From 39dd20959c8b3a143cfe41138a5c62749da54079 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 17 Oct 2005 00:04:45 +0000 Subject: [PATCH] * input/regression/override-nest.ly: new file. * python/convertrules.py (FatalConversionError.subber): conversion rule for #'callbacks * input/regression/override-nest.ly: new function. * lily/parser.yy (music_property_def): allow \override #'a #'b = #c too. * lily/context-property.cc (lookup_nested_property): new function. (evict_from_alist): new function. (general_pushpop_property): new function. (execute_general_pushpop_property): rewrite. Support nested properties too. --- ChangeLog | 16 ++ input/regression/+.ly | 2 +- input/regression/allfontstyle.ily | 2 +- input/regression/balloon.ly | 12 +- input/regression/bar-check-redefine.ly | 2 +- input/regression/bar-number.ly | 2 +- input/regression/bar-scripts.ly | 2 +- input/regression/beam-auto-knee.ly | 2 +- input/regression/beam-auto.ly | 2 +- input/regression/beam-break.ly | 2 +- input/regression/beam-center-slope.ly | 2 +- input/regression/beam-concave-damped.ly | 2 +- input/regression/beam-concave.ly | 2 +- .../regression/beam-cross-staff-auto-knee.ly | 2 +- input/regression/beam-cross-staff-slope.ly | 2 +- input/regression/beam-cross-staff.ly | 2 +- input/regression/beam-damp.ly | 2 +- input/regression/beam-default-lengths.ly | 2 +- input/regression/beam-extreme.ly | 2 +- input/regression/beam-french.ly | 2 +- input/regression/beam-funky-beamlet.ly | 2 +- input/regression/beam-funky.ly | 2 +- input/regression/beam-isknee.ly | 2 +- input/regression/beam-knee-symmetry.ly | 2 +- input/regression/beam-length.ly | 2 +- input/regression/beam-manual-beaming.ly | 2 +- input/regression/beam-multiple-cross-staff.ly | 2 +- input/regression/beam-outside-beamlets.ly | 2 +- input/regression/beam-over-barline.ly | 2 +- input/regression/beam-position.ly | 2 +- input/regression/beam-quant-standard.ly | 2 +- input/regression/beam-quanting-32nd.ly | 2 +- input/regression/beam-quanting-horizontal.ly | 2 +- input/regression/beam-quarter.ly | 2 +- input/regression/beam-rest.ly | 2 +- input/regression/beam-second.ly | 2 +- input/regression/beam-shortened-lengths.ly | 2 +- input/regression/beaming-ternary-metrum.ly | 2 +- input/regression/beaming.ly | 2 +- input/regression/beams.ly | 2 +- input/regression/break.ly | 2 +- input/regression/breathing-sign-ancient.ly | 2 +- input/regression/breathing-sign.ly | 2 +- input/regression/chord-changes.ly | 2 +- input/regression/chord-name-entry-11.ly | 2 +- input/regression/chord-name-entry.ly | 2 +- input/regression/chord-name-exceptions.ly | 2 +- input/regression/chord-name-major7.ly | 2 +- input/regression/chord-names-bass.ly | 2 +- input/regression/chord-scripts.ly | 2 +- input/regression/chord-tremolo-short.ly | 2 +- input/regression/chord-tremolo.ly | 2 +- input/regression/chords-funky-ignatzek.ly | 2 +- input/regression/clef-oct.ly | 2 +- input/regression/clefs.ly | 2 +- input/regression/cluster-cross-staff.ly | 2 +- input/regression/cluster.ly | 2 +- input/regression/collision-2.ly | 2 +- input/regression/collision-alignment.ly | 2 +- input/regression/collision-dots-invert.ly | 2 +- input/regression/collision-dots-move.ly | 2 +- input/regression/collision-dots.ly | 2 +- input/regression/collision-head-chords.ly | 2 +- input/regression/collision-heads.ly | 2 +- .../collision-merge-differently-dotted.ly | 2 +- input/regression/collision-merge-dots.ly | 2 +- input/regression/collision-mesh.ly | 2 +- input/regression/collisions.ly | 2 +- input/regression/color.ly | 2 +- .../regression/completion-heads-polyphony.ly | 2 +- input/regression/completion-heads.ly | 2 +- input/regression/custos.ly | 2 +- input/regression/dot-flag-collision.ly | 2 +- input/regression/dots.ly | 2 +- input/regression/drums.ly | 2 +- input/regression/dynamics-broken-hairpin.ly | 2 +- input/regression/dynamics-glyphs.ly | 2 +- input/regression/dynamics-hairpin-length.ly | 2 +- input/regression/dynamics-line.ly | 2 +- input/regression/dynamics-unbound-hairpin.ly | 2 +- input/regression/easy-notation.ly | 2 +- input/regression/fermata-rest-position.ly | 2 +- .../figured-bass-continuation-center.ly | 2 +- input/regression/figured-bass-continuation.ly | 2 +- input/regression/figured-bass.ly | 2 +- input/regression/fill-line-test.ly | 2 +- input/regression/finger-chords-order.ly | 2 +- input/regression/finger-chords.ly | 2 +- input/regression/fingering.ly | 2 +- input/regression/follow-voice-break.ly | 2 +- input/regression/font-family-override.ly | 2 +- input/regression/font-magnification.ly | 2 +- input/regression/font-name.ly | 2 +- input/regression/font-postscript.ly | 2 +- input/regression/fret-diagrams.ly | 2 +- input/regression/generic-output-property.ly | 2 +- input/regression/glissando.ly | 2 +- input/regression/grace-auto-beam.ly | 2 +- input/regression/grace-bar-line.ly | 2 +- input/regression/grace-bar-number.ly | 2 +- input/regression/grace-beam.ly | 2 +- input/regression/grace-end.ly | 2 +- input/regression/grace-nest.ly | 2 +- input/regression/grace-nest1.ly | 2 +- input/regression/grace-nest2.ly | 2 +- input/regression/grace-nest3.ly | 2 +- input/regression/grace-nest4.ly | 2 +- input/regression/grace-nest5.ly | 2 +- input/regression/grace-part-combine.ly | 2 +- input/regression/grace-staff-length.ly | 2 +- input/regression/grace-start.ly | 2 +- input/regression/grace-stem-length.ly | 2 +- input/regression/grace-stems.ly | 2 +- input/regression/grace-sync.ly | 2 +- input/regression/grace-types.ly | 2 +- input/regression/grace-unfold-repeat.ly | 2 +- input/regression/grace-volta-repeat-2.ly | 2 +- input/regression/grace-volta-repeat.ly | 2 +- input/regression/grace.ly | 2 +- input/regression/grid-lines.ly | 2 +- input/regression/hairpin-dashed.ly | 2 +- input/regression/hairpin-ending.ly | 2 +- input/regression/hara-kiri-pianostaff.ly | 2 +- input/regression/instrument-name-markup.ly | 2 +- input/regression/instrument-name-partial.ly | 2 +- input/regression/instrument-name.ly | 2 +- input/regression/key-clefs.ly | 2 +- .../regression/key-signature-cancellation.ly | 2 +- input/regression/key-signature-scordatura.ly | 2 +- input/regression/keys.ly | 2 +- input/regression/laissez-vibrer-ties.ly | 2 +- input/regression/landscape.ly | 2 +- input/regression/ledger-line-minimum.ly | 2 +- input/regression/ledger-line-shorten.ly | 2 +- input/regression/lily-in-scheme.ly | 2 +- input/regression/line-arrows.ly | 2 +- input/regression/lyric-combine-new.ly | 2 +- input/regression/lyric-combine-polyphonic.ly | 2 +- input/regression/lyric-combine.ly | 2 +- input/regression/lyric-extender-broken.ly | 2 +- input/regression/lyric-extender.ly | 2 +- input/regression/lyric-hyphen-break.ly | 2 +- input/regression/lyric-hyphen-retain.ly | 4 +- input/regression/lyric-hyphen.ly | 2 +- input/regression/lyric-melisma-manual.ly | 2 +- input/regression/lyric-phrasing.ly | 2 +- input/regression/lyrics-bar.ly | 2 +- input/regression/lyrics-melisma-beam.ly | 2 +- input/regression/lyrics-tenor-clef.ly | 2 +- input/regression/markup-arrows.ly | 2 +- input/regression/markup-bidi-pango.ly | 2 +- input/regression/markup-eps.ly | 2 +- input/regression/markup-note.ly | 2 +- input/regression/markup-scheme.ly | 2 +- input/regression/markup-score.ly | 2 +- input/regression/markup-stack.ly | 2 +- input/regression/markup-syntax.ly | 2 +- input/regression/markup-user.ly | 2 +- input/regression/markup-word-wrap.ly | 2 +- input/regression/measure-grouping.ly | 2 +- input/regression/mensural-ligatures.ly | 2 +- input/regression/mensural.ly | 2 +- input/regression/metronome-marking.ly | 2 +- input/regression/mm-rests2.ly | 2 +- input/regression/multi-measure-rest-center.ly | 2 +- input/regression/multi-measure-rest-grace.ly | 2 +- .../multi-measure-rest-instr-name.ly | 2 +- .../multi-measure-rest-multi-staff-center.ly | 2 +- .../regression/multi-measure-rest-spacing.ly | 2 +- input/regression/multi-measure-rest-text.ly | 4 +- input/regression/multi-measure-rest.ly | 2 +- input/regression/music-function.ly | 2 +- input/regression/music-map.ly | 2 +- input/regression/newaddlyrics.ly | 2 +- input/regression/no-staff.ly | 2 +- input/regression/non-empty-text.ly | 2 +- input/regression/note-group-bracket.ly | 2 +- input/regression/note-head-chord.ly | 2 +- input/regression/note-head-harmonic.ly | 2 +- input/regression/note-head-solfa.ly | 2 +- input/regression/note-head-style.ly | 2 +- input/regression/note-line.ly | 2 +- input/regression/number-staff-lines.ly | 2 +- input/regression/ottava-broken.ly | 2 +- input/regression/ottava.ly | 2 +- input/regression/override-nest.ly | 13 + input/regression/page-breaks.ly | 2 +- input/regression/page-layout.ly | 2 +- input/regression/page-spacing.ly | 2 +- input/regression/page-top-space.ly | 2 +- input/regression/part-combine-a2.ly | 2 +- input/regression/part-combine-cross.ly | 2 +- input/regression/part-combine-global.ly | 2 +- .../part-combine-mmrest-after-solo.ly | 2 +- input/regression/part-combine-solo-end.ly | 2 +- input/regression/part-combine-solo-global.ly | 2 +- input/regression/part-combine-solo.ly | 2 +- input/regression/part-combine-text.ly | 2 +- input/regression/part-combine.ly | 2 +- input/regression/pedal-bracket.ly | 2 +- input/regression/pedal-end.ly | 2 +- input/regression/pedal-ped.ly | 2 +- input/regression/phrasing-slur-slur-avoid.ly | 2 +- input/regression/prefatory-empty-spacing.ly | 2 +- input/regression/prefatory-spacing-matter.ly | 2 +- input/regression/property-grace-polyphony.ly | 2 +- input/regression/property-once.ly | 2 +- input/regression/quote-cue-during.ly | 2 +- input/regression/quote-cyclic.ly | 2 +- input/regression/quote-during.ly | 2 +- input/regression/quote-grace.ly | 2 +- input/regression/quote-transposition.ly | 2 +- input/regression/quote.ly | 2 +- input/regression/rehearsal-mark-letter.ly | 2 +- input/regression/rehearsal-mark-number.ly | 2 +- input/regression/repeat-fold.ly | 2 +- input/regression/repeat-line-break.ly | 2 +- input/regression/repeat-percent-count.ly | 2 +- input/regression/repeat-percent-skipbars.ly | 2 +- input/regression/repeat-percent.ly | 2 +- input/regression/repeat-slash.ly | 2 +- input/regression/repeat-unfold-all.ly | 2 +- input/regression/repeat-unfold-tremolo.ly | 2 +- input/regression/repeat-unfold.ly | 2 +- .../repeat-volta-skip-alternatives.ly | 2 +- input/regression/repeat-volta.ly | 2 +- input/regression/rest-collision-beam.ly | 2 +- input/regression/rest-collision.ly | 2 +- input/regression/rest-dot-position.ly | 2 +- input/regression/rest-ledger.ly | 2 +- input/regression/rest-pitch.ly | 2 +- input/regression/rest-polyphonic.ly | 2 +- input/regression/rest.ly | 2 +- input/regression/rhythmic-staff.ly | 2 +- input/regression/score-text.ly | 2 +- input/regression/script-collision.ly | 2 +- input/regression/script-stack-order.ly | 2 +- input/regression/script-stacked.ly | 2 +- input/regression/size11.ly | 2 +- input/regression/size13.ly | 2 +- input/regression/size16.ly | 2 +- input/regression/size20.ly | 2 +- input/regression/size23.ly | 2 +- input/regression/size26.ly | 2 +- input/regression/slur-broken-trend.ly | 2 +- input/regression/slur-cross-staff.ly | 2 +- input/regression/slur-dash.ly | 2 +- input/regression/slur-dots.ly | 2 +- input/regression/slur-double.ly | 2 +- input/regression/slur-dynamics.ly | 2 +- input/regression/slur-extreme.ly | 2 +- input/regression/slur-manual.ly | 2 +- input/regression/slur-nice.ly | 2 +- input/regression/slur-rest.ly | 2 +- input/regression/slur-scoring.ly | 2 +- input/regression/slur-script-inside.ly | 2 +- input/regression/slur-script.ly | 2 +- input/regression/slur-symmetry-1.ly | 2 +- input/regression/slur-symmetry.ly | 2 +- input/regression/slur-tilt.ly | 2 +- input/regression/spacing-accidental-staffs.ly | 2 +- .../regression/spacing-accidental-stretch.ly | 2 +- input/regression/spacing-accidental.ly | 2 +- input/regression/spacing-bar-stem.ly | 2 +- input/regression/spacing-clef-first-note.ly | 2 +- input/regression/spacing-end-of-line.ly | 2 +- input/regression/spacing-ended-voice.ly | 2 +- input/regression/spacing-folded-clef.ly | 2 +- input/regression/spacing-folded-clef2.ly | 6 +- input/regression/spacing-grace-duration.ly | 2 +- input/regression/spacing-grace.ly | 2 +- input/regression/spacing-knee.ly | 2 +- input/regression/spacing-multi-tuplet.ly | 2 +- input/regression/spacing-note-flags.ly | 2 +- input/regression/spacing-proportional.ly | 2 +- input/regression/spacing-ragged-last.ly | 2 +- input/regression/spacing-rest.ly | 2 +- input/regression/spacing-short-notes.ly | 2 +- input/regression/spacing-stem-bar.ly | 2 +- input/regression/spacing-stem-direction.ly | 2 +- .../regression/spacing-stem-same-direction.ly | 2 +- input/regression/spacing-stick-out.ly | 2 +- .../regression/spacing-strict-notespacing.ly | 2 +- .../spacing-strict-spacing-grace.ly | 2 +- input/regression/spacing-to-grace.ly | 2 +- .../regression/spacing-uniform-stretching.ly | 2 +- input/regression/span-bar-break.ly | 2 +- input/regression/span-bar.ly | 2 +- input/regression/spanner-break-overshoot.ly | 2 +- input/regression/staccato-pos.ly | 2 +- input/regression/staff-halfway.ly | 2 +- input/regression/staff-mixed-size.ly | 2 +- input/regression/staff-tweak.ly | 2 +- input/regression/stanza-number.ly | 2 +- input/regression/stem-direction.ly | 2 +- input/regression/stem-shorten.ly | 2 +- input/regression/stem-stemlet.ly | 2 +- input/regression/stem-tremolo.ly | 2 +- input/regression/stencil-hacking.ly | 9 +- input/regression/string-number.ly | 2 +- input/regression/system-extents.ly | 4 +- input/regression/system-overstrike.ly | 2 +- input/regression/system-separator.ly | 2 +- input/regression/system-start-bracket.ly | 2 +- input/regression/tablature-string-tunings.ly | 2 +- input/regression/tablature.ly | 2 +- input/regression/tag-filter.ly | 2 +- input/regression/text-spanner.ly | 2 +- input/regression/tie-arpeggio.ly | 2 +- input/regression/tie-broken.ly | 2 +- input/regression/tie-busy-grobs.ly | 2 +- input/regression/tie-chord.ly | 2 +- input/regression/tie-grace.ly | 2 +- input/regression/tie-manual.ly | 2 +- input/regression/tie-single.ly | 2 +- input/regression/trill-spanner-pitched.ly | 2 +- input/regression/trill-spanner.ly | 2 +- input/regression/tuplet-beam.ly | 2 +- input/regression/tuplet-broken.ly | 2 +- input/regression/tuplet-full-length.ly | 2 +- input/regression/tuplet-gap.ly | 2 +- input/regression/tuplet-nest.ly | 2 +- input/regression/tuplet-properties.ly | 2 +- input/regression/tuplet-rest.ly | 2 +- input/regression/tuplet-slope.ly | 2 +- .../regression/tuplet-staffline-collision.ly | 2 +- input/regression/tuplets.ly | 2 +- input/regression/utf-8.ly | 2 +- input/regression/voice-follower.ly | 2 +- input/regression/volta-broken-left-edge.ly | 2 +- input/regression/volta-multi-staff.ly | 2 +- input/regression/whiteout.ly | 2 +- lily/clef-engraver.cc | 4 +- lily/context-def.cc | 3 +- lily/context-property.cc | 230 ++++++++++++------ lily/include/context.hh | 3 +- lily/parser.yy | 50 ++-- lily/property-iterator.cc | 29 ++- python/convertrules.py | 25 +- scm/music-functions.scm | 9 +- 340 files changed, 600 insertions(+), 469 deletions(-) create mode 100644 input/regression/override-nest.ly diff --git a/ChangeLog b/ChangeLog index 59b7b78255..be7900bee1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2005-10-17 Han-Wen Nienhuys + + * python/convertrules.py (FatalConversionError.subber): conversion + rule for #'callbacks + + * input/regression/override-nest.ly: new function. + + * lily/parser.yy (music_property_def): allow \override #'a #'b = + #c too. + + * lily/context-property.cc (lookup_nested_property): new function. + (evict_from_alist): new function. + (general_pushpop_property): new function. + (execute_general_pushpop_property): rewrite. Support nested + properties too. + 2005-10-16 Han-Wen Nienhuys * lily/beam.cc: use length-fraction too. diff --git a/input/regression/+.ly b/input/regression/+.ly index acdb4f985c..dbf5ab798b 100644 --- a/input/regression/+.ly +++ b/input/regression/+.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" %% +.ly: Be the first .ly file for lys-to-tely.py. %% Better to make lys-to-tely.py include "introduction.texi" or %% other .texi documents too? diff --git a/input/regression/allfontstyle.ily b/input/regression/allfontstyle.ily index 2aca758d45..e3b7bb958c 100644 --- a/input/regression/allfontstyle.ily +++ b/input/regression/allfontstyle.ily @@ -1,4 +1,4 @@ -\version "2.4.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/balloon.ly b/input/regression/balloon.ly index 18e0954455..1f20c4285d 100644 --- a/input/regression/balloon.ly +++ b/input/regression/balloon.ly @@ -3,7 +3,7 @@ texidoc = "With balloon texts, objects in the output can be marked, with lines and explanatory text added." } -\version "2.7.10" +\version "2.7.13" \layout{ raggedright = ##t } @@ -12,11 +12,11 @@ with lines and explanatory text added." \relative c' { %% by hand: - \once\override Stem #'print-function = #Balloon_interface::print - \once\override Stem #'balloon-original-callback = #Stem::print - \once\override Stem #'balloon-text = #"I'm a stem" - \once\override Stem #'balloon-text-offset = #'(3 . 4) - \once\override Stem #'balloon-text-props + \once\override Stem #'callbacks #'stencil = #Balloon_interface::print + \once\override Stem #'balloon-original-callback = #Stem::print + \once\override Stem #'balloon-text = #"I'm a stem" + \once\override Stem #'balloon-text-offset = #'(3 . 4) + \once\override Stem #'balloon-text-props = #'((font-family . roman)) diff --git a/input/regression/bar-check-redefine.ly b/input/regression/bar-check-redefine.ly index 69880419d3..faf450709d 100644 --- a/input/regression/bar-check-redefine.ly +++ b/input/regression/bar-check-redefine.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "The meaning of @code{|} is stored in the identifier @code{pipeSymbol}." diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly index 0f5ffb854c..4c137aeb5c 100644 --- a/input/regression/bar-number.ly +++ b/input/regression/bar-number.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly index 07e29185a4..b334fce780 100644 --- a/input/regression/bar-scripts.ly +++ b/input/regression/bar-scripts.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly index d8b1262a81..0e82705a76 100644 --- a/input/regression/beam-auto-knee.ly +++ b/input/regression/beam-auto-knee.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/beam-auto.ly b/input/regression/beam-auto.ly index 1c0516808f..590fed758a 100644 --- a/input/regression/beam-auto.ly +++ b/input/regression/beam-auto.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc = "@cindex Beaming Presets There are presets for the @code{auto-beam} engraver in the case of common diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly index facfebd883..51ae95eb73 100644 --- a/input/regression/beam-break.ly +++ b/input/regression/beam-break.ly @@ -4,7 +4,7 @@ " } -\version "2.6.0" +\version "2.7.13" \layout { raggedright= ##t } \relative c'' { diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly index 4fdd49ad27..75240bac7c 100644 --- a/input/regression/beam-center-slope.ly +++ b/input/regression/beam-center-slope.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc="Simple beams on middle staffline are allowed to be diff --git a/input/regression/beam-concave-damped.ly b/input/regression/beam-concave-damped.ly index 0b8ad29143..f1baac5863 100644 --- a/input/regression/beam-concave-damped.ly +++ b/input/regression/beam-concave-damped.ly @@ -2,7 +2,7 @@ texidoc = "Beams that are not strictly concave are damped according to their concaveness. " } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t } diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly index 1c1c8fc935..2cd8fcbd89 100644 --- a/input/regression/beam-concave.ly +++ b/input/regression/beam-concave.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc = "Fully concave beams should be horizontal. Informally spoken, diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly index 20771666fd..63d3cd3888 100644 --- a/input/regression/beam-cross-staff-auto-knee.ly +++ b/input/regression/beam-cross-staff-auto-knee.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly index 7af3f3fcd1..0d8a3e3a1a 100644 --- a/input/regression/beam-cross-staff-slope.ly +++ b/input/regression/beam-cross-staff-slope.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Cross staff (kneed) beams do not cause extreme slopes." } diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly index b1e416eb6f..faef9ca622 100644 --- a/input/regression/beam-cross-staff.ly +++ b/input/regression/beam-cross-staff.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" Beams can be typeset over fixed distance aligned staves, beam diff --git a/input/regression/beam-damp.ly b/input/regression/beam-damp.ly index d65d78a02f..4b5d107d5e 100644 --- a/input/regression/beam-damp.ly +++ b/input/regression/beam-damp.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "@cindex Beam Damp Beams are less steep than the notes they encompass. " } \layout{ diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly index 1462490f19..4321247b25 100644 --- a/input/regression/beam-default-lengths.ly +++ b/input/regression/beam-default-lengths.ly @@ -1,6 +1,6 @@ \layout{ raggedright = ##t} -\version "2.6.0" +\version "2.7.13" \header{ texidoc="Beamed stems have standard lengths if possible. Quantization is switched off in this example." diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index 3fc5d62e27..157463bebf 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" Beams should behave reasonably well, even under extreme circumstances. diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly index d99f86bb40..fe7c507664 100644 --- a/input/regression/beam-french.ly +++ b/input/regression/beam-french.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "In french style beaming, the stems do not go between beams." diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly index 3884d8b7f1..2587fe4da6 100644 --- a/input/regression/beam-funky-beamlet.ly +++ b/input/regression/beam-funky-beamlet.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc=" Funky kneed beams with beamlets also work. The beamlets diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly index 2c1991784c..a0cec97014 100644 --- a/input/regression/beam-funky.ly +++ b/input/regression/beam-funky.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "In complex configurations of knee beaming, according to diff --git a/input/regression/beam-isknee.ly b/input/regression/beam-isknee.ly index 9b8ff307a5..399b85881d 100644 --- a/input/regression/beam-isknee.ly +++ b/input/regression/beam-isknee.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc="@cindex Beam Isknee diff --git a/input/regression/beam-knee-symmetry.ly b/input/regression/beam-knee-symmetry.ly index 43d8ad4e4f..6fa6c6f6e2 100644 --- a/input/regression/beam-knee-symmetry.ly +++ b/input/regression/beam-knee-symmetry.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Point-symmetric beams should receive the same diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly index 2190e44574..1fb32d9667 100644 --- a/input/regression/beam-length.ly +++ b/input/regression/beam-length.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly index ef28af44ac..cbda79c40f 100644 --- a/input/regression/beam-manual-beaming.ly +++ b/input/regression/beam-manual-beaming.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly index c26322af07..11388ecf10 100644 --- a/input/regression/beam-multiple-cross-staff.ly +++ b/input/regression/beam-multiple-cross-staff.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Kneed beams (often happens with cross-staff beams) diff --git a/input/regression/beam-outside-beamlets.ly b/input/regression/beam-outside-beamlets.ly index 0d83b58514..5a82a0c640 100644 --- a/input/regression/beam-outside-beamlets.ly +++ b/input/regression/beam-outside-beamlets.ly @@ -3,7 +3,7 @@ } -\version "2.7.12" +\version "2.7.13" \paper { raggedright = ##t } diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly index 4c258f03ff..ed26a677a1 100644 --- a/input/regression/beam-over-barline.ly +++ b/input/regression/beam-over-barline.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Explicit beams may cross barlines. " } diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly index 9880bc8693..0783a2e44b 100644 --- a/input/regression/beam-position.ly +++ b/input/regression/beam-position.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" Beams on ledgered notes should always reach the middle staff diff --git a/input/regression/beam-quant-standard.ly b/input/regression/beam-quant-standard.ly index 9dca8fb87e..3a2bf9a56d 100644 --- a/input/regression/beam-quant-standard.ly +++ b/input/regression/beam-quant-standard.ly @@ -6,7 +6,7 @@ } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t diff --git a/input/regression/beam-quanting-32nd.ly b/input/regression/beam-quanting-32nd.ly index 388ed710a0..c6c503745d 100644 --- a/input/regression/beam-quanting-32nd.ly +++ b/input/regression/beam-quanting-32nd.ly @@ -8,7 +8,7 @@ texidoc = "Stem lengths take precedence over beam quants: `forbidden' } -\version "2.6.0" +\version "2.7.13" \relative c''{ \time 3/8 diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly index 3f01d80882..b73601fcbc 100644 --- a/input/regression/beam-quanting-horizontal.ly +++ b/input/regression/beam-quanting-horizontal.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly index c929a6004a..7d489e287a 100644 --- a/input/regression/beam-quarter.ly +++ b/input/regression/beam-quarter.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc= "Quarter notes may be beamed: the beam is halted momentarily." diff --git a/input/regression/beam-rest.ly b/input/regression/beam-rest.ly index 43669b2127..91babad2f8 100644 --- a/input/regression/beam-rest.ly +++ b/input/regression/beam-rest.ly @@ -3,7 +3,7 @@ texidoc = "The number of beams does not change on a rest." } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t } diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly index a62fc99f2d..1a2becefa9 100644 --- a/input/regression/beam-second.ly +++ b/input/regression/beam-second.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly index 14f5350a0a..775c0feed2 100644 --- a/input/regression/beam-shortened-lengths.ly +++ b/input/regression/beam-shortened-lengths.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc="Beams in unnatural direction, have shortened stems, but do not look too short." diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly index 785f9d876e..63efc88908 100644 --- a/input/regression/beaming-ternary-metrum.ly +++ b/input/regression/beaming-ternary-metrum.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Automatic beaming works also in ternary time sigs." } diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly index ee953ad6b0..9acb38d092 100644 --- a/input/regression/beaming.ly +++ b/input/regression/beaming.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/beams.ly b/input/regression/beams.ly index 42c01f25b4..ebb7f8780f 100644 --- a/input/regression/beams.ly +++ b/input/regression/beams.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Beaming can be also given explicitly." } diff --git a/input/regression/break.ly b/input/regression/break.ly index 87ddcdbf38..22fa437f10 100644 --- a/input/regression/break.ly +++ b/input/regression/break.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/breathing-sign-ancient.ly b/input/regression/breathing-sign-ancient.ly index 4413517602..827d388d4d 100644 --- a/input/regression/breathing-sign-ancient.ly +++ b/input/regression/breathing-sign-ancient.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly index 1c6007ba94..ca1aa86795 100644 --- a/input/regression/breathing-sign.ly +++ b/input/regression/breathing-sign.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" Breathing signs are available in different tastes: commas (default), diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly index e07f30fe06..7c4da95897 100644 --- a/input/regression/chord-changes.ly +++ b/input/regression/chord-changes.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc="Property chordChanges: display chord names only when diff --git a/input/regression/chord-name-entry-11.ly b/input/regression/chord-name-entry-11.ly index c004997166..e41dede2e7 100644 --- a/input/regression/chord-name-entry-11.ly +++ b/input/regression/chord-name-entry-11.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/chord-name-entry.ly b/input/regression/chord-name-entry.ly index ae5c659bf4..6423709b77 100644 --- a/input/regression/chord-name-entry.ly +++ b/input/regression/chord-name-entry.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/chord-name-exceptions.ly b/input/regression/chord-name-exceptions.ly index fce78d16fe..cc4d3532fe 100644 --- a/input/regression/chord-name-exceptions.ly +++ b/input/regression/chord-name-exceptions.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "The property @code{chordNameExceptions} can used diff --git a/input/regression/chord-name-major7.ly b/input/regression/chord-name-major7.ly index d3353cd120..9feb0f4865 100644 --- a/input/regression/chord-name-major7.ly +++ b/input/regression/chord-name-major7.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "The layout of the major 7 can be tuned with @code{majorSevenSymbol}." diff --git a/input/regression/chord-names-bass.ly b/input/regression/chord-names-bass.ly index 2e1f31583d..08d594c312 100644 --- a/input/regression/chord-names-bass.ly +++ b/input/regression/chord-names-bass.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly index 7958f4cef0..d6d6ec413c 100644 --- a/input/regression/chord-scripts.ly +++ b/input/regression/chord-scripts.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Scripts can also be attached to chord elements." diff --git a/input/regression/chord-tremolo-short.ly b/input/regression/chord-tremolo-short.ly index c491e62498..41a32ca594 100644 --- a/input/regression/chord-tremolo-short.ly +++ b/input/regression/chord-tremolo-short.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = " 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. diff --git a/input/regression/chord-tremolo.ly b/input/regression/chord-tremolo.ly index 734ec8e200..c061ba3ee8 100644 --- a/input/regression/chord-tremolo.ly +++ b/input/regression/chord-tremolo.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/chords-funky-ignatzek.ly b/input/regression/chords-funky-ignatzek.ly index c462b7a60f..a9971b7ce0 100644 --- a/input/regression/chords-funky-ignatzek.ly +++ b/input/regression/chords-funky-ignatzek.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/clef-oct.ly b/input/regression/clef-oct.ly index 684a915931..7861cc6cd4 100644 --- a/input/regression/clef-oct.ly +++ b/input/regression/clef-oct.ly @@ -1,5 +1,5 @@ -\version "2.6.0" \header { +\version "2.7.13" \header { texidoc = "Octavation signs may be added to clefs. These octavation signs may be placed below or above (meaning an octave diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly index f795fcd519..14f76719cf 100644 --- a/input/regression/clefs.ly +++ b/input/regression/clefs.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ diff --git a/input/regression/cluster-cross-staff.ly b/input/regression/cluster-cross-staff.ly index 9a6adbb76b..4139f3a880 100644 --- a/input/regression/cluster-cross-staff.ly +++ b/input/regression/cluster-cross-staff.ly @@ -7,7 +7,7 @@ raggedright= ##t } -\version "2.7.10" +\version "2.7.13" \new PianoStaff << \context Staff = "up" { diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly index ef805b9f70..4e31bcd0ac 100644 --- a/input/regression/cluster.ly +++ b/input/regression/cluster.ly @@ -1,5 +1,5 @@ -\version "2.7.10" +\version "2.7.13" \header { texidoc = "Clusters are a device to denote that a complete range of notes is to be played." diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly index 5755557c24..88a281f539 100644 --- a/input/regression/collision-2.ly +++ b/input/regression/collision-2.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Single head notes may collide. " } diff --git a/input/regression/collision-alignment.ly b/input/regression/collision-alignment.ly index f9424ff51c..e43e42461d 100644 --- a/input/regression/collision-alignment.ly +++ b/input/regression/collision-alignment.ly @@ -7,7 +7,7 @@ \layout { raggedright = ##t } -\version "2.6.0" +\version "2.7.13" \relative << \new Staff { diff --git a/input/regression/collision-dots-invert.ly b/input/regression/collision-dots-invert.ly index b16cf2b461..a59be63951 100644 --- a/input/regression/collision-dots-invert.ly +++ b/input/regression/collision-dots-invert.ly @@ -6,7 +6,7 @@ } \layout { raggedright = ##t } -\version "2.6.0" +\version "2.7.13" \relative c'' { << 2\\ { 4 4 } >> << { 2 } \\ { 4. 8 } >> diff --git a/input/regression/collision-dots-move.ly b/input/regression/collision-dots-move.ly index dff14ca39e..9a29b55caf 100644 --- a/input/regression/collision-dots-move.ly +++ b/input/regression/collision-dots-move.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "If collision resolution finds dotted note head must diff --git a/input/regression/collision-dots.ly b/input/regression/collision-dots.ly index 78a5c937cd..e26c61150c 100644 --- a/input/regression/collision-dots.ly +++ b/input/regression/collision-dots.ly @@ -5,7 +5,7 @@ on the right side." } -\version "2.6.0" +\version "2.7.13" \layout { raggedright= ##t } % todo: b2 (up) + b8 down looks strange compared to c2up + b8. (down) diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly index e430bc89d4..4d57472ad9 100644 --- a/input/regression/collision-head-chords.ly +++ b/input/regression/collision-head-chords.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Note heads in collisions should be merged if they have the same positions in the extreme note heads. diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly index 326cb01e2e..be3fdd52bf 100644 --- a/input/regression/collision-heads.ly +++ b/input/regression/collision-heads.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly index e0bfb514f3..79157be561 100644 --- a/input/regression/collision-merge-differently-dotted.ly +++ b/input/regression/collision-merge-differently-dotted.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "If NoteCollision has merge-differently-dotted = ##t note diff --git a/input/regression/collision-merge-dots.ly b/input/regression/collision-merge-dots.ly index 35a25706a8..cd667b0e11 100644 --- a/input/regression/collision-merge-dots.ly +++ b/input/regression/collision-merge-dots.ly @@ -4,7 +4,7 @@ } \layout { raggedright = ##t } -\version "2.6.0" +\version "2.7.13" { \relative c'' \new Staff { diff --git a/input/regression/collision-mesh.ly b/input/regression/collision-mesh.ly index ebe885870e..828af71302 100644 --- a/input/regression/collision-mesh.ly +++ b/input/regression/collision-mesh.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Oppositely stemmed chords, meshing into each other, are resolved." diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly index dfdcf3f775..056ec3a820 100644 --- a/input/regression/collisions.ly +++ b/input/regression/collisions.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" In addition to normal collision rules, there is support for polyphony, diff --git a/input/regression/color.ly b/input/regression/color.ly index 2e2733fa59..d7bc6ed492 100644 --- a/input/regression/color.ly +++ b/input/regression/color.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc = "Each grob can have a color assigned to it. diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly index 4875d72343..316814a64e 100644 --- a/input/regression/completion-heads-polyphony.ly +++ b/input/regression/completion-heads-polyphony.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Completion heads are broken across bar lines. This was diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly index 96350e3a8e..509ca914da 100644 --- a/input/regression/completion-heads.ly +++ b/input/regression/completion-heads.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/custos.ly b/input/regression/custos.ly index 524ebffdb4..5724cf9971 100644 --- a/input/regression/custos.ly +++ b/input/regression/custos.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Custodes may be engraved in various styles." } diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly index 7a5b3682ef..f7b9fdf259 100644 --- a/input/regression/dot-flag-collision.ly +++ b/input/regression/dot-flag-collision.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Dots move to the right when a collision with the (up)flag happens." } diff --git a/input/regression/dots.ly b/input/regression/dots.ly index 2e3f902d2f..ceab222562 100644 --- a/input/regression/dots.ly +++ b/input/regression/dots.ly @@ -1,4 +1,4 @@ -\version "2.6.0" \header{ +\version "2.7.13" \header{ texidoc=" Noteheads can have dots, and rests too. diff --git a/input/regression/drums.ly b/input/regression/drums.ly index 44fc7ee411..d49ddd4ac7 100644 --- a/input/regression/drums.ly +++ b/input/regression/drums.ly @@ -7,7 +7,7 @@ } -\version "2.6.0" +\version "2.7.13" drh = \drummode { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 } drl = \drummode {\repeat "unfold" 3 {bd4 sn8 bd bd4 << bd ss >> } bd8 tommh tommh bd toml toml bd tomfh16 tomfh } diff --git a/input/regression/dynamics-broken-hairpin.ly b/input/regression/dynamics-broken-hairpin.ly index b633c495e1..f8a1c36b60 100644 --- a/input/regression/dynamics-broken-hairpin.ly +++ b/input/regression/dynamics-broken-hairpin.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc = "Broken crescendi should be open on one side." } diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly index 5e26307271..9bec007cc4 100644 --- a/input/regression/dynamics-glyphs.ly +++ b/input/regression/dynamics-glyphs.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header {texidoc = "Dynamic letters are kerned, and their weight matches that of the hairpin signs. The dynamic scripts should be diff --git a/input/regression/dynamics-hairpin-length.ly b/input/regression/dynamics-hairpin-length.ly index 36d560ed62..820c9bc1e5 100644 --- a/input/regression/dynamics-hairpin-length.ly +++ b/input/regression/dynamics-hairpin-length.ly @@ -6,7 +6,7 @@ respectively." } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t } diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly index cc92790ca2..e9b753c28b 100644 --- a/input/regression/dynamics-line.ly +++ b/input/regression/dynamics-line.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" Dynamics appear below or above the staff. If multiple dynamics are linked with (de)crescendi, they should be on the same diff --git a/input/regression/dynamics-unbound-hairpin.ly b/input/regression/dynamics-unbound-hairpin.ly index f03ec547fa..4c73be8bbd 100644 --- a/input/regression/dynamics-unbound-hairpin.ly +++ b/input/regression/dynamics-unbound-hairpin.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Crescendi may start off-notes, however, they should not collapse into flat lines." diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly index f87f02a5fa..9dbb963ee5 100644 --- a/input/regression/easy-notation.ly +++ b/input/regression/easy-notation.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = " Easy-notation (or Ez-notation) prints names in note heads. diff --git a/input/regression/fermata-rest-position.ly b/input/regression/fermata-rest-position.ly index 2a4a1f19e3..715d8225c6 100644 --- a/input/regression/fermata-rest-position.ly +++ b/input/regression/fermata-rest-position.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = " Fermatas over multimeasure rests are positioned as over normal rests. diff --git a/input/regression/figured-bass-continuation-center.ly b/input/regression/figured-bass-continuation-center.ly index c92b2b9a21..7ab4f356bc 100644 --- a/input/regression/figured-bass-continuation-center.ly +++ b/input/regression/figured-bass-continuation-center.ly @@ -5,7 +5,7 @@ } -\version "2.7.12" +\version "2.7.13" \paper { raggedright = ##t } diff --git a/input/regression/figured-bass-continuation.ly b/input/regression/figured-bass-continuation.ly index ea4fa2704a..ea3cce57f4 100644 --- a/input/regression/figured-bass-continuation.ly +++ b/input/regression/figured-bass-continuation.ly @@ -5,7 +5,7 @@ figures. They are switched on with @code{useBassFigureExtenders}" } -\version "2.7.12" +\version "2.7.13" \paper { raggedright = ##t } diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly index 5a4dd4aec0..ba2aa73ea1 100644 --- a/input/regression/figured-bass.ly +++ b/input/regression/figured-bass.ly @@ -1,4 +1,4 @@ -\version "2.7.12" +\version "2.7.13" \header { diff --git a/input/regression/fill-line-test.ly b/input/regression/fill-line-test.ly index a4d302312d..ed4b749f35 100644 --- a/input/regression/fill-line-test.ly +++ b/input/regression/fill-line-test.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/finger-chords-order.ly b/input/regression/finger-chords-order.ly index 60d195f962..1f9b240ee5 100644 --- a/input/regression/finger-chords-order.ly +++ b/input/regression/finger-chords-order.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly index b618d96365..e2d628551b 100644 --- a/input/regression/finger-chords.ly +++ b/input/regression/finger-chords.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "With the new chord syntax, it is possible to associate diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly index ef3638cf39..18e5dc0320 100644 --- a/input/regression/fingering.ly +++ b/input/regression/fingering.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Automatic fingering tries to put fingering instructions diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly index 47ccdb8151..f3765e3d82 100644 --- a/input/regression/follow-voice-break.ly +++ b/input/regression/follow-voice-break.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc = " The line-spanners connects to the Y position of the note on the next line. diff --git a/input/regression/font-family-override.ly b/input/regression/font-family-override.ly index 47b0149b95..db39975215 100644 --- a/input/regression/font-family-override.ly +++ b/input/regression/font-family-override.ly @@ -5,7 +5,7 @@ } -\version "2.6.0" +\version "2.7.13" \paper { % change for other default global staff size. diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly index 763dff70a9..2e2e03d05c 100644 --- a/input/regression/font-magnification.ly +++ b/input/regression/font-magnification.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "The magnification can be set for any font. Note that this does not change variable symbols such as beams or slurs. " } diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly index fdb09994ff..8e7adadaea 100644 --- a/input/regression/font-name.ly +++ b/input/regression/font-name.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/font-postscript.ly b/input/regression/font-postscript.ly index eaeff71085..10ffd5b93f 100644 --- a/input/regression/font-postscript.ly +++ b/input/regression/font-postscript.ly @@ -8,7 +8,7 @@ passed to LaTeX and dvips to help it find the uncb font." } -\version "2.6.0" +\version "2.7.13" \paper { diff --git a/input/regression/fret-diagrams.ly b/input/regression/fret-diagrams.ly index 25d46947ae..1c577d2c0d 100644 --- a/input/regression/fret-diagrams.ly +++ b/input/regression/fret-diagrams.ly @@ -1,7 +1,7 @@ %% regression test for fret diagram markups -\version "2.6.0" +\version "2.7.13" \paper { diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly index 5efd751c46..304ceb4cb3 100644 --- a/input/regression/generic-output-property.ly +++ b/input/regression/generic-output-property.ly @@ -1,5 +1,5 @@ -\version "2.7.10" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly index a0a00cb343..ec259f54df 100644 --- a/input/regression/glissando.ly +++ b/input/regression/glissando.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly index 8badb59575..ebbb6589fe 100644 --- a/input/regression/grace-auto-beam.ly +++ b/input/regression/grace-auto-beam.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "The autobeamer is not confused by grace notes." diff --git a/input/regression/grace-bar-line.ly b/input/regression/grace-bar-line.ly index e42779905d..d90100ea1c 100644 --- a/input/regression/grace-bar-line.ly +++ b/input/regression/grace-bar-line.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Bar line should come before the grace note." } diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly index 8dcdf688dd..285d465c3d 100644 --- a/input/regression/grace-bar-number.ly +++ b/input/regression/grace-bar-number.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Grace notes do tricky things with timing. If a measure diff --git a/input/regression/grace-beam.ly b/input/regression/grace-beam.ly index a909fabf14..03e19f5b13 100644 --- a/input/regression/grace-beam.ly +++ b/input/regression/grace-beam.ly @@ -9,7 +9,7 @@ Unbeamed grace notes are not put into normal beams. \layout { raggedright= ##t } -\version "2.6.0" +\version "2.7.13" \relative c'' { c4 d8[ \grace { e32[ d c d] } e8] diff --git a/input/regression/grace-end.ly b/input/regression/grace-end.ly index 759958b58c..db510abce9 100644 --- a/input/regression/grace-end.ly +++ b/input/regression/grace-end.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc="@cindex Grace End diff --git a/input/regression/grace-nest.ly b/input/regression/grace-nest.ly index 459293b610..d85a83cb69 100644 --- a/input/regression/grace-nest.ly +++ b/input/regression/grace-nest.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { 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." diff --git a/input/regression/grace-nest1.ly b/input/regression/grace-nest1.ly index 20ddd1b0f4..42117be451 100644 --- a/input/regression/grace-nest1.ly +++ b/input/regression/grace-nest1.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { 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." diff --git a/input/regression/grace-nest2.ly b/input/regression/grace-nest2.ly index b60b74773b..52edd25151 100644 --- a/input/regression/grace-nest2.ly +++ b/input/regression/grace-nest2.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { 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." diff --git a/input/regression/grace-nest3.ly b/input/regression/grace-nest3.ly index d353f04be4..58ec8b327e 100644 --- a/input/regression/grace-nest3.ly +++ b/input/regression/grace-nest3.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "In nested syntax, graces are still properly handled." } diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly index ca26585678..a2d4d5298f 100644 --- a/input/regression/grace-nest4.ly +++ b/input/regression/grace-nest4.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Also in the nested syntax here, grace notes appear rightly." } diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly index 43e9bf9263..6910618358 100644 --- a/input/regression/grace-nest5.ly +++ b/input/regression/grace-nest5.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Graces notes may have the same duration as the main note." } diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly index b9559399f7..2f99bf2948 100644 --- a/input/regression/grace-part-combine.ly +++ b/input/regression/grace-part-combine.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Grace notes may be put in a @code{partcombine}r." } diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly index f7dc98fdb6..9131ed50a6 100644 --- a/input/regression/grace-staff-length.ly +++ b/input/regression/grace-staff-length.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc = "Stripped version of trip.ly. Staves should be of correct length." } diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly index a668ce79a7..262e95581b 100644 --- a/input/regression/grace-start.ly +++ b/input/regression/grace-start.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Pieces may begin with grace notes." } diff --git a/input/regression/grace-stem-length.ly b/input/regression/grace-stem-length.ly index 84370afee4..9b1eef5ecb 100644 --- a/input/regression/grace-stem-length.ly +++ b/input/regression/grace-stem-length.ly @@ -5,7 +5,7 @@ normal notes, if possible. They should never be longer, even if that would lead to beam quanting program. " } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly index c48a1c6caf..aff8ace2ce 100644 --- a/input/regression/grace-stems.ly +++ b/input/regression/grace-stems.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc = "Here @code{startGraceMusic} should set @code{no-stem-extend} to true; the two grace beams should be the same here. diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly index 9b94bb983b..b9bc7701de 100644 --- a/input/regression/grace-sync.ly +++ b/input/regression/grace-sync.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Grace notes in different voices/staves are synchronized." } diff --git a/input/regression/grace-types.ly b/input/regression/grace-types.ly index 8f9ef8ebf1..4953b86df1 100644 --- a/input/regression/grace-types.ly +++ b/input/regression/grace-types.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "There are three different kinds of grace types: the base grace switches to smaller type, the appoggiatura inserts also a slur, and the diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly index 50b1543a67..f9b7839345 100644 --- a/input/regression/grace-unfold-repeat.ly +++ b/input/regression/grace-unfold-repeat.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "When grace notes are entered with unfolded repeats, line breaks take place before grace notes. diff --git a/input/regression/grace-volta-repeat-2.ly b/input/regression/grace-volta-repeat-2.ly index 74e22e4eb9..9abdddb426 100644 --- a/input/regression/grace-volta-repeat-2.ly +++ b/input/regression/grace-volta-repeat-2.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly index d6a72ce96a..09d89805f0 100644 --- a/input/regression/grace-volta-repeat.ly +++ b/input/regression/grace-volta-repeat.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/grace.ly b/input/regression/grace.ly index e673124a8f..1558584386 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ diff --git a/input/regression/grid-lines.ly b/input/regression/grid-lines.ly index 14221524f1..6bb907eef9 100644 --- a/input/regression/grid-lines.ly +++ b/input/regression/grid-lines.ly @@ -5,7 +5,7 @@ staves synchronized with the notes." } -\version "2.6.0" +\version "2.7.13" skips = { diff --git a/input/regression/hairpin-dashed.ly b/input/regression/hairpin-dashed.ly index 2408bbdaac..312f830449 100644 --- a/input/regression/hairpin-dashed.ly +++ b/input/regression/hairpin-dashed.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc ="Hairpin crescendi may be dashed. " diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly index b5c303fa43..7fa4a43beb 100644 --- a/input/regression/hairpin-ending.ly +++ b/input/regression/hairpin-ending.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly index ca3a36cc61..1b241daf89 100644 --- a/input/regression/hara-kiri-pianostaff.ly +++ b/input/regression/hara-kiri-pianostaff.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly index 25b206dd0e..6fbcdbc850 100644 --- a/input/regression/instrument-name-markup.ly +++ b/input/regression/instrument-name-markup.ly @@ -9,7 +9,7 @@ including alterations. " \layout { raggedright = ##t } -\version "2.6.0" +\version "2.7.13" textFlat = \markup {\smaller \flat} diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly index 74d813589d..9b3da267e7 100644 --- a/input/regression/instrument-name-partial.ly +++ b/input/regression/instrument-name-partial.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Instrument names are also printed on partial starting measures." } diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly index b3d1959013..0851304124 100644 --- a/input/regression/instrument-name.ly +++ b/input/regression/instrument-name.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" Staff margins are also markings attached to barlines. They should be diff --git a/input/regression/key-clefs.ly b/input/regression/key-clefs.ly index b4d1ae5477..094c6cc6be 100644 --- a/input/regression/key-clefs.ly +++ b/input/regression/key-clefs.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Each clef have own accidental placing rules. " } #(set-global-staff-size 16) diff --git a/input/regression/key-signature-cancellation.ly b/input/regression/key-signature-cancellation.ly index bf4453181e..3b3b1ad867 100644 --- a/input/regression/key-signature-cancellation.ly +++ b/input/regression/key-signature-cancellation.ly @@ -6,7 +6,7 @@ } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t diff --git a/input/regression/key-signature-scordatura.ly b/input/regression/key-signature-scordatura.ly index dbcccd040c..df3a5fb418 100644 --- a/input/regression/key-signature-scordatura.ly +++ b/input/regression/key-signature-scordatura.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "By setting @code{Staff.keySignature} directly, key signatures can be set invidually per pitch. diff --git a/input/regression/keys.ly b/input/regression/keys.ly index e2e20eabbf..3dc1c411e6 100644 --- a/input/regression/keys.ly +++ b/input/regression/keys.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" Key signatures may appear on key changes, even without a barline. diff --git a/input/regression/laissez-vibrer-ties.ly b/input/regression/laissez-vibrer-ties.ly index b95c82d846..329a0ff967 100644 --- a/input/regression/laissez-vibrer-ties.ly +++ b/input/regression/laissez-vibrer-ties.ly @@ -10,7 +10,7 @@ They have fixed size. Their formatting can be tuned with " } -\version "2.7.10" +\version "2.7.13" \paper { raggedright = ##t } diff --git a/input/regression/landscape.ly b/input/regression/landscape.ly index ec4c1b5390..ce46647aac 100644 --- a/input/regression/landscape.ly +++ b/input/regression/landscape.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" #(set-default-paper-size "a6" 'landscape) pattern = \relative { a b c d \break } diff --git a/input/regression/ledger-line-minimum.ly b/input/regression/ledger-line-minimum.ly index 31a994f4d0..057547744b 100644 --- a/input/regression/ledger-line-minimum.ly +++ b/input/regression/ledger-line-minimum.ly @@ -7,7 +7,7 @@ disappearing." } -\version "2.6.0" +\version "2.7.13" \paper { raggedright = ##t} \relative c'' { \time 2/4 diff --git a/input/regression/ledger-line-shorten.ly b/input/regression/ledger-line-shorten.ly index 7be51cfa8b..42e7fd5653 100644 --- a/input/regression/ledger-line-shorten.ly +++ b/input/regression/ledger-line-shorten.ly @@ -2,7 +2,7 @@ texidoc = "Ledger lines are shortened when they are very close. This ensures that ledgers lines stay separate." } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t diff --git a/input/regression/lily-in-scheme.ly b/input/regression/lily-in-scheme.ly index d0708b00de..95a4794f73 100644 --- a/input/regression/lily-in-scheme.ly +++ b/input/regression/lily-in-scheme.ly @@ -12,7 +12,7 @@ the @code{TextScript} grob. } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t } withPaddingA = #(def-music-function (parser location padding music) (number? ly:music?) diff --git a/input/regression/line-arrows.ly b/input/regression/line-arrows.ly index 2f30f81ac1..729c3645d8 100644 --- a/input/regression/line-arrows.ly +++ b/input/regression/line-arrows.ly @@ -2,7 +2,7 @@ texidoc = "Arrows can be applied to text-spanners and line-spanners (such as the Glissando)" } -\version "2.6.0" +\version "2.7.13" \paper { raggedright = ##t diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly index 4a22763491..06957bf900 100644 --- a/input/regression/lyric-combine-new.ly +++ b/input/regression/lyric-combine-new.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "With the @code{\\lyricsto} mechanism, individual lyric diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index 42dcf6396d..46fa21f2bb 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc ="Polyphonic rhythms and rests do not disturb diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly index c22e63feb2..d24fc10962 100644 --- a/input/regression/lyric-combine.ly +++ b/input/regression/lyric-combine.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ diff --git a/input/regression/lyric-extender-broken.ly b/input/regression/lyric-extender-broken.ly index 6411e79322..453b8b6586 100644 --- a/input/regression/lyric-extender-broken.ly +++ b/input/regression/lyric-extender-broken.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly index e2742423f0..b8ffdb7593 100644 --- a/input/regression/lyric-extender.ly +++ b/input/regression/lyric-extender.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly index f2c94b9412..0fab71b2e8 100644 --- a/input/regression/lyric-hyphen-break.ly +++ b/input/regression/lyric-hyphen-break.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/lyric-hyphen-retain.ly b/input/regression/lyric-hyphen-retain.ly index d10aa84285..dd3beddf4b 100644 --- a/input/regression/lyric-hyphen-retain.ly +++ b/input/regression/lyric-hyphen-retain.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { @@ -38,7 +38,7 @@ amount bla -- bla -- bla -- bla -- \override LyricHyphen #'minimum-length = #0.7 - \override LyricHyphen #'spacing-procedure = + \override LyricHyphen #'callbacks #'springs-and-rods = #Hyphen_spanner::set_spacing_rods bla -- bla -- bla -- bla diff --git a/input/regression/lyric-hyphen.ly b/input/regression/lyric-hyphen.ly index c63f1d01e3..eabec62c68 100644 --- a/input/regression/lyric-hyphen.ly +++ b/input/regression/lyric-hyphen.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "In lyrics, hyphens may be used." } diff --git a/input/regression/lyric-melisma-manual.ly b/input/regression/lyric-melisma-manual.ly index 1415ad43b3..f5a05bc3f8 100644 --- a/input/regression/lyric-melisma-manual.ly +++ b/input/regression/lyric-melisma-manual.ly @@ -5,7 +5,7 @@ } -\version "2.7.2" +\version "2.7.13" \paper { raggedright = ##t } diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly index 0b7068c998..af62949dec 100644 --- a/input/regression/lyric-phrasing.ly +++ b/input/regression/lyric-phrasing.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = " diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly index a597320323..c14ed991c2 100644 --- a/input/regression/lyrics-bar.ly +++ b/input/regression/lyrics-bar.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly index 402cadcdc9..5cdc28c669 100644 --- a/input/regression/lyrics-melisma-beam.ly +++ b/input/regression/lyrics-melisma-beam.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Melismata are triggered by manual beams." diff --git a/input/regression/lyrics-tenor-clef.ly b/input/regression/lyrics-tenor-clef.ly index 125bff6fc1..21c06010cc 100644 --- a/input/regression/lyrics-tenor-clef.ly +++ b/input/regression/lyrics-tenor-clef.ly @@ -2,7 +2,7 @@ texidoc = "Lyrics are not lowered despite the presence of an octavation 8." } -\version "2.6.0" +\version "2.7.13" \layout { \context { \Staff diff --git a/input/regression/markup-arrows.ly b/input/regression/markup-arrows.ly index 8f822935b5..97ed575c50 100644 --- a/input/regression/markup-arrows.ly +++ b/input/regression/markup-arrows.ly @@ -26,4 +26,4 @@ } } -\version "2.7.4" +\version "2.7.13" diff --git a/input/regression/markup-bidi-pango.ly b/input/regression/markup-bidi-pango.ly index 316d6bead4..ae2a752cb6 100644 --- a/input/regression/markup-bidi-pango.ly +++ b/input/regression/markup-bidi-pango.ly @@ -1,4 +1,4 @@ -\version "2.7.8" +\version "2.7.13" \header { diff --git a/input/regression/markup-eps.ly b/input/regression/markup-eps.ly index 9aecd6bb1d..71ae960cd6 100644 --- a/input/regression/markup-eps.ly +++ b/input/regression/markup-eps.ly @@ -3,7 +3,7 @@ texidoc = "The epsfile markup command reads an EPS file" } -\version "2.6.0" +\version "2.7.13" #(let* ((port (open-output-file "box.eps"))) diff --git a/input/regression/markup-note.ly b/input/regression/markup-note.ly index 316f83be00..13ca046ba2 100644 --- a/input/regression/markup-note.ly +++ b/input/regression/markup-note.ly @@ -3,7 +3,7 @@ texidoc = "The note markup function may be used to make metronome markings. It works for a variety of flag, dot and duration settings." } -\version "2.6.0" +\version "2.7.13" { c4^\markup { \note #"1" #1 diff --git a/input/regression/markup-scheme.ly b/input/regression/markup-scheme.ly index d1f1aa5389..58c123bfee 100644 --- a/input/regression/markup-scheme.ly +++ b/input/regression/markup-scheme.ly @@ -25,7 +25,7 @@ For maintenance reasons, we don't excercise the entire markup command set. -\version "2.6.0" +\version "2.7.13" { \fatText diff --git a/input/regression/markup-score.ly b/input/regression/markup-score.ly index 61b6c771b8..c5475a544e 100644 --- a/input/regression/markup-score.ly +++ b/input/regression/markup-score.ly @@ -2,7 +2,7 @@ texidoc = "Use \\score block as markup command." } -\version "2.6.0" +\version "2.7.13" tuning = \markup { \score { diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly index 5fcb93c510..3681da12d7 100644 --- a/input/regression/markup-stack.ly +++ b/input/regression/markup-stack.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header {texidoc="Markup scripts may be stacked."} \layout { raggedright = ##t} { diff --git a/input/regression/markup-syntax.ly b/input/regression/markup-syntax.ly index 64136dfc75..84d7f92168 100644 --- a/input/regression/markup-syntax.ly +++ b/input/regression/markup-syntax.ly @@ -4,7 +4,7 @@ } -\version "2.6.0" +\version "2.7.13" { f'1-\markup { diff --git a/input/regression/markup-user.ly b/input/regression/markup-user.ly index f632a71961..63bf496e2a 100644 --- a/input/regression/markup-user.ly +++ b/input/regression/markup-user.ly @@ -12,7 +12,7 @@ -\version "2.6.0" % to be updated +\version "2.7.13" % to be updated #(def-markup-command (upcase paper props str) (string?) "Upcase the string characters. Syntax: \\upcase #\"string\"" diff --git a/input/regression/markup-word-wrap.ly b/input/regression/markup-word-wrap.ly index c8929c3816..8653490ca0 100644 --- a/input/regression/markup-word-wrap.ly +++ b/input/regression/markup-word-wrap.ly @@ -5,7 +5,7 @@ } -\version "2.7.0" +\version "2.7.13" \markup { this is normal text diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly index a17a5d0198..d5e6a9c333 100644 --- a/input/regression/measure-grouping.ly +++ b/input/regression/measure-grouping.ly @@ -7,7 +7,7 @@ brackets above beats when the beats of a time signature are grouped. " } -\version "2.6.0" +\version "2.7.13" %% TODO: should have 2/4 + 5/8 time sig style. diff --git a/input/regression/mensural-ligatures.ly b/input/regression/mensural-ligatures.ly index fe41d9c350..d7b5e96740 100644 --- a/input/regression/mensural-ligatures.ly +++ b/input/regression/mensural-ligatures.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Mensural ligatures show different shapes, depending on the diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly index 3d0252531b..f9b8d133a0 100644 --- a/input/regression/mensural.ly +++ b/input/regression/mensural.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "There is limited support for mensural notation: note head diff --git a/input/regression/metronome-marking.ly b/input/regression/metronome-marking.ly index 607c8539a2..7bf70c251f 100644 --- a/input/regression/metronome-marking.ly +++ b/input/regression/metronome-marking.ly @@ -14,7 +14,7 @@ The marking is left aligned with the time signature, if there is one. \layout { raggedright = ##t } -\version "2.6.0" +\version "2.7.13" \relative c'' { \tempo \breve = 100 c1 c1 \tempo 8.. = 50 c1 diff --git a/input/regression/mm-rests2.ly b/input/regression/mm-rests2.ly index 39b4b5d491..74f46caefc 100644 --- a/input/regression/mm-rests2.ly +++ b/input/regression/mm-rests2.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/multi-measure-rest-center.ly b/input/regression/multi-measure-rest-center.ly index 5165f84076..d9deaabf06 100644 --- a/input/regression/multi-measure-rest-center.ly +++ b/input/regression/multi-measure-rest-center.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "The multimeasure rest is centered exactly between bar lines." diff --git a/input/regression/multi-measure-rest-grace.ly b/input/regression/multi-measure-rest-grace.ly index 425827c6cb..f97b7af997 100644 --- a/input/regression/multi-measure-rest-grace.ly +++ b/input/regression/multi-measure-rest-grace.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly index bb526c52e5..8b9f00bbc1 100644 --- a/input/regression/multi-measure-rest-instr-name.ly +++ b/input/regression/multi-measure-rest-instr-name.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "There are both long and short instrument names. diff --git a/input/regression/multi-measure-rest-multi-staff-center.ly b/input/regression/multi-measure-rest-multi-staff-center.ly index 63e7ebc86a..65f00fc5ba 100644 --- a/input/regression/multi-measure-rest-multi-staff-center.ly +++ b/input/regression/multi-measure-rest-multi-staff-center.ly @@ -4,7 +4,7 @@ independent on prefatory matter in other staves." } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t } diff --git a/input/regression/multi-measure-rest-spacing.ly b/input/regression/multi-measure-rest-spacing.ly index 4d08d40ceb..0295fd4eb3 100644 --- a/input/regression/multi-measure-rest-spacing.ly +++ b/input/regression/multi-measure-rest-spacing.ly @@ -8,7 +8,7 @@ extra spacing column is created. This should not cause problems." raggedright = ##t } -\version "2.6.0" +\version "2.7.13" << diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly index 486eba7144..7d8d54959f 100644 --- a/input/regression/multi-measure-rest-text.ly +++ b/input/regression/multi-measure-rest-text.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { @@ -22,7 +22,7 @@ measures stretch to accomodate wide texts. R2.^"4" R2.*3_\markup { \roman "a1b2c3" } R2.*10^"inner"^"top"_"inner"_"bot" - \override MultiMeasureRestText #'spacing-procedure + \override MultiMeasureRestText #'callbacks #'springs-and-rods = #Multi_measure_rest::set_text_rods R2.^"very very very very very very long text" diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly index 3e45b19884..5b58111dd4 100644 --- a/input/regression/multi-measure-rest.ly +++ b/input/regression/multi-measure-rest.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/music-function.ly b/input/regression/music-function.ly index 8c6eb8ca26..3708a03b58 100644 --- a/input/regression/music-function.ly +++ b/input/regression/music-function.ly @@ -7,7 +7,7 @@ demonstrate a @code{\myBar} function, which works similar to @code{\bar}, but is implemented completely in Scheme." } -\version "2.6.0" +\version "2.7.13" myBar = #(def-music-function (parser location bar-type) (string?) (context-spec-music diff --git a/input/regression/music-map.ly b/input/regression/music-map.ly index 86057ddbb8..2dc7fe2705 100644 --- a/input/regression/music-map.ly +++ b/input/regression/music-map.ly @@ -10,7 +10,7 @@ and dynamics are left over. These are put onto the 2nd measure." } -\version "2.7.10" +\version "2.7.13" #(define (notes-to-skip m) "Convert all stuff with duration (notes, lyrics, bass figures, etc.) to skips. diff --git a/input/regression/newaddlyrics.ly b/input/regression/newaddlyrics.ly index a91f8e7fa4..235bff73bb 100644 --- a/input/regression/newaddlyrics.ly +++ b/input/regression/newaddlyrics.ly @@ -26,4 +26,4 @@ } >> -\version "2.6.0" +\version "2.7.13" diff --git a/input/regression/no-staff.ly b/input/regression/no-staff.ly index 7740b43dab..1377ac5faf 100644 --- a/input/regression/no-staff.ly +++ b/input/regression/no-staff.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" % possible rename to staff-something. -gp \header{ texidoc = "@cindex Staff Remove diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly index 857bc7410a..a1a7b27779 100644 --- a/input/regression/non-empty-text.ly +++ b/input/regression/non-empty-text.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" By default, text is set with empty horizontal dimensions. diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly index d5d70e1405..067a72cb2f 100644 --- a/input/regression/note-group-bracket.ly +++ b/input/regression/note-group-bracket.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly index 3e801b2166..98adbfb691 100644 --- a/input/regression/note-head-chord.ly +++ b/input/regression/note-head-chord.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Note heads are flipped on the stem to prevent collisions. diff --git a/input/regression/note-head-harmonic.ly b/input/regression/note-head-harmonic.ly index b357e95e1f..bebeda585e 100644 --- a/input/regression/note-head-harmonic.ly +++ b/input/regression/note-head-harmonic.ly @@ -12,7 +12,7 @@ raggedright = ##t } -\version "2.6.0" +\version "2.7.13" { diff --git a/input/regression/note-head-solfa.ly b/input/regression/note-head-solfa.ly index 776a347d96..0a0dd2eb84 100644 --- a/input/regression/note-head-solfa.ly +++ b/input/regression/note-head-solfa.ly @@ -6,7 +6,7 @@ is adjusted according to the step of the scale, as measured relative to the @code{tonic} property." } -\version "2.6.0" +\version "2.7.13" fragment = { \key c \major diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly index 59a55325ce..647ed3f20d 100644 --- a/input/regression/note-head-style.ly +++ b/input/regression/note-head-style.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" Note head shapes may be set from several choices. diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly index 76969d7ee8..57e0825e2f 100644 --- a/input/regression/note-line.ly +++ b/input/regression/note-line.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Note head lines (e.g. glissando) diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly index 6b1d9f1248..e55b8e63a8 100644 --- a/input/regression/number-staff-lines.ly +++ b/input/regression/number-staff-lines.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" The number of stafflines of a staff can be set. Ledger diff --git a/input/regression/ottava-broken.ly b/input/regression/ottava-broken.ly index 2981fee834..71eb3bbb90 100644 --- a/input/regression/ottava-broken.ly +++ b/input/regression/ottava-broken.ly @@ -10,7 +10,7 @@ the end of the line (regardless of prefatory matter). } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t } diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly index 9a81d74eed..ee44664e32 100644 --- a/input/regression/ottava.ly +++ b/input/regression/ottava.ly @@ -10,7 +10,7 @@ string can be tuned with @code{Staff.ottavation}. " } -\version "2.6.0" +\version "2.7.13" %% . There must be a minimum distance between the octavation line and the %% topmost staff line, taking into account the height of the closing diff --git a/input/regression/override-nest.ly b/input/regression/override-nest.ly new file mode 100644 index 0000000000..305c6de20b --- /dev/null +++ b/input/regression/override-nest.ly @@ -0,0 +1,13 @@ +\version "2.7.13" +\header { + + texidoc = "Sublist of grob property lists may be also tuned. In the +next example, the @code{beamed-lengths} property of the @code{Stem} +grob is tweaked." + +} + +\relative { + \override Stem #'details #'beamed-lengths = #'(8 8 8) + c8[ c] +} diff --git a/input/regression/page-breaks.ly b/input/regression/page-breaks.ly index 7da6bf308b..b77b541286 100644 --- a/input/regression/page-breaks.ly +++ b/input/regression/page-breaks.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/page-layout.ly b/input/regression/page-layout.ly index 7d315aef1c..0ecc725e0b 100644 --- a/input/regression/page-layout.ly +++ b/input/regression/page-layout.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" diff --git a/input/regression/page-spacing.ly b/input/regression/page-spacing.ly index 2ede5f04ef..6dccbccf75 100644 --- a/input/regression/page-spacing.ly +++ b/input/regression/page-spacing.ly @@ -13,7 +13,7 @@ By setting @code{annotatespacing}, we can see the effect of each property. } -\version "2.7.12" +\version "2.7.13" #(set-global-staff-size 11) diff --git a/input/regression/page-top-space.ly b/input/regression/page-top-space.ly index 154def9de8..4e456773ce 100644 --- a/input/regression/page-top-space.ly +++ b/input/regression/page-top-space.ly @@ -4,7 +4,7 @@ first system can be forced to be uniform." } -\version "2.7.11" +\version "2.7.13" \book { \score { diff --git a/input/regression/part-combine-a2.ly b/input/regression/part-combine-a2.ly index 96ca060e9c..22ae352846 100644 --- a/input/regression/part-combine-a2.ly +++ b/input/regression/part-combine-a2.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc ="The a2 string is printed only on notes (i.e. not on rests), and only after chords, solo or polyphony." diff --git a/input/regression/part-combine-cross.ly b/input/regression/part-combine-cross.ly index 46d238a2cd..ea085e2014 100644 --- a/input/regression/part-combine-cross.ly +++ b/input/regression/part-combine-cross.ly @@ -4,7 +4,7 @@ " } -\version "2.6.0" +\version "2.7.13" vone = \relative a' { g4 g f f e e d d } vtwo = \relative a' { e4 e f f g g a a } diff --git a/input/regression/part-combine-global.ly b/input/regression/part-combine-global.ly index 37705ad459..d6a968f02f 100644 --- a/input/regression/part-combine-global.ly +++ b/input/regression/part-combine-global.ly @@ -11,7 +11,7 @@ voices. " } -\version "2.6.0" +\version "2.7.13" vone = diff --git a/input/regression/part-combine-mmrest-after-solo.ly b/input/regression/part-combine-mmrest-after-solo.ly index a5bc407fb1..5552560770 100644 --- a/input/regression/part-combine-mmrest-after-solo.ly +++ b/input/regression/part-combine-mmrest-after-solo.ly @@ -1,7 +1,7 @@ \header { texidoc = " Multimeasure rests are printed after solos, both for solo1 and for solo2." } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t } \new Staff diff --git a/input/regression/part-combine-solo-end.ly b/input/regression/part-combine-solo-end.ly index 10a9fc3f96..f43b41bf3c 100644 --- a/input/regression/part-combine-solo-end.ly +++ b/input/regression/part-combine-solo-end.ly @@ -6,7 +6,7 @@ } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t } << diff --git a/input/regression/part-combine-solo-global.ly b/input/regression/part-combine-solo-global.ly index ada58de021..4f4fdaf176 100644 --- a/input/regression/part-combine-solo-global.ly +++ b/input/regression/part-combine-solo-global.ly @@ -5,7 +5,7 @@ } -\version "2.6.0" +\version "2.7.13" \paper { raggedright = ##t } \new Staff diff --git a/input/regression/part-combine-solo.ly b/input/regression/part-combine-solo.ly index 71863b4269..93a61ddca8 100644 --- a/input/regression/part-combine-solo.ly +++ b/input/regression/part-combine-solo.ly @@ -17,7 +17,7 @@ Solo 1/2 can not be used when a spanner is active, so there is no solo vone = \relative a' { d4 r8 d8 d8 r8 d8 r8 d2 ~ d2 ~ d4 } vtwo = \relative g' { g4. g8 r2 g4 r4 r2 g4 } -\version "2.6.0" +\version "2.7.13" \paper { raggedright = ##t } diff --git a/input/regression/part-combine-text.ly b/input/regression/part-combine-text.ly index dd7a127e86..0b936c0b9d 100644 --- a/input/regression/part-combine-text.ly +++ b/input/regression/part-combine-text.ly @@ -9,7 +9,7 @@ texts accordingly. } -\version "2.6.0" +\version "2.7.13" \layout { raggedright= ##t } diff --git a/input/regression/part-combine.ly b/input/regression/part-combine.ly index cefd7fcc32..1c251713f7 100644 --- a/input/regression/part-combine.ly +++ b/input/regression/part-combine.ly @@ -11,7 +11,7 @@ \layout { raggedright = ##t } -\version "2.6.0" +\version "2.7.13" vone = \relative a' { g2 g g g4 g f' c c( c) c c c ~ c diff --git a/input/regression/pedal-bracket.ly b/input/regression/pedal-bracket.ly index b000fdbc4b..afa98a8890 100644 --- a/input/regression/pedal-bracket.ly +++ b/input/regression/pedal-bracket.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/pedal-end.ly b/input/regression/pedal-end.ly index 6186814f49..ea04198f61 100644 --- a/input/regression/pedal-end.ly +++ b/input/regression/pedal-end.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Unterminated piano pedal brackets run to the end of the piece. " diff --git a/input/regression/pedal-ped.ly b/input/regression/pedal-ped.ly index 3231abe87b..61e0960476 100644 --- a/input/regression/pedal-ped.ly +++ b/input/regression/pedal-ped.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "The standard piano pedals style comes with Ped symbols. diff --git a/input/regression/phrasing-slur-slur-avoid.ly b/input/regression/phrasing-slur-slur-avoid.ly index 4ff6360021..1db9b29dcd 100644 --- a/input/regression/phrasing-slur-slur-avoid.ly +++ b/input/regression/phrasing-slur-slur-avoid.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc="@code{PhrasingSlur}s go over normal slurs." } diff --git a/input/regression/prefatory-empty-spacing.ly b/input/regression/prefatory-empty-spacing.ly index 23c7058983..782bd9871e 100644 --- a/input/regression/prefatory-empty-spacing.ly +++ b/input/regression/prefatory-empty-spacing.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly index 24997ddbe7..2867b6a208 100644 --- a/input/regression/prefatory-spacing-matter.ly +++ b/input/regression/prefatory-spacing-matter.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Distances between prefatory items (e.g. clef, bar, diff --git a/input/regression/property-grace-polyphony.ly b/input/regression/property-grace-polyphony.ly index 46fe308234..6cafd8367b 100644 --- a/input/regression/property-grace-polyphony.ly +++ b/input/regression/property-grace-polyphony.ly @@ -7,7 +7,7 @@ } \layout { raggedright = ##t } -\version "2.6.0" +\version "2.7.13" \relative c'' { << { \grace e8 d2 } diff --git a/input/regression/property-once.ly b/input/regression/property-once.ly index f350c0714d..10011d28f8 100644 --- a/input/regression/property-once.ly +++ b/input/regression/property-once.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Once properties take effect during a single time step only." } diff --git a/input/regression/quote-cue-during.ly b/input/regression/quote-cue-during.ly index 29363cb4cf..6d6dcd4e73 100644 --- a/input/regression/quote-cue-during.ly +++ b/input/regression/quote-cue-during.ly @@ -11,7 +11,7 @@ last note." } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t } diff --git a/input/regression/quote-cyclic.ly b/input/regression/quote-cyclic.ly index 89af2fb117..200f6776b4 100644 --- a/input/regression/quote-cyclic.ly +++ b/input/regression/quote-cyclic.ly @@ -6,7 +6,7 @@ example, there are notes with each full-bar rest." } -\version "2.6.0" +\version "2.7.13" A = \relative c' { c4 d e f | \cueDuring #"qB" #1 { R1 } | } B = \relative c' { \cueDuring #"qA" #1 { R1 } | f4 e d c | } diff --git a/input/regression/quote-during.ly b/input/regression/quote-during.ly index b4976c25d0..c9ab28d421 100644 --- a/input/regression/quote-during.ly +++ b/input/regression/quote-during.ly @@ -8,7 +8,7 @@ quoted. In this example, a 16th rests is not quoted, since @code{rest-event} is not in @code{quotedEventTypes}." } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t } diff --git a/input/regression/quote-grace.ly b/input/regression/quote-grace.ly index e326c2a1b5..249a04df08 100644 --- a/input/regression/quote-grace.ly +++ b/input/regression/quote-grace.ly @@ -7,7 +7,7 @@ } \paper { raggedright= ##t } -\version "2.6.0" +\version "2.7.13" quoted = \relative c'' { R1 \grace g16 f4 \grace a16 bes4 \grace b16 c4 c4 diff --git a/input/regression/quote-transposition.ly b/input/regression/quote-transposition.ly index 71168ae36a..5b90a8cd45 100644 --- a/input/regression/quote-transposition.ly +++ b/input/regression/quote-transposition.ly @@ -10,7 +10,7 @@ quoted ones) will transposed as well. " } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t } diff --git a/input/regression/quote.ly b/input/regression/quote.ly index 1e1a04fbcc..a1ac4cae50 100644 --- a/input/regression/quote.ly +++ b/input/regression/quote.ly @@ -7,7 +7,7 @@ things are quoted. In this example, a 16th rests is not quoted, since @code{rest-event} is not in @code{quotedEventTypes}." } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t } diff --git a/input/regression/rehearsal-mark-letter.ly b/input/regression/rehearsal-mark-letter.ly index e0765f1dff..efd8a0411e 100644 --- a/input/regression/rehearsal-mark-letter.ly +++ b/input/regression/rehearsal-mark-letter.ly @@ -8,7 +8,7 @@ after Z, double letters are used. The mark may be set with } -\version "2.6.0" +\version "2.7.13" \paper { raggedright = ##t } \relative c'' { diff --git a/input/regression/rehearsal-mark-number.ly b/input/regression/rehearsal-mark-number.ly index e523cd854f..44f624def0 100644 --- a/input/regression/rehearsal-mark-number.ly +++ b/input/regression/rehearsal-mark-number.ly @@ -5,7 +5,7 @@ By setting @code{markFormatter} we may choose a different style of mark printing } -\version "2.6.0" +\version "2.7.13" \paper { raggedright = ##t } diff --git a/input/regression/repeat-fold.ly b/input/regression/repeat-fold.ly index 6f13c702cc..109804cba0 100644 --- a/input/regression/repeat-fold.ly +++ b/input/regression/repeat-fold.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/repeat-line-break.ly b/input/regression/repeat-line-break.ly index 45d8b82ab0..e24067c3eb 100644 --- a/input/regression/repeat-line-break.ly +++ b/input/regression/repeat-line-break.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/repeat-percent-count.ly b/input/regression/repeat-percent-count.ly index cab8ce4a2e..b1d3f14c5e 100644 --- a/input/regression/repeat-percent-count.ly +++ b/input/regression/repeat-percent-count.ly @@ -9,7 +9,7 @@ only if there are more than two repeats." } -\version "2.7.6" +\version "2.7.13" \relative c'' \new Voice { \set countPercentRepeats = ##t diff --git a/input/regression/repeat-percent-skipbars.ly b/input/regression/repeat-percent-skipbars.ly index b6bb8f33d0..f1fab7cda7 100644 --- a/input/regression/repeat-percent-skipbars.ly +++ b/input/regression/repeat-percent-skipbars.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/repeat-percent.ly b/input/regression/repeat-percent.ly index 8fff8be87d..fe86bc5cc6 100644 --- a/input/regression/repeat-percent.ly +++ b/input/regression/repeat-percent.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Measure repeats may be nested with beat repeats." } diff --git a/input/regression/repeat-slash.ly b/input/regression/repeat-slash.ly index 1c210e64d6..21eabcd8fe 100644 --- a/input/regression/repeat-slash.ly +++ b/input/regression/repeat-slash.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Within a bar, beat repeats denote that a music snippet should be played again." diff --git a/input/regression/repeat-unfold-all.ly b/input/regression/repeat-unfold-all.ly index 6b197a2a89..6a03e801d9 100644 --- a/input/regression/repeat-unfold-all.ly +++ b/input/regression/repeat-unfold-all.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Volta repeats may be unfolded through the music function @code{\unfoldRepeats}." diff --git a/input/regression/repeat-unfold-tremolo.ly b/input/regression/repeat-unfold-tremolo.ly index b1e3d629de..d8aa3ec8d7 100644 --- a/input/regression/repeat-unfold-tremolo.ly +++ b/input/regression/repeat-unfold-tremolo.ly @@ -1,4 +1,4 @@ -\version "2.7.10" +\version "2.7.13" \header { texidoc = "Unfolding tremolo repeats. All fragments fill one diff --git a/input/regression/repeat-unfold.ly b/input/regression/repeat-unfold.ly index 8381b3bf02..9d8dde2db9 100644 --- a/input/regression/repeat-unfold.ly +++ b/input/regression/repeat-unfold.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly index 3e3fc5d5e1..bb99d3ca32 100644 --- a/input/regression/repeat-volta-skip-alternatives.ly +++ b/input/regression/repeat-volta-skip-alternatives.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "When too few alternatives are present, the first diff --git a/input/regression/repeat-volta.ly b/input/regression/repeat-volta.ly index be809379ee..ad6fe194a0 100644 --- a/input/regression/repeat-volta.ly +++ b/input/regression/repeat-volta.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/rest-collision-beam.ly b/input/regression/rest-collision-beam.ly index 274287296f..2f061f2c68 100644 --- a/input/regression/rest-collision-beam.ly +++ b/input/regression/rest-collision-beam.ly @@ -6,7 +6,7 @@ raggedright = ##t } -\version "2.6.0" +\version "2.7.13" fig = \relative c' { 8[ r r r ] diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly index f259aa9ed5..fc02945fc3 100644 --- a/input/regression/rest-collision.ly +++ b/input/regression/rest-collision.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" Rests should not collide with beams, stems and noteheads. Rests may diff --git a/input/regression/rest-dot-position.ly b/input/regression/rest-dot-position.ly index df36948954..8fac1da4bc 100644 --- a/input/regression/rest-dot-position.ly +++ b/input/regression/rest-dot-position.ly @@ -4,7 +4,7 @@ } -\version "2.6.0" +\version "2.7.13" \paper { raggedright = ##t } diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly index cbbcd7db9a..4872b2c30b 100644 --- a/input/regression/rest-ledger.ly +++ b/input/regression/rest-ledger.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Whole and half rests moving outside the staff should get ledger lines." diff --git a/input/regression/rest-pitch.ly b/input/regression/rest-pitch.ly index 5aa510cc4a..7da5d7585c 100644 --- a/input/regression/rest-pitch.ly +++ b/input/regression/rest-pitch.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Rests can have pitches--these will be affected by diff --git a/input/regression/rest-polyphonic.ly b/input/regression/rest-polyphonic.ly index 3c8d4ae6e1..687998c6eb 100644 --- a/input/regression/rest-polyphonic.ly +++ b/input/regression/rest-polyphonic.ly @@ -9,7 +9,7 @@ even if there is no opposite note or rest. The amount is two \layout { raggedright = ##t } -\version "2.6.0" +\version "2.7.13" \new Staff \relative c' { diff --git a/input/regression/rest.ly b/input/regression/rest.ly index 5f7ea099e2..df25506415 100644 --- a/input/regression/rest.ly +++ b/input/regression/rest.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/rhythmic-staff.ly b/input/regression/rhythmic-staff.ly index f26ddc8400..32f0b507da 100644 --- a/input/regression/rhythmic-staff.ly +++ b/input/regression/rhythmic-staff.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/score-text.ly b/input/regression/score-text.ly index 641f97358e..15803ef9c5 100644 --- a/input/regression/score-text.ly +++ b/input/regression/score-text.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly index 7ccc913520..fa92331567 100644 --- a/input/regression/script-collision.ly +++ b/input/regression/script-collision.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly index 4d911ae45b..0b1e74d830 100644 --- a/input/regression/script-stack-order.ly +++ b/input/regression/script-stack-order.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Scripts can be stacked. The order is determined by a priority field, but when objects have the same priority, the input diff --git a/input/regression/script-stacked.ly b/input/regression/script-stacked.ly index 7c85edcd1b..8f4131e519 100644 --- a/input/regression/script-stacked.ly +++ b/input/regression/script-stacked.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \layout { raggedright= ##t } diff --git a/input/regression/size11.ly b/input/regression/size11.ly index 9afccbbf3a..89ef5a8b1f 100644 --- a/input/regression/size11.ly +++ b/input/regression/size11.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/size13.ly b/input/regression/size13.ly index 88e2246e78..e6af2f928c 100644 --- a/input/regression/size13.ly +++ b/input/regression/size13.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" foollilypondbook = " \score " diff --git a/input/regression/size16.ly b/input/regression/size16.ly index 0b7ba93bbc..a0059c8005 100644 --- a/input/regression/size16.ly +++ b/input/regression/size16.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" foollilypondbook = " \score " diff --git a/input/regression/size20.ly b/input/regression/size20.ly index c898647dea..fb75d76397 100644 --- a/input/regression/size20.ly +++ b/input/regression/size20.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" foollilypondbook = " \score " diff --git a/input/regression/size23.ly b/input/regression/size23.ly index 5b167dc40a..fee9b9dda7 100644 --- a/input/regression/size23.ly +++ b/input/regression/size23.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" foollilypondbook = " \score " diff --git a/input/regression/size26.ly b/input/regression/size26.ly index 9759e7b6b1..45fdae029a 100644 --- a/input/regression/size26.ly +++ b/input/regression/size26.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" foollilypondbook = " \score " diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly index c2724d79bf..1dab583235 100644 --- a/input/regression/slur-broken-trend.ly +++ b/input/regression/slur-broken-trend.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly index 33b48fceb6..d55b66f6dc 100644 --- a/input/regression/slur-cross-staff.ly +++ b/input/regression/slur-cross-staff.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" Slurs behave decently when broken across a linebreak. diff --git a/input/regression/slur-dash.ly b/input/regression/slur-dash.ly index 56b191dee9..89338b4f98 100644 --- a/input/regression/slur-dash.ly +++ b/input/regression/slur-dash.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header {texidoc = "@cindex Slur, dotted, dashed The appearance of slurs may be changed from solid to dotted or dashed. " diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly index 61fbf83047..66679fdc6c 100644 --- a/input/regression/slur-dots.ly +++ b/input/regression/slur-dots.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc="Slurs should not get confused by augmentation dots. With a lot of dots, the problems becomes more visible." diff --git a/input/regression/slur-double.ly b/input/regression/slur-double.ly index 7108b1d704..f4edfc9f05 100644 --- a/input/regression/slur-double.ly +++ b/input/regression/slur-double.ly @@ -3,7 +3,7 @@ texidoc = "Some composers use slurs both above and below chords. This can be typeset by setting @code{doubleSlurs}" } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t } \relative { diff --git a/input/regression/slur-dynamics.ly b/input/regression/slur-dynamics.ly index 83d867d8d9..ab32714c39 100644 --- a/input/regression/slur-dynamics.ly +++ b/input/regression/slur-dynamics.ly @@ -4,7 +4,7 @@ texidoc = "Dynamics avoid collision with slur." } -\version "2.6.0" +\version "2.7.13" \layout { indent = 0\mm raggedright = ##t diff --git a/input/regression/slur-extreme.ly b/input/regression/slur-extreme.ly index ba7c796f3e..844d7a9140 100644 --- a/input/regression/slur-extreme.ly +++ b/input/regression/slur-extreme.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/slur-manual.ly b/input/regression/slur-manual.ly index 35261e2e5c..59a8647b34 100644 --- a/input/regression/slur-manual.ly +++ b/input/regression/slur-manual.ly @@ -6,7 +6,7 @@ positioning of the slur. It selects the slur configuration closest to the given pair. " } -\version "2.6.0" +\version "2.7.13" \paper { raggedright = ##T } \relative { diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly index d9a9d051d6..5475243a4f 100644 --- a/input/regression/slur-nice.ly +++ b/input/regression/slur-nice.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" Slurs should look nice and symmetric. The curvature may increase diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly index 8935448f6f..0067aa784a 100644 --- a/input/regression/slur-rest.ly +++ b/input/regression/slur-rest.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc ="Slurs may be placed over rest. The slur will avoid colliding with diff --git a/input/regression/slur-scoring.ly b/input/regression/slur-scoring.ly index fa283c2535..8f4d8e07f5 100644 --- a/input/regression/slur-scoring.ly +++ b/input/regression/slur-scoring.ly @@ -12,7 +12,7 @@ } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t % #(define debug-slur-scoring #t) diff --git a/input/regression/slur-script-inside.ly b/input/regression/slur-script-inside.ly index 5378f58630..2a7d338d5e 100644 --- a/input/regression/slur-script-inside.ly +++ b/input/regression/slur-script-inside.ly @@ -8,7 +8,7 @@ } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t } diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly index 8eb12d5ab9..de36d7e37a 100644 --- a/input/regression/slur-script.ly +++ b/input/regression/slur-script.ly @@ -9,7 +9,7 @@ scripts can be moved manually." } -\version "2.6.0" +\version "2.7.13" \layout { indent = 0\mm raggedright = ##t diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly index f24e14a1ca..2ec8bb0a72 100644 --- a/input/regression/slur-symmetry-1.ly +++ b/input/regression/slur-symmetry-1.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Symmetric figures should lead to symmetric slurs." diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly index f52d559539..c70d5a7fdb 100644 --- a/input/regression/slur-symmetry.ly +++ b/input/regression/slur-symmetry.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Symmetric figures should lead to symmetric slurs." diff --git a/input/regression/slur-tilt.ly b/input/regression/slur-tilt.ly index f2a4eb265d..ffcc6c4445 100644 --- a/input/regression/slur-tilt.ly +++ b/input/regression/slur-tilt.ly @@ -8,7 +8,7 @@ point into one note head, and point over another note head." \layout { raggedright = ##t } -\version "2.6.0" +\version "2.7.13" \relative c'' { \time 2/4 diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly index db7aed0933..d85279c41c 100644 --- a/input/regression/spacing-accidental-staffs.ly +++ b/input/regression/spacing-accidental-staffs.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Accidentals in different staves do not affect the diff --git a/input/regression/spacing-accidental-stretch.ly b/input/regression/spacing-accidental-stretch.ly index f428ae4381..9ba695a04c 100644 --- a/input/regression/spacing-accidental-stretch.ly +++ b/input/regression/spacing-accidental-stretch.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Accidentals do not influence the amount of stretchable space. diff --git a/input/regression/spacing-accidental.ly b/input/regression/spacing-accidental.ly index 5af64a9af0..8c6c7e7938 100644 --- a/input/regression/spacing-accidental.ly +++ b/input/regression/spacing-accidental.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Accidentals sticking out to the left diff --git a/input/regression/spacing-bar-stem.ly b/input/regression/spacing-bar-stem.ly index 83a90cc423..f8d26b6abf 100644 --- a/input/regression/spacing-bar-stem.ly +++ b/input/regression/spacing-bar-stem.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Downstem notes following a barline are printed with some extra space. This is an optical correction similar diff --git a/input/regression/spacing-clef-first-note.ly b/input/regression/spacing-clef-first-note.ly index b2c9fd6e73..b11de74049 100644 --- a/input/regression/spacing-clef-first-note.ly +++ b/input/regression/spacing-clef-first-note.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Clef changes at the start of a line get much more space diff --git a/input/regression/spacing-end-of-line.ly b/input/regression/spacing-end-of-line.ly index 5b583d8883..9f01223c01 100644 --- a/input/regression/spacing-end-of-line.ly +++ b/input/regression/spacing-end-of-line.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc ="Broken engraving of a bar at the end of a line does not upset diff --git a/input/regression/spacing-ended-voice.ly b/input/regression/spacing-ended-voice.ly index bb962269a7..cb75832111 100644 --- a/input/regression/spacing-ended-voice.ly +++ b/input/regression/spacing-ended-voice.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = " A voicelet (a very short voice to get polyphonic chords correct) should not confuse the spacing engine." diff --git a/input/regression/spacing-folded-clef.ly b/input/regression/spacing-folded-clef.ly index c62f57cdce..9be4c21f75 100644 --- a/input/regression/spacing-folded-clef.ly +++ b/input/regression/spacing-folded-clef.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "A clef can be folded below notes in a different staff, if this does not disrupt the flow of the notes." diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly index 766b9a1f9e..3910763faf 100644 --- a/input/regression/spacing-folded-clef2.ly +++ b/input/regression/spacing-folded-clef2.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "A clef can be folded below notes in a different staff, if @@ -11,8 +11,8 @@ can show where columns are in the score." \context { \Score - \override NonMusicalPaperColumn #'print-function = #Paper_column::print - \override PaperColumn #'print-function = #Paper_column::print + \override NonMusicalPaperColumn #'callbacks #'stencil = #Paper_column::print + \override PaperColumn #'callbacks #'stencil = #Paper_column::print \override NonMusicalPaperColumn #'font-family = #'roman \override PaperColumn #'font-family = #'roman diff --git a/input/regression/spacing-grace-duration.ly b/input/regression/spacing-grace-duration.ly index a02dda3993..274ca637cd 100644 --- a/input/regression/spacing-grace-duration.ly +++ b/input/regression/spacing-grace-duration.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Spacing uses the duration of the notes, but disregards diff --git a/input/regression/spacing-grace.ly b/input/regression/spacing-grace.ly index 60c7c96bbe..437a03a694 100644 --- a/input/regression/spacing-grace.ly +++ b/input/regression/spacing-grace.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Grace note spacing. " } diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly index 5eabbc4ebd..85663ae07a 100644 --- a/input/regression/spacing-knee.ly +++ b/input/regression/spacing-knee.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "For knees, the spacing correction is such that the diff --git a/input/regression/spacing-multi-tuplet.ly b/input/regression/spacing-multi-tuplet.ly index 17a45604fd..05539b319a 100644 --- a/input/regression/spacing-multi-tuplet.ly +++ b/input/regression/spacing-multi-tuplet.ly @@ -1,4 +1,4 @@ -\version "2.6.0" \header{ +\version "2.7.13" \header{ texidoc = "Concurrent tuplets should be equidistant on all staffs. diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly index e69d0b0795..e95c0d9da3 100644 --- a/input/regression/spacing-note-flags.ly +++ b/input/regression/spacing-note-flags.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/spacing-proportional.ly b/input/regression/spacing-proportional.ly index 32b5440d5d..ff1bbed75c 100644 --- a/input/regression/spacing-proportional.ly +++ b/input/regression/spacing-proportional.ly @@ -6,7 +6,7 @@ to the distance for the given duration." } -\version "2.7.4" +\version "2.7.13" \paper { raggedright = ##t } diff --git a/input/regression/spacing-ragged-last.ly b/input/regression/spacing-ragged-last.ly index 306ebbc025..6485037046 100644 --- a/input/regression/spacing-ragged-last.ly +++ b/input/regression/spacing-ragged-last.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly index fd14af8da2..3577544658 100644 --- a/input/regression/spacing-rest.ly +++ b/input/regression/spacing-rest.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Rests get a little less space, since they are narrower. However, the quarter rest in feta font is relatively wide, causing this diff --git a/input/regression/spacing-short-notes.ly b/input/regression/spacing-short-notes.ly index 44375e7c71..2428e6d04f 100644 --- a/input/regression/spacing-short-notes.ly +++ b/input/regression/spacing-short-notes.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Notes that are shorter than the common shortest note get a diff --git a/input/regression/spacing-stem-bar.ly b/input/regression/spacing-stem-bar.ly index 9a36e658ac..ef082e4c18 100644 --- a/input/regression/spacing-stem-bar.ly +++ b/input/regression/spacing-stem-bar.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Upstem notes before a barline are printed with some extra diff --git a/input/regression/spacing-stem-direction.ly b/input/regression/spacing-stem-direction.ly index 00a14fb0f1..3edb6a6cde 100644 --- a/input/regression/spacing-stem-direction.ly +++ b/input/regression/spacing-stem-direction.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly index d9aaceb95f..0a1ed16192 100644 --- a/input/regression/spacing-stem-same-direction.ly +++ b/input/regression/spacing-stem-same-direction.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "For juxtaposed chords with the same direction, a slight optical correction is used. It is constant, and works only if diff --git a/input/regression/spacing-stick-out.ly b/input/regression/spacing-stick-out.ly index ac751bea92..81d43b7cdc 100644 --- a/input/regression/spacing-stick-out.ly +++ b/input/regression/spacing-stick-out.ly @@ -7,7 +7,7 @@ } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t } diff --git a/input/regression/spacing-strict-notespacing.ly b/input/regression/spacing-strict-notespacing.ly index d88f8abb2c..af6233a6f7 100644 --- a/input/regression/spacing-strict-notespacing.ly +++ b/input/regression/spacing-strict-notespacing.ly @@ -9,7 +9,7 @@ time. This may cause collisions. " } -\version "2.7.4" +\version "2.7.13" \paper { raggedright = ##t diff --git a/input/regression/spacing-strict-spacing-grace.ly b/input/regression/spacing-strict-spacing-grace.ly index 4af57d8c01..19916344a5 100644 --- a/input/regression/spacing-strict-spacing-grace.ly +++ b/input/regression/spacing-strict-spacing-grace.ly @@ -5,7 +5,7 @@ } -\version "2.7.4" +\version "2.7.13" \paper { raggedright = ##t diff --git a/input/regression/spacing-to-grace.ly b/input/regression/spacing-to-grace.ly index 899a1eb2b5..f96e2df7fc 100644 --- a/input/regression/spacing-to-grace.ly +++ b/input/regression/spacing-to-grace.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc ="Space from a normal note (or barline) to a grace note is diff --git a/input/regression/spacing-uniform-stretching.ly b/input/regression/spacing-uniform-stretching.ly index f3e96d0c33..673da842dc 100644 --- a/input/regression/spacing-uniform-stretching.ly +++ b/input/regression/spacing-uniform-stretching.ly @@ -6,7 +6,7 @@ } -\version "2.7.4" +\version "2.7.13" \relative c'' << diff --git a/input/regression/span-bar-break.ly b/input/regression/span-bar-break.ly index f3a4423f91..4b5eeec3f7 100644 --- a/input/regression/span-bar-break.ly +++ b/input/regression/span-bar-break.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly index ed52f420c5..bb6357b62d 100644 --- a/input/regression/span-bar.ly +++ b/input/regression/span-bar.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Span bars are drawn only between staff bar lines. By setting bar lines to transparent, they are shown only between systems. diff --git a/input/regression/spanner-break-overshoot.ly b/input/regression/spanner-break-overshoot.ly index b71ff19cca..277d3fef1d 100644 --- a/input/regression/spanner-break-overshoot.ly +++ b/input/regression/spanner-break-overshoot.ly @@ -8,7 +8,7 @@ prefatory matter." } -\version "2.7.4" +\version "2.7.13" \paper { raggedright = ##t } diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly index 8e12b3db12..97f6424baf 100644 --- a/input/regression/staccato-pos.ly +++ b/input/regression/staccato-pos.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ diff --git a/input/regression/staff-halfway.ly b/input/regression/staff-halfway.ly index e4eacb9d3d..0d7392672a 100644 --- a/input/regression/staff-halfway.ly +++ b/input/regression/staff-halfway.ly @@ -2,7 +2,7 @@ texidoc = "Staves can be started and stopped at command. " } -\version "2.6.0" +\version "2.7.13" \paper { raggedright = ##t diff --git a/input/regression/staff-mixed-size.ly b/input/regression/staff-mixed-size.ly index 1e56d53429..046318881d 100644 --- a/input/regression/staff-mixed-size.ly +++ b/input/regression/staff-mixed-size.ly @@ -7,7 +7,7 @@ large on smaller staves." } -\version "2.6.0" +\version "2.7.13" \layout { #(layout-set-staff-size 6) diff --git a/input/regression/staff-tweak.ly b/input/regression/staff-tweak.ly index 79339fc9ff..ec32ce4a74 100644 --- a/input/regression/staff-tweak.ly +++ b/input/regression/staff-tweak.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "The staff is a grob (graphical object) which may be adjusted as well, for example, to have 6 thick lines and a slightly large @code{staff-space}. diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly index 3daa245965..25871250e1 100644 --- a/input/regression/stanza-number.ly +++ b/input/regression/stanza-number.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Stanza numbers are put left of their lyric. They are aligned in a column." } diff --git a/input/regression/stem-direction.ly b/input/regression/stem-direction.ly index b6ef606308..ee806cb9d5 100644 --- a/input/regression/stem-direction.ly +++ b/input/regression/stem-direction.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/stem-shorten.ly b/input/regression/stem-shorten.ly index 442b38e3b9..3aae75dd62 100644 --- a/input/regression/stem-shorten.ly +++ b/input/regression/stem-shorten.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/stem-stemlet.ly b/input/regression/stem-stemlet.ly index f8adcf2df6..661319dfe8 100644 --- a/input/regression/stem-stemlet.ly +++ b/input/regression/stem-stemlet.ly @@ -5,7 +5,7 @@ length can be set with @code{stemlet-length}." } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##t } \relative { diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly index 6482c3a674..0b27ae48c5 100644 --- a/input/regression/stem-tremolo.ly +++ b/input/regression/stem-tremolo.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" Stem tremolos or rolls are tremolo signs that look like beam segments diff --git a/input/regression/stencil-hacking.ly b/input/regression/stencil-hacking.ly index fc13bb2126..b5ec1dfa0b 100644 --- a/input/regression/stencil-hacking.ly +++ b/input/regression/stencil-hacking.ly @@ -1,5 +1,5 @@ -\version "2.7.0" +\version "2.7.13" \header { texidoc=" You can write stencil callbacks in Scheme, thus providing custom glyphs for notation elements. A simple example is @@ -53,12 +53,13 @@ GROB. The dimensions of the stencil is not affected. \relative c' { c4 e - \override NoteHead #'print-function + \override NoteHead #'callbacks #'stencil = #(parenthesize-callback Note_head::print) g bes - \revert NoteHead #'print-function - \override Beam #'print-function + \revert NoteHead #'callbacks % stencil + + \override Beam #'callbacks #'stencil = #(parenthesize-callback Beam::print) diff --git a/input/regression/string-number.ly b/input/regression/string-number.ly index 485ec4b772..dcfe84de0f 100644 --- a/input/regression/string-number.ly +++ b/input/regression/string-number.ly @@ -4,7 +4,7 @@ positioning mechanism as finger instructions." } -\version "2.6.0" +\version "2.7.13" \paper { raggedright = ##t } diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly index 170b999943..35cb091b2b 100644 --- a/input/regression/system-extents.ly +++ b/input/regression/system-extents.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "The size of every system is correctly determined; this @@ -10,7 +10,7 @@ \layout { \context { \Score - \override System #'print-function = #box-grob-stencil + \override System #'callbacks #'stencil = #box-grob-stencil } } diff --git a/input/regression/system-overstrike.ly b/input/regression/system-overstrike.ly index 02a6f93ddb..58ab523741 100644 --- a/input/regression/system-overstrike.ly +++ b/input/regression/system-overstrike.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "By setting betweensystempadding to a negative value, it is possible to eliminate the anti-collision constraints. Then setting @code{betweensystemspace} to a low (nonzero) value, diff --git a/input/regression/system-separator.ly b/input/regression/system-separator.ly index 660282e636..17ee8c2752 100644 --- a/input/regression/system-separator.ly +++ b/input/regression/system-separator.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/system-start-bracket.ly b/input/regression/system-start-bracket.ly index 010b70fda3..af6e0f6de8 100644 --- a/input/regression/system-start-bracket.ly +++ b/input/regression/system-start-bracket.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = " diff --git a/input/regression/tablature-string-tunings.ly b/input/regression/tablature-string-tunings.ly index 230852a6ed..add6c780a2 100644 --- a/input/regression/tablature-string-tunings.ly +++ b/input/regression/tablature-string-tunings.ly @@ -6,7 +6,7 @@ } -\version "2.6.0" +\version "2.7.13" \new TabStaff { diff --git a/input/regression/tablature.ly b/input/regression/tablature.ly index f3236c3a38..2a41f5b1be 100644 --- a/input/regression/tablature.ly +++ b/input/regression/tablature.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc = "@cindex Tabulature A sample tablature, with both normal staff and tab. diff --git a/input/regression/tag-filter.ly b/input/regression/tag-filter.ly index a2dea75d7c..f306b8b650 100644 --- a/input/regression/tag-filter.ly +++ b/input/regression/tag-filter.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "The @code{\\tag} command marks music expressions with a diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly index d75f102ec9..36295730a4 100644 --- a/input/regression/text-spanner.ly +++ b/input/regression/text-spanner.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc= "Text spanners should not repeat start text when broken." } diff --git a/input/regression/tie-arpeggio.ly b/input/regression/tie-arpeggio.ly index 60836027e5..d12303349d 100644 --- a/input/regression/tie-arpeggio.ly +++ b/input/regression/tie-arpeggio.ly @@ -8,7 +8,7 @@ } -\version "2.6.0" +\version "2.7.13" \paper { raggedright = ##t } \relative { diff --git a/input/regression/tie-broken.ly b/input/regression/tie-broken.ly index 15831d4156..47fb0fca86 100644 --- a/input/regression/tie-broken.ly +++ b/input/regression/tie-broken.ly @@ -3,7 +3,7 @@ texidoc = "Ties behave properly at line breaks." } -\version "2.7.8" +\version "2.7.13" \paper { raggedright = ##t } diff --git a/input/regression/tie-busy-grobs.ly b/input/regression/tie-busy-grobs.ly index ca30ebd7af..a76afbdd80 100644 --- a/input/regression/tie-busy-grobs.ly +++ b/input/regression/tie-busy-grobs.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Tie engraver uses @code{busyGrobs} to keep track of diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly index 2df39cbe0b..74b448a027 100644 --- a/input/regression/tie-chord.ly +++ b/input/regression/tie-chord.ly @@ -13,7 +13,7 @@ each system. " } -\version "2.7.7" +\version "2.7.13" \paper { indent = #0.0 diff --git a/input/regression/tie-grace.ly b/input/regression/tie-grace.ly index 9feb9e4322..8628a0029a 100644 --- a/input/regression/tie-grace.ly +++ b/input/regression/tie-grace.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Tieing a grace to the to a following grace or main note works." } diff --git a/input/regression/tie-manual.ly b/input/regression/tie-manual.ly index babf8180c7..c8d8d9dc89 100644 --- a/input/regression/tie-manual.ly +++ b/input/regression/tie-manual.ly @@ -6,7 +6,7 @@ the second note of the chord." } -\version "2.7.7" +\version "2.7.13" \layout { raggedright = ##t diff --git a/input/regression/tie-single.ly b/input/regression/tie-single.ly index 24cdc87d9c..60f37ea181 100644 --- a/input/regression/tie-single.ly +++ b/input/regression/tie-single.ly @@ -22,7 +22,7 @@ that otherwise don't fit in a space raggedright = ##t } -\version "2.7.7" +\version "2.7.13" frag = \relative c'' { diff --git a/input/regression/trill-spanner-pitched.ly b/input/regression/trill-spanner-pitched.ly index 6e13f9b8b9..9d2917972b 100644 --- a/input/regression/trill-spanner-pitched.ly +++ b/input/regression/trill-spanner-pitched.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { diff --git a/input/regression/trill-spanner.ly b/input/regression/trill-spanner.ly index ecd2030a0d..e7c1b44d76 100644 --- a/input/regression/trill-spanner.ly +++ b/input/regression/trill-spanner.ly @@ -2,7 +2,7 @@ texidoc = "Trill spanner" } -\version "2.6.0" +\version "2.7.13" \layout { raggedright = ##T } diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly index b98b044105..ec6367aee7 100644 --- a/input/regression/tuplet-beam.ly +++ b/input/regression/tuplet-beam.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "In combination with a beam, the bracket of the tuplet diff --git a/input/regression/tuplet-broken.ly b/input/regression/tuplet-broken.ly index 95fb4cf98c..ffb66bc156 100644 --- a/input/regression/tuplet-broken.ly +++ b/input/regression/tuplet-broken.ly @@ -8,7 +8,7 @@ } -\version "2.7.4" +\version "2.7.13" \paper { raggedright = ##t diff --git a/input/regression/tuplet-full-length.ly b/input/regression/tuplet-full-length.ly index 28dd010a09..49ad60b559 100644 --- a/input/regression/tuplet-full-length.ly +++ b/input/regression/tuplet-full-length.ly @@ -5,7 +5,7 @@ start of the next non-tuplet note. " } -\version "2.7.4" +\version "2.7.13" \paper { raggedright = ##t indent = 0.0 } diff --git a/input/regression/tuplet-gap.ly b/input/regression/tuplet-gap.ly index 69d92a2138..f4d4ce0b36 100644 --- a/input/regression/tuplet-gap.ly +++ b/input/regression/tuplet-gap.ly @@ -5,7 +5,7 @@ } -\version "2.6.0" +\version "2.7.13" \layout { indent = 0.0\mm diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly index ebda9b0f5c..8fa9cff559 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc=" Tuplets may be nested." diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly index cab4fd1183..0574f1eb1d 100644 --- a/input/regression/tuplet-properties.ly +++ b/input/regression/tuplet-properties.ly @@ -6,7 +6,7 @@ for instance, bracketed (B) and non-bracketed (NB). } -\version "2.6.0" +\version "2.7.13" diff --git a/input/regression/tuplet-rest.ly b/input/regression/tuplet-rest.ly index 85506051dc..29461ec0e1 100644 --- a/input/regression/tuplet-rest.ly +++ b/input/regression/tuplet-rest.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Tuplets may contain rests. " diff --git a/input/regression/tuplet-slope.ly b/input/regression/tuplet-slope.ly index c44b2bc7eb..093096b969 100644 --- a/input/regression/tuplet-slope.ly +++ b/input/regression/tuplet-slope.ly @@ -15,7 +15,7 @@ The bracket direction is determined by the dominating stem direction. raggedright = ##t } -\version "2.6.0" +\version "2.7.13" \new Voice { \relative c'' { diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly index 1e40b66a72..0af2753898 100644 --- a/input/regression/tuplet-staffline-collision.ly +++ b/input/regression/tuplet-staffline-collision.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc = "Horizontal tuplet brackets are shifted vertically diff --git a/input/regression/tuplets.ly b/input/regression/tuplets.ly index 8ccbeebde0..3bbd4d4597 100644 --- a/input/regression/tuplets.ly +++ b/input/regression/tuplets.ly @@ -1,5 +1,5 @@ -\version "2.6.0" +\version "2.7.13" \header{ texidoc=" diff --git a/input/regression/utf-8.ly b/input/regression/utf-8.ly index 0320843bb3..4cab961a03 100644 --- a/input/regression/utf-8.ly +++ b/input/regression/utf-8.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs diff --git a/input/regression/voice-follower.ly b/input/regression/voice-follower.ly index 546fba0adc..c971ce2b8f 100644 --- a/input/regression/voice-follower.ly +++ b/input/regression/voice-follower.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc= " diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly index 9eba69a6e0..491fadb6f7 100644 --- a/input/regression/volta-broken-left-edge.ly +++ b/input/regression/volta-broken-left-edge.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.13" \header { texidoc ="Broken volta spanners behave correctly at their left edge in all cases." diff --git a/input/regression/volta-multi-staff.ly b/input/regression/volta-multi-staff.ly index b4272dfc36..385885fd22 100644 --- a/input/regression/volta-multi-staff.ly +++ b/input/regression/volta-multi-staff.ly @@ -6,7 +6,7 @@ } \layout { raggedright = ##t } -\version "2.6.0" +\version "2.7.13" vmus = { \repeat volta 2 c1 \alternative { d e } } diff --git a/input/regression/whiteout.ly b/input/regression/whiteout.ly index b6890db702..70adcb4c2a 100644 --- a/input/regression/whiteout.ly +++ b/input/regression/whiteout.ly @@ -5,7 +5,7 @@ markup. The whitening effect only is only guaranteed for staff lines, since staff lines are in a different layer. " } -\version "2.6.0" +\version "2.7.13" \paper { diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index f72a38bcd1..b846bd5406 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -69,12 +69,10 @@ void Clef_engraver::set_glyph () { SCM glyph_sym = ly_symbol2scm ("glyph"); - SCM glyph = get_property ("clefGlyph"); - SCM basic = ly_symbol2scm ("Clef"); execute_pushpop_property (context (), basic, glyph_sym, SCM_UNDEFINED); - execute_pushpop_property (context (), basic, glyph_sym, glyph); + execute_pushpop_property (context (), basic, glyph_sym, get_property ("clefGlyph")); } /** diff --git a/lily/context-def.cc b/lily/context-def.cc index 8ae1f52b38..71bbdf4259 100644 --- a/lily/context-def.cc +++ b/lily/context-def.cc @@ -128,8 +128,7 @@ Context_def::add_context_mod (SCM mod) else if (ly_symbol2scm ("accepts") == tag || ly_symbol2scm ("denies") == tag) accept_mods_ = scm_cons (scm_list_2 (tag, sym), accept_mods_); - else if (ly_symbol2scm ("poppush") == tag - || ly_symbol2scm ("pop") == tag + else if (ly_symbol2scm ("pop") == tag || ly_symbol2scm ("push") == tag || ly_symbol2scm ("assign") == tag || ly_symbol2scm ("unset") == tag) diff --git a/lily/context-property.cc b/lily/context-property.cc index dbdde16827..d7923c7018 100644 --- a/lily/context-property.cc +++ b/lily/context-property.cc @@ -15,103 +15,174 @@ #include "warn.hh" #include "paper-column.hh" -/* - Grob descriptions (ie. alists with layout properties) are - represented as a (ALIST . BASED-ON) pair, where BASED-ON is the - alist defined in a parent context. BASED-ON should always be a tail - of ALIST. -*/ +SCM +lookup_nested_property (SCM alist, + SCM grob_property_path) +{ + if (scm_is_pair (grob_property_path)) + { + SCM sym = scm_car (grob_property_path); + SCM handle = scm_assq (sym, alist); + + if (handle == SCM_BOOL_F) + return SCM_EOL; + else + return lookup_nested_property (scm_cdr (handle), + scm_cdr (grob_property_path)); + } + else + return alist; +} /* - Push or pop (depending on value of VAL) a single entry (ELTPROP . VAL) - entry from a translator property list by name of PROP + copy ALIST leaving out SYMBOL. Copying stops at ALIST_END */ +SCM +evict_from_alist (SCM symbol, + SCM alist, + SCM alist_end) +{ + SCM new_alist = SCM_EOL; + SCM *tail = &new_alist; + + while (alist != alist_end) + { + if (ly_is_equal (scm_caar (alist), symbol)) + { + alist = scm_cdr (alist); + break; + } + + *tail = scm_cons (scm_car (alist), SCM_EOL); + tail = SCM_CDRLOC (*tail); + alist = scm_cdr (alist); + } + + *tail = alist; + return new_alist; +} void -execute_pushpop_property (Context *trg, - SCM prop, SCM eltprop, SCM val) +general_pushpop_property (Context *context, + SCM context_property, + SCM grob_property_path, + SCM new_value + ) { - SCM prev = SCM_EOL; - if (scm_is_symbol (prop) && scm_is_symbol (eltprop)) + if (!scm_is_symbol (context_property) + || !scm_is_symbol (scm_car (grob_property_path))) { - if (val != SCM_UNDEFINED) - { - Context *where = trg->where_defined (prop, &prev); + warning (_ ("need symbol arguments for \\override and \\revert")); + if (do_internal_type_checking_global) + assert (false); + } - /* - Don't mess with MIDI. - */ - if (!where) - return; + execute_general_pushpop_property (context, context_property, + grob_property_path, new_value); +} - if (where != trg) - { - SCM base = updated_grob_properties (trg, prop); - prev = scm_cons (base, base); - trg->internal_set_property (prop, prev); - } - if (!scm_is_pair (prev)) - { - programming_error ("Grob definition should be cons"); - return; - } +/* + + Grob descriptions (ie. alists with layout properties) are + represented as a (ALIST . BASED-ON) pair, where BASED-ON is the + alist defined in a parent context. BASED-ON should always be a tail + of ALIST. - SCM prev_alist = scm_car (prev); + Push or pop (depending on value of VAL) a single entry entry from a + translator property list by name of PROP. GROB_PROPERTY_PATH + indicates nested alists, eg. '(beamed-stem-lengths details) + +*/ +void +execute_general_pushpop_property (Context *context, + SCM context_property, + SCM grob_property_path, + SCM new_value + ) +{ + SCM current_context_val = SCM_EOL; + if (new_value != SCM_UNDEFINED) + { + Context *where = context->where_defined (context_property, ¤t_context_val); - if (scm_is_pair (prev_alist) || prev_alist == SCM_EOL) - { - bool ok = type_check_assignment (eltprop, val, ly_symbol2scm ("backend-type?")); + /* + Don't mess with MIDI. + */ + if (!where) + return; - /* - tack onto alist: - */ - if (ok) - scm_set_car_x (prev, scm_acons (eltprop, val, prev_alist)); - } - else - { - // warning here. - } + if (where != context) + { + SCM base = updated_grob_properties (context, context_property); + current_context_val = scm_cons (base, base); + context->internal_set_property (context_property, current_context_val); } - else if (trg->where_defined (prop, &prev) == trg) + + if (!scm_is_pair (current_context_val)) { - SCM prev_alist = scm_car (prev); - SCM daddy = scm_cdr (prev); + programming_error ("Grob definition should be cons"); + return; + } - SCM new_alist = SCM_EOL; - SCM *tail = &new_alist; + SCM prev_alist = scm_car (current_context_val); + SCM symbol = scm_car (grob_property_path); + SCM target_alist + = lookup_nested_property (prev_alist, + scm_reverse (scm_cdr (grob_property_path))); - while (prev_alist != daddy) - { - if (ly_is_equal (scm_caar (prev_alist), eltprop)) - { - prev_alist = scm_cdr (prev_alist); - break; - } - - *tail = scm_cons (scm_car (prev_alist), SCM_EOL); - tail = SCM_CDRLOC (*tail); - prev_alist = scm_cdr (prev_alist); - } + target_alist = scm_acons (symbol, new_value, target_alist); - if (new_alist == SCM_EOL && prev_alist == daddy) - trg->unset_property (prop); - else + bool ok = true; + if (!scm_is_pair (scm_cdr (grob_property_path))) + { + ok = type_check_assignment (symbol, new_value, ly_symbol2scm ("backend-type?")); + + /* + tack onto alist. We can use set_car, since + updated_grob_properties() in child contexts will check + for changes in the car. + */ + if (ok) { - *tail = prev_alist; - trg->internal_set_property (prop, scm_cons (new_alist, daddy)); + scm_set_car_x (current_context_val, target_alist); } } + else + { + execute_general_pushpop_property (context, + context_property, + scm_cdr (grob_property_path), + target_alist + ); + } } - else + else if (context->where_defined (context_property, ¤t_context_val) == context) { - warning (_ ("need symbol arguments for \\override and \\revert")); - if (do_internal_type_checking_global) - assert (false); + SCM current_value = scm_car (current_context_val); + SCM daddy = scm_cdr (current_context_val); + SCM symbol = scm_car (grob_property_path); + SCM new_alist = evict_from_alist (symbol, current_value, daddy); + + if (new_alist == daddy) + context->unset_property (context_property); + else + context->internal_set_property (context_property, scm_cons (new_alist, daddy)); } } +void +execute_pushpop_property (Context *context, + SCM context_property, + SCM grob_property, + SCM new_value + ) +{ + general_pushpop_property (context, context_property, + scm_list_1 (grob_property), + new_value); +} + /* PRE_INIT_OPS is in the order specified, and hence must be reversed. */ @@ -125,12 +196,19 @@ apply_property_operations (Context *tg, SCM pre_init_ops) SCM type = scm_car (entry); entry = scm_cdr (entry); - if (type == ly_symbol2scm ("push") || type == ly_symbol2scm ("poppush")) + if (type == ly_symbol2scm ("push")) { - SCM val = scm_cddr (entry); - val = scm_is_pair (val) ? scm_car (val) : SCM_UNDEFINED; - - execute_pushpop_property (tg, scm_car (entry), scm_cadr (entry), val); + SCM context_prop = scm_car (entry); + SCM val = scm_cadr (entry); + SCM grob_prop_path = scm_cddr (entry); + execute_general_pushpop_property (tg, context_prop, grob_prop_path, val); + } + else if (type == ly_symbol2scm ("pop")) + { + SCM context_prop = scm_car (entry); + SCM val = SCM_UNDEFINED; + SCM grob_prop_path = scm_cdr (entry); + execute_general_pushpop_property (tg, context_prop, grob_prop_path, val); } else if (type == ly_symbol2scm ("assign")) tg->internal_set_property (scm_car (entry), scm_cadr (entry)); diff --git a/lily/include/context.hh b/lily/include/context.hh index faf6491eb8..ce954e6640 100644 --- a/lily/include/context.hh +++ b/lily/include/context.hh @@ -63,7 +63,6 @@ public: Context (Object_key const *); /* properties: */ - void execute_pushpop_property (SCM prop, SCM sym, SCM val); SCM internal_get_property (SCM name_sym) const; SCM properties_as_alist () const; void internal_set_property (SCM var_sym, SCM value); @@ -102,6 +101,8 @@ public: void apply_property_operations (Context *tg, SCM pre_init_ops); void execute_pushpop_property (Context *trg, SCM prop, SCM eltprop, SCM val); +void execute_general_pushpop_property (Context *context, + SCM context_property, SCM grob_property_path, SCM val); SCM updated_grob_properties (Context *tg, SCM sym); Context *find_context_below (Context *where, SCM type_sym, String id); diff --git a/lily/parser.yy b/lily/parser.yy index 0f73f67748..52c07bf867 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1418,7 +1418,11 @@ property_operation: } | OVERRIDE simple_string embedded_scm '=' embedded_scm { $$ = scm_list_4 (ly_symbol2scm ("push"), - scm_string_to_symbol ($2), $3, $5); + scm_string_to_symbol ($2), $5, $3); + } + | OVERRIDE simple_string embedded_scm embedded_scm '=' embedded_scm { + $$ = scm_list_5 (ly_symbol2scm ("push"), + scm_string_to_symbol ($2), $6, $4, $3); } | REVERT simple_string embedded_scm { $$ = scm_list_3 (ly_symbol2scm ("pop"), @@ -1466,10 +1470,17 @@ context_prop_spec: music_property_def: OVERRIDE context_prop_spec embedded_scm '=' scalar { $$ = property_op_to_music (scm_list_4 ( - ly_symbol2scm ("poppush"), + ly_symbol2scm ("push"), scm_cadr ($2), - $3, $5)); - $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + $5, $3)); + $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + } + | OVERRIDE context_prop_spec embedded_scm embedded_scm '=' scalar { + $$ = property_op_to_music (scm_list_5 ( + ly_symbol2scm ("push"), + scm_cadr ($2), + $6, $4, $3)); + $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL); } | REVERT context_prop_spec embedded_scm { $$ = property_op_to_music (scm_list_3 ( @@ -2725,7 +2736,7 @@ property_op_to_music (SCM op) SCM symbol = scm_cadr (op); SCM args = scm_cddr (op); SCM grob_val = SCM_UNDEFINED; - SCM grob_sym = SCM_UNDEFINED; + SCM grob_path = SCM_UNDEFINED; SCM val = SCM_UNDEFINED; if (tag == ly_symbol2scm ("assign")) @@ -2735,16 +2746,16 @@ property_op_to_music (SCM op) } else if (tag == ly_symbol2scm ("unset")) m = MY_MAKE_MUSIC ("PropertyUnset"); - else if (tag == ly_symbol2scm ("poppush") - || tag == ly_symbol2scm ("push")) + else if (tag == ly_symbol2scm ("push")) { m = MY_MAKE_MUSIC ("OverrideProperty"); - grob_sym = scm_car (args); - grob_val = scm_cadr (args); + grob_val = scm_car (args); + grob_path = scm_cdr (args); + m->set_property ("pop-first", SCM_BOOL_T); } else if (tag == ly_symbol2scm ("pop")) { m = MY_MAKE_MUSIC ("RevertProperty"); - grob_sym = scm_car (args); + grob_path = scm_cdr (args); } m->set_property ("symbol", symbol); @@ -2753,23 +2764,8 @@ property_op_to_music (SCM op) m->set_property ("value", val); if (grob_val != SCM_UNDEFINED) m->set_property ("grob-value", grob_val); - - if (grob_sym != SCM_UNDEFINED) - { - bool itc = do_internal_type_checking_global; - /* UGH. - */ - bool autobeam = ly_is_equal (symbol, ly_symbol2scm ("autoBeamSettings")); - if (autobeam) - do_internal_type_checking_global = false; - m->set_property ("grob-property", grob_sym); - if (autobeam) - do_internal_type_checking_global = itc; - } - - if (tag == ly_symbol2scm ("poppush")) - m->set_property ("pop-first", SCM_BOOL_T); - + if (grob_path != SCM_UNDEFINED) + m->set_property ("grob-property-path", grob_path); return m; } diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc index 9cd2af1fff..3dcba903ec 100644 --- a/lily/property-iterator.cc +++ b/lily/property-iterator.cc @@ -83,20 +83,35 @@ check_grob (Music *mus, SCM sym) return g; } +SCM +get_property_path (Music *m) +{ + SCM grob_property_path = m->get_property ("grob-property-path"); + + SCM eprop = m->get_property ("grob-property"); + if (scm_is_symbol (eprop)) + { + grob_property_path = scm_list_1 (eprop); + } + + return grob_property_path; +} + void Push_property_iterator::process (Moment m) { SCM sym = get_music ()->get_property ("symbol"); if (check_grob (get_music (), sym)) { - SCM eprop = get_music ()->get_property ("grob-property"); + SCM grob_property_path = get_property_path (get_music ()); SCM val = get_music ()->get_property ("grob-value"); if (to_boolean (get_music ()->get_property ("pop-first")) && !to_boolean (get_music ()->get_property ("once"))) - execute_pushpop_property (get_outlet (), sym, eprop, SCM_UNDEFINED); + + execute_general_pushpop_property (get_outlet (), sym, grob_property_path, SCM_UNDEFINED); - execute_pushpop_property (get_outlet (), sym, eprop, val); + execute_general_pushpop_property (get_outlet (), sym, grob_property_path, val); } Simple_music_iterator::process (m); } @@ -111,9 +126,9 @@ Push_property_iterator::once_finalization (SCM trans, SCM music) SCM sym = mus->get_property ("symbol"); if (check_grob (mus, sym)) { - SCM eprop = mus->get_property ("grob-property"); + SCM grob_property_path = get_property_path (mus); - execute_pushpop_property (tg, sym, eprop, SCM_UNDEFINED); + execute_general_pushpop_property (tg, sym, grob_property_path, SCM_UNDEFINED); } return SCM_UNSPECIFIED; } @@ -139,8 +154,8 @@ Pop_property_iterator::process (Moment m) if (check_grob (get_music (), sym)) { - SCM eprop = get_music ()->get_property ("grob-property"); - execute_pushpop_property (get_outlet (), sym, eprop, SCM_UNDEFINED); + SCM grob_property_path = get_property_path (get_music ()); + execute_general_pushpop_property (get_outlet (), sym, grob_property_path, SCM_UNDEFINED); } Simple_music_iterator::process (m); } diff --git a/python/convertrules.py b/python/convertrules.py index d6ebe80f9b..b098537a9c 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -2583,16 +2583,27 @@ def conv (str): conversions.append (((2, 7, 12), conv, '''outputProperty -> overrideProperty''')) -def conv (str): - if re.search(r'(spacing-procedure|after-line-breaking-callback|before-line-breaking-callback|print-function)', str): - error_file.write (""" -Conversion rules for 2.7.13 layout engine refactoring haven't been written yet. +def conv (str): + def subber (match): + newkey = {'spacing-procedure': 'springs-and-rods', + 'after-line-breaking-callback' : 'after-line-breaking', + 'before-line-breaking-callback' : 'before-line-breaking', + 'print-function' : 'stencil'} [match.group(3)] + what = match.group (1) + grob = match.group (2) -""") + if what == 'revert': + return "revert %s #'callbacks %% %s\n" % (grob, newkey) + elif what == 'override': + return "override %s #'callbacks #'%s" % (grob, newkey) + else: + raise 'urg' + return '' - raise FatalConversionError () - + str = re.sub(r"(override|revert)\s*([a-zA-Z.]+)\s*#'(spacing-procedure|after-line-breaking-callback" + + r"|before-line-breaking-callback|print-function)", + subber, str) return str conversions.append (((2, 7, 13), conv, diff --git a/scm/music-functions.scm b/scm/music-functions.scm index ea58c353fb..f5f3eb7988 100644 --- a/scm/music-functions.scm +++ b/scm/music-functions.scm @@ -808,11 +808,14 @@ if appropriate. (define-public ((add-balloon-text object-name text off) grob orig-context cur-context) "Usage: see input/regression/balloon.ly " (let* ((meta (ly:grob-property grob 'meta)) + (callbacks (ly:grob-property grob 'callbacks)) (nm (if (pair? meta) (cdr (assoc 'name meta)) "nonexistant")) - (cb (ly:grob-property grob 'print-function))) - (if (equal? nm object-name) + (cb-handle (assoc 'stencil callbacks)) + (cb (if cb-handle (cdr cb-handle) #f))) + (if (and (equal? nm object-name) + cb) (begin - (set! (ly:grob-property grob 'print-function) Balloon_interface::print) + (ly:grob-set-callback! grob 'stencil Balloon_interface::print) (set! (ly:grob-property grob 'balloon-original-callback) cb) (set! (ly:grob-property grob 'balloon-text) text) (set! (ly:grob-property grob 'balloon-text-offset) off) -- 2.39.2