X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Flsr%2Fincipit.ly;h=6929ccfa6d5fb50672afa02d43594ec161d8b34d;hb=3eb1e37e2e0b3966142cd04b85e30ab882308612;hp=a7c04ad5c4912772d8f712c8fb83804bf25e97ff;hpb=1dc3363b663111eeb23de9bcd8330f59cee642a5;p=lilypond.git

diff --git a/input/lsr/incipit.ly b/input/lsr/incipit.ly
index a7c04ad5c4..6929ccfa6d 100644
--- a/input/lsr/incipit.ly
+++ b/input/lsr/incipit.ly
@@ -1,7 +1,11 @@
-%% 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.62"
+\version "2.13.1"
+
 \header {
+  lsrtags = "staff-notation, ancient-notation"
+
+%% Translation of GIT committish: aea975539ec44fd0f1a8fd25930b88b5ab64b53a
   texidoces = "
 Los «incipit» se pueden escribir utilizando el grob del nombre del
 instruemento, pero manteniendo independientes las definiciones del
@@ -9,13 +13,14 @@ 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
 
-
 incipit =
 #(define-music-function (parser location incipit-music) (ly:music?)
   #{
@@ -23,7 +28,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)))
@@ -47,7 +52,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)))
   #})
@@ -58,9 +63,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
 
@@ -246,25 +249,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 {