From 7a2c734d887a45e1cfb3ef4bbc67d1f5643d17f9 Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Sun, 27 Apr 2008 20:16:17 -0700
Subject: [PATCH] LSR: udpate

---
 ...hen-using-tuplet-and-non-tuplet-rythms..ly |  1 +
 ...ngerings-to-be-printed-inside-the-staff.ly |  2 +-
 .../altering-the-number-of-stems-in-a-beam.ly | 27 -----------------
 ...yles-depending-on-the-step-of-the-scale.ly |  2 +-
 ...staff-lines-using-the--whiteout-command.ly |  2 +-
 .../lsr/center-text-below-hairpin-dynamics.ly |  2 ++
 input/lsr/changing--flageolet-mark-size.ly    |  4 ++-
 ...changing-a-single-notes-size-in-a-chord.ly |  2 +-
 ...f-a-slur-from-solid-to-dotted-or-dashed.ly | 10 ++-----
 input/lsr/compound-time-signatures.ly         |  9 +++---
 ...lling-the-placement-of-chord-fingerings.ly |  2 +-
 input/lsr/creating-blank-staves.ly            |  2 +-
 ...f-stems-on-the-center-line-of-the-staff.ly |  2 +-
 input/lsr/demo-midiinstruments.ly             |  2 +-
 ...ng-native-postscript-in-a--markup-block.ly |  2 +-
 input/lsr/expressive-marks.snippet-list       |  1 +
 .../grid-lines-changing-their-appearance.ly   |  2 +-
 ...izing-rhythms-and-notes-synchronization.ly |  2 +-
 ...ore-fragments-above-a-staff,-as-markups.ly |  2 ++
 ...ome-staff-lines-thicker-than-the-others.ly |  2 +-
 ...ome-and-rehearsal-marks-below-the-staff.ly | 29 +++++++++++++++++++
 input/lsr/rhythms.snippet-list                |  2 +-
 input/lsr/staff-notation.snippet-list         |  1 +
 input/lsr/string-quartet-template-simple.ly   |  2 +-
 ...ng-quartet-template-with-separate-parts.ly |  2 +-
 input/lsr/three-sided-box.ly                  |  2 ++
 input/lsr/tweaks-and-overrides.snippet-list   |  2 +-
 input/lsr/unfretted-strings.snippet-list      |  5 +++-
 28 files changed, 67 insertions(+), 58 deletions(-)
 delete mode 100644 input/lsr/altering-the-number-of-stems-in-a-beam.ly
 create mode 100644 input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly

diff --git a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
index e73c44cac0..5c6dbf3fdf 100644
--- a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
+++ b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
@@ -23,5 +23,6 @@ sections (enclosed within curly braces).
   r16[ g16 \times 2/3 { r16 e'8] }
   g16( a \times 2/3 { b d e') }
   g8[( a \times 2/3 { b d') e']~ }
+  \time 2/4
   \times 4/5 { e'32\( a b d' e' } a'4.\)
 }
diff --git a/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly b/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly
index 1591e86ae3..b0997d3f8c 100644
--- a/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly
+++ b/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "editorial-and-educational-use, spacing"
+  lsrtags = "editorial-annotations, spacing"
 
   texidoc = "
 By default, fingering numbers will be printed outside the staff.
diff --git a/input/lsr/altering-the-number-of-stems-in-a-beam.ly b/input/lsr/altering-the-number-of-stems-in-a-beam.ly
deleted file mode 100644
index a1caa7f1f5..0000000000
--- a/input/lsr/altering-the-number-of-stems-in-a-beam.ly
+++ /dev/null
@@ -1,27 +0,0 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.11.38"
-
-\header {
-  lsrtags = "rhythms, tweaks-and-overrides"
-
-  texidoc = "
-You can alter the number of stems in a beam. In this example, two sets
-of four 32nds are joined, as if they were 8th notes.
-
-
-
-
-"
-  doctitle = "Altering the number of stems in a beam"
-} % begin verbatim
-\relative {
-  #(override-auto-beam-setting '(end * * * *)  1 4)
-  f32 g a b b a g f
-
-  f32 g a
-  \set stemRightBeamCount = #1 b
-  \set stemLeftBeamCount = #1 b
-  a g f
-}
-
diff --git a/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly b/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
index 245baaab77..03aa44276a 100644
--- a/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
+++ b/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "pitches, editorial-and-educational-use"
+  lsrtags = "pitches, editorial-annotations"
 
   texidoc = "
 The @code{shapeNoteStyles} property can be used to define various note
diff --git a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly
index 097ea080db..d438c66003 100644
--- a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly
+++ b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "editorial-and-educational-use, text"
+  lsrtags = "editorial-annotations, text"
 
   texidoc = "
 The @code{\\whiteout} command underlays a white box under a markup.
diff --git a/input/lsr/center-text-below-hairpin-dynamics.ly b/input/lsr/center-text-below-hairpin-dynamics.ly
index 99495e22a9..5c5fd44d86 100644
--- a/input/lsr/center-text-below-hairpin-dynamics.ly
+++ b/input/lsr/center-text-below-hairpin-dynamics.ly
@@ -29,6 +29,8 @@ hairpinWithCenteredText = #(define-music-function (parser location text) (markup
 hairpinMolto = \hairpinWithCenteredText \markup { \italic "molto" }
 hairpinMore = \hairpinWithCenteredText \markup { \bigger "moltissimo" }
 
+\layout { ragged-right = ##f }
+
 {
   \hairpinMolto c'2\< c'2\f
   \hairpinMore  c'2\< c'2\f
diff --git a/input/lsr/changing--flageolet-mark-size.ly b/input/lsr/changing--flageolet-mark-size.ly
index 179f87fcc8..93a63b36d1 100644
--- a/input/lsr/changing--flageolet-mark-size.ly
+++ b/input/lsr/changing--flageolet-mark-size.ly
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "expressive-marks"
+  lsrtags = "expressive-marks, unfretted-strings"
 
   texidoc = "
 To make the @code{\\flageolet} circle smaller use the following Scheme
@@ -19,6 +19,8 @@ smallFlageolet = #(let ((m (make-music 'ArticulationEvent
                     (ly:music-property m 'tweaks)))
        m)
 
+\layout { ragged-right = ##f }
+
 \relative c'' {
   d4^\flageolet_\markup { default size } d4_\flageolet
   c4^\smallFlageolet_\markup { smaller } c4_\smallFlageolet
diff --git a/input/lsr/changing-a-single-notes-size-in-a-chord.ly b/input/lsr/changing-a-single-notes-size-in-a-chord.ly
index 50535f13c0..e33bc406a7 100644
--- a/input/lsr/changing-a-single-notes-size-in-a-chord.ly
+++ b/input/lsr/changing-a-single-notes-size-in-a-chord.ly
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "simultaneous-notes, editorial-and-educational-use, tweaks-and-overrides"
+  lsrtags = "simultaneous-notes, editorial-annotations, tweaks-and-overrides"
 
   texidoc = "
 Individual note heads in a chord can be modified with the
diff --git a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
index 3111bd7981..f35de5224a 100644
--- a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
+++ b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
@@ -3,12 +3,10 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "expressive-marks, editorial-and-educational-use"
+  lsrtags = "expressive-marks, editorial-annotations"
 
   texidoc = "
-The appearance of slurs may be changed from solid to dotted or dashed.
-
-
+The appearance of slurs may be changed from solid to dotted or dashed. 
 
 "
   doctitle = "Changing the appearance of a slur from solid to dotted or dashed"
@@ -25,7 +23,3 @@ The appearance of slurs may be changed from solid to dotted or dashed.
   c( d e  c) |
 }
 
-
-
-
-
diff --git a/input/lsr/compound-time-signatures.ly b/input/lsr/compound-time-signatures.ly
index 3a2a3d4963..b94107506e 100644
--- a/input/lsr/compound-time-signatures.ly
+++ b/input/lsr/compound-time-signatures.ly
@@ -22,13 +22,12 @@ database.)
    (#:line ((#:column (one num)) #:vcenter "+" (#:column (two num))))
   ))
 
-\relative {
-  % compound time signature hack
+\relative {  
   \override Staff.TimeSignature #'stencil = #ly:text-interface::print
-  \override Staff.TimeSignature #'text = #( compound-time "2" "3" "8" )
+  \override Staff.TimeSignature #'text = #(compound-time "2" "3" "8")
   \time 5/8
   #(override-auto-beam-setting '(end 1 8 5 8) 1 4)
-  c8 d e fis gis |
-  c fis, gis e d |
+  c8 d e fis gis
+  c fis, gis e d
   c8 d e4 gis8
 }
diff --git a/input/lsr/controlling-the-placement-of-chord-fingerings.ly b/input/lsr/controlling-the-placement-of-chord-fingerings.ly
index e3875b3004..077ee0a5c4 100644
--- a/input/lsr/controlling-the-placement-of-chord-fingerings.ly
+++ b/input/lsr/controlling-the-placement-of-chord-fingerings.ly
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "editorial-and-educational-use, chords"
+  lsrtags = "editorial-annotations, chords"
 
   texidoc = "
 The placement of fingering numbers can be controlled precisely.
diff --git a/input/lsr/creating-blank-staves.ly b/input/lsr/creating-blank-staves.ly
index 4e32db01fc..c45f9ac423 100644
--- a/input/lsr/creating-blank-staves.ly
+++ b/input/lsr/creating-blank-staves.ly
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "staff-notation, editorial-and-educational-use, contexts-and-engravers, paper-and-layout"
+  lsrtags = "staff-notation, editorial-annotations, contexts-and-engravers, paper-and-layout"
 
   texidoc = "
 To create blank staves, generate empty measures then remove the
diff --git a/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly b/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly
index 7c6673264f..f3a270281f 100644
--- a/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly
+++ b/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "editorial-and-educational-use"
+  lsrtags = "editorial-annotations"
 
   texidoc = "
 The default direction of stems on the center line of the staff is set
diff --git a/input/lsr/demo-midiinstruments.ly b/input/lsr/demo-midiinstruments.ly
index bc0f57e1d0..c7384495d7 100644
--- a/input/lsr/demo-midiinstruments.ly
+++ b/input/lsr/demo-midiinstruments.ly
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "vocal-music, midi"
+  lsrtags = "vocal-music, unfretted-strings, midi"
 
   texidoc = "
 Problem: How to know which @code{midiInstrument} would be best for your
diff --git a/input/lsr/embedding-native-postscript-in-a--markup-block.ly b/input/lsr/embedding-native-postscript-in-a--markup-block.ly
index c6bb8a8015..baef1614d9 100644
--- a/input/lsr/embedding-native-postscript-in-a--markup-block.ly
+++ b/input/lsr/embedding-native-postscript-in-a--markup-block.ly
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "editorial-and-educational-use, text"
+  lsrtags = "editorial-annotations, text"
 
   texidoc = "
 PostScript code can be directly inserted inside a @code{\\markup}
diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list
index ea288f41e9..ee4a738ab0 100644
--- a/input/lsr/expressive-marks.snippet-list
+++ b/input/lsr/expressive-marks.snippet-list
@@ -3,6 +3,7 @@ creating-text-spanners.ly
 adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
 changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
 caesura-railtracks-with-fermata.ly
+printing-metronome-and-rehearsal-marks-below-the-staff.ly
 creating-real-parenthesized-dynamics.ly
 center-text-below-hairpin-dynamics.ly
 contemporary-glissando.ly
diff --git a/input/lsr/grid-lines-changing-their-appearance.ly b/input/lsr/grid-lines-changing-their-appearance.ly
index 238fc5788f..d2534d9e0f 100644
--- a/input/lsr/grid-lines-changing-their-appearance.ly
+++ b/input/lsr/grid-lines-changing-their-appearance.ly
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "editorial-and-educational-use"
+  lsrtags = "editorial-annotations"
 
   texidoc = "
 The appearance of grid lines can be changed by overriding some of their
diff --git a/input/lsr/grid-lines-emphasizing-rhythms-and-notes-synchronization.ly b/input/lsr/grid-lines-emphasizing-rhythms-and-notes-synchronization.ly
index 6312e01b59..66bb52fa61 100644
--- a/input/lsr/grid-lines-emphasizing-rhythms-and-notes-synchronization.ly
+++ b/input/lsr/grid-lines-emphasizing-rhythms-and-notes-synchronization.ly
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "editorial-and-educational-use"
+  lsrtags = "editorial-annotations"
 
   texidoc = "
 Regular vertical lines can be drawn between staves to show notes
diff --git a/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly b/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly
index 8452feae99..920cc52bff 100644
--- a/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly
+++ b/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly
@@ -28,6 +28,8 @@ tuning = \markup {
   subsubtitle = \markup { "Originalstimmung:" \general-align #Y #CENTER \tuning }
 }
 
+\layout { ragged-right = ##f }
+
 \relative {
   \time 4/8
   \times 2/3 { c'8 d e } \times 2/3 { c d e }
diff --git a/input/lsr/making-some-staff-lines-thicker-than-the-others.ly b/input/lsr/making-some-staff-lines-thicker-than-the-others.ly
index 9499426cd3..08ebd76848 100644
--- a/input/lsr/making-some-staff-lines-thicker-than-the-others.ly
+++ b/input/lsr/making-some-staff-lines-thicker-than-the-others.ly
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "staff-notation, editorial-and-educational-use"
+  lsrtags = "staff-notation, editorial-annotations"
 
   texidoc = "
 For pedagogical purposes, you may want to make one staff line thicker
diff --git a/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly b/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly
new file mode 100644
index 0000000000..db7520eabb
--- /dev/null
+++ b/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly
@@ -0,0 +1,29 @@
+%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% This file is in the public domain.
+\version "2.11.38"
+
+\header {
+  lsrtags = "rhythms, expressive-marks, staff-notation, tweaks-and-overrides"
+
+  texidoc = "
+By default, metronome and rehearsal marks are printed above the staff.
+If you would like to have them below the staff, simply set the
+'side-axis and 'direction properties of MetronomeMark or RehearsalMark
+appropriately.
+
+"
+  doctitle = "Printing metronome and rehearsal marks below the staff"
+} % begin verbatim
+{
+  % Metronome marks below the staff
+
+  \override Score.MetronomeMark #'side-axis = #Y
+  \override Score.MetronomeMark #'direction = #DOWN
+  \tempo 8.=120 c''1
+
+  % Rehearsal marks below the staff
+
+  \override Score.RehearsalMark #'side-axis = #Y
+  \override Score.RehearsalMark #'direction = #DOWN
+  \mark\default c''1
+}
diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list
index d4459ca3c4..4305d06024 100644
--- a/input/lsr/rhythms.snippet-list
+++ b/input/lsr/rhythms.snippet-list
@@ -11,8 +11,8 @@ positioning-multi--measure-rests.ly
 using-ties-with-arpeggios.ly
 forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
 compound-time-signatures.ly
-altering-the-number-of-stems-in-a-beam.ly
 modifying-tuplet-bracket-length.ly
+printing-metronome-and-rehearsal-marks-below-the-staff.ly
 changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly
 making-an-object-invisible-with-the-transparent-property.ly
 automatic-beam-subdivisions.ly
diff --git a/input/lsr/staff-notation.snippet-list b/input/lsr/staff-notation.snippet-list
index e6594271f7..4c4ac2dc4b 100644
--- a/input/lsr/staff-notation.snippet-list
+++ b/input/lsr/staff-notation.snippet-list
@@ -6,6 +6,7 @@ changing-the-number-of-lines-in-a-staff.ly
 adding-an-extra-staff-at-a-line-break.ly
 display-bracket-with-only-one-staff-in-a-system.ly
 time-signature-in-parentheses.ly
+printing-metronome-and-rehearsal-marks-below-the-staff.ly
 tweaking-clef-properties.ly
 adding-an-extra-staff.ly
 changing-the-staff-size.ly
diff --git a/input/lsr/string-quartet-template-simple.ly b/input/lsr/string-quartet-template-simple.ly
index caa7ce9eee..eb338b8416 100644
--- a/input/lsr/string-quartet-template-simple.ly
+++ b/input/lsr/string-quartet-template-simple.ly
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "template"
+  lsrtags = "unfretted-strings, template"
 
   texidoc = "
 This template demonstrates a simple string quartet. It also uses a
diff --git a/input/lsr/string-quartet-template-with-separate-parts.ly b/input/lsr/string-quartet-template-with-separate-parts.ly
index 70dba3f784..c9c7ee500c 100644
--- a/input/lsr/string-quartet-template-with-separate-parts.ly
+++ b/input/lsr/string-quartet-template-with-separate-parts.ly
@@ -3,7 +3,7 @@
 \version "2.11.38"
 
 \header {
-  lsrtags = "template"
+  lsrtags = "unfretted-strings, template"
 
   texidoc = "
 The \"String quartet template\" snippet produces a nice string quartet,
diff --git a/input/lsr/three-sided-box.ly b/input/lsr/three-sided-box.ly
index 3be893fcd6..e9fb519f83 100644
--- a/input/lsr/three-sided-box.ly
+++ b/input/lsr/three-sided-box.ly
@@ -45,6 +45,8 @@ thickness and padding around the markup."
 
 % Test it:
 
+\layout { ragged-right = ##f }
+
 \relative c' { 
   c2^\markup { \NWS-box ABCD }
   c^\markup { \NWS-box \note #"4" #1.0 } 
diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list
index b612a39483..cb7a4e8390 100644
--- a/input/lsr/tweaks-and-overrides.snippet-list
+++ b/input/lsr/tweaks-and-overrides.snippet-list
@@ -12,8 +12,8 @@ positioning-multi--measure-rests.ly
 changing-the-staff-size.ly
 vertically-aligning-ossias-and-lyrics.ly
 changing-properties-for-individual-grobs.ly
-altering-the-number-of-stems-in-a-beam.ly
 mensurstriche-layout-bar-lines-between-the-staves.ly
+printing-metronome-and-rehearsal-marks-below-the-staff.ly
 tweaking-clef-properties.ly
 vertically-centered-dynamics-and-textscripts.ly
 proportional-strict-notespacing.ly
diff --git a/input/lsr/unfretted-strings.snippet-list b/input/lsr/unfretted-strings.snippet-list
index 24e2ae9f58..bfcf6a78dc 100644
--- a/input/lsr/unfretted-strings.snippet-list
+++ b/input/lsr/unfretted-strings.snippet-list
@@ -1 +1,4 @@
-rhythmic-slashes.ly
+string-quartet-template-simple.ly
+changing--flageolet-mark-size.ly
+string-quartet-template-with-separate-parts.ly
+demo-midiinstruments.ly
-- 
2.39.5