Skip to content

Commit

Permalink
Rework dulcimer music yet again
Browse files Browse the repository at this point in the history
This edit splits what was dulcimer-tabs-d into dulcimer-tabs-dad
and dulcimer-tabs-dgd, containing just 'D' tunes and just 'G' tunes
respectively. dulcimer-tabs-a remains, for the time being.
  • Loading branch information
Jon Warbrick committed Sep 7, 2019
1 parent 895ee98 commit a7217fd
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 23 deletions.
1 change: 1 addition & 0 deletions .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Options FollowSymLinks
RewriteBase "/tunebook-abc/"
RewriteRule "^tunebook-tabs\.pdf$" "tunebook-guitar-dwhistle.pdf" [R=permanent,L]
RewriteRule "^tunebook-dulcimer\.pdf$" "tunebook-dulcimer-chords-dad.pdf" [R=permanent,L]
RewriteRule "^tunebook-dulcimer-tabs-d\.pdf$" "tunebook-dulcimer-tabs-dad.pdf" [R=permanent,L]
RewriteRule "^cheatsheet-dulcimer\.pdf$" "cheatsheet-dulcimer-d.pdf" [R=permanent,L]
RewriteRule "^cheatsheet-dulcimer-dad\.pdf$" "cheatsheet-dulcimer-d.pdf" [R=permanent,L]
RewriteRule "^cheatsheet-whistle\.pdf$" "cheatsheet-dwhistle.pdf" [R=permanent,L]
29 changes: 22 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ dist/tunebook-baseclef.pdf \
dist/tunebook-guitar-dwhistle.pdf \
dist/tunebook-mandolin.pdf \
dist/tunebook-dulcimer-chords-dad.pdf \
dist/tunebook-dulcimer-tabs-d.pdf \
dist/tunebook-dulcimer-tabs-dad.pdf \
dist/tunebook-dulcimer-tabs-dgd.pdf \
dist/tunebook-dulcimer-tabs-a.pdf \
dist/tunebook-ukulele.pdf \
dist/cheatsheet.pdf \
Expand Down Expand Up @@ -141,19 +142,33 @@ dist/tunebook-dulcimer-chords-dad.pdf : $(abc_source) $(common_depends) inc/dulc
rm $@.ps
exiftool -Title='Tunebook ABC - DAD Dulcimer Chords' -Author='Tunebook ABC' $@

# Dulcimer melody TABs for a 'D' melody string
dist/tunebook-dulcimer-tabs-d.pdf : $(abc_source) $(common_depends) inc/dulcimer-tabs-d.abc fmt/dulcimer-tabs-d.fmt fmt/dulcimer.fmt
# Dulcimer melody TABs for tunes in 'D' and DAD tuneing
dist/tunebook-dulcimer-tabs-dad.pdf : $(abc_source) $(common_depends) inc/dulcimer-tabs-dad.abc fmt/dulcimer-tabs-dad.fmt fmt/dulcimer.fmt
mkdir -p dist
(echo '%abc-2.1'; \
cat inc/dulcimer-tabs-d.abc; echo; echo; \
cat inc/dulcimer-tabs-dad.abc; echo; echo; \
cat inc/frontmatter.abc; echo; echo; \
echo "%%header \"-$$(git describe --tags --always) \$$P\""; echo; \
echo '%%newpage'; \
bin/sorter.py --ref; \
) | abcm2ps $(common_args) -1 -T8 -F dulcimer-tabs-d.fmt | bin/abcmaddidx.tcl - $@.ps
bin/sorter.py --ref --key-filter=D; \
) | abcm2ps $(common_args) -1 -T8 -F dulcimer-tabs-dad.fmt | bin/abcmaddidx.tcl - $@.ps
ps2pdf $@.ps $@
rm $@.ps
exiftool -Title='Tunebook ABC - Dulcimer melody D' -Author='Tunebook ABC' $@
exiftool -Title='Tunebook ABC - DAD Dulcimer' -Author='Tunebook ABC' $@

# Dulcimer melody TABs for tunes in 'G' and DGD tuneing
dist/tunebook-dulcimer-tabs-dgd.pdf : $(abc_source) $(common_depends) inc/dulcimer-tabs-dgd.abc fmt/dulcimer-tabs-dgd.fmt fmt/dulcimer.fmt
mkdir -p dist
(echo '%abc-2.1'; \
cat inc/dulcimer-tabs-dgd.abc; echo; echo; \
cat inc/frontmatter.abc; echo; echo; \
echo "%%header \"-$$(git describe --tags --always) \$$P\""; echo; \
echo '%%newpage'; \
bin/sorter.py --ref --key-filter=G; \
) | abcm2ps $(common_args) -1 -T8 -F dulcimer-tabs-dgd.fmt | bin/abcmaddidx.tcl - $@.ps
ps2pdf $@.ps $@
rm $@.ps
exiftool -Title='Tunebook ABC - DGD Dulcimer' -Author='Tunebook ABC' $@

# Dulcimer melody TABs for a 'A' melody string
dist/tunebook-dulcimer-tabs-a.pdf : $(abc_source) $(common_depends) inc/dulcimer-tabs-a.abc fmt/dulcimer-tabs-a.fmt fmt/dulcimer.fmt
Expand Down
3 changes: 3 additions & 0 deletions fmt/dulcimer-tabs-d.fmt → fmt/dulcimer-tabs-dad.fmt
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
format dulcimer.fmt
beginps
/d_drones [(D) (A)] def
endps
tablature #8 pitch=D 28 0 55 d_head d_note
5 changes: 5 additions & 0 deletions fmt/dulcimer-tabs-dgd.fmt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
format dulcimer.fmt
beginps
/d_drones [(D) (G)] def
endps
tablature #8 pitch=D 28 0 55 d_head d_note
4 changes: 2 additions & 2 deletions inc/dulcimer-chords-dad.abc
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
%%vskip 1.5cm
%%textfont * 36
%%center Tunebook ABC - DAD Mountain Dulcimer Chords
%%center Tunebook ABC - DAD Dulcimer Chords
%%vskip 27

%%textfont * 18
%%vskip 5
%%begintext justify
%%This rendering of the tunebook includes example chord diagrams
%%for DAD-tuned Mountain Dulcimers. The chords assume an instrument
%%for D-A-D-tuned Mountain Dulcimers. The chords assume an instrument
%%without a "1\u00bd" fret (there are otherwise better fingerings for "C").
%%endtext
13 changes: 0 additions & 13 deletions inc/dulcimer-tabs-d.abc

This file was deleted.

12 changes: 12 additions & 0 deletions inc/dulcimer-tabs-dad.abc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
%%vskip 1.5cm
%%textfont * 36
%%center Tunebook ABC - DAD Dulcimer TABS
%%vskip 27

%%textfont * 18
%%vskip 5
%%begintext justify
%%This rendering of the tunebook includes simple melody tabs for Mountain Dulcimers tuned D-A-D.
%%$1It only includes tunes in the key of D$0 - see elsewhere for TABs for all the tunes
%%in G.
%%endtext
12 changes: 12 additions & 0 deletions inc/dulcimer-tabs-dgd.abc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
%%vskip 1.5cm
%%textfont * 36
%%center Tunebook ABC - DGD Dulcimer TABS
%%vskip 27

%%textfont * 18
%%vskip 5
%%begintext justify
%%This rendering of the tunebook includes simple melody tabs for Mountain Dulcimers tuned D-G-D.
%%$1It only includes tunes in the key of G$0 - see elsewhere for TABs for all the tunes
%%in D.
%%endtext
3 changes: 2 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ <h2>Other formats</h2>
<li>Mountain Dulcimer:
<ul>
<li><a href="tunebook-dulcimer-chords-dad.pdf">tunebook-dulcimer-chords-dad.pdf</a> with example chord diagrams for D-A-D tuning</li>
<li><a href="tunebook-dulcimer-tabs-d.pdf">tunebook-dulcimer-tabs-d.pdf</a> with simple melody tabs for melody strings tuned to 'D'</li>
<li><a href="tunebook-dulcimer-tabs-dad.pdf">tunebook-dulcimer-tabs-dad.pdf</a> with simple melody tabs for D-A-D tuning ('D' tunes only)</li>
<li><a href="tunebook-dulcimer-tabs-dgd.pdf">tunebook-dulcimer-tabs-dgd.pdf</a> with simple melody tabs for D-G-D tuning ('G' tunes only)</li>
<li><a href="tunebook-dulcimer-tabs-a.pdf">tunebook-dulcimer-tabs-a.pdf</a> with simple melody tabs for melody strings tuned to 'A'</li>
</ul>
</li>
Expand Down

0 comments on commit a7217fd

Please sign in to comment.