MakeLSR run with LSR tarball

diff --git a/Documentation/snippets/adding-drum-parts.ly b/Documentation/snippets/adding-drum-parts.ly
index a0b3264d0fabb7aa8a06f14c827fd2c3dd3d865e..eff1c44caa671996e014256f959e0b87ca15590f 100644 (file)
--- a/Documentation/snippets/adding-drum-parts.ly
+++ b/Documentation/snippets/adding-drum-parts.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.0"
 
 \header {
   lsrtags = "percussion, preparing-parts, really-simple, rhythms, specific-notation"

diff --git a/Documentation/snippets/arabic-improvisation.ly b/Documentation/snippets/arabic-improvisation.ly
index b4354ab71777172f42e269fab21d6275b31634bb..7427da160fd7ba918c66969fccc03f8870517b62 100644 (file)
--- a/Documentation/snippets/arabic-improvisation.ly
+++ b/Documentation/snippets/arabic-improvisation.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.0"
 
 \header {
   lsrtags = "world-music"

diff --git a/Documentation/snippets/center-text-below-hairpin-dynamics.ly b/Documentation/snippets/center-text-below-hairpin-dynamics.ly
index 4f2eb369260787696decd0d6ee9f53c3e4c1ea79..edf4c835fa584a7ac120f22950bb752be0b41502 100644 (file)
--- a/Documentation/snippets/center-text-below-hairpin-dynamics.ly
+++ b/Documentation/snippets/center-text-below-hairpin-dynamics.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.0"
 
 \header {
   lsrtags = "expressive-marks, really-cool, scheme-language, text"
@@ -12,28 +12,51 @@
   texidoc = "
 This example provides a function to typeset a hairpin (de)crescendo
 with some additional text below it, such as @qq{molto} or @qq{poco}.
-The example also illustrates how to modify the way an object is
-normally printed, using some Scheme code.
+The added text will change the direction according to the direction of
+the hairpin. The Hairpin is aligned to DynamicText.  The example also
+illustrates how to modify the way an object is normally printed, using
+some Scheme code.
 
 "
   doctitle = "Center text below hairpin dynamics"
 } % begin verbatim
 
-
 hairpinWithCenteredText =
 #(define-music-function (parser location text) (markup?)
 #{
-  \override Voice.Hairpin #'stencil = #(lambda (grob)
-    (ly:stencil-aligned-to
-     (ly:stencil-combine-at-edge
-      (ly:stencil-aligned-to (ly:hairpin::print grob) X CENTER)
-      Y DOWN
-      (ly:stencil-aligned-to (grob-interpret-markup grob text) X CENTER))
-     X LEFT))
+  \once \override Voice.Hairpin #'after-line-breaking =
+    #(lambda (grob)
+      (let* ((stencil (ly:hairpin::print grob))
+             (par-y (ly:grob-parent grob Y))
+             (dir (ly:grob-property par-y 'direction))
+             (new-stencil (ly:stencil-aligned-to
+                  (ly:stencil-combine-at-edge
+                    (ly:stencil-aligned-to stencil X CENTER)
+                    Y dir
+                    (ly:stencil-aligned-to (grob-interpret-markup grob text) X CENTER))
+                    X LEFT))
+             (staff-space (ly:output-def-lookup (ly:grob-layout grob) 'staff-space))
+             (staff-line-thickness (ly:output-def-lookup (ly:grob-layout grob) 'line-thickness))
+             (grob-name (lambda (x) (assq-ref (ly:grob-property x 'meta) 'name)))
+             (par-x (ly:grob-parent grob X))
+             (dyn-text (eq? (grob-name par-x) 'DynamicText ))
+             (dyn-text-stencil-x-length (if dyn-text
+                                           (interval-length (ly:stencil-extent (ly:grob-property par-x 'stencil) X))
+                                           0))
+             (x-shift (if dyn-text (- (+ staff-space dyn-text-stencil-x-length) (* 0.5 staff-line-thickness)) 0)))
+
+      (ly:grob-set-property! grob 'Y-offset 0)
+      (ly:grob-set-property! grob 'stencil
+         (ly:stencil-translate-axis
+          new-stencil
+          x-shift X))))
 #})
 
-hairpinMolto = \hairpinWithCenteredText \markup { \italic molto }
-hairpinMore = \hairpinWithCenteredText \markup { \larger moltissimo }
+hairpinMolto =
+\hairpinWithCenteredText \markup { \italic molto }
+
+hairpinMore =
+\hairpinWithCenteredText \markup { \larger moltissimo }
 
 \layout { ragged-right = ##f }
 
@@ -41,5 +64,10 @@ hairpinMore = \hairpinWithCenteredText \markup { \larger moltissimo }
   \hairpinMolto
   c2\< c\f
   \hairpinMore
-  c2\< c\f
+  c2\ppppp\< c\f
+  \break
+  \hairpinMolto
+  c2^\< c\f
+  \hairpinMore
+  c2\ppppp\< c\f
 }

diff --git a/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly b/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly
index aded2070cb32726066a534e4bed17bde00ecdd19..7afdeeeff80b2f1cc887341e211e06546e0cafe6 100644 (file)
--- a/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly
+++ b/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.0"
 
 \header {
   lsrtags = "contexts-and-engravers, midi, real-music"

diff --git a/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly b/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly
index 6045697b5a527a874d18576de89ed6402250231c..36a93e92c8bdd7121cfa715c7cd4ba7b6cdc8cc2 100644 (file)
--- a/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly
+++ b/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.0"
 
 \header {
   lsrtags = "fretted-strings"

diff --git a/Documentation/snippets/displaying-complex-chords.ly b/Documentation/snippets/displaying-complex-chords.ly
index 160093aac7ef987f032ae60ea36a7f36687149c6..d30bb52bcda5d0c77aa69f1200cdeb77872b47f8 100644 (file)
--- a/Documentation/snippets/displaying-complex-chords.ly
+++ b/Documentation/snippets/displaying-complex-chords.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.0"
 
 \header {
   lsrtags = "chords, simultaneous-notes, workaround"

diff --git a/Documentation/snippets/drawing-boxes-around-grobs.ly b/Documentation/snippets/drawing-boxes-around-grobs.ly
index 2bddbf518c6a6db061623dae6a5bf8107cc94ee6..38613fa15ee2ce2777b34ae90b38a4df791ba484 100644 (file)
--- a/Documentation/snippets/drawing-boxes-around-grobs.ly
+++ b/Documentation/snippets/drawing-boxes-around-grobs.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.0"
 
 \header {
   lsrtags = "editorial-annotations, scheme-language, tweaks-and-overrides"

diff --git a/Documentation/snippets/generating-random-notes.ly b/Documentation/snippets/generating-random-notes.ly
index 20930095215a9475a31f10e030e6c04c7c0a3a15..bea3ff4fa60482d1eb0827276751de7e15953179 100644 (file)
--- a/Documentation/snippets/generating-random-notes.ly
+++ b/Documentation/snippets/generating-random-notes.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.0"
 
 \header {
   lsrtags = "pitches, really-cool, scheme-language"

diff --git a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
index e85878da1e779f43c8db4b29eb7e1785a014ce22..795a27de58f43f48116a3e68bf9d999c18354955 100644 (file)
--- a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
+++ b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.0"
 
 \header {
   lsrtags = "contemporary-notation, percussion, real-music, rhythms"

diff --git a/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-2.ly b/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-2.ly
index 80a56e227e5338159355ea7a6899813163eb1696..8abdbaa318a320bec17b7b9dbdb24701bd382d4c 100644 (file)
--- a/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-2.ly
+++ b/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-2.ly
@@ -30,7 +30,7 @@ independently of the other.
     \new Staff {
       <<
         \new Voice \with {
-          \consists "Mark_engraver"
+          \consists Mark_engraver
           \consists "Staff_collecting_engraver"
         }
         { c4 d e f
@@ -38,7 +38,7 @@ independently of the other.
           c4 d e f
         }
         \new Voice \with {
-          \consists "Mark_engraver"
+          \consists Mark_engraver
           \consists "Staff_collecting_engraver"
           \override RehearsalMark #'direction = #DOWN
         }

diff --git a/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly b/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
index 8618782bb1a296ff002e237d947f487418d0abfd..b91c71b072c4db029e0981493fe8ce437fa8aaf8 100644 (file)
--- a/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
+++ b/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.0"
 
 \header {
   lsrtags = "contemporary-notation, editorial-annotations, vocal-music, workaround"

diff --git a/Documentation/snippets/markup-lines.ly b/Documentation/snippets/markup-lines.ly
index 474f13f19de5fc2dd782109b2a151e8864a3f663..46455f148e3f71b53a94f076dece0a29b4fad5ee 100644 (file)
--- a/Documentation/snippets/markup-lines.ly
+++ b/Documentation/snippets/markup-lines.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.0"
 
 \header {
   lsrtags = "text"

diff --git a/Documentation/snippets/recorder-fingering-chart.ly b/Documentation/snippets/recorder-fingering-chart.ly
index dbe8cfa9d03a66bbed481b1127046586207e621c..bdf56928161fee48264eb8fd134dcf5ec1555164 100644 (file)
--- a/Documentation/snippets/recorder-fingering-chart.ly
+++ b/Documentation/snippets/recorder-fingering-chart.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.0"
 
 \header {
   lsrtags = "winds"

diff --git a/Documentation/snippets/screech-and-boink.ly b/Documentation/snippets/screech-and-boink.ly
index 2bb83f323928c65727b3824a289536630241cf3e..107c4fd7715205f406d2599c612dfab36f310bba 100644 (file)
--- a/Documentation/snippets/screech-and-boink.ly
+++ b/Documentation/snippets/screech-and-boink.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.0"
 
 \header {
   lsrtags = "headword"

diff --git a/Documentation/snippets/slides-in-tablature.ly b/Documentation/snippets/slides-in-tablature.ly
index 970380d2f309713380c3f6404ddd733fa5581795..46b6e6a4169fe27723d066c72034d9689ece0529 100644 (file)
--- a/Documentation/snippets/slides-in-tablature.ly
+++ b/Documentation/snippets/slides-in-tablature.ly
@@ -21,12 +21,12 @@ slides = {
   c'8\3(\glissando d'8\3)
   c'8\3\glissando d'8\3
   \hideNotes
-  \grace { g16\3\glissando }
+  \grace { g16\glissando }
   \unHideNotes
   c'4\3
   \afterGrace d'4\3\glissando {
   \stemDown \hideNotes
-  g16\3 }
+  g16 }
   \unHideNotes
 }
 

diff --git a/Documentation/snippets/table-of-contents.ly b/Documentation/snippets/table-of-contents.ly
index 51542ae679fa62282d403480beece1ee80f85efb..ea6bf4b60964c0d992a8b4b6c017a1b11c7026d2 100644 (file)
--- a/Documentation/snippets/table-of-contents.ly
+++ b/Documentation/snippets/table-of-contents.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.0"
 
 \header {
   lsrtags = "paper-and-layout"

diff --git a/Documentation/snippets/tweaking-grace-layout-within-music.ly b/Documentation/snippets/tweaking-grace-layout-within-music.ly
index 2afa28fc4df7324e57230f2e6351419ed18ca73c..089c99cde3848cfbea142b44387ef620116ad25b 100644 (file)
--- a/Documentation/snippets/tweaking-grace-layout-within-music.ly
+++ b/Documentation/snippets/tweaking-grace-layout-within-music.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.0"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"

diff --git a/Documentation/snippets/unfretted-headword.ly b/Documentation/snippets/unfretted-headword.ly
index 17ec6b723e2644e2a85a7b261a92f529d47e2fe1..eb7d328427306738c3878826a8fba98aa7f288bc 100644 (file)
--- a/Documentation/snippets/unfretted-headword.ly
+++ b/Documentation/snippets/unfretted-headword.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.0"
 
 \header {
   lsrtags = "headword"