From f5c06fbbc266127b417f91453da43dd578c91382 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 21 Oct 2005 17:09:15 +0000 Subject: [PATCH] (conv): add rules. --- ChangeLog | 2 ++ Documentation/user/advanced-notation.itely | 4 +-- Documentation/user/examples.itely | 7 +++-- Documentation/user/global.itely | 32 ++++++++------------ Documentation/user/instrument-notation.itely | 6 ++-- python/convertrules.py | 2 +- 6 files changed, 25 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87059675f3..d04c2fecf1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-10-21 Han-Wen Nienhuys + * Documentation/user/*.itely: remove minimumVerticalExtent. + * scm/define-grobs.scm (all-grob-descriptions): remove RemoveEmptyVerticalGroup diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely index 922d9aeec0..999fd931f3 100644 --- a/Documentation/user/advanced-notation.itely +++ b/Documentation/user/advanced-notation.itely @@ -1258,10 +1258,10 @@ in this example disappears in the second line The first system shows all staves in full. If empty staves should be removed from the first system too, set @code{remove-first} to true in -@internalsref{RemoveEmptyVerticalGroup}. +@internalsref{VerticalAxisGroup}. @example -\override Score.RemoveEmptyVerticalGroup #'remove-first = ##t +\override Score.VerticalAxisGroup #'remove-first = ##t @end example To remove other types of contexts, use @code{\AncientRemoveEmptyStaffContext} diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely index d652851f2f..27c42eeaa6 100644 --- a/Documentation/user/examples.itely +++ b/Documentation/user/examples.itely @@ -339,7 +339,7 @@ pedal = { \alias Voice % So that \cresc works, for example. \consists "Output_property_engraver" - minimumVerticalExtent = #'(-1 . 1) + \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1) pedalSustainStrings = #'("Ped." "*Ped." "*") pedalUnaCordaStrings = #'("una corda" "" "tre corde") @@ -620,7 +620,8 @@ bassWords = \lyricmode { \context { % a little smaller so lyrics % can be closer to the staff - \Staff minimumVerticalExtent = #'(-3 . 3) + \Staff + \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3) } } } @@ -674,7 +675,7 @@ bassWords = \lyricmode { % a little smaller so lyrics % can be closer to the staff \Staff - minimumVerticalExtent = #'(-3 . 3) + \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3) } } diff --git a/Documentation/user/global.itely b/Documentation/user/global.itely index 064bf68e1e..14bff658eb 100644 --- a/Documentation/user/global.itely +++ b/Documentation/user/global.itely @@ -453,7 +453,7 @@ layout. \layout @{ indent = 2.0\cm \context @{ \Staff - minimumVerticalExtent = #'(-6 . 6 + \override VerticalAxisGroup #'minimum-Y-extent = #'(-6 . 6) @} \context @{ \Voice \override TextScript #'padding = #1.0 @@ -483,24 +483,24 @@ systems from bumping into each other, some minimum distances are set. By changing these, you can put staves closer together, and thus put more systems onto one page. -@c TODO: junk explanation of minimumVerticalExtent - Normally staves are stacked vertically. To make staves maintain a distance, their vertical size is padded. This is done with the -property @code{minimumVerticalExtent}. It takes a pair of numbers, so +property @code{minimum-Y-extent}. It takes a pair of numbers, so if you want to make it smaller than its default @code{#'(-4 . 4)}, -then you could set +then you could set. When applied to a +@internalsref{VerticalAxisGroup}, it controls the size of a horizontal +line, such as a staff or a line of lyrics. @example -\set Staff.minimumVerticalExtent = #'(-3 . 3) +\override Staff.VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3) @end example @noindent This sets the vertical size of the current staff to 3 staff spaces on -either side of the center staff line. The argument of -@code{minimumVerticalExtent} is interpreted as an interval, where the -center line is the 0, so the first number is generally negative. The -staff can be made larger at the bottom by setting it to @code{(-6 . 4)}. +either side of the center staff line. The value @code{(-3 . 3)} is +interpreted as an interval, where the center line is the 0, so the +first number is generally negative. The staff can be made larger at +the bottom by setting it to @code{(-6 . 4)}. The spacing of staves in a system may also be tuned per system. This is done with the command @@ -538,8 +538,9 @@ The distance for @code{alignment-extra-space} may also be negative. To change the amount of space between systems, use @code{betweensystemspace}. A score with only one staff is still -considered to have systems, so setting @code{betweensystemspace} -will be much more useful than changing @code{minimumVerticalExtent}. +considered to have systems, so setting @code{betweensystemspace} will +be much more useful than changing @code{minimum-Y-extent} of a Staff +context. @example \paper @{ @@ -592,13 +593,6 @@ Example files: @inputfileref{input/regression/,page-spacing.ly}, @inputfileref{input/regression/,alignment-vertical-spacing.ly}. -@refbugs - -@code{minimumVerticalExtent} is syntactic sugar for setting -@code{minimum-Y-extent} of the @internalsref{VerticalAxisGroup} of the -current context. It can only be changed score wide. - - @node Vertical spacing of piano staves diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely index 4c05f06385..198e37e36f 100644 --- a/Documentation/user/instrument-notation.itely +++ b/Documentation/user/instrument-notation.itely @@ -1575,7 +1575,7 @@ mus = \drummode { \remove Time_signature_engraver \override Stem #'transparent = ##t \override Stem #'Y-extent-callback = ##f - minimumVerticalExtent = #'(-4.0 . 5.0) + \override VerticalAxisGroup #'minimum-Y-extent = #'(-4.0 . 5.0) } \mus \context Lyrics \nam >> @@ -1609,7 +1609,7 @@ mus = \drummode { timh ssh timl ssl cb s16 } \override Stem #'Y-extent-callback = ##f \override StaffSymbol #'line-count = #2 \override StaffSymbol #'staff-space = #2 - minimumVerticalExtent = #'(-3.0 . 4.0) + \override VerticalAxisGroup #'minimum-Y-extent = #'(-3.0 . 4.0) drumStyleTable = #timbales-style } \mus \context Lyrics { @@ -2212,7 +2212,7 @@ select ancient accidentals. Supported styles are \remove "Key_engraver" \remove "Time_signature_engraver" \remove "Staff_symbol_engraver" - minimumVerticalExtent = ##f + \override VerticalAxisGroup #'minimum-Y-extent = ##f } } } diff --git a/python/convertrules.py b/python/convertrules.py index 4d5fdf06e5..5425221668 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -2625,7 +2625,7 @@ def conv (str): r"\\revert \1 #'\2", str) str = re.sub (r"([XY]-extent)-callback", r'\1', str) str = re.sub (r"RemoveEmptyVerticalGroup", "VerticalAxisGroup", str) - str = re.sub (r"\\set ([a-zA-Z]+\.)?minimumVerticalExtent", + str = re.sub (r"\\set ([a-zA-Z]*\.?)minimumVerticalExtent", r"\\override \1VerticalAxisGroup #'minimum-Y-extent", str) str = re.sub (r"minimumVerticalExtent", -- 2.39.5