From 1918b153642d06954a8ea7bb7a1d40ce28abb1fe Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Wed, 16 Apr 2008 09:45:49 +0200 Subject: [PATCH] Rename LSR tags --- buildscripts/add_html_footer.py | 2 +- buildscripts/makelsr.py | 5 +++-- input/lsr/fretted-strings-intro.itely | 5 +++++ ...snippet-list => fretted-strings.snippet-list} | 0 input/lsr/guitar-intro.itely | 5 ----- input/lsr/keyboards-intro.itely | 5 +++++ ...music.snippet-list => keyboards.snippet-list} | 0 input/lsr/lilypond-snippets.tely | 16 +++++++--------- input/lsr/piano-music-intro.itely | 5 ----- input/lsr/strings-intro.itely | 5 ----- input/lsr/unfretted-strings-intro.itely | 5 +++++ ...ippet-list => unfretted-strings.snippet-list} | 0 input/new/letter-tablature-formatting.ly | 2 +- .../new/piano-template-with-centered-dynamics.ly | 2 +- 14 files changed, 28 insertions(+), 29 deletions(-) create mode 100644 input/lsr/fretted-strings-intro.itely rename input/lsr/{guitar.snippet-list => fretted-strings.snippet-list} (100%) delete mode 100644 input/lsr/guitar-intro.itely create mode 100644 input/lsr/keyboards-intro.itely rename input/lsr/{piano-music.snippet-list => keyboards.snippet-list} (100%) delete mode 100644 input/lsr/piano-music-intro.itely delete mode 100644 input/lsr/strings-intro.itely create mode 100644 input/lsr/unfretted-strings-intro.itely rename input/lsr/{strings.snippet-list => unfretted-strings.snippet-list} (100%) diff --git a/buildscripts/add_html_footer.py b/buildscripts/add_html_footer.py index 47589baeea..bd7d8409ce 100644 --- 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 f3f91a0c02..e4bfd2a0a6 100755 --- 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 index 0000000000..bb149c1e2d --- /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/guitar.snippet-list b/input/lsr/fretted-strings.snippet-list similarity index 100% rename from input/lsr/guitar.snippet-list rename to input/lsr/fretted-strings.snippet-list diff --git a/input/lsr/guitar-intro.itely b/input/lsr/guitar-intro.itely deleted file mode 100644 index 931ad7a54e..0000000000 --- a/input/lsr/guitar-intro.itely +++ /dev/null @@ -1,5 +0,0 @@ -@node Guitar -@unnumbered Guitar - -@lysnippets - diff --git a/input/lsr/keyboards-intro.itely b/input/lsr/keyboards-intro.itely new file mode 100644 index 0000000000..35b849e79c --- /dev/null +++ b/input/lsr/keyboards-intro.itely @@ -0,0 +1,5 @@ +@node Keyboards +@unnumbered Keyboards + +@lysnippets + diff --git a/input/lsr/piano-music.snippet-list b/input/lsr/keyboards.snippet-list similarity index 100% rename from input/lsr/piano-music.snippet-list rename to input/lsr/keyboards.snippet-list diff --git a/input/lsr/lilypond-snippets.tely b/input/lsr/lilypond-snippets.tely index 3b8879366e..98d5eb1da1 100644 --- 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 index 3cd0e85431..0000000000 --- a/input/lsr/piano-music-intro.itely +++ /dev/null @@ -1,5 +0,0 @@ -@node Piano -@unnumbered Piano - -@lysnippets - diff --git a/input/lsr/strings-intro.itely b/input/lsr/strings-intro.itely deleted file mode 100644 index 316fef7cb6..0000000000 --- a/input/lsr/strings-intro.itely +++ /dev/null @@ -1,5 +0,0 @@ -@node Strings -@unnumbered Strings - -@lysnippets - diff --git a/input/lsr/unfretted-strings-intro.itely b/input/lsr/unfretted-strings-intro.itely new file mode 100644 index 0000000000..f5f5966e6e --- /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/strings.snippet-list b/input/lsr/unfretted-strings.snippet-list similarity index 100% rename from input/lsr/strings.snippet-list rename to input/lsr/unfretted-strings.snippet-list diff --git a/input/new/letter-tablature-formatting.ly b/input/new/letter-tablature-formatting.ly index 7cf604ff8f..0fb7fd29bc 100644 --- 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 d18c5b1cee..65c437c0db 100644 --- 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 -- 2.39.5