Doc-es: pre-merge update of texidoc committishes.

[lilypond.git] / input / new / incipit.ly

diff --git a/input/new/incipit.ly b/input/new/incipit.ly
index 3e3cc41edd30a8457215490d5354698b23eaf40a..5664d32cb1a9194505d8809e0d9368d4578f1937 100644 (file)
--- a/input/new/incipit.ly
+++ b/input/new/incipit.ly
@@ -1,4 +1,4 @@
-\version "2.11.61"
+\version "2.12.0"
 \header {
   lsrtags = "staff-notation,ancient-notation"
   texidoc = "Incipits can be added using the instrument name grob, but
@@ -13,7 +13,7 @@ incipit =
     \once \override Staff.InstrumentName #'self-alignment-Y = #UP
     \once \override Staff.InstrumentName #'Y-offset = #4
     \once \override Staff.InstrumentName #'padding = #0.3
-    \once \override Staff.InstrumentName #'stencil = 
+    \once \override Staff.InstrumentName #'stencil =
     #(lambda (grob)
        (let* ((instrument-name (ly:grob-property grob 'long-text))
               (layout (ly:output-def-clone (ly:grob-layout grob)))
@@ -37,7 +37,7 @@ incipit =
          (ly:output-def-set-variable! layout 'ragged-last #f)
          (ly:output-def-set-variable! layout 'system-count 1)
          (ly:score-add-output-def! score layout)
-         (set! (ly:grob-property grob 'long-text)
+         (ly:grob-set-property! grob 'long-text
                (markup #:score score))
          (ly:system-start-text::print grob)))
   #})
@@ -48,9 +48,7 @@ global = {
   \set Score.skipBars = ##t
   \key g \major
   \time 4/4
-  
-  %make the staff lines invisible on staves
-  \override Staff.BarLine #'transparent = ##t
+
   % the actual music
   \skip 1*8
 
@@ -236,25 +234,19 @@ bassusLyrics = \lyricmode {
         \incipit \bassusIncipit
         \bassusNotes
       >>
+      \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics }
     >>
-    \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics }
-    %% Keep the bass lyrics outside of the staff group to avoid bar lines
-    %% between the lyrics.
   >>
   \layout {
     \context {
       \Score
-      %% no bar lines in staves
+      %% no bar lines in staves or lyrics
       \override BarLine #'transparent = ##t
     }
-    %% the next three instructions keep the lyrics between the bar lines
+    %% the next two instructions keep the lyrics between the bar lines
     \context {
       \Lyrics
-      \consists "Bar_engraver" 
-      \override BarLine #'transparent = ##t
-    } 
-    \context {
-      \StaffGroup
+      \consists "Bar_engraver"
       \consists "Separating_line_group_engraver"
     }
     \context {