From: Phil Holmes <mail@philholmes.net>
Date: Sun, 8 Nov 2015 13:37:04 +0000 (+0000)
Subject: LSR updates
X-Git-Tag: release/2.19.31-1~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=99ef5fc2078de65d49783e81d0258d33a72486f5;p=lilypond.git

LSR updates
---

diff --git a/Documentation/snippets/arranging-separate-lyrics-on-a-single-line.ly b/Documentation/snippets/arranging-separate-lyrics-on-a-single-line.ly
new file mode 100644
index 0000000000..9458e21e8b
--- /dev/null
+++ b/Documentation/snippets/arranging-separate-lyrics-on-a-single-line.ly
@@ -0,0 +1,73 @@
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
+
+\header {
+  lsrtags = "paper-and-layout, vocal-music"
+
+  texidoc = "
+Sometimes you may want to put lyrics for different performers on a
+single line: where there is rapidly alternating text, for example.
+This snippet shows how this can be done with @code{\\override
+VerticalAxisGroup #'nonstaff-nonstaff-spacing #'minimum-distance =
+##f}.
+
+"
+  doctitle = "Arranging separate lyrics on a single line"
+} % begin verbatim
+
+\layout {
+  \context {
+    \Lyrics
+    \override VerticalAxisGroup #'nonstaff-nonstaff-spacing
+       #'minimum-distance = ##f
+  }
+}
+
+aliceSings = \markup { \smallCaps "Alice" }
+eveSings = \markup { \smallCaps "Eve" }
+
+<<
+  \new Staff <<
+    \new Voice = "alice" {
+      f'4^\aliceSings g' r2 |
+      s1 |
+      f'4^\aliceSings g' r2 |
+      s1 | \break
+      % ...
+
+      \voiceOne
+      s2 a'8^\aliceSings a' b'4 |
+      \oneVoice
+      g'1
+    }
+    \new Voice = "eve" {
+      s1 |
+      a'2^\eveSings g' |
+      s1 |
+      a'2^\eveSings g'
+      % ...
+
+      \voiceTwo
+      f'4^\eveSings a'8 g' f'4 e' |
+      \oneVoice
+      s1
+    }
+  >>
+  \new Lyrics \lyricsto "alice" {
+    may -- be
+    sec -- ond
+    % ...
+    Shut up, you fool!
+  }
+  \new Lyrics \lyricsto "eve" {
+    that the
+    words are
+    % ...
+    …and then I was like–
+  }
+>>
diff --git a/Documentation/snippets/orchestra,-choir-and-piano-template.ly b/Documentation/snippets/orchestra,-choir-and-piano-template.ly
index 6bc546d353..e3b6eff963 100644
--- a/Documentation/snippets/orchestra,-choir-and-piano-template.ly
+++ b/Documentation/snippets/orchestra,-choir-and-piano-template.ly
@@ -21,6 +21,7 @@ music for transposing instruments at concert pitch.
 
 #(set-global-staff-size 17)
 \paper {
+  paper-height = 10\cm
   indent = 3.0\cm  % space for instrumentName
   short-indent = 1.5\cm  % space for shortInstrumentName
 }
diff --git a/Documentation/snippets/paper-and-layout.snippet-list b/Documentation/snippets/paper-and-layout.snippet-list
index e99215262a..8bae8889e1 100644
--- a/Documentation/snippets/paper-and-layout.snippet-list
+++ b/Documentation/snippets/paper-and-layout.snippet-list
@@ -1,4 +1,5 @@
 aligning-and-centering-instrument-names.ly
+arranging-separate-lyrics-on-a-single-line.ly
 book-parts.ly
 changing-the-staff-size.ly
 clip-systems.ly
diff --git a/Documentation/snippets/vocal-music.snippet-list b/Documentation/snippets/vocal-music.snippet-list
index 2a8cf23755..fd9f3f3cd6 100644
--- a/Documentation/snippets/vocal-music.snippet-list
+++ b/Documentation/snippets/vocal-music.snippet-list
@@ -7,6 +7,7 @@ ambitus-with-multiple-voices.ly
 ambitus.ly
 ancient-notation-template----modern-transcription-of-gregorian-music.ly
 anglican-psalm-template.ly
+arranging-separate-lyrics-on-a-single-line.ly
 changing-stanza-fonts.ly
 chant-or-psalms-notation.ly
 forcing-hyphens-to-be-shown.ly