X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fgregorian.ly;h=a88f3f762c3dd44a50c1c97a83b6907b9068e463;hb=6c57a752cbc07ee41895e883129e3cdb19d64d39;hp=30a556ae0b5b1be23625a476a8ba89eeb0888743;hpb=1f419a2af14d4a5daf9bc9eb5f7368eedb5c6021;p=lilypond.git

diff --git a/ly/gregorian.ly b/ly/gregorian.ly
index 30a556ae0b..a88f3f762c 100644
--- a/ly/gregorian.ly
+++ b/ly/gregorian.ly
@@ -3,7 +3,7 @@
   $Id$
 %}
 
-\version "2.10.0"
+\version "2.16.0"
 
 %
 % Declare memorable shortcuts for special unicode characters
@@ -22,28 +22,18 @@ iij = \lyricmode { iij }
 % Given some music that represents lyrics, add a prefix to the first
 % lyric event.
 %
-% TODO: Robustify this function.  For example, this function works
-% correctly for "\versus { some lyrics }", but it barfs with a wrong type
-% argument error for e.g. "\versus some lyrics".
-%
 #(define (add-prefix-to-lyrics prefix music)
-   (make-music
-    'SequentialMusic
-    'elements (append
-	       (cons
-		(let* ((elems (car (ly:music-property music 'elements)))
-		       (props (ly:music-mutable-properties elems))
-		       (events (filter (lambda (x)
-					 (equal? (car x) 'elements))
-				       props))
-		       (first-evt (cadar events))
-		       (first-syllable (ly:prob-property first-evt 'text))
-		       (first-duration (ly:prob-property first-evt 'duration)))
-		  (make-music
-		   'LyricEvent
-		   'duration first-duration
-		   'text (string-append prefix first-syllable)))
-		(cdr (ly:music-property music 'elements))))))
+   (let ((found? #f))
+     (map-some-music
+      (lambda (m)
+	(if found? m
+	    (and (music-is-of-type? m 'lyric-event)
+		 (begin
+		   (set! (ly:music-property m 'text)
+			 (string-append prefix (ly:music-property m 'text)))
+		   (set! found? #t)
+		   m))))
+      music)))
 
 % Add unicode 2123 (versicle) as prefix to lyrics.
 versus =
@@ -138,6 +128,7 @@ finalis = {
 
   % Workaround: add padding.  Correct fix would be spacing engine handle this.
   \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+  \once \override BreathingSign  #'extra-spacing-height = #'(-0.5 . 0.5)
 
   \breathe
 }
@@ -149,8 +140,6 @@ accentus = #(make-articulation "accentus")
 ictus = #(make-articulation "ictus")
 semicirculus = #(make-articulation "semicirculus")
 circulus = #(make-articulation "circulus")
-episemInitium = \startTextSpan
-episemFinis = \stopTextSpan
 
 %
 % \augmentum increases the dot-count value of all note heads to which
@@ -223,17 +212,12 @@ ligature = #(define-music-function
 %
 \layout {
     indent = 0.0
-    packed = ##t
 
-    %%% TODO: should raggedright be the default?
+    %%% TODO: should ragged-right be the default?
     %ragged-right = ##t
     ragged-last = ##t
 
-    %%% FIXME: line-thickness should be set here to a slightly
-    %%% thicker value as the default; but we can not set it here,
-    %%% since neither \staff-space nor #staff-space is yet defined
-    %%% when lily comes across the following line.
-    %line-thickness = \staff-space / 7.0
+    line-thickness = #(/ (ly:output-def-lookup $defaultpaper 'staff-space) 7.0)
 
     \context {
 	\VaticanaStaff
@@ -299,7 +283,7 @@ neumeDemoLayout = \layout {
 	\override StaffSymbol #'transparent = ##t
 	\remove "Time_signature_engraver"
 	\remove "Bar_engraver"
-	\override VerticalAxisGroup #'minimum-Y-extent = ##f
+	\override VerticalAxisGroup #'staff-staff-spacing = #'()
     }
     \context {
 	\Voice
@@ -307,6 +291,7 @@ neumeDemoLayout = \layout {
 	\consists Vaticana_ligature_engraver
 	\override NoteHead #'style = #'vaticana.punctum
 	\override Stem #'transparent = ##t
+	\override Flag #'transparent = ##t
     }
 }