X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fgregorian-init.ly;h=23495a0e6404e8ee6376b31a2fd229f2c7d76946;hb=33c6cf0164f0df1d13806471170e76e76f509463;hp=63f70023c4eb8d2ea5c15a114f7f6aa1b86784c2;hpb=a81a96d025a7a3d27f1974046ede8443e890d124;p=lilypond.git

diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly
index 63f70023c4..23495a0e64 100644
--- a/ly/gregorian-init.ly
+++ b/ly/gregorian-init.ly
@@ -1,4 +1,4 @@
-\version "2.7.31"
+\version "2.7.39"
 
 %%%%%%%%
 %%%%%%%% shortcuts common for all styles of gregorian chant notation
@@ -91,6 +91,12 @@ finalis = {
   \breathe
 }
 
+augmentum = {
+  %%% TODO: A ligature head postfix that indicates that an
+  %%% augmentum dot should be appended to the right end of
+  %%% the surrounding ligature.  [Not yet implemented.]
+}
+
 %
 % declare articulation shortcuts
 %
@@ -119,7 +125,7 @@ episemFinis = #(make-span-event 'TextSpanEvent STOP)
 				       'elements (list
 						  (make-span-event 'LigatureEvent STOP)))))))
 
-ligature = #(def-music-function
+ligature = #(define-music-function
 	      (location music) (ly:music?)
 	      (make-ligature music))
 
@@ -144,7 +150,7 @@ ligature = #(def-music-function
 % % \[ \virga x \inclinatum y \inclinatum z ... \]
 %
 %#(defmacro def-climacus-function (start stop)
-%  `(def-music-function (location music) (ly:music?)
+%  `(define-music-function (location music) (ly:music?)
 %     (make-music 'SequentialMusic
 %        'elements (list 'LigatureStartEvent
 %			(ly:music-deep-copy ,start)
@@ -153,6 +159,63 @@ ligature = #(def-music-function
 %			'LigatureStopEvent))))
 %climacus = #(def-climacus-function startSequentialMusic stopSequentialMusic)
 
+\layout {
+    indent = 0.0
+    packed = ##t
+
+    %%% TODO: should raggedright 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
+
+    \context {
+	\VaticanaStaff
+	 \override StaffSymbol #'color = #red
+	 \override LedgerLineSpanner #'color = #red
+    }
+    \context {
+	\Score
+	\remove "Bar_number_engraver"
+
+	%%%
+	%%% FIXME: Musicologically seen, timing should be set to #f.
+	%%% Unfortunately, setting it to #f will result in no
+	%%% line-breakable items being created, such that the whole
+	%%% music will end up in a single line.  Therefore, we
+	%%% currently set it to #t, until the ligature code is fixed
+	%%% to automatically insert breakable items.
+	%%%
+	timing = ##t
+
+	%%%
+	%%% FIXME: Setting barAlways to #t would fix the above
+	%%% "timing = ##t" problem, but, surprisingly, it increases
+	%%% the space between ligatures.  Hence, we set it to #f.
+	%%%
+	barAlways = ##f
+
+	\override SpacingSpanner #'packed-spacing = ##t
+
+	%%%
+	%%% TODO: Play around with the following SpacingSpanner
+	%%% settings to yield better spacing between ligatures.
+	%%%
+	%%% FIXME: setting #'spacing-increment to a small value
+	%%% causes tons of "programming error: adding reverse spring,
+	%%% setting to unit" messages.
+	%%%
+	%\override SpacingSpanner #'shortest-duration-space = #0
+	%\override SpacingSpanner #'average-spacing-wishes = ##f
+	%\override SpacingSpanner #'spacing-increment = #0.0
+	%\override SpacingSpanner #'uniform-stretching = ##t
+    }
+}
+
 %
 % example layout block for gregorian chant notation
 %