Doc: LSR update

diff --git a/Documentation/snippets/accordion-discant-symbols.ly b/Documentation/snippets/accordion-discant-symbols.ly
index 096d76dd127769f55d7d5c8dda127e2880b20952..b3a92fb486eed4ac629ada7d4e39d205032a5b78 100644 (file)
--- a/Documentation/snippets/accordion-discant-symbols.ly
+++ b/Documentation/snippets/accordion-discant-symbols.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.2"
 
 \header {
   lsrtags = "keyboards"

diff --git a/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly b/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
index 9280c01b442d53ea6678fb05f43985429d667da3..204a8620239ec599488ba55819ca69a47ad84795 100644 (file)
--- a/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
+++ b/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.2"
 
 \header {
   lsrtags = "chords"

diff --git a/Documentation/snippets/adding-drum-parts.ly b/Documentation/snippets/adding-drum-parts.ly
index 770aa89f00c8f64d63726c9c8b8ca9acf09cb28b..78afd3d1a3e8a6e674c0761d3e71f0b679978418 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.14.0"
+\version "2.15.2"
 
 \header {
   lsrtags = "rhythms, percussion"

diff --git a/Documentation/snippets/adding-indicators-to-staves-which-get-split-after-a-break.ly b/Documentation/snippets/adding-indicators-to-staves-which-get-split-after-a-break.ly
index e2c62cd2507229b8fb12e2ef243b26e15556fca3..5749977d07af4aa22281d674dd43a0d2b49c6019 100644 (file)
--- a/Documentation/snippets/adding-indicators-to-staves-which-get-split-after-a-break.ly
+++ b/Documentation/snippets/adding-indicators-to-staves-which-get-split-after-a-break.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.2"
 
 \header {
   lsrtags = "staff-notation, vocal-music"

diff --git a/Documentation/snippets/ancient-fonts.ly b/Documentation/snippets/ancient-fonts.ly
index e1d85e177049fdef8245a7939911a8fa5d18ad69..42b43c2176748dfcfbd7799df4c623202dfb2cec 100644 (file)
--- a/Documentation/snippets/ancient-fonts.ly
+++ b/Documentation/snippets/ancient-fonts.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.2"
 
 \header {
   lsrtags = "ancient-notation"

diff --git a/Documentation/snippets/chords.snippet-list b/Documentation/snippets/chords.snippet-list
index 0749eb969e38abefd425177a825fd1e19ead4255..86bdaefd0ebb642e137097991c42b71d5c2c1774 100644 (file)
--- a/Documentation/snippets/chords.snippet-list
+++ b/Documentation/snippets/chords.snippet-list
@@ -9,6 +9,7 @@ chord-name-exceptions.ly
 chord-name-major7.ly
 clusters.ly
 controlling-the-placement-of-chord-fingerings.ly
+cross-staff-chords---beaming-problems-workaround.ly
 displaying-complex-chords.ly
 manually-break-figured-bass-extenders-for-only-some-numbers.ly
 showing-chords-at-changes.ly

diff --git a/Documentation/snippets/creating-double-digit-fingerings.ly b/Documentation/snippets/creating-double-digit-fingerings.ly
index e36819c6423b2f11cb8a7f310729e037412b3f53..f86634bbbaea0a2e1bdf338ccfdb5c7daffd3099 100644 (file)
--- a/Documentation/snippets/creating-double-digit-fingerings.ly
+++ b/Documentation/snippets/creating-double-digit-fingerings.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.12.2"
+\version "2.14.0"
 
 \header {
   lsrtags = "expressive-marks, staff-notation, editorial-annotations, tweaks-and-overrides"

diff --git a/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly b/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly
new file mode 100644 (file)
index 0000000..b01a0ad
--- /dev/null
+++ b/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly
@@ -0,0 +1,50 @@
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.0"
+
+\header {
+  lsrtags = "chords, keyboards, tweaks-and-overrides"
+
+  texidoc = "
+Sometimes it is better to use stems from the upper staff for creating
+cross-staff chords, because no problems with automatic beam collision
+avoidance then arise.  If the stems from the lower staff were used in
+the following example, it would be necessary to change the automatic
+beam collision avoidance settings so that it doesn't detect collisions
+between staves using @code{\\override Staff.Beam #'collision-voice-only
+= ##t}
+
+"
+  doctitle = "Cross-staff chords - beaming problems workaround"
+} % begin verbatim
+
+\new PianoStaff <<
+  \new Staff = up
+    \relative c' {
+      <<
+        { r4
+          \override Stem #'cross-staff = ##t
+          \override Stem #'length = #19 % this is in half-spaces,
+              % so it makes stems 9.5 staffspaces long
+          \override Stem #'Y-offset = #-6 % stems are normally lengthened
+              % upwards, so here we must lower the stem by the amount
+              % equal to the lengthening - in this case (19 - 7) / 2
+              % (7 is default stem length)
+          e e e }
+        { s4
+          \change Staff = "bottom"
+          c, c c
+        }
+      >>
+    }
+  \new Staff = bottom
+    \relative c' {
+      \clef bass
+      \voiceOne
+      g8 a g a g a g a
+    }
+>>

diff --git a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
index 1e86dcc66dc8ed047b40d04263c2e85d0d5f5aa8..cfbabf5a9b8049bc36c06bdb7871238c8cae8e6d 100644 (file)
--- a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
+++ b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.2"
 
 \header {
   lsrtags = "fretted-strings, tweaks-and-overrides"

diff --git a/Documentation/snippets/demo-midiinstruments.ly b/Documentation/snippets/demo-midiinstruments.ly
index e1ba733c2be1cf88b4e9afa385e58f4c372e7aae..78de4305ffdf926f7f4aa348ce0001fd080c968d 100644 (file)
--- a/Documentation/snippets/demo-midiinstruments.ly
+++ b/Documentation/snippets/demo-midiinstruments.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.2"
 
 \header {
   lsrtags = "midi"

diff --git a/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly b/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly
index dba17f532bb533fafd9acd28f8a056994e632d24..9db5d0633b85e7af6c5cf160809348fa5d5b246c 100644 (file)
--- a/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly
+++ b/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.2"
 
 \header {
   lsrtags = "expressive-marks"

diff --git a/Documentation/snippets/hymn-template.ly b/Documentation/snippets/hymn-template.ly
index 1c26594742cca0375e89cefa77835bc35471e64f..0ee49bf43bca68d387e7d6a71748e100437ed34b 100644 (file)
--- a/Documentation/snippets/hymn-template.ly
+++ b/Documentation/snippets/hymn-template.ly
@@ -18,6 +18,7 @@ añadir los versos como texto independiente debajo de la música.
 "
 
   doctitlees = "Plantilla para himnos"
+
 %%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
 
   texidocde = "

diff --git a/Documentation/snippets/jazz-combo-template.ly b/Documentation/snippets/jazz-combo-template.ly
index c25a96fe538b4862923f248f884117e4ac4e30ef..93e0d4a13b0b011bb63bb8dcb67d223669f6897f 100644 (file)
--- a/Documentation/snippets/jazz-combo-template.ly
+++ b/Documentation/snippets/jazz-combo-template.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.2"
 
 \header {
   lsrtags = "keyboards, percussion, fretted-strings, template"

diff --git a/Documentation/snippets/keyboards.snippet-list b/Documentation/snippets/keyboards.snippet-list
index 0c440941d6ddd3251a4eaead79e7c114d16fea0f..b8eb5cf57464c8c5213925b64020d3f99134752a 100644 (file)
--- a/Documentation/snippets/keyboards.snippet-list
+++ b/Documentation/snippets/keyboards.snippet-list
@@ -3,6 +3,7 @@ changing-the-text-for-sustain-markings.ly
 clusters.ly
 controlling-the-placement-of-chord-fingerings.ly
 creating-slurs-across-voices.ly
+cross-staff-chords---beaming-problems-workaround.ly
 cross-staff-tremolos.ly
 fine-tuning-pedal-brackets.ly
 indicating-cross-staff-chords-with-arpeggio-bracket.ly

diff --git a/Documentation/snippets/partcombine-and-autobeamoff.ly b/Documentation/snippets/partcombine-and-autobeamoff.ly
index 338e039157148fa33dcc0633f75bc2d145260cc3..e84da405de07ea581a79c8223e01e6fb34ebbe10 100644 (file)
--- a/Documentation/snippets/partcombine-and-autobeamoff.ly
+++ b/Documentation/snippets/partcombine-and-autobeamoff.ly
@@ -47,6 +47,7 @@ necesario hacer tres llamadas a @code{\\autoBeamOff}.
 
 "
   doctitlees = "Partcombine y autoBeamOff"
+
 %%   Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
 
   texidocde = "
@@ -78,6 +79,7 @@ wenn man es mit @code{\\partcombine} verwendet, muss @code{\\autoBeamOff}
 "
 doctitlede = "Partcombine und autoBeamOff"
 
+
 %% Translation of GIT committish: e1a149d0cc60b02e86209387958f4028567dd366
   texidocfr = "
 Le fonction @code{@bs{}autoBeamOff} dans le cadre d'un

diff --git a/Documentation/snippets/piano-template-with-melody-and-lyrics.ly b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
index 24cc3ba3359777d2de93063b83e6cba4fc7e905f..a5a5fbcdd5b1468adb94f18ca7d1ee8c0cb752a4 100644 (file)
--- a/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
+++ b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.2"
 
 \header {
   lsrtags = "vocal-music, keyboards, template"

diff --git a/Documentation/snippets/removing-the-first-empty-line.ly b/Documentation/snippets/removing-the-first-empty-line.ly
index 65e201125158d55c8c54bed4464c4e94be229526..491eb9bb1d8c08c72b64986e5d26d9c87f87ece4 100644 (file)
--- a/Documentation/snippets/removing-the-first-empty-line.ly
+++ b/Documentation/snippets/removing-the-first-empty-line.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.2"
 
 \header {
   lsrtags = "staff-notation, tweaks-and-overrides, breaks"

diff --git a/Documentation/snippets/tweaks-and-overrides.snippet-list b/Documentation/snippets/tweaks-and-overrides.snippet-list
index 207649664b80a158a0e2f6dd0e85456278e9bc03..f6ecc202347d8ebe4c697af19ebf5e6bbbf39d31 100644 (file)
--- a/Documentation/snippets/tweaks-and-overrides.snippet-list
+++ b/Documentation/snippets/tweaks-and-overrides.snippet-list
@@ -20,6 +20,7 @@ creating-a-delayed-turn.ly
 creating-double-digit-fingerings.ly
 creating-simultaneous-rehearsal-marks.ly
 creating-text-spanners.ly
+cross-staff-chords---beaming-problems-workaround.ly
 custodes.ly
 customizing-fretboard-fret-diagrams.ly
 customizing-markup-fret-diagrams.ly

diff --git a/Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly b/Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly
index ac9dfc5102d3c1198838eafa2a712128ddb3b9d2..7c86e7a6c7c4f71507e46790aa91b8f7240083ef 100644 (file)
--- a/Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly
+++ b/Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly
@@ -41,7 +41,7 @@ mentionnerez explicitement au sein d'un contexte @code{StaffGroup} ou
 
   texidoc = "
 The system start delimiter @code{SystemStartSquare} can be used by
-setting it explicitly in a @code{StaffGroup} or @code{ChoirStaffGroup}
+setting it explicitly in a @code{StaffGroup} or @code{ChoirStaff}
 context.
 
 "

diff --git a/Documentation/snippets/using-postscript-to-generate-special-note-head-shapes.ly b/Documentation/snippets/using-postscript-to-generate-special-note-head-shapes.ly
index a16dcd6d79b4151155002c837c16629cc7d45855..ff14f5a769473e26dada717866edcad6a6c78e2b 100644 (file)
--- a/Documentation/snippets/using-postscript-to-generate-special-note-head-shapes.ly
+++ b/Documentation/snippets/using-postscript-to-generate-special-note-head-shapes.ly
@@ -41,7 +41,7 @@ parallelogram =
       fill
       grestore" )
     (cons 0 1.3125)
-    (cons 0 0))
+    (cons -.75 .75))
 
 myNoteHeads = \override NoteHead #'stencil = \parallelogram
 normalNoteHeads = \revert NoteHead #'stencil
@@ -52,5 +52,3 @@ normalNoteHeads = \revert NoteHead #'stencil
   \normalNoteHeads
   <f, \tweak #'stencil \parallelogram b e>4 d
 }
-
-