resolve merge

[lilypond.git] / ly / gregorian.ly

diff --git a/ly/gregorian.ly b/ly/gregorian.ly
index 496e0b6717a5b73133717cb564fce05a5444de06..0b8e0680beb76ecb72f1d005b37b1c4921ba54f6 100644 (file)
--- a/ly/gregorian.ly
+++ b/ly/gregorian.ly
@@ -3,7 +3,7 @@
   $Id$
 %}
 
-\version "2.12.0"
+\version "2.14.0"
 
 %
 % Declare memorable shortcuts for special unicode characters
@@ -138,6 +138,7 @@ finalis = {
 
   % Workaround: add padding.  Correct fix would be spacing engine handle this.
   \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+  \once \override BreathingSign  #'extra-spacing-height = #'(-0.5 . 0.5)
 
   \breathe
 }
@@ -149,8 +150,6 @@ accentus = #(make-articulation "accentus")
 ictus = #(make-articulation "ictus")
 semicirculus = #(make-articulation "semicirculus")
 circulus = #(make-articulation "circulus")
-episemInitium = \startTextSpan
-episemFinis = \stopTextSpan
 
 %
 % \augmentum increases the dot-count value of all note heads to which
@@ -224,15 +223,11 @@ ligature = #(define-music-function
 \layout {
     indent = 0.0
 
-    %%% TODO: should raggedright be the default?
+    %%% TODO: should ragged-right 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
+    line-thickness = #(/ (ly:output-def-lookup $defaultpaper 'staff-space) 7.0)
 
     \context {
        \VaticanaStaff
@@ -298,7 +293,7 @@ neumeDemoLayout = \layout {
        \override StaffSymbol #'transparent = ##t
        \remove "Time_signature_engraver"
        \remove "Bar_engraver"
-       \override VerticalAxisGroup #'minimum-Y-extent = ##f
+       \override VerticalAxisGroup #'staff-staff-spacing = #'()
     }
     \context {
        \Voice