Rework dulcimer music yet again, again

This edit combines what was dulcimer-tabs-dad.pdf and dulcimer-tabs-dgd.pdf
into a single file dulcimer-tabs-dxd.pdf. This contains TABs for all the
'D' tunes first (assuming D-A-D tuning) and all the 'G' tunes second
(assuming D-G-D tuning).

.htaccess

@@ -8,6 +8,8 @@ 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 "^tunebook-dulcimer-tabs-dad\.pdf$"    "tunebook-dulcimer-tabs-dxd.pdf" [R=permanent,L]
+RewriteRule "^tunebook-dulcimer-tabs-dgd\.pdf$"    "tunebook-dulcimer-tabs-dxd.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]

Makefile

@@ -6,8 +6,7 @@ dist/tunebook-baseclef.pdf \
 dist/tunebook-guitar-dwhistle.pdf \
 dist/tunebook-mandolin.pdf \
 dist/tunebook-dulcimer-chords-dad.pdf \
-dist/tunebook-dulcimer-tabs-dad.pdf \
-dist/tunebook-dulcimer-tabs-dgd.pdf \
+dist/tunebook-dulcimer-tabs-dxd.pdf \
 dist/tunebook-dulcimer-tabs-a.pdf \
 dist/tunebook-ukulele.pdf \
 dist/cheatsheet.pdf \
@@ -142,33 +141,25 @@ 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 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
+# Dulcimer melody TABs for tunes in 'D' (with D-A-D tuning) and 'G' (with DGD tuning)
+dist/tunebook-dulcimer-tabs-dxd.pdf : $(abc_source) $(common_depends) inc/dulcimer-tabs-dxd.abc inc/dulcimer-tabs-dxd-1.abc inc/dulcimer-tabs-dxd-2.abc fmt/dulcimer-tabs-dad.fmt fmt/dulcimer-tabs-dgd.fmt fmt/dulcimer.fmt
 	mkdir -p dist
 	(echo '%abc-2.1'; \
-	 cat inc/dulcimer-tabs-dad.abc; echo; echo; \
+	 cat inc/dulcimer-tabs-dxd.abc; echo; echo; \
 	 cat inc/frontmatter.abc; echo; echo; \
 	 echo "%%header \"-$$(git describe --tags --always)		\$$P\""; echo; \
 	 echo '%%newpage'; \
+	 cat inc/dulcimer-tabs-dxd-1.abc; echo; echo; \
+	 echo '%%format dulcimer-tabs-dad.fmt'; \
 	 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 - 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'; \
+	 cat inc/dulcimer-tabs-dxd-2.abc; echo; echo; \
+	 echo '%%format dulcimer-tabs-dgd.fmt'; \
 	 bin/sorter.py --ref --key-filter=G; \
-	) | abcm2ps $(common_args) -1 -T8 -F dulcimer-tabs-dgd.fmt | bin/abcmaddidx.tcl - $@.ps
+	) | abcm2ps $(common_args) -1 -T8 | bin/abcmaddidx.tcl - $@.ps
 	ps2pdf $@.ps $@
 	rm $@.ps
-	exiftool -Title='Tunebook ABC - DGD Dulcimer' -Author='Tunebook ABC' $@
+	exiftool -Title='Tunebook ABC - DAD/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

inc/dulcimer-tabs-dxd-1.abc

@@ -0,0 +1,7 @@
+%%vskip 5
+%%textfont * 24
+%%center Part One - Tunes on the key of D
+
+%%textfont * 18
+%%vskip 5
+%%center These TABs assume D-A-D tuning

inc/dulcimer-tabs-dxd-2.abc

@@ -0,0 +1,7 @@
+%%vskip 5
+%%textfont * 24
+%%center Part Two - Tunes on the key of G
+
+%%textfont * 18
+%%vskip 5
+%%center These TABs assume D-G-D tuning

inc/dulcimer-tabs-dxd.abc

@@ -0,0 +1,13 @@
+%%vskip 1.5cm
+%%textfont * 36
+%%center Tunebook ABC - DAD/DGD Dulcimer TABs
+%%vskip 27
+
+%%textfont * 18
+%%begintext justify
+%%This rendering of the tunebook includes simple melody tabs for Mountain Dulcimers.
+%%All the tunes in the key of D appear in the $1first half$0 and assume D-A-D tuning; tunes in the
+%%key of G appear in the $1second half$0 and assume D-G-D tuning. The two tunes in
+%%the key of A are not included.
+%%endtext
+

index.html

@@ -79,8 +79,7 @@ <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-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-dxd.pdf">tunebook-dulcimer-tabs-dxd.pdf</a> with simple melody tabs for D-A-D and D-G-D tuning ('D' and '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>