From 11613b92019bb42418863f43de92287a64878f14 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 27 Aug 2003 23:40:59 +0000 Subject: [PATCH] * lily/my-lily-lexer.cc: add \accacciatura and \appoggiatura * ly/grace-init.ly (stopGraceMusic): add slurs on grace note by default * scm/music-functions.scm (set-stop-grace-properties) (set-start-grace-properties, add-grace-property): new functions for modular grace tweak control. * ly/engraver-init.ly (ScoreContext): new property graceSettings. --- ChangeLog | 23 +++++ Documentation/topdocs/NEWS.texi | 13 ++- Documentation/user/cheatsheet.itely | 6 +- Documentation/user/internals.itely | 8 +- Documentation/user/refman.itely | 94 ++++++++---------- Documentation/user/tutorial.itely | 28 +++--- GNUmakefile.in | 2 +- input/example-1.ly | 1 - input/example-2.ly | 3 +- input/mutopia-header.ly | 6 +- input/regression/+.ly | 2 +- input/regression/accidental-cautionary.ly | 2 +- input/regression/accidental-double.ly | 2 +- input/regression/accidental-ledger.ly | 2 +- input/regression/accidental-octave.ly | 2 +- input/regression/accidental-placement.ly | 2 +- input/regression/accidental-single-double.ly | 2 +- .../accidental-unbroken-tie-spacing.ly | 2 +- input/regression/accidental-voice.ly | 10 +- input/regression/accidental.ly | 2 +- input/regression/accidentals.ly | 2 +- input/regression/allfontstyle.ly | 4 +- input/regression/ambitus.ly | 6 +- input/regression/apply-context.ly | 2 +- input/regression/apply-output.ly | 2 +- input/regression/arpeggio-collision.ly | 10 +- input/regression/arpeggio.ly | 6 +- input/regression/auto-beam-bar.ly | 2 +- input/regression/auto-beam-triplet.ly | 2 +- input/regression/auto-beam-tuplets.ly | 2 +- input/regression/auto-beam.ly | 2 +- input/regression/auto-change.ly | 2 +- input/regression/bar-number.ly | 2 +- input/regression/bar-scripts.ly | 8 +- input/regression/beam-auto-knee.ly | 2 +- input/regression/beam-break.ly | 2 +- input/regression/beam-center-slope.ly | 2 +- input/regression/beam-chord.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-knee-symmetry.ly | 2 +- input/regression/beam-length.ly | 2 +- input/regression/beam-manual-beaming.ly | 2 +- input/regression/beam-manual.ly | 4 +- input/regression/beam-multiple-cross-staff.ly | 2 +- input/regression/beam-over-barline.ly | 2 +- input/regression/beam-position.ly | 4 +- input/regression/beam-postfix-notation.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/beamed-chord.ly | 2 +- input/regression/beaming-ternary-metrum.ly | 2 +- input/regression/beaming.ly | 2 +- input/regression/beams.ly | 2 +- input/regression/between-systems.ly | 2 +- input/regression/break.ly | 2 +- input/regression/breathing-sign.ly | 14 +-- 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-scripts.ly | 2 +- input/regression/chord-tremolo.ly | 2 +- input/regression/chords-funky-ignatzek.ly | 2 +- input/regression/clefs.ly | 2 +- input/regression/cluster.ly | 6 +- input/regression/collision-2.ly | 2 +- input/regression/collision-dots.ly | 6 +- input/regression/collision-head-chords.ly | 2 +- input/regression/collision-heads.ly | 6 +- .../collision-merge-differently-dotted.ly | 6 +- input/regression/collision-mesh.ly | 19 ++-- input/regression/collisions.ly | 16 +-- .../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 | 6 +- input/regression/drums.ly | 2 +- input/regression/dynamics-broken-hairpin.ly | 2 +- input/regression/dynamics-glyphs.ly | 2 +- input/regression/dynamics-line.ly | 2 +- input/regression/dynamics-unbound-hairpin.ly | 2 +- input/regression/easy-notation.ly | 2 +- input/regression/figured-bass.ly | 2 +- input/regression/finger-chords.ly | 2 +- input/regression/fingering.ly | 2 +- input/regression/follow-voice-break.ly | 2 +- input/regression/font-magnification.ly | 2 +- input/regression/font-name.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-dynamic.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 | 6 +- input/regression/grace-staff-length.ly | 6 +- input/regression/grace-start.ly | 2 +- input/regression/grace-stems.ly | 2 +- input/regression/grace-sync.ly | 6 +- 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/hairpin-ending.ly | 2 +- input/regression/hara-kiri-pianostaff.ly | 8 +- input/regression/instrument-name-markup.ly | 4 +- input/regression/instrument-name-partial.ly | 2 +- input/regression/instrument-name.ly | 2 +- input/regression/key-clefs.ly | 2 +- input/regression/key-signature-scordatura.ly | 2 +- input/regression/keys.ly | 2 +- input/regression/lyric-align.ly | 2 +- input/regression/lyric-combine-polyphonic.ly | 2 +- input/regression/lyric-combine.ly | 2 +- input/regression/lyric-extender.ly | 2 +- input/regression/lyric-hyphen.ly | 2 +- input/regression/lyric-phrasing.ly | 2 +- input/regression/lyrics-bar.ly | 4 +- input/regression/lyrics-extender.ly | 2 +- input/regression/lyrics-melisma-beam.ly | 4 +- input/regression/lyrics-multi-stanza.ly | 4 +- input/regression/markup-note.ly | 2 +- input/regression/markup-stack.ly | 2 +- input/regression/measure-grouping.ly | 2 +- input/regression/mensural.ly | 2 +- input/regression/metronome-marking.ly | 2 +- input/regression/mm-rests2.ly | 2 +- input/regression/mmrest-collision.ly | 6 +- input/regression/molecule-hacking.ly | 2 +- input/regression/multi-measure-rest-center.ly | 2 +- input/regression/multi-measure-rest-grace.ly | 6 +- .../multi-measure-rest-instr-name.ly | 2 +- input/regression/multi-measure-rest-text.ly | 2 +- input/regression/multi-measure-rest.ly | 2 +- input/regression/music-map.ly | 2 +- input/regression/new-markup-syntax.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-style.ly | 58 +++++------ 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/output-property.ly | 2 +- input/regression/pc-mmrest.ly | 2 +- input/regression/pc-switch-slur.ly | 2 +- input/regression/phrasing-slur.ly | 2 +- input/regression/prefatory-empty-spacing.ly | 2 +- input/regression/prefatory-spacing-matter.ly | 2 +- input/regression/property-once.ly | 2 +- input/regression/rehearsal-mark.ly | 2 +- input/regression/repeat-fold.ly | 2 +- input/regression/repeat-line-break.ly | 2 +- input/regression/repeat-percent-skipbars.ly | 2 +- input/regression/repeat-percent.ly | 3 +- input/regression/repeat-slash.ly | 2 +- input/regression/repeat-unfold-all.ly | 2 +- input/regression/repeat-unfold.ly | 2 +- .../repeat-volta-skip-alternatives.ly | 2 +- input/regression/repeat-volta.ly | 2 +- input/regression/rest-collision-default.ly | 6 +- input/regression/rest-collision.ly | 25 +++-- input/regression/rest-ledger.ly | 2 +- input/regression/rest-pitch.ly | 2 +- input/regression/rest.ly | 2 +- input/regression/rhythmic-staff.ly | 2 +- input/regression/script-collision.ly | 6 +- 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-area.ly | 2 +- input/regression/slur-attachment.ly | 2 +- input/regression/slur-broken-trend.ly | 2 +- input/regression/slur-cross-staff.ly | 2 +- input/regression/slur-dots.ly | 2 +- input/regression/slur-nice.ly | 2 +- input/regression/slur-rest.ly | 2 +- input/regression/slur-staccato.ly | 2 +- input/regression/slur-stem-broken.ly | 2 +- input/regression/slur-symmetry-1.ly | 4 +- input/regression/slur-symmetry.ly | 4 +- input/regression/spacing-accidental-staffs.ly | 4 +- .../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 | 6 +- input/regression/spacing-end-of-line.ly | 2 +- input/regression/spacing-ended-voice.ly | 2 +- input/regression/spacing-folded-clef.ly | 6 +- 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 | 6 +- input/regression/spacing-note-flags.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-to-grace.ly | 2 +- input/regression/spacing-very-tight.ly | 2 +- input/regression/span-bar.ly | 10 +- input/regression/staccato-pos.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-spacing.ly | 2 +- input/regression/stem-tremolo.ly | 2 +- input/regression/system-extents.ly | 2 +- input/regression/system-start-bracket.ly | 2 +- input/regression/text-spanner.ly | 2 +- input/regression/tie-accidental.ly | 2 +- input/regression/tie-break-accidental.ly | 2 +- input/regression/tie-busy-grobs.ly | 10 +- input/regression/tie-chord-partial.ly | 4 +- input/regression/tie-chord.ly | 2 +- input/regression/tie-dots.ly | 2 +- input/regression/tie-grace.ly | 2 +- input/regression/tie.ly | 2 +- input/regression/tuplet-beam.ly | 2 +- input/regression/tuplet-nest.ly | 2 +- input/regression/tuplet-properties.ly | 2 +- input/regression/tuplet-rest.ly | 2 +- .../regression/tuplet-staffline-collision.ly | 2 +- input/regression/tuplets.ly | 2 +- input/regression/voice-follower.ly | 4 +- input/regression/volta-broken-left-edge.ly | 4 +- input/regression/volta-multi-staff.ly | 12 +-- input/template/gregorian-transcription.ly | 2 +- input/template/header.ly | 2 +- input/template/jazz-combo.ly | 2 +- input/template/melody-chords.ly | 2 +- input/template/melody-lyrics-chords.ly | 2 +- input/template/melody-lyrics.ly | 2 +- input/template/melody.ly | 2 +- input/template/piano-4-voices.ly | 2 +- input/template/piano-dynamics.ly | 2 +- input/template/piano-lyrics.ly | 2 +- input/template/piano-melody-lyrics.ly | 2 +- input/template/piano.ly | 2 +- input/template/satb.ly | 2 +- input/test/+.ly | 2 +- input/test/ac-extra-voice.ly | 2 +- input/test/add-staccato.ly | 2 +- input/test/add-text-script.ly | 2 +- input/test/ancient-accidentals.ly | 2 +- input/test/ancient-font.ly | 2 +- input/test/ancient-time.ly | 2 +- input/test/bagpipe.ly | 2 +- input/test/bar-always.ly | 2 +- input/test/bar-lines-lyric-only.ly | 2 +- input/test/bar-lines.ly | 2 +- input/test/bar-number-every-five-reset.ly | 2 +- input/test/bar-number-regular-interval.ly | 2 +- input/test/bar-number-show-all.ly | 2 +- input/test/beam-auto-4-8.ly | 2 +- input/test/beam-auto-override.ly | 2 +- input/test/beam-auto.ly | 2 +- input/test/beam-control.ly | 2 +- input/test/beam-count.ly | 2 +- input/test/beam-dir-functions.ly | 2 +- input/test/beam-isknee.ly | 2 +- input/test/beam-neutral-direction.ly | 2 +- input/test/beam-rest.ly | 2 +- input/test/blank-notes.ly | 2 +- input/test/blank-paper-tab.ly | 2 +- input/test/blank-paper.ly | 2 +- input/test/boxed-molecule.ly | 2 +- input/test/caps.ly | 2 +- input/test/cautionaries.ly | 2 +- input/test/chord-names-german.ly | 2 +- input/test/chord-names-jazz.ly | 2 +- input/test/chord-names-no-inversions.ly | 2 +- input/test/chords-without-melody.ly | 2 +- input/test/clef-8-syntax.ly | 2 +- input/test/clef-end-of-line.ly | 2 +- input/test/clef-manual-control.ly | 2 +- input/test/coriolan-margin.ly | 2 +- input/test/count-systems.ly | 2 +- input/test/crescendi.ly | 2 +- input/test/cue-notes.ly | 2 +- input/test/divisiones.ly | 2 +- input/test/drarn-slurs.ly | 2 +- input/test/drarn.ly | 11 ++- input/test/dynamic-absolute-volume.ly | 2 +- input/test/dynamic-extra.ly | 2 +- input/test/embedded-postscript.ly | 2 +- input/test/embedded-scm.ly | 2 +- input/test/embedded-tex.ly | 2 +- input/test/explicit.ly | 2 +- input/test/extra-offset.ly | 2 +- input/test/extra-staff.ly | 10 +- input/test/fill-a4.ly | 2 +- input/test/follow-thread.ly | 4 +- input/test/force-hshift.ly | 2 +- input/test/gourlay.ly | 9 +- input/test/gregorian-scripts.ly | 2 +- input/test/harmonic.ly | 4 +- input/test/header-ifelse.ly | 2 +- input/test/hshift.ly | 12 +-- input/test/hymn.ly | 2 +- input/test/improv.ly | 2 +- input/test/incipit.ly | 4 +- input/test/instrument-name-grandstaff.ly | 5 +- input/test/ly2dvi-testpage.ly | 2 +- input/test/maximum-rest-count.ly | 8 +- input/test/mensural-ligatures.ly | 6 +- input/test/midi-scales.ly | 2 +- input/test/move-accidentals.ly | 2 +- input/test/move-notehead.ly | 2 +- input/test/move-specific-text.ly | 2 +- input/test/music-box.ly | 4 +- input/test/music-creation.ly | 2 +- input/test/nested-groups.ly | 40 ++++---- input/test/no-bar-lines.ly | 2 +- input/test/no-staff.ly | 2 +- input/test/octave-duplicate.ly | 2 +- input/test/ossia.ly | 4 +- input/test/part-combine-moments.ly | 2 +- input/test/part-combine-staff.ly | 2 +- input/test/part-combine.ly | 2 +- input/test/partial-blank.ly | 10 +- input/test/pedal.ly | 2 +- input/test/phrasing-slur-height.ly | 4 +- input/test/polymetric-differing-notes.ly | 8 +- input/test/polymetric.ly | 8 +- input/test/preset-extent.ly | 2 +- input/test/repeat-manual.ly | 2 +- input/test/repeat-shorter-bracket.ly | 2 +- input/test/repeat.ly | 2 +- input/test/rest-dot-positions.ly | 6 +- input/test/rests.ly | 2 +- input/test/reverse-music.ly | 2 +- input/test/rhythm-excercise.ly | 2 +- input/test/scales-greek.ly | 9 +- input/test/scheme-interactions.ly | 2 +- input/test/script-abbreviations.ly | 2 +- input/test/script-chart.ly | 2 +- input/test/script-priority.ly | 2 +- input/test/script-stack.ly | 2 +- input/test/separate-staccato.ly | 4 +- input/test/slur-attachment-override.ly | 2 +- input/test/slur-beautiful.ly | 2 +- input/test/slur-dash.ly | 2 +- input/test/slur-minimum-length.ly | 2 +- input/test/slur-shape.ly | 56 +++++------ input/test/slur-ugly.ly | 2 +- input/test/smart-transpose.ly | 2 +- input/test/spacing-2.ly | 10 +- input/test/spanner-after-break-tweak.ly | 2 +- input/test/staff-bracket.ly | 12 +-- input/test/staff-container.ly | 10 +- input/test/staff-lines.ly | 6 +- input/test/staff-size.ly | 8 +- input/test/staff-space.ly | 6 +- input/test/stem-centered.ly | 2 +- input/test/stem-cross-staff.ly | 6 +- input/test/stem-extend.ly | 6 +- input/test/stem-length.ly | 2 +- input/test/tablature-hammer.ly | 2 +- input/test/tablature.ly | 2 +- input/test/text-spanner.ly | 2 +- input/test/textscript.ly | 2 +- input/test/tie-cross-voice.ly | 2 +- input/test/tie-sparse.ly | 2 +- input/test/time-signature-double.ly | 2 +- input/test/time.ly | 2 +- input/test/timing.ly | 2 +- input/test/title.ly | 2 +- input/test/to-xml.ly | 2 +- input/test/transposition.ly | 10 +- input/test/trill.ly | 2 +- input/test/trills.ly | 14 +-- input/test/unfold-all-repeats.ly | 2 +- input/test/vaticana.ly | 2 +- input/test/version-output.ly | 2 +- input/test/vertical-extent.ly | 6 +- input/twinkle-pop.ly | 3 +- lily/auto-beam-engraver.cc | 2 - lily/clef-engraver.cc | 7 +- lily/include/translator-def.hh | 1 - lily/include/translator-group.hh | 2 +- lily/ligature-engraver.cc | 4 +- lily/my-lily-lexer.cc | 4 +- lily/parser.yy | 27 ++++- lily/property-iterator.cc | 15 ++- lily/repeated-music.cc | 10 +- lily/translator-def.cc | 13 +-- lily/translator-group.cc | 4 +- lily/translator-scheme.cc | 64 +++++++++++- lily/translator.cc | 1 + ly/engraver-init.ly | 26 +++++ ly/grace-init.ly | 98 +++++-------------- python/lilylib.py | 5 + scm/define-translator-properties.scm | 6 ++ scm/lily.scm | 44 +++++---- scm/music-functions.scm | 89 +++++++++++++++-- scripts/convert-ly.py | 15 +++ 428 files changed, 1046 insertions(+), 903 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c7602d138..c670ca2abb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2003-08-28 Han-Wen Nienhuys + + * input/*/*.ly (vmus): use \new everywhere. + + * lily/my-lily-lexer.cc: add \accacciatura and \appoggiatura + + * ly/grace-init.ly (stopGraceMusic): add slurs on grace note by + default + + * scm/music-functions.scm (set-stop-grace-properties) + (set-start-grace-properties, add-grace-property): new functions + for modular grace tweak control. + + * ly/engraver-init.ly (ScoreContext): new property graceSettings. + 2003-08-28 Jan Nieuwenhuizen * Documentation/topdocs/INSTALL.texi: Explain install-pfa-fonts. @@ -10,6 +25,14 @@ 2003-08-27 Han-Wen Nienhuys + * lily/translator-scheme.cc (LY_DEFINE): + ly:context-pushpop-property new function. + (LY_DEFINE): new function ly:translator-find + new function ly:translator? + (LY_DEFINE): new function ly:context? + + * lily/translator-def.cc: remove Translator_def::apply_pushpop_property(). + * python/lilylib.py (read_pipe): only store and display error log if verbose not set. (read_pipe): only display log if it contains something. diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi index 559dae2246..60a6fa8bc4 100644 --- a/Documentation/topdocs/NEWS.texi +++ b/Documentation/topdocs/NEWS.texi @@ -10,15 +10,22 @@ @itemize @item -The @code{\newcontext} command will create a context with a unique +Two new commands for grace note have been added, @code{\accacciatura} +and @code{\appogiatura}. Both reflect the traditional meanings of +accacciatura and ap + + + +@item +The @code{\new} command will create a context with a unique name automatically. Hence, for multi-staff scores, it is no longer necessary to invent arbitrary context names. For example, a two-staff score may be created by @example \simultaneous @{ - \newcontext Staff @{ @var{notes for 1st staff} @} - \newcontext Staff @{ @var{notes for 2nd staff} @} + \new Staff @{ @var{notes for 1st staff} @} + \new Staff @{ @var{notes for 2nd staff} @} @} @end example diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely index 277f49c797..bf879584be 100644 --- a/Documentation/user/cheatsheet.itely +++ b/Documentation/user/cheatsheet.itely @@ -149,12 +149,12 @@ a8-[ b-] @end lilypond -@item @code{< \newcontext Staff ... >} +@item @code{< \new Staff ... >} @tab more staves @tab @lilypond[fragment] -< \newcontext Staff { c'1 } - \newcontext Staff { c'1 } > +< \new Staff { c'1 } + \new Staff { c'1 } > @end lilypond diff --git a/Documentation/user/internals.itely b/Documentation/user/internals.itely index cfadcc9ac0..f9e647e62f 100644 --- a/Documentation/user/internals.itely +++ b/Documentation/user/internals.itely @@ -78,7 +78,7 @@ Contexts for a music expression can be selected manually, using one of the following music expressions: @example -\newcontext @var{contexttype} @var{musicexpr} +\new @var{contexttype} @var{musicexpr} \context @var{contexttype} [= @var{contextname}] @var{musicexpr} @end example @@ -103,13 +103,13 @@ Within @code{another}, a (default) Voice context is created for the @code{e4}. A context is ended when when all music referring it has finished, so after the third quarter, @code{another} is removed. -The @code{\newcontext} construction creates a context with a +The @code{\new} construction creates a context with a generated, unique @var{contextname}. An expression with -@code{\newcontext} always leads to a new context. This is convenient +@code{\new} always leads to a new context. This is convenient for creating multiple staffs, multiple lyric lines, etc. When using automatic staff changes, automatic phrasing, etc., the -context names have special meanings, so @code{\newcontext} cannot be +context names have special meanings, so @code{\new} cannot be used. diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index ae561b2f22..ef2decf484 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1103,11 +1103,11 @@ connected between different staves of a @internalsref{StaffGroup}: @c @lilypond[fragment, verbatim] < \context StaffGroup < - \newcontext Staff { e'4 d' + \new Staff { e'4 d' \bar "||" f' e' } - \newcontext Staff { \clef bass c4 g e g } > -\newcontext Staff { \clef bass c2 c2 } > + \new Staff { \clef bass c4 g e g } > +\new Staff { \clef bass c2 c2 } > @end lilypond @@ -1176,9 +1176,9 @@ a stem directions and horizontal shift for each part: @lilypond[singleline, verbatim] \relative c'' -\context Staff < \newcontext Voice { \voiceOne cis2 b } - \newcontext Voice { \voiceThree b4 ais ~ ais4 gis4 } - \newcontext Voice { \voiceTwo fis4~ fis4 f ~ f } > +\context Staff < \new Voice { \voiceOne cis2 b } + \new Voice { \voiceThree b4 ais ~ ais4 gis4 } + \new Voice { \voiceTwo fis4~ fis4 f ~ f } > @end lilypond Normally, note heads with a different number of dots are not merged, but @@ -1517,26 +1517,26 @@ creation of the piano staff: @example \score @{ \notes \relative c'' < - \newcontext Staff @{ cis4 d e2 @} + \new Staff @{ cis4 d e2 @} \context GrandStaff < \pianoAccidentals - \newcontext Staff @{ cis4 d e2 @} - \newcontext Staff @{ es2 c @} + \new Staff @{ cis4 d e2 @} + \new Staff @{ es2 c @} > - \newcontext Staff @{ es2 c @} + \new Staff @{ es2 c @} > @} @end example @lilypond[singleline] \score { \notes \relative c'' < - \newcontext Staff { cis4 d e2 } + \new Staff { cis4 d e2 } \context GrandStaff < \pianoAccidentals - \newcontext Staff { cis4 d e2 } - \newcontext Staff { es2 c } + \new Staff { cis4 d e2 } + \new Staff { es2 c } > - \newcontext Staff { es2 c } + \new Staff { es2 c } > \paper { \translator { @@ -2182,8 +2182,8 @@ In the following example, there are two sixteenth graces notes for every eighth grace note: @lilypond[relative=2,verbatim,fragment] -< \newcontext Staff { e4 \grace { c16[ d e f] } e4 } - \newcontext Staff { c'4 \grace { g8[ b] } c4 } > +< \new Staff { e4 \grace { c16[ d e f] } e4 } + \new Staff { c'4 \grace { g8[ b] } c4 } > @end lilypond @@ -2193,17 +2193,7 @@ played as short as possible. An appogiatura takes a fixed fraction of the main note, is and denoted without a slash. Such slashless notes are obtained by setting the object property -@code{stroke-style} of the @internalsref{Stem} object. For proper -matching of override and reverts of such properties, it is necessary -to use a Scheme function. - -The following fragment overrides the default formatting Grace style stems: -@example - #(add-to-grace-init "Voice" 'Stem 'stroke-style '()) -@end example - -The @code{\override} is carefully matched with a @code{\revert}: - +@code{stroke-style} of the @internalsref{Stem} object: @cindex slash @cindex grace slash @@ -2217,6 +2207,8 @@ The @code{\override} is carefully matched with a @code{\revert}: } c4 } @end lilypond +The @code{\override} is carefully matched with a @code{\revert}: + If you want to end a note with a grace note, then the standard trick is to put the grace notes before a phantom ``space note'', e.g. @@ -2274,8 +2266,8 @@ such as key signatures, barlines, etc. are also synchronized. Take care when you mix staves with grace notes and staves without, for example, @lilypond[relative=2,verbatim,fragment] -< \newcontext Staff { e4 \bar "|:" \grace c16 d4 } - \newcontext Staff { c4 \bar "|:" d4 } > +< \new Staff { e4 \bar "|:" \grace c16 d4 } + \new Staff { c4 \bar "|:" d4 } > @end lilypond Grace sections should only be used within sequential music @@ -2720,8 +2712,8 @@ down = \notes { bassdrum4 snare8 bd r bd sn4 } \score { \apply #(drums->paper 'drums) \context Staff < \clef percussion - \newcontext Voice { \voiceOne \up } - \newcontext Voice { \voiceTwo \down } + \new Voice { \voiceOne \up } + \new Voice { \voiceTwo \down } > } @@ -2911,8 +2903,8 @@ down = \notes { bd4 sn bd toml8 toml } \score { \apply #(drums->paper 'mydrums) \context Staff < \clef percussion - \newcontext Voice { \voiceOne \up } - \newcontext Voice { \voiceTwo \down } + \new Voice { \voiceOne \up } + \new Voice { \voiceTwo \down } > } @end lilypond @@ -2940,12 +2932,12 @@ down = \notes { bassdrum4 snare8 bd r bd sn4 } bass = \notes \transpose c c,, { a4. e8 r e g e } \score { < - \apply #(drums->paper 'drums) \newcontext Staff < + \apply #(drums->paper 'drums) \new Staff < \clef percussion - \newcontext Voice { \voiceOne \up } - \newcontext Voice { \voiceTwo \down } + \new Voice { \voiceOne \up } + \new Voice { \voiceTwo \down } > - \newcontext Staff { \clef "F_8" \bass } + \new Staff { \clef "F_8" \bass } > } @end lilypond @@ -3169,8 +3161,8 @@ in both staves, and set @lilypond[fragment,relative,verbatim] \context PianoStaff < \property PianoStaff.connectArpeggios = ##t - \newcontext Staff { <>-\arpeggio } - \newcontext Staff { \clef bass <>-\arpeggio } + \new Staff { <>-\arpeggio } + \new Staff { \clef bass <>-\arpeggio } > @end lilypond @@ -3377,24 +3369,24 @@ more complex orderings, the best way is to setup the hierarchy of staves and lyrics first, e.g. @example \context ChoirStaff \notes < - \newcontext Lyrics @{ s1 @} - \newcontext Staff @{ s1 @} - \newcontext Lyrics @{ s1 @} - \newcontext Staff @{ s1 @} + \new Lyrics @{ s1 @} + \new Staff @{ s1 @} + \new Lyrics @{ s1 @} + \new Staff @{ s1 @} > @end example and then combine the appropriate melodies and lyric lines: @example \addlyrics - \newcontext Staff @emph{the music} - \newcontext Lyrics @emph{the lyrics} + \new Staff @emph{the music} + \new Lyrics @emph{the lyrics} @end example putting both together, you would get @example \context ChoirStaff \notes < - \newcontext Lyrics @dots{} - \newcontext Staff @dots{} + \new Lyrics @dots{} + \new Staff @dots{} \addlyrics @dots{} > @end example @@ -3551,8 +3543,8 @@ lower = \notes \relative c { \score { \context ChoirStaff { < - \newcontext Staff { \upper } - \newcontext Staff { \lower } + \new Staff { \upper } + \new Staff { \lower } > } \paper { @@ -4392,8 +4384,8 @@ in this example disappears in the second line: @lilypond[verbatim] \score { \notes \relative c' < - \newcontext Staff { e4 f g a \break c1 } - \newcontext Staff { c4 d e f \break R1 } + \new Staff { e4 f g a \break c1 } + \new Staff { c4 d e f \break R1 } > \paper { linewidth = 6.\cm diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 8c90864b2e..3208a77635 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -655,8 +655,8 @@ staff is marked by adding @code{\context Staff} before it. These @quotation @lilypond[fragment,verbatim] \simultaneous { - \newcontext Staff { \clef violin c'' } - \newcontext Staff { \clef bass c } + \new Staff { \clef violin c'' } + \new Staff { \clef bass c } } @end lilypond @end quotation @@ -696,14 +696,14 @@ We can now typeset a melody with two staves: @lilypond[verbatim,singleline] \score { \notes - < \newcontext Staff { + < \new Staff { \time 3/4 \clef violin \relative c'' { e2( d4 c2 b4 a8[ a] b[ b] g[ g] a2.) } } - \newcontext Staff { + \new Staff { \clef bass c2 e4 g2. f4 e d c2. @@ -1273,11 +1273,11 @@ Again, these expressions can be nested arbitrarily: @lilypond[fragment] < - \newcontext Staff + \new Staff \relative c'' < { a4 g2 f4-~ f4 } \\ { s4 g4 f2 f4 } > - \newcontext Staff + \new Staff < { \clef bass <>1 } \\ { f4 d e2 } > @@ -1299,8 +1299,8 @@ Piano music is always typeset in two staves connected by a brace. Printing such a staff is done similar to the polyphonic example in @ref{Combining music into compound expressions}: @example - < \newcontext Staff @{ @dots{} @} - \newcontext Staff @{ @dots{} @} + < \new Staff @{ @dots{} @} + \new Staff @{ @dots{} @} > @end example but now this entire expression must be interpreted as a @@ -1313,9 +1313,9 @@ Here is a full-fledged example: @lilypond[relative 0,fragment] \context PianoStaff - < \newcontext Staff { \time 2/4 + < \new Staff { \time 2/4 c4 c g' g } - \newcontext Staff { + \new Staff { \clef bass c,, c' e c } > @end lilypond @@ -1652,8 +1652,8 @@ file @file{bassoon-music.ly}: \score @{ \simultaneous @{ - \newcontext Staff \hornNotes - \newcontext Staff \bassoonNotes + \new Staff \hornNotes + \new Staff \bassoonNotes @} @} @end example @@ -1662,10 +1662,10 @@ This would lead to the simple score depicted below: @lilypond[singleline] \score { \notes \relative c \simultaneous { - \newcontext Staff { \time 2/4 + \new Staff { \time 2/4 R2*3 r4 f8 a cis4 f e d } - \newcontext Staff { \clef bass + \new Staff { \clef bass r4 d,8 f | gis4 c | b bes | a8 e f4 | g d | gis f } } } diff --git a/GNUmakefile.in b/GNUmakefile.in index 2c5aa22eb9..4f8d9b775e 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -53,7 +53,7 @@ $(outdir)/$(fontball): $(outdir)/$(deb) rm -rf $(outdir)/./usr ar p $< data.tar.gz | \ tar -C $(outdir) -zxf - $(lld)/dvips $(lld)/fonts/type1 - # strip the $(lld) part? +# strip the $(lld) part? tar -C $(outdir) -czf $@ ./usr get-pfa-fonts: $(outdir)/$(fontball) diff --git a/input/example-1.ly b/input/example-1.ly index 3adfef97b5..d35b361c62 100644 --- a/input/example-1.ly +++ b/input/example-1.ly @@ -1,4 +1,3 @@ -#(ly:set-option 'old-relative) \version "1.9.1" % A simple scale in LilyPond % diff --git a/input/example-2.ly b/input/example-2.ly index 9760c07b0c..3c935a2229 100644 --- a/input/example-2.ly +++ b/input/example-2.ly @@ -1,4 +1,3 @@ -#(ly:set-option 'old-relative) \version "1.9.1" % Some beamed and slurred notes of different taste in LilyPond % @@ -15,7 +14,7 @@ \score { \context Voice \notes\relative c { - a''2 ~ c4( [e8 )e] [a,16 a a a] + a''2 ~ a4( e8[ )e] a,16[ a a a] } \paper { } \midi { } diff --git a/input/mutopia-header.ly b/input/mutopia-header.ly index 8456e55443..4d33195271 100644 --- a/input/mutopia-header.ly +++ b/input/mutopia-header.ly @@ -7,13 +7,13 @@ piece = "Piece" composer = "Composer" enteredby = "JCN" - instrument = \instrument + instrument = "Instrument printed over the score" % mutopia headers. mutopiatitle = "" mutopiacomposer = "" mutopiaopus = "" - mutopiainstrument = \instrument + mutopiainstrument = "File under these instruments at mutopia." date = "1807" source = "Urtext edition" @@ -21,7 +21,7 @@ style = "Classical" copyright = "Public Domain" maintainer = "Jan Nieuwenhuizen" - maintainer_email = "janneke@gnu.org" + maintainerEmail = "janneke@gnu.org" lastupdated = "2001/Mar/19" mutopiapublicdomain = "\\parbox{\hsize}{\\thefooter\\quad\\small \\\\This music is part of the Mutopia project, diff --git a/input/regression/+.ly b/input/regression/+.ly index 96ea39f645..eacf41865a 100644 --- a/input/regression/+.ly +++ b/input/regression/+.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" %% +.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/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly index ff1e65ccf5..2ef1a22bfe 100644 --- a/input/regression/accidental-cautionary.ly +++ b/input/regression/accidental-cautionary.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Cautionary accidentals are indicated using either diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly index 99c3131833..4f5465c506 100644 --- a/input/regression/accidental-double.ly +++ b/input/regression/accidental-double.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "If two forced accidentals happen at the same time, only one sharp sign is printed." diff --git a/input/regression/accidental-ledger.ly b/input/regression/accidental-ledger.ly index 3c4275b362..694e61bbb3 100644 --- a/input/regression/accidental-ledger.ly +++ b/input/regression/accidental-ledger.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Ledger lines are shortened when there are accidentals." diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly index b07157a38a..d69bcd41fc 100644 --- a/input/regression/accidental-octave.ly +++ b/input/regression/accidental-octave.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc=" diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly index a424618789..374e10dd73 100644 --- a/input/regression/accidental-placement.ly +++ b/input/regression/accidental-placement.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly index 7e96efe590..60ced5fd34 100644 --- a/input/regression/accidental-single-double.ly +++ b/input/regression/accidental-single-double.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" A sharp sign after a double sharp sign, as well as a flat sign diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly index 9587d656d4..dd57c8377e 100644 --- a/input/regression/accidental-unbroken-tie-spacing.ly +++ b/input/regression/accidental-unbroken-tie-spacing.ly @@ -4,7 +4,7 @@ texidoc = "Tied accidentaled notes (which cause reminder accidentals) don't wrea the spacing when unbroken." } -\version "1.9.1" +\version "1.9.2" \include "deutsch.ly" rechts = \notes \relative c' { diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly index bd02782d23..5173cbe38c 100644 --- a/input/regression/accidental-voice.ly +++ b/input/regression/accidental-voice.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" @@ -49,12 +49,12 @@ voiceb = \notes \transpose c c' { \score { < \notes - \context NoteNames=namesa \apply #no-octaves \voicea + \new NoteNames \apply #no-octaves \voicea \context Staff < \modernVoiceCautionaries - \context Voice = voicea \voicea - \context Voice = voiceb \voiceb + \new Voice \voicea + \new Voice \voiceb > - \context NoteNames=namesb \apply #no-octaves \voiceb + \new NoteNames \apply #no-octaves \voiceb > } diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly index 83468c0b00..56356af15d 100644 --- a/input/regression/accidental.ly +++ b/input/regression/accidental.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/accidentals.ly b/input/regression/accidentals.ly index 6d36c28f4a..f6dcd340ca 100644 --- a/input/regression/accidentals.ly +++ b/input/regression/accidentals.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/allfontstyle.ly b/input/regression/allfontstyle.ly index ef54e59095..e3d08731bd 100644 --- a/input/regression/allfontstyle.ly +++ b/input/regression/allfontstyle.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" @@ -13,7 +13,7 @@ Different text styles are used for various purposes. \alternative { { d-4_\markup { \italic "cantabile" } } - { e } } \grace { c16 } + { e } } \accacciatura { c16 } f4\ff^""^\markup { \large "Largo" } \mark "B" g } diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly index fb38cd23e0..766a40c6e7 100644 --- a/input/regression/ambitus.ly +++ b/input/regression/ambitus.ly @@ -52,7 +52,7 @@ paper block: %} -\version "1.9.1" +\version "1.9.2" upper = \notes \relative c { \clef "treble" @@ -72,8 +72,8 @@ lower = \notes \relative c { \score { \context ChoirStaff { < - \context Staff = one { \upper } - \context Staff = three { \lower } + \new Staff { \upper } + \new Staff { \lower } > } \paper { \translator { diff --git a/input/regression/apply-context.ly b/input/regression/apply-context.ly index 0b9c57712c..7502c35f99 100644 --- a/input/regression/apply-context.ly +++ b/input/regression/apply-context.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly index 88e9b7045f..1fade8fa7b 100644 --- a/input/regression/apply-output.ly +++ b/input/regression/apply-output.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "The @code{\applyoutput} expression is the most flexible way to diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly index 99d8f10815..5bface2330 100644 --- a/input/regression/arpeggio-collision.ly +++ b/input/regression/arpeggio-collision.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Arpeggio stays clear of accidentals and flipped note heads. @@ -7,25 +7,25 @@ Since Arpeggio engraver is Voice, it does nothing for voice collisions." } hairyChord = \context Staff \notes\relative c' < - \context Voice=one { + \new Voice { \property Voice.Stem \override #'direction = #1 \property Voice.NoteColumn \override #'horizontal-shift = #0 e4\arpeggio } - \context Voice=two { + \new Voice { \property Voice.Stem \override #'direction = #1 \property Voice.NoteColumn \override #'horizontal-shift = #1 cis\arpeggio } - \context Voice=three { + \new Voice { \property Voice.Stem \override #'direction = #1 \property Voice.NoteColumn \override #'horizontal-shift = #2 ais\arpeggio } - \context Voice=four { + \new Voice { \property Voice.Stem \override #'direction = #-1 \property Voice.NoteColumn \override #'horizontal-shift = #-1 fis\arpeggio diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly index 277b308961..af7efa9ea1 100644 --- a/input/regression/arpeggio.ly +++ b/input/regression/arpeggio.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" Arpeggios are supported, both cross-staff and broken single staff. @@ -10,7 +10,7 @@ Arpeggios are supported, both cross-staff and broken single staff. \score{ \context PianoStaff < - \context Staff=one \notes\relative c''{ + \new Staff \notes\relative c''{ \context Voice << fis, d a >>\arpeggio \property Staff.Arpeggio \override #'arpeggio-direction = #1 \context Voice << fis, d a >>\arpeggio @@ -18,7 +18,7 @@ Arpeggios are supported, both cross-staff and broken single staff. \property PianoStaff.connectArpeggios = ##t <>\arpeggio } - \context Staff=two \notes\relative c{ + \new Staff \notes\relative c{ \clef bass \context Voice << g b d >>\arpeggio \property Staff.Arpeggio \override #'arpeggio-direction = #-1 diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly index 5364837395..118b3c7385 100644 --- a/input/regression/auto-beam-bar.ly +++ b/input/regression/auto-beam-bar.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly index 3f3a0306d5..1be21e4963 100644 --- a/input/regression/auto-beam-triplet.ly +++ b/input/regression/auto-beam-triplet.ly @@ -4,7 +4,7 @@ texidoc = "Automatic beaming is also done on tuplets." } -\version "1.9.1" +\version "1.9.2" \score{ \notes\relative c''{ diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly index c0d9aea33b..85fd689d68 100644 --- a/input/regression/auto-beam-tuplets.ly +++ b/input/regression/auto-beam-tuplets.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Tuplet-spanner should not put (visible) brackets on diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly index 234cfe4487..bc8e57a263 100644 --- a/input/regression/auto-beam.ly +++ b/input/regression/auto-beam.ly @@ -5,7 +5,7 @@ texidoc="Test automatic beamer: the last measure should have a single beam." } -\version "1.9.1" +\version "1.9.2" diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly index 01567777e7..6dc001a2a3 100644 --- a/input/regression/auto-change.ly +++ b/input/regression/auto-change.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly index 2e595a9de7..9086416c82 100644 --- a/input/regression/bar-number.ly +++ b/input/regression/bar-number.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly index 5270fa9833..30c3634c0a 100644 --- a/input/regression/bar-scripts.ly +++ b/input/regression/bar-scripts.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" @@ -10,19 +10,19 @@ knowing it. Consequently, they fall over often. } -onestaff = \context Staff = foo\notes\relative c'' { +onestaff = \new Staff\notes\relative c'' { \property Staff.instr = instr \property Staff.instrument = instrument \mark "B" c1 \mark "A" \break c2 c2 \break } grstaff = \notes \relative c'' \context GrandStaff < - \context Staff = bar { + \new Staff { \property Staff.instr = instr \mark "B" \break c1 \mark "A" c2 } - \context Staff = bufl { c1 c2 } + \new Staff { c1 c2 } > diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly index 8d4c5ec1f3..066535c121 100644 --- a/input/regression/beam-auto-knee.ly +++ b/input/regression/beam-auto-knee.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="Automatic kneeing. A knee is made when a horizontal beam fits in a gap between note heads that is larger than a predefined diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly index fceb8c164f..4b6010c690 100644 --- a/input/regression/beam-break.ly +++ b/input/regression/beam-break.ly @@ -4,7 +4,7 @@ " } -\version "1.9.1" +\version "1.9.2" \paper { raggedright= ##t } \score { \notes \relative c'' { diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly index 4e642b01be..cbc12449e6 100644 --- a/input/regression/beam-center-slope.ly +++ b/input/regression/beam-center-slope.ly @@ -1,6 +1,6 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="Simple beams on middle staffline are allowed to be diff --git a/input/regression/beam-chord.ly b/input/regression/beam-chord.ly index 3846a9dd55..9f50ac828c 100644 --- a/input/regression/beam-chord.ly +++ b/input/regression/beam-chord.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "If the first and last outer notes of a beam are the same, diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly index 1d52cadeed..7e395d8b40 100644 --- a/input/regression/beam-concave.ly +++ b/input/regression/beam-concave.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc = "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 7da8577341..f601b2cc5a 100644 --- a/input/regression/beam-cross-staff-auto-knee.ly +++ b/input/regression/beam-cross-staff-auto-knee.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly index fbc9747511..522373697b 100644 --- a/input/regression/beam-cross-staff-slope.ly +++ b/input/regression/beam-cross-staff-slope.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Cross staff (kneed) beams don't cause extreme slopes." } diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly index 2f4c6e2982..dd2f690ec7 100644 --- a/input/regression/beam-cross-staff.ly +++ b/input/regression/beam-cross-staff.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 f98aef0424..881cfc43ca 100644 --- a/input/regression/beam-damp.ly +++ b/input/regression/beam-damp.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Beam Damp Beams are less steep than the notes they encompass. " } diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly index a6db3c9fbb..de8dfd6711 100644 --- a/input/regression/beam-default-lengths.ly +++ b/input/regression/beam-default-lengths.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="Beamed stems have standard lengths if possible." diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index 5cae7ef76b..cf2154ade0 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 d4027f6c3e..aed34d6664 100644 --- a/input/regression/beam-french.ly +++ b/input/regression/beam-french.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly index 20282b72f1..2fe276ec2f 100644 --- a/input/regression/beam-funky-beamlet.ly +++ b/input/regression/beam-funky-beamlet.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 609408c1c2..c7eaa33429 100644 --- a/input/regression/beam-funky.ly +++ b/input/regression/beam-funky.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Knee beaming, complex configurations. According to diff --git a/input/regression/beam-knee-symmetry.ly b/input/regression/beam-knee-symmetry.ly index 030f19f331..8f68a8bc60 100644 --- a/input/regression/beam-knee-symmetry.ly +++ b/input/regression/beam-knee-symmetry.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Point-symmetric beams should receive the same diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly index d3242c0352..6e596a70e0 100644 --- a/input/regression/beam-length.ly +++ b/input/regression/beam-length.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly index ed73fd8635..4b5a8b1ee5 100644 --- a/input/regression/beam-manual-beaming.ly +++ b/input/regression/beam-manual-beaming.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/beam-manual.ly b/input/regression/beam-manual.ly index 9a75c064a7..c22af80e21 100644 --- a/input/regression/beam-manual.ly +++ b/input/regression/beam-manual.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { @@ -9,7 +9,6 @@ } \score { - \context Staff = up { \notes\relative c'{ \property Voice.Beam \override #'auto-knee-gap = ##f \property Voice.Beam \override #'positions = #'(-10 . 10) @@ -17,7 +16,6 @@ c16[ c'' a f] } - } \paper{ raggedright = ##t } diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly index 29b556388a..0d5cb52534 100644 --- a/input/regression/beam-multiple-cross-staff.ly +++ b/input/regression/beam-multiple-cross-staff.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Kneed beams (often happens with cross-staff beams) diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly index bba4a7cf22..db03d364aa 100644 --- a/input/regression/beam-over-barline.ly +++ b/input/regression/beam-over-barline.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Explicit beams may cross barlines. " } diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly index 21ff0b9919..bf9b6f2880 100644 --- a/input/regression/beam-position.ly +++ b/input/regression/beam-position.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" Beams should always reach the middle staff line. The second beam @@ -13,7 +13,7 @@ Override with @code{noStemExtend}. \score { \context Voice \notes\relative c { f8[ f] f64[ f] - \grace { + \grace { f8[ e8] \property Voice.Stem \override #'no-stem-extend = ##f f8[ e8] diff --git a/input/regression/beam-postfix-notation.ly b/input/regression/beam-postfix-notation.ly index 218f693a9a..36ec82cab7 100644 --- a/input/regression/beam-postfix-notation.ly +++ b/input/regression/beam-postfix-notation.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Beams and ties may be entered in postfix notation, separating the diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly index 320cf2b942..b77ab9d85f 100644 --- a/input/regression/beam-quanting-horizontal.ly +++ b/input/regression/beam-quanting-horizontal.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly index 3925765d0f..81c477f159 100644 --- a/input/regression/beam-quarter.ly +++ b/input/regression/beam-quarter.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 d33bfc99ff..aff906436f 100644 --- a/input/regression/beam-rest.ly +++ b/input/regression/beam-rest.ly @@ -3,7 +3,7 @@ texidoc = "The number of beams doesn't change on a rest." } -\version "1.9.1" +\version "1.9.2" \score { \notes \relative c, { \clef bass diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly index c47e38287f..2e24e5604d 100644 --- a/input/regression/beam-second.ly +++ b/input/regression/beam-second.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" Seconds are tricky. We used to have problems with seconds being too diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly index c95d984695..897a4cd857 100644 --- a/input/regression/beam-shortened-lengths.ly +++ b/input/regression/beam-shortened-lengths.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="Beams in unnatural direction, have shortened stems, but do not look too short." diff --git a/input/regression/beamed-chord.ly b/input/regression/beamed-chord.ly index 929ecda4d1..aa52d3e71d 100644 --- a/input/regression/beamed-chord.ly +++ b/input/regression/beamed-chord.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc = "Hairy case for beam, chord, and automatic knees." diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly index 3e5003b5e5..878c26ae49 100644 --- a/input/regression/beaming-ternary-metrum.ly +++ b/input/regression/beaming-ternary-metrum.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Automatic beaming works also in ternary time sigs." } diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly index ee46ce2859..ca5253d1b7 100644 --- a/input/regression/beaming.ly +++ b/input/regression/beaming.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/beams.ly b/input/regression/beams.ly index 0a1b930e8c..1fcadcfde3 100644 --- a/input/regression/beams.ly +++ b/input/regression/beams.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Beams (simple)." } diff --git a/input/regression/between-systems.ly b/input/regression/between-systems.ly index 2d332bfc10..57dfcd1fd3 100644 --- a/input/regression/between-systems.ly +++ b/input/regression/between-systems.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/break.ly b/input/regression/break.ly index 0a77a28559..7737e60aec 100644 --- a/input/regression/break.ly +++ b/input/regression/break.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly index 5b5bd4d04c..3d130053b7 100644 --- a/input/regression/breathing-sign.ly +++ b/input/regression/breathing-sign.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" Breathing signs, also used for phrasing, do normally not influence @@ -25,21 +25,21 @@ finalis, the latter three looking similar to bar glyphs. \key es \major \time 3/4 % this bar contains no \breathe - < \context Voice = two { \stemDown es4 bes es } - \context Voice = one { \stemUp g4 as g } + < { g4 as g } +\\{ es4 bes es } > | % by default, \breathe uses the rcomma, just as if saying: % \property Voice.BreathingSign \set #'text = #"scripts-rcomma" - < \context Voice = two { \stemDown es4 \breathe bes es } - \context Voice = one { \stemUp g4 as g } + < + { g4 as g }\\{ es4 \breathe bes es } > | % rvarcomma and lvarcomma are variations of the default rcomma and lcomma % N.B.: must use Staff context here, since we start a Voice below \property Staff.BreathingSign \override #'text = #"scripts-rvarcomma" - < \context Voice = two { \stemDown es4 \breathe bes es } - \context Voice = one { \stemUp g4 as g } + < { g4 as g }\\ + { es4 \breathe bes es } > | % wedge diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly index 155b3107b8..75e3b032b1 100644 --- a/input/regression/chord-changes.ly +++ b/input/regression/chord-changes.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \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 27ee59284a..ec133c94f0 100644 --- a/input/regression/chord-name-entry-11.ly +++ b/input/regression/chord-name-entry-11.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/chord-name-entry.ly b/input/regression/chord-name-entry.ly index b275fadfce..7b915462e8 100644 --- a/input/regression/chord-name-entry.ly +++ b/input/regression/chord-name-entry.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/chord-name-exceptions.ly b/input/regression/chord-name-exceptions.ly index 4655cbc9b0..d6a7441c2d 100644 --- a/input/regression/chord-name-exceptions.ly +++ b/input/regression/chord-name-exceptions.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "The property @code{chordNameExceptions} can used to store a list of special notations for specific chords. diff --git a/input/regression/chord-name-major7.ly b/input/regression/chord-name-major7.ly index 63ea28a700..69ac0d3944 100644 --- a/input/regression/chord-name-major7.ly +++ b/input/regression/chord-name-major7.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "The layout of the major 7 can be tuned with @code{majorSevenSymbol}." diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly index 6fff693ebd..f3fdb96093 100644 --- a/input/regression/chord-scripts.ly +++ b/input/regression/chord-scripts.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Scripts can also be attached to chord elements." diff --git a/input/regression/chord-tremolo.ly b/input/regression/chord-tremolo.ly index 34b10c818b..bbd3b9857a 100644 --- a/input/regression/chord-tremolo.ly +++ b/input/regression/chord-tremolo.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/chords-funky-ignatzek.ly b/input/regression/chords-funky-ignatzek.ly index 48785dec02..560be799ea 100644 --- a/input/regression/chords-funky-ignatzek.ly +++ b/input/regression/chords-funky-ignatzek.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly index e320d83a13..6d7fc7cc63 100644 --- a/input/regression/clefs.ly +++ b/input/regression/clefs.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly index 9ca98bc437..ece57ccd0b 100644 --- a/input/regression/cluster.ly +++ b/input/regression/cluster.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Clusters are a device to denote that a complete range of notes is to be played." @@ -12,8 +12,8 @@ fragment =\notes \relative c' { \score { \notes < - \context Staff = SA \fragment - \context Staff = SB \apply #notes-to-clusters \fragment + \new Staff \fragment + \new Staff \apply #notes-to-clusters \fragment > \paper { raggedright = ##t } } diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly index cdc5bb044f..6e59996700 100644 --- a/input/regression/collision-2.ly +++ b/input/regression/collision-2.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Collisions for single head notes. " } diff --git a/input/regression/collision-dots.ly b/input/regression/collision-dots.ly index 76417e0efb..764c7ec189 100644 --- a/input/regression/collision-dots.ly +++ b/input/regression/collision-dots.ly @@ -5,18 +5,18 @@ on the right side." } -\version "1.9.1" +\version "1.9.2" \paper { raggedright= ##t } \score{ \context Staff \notes < \clef "bass" - \context Voice = "Tenor" { + \new Voice { \stemUp b8. c'16 d'4 b8 c'8 d'4 } - \context Voice = "Bass" { + \new Voice { \stemDown b2 b2 } diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly index 7abee32b07..61de436c96 100644 --- a/input/regression/collision-head-chords.ly +++ b/input/regression/collision-head-chords.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \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 90a07557d8..0db80feee4 100644 --- a/input/regression/collision-heads.ly +++ b/input/regression/collision-heads.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = @@ -13,7 +13,7 @@ if the black note heads are from 8th or shorter notes. \score { \notes \context Staff\relative c''< -\context Voice = VA { +\new Voice { \voiceOne c2 c8 c4. @@ -22,7 +22,7 @@ if the black note heads are from 8th or shorter notes. c8 c4. c2 } -\context Voice = VB { +\new Voice { \voiceTwo c8 c4. c2 diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly index eb51799b60..17704c5fbb 100644 --- a/input/regression/collision-merge-differently-dotted.ly +++ b/input/regression/collision-merge-differently-dotted.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "If NoteCollision has merge-differently-dotted set, note @@ -11,11 +11,11 @@ heads that have differing dot counts may be merged anyway." \score { \notes { \context Staff < - \context Voice = VA { \voiceOne g'8 g'8 + \new Voice { \voiceOne g'8 g'8 \property Staff.NoteCollision \override #'merge-differently-dotted = ##t g'8 g'8 } - \context Voice = VB { \voiceTwo g'8.[ f16] g'8.[ f'16] } + \new Voice { \voiceTwo g'8.[ f16] g'8.[ f'16] } > }} diff --git a/input/regression/collision-mesh.ly b/input/regression/collision-mesh.ly index 62f754c4d0..209bb2ffdc 100644 --- a/input/regression/collision-mesh.ly +++ b/input/regression/collision-mesh.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Oppositely stemmed chords, meshing into each other, are resolved." @@ -11,21 +11,20 @@ are resolved." \context Staff \notes \transpose c c' { \time 3/4 % Here's what I was trying to do: - < \context Voice = VI {\stemDown + < { + d'4 + d'4. + <>4 + <>4 + <>4. + }\\ { <>4 <>4. <>4 d'4 d'4. } - - \context Voice=VII {\stemUp - d'4 - d'4. - <>4 - <>4 - <>4. - } > + > } } diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly index 4854553c59..6c7c28b942 100644 --- a/input/regression/collisions.ly +++ b/input/regression/collisions.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" Normal collisions. We have support for polyphony, where the @@ -13,16 +13,16 @@ copyright = "public domain" twovoice = \notes \relative c' \context Staff \notes < - \context Voice=i { \stemDown c4 c d d e e f f } - \context Voice=ii { \stemUp g4 f f e e d d c } + { g4 f f e e d d c } +\\ { c4 c d d e e f f } > twovoicechords = \context Staff \notes < - \context Voice = i \relative c' { - \stemUp e4 d c b a g f - } - \context Voice = ii \relative c' { - \stemDown <>4 <>4 <>4 <>4 <> + \relative c' { + e4 d c b a g f + }\\ + \relative c' { + <>4 <>4 <>4 <>4 <> <> <> } > diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly index c14fec7466..2eb91bb9a0 100644 --- a/input/regression/completion-heads-polyphony.ly +++ b/input/regression/completion-heads-polyphony.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \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 54b7692b02..f64866151b 100644 --- a/input/regression/completion-heads.ly +++ b/input/regression/completion-heads.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/custos.ly b/input/regression/custos.ly index 69310094b4..357dcd0fef 100644 --- a/input/regression/custos.ly +++ b/input/regression/custos.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Custodes in various styles." } diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly index 17193d48c9..e140f8842b 100644 --- a/input/regression/dot-flag-collision.ly +++ b/input/regression/dot-flag-collision.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 c374b4b298..6205cc9dd3 100644 --- a/input/regression/dots.ly +++ b/input/regression/dots.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" Noteheads can have dots, and rests can too. Augmentation dots should @@ -21,8 +21,8 @@ a column. The dots go along as rests are shifted to avoid collisions. \context Staff < - \context Voice = VA { \stemUp f'' <> r4. } - \context Voice = VB { \stemDown b, <> r4. } + { f'' <> r4. }\\ + { b, <> r4. } > diff --git a/input/regression/drums.ly b/input/regression/drums.ly index 60627908c3..3044ce3825 100644 --- a/input/regression/drums.ly +++ b/input/regression/drums.ly @@ -8,7 +8,7 @@ texidoc = "Drum notation, although kludgy, should work. Though, << chord >> does \include "drumpitch-init.ly" -\version "1.9.1" +\version "1.9.2" drh = \notes { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 } drl = \notes {\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 5cfdf800f7..3ccbf4bc2e 100644 --- a/input/regression/dynamics-broken-hairpin.ly +++ b/input/regression/dynamics-broken-hairpin.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 03d508af63..5d5613aacb 100644 --- a/input/regression/dynamics-glyphs.ly +++ b/input/regression/dynamics-glyphs.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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-line.ly b/input/regression/dynamics-line.ly index 7e0a892115..cf40cfeba4 100644 --- a/input/regression/dynamics-line.ly +++ b/input/regression/dynamics-line.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 0b4dcd17ab..1cbe39fd04 100644 --- a/input/regression/dynamics-unbound-hairpin.ly +++ b/input/regression/dynamics-unbound-hairpin.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Crescendi may start off-notes. In that case, they should not collapse into flat lines." diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly index 6da74425bc..6823d67ac9 100644 --- a/input/regression/easy-notation.ly +++ b/input/regression/easy-notation.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = " Ez-notation prints names in note heads. diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly index fd7c1bf71a..c6bf7ef6e5 100644 --- a/input/regression/figured-bass.ly +++ b/input/regression/figured-bass.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = " Figured bass is created by the FiguredBass context which eats diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly index 04ba72932c..de50af379f 100644 --- a/input/regression/finger-chords.ly +++ b/input/regression/finger-chords.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "With the new chord syntax it's possible to associate diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly index 4c37ce9938..2a0f1b2803 100644 --- a/input/regression/fingering.ly +++ b/input/regression/fingering.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 2cebbb1997..f9583da7c9 100644 --- a/input/regression/follow-voice-break.ly +++ b/input/regression/follow-voice-break.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc = " When put across line breaks, only the part before the line break is diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly index b4dbfbfece..bd86af248e 100644 --- a/input/regression/font-magnification.ly +++ b/input/regression/font-magnification.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "The magnification can be set for any font. Note that this doesn't change variable symbols such as beams or slurs. " } diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly index efc1d90f30..7b6307b5bd 100644 --- a/input/regression/font-name.ly +++ b/input/regression/font-name.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly index f1d757fc73..aa13d88027 100644 --- a/input/regression/generic-output-property.ly +++ b/input/regression/generic-output-property.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly index 6a1660ebf3..ab999e7193 100644 --- a/input/regression/glissando.ly +++ b/input/regression/glissando.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly index 8b81abbbef..5b646c56b1 100644 --- a/input/regression/grace-auto-beam.ly +++ b/input/regression/grace-auto-beam.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 39cf0665f6..8b964ff711 100644 --- a/input/regression/grace-bar-line.ly +++ b/input/regression/grace-bar-line.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 7fedb2816c..a9619a21ab 100644 --- a/input/regression/grace-bar-number.ly +++ b/input/regression/grace-bar-number.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 8a51accbc9..75ffb667f5 100644 --- a/input/regression/grace-beam.ly +++ b/input/regression/grace-beam.ly @@ -9,6 +9,6 @@ Unbeamed grace notes are not put into normal beams. \paper { raggedright= ##t } -\version "1.9.1" +\version "1.9.2" \score { \notes\relative c'' { c4 d8[ \grace { e32[ d c d] } e8] e[ e \grace { f16 } e8 e] }} diff --git a/input/regression/grace-dynamic.ly b/input/regression/grace-dynamic.ly index b73ccae4e4..8d027d71bc 100644 --- a/input/regression/grace-dynamic.ly +++ b/input/regression/grace-dynamic.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ % ? % niet zo onschuldig! je hebt graces gefixt in 1.5, zie maar eens 1.3.150 diff --git a/input/regression/grace-end.ly b/input/regression/grace-end.ly index b1c572f64a..736a57a59d 100644 --- a/input/regression/grace-end.ly +++ b/input/regression/grace-end.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc="@cindex Grace End diff --git a/input/regression/grace-nest.ly b/input/regression/grace-nest.ly index bc73155013..c61c0d4a5c 100644 --- a/input/regression/grace-nest.ly +++ b/input/regression/grace-nest.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \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 7414eec1fe..c92238f873 100644 --- a/input/regression/grace-nest1.ly +++ b/input/regression/grace-nest1.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \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 73a4234417..498a68ed26 100644 --- a/input/regression/grace-nest2.ly +++ b/input/regression/grace-nest2.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \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 c3e072e2b2..aa7c442771 100644 --- a/input/regression/grace-nest3.ly +++ b/input/regression/grace-nest3.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Another nested grace situation." } diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly index bc134b1940..5e3a7c04a0 100644 --- a/input/regression/grace-nest4.ly +++ b/input/regression/grace-nest4.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Another combination of grace note nesting." } diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly index ef991e9df3..736b3b384d 100644 --- a/input/regression/grace-nest5.ly +++ b/input/regression/grace-nest5.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Another nested grace situation." } diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly index 43e8dd3c2f..da358d6d01 100644 --- a/input/regression/grace-part-combine.ly +++ b/input/regression/grace-part-combine.ly @@ -1,13 +1,13 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Partcombiner and grace notes can go together." } \paper { raggedright= ##t } \score { - \context StaffGroup = group < - \context Staff = instrument < + \new StaffGroup < + \new Staff < \context Voice=one \partcombine Voice \context Thread=one \notes \relative c'' { c4 d e f \grace f16 g1 diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly index c0c0199b78..d2f8e4ad70 100644 --- a/input/regression/grace-staff-length.ly +++ b/input/regression/grace-staff-length.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ texidoc = "Stripped version of trip.ly. Staffs should be of correct length." } @@ -8,12 +8,12 @@ texidoc = "Stripped version of trip.ly. Staffs should be of correct length." \score{ \context PianoStaff \notes \relative c'' < - \context Staff = treble { + \new Staff { r1 r1 \bar "|." } - \context Staff = bass { + \new Staff { r1 \context Staff { \grace { c16 } c1 diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly index 23ec247bbb..a4a3464050 100644 --- a/input/regression/grace-start.ly +++ b/input/regression/grace-start.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Pieces may begin with grace notes." } diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly index 2ed71f6d1f..51f337b549 100644 --- a/input/regression/grace-stems.ly +++ b/input/regression/grace-stems.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc = "Here startGraceMusic should set 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 8a323cf0c4..9b8a557846 100644 --- a/input/regression/grace-sync.ly +++ b/input/regression/grace-sync.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Grace notes in different voices/staves are synchronized." } @@ -7,11 +7,11 @@ \score {\notes\relative c'' < \context Staff { c2 \grace c8 c4 c4 } - \context Staff = SB { c2 \clef bass + \new Staff { c2 \clef bass \grace { dis8[ ( d8] \key es\major } c4) c4 } - \context Staff = SC { c2 c4 c4 \bar "|." } + \new Staff { c2 c4 c4 \bar "|." } > \paper { raggedright = ##t} } diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly index c286bdea6c..1bf347b3bc 100644 --- a/input/regression/grace-unfold-repeat.ly +++ b/input/regression/grace-unfold-repeat.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Grace notes and unfolded repeats. Line breaks may happen before grace notes. diff --git a/input/regression/grace-volta-repeat-2.ly b/input/regression/grace-volta-repeat-2.ly index bc3553bee9..9eaa33ae4c 100644 --- a/input/regression/grace-volta-repeat-2.ly +++ b/input/regression/grace-volta-repeat-2.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly index 0f57e60e82..85ac04ada8 100644 --- a/input/regression/grace-volta-repeat.ly +++ b/input/regression/grace-volta-repeat.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/grace.ly b/input/regression/grace.ly index 5304ed0f80..1a4ad492e3 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly index 715f8f51d0..d2cfc780f4 100644 --- a/input/regression/hairpin-ending.ly +++ b/input/regression/hairpin-ending.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly index 068cd13f9a..571e950782 100644 --- a/input/regression/hara-kiri-pianostaff.ly +++ b/input/regression/hara-kiri-pianostaff.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = @@ -23,9 +23,9 @@ alignment; this should not confuse the mechanism. \score { \notes \transpose c c'' \context PianoStaff < - \context Staff = up { c4 c c c \break s1 \break c4 c c c \break c c c c} - \context Staff = mid { d4 d d d s1 s1 s1 s1 } - \context Staff = down { e4 e e e s1 e4 e e e s1 } + \new Staff { c4 c c c \break s1 \break c4 c c c \break c c c c} + \new Staff { d4 d d d s1 s1 s1 s1 } + \new Staff { e4 e e e s1 e4 e e e s1 } > \paper { \translator { diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly index 9d8a58d5b6..e5e902a5c6 100644 --- a/input/regression/instrument-name-markup.ly +++ b/input/regression/instrument-name-markup.ly @@ -7,12 +7,12 @@ including alterations. " } -\version "1.9.1" +\version "1.9.2" textFlat = \markup {\smaller \musicglyph #"accidentals--1"} \score { - \notes \context Staff = treble { + \notes \new Staff { \property Staff.instrument = \markup { \column << "Clarinetti" { "in B" \textFlat } >> } \property Staff.instr diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly index ccabed0205..487e025f26 100644 --- a/input/regression/instrument-name-partial.ly +++ b/input/regression/instrument-name-partial.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 fcc76cf287..2d7f7b7d9b 100644 --- a/input/regression/instrument-name.ly +++ b/input/regression/instrument-name.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \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 893744602c..a1cbc28d92 100644 --- a/input/regression/key-clefs.ly +++ b/input/regression/key-clefs.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Tests placement of accidentals in every clef. " } \score { \notes diff --git a/input/regression/key-signature-scordatura.ly b/input/regression/key-signature-scordatura.ly index e34bb8ca54..7b11d4ddcb 100644 --- a/input/regression/key-signature-scordatura.ly +++ b/input/regression/key-signature-scordatura.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Key signatures can be set per pitch individually. This can be done by setting @code{Staff.keySignature} diff --git a/input/regression/keys.ly b/input/regression/keys.ly index b9eb85cb29..597916ff1a 100644 --- a/input/regression/keys.ly +++ b/input/regression/keys.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" Key signatures appear on key changes. They may also diff --git a/input/regression/lyric-align.ly b/input/regression/lyric-align.ly index 696a7b034f..93eaeab09c 100644 --- a/input/regression/lyric-align.ly +++ b/input/regression/lyric-align.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index b28a886c4d..f8a0aacac6 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc ="Polyphonic rhythms and rests don't disturb diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly index a4cb15f50c..32b0a088db 100644 --- a/input/regression/lyric-combine.ly +++ b/input/regression/lyric-combine.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc= "Lyrics can be set to a melody automatically. Excess lyrics will be diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly index 42b42cd642..3f135f4edc 100644 --- a/input/regression/lyric-extender.ly +++ b/input/regression/lyric-extender.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc= "Tests lyric extenders. "} \paper { raggedright= ##t } diff --git a/input/regression/lyric-hyphen.ly b/input/regression/lyric-hyphen.ly index 95e31c05f5..d581e2ad29 100644 --- a/input/regression/lyric-hyphen.ly +++ b/input/regression/lyric-hyphen.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header {texidoc="Tests lyric hyphens. "} \score{ < diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly index a66dcc5e41..c1c69d2f90 100644 --- a/input/regression/lyric-phrasing.ly +++ b/input/regression/lyric-phrasing.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="Lyric phrasing diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly index e29ff5e6c6..219e627456 100644 --- a/input/regression/lyrics-bar.ly +++ b/input/regression/lyrics-bar.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" @@ -21,7 +21,7 @@ lyrics don't collide with barlines. this4 one has no BarEngraverAddedToContext1 } > - \notes \context Staff = SB { b1 b1 } + \notes \new Staff { b1 b1 } > \paper { raggedright = ##t diff --git a/input/regression/lyrics-extender.ly b/input/regression/lyrics-extender.ly index 862772c7e6..f0bcf9b90e 100644 --- a/input/regression/lyrics-extender.ly +++ b/input/regression/lyrics-extender.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ texidoc = diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly index 7720dfc935..ee16767804 100644 --- a/input/regression/lyrics-melisma-beam.ly +++ b/input/regression/lyrics-melisma-beam.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Melismata are triggered by manual beams." @@ -9,7 +9,7 @@ \score { \simultaneous { \addlyrics - \context Staff = mel + \new Staff \notes \relative c'' { \property Staff.autoBeaming = ##f c8 c8[ c8 c8] c8 } diff --git a/input/regression/lyrics-multi-stanza.ly b/input/regression/lyrics-multi-stanza.ly index 2ab13a4e30..79eb20ba29 100644 --- a/input/regression/lyrics-multi-stanza.ly +++ b/input/regression/lyrics-multi-stanza.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Lyrics syllables are aligned according to @@ -10,7 +10,7 @@ texidoc = "Lyrics syllables are aligned according to \score { \addlyrics - \notes \relative c'' \context Voice = duetto { \time 3/4 g2 e4 a2 f4 g2. } + \notes \relative c'' \context Voice = duet { \time 3/4 g2 e4 a2 f4 g2. } \lyrics \context Lyrics < \context LyricsVoice = "duet-1" { \property LyricsVoice . stanza = "Bert" diff --git a/input/regression/markup-note.ly b/input/regression/markup-note.ly index ebdebb1543..9415c3993b 100644 --- a/input/regression/markup-note.ly +++ b/input/regression/markup-note.ly @@ -3,7 +3,7 @@ texidoc = "The note markup function is used to make metronome markings. It works for a variety of flag dot and duration settings." } -\version "1.9.1" +\version "1.9.2" \score { \notes { c4^\markup { \note #0 #0 #1 diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly index b5949de741..b1cc9ae0cd 100644 --- a/input/regression/markup-stack.ly +++ b/input/regression/markup-stack.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header {texidoc="Stacking of markup scripts."} \paper { raggedright = ##t} \score { \notes { c''^\markup { "a" \column << "1" \bold "2" "3" >> } } } diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly index 45fd1db9ed..72897c5b44 100644 --- a/input/regression/measure-grouping.ly +++ b/input/regression/measure-grouping.ly @@ -8,7 +8,7 @@ of Steve Martland's Dance Works. " } -\version "1.9.1" +\version "1.9.2" %% TODO: should have 2/4 + 5/8 time sig style. diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly index 779213fee1..20c4eb4de5 100644 --- a/input/regression/mensural.ly +++ b/input/regression/mensural.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \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 d1a1452112..c33117a138 100644 --- a/input/regression/metronome-marking.ly +++ b/input/regression/metronome-marking.ly @@ -9,7 +9,7 @@ The marking is left aligned with the time signature, if there is one. } -\version "1.9.1" +\version "1.9.2" \score { \notes \relative c'' { \tempo \breve = 100 c1 c1 \tempo 8.. = 50 c1 } \paper { raggedright = ##t } diff --git a/input/regression/mm-rests2.ly b/input/regression/mm-rests2.ly index fafe8c9ef1..233b95eeaa 100644 --- a/input/regression/mm-rests2.ly +++ b/input/regression/mm-rests2.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/mmrest-collision.ly b/input/regression/mmrest-collision.ly index c13eaa0db9..568b8f46d4 100644 --- a/input/regression/mmrest-collision.ly +++ b/input/regression/mmrest-collision.ly @@ -1,13 +1,13 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Tests a collision between multimeasure rests in different voices. " } \score { \context Staff \notes < - \context Voice=i { + \new Voice { \property Voice.MultiMeasureRest \override #'staff-position = #3 R1 } - \context Voice=ii { + \new Voice { \property Voice.MultiMeasureRest \override #'staff-position = #-3 R1 } diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly index f12a480740..9851bab792 100644 --- a/input/regression/molecule-hacking.ly +++ b/input/regression/molecule-hacking.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc=" You can write molecule callbacks in Scheme, thus providing custom glyphs for notation elements. A simple example is diff --git a/input/regression/multi-measure-rest-center.ly b/input/regression/multi-measure-rest-center.ly index 135d47aff8..8eda9b4ace 100644 --- a/input/regression/multi-measure-rest-center.ly +++ b/input/regression/multi-measure-rest-center.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \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 c8e42524a9..23aed11d62 100644 --- a/input/regression/multi-measure-rest-grace.ly +++ b/input/regression/multi-measure-rest-grace.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { @@ -7,7 +7,7 @@ texidoc= "Grace notes and multi-measure rests." \score { \notes < - \context Staff = SB { R1 R1 R1*3 } - \context Staff = SA { \clef bass c1 \grace c8 c2 c2 c1 \grace c16 c2 c2 c1 } + \new Staff { R1 R1 R1*3 } + \new Staff { \clef bass c1 \grace c8 c2 c2 c1 \grace c16 c2 c2 c1 } > } diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly index e904e88100..29f09ec73d 100644 --- a/input/regression/multi-measure-rest-instr-name.ly +++ b/input/regression/multi-measure-rest-instr-name.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "This combines instrument names and multimeasure rests (there was an interesting bug in 1.3.98). " } diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly index 5219246670..7b182420c6 100644 --- a/input/regression/multi-measure-rest-text.ly +++ b/input/regression/multi-measure-rest-text.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly index 56a03fd565..18d3bf8b9c 100644 --- a/input/regression/multi-measure-rest.ly +++ b/input/regression/multi-measure-rest.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/music-map.ly b/input/regression/music-map.ly index b231cd0700..361574d800 100644 --- a/input/regression/music-map.ly +++ b/input/regression/music-map.ly @@ -11,7 +11,7 @@ dynamics are left over. These are put onto the 2nd measure." } -\version "1.9.1" +\version "1.9.2" #(define (notes-to-skip m) "Convert all stuff with duration (notes, lyrics, bass figures, etc.) to skips. diff --git a/input/regression/new-markup-syntax.ly b/input/regression/new-markup-syntax.ly index ec0eed659f..69883ab692 100644 --- a/input/regression/new-markup-syntax.ly +++ b/input/regression/new-markup-syntax.ly @@ -2,7 +2,7 @@ texidoc = "New markup syntax." } -\version "1.9.1" +\version "1.9.2" \score { diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly index 71bc0debe9..c04e375cfb 100644 --- a/input/regression/non-empty-text.ly +++ b/input/regression/non-empty-text.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly index f9ac6ef38b..1d49916e8d 100644 --- a/input/regression/note-group-bracket.ly +++ b/input/regression/note-group-bracket.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly index df002efdf8..f932fe136d 100644 --- a/input/regression/note-head-chord.ly +++ b/input/regression/note-head-chord.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Note heads are flipped on the stem to prevent collisions. diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly index 10a4707c2c..c68b8046a0 100644 --- a/input/regression/note-head-style.ly +++ b/input/regression/note-head-style.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" Note head shapes are settable. The stem endings should be adjusted @@ -17,12 +17,12 @@ either up or down stems. \property Staff.NoteHead \set #'style = #'default < - \context Voice = up { + \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'default" } e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa } - \context Voice = down { + \new Voice { \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } @@ -31,12 +31,12 @@ either up or down stems. \property Staff.NoteHead \set #'style = #'baroque < - \context Voice = up { + \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'baroque" } e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa } - \context Voice = down { + \new Voice { \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } @@ -45,12 +45,12 @@ either up or down stems. \property Staff.NoteHead \set #'style = #'neo_mensural < - \context Voice = up { + \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'neo\_mensural" } e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa } - \context Voice = down { + \new Voice { \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } @@ -59,12 +59,12 @@ either up or down stems. \property Staff.NoteHead \set #'style = #'mensural < - \context Voice = up { + \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'mensural" } e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa } - \context Voice = down { + \new Voice { \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } @@ -73,12 +73,12 @@ either up or down stems. \property Staff.NoteHead \set #'style = #'harmonic < - \context Voice = up { + \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'harmonic" } e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa } - \context Voice = down { + \new Voice { \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } @@ -87,12 +87,12 @@ either up or down stems. \property Staff.NoteHead \set #'style = #'diamond < - \context Voice = up { + \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'diamond" } e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa } - \context Voice = down { + \new Voice { \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } @@ -101,12 +101,12 @@ either up or down stems. \property Staff.NoteHead \set #'style = #'cross < - \context Voice = up { + \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'cross" } e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa } - \context Voice = down { + \new Voice { \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } @@ -115,12 +115,12 @@ either up or down stems. \property Staff.NoteHead \set #'style = #'xcircle < - \context Voice = up { + \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'xcircle" } e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa } - \context Voice = down { + \new Voice { \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } @@ -129,12 +129,12 @@ either up or down stems. \property Staff.NoteHead \set #'style = #'triangle < - \context Voice = up { + \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'triangle" } e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa } - \context Voice = down { + \new Voice { \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } @@ -143,12 +143,12 @@ either up or down stems. \property Staff.NoteHead \set #'style = #'slash < - \context Voice = up { + \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'slash" } e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa } - \context Voice = down { + \new Voice { \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } @@ -157,12 +157,12 @@ either up or down stems. \property Staff.NoteHead \override #'transparent = ##t < - \context Voice = up { + \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'transparent = \#\#t" } e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa } - \context Voice = down { + \new Voice { \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } @@ -170,26 +170,26 @@ either up or down stems. \property Staff.NoteHead \revert #'transparent \break - \context Voice = another < - \context Thread = TA { + \new Voice < + \new Thread { \property Thread.NoteHead \set #'style = #'cross \property Voice.Stem \set #'direction = #1 c'16 } - \context Thread = TB { + \new Thread { \property Thread.NoteHead \set #'style = #'default a16 } - \context Thread = TC { + \new Thread { \property Thread.NoteHead \set #'style = #'mensural d'16 } > \context Voice < - \context Thread = TA { + \new Thread { \property Thread.NoteHead \set #'style = #'cross c'4 c'4 c'4 c'4 } - \context Thread = TB { + \new Thread { \property Thread.NoteHead \set #'style = #'mensural c''4 \stemDown c'' \property Thread.NoteHead \set #'style = #'slash diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly index 0e5a472f91..d771a8c1d1 100644 --- a/input/regression/note-line.ly +++ b/input/regression/note-line.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \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 9e65db846d..0a36c9eba5 100644 --- a/input/regression/number-staff-lines.ly +++ b/input/regression/number-staff-lines.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 7579bc7e3e..6efcf2d4ea 100644 --- a/input/regression/ottava-broken.ly +++ b/input/regression/ottava-broken.ly @@ -8,7 +8,7 @@ line, and the horizontal line doesn't stick out." } -\version "1.9.1" +\version "1.9.2" \paper { raggedright = ##t} diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly index 115ff53295..2d76c44590 100644 --- a/input/regression/ottava.ly +++ b/input/regression/ottava.ly @@ -6,7 +6,7 @@ use of the scheme function @code{set-octavation}. " } -\version "1.9.1" +\version "1.9.2" \paper { raggedright = ##t} diff --git a/input/regression/output-property.ly b/input/regression/output-property.ly index 09af5dbee8..9856e93b28 100644 --- a/input/regression/output-property.ly +++ b/input/regression/output-property.ly @@ -11,7 +11,7 @@ possible to use @code{\override} would shift both texts. } -\version "1.9.1" +\version "1.9.2" #(define (make-text-checker text) (lambda (grob) (equal? text (ly:get-grob-property grob 'text)))) diff --git a/input/regression/pc-mmrest.ly b/input/regression/pc-mmrest.ly index 40c9544e92..d27ac4bfd8 100644 --- a/input/regression/pc-mmrest.ly +++ b/input/regression/pc-mmrest.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc="Multi measure rests of second voice should not disappear." } diff --git a/input/regression/pc-switch-slur.ly b/input/regression/pc-switch-slur.ly index 07ffc54999..817b0d2bd1 100644 --- a/input/regression/pc-switch-slur.ly +++ b/input/regression/pc-switch-slur.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="The partcombiner should not combine two small slurs into a big one." } diff --git a/input/regression/phrasing-slur.ly b/input/regression/phrasing-slur.ly index cb8efa7e6c..65fd41f712 100644 --- a/input/regression/phrasing-slur.ly +++ b/input/regression/phrasing-slur.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc="Slurs play well with phrasing slur." diff --git a/input/regression/prefatory-empty-spacing.ly b/input/regression/prefatory-empty-spacing.ly index 86da70ab06..343687ded6 100644 --- a/input/regression/prefatory-empty-spacing.ly +++ b/input/regression/prefatory-empty-spacing.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly index d34050185c..d0b855b4ee 100644 --- a/input/regression/prefatory-spacing-matter.ly +++ b/input/regression/prefatory-spacing-matter.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Prefatory spacing. diff --git a/input/regression/property-once.ly b/input/regression/property-once.ly index 6c4a66fb39..c9d0dafa0f 100644 --- a/input/regression/property-once.ly +++ b/input/regression/property-once.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Once properties take effect during a single time step only." } diff --git a/input/regression/rehearsal-mark.ly b/input/regression/rehearsal-mark.ly index 433051cfdf..3bb0b6a904 100644 --- a/input/regression/rehearsal-mark.ly +++ b/input/regression/rehearsal-mark.ly @@ -4,7 +4,7 @@ can be incremented automatically or manually. "} -\version "1.9.1" +\version "1.9.2" global = \notes { diff --git a/input/regression/repeat-fold.ly b/input/regression/repeat-fold.ly index fd8108a122..efb10903f9 100644 --- a/input/regression/repeat-fold.ly +++ b/input/regression/repeat-fold.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/repeat-line-break.ly b/input/regression/repeat-line-break.ly index 418c618b7d..9b1ebfb43c 100644 --- a/input/regression/repeat-line-break.ly +++ b/input/regression/repeat-line-break.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/repeat-percent-skipbars.ly b/input/regression/repeat-percent-skipbars.ly index 530020e1b4..195f838196 100644 --- a/input/regression/repeat-percent-skipbars.ly +++ b/input/regression/repeat-percent-skipbars.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/repeat-percent.ly b/input/regression/repeat-percent.ly index 79e31a2c1e..68622b2d93 100644 --- a/input/regression/repeat-percent.ly +++ b/input/regression/repeat-percent.ly @@ -1,5 +1,4 @@ -#(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Measure repeats are supported, and may be nested with beat repeats." } diff --git a/input/regression/repeat-slash.ly b/input/regression/repeat-slash.ly index a0ac87b6a3..29cd829839 100644 --- a/input/regression/repeat-slash.ly +++ b/input/regression/repeat-slash.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Beat repeats are supported." } diff --git a/input/regression/repeat-unfold-all.ly b/input/regression/repeat-unfold-all.ly index ba9e5fc2e5..afaaff46df 100644 --- a/input/regression/repeat-unfold-all.ly +++ b/input/regression/repeat-unfold-all.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Repeats may be unfolded through the Scheme function @code{unfold-repeats}." diff --git a/input/regression/repeat-unfold.ly b/input/regression/repeat-unfold.ly index 927a8d4f9d..88ed06eb24 100644 --- a/input/regression/repeat-unfold.ly +++ b/input/regression/repeat-unfold.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly index 6213acb8b6..3429477e9c 100644 --- a/input/regression/repeat-volta-skip-alternatives.ly +++ b/input/regression/repeat-volta-skip-alternatives.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "When too few alternatives are present, the first alternative is repeated, by printing a range for the 1st repeat." diff --git a/input/regression/repeat-volta.ly b/input/regression/repeat-volta.ly index 7553e72bc0..1080d08c10 100644 --- a/input/regression/repeat-volta.ly +++ b/input/regression/repeat-volta.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/rest-collision-default.ly b/input/regression/rest-collision-default.ly index bfffe17221..e258b91037 100644 --- a/input/regression/rest-collision-default.ly +++ b/input/regression/rest-collision-default.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { @@ -13,8 +13,8 @@ texidoc = "Rests in collisions sit opposite of the note if no direction is \score{\notes\relative c'' \context Staff < \time 2/4 -\context Voice=upper { +\new Voice { r4 } -\context Voice=lower {\voiceTwo +\new Voice {\voiceTwo b8 }>} diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly index dee2a14229..547f87273a 100644 --- a/input/regression/rest-collision.ly +++ b/input/regression/rest-collision.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" Rests should not collide with beams, stems and noteheads. Rests may @@ -17,30 +17,29 @@ scale = \notes \relative c' { rests = \notes { r r r r r r r r r r r r r r r r } -different = < \context Voice = one { - \stemUp +different = < { \notes \relative c'' { r8 a e4 a e } - } - \context Voice = two { - \stemDown + }\\ { + \notes \relative c'' { r1 }} > scales = \context Staff \notes < - \context Voice=i { \stemUp r1 r2 r2 \scale c''1 c'2 a'2 \rests } - \context Voice = ii { \stemDown a'1 a'2 d'2 \rests r1 r2 r2 \scale } + { r1 r2 r2 \scale c''1 c'2 a'2 \rests } + \\ + { a'1 a'2 d'2 \rests r1 r2 r2 \scale } > restsII = \context Staff \notes { r4 r8 - \context Staff < { \stemUp r8 } { \stemDown r8} > - \context Staff < {\stemUp r8} r8 { \stemDown r8} > - \context Staff < {\stemUp r8} r8 r8 { \stemDown r8} > - \context Staff < {\stemUp r} { \stemDown r} > - \context Staff < {\stemUp r} r { \stemDown r} > + \context Staff < { r8 } \\{ r8} > + \context Staff < { r8} r8 \\{ r8} > + \context Staff < { r8} r8 r8 \\ { r8} > + \context Staff < { r} \\ { r} > + \context Staff < { r} r\\ { \stemDown r} > \stemUp \transpose c c' { c''8[ r8 c''8 c''8] c8[ r8 c8 c8] diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly index 33e8c42790..7bbd55042d 100644 --- a/input/regression/rest-ledger.ly +++ b/input/regression/rest-ledger.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \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 ca4e0f9066..5434a169e4 100644 --- a/input/regression/rest-pitch.ly +++ b/input/regression/rest-pitch.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Rests can have pitches--these will be affected by diff --git a/input/regression/rest.ly b/input/regression/rest.ly index bffc140f43..f9152bf287 100644 --- a/input/regression/rest.ly +++ b/input/regression/rest.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/rhythmic-staff.ly b/input/regression/rhythmic-staff.ly index 00c393c164..f0093ab1ae 100644 --- a/input/regression/rhythmic-staff.ly +++ b/input/regression/rhythmic-staff.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly index 8e610517f2..7fa6fc0757 100644 --- a/input/regression/script-collision.ly +++ b/input/regression/script-collision.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { @@ -11,8 +11,8 @@ \notes \relative c'' { c4 <>\marcato - < \context Voice = VA { \voiceOne c4^^ } - \context Voice = VB { \voiceTwo d4_^} > + < { c4^^ }\\ + { d4_^ } > } \paper { raggedright = ##t} } diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly index fc07e70542..381aae9d69 100644 --- a/input/regression/script-stack-order.ly +++ b/input/regression/script-stack-order.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 6a86a5d250..39ee607536 100644 --- a/input/regression/script-stacked.ly +++ b/input/regression/script-stacked.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \paper { raggedright= ##t } diff --git a/input/regression/size11.ly b/input/regression/size11.ly index 5ef46e5722..91f639d45b 100644 --- a/input/regression/size11.ly +++ b/input/regression/size11.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/size13.ly b/input/regression/size13.ly index d7ec3ba764..fdc05de2d1 100644 --- a/input/regression/size13.ly +++ b/input/regression/size13.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" foollilypondbook = " \score " diff --git a/input/regression/size16.ly b/input/regression/size16.ly index c8c1a3860c..dc2bcd946e 100644 --- a/input/regression/size16.ly +++ b/input/regression/size16.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" foollilypondbook = " \score " diff --git a/input/regression/size20.ly b/input/regression/size20.ly index cd05cac59c..9e072743ff 100644 --- a/input/regression/size20.ly +++ b/input/regression/size20.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" foollilypondbook = " \score " diff --git a/input/regression/size23.ly b/input/regression/size23.ly index 4202eb3b9b..570952a8bb 100644 --- a/input/regression/size23.ly +++ b/input/regression/size23.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" foollilypondbook = " \score " diff --git a/input/regression/size26.ly b/input/regression/size26.ly index 166499a7c6..22277fbb2b 100644 --- a/input/regression/size26.ly +++ b/input/regression/size26.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" foollilypondbook = " \score " diff --git a/input/regression/slur-area.ly b/input/regression/slur-area.ly index 4e9d44996b..b6f370f2b9 100644 --- a/input/regression/slur-area.ly +++ b/input/regression/slur-area.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "The area underneath an (up) slur is minimised to improve the shape. " diff --git a/input/regression/slur-attachment.ly b/input/regression/slur-attachment.ly index 3c8d4cb0c2..db268a1381 100644 --- a/input/regression/slur-attachment.ly +++ b/input/regression/slur-attachment.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly index f766f66995..5a0bc2f123 100644 --- a/input/regression/slur-broken-trend.ly +++ b/input/regression/slur-broken-trend.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly index 381042035a..08bf3089c3 100644 --- a/input/regression/slur-cross-staff.ly +++ b/input/regression/slur-cross-staff.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" The same goes for slurs. They behave decently when broken across diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly index f34a1381b5..d022acc9c5 100644 --- a/input/regression/slur-dots.ly +++ b/input/regression/slur-dots.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="Slurs should not get confused by augmentation dots. We use a lot of dots here, to make problems more visible." diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly index 8e031c2a54..fb59f1fa65 100644 --- a/input/regression/slur-nice.ly +++ b/input/regression/slur-nice.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 273fcd0d99..0aba0c09a4 100644 --- a/input/regression/slur-rest.ly +++ b/input/regression/slur-rest.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc ="Slurs may be placed over rest. The slur will avoid colliding with diff --git a/input/regression/slur-staccato.ly b/input/regression/slur-staccato.ly index f9adf1e3ea..057e43acb7 100644 --- a/input/regression/slur-staccato.ly +++ b/input/regression/slur-staccato.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc="Manual hack for slur and staccato." } diff --git a/input/regression/slur-stem-broken.ly b/input/regression/slur-stem-broken.ly index d4371b9e6c..5437cbbfe4 100644 --- a/input/regression/slur-stem-broken.ly +++ b/input/regression/slur-stem-broken.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc="Trend of broken slur with user-overridden stem attachment should also follow the same vertical direction it would have had in unbroken state." diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly index d76e9328dd..3afd90e34b 100644 --- a/input/regression/slur-symmetry-1.ly +++ b/input/regression/slur-symmetry-1.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Symmetric figures should lead to symmetric slurs." @@ -11,7 +11,7 @@ \context Staff{ f8(f f f) f(g g f) f(a a f) f(b b f) } - \context Staff=x{ + \new Staff{ e,(e e e) e(d d e) e(c c e) e(b b e) } > diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly index 809856ad6c..9e1f32f63b 100644 --- a/input/regression/slur-symmetry.ly +++ b/input/regression/slur-symmetry.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Symmetric figures should lead to symmetric slurs." @@ -12,7 +12,7 @@ \context Staff{ e8(e e) e(d e) e(c e) e(b e) } - \context Staff=x{ + \new Staff{ f'8(f f) f(g f) f(a f) f(b f) } > diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly index 7a96778aae..92be39ede7 100644 --- a/input/regression/spacing-accidental-staffs.ly +++ b/input/regression/spacing-accidental-staffs.ly @@ -1,12 +1,12 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Accidentals in different staffs don't effect the spacing of the quarter notes here." } -\score { \notes \relative c'' < \context Staff = SA { \time 4/4 +\score { \notes \relative c'' < \new Staff { \time 4/4 c8[ c8 cis8 cis8] cis8[ cis8 cis8 cis] diff --git a/input/regression/spacing-accidental-stretch.ly b/input/regression/spacing-accidental-stretch.ly index a2ba1b4004..e03adc8c80 100644 --- a/input/regression/spacing-accidental-stretch.ly +++ b/input/regression/spacing-accidental-stretch.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Accidentals don't influence the amount of stretchable space. " diff --git a/input/regression/spacing-accidental.ly b/input/regression/spacing-accidental.ly index 31b8c8ca57..5787cda3c1 100644 --- a/input/regression/spacing-accidental.ly +++ b/input/regression/spacing-accidental.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 ef3baa355a..a19962f05d 100644 --- a/input/regression/spacing-bar-stem.ly +++ b/input/regression/spacing-bar-stem.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 b0f7d1f8e9..8b58bd857f 100644 --- a/input/regression/spacing-clef-first-note.ly +++ b/input/regression/spacing-clef-first-note.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Clef changes at the start of a line get much more space @@ -7,12 +7,12 @@ than clef changes halfway the line." } \score {\notes { - < \context Staff = SA { + < \new Staff { c'2 \clef bass e16 f a \clef treble b } - \context Staff = SB { + \new Staff { c'4 c'4 c'4 }> } diff --git a/input/regression/spacing-end-of-line.ly b/input/regression/spacing-end-of-line.ly index 2792903862..e2fc3efefa 100644 --- a/input/regression/spacing-end-of-line.ly +++ b/input/regression/spacing-end-of-line.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc ="Broken matter at the end of line does not upset the diff --git a/input/regression/spacing-ended-voice.ly b/input/regression/spacing-ended-voice.ly index eda8b19ba7..b6ef294d32 100644 --- a/input/regression/spacing-ended-voice.ly +++ b/input/regression/spacing-ended-voice.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \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 b0b8e180a1..0c6c2914db 100644 --- a/input/regression/spacing-folded-clef.ly +++ b/input/regression/spacing-folded-clef.ly @@ -1,13 +1,13 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "A clef can be folded below notes in a different staff, if this doesn't disrupt the flow of the notes." } \score { \notes \relative c'' < -\context Staff = SA { c4 c16[ c c c] c4 c4 } - \context Staff = SB { \clef bass c,2 \clef treble c'2 } +\new Staff { c4 c16[ c c c] c4 c4 } + \new Staff { \clef bass c,2 \clef treble c'2 } > \paper { raggedright = ##t} diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly index 3b38c9826e..64ed940d53 100644 --- a/input/regression/spacing-folded-clef2.ly +++ b/input/regression/spacing-folded-clef2.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "A clef can be folded below notes in a different staff, if @@ -8,8 +8,8 @@ show where columns are in the score." } \score { \notes \relative c'' < - \context Staff = SA { c4 c4 c4 \bar "|." } - \context Staff = SB { \clef bass c,2 \clef treble c'2 } + \new Staff { c4 c4 c4 \bar "|." } + \new Staff { \clef bass c,2 \clef treble c'2 } > \paper { raggedright = ##t diff --git a/input/regression/spacing-grace-duration.ly b/input/regression/spacing-grace-duration.ly index 14cdd1c73a..163dea5fbf 100644 --- a/input/regression/spacing-grace-duration.ly +++ b/input/regression/spacing-grace-duration.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 9d818e2474..35c20cbf5f 100644 --- a/input/regression/spacing-grace.ly +++ b/input/regression/spacing-grace.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Grace note spacing. Should be tuned? " } diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly index d64179de5b..4faef8c681 100644 --- a/input/regression/spacing-knee.ly +++ b/input/regression/spacing-knee.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \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 fa484ad014..e43609066a 100644 --- a/input/regression/spacing-multi-tuplet.ly +++ b/input/regression/spacing-multi-tuplet.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ texidoc = "Concurrent tuplets should be spaced equidistantly on all staffs. @@ -12,11 +12,11 @@ is. For non-raggedright, it still shows a bug: uneven spacing. multipart = \notes \relative c'{ \context StaffGroup < - \context Staff = ten \context Voice { + \new Staff \context Voice { \times 2/10 { c8[ c c c c c c c c c] } \times 2/10 { c[ c c c c c c c c c] } } - \context Staff = eleven \context Voice { + \new Staff \context Voice { \times 2/11 { c8[ c c c c c c c c c c] } \times 2/11 { c[ c c c c c c c c c c] } } diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly index aea164dd23..6bcafd02c8 100644 --- a/input/regression/spacing-note-flags.ly +++ b/input/regression/spacing-note-flags.ly @@ -17,5 +17,5 @@ raggedright = ##t } } -\version "1.9.1" +\version "1.9.2" diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly index 89a2a51e94..f18c3652ca 100644 --- a/input/regression/spacing-rest.ly +++ b/input/regression/spacing-rest.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Rests get a little less space, since they are narrower. However, the feta quarter rest is relatively wide, causing this effect to be diff --git a/input/regression/spacing-short-notes.ly b/input/regression/spacing-short-notes.ly index 1617634fcc..98cab3b876 100644 --- a/input/regression/spacing-short-notes.ly +++ b/input/regression/spacing-short-notes.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 08ce39215f..ccca587a57 100644 --- a/input/regression/spacing-stem-bar.ly +++ b/input/regression/spacing-stem-bar.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \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 74c325f053..b534410859 100644 --- a/input/regression/spacing-stem-direction.ly +++ b/input/regression/spacing-stem-direction.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly index f8a43b8a7b..09f200b052 100644 --- a/input/regression/spacing-stem-same-direction.ly +++ b/input/regression/spacing-stem-same-direction.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "For juxtaposed chords with the same direction, a slight optical correction is used. It is constant, and only works if diff --git a/input/regression/spacing-to-grace.ly b/input/regression/spacing-to-grace.ly index 5096c66188..af0b19adef 100644 --- a/input/regression/spacing-to-grace.ly +++ b/input/regression/spacing-to-grace.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc ="Space from a normal note/barline to a grace note is diff --git a/input/regression/spacing-very-tight.ly b/input/regression/spacing-very-tight.ly index a27de21a08..cc0f53691d 100644 --- a/input/regression/spacing-very-tight.ly +++ b/input/regression/spacing-very-tight.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = " When tightly spaced, hinterfleisch -> 0. diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly index 6113f072e6..2e5e5b9624 100644 --- a/input/regression/span-bar.ly +++ b/input/regression/span-bar.ly @@ -1,18 +1,18 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Span bars draw only in between staff bar lines, so setting those to transparent shows bar lines between systems only. " } \score { - \notes \relative c' \context StaffGroup = groupie < - \context Staff = SB { a1 a1 a1} - \context Lyrics = LB \lyrics < + \notes \relative c' \new StaffGroup < + \new Staff { a1 a1 a1} + \new Lyrics \lyrics < { bla1 die bla } { foo bar foo } > - \context Staff = SC { f1 f1 f1} + \new Staff { f1 f1 f1} > \paper { \translator { diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly index c002699ccc..8f9f2729f6 100644 --- a/input/regression/staccato-pos.ly +++ b/input/regression/staccato-pos.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/staff-tweak.ly b/input/regression/staff-tweak.ly index 2819006b16..35e32f94d1 100644 --- a/input/regression/staff-tweak.ly +++ b/input/regression/staff-tweak.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "The staff is a grob, and may be adjusted as well: this one shows a staff with 6 thick line, and a slightly large staffspace. diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly index 74dfa050c6..6d59d63988 100644 --- a/input/regression/stanza-number.ly +++ b/input/regression/stanza-number.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Stanza numbers may differ for the first and following systems." } diff --git a/input/regression/stem-direction.ly b/input/regression/stem-direction.ly index 71feb75d91..7cc95b5933 100644 --- a/input/regression/stem-direction.ly +++ b/input/regression/stem-direction.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/stem-shorten.ly b/input/regression/stem-shorten.ly index cf1c965d7a..9b7f5983fb 100644 --- a/input/regression/stem-shorten.ly +++ b/input/regression/stem-shorten.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/regression/stem-spacing.ly b/input/regression/stem-spacing.ly index 54eb1d8ac4..685864eb1b 100644 --- a/input/regression/stem-spacing.ly +++ b/input/regression/stem-spacing.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly index 7b0495bc1c..ea680aa2f6 100644 --- a/input/regression/stem-tremolo.ly +++ b/input/regression/stem-tremolo.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" Stem tremolos or rolls are tremolo signs that look like beam segments diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly index b6a9e14a85..0320505a47 100644 --- a/input/regression/system-extents.ly +++ b/input/regression/system-extents.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "LilyPond correctly determines the size of every diff --git a/input/regression/system-start-bracket.ly b/input/regression/system-start-bracket.ly index 6129aab7b1..0c25d53151 100644 --- a/input/regression/system-start-bracket.ly +++ b/input/regression/system-start-bracket.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = " diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly index ad0b4bf9fa..43cab57f87 100644 --- a/input/regression/text-spanner.ly +++ b/input/regression/text-spanner.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc= "Text spanners should not repeat start text when broken." } diff --git a/input/regression/tie-accidental.ly b/input/regression/tie-accidental.ly index 345830ddba..0f2fa42e5b 100644 --- a/input/regression/tie-accidental.ly +++ b/input/regression/tie-accidental.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/tie-break-accidental.ly b/input/regression/tie-break-accidental.ly index 8a842019ed..9b8c215156 100644 --- a/input/regression/tie-break-accidental.ly +++ b/input/regression/tie-break-accidental.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "First and second bes (tied across line break) diff --git a/input/regression/tie-busy-grobs.ly b/input/regression/tie-busy-grobs.ly index 22e28934be..c19149ad6f 100644 --- a/input/regression/tie-busy-grobs.ly +++ b/input/regression/tie-busy-grobs.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Tie engraver uses @code{busyGrobs} to keep track of @@ -11,9 +11,11 @@ note heads. Test if this queue works by throwing many mixed tuplets at it." { \notes \context Staff \relative c'' < - \context Voice { \voiceOne \times 2/3 { c'8~ c8~ c8~ c8~ c8~ c8 } } - \context Voice= VII { \voiceThree { b,8 ~ b8 ~ b8 ~ b8 }} - \context Voice = VIII { \voiceTwo \times 2/5 { a,4 ~a4 ~a4~ a4~ a4 }} + { \times 2/3 { c'8~ c8~ c8~ c8~ c8~ c8 } } + \\ + { \voiceTwo \times 2/5 { a,4 ~a4 ~a4~ a4~ a4 }} + \\ + { \voiceThree { b,8 ~ b8 ~ b8 ~ b8 }} > } diff --git a/input/regression/tie-chord-partial.ly b/input/regression/tie-chord-partial.ly index 121b070c56..e1a2a0ed93 100644 --- a/input/regression/tie-chord-partial.ly +++ b/input/regression/tie-chord-partial.ly @@ -6,13 +6,13 @@ putting the Tie engraver at Thread level, and redirecting untied notes to a different thread." } -\version "1.9.1" +\version "1.9.2" \paper { raggedright= ##t } \score { \notes \context Thread \relative c' { - < c~ e \context Thread = "untied" c' > + < c~ e \new Thread c' > < c e c' > } diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly index 09d02afb28..b2ed3936c4 100644 --- a/input/regression/tie-chord.ly +++ b/input/regression/tie-chord.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" When tieing chords, the outer slurs point outwards, the inner slurs diff --git a/input/regression/tie-dots.ly b/input/regression/tie-dots.ly index e00955d147..34f1000260 100644 --- a/input/regression/tie-dots.ly +++ b/input/regression/tie-dots.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Ties should not collide with dots." } diff --git a/input/regression/tie-grace.ly b/input/regression/tie-grace.ly index 51bb1da1c1..920520441e 100644 --- a/input/regression/tie-grace.ly +++ b/input/regression/tie-grace.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Tieing a grace to the to a following grace or main note works." } diff --git a/input/regression/tie.ly b/input/regression/tie.ly index 442ddef34e..9250ecc957 100644 --- a/input/regression/tie.ly +++ b/input/regression/tie.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly index 7160cb8fc9..023212a235 100644 --- a/input/regression/tuplet-beam.ly +++ b/input/regression/tuplet-beam.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "In combination with a beam, the bracket of the tuplet diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly index a467a3f30a..4b14578830 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc="Manual hack for nested tuplets, move outer tuplet up." } diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly index ffacce4812..8b22aaed22 100644 --- a/input/regression/tuplet-properties.ly +++ b/input/regression/tuplet-properties.ly @@ -6,7 +6,7 @@ NB should have no bracket, B should have bracket. } -\version "1.9.1" +\version "1.9.2" \score { diff --git a/input/regression/tuplet-rest.ly b/input/regression/tuplet-rest.ly index e292a2011a..f1d6d30407 100644 --- a/input/regression/tuplet-rest.ly +++ b/input/regression/tuplet-rest.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header {texidoc = "Tests tuplet rests. "} \score { diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly index 5ff8649723..e657b65c60 100644 --- a/input/regression/tuplet-staffline-collision.ly +++ b/input/regression/tuplet-staffline-collision.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Horizontal tuplet brackets are shifted vertically diff --git a/input/regression/tuplets.ly b/input/regression/tuplets.ly index 31c4ba05ee..ae6a979f07 100644 --- a/input/regression/tuplets.ly +++ b/input/regression/tuplets.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/regression/voice-follower.ly b/input/regression/voice-follower.ly index 498d75b129..64d19ec2c6 100644 --- a/input/regression/voice-follower.ly +++ b/input/regression/voice-follower.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc= " @@ -18,7 +18,7 @@ can be printed automatically. This is enabled if the property \translator Staff=two b2 a } - \context Staff=two {\clef bass \skip 1*2 } + \new Staff {\clef bass \skip 1*2 } >\paper{ linewidth =-1. }} diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly index 30e3b1508c..0813a8969f 100644 --- a/input/regression/volta-broken-left-edge.ly +++ b/input/regression/volta-broken-left-edge.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc ="Broken volta spanners behave correctly at left edge in all cases." @@ -108,7 +108,7 @@ f f\break \notes < - \context Staff="4" + \new Staff { \voiceB \voiceC diff --git a/input/regression/volta-multi-staff.ly b/input/regression/volta-multi-staff.ly index ab9ca031f6..4603334a4f 100644 --- a/input/regression/volta-multi-staff.ly +++ b/input/regression/volta-multi-staff.ly @@ -4,7 +4,7 @@ texidoc = "By setting @code{voltaOnThisStaff}, repeats can be put on more staffs in a score." } -\version "1.9.1" +\version "1.9.2" vmus = \notes { \repeat volta 2 c1 \alternative { d e } } @@ -12,15 +12,15 @@ vmus = \notes { \repeat volta 2 c1 \alternative { d e } } \score { \notes \relative c'' < - \context StaffGroup = SGA < + \new StaffGroup < \context Staff \vmus - \context Staff = SB \vmus + \new Staff \vmus > - \context StaffGroup = SGB < - \context Staff =SC < + \new StaffGroup < + \new Staff < \property Staff.voltaOnThisStaff = ##t \vmus > - \context Staff = SD \vmus + \new Staff \vmus > > diff --git a/input/template/gregorian-transcription.ly b/input/template/gregorian-transcription.ly index ab168d71b2..f46456f84d 100644 --- a/input/template/gregorian-transcription.ly +++ b/input/template/gregorian-transcription.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/template/header.ly b/input/template/header.ly index 0cf128854b..6b30d190ba 100644 --- a/input/template/header.ly +++ b/input/template/header.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { dedication = "dedication" title = "Title" diff --git a/input/template/jazz-combo.ly b/input/template/jazz-combo.ly index 2e1539de9e..9c7cd150ca 100644 --- a/input/template/jazz-combo.ly +++ b/input/template/jazz-combo.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { title = "Song" subtitle = "(tune)" diff --git a/input/template/melody-chords.ly b/input/template/melody-chords.ly index d77223c069..70991f0b3d 100644 --- a/input/template/melody-chords.ly +++ b/input/template/melody-chords.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Lead sheet format: chords with melody." diff --git a/input/template/melody-lyrics-chords.ly b/input/template/melody-lyrics-chords.ly index edd75e836f..684fcf1f11 100644 --- a/input/template/melody-lyrics-chords.ly +++ b/input/template/melody-lyrics-chords.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Popsong format: chords, melody and lyrics." diff --git a/input/template/melody-lyrics.ly b/input/template/melody-lyrics.ly index bc2f9fe0d0..033e2d7c6c 100644 --- a/input/template/melody-lyrics.ly +++ b/input/template/melody-lyrics.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Melody and lyrics." diff --git a/input/template/melody.ly b/input/template/melody.ly index b54d35f071..a4e658e3f0 100644 --- a/input/template/melody.ly +++ b/input/template/melody.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Only a melody." diff --git a/input/template/piano-4-voices.ly b/input/template/piano-4-voices.ly index 42758a7765..d2f539b22c 100644 --- a/input/template/piano-4-voices.ly +++ b/input/template/piano-4-voices.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc ="Polyphonic piano music" diff --git a/input/template/piano-dynamics.ly b/input/template/piano-dynamics.ly index dddca044da..6bfb2241f8 100644 --- a/input/template/piano-dynamics.ly +++ b/input/template/piano-dynamics.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc =" Template that puts dynamics on a separate line, so it is neatly diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly index 6e305fa984..f6d655e060 100644 --- a/input/template/piano-lyrics.ly +++ b/input/template/piano-lyrics.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc ="Lyrics between two staffs." diff --git a/input/template/piano-melody-lyrics.ly b/input/template/piano-melody-lyrics.ly index 226c7ee4cb..3c3c1ee81f 100644 --- a/input/template/piano-melody-lyrics.ly +++ b/input/template/piano-melody-lyrics.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc ="Classical song format: one staff with melody and lyrics, diff --git a/input/template/piano.ly b/input/template/piano.ly index 25f5af60a4..16935ad15a 100644 --- a/input/template/piano.ly +++ b/input/template/piano.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Simple piano music." diff --git a/input/template/satb.ly b/input/template/satb.ly index 3bf862fdd3..76f1583435 100644 --- a/input/template/satb.ly +++ b/input/template/satb.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = " diff --git a/input/test/+.ly b/input/test/+.ly index f765104c3e..127c284721 100644 --- a/input/test/+.ly +++ b/input/test/+.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" %% +.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/test/ac-extra-voice.ly b/input/test/ac-extra-voice.ly index 81f5c450c5..d241cf692b 100644 --- a/input/test/ac-extra-voice.ly +++ b/input/test/ac-extra-voice.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" %% I don't know what this example is supposed to do. delete it? %% It shows how to use the autochange feature together with an extra diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly index c42f94a63b..8392fcf2a9 100644 --- a/input/test/add-staccato.ly +++ b/input/test/add-staccato.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly index d1f6c661f3..9da7b4816c 100644 --- a/input/test/add-text-script.ly +++ b/input/test/add-text-script.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc= "@cindex make-music Fingering diff --git a/input/test/ancient-accidentals.ly b/input/test/ancient-accidentals.ly index fb98e13d53..fc833d9e0f 100644 --- a/input/test/ancient-accidentals.ly +++ b/input/test/ancient-accidentals.ly @@ -6,7 +6,7 @@ file lists all of them. " } -\version "1.9.1" +\version "1.9.2" \score { \context Voice \notes\relative c { diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index 4a60a41505..37f753b81d 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" % TODO: split ancient-font into seperate files; possibly in % different locations. \header { diff --git a/input/test/ancient-time.ly b/input/test/ancient-time.ly index 3fc64c5a61..a805f9ac75 100644 --- a/input/test/ancient-time.ly +++ b/input/test/ancient-time.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" % TODO: move stuff from ancient-font into here? See comment % for ancient-font.ly \header { diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly index 6ac300e4c4..98297007ec 100644 --- a/input/test/bagpipe.ly +++ b/input/test/bagpipe.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Bagpipe Music diff --git a/input/test/bar-always.ly b/input/test/bar-always.ly index 1c321467a3..4e0c64aacd 100644 --- a/input/test/bar-always.ly +++ b/input/test/bar-always.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Bars Always diff --git a/input/test/bar-lines-lyric-only.ly b/input/test/bar-lines-lyric-only.ly index aae8810043..d1de8adf3b 100644 --- a/input/test/bar-lines-lyric-only.ly +++ b/input/test/bar-lines-lyric-only.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Bar line lyric only You can move around @code{Bar_engraver} and @code{Span_bar_engraver} if you want bar lines on lyrics. " diff --git a/input/test/bar-lines.ly b/input/test/bar-lines.ly index 3a164bab30..4a8d88af7b 100644 --- a/input/test/bar-lines.ly +++ b/input/test/bar-lines.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Bar Lines Different types of bar lines demonstrated. diff --git a/input/test/bar-number-every-five-reset.ly b/input/test/bar-number-every-five-reset.ly index 9c42183433..ceb8321489 100644 --- a/input/test/bar-number-every-five-reset.ly +++ b/input/test/bar-number-every-five-reset.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Bar Number Every Fifth Reset diff --git a/input/test/bar-number-regular-interval.ly b/input/test/bar-number-regular-interval.ly index 2297cd773a..6b147df799 100644 --- a/input/test/bar-number-regular-interval.ly +++ b/input/test/bar-number-regular-interval.ly @@ -5,7 +5,7 @@ Bar numbers can also be printed at regular intervals. " } -\version "1.9.1" +\version "1.9.2" \score { \context Staff \notes \transpose c c' { diff --git a/input/test/bar-number-show-all.ly b/input/test/bar-number-show-all.ly index 65ef473ee7..55cad8d90f 100644 --- a/input/test/bar-number-show-all.ly +++ b/input/test/bar-number-show-all.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="@cindex Bar Number Show All Second line has bar numbers on start of every measure. diff --git a/input/test/beam-auto-4-8.ly b/input/test/beam-auto-4-8.ly index a90532f427..b55fccd4a2 100644 --- a/input/test/beam-auto-4-8.ly +++ b/input/test/beam-auto-4-8.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % keep for now, although merging into beam-auto-override is a possibility. \header { texidoc = "@cindex Auto Beaming 4/8 diff --git a/input/test/beam-auto-override.ly b/input/test/beam-auto-override.ly index f007c793a7..8a106d4bba 100644 --- a/input/test/beam-auto-override.ly +++ b/input/test/beam-auto-override.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Auto Beaming Override diff --git a/input/test/beam-auto.ly b/input/test/beam-auto.ly index 47c68d1346..ada307468c 100644 --- a/input/test/beam-auto.ly +++ b/input/test/beam-auto.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc = "@cindex Beaming Presets The auto-beam engraver has presets for common time signatures. " } diff --git a/input/test/beam-control.ly b/input/test/beam-control.ly index 827c540fb1..25231bd06f 100644 --- a/input/test/beam-control.ly +++ b/input/test/beam-control.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="@cindex Beam Position Control diff --git a/input/test/beam-count.ly b/input/test/beam-count.ly index 16364f953b..659a0abf00 100644 --- a/input/test/beam-count.ly +++ b/input/test/beam-count.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="@cindex Beam Count diff --git a/input/test/beam-dir-functions.ly b/input/test/beam-dir-functions.ly index dac6ac949d..f68a93e4fe 100644 --- a/input/test/beam-dir-functions.ly +++ b/input/test/beam-dir-functions.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Beam Dir Functions diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index 563663d7cd..89b7550232 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="@cindex Beam Isknee LilyPond can beam across a Piano Staff. diff --git a/input/test/beam-neutral-direction.ly b/input/test/beam-neutral-direction.ly index 507beb6353..a2b185ad59 100644 --- a/input/test/beam-neutral-direction.ly +++ b/input/test/beam-neutral-direction.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="@cindex Beam Neutral Direction When a beam falls in the middle of the staff, LilyPond normally diff --git a/input/test/beam-rest.ly b/input/test/beam-rest.ly index 2240d5a619..a3ccd14b12 100644 --- a/input/test/beam-rest.ly +++ b/input/test/beam-rest.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="@cindex Beam Over Rests diff --git a/input/test/blank-notes.ly b/input/test/blank-notes.ly index 0798c806be..4d376b5b16 100644 --- a/input/test/blank-notes.ly +++ b/input/test/blank-notes.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % possible rename to invis-notes.ly % check if other documents call this "blank notes", though. I think % invisible notes sounds better, but whatever it is, it should be diff --git a/input/test/blank-paper-tab.ly b/input/test/blank-paper-tab.ly index c60f4cc008..933e3e704c 100644 --- a/input/test/blank-paper-tab.ly +++ b/input/test/blank-paper-tab.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Blank Paper Tab diff --git a/input/test/blank-paper.ly b/input/test/blank-paper.ly index 1794212727..aa76576e87 100644 --- a/input/test/blank-paper.ly +++ b/input/test/blank-paper.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc="@cindex Blank Paper diff --git a/input/test/boxed-molecule.ly b/input/test/boxed-molecule.ly index f7a243b495..9f04fb92e1 100644 --- a/input/test/boxed-molecule.ly +++ b/input/test/boxed-molecule.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Boxed Molecule You can override the molecule callback to draw a box around diff --git a/input/test/caps.ly b/input/test/caps.ly index d9acee507e..22f9dd103f 100644 --- a/input/test/caps.ly +++ b/input/test/caps.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Capital Letters You can set the font to use small caps. diff --git a/input/test/cautionaries.ly b/input/test/cautionaries.ly index 6017bc52d8..36991ec8dd 100644 --- a/input/test/cautionaries.ly +++ b/input/test/cautionaries.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="@cindex Cautionary Accidentals LilyPond can display cautionary accidentals in different ways. diff --git a/input/test/chord-names-german.ly b/input/test/chord-names-german.ly index 34d009647c..9dac83696a 100644 --- a/input/test/chord-names-german.ly +++ b/input/test/chord-names-german.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Chord Names German By setting @code{ChordNames.chordRootNamer}, the root diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly index e244072e7f..e8c1060ad1 100644 --- a/input/test/chord-names-jazz.ly +++ b/input/test/chord-names-jazz.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { diff --git a/input/test/chord-names-no-inversions.ly b/input/test/chord-names-no-inversions.ly index bdbc9d0823..7ac4c6a690 100644 --- a/input/test/chord-names-no-inversions.ly +++ b/input/test/chord-names-no-inversions.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc= "@cindex Chord Names No Inversions Chord names don't attempt to find inversions and bass notes. " } diff --git a/input/test/chords-without-melody.ly b/input/test/chords-without-melody.ly index 474c8dd026..163eaaea68 100644 --- a/input/test/chords-without-melody.ly +++ b/input/test/chords-without-melody.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Jazz chords can also be used without notes." } diff --git a/input/test/clef-8-syntax.ly b/input/test/clef-8-syntax.ly index a56b71766b..133ef8c1e7 100644 --- a/input/test/clef-8-syntax.ly +++ b/input/test/clef-8-syntax.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Chord Octavation Appending @code{_8} or @code{^8} to a clef name will diff --git a/input/test/clef-end-of-line.ly b/input/test/clef-end-of-line.ly index aaa45082ab..40e422568d 100644 --- a/input/test/clef-end-of-line.ly +++ b/input/test/clef-end-of-line.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Clef End of Line diff --git a/input/test/clef-manual-control.ly b/input/test/clef-manual-control.ly index 2bc6bd59ad..a0f531138c 100644 --- a/input/test/clef-manual-control.ly +++ b/input/test/clef-manual-control.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc = " @cindex Clef Manual Control diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly index eab0363521..0ddbe06ffc 100644 --- a/input/test/coriolan-margin.ly +++ b/input/test/coriolan-margin.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % Ugh, we need to override some LaTeX titling stuff diff --git a/input/test/count-systems.ly b/input/test/count-systems.ly index e36e589d8f..1e369059c0 100644 --- a/input/test/count-systems.ly +++ b/input/test/count-systems.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="@cindex Count Systems diff --git a/input/test/crescendi.ly b/input/test/crescendi.ly index b91ffa492a..454a62dd8f 100644 --- a/input/test/crescendi.ly +++ b/input/test/crescendi.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="@cindex Crescendi LilyPond can print crescendi in a number of different ways. diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly index 59d94bace1..9bb9909670 100644 --- a/input/test/cue-notes.ly +++ b/input/test/cue-notes.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" % TODO: check to see if this example can be simplified using \small % or \tiny. \header { texidoc = "@cindex Cue Notes diff --git a/input/test/divisiones.ly b/input/test/divisiones.ly index 4efe93c91e..1e05635d1f 100644 --- a/input/test/divisiones.ly +++ b/input/test/divisiones.ly @@ -7,7 +7,7 @@ Choices are @code{divisioMinima}, @code{divisioMaior} @code{caesura}. " } -\version "1.9.1" +\version "1.9.2" \include "gregorian-init.ly" diff --git a/input/test/drarn-slurs.ly b/input/test/drarn-slurs.ly index 928c99e870..6f1b9083a0 100644 --- a/input/test/drarn-slurs.ly +++ b/input/test/drarn-slurs.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % possible rename to slurs-? % TODO: find out what drarn means, and if there's an overlap with drarn.ly \header{ diff --git a/input/test/drarn.ly b/input/test/drarn.ly index 3569f3b771..4c37d561f7 100644 --- a/input/test/drarn.ly +++ b/input/test/drarn.ly @@ -1,20 +1,21 @@ -\version "1.9.1" +\version "1.9.2" \header{texidoc="@cindex Drarn You can attach slurs and ties to noteheads. " } \score { \context Staff \notes < - \time 3/8 - \context Voice=one \relative c'' { + + \relative c'' { +\time 3/8 \property Voice.Stem \set #'direction = #1 \property Voice.Tie \set #'direction = #1 \property Voice.Slur \set #'direction = #1 \property Voice.Slur \set #'attachment = #'(head . head) c8~c(c) - } - \context Voice=two \relative c'' { + }\\ + \relative c'' { \property Voice.Stem \set #'direction = #-1 \property Voice.Tie \set #'direction = #-1 \property Voice.Slur \set #'direction = #-1 diff --git a/input/test/dynamic-absolute-volume.ly b/input/test/dynamic-absolute-volume.ly index accb180f9c..e030617770 100644 --- a/input/test/dynamic-absolute-volume.ly +++ b/input/test/dynamic-absolute-volume.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Dynamic Absolute Volume Absolute dynamics have effect in MIDI files. diff --git a/input/test/dynamic-extra.ly b/input/test/dynamic-extra.ly index c27a70b129..09e3b930ae 100644 --- a/input/test/dynamic-extra.ly +++ b/input/test/dynamic-extra.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % probably should be merged into refman. \header{ texidoc = "@cindex Dynamic Piu Forte diff --git a/input/test/embedded-postscript.ly b/input/test/embedded-postscript.ly index 996cecaf44..6ca4ffc3f6 100644 --- a/input/test/embedded-postscript.ly +++ b/input/test/embedded-postscript.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Embedded Postscript By inserting the @TeX{} command \embeddedps, you can diff --git a/input/test/embedded-scm.ly b/input/test/embedded-scm.ly index 6c8a8af45d..36daac8091 100644 --- a/input/test/embedded-scm.ly +++ b/input/test/embedded-scm.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % TODO: does this work? It doesn't do anything with 1.7.20 \header {texidoc="@cindex Embedded scm You can embed scm functions in your scores. diff --git a/input/test/embedded-tex.ly b/input/test/embedded-tex.ly index 41bb591c21..a9265aea09 100644 --- a/input/test/embedded-tex.ly +++ b/input/test/embedded-tex.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="@cindex Embedded Tex You can embed Tex commands in your score. "} diff --git a/input/test/explicit.ly b/input/test/explicit.ly index f057ae5090..49642f6b44 100644 --- a/input/test/explicit.ly +++ b/input/test/explicit.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="@cindex Explicit Pitch and Duration Explicit pitches and durations. " diff --git a/input/test/extra-offset.ly b/input/test/extra-offset.ly index cd9bea2d3d..53be448aff 100644 --- a/input/test/extra-offset.ly +++ b/input/test/extra-offset.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Scheme Move Notehead You can move objects around with scheme. This example shows how to move noteheads around. " } diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index fbae22ce51..35eac6c9f4 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" % definately wil be renamed to something. %{ (Message vers:9) @@ -31,11 +31,11 @@ You can add an extra staff after the beginning of a piece. "} \score { < - \context Staff=i \notes\relative c''{ c1 c c c c } - \context StaffGroup=ii \notes\relative c''{ - \context Staff=ii + \new Staff \notes\relative c''{ c1 c c c c } + \new StaffGroup \notes\relative c''{ + \new Staff c1 c - < \context Staff=ii { c1 } \context Staff=iii { c1 } > + < \new Staff { c1 } \new Staff { c1 } > c } > diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly index c1b82bfb84..c985cf6583 100644 --- a/input/test/fill-a4.ly +++ b/input/test/fill-a4.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" %possible rename to paper-fill-a4.ly -gp % candidate for reg -gp % Han says no, but keeping this comment temporarily so that I don't diff --git a/input/test/follow-thread.ly b/input/test/follow-thread.ly index 500adcd757..b3cf0920ad 100644 --- a/input/test/follow-thread.ly +++ b/input/test/follow-thread.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" % MERGED: stuff from follow-break.ly to follow-thread.ly % followVoice: connect note heads with line when thread switches staff @@ -10,7 +10,7 @@ property @code{followVoice}. " } \score { \notes\relative c { - \context PianoStaff=ps < + \new PianoStaff < \property PianoStaff.followVoice = ##t \context Staff=one \context Voice { \property Voice.VoiceFollower \set #'style = #'dashed-line diff --git a/input/test/force-hshift.ly b/input/test/force-hshift.ly index 29ec005980..5f0f861ffd 100644 --- a/input/test/force-hshift.ly +++ b/input/test/force-hshift.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc="@cindex Force hshift Force hshift to override collisions. " } diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index e3d6aad448..e3bf200d47 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ texidoc="@cindex Gourlay @@ -11,9 +11,10 @@ breaking lines. " \score{ \notes \context Staff \relative c'' < - \context Voice = VA { \stemUp d2 d | d d | d4 d2. | \break c1 } - \context Voice = VB { \stemDown g4 g g g | \times 2/3 { g2 g2 g2 } | g4. g8 g2 | c1 } - > + { \stemUp d2 d | d d | d4 d2. | \break c1 } + \\ + { \stemDown g4 g g g | \times 2/3 { g2 g2 g2 } | g4. g8 g2 | c1 } + > \paper{ raggedright = ##t } diff --git a/input/test/gregorian-scripts.ly b/input/test/gregorian-scripts.ly index 0b8bd106b6..84d1a6def6 100644 --- a/input/test/gregorian-scripts.ly +++ b/input/test/gregorian-scripts.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { title = "Gregorian Scripts" texidoc = "@cindex Gregorian Scripts diff --git a/input/test/harmonic.ly b/input/test/harmonic.ly index 7a4479357c..0fd80a36fd 100644 --- a/input/test/harmonic.ly +++ b/input/test/harmonic.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc ="@cindex Artificial Harmonics For stringed instruments, artificial harmonics are notated with @@ -6,7 +6,7 @@ two different notehead styles on the same stem. " } \score { \notes { c'4 - < c'4 \context Thread = tb { + < c'4 \new Thread { \property Thread.NoteHead \set #'style = #'harmonic g'4 } > diff --git a/input/test/header-ifelse.ly b/input/test/header-ifelse.ly index cbbde85227..fe832236de 100644 --- a/input/test/header-ifelse.ly +++ b/input/test/header-ifelse.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" #(define (my-ly-version) diff --git a/input/test/hshift.ly b/input/test/hshift.ly index c7629a7cc9..cfb9ac8cc5 100644 --- a/input/test/hshift.ly +++ b/input/test/hshift.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Horizontal Shift You can manually shift notes horizontally. " } @@ -13,11 +13,11 @@ shiftV = \property Voice.NoteColumn \override #'horizontal-shift = #4 \context Voice \notes\relative c { \context Staff < - \context Voice =VA {\stemUp \shiftI g'' } - \context Voice =VB {\stemUp \shiftII e } - \context Voice =VC {\stemUp \shiftIII c } - \context Voice =VD {\stemUp \shiftIV a } - \context Voice =VE {\stemUp \shiftV f } + \new Voice {\stemUp \shiftI g'' } + \new Voice {\stemUp \shiftII e } + \new Voice {\stemUp \shiftIII c } + \new Voice {\stemUp \shiftIV a } + \new Voice {\stemUp \shiftV f } > } \paper { raggedright = ##t } diff --git a/input/test/hymn.ly b/input/test/hymn.ly index b9a05d4faf..730be3ed54 100644 --- a/input/test/hymn.ly +++ b/input/test/hymn.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = " diff --git a/input/test/improv.ly b/input/test/improv.ly index f948694e8c..f3a2e61854 100644 --- a/input/test/improv.ly +++ b/input/test/improv.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = diff --git a/input/test/incipit.ly b/input/test/incipit.ly index 9b3074803f..f68818c173 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Incipit This shows how to make an ``incipit'' to indicate scordatora tuning of a violin part, using the clefStyle property. @@ -56,7 +56,7 @@ BC = \notes\relative c{ \endincipit \violin }} - \context Staff = BC{\notes{ + \new Staff {\notes{ \property Staff.Clef \override #'transparent = ##t \bcincipit \bar ".|" \property Staff.Clef \revert #'transparent diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly index 58358b1c65..f50b2c55ff 100644 --- a/input/test/instrument-name-grandstaff.ly +++ b/input/test/instrument-name-grandstaff.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Instrument Name Grandstaff You can name the whole grandstaff in addition to individual staffs. " } @@ -13,9 +13,6 @@ You can name the whole grandstaff in addition to individual staffs. " } \paper { raggedright = ##t -\translator { \StaffContext - \consists "Instrument_name_engraver" - } \translator { \GrandStaffContext \consists "Instrument_name_engraver" } }} diff --git a/input/test/ly2dvi-testpage.ly b/input/test/ly2dvi-testpage.ly index 58ba2d995d..e9f1672bee 100644 --- a/input/test/ly2dvi-testpage.ly +++ b/input/test/ly2dvi-testpage.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % MERGE with title.ly -gp %{ diff --git a/input/test/maximum-rest-count.ly b/input/test/maximum-rest-count.ly index e5340ba10e..58e83878b8 100644 --- a/input/test/maximum-rest-count.ly +++ b/input/test/maximum-rest-count.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" % possible rename to rest-foo \header { texidoc = "@cindex Rest Collision Count @@ -8,7 +8,7 @@ Control the number of rests in a collision with maximum-rest-count." \score{ \context Staff \notes\relative c''< - \context Voice = x { + \new Voice { a4 r \property Staff. RestCollision \set #'maximum-rest-count = #1 @@ -20,7 +20,7 @@ Control the number of rests in a collision with maximum-rest-count." r8 r8 c } - \context Voice = y { + \new Voice { c4 r r @@ -29,7 +29,7 @@ Control the number of rests in a collision with maximum-rest-count." r r } - \context Voice = z { + \new Voice { e4 r r diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly index 8e59687e1d..57f2527d35 100644 --- a/input/test/mensural-ligatures.ly +++ b/input/test/mensural-ligatures.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" % TODO: % check with ancient- stuff. rename, merge, something. -gp @@ -33,12 +33,12 @@ voice = \notes \transpose c c' { \score { \context ChoirStaff < - \context MensuralStaff = upperStaff < + \new MensuralStaff < \context MensuralVoice < \voice > > - \context Staff = lowerStaff < + \new Staff < \context Voice < \voice > diff --git a/input/test/midi-scales.ly b/input/test/midi-scales.ly index dc44fe8590..37c8a0e851 100644 --- a/input/test/midi-scales.ly +++ b/input/test/midi-scales.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % candidate for regression. -gp \header { texidoc="MIDI and midi2ly test file. Diff between this and midi2ly.py should be minimal." diff --git a/input/test/move-accidentals.ly b/input/test/move-accidentals.ly index acf2460a20..bb075ab0bc 100644 --- a/input/test/move-accidentals.ly +++ b/input/test/move-accidentals.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" % possible rename to scheme- or something like that. -gp \header { texidoc= "@cindex Scheme Manual Accidentals Positions of accidentals may be manually set. This diff --git a/input/test/move-notehead.ly b/input/test/move-notehead.ly index 9a2117f33d..a2121ae28a 100644 --- a/input/test/move-notehead.ly +++ b/input/test/move-notehead.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Scheme Move Notehead You can move objects around with the property extra-offset. This diff --git a/input/test/move-specific-text.ly b/input/test/move-specific-text.ly index 070548742c..99721dafa2 100644 --- a/input/test/move-specific-text.ly +++ b/input/test/move-specific-text.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % possible rename to scheme- or something like that. -gp \header { texidoc = "@cindex Scheme Move Text You can move objects around with scheme. This example shows how to diff --git a/input/test/music-box.ly b/input/test/music-box.ly index 249dd85ea4..c426a0813d 100644 --- a/input/test/music-box.ly +++ b/input/test/music-box.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \include "deutsch.ly" % possible rename to scheme- something. -gp % TODO: ask if it needs to have so many empty bars in the middle. -gp @@ -62,7 +62,7 @@ using Scheme functions to avoid typing work. " } -\version "1.9.1" +\version "1.9.2" pat = \notes \transpose c c' \repeat unfold 2 { < { \context Staff=up {r8 e16 f g e f g } } diff --git a/input/test/music-creation.ly b/input/test/music-creation.ly index e26894fa56..c8cd7c6b2d 100644 --- a/input/test/music-creation.ly +++ b/input/test/music-creation.ly @@ -1,4 +1,4 @@ -\version "1.9.1" %% or actually: 1.7.1 ... +\version "1.9.2" %% or actually: 1.7.1 ... % possible rename to scheme- something. -gp \header { texidoc = "@cindex Scheme Music Creation You can create music expressions from Scheme. The diff --git a/input/test/nested-groups.ly b/input/test/nested-groups.ly index 5795081389..23383ea32b 100644 --- a/input/test/nested-groups.ly +++ b/input/test/nested-groups.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="@cindex Nested Staff Groups LilyPond can print nested groups of staffs. " @@ -9,31 +9,31 @@ LilyPond can print nested groups of staffs. " \score { \notes < - \context StaffGroup = ga < - \context Staff = sb {c' d' e' f'} - \context InnerStaffGroup = isga < - \context Staff = sd {c' d' e' f'} - \context GrandStaff=gs < - \context Staff = sgsa {c' d' e' f'} - \context Staff = sgsb {c' d' e' f'} + \new StaffGroup < + \new Staff {c' d' e' f'} + \new InnerStaffGroup < + \new Staff {c' d' e' f'} + \new GrandStaff < + \new Staff {c' d' e' f'} + \new Staff {c' d' e' f'} > - \context Staff = sc {c' d' e' f'} + \new Staff {c' d' e' f'} > - \context ChoirStaff = csa < - \context Staff = sd {c' d' e' f'} - \context InnerStaffGroup=gc < - \context Staff = sq {c' d' e' f'} + \new ChoirStaff < + \new Staff {c' d' e' f'} + \new InnerStaffGroup < + \new Staff {c' d' e' f'} > - \context Staff = se {c' d' e' f'} + \new Staff {c' d' e' f'} > > - \context ChoirStaff = csb < - \context Staff = sg {c' d' e' f'} - \context InnerStaffGroup = isgb < - \context Staff = sh {c' d' e' f'} - \context Staff = si {c' d' e' f'} + \new ChoirStaff < + \new Staff {c' d' e' f'} + \new InnerStaffGroup < + \new Staff {c' d' e' f'} + \new Staff {c' d' e' f'} > - \context Staff = sj {c' d' e' f'} + \new Staff {c' d' e' f'} > > diff --git a/input/test/no-bar-lines.ly b/input/test/no-bar-lines.ly index 3f4c8814a7..fcdf1ec876 100644 --- a/input/test/no-bar-lines.ly +++ b/input/test/no-bar-lines.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % possible rename to bar-lines-foo. -gp \header{ texidoc = "@cindex Bar Lines Remove diff --git a/input/test/no-staff.ly b/input/test/no-staff.ly index d8dd600f4c..73cafa21f5 100644 --- a/input/test/no-staff.ly +++ b/input/test/no-staff.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" % possible rename to staff-something. -gp \header{ texidoc = "@cindex Staff Remove diff --git a/input/test/octave-duplicate.ly b/input/test/octave-duplicate.ly index 3eef43f38a..8c95d64502 100644 --- a/input/test/octave-duplicate.ly +++ b/input/test/octave-duplicate.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc="@cindex Octave Doubling Octave doubling parts of music. " } diff --git a/input/test/ossia.ly b/input/test/ossia.ly index 69436190f7..39fcd547d1 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" % pretty much a duplicate of extra-staff.ly. candidate for merge or delete. -gp \header { texidoc = "@cindex Ossia @@ -10,7 +10,7 @@ really supported, but can be somewhat faked in lily. " \score { \notes\relative c'' { c1 c1 < {\clef "treble" c1 c1 } - \context Staff = stb { c1 c1 } + \new Staff { c1 c1 } > } \paper {raggedright= ##t} diff --git a/input/test/part-combine-moments.ly b/input/test/part-combine-moments.ly index a336eb323f..e698542c8b 100644 --- a/input/test/part-combine-moments.ly +++ b/input/test/part-combine-moments.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % TODO: this example has a ton of text for very little output. % Is it all needed? -gp % should this go to regression or be delete'd? -gp diff --git a/input/test/part-combine-staff.ly b/input/test/part-combine-staff.ly index f058a46271..12e84c90ba 100644 --- a/input/test/part-combine-staff.ly +++ b/input/test/part-combine-staff.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Part Combine Staff You can combine parts on two staffs, as well as two voices. " } diff --git a/input/test/part-combine.ly b/input/test/part-combine.ly index c49ebe4178..bc6e3e896f 100644 --- a/input/test/part-combine.ly +++ b/input/test/part-combine.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="@cindex Part Combine In orchestral scores and hymns, voices are traditionally combined onto diff --git a/input/test/partial-blank.ly b/input/test/partial-blank.ly index ed1df85841..1d6ef50cce 100644 --- a/input/test/partial-blank.ly +++ b/input/test/partial-blank.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % check with invisible-notes or blank-notes. possible rename. -gp \header{ texidoc = "@cindex Partial Blank When entering half music (i.e. for students to complete by hand) @@ -16,17 +16,17 @@ mel = \notes \relative c' {c16 d16 e8 a4 g2 e8 d c2. g'1 e4 d c2} \score { \context PianoStaff \notes < - \context Staff = v < + \new Staff < \clef G - \context Voice=melo {\mel} - \context Voice=invisible { + \new Voice {\mel} + \new Voice { \property Voice.NoteHead \override #'transparent = ##t \property Voice.Stem \override #'transparent = ##t \property Voice.Beam \override #'transparent = ##t \repeat unfold 4 \quickmeasure } > - \context Staff = empty \notes {\clef F s1*4} + \new Staff \notes {\clef F s1*4} > \paper {} } diff --git a/input/test/pedal.ly b/input/test/pedal.ly index c42b66e8a4..d2840c2708 100644 --- a/input/test/pedal.ly +++ b/input/test/pedal.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc = "@cindex Pedal Piano pedal symbols merge stop and start. The strings are configurable. diff --git a/input/test/phrasing-slur-height.ly b/input/test/phrasing-slur-height.ly index 4a7928a64d..29bc31647b 100644 --- a/input/test/phrasing-slur-height.ly +++ b/input/test/phrasing-slur-height.ly @@ -1,11 +1,11 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="@cindex Phrasing Slur Height Make PhrasingSlur higher, to avoid colission from other slurs. " } \score { - \context Staff = melody \notes\relative c''{ + \new Staff \notes\relative c''{ \property Staff.PhrasingSlur \override #'height-limit = #8.0 c8 \( (d e f) g ( a b c) | c ( b a g) f ( e d c)\) diff --git a/input/test/polymetric-differing-notes.ly b/input/test/polymetric-differing-notes.ly index 023adba623..47898be9fe 100644 --- a/input/test/polymetric-differing-notes.ly +++ b/input/test/polymetric-differing-notes.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" @@ -47,18 +47,18 @@ what happens on the inside: a 3/4 time signature is combined with a \score { \notes \relative c' < - \context Staff= AS { + \new Staff { \time 3/4 c4 c c | c c c | } - \context Staff= BS { + \new Staff { \time 3/4 \property Staff.timeSignatureFraction= #'(9 . 8) \apply #display-music \apply #(scale-music-function '(2 . 3)) \repeat unfold 6 { c8[ c c] } } - \context Staff= DS { + \new Staff { \time 3/4 \property Staff.timeSignatureFraction= #'(10 . 8) \apply #display-music \apply #(scale-music-function '(3 . 5)) diff --git a/input/test/polymetric.ly b/input/test/polymetric.ly index d9bf261834..1381543035 100644 --- a/input/test/polymetric.ly +++ b/input/test/polymetric.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ texidoc="@cindex Time Signature Multiple @@ -16,16 +16,16 @@ command work correctly. Barlines distort the regular spacing, though. \score{ \notes \relative c' < - \context Staff= AS { + \new Staff { \time 3/4 c4 c c | c c c | } - \context Staff=BS { + \new Staff { \time 2/4 c4 c | c c | c c } - \context Staff =CS { + \new Staff { \time 3/8 c4. c8 c c c4. c8 c c } diff --git a/input/test/preset-extent.ly b/input/test/preset-extent.ly index 06bcef0b77..498e8d4ec6 100644 --- a/input/test/preset-extent.ly +++ b/input/test/preset-extent.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = " @cindex Preset Extent diff --git a/input/test/repeat-manual.ly b/input/test/repeat-manual.ly index d6fb9bcac0..130cf0c0c4 100644 --- a/input/test/repeat-manual.ly +++ b/input/test/repeat-manual.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Repeat Manual You can manually control repeat signs and numbers to produce unusual output. " diff --git a/input/test/repeat-shorter-bracket.ly b/input/test/repeat-shorter-bracket.ly index 64aa711378..9ace3bfd4f 100644 --- a/input/test/repeat-shorter-bracket.ly +++ b/input/test/repeat-shorter-bracket.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ texidoc=" diff --git a/input/test/repeat.ly b/input/test/repeat.ly index 28d85d5ba7..6f0d85dbde 100644 --- a/input/test/repeat.ly +++ b/input/test/repeat.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" % possible rename to lyric-repeat or repeat-lyric. \header{ texidoc = "@cindex Repeat Lyrics You can use alternate lyrics as well as alternate notes for repeats. " diff --git a/input/test/rest-dot-positions.ly b/input/test/rest-dot-positions.ly index e580cd4268..9c518ee089 100644 --- a/input/test/rest-dot-positions.ly +++ b/input/test/rest-dot-positions.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % candidate for regression. -gp \header { texidoc = "@cindex Rest Dot Positions This file tests dotted rests. " } @@ -50,8 +50,8 @@ muz = \notes \relative c'' { \context Staff { \muz \break < - \context Voice=one { \voiceOne \muz } - \context Voice=two { \voiceTwo \muz } + { \muz } \\ + { \muz } > } \paper{} diff --git a/input/test/rests.ly b/input/test/rests.ly index 11f971d49f..596cca60e9 100644 --- a/input/test/rests.ly +++ b/input/test/rests.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Rests diff --git a/input/test/reverse-music.ly b/input/test/reverse-music.ly index af74fb2154..100a786105 100644 --- a/input/test/reverse-music.ly +++ b/input/test/reverse-music.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % possible rename to scheme-something. \header { texidoc="@cindex Scheme Reverse Music Simple customised music apply. " diff --git a/input/test/rhythm-excercise.ly b/input/test/rhythm-excercise.ly index 1d0c13e3ef..8c124cc600 100644 --- a/input/test/rhythm-excercise.ly +++ b/input/test/rhythm-excercise.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Rhythm Exercise This example shows a way to generate rhythm exercises with LilyPond (e.g. no staff but retaining the barlines). " diff --git a/input/test/scales-greek.ly b/input/test/scales-greek.ly index a47412253a..89e0e6b386 100644 --- a/input/test/scales-greek.ly +++ b/input/test/scales-greek.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Scales Greek Show different scales." @@ -46,14 +46,7 @@ voicedefault = \notes { } \score{ - \notes < - - \context Staff="default" - { \voicedefault - } - - > \paper { } \midi {} } diff --git a/input/test/scheme-interactions.ly b/input/test/scheme-interactions.ly index cbc859e495..db2c502c97 100644 --- a/input/test/scheme-interactions.ly +++ b/input/test/scheme-interactions.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Scheme Interactions With @code{ly:export}, you can pass of the result of Scheme expressions as lilypond input. Within a Scheme expression, diff --git a/input/test/script-abbreviations.ly b/input/test/script-abbreviations.ly index 5cb8f8919a..f4592cf2fb 100644 --- a/input/test/script-abbreviations.ly +++ b/input/test/script-abbreviations.ly @@ -1,7 +1,7 @@ % this chart is used in the manual too. -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Script Abbreviations Some scripts may be entered using an abbreviation. diff --git a/input/test/script-chart.ly b/input/test/script-chart.ly index 8038f93926..45e901e4c0 100644 --- a/input/test/script-chart.ly +++ b/input/test/script-chart.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" % this chart is used in the manual too. diff --git a/input/test/script-priority.ly b/input/test/script-priority.ly index b191208b5d..ede796e42e 100644 --- a/input/test/script-priority.ly +++ b/input/test/script-priority.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Script Priority Relative placements of different script types can be controlled diff --git a/input/test/script-stack.ly b/input/test/script-stack.ly index 3ebd6017c4..9169dec404 100644 --- a/input/test/script-stack.ly +++ b/input/test/script-stack.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Stacked Text Articulation You can stack text and articulations. " diff --git a/input/test/separate-staccato.ly b/input/test/separate-staccato.ly index 643b05f850..a3e48d04ff 100644 --- a/input/test/separate-staccato.ly +++ b/input/test/separate-staccato.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % possible rename. -gp \header { texidoc="@cindex Seperate Staccato @@ -12,7 +12,7 @@ staccatos = \notes { s4-. s-. s-. s s } music = \notes\relative c' { c4 d e f g a b c d e } \score { - \context Thread=one < + \new Thread < \music \repeat unfold 2 \staccatos > diff --git a/input/test/slur-attachment-override.ly b/input/test/slur-attachment-override.ly index fe3a8679bf..7f107fdcae 100644 --- a/input/test/slur-attachment-override.ly +++ b/input/test/slur-attachment-override.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc="@cindex Slur Attachment Override diff --git a/input/test/slur-beautiful.ly b/input/test/slur-beautiful.ly index ebe98ee70d..e80c29b3a2 100644 --- a/input/test/slur-beautiful.ly +++ b/input/test/slur-beautiful.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % TODO bit too wordy; edit a bit to cut stuff. -gp \header { texidoc ="@cindex Slur Beautiful Similarly, the curvature of a slur is adjusted to stay clear of note diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly index 5178aea37b..00edd4cbf7 100644 --- a/input/test/slur-dash.ly +++ b/input/test/slur-dash.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header {texidoc = "@cindex Slur, dotted You can print different kinds of slurs (dotted, dashed, etc). " } diff --git a/input/test/slur-minimum-length.ly b/input/test/slur-minimum-length.ly index bb3a5a4600..7ca80baea0 100644 --- a/input/test/slur-minimum-length.ly +++ b/input/test/slur-minimum-length.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Slur Minimum Length You can set the minimum length of a slur. " diff --git a/input/test/slur-shape.ly b/input/test/slur-shape.ly index 71d939aa0c..0dfa3cf482 100644 --- a/input/test/slur-shape.ly +++ b/input/test/slur-shape.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "Slurs become flatter as they grow longer. " @@ -12,33 +12,33 @@ x = { \score { \context Staff \notes\relative c < - \context Voice=va { \x f(f) } - \context Voice=vb { \x g(s4g) } - \context Voice=vc { \x a(s4*2a) } - \context Voice=vd { \x b(s4*3b) } - \context Voice=ve { \x c(s4*4c) } - \context Voice=vf { \x d(s4*5d) } - \context Voice=vg { \x e(s4*6e) } - \context Voice=vh { \x f(s4*7f) } - \context Voice=vi { \x g(s4*8g) } - \context Voice=vj { \x a(s4*9a) } - \context Voice=vk { \x b(s4*10b) } - \context Voice=vl { \x c(s4*11c) } - \context Voice=vm { \x d(s4*12d) } - \context Voice=vn { \x e(s4*13e) } - \context Voice=vo { \x f(s4*14f) } - \context Voice=vp { \x g(s4*15g) } - \context Voice=vq { \x a(s4*16a) } - \context Voice=vr { \x b(s4*17b) } - \context Voice=vs { \x c(s4*18c) } - \context Voice=vt { \x d(s4*19d) } - \context Voice=vu { \x e(s4*20e) } - \context Voice=vv { \x f(s4*21f) } - \context Voice=vw { \x g(s4*22g) } - \context Voice=vx { \x a(s4*23a) } - \context Voice=vy { \x b(s4*24b) } - \context Voice=vz { \x c(s4*25c) } - \context Voice=wa { \x d(s4*26d) } + \new Voice { \x f(f) } + \new Voice { \x g(s4g) } + \new Voice { \x a(s4*2a) } + \new Voice { \x b(s4*3b) } + \new Voice { \x c(s4*4c) } + \new Voice { \x d(s4*5d) } + \new Voice { \x e(s4*6e) } + \new Voice { \x f(s4*7f) } + \new Voice { \x g(s4*8g) } + \new Voice { \x a(s4*9a) } + \new Voice { \x b(s4*10b) } + \new Voice { \x c(s4*11c) } + \new Voice { \x d(s4*12d) } + \new Voice { \x e(s4*13e) } + \new Voice { \x f(s4*14f) } + \new Voice { \x g(s4*15g) } + \new Voice { \x a(s4*16a) } + \new Voice { \x b(s4*17b) } + \new Voice { \x c(s4*18c) } + \new Voice { \x d(s4*19d) } + \new Voice { \x e(s4*20e) } + \new Voice { \x f(s4*21f) } + \new Voice { \x g(s4*22g) } + \new Voice { \x a(s4*23a) } + \new Voice { \x b(s4*24b) } + \new Voice { \x c(s4*25c) } + \new Voice { \x d(s4*26d) } > \paper { raggedright = ##t diff --git a/input/test/slur-ugly.ly b/input/test/slur-ugly.ly index 6ec95789a2..a2d3288dbc 100644 --- a/input/test/slur-ugly.ly +++ b/input/test/slur-ugly.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc="@cindex Slur Ugly You can get ugly slurs, if you want. " diff --git a/input/test/smart-transpose.ly b/input/test/smart-transpose.ly index 96d7c78fb5..1862bfd16c 100644 --- a/input/test/smart-transpose.ly +++ b/input/test/smart-transpose.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc="@cindex Smart Transpose diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index 1e5957eb46..f531d1c220 100644 --- a/input/test/spacing-2.ly +++ b/input/test/spacing-2.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" % more yummy regression goodness. -gp \header { texidoc = " @@ -12,14 +12,14 @@ texidoc = " \score { \notes \relative c'' \context GrandStaff < - \context Staff = SA < - \context Voice = VA { \stemUp\slurUp\tieUp + \new Staff < + \new Voice { \stemUp\slurUp\tieUp e4 dis4 e2 } - \context Voice = VB { \stemDown\slurDown\tieDown + \new Voice { \stemDown\slurDown\tieDown cis8[ a] fis[ b] gis2 } {\key e \major } > - \context Staff = SB { \clef "bass" \key e \major + \new Staff { \clef "bass" \key e \major a,,16[ e dis e] b'8[ b,] e16[ e, gis b] e4 } > diff --git a/input/test/spanner-after-break-tweak.ly b/input/test/spanner-after-break-tweak.ly index f90e43e410..cdf870eb0b 100644 --- a/input/test/spanner-after-break-tweak.ly +++ b/input/test/spanner-after-break-tweak.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Spanner after break diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly index 8b57de1966..143878780f 100644 --- a/input/test/staff-bracket.ly +++ b/input/test/staff-bracket.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{texidoc = "@cindex Staff Bracket Here's an example of staff brackets. " @@ -7,11 +7,11 @@ Here's an example of staff brackets. " \score { - \context StaffGroup = "a" \notes \relative c'' < - \context Staff = "a" { b1 } - \context PianoStaff = "b" < - \context Staff = "c" \notes { b1 } - \context Staff = "d" \notes { b1 } + \new StaffGroup \notes \relative c'' < + \new Staff { b1 } + \new PianoStaff < + \new Staff \notes { b1 } + \new Staff \notes { b1 } > > diff --git a/input/test/staff-container.ly b/input/test/staff-container.ly index 4337550654..2a2e09c712 100644 --- a/input/test/staff-container.ly +++ b/input/test/staff-container.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { @@ -26,15 +26,15 @@ quarterSkip = #(make-nonevent-skip (ly:make-duration 2 0)) \score { \notes \relative c'' < - \context StaffContainer = SA { + \new StaffContainer { %% need < >, otherwise we descend to the voice inside SA - < \context Staff = SA { c4 c4 } > + < \new Staff { c4 c4 } > \quarterSkip - < \context Staff = SB { b4 b4 } > + < \new Staff { b4 b4 } > } - \context StaffContainer =SB { + \new StaffContainer { \quarterSkip < \context Staff { e d f } > \quarterSkip diff --git a/input/test/staff-lines.ly b/input/test/staff-lines.ly index e2e6f0b727..6bbbf0d1fb 100644 --- a/input/test/staff-lines.ly +++ b/input/test/staff-lines.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc="@cindex Staff Lines Staff symbol property set workaround. " @@ -17,12 +17,12 @@ lower = \notes\relative c { \score { \context PianoStaff < %\time 4/4 - \context Staff = upper < + \new Staff < \upper \outputproperty #(make-type-checker 'staff-symbol-interface) #'line-count = #5 > - \context Staff = lower < + \new Staff < \clef bass \lower \outputproperty #(make-type-checker 'staff-symbol-interface) diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index 2df82c477d..03e6db5156 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Staff Size @@ -10,7 +10,7 @@ Setting staff sizes is a little clumsy. There are two options: using } \score { - \notes \relative c' < \context StaffContainer = SA{ + \notes \relative c' < \new StaffContainer { \property StaffContainer.StaffSymbol \set #'staff-space = #(/ 16 20) \property Staff.fontSize = #-1 @@ -22,8 +22,8 @@ Setting staff sizes is a little clumsy. There are two options: using c8 d e[ f g a] b c \ff } -\context Staff = SB \relative c'' { \dynamicDown c,,4 \ff c c c } -\context Staff = SC { +\new Staff \relative c'' { \dynamicDown c,,4 \ff c c c } +\new Staff { \context Staff \outputproperty #(make-type-checker 'staff-symbol-interface) #'staff-space = #0.8 \property Staff.fontSize = #-1 diff --git a/input/test/staff-space.ly b/input/test/staff-space.ly index 31c565a0fa..3e9d6eeaf3 100644 --- a/input/test/staff-space.ly +++ b/input/test/staff-space.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header{ texidoc ="@cindex Staff Space Setting staff space on a staff. " @@ -7,8 +7,8 @@ Setting staff space on a staff. " \score { \notes \relative c'' \context GrandStaff < - \context Staff = up { c4 c4 } - \context Staff = down { + \new Staff { c4 c4 } + \new Staff { c4 <>8[ diff --git a/input/test/stem-centered.ly b/input/test/stem-centered.ly index 57e72153cc..3492411475 100644 --- a/input/test/stem-centered.ly +++ b/input/test/stem-centered.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % possible rename to ancient- something. \header { texidoc ="@cindex Ancient Mensural Note Heads diff --git a/input/test/stem-cross-staff.ly b/input/test/stem-cross-staff.ly index 39c5d93f24..bc307cb5d0 100644 --- a/input/test/stem-cross-staff.ly +++ b/input/test/stem-cross-staff.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Stem Cross Staff There is no support for putting chords across staves. @@ -14,14 +14,14 @@ noFlag = \once \property Voice.Stem \override #'flag-style = #'no-flag \score { \notes \context PianoStaff - < \context Staff = up { + < \new Staff { \stemDown \stemExtend f'4 \stemExtend \noFlag f'8 } - \context Staff = down { + \new Staff { \clef bass a4 a8 } > diff --git a/input/test/stem-extend.ly b/input/test/stem-extend.ly index 38cbdd87b5..e80d975c6e 100644 --- a/input/test/stem-extend.ly +++ b/input/test/stem-extend.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Stem Extend You can stop LilyPond from extending stems to the center line. " @@ -8,12 +8,12 @@ You can stop LilyPond from extending stems to the center line. " \score { \context Voice \notes\relative c { \context Staff < - \context Voice = "a" { + \new Voice { f2 f8 g a b \property Voice.Stem \set #'no-stem-extend = ##t f2 f8 g a b } - \context Voice = "b" { + \new Voice { c''2 c8 b a g \property Voice.Stem \set #'no-stem-extend = ##t c2 c8 b a g diff --git a/input/test/stem-length.ly b/input/test/stem-length.ly index 172a521c18..1ced1c48d9 100644 --- a/input/test/stem-length.ly +++ b/input/test/stem-length.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc = "@cindex Stem Length You can alter the length of stems. " diff --git a/input/test/tablature-hammer.ly b/input/test/tablature-hammer.ly index cb1cffdda6..7f1728ff4a 100644 --- a/input/test/tablature-hammer.ly +++ b/input/test/tablature-hammer.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header {texidoc = "@cindex Tablature hammer You can fake a hammer in tablature with slurs. " } diff --git a/input/test/tablature.ly b/input/test/tablature.ly index 65dcfb22eb..b6a5978e69 100644 --- a/input/test/tablature.ly +++ b/input/test/tablature.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc = "@cindex Tabulature A sample tablature, with both normal staff and tab. diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly index dad97ad719..827e52b862 100644 --- a/input/test/text-spanner.ly +++ b/input/test/text-spanner.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % TODO: check about other ottava functions. \header { texidoc = "@cindex Ottava Spanner diff --git a/input/test/textscript.ly b/input/test/textscript.ly index 811aca0be8..7445222f0b 100644 --- a/input/test/textscript.ly +++ b/input/test/textscript.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Textscript Test font selection and scm text markup. " diff --git a/input/test/tie-cross-voice.ly b/input/test/tie-cross-voice.ly index 45e02d886f..fe96f9986f 100644 --- a/input/test/tie-cross-voice.ly +++ b/input/test/tie-cross-voice.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" diff --git a/input/test/tie-sparse.ly b/input/test/tie-sparse.ly index 0aa1a80a8a..56ca6305d5 100644 --- a/input/test/tie-sparse.ly +++ b/input/test/tie-sparse.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "@cindex Tie Sparse Setting sparseTies causes only one tie to be diff --git a/input/test/time-signature-double.ly b/input/test/time-signature-double.ly index a449b0f7b8..20998c0937 100644 --- a/input/test/time-signature-double.ly +++ b/input/test/time-signature-double.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc= "@cindex Time Signature Double Double time signatures are not supported diff --git a/input/test/time.ly b/input/test/time.ly index 6ecfe16ed1..8c93c6f4be 100644 --- a/input/test/time.ly +++ b/input/test/time.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % TODO: This file could be old. Ask about it later. -gp \header { texidoc = "@cindex Time diff --git a/input/test/timing.ly b/input/test/timing.ly index eeed0326e1..55c7ea5e21 100644 --- a/input/test/timing.ly +++ b/input/test/timing.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" % possible rename to bar-something. \header{ texidoc = "@cindex Bar Length diff --git a/input/test/title.ly b/input/test/title.ly index e3ce894e56..cabdf293f5 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" % MERGE with ly2dvi- \header { filename = "title.ly" diff --git a/input/test/to-xml.ly b/input/test/to-xml.ly index d0c49c1c66..6f0d9a6466 100644 --- a/input/test/to-xml.ly +++ b/input/test/to-xml.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" fooBar = \notes { < c''4 \\ g'4 > } diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 1e906df1cd..c31ebae0e1 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -1,5 +1,5 @@ -\version "1.9.1" +\version "1.9.2" \header{ texidoc = "@cindex Transposition Transposition test file." @@ -62,10 +62,10 @@ vFour = \notes \transpose c d \vThree \score { \context StaffGroup < - \context Staff=vOne \vOne - \context Staff=vTwo \vTwo - \context Staff=vThree \vThree - \context Staff=vFour \vFour + \new Staff \vOne + \new Staff \vTwo + \new Staff \vThree + \new Staff \vFour > \paper { linewidth= 130.\mm raggedright = ##t } } diff --git a/input/test/trill.ly b/input/test/trill.ly index 65845ebc89..6a82f36630 100644 --- a/input/test/trill.ly +++ b/input/test/trill.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc="@cindex Trill Show trill line type. " diff --git a/input/test/trills.ly b/input/test/trills.ly index 8aca17afca..3dfb7ffa4f 100644 --- a/input/test/trills.ly +++ b/input/test/trills.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.2" \header { texidoc="@cindex Trills @@ -39,7 +39,7 @@ endHorizScript = { \score { < \context GrandStaff < - \context Staff=upper \notes\relative c'' { + \new Staff \notes\relative c'' { \time 1/4 c4\prall \time 3/8 @@ -52,8 +52,8 @@ endHorizScript = { \time 3/4 b4 c^\turn d \time 1/4 - <\context Voice=upper{\voiceOne d4} - \context Voice=lower{\voiceTwo + <{ d4}\\ + { \property Voice.Script \override #'extra-offset = #'(-0.8 . 2.0) b_\turn}> \startHorizScript @@ -74,7 +74,7 @@ endHorizScript = { \time 3/4 d2^\prallup e4 } - \context Lyrics=one \lyrics { + \new Lyrics \lyrics { "Tremblement"4 "Tremblement"4. "Cadence" @@ -95,7 +95,7 @@ endHorizScript = { %} } - \context Lyrics=two \lyrics { + \new Lyrics \lyrics { "simple"4 "appuy\\'e"4. %{ \skip 1*3 @@ -105,7 +105,7 @@ endHorizScript = { "de suite"1 %} } - \context Staff=lower \notes\relative c'' { + \new Staff \notes\relative c'' { % autobeamer has som problems here d32[ \repeat unfold 3 { c d } c] d8 ~ d32[\repeat unfold 3 { d32 c } c] diff --git a/input/test/unfold-all-repeats.ly b/input/test/unfold-all-repeats.ly index 28a7cb1a64..5277899fad 100644 --- a/input/test/unfold-all-repeats.ly +++ b/input/test/unfold-all-repeats.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" % regression. -gp \header { diff --git a/input/test/vaticana.ly b/input/test/vaticana.ly index 8ae73fa0ac..dc3676698d 100644 --- a/input/test/vaticana.ly +++ b/input/test/vaticana.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" % possible rename to ancient-something. \header { texidoc = "Ancient Vaticana diff --git a/input/test/version-output.ly b/input/test/version-output.ly index 727939e225..efda0e4aff 100644 --- a/input/test/version-output.ly +++ b/input/test/version-output.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" \header { texidoc = "By putting the output of @code{lilypond-version} diff --git a/input/test/vertical-extent.ly b/input/test/vertical-extent.ly index bc390a1a1a..ca2cca84e8 100644 --- a/input/test/vertical-extent.ly +++ b/input/test/vertical-extent.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.2" % TODO: huh? what's this file about? -gp \header { texidoc = " @@ -10,12 +10,12 @@ associated context finishes, so using it in \property works. \score { \notes < - \context Staff = upper { + \new Staff { \property Staff.verticalExtent = #'(-15.0 . 0.0) \clef alto c1 } - \context Staff = lower { + \new Staff { \property Staff.verticalExtent = #'(-0.0 . 15.0) \clef alto g1 diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index cb875ca68c..3706006216 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -3,7 +3,6 @@ \header{ filename = "twinkle-pop.ly" xtitle = "Ah, vous dirais-je, maman " -description = "twinkle twinkle in pop-song-settings" composer = "traditional" enteredby = "HWN, chords by Johan Vromans" copyright = "public domain" @@ -35,7 +34,7 @@ acc = \chords { } text = \lyrics{ - \property Lyrics . LyricText \set #'font-style = #'italic + \property Lyrics . LyricText \set #'font-shape = #'italic Ah!4 vous dir -- ai -- je ma man2 Ce4 qui cau -- se mon tour -- ment2 diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 9a816a42ab..1d6af1f1fa 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -268,7 +268,6 @@ Auto_beam_engraver::begin_beam () beat_length_ = *unsmob_moment (get_property ("beatLength")); } - void Auto_beam_engraver::junk_beam () { @@ -291,7 +290,6 @@ Auto_beam_engraver::end_beam () junk_beam (); } else - { finished_beam_ = create_beam (); if (finished_beam_) diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 1891eb4afc..9125084f2f 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -62,8 +62,8 @@ Clef_engraver::set_glyph () SCM basic = ly_symbol2scm ("Clef"); - daddy_trans_->execute_single_pushpop_property (basic, glyph_sym, SCM_UNDEFINED); - daddy_trans_->execute_single_pushpop_property (basic, glyph_sym, glyph); + daddy_trans_->execute_pushpop_property (basic, glyph_sym, SCM_UNDEFINED); + daddy_trans_->execute_pushpop_property (basic, glyph_sym, glyph); } /** @@ -130,8 +130,7 @@ Clef_engraver::inspect_clef_properties () || scm_equal_p (glyph, prev_glyph_) == SCM_BOOL_F || scm_equal_p (clefpos, prev_cpos_) == SCM_BOOL_F || scm_equal_p (octavation, prev_octavation_) == SCM_BOOL_F - || to_boolean (force_clef) -) + || to_boolean (force_clef)) { set_glyph (); create_clef (); diff --git a/lily/include/translator-def.hh b/lily/include/translator-def.hh index 8e755dda48..0c3d8457f5 100644 --- a/lily/include/translator-def.hh +++ b/lily/include/translator-def.hh @@ -53,7 +53,6 @@ public: SCM to_alist () const; static SCM make_scm () ; - static void apply_pushpop_property (Translator_group*, SCM syms, SCM eprop, SCM val); SCM clone_scm ()const; void apply_property_operations (Translator_group*); diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh index c30604508c..4a40e07208 100644 --- a/lily/include/translator-group.hh +++ b/lily/include/translator-group.hh @@ -38,7 +38,7 @@ class Translator_group : public virtual Translator { protected: ~Translator_group (); public: - void execute_single_pushpop_property (SCM prop, SCM sym, SCM val); + void execute_pushpop_property (SCM prop, SCM sym, SCM val); SCM internal_get_property (SCM name_sym) const; SCM properties_as_alist () const; diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc index dfcb323ee9..e355e5c3ec 100644 --- a/lily/ligature-engraver.cc +++ b/lily/ligature-engraver.cc @@ -125,7 +125,7 @@ Ligature_engraver::override_molecule_callback () SCM source_callback = ly_symbol2scm ("ligature-primitive-callback"); SCM noteHeadProperties = daddy_trans_->get_property ("NoteHead"); SCM value = ly_cdr (scm_sloppy_assq (source_callback, noteHeadProperties)); - daddy_trans_->execute_single_pushpop_property (symbol, target_callback, value); + daddy_trans_->execute_pushpop_property (symbol, target_callback, value); } /* @@ -146,7 +146,7 @@ Ligature_engraver::revert_molecule_callback () { SCM symbol = ly_symbol2scm ("NoteHead"); SCM key = ly_symbol2scm ("molecule-callback"); - daddy_trans_->execute_single_pushpop_property (symbol, key, SCM_UNDEFINED); + daddy_trans_->execute_pushpop_property (symbol, key, SCM_UNDEFINED); } void diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index c1fe8e04b3..48f08e8e98 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -26,6 +26,7 @@ static Keyword_ent the_key_tab[]={ + {"accacciatura", ACCACCIATURA}, {"accepts", ACCEPTS}, {"addlyrics", ADDLYRICS}, {"alias", ALIAS}, @@ -33,6 +34,7 @@ static Keyword_ent the_key_tab[]={ {"apply", APPLY}, {"applycontext", APPLYCONTEXT}, {"applyoutput", APPLYOUTPUT}, + {"appoggiatura", APPOGGIATURA}, {"autochange", AUTOCHANGE}, {"bar", BAR}, {"breathe", BREATHE}, @@ -56,7 +58,7 @@ static Keyword_ent the_key_tab[]={ {"markup", MARKUP}, {"midi", MIDI}, {"name", NAME}, - {"newcontext", NEWCONTEXT}, + {"new", NEWCONTEXT}, {"notes", NOTES}, {"octave", OCTAVE}, {"once", ONCE}, diff --git a/lily/parser.yy b/lily/parser.yy index 33ac19f461..6ff5a07dc4 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -238,6 +238,8 @@ yylex (YYSTYPE *s, void * v) %token FIGURES FIGURE_OPEN FIGURE_CLOSE %token FIGURE_BRACKET_CLOSE FIGURE_BRACKET_OPEN %token GRACE +%token ACCACCIATURA +%token APPOGGIATURA %token GROBDESCRIPTIONS %token HEADER %token HYPHEN @@ -289,6 +291,7 @@ yylex (YYSTYPE *s, void * v) %type exclamations questions dots optional_rest %type bass_mod +%type grace_head %type bass_number br_bass_figure bass_figure figure_list figure_spec %token DIGIT %token NOTENAME_PITCH @@ -893,6 +896,13 @@ Simple_music: ; +grace_head: + GRACE { $$ = scm_makfrom0str ("Grace"); } + | ACCACCIATURA { $$ = scm_makfrom0str ("Accacciatura"); } + | APPOGGIATURA { $$ = scm_makfrom0str ("Appoggiatura"); } + ; + + Composite_music: CONTEXT STRING Music { Music*csm =MY_MAKE_MUSIC("ContextSpeccedMusic"); @@ -916,15 +926,26 @@ Composite_music: $$ = chm; chm->set_spot (*$3->origin ()); } - | GRACE Music { + | grace_head Music { #if 1 /* The other version is for easier debugging of Sequential_music_iterator in combination with grace notes. */ - SCM start = THIS->lexer_->lookup_identifier ("startGraceMusic"); - SCM stop = THIS->lexer_->lookup_identifier ("stopGraceMusic"); +/* + +TODO: should distinguish between both grace types in the +basic music objects too, since the meaning is different. + +*/ + + String start_str = "start" + ly_scm2string ($1) + "Music"; + String stop_str = "stop" + ly_scm2string ($1) + "Music"; + + SCM start = THIS->lexer_->lookup_identifier (start_str); + SCM stop = THIS->lexer_->lookup_identifier (stop_str); + Music *startm = unsmob_music (start); Music *stopm = unsmob_music (stop); diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc index b42d1f8b04..cde3cc848e 100644 --- a/lily/property-iterator.cc +++ b/lily/property-iterator.cc @@ -111,10 +111,9 @@ Push_property_iterator::process (Moment m) if (to_boolean (get_music ()->get_mus_property ("pop-first")) && !to_boolean (get_music ()->get_mus_property ("once")) ) - Translator_def::apply_pushpop_property (report_to (), - sym, eprop, SCM_UNDEFINED); + report_to()->execute_pushpop_property (sym, eprop, SCM_UNDEFINED); - Translator_def::apply_pushpop_property (report_to (), sym, eprop, val); + report_to()->execute_pushpop_property (sym, eprop, val); } Simple_music_iterator::process (m); } @@ -124,15 +123,14 @@ SCM Push_property_iterator::once_finalization (SCM trans, SCM music) { Music * mus = unsmob_music (music); - Translator_group *tg - = dynamic_cast (unsmob_translator (trans)); - + Translator_group * tg = dynamic_cast (unsmob_translator (trans)); + SCM sym = mus->get_mus_property ("symbol"); if (check_grob (mus, sym)) { SCM eprop = mus->get_mus_property ("grob-property"); - Translator_def::apply_pushpop_property (tg, sym, eprop, SCM_UNDEFINED); + tg->execute_pushpop_property (sym, eprop, SCM_UNDEFINED); } return SCM_UNSPECIFIED; } @@ -155,10 +153,11 @@ void Pop_property_iterator::process (Moment m) { SCM sym = get_music ()->get_mus_property ("symbol"); + if (check_grob (get_music (), sym)) { SCM eprop = get_music ()->get_mus_property ("grob-property"); - Translator_def::apply_pushpop_property (report_to (), sym, eprop, SCM_UNDEFINED); + report_to()->execute_pushpop_property (sym, eprop, SCM_UNDEFINED); } Simple_music_iterator::process (m); } diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 186696b115..c047349fef 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -34,15 +34,17 @@ Repeated_music::to_relative_octave (Pitch p) { if (lily_1_8_relative) { - lily_1_8_compatibility_used = true; if (body ()) p = body ()->to_relative_octave (p); Pitch last = p ; if (alternatives ()) - for (SCM s = alternatives (); gh_pair_p (s); s = ly_cdr (s)) - unsmob_music (ly_car (s))->to_relative_octave (p); - + { + lily_1_8_compatibility_used = true; + + for (SCM s = alternatives (); gh_pair_p (s); s = ly_cdr (s)) + unsmob_music (ly_car (s))->to_relative_octave (p); + } return last; } diff --git a/lily/translator-def.cc b/lily/translator-def.cc index 551c0b59d5..de404836ed 100644 --- a/lily/translator-def.cc +++ b/lily/translator-def.cc @@ -157,17 +157,6 @@ Translator_def::add_pop_property (SCM props, SCM syms) -/* - Do it. SYM is single symbol. VAL is SCM_UNDEFINED in case of a pop -*/ -void -Translator_def::apply_pushpop_property (Translator_group* me,SCM sym, SCM eprop, SCM val) -{ - dynamic_cast (me) - ->execute_single_pushpop_property (sym, eprop, val); -} - - Link_array Translator_def::path_to_acceptable_translator (SCM type_string, Music_output_def* odef) const @@ -282,7 +271,7 @@ Translator_def::apply_property_operations (Translator_group*tg) SCM val = ly_cddr (entry); val = gh_pair_p (val) ? ly_car (val) : SCM_UNDEFINED; - apply_pushpop_property (tg, ly_car (entry), ly_cadr (entry), val); + tg->execute_pushpop_property (ly_car (entry), ly_cadr (entry), val); } else if (type == ly_symbol2scm ("assign")) { diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 6dbe4eb65c..f57e3ecfb6 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -313,7 +313,7 @@ Translator_group::unset_property (SCM sym) entry from a translator property list by name of PROP */ void -Translator_group::execute_single_pushpop_property (SCM prop, SCM eltprop, SCM val) +Translator_group::execute_pushpop_property (SCM prop, SCM eltprop, SCM val) { if (gh_symbol_p (prop)) { @@ -359,8 +359,6 @@ Translator_group::execute_single_pushpop_property (SCM prop, SCM eltprop, SCM va - - /* STUBS */ diff --git a/lily/translator-scheme.cc b/lily/translator-scheme.cc index ad894342de..2a51a7438f 100644 --- a/lily/translator-scheme.cc +++ b/lily/translator-scheme.cc @@ -1,9 +1,9 @@ /* -translator-scheme.cc -- implement + translator-scheme.cc -- implement Scheme context functions + + source file of the GNU LilyPond music typesetter -source file of the GNU LilyPond music typesetter - -(c) 2002--2003 Han-Wen Nienhuys + (c) 2002--2003 Han-Wen Nienhuys */ @@ -97,6 +97,31 @@ LY_DEFINE(ly_context_parent, return SCM_BOOL_F; } +/* + Todo: should support translator IDs, and creation? + */ +LY_DEFINE(ly_translator_find, + "ly:translator-find", 2, 0,0, + (SCM context, SCM name), + "Find a parent of @var{context} that has name or alias @var{name}. " + "Return @code{#f} if not found." ) +{ + Translator_group* tr= dynamic_cast ( unsmob_translator (context)); + + SCM_ASSERT_TYPE(tr, context, SCM_ARG1, __FUNCTION__, "context"); + SCM_ASSERT_TYPE(gh_string_p (name), name, SCM_ARG2, __FUNCTION__, "string"); + + String s = ly_scm2string (name); + + while (tr) + { + if (tr->is_alias_b (s)) + return tr->self_scm(); + tr = tr->daddy_trans_ ; + } + + return SCM_BOOL_F; +} LY_DEFINE(ly_context_properties, @@ -137,6 +162,36 @@ LY_DEFINE(ly_translator_description, } +LY_DEFINE(ly_context_pushpop_property, + "ly:context-pushpop-property", 3, 1, 0, + (SCM context, SCM grob, SCM eltprop, SCM val), + "Do a single @code{\\override} or @code{\\revert} operation " + "in @var{context}. The grob definition @code{grob} is extended with " + "@code{eltprop} (if @var{val} is specified) " + "or reverted (if unspecified).") +{ + Translator_group *tg = dynamic_cast (unsmob_translator (context)); + + SCM_ASSERT_TYPE(tg, context, SCM_ARG1, __FUNCTION__, "context"); + SCM_ASSERT_TYPE(gh_symbol_p (grob), grob, SCM_ARG2, __FUNCTION__, "symbol"); + SCM_ASSERT_TYPE(gh_symbol_p (eltprop), eltprop, SCM_ARG3, __FUNCTION__, "symbol"); + + tg->execute_pushpop_property (grob, eltprop, val); + + return SCM_UNDEFINED; +} + +LY_DEFINE(ly_context_p, + "ly:context?", 1, 0, 0, + (SCM x), + "Type predicate: is @var{x} a context?") +{ + Translator_group *tg = dynamic_cast (unsmob_translator (x)); + + return SCM_BOOL (tg); +} + + int Translator::print_smob (SCM s, SCM port, scm_print_state *) { @@ -159,3 +214,4 @@ Translator::print_smob (SCM s, SCM port, scm_print_state *) return 1; } + diff --git a/lily/translator.cc b/lily/translator.cc index 477d2a111b..7d2bdbc702 100644 --- a/lily/translator.cc +++ b/lily/translator.cc @@ -149,3 +149,4 @@ Translator::static_translator_description ()const IMPLEMENT_SMOBS (Translator); IMPLEMENT_DEFAULT_EQUAL_P (Translator); +IMPLEMENT_TYPE_P(Translator,"ly:translator?"); diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 23a1e1045e..2001c605dc 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -520,6 +520,32 @@ ScoreContext = \translator { bassFigureFormatFunction = #make-bass-figure-markup metronomeMarkFormatter = #make-metronome-markup + graceSettings = #`#( + ("Voice" Stem direction 1) + ("Voice" Stem lengths ,(map (lambda (x) (* 0.8 x)) '(2.5 2.5 3.0 4.0 5.0))) + ("Voice" Stem stem-shorten (0.4 0)) + ("Voice" Stem font-relative-size -1) + ("Voice" NoteHead font-relative-size -1) + ("Voice" Dots font-relative-size -1) + ("Voice" Stem beamed-lengths + ,(map (lambda (x) (* 0.8 x)) '(3.26))) + ("Voice" Stem beamed-minimum-free-lengths + ,(map (lambda (x) (* 0.8 x)) '(2.5 2.0 1.5))) + ("Voice" Stem beamed-extreme-minimum-free-lengths + ,(map (lambda (x) (* 0.8 x)) '(1.83 1.5))) + + ("Voice" Stem no-stem-extend #t) + ("Voice" Beam thickness 0.384) + ("Voice" Beam space-function ,(lambda (beam mult) + (* 0.8 (Beam::space_function + beam mult)))) + ("Voice" Beam position-callbacks (,Beam::least_squares + ,Beam::check_concave + ,Beam::slope_damping)) + ("Staff" Accidental font-relative-size -2) + ("Voice" Slur direction -1) + ) + \grobdescriptions #all-grob-descriptions } diff --git a/ly/grace-init.ly b/ly/grace-init.ly index 5c1db95bd6..3c052b8bfd 100644 --- a/ly/grace-init.ly +++ b/ly/grace-init.ly @@ -1,87 +1,33 @@ \version "1.9.1" -%% -%% TODO: these definitions should be read and executed out dynamically -%% using an applycontext. -%% -startGraceMusic = { - \property Voice.Stem \override #'direction = #1 - \property Voice.Stem \override #'lengths = - #(map (lambda (x) (* 0.8 x)) '(2.5 2.5 3.0 4.0 5.0)) - \property Voice.Stem \override #'stem-shorten = - #'(0.4 0) - \property Voice.Stem \override #'beamed-lengths = - #(map (lambda (x) (* 0.8 x)) '(3.26)) - \property Voice.Stem \override #'beamed-minimum-free-lengths = - #(map (lambda (x) (* 0.8 x)) '(2.5 2.0 1.5)) - \property Voice.Stem \override #'beamed-extreme-minimum-free-lengths = - #(map (lambda (x) (* 0.8 x)) '(1.83 1.5)) - - \property Voice.Stem \override #'no-stem-extend = ##t - \property Voice.Stem \override #'stroke-style = #"grace" - \property Voice.Beam \override #'thickness = #0.384 - - %% Instead of calling Beam::space_function, we should invoke - %% the previously active beam function... - \property Voice.Beam \override #'space-function = - #(lambda (beam mult) (* 0.8 (Beam::space_function beam mult))) +startGraceMusic = \notes { + \context Voice \applycontext #set-start-grace-properties +} - \property Voice.Beam \override #'position-callbacks = - #`(,Beam::least_squares - ,Beam::check_concave - ,Beam::slope_damping) - - % Can't use Staff.fontSize, since time sigs, keys sigs, etc. will - % be smaller as well. +stopGraceMusic = \notes { + \context Voice \applycontext #set-stop-grace-properties +} - \property Voice.fontSize = #-2 - \property Staff.Accidental \override #'font-relative-size = #-2 - \property Voice.Slur \override #'direction = #-1 +startAppoggiaturaMusic = +\notes { + \context Voice \applycontext #set-start-grace-properties + s1*0( } +stopAppoggiaturaMusic = \notes { + \context Voice \applycontext #set-stop-grace-properties + s1*0) +} -%% attention: order is significant: reversed from above -%% (consistent ordering reduces memory usage.) -stopGraceMusic = { - \property Voice.Slur \revert #'direction - \property Staff.Accidental \revert #'font-relative-size - \property Voice.Beam \revert #'thickness +startAccacciaturaMusic = \notes { + \context Voice \applycontext #set-start-grace-properties + s1*0( + \property Voice.Stem \override #'stroke-style = #"grace" +} +stopAccacciaturaMusic = \notes { \property Voice.Stem \revert #'stroke-style - \property Voice.Stem \revert #'no-stem-extend - \property Voice.Stem \revert #'beamed-extreme-minimum-free-lengths - \property Voice.Stem \revert #'beamed-minimum-free-lengths - \property Voice.Stem \revert #'beamed-lengths - \property Voice.Stem \revert #'stem-shorten - \property Voice.Stem \revert #'lengths - \property Voice.Stem \revert #'direction - \property Voice.Beam \revert #'space-function - - \property Voice.Beam \revert #'position-callbacks - - % Can't use Staff.fontSize, since time sigs, keys sigs, etc. will - % be smaller as well. - - \property Voice.fontSize \unset + \context Voice \applycontext #set-stop-grace-properties + s1*0) } - -#(define (add-to-grace-init context object prop val) - " Override context.object #'property before entering grace context, -and restore afterwards. Use this to add settings to default grace notes. -" - (set! stopGraceMusic - (make-sequential-music - (cons - (context-spec-music (make-grob-property-revert object prop) context) - (ly:get-mus-property stopGraceMusic 'elements) - ))) - (set! startGraceMusic - (make-sequential-music - (append - (ly:get-mus-property startGraceMusic 'elements) - (list (context-spec-music (make-grob-property-set object prop val) context)) - ) - ))) - - diff --git a/python/lilylib.py b/python/lilylib.py index e705cb1e15..abb604baf5 100644 --- a/python/lilylib.py +++ b/python/lilylib.py @@ -268,6 +268,11 @@ def read_pipe (cmd, mode = 'r'): if contents: error (_ ("The error log is as follows:")) sys.stderr.write (contents) + + # Ugh. code dup + if error_log_file: + os.unlink (error_log_file) + exit (status) if __main__.verbose_p: diff --git a/scm/define-translator-properties.scm b/scm/define-translator-properties.scm index a35d9c5ec5..c027af6268 100644 --- a/scm/define-translator-properties.scm +++ b/scm/define-translator-properties.scm @@ -267,6 +267,12 @@ in a context. This is done using the @code{Font_size_engraver}.") the side of the note head. Use LEFT, RIGHT or unset.") (translator-property-description 'forceClef boolean? "Show clef symbol, even if it hasn't changed. Only active for the first clef after the property is set, not for the full staff.") + +(translator-property-description 'graceSettings vector? + "Overrides for grace notes. This +property should be manipulated through the @code{add-grace-property} +function.") + (translator-property-description 'highStringOne boolean? "Whether the 1st string is the string with highest pitch on the instrument (used by the automatic string selector).") diff --git a/scm/lily.scm b/scm/lily.scm index ddb424a603..5118e58110 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -360,34 +360,36 @@ L1 is copied, L2 not. (set! type-p-name-alist `( - (,ly:dir? . "direction") - (,scheme? . "any type") - (,number-pair? . "pair of numbers") - (,ly:input-location? . "input location") - (,ly:grob? . "grob (GRaphical OBject)") + (,boolean-or-symbol? . "boolean or symbol") + (,boolean? . "boolean") + (,char? . "char") (,grob-list? . "list of grobs") - (,ly:duration? . "duration") - (,pair? . "pair") + (,input-port? . "input port") (,integer? . "integer") (,list? . "list") - (,symbol? . "symbol") - (,string? . "string") - (,boolean? . "boolean") - (,ly:pitch? . "pitch") - (,ly:moment? . "moment") + (,ly:context? . "context") (,ly:dimension? . "dimension, in staff space") + (,ly:dir? . "direction") + (,ly:duration? . "duration") + (,ly:grob? . "grob (GRaphical OBject)") (,ly:input-location? . "input location") - (,music-list? . "list of music") + (,ly:input-location? . "input location") + (,ly:moment? . "moment") (,ly:music? . "music") + (,ly:pitch? . "pitch") + (,ly:translator? . "translator") + (,markup-list? . "list of markups") + (,markup? . "markup") + (,music-list? . "list of music") + (,number-or-grob? . "number or grob") + (,number-or-string? . "number or string") + (,number-pair? . "pair of numbers") (,number? . "number") - (,char? . "char") - (,input-port? . "input port") (,output-port? . "output port") - (,vector? . "vector") + (,pair? . "pair") (,procedure? . "procedure") - (,boolean-or-symbol? . "boolean or symbol") - (,number-or-string? . "number or string") - (,markup? . "markup") - (,markup-list? . "list of markups") - (,number-or-grob? . "number or grob") + (,scheme? . "any type") + (,string? . "string") + (,symbol? . "symbol") + (,vector? . "vector") )) diff --git a/scm/music-functions.scm b/scm/music-functions.scm index 50a0dd8160..ba31d6dea1 100644 --- a/scm/music-functions.scm +++ b/scm/music-functions.scm @@ -204,9 +204,7 @@ i.e. this is not an override" (define-public (make-apply-context func) (let* - ( - (m (make-music-by-name 'ApplyContext)) - ) + ((m (make-music-by-name 'ApplyContext))) (ly:set-mus-property! m 'procedure func) m @@ -320,9 +318,7 @@ a property set for MultiMeasureRestNumber." (define-public (make-ottava-set octavation) (let* - ( - (m (make-music-by-name 'ApplyContext)) - ) + ((m (make-music-by-name 'ApplyContext))) (define (ottava-modify context) @@ -569,15 +565,90 @@ Rest can contain a list of beat groupings music ) + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; switch it on here, so parsing and init isn't checked (too slow!) +;; +;; setting stuff for grace context. +;; + +(define (vector-extend v x) + "Make a new vector consisting of V, with X added to the end." + (let* + ((n (vector-length v)) + (nv (make-vector (+ n 1) '()))) + + + (vector-move-left! v 0 n nv 0) + (vector-set! nv n x) + nv)) + + +(define (vector-map f v) + "Map F over V. This function returns nothing." + (do + ((n (vector-length v)) + (i 0 (+ i 1))) + ((>= i n)) + + (f (vector-ref v i)))) + +(define (vector-reverse-map f v) + "Map F over V, N to 0 order. This function returns nothing." + (do + ((i (- (vector-length v) 1) (- i 1))) + ((< i 0)) + + (f (vector-ref v i)))) +;; TODO: make a remove-grace-property too. +(define-public (add-grace-property context-name grob sym val) + "Set SYM=VAL for GROB in CONTEXT-NAME. " + (define (set-prop context) + (let* + ((where (ly:context-property-where-defined context 'graceSettings)) + (current (ly:get-context-property where 'graceSettings)) + (new-settings (vector-extend current (list context-name grob sym val))) + ) + (ly:set-context-property! where 'graceSettings new-settings))) + + (ly:export (context-spec-music (make-apply-context set-prop) "Voice"))) + + +(define-public (set-start-grace-properties context) + (define (execute-1 x) + (let* + ((tr (ly:translator-find context (car x)))) + + (if (ly:context? tr) + (ly:context-pushpop-property tr (cadr x) (caddr x) (cadddr x)) + ))) + + (let* + ((props (ly:get-context-property context 'graceSettings))) + (vector-map execute-1 props))) + +(define-public (set-stop-grace-properties context) + (define (execute-1 x) + (let* + ((tr (ly:translator-find context (car x)))) + (if (ly:context? tr) + (ly:context-pushpop-property tr (cadr x) (caddr x)) + ))) + + (let* + ((props (ly:get-context-property context 'graceSettings))) + + (vector-reverse-map execute-1 props))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; switch it on here, so parsing and init isn't checked (too slow!) +;; ;; automatic music transformations. (define (switch-on-debugging m) (set-debug-cell-accesses! 15000) - m - ) + m) (define-public toplevel-music-functions (list check-start-chords diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 3525650684..dd6c5aed44 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1422,6 +1422,21 @@ if 1: return str conversions.append (((1,9,1), conv, """Remove - before articulation""")) +if 1: + def conv (str): + str = re.sub ('\\\\newcontext', '\\\\new', str) + str = re.sub ('\\\\grace[\t\n ]*([^{ ]+)', + r'\\grace { \1 }', str) + str = re.sub ("\\\\grace[\t\n ]*{([^}]+)}", + r"""\\grace { + \\property Voice.Stem \\override #'stroke-style = #"grace" + \1 + \\property Voice.Stem \\revert #'stroke-style } +""", str) + + return str + + conversions.append (((1,9,2), conv, """\newcontext -> \new""")) ################################ # END OF CONVERSIONS -- 2.39.2