Rename some derived files

Names like tunebook-tabs.pdf made sense once upon a time when this file was the only one containing tabs, but are now looking silly in the face of lots of different sorts of tabs. Likewise tunebook-dulcimer.pdf now only contains Dulcimer chords while tunebook-dulcimer-tabs-dad.pdf contains chords and tabs. This edit renames several output files to be more specific (and to include tunings for Whistle and Dulcimer), renames some internal support files to match, and adds redirects from the old output file names to the new ones.
jw35 · Aug 30, 2019 · c3ec587 · c3ec587
1 parent ca97246
commit c3ec587
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 46 deletions.
diff --git a/.htaccess b/.htaccess
@@ -1,3 +1,11 @@
 Options +Indexes
 IndexOptions -FancyIndexing SuppressIcon
 IndexIgnore .. HEADER.html
+
+RewriteEngine On
+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 "^cheatsheet-dulcimer\.pdf$"  "cheatsheet-dulcimer-dad.pdf" [R=permanent,L]
+RewriteRule "^cheatsheet-whistle\.pdf$"   "cheatsheet-dwhistle.pdf" [R=permanent,L]
diff --git a/Makefile b/Makefile
@@ -3,15 +3,15 @@ dist/tunebook.pdf \
 dist/tunebook-bflat.pdf \
 dist/tunebook-eflat.pdf \
 dist/tunebook-baseclef.pdf \
-dist/tunebook-tabs.pdf \
+dist/tunebook-guitar-dwhistle.pdf \
 dist/tunebook-mandolin.pdf \
-dist/tunebook-dulcimer.pdf \
+dist/tunebook-dulcimer-chords-dad.pdf \
 dist/tunebook-dulcimer-tabs-dad.pdf \
 dist/tunebook-ukulele.pdf \
 dist/cheatsheet.pdf \
-dist/cheatsheet-whistle.pdf \
+dist/cheatsheet-dwhistle.pdf \
 dist/cheatsheet-mandolin.pdf \
-dist/cheatsheet-dulcimer.pdf
+dist/cheatsheet-dulcimer-dad.pdf
 
 abc_source := $(wildcard abc/[0-9]*.abc)
 
@@ -94,16 +94,16 @@ dist/tunebook-baseclef.pdf : $(abc_source) baseclef.abc frontmatter.abc bin/sort
 
 # All the tunes as a printable score, one tune per page with guitar
 # chord diagrams and D whistle tabs
-dist/tunebook-tabs.pdf : $(abc_source) tabs.abc frontmatter.abc bin/sorter.py bin/add_chords.py tunebook.fmt flute.fmt guitarchords.fmt
+dist/tunebook-guitar-dwhistle.pdf : $(abc_source) guitar-dwhistle.abc frontmatter.abc bin/sorter.py bin/add_chords.py tunebook.fmt flute.fmt guitarchords.fmt
 	mkdir -p dist
 	(echo '%abc-2.1'; \
-	 cat tabs.abc; echo; echo; \
+	 cat guitar-dwhistle.abc; echo; echo; \
 	 cat frontmatter.abc; echo; echo; \
 	 echo "%%header \"-$$(git describe --tags --always)		\$$P\""; echo; \
 	 echo '%%newpage'; \
 	 bin/sorter.py --ref; \
 	) | bin/add_chords.py | abcm2ps - -1 -i -F tunebook.fmt -F guitarchords.fmt -T1 -O - | ps2pdf - $@
-	exiftool -Title='Tunebook ABC - D Wistle' -Author='Tunebook ABC' $@
+	exiftool -Title='Tunebook ABC - Guitar and D Wistle' -Author='Tunebook ABC' $@
 
 # All the tunes as a printable score, one tune per page with mandolin tabs
 dist/tunebook-mandolin.pdf : $(abc_source) mandolin.abc frontmatter.abc bin/sorter.py bin/add_chords.py tunebook.fmt mandolin.fmt
@@ -119,7 +119,7 @@ dist/tunebook-mandolin.pdf : $(abc_source) mandolin.abc frontmatter.abc bin/sort
 
 # All the tunes as a printable score, one tune per page with dulcimer
 # chord diagrams for a DAD-tuned instrument
-dist/tunebook-dulcimer.pdf : $(abc_source) dulcimer-chords-dad.abc frontmatter.abc bin/sorter.py bin/add_chords.py tunebook.fmt dulcimer.fmt dulcimerchords.fmt
+dist/tunebook-dulcimer-chords-dad.pdf : $(abc_source) dulcimer-chords-dad.abc frontmatter.abc bin/sorter.py bin/add_chords.py tunebook.fmt dulcimer.fmt dulcimerchords.fmt
 	mkdir -p dist
 	(echo '%abc-2.1'; \
 	 cat dulcimer-chords-dad.abc; echo; echo; \
@@ -141,7 +141,7 @@ dist/tunebook-dulcimer-tabs-dad.pdf : $(abc_source) dulcimer-tabs-dad.abc frontm
 	 echo '%%newpage'; \
 	 bin/sorter.py --ref --key-filter D; \
 	) | bin/add_chords.py | abcm2ps - -1 -i -F tunebook.fmt -F dulcimerchords.fmt -T8 -O - | ps2pdf - $@
-	exiftool -Title='Tunebook ABC - Dulcimer' -Author='Tunebook ABC' $@
+	exiftool -Title='Tunebook ABC - DAD Dulcimer' -Author='Tunebook ABC' $@
 
 # All the tunes as a printable score, one tune per page with ukulele chords
 dist/tunebook-ukulele.pdf : $(abc_source) ukulele.abc frontmatter.abc bin/sorter.py bin/add_chords.py tunebook.fmt ukulelechords.fmt
@@ -153,7 +153,7 @@ dist/tunebook-ukulele.pdf : $(abc_source) ukulele.abc frontmatter.abc bin/sorter
 	 echo '%%newpage'; \
 	 bin/sorter.py --ref; \
 	) | bin/add_chords.py | abcm2ps - -1 -i -F tunebook.fmt -F ukulelechords.fmt -O - | ps2pdf - $@
-	exiftool -Title='Tunebook ABC - Dulcimer' -Author='Tunebook ABC' $@
+	exiftool -Title='Tunebook ABC - Ukulele' -Author='Tunebook ABC' $@
 
 ## Cheatsheets
 
@@ -170,16 +170,16 @@ dist/cheatsheet.pdf : $(abc_source) cheatsheet.abc frontmatter.abc bin/sorter.py
 	exiftool -Title='Tunebook ABC - Cheatsheet' -Author='Tunebook ABC' $@
 
 # The first few bars of all the tunes with whistle fingering
-dist/cheatsheet-whistle.pdf : $(abc_source) cheatsheet-whistle.abc frontmatter.abc bin/sorter.py bin/make_cheatsheet.py tunebook.fmt cheatsheet.fmt flute.fmt
+dist/cheatsheet-dwhistle.pdf : $(abc_source) cheatsheet-dwhistle.abc frontmatter.abc bin/sorter.py bin/make_cheatsheet.py tunebook.fmt cheatsheet.fmt flute.fmt
 	mkdir -p dist
 	(echo '%abc-2.1'; \
-	 cat cheatsheet-whistle.abc; echo; echo; \
+	 cat cheatsheet-dwhistle.abc; echo; echo; \
 	 cat frontmatter.abc; echo; echo; \
 	 echo "%%header \"-$$(git describe --tags --always)		\""; echo; \
 	 echo '%%scale 0.6'; \
 	 bin/sorter.py --title; \
 	) |  bin/make_cheatsheet.py --rows 7 | abcm2ps - -i -F tunebook.fmt -F cheatsheet.fmt -T1 -O - | ps2pdf - $@
-	exiftool -Title='Tunebook ABC - Cheatsheet Whistle' -Author='Tunebook ABC' $@
+	exiftool -Title='Tunebook ABC - Cheatsheet D Whistle' -Author='Tunebook ABC' $@
 
 # The first few bars of all the tunes with mandolin fingering
 dist/cheatsheet-mandolin.pdf : $(abc_source) cheatsheet-mandolin.abc frontmatter.abc bin/sorter.py bin/make_cheatsheet.py tunebook.fmt cheatsheet.fmt cheatsheet-mandolin.fmt mandolin.fmt
@@ -195,7 +195,7 @@ dist/cheatsheet-mandolin.pdf : $(abc_source) cheatsheet-mandolin.abc frontmatter
 
 # The first few bars of all the tunes in 'D' with dulcimer fingering for a
 # DAD-tuned instrument
-dist/cheatsheet-dulcimer.pdf : $(abc_source) cheatsheet-dulcimer-dad.abc frontmatter.abc bin/sorter.py bin/make_cheatsheet.py tunebook.fmt cheatsheet.fmt cheatsheet-dulcimer.fmt dulcimer.fmt
+dist/cheatsheet-dulcimer-dad.pdf : $(abc_source) cheatsheet-dulcimer-dad.abc frontmatter.abc bin/sorter.py bin/make_cheatsheet.py tunebook.fmt cheatsheet.fmt cheatsheet-dulcimer.fmt dulcimer.fmt
 	mkdir -p dist
 	(echo '%abc-2.1'; \
 	 cat cheatsheet-dulcimer-dad.abc; echo; echo; \
@@ -204,7 +204,7 @@ dist/cheatsheet-dulcimer.pdf : $(abc_source) cheatsheet-dulcimer-dad.abc frontma
 	 echo '%%scale 0.6'; \
 	 bin/sorter.py --title --key-filter D; \
 	) |  bin/make_cheatsheet.py --rows 8 | abcm2ps - -i -F tunebook.fmt -F cheatsheet.fmt -F cheatsheet-dulcimer.fmt -T8 -O - | ps2pdf - $@
-	exiftool -Title='Tunebook ABC - Cheatsheet Dulcimer' -Author='Tunebook ABC' $@
+	exiftool -Title='Tunebook ABC - Cheatsheet DAD Dulcimer' -Author='Tunebook ABC' $@
 
 # Assorted files
 
@@ -248,5 +248,5 @@ target_filenames := $(patsubst dist/%,%,$(targets))
 website: $(targets) index.html .htaccess abc midi mp3 dist/tunebook-abc.zip dist/tunebook-midi.zip dist/tunebook-mp3.zip
 	( \
 		cd dist; \
-		rsync -av ../index.html ../.htaccess $(target_filenames) abc midi mp3 tunebook-abc.zip tunebook-midi.zip tunebook-mp3.zip [email protected]:www.brsn.org.uk_html/tunebook-abc/; \
+		rsync -av ../index.html ../.htaccess $(target_filenames) abc midi mp3 tunebook-abc.zip tunebook-midi.zip tunebook-mp3.zip [email protected]:brsn.org.uk_html/tunebook-abc/; \
 	)
diff --git a/cheatsheet-whistle.abc → cheatsheet-dwhistle.abc b/cheatsheet-whistle.abc → cheatsheet-dwhistle.abc
@@ -1,6 +1,6 @@
 %%vskip 1.5cm
 %%textfont * 36
-%%center Tunebook ABC - Whistle CheatSheet
+%%center Tunebook ABC - D Whistle CheatSheet
 %%vskip 27
 
 %%textfont * 18

diff --git a/tabs.abc → guitar-dwhistle.abc b/tabs.abc → guitar-dwhistle.abc
@@ -1,6 +1,6 @@
 %%vskip 1.5cm
 %%textfont * 36
-%%center Tunebook ABC - Guitar and Whistle
+%%center Tunebook ABC - Guitar and D Whistle
 %%vskip 27
 
 %%textfont * 18

diff --git a/index.html b/index.html
@@ -16,14 +16,16 @@ <h1>Tunebook ABC</h1>
         <p>
             This site contains a transcription into <a href="http://abcnotation.com/">ABC notation</a>
             of the tunes used by <a href="https://www.tuneworks.co.uk/">Tuneworks</a> in
-            support of the workshops and sessions that they run at
+            the workshops and sessions that they run at
             various UK folk festivals. While most of these tunes
-            are already available on sites such as The Session, the ones
+            are already available on sites like <a href="https://thesession.org">The Session</a>, the ones
             here are intended to be note-for-note identical to the versions
-            in the
+            published in the
             <a href="https://docs.wixstatic.com/ugd/d6448b_974724120ad6465fbf8f417ff89daf0b.pdf">Tuneworks Tunebook</a>.
         </p>
 
+        <h2>ABC Files</h2>
+
         <ul>
             <li>
                 <a href="tunebook.abc">All the tunes as a single file</a>, suitable for further processing
@@ -32,13 +34,15 @@ <h1>Tunebook ABC</h1>
                 seems to handle this file OK.
             </li>
             <li>
-                <a href="abc/">One file per tune</a>, or <a href="tunebook-abc.zip">all the tunes in a Zip archive</a>.
+                <a href="abc/">Individual tunes</a> (or <a href="tunebook-abc.zip">all the tunes in a Zip archive</a>).
                 Here (and elsewhere) the numbers at the start of the
                 filename encode the number of the page in the original Tunebook on which the tune appears
                 and its place on that page.
             </li>
         </ul>
 
+        <h2>Other formats</h2>
+
         <p>
             This site also contains the results of processing the ABC files into various other formats:
         </p>
@@ -53,45 +57,40 @@ <h1>Tunebook ABC</h1>
                 <ul>
                     <li><a href="tunebook-eflat.pdf">tunebook-eflat.pdf</a> to E&#9837; (e.g. for alto sax)</li>
                     <li><a href="tunebook-bflat.pdf">tunebook-bflat.pdf</a> to B&#9837; (e.g. for clarinet, soprano or tenor sax )</li>
+                    <li><a href="tunebook-baseclef.pdf">tunebook-baseclef.pdf</a> The printed tunebook in the base clef</li>
                 </ul>
             </li>
-            <li><a href="tunebook-baseclef.pdf">tunebook-baseclef.pdf</a> The printed tunebook in the base clef</li>
+        </ul>
+
+        <ul>
             <li>One tune per page for various instruments:
                 <ul>
-                    <li><a href="tunebook-tabs.pdf">tunebook-tabs.pdf</a> with guitar chord diagrams and D whistle tabs.</li>
+                    <li><a href="tunebook-guitar-dwhistle.pdf">tunebook-guitar-dwhistle.pdf</a> with Guitar chord diagrams and D Whistle tabs.</li>
                     <li><a href="tunebook-mandolin.pdf">tunebook-mandolin.pdf</a> with mandolin tabs.</li>
-                    <li><a href="tunebook-dulcimer.pdf">tunebook-dulcimer.pdf</a> with example chord diagrams for D-A-D mountain dulcimers.</li>
-                    <li><a href="tunebook-dulcimer-tabs-dad.pdf">tunebook-dulcimer-tabs-dad.pdf</a> with example chord diagrams and simple tabs just for the tunes in the key of 'D' for D-A-D mountain dulcimers (tunes in other keys would need retuning or clever capo tricks).</li>
-                    <li><a href="tunebook-ukulele.pdf">tunebook-ukulele.pdf</a> with ukulele chord diagrams.</li>
-                </ul></li>
+                    <li><a href="tunebook-dulcimer-chords-dad.pdf">tunebook-dulcimer-chords-dad.pdf</a> with example chord diagrams for D-A-D Mountain Dulcimers.</li>
+                    <li><a href="tunebook-dulcimer-tabs-dad.pdf">tunebook-dulcimer-tabs-dad.pdf</a> with example chord diagrams and simple tabs just for the tunes in the key of 'D' for D-A-D Mountain Dulcimers (tunes in other keys need retuning or clever capo tricks).</li>
+                    <li><a href="tunebook-ukulele.pdf">tunebook-ukulele.pdf</a> with Ukulele chord diagrams.</li>
+                </ul>
+            </li>
+        </ul>
+
+        <ul>
             <li>A compact index to all the tunes, just showing the first couple of bars
                 (handy when trying to remember the notes for a particular tune or identify a tune's name from its start):
                 <ul>
                     <li><a href="cheatsheet.pdf">cheatsheet.pdf</a> just the tunes.</li>
-                    <li><a href="cheatsheet-whistle.pdf">cheatsheet-whistle.pdf</a> as above, but including
-                        D whistle tabs.</li>
-                    <li><a href="cheatsheet-mandolin.pdf">cheatsheet-mandolin.pdf</a> as above, but including
-                        mandolin tabs.</li>
-                    <li><a href="cheatsheet-dulcimer.pdf">cheatsheet-dulcimer.pdf</a> as above, but including
-                        dulcimer tabs.</li>
+                    <li><a href="cheatsheet-dwhistle.pdf">cheatsheet-dwhistle.pdf</a> as above, but including D Whistle tabs.</li>
+                    <li><a href="cheatsheet-mandolin.pdf">cheatsheet-mandolin.pdf</a> as above, but including Mandolin tabs.</li>
+                    <li><a href="cheatsheet-dulcimer-dad.pdf">cheatsheet-dulcimer-dad.pdf</a> as above, but including D-A-D Mountain Dulcimer tabs just for the tunes in the key of 'D'.</li>
                 </ul>
             </li>
+        </ul>
+
+        <ul>
             <li><a href="midi/">All the tunes converted to MIDI files</a> (or <a href="tunebook-midi.zip">all the MIDI files in a Zip archive)</a></li>
             <li><a href="mp3/">All the tunes converted to mp3 files</a> (or <a href="tunebook-mp3.zip">all the mp3 files in a Zip archive)</a></li>
         </ul>
 
-        <p>
-            This work was partly inspired by <a href="http://www.pghardy.net/concertina/tunebooks/">Paul
-            Hardy's Tunebooks</a> and his
-            <a href="http://www.pghardy.net/concertina/tunebooks/tunebook_process.html">tunebook process page</a>
-            heavily informed the processing pipeline.
-        </p>
-
-        <p>
-            The master copies of these tunes, along with the tools used to produce everything else,
-            can be found on GitHub at <a href="https://github.com/jw35/tunebook-abc">https://github.com/jw35/tunebook-abc</a>.
-        </p>
-
         <p>
             The transcription is bound to contain mistakes, defined as (almost) anything that isn't the same as it is in the
             Tuneworks Tunebook (ignoring minor stylistic differences and the differences listed below).
@@ -110,6 +109,19 @@ <h1>Tunebook ABC</h1>
             omitted, largely because abc2midi complains that it makes the repeat bar too long.</li>
         </ul>
 
+        <p>
+            This work was inspired by <a href="http://www.pghardy.net/concertina/tunebooks/">Paul
+            Hardy's Tunebooks</a> and his
+            <a href="http://www.pghardy.net/concertina/tunebooks/tunebook_process.html">tunebook process page</a> informed the initial processing pipeline. Robin Clark of
+            <a href="http://www.dulcimers.co.uk">Bird Rock Dulcimers</a> fixed a number of mistakes
+            in the Dulcimer versions.
+        </p>
+
+        <p>
+            The master copies of these tunes, along with the tools used to produce everything else,
+            can be found on GitHub at <a href="https://github.com/jw35/tunebook-abc">https://github.com/jw35/tunebook-abc</a>.
+        </p>
+
         <p>
             This transcription and the subsequent processing is the work of
             Jon Warbrick &lt;[email protected]&gt;. The transcribed ABC files and