From: Graham Percival <graham@percival-music.ca>
Date: Fri, 19 Nov 2010 04:30:41 +0000 (+0000)
Subject: manual convert-ly: minimum-Y-extent (1298+1299).
X-Git-Tag: release/2.13.40-1~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7db644d15df8de3deb39df61acaa48112a16477d;p=lilypond.git

manual convert-ly: minimum-Y-extent (1298+1299).

Patch by Keith O'Hara.

cary.ly used Y-extent to increase space for staves, use
markup-system-spacing instead.

orchestra.ly used Y-extent to created a custom context for rows
rehearsal and tempo marks.  The new way to creat such a row is to
give the context a staff-affinity, and put the spacing
requirements into nonstaff-unrelatedstaff-spacing, etc.  This file
also had its own definition of the \Dynamics context, which is now
built-in.

percussion.itely used Y-extent to produce a spacing to the lyrics
line very similar to what we now get by default.

spacing.itely used Y-extent among other \overrides in an example

ancient.itely used Y-extent to make an invisible staff take up no
space.  The markup can stand alone with no staff.  (If for some
reason a @lilypond must contain notes or skips, then just delete
the 2 lines with minimum-Y-extent.)

The relevant portion of gregorian.ly defined a layout for printing
naked neumes, with no visible staff.  The function of that line,
setting the height of that invisible staff to zero, is not
actually used anywhere in the Google-able portion of lilypond.org,
but the 2.13 equivalent gives the same output the old method, in
case anyone uses this layout to make a vertical stack of naked
neumes.
---

diff --git a/Documentation/notation/ancient.itely b/Documentation/notation/ancient.itely
index 68e923533e..26347e2df8 100644
--- a/Documentation/notation/ancient.itely
+++ b/Documentation/notation/ancient.itely
@@ -742,27 +742,11 @@ different from the default style.  If called for, the natural sign
 will be taken from the @code{vaticana} style.
 
 @lilypond[quote,ragged-right,staffsize=26]
-\score {
-{
-  \textLengthOn
-  s^\markup {
-    \column {
-      "mensural"
-      \line { " " \musicglyph #"accidentals.mensural-1"
-        " " \musicglyph #"accidentals.mensural1" }
-    }
-  }
-}
-\layout {
-  interscoreline = 1
-  \context { \Score \remove "Bar_number_engraver" }
-  \context { \Staff
-      \remove "Clef_engraver"
-      \remove "Key_engraver"
-      \remove "Time_signature_engraver"
-      \remove "Staff_symbol_engraver"
-      \override VerticalAxisGroup #'minimum-Y-extent = ##f
-    }
+\markup {
+  \column {
+    "mensural"
+    \line { " " \musicglyph #"accidentals.mensural-1"
+      " " \musicglyph #"accidentals.mensural1" }
   }
 }
 @end lilypond
@@ -1133,35 +1117,19 @@ Notation Reference:
 Accidentals for the three different Gregorian styles are available:
 
 @lilypond[quote,ragged-right,staffsize=26]
-\score {
-{
-  \textLengthOn
-  s^\markup {
-    \column {
-      "vaticana"
-      \line { " " \musicglyph #"accidentals.vaticana-1"
-        " " \musicglyph #"accidentals.vaticana0" }
-    }
-    \column {
-      "medicaea"
-      \line { " " \musicglyph #"accidentals.medicaea-1" }
-    }
-    \column {
-      "hufnagel"
-      \line { " " \musicglyph #"accidentals.hufnagel-1" }
-    }
+\markup {
+  \column {
+    "vaticana"
+    \line { " " \musicglyph #"accidentals.vaticana-1"
+      " " \musicglyph #"accidentals.vaticana0" }
   }
-}
-\layout {
-  interscoreline = 1
-  \context { \Score \remove "Bar_number_engraver" }
-  \context { \Staff
-      \remove "Clef_engraver"
-      \remove "Key_engraver"
-      \remove "Time_signature_engraver"
-      \remove "Staff_symbol_engraver"
-      \override VerticalAxisGroup #'minimum-Y-extent = ##f
-    }
+  \column {
+    "medicaea"
+    \line { " " \musicglyph #"accidentals.medicaea-1" }
+  }
+  \column {
+    "hufnagel"
+    \line { " " \musicglyph #"accidentals.hufnagel-1" }
   }
 }
 @end lilypond
diff --git a/Documentation/notation/percussion.itely b/Documentation/notation/percussion.itely
index 47705007ef..1048b387bc 100644
--- a/Documentation/notation/percussion.itely
+++ b/Documentation/notation/percussion.itely
@@ -249,7 +249,6 @@ mus = \drummode {
        \remove Time_signature_engraver
        \override Stem #'transparent = ##t
        \override Stem #'Y-extent = ##f
-       \override VerticalAxisGroup #'minimum-Y-extent = #'(-4.0 . 5.0)
      } \mus
      \new Lyrics \nam
   >>
diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely
index 27aef2095e..773bbf9e48 100644
--- a/Documentation/notation/spacing.itely
+++ b/Documentation/notation/spacing.itely
@@ -934,9 +934,6 @@ layout.
 @example
 \layout @{
   indent = 2.0\cm
-  \context @{ \Staff
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-6 . 6)
-  @}
   \context @{ \Voice
     \override TextScript #'padding = #1.0
     \override Glissando #'thickness = #3
diff --git a/Documentation/web/ly-examples/cary-layout.ily b/Documentation/web/ly-examples/cary-layout.ily
index 740a025086..480426c48c 100644
--- a/Documentation/web/ly-examples/cary-layout.ily
+++ b/Documentation/web/ly-examples/cary-layout.ily
@@ -1,5 +1,5 @@
 
-\version "2.12.0"
+\version "2.13.39"
 
 \layout {
   indent = #0
@@ -35,6 +35,7 @@
   printfirst-page-number = ##t
   print-page-number = ##t
   ragged-last-bottom = ##t
+  markup-system-spacing #'minimum-distance = #25
 }
 
 #(set-global-staff-size 14)
diff --git a/Documentation/web/ly-examples/cary.ly b/Documentation/web/ly-examples/cary.ly
index 9de0de0e4e..1b10e17bb2 100644
--- a/Documentation/web/ly-examples/cary.ly
+++ b/Documentation/web/ly-examples/cary.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.13.39"
 % the example header file caused the head to be chopped off
 %\include "example-header.ily"
 
@@ -39,7 +39,6 @@
 			\override TupletBracket #'direction = #down
 			\override TupletBracket #'staff-padding = #5
 			\override TupletBracket #'padding = #2.25
-			\override VerticalAxisGroup #'minimum-Y-extent = #'(10 . 10)
 		} <<
 			
 			\new Voice {
@@ -101,7 +100,6 @@
 			\override Stem #'direction = #down
 			\override TupletBracket #'staff-padding = #5
 			\override TupletBracket #'padding = #2.25
-			\override VerticalAxisGroup #'minimum-Y-extent = #'(10 . 10)
 		} <<
 			
 			\new Voice \with {
diff --git a/Documentation/web/ly-examples/orchestra.ly b/Documentation/web/ly-examples/orchestra.ly
index edcdcc64ce..0b43811af3 100644
--- a/Documentation/web/ly-examples/orchestra.ly
+++ b/Documentation/web/ly-examples/orchestra.ly
@@ -1,4 +1,4 @@
-\version "2.13.36"
+\version "2.13.39"
 
 \header {
   tagline = ##f
@@ -49,35 +49,8 @@ offCr = {
   \revert DynamicTextSpanner #'style
 }
 
-%% Layout to produce piano dynamics context
+%% Layout for piano dynamics
 \layout {
-  \context {
-    \type "Engraver_group"
-    \name Dynamics
-    \alias Voice
-    \consists "Output_property_engraver"
-    \consists "Axis_group_engraver"
-    \consists "Piano_pedal_engraver"
-    pedalSustainStrings = #'("Ped." "*Ped." "*")
-    pedalUnaCordaStrings = #'("una corda" "" "tre corde")
-    \consists "Script_engraver"
-    \consists "New_dynamic_engraver"
-    \consists "Dynamic_align_engraver"
-    \consists "Text_engraver"
-    \consists "Text_spanner_engraver"
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1)
-    \override DynamicLineSpanner #'Y-offset = #0
-    \override TextScript #'font-size = #2
-    \override TextSpanner #'bound-details #'left #'stencil-align-dir-y = #CENTER
-    \override TextScript #'font-shape = #'italic
-    \override TextSpanner #'breakable = ##t
-    \override DynamicLineSpanner #'breakable = ##t
-    \override DynamicTextSpanner #'breakable = ##t
-  }
-  \context {
-    \PianoStaff
-    \accepts "Dynamics"
-  }
   \context {
     \Voice
     \override Glissando #'breakable = ##t
@@ -134,7 +107,9 @@ offCr = {
     \consists "Text_engraver"
     \consists "Text_spanner_engraver"
     \consists "Font_size_engraver"
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-2 . 2 )
+    \override VerticalAxisGroup #'staff-affinity = #DOWN
+    \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing #'padding = #2
+    \override VerticalAxisGroup #'nonstaff-unrelatedstaff-spacing #'padding = #5
     \override TextSpanner #'breakable = ##t
   }
   \context {
diff --git a/ly/gregorian.ly b/ly/gregorian.ly
index 8fbc6fdee8..cdb4968161 100644
--- a/ly/gregorian.ly
+++ b/ly/gregorian.ly
@@ -3,7 +3,7 @@
   $Id$
 %}
 
-\version "2.12.0"
+\version "2.13.39"
 
 %
 % Declare memorable shortcuts for special unicode characters
@@ -293,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