X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fgregorian.ly;h=b0fe9f24c2f21d403da331a39d6d7d915e2fd217;hb=44253c2f99fe396208ae748303b9cfaa4e575e8d;hp=367dbbf16b62d8e323b3c50df749c95bf38e2a2d;hpb=8dd920d2143611a60bdaf82831613aae6342d2aa;p=lilypond.git

diff --git a/ly/gregorian.ly b/ly/gregorian.ly
index 367dbbf16b..b0fe9f24c2 100644
--- a/ly/gregorian.ly
+++ b/ly/gregorian.ly
@@ -3,7 +3,7 @@
   $Id$
 %}
 
-\version "2.12.0"
+\version "2.17.30"
 
 %
 % 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 =
@@ -59,85 +49,91 @@ responsum =
 % Declare head prefix shortcuts.
 %
 virga =
-  \once \override NoteHead  #'virga = ##t
+  \once \override NoteHead.virga = ##t
 stropha =
-  \once \override NoteHead  #'stropha = ##t
+  \once \override NoteHead.stropha = ##t
 inclinatum =
-  \once \override NoteHead  #'inclinatum = ##t
+  \once \override NoteHead.inclinatum = ##t
 auctum =
-  \once \override NoteHead  #'auctum = ##t
+  \once \override NoteHead.auctum = ##t
 descendens =
-  \once \override NoteHead  #'descendens = ##t
+  \once \override NoteHead.descendens = ##t
 ascendens =
-  \once \override NoteHead  #'ascendens = ##t
+  \once \override NoteHead.ascendens = ##t
 pes =
-  \once \override NoteHead  #'pes-or-flexa = ##t
+  \once \override NoteHead.pes-or-flexa = ##t
 flexa =
-  \once \override NoteHead  #'pes-or-flexa = ##t
+  \once \override NoteHead.pes-or-flexa = ##t
 oriscus =
-  \once \override NoteHead  #'oriscus = ##t
+  \once \override NoteHead.oriscus = ##t
 quilisma =
-  \once \override NoteHead  #'quilisma = ##t
+  \once \override NoteHead.quilisma = ##t
 deminutum =
-  \once \override NoteHead  #'deminutum = ##t
+  \once \override NoteHead.deminutum = ##t
 linea =
-  \once \override NoteHead  #'linea = ##t
+  \once \override NoteHead.linea = ##t
 cavum =
-  \once \override NoteHead  #'cavum = ##t
+  \once \override NoteHead.cavum = ##t
 
 %
 % Declare divisiones shortcuts.
 %
 virgula = {
-  \once \override BreathingSign  #'text = #(make-musicglyph-markup "scripts.rcomma")
-  \once \override BreathingSign  #'font-size = #-2
+  \once \override BreathingSign.text = #(make-musicglyph-markup "scripts.rcomma")
+  \once \override BreathingSign.font-size = #-2
 
   % Workaround: add padding.  Correct fix would be spacing engine handle this.
-  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+  \once \override BreathingSign.minimum-X-extent = #'(-1.0 . 0.0)
+  \once \override BreathingSign.minimum-Y-extent = #'(-2.5 . 2.5)
 
   \breathe
 }
 caesura = {
-  \once \override BreathingSign  #'text = #(make-musicglyph-markup "scripts.rvarcomma")
-  \once \override BreathingSign  #'font-size = #-2
+  \once \override BreathingSign.text = #(make-musicglyph-markup "scripts.rvarcomma")
+  \once \override BreathingSign.font-size = #-2
 
   % Workaround: add padding.  Correct fix would be spacing engine handle this.
-  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+  \once \override BreathingSign.minimum-X-extent = #'(-1.0 . 0.0)
+  \once \override BreathingSign.minimum-Y-extent = #'(-2.5 . 2.5)
 
   \breathe
 }
 divisioMinima = {
-  \once \override BreathingSign  #'stencil = #ly:breathing-sign::divisio-minima
+  \once \override BreathingSign.stencil = #ly:breathing-sign::divisio-minima
 
   % Workaround: add padding.  Correct fix would be spacing engine handle this.
-  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+  \once \override BreathingSign.minimum-X-extent = #'(-1.0 . 0.0)
+  \once \override BreathingSign.minimum-Y-extent = #'(-2.5 . 2.5)
 
   \breathe
 }
 divisioMaior = {
-  \once \override BreathingSign  #'stencil = #ly:breathing-sign::divisio-maior
-  \once \override BreathingSign  #'Y-offset = #0
+  \once \override BreathingSign.stencil = #ly:breathing-sign::divisio-maior
+  \once \override BreathingSign.Y-offset = #0
 
   % Workaround: add padding.  Correct fix would be spacing engine handle this.
-  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+  \once \override BreathingSign.minimum-X-extent = #'(-1.0 . 0.0)
+  \once \override BreathingSign.minimum-Y-extent = #'(-2.5 . 2.5)
 
   \breathe
 }
 divisioMaxima = {
-  \once \override BreathingSign  #'stencil = #ly:breathing-sign::divisio-maxima
-  \once \override BreathingSign  #'Y-offset = #0
+  \once \override BreathingSign.stencil = #ly:breathing-sign::divisio-maxima
+  \once \override BreathingSign.Y-offset = #0
 
   % Workaround: add padding.  Correct fix would be spacing engine handle this.
-  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+  \once \override BreathingSign.minimum-X-extent = #'(-1.0 . 0.0)
+  \once \override BreathingSign.minimum-Y-extent = #'(-2.5 . 2.5)
 
   \breathe
 }
 finalis = {
-  \once \override BreathingSign  #'stencil = #ly:breathing-sign::finalis
-  \once \override BreathingSign  #'Y-offset = #0
+  \once \override BreathingSign.stencil = #ly:breathing-sign::finalis
+  \once \override BreathingSign.Y-offset = #0
 
   % Workaround: add padding.  Correct fix would be spacing engine handle this.
-  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+  \once \override BreathingSign.minimum-X-extent = #'(-1.0 . 0.0)
+  \once \override BreathingSign.minimum-Y-extent = #'(-2.5 . 2.5)
 
   \breathe
 }
@@ -230,8 +226,8 @@ ligature = #(define-music-function
 
     \context {
 	\VaticanaStaff
-	 \override StaffSymbol #'color = #red
-	 \override LedgerLineSpanner #'color = #red
+	 \override StaffSymbol.color = #red
+	 \override LedgerLineSpanner.color = #red
     }
     \context {
 	\Score
@@ -254,7 +250,7 @@ ligature = #(define-music-function
 	%%%
 	barAlways = ##f
 
-	\override SpacingSpanner #'packed-spacing = ##t
+	\override SpacingSpanner.packed-spacing = ##t
 
 	%%%
 	%%% TODO: Play around with the following SpacingSpanner
@@ -264,11 +260,11 @@ ligature = #(define-music-function
 	%%% causes tons of "programming error: adding reverse spring,
 	%%% setting to unit" messages.
 	%%%
-	%\override SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 4)
-	%\override SpacingSpanner #'shortest-duration-space = #0
-	%\override SpacingSpanner #'average-spacing-wishes = ##f
-	%\override SpacingSpanner #'spacing-increment = #0.0
-	%\override SpacingSpanner #'uniform-stretching = ##t
+	%\override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/4)
+	%\override SpacingSpanner.shortest-duration-space = #0
+	%\override SpacingSpanner.average-spacing-wishes = ##f
+	%\override SpacingSpanner.spacing-increment = #0.0
+	%\override SpacingSpanner.uniform-stretching = ##t
     }
 }
 
@@ -289,17 +285,17 @@ neumeDemoLayout = \layout {
 	\Staff
 	\remove "Clef_engraver"
 	\remove "Key_engraver"
-	\override StaffSymbol #'transparent = ##t
+	\hide StaffSymbol
 	\remove "Time_signature_engraver"
 	\remove "Bar_engraver"
-	\override VerticalAxisGroup #'minimum-Y-extent = ##f
+	\override VerticalAxisGroup.staff-staff-spacing = #'()
     }
     \context {
 	\Voice
-	\remove Ligature_bracket_engraver
-	\consists Vaticana_ligature_engraver
-	\override NoteHead #'style = #'vaticana.punctum
-	\override Stem #'transparent = ##t
+	\remove "Ligature_bracket_engraver"
+	\consists "Vaticana_ligature_engraver"
+	\override NoteHead.style = #'vaticana.punctum
+	\hide Stem
     }
 }