LSR: update known snippets.

diff --git a/input/lsr/ancient/ancient-accidentals.ly b/input/lsr/ancient/ancient-accidentals.ly
index 6e6cd7a26d09718845c24aae699856b07a7cc86f..7f046dedc4dd5e6a9a2e757a363da4a479c63ebf 100644 (file)
--- a/input/lsr/ancient/ancient-accidentals.ly
+++ b/input/lsr/ancient/ancient-accidentals.ly
@@ -10,7 +10,7 @@ collected here.
 
 \relative c'' {
       \time 5/4
-      \override Staff.Accidental #'glyph-name-alist = #alteration-default-glyph-name-alist
+      \override Staff.Accidental #'glyph-name-alist = #standard-alteration-glyph-name-alist
       cisis^\markup { \typewriter default } cis c ces ceses 
       \override Staff.Accidental #'glyph-name-alist = #alteration-hufnagel-glyph-name-alist
       cisis^\markup { \typewriter hufnagel } cis c ces ceses 

diff --git a/input/lsr/contemporary/feathered-beams.ly b/input/lsr/contemporary/feathered-beams.ly
index 82e0dcbb2fcab0c00b5f26675f779fbf6dba6bba..cc3a4c71ac2b960d74f59dbe0d41685b5bae5524 100644 (file)
--- a/input/lsr/contemporary/feathered-beams.ly
+++ b/input/lsr/contemporary/feathered-beams.ly
@@ -4,17 +4,55 @@
 \header { texidoc = "
 Feathered beams can be obtained by setting the @code{#'grow-direction}
 property; you may also want to use @code{\featherDurations} to adjust
-note durations. (See also in tha manual : \"Feathered beams\")
+note durations. (See also in the manual : \"Feathered beams\")
 " }
 
-\paper {
-  ragged-right = ##t
-  indent = #0.0
+\score{
+\relative c''
+<<
+\new Staff {
+% Turn on feathered beams:
+\override Beam #'grow-direction = #LEFT
+
+% Illustration of feathered beams and the \featherDurations
+% function.
+
+
+% Example of a beamed sequence:
+bes32\p\>[ ges d' bes, c' ges a ges \!]
+
+% When the factor is 4/4=1, you get the same as without \featherDurations
+\featherDurations #(ly:make-moment  4 4)
+{ bes32\p\>[ ges d' bes, c' ges a ges \!] }
+
+% When the factor is >1, you get a ritardando-like placement of the
+% notes (and sound in the MIDI output).
+\featherDurations #(ly:make-moment  6 4)
+{ bes32\p\>[ ges d' bes, c' ges a ges \!] }
+
+% When the factor is <1, you get accelerando, i.e. you should
+% really only use if when \override Beam #'grow-direction = #RIGHT
+\featherDurations #(ly:make-moment  3 4)
+{ bes32\p\>[ ges d' bes, c' ges a ges \!] }
+
+% Revert back to ordinary beams:
+\revert Beam #'grow-direction
+bes32\p\>[ ges d' bes, c' ges a ges \!]
+
+% Get a single feathered beam, using \once \override:
+\once \override Beam #'grow-direction = #LEFT
+bes32\p\>[ ges d' bes, c' ges a ges \!]
+bes32\p\>[ ges d' bes, c' ges a ges \!]
+
+% The \featherDurations function just adjusts the durations
+% of the notes and can be used without % feathered beams:
+\featherDurations #(ly:make-moment  6 4)
+{ bes32\p\>[ ges d' bes, c' ges a ges \!] }
+
 }
 
-\featherDurations #(ly:make-moment 3 4) \relative c'' {
-  \override Beam #'grow-direction = #LEFT
-  c16[
-    c c c
-    c c c c ] 
+% Reference rhythm to compare to:
+\new Staff \repeat unfold 64 { c32 }
+ >>
 }
+

diff --git a/input/lsr/contemporary/time-signatures-on-top-of-the-score-using-a-separate-staff.ly b/input/lsr/contemporary/time-signatures-on-top-of-the-score-using-a-separate-staff.ly
index 03e7e92a8b3eb57c60f09a1c0e9099830f97d298..616c959cfb7d5383a9f3246d01af15fe38d01b3d 100644 (file)
--- a/input/lsr/contemporary/time-signatures-on-top-of-the-score-using-a-separate-staff.ly
+++ b/input/lsr/contemporary/time-signatures-on-top-of-the-score-using-a-separate-staff.ly
@@ -2,31 +2,37 @@
 \version "2.11.23"
 
 \header { texidoc = "
-in XXth century music, where time signatures tend to change a lot, it
+In XXth century music, where time signatures tend to change a lot, it
 is sometimes recommended to put the time signatures on top of the score
 (or above each StaffGroup in case of an orchestral score). This can be
 achieved by creating a dummy staff which only contains the
-Time-signature-engraver). In this specific example, I've used a
-separate identifier to define every time signature change, which allows
-me to not bother entering them again when typing the actual music
-(careful though: it makes getting lost easier!).
+Time-signature-engraver). In this specific example, a separate
+identifier is used to define every time signature change, which allows
+not to bother entering them again when typing the actual music (careful
+though: it makes getting lost easier!).
+
+Notice the overriding of the X-offset property: a specific trick to
+make the time signatures aligned with the barlines, thanks to Han-Wen.
 " }
 
 \layout{
-  \context { 
-    \type "Engraver_group"
-    \consists "Time_signature_engraver"
-    \consists "Axis_group_engraver"
-    \name "TimeSig"
-    \override TimeSignature #'extra-offset = #'(-2.2 . 0.0 )
-    \override TimeSignature #'font-size = #3
-  }
+ \context {
+   \type "Engraver_group"
+   \consists "Time_signature_engraver"
+   \consists "Axis_group_engraver"
+   \name "TimeSig"
+   \override TimeSignature #'font-size = #3
+   \override TimeSignature #'break-align-symbol = ##f
+   \override TimeSignature #'X-offset
+   = #ly:self-alignment-interface::x-aligned-on-self
+   \override TimeSignature #'self-alignment-X = #0
+ }
   \context {
     \Score \accepts TimeSig
   }
 
   \context { \Staff
-    \override TimeSignature #'transparent = ##t
+    \remove "Time_signature_engraver"
   }
 }
 

diff --git a/input/lsr/staff/aligning-instrument-names.ly b/input/lsr/staff/aligning-instrument-names.ly
deleted file mode 100644 (file)
index fad0e45..0000000
--- a/input/lsr/staff/aligning-instrument-names.ly
+++ /dev/null
@@ -1,21 +0,0 @@
-%%  Do not edit this file; it is auto-generated from LSR!
-\version "2.11.23"
-
-\header { texidoc = "
-Instrument names can be displayed using a \markup command; in this case
-the name is placed inside a padded box, which can help vertical
-alignment.
-" }
-
-\new StaffGroup \relative
-<<
-  \new Staff {
-    \set Staff.instrumentName = \markup { \hcenter-in #10 "blabla" }
-    c1 c1
-  } 
-  \new Staff {
-    \set Staff.instrumentName = \markup { \hcenter-in #10 "blo" }
-    c1 c1
-  } 
-  
->>