X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Flsr%2Fincipit.ly;h=d09025ef74b4ec51d8b004570cec83fcb22bb2d5;hb=fb09f28821ce6ce66ec508ddaa8c9320d2813695;hp=f41589cb01b34cf8cbdcfaec96ccea71b1c1a6e7;hpb=f26ba98bff8314bf0b379d3eea7fb3bee7e31dc3;p=lilypond.git

diff --git a/input/lsr/incipit.ly b/input/lsr/incipit.ly
index f41589cb01..d09025ef74 100644
--- a/input/lsr/incipit.ly
+++ b/input/lsr/incipit.ly
@@ -1,7 +1,10 @@
-%% Do not edit this file; it is auto-generated from input/new
+%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.53"
+\version "2.12.3"
+
 \header {
+  lsrtags = "staff-notation, ancient-notation"
+
   texidoces = "
 Los «incipit» se pueden escribir utilizando el grob del nombre del
 instruemento, pero manteniendo independientes las definiciones del
@@ -9,9 +12,11 @@ nombre del instrumento y del incipit."
  
  doctitlees = "Incipit"
 
-  lsrtags = "staff-notation,ancient-notation"
-  texidoc = "Incipits can be added using the instrument name grob, but
-keeping separate the instrument name definition and the incipit definition."
+  texidoc = "
+Incipits can be added using the instrument name grob, but keeping
+separate the instrument name definition and the incipit definition.
+
+"
   doctitle = "Incipit"
 } % begin verbatim
 
@@ -22,7 +27,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)))
@@ -46,7 +51,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)))
   #})
@@ -57,9 +62,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
 
@@ -71,7 +74,7 @@ global = {
 }
 
 discantusIncipit = <<
-  \new MensuralVoice = discantusIncipit <<
+  \new MensuralVoice = "discantusIncipit" <<
     \repeat unfold 9 { s1 \noBreak }
     {
       \clef "neomensural-c1"
@@ -108,7 +111,7 @@ discantusLyrics = \lyricmode {
 }
 
 altusIncipit = <<
-  \new MensuralVoice = altusIncipit <<
+  \new MensuralVoice = "altusIncipit" <<
     \repeat unfold 9 { s1 \noBreak }
     {
       \clef "neomensural-c3"
@@ -144,7 +147,7 @@ altusLyrics = \lyricmode {
 }
 
 tenorIncipit = <<
-  \new MensuralVoice = tenorIncipit <<
+  \new MensuralVoice = "tenorIncipit" <<
     \repeat unfold 9 { s1 \noBreak }
     {
       \clef "neomensural-c4"
@@ -181,7 +184,7 @@ tenorLyrics = \lyricmode {
 }
 
 bassusIncipit = <<
-  \new MensuralVoice = bassusIncipit <<
+  \new MensuralVoice = "bassusIncipit" <<
     \repeat unfold 9 { s1 \noBreak }
     {
       \clef "bass"
@@ -220,49 +223,44 @@ bassusLyrics = \lyricmode {
     \new StaffGroup = choirStaff <<
       \new Voice = "discantusNotes" <<
         \global
-        \set Staff.instrumentName = "Discantus"
+        \set Staff.instrumentName = #"Discantus"
         \incipit \discantusIncipit
         \discantusNotes
       >>
       \new Lyrics = "discantusLyrics" \lyricsto discantusNotes { \discantusLyrics }
       \new Voice = "altusNotes" <<
         \global
-        \set Staff.instrumentName = "Altus"
+        \set Staff.instrumentName = #"Altus"
         \incipit \altusIncipit
         \altusNotes
       >>
       \new Lyrics = "altusLyrics" \lyricsto altusNotes { \altusLyrics }
       \new Voice = "tenorNotes" <<
         \global
-        \set Staff.instrumentName = "Tenor"
+        \set Staff.instrumentName = #"Tenor"
         \incipit \tenorIncipit
         \tenorNotes
       >>
       \new Lyrics = "tenorLyrics" \lyricsto tenorNotes { \tenorLyrics }
       \new Voice = "bassusNotes" <<
-        \set Staff.instrumentName = "Bassus"
+        \global
+        \set Staff.instrumentName = #"Bassus"
         \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 {
@@ -277,7 +275,7 @@ bassusLyrics = \lyricmode {
       %% overall spacing if you comment in the following command.
       %%\remove "Forbid_line_break_engraver"
     }
-    indent=6\cm
+    indent = 6\cm
     incipit-width = 4\cm
   }
 }