Rename LSR tags

diff --git a/buildscripts/add_html_footer.py b/buildscripts/add_html_footer.py
index 47589baeeab4dc0536392a72039c4ff75e416228..bd7d8409cee5af622e6792fde092fda347776e0f 100644 (file)
--- a/buildscripts/add_html_footer.py
+++ b/buildscripts/add_html_footer.py
@@ -97,7 +97,7 @@ snippets_ref_re = re.compile (r'href="(\.\./)?lilypond-snippets')
 # this also fixes missing PNGs only present in translated docs
 def hack_urls (s, prefix):
     if splitted_docs_re.match (prefix):
-        s = re.sub ('(href|src)="(lily-.*?|.*?[.]png)"', '\\1="../\\2"', s)
+        s = re.sub ('(href|src)="(../lily-.*?|.*?[.]png)"', '\\1="../\\2"', s)
 
     # fix Snippets xrefs ad hoc
     s = snippets_ref_re.sub ('href="source/input/lsr/lilypond-snippets', s)

diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py
index f3f91a0c0261e342b0a343fa99fa9591865e0496..e4bfd2a0a63299b276368b1e77906bbf328134ef 100755 (executable)
--- a/buildscripts/makelsr.py
+++ b/buildscripts/makelsr.py
@@ -28,8 +28,9 @@ TAGS.extend (['pitches', 'rhythms', 'expressive-marks',
 'repeats', 'simultaneous-notes', 'staff-notation',
 'editorial-and-educational-use', 'text'])
 # NR 2
-TAGS.extend (['vocal-music', 'chords', 'piano-music',
-'percussion', 'guitar', 'strings', 'bagpipes', 'ancient-notation'])
+TAGS.extend (['vocal-music', 'chords', 'keyboards',
+'percussion', 'fretted-strings', 'unfretted-strings', 'ancient-notation' # ,'winds'
+])
 
 # other
 TAGS.extend (['contexts-and-engravers', 'tweaks-and-overrides',

diff --git a/input/lsr/fretted-strings-intro.itely b/input/lsr/fretted-strings-intro.itely
new file mode 100644 (file)
index 0000000..bb149c1
--- /dev/null
+++ b/input/lsr/fretted-strings-intro.itely
@@ -0,0 +1,5 @@
+@node Fretted strings
+@unnumbered Fretted strings
+
+@lysnippets
+

diff --git a/input/lsr/fretted-strings.snippet-list b/input/lsr/fretted-strings.snippet-list
new file mode 100644 (file)
index 0000000..f4997a5
--- /dev/null
+++ b/input/lsr/fretted-strings.snippet-list
@@ -0,0 +1,3 @@
+letter-tablature-formatting.ly
+jazz-combo-template.ly
+adding-fingerings-to-tablatures.ly

diff --git a/input/lsr/guitar-intro.itely b/input/lsr/guitar-intro.itely
deleted file mode 100644 (file)
index 931ad7a..0000000
--- a/input/lsr/guitar-intro.itely
+++ /dev/null
@@ -1,5 +0,0 @@
-@node Guitar
-@unnumbered Guitar
-
-@lysnippets
-

diff --git a/input/lsr/guitar.snippet-list b/input/lsr/guitar.snippet-list
deleted file mode 100644 (file)
index f4997a5..0000000
--- a/input/lsr/guitar.snippet-list
+++ /dev/null
@@ -1,3 +0,0 @@
-letter-tablature-formatting.ly
-jazz-combo-template.ly
-adding-fingerings-to-tablatures.ly

diff --git a/input/lsr/keyboards-intro.itely b/input/lsr/keyboards-intro.itely
new file mode 100644 (file)
index 0000000..35b849e
--- /dev/null
+++ b/input/lsr/keyboards-intro.itely
@@ -0,0 +1,5 @@
+@node Keyboards
+@unnumbered Keyboards
+
+@lysnippets
+

diff --git a/input/lsr/keyboards.snippet-list b/input/lsr/keyboards.snippet-list
new file mode 100644 (file)
index 0000000..b8794af
--- /dev/null
+++ b/input/lsr/keyboards.snippet-list
@@ -0,0 +1,9 @@
+piano-template-with-centered-dynamics.ly
+clusters.ly
+piano-template-with-centered-lyrics.ly
+vocal-ensemble-template-with-automatic-piano-reduction.ly
+piano-template-simple.ly
+controlling-the-placement-of-chord-fingerings.ly
+piano-template-with-melody-and-lyrics.ly
+jazz-combo-template.ly
+demo-midiinstruments.ly

diff --git a/input/lsr/lilypond-snippets.tely b/input/lsr/lilypond-snippets.tely
index 3b8879366eeba00a6c97bcae6f840b3adafe1cde..98d5eb1da120723db2ff76e5113b42ea33c42719 100644 (file)
--- a/input/lsr/lilypond-snippets.tely
+++ b/input/lsr/lilypond-snippets.tely
@@ -90,11 +90,10 @@ Musical notation
 Specialist notation
 * Vocal music::
 * Chords::
-* Piano::
+* Keyboards::
 * Percussion::
-* Guitar::
-* Strings::
-@c * Bagpipes::
+* Fretted strings::
+* Unfretted strings::
 * Ancient notation::
 
 Other collections
@@ -122,12 +121,11 @@ Other collections
 
 @include vocal-music.itely
 @include chords.itely
-@include piano-music.itely
+@include keyboards.itely
 @include percussion.itely
-@include guitar.itely
-@include strings.itely
-@c ignore empty section
-@c @include bagpipes.itely
+@include fretted-strings.itely
+@include unfretted-strings.itely
+@c @include winds.itely
 @include ancient-notation.itely
 
 @include contexts-and-engravers.itely

diff --git a/input/lsr/piano-music-intro.itely b/input/lsr/piano-music-intro.itely
deleted file mode 100644 (file)
index 3cd0e85..0000000
--- a/input/lsr/piano-music-intro.itely
+++ /dev/null
@@ -1,5 +0,0 @@
-@node Piano
-@unnumbered Piano
-
-@lysnippets
-

diff --git a/input/lsr/piano-music.snippet-list b/input/lsr/piano-music.snippet-list
deleted file mode 100644 (file)
index b8794af..0000000
--- a/input/lsr/piano-music.snippet-list
+++ /dev/null
@@ -1,9 +0,0 @@
-piano-template-with-centered-dynamics.ly
-clusters.ly
-piano-template-with-centered-lyrics.ly
-vocal-ensemble-template-with-automatic-piano-reduction.ly
-piano-template-simple.ly
-controlling-the-placement-of-chord-fingerings.ly
-piano-template-with-melody-and-lyrics.ly
-jazz-combo-template.ly
-demo-midiinstruments.ly

diff --git a/input/lsr/strings-intro.itely b/input/lsr/strings-intro.itely
deleted file mode 100644 (file)
index 316fef7..0000000
--- a/input/lsr/strings-intro.itely
+++ /dev/null
@@ -1,5 +0,0 @@
-@node Strings
-@unnumbered Strings
-
-@lysnippets
-

diff --git a/input/lsr/strings.snippet-list b/input/lsr/strings.snippet-list
deleted file mode 100644 (file)
index a0795b5..0000000
--- a/input/lsr/strings.snippet-list
+++ /dev/null
@@ -1,3 +0,0 @@
-string-quartet-template-simple.ly
-string-quartet-template-with-separate-parts.ly
-demo-midiinstruments.ly

diff --git a/input/lsr/unfretted-strings-intro.itely b/input/lsr/unfretted-strings-intro.itely
new file mode 100644 (file)
index 0000000..f5f5966
--- /dev/null
+++ b/input/lsr/unfretted-strings-intro.itely
@@ -0,0 +1,5 @@
+@node Unfretted strings
+@unnumbered Unfretted strings
+
+@lysnippets
+

diff --git a/input/lsr/unfretted-strings.snippet-list b/input/lsr/unfretted-strings.snippet-list
new file mode 100644 (file)
index 0000000..a0795b5
--- /dev/null
+++ b/input/lsr/unfretted-strings.snippet-list
@@ -0,0 +1,3 @@
+string-quartet-template-simple.ly
+string-quartet-template-with-separate-parts.ly
+demo-midiinstruments.ly

diff --git a/input/new/letter-tablature-formatting.ly b/input/new/letter-tablature-formatting.ly
index 7cf604ff8fdb18f3dd8ce3ab3e43a25073429247..0fb7fd29bc61cab8aa793d9b9b8c28bc2cca56fa 100644 (file)
--- a/input/new/letter-tablature-formatting.ly
+++ b/input/new/letter-tablature-formatting.ly
@@ -1,7 +1,7 @@
 \version "2.11.35"
 
 \header {
-  lsrtags = "guitar"
+  lsrtags = "fretted-strings"
   texidoc = "
 You can format a tablature with letters instead of numbers - so that
 0->a, 1->b, 2->c, etc. 

diff --git a/input/new/piano-template-with-centered-dynamics.ly b/input/new/piano-template-with-centered-dynamics.ly
index d18c5b1cee35ac6551be7d902bdec29faab298c0..65c437c0db7aadca87bf8e3f4b62b48c770fcce3 100644 (file)
--- a/input/new/piano-template-with-centered-dynamics.ly
+++ b/input/new/piano-template-with-centered-dynamics.ly
@@ -1,7 +1,7 @@
 \version "2.11.35"
 
 \header {
-  lsrtags = "expressive-marks,piano-music,template"
+  lsrtags = "expressive-marks,keyboards,template"
   texidoc = "
 Many piano scores have the dynamics centered between the two staves.
 This requires a bit of tweaking to implement, but since the template is