formatting cleanups, rename

[lilypond.git] / ly / gregorian-init.ly

diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly
index 19e6d76c4ecfeb2b829aa0fb3436d5f3907be635..8111cae2300ee9370e3eb97aec2c90df04fdef91 100644 (file)
--- a/ly/gregorian-init.ly
+++ b/ly/gregorian-init.ly
@@ -1,4 +1,4 @@
-\version "1.7.10"
+\version "1.8.0"
 
 %%%%%%%%
 %%%%%%%% shortcuts common for all styles of gregorian chant notation
@@ -8,31 +8,27 @@
 % declare head prefix shortcuts
 %
 virga =
-  \once \property Voice.LigatureHead \override #'virga = ##t
+  \once \property Voice.NoteHead \override #'virga = ##t
 stropha =
-  \once \property Voice.LigatureHead \override #'stropha = ##t
+  \once \property Voice.NoteHead \override #'stropha = ##t
 inclinatum =
-  \once \property Voice.LigatureHead \override #'inclinatum = ##t
+  \once \property Voice.NoteHead \override #'inclinatum = ##t
 auctum =
-  \once \property Voice.LigatureHead \override #'auctum = ##t
-aucta =
-  \once \property Voice.LigatureHead \override #'auctum = ##t
+  \once \property Voice.NoteHead \override #'auctum = ##t
 descendens =
-  \once \property Voice.LigatureHead \override #'descendens = ##t
+  \once \property Voice.NoteHead \override #'descendens = ##t
 ascendens =
-  \once \property Voice.LigatureHead \override #'ascendens = ##t
+  \once \property Voice.NoteHead \override #'ascendens = ##t
 pes =
-  \once \property Voice.LigatureHead \override #'pes-or-flexa = ##t
+  \once \property Voice.NoteHead \override #'pes-or-flexa = ##t
 flexa =
-  \once \property Voice.LigatureHead \override #'pes-or-flexa = ##t
-semivocalis =
-  \once \property Voice.LigatureHead \override #'semivocalis = ##t
+  \once \property Voice.NoteHead \override #'pes-or-flexa = ##t
 oriscus =
-  \once \property Voice.LigatureHead \override #'oriscus = ##t
+  \once \property Voice.NoteHead \override #'oriscus = ##t
 quilisma =
-  \once \property Voice.LigatureHead \override #'quilisma = ##t
+  \once \property Voice.NoteHead \override #'quilisma = ##t
 deminutum =
-  \once \property Voice.LigatureHead \override #'deminutum = ##t
+  \once \property Voice.NoteHead \override #'deminutum = ##t
 
 %
 % declare divisiones shortcuts
@@ -40,33 +36,63 @@ deminutum =
 virgula = {
   \once \property Voice.BreathingSign \override #'text = #"scripts-rcomma"
   \once \property Voice.BreathingSign \override #'font-relative-size = #-1
+
+  % Workaround: add padding.  Correct fix would be spacing engine handle this.
+  \once \property Voice.BreathingSign \override #'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
+
+  % Workaround: add padding.  Correct fix would be spacing engine handle this.
+  \once \property Voice.BreathingSign \override #'extra-X-extent = #'(-1.0 . 0)
+
   \breathe
 }
-divisiominima = {
-  \once \property Voice.BreathingSign \override #'type = #'minima
+divisioMinima = {
   \once \property Voice.BreathingSign \override #'molecule-callback = #Breathing_sign::divisio_minima
+
+  % Workaround: add padding.  Correct fix would be spacing engine handle this.
+  \once \property Voice.BreathingSign \override #'extra-X-extent = #'(-1.0 . 0)
+
   \breathe
 }
-divisiomaior = {
-  \once \property Voice.BreathingSign \override #'type = #'maior
+divisioMaior = {
   \once \property Voice.BreathingSign \override #'molecule-callback = #Breathing_sign::divisio_maior
   \once \property Voice.BreathingSign \override #'Y-offset-callbacks = #'()
+
+  % Workaround: add padding.  Correct fix would be spacing engine handle this.
+  \once \property Voice.BreathingSign \override #'extra-X-extent = #'(-1.0 . 0)
+
   \breathe
 }
-divisiomaxima = {
-  \once \property Voice.BreathingSign \override #'type = #'maxima
+divisioMaxima = {
   \once \property Voice.BreathingSign \override #'molecule-callback = #Breathing_sign::divisio_maxima
   \once \property Voice.BreathingSign \override #'Y-offset-callbacks = #'()
+
+  % Workaround: add padding.  Correct fix would be spacing engine handle this.
+  \once \property Voice.BreathingSign \override #'extra-X-extent = #'(-1.0 . 0)
+
   \breathe
 }
 finalis = {
-  \once \property Voice.BreathingSign \override #'type = #'finalis
   \once \property Voice.BreathingSign \override #'molecule-callback = #Breathing_sign::finalis
   \once \property Voice.BreathingSign \override #'Y-offset-callbacks = #'()
+
+  % Workaround: add padding.  Correct fix would be spacing engine handle this.
+  \once \property Voice.BreathingSign \override #'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)