* ly/engraver.ly: Remove obsolete comments.

	* ly/gregorian-init.ly: Define default layout block.

diff --git a/ChangeLog b/ChangeLog
index ae9e904f4ef301a17c047ab7319bbd027b5ab103..e01c21213847abf1f98b5bcb43730db2c469ef05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-16  Jürgen Reuter  <reuter@ipd.uka.de>
+
+       * ly/engraver.ly: Remove obsolete comments.
+
+       * ly/gregorian-init.ly: Define default layout block.
+
 2006-04-15  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/lily-parser-scheme.cc: Use them to fix --output=DIR/BASE

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 8e6b63420f4c9beb3ee401848903eaf20d8e9208..b8d3076841b03927e300658039dd2fe85a970ee2 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -761,9 +761,6 @@ AncientRemoveEmptyStaffContext = \context {
   \override Custos #'style = #'vaticana
   \override Custos #'neutral-position = #3
   \override Custos #'neutral-direction = #DOWN
-
-  %% Score.timing = ##f
-  %% Score.barAlways = ##t
 }
 
 \context {
@@ -866,9 +863,6 @@ AncientRemoveEmptyStaffContext = \context {
   \override Custos #'style = #'mensural
   \override Custos #'neutral-position = #3
   \override Custos #'neutral-direction = #DOWN
-
-  %% Score.timing = ##f
-  %% Score.barAlways = ##t
 }
 
 

diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly
index 2719813e92ce59d54af803a675e16d3938800756..23495a0e6404e8ee6376b31a2fd229f2c7d76946 100644 (file)
--- a/ly/gregorian-init.ly
+++ b/ly/gregorian-init.ly
@@ -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
 %
@@ -153,6 +159,63 @@ ligature = #(define-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
 %