X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fgregorian-init.ly;h=8b4c01ad66d54916a7efced628115d249b099ab0;hb=b584147c940e9456c2e0819e5af0afb765ade992;hp=b61397c62bb8bfa902ec4ca7ccba68f9c0e04679;hpb=63bd790abbe3fa267409b515c63796cae37e5ad9;p=lilypond.git

diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly
index b61397c62b..8b4c01ad66 100644
--- a/ly/gregorian-init.ly
+++ b/ly/gregorian-init.ly
@@ -1,4 +1,4 @@
-\version "1.7.18"
+\version "2.1.30"
 
 %%%%%%%%
 %%%%%%%% shortcuts common for all styles of gregorian chant notation
@@ -8,65 +8,95 @@
 % declare head prefix shortcuts
 %
 virga =
-  \once \property Voice.NoteHead \override #'virga = ##t
+  \once \override NoteHead  #'virga = ##t
 stropha =
-  \once \property Voice.NoteHead \override #'stropha = ##t
+  \once \override NoteHead  #'stropha = ##t
 inclinatum =
-  \once \property Voice.NoteHead \override #'inclinatum = ##t
+  \once \override NoteHead  #'inclinatum = ##t
 auctum =
-  \once \property Voice.NoteHead \override #'auctum = ##t
-aucta =
-  \once \property Voice.NoteHead \override #'auctum = ##t
+  \once \override NoteHead  #'auctum = ##t
 descendens =
-  \once \property Voice.NoteHead \override #'descendens = ##t
+  \once \override NoteHead  #'descendens = ##t
 ascendens =
-  \once \property Voice.NoteHead \override #'ascendens = ##t
+  \once \override NoteHead  #'ascendens = ##t
 pes =
-  \once \property Voice.NoteHead \override #'pes-or-flexa = ##t
+  \once \override NoteHead  #'pes-or-flexa = ##t
 flexa =
-  \once \property Voice.NoteHead \override #'pes-or-flexa = ##t
+  \once \override NoteHead  #'pes-or-flexa = ##t
 oriscus =
-  \once \property Voice.NoteHead \override #'oriscus = ##t
+  \once \override NoteHead  #'oriscus = ##t
 quilisma =
-  \once \property Voice.NoteHead \override #'quilisma = ##t
-semivocalis =
-  \once \property Voice.NoteHead \override #'deminutum = ##t
+  \once \override NoteHead  #'quilisma = ##t
 deminutum =
-  \once \property Voice.NoteHead \override #'deminutum = ##t
+  \once \override NoteHead  #'deminutum = ##t
+linea =
+  \once \override NoteHead  #'linea = ##t
+cavum =
+  \once \override NoteHead  #'cavum = ##t
 
 %
 % declare divisiones shortcuts
 %
 virgula = {
-  \once \property Voice.BreathingSign \override #'text = #"scripts-rcomma"
-  \once \property Voice.BreathingSign \override #'font-relative-size = #-1
+  \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)
+
   \breathe
 }
 caesura = {
-  \once \property Voice.BreathingSign \override #'text = #"scripts-rvarcomma"
-  \once \property Voice.BreathingSign \override #'font-relative-size = #-1
+  \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)
+
   \breathe
 }
 divisioMinima = {
-  \once \property Voice.BreathingSign \override #'molecule-callback = #Breathing_sign::divisio_minima
+  \once \override BreathingSign  #'print-function = #Breathing_sign::divisio_minima
+
+  % Workaround: add padding.  Correct fix would be spacing engine handle this.
+  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+
   \breathe
 }
 divisioMaior = {
-  \once \property Voice.BreathingSign \override #'molecule-callback = #Breathing_sign::divisio_maior
-  \once \property Voice.BreathingSign \override #'Y-offset-callbacks = #'()
+  \once \override BreathingSign  #'print-function = #Breathing_sign::divisio_maior
+  \once \override BreathingSign  #'Y-offset-callbacks = #'()
+
+  % Workaround: add padding.  Correct fix would be spacing engine handle this.
+  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+
   \breathe
 }
 divisioMaxima = {
-  \once \property Voice.BreathingSign \override #'molecule-callback = #Breathing_sign::divisio_maxima
-  \once \property Voice.BreathingSign \override #'Y-offset-callbacks = #'()
+  \once \override BreathingSign  #'print-function = #Breathing_sign::divisio_maxima
+  \once \override BreathingSign  #'Y-offset-callbacks = #'()
+
+  % Workaround: add padding.  Correct fix would be spacing engine handle this.
+  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+
   \breathe
 }
 finalis = {
-  \once \property Voice.BreathingSign \override #'molecule-callback = #Breathing_sign::finalis
-  \once \property Voice.BreathingSign \override #'Y-offset-callbacks = #'()
+  \once \override BreathingSign  #'print-function = #Breathing_sign::finalis
+  \once \override BreathingSign  #'Y-offset-callbacks = #'()
+
+  % Workaround: add padding.  Correct fix would be spacing engine handle this.
+  \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+
   \breathe
 }
 
+%
+% declare articulation shortcuts
+%
+accentus = #(make-articulation "accentus")
+ictus = #(make-articulation "ictus")
+semicirculus = #(make-articulation "semicirculus")
+circulus = #(make-articulation "circulus")
 episemInitium = #(make-span-event 'TextSpanEvent START)
-
 episemFinis = #(make-span-event 'TextSpanEvent STOP)