Index: Documentation/notation/spacing.itely |
diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely |
index ecc3217cf9bab0370d9f0b23780bebb61888a715..277b573fd9234941a16dbf3e06346d0d22201292 100644 |
--- a/Documentation/notation/spacing.itely |
+++ b/Documentation/notation/spacing.itely |
@@ -8,7 +8,7 @@ |
Guide, node Updating translation committishes.. |
@end ignore |
-@c \version "2.16.0" |
+@c \version "2.17.6" |
@ignore |
GDP TODO list |
@@ -30,7 +30,7 @@ staff lines." |
Could we add a sentence: |
"Use instead the pair fontSize = #@var{N} |
- \override StaffSymbol #'staff-space = #(magstep |
+ \override StaffSymbol.staff-space = #(magstep |
@var{N}) |
inside the Staff context to change the size of the font and the |
distance between |
@@ -1116,12 +1116,12 @@ Here is an example @code{\layout} block: |
indent = 2\cm |
\context @{ |
\StaffGroup |
- \override StaffGrouper #'staff-staff-spacing #'basic-distance = #8 |
+ \override StaffGrouper.staff-staff-spacing.basic-distance = #8 |
@} |
\context @{ |
\Voice |
- \override TextScript #'padding = #1 |
- \override Glissando #'thickness = #3 |
+ \override TextScript.padding = #1 |
+ \override Glissando.thickness = #3 |
@} |
@} |
@end example |
@@ -1142,8 +1142,8 @@ For example, if this block: |
\layout @{ |
\context @{ |
\Voice |
- \override TextScript #'color = #magenta |
- \override Glissando #'thickness = #1.5 |
+ \override TextScript.color = #magenta |
+ \override Glissando.thickness = #1.5 |
@} |
@} |
@end example |
@@ -1163,7 +1163,7 @@ If a variable is defined like this: |
layoutVariable = \layout @{ |
\context @{ |
\Voice |
- \override NoteHead #'font-size = #4 |
+ \override NoteHead.font-size = #4 |
@} |
@} |
@end example |
@@ -1183,7 +1183,7 @@ for example: |
\layoutVariable |
\context @{ |
\Voice |
- \override NoteHead #'color = #red |
+ \override NoteHead.color = #red |
@} |
@} |
@end example |
@@ -1401,10 +1401,10 @@ with the music: |
Similarly, line breaks are normally forbidden when beams cross bar |
lines. This behavior can be changed by setting |
-@code{\override Beam #'breakable = ##t}: |
+@code{\override Beam.breakable = ##t}: |
@lilypond[quote,ragged-right,relative=2,verbatim] |
-\override Beam #'breakable = ##t |
+\override Beam.breakable = ##t |
c2. c8[ c | \break |
c8 c] c2. | |
@end lilypond |
@@ -1703,8 +1703,8 @@ Lily sometimes rejects explicit @code{\break} and @code{\pageBreak} |
commands. There are two commands to override this behavior: |
@example |
-\override NonMusicalPaperColumn #'line-break-permission = ##f |
-\override NonMusicalPaperColumn #'page-break-permission = ##f |
+\override NonMusicalPaperColumn.line-break-permission = ##f |
+\override NonMusicalPaperColumn.page-break-permission = ##f |
@end example |
When @code{line-break-permission} is overridden to false, Lily will insert |
@@ -1735,8 +1735,8 @@ music = \relative c'' { c8 c c c } |
\layout { |
\context { |
\Score |
- \override NonMusicalPaperColumn #'line-break-permission = ##f |
- \override NonMusicalPaperColumn #'page-break-permission = ##f |
+ \override NonMusicalPaperColumn.line-break-permission = ##f |
+ \override NonMusicalPaperColumn.page-break-permission = ##f |
} |
} |
} |
@@ -1802,20 +1802,20 @@ music = \relative c'' { c4 c c c } |
\score { |
\new Staff << |
\new Voice { |
- \overrideProperty "Score.NonMusicalPaperColumn" |
- #'line-break-system-details #'((Y-offset . 0)) |
+ \overrideProperty Score.NonMusicalPaperColumn |
+ line-break-system-details #'((Y-offset . 0)) |
s1 * 2 \break |
- \overrideProperty "Score.NonMusicalPaperColumn" |
- #'line-break-system-details #'((Y-offset . 35)) |
+ \overrideProperty Score.NonMusicalPaperColumn |
+ line-break-system-details #'((Y-offset . 35)) |
s1 * 3 \break |
- \overrideProperty "Score.NonMusicalPaperColumn" |
- #'line-break-system-details #'((Y-offset . 70)) |
+ \overrideProperty Score.NonMusicalPaperColumn |
+ line-break-system-details #'((Y-offset . 70)) |
s1 * 6 \break |
- \overrideProperty "Score.NonMusicalPaperColumn" |
- #'line-break-system-details #'((Y-offset . 105)) |
+ \overrideProperty Score.NonMusicalPaperColumn |
+ line-break-system-details #'((Y-offset . 105)) |
s1 * 5 \break |
} |
\new Voice { |
@@ -1959,14 +1959,14 @@ of these reference points: |
#(define zero-space '((padding . -inf.0) (basic-distance . 0))) |
alignToZero = \with { |
- \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing = #zero-space |
- \override VerticalAxisGroup #'nonstaff-nonstaff-spacing = #zero-space |
+ \override VerticalAxisGroup.nonstaff-relatedstaff-spacing = #zero-space |
+ \override VerticalAxisGroup.nonstaff-nonstaff-spacing = #zero-space |
} |
lowerCaseChords = \with { |
chordNameLowercaseMinor = ##t |
} |
staffAffinityDown = \with { |
- \override VerticalAxisGroup #'staff-affinity = #DOWN |
+ \override VerticalAxisGroup.staff-affinity = #DOWN |
} |
labelContext = |
#(define-music-function |
@@ -1984,13 +1984,13 @@ labelContext = |
\lowerCaseChords } |
\context { \FretBoards \alignToZero \staffAffinityDown } |
\context { \Score |
- \override BarLine #'stencil = ##f |
- \override DynamicText #'self-alignment-X = #-1 |
- \override FretBoard #'X-offset = #1.75 |
- \override InstrumentName #'minimum-Y-extent = #'(-2 . 2) |
- \override InstrumentName #'extra-offset = #'(0 . -0.5) |
- \override TextScript #'minimum-Y-extent = #'(-2 . 3) |
- \override TimeSignature #'stencil = ##f |
+ \override BarLine.stencil = ##f |
+ \override DynamicText.self-alignment-X = #-1 |
+ \override FretBoard.X-offset = #1.75 |
+ \override InstrumentName.minimum-Y-extent = #'(-2 . 2) |
+ \override InstrumentName.extra-offset = #'(0 . -0.5) |
+ \override TextScript.minimum-Y-extent = #'(-2 . 3) |
+ \override TimeSignature.stencil = ##f |
} |
} |
@@ -2053,12 +2053,11 @@ individually, and the second completely re-defines the property: |
@example |
\new Staff \with @{ |
- \override VerticalAxisGroup #'default-staff-staff-spacing |
- #'basic-distance = #10 |
+ \override VerticalAxisGroup.default-staff-staff-spacing.basic-distance = #10 |
@} @{ @dots{} @} |
\new Staff \with @{ |
- \override VerticalAxisGroup #'default-staff-staff-spacing = |
+ \override VerticalAxisGroup.default-staff-staff-spacing = |
#'((basic-distance . 10) |
(minimum-distance . 9) |
(padding . 1) |
@@ -2073,8 +2072,7 @@ To change any spacing settings globally, put them in the |
\layout @{ |
\context @{ |
\Staff |
- \override VerticalAxisGroup #'default-staff-staff-spacing |
- #'basic-distance = #10 |
+ \override VerticalAxisGroup.default-staff-staff-spacing.basic-distance = #10 |
@} |
@} |
@end example |
@@ -2232,7 +2230,7 @@ are combined in a group or groups. |
\layout { |
\context { |
\Staff |
- \override VerticalAxisGroup #'default-staff-staff-spacing = |
+ \override VerticalAxisGroup.default-staff-staff-spacing = |
#'((basic-distance . 8) |
(minimum-distance . 7) |
(padding . 1)) |
@@ -2254,7 +2252,7 @@ are combined in a group or groups. |
% By setting 'padding to a negative value, staves can be made to |
% collide. The lowest acceptable value for 'basic-distance is 0. |
\new Staff \with { |
- \override VerticalAxisGroup #'default-staff-staff-spacing = |
+ \override VerticalAxisGroup.default-staff-staff-spacing = |
#'((basic-distance . 3.5) |
(padding . -10)) |
} { \clef bass g2 r | } |
@@ -2309,14 +2307,14 @@ The following example shows how properties of the |
\layout { |
\context { |
\Score |
- \override StaffGrouper #'staff-staff-spacing #'padding = #0 |
- \override StaffGrouper #'staff-staff-spacing #'basic-distance = #1 |
+ \override StaffGrouper.staff-staff-spacing.padding = #0 |
+ \override StaffGrouper.staff-staff-spacing.basic-distance = #1 |
} |
} |
<< |
\new PianoStaff \with { |
- \override StaffGrouper #'staffgroup-staff-spacing #'basic-distance = #20 |
+ \override StaffGrouper.staffgroup-staff-spacing.basic-distance = #20 |
} << |
\new Staff { c'1 } |
\new Staff { c'1 } |
@@ -2375,24 +2373,23 @@ able to stretch much more than usual: |
\layout { |
\context { |
\Lyrics |
- \override VerticalAxisGroup |
- #'nonstaff-nonstaff-spacing #'stretchability = #1000 |
+ \override VerticalAxisGroup.nonstaff-nonstaff-spacing.stretchability = #1000 |
} |
} |
\new StaffGroup |
<< |
\new Staff \with { |
- \override VerticalAxisGroup #'staff-staff-spacing = #'((basic-distance . 30)) |
+ \override VerticalAxisGroup.staff-staff-spacing = #'((basic-distance . 30)) |
} { c'1 } |
\new Lyrics \with { |
- \override VerticalAxisGroup #'staff-affinity = #UP |
+ \override VerticalAxisGroup.staff-affinity = #UP |
} \lyricmode { up } |
\new Lyrics \with { |
- \override VerticalAxisGroup #'staff-affinity = #CENTER |
+ \override VerticalAxisGroup.staff-affinity = #CENTER |
} \lyricmode { center } |
\new Lyrics \with { |
- \override VerticalAxisGroup #'staff-affinity = #DOWN |
+ \override VerticalAxisGroup.staff-affinity = #DOWN |
} \lyricmode { down } |
\new Staff { c'1 } |
>> |
@@ -2455,20 +2452,20 @@ example @code{NonMusicalPaperColumn} overrides with the special |
@example |
\overrideProperty NonMusicalPaperColumn |
- #'line-break-system-details #'((X-offset . 20)) |
+ line-break-system-details #'((X-offset . 20)) |
\overrideProperty NonMusicalPaperColumn |
- #'line-break-system-details #'((Y-offset . 40)) |
+ line-break-system-details #'((Y-offset . 40)) |
\overrideProperty NonMusicalPaperColumn |
- #'line-break-system-details #'((X-offset . 20) |
+ line-break-system-details #'((X-offset . 20) |
(Y-offset . 40)) |
\overrideProperty NonMusicalPaperColumn |
- #'line-break-system-details #'((alignment-distances . (15))) |
+ line-break-system-details #'((alignment-distances . (15))) |
\overrideProperty NonMusicalPaperColumn |
- #'line-break-system-details #'((X-offset . 20) |
+ line-break-system-details #'((X-offset . 20) |
(Y-offset . 40) |
(alignment-distances . (15))) |
@end example |
@@ -2520,14 +2517,14 @@ attribute of the @code{NonMusicalPaperColumn} grob: |
<< |
\new Staff << |
\new Voice { |
- \overrideProperty #"Score.NonMusicalPaperColumn" |
- #'line-break-system-details #'((Y-offset . 0)) |
+ \overrideProperty Score.NonMusicalPaperColumn |
+ line-break-system-details #'((Y-offset . 0)) |
s1*5 \break |
- \overrideProperty #"Score.NonMusicalPaperColumn" |
- #'line-break-system-details #'((Y-offset . 40)) |
+ \overrideProperty Score.NonMusicalPaperColumn |
+ line-break-system-details #'((Y-offset . 40)) |
s1*5 \break |
- \overrideProperty #"Score.NonMusicalPaperColumn" |
- #'line-break-system-details #'((Y-offset . 80)) |
+ \overrideProperty Score.NonMusicalPaperColumn |
+ line-break-system-details #'((Y-offset . 80)) |
s1*5 \break |
} |
\new Voice { \repeat unfold 15 { c'4 c' c' c' } } |
@@ -2558,16 +2555,16 @@ subproperty of @code{line-break-system-details}. |
<< |
\new Staff << |
\new Voice { |
- \overrideProperty #"Score.NonMusicalPaperColumn" |
- #'line-break-system-details #'((Y-offset . 20) |
+ \overrideProperty Score.NonMusicalPaperColumn |
+ line-break-system-details #'((Y-offset . 20) |
(alignment-distances . (15))) |
s1*5 \break |
- \overrideProperty #"Score.NonMusicalPaperColumn" |
- #'line-break-system-details #'((Y-offset . 60) |
+ \overrideProperty Score.NonMusicalPaperColumn |
+ line-break-system-details #'((Y-offset . 60) |
(alignment-distances . (15))) |
s1*5 \break |
- \overrideProperty #"Score.NonMusicalPaperColumn" |
- #'line-break-system-details #'((Y-offset . 100) |
+ \overrideProperty Score.NonMusicalPaperColumn |
+ line-break-system-details #'((Y-offset . 100) |
(alignment-distances . (15))) |
s1*5 \break |
} |
@@ -2599,16 +2596,16 @@ specifies the vertical positioning of staves but not of staff groups. |
<< |
\new Staff << |
\new Voice { |
- \overrideProperty #"Score.NonMusicalPaperColumn" |
- #'line-break-system-details #'((Y-offset . 0) |
+ \overrideProperty Score.NonMusicalPaperColumn |
+ line-break-system-details #'((Y-offset . 0) |
(alignment-distances . (30 10))) |
s1*5 \break |
- \overrideProperty #"Score.NonMusicalPaperColumn" |
- #'line-break-system-details #'((Y-offset . 60) |
+ \overrideProperty Score.NonMusicalPaperColumn |
+ line-break-system-details #'((Y-offset . 60) |
(alignment-distances . (10 10))) |
s1*5 \break |
- \overrideProperty #"Score.NonMusicalPaperColumn" |
- #'line-break-system-details #'((Y-offset . 100) |
+ \overrideProperty Score.NonMusicalPaperColumn |
+ line-break-system-details #'((Y-offset . 100) |
(alignment-distances . (10 30))) |
s1*5 \break |
} |
@@ -2680,13 +2677,13 @@ the staff. |
@lilypond[quote,ragged-right,relative=2,verbatim] |
c4_"Text"\pp |
r2. |
-\once \override TextScript #'outside-staff-priority = #1 |
+\once \override TextScript.outside-staff-priority = #1 |
c4_"Text"\pp % this time the text will be closer to the staff |
r2. |
% by setting outside-staff-priority to a non-number, |
% we disable the automatic collision avoidance |
-\once \override TextScript #'outside-staff-priority = ##f |
-\once \override DynamicLineSpanner #'outside-staff-priority = ##f |
+\once \override TextScript.outside-staff-priority = ##f |
+\once \override DynamicLineSpanner.outside-staff-priority = ##f |
c4_"Text"\pp % now they will collide |
@end lilypond |
@@ -2695,9 +2692,9 @@ previously-positioned grobs can be controlled with |
@code{outside-staff-padding}. |
@lilypond[quote,ragged-right,relative=2,verbatim,staffsize=18] |
-\once \override TextScript #'outside-staff-padding = #0 |
+\once \override TextScript.outside-staff-padding = #0 |
a'^"This text is placed very close to the note" |
-\once \override TextScript #'outside-staff-padding = #3 |
+\once \override TextScript.outside-staff-padding = #3 |
c^"This text is padded away from the previous text" |
c^"This text is placed close to the previous text" |
@end lilypond |
@@ -2719,7 +2716,7 @@ c4 |
c''2 |
% setting outside-staff-horizontal-padding fixes this |
R1 |
-\once \override TextScript #'outside-staff-horizontal-padding = #1 |
+\once \override TextScript.outside-staff-horizontal-padding = #1 |
c,,4^"Text" |
c4 |
c''2 |
@@ -2824,8 +2821,8 @@ once with exaggerated corrections: |
{ |
c'4 e''4 e'4 b'4 | |
b'4 e''4 b'4 e''4 | |
- \override Staff.NoteSpacing #'stem-spacing-correction = #1.5 |
- \override Staff.StaffSpacing #'stem-spacing-correction = #1.5 |
+ \override Staff.NoteSpacing.stem-spacing-correction = #1.5 |
+ \override Staff.StaffSpacing.stem-spacing-correction = #1.5 |
c'4 e''4 e'4 b'4 | |
b'4 e''4 b'4 e''4 | |
} |
@@ -2852,7 +2849,7 @@ following work-around may be used to insert extra space into a score, |
adjusting the padding value as necessary. |
@example |
- \override Score.NonMusicalPaperColumn #'padding = #10 |
+ \override Score.NonMusicalPaperColumn.padding = #10 |
@end example |
No work-around exists for decreasing the amount of space. |
@@ -2923,8 +2920,7 @@ than @code{1 16}. |
\layout { |
\context { |
\Score |
- \override SpacingSpanner |
- #'base-shortest-duration = #(ly:make-moment 1 16) |
+ \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1 16) |
} |
} |
} |
@@ -2958,7 +2954,7 @@ property can only be changed at the beginning of a score, |
\layout { |
\context { |
\Score |
- \override SpacingSpanner #'uniform-stretching = ##t |
+ \override SpacingSpanner.uniform-stretching = ##t |
} |
} |
} |
@@ -2968,7 +2964,7 @@ When @code{strict-note-spacing} is set, notes are spaced without |
regard for clefs, bar lines, and grace notes, |
@lilypond[quote,ragged-right,relative=2,verbatim] |
-\override Score.SpacingSpanner #'strict-note-spacing = ##t |
+\override Score.SpacingSpanner.strict-note-spacing = ##t |
\new Staff { c8[ c \clef alto c \grace { c16[ c] } c8 c c] c32[ c32] } |
@end lilypond |
@@ -3049,7 +3045,7 @@ which may be used together or alone: |
@item @code{uniform-stretching} |
@item @code{strict-note-spacing} |
@item @code{\remove "Separating_line_group_engraver"} |
-@item @code{\override PaperColumn #'used = ##t} |
+@item @code{\override PaperColumn.used = ##t} |
@end itemize |
In the examples that follow, we explore these five different |
@@ -3278,7 +3274,7 @@ turn on @code{uniform-stretching}, which is a property of |
\context { |
\Score |
proportionalNotationDuration = #(ly:make-moment 1 20) |
- \override SpacingSpanner #'uniform-stretching = ##t |
+ \override SpacingSpanner.uniform-stretching = ##t |
} |
} |
} |
@@ -3377,7 +3373,7 @@ property of @code{SpacingSpanner}. Compare the two scores below: |
\new Staff { |
\set Score.proportionalNotationDuration = #(ly:make-moment 1 16) |
- \override Score.SpacingSpanner #'strict-note-spacing = ##t |
+ \override Score.SpacingSpanner.strict-note-spacing = ##t |
c''8 |
c''8 |
c''8 |
@@ -3398,11 +3394,11 @@ In addition to the settings given here, there are other settings |
that frequently appear in proportional scores. These include: |
@itemize |
-@item @code{\override SpacingSpanner #'strict-grace-spacing = ##t} |
+@item @code{\override SpacingSpanner.strict-grace-spacing = ##t} |
@item @code{tupletFullLength = ##t} |
-@item @code{\override Beam #'breakable = ##t} |
-@item @code{\override Glissando #'breakable = ##t} |
-@item @code{\override TextSpanner #'breakable = ##t} |
+@item @code{\override Beam.breakable = ##t} |
+@item @code{\override Glissando.breakable = ##t} |
+@item @code{\override TextSpanner.breakable = ##t} |
@item @code{\remove "Forbid_line_break_engraver" in the Voice context} |
@end itemize |
@@ -3552,7 +3548,7 @@ a system can be moved closer to the staff: |
@lilypond[verbatim,quote,relative=1] |
e4 c g\f c |
-e4 c g-\tweak #'X-offset #-2.7 -\tweak #'Y-offset #2.5 \f c |
+e4 c g-\tweak X-offset #-2.7 -\tweak Y-offset #2.5 \f c |
@end lilypond |
@item |
@@ -3590,8 +3586,7 @@ duration longer, a @q{squeezing} effect occurs: |
\layout { |
\context { |
\Score |
- \override SpacingSpanner |
- #'common-shortest-duration = #(ly:make-moment 1 2) |
+ \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1 2) |
} |
} |
} |