From 617646bb3f5e82a2bcc23a954d3fd1f4636afc7c Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 22 Aug 2005 17:28:51 +0000 Subject: [PATCH] * scm/ps-to-png.scm: remove dir-re function. (make-ps-images): generate page names, instead of globbing them. This brings down LilyPond memory usage for make web by a factor 10. (backportme?) * lily/tie-column.cc (set_chord_outlines): new function. (new_directions): read tie-configuration --- ChangeLog | 3 +++ Documentation/topdocs/NEWS.tely | 6 ++--- input/regression/accidental-double.ly | 2 +- input/regression/accidental-placement.ly | 7 +++--- input/regression/accidental-quarter.ly | 2 +- input/regression/accidental-single-double.ly | 2 +- .../accidental-unbroken-tie-spacing.ly | 6 ++--- input/regression/accidental-voice.ly | 2 +- input/regression/apply-context.ly | 2 +- input/regression/apply-output.ly | 2 +- input/regression/arpeggio-bracket.ly | 2 +- input/regression/arpeggio-collision.ly | 12 +++++----- input/regression/arpeggio.ly | 2 +- input/regression/auto-beam-bar.ly | 4 +--- input/regression/auto-beam-triplet.ly | 2 +- input/regression/auto-beam-tuplets.ly | 2 +- input/regression/auto-beam.ly | 14 ++++++------ input/regression/auto-change.ly | 2 +- input/regression/balloon.ly | 3 ++- input/regression/bar-check-redefine.ly | 2 ++ input/regression/beam-auto-knee.ly | 4 +--- input/regression/beam-center-slope.ly | 9 ++++---- input/regression/beam-concave.ly | 12 +++++----- .../regression/beam-cross-staff-auto-knee.ly | 7 +++--- input/regression/beam-damp.ly | 6 ++--- input/regression/beam-default-lengths.ly | 2 +- input/regression/beam-extreme.ly | 10 ++++----- input/regression/beam-funky-beamlet.ly | 2 +- input/regression/beam-funky.ly | 3 ++- input/regression/beam-isknee.ly | 8 ++++--- input/regression/beam-knee-symmetry.ly | 14 ++++++------ input/regression/beam-manual-beaming.ly | 8 ++++--- input/regression/beam-multiple-cross-staff.ly | 6 ++++- input/regression/beam-over-barline.ly | 4 +++- input/regression/beam-position.ly | 7 +++--- input/regression/beam-quarter.ly | 1 + input/regression/beam-rest.ly | 3 ++- input/regression/beam-second.ly | 6 ++--- input/regression/beam-shortened-lengths.ly | 4 +++- input/regression/beaming-ternary-metrum.ly | 2 +- input/regression/beams.ly | 2 +- input/regression/chord-changes.ly | 5 ++++- input/regression/chord-name-entry-11.ly | 1 + input/regression/chord-tremolo-short.ly | 4 +++- input/regression/clef-oct.ly | 4 +++- input/regression/clefs.ly | 6 ++--- input/regression/cluster-cross-staff.ly | 6 ++--- input/regression/cluster.ly | 4 +++- input/regression/collision-2.ly | 3 ++- input/regression/collision-dots-invert.ly | 4 +++- input/regression/collision-head-chords.ly | 4 +++- input/regression/collision-merge-dots.ly | 4 +++- input/regression/custos.ly | 18 ++++++++------- input/regression/dot-flag-collision.ly | 4 +++- input/regression/dynamics-unbound-hairpin.ly | 4 +++- input/regression/follow-voice-break.ly | 7 +++--- input/regression/generic-output-property.ly | 5 ++--- input/regression/grace-auto-beam.ly | 4 +++- input/regression/grace-bar-line.ly | 4 +++- input/regression/grace-bar-number.ly | 4 +++- input/regression/grace-end.ly | 9 +++++--- input/regression/grace-nest.ly | 9 +++++--- input/regression/grace-nest1.ly | 1 + input/regression/grace-nest4.ly | 3 ++- input/regression/grace-nest5.ly | 2 +- input/regression/grace-start.ly | 5 ++++- input/regression/grace-stems.ly | 8 +++---- input/regression/grace-sync.ly | 5 ++++- input/regression/grace-volta-repeat.ly | 5 ++++- input/regression/grace.ly | 3 ++- input/regression/instrument-name-markup.ly | 5 ++++- input/regression/instrument-name-partial.ly | 5 ++++- input/regression/instrument-name.ly | 9 +++++--- input/regression/lyric-combine-polyphonic.ly | 3 ++- input/regression/lyric-extender.ly | 1 + input/regression/lyric-phrasing.ly | 5 ++++- input/regression/lyrics-melisma-beam.ly | 5 ++++- input/regression/markup-scheme.ly | 20 +++++++++-------- input/regression/markup-user.ly | 7 +++++- input/regression/metronome-marking.ly | 6 ++++- input/regression/multi-measure-rest-center.ly | 5 ++++- .../multi-measure-rest-instr-name.ly | 13 +++++------ .../multi-measure-rest-multi-staff-center.ly | 5 ++++- .../regression/multi-measure-rest-spacing.ly | 9 +++++--- input/regression/multi-measure-rest.ly | 15 +++++++------ input/regression/note-group-bracket.ly | 13 +++++------ input/regression/note-head-harmonic.ly | 10 ++++++--- input/regression/note-head-style.ly | 10 +++++---- .../part-combine-mmrest-after-solo.ly | 8 +++---- input/regression/part-combine.ly | 4 +++- input/regression/pedal-end.ly | 4 +++- input/regression/prefatory-spacing-matter.ly | 6 ++++- input/regression/repeat-slash.ly | 4 +++- input/regression/repeat-unfold-tremolo.ly | 4 +++- input/regression/rest-collision-beam.ly | 8 ++++--- input/regression/rest-collision.ly | 4 +++- input/regression/rest-polyphonic.ly | 4 +++- input/regression/script-collision.ly | 4 +++- input/regression/script-stack-order.ly | 4 +++- input/regression/slur-dash.ly | 7 ++++-- input/regression/slur-dots.ly | 8 ++++--- input/regression/slur-rest.ly | 4 +++- input/regression/slur-symmetry-1.ly | 8 ++++--- input/regression/slur-symmetry.ly | 8 ++++--- input/regression/spacing-accidental-staffs.ly | 4 +++- .../regression/spacing-accidental-stretch.ly | 22 +++++++++---------- input/regression/spacing-accidental.ly | 4 +++- input/regression/spacing-bar-stem.ly | 4 +++- input/regression/spacing-clef-first-note.ly | 19 ++++++++-------- input/regression/spacing-end-of-line.ly | 10 ++++++--- input/regression/spacing-ended-voice.ly | 6 +++-- input/regression/spacing-grace-duration.ly | 4 +++- input/regression/spacing-grace.ly | 4 +++- input/regression/spacing-knee.ly | 4 +++- input/regression/spacing-note-flags.ly | 10 +++++---- input/regression/spacing-rest.ly | 8 ++++--- input/regression/spacing-short-notes.ly | 4 +++- input/regression/spacing-stem-bar.ly | 4 +++- input/regression/spacing-stem-direction.ly | 8 ++++--- .../regression/spacing-stem-same-direction.ly | 4 +++- input/regression/spacing-to-grace.ly | 4 +++- input/regression/span-bar-break.ly | 4 +++- input/regression/span-bar.ly | 12 +++++----- input/regression/staccato-pos.ly | 8 ++++--- input/regression/staff-mixed-size.ly | 8 +++---- input/regression/staff-tweak.ly | 8 ++++--- input/regression/stem-shorten.ly | 8 ++++--- input/regression/system-start-bracket.ly | 4 +++- input/regression/tie-busy-grobs.ly | 8 ++++--- input/regression/voice-follower.ly | 10 +++++---- input/regression/volta-broken-left-edge.ly | 4 +++- input/regression/volta-multi-staff.ly | 4 +++- lily/tie-column.cc | 2 +- scm/ps-to-png.scm | 10 ++++----- 134 files changed, 490 insertions(+), 302 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1713081ef..8d961e6582 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-08-22 Han-Wen Nienhuys + * input/regression/*.ly: formatting clean-up. Default layout + before music expression. + * input/mutopia/R.Schumann/GNUmakefile (examples): switch off romanze28-2 example. diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely index 71de922b5b..8c8bd87a37 100644 --- a/Documentation/topdocs/NEWS.tely +++ b/Documentation/topdocs/NEWS.tely @@ -50,8 +50,8 @@ specify tie formatting @end lilypond This improvement has been sponsored by Bertalan Fodor, Jay Hamilton, -Kieren MacMillan, Steve Doonan, by Trevor Baca, and -Vicente Solsona Dellá. +Kieren MacMillan, Steve Doonan, Trevor Baca, and Vicente Solsona +Dellá. @item Formatting of isolated, single ties has been improved. Now, ties avoid @@ -66,7 +66,7 @@ staff lines, flags and dots, without compromising their shape. @end lilypond This improvement has been sponsored by Bertalan Fodor, Jay Hamilton, -Kieren MacMillan, Steve Doonan, by Trevor Baca, and Vicente Solsona +Kieren MacMillan, Steve Doonan, Trevor Baca, and Vicente Solsona Dellá. diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly index 9704a2691a..f0bd207e2a 100644 --- a/input/regression/accidental-double.ly +++ b/input/regression/accidental-double.ly @@ -4,6 +4,7 @@ sharp sign is printed." } +\layout { raggedright= ##t } \transpose c c' \context Staff << @@ -12,7 +13,6 @@ \context Voice = "vb" { \stemDown c fis! } >> -\layout { raggedright= ##t } diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly index d7a58b5be3..ca1e7b6b32 100644 --- a/input/regression/accidental-placement.ly +++ b/input/regression/accidental-placement.ly @@ -10,6 +10,10 @@ flats in a sixth should be staggered. " } +\layout { + raggedright = ##t +} + \context Voice \relative c' { @@ -32,8 +36,5 @@ flats in a sixth should be staggered. " } -\layout { - raggedright = ##t -} diff --git a/input/regression/accidental-quarter.ly b/input/regression/accidental-quarter.ly index 00643dd218..32b3ef495a 100644 --- a/input/regression/accidental-quarter.ly +++ b/input/regression/accidental-quarter.ly @@ -4,6 +4,7 @@ threequarters flat." } \version "2.6.0" +\layout { raggedright = ##t } \relative c'' { \time 12/4 @@ -18,4 +19,3 @@ cisih cisis } -\layout { raggedright = ##t } diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly index 907a127b83..a7e196925e 100644 --- a/input/regression/accidental-single-double.ly +++ b/input/regression/accidental-single-double.ly @@ -9,6 +9,7 @@ natural sign. } +\layout { raggedright = ##t } thenotes = \relative cis' { \time 4/4 @@ -23,5 +24,4 @@ thenotes = \relative cis' { } >> -\layout { raggedright = ##t } diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly index f4ba16868f..4c718a4932 100644 --- a/input/regression/accidental-unbroken-tie-spacing.ly +++ b/input/regression/accidental-unbroken-tie-spacing.ly @@ -5,6 +5,9 @@ wreak havoc in the spacing when unbroken." } \version "2.6.0" +\layout { + raggedright = ##t +} \relative c' { \clef treble @@ -13,6 +16,3 @@ wreak havoc in the spacing when unbroken." 8 } -\layout { - raggedright = ##t -} diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly index 38ec9aa440..66ab2514e8 100644 --- a/input/regression/accidental-voice.ly +++ b/input/regression/accidental-voice.ly @@ -1,4 +1,5 @@ \version "2.6.0" +\layout { raggedright = ##t } \header{ texidoc=" @@ -37,4 +38,3 @@ voiceb = \transpose c c' { } >> - \layout { raggedright = ##t } diff --git a/input/regression/apply-context.ly b/input/regression/apply-context.ly index 89676aeffa..86c838d999 100644 --- a/input/regression/apply-context.ly +++ b/input/regression/apply-context.ly @@ -14,7 +14,7 @@ This example prints a bar-number during processing on stdout. } - \layout { raggedright= ##t } +\layout { raggedright= ##t } \relative c'' { diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly index 78c2cfef25..cf99e3dba5 100644 --- a/input/regression/apply-output.ly +++ b/input/regression/apply-output.ly @@ -10,6 +10,7 @@ position. " } +\layout { raggedright = ##t } #(define (mc-squared gr org cur) (let* @@ -44,4 +45,3 @@ position. } -\layout { raggedright = ##t } diff --git a/input/regression/arpeggio-bracket.ly b/input/regression/arpeggio-bracket.ly index cfa3c5ed1a..050bd3b3f0 100644 --- a/input/regression/arpeggio-bracket.ly +++ b/input/regression/arpeggio-bracket.ly @@ -1,3 +1,4 @@ +\layout { raggedright= ##t } \version "2.6.0" @@ -14,5 +15,4 @@ arpeggiate the chord. \arpeggio } -\layout { raggedright= ##t } diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly index aa0e9133fd..cfe7694921 100644 --- a/input/regression/arpeggio-collision.ly +++ b/input/regression/arpeggio-collision.ly @@ -3,12 +3,6 @@ \header { texidoc = "Arpeggio stays clear of accidentals and flipped note heads." } - -\transpose c c' { - \arpeggio - \arpeggio - \arpeggio -} \layout { raggedright = ##t \context{ @@ -18,3 +12,9 @@ texidoc = "Arpeggio stays clear of accidentals and flipped note heads." } + +\transpose c c' { + \arpeggio + \arpeggio + \arpeggio +} diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly index 8d35d97442..7e5aa36ff5 100644 --- a/input/regression/arpeggio.ly +++ b/input/regression/arpeggio.ly @@ -6,6 +6,7 @@ Arpeggios are supported, both cross-staff and broken single staff. " } +\layout { raggedright= ##t } \context PianoStaff << @@ -25,4 +26,3 @@ Arpeggios are supported, both cross-staff and broken single staff. \arpeggio } >> -\layout { raggedright= ##t } diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly index d3a5fe56c4..45113cc54b 100644 --- a/input/regression/auto-beam-bar.ly +++ b/input/regression/auto-beam-bar.ly @@ -4,11 +4,9 @@ \header{ texidoc="No auto beams will be put over (manual) repeat bars." } +\layout{ raggedright = ##t } { \time 3/4 a'4 b' c''8 \bar ":|:" d''8 } -\layout{ - raggedright = ##t -} diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly index 2a2e019fb4..f8e1595775 100644 --- a/input/regression/auto-beam-triplet.ly +++ b/input/regression/auto-beam-triplet.ly @@ -5,9 +5,9 @@ } \version "2.6.0" +\layout { raggedright= ##t } \relative c''{ c8 c c c \times 4/6 { c c c c c c} } -\layout { raggedright= ##t } diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly index 7230612a9a..9766ef2434 100644 --- a/input/regression/auto-beam-tuplets.ly +++ b/input/regression/auto-beam-tuplets.ly @@ -5,6 +5,7 @@ texidoc = "Tuplet-spanner should not put (visible) brackets on beams even if they're auto generated." } +\layout { raggedright= ##t } \relative c' { \set tupletSpannerDuration = #(ly:make-moment 1 4) @@ -13,5 +14,4 @@ beams even if they're auto generated." f8[ f f ] f8[ f f ] f f f f f f } } -\layout { raggedright= ##t } diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly index 76f263c162..138d9678ff 100644 --- a/input/regression/auto-beam.ly +++ b/input/regression/auto-beam.ly @@ -5,16 +5,16 @@ beam." \version "2.6.0" -\layout { raggedright = ##t } - -\relative c'' { - a\longa a\breve - a1 a2 a4 a8 a16 a32 a64 a64 -} -\layout { +\layout { + raggedright = ##t \context { \Staff \remove "Clef_engraver" } } + +\relative c'' { + a\longa a\breve + a1 a2 a4 a8 a16 a32 a64 a64 +} diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly index 5925276b1f..080c01f0d0 100644 --- a/input/regression/auto-change.ly +++ b/input/regression/auto-change.ly @@ -9,7 +9,7 @@ note. When central C is reached, staff is not yet switched (by default). " } - \layout { raggedright= ##t } +\layout { raggedright= ##t } \context PianoStaff << \context Staff = "up" { diff --git a/input/regression/balloon.ly b/input/regression/balloon.ly index 909321a668..f710b9bc5c 100644 --- a/input/regression/balloon.ly +++ b/input/regression/balloon.ly @@ -5,6 +5,8 @@ with lines and explanatory text added." } \version "2.6.0" +\layout{ raggedright = ##t } + { \relative c' { @@ -27,4 +29,3 @@ with lines and explanatory text added." c8 } } -\layout{ raggedright = ##t } diff --git a/input/regression/bar-check-redefine.ly b/input/regression/bar-check-redefine.ly index 87302015d4..69880419d3 100644 --- a/input/regression/bar-check-redefine.ly +++ b/input/regression/bar-check-redefine.ly @@ -7,5 +7,7 @@ identifier @code{pipeSymbol}." pipeSymbol = \bar "||" \layout { raggedright = ##t } + + { c'2 | c'2 | } diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly index dafc149089..d8b1262a81 100644 --- a/input/regression/beam-auto-knee.ly +++ b/input/regression/beam-auto-knee.ly @@ -8,11 +8,9 @@ beam fits in a gap between note heads that is larger than a predefined threshold. " } +\layout{ raggedright = ##t } \context Staff \relative c''{ c'8[ c,,] c8[ e'] c,16[ e g c e g c c,,] } -\layout{ - raggedright = ##t -} diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly index 4c7dcc00ae..4fdd49ad27 100644 --- a/input/regression/beam-center-slope.ly +++ b/input/regression/beam-center-slope.ly @@ -8,6 +8,11 @@ } +\layout{ + raggedright = ##t + indent = 0 +} + \relative c'{ %%\override Staff.Stem #'beamed-lengths = #'(3.50) %% c8[ d] @@ -40,8 +45,4 @@ a''[ f] f[ a] } -\layout{ - raggedright = ##t - indent = 0 -} diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly index 0c570a8fb1..1c1c8fc935 100644 --- a/input/regression/beam-concave.ly +++ b/input/regression/beam-concave.ly @@ -50,6 +50,12 @@ rossBeams = \relative c'' { } +\layout{ + raggedright = ##t + #(define debug-beam-quanting #t) +} + + #(define (<> x y) (not (= x y))) @@ -58,9 +64,3 @@ rossBeams = \relative c'' { \rossBeams } - \layout{ - raggedright = ##t - #(define debug-beam-quanting #t) - } - - diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly index cc9decfaa1..20771666fd 100644 --- a/input/regression/beam-cross-staff-auto-knee.ly +++ b/input/regression/beam-cross-staff-auto-knee.ly @@ -8,6 +8,10 @@ produced with explicit staff switches)." } +\layout{ + raggedright = ##t +} + \context PianoStaff << \context Staff = "up" \relative c''{ b8[ \change Staff="down" d,, ] @@ -19,6 +23,3 @@ produced with explicit staff switches)." s2. } >> -\layout{ - raggedright = ##t -} diff --git a/input/regression/beam-damp.ly b/input/regression/beam-damp.ly index 687a7d5f05..d65d78a02f 100644 --- a/input/regression/beam-damp.ly +++ b/input/regression/beam-damp.ly @@ -2,6 +2,9 @@ \version "2.6.0" \header { texidoc = "@cindex Beam Damp Beams are less steep than the notes they encompass. " } +\layout{ + raggedright = ##t +} \relative c''{ %% \stemUp @@ -17,8 +20,5 @@ Beams are less steep than the notes they encompass. " } d'[ c b a] a[ b c d] } -\layout{ - raggedright = ##t -} diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly index f765336f85..1462490f19 100644 --- a/input/regression/beam-default-lengths.ly +++ b/input/regression/beam-default-lengths.ly @@ -1,3 +1,4 @@ +\layout{ raggedright = ##t} \version "2.6.0" @@ -13,4 +14,3 @@ f4 f8[ f] f16[ f] f32[ f] f64[ f] f128[ f] } -\layout{ raggedright = ##t} diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index 87ecdbd05b..3fc5d62e27 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -9,6 +9,11 @@ under normal circumstances, these beams would get knees here " } +\layout{ + %% raggedright = ##t + raggedright = ##t +} + extreme = \relative c'' { \stemNeutral g8[ c c,] @@ -33,8 +38,3 @@ extreme = \relative c'' { \override Beam #'auto-knee-gap = ##f \extreme } - -\layout{ - %% raggedright = ##t - raggedright = ##t -} diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly index b7b0bd2699..3884d8b7f1 100644 --- a/input/regression/beam-funky-beamlet.ly +++ b/input/regression/beam-funky-beamlet.ly @@ -8,6 +8,7 @@ should be pointing to the note head. } +\layout { raggedright = ##t} \relative c' { c16 c''8 c,,16 @@ -15,5 +16,4 @@ should be pointing to the note head. c16 c,,8 c16 } -\layout { raggedright = ##t} diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly index 1f03f4ddf5..2c1991784c 100644 --- a/input/regression/beam-funky.ly +++ b/input/regression/beam-funky.ly @@ -9,6 +9,8 @@ beam. This is in disagreement with the current algorithm." } +\layout { raggedright = ##t} + \relative c' { \override Beam #'auto-knee-gap = #7 @@ -34,5 +36,4 @@ beam. This is in disagreement with the current algorithm." } } } -\layout { raggedright = ##t} diff --git a/input/regression/beam-isknee.ly b/input/regression/beam-isknee.ly index 357b821771..9b8ff307a5 100644 --- a/input/regression/beam-isknee.ly +++ b/input/regression/beam-isknee.ly @@ -8,6 +8,11 @@ Beams can be placed across a @code{PianoStaff}. " } + +\layout{ + raggedright = ##t +} + \context PianoStaff << \context Staff = "one" \relative c'{ s1 @@ -20,9 +25,6 @@ Beams can be placed across a @code{PianoStaff}. s2 } >> -\layout{ - raggedright = ##t -} diff --git a/input/regression/beam-knee-symmetry.ly b/input/regression/beam-knee-symmetry.ly index d066969415..43d8ad4e4f 100644 --- a/input/regression/beam-knee-symmetry.ly +++ b/input/regression/beam-knee-symmetry.ly @@ -6,11 +6,11 @@ quanting. There is no up/down bias in the quanting code." } +\layout{ + raggedright = ##t +} - \relative c'{ - a8[ b'' a,, b''] - b8[ a,, b'' a,,] - } - \layout{ - raggedright = ##t - } +\relative c'{ + a8[ b'' a,, b''] + b8[ a,, b'' a,,] +} diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly index bd4655fda5..ef28af44ac 100644 --- a/input/regression/beam-manual-beaming.ly +++ b/input/regression/beam-manual-beaming.ly @@ -6,6 +6,10 @@ texidoc = "Beaming can be overidden for individual stems." } +\layout{ + raggedright = ##t +} + \relative c'' { c32[ c @@ -21,6 +25,4 @@ #'beaming = #(cons (list 0 2 4) (list 0 1 4)) c c c] } -\layout{ - raggedright = ##t -} + diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly index 962f118a62..c26322af07 100644 --- a/input/regression/beam-multiple-cross-staff.ly +++ b/input/regression/beam-multiple-cross-staff.ly @@ -8,6 +8,10 @@ to the last beam. " } +\layout { + raggedright= ##t +} + \context PianoStaff \relative c' << \context Staff = SA { \stemDown @@ -24,5 +28,5 @@ to the last beam. } >> -\layout { raggedright= ##t } + diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly index 7d732b6536..4c258f03ff 100644 --- a/input/regression/beam-over-barline.ly +++ b/input/regression/beam-over-barline.ly @@ -3,7 +3,9 @@ \header { texidoc = "Explicit beams may cross barlines. " } +\layout { raggedright= ##t } + \relative c'' { c2. c8[ c8 c8 c8] } -\layout { raggedright= ##t } + diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly index a8bbebd37e..9880bc8693 100644 --- a/input/regression/beam-position.ly +++ b/input/regression/beam-position.ly @@ -9,6 +9,10 @@ note beams. Override with @code{no-stem-extend}. " } +\layout { + raggedright = ##t +} + \context Voice \relative c { f8[ f] f64[ f] @@ -21,6 +25,3 @@ note beams. Override with @code{no-stem-extend}. " f8[ f] } -\layout { - raggedright = ##t -} diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly index b7a2a240fc..c929a6004a 100644 --- a/input/regression/beam-quarter.ly +++ b/input/regression/beam-quarter.ly @@ -6,6 +6,7 @@ } \layout { raggedright = ##t } + \relative c'' { c8[ c4 c8] % should warn here! } diff --git a/input/regression/beam-rest.ly b/input/regression/beam-rest.ly index 5a7f0a0dde..43669b2127 100644 --- a/input/regression/beam-rest.ly +++ b/input/regression/beam-rest.ly @@ -5,8 +5,9 @@ \version "2.6.0" +\layout { raggedright = ##t } + \relative c, { \clef bass e8[ r16 f d'8 e16 e16] c8[ c16 r16 bes8 r16 c16] | } -\layout { raggedright = ##t } diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly index d73e7b3844..a62fc99f2d 100644 --- a/input/regression/beam-second.ly +++ b/input/regression/beam-second.ly @@ -10,6 +10,9 @@ quickly." } +\layout{ + raggedright = ##t +} \relative c''{ \stemUp @@ -17,6 +20,3 @@ quickly." b16[ c] a'[ b] } -\layout{ - raggedright = ##t -} diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly index 4097f7dfa1..14f5350a0a 100644 --- a/input/regression/beam-shortened-lengths.ly +++ b/input/regression/beam-shortened-lengths.ly @@ -4,6 +4,8 @@ \header{ texidoc="Beams in unnatural direction, have shortened stems, but do not look too short." } +\layout{ raggedright = ##t } + \relative c'{ \override Beam #'position-callbacks = @@ -13,4 +15,4 @@ \stemUp f'4 f8[ f] f16[ f] f32[ f] f64[ f] f128[ f] } -\layout{ raggedright = ##t } + diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly index 0c232c64ab..785f9d876e 100644 --- a/input/regression/beaming-ternary-metrum.ly +++ b/input/regression/beaming-ternary-metrum.ly @@ -3,10 +3,10 @@ \header { texidoc = "Automatic beaming works also in ternary time sigs." } +\layout { raggedright = ##t} \relative c'' { \time 6/8 c8.[ c16 c16 c16] } -\layout { raggedright = ##t} diff --git a/input/regression/beams.ly b/input/regression/beams.ly index 9b2d3fd63d..42c01f25b4 100644 --- a/input/regression/beams.ly +++ b/input/regression/beams.ly @@ -4,7 +4,7 @@ texidoc = "Beaming can be also given explicitly." } - \layout { raggedright= ##t } +\layout { raggedright= ##t } \relative c' { diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly index 8c253cdaf2..e07f30fe06 100644 --- a/input/regression/chord-changes.ly +++ b/input/regression/chord-changes.ly @@ -7,6 +7,9 @@ chord name after a line break. " } +\layout{ raggedright = ##t } + + scheme = \chordmode { c1:m \break c:m c:m c:m d c1:m \break c:m c:m c:m d @@ -22,4 +25,4 @@ settings = { >> \context Staff \transpose c c' \scheme >> - \layout{ raggedright = ##t } + diff --git a/input/regression/chord-name-entry-11.ly b/input/regression/chord-name-entry-11.ly index ec843b54a2..c004997166 100644 --- a/input/regression/chord-name-entry-11.ly +++ b/input/regression/chord-name-entry-11.ly @@ -8,5 +8,6 @@ } \layout { raggedright = ##t } + \chordmode { c:13 c:13.11 c:m13 } diff --git a/input/regression/chord-tremolo-short.ly b/input/regression/chord-tremolo-short.ly index 756c058de2..c491e62498 100644 --- a/input/regression/chord-tremolo-short.ly +++ b/input/regression/chord-tremolo-short.ly @@ -4,11 +4,13 @@ Tremolo repeats can be constructed for short tremolos (total duration smaller than 1/4) too. Only some of the beams are connected to the stems. " } +\layout { raggedright = ##t } + \context Staff \relative c' { \repeat "tremolo" 2 { c32 e32 } \stemDown \repeat "tremolo" 2 { c32 e32 } } -\layout { raggedright = ##t } + diff --git a/input/regression/clef-oct.ly b/input/regression/clef-oct.ly index 5ac0e01d5c..684a915931 100644 --- a/input/regression/clef-oct.ly +++ b/input/regression/clef-oct.ly @@ -6,6 +6,8 @@ octavation signs may be placed below or above (meaning an octave higher or lower), and can take any value, including 15 for two octaves." } +\layout { raggedright = ##t } + \relative c'' { @@ -24,4 +26,4 @@ higher or lower), and can take any value, including 15 for two octaves." \clef "G^9" c4 } -\layout { raggedright = ##t } + diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly index aa9bc7894f..f795fcd519 100644 --- a/input/regression/clefs.ly +++ b/input/regression/clefs.ly @@ -8,6 +8,9 @@ or below the clef respectively." } +\layout{ + raggedright = ##t +} { @@ -25,7 +28,4 @@ or below the clef respectively." \override Staff.Clef #'full-size-change = ##t \clef "treble" c'1^"full-size-change = #t" \bar "|." } -\layout{ - raggedright = ##t -} diff --git a/input/regression/cluster-cross-staff.ly b/input/regression/cluster-cross-staff.ly index c9744625de..ac491a4bad 100644 --- a/input/regression/cluster-cross-staff.ly +++ b/input/regression/cluster-cross-staff.ly @@ -3,6 +3,9 @@ texidoc = "Clusters can be written across staves." } +\layout { + raggedright= ##t +} \version "2.6.0" @@ -17,6 +20,3 @@ { \clef bass s1 * 2 } >> >> -\layout { - raggedright= ##t -} diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly index b606591f67..1926b36793 100644 --- a/input/regression/cluster.ly +++ b/input/regression/cluster.ly @@ -4,6 +4,8 @@ texidoc = "Clusters are a device to denote that a complete range of notes is to be played." } + \layout { raggedright = ##t } + fragment = \relative c' { c4 f4 4 @@ -15,7 +17,7 @@ fragment = \relative c' { \new Staff \fragment \new Staff \applymusic #notes-to-clusters \fragment >> - \layout { raggedright = ##t } + diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly index 2e64ede364..5755557c24 100644 --- a/input/regression/collision-2.ly +++ b/input/regression/collision-2.ly @@ -2,7 +2,8 @@ \header { texidoc = "Single head notes may collide. " } - \layout { raggedright= ##t } + +\layout { raggedright= ##t } \context Staff \transpose c c' << diff --git a/input/regression/collision-dots-invert.ly b/input/regression/collision-dots-invert.ly index 1e733cec1d..b16cf2b461 100644 --- a/input/regression/collision-dots-invert.ly +++ b/input/regression/collision-dots-invert.ly @@ -4,9 +4,11 @@ dots: notes with dots should go to the right, if there could be confusion to which notes the dots belong." } +\layout { raggedright = ##t } + \version "2.6.0" \relative c'' { << 2\\ { 4 4 } >> << { 2 } \\ { 4. 8 } >> } -\layout { raggedright = ##t } + diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly index 1e463308b3..e430bc89d4 100644 --- a/input/regression/collision-head-chords.ly +++ b/input/regression/collision-head-chords.ly @@ -5,12 +5,14 @@ they have the same positions in the extreme note heads. " } +\layout {raggedright = ##t} + \relative c'' { c4 << { c4 d4 8 } \\ { c4 c 8 8 } >> } -\layout {raggedright = ##t} + diff --git a/input/regression/collision-merge-dots.ly b/input/regression/collision-merge-dots.ly index 143022e0f2..35a25706a8 100644 --- a/input/regression/collision-merge-dots.ly +++ b/input/regression/collision-merge-dots.ly @@ -2,6 +2,8 @@ texidoc = "When merging heads, the dots are merged too." } +\layout { raggedright = ##t } + \version "2.6.0" { @@ -10,4 +12,4 @@ } } -\layout { raggedright = ##t } + diff --git a/input/regression/custos.ly b/input/regression/custos.ly index 26872303a0..524ebffdb4 100644 --- a/input/regression/custos.ly +++ b/input/regression/custos.ly @@ -3,6 +3,16 @@ texidoc = "Custodes may be engraved in various styles." } +\layout { + \context { + \Staff + \consists Custos_engraver + } + raggedright = ##t +} + + + { \override Staff.Custos #'neutral-position = #4 @@ -22,11 +32,3 @@ c'1^"mensural" \break < d' a' f''>1 } -\layout { - \context { - \Staff - \consists Custos_engraver - } - raggedright = ##t -} - diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly index 27ac159bec..7a5b3682ef 100644 --- a/input/regression/dot-flag-collision.ly +++ b/input/regression/dot-flag-collision.ly @@ -3,6 +3,8 @@ \header { texidoc = "Dots move to the right when a collision with the (up)flag happens." } +\layout { raggedright = ##t} + \relative c'' { @@ -12,6 +14,6 @@ g''16. a,4. a8 a8. a16. c,16. g16. } -\layout { raggedright = ##t} + diff --git a/input/regression/dynamics-unbound-hairpin.ly b/input/regression/dynamics-unbound-hairpin.ly index 3c5be6ac3b..f03ec547fa 100644 --- a/input/regression/dynamics-unbound-hairpin.ly +++ b/input/regression/dynamics-unbound-hairpin.ly @@ -3,10 +3,12 @@ \header { texidoc = "Crescendi may start off-notes, however, they should not collapse into flat lines." } +\layout { raggedright = ##t} + \context Voice { << f''1 { s4 s4 \< s4\! \> s4\! } >> } -\layout { raggedright = ##t} + diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly index 01f862b280..47ccdb8151 100644 --- a/input/regression/follow-voice-break.ly +++ b/input/regression/follow-voice-break.ly @@ -9,6 +9,9 @@ printed. } +\layout{ raggedright = ##t } + + \context PianoStaff << \set PianoStaff.followVoice = ##t @@ -19,7 +22,5 @@ printed. } \context Staff = "two" { \clef bass \skip 1*2 } >> -\layout{ - raggedright = ##t -} + diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly index 8aeaf0b7c7..353d8b88ed 100644 --- a/input/regression/generic-output-property.ly +++ b/input/regression/generic-output-property.ly @@ -8,6 +8,8 @@ setting the @code{extra-offset} of a grob. " } +\layout{ raggedright = ##t } + \relative c''{ \context Bottom @@ -24,8 +26,5 @@ setting the @code{extra-offset} of a grob. \mark \default e } -\layout{ - raggedright = ##t -} diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly index 019500c9f3..8badb59575 100644 --- a/input/regression/grace-auto-beam.ly +++ b/input/regression/grace-auto-beam.ly @@ -4,6 +4,8 @@ { texidoc = "The autobeamer is not confused by grace notes." } +\layout { raggedright = ##t } + \context Voice \relative c''{ @@ -11,6 +13,6 @@ \grace a8 g16 f e f \grace a8 g16 f e f \grace a8 g16 f e f \grace a8 g16 f e f | } -\layout { raggedright = ##t } + diff --git a/input/regression/grace-bar-line.ly b/input/regression/grace-bar-line.ly index 86ae1f6826..e42779905d 100644 --- a/input/regression/grace-bar-line.ly +++ b/input/regression/grace-bar-line.ly @@ -3,6 +3,8 @@ \header { texidoc = "Bar line should come before the grace note." } +\layout { raggedright = ##t} + @@ -10,6 +12,6 @@ \relative c' \context Staff { f1 \grace { a'16[ f] } g1 } -\layout { raggedright = ##t} + diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly index e6404f02a4..8dcdf688dd 100644 --- a/input/regression/grace-bar-number.ly +++ b/input/regression/grace-bar-number.ly @@ -9,11 +9,13 @@ breaks should be possible at grace notes, and the bar number should be printed correctly. " } +\layout { raggedright = ##t } + \relative c'' { c1 \break \grace c8 c1 } -\layout { raggedright = ##t } + diff --git a/input/regression/grace-end.ly b/input/regression/grace-end.ly index 38d21e62a9..759958b58c 100644 --- a/input/regression/grace-end.ly +++ b/input/regression/grace-end.ly @@ -8,14 +8,17 @@ } +\layout { + raggedright = ##t +} + + \context Voice \relative c' { c4 \grace { d16[ d16] } } -\layout { - raggedright = ##t -} + diff --git a/input/regression/grace-nest.ly b/input/regression/grace-nest.ly index a32c24f902..459293b610 100644 --- a/input/regression/grace-nest.ly +++ b/input/regression/grace-nest.ly @@ -4,13 +4,16 @@ } -{ - c''2 { \grace b'16 c''2 } \bar "|." -} \layout { raggedright = ##t } +{ + c''2 { \grace b'16 c''2 } \bar "|." +} + + + diff --git a/input/regression/grace-nest1.ly b/input/regression/grace-nest1.ly index 94147c16f4..20ddd1b0f4 100644 --- a/input/regression/grace-nest1.ly +++ b/input/regression/grace-nest1.ly @@ -3,6 +3,7 @@ texidoc = "Grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." } + \layout { raggedright= ##t } diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly index a3a2b772cc..ca26585678 100644 --- a/input/regression/grace-nest4.ly +++ b/input/regression/grace-nest4.ly @@ -3,6 +3,8 @@ texidoc = "Also in the nested syntax here, grace notes appear rightly." } +\layout { raggedright = ##t } + \context Voice \relative c'' { << @@ -10,7 +12,6 @@ >> \grace c16 c2. \bar "|." } -\layout { raggedright = ##t } diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly index 6eaf8661a7..43e9bf9263 100644 --- a/input/regression/grace-nest5.ly +++ b/input/regression/grace-nest5.ly @@ -3,12 +3,12 @@ \header { texidoc = "Graces notes may have the same duration as the main note." } +\layout { raggedright = ##t } \relative c'' { s2 4 \grace g e4 } -\layout { raggedright = ##t } diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly index cf1bfbd5d5..a668ce79a7 100644 --- a/input/regression/grace-start.ly +++ b/input/regression/grace-start.ly @@ -3,12 +3,15 @@ \header { texidoc = "Pieces may begin with grace notes." } + +\layout { raggedright = ##t} + \relative c' \context Staff { \grace { a'16[ f] } g1 \bar "||" % test if | and || are synced. \grace { a16[ bes] } c1 \bar "||" % test if | and || are synced. } -\layout { raggedright = ##t} + diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly index c1772b58c7..c48a1c6caf 100644 --- a/input/regression/grace-stems.ly +++ b/input/regression/grace-stems.ly @@ -7,6 +7,9 @@ true; the two grace beams should be the same here. } +\layout { + raggedright = ##t +} \context Voice \relative c { \grace { @@ -18,9 +21,4 @@ true; the two grace beams should be the same here. a4 } -\layout { - raggedright = ##t -} -\midi { } - diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly index b85ea82973..9b94bb983b 100644 --- a/input/regression/grace-sync.ly +++ b/input/regression/grace-sync.ly @@ -3,6 +3,9 @@ texidoc = "Grace notes in different voices/staves are synchronized." } +\layout { raggedright = ##t} + + \relative c'' << \context Staff { c2 @@ -15,6 +18,6 @@ c4) c4 } \new Staff { c2 c4 c4 \bar "|." } >> -\layout { raggedright = ##t} + diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly index 18117cfc92..d6a72ce96a 100644 --- a/input/regression/grace-volta-repeat.ly +++ b/input/regression/grace-volta-repeat.ly @@ -7,6 +7,9 @@ } +\layout { raggedright = ##t} + + \relative c''{\key a \minor \time 2/4 \repeat "volta" 2 { @@ -15,7 +18,7 @@ } } -\layout { raggedright = ##t} + diff --git a/input/regression/grace.ly b/input/regression/grace.ly index f3e465f35c..e673124a8f 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -12,6 +12,8 @@ Main note scripts do not end up on the grace note. " } +\layout {raggedright = ##t} + \context Voice = VA \relative c'' { \grace b8 c4\fermata \grace { c32[ cis32] } gis4 @@ -24,6 +26,5 @@ Main note scripts do not end up on the grace note. %%\grace { \set Grace.graceAlignPosition = \right c16} c4 c4 \grace { c16 } c4 } -\layout {raggedright = ##t} diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly index 0552b865dd..02c88df089 100644 --- a/input/regression/instrument-name-markup.ly +++ b/input/regression/instrument-name-markup.ly @@ -1,6 +1,9 @@ \header { texidoc = "Instrument names are set with @code{Staff.instrument} and + +\layout { raggedright = ##t } + @code{Staff.instr}. You can enter markup texts to create more funky names, including alterations. " @@ -20,7 +23,7 @@ textFlat = \markup {\smaller \flat} { c''1 \break c'' } } -\layout { raggedright = ##t } + diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly index c2781a0680..74d813589d 100644 --- a/input/regression/instrument-name-partial.ly +++ b/input/regression/instrument-name-partial.ly @@ -4,8 +4,11 @@ texidoc = "Instrument names are also printed on partial starting measures." } +\layout { raggedright = ##t } + + \relative c'' { \set Staff.instrument = "foo" \partial 4 c4 c1 } -\layout { raggedright = ##t } + diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly index c767c01acf..b3d1959013 100644 --- a/input/regression/instrument-name.ly +++ b/input/regression/instrument-name.ly @@ -8,6 +8,11 @@ PianoStaff. " } +\layout { + raggedright = ##t +} + + @@ -19,8 +24,6 @@ PianoStaff. \set Staff.instrument = "Right " { c''4 }} \context Staff = "bass" { \set Staff.instrument = "Left " \clef bass c4 }>> -\layout { - raggedright = ##t -} + diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index 7234ef1ac6..42dcf6396d 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -6,6 +6,7 @@ } +\layout { raggedright = ##t} { \clef violin @@ -29,6 +30,6 @@ } >> } -\layout { raggedright = ##t} + diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly index 4f74db7802..e2742423f0 100644 --- a/input/regression/lyric-extender.ly +++ b/input/regression/lyric-extender.ly @@ -8,6 +8,7 @@ does not extend past a rest, or past the next lyric syllable." } \layout { raggedright = ##t } + \relative c''{ d8( e f) r4. f4 diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly index fe32bef281..0b7068c998 100644 --- a/input/regression/lyric-phrasing.ly +++ b/input/regression/lyric-phrasing.ly @@ -8,6 +8,9 @@ " } + \layout { raggedright = ##t } + + << @@ -22,5 +25,5 @@ izzz } >> - \layout { raggedright = ##t } + diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly index ae915d19e5..402cadcdc9 100644 --- a/input/regression/lyrics-melisma-beam.ly +++ b/input/regression/lyrics-melisma-beam.ly @@ -4,6 +4,9 @@ texidoc = "Melismata are triggered by manual beams." } + \layout { raggedright = ##t } + + << @@ -14,5 +17,5 @@ \lyricsto "" \new Lyrics \lyricmode { bla bla bla } >> - \layout { raggedright = ##t } + diff --git a/input/regression/markup-scheme.ly b/input/regression/markup-scheme.ly index 68568adff2..d1f1aa5389 100644 --- a/input/regression/markup-scheme.ly +++ b/input/regression/markup-scheme.ly @@ -14,6 +14,17 @@ For maintenance reasons, we don't excercise the entire markup command set. %} +\layout { + raggedright = ##t + indent = #0 + \context { + \Staff + \remove Time_signature_engraver + } +} + + + \version "2.6.0" { @@ -62,12 +73,3 @@ For maintenance reasons, we don't excercise the entire markup command set. #:smaller #:smaller #:smaller "A") #:sub "alike") } -\layout { - raggedright = ##t - indent = #0 - \context { - \Staff - \remove Time_signature_engraver - } -} - diff --git a/input/regression/markup-user.ly b/input/regression/markup-user.ly index ec0b6552fc..f632a71961 100644 --- a/input/regression/markup-user.ly +++ b/input/regression/markup-user.ly @@ -7,6 +7,11 @@ } + +\layout { raggedright = ##t } + + + \version "2.6.0" % to be updated #(def-markup-command (upcase paper props str) (string?) @@ -18,5 +23,5 @@ c''-\markup \upcase #"hello world" % produces a "HELLO WORLD" markup } -\layout { raggedright = ##t } + diff --git a/input/regression/metronome-marking.ly b/input/regression/metronome-marking.ly index fea439b9cc..607c8539a2 100644 --- a/input/regression/metronome-marking.ly +++ b/input/regression/metronome-marking.ly @@ -5,17 +5,21 @@ texidoc = "Here @code{\\tempo} directives are printed as metronome markings. + + The marking is left aligned with the time signature, if there is one. " } +\layout { raggedright = ##t } + \version "2.6.0" \relative c'' { \tempo \breve = 100 c1 c1 \tempo 8.. = 50 c1 } -\layout { raggedright = ##t } + diff --git a/input/regression/multi-measure-rest-center.ly b/input/regression/multi-measure-rest-center.ly index 48fbcbc12a..5165f84076 100644 --- a/input/regression/multi-measure-rest-center.ly +++ b/input/regression/multi-measure-rest-center.ly @@ -5,6 +5,9 @@ } +\layout { raggedright = ##t} + + { @@ -14,7 +17,7 @@ c'1 R1*20 c'1 } -\layout { raggedright = ##t} + diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly index 4338e09b2e..bb526c52e5 100644 --- a/input/regression/multi-measure-rest-instr-name.ly +++ b/input/regression/multi-measure-rest-instr-name.ly @@ -7,12 +7,6 @@ multimeasure rests. " } - -\context Staff << - \set Staff.instrument = "instrument" - \set Staff.instr = "instr" - {c''1 \break R1 } ->> \layout { raggedright = ##t \context { @@ -23,5 +17,8 @@ multimeasure rests. " } - - +\context Staff << + \set Staff.instrument = "instrument" + \set Staff.instr = "instr" + {c''1 \break R1 } +>> diff --git a/input/regression/multi-measure-rest-multi-staff-center.ly b/input/regression/multi-measure-rest-multi-staff-center.ly index 6c359af9f3..63e7ebc86a 100644 --- a/input/regression/multi-measure-rest-multi-staff-center.ly +++ b/input/regression/multi-measure-rest-multi-staff-center.ly @@ -2,7 +2,10 @@ independent on prefatory matter in other staves." } + + \version "2.6.0" +\layout { raggedright = ##t } << \new Staff { R1 } @@ -10,5 +13,5 @@ independent on prefatory matter in other staves." >> - \layout { raggedright = ##t } + diff --git a/input/regression/multi-measure-rest-spacing.ly b/input/regression/multi-measure-rest-spacing.ly index 6c23e5eeef..4d08d40ceb 100644 --- a/input/regression/multi-measure-rest-spacing.ly +++ b/input/regression/multi-measure-rest-spacing.ly @@ -3,6 +3,11 @@ texidoc = "By setting texts starting with a multi-measure rest, an extra spacing column is created. This should not cause problems." } + + \layout { + raggedright = ##t + } + \version "2.6.0" @@ -12,7 +17,5 @@ extra spacing column is created. This should not cause problems." << { R1*40 } { s1*0_"bla" }>> } >> - \layout { - raggedright = ##t - } + diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly index 2afd03cb11..3e45b19884 100644 --- a/input/regression/multi-measure-rest.ly +++ b/input/regression/multi-measure-rest.ly @@ -14,6 +14,14 @@ are used then a different symbol is used. " } +\layout { + \context { + \Score + skipBars = ##t + } + raggedright = ##t +} + { \time 3/4 \key cis \major @@ -26,12 +34,5 @@ are used then a different symbol is used. \time 8/4 R1*2 } -\layout { - \context { - \Score - skipBars = ##t - } - raggedright = ##t -} diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly index bc63a69bf8..d5d70e1405 100644 --- a/input/regression/note-group-bracket.ly +++ b/input/regression/note-group-bracket.ly @@ -16,6 +16,12 @@ analysis brackets start and end. } +\layout { + \context { + \Staff \consists "Horizontal_bracket_engraver" + } + raggedright = ##t +} \relative c'' @@ -28,11 +34,4 @@ analysis brackets start and end. c4\stopGroup\stopGroup } -\layout { - \context { - \Staff \consists "Horizontal_bracket_engraver" - } - raggedright = ##t -} - diff --git a/input/regression/note-head-harmonic.ly b/input/regression/note-head-harmonic.ly index 3c2f405f53..b357e95e1f 100644 --- a/input/regression/note-head-harmonic.ly +++ b/input/regression/note-head-harmonic.ly @@ -4,6 +4,12 @@ completely identical to normal note heads. Harmonic heads do not get dots. If @code{harmonicAccidentals} is unset, they also don't get accidentals." + + +} + +\layout { + raggedright = ##t } \version "2.6.0" @@ -18,7 +24,5 @@ < dis'' gis''\harmonic >8 } -\layout { - raggedright = ##t -} + diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly index 5502966297..59a55325ce 100644 --- a/input/regression/note-head-style.ly +++ b/input/regression/note-head-style.ly @@ -11,6 +11,11 @@ dimensions. " } +\layout { + indent = 0.0 + raggedright = ##t +} + pattern = << \new Voice { \override Stem #'direction = #UP @@ -81,8 +86,5 @@ pattern = << \pattern } -\layout { - indent = 0.0 - raggedright = ##t -} + diff --git a/input/regression/part-combine-mmrest-after-solo.ly b/input/regression/part-combine-mmrest-after-solo.ly index 9433f7ee63..a5bc407fb1 100644 --- a/input/regression/part-combine-mmrest-after-solo.ly +++ b/input/regression/part-combine-mmrest-after-solo.ly @@ -4,7 +4,7 @@ \version "2.6.0" \layout { raggedright = ##t } - \new Staff - \partcombine - \relative c''{ R1*2 | c4 r2. | c2 r | R1 } - \relative c' { c2 r | R1 | c4 r2. | R1*2 } +\new Staff +\partcombine +\relative c''{ R1*2 | c4 r2. | c2 r | R1 } +\relative c' { c2 r | R1 | c4 r2. | R1*2 } diff --git a/input/regression/part-combine.ly b/input/regression/part-combine.ly index b1c52a68b7..cefd7fcc32 100644 --- a/input/regression/part-combine.ly +++ b/input/regression/part-combine.ly @@ -9,6 +9,8 @@ " } +\layout { raggedright = ##t } + \version "2.6.0" vone = \relative a' { @@ -23,6 +25,6 @@ vtwo = \relative a' { \partcombine \vone \vtwo -\layout { raggedright = ##t } + diff --git a/input/regression/pedal-end.ly b/input/regression/pedal-end.ly index 49b7aaf6d2..6186814f49 100644 --- a/input/regression/pedal-end.ly +++ b/input/regression/pedal-end.ly @@ -5,11 +5,13 @@ } +\layout { raggedright = ##t } + { \set Staff.pedalSustainStyle = #'bracket c4 \sustainDown \bar "|." } -\layout { raggedright = ##t } + diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly index 910b943116..24997ddbe7 100644 --- a/input/regression/prefatory-spacing-matter.ly +++ b/input/regression/prefatory-spacing-matter.ly @@ -10,6 +10,10 @@ bar-line is different from the start of line. } +\layout { + raggedright = ##t +} + \relative c'' { \set Staff.instrument = "fobar" \bar "||:" @@ -20,6 +24,6 @@ bar-line is different from the start of line. \key g \minor c1 } -\layout { raggedright = ##t} + diff --git a/input/regression/repeat-slash.ly b/input/regression/repeat-slash.ly index a9e2c7f972..1c210e64d6 100644 --- a/input/regression/repeat-slash.ly +++ b/input/regression/repeat-slash.ly @@ -4,6 +4,8 @@ played again." } +\layout { raggedright = ##t } + \relative c' \context Voice { \time 4/4 @@ -13,5 +15,5 @@ played again." \repeat "percent" 2 { g'8 g c, c } \repeat "percent" 4 { b8 b8 } } -\layout { raggedright = ##t } + diff --git a/input/regression/repeat-unfold-tremolo.ly b/input/regression/repeat-unfold-tremolo.ly index 2c00727808..cd5454e8ea 100644 --- a/input/regression/repeat-unfold-tremolo.ly +++ b/input/regression/repeat-unfold-tremolo.ly @@ -6,6 +6,8 @@ } +\layout { raggedright = ##t } + { @@ -23,5 +25,5 @@ } -\layout { raggedright = ##t } + diff --git a/input/regression/rest-collision-beam.ly b/input/regression/rest-collision-beam.ly index d9cc6e7b12..274287296f 100644 --- a/input/regression/rest-collision-beam.ly +++ b/input/regression/rest-collision-beam.ly @@ -2,6 +2,10 @@ texidoc = "Rests under beams are only moved if necessary." } +\layout { + raggedright = ##t +} + \version "2.6.0" fig = \relative c' { @@ -31,8 +35,6 @@ fig = \relative c' { >> } - \layout { - raggedright = ##t - } + diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly index bfbe75b1af..f259aa9ed5 100644 --- a/input/regression/rest-collision.ly +++ b/input/regression/rest-collision.ly @@ -10,6 +10,8 @@ cases. " } +\layout { raggedright = ##t } + scale = \relative c' { c8 d e f g a b c c d e f g a b c @@ -48,7 +50,7 @@ restsII = \context Staff { \scales \restsII } -\layout { raggedright = ##t } + diff --git a/input/regression/rest-polyphonic.ly b/input/regression/rest-polyphonic.ly index b962edcd5e..3c8d4ae6e1 100644 --- a/input/regression/rest-polyphonic.ly +++ b/input/regression/rest-polyphonic.ly @@ -6,6 +6,8 @@ even if there is no opposite note or rest. The amount is two } +\layout { raggedright = ##t } + \version "2.6.0" @@ -14,5 +16,5 @@ even if there is no opposite note or rest. The amount is two << { r8 g''4 g8 r g4 g8 } \\ { d,4 r d r } >> } -\layout { raggedright = ##t } + diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly index ef5f32f6be..7ccc913520 100644 --- a/input/regression/script-collision.ly +++ b/input/regression/script-collision.ly @@ -6,6 +6,8 @@ positioned correctly when there are collisions." } +\layout { raggedright = ##t} + \relative c'' { c4 @@ -13,6 +15,6 @@ << { c4^^ }\\ { d4_^ } >> } -\layout { raggedright = ##t} + diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly index 5114c08ab9..4d911ae45b 100644 --- a/input/regression/script-stack-order.ly +++ b/input/regression/script-stack-order.ly @@ -7,7 +7,9 @@ order determines the order. Objects specified first are closest to the note. " } -\relative c'' { c4^"inner up"^"outer up"_"inner down"_"outer down" } \layout { raggedright = ##t} +\relative c'' { c4^"inner up"^"outer up"_"inner down"_"outer down" } + + diff --git a/input/regression/slur-dash.ly b/input/regression/slur-dash.ly index d9e332359d..56b191dee9 100644 --- a/input/regression/slur-dash.ly +++ b/input/regression/slur-dash.ly @@ -2,7 +2,9 @@ \header {texidoc = "@cindex Slur, dotted, dashed The appearance of slurs may be changed from solid to dotted or dashed. " - } +} +\layout{ raggedright=##t } + \relative c'{ c( d e c) | @@ -16,7 +18,8 @@ The appearance of slurs may be changed from solid to dotted or dashed. \slurSolid c( d e c) | } -\layout{ raggedright=##t } + + diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly index a51dbe94bf..61fbf83047 100644 --- a/input/regression/slur-dots.ly +++ b/input/regression/slur-dots.ly @@ -5,12 +5,14 @@ of dots, the problems becomes more visible." } -\relative c'' { - c4.............( c) -} \layout { raggedright = ##t } +\relative c'' { + c4.............( c) +} + + diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly index 1278958aba..8935448f6f 100644 --- a/input/regression/slur-rest.ly +++ b/input/regression/slur-rest.ly @@ -7,6 +7,8 @@ the rest. " } + +\layout { raggedright = ##t } { \stemDown c'4 ( r4 c'2) \relative c'' { @@ -15,6 +17,6 @@ the rest. } } -\layout { raggedright = ##t } + diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly index 844bee9888..f24e14a1ca 100644 --- a/input/regression/slur-symmetry-1.ly +++ b/input/regression/slur-symmetry-1.ly @@ -4,6 +4,10 @@ texidoc = "Symmetric figures should lead to symmetric slurs." } +\layout{ + raggedright = ##t +} + \relative c''<< \time 4/4 @@ -14,8 +18,6 @@ e,(e e e) e(d d e) e(c c e) e(b b e) } >> -\layout{ - raggedright = ##t -} + diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly index a86dc56b5c..f52d559539 100644 --- a/input/regression/slur-symmetry.ly +++ b/input/regression/slur-symmetry.ly @@ -5,6 +5,10 @@ } +\layout{ + raggedright = ##t +} + \relative c'<< \time 6/8 @@ -15,8 +19,6 @@ f'8(f f) f(g f) f(a f) f(b f) } >> -\layout{ - raggedright = ##t -} + diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly index 7b8a3eaae5..db7aed0933 100644 --- a/input/regression/spacing-accidental-staffs.ly +++ b/input/regression/spacing-accidental-staffs.ly @@ -5,6 +5,8 @@ spacing of the eighth notes here." } +\layout { raggedright = ##t} + \relative c'' << \new Staff { \time 4/4 @@ -17,7 +19,7 @@ spacing of the eighth notes here." } >> -\layout { raggedright = ##t} + diff --git a/input/regression/spacing-accidental-stretch.ly b/input/regression/spacing-accidental-stretch.ly index 114327939c..f428ae4381 100644 --- a/input/regression/spacing-accidental-stretch.ly +++ b/input/regression/spacing-accidental-stretch.ly @@ -2,20 +2,18 @@ \version "2.6.0" \header { - texidoc = "Accidentals do not influence the amount of stretchable space. + texidoc = "Accidentals do not influence the amount of stretchable space. The accidental does add a little non-stretchable space. " } -\score { - \relative c'' \context GrandStaff { - #(set-accidental-style 'piano-cautionary) - \time 2/4 - d16 d d d d d cis d dis dis dis dis - - } - - %% not raggedright!! - \layout { linewidth = 18.\cm - } +%% not raggedright!! +\layout { + linewidth = 18.\cm +} +\relative c'' \context GrandStaff { + #(set-accidental-style 'piano-cautionary) + \time 2/4 + d16 d d d d d cis d dis dis dis dis + } diff --git a/input/regression/spacing-accidental.ly b/input/regression/spacing-accidental.ly index 6d89738001..5af64a9af0 100644 --- a/input/regression/spacing-accidental.ly +++ b/input/regression/spacing-accidental.ly @@ -6,12 +6,14 @@ of a note will take a little more space, but only if the spacing is tight." } +\layout { raggedright = ##t} + \relative c'' { \time 8/4 c2 c2 cis2 cis2 | c8 c8 cis8 cis8 cis c c c] } -\layout { raggedright = ##t} + diff --git a/input/regression/spacing-bar-stem.ly b/input/regression/spacing-bar-stem.ly index d8df82bc86..83a90cc423 100644 --- a/input/regression/spacing-bar-stem.ly +++ b/input/regression/spacing-bar-stem.ly @@ -9,6 +9,8 @@ Accidentals after the barline get some space as well. " } +\layout { raggedright = ##t} + \relative c'' { @@ -19,6 +21,6 @@ Accidentals after the barline get some space as well. \stemDown c4 \stemUp c4 \stemDown f c,4 c'4 cis4 \stemUp c4 } -\layout { raggedright = ##t} + diff --git a/input/regression/spacing-clef-first-note.ly b/input/regression/spacing-clef-first-note.ly index 468b78624b..b2c9fd6e73 100644 --- a/input/regression/spacing-clef-first-note.ly +++ b/input/regression/spacing-clef-first-note.ly @@ -6,6 +6,16 @@ than clef changes halfway the line." } + \layout { + raggedright = ##t + \context { + \Staff + \remove Time_signature_engraver + } + } + + + << \new Staff { @@ -17,12 +27,3 @@ than clef changes halfway the line." c'4 c'4 c'4 } >> - \layout { - raggedright = ##t - \context { - \Staff - \remove Time_signature_engraver - } - } - - diff --git a/input/regression/spacing-end-of-line.ly b/input/regression/spacing-end-of-line.ly index 093545241e..5b583d8883 100644 --- a/input/regression/spacing-end-of-line.ly +++ b/input/regression/spacing-end-of-line.ly @@ -3,7 +3,12 @@ \header { texidoc ="Broken engraving of a bar at the end of a line does not upset - the space following rests and notes." } + the space following rests and notes." + +} + +\layout { + raggedright = ##t } \relative c' { @@ -12,7 +17,6 @@ \time 3/4 \break e2 e4 | e2 e4 \time 4/4 \break } -\layout { - raggedright = ##t } + diff --git a/input/regression/spacing-ended-voice.ly b/input/regression/spacing-ended-voice.ly index 6ceab62b6b..bb962269a7 100644 --- a/input/regression/spacing-ended-voice.ly +++ b/input/regression/spacing-ended-voice.ly @@ -2,8 +2,9 @@ \header { texidoc = " A voicelet (a very short voice to get polyphonic chords correct) should not confuse the spacing engine." - } +} +\layout { raggedright = ##t } { \context Staff \relative c' { @@ -16,6 +17,7 @@ should not confuse the spacing engine." >> c4 }} -\layout { raggedright = ##t } + + diff --git a/input/regression/spacing-grace-duration.ly b/input/regression/spacing-grace-duration.ly index ccda67c403..a02dda3993 100644 --- a/input/regression/spacing-grace-duration.ly +++ b/input/regression/spacing-grace-duration.ly @@ -9,6 +9,8 @@ " } +\layout { raggedright = ##t} + \relative c'' \context Voice { @@ -18,6 +20,6 @@ } -\layout { raggedright = ##t} + diff --git a/input/regression/spacing-grace.ly b/input/regression/spacing-grace.ly index 82553d1c4f..60c7c96bbe 100644 --- a/input/regression/spacing-grace.ly +++ b/input/regression/spacing-grace.ly @@ -4,9 +4,11 @@ texidoc = "Grace note spacing. " } +\layout { raggedright = ##t} + \context Voice \relative c'' { \grace { c16[ d] } c4 } -\layout { raggedright = ##t} + diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly index 442f78c445..5eabbc4ebd 100644 --- a/input/regression/spacing-knee.ly +++ b/input/regression/spacing-knee.ly @@ -7,6 +7,8 @@ width of the note heads and the thickness of the stem. " } +\layout { raggedright = ##t} + { g''8[ g g'' g''] @@ -16,7 +18,7 @@ width of the note heads and the thickness of the stem. \override Stem #'thickness = #10 g''8[ g g'' g''] } -\layout { raggedright = ##t} + diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly index d0edc43d1a..e69d0b0795 100644 --- a/input/regression/spacing-note-flags.ly +++ b/input/regression/spacing-note-flags.ly @@ -1,3 +1,4 @@ +\version "2.6.0" \header { @@ -7,15 +8,16 @@ } +\layout { + raggedright = ##t +} + \relative c'' \context Staff { \set autoBeaming = ##f a8[ a8 a8 a8] a8 a8 a8 a8 } -\layout { - raggedright = ##t -} -\version "2.6.0" + diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly index 439b7736ed..fd14af8da2 100644 --- a/input/regression/spacing-rest.ly +++ b/input/regression/spacing-rest.ly @@ -6,12 +6,14 @@ However, the quarter rest in feta font is relatively wide, causing this effect to be very small. " } + +\layout { + raggedright = ##t +} \relative c'' \context Staff { \time 12/4 r4 c4 c4 c4 r4 r4 c4 } -\layout { - raggedright = ##t -} + diff --git a/input/regression/spacing-short-notes.ly b/input/regression/spacing-short-notes.ly index d6f5243ac5..44375e7c71 100644 --- a/input/regression/spacing-short-notes.ly +++ b/input/regression/spacing-short-notes.ly @@ -10,6 +10,8 @@ eighth note. " } +\layout { raggedright = ##t} + \relative c'' { \time 2/4 @@ -20,6 +22,6 @@ eighth note. " } -\layout { raggedright = ##t} + diff --git a/input/regression/spacing-stem-bar.ly b/input/regression/spacing-stem-bar.ly index 3310b800d0..9a36e658ac 100644 --- a/input/regression/spacing-stem-bar.ly +++ b/input/regression/spacing-stem-bar.ly @@ -8,6 +8,8 @@ space. This is an optical correction similar to juxtaposed stems. } +\layout { raggedright = ##t} + \relative e' { @@ -22,6 +24,6 @@ space. This is an optical correction similar to juxtaposed stems. c c c e e e } -\layout { raggedright = ##t} + diff --git a/input/regression/spacing-stem-direction.ly b/input/regression/spacing-stem-direction.ly index 8762620c97..00a14fb0f1 100644 --- a/input/regression/spacing-stem-direction.ly +++ b/input/regression/spacing-stem-direction.ly @@ -11,6 +11,10 @@ much to correct." } +\layout { + raggedright = ##t +} + \context Voice \relative c { %% make sure neutral is down. @@ -18,8 +22,6 @@ much to correct." \time 16/4 c''4 c c, c' d, c' e, c' f, c' g c a c b c } -\layout { - raggedright = ##t -} + diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly index 464940b86e..d9aaceb95f 100644 --- a/input/regression/spacing-stem-same-direction.ly +++ b/input/regression/spacing-stem-same-direction.ly @@ -6,12 +6,14 @@ slight optical correction is used. It is constant, and works only if two chords have no common head-positions range." } +\layout { raggedright = ##t} + \relative c'' { \stemDown \time 12/4 f8[ e f e] f[ d f d] f[ c f c] f[ b, f' b,] f'[ a, f' a,] } -\layout { raggedright = ##t} + diff --git a/input/regression/spacing-to-grace.ly b/input/regression/spacing-to-grace.ly index 5d9308f599..899a1eb2b5 100644 --- a/input/regression/spacing-to-grace.ly +++ b/input/regression/spacing-to-grace.ly @@ -7,6 +7,8 @@ } +\layout { raggedright = ##t} + \context Voice { \time 2/4 @@ -17,6 +19,6 @@ } } -\layout { raggedright = ##t} + diff --git a/input/regression/span-bar-break.ly b/input/regression/span-bar-break.ly index 793ec60ee6..f3a4423f91 100644 --- a/input/regression/span-bar-break.ly +++ b/input/regression/span-bar-break.ly @@ -7,6 +7,8 @@ barline is drawn between the staves, but the @code{:|} is not." } +\layout{ raggedright = ##t } + \new PianoStaff << \context Staff = "up" { @@ -15,5 +17,5 @@ barline is drawn between the staves, but the @code{:|} is not." } \context Staff = "down" { r r } >> -\layout{ raggedright = ##t } + diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly index dbd9b2da0f..856ce1c234 100644 --- a/input/regression/span-bar.ly +++ b/input/regression/span-bar.ly @@ -9,6 +9,12 @@ between systems. " } +\layout { + \context { + \Staff + } + raggedright =##t +} \relative c' \new StaffGroup << \new Staff { @@ -26,12 +32,6 @@ between systems. f1 f1 f1 f1 } >> -\layout { - \context { - \Staff - } - raggedright =##t -} diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly index bca8c63bae..8e12b3db12 100644 --- a/input/regression/staccato-pos.ly +++ b/input/regression/staccato-pos.ly @@ -10,14 +10,16 @@ to it. " } +\layout { + raggedright = ##t +} + \context Voice \relative c' { e'4-. f-. g-. d-. c-. b-. \stemDown e,-. d-. c-. b-. a-. g-. } -\layout { - raggedright = ##t -} + diff --git a/input/regression/staff-mixed-size.ly b/input/regression/staff-mixed-size.ly index 86087c938e..1e56d53429 100644 --- a/input/regression/staff-mixed-size.ly +++ b/input/regression/staff-mixed-size.ly @@ -9,6 +9,10 @@ large on smaller staves." \version "2.6.0" +\layout { + #(layout-set-staff-size 6) + raggedright = ##t +} << \new Staff \with { @@ -26,8 +30,4 @@ large on smaller staves." } >> - \layout { - #(layout-set-staff-size 6) - raggedright = ##t - } diff --git a/input/regression/staff-tweak.ly b/input/regression/staff-tweak.ly index 28e9d8bce2..79339fc9ff 100644 --- a/input/regression/staff-tweak.ly +++ b/input/regression/staff-tweak.ly @@ -6,6 +6,10 @@ However, beams remain correctly quantized." } +\layout { + raggedright = ##t +} + mus = \relative c' { c4 g' d'8 d d d } @@ -19,8 +23,6 @@ mus = \relative c' { c4 g' d'8 d d d } } \mus >> - \layout { - raggedright = ##t - } + diff --git a/input/regression/stem-shorten.ly b/input/regression/stem-shorten.ly index ef35c229b3..442b38e3b9 100644 --- a/input/regression/stem-shorten.ly +++ b/input/regression/stem-shorten.ly @@ -9,6 +9,10 @@ } +\layout { + raggedright = ##t +} + \relative c'' { \stemDown d c b a g f e @@ -18,7 +22,5 @@ 2 } -\layout { - raggedright = ##t -} + diff --git a/input/regression/system-start-bracket.ly b/input/regression/system-start-bracket.ly index 5eb99f1e56..010b70fda3 100644 --- a/input/regression/system-start-bracket.ly +++ b/input/regression/system-start-bracket.ly @@ -6,6 +6,8 @@ The piano brace should be shifted horizontally if it is enclosed in a bracket. " } +\layout {raggedright = ##t} + { \context StaffGroup << @@ -16,6 +18,6 @@ The piano brace should be shifted horizontally if it is enclosed in a bracket. >> >> } -\layout {raggedright = ##t} + diff --git a/input/regression/tie-busy-grobs.ly b/input/regression/tie-busy-grobs.ly index 169be093cc..ca30ebd7af 100644 --- a/input/regression/tie-busy-grobs.ly +++ b/input/regression/tie-busy-grobs.ly @@ -8,6 +8,10 @@ one may have collisions between ties and beams. } +\layout { + raggedright = ##t +} + \context Staff \relative c'' << @@ -18,8 +22,6 @@ one may have collisions between ties and beams. { \voiceThree { b,8 ~ b8 ~ b8 ~ b8 }} >> - \layout { - raggedright = ##t - } + diff --git a/input/regression/voice-follower.ly b/input/regression/voice-follower.ly index 419bde81c5..546fba0adc 100644 --- a/input/regression/voice-follower.ly +++ b/input/regression/voice-follower.ly @@ -7,7 +7,11 @@ Whenever a voice switches to another staff a line connecting the notes can be printed automatically. This is enabled if the property @code{followVoice} is set to true. " - } +} + +\layout{ + raggedright = ##t +} \relative c' \context PianoStaff << @@ -19,7 +23,5 @@ can be printed automatically. This is enabled if the property } \context Staff = "two" {\clef bass \skip 1*2 } >> -\layout{ - raggedright = ##t -} + diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly index 1485927094..9eba69a6e0 100644 --- a/input/regression/volta-broken-left-edge.ly +++ b/input/regression/volta-broken-left-edge.ly @@ -5,6 +5,8 @@ } +\layout { raggedright =##t } + %{ @@ -118,6 +120,6 @@ voiceE = { } >> - \layout { raggedright =##t } + diff --git a/input/regression/volta-multi-staff.ly b/input/regression/volta-multi-staff.ly index 7e68b4f39b..b4272dfc36 100644 --- a/input/regression/volta-multi-staff.ly +++ b/input/regression/volta-multi-staff.ly @@ -4,6 +4,8 @@ also over other staves than the topmost one in a score." } + +\layout { raggedright = ##t } \version "2.6.0" @@ -24,5 +26,5 @@ vmus = { \repeat volta 2 c1 \alternative { d e } } >> >> -\layout { raggedright = ##t } + diff --git a/lily/tie-column.cc b/lily/tie-column.cc index 1ab6cd18a9..4f6eae212c 100644 --- a/lily/tie-column.cc +++ b/lily/tie-column.cc @@ -137,7 +137,7 @@ set_chord_outlines (Drul_array< Array > *skyline_drul, if (boxes.size()) { Box b = boxes.boundary (updowndir, 0); - Interval x = b[X_AXIS]; + x = b[X_AXIS]; x[-d] = b[X_AXIS].linear_combination (-d / 2); } diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm index ab0ac5d672..f43c3f19c3 100644 --- a/scm/ps-to-png.scm +++ b/scm/ps-to-png.scm @@ -168,13 +168,13 @@ (set! status (my-system verbose? #f cmd)) - (if multi-page? - (set! files + (set! files + (if multi-page? (map (lambda (n) (format "~a-page~a.png" base (1+ n))) - (iota page-count))) - (list (format "~a.png" base))) + (iota page-count)) + (list (format "~a.png" base)))) (if (not (= 0 status)) (begin @@ -188,7 +188,7 @@ (cons png1 (cdr files))) )) - + (if (not (= 1 aa-factor)) (for-each (lambda (f) (scale-down-image verbose? aa-factor f)) files)) -- 2.39.2