From 70048d99398924e7ca0eb481925145ec243700c5 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 31 Aug 2003 17:53:13 +0000 Subject: [PATCH] * scripts/convert-ly.py (FatalConversionError.figures_replace): rule for < > <-> << >> substitution * lily/lexer.ll: exchange meaning of << >> and < > * VERSION (PACKAGE_NAME): 1.9.3 released --- ChangeLog | 5 + Documentation/topdocs/NEWS.texi | 30 +- Documentation/user/refman.itely | 2 +- Documentation/user/tutorial.itely | 6 +- VERSION | 2 +- input/ascii-art/as-email.ly | 2 +- input/ascii-art/as1.ly | 2 +- input/ascii-art/as2.ly | 2 +- input/ascii-art/asciiscript5.ly | 2 +- input/ascii-art/asciiscript9.ly | 2 +- input/ascii-art/r-as.ly | 8 +- input/ascii-art/standchen-as5.ly | 14 +- input/ascii-art/standchen-as9.ly | 14 +- input/ascii-art/twinkle-as5.ly | 6 +- input/example-1.ly | 2 +- input/example-2.ly | 2 +- input/example-3.ly | 6 +- input/les-nereides.ly | 112 ++++--- input/mutopia-header.ly | 2 +- .../E.Satie/petite-ouverture-a-danser.ly | 82 ++--- input/mutopia/F.Schubert/standchen.ly | 306 ++++++++++-------- .../J.S.Bach/baerenreiter-sarabande.ly | 42 +-- input/mutopia/J.S.Bach/bwv940.ly | 20 +- input/mutopia/J.S.Bach/wtk1-fugue2.ly | 24 +- input/mutopia/R.Schumann/romanze-op28-2.ly | 66 ++-- input/mutopia/W.A.Mozart/mozart-hrn-3.ly | 2 +- .../mutopia/W.A.Mozart/mozart-hrn3-allegro.ly | 62 +++- input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly | 2 +- .../mutopia/W.A.Mozart/mozart-hrn3-romanze.ly | 8 +- input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly | 30 +- input/no-notation/bar-check.ly | 2 +- input/no-notation/beam-warn.ly | 2 +- input/no-notation/denneboom.ly | 2 +- input/no-notation/die-staff.ly | 6 +- input/no-notation/midi-grace.ly | 14 +- input/no-notation/midi-transposing.ly | 2 +- input/no-notation/midi-tuplets.ly | 2 +- input/no-notation/midi-volume-equaliser.ly | 26 +- input/no-notation/parse.ly | 2 +- input/no-notation/parse2.ly | 2 +- input/no-notation/parse3.ly | 2 +- input/no-notation/parse4.ly | 2 +- input/no-notation/parse5.ly | 6 +- input/no-notation/pc-direction.ly | 34 +- input/no-notation/textcresc.ly | 2 +- input/puer-fragment.ly | 6 +- input/regression/+.ly | 2 +- input/regression/accidental-cautionary.ly | 2 +- input/regression/accidental-double.ly | 6 +- input/regression/accidental-ledger.ly | 2 +- input/regression/accidental-octave.ly | 22 +- input/regression/accidental-placement.ly | 24 +- input/regression/accidental-single-double.ly | 6 +- .../accidental-unbroken-tie-spacing.ly | 6 +- input/regression/accidental-voice.ly | 10 +- input/regression/accidental.ly | 6 +- input/regression/accidentals.ly | 22 +- input/regression/allfontstyle.ly | 2 +- input/regression/ambitus.ly | 6 +- input/regression/apply-context.ly | 2 +- input/regression/apply-output.ly | 6 +- input/regression/arpeggio-collision.ly | 12 +- input/regression/arpeggio.ly | 18 +- 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 | 8 +- input/regression/bar-number.ly | 2 +- input/regression/bar-scripts.ly | 6 +- 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 | 22 +- input/regression/beam-concave.ly | 2 +- .../regression/beam-cross-staff-auto-knee.ly | 6 +- input/regression/beam-cross-staff-slope.ly | 12 +- input/regression/beam-cross-staff.ly | 6 +- 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 | 2 +- input/regression/beam-multiple-cross-staff.ly | 6 +- input/regression/beam-over-barline.ly | 2 +- input/regression/beam-position.ly | 2 +- 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 | 4 +- 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 | 8 +- input/regression/chord-name-entry-11.ly | 2 +- input/regression/chord-name-entry.ly | 2 +- input/regression/chord-name-exceptions.ly | 10 +- input/regression/chord-name-major7.ly | 2 +- input/regression/chord-scripts.ly | 16 +- input/regression/chord-tremolo.ly | 2 +- input/regression/chords-funky-ignatzek.ly | 24 +- input/regression/clefs.ly | 2 +- input/regression/cluster.ly | 10 +- input/regression/collision-2.ly | 6 +- input/regression/collision-dots.ly | 6 +- input/regression/collision-head-chords.ly | 4 +- input/regression/collision-heads.ly | 6 +- .../collision-merge-differently-dotted.ly | 6 +- input/regression/collision-mesh.ly | 18 +- input/regression/collisions.ly | 22 +- .../regression/completion-heads-polyphony.ly | 6 +- input/regression/completion-heads.ly | 2 +- input/regression/custos.ly | 10 +- input/regression/dot-flag-collision.ly | 2 +- input/regression/dots.ly | 14 +- input/regression/drums.ly | 26 +- 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 | 4 +- input/regression/easy-notation.ly | 2 +- input/regression/figured-bass.ly | 12 +- input/regression/finger-chords.ly | 14 +- input/regression/fingering.ly | 6 +- input/regression/follow-voice-break.ly | 6 +- input/regression/font-magnification.ly | 2 +- input/regression/font-name.ly | 2 +- input/regression/generic-output-property.ly | 2 +- input/regression/glissando.ly | 8 +- 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 | 4 +- input/regression/grace-nest4.ly | 6 +- input/regression/grace-nest5.ly | 4 +- input/regression/grace-part-combine.ly | 10 +- 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-types.ly | 2 +- input/regression/grace-unfold-repeat.ly | 2 +- input/regression/grace-volta-repeat-2.ly | 2 +- input/regression/grace-volta-repeat.ly | 2 +- input/regression/grace.ly | 4 +- input/regression/hairpin-ending.ly | 2 +- input/regression/hara-kiri-pianostaff.ly | 6 +- input/regression/instrument-name-markup.ly | 4 +- input/regression/instrument-name-partial.ly | 2 +- input/regression/instrument-name.ly | 6 +- input/regression/key-clefs.ly | 2 +- input/regression/key-signature-scordatura.ly | 2 +- input/regression/keys.ly | 2 +- input/regression/lyric-align.ly | 10 +- input/regression/lyric-combine-polyphonic.ly | 6 +- input/regression/lyric-combine.ly | 10 +- input/regression/lyric-extender.ly | 6 +- input/regression/lyric-hyphen.ly | 6 +- input/regression/lyric-phrasing.ly | 6 +- input/regression/lyrics-bar.ly | 10 +- input/regression/lyrics-extender.ly | 8 +- input/regression/lyrics-melisma-beam.ly | 2 +- input/regression/lyrics-multi-stanza.ly | 6 +- input/regression/markup-note.ly | 2 +- input/regression/markup-stack.ly | 4 +- input/regression/measure-grouping.ly | 2 +- input/regression/mensural.ly | 2 +- input/regression/metronome-marking.ly | 2 +- input/regression/mm-rests2.ly | 6 +- 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 | 6 +- input/regression/multi-measure-rest-text.ly | 4 +- input/regression/multi-measure-rest.ly | 2 +- input/regression/music-map.ly | 6 +- input/regression/new-markup-syntax.ly | 6 +- input/regression/non-empty-text.ly | 2 +- input/regression/note-group-bracket.ly | 2 +- input/regression/note-head-chord.ly | 12 +- input/regression/note-head-style.ly | 54 ++-- input/regression/note-line.ly | 6 +- 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 | 10 +- input/regression/pc-switch-slur.ly | 6 +- 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 | 6 +- input/regression/repeat-fold.ly | 2 +- input/regression/repeat-line-break.ly | 2 +- input/regression/repeat-percent-skipbars.ly | 6 +- input/regression/repeat-percent.ly | 2 +- 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 | 20 +- input/regression/rest-ledger.ly | 2 +- input/regression/rest-pitch.ly | 6 +- input/regression/rest.ly | 2 +- input/regression/rhythmic-staff.ly | 2 +- input/regression/script-collision.ly | 8 +- 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 | 6 +- 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 | 6 +- input/regression/slur-symmetry.ly | 6 +- input/regression/spacing-accidental-staffs.ly | 6 +- .../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 | 6 +- 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 | 6 +- 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 | 10 +- input/regression/tag-filter.ly | 10 +- input/regression/text-spanner.ly | 2 +- input/regression/tie-accidental.ly | 6 +- input/regression/tie-break-accidental.ly | 2 +- input/regression/tie-busy-grobs.ly | 6 +- input/regression/tie-chord-partial.ly | 6 +- input/regression/tie-chord.ly | 4 +- 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 | 6 +- input/regression/volta-broken-left-edge.ly | 6 +- input/regression/volta-multi-staff.ly | 18 +- input/screech-boink.ly | 22 +- input/template/gregorian-transcription.ly | 2 +- input/template/header.ly | 2 +- input/template/jazz-combo.ly | 58 ++-- input/template/melody-chords.ly | 6 +- input/template/melody-lyrics-chords.ly | 6 +- input/template/melody-lyrics.ly | 6 +- input/template/melody.ly | 2 +- input/template/piano-4-voices.ly | 14 +- input/template/piano-dynamics.ly | 10 +- input/template/piano-lyrics.ly | 10 +- input/template/piano-melody-lyrics.ly | 14 +- input/template/piano.ly | 10 +- input/template/satb.ly | 6 +- input/test/+.ly | 2 +- input/test/ac-extra-voice.ly | 14 +- input/test/add-staccato.ly | 2 +- input/test/add-text-script.ly | 2 +- input/test/ancient-accidentals.ly | 2 +- input/test/ancient-font.ly | 22 +- input/test/ancient-time.ly | 2 +- input/test/bagpipe.ly | 2 +- input/test/bar-always.ly | 2 +- input/test/bar-lines-lyric-only.ly | 10 +- input/test/bar-lines.ly | 2 +- input/test/bar-number-every-five-reset.ly | 6 +- 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 | 6 +- 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 | 6 +- input/test/blank-paper.ly | 2 +- input/test/boxed-molecule.ly | 2 +- input/test/caps.ly | 6 +- input/test/cautionaries.ly | 8 +- input/test/chord-names-german.ly | 6 +- input/test/chord-names-jazz.ly | 116 +++---- input/test/chord-names-no-inversions.ly | 12 +- 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 | 40 +-- input/test/count-systems.ly | 2 +- input/test/crescendi.ly | 2 +- input/test/cue-notes.ly | 6 +- input/test/divisiones.ly | 2 +- input/test/drarn-slurs.ly | 2 +- input/test/drarn.ly | 6 +- 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 | 22 +- input/test/fill-a4.ly | 2 +- input/test/follow-thread.ly | 6 +- input/test/force-hshift.ly | 14 +- input/test/gourlay.ly | 6 +- input/test/gregorian-scripts.ly | 2 +- input/test/harmonic.ly | 6 +- input/test/header-ifelse.ly | 2 +- input/test/hshift.ly | 6 +- input/test/hymn.ly | 6 +- input/test/improv.ly | 10 +- input/test/incipit.ly | 10 +- input/test/instrument-name-grandstaff.ly | 6 +- input/test/ly2dvi-testpage.ly | 2 +- input/test/maximum-rest-count.ly | 6 +- input/test/mensural-ligatures.ly | 22 +- input/test/midi-scales.ly | 2 +- input/test/move-accidentals.ly | 6 +- input/test/move-notehead.ly | 2 +- input/test/move-specific-text.ly | 2 +- input/test/music-box.ly | 18 +- input/test/music-creation.ly | 2 +- input/test/nested-groups.ly | 34 +- input/test/no-bar-lines.ly | 2 +- input/test/no-staff.ly | 2 +- input/test/octave-duplicate.ly | 34 +- input/test/ossia.ly | 6 +- input/test/part-combine-moments.ly | 6 +- input/test/part-combine-staff.ly | 6 +- input/test/part-combine.ly | 6 +- input/test/partial-blank.ly | 10 +- input/test/pedal.ly | 2 +- input/test/phrasing-slur-height.ly | 2 +- input/test/polymetric-differing-notes.ly | 6 +- input/test/polymetric.ly | 6 +- input/test/preset-extent.ly | 2 +- input/test/repeat-manual.ly | 2 +- input/test/repeat-shorter-bracket.ly | 6 +- input/test/repeat.ly | 8 +- 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 | 2 +- input/test/scheme-interactions.ly | 2 +- input/test/script-abbreviations.ly | 2 +- input/test/script-chart.ly | 6 +- input/test/script-priority.ly | 2 +- input/test/script-stack.ly | 2 +- input/test/separate-staccato.ly | 6 +- input/test/slur-attachment-override.ly | 4 +- input/test/slur-beautiful.ly | 2 +- input/test/slur-dash.ly | 2 +- input/test/slur-minimum-length.ly | 2 +- input/test/slur-shape.ly | 6 +- input/test/slur-ugly.ly | 10 +- input/test/smart-transpose.ly | 4 +- input/test/spacing-2.ly | 10 +- input/test/spanner-after-break-tweak.ly | 2 +- input/test/staff-bracket.ly | 10 +- input/test/staff-container.ly | 14 +- input/test/staff-lines.ly | 14 +- input/test/staff-size.ly | 6 +- input/test/staff-space.ly | 8 +- 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 | 6 +- input/test/tablature.ly | 14 +- input/test/text-spanner.ly | 2 +- input/test/textscript.ly | 2 +- input/test/tie-cross-voice.ly | 6 +- input/test/tie-sparse.ly | 4 +- input/test/time-signature-double.ly | 2 +- input/test/time.ly | 4 +- input/test/timing.ly | 2 +- input/test/title.ly | 2 +- input/test/to-xml.ly | 4 +- input/test/transposition.ly | 8 +- input/test/trill.ly | 2 +- input/test/trills.ly | 20 +- input/test/unfold-all-repeats.ly | 2 +- input/test/vaticana.ly | 6 +- input/test/version-output.ly | 2 +- input/test/vertical-extent.ly | 6 +- input/tutorial/brahms-original.ly | 14 +- input/tutorial/brahms-tweaked.ly | 14 +- input/twinkle-pop.ly | 10 +- lily/lexer.ll | 12 +- lily/parser.yy | 22 +- ly/chord-modifiers-init.ly | 22 +- ly/nederlands.ly | 8 - scripts/convert-ly.py | 36 ++- stepmake/stepmake/script-rules.make | 12 +- 455 files changed, 1782 insertions(+), 1605 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9ca4b971b..72d37f199a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2003-08-31 Han-Wen Nienhuys + * scripts/convert-ly.py (FatalConversionError.figures_replace): + rule for < > <-> << >> substitution + + * lily/lexer.ll: exchange meaning of << >> and < > + * VERSION (PACKAGE_NAME): 1.9.3 released * stepmake/stepmake/help2man-rules.make ($(outdir)/%.1): build man diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi index 016a325b07..5b0c57e220 100644 --- a/Documentation/topdocs/NEWS.texi +++ b/Documentation/topdocs/NEWS.texi @@ -9,6 +9,32 @@ @itemize +@item +The syntax for chords and simultaneous music have changed. +Chords are entered as + +@example + <@var{pitches}> +@end example + +while simultaneous music is entered + +@example + <<@var{..music list..}>> +@end example + +In effect, the meanings of both have been swapped relative to their 1.8 +definition. The syntax for lists in @code{\markup} has changed +alongside, but figured bass mode was not changed, i.e.: + +@example + \markup @{ \center <@var{..list of markups..}> @} + \figure @{ <@var{figures> @} +@end example + +As chords the more often used than simultaneous music, this change will +save keystrokes. + @item Each music expression can now be tagged, to make different printed versions from the same music expression. In the following example, @@ -36,8 +62,8 @@ to an articulation, for example, c4-\tag #'with-fingerings -4 -\tag #'with-strings \6 @end example -This defines a note, which has a fingering and a string-number -indication. +This defines a note, which has a conditional fingering and a +string-number indication. @item The settings for chord-fingering are more flexible. You can specify a diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 7df47a991a..d8222701cf 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -4437,7 +4437,7 @@ in this example disappears in the second line: @node Different editions from one source @subsection Different editions from one source -The @code{\\tag} command marks music expressions with a name. These +The @code{\tag} command marks music expressions with a name. These tagged expressions can be filtered out later. With this mechanism it is possible to make different versions of the same music source. diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 3808b14b73..f3ab5d6d09 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -45,8 +45,8 @@ produce printed output. You should then be able to create and print your first sheets of music. @menu -* First steps:: Music language of LilyPond. -* Running LilyPond:: Printing music. +* First steps:: +* Running LilyPond:: * More about pitches and accidentals:: * Octave entry:: * Combining music into compound expressions:: @@ -62,7 +62,7 @@ your first sheets of music. * Fine tuning layout:: * Organizing larger pieces:: * An orchestral part:: -* Integrating text and music:: Integrating text and music. +* Integrating text and music:: @end menu diff --git a/VERSION b/VERSION index f62e416fdf..e40bd83d6d 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=9 -PATCH_LEVEL=3 +PATCH_LEVEL=4 MY_PATCH_LEVEL= # Use the above to send patches: MY_PATCH_LEVEL is always empty for a diff --git a/input/ascii-art/as-email.ly b/input/ascii-art/as-email.ly index 2da58c9fb1..0565c44af8 100644 --- a/input/ascii-art/as-email.ly +++ b/input/ascii-art/as-email.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" % ASCII Art output % % Process as: diff --git a/input/ascii-art/as1.ly b/input/ascii-art/as1.ly index cf310912c8..5fa9c1474f 100644 --- a/input/ascii-art/as1.ly +++ b/input/ascii-art/as1.ly @@ -1,6 +1,6 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" \score { \context Voice \notes\relative c { diff --git a/input/ascii-art/as2.ly b/input/ascii-art/as2.ly index 3d0959193b..56e99ab593 100644 --- a/input/ascii-art/as2.ly +++ b/input/ascii-art/as2.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" % test for ascii-art output diff --git a/input/ascii-art/asciiscript5.ly b/input/ascii-art/asciiscript5.ly index 7f20238f65..23a20bd836 100644 --- a/input/ascii-art/asciiscript5.ly +++ b/input/ascii-art/asciiscript5.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" % ASCII Art output % % Process as: diff --git a/input/ascii-art/asciiscript9.ly b/input/ascii-art/asciiscript9.ly index 96858589ca..4564eb1bcd 100644 --- a/input/ascii-art/asciiscript9.ly +++ b/input/ascii-art/asciiscript9.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" % ASCII Art output % % Process as: diff --git a/input/ascii-art/r-as.ly b/input/ascii-art/r-as.ly index 3de5511e9e..95eb89f56e 100644 --- a/input/ascii-art/r-as.ly +++ b/input/ascii-art/r-as.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" % ASCII Art output % % Process as: @@ -10,14 +10,14 @@ \include "paper-as5.ly" \score{ - < + << \context Staff \notes\relative c'{ c d e f \repeat "volta" 2 { g a b c } \alternative { { c b a g } { f e d c } } } \context Lyrics \lyrics { - De eer- ste < { maat } { moet } > + De eer- ste << { maat } { moet } >> \repeat fold 2 { } \alternative { { en dan twee keer } @@ -25,5 +25,5 @@ } en dan nog dit er ach- ter aan } - > + >> } diff --git a/input/ascii-art/standchen-as5.ly b/input/ascii-art/standchen-as5.ly index 1f170cba65..6d50a2ac12 100644 --- a/input/ascii-art/standchen-as5.ly +++ b/input/ascii-art/standchen-as5.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" % ASCII Art output % % Process as: @@ -11,22 +11,22 @@ \include "paper-as5.ly" \score { - \context StaffGroup < + \context StaffGroup << \context Staff=upper \notes\relative c{ \key f \major \time 3/4 r8^"Moderato" %\pp - | - r8 + <> <> <> <> <> | + r8 <> <> } \context Staff=lower \notes\relative c{ \key f \major \time 3/4 \clef "bass" - r4 - r4 + <> r4 + <> r4 } - > + >> \paper { indent=4.0\char linewidth=78.0\char diff --git a/input/ascii-art/standchen-as9.ly b/input/ascii-art/standchen-as9.ly index 22ba0e21d2..7d7b0b5a4d 100644 --- a/input/ascii-art/standchen-as9.ly +++ b/input/ascii-art/standchen-as9.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" % ASCII Art output % Process as: @@ -12,22 +12,22 @@ \include "paper-as9.ly" \score { - \context GrandStaff < + \context GrandStaff << \context Staff=upper \notes\relative c{ \key f \major \time 3/4 r8^"Moderato" %\pp - | - r8 + <> <> <> <> <> | + r8 <> <> } \context Staff=lower \notes\relative c{ \key f \major \time 3/4 \clef "bass" - r4 - r4 + <> r4 + <> r4 } - > + >> \paper { indent=4.0\char linewidth=78.0\char diff --git a/input/ascii-art/twinkle-as5.ly b/input/ascii-art/twinkle-as5.ly index fcf0c7cb51..b1f63bc73a 100644 --- a/input/ascii-art/twinkle-as5.ly +++ b/input/ascii-art/twinkle-as5.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" % ASCII Art output % % Process as: @@ -62,12 +62,12 @@ text = \lyrics{ } \score{ - \context GrandStaff < + \context GrandStaff << \addlyrics \context Staff=upper \melody \context Lyrics=between \text \context Staff=lower \accompany - > + >> \paper{ \translator { \GrandStaffContext \accepts "Lyrics" } indent=4.0\char diff --git a/input/example-1.ly b/input/example-1.ly index d35b361c62..ec0862bed9 100644 --- a/input/example-1.ly +++ b/input/example-1.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.4" % A simple scale in LilyPond % % Type: diff --git a/input/example-2.ly b/input/example-2.ly index 3c935a2229..233e7de480 100644 --- a/input/example-2.ly +++ b/input/example-2.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.4" % Some beamed and slurred notes of different taste in LilyPond % % Type: diff --git a/input/example-3.ly b/input/example-3.ly index 00bad3cacb..7733741ee1 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" one = \notes\relative c{ c'' d e f @@ -11,10 +11,10 @@ two = \notes\relative c{ } \score{ - < + << \one \two - > + >> \paper{} \midi{} } diff --git a/input/les-nereides.ly b/input/les-nereides.ly index a9ba1ba5bc..da49e0a61a 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" \header { composer = "ARTHUR GRAY" @@ -22,7 +22,7 @@ marked with %tweak possibly more impressive to render without tweaks? - grep -v tweak input/les-nereides.ly > lnnt.ly + grep -v tweak input/les-nereides.ly >> lnnt.ly ly2dvi lnnt.ly %} @@ -37,18 +37,18 @@ treble = \new Voice \notes\relative c''{ r2 | %2 \stemUp - r4 <>\arpeggio r2 + r4 \arpeggio r2 | %3 - r4 <>\arpeggio r8. + r4 \arpeggio r8. \translator Staff=bass \once\property Voice.TextScript \set #'extra-offset = #'(-3 . -4) %tweak cis,16^2(^\markup {\small \italic "m.d." } - <>8 <> + 8 | %4 - <>4) + 4) \translator Staff=treble @@ -62,6 +62,8 @@ treble = \new Voice \notes\relative c''{ \tieUp cis''''4^\markup { \small \italic "m.g." }\arpeggio~ \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + cis8 %\stemBoth Hmm @@ -73,24 +75,26 @@ treble = \new Voice \notes\relative c''{ cis32[ a-1 fis-4 dis] cis[ a fis)-2] % the small grace in lower staff comes after us s32 - } + + \property Voice.Stem \revert #'stroke-style } + \stemUp cis'4( bis) | %5 - r8 <>8(\mf <> <> + r8 8(\mf % \fingerUp \property Voice.Fingering \set #'direction = #1 % Manual fix for collision with slur \property Voice.Fingering \set #'extra-offset = #'(0 . 1) %tweak - <> <> e)-1-4-5 r + e)-1-4-5 r | %6 - r <>8(\mf <> <> - <> <> e) r + r 8(\mf + e) r | %7 \bar "||" @@ -107,18 +111,18 @@ trebleTwo = \new Voice \notes\relative c''{ s1*2 | %4 s4 - <>4\arpeggio - <>2 + 4\arpeggio + 2 | %5 s8 cis4. d4 - %%<>8[( <> - <>8[( <>-3-1 + %%8[( + 8[( -3-1 | %6 - %%<>)] cis4. d4 - <>)]-2-1 cis4. d4 - <>8[( <> + %%)] cis4. d4 + )]-2-1 cis4. d4 + 8[( | %7 - <>)] + )] } bass = \new Voice \notes\relative c{ @@ -132,13 +136,13 @@ bass = \new Voice \notes\relative c{ \dynamicUp - r8. e,16(\f_2 <>8[ <>] + r8. e,16(\f_2 8[ ] | %2 - <>4 + 4 \translator Staff=treble \stemDown \property Voice.Slur \override #'attachment = #'(stem . stem) %tweak - <>4)\arpeggio + 4)\arpeggio \property Voice.Slur \revert #'attachment %tweak \translator Staff=bass @@ -148,17 +152,17 @@ bass = \new Voice \notes\relative c{ \property Voice.Slur \override #'y-free = #0.1 %tweak \property Voice.Slur \revert #'attachment-offset %tweak \property Voice.Slur \override #'attachment-offset = #'((0 . 3) . (0 . 8)) %tweak - r8. cis,,16( <>8 <> + r8. cis,,16( 8 | %3 \property Voice.Stem \set #'length = #5 %tweak - <>4 + 4 \translator Staff=treble \property Voice.Stem \revert #'length %tweak \property Voice.Stem \revert #'direction \property Voice.Stem \override #'direction = #-1 - <>)\arpeggio + )\arpeggio \translator Staff=bass \property Voice.Stem \revert #'direction r2 @@ -167,23 +171,27 @@ bass = \new Voice \notes\relative c{ \property Voice.Slur \revert #'beautiful %tweak \property Voice.Slur \revert #'attachment-offset %tweak \stemDown - <>4 + 4 \clef treble \stemBoth - < + << %urg: staff-change: ! on dis - <>\arpeggio - > + \arpeggio + >> \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + s8 s16 s s s32 s s s s s \clef bass \property Voice.fontSize = #-3 - <>32( - } <>2) + 32( + + \property Voice.Stem \revert #'stroke-style } + 2) | %5 \slurUp @@ -191,10 +199,10 @@ bass = \new Voice \notes\relative c{ % \fingerDown \property Voice.Fingering \set #'direction = #-1 - %%a,8 e'[-5(<>]) - a,8 e'[-5(<>])-2-3 - %%r b,-5 <>4 - r b,-5 <>4-3-5 + %%a,8 e'[-5(]) + a,8 e'[-5(])-2-3 + %%r b,-5 4 + r b,-5 4-3-5 \slurBoth \once \property Voice.Fingering \set #'extra-offset = #'(0 . -1) %tweak e,8[-5( @@ -203,7 +211,7 @@ bass = \new Voice \notes\relative c{ \once \property Voice.Fingering \set #'extra-offset = #'(0 . -1) %tweak a)-2] \slurUp - e'[(<>)] r b, <>4 + e'[()] r b, 4 \slurBoth e,8[( @@ -229,13 +237,17 @@ middleDynamics = \notes{ | %4 s2 \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + s8 s16 s s s32 s \once\property Dynamics.Hairpin \set #'extra-offset = #'(0 . 2) %tweak s\> s s32 s s s\! - } + + \property Voice.Stem \revert #'stroke-style } + s32 s-"rall." s s s8 s4 | %5 s2-"a tempo" s8 @@ -267,11 +279,15 @@ lowerDynamics = \notes{ %{ s4 \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + s8 s16 s s s32 s s s\sustainUp s32 s s s\sustainDown - } + + \property Voice.Stem \revert #'stroke-style } + %} s2 @@ -300,23 +316,23 @@ lowerDynamics = \notes{ } \score{ - \context PianoStaff < - \context Staff=treble < + \context PianoStaff << + \context Staff=treble << \treble \trebleTwo - > - \new Dynamics < + >> + \new Dynamics << \middleDynamics - > - \context Staff=bass < + >> + \context Staff=bass << \clef bass \bass \bassTwo - > - \new Dynamics < + >> + \new Dynamics << \lowerDynamics - > - > + >> + >> \paper { \translator { \ScoreContext diff --git a/input/mutopia-header.ly b/input/mutopia-header.ly index 4d33195271..a816ea387e 100644 --- a/input/mutopia-header.ly +++ b/input/mutopia-header.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.4" \header { title = "Title" subtitle = "Subtitle" diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly index bbc26cb360..d795d256d5 100644 --- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -8,7 +8,7 @@ copyright = "Public Domain" } -\version "1.9.1" +\version "1.9.4" \include "nederlands.ly" @@ -65,82 +65,82 @@ ii = \context Staff \notes\relative c'{ \context Voice=ii \voiceTwo - r8 <> r <> | r <> r <> | r <> r <> | - r <> r <> | r <> r <> | r <> r <> | - r <> r <> | r bes r <> | r <> r <> | - r <> r <> + r8 r | r r | r r | + r r | r r | r r | + r r | r bes r | r r | + r r % Au movement - r <> r <> | r <> r <> | r <> r <> | - r <> r <> | r <> r <> | r <> r <> | r <> r <> | - r <> r <> | r <> r <> | r <> r <> | - r <> r <> | + r r | r r | r r | + r r | r r | r r | r r | + r r | r r | r r | + r r | - r <> r <> r <> | + r r r | - r <> r <> | r <> r <> | r <> r <> | - r <> r <> | + r r | r r | r r | + r r | \translator Staff=bass\voiceOne - r <> r <> r <> | r <> + r r r | r \translator Staff=treble\voiceTwo - r <> r <> | + r r | - r <> r <> | r <> r <> | r <> r <> | - r <> r <> | r <> r <> | r <> r <> | - r <> r <> | r <> r <> | + r r | r r | r r | + r r | r r | r r | + r r | r r | % copy from begin: 1-10 - r8 <> r <> | r <> r <> | r <> r <> | - r <> r <> | r <> r <> | r <> r <> | - r <> r <> | r bes r <> | r <> r <> | - r <> r <> + r8 r | r r | r r | + r r | r r | r r | + r r | r bes r | r r | + r r } lower = \context Staff \notes \relative c{ \context Voice=iii - <>4 <> | r <> | <> <> | <> r | - <> <> | <> r | <> <> | - <> <> | <> <> | <> r | + 4 | r | | r | + | r | | + | | r | % Au movement - <> <> | <> <> | <> r | <> <> | - r <> | <> <> | r <> | <> r | <> <> | - <> <> | <> r | + | | r | | + r | | r | r | | + | r | - <> <> r | + r | - <> r | <> <> | <> <> | <> r | + r | | | r | - <> <> r | <> <> <> | + r | | - <> r | <> <> | <> <> | <> <> | - <> <> | <> <> | <> r | <> r + r | | | | + | | r | r % copy from begin: 1-10 - <>4 <> | r <> | <> <> | <> r | - <> <> | <> r | <> <> | - <> <> | <> <> | <> r | + 4 | r | | r | + | r | | + | | r | } \score { - \context GrandStaff < - \context Staff = treble < + \context GrandStaff << + \context Staff = treble << \global \clef violin \i \ii - > - \context Staff = bass < + >> + \context Staff = bass << \global \clef bass \lower - > - > + >> + >> \paper { \translator{ diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly index 1e4f2be1ea..56ea5c8fcd 100644 --- a/input/mutopia/F.Schubert/standchen.ly +++ b/input/mutopia/F.Schubert/standchen.ly @@ -42,7 +42,7 @@ instrument = "Piano" footer = "Mutopia-2001/04/27-xx" } -\version "1.9.1" +\version "1.9.4" dynamicUp = \property Voice.DynamicLineSpanner \override #'direction = #1 dynamicRevert = \property Voice.DynamicLineSpanner \revert #'direction @@ -65,14 +65,26 @@ vocalVerse = \notes\relative c''{ R2. | g8. b16 es4. d8 | c8. g16 es4. c8 | - \grace { as'32[( bes ] } \times 2/3 { as8[)( g)] as } c4. as8 | + \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + as'32[( bes ] + \property Voice.Stem \revert #'stroke-style } + \times 2/3 { as8[)( g)] as } c4. as8 | g2. | - \grace { f32[( g ] } \times 2/3 { f8[)( e)] f } as4. f8 | + \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + f32[( g ] + \property Voice.Stem \revert #'stroke-style } + \times 2/3 { f8[)( e)] f } as4. f8 | es!2. | g8. b16 es4. d8 | c8. g16 e4. c8 | - \grace { a'32[( b ] } \times 2/3 { a!8[)( gis)] a } c4. a8 | + \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + a'32[( b ] + \property Voice.Stem \revert #'stroke-style } + \times 2/3 { a!8[)( gis)] a } c4. a8 | g!2. | \times 2/3 { d'8[\f( cis)] d } f4. b,8 | c!2. | @@ -88,7 +100,11 @@ vocalThrough = \notes\relative c{ a8. b16 c4-> a8 r | R2. | R2. | - \grace { a32[( b ] } \times 2/3 { a!8[)( gis)] a } c4. a8 | + \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + a32[( b ] + \property Voice.Stem \revert #'stroke-style } + \times 2/3 { a!8[)( gis)] a } c4. a8 | g!2. | \times 2/3 { d'8[\f( cis)] d } f4. b,8 | c!2. ~ | @@ -140,209 +156,213 @@ lyricThrough = \lyrics{ } trebleIntro = \notes\relative c{ - r8^"\bf M\\\"a\\ss ig"\pp <>-. <>-. <>-. <>-. <>-. | - r8 <>-. <>-. <>-. <>-. <>-. | - r8 <>-. <>-. <>-. <>-. <>-. | - r8 <>-. <>-. <>-. <>-. <>-. | + r8^"\bf M\\\"a\\ss ig"\pp -. -. -. -. -. | + r8 -. -. -. -. -. | + r8 -. -. -. -. -. | + r8 -. -. -. -. -. | } trebleVerseOne = \notes\relative c{ %5 - r8 <> <> <> <> <> | - r8 <> <> <> <> <> | - r8 <> <> <> <> <> | - r8 <> <> <> <> <> | - <>4.( <>8) - \times 2/3 { <>([ <> <>)] } + r8 | + r8 | + r8 | + r8 | + 4.( 8) + \times 2/3 { ([ )] } %10 - <>2. | - r8 <> <> <> <> <> | - r8 <> <> <> <> <> | - r8 <> <> <> <> <> | + 2. | + r8 | + r8 | + r8 | r8 - <>[ - <> - <> - <>] - <>( - <>4.() - <>8) + [ + + + ] + ( + 4.() + 8) - \times 2/3 { <>([ <> <>)] } + \times 2/3 { ([ )] } %16 - <>2. | - r8 <> <> <> <> <> | - r8 <> <> <> <> <> | - r8\pp <> <> <> <> <> | + 2. | + r8 | + r8 | + r8\pp | %20 - r8 <> <> <> <> <> | + r8 | \property Voice.Slur \override #'attachment = #'(stem . stem) - \grace { as'32[( bes ] } + \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + as'32[( bes ] + \property Voice.Stem \revert #'stroke-style } + \times 2/3 { as8[)( g as] } c4.-> as8) | \property Voice.Slur \revert #'attachment g2. | - r8 <> <> <> <> <> | - r8 <> <> <> <> <> | - r8 <> <> <> <> <> | - r8 <> <> <> <> <> | - \times 2/3 { <>\f( <> <> } - <>4.-> <>8) | + r8 | + r8 | + r8 | + r8 | + \times 2/3 { \f( } + 4.-> 8) | } trebleEentje = \notes \relative c' \context Voice { \stemBoth - <>2 r4 | - <>2\(\mf <>8.(-> <>16)\) | + 2 r4 | + 2\(\mf 8.(-> 16)\) | % urg: slurs with staccati are ugly - <>4. <>8-.( <>-. <>)-. | - <>4. <>8-.( <>-. <>)-. | - <>2 <>4\pp | - <>2\( <>8.( <>16)\) | - <>4.\( <>8(-. <>-. <>)\)-. | - <>4. <>8(-. <>-. <>)-. | + 4. 8-.( -. )-. | + 4. 8-.( -. )-. | + 2 4\pp | + 2\( 8.( 16)\) | + 4.\( 8(-. -. )\)-. | + 4. 8(-. -. )-. | %60 - <>2 r4 | + 2 r4 | } trebleThrough = \notes \relative c'{ \stemBoth - <>2. | + 2. | %61 R2. | - <>8.[\< <>16 <>8. <>16\>\! <>8. <>16] | + 8.[\< 16 8. 16\>\! 8. 16] | %% score has double slur on chord. - <>4( <>) r\! + 4( ) r\! - <>4. <>8 <>8.->[ c16] | + 4. 8 8.->[ c16] | %65 - <>2.~(\f - <>2) r4 - < + 2.~(\f + 2) r4 + << { a'8. b16 c4^> ( a8) r | a8. b16 c4^> ( a8) r | }\\{ - <>4 <>2 | - <>4 <>2 | - } > + 4 2 | + 4 2 | + } >> % 4 bars copied from end verse1 - r8 <> <> <> <> <> | + r8 | %70 - r8 <> <> <> <> <> | - \times 2/3 { <>8( <> <> } + r8 | + \times 2/3 { 8( } - <>4.-> <>8) - <>2. | - <>2. | + 4.-> 8) + 2. | + 2. | \property Voice . TextScript \override #'font-shape = #'italic - <>2._"decresc." + 2._"decresc." \property Voice . TextScript \revert #'font-shape %75 - <>2. | - <>2 <>4\pp | + 2. | + 2 4\pp | % four copied from begin eentje - <>2( <>8.-> <>16) | - <>4. <>8(-. <>-. <>)-. | - <>4. <>8(-. <>-. <>)-. | + 2( 8.-> 16) | + 4. 8(-. -. )-. | + 4. 8(-. -. )-. | %80 \property Voice . TextScript \override #'font-shape = #'italic - <>2._"dim." + 2._"dim." \property Voice . TextScript \revert #'font-shape - <>2. | - <>2.\fermata | + 2. | + 2.\fermata | } bassIntro = \notes\relative c{ \dynamicUp %1 - <>2 r4 | - <>2 r4 | - <>2 r4 | - <>2 r4 | + 2 r4 | + 2 r4 | + 2 r4 | + 2 r4 | } bassVerseOne = \notes\relative c{ % \clef bass \dynamicUp %5 - <>2 r4 | - <>2 r4 | - <>2 r4 | - <>2 r4 | - <>8 <>[ <> <> <> <>] | + 2 r4 | + 2 r4 | + 2 r4 | + 2 r4 | + 8 [ ] | %10 - <>8 <>[ <> <> <> <>] | - <>2 r4 | - <>2 r4 | - <>2 r4 | - <>2 r4 | + 8 [ ] | + 2 r4 | + 2 r4 | + 2 r4 | + 2 r4 | %15 - bes'8 <>[ <> <> <> <>] | - es,8 <>[ <> <> <> <>] | - <>2 r4 | - <>2 r4 | - <>2 r4 | - <>2 r4 | - <>8 <>[ <> <> <> <>] | - <>8 <>[ <> <> <> <>] | - <>2 r4 | - <>2 r4 | - <>2 r4 | - <>2 r4 | - <>8 <>[ <> <> <> <>] | - c,8 <>[ <> <> <> <>] | + bes'8 [ ] | + es,8 [ ] | + 2 r4 | + 2 r4 | + 2 r4 | + 2 r4 | + 8 [ ] | + 8 [ ] | + 2 r4 | + 2 r4 | + 2 r4 | + 2 r4 | + 8 [ ] | + c,8 [ ] | } bassEentje = \notes\relative c{ \dynamicUp - <>8 <>[ <> <> <> <>] | - c,8 <>[ <> <> <> <>] | - <>8 <>[ <> <> <> <>] | - c,8 <>[ <> <> <> <>] | - <>8 <>[ <> <> <> <>] | - c,8 <>[ <> <> <> <>] | - <>8 <>[ <> <> <> <>] | - c,8 <>[ <> <> <> <>] | + 8 [ ] | + c,8 [ ] | + 8 [ ] | + c,8 [ ] | + 8 [ ] | + c,8 [ ] | + 8 [ ] | + c,8 [ ] | } bassThrough = \notes\relative c{ \dynamicUp %61 - <>8^"cresc." <>[ <> <> <>-> <>] | - <>8 <>[ <> <> <>-> <>] | + 8^"cresc." [ -> ] | + 8 [ -> ] | % copied - <>8 <>[ <> <> <>-> <>] | - <>8 <>[ <> <> <>-> <>] | + 8 [ -> ] | + 8 [ -> ] | %65 - <>8 <>[\> <> <> <> <> \!] | - <>8 <>[ <> <> <> <>] | - <>8 <>[ <> <> <> <>] | - <>8 <>[ <> <> <> <>] | + 8 [\> \!] | + 8 [ ] | + 8 [ ] | + 8 [ ] | % 4 bars copied from end verse1 - <>2\p r4 | + 2\p r4 | %70 - <>2 r4 | - <>8 <>[ <> <> <> <>] | - c,8\> <>[ << e g c>> \! <> <> <>] | + 2 r4 | + 8 [ ] | + c,8\> [ < e g c> \! ] | - <>8 <>[ <> <> <> <>] | - <>8 <>[ <> <> <> <>] | + 8 [ ] | + 8 [ ] | %75 - <>8 <>[ <> <> <> <>] | - c,8 <>[ <> <> <> <>] | - c,8 <>[ <> <> <> <>] | - c,8 <>[ <> <> <> <>] | - g,8 <>[ <> <> <> <>] | + 8 [ ] | + c,8 [ ] | + c,8 [ ] | + c,8 [ ] | + g,8 [ ] | %80 - c,8 <>[ <> <> <> <>] | - c,8 <>[ <> <> <> <>] | - <>2._\fermata | + c,8 [ ] | + c,8 [ ] | + 2._\fermata | } global = \notes{ @@ -389,11 +409,11 @@ vocals = \context Voice \notes { R1 * 3/4 * 6 } -vocalStaff = \context Staff = vocal< +vocalStaff = \context Staff = vocal<< \property Staff.midiInstrument = "synth voice" - \context Voice = "leise" < \global - \vocals > -> + \context Voice = "leise" << \global + \vocals >> +>> treble = { \clef treble @@ -405,11 +425,11 @@ treble = { \trebleThrough } -trebleStaff = \context Staff = treble< +trebleStaff = \context Staff = treble<< \property Staff.midiInstrument = "acoustic grand" \global \treble -> +>> bass = { \clef bass \bassIntro @@ -419,21 +439,21 @@ bass = { \bassThrough } -bassStaff = \context Staff = bass< +bassStaff = \context Staff = bass<< \property Staff.midiInstrument = "acoustic grand" \global \bass -> +>> -grandStaff = \context PianoStaff < +grandStaff = \context PianoStaff << \trebleStaff \bassStaff -> +>> \score{ - < + << %{ Transpose as you like for your voice @@ -450,7 +470,7 @@ grandStaff = \context PianoStaff < \vocalStaff \lyricStaff \grandStaff - > + >> \paper { % Use % textheight = 280.\mm diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly index 6fd589fe73..fb1018520e 100644 --- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly +++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.4" % #(ly:set-point-and-click 'line-column) @@ -53,40 +53,40 @@ sarabandeA = \context Voice \notes \relative c { \property Staff.NoteCollision \set #'merge-differently-dotted = ##t - < { d8. e16 e4.\trill d16 e } \\ - { d4 a2 } > - <>4. e'8[ d c] | + << { d8. e16 e4.\trill d16 e } \\ + { d4 a2 } >> + 4. e'8[ d c] | bes[ g'] f[ e16(f] g[ a bes d,)] | cis4.\trill b8[ a g] | %% check spacing without accs: %% c4.\trill bes8[ a g] | - < { d'8. e16 e4.\trill d16 e | + << { d'8. e16 e4.\trill d16 e | f4. d8[ e f] } \\ - { <>4 a2 <>4. } > | + { 4 a2 4. } >> | %%7 g8 bes16(a) c(bes) a(g) d'8 f, | - < e4.\trill - \\ <>4 > + << e4.\trill + \\ 4 >> d8[ c bes] %%9 - < { f'8 g16(a) a4. g16(f) | + << { f'8 g16(a) a4. g16(f) | g8 a16(bes) bes4. c16(d) } \\ - { a,4 <>4. r8 bes4 <>2 } - > | + { a,4 4. r8 bes4 2 } + >> | \forcedBreak %% 11 e,8[ f] c,[ g'] f'[ e] | f4 f,2 | - < { a'4 a4.\trill bes8 + << { a'4 a4.\trill bes8 c bes16 a } \\ - { f8[ es] es4. r8 d4 } > + { f8[ es] es4. r8 d4 } >> fis8.\trill es16 d8 c | bes[ g'] @@ -95,7 +95,7 @@ sarabandeA = \context Voice \notes \relative c { \forcedBreak %%16 - << bes d, g, >>4.\trill a8[ g f!] | + < bes d, g, >4.\trill a8[ g f!] | e bes a f' g a | d, as g es' f g | cis,[ bes'] a[ g16 f] e!8[ f16 d] | @@ -103,23 +103,23 @@ sarabandeA = \context Voice \notes \relative c { \forcedBreak %%21 - < { d e16(f) f4. e16(d) | + << { d e16(f) f4. e16(d) | e8 f16(g) g4. a16(bes) | a8 cis16 d d,8 e16 f32 g f8\trill e16(d) } \\ { bes4 g2 | - g4 <>4. s8 | - <>8 r r g, a4 } > + g4 4. s8 | + 8 r r g, a4 } >> | \stemUp d4 d,16 a'( b cis d e f g) | \stemBoth \forcedLastBreak %%25 - < { a16(b c b) c4. b16(a) | + << { a16(b c b) c4. b16(a) | b cis d cis d4. e16(f) | } \\ { f,4 fis4. s8 | - <>4 gis4. } > + 4 gis4. } >> \voiceOne d16(cis d) f, a,8[ e'] @@ -148,11 +148,11 @@ sarabandeCelloGlobal = \notes{ sarabandeCelloScripts = \notes{ } -sarabandeCelloStaff = \context Staff < +sarabandeCelloStaff = \context Staff << \sarabandeA \sarabandeCelloGlobal \sarabandeCelloScripts -> +>> % size perversions smallerPaper = \paper { diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly index 95300bb8cb..ec5f7d7707 100644 --- a/input/mutopia/J.S.Bach/bwv940.ly +++ b/input/mutopia/J.S.Bach/bwv940.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" %{ Header for Petites Preludes. @@ -120,13 +120,13 @@ four = \notes\relative c{ \stemUp\tieUp b2 a | g a4. gis16 a | - gis2 << g cis,>>8 <> e4 | + gis2 < g cis,>8 e4 | d4. fis16 g r16 bes8. ~ bes4 | %10 \stemDown - < d,1 { \fatText s4^\markup { \hspace #20 } + << d,1 { \fatText s4^\markup { \hspace #20 } s4^\markup { \hspace #1 } s4 } - > + >> } global = \notes{ @@ -136,19 +136,19 @@ global = \notes{ \score{ % Allegretto - \context PianoStaff < - \context Staff = upper < + \context PianoStaff << + \context Staff = upper << \global \context Voice = i\one \context Voice = ii \two - > - \context Staff = lower < + >> + \context Staff = lower << \global \clef "bass" \context Voice= iii \three \context Voice = iv \four - > - > + >> + >> \paper{ linewidth = 17.0 \cm \translator { diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly index 3ab00313b5..4d4dcfd91d 100644 --- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -38,7 +38,7 @@ %} -\version "1.9.1" +\version "1.9.4" @@ -100,8 +100,8 @@ dux = \context Voice=two \notes \relative c''{ b, c d b b c r c | f16 d es c ~ c8 b c4 r8 e | %%30 - f4 r8 f f es16 d es8 <> | - <> r <> r <>2 | + f4 r8 f f es16 d es8 | + r r 2 | } @@ -143,7 +143,7 @@ comes = \context Voice=one \notes \relative c'' { g f16 es f8 d as' g r a | b c f,16 es d c c8 c'16 b c8 g | %%30 - as c16 b c8 <> g,8 c16 b c8 d | + as c16 b c8 g,8 c16 b c8 d | f,16 g as4 g16 f e2 | } @@ -186,26 +186,26 @@ bassdux = \context Voice=three \notes \relative c' { f,16 g as4 g16 f es4 r8 es' | d c g' g, %%30 - < { c2 ~ | c1 ~ | c1 } \\ + << { c2 ~ | c1 ~ | c1 } \\ { c,2 ~ | c1 ~ | c1 } - > + >> } \score { - \notes \context PianoStaff < + \notes \context PianoStaff << \property Score.TimeSignature \override #'style = #'C - \context Staff = treble < + \context Staff = treble << \key c \minor \dux { \comes \bar "|." } \time 4/4 - > - \context Staff = bass < + >> + \context Staff = bass << \key c \minor \bassdux - > - > + >> + >> \paper { linewidth = 18.0 \cm diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index acff585107..1059cb5b87 100644 --- a/input/mutopia/R.Schumann/romanze-op28-2.ly +++ b/input/mutopia/R.Schumann/romanze-op28-2.ly @@ -6,7 +6,7 @@ %% 19 is broken --hwn. %\include "paper19.ly" \include "paper16.ly" -\version "1.9.1" +\version "1.9.4" \header { title = "Romanzen" @@ -54,12 +54,12 @@ righta = \notes \transpose c cis' { } \forcedBreak \stemUp \slurUp \tieUp - b4^5( <>8~<> a g^4 | + b4^5( 8~ a g^4 | f4^5 e8^5~e d4)^4 | - as4^4( <>8~<> g^5 f^4 | + as4^4( 8~ g^5 f^4 | es4^5 d8^5~d c4)^4 | - c^4( es8^5~<> d^3 f) | - e4^4( g8^5~<> f^3 as) | + c^4( es8^5~ d^3 f) | + e4^4( g8^5~ f^3 as) | g4^4 b8^5~b a c'^5~ | c' b^4 ges^5 des^3 b,^5 \d ges,16[^4 f,] | e,^2^\markup { \large "ritard..." } cis,^1 \u r8 r r4 r16 \d gis,^2^"R.H."] | @@ -76,13 +76,13 @@ righta = \notes \transpose c cis' { as' des'^1 c'8^\markup { \finger "2-3" } h~h c'16) \clef F e,16[(^2 f, g,] | \forcedBreak - as,[^5 h,,^2)] \clef G <>8[( <>16 c'] <>4.~ - <>8) s4 s8 r16 h^2( c' d' | + as,[^5 h,,^2)] \clef G 8[( 16 c'] 4.~ + 8) s4 s8 r16 h^2( c' d' | es' ges-1 f-2 a-1 c'-2 f'-4 \stemUp \tieUp e'-5 d' c' b-4 a^\prall^\markup { \finger "2-4-3" } g | - f) f'-5( e'-5 d'-4 c'-3 f')-5 <>4( <>8 | - <>4 <>8 f16^4 d'^5~ d'8.[ c'16^4] | + f) f'-5( e'-5 d'-4 c'-3 f')-5 4( 8 | + 4 8 f16^4 d'^5~ d'8.[ c'16^4] | \forcedBreak - < f8)^3_\pp \context Voice = another { \m a,16[ \u c8 c16] } > \m g,[ \u c_3] \m b,[^\markup { \finger "2-1" } \u c8 c16] \m a,[ \u c]~ | \stemBoth + << f8)^3_\pp \context Voice = another { \m a,16[ \u c8 c16] } >> \m g,[ \u c_3] \m b,[^\markup { \finger "2-1" } \u c8 c16] \m a,[ \u c]~ | \stemBoth c16 c8_4 c c16~c c8_2 c c16~ | c16 c8 c c16~c c8 c c16~ | c16 c8 c c16 r4^\fermata r8 | \bar "|." @@ -131,14 +131,18 @@ rightb = \notes \transpose c cis' { \stemUp \tieUp as r4 r8 | } s2. s - \u s4. \grace {f8(} f4) e8 | + \u s4. \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + f8( + \property Voice.Stem \revert #'stroke-style } + f4) e8 | f g16_2 b_1 a_2 gis_1 c_2 h, c cis_1 d_2 b,_1 | - \tieDown c4.~<>16\< \tieBoth <>~ << f^3 h >>8[\>\! << e b^2>> \!] | + \tieDown c4.~16\< \tieBoth ~ < f^3 h >8[\>\! < e b^2> \!] | \translator Staff=mid \transpose c' c { a4^1( g8^1 b4 a8^2 | - f8..^1 f32^1 g8^2 a8..) \slurUp <>32( <>8 | - <>8..) <>32( <>8 <>4.\>) ~ | + f8..^1 f32^1 g8^2 a8..) \slurUp 32( 8 | + 8..) 32( 8 4.\>) ~ | a~ a\!^\fermata \bar "|." } } @@ -156,23 +160,23 @@ lefta = \notes \transpose c cis { e4^1 d8^1~d c4)^1 | } \d \tieBoth \slurDown - < + << \transpose c' c { g4 a8~a f g | a4 g8~g f e | d4 g8~g es f | g4 f8~f es d | c4 r8 f4 as8~ | as g b as4 ces'8~ | - ces' b des' c'4 \context Voice=another { \stemUp \tieUp <>8~ | + ces' b des' c'4 \context Voice=another { \stemUp \tieUp 8~ | es' des'4^1~ \stemDown des'8.[ c'16] } } \transpose c' c, { g4(-4 a8-3~a f-5 g-4 | a4-3 g8-\markup { \finger "4-3" } ~g f-4 e-5 | d4)-\markup { \finger "4-5" }( g8-3~g es f-4 | g4-3 f8-4~f es d-4 | c4) r8 f4-4( as8-5~ | as g-4 b)-5 as4-5( ces'8-4~ | - ces' b des'-4 c'4)-5( <>8 | + ces' b des'-4 c'4)-5( 8 | \stemDown \tieDown des'4.)_5~des'~ | \property Voice.NoteColumn \override #'horizontal-shift = #-1 des' s } - > + >> \translator Staff=down \stemUp \slurUp \tieUp \phrasingSlurUp f4^1( e8^1 g4^1 f8^1 | d8..^1 d32^2 e8^1 f4.) | @@ -183,8 +187,12 @@ lefta = \notes \transpose c cis { d' d'8..^\accent d'32-1 s4. | s2.*2 s8 r16 h\( c' d' es' as g8\arpeggio fis( - ges)\) f16-2( a-1 c'-3 f')-1 \grace {\stemDown \slurUp b,[( f] \stemUp } e')-1( d' c' b-1 a-2\prall g - f16)-4 f' <> d'-1 c'-2 h-1 s4. + ges)\) f16-2( a-1 c'-3 f')-1 \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + \stemDown \slurUp b,[( f] \stemUp + \property Voice.Stem \revert #'stroke-style } + e')-1( d' c' b-1 a-2\prall g + f16)-4 f' d'-1 c'-2 h-1 s4. s2. f4^1( e8 g4 f8 | d8..^1 d32-2 e8^1 f8..) d32^2( e8^1 | @@ -215,11 +223,11 @@ leftb = \notes \transpose c cis { a) c_3 f, c c'[ f_2] b, f b f_3 d' as | h, as d' as h, as( f'4.)^\fermata\arpeggio_2 ~ \d \stemDown f'8. \clef G \stemBoth \tieBoth \phrasingSlurDown - \transpose c c' { e16[_4( f g] as[ des_3] c8[_4 <>)]~ | - <>} \clef F <>[( <>] <>8.) h,16_4\( c d | + \transpose c c' { e16[_4( f g] as[ des_3] c8[_4 )]~ | + } \clef F [( ] 8.) h,16_4\( c d | \voiceTwo es as,_3 g,8 fis,~fis, g,_4\arpeggio gis,_5~ | - gis, <>16\) r16 r8 r4 cis8( | + gis, 16\) r16 r8 r4 cis8( | d) e( f16_4 d_5 c4.)_ \markup { \finger "4-3" }~ | \oneVoice c16( h,_4 c_3 cis_1 d_2 b,_3 a,_4 as,_1 g,8 c,8) | @@ -231,7 +239,7 @@ leftb = \notes \transpose c cis { } \score { \notes - \context PianoStaff < + \context PianoStaff << \pianoCautionaries \property PianoStaff.NoteCollision \override #'merge-differently-dotted = ##t \property PianoStaff.connectArpeggios = ##t @@ -244,7 +252,7 @@ leftb = \notes \transpose c cis { \property PianoStaff.instrument="2. " \context Staff = up { \property Staff.DynamicLineSpanner \override #'direction = #-1 - \clef G <\global \context Voice=upv \righta > + \clef G <<\global \context Voice=upv \righta >> } \context Staff = mid { \property Staff.InstrumentName \set #'font-relative-size = #0 @@ -252,15 +260,15 @@ leftb = \notes \transpose c cis { \property Staff.InstrumentName \set #'font-magnification = #1 \property Staff.InstrumentName \set #'extra-offset = #'(0 . 6) % \property Staff.instrument="\\begin{turn}{-90}{Rechte Hand}\\end{turn}" - \property Staff.instrument= \markup { \column << Rechte Hand >> } - \clef F <\global \context Voice=midv \rightb> + \property Staff.instrument= \markup { \column < Rechte Hand > } + \clef F <<\global \context Voice=midv \rightb>> } \context Staff = down { \property Staff.DynamicLineSpanner \override #'direction = #1 \clef F - < \global \context Voice=lva \lefta \context Voice=lvb \leftb > + << \global \context Voice=lva \lefta \context Voice=lvb \leftb >> } - > + >> \paper { interscoreline = 0.0 interscorelinefill = 1 diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly index f6c9c1ee3f..52ec8a658b 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly @@ -30,7 +30,7 @@ virtuoso that taught in Geneva. %} -\version "1.9.1" +\version "1.9.4" \include "mozart-hrn3-defs.ly" \include "mozart-hrn3-allegro.ly" diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly index 97c4f8100a..dd5c29590e 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" \include "mozart-hrn3-defs.ly" allegro = @@ -26,7 +26,11 @@ allegro = dis4 ( e4) r8 c8[-. c-. c-.] c4.( d16[ e] f4 e) a,( d g, c) - d-. d-. \grace e16( d8.[) c16 d8. e16] + d-. d-. \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + e16( + \property Voice.Stem \revert #'stroke-style } + d8.[) c16 d8. e16] c4 r r2 R1*3 c,2 ~ c8[ e g c] @@ -40,7 +44,11 @@ allegro = d2( ~ d8[ e16 d] c8[ b)] | b[( a)] a4 r8 a[ a a] a4( cis e g) - \grace { \longgrace g16( \endlonggrace } + \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + \longgrace g16( \endlonggrace + \property Voice.Stem \revert #'stroke-style } + fis8[)( e16 d)] d4-. r2 | \mark "B" R1*3 @@ -58,8 +66,12 @@ allegro = c,2\p e4 g c \cresc e g4. e8 | \endcresc d4.\f e16[ fis] g[ ( fis) e d] c[( b) a g] - < a1(\trill - { s2 \grace{ g16[ a] } } > + << a1(\trill + { s2 \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + g16[ a] + \property Voice.Stem \revert #'stroke-style } + } >> \mark "C" g4) r r2 R1*15 @@ -98,7 +110,11 @@ allegro = c4.( d16[ e] f4 e) a, ( d g, c) d d - \grace { e8( } + \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + e8( + \property Voice.Stem \revert #'stroke-style } + d8.[) c16 d8. e16] c4 r r2 \mark "F" @@ -108,8 +124,16 @@ allegro = c,8[ e g c ] e[ ( g) e c] c[( b)] b4 r2 c2 (bes a) a8[(b c cis)] - d2( ~ d8[ e16 d] \grace { \longgrace d16( \endlonggrace } c8[) b16 c)] - \grace { \longgrace c16 \endlonggrace } b8[( a16 g)] g4 r2 | + d2( ~ d8[ e16 d] \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + \longgrace d16( \endlonggrace + \property Voice.Stem \revert #'stroke-style } + c8[) b16 c)] + \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + \longgrace c16 \endlonggrace + \property Voice.Stem \revert #'stroke-style } + b8[( a16 g)] g4 r2 | R1*3 r2 r4 g'8[( e)] \mark "G" @@ -128,10 +152,18 @@ allegro = f4. ( d8) f8[ ( d) f d] - c[ (e] g2) \grace { \longgrace f16( \endlonggrace } e8[)( d16 c)] + c[ (e] g2) \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + \longgrace f16( \endlonggrace + \property Voice.Stem \revert #'stroke-style } + e8[)( d16 c)] - < d1\trill ( - { s2 \grace { c16[ d] } } > + << d1\trill ( + { s2 \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + c16[ d] + \property Voice.Stem \revert #'stroke-style } + } >> c4) r r2 R1 | @@ -144,8 +176,12 @@ allegro = g4 \times 2/3 { r8 c8[( g)] } \times 2/3 { e[ ( g) e-. ] } \times 2/3 { c[ ( e) c-.] }| g4 r8 g'\f a[ b c d]| - < d1(\trill - { s2 \grace { c16[ d] } } > + << d1(\trill + { s2 \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + c16[ d] + \property Voice.Stem \revert #'stroke-style } + } >> c4) r r2 R1*3 diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly index e69eccc852..4652a43a7b 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly @@ -4,7 +4,7 @@ longgrace = \property Voice.Stem \override #'stroke-style = #'() endlonggrace = \property Voice.Stem \revert #'stroke-style ritenuto = \markup { \italic "rit." } -\version "1.9.1" +\version "1.9.4" cresc = \notes { #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly index 25707e423b..bbf239b8ed 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly @@ -1,6 +1,6 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" \include "mozart-hrn3-defs.ly" romanze = \notes \relative c' { @@ -44,7 +44,11 @@ romanze = \notes \relative c' { d8[( e f d)] b4 r8 g c[ ( e) g g] g[( f e d)] c4( - \grace { \longgrace e16 \endlonggrace } + \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + \longgrace e16 \endlonggrace + \property Voice.Stem \revert #'stroke-style } + d8.[ c16) \< ] c8[ c-.( c-. c)-.]\! \mark "C" diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly index 3cf551c173..a8a9dd1475 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" % \include "mozart-hrn3-defs.ly" @@ -47,9 +47,17 @@ rondo = \notes \relative c' c4 r8 r4 r8 | R2.*7 \mark "A" - c4.\p \grace { e16( } d8[) c d] + c4.\p \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + e16( + \property Voice.Stem \revert #'stroke-style } + d8[) c d] c4 r8 r4 r8 - e4. \grace g16( f8[) e f] + e4. \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + g16( + \property Voice.Stem \revert #'stroke-style } + f8[) e f] e4 r8 r4 r8 g4. e4 c8 g2.~ @@ -85,8 +93,8 @@ rondo = \notes \relative c' b[( d) d-.] d[( g) g-.] g2.~ g8[ \> a g] f[ e d] - < \rondotheme - { s8\!\p } > + << \rondotheme + { s8\!\p } >> R2.*12 r4 r8 r4 c8 @@ -140,8 +148,8 @@ rondo = \notes \relative c' %% EB does the slur in the Rondo differently from the 1st adn 2nd time. %% why. Should check with MS. - < \rondotheme - { s8\p } > + << \rondotheme + { s8\p } >> R2.*7 \mark "G" R2.*4 @@ -162,8 +170,12 @@ rondo = \notes \relative c' g4 r8 g''8[ e c] - < d2.(\trill - { s2 \grace { c16[ d] } } > + << d2.(\trill + { s2 \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + c16[ d] + \property Voice.Stem \revert #'stroke-style } + } >> c4) r8 r4 r8 diff --git a/input/no-notation/bar-check.ly b/input/no-notation/bar-check.ly index 368ec9b3be..e7ade4033e 100644 --- a/input/no-notation/bar-check.ly +++ b/input/no-notation/bar-check.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.4" \header { diff --git a/input/no-notation/beam-warn.ly b/input/no-notation/beam-warn.ly index 2def790b58..c6b1403f0b 100644 --- a/input/no-notation/beam-warn.ly +++ b/input/no-notation/beam-warn.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.4" \header { diff --git a/input/no-notation/denneboom.ly b/input/no-notation/denneboom.ly index f2b75faac9..528927bdcc 100644 --- a/input/no-notation/denneboom.ly +++ b/input/no-notation/denneboom.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.4" \header{ filename = "denneboom.ly" enteredby = "jcn" diff --git a/input/no-notation/die-staff.ly b/input/no-notation/die-staff.ly index c3327ba8b0..7471aefd64 100644 --- a/input/no-notation/die-staff.ly +++ b/input/no-notation/die-staff.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.4" \header { texidoc = "a staff should really die, if no one's referencing it." @@ -11,13 +11,13 @@ texidoc = "a staff should really die, if no one's referencing it." \break - \context PianoStaff < + \context PianoStaff << \context Staff = i { \notes { a' b' c' d' } } \context Staff = ii { \notes { \clef "bass" a b c d } } - > + >> } } diff --git a/input/no-notation/midi-grace.ly b/input/no-notation/midi-grace.ly index 1e287f65d8..a804b85fc6 100644 --- a/input/no-notation/midi-grace.ly +++ b/input/no-notation/midi-grace.ly @@ -1,12 +1,20 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" \header{ texidoc = "Tests MIDI output with grace notes. " } \score { \context Voice \notes\relative c { \context Voice=VoiceOne - \grace c8 d4 d d d d - \grace { e16 f e f } d4 d d d d + \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + c8 + \property Voice.Stem \revert #'stroke-style } + d4 d d d d + \grace { + \property Voice.Stem \override #'stroke-style = #"grace" + e16 f e f + \property Voice.Stem \revert #'stroke-style } + d4 d d d d } \paper { } diff --git a/input/no-notation/midi-transposing.ly b/input/no-notation/midi-transposing.ly index d9a0732c50..f0926243ad 100644 --- a/input/no-notation/midi-transposing.ly +++ b/input/no-notation/midi-transposing.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" \header { texidoc = "@cindex Transposing The transposing property leaves output invariant, but has effect on MIDI. " diff --git a/input/no-notation/midi-tuplets.ly b/input/no-notation/midi-tuplets.ly index 2292bca68e..262302e4ad 100644 --- a/input/no-notation/midi-tuplets.ly +++ b/input/no-notation/midi-tuplets.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" \header { texidoc = " diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly index 0c271ddff1..6eec909469 100644 --- a/input/no-notation/midi-volume-equaliser.ly +++ b/input/no-notation/midi-volume-equaliser.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" \header { texidoc = "@cindex Midi Volume Equaliser The full orchestra plays a notes, where groups stop one after @@ -116,34 +116,34 @@ violoncello = \notes \relative c' { \score { - < - \context StaffGroup ="legni" < + << + \context StaffGroup ="legni" << \context Staff ="flauti" \flauti \context Staff ="oboi" \oboi \context Staff ="clarinetti" \clarinetti \context Staff ="fagotti" \fagotti - > - \context StaffGroup ="ottoni" < + >> + \context StaffGroup ="ottoni" << \context Staff ="corni" \corni \context Staff ="trombe" \trombe - > - \context StaffGroup ="timpani" < + >> + \context StaffGroup ="timpani" << \context Staff ="timpani" \timpani { \skip 1 % Hmm: this forces a staff-bracket, that's good! % However, I can't find where is decided on staff-bracket yes/no } - > - \context StaffGroup ="archi" < - \context GrandStaff ="violini" < + >> + \context StaffGroup ="archi" << + \context GrandStaff ="violini" << \context Staff ="violino1" \violinoI \context Staff ="violino2" \violinoII - > + >> \context Staff ="viola" \viola \context Staff ="violoncello" \violoncello - > - > + >> + >> \paper { \paperSixteen diff --git a/input/no-notation/parse.ly b/input/no-notation/parse.ly index fb2ab070e9..c613d5bce0 100644 --- a/input/no-notation/parse.ly +++ b/input/no-notation/parse.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.4" % Test parser error diff --git a/input/no-notation/parse2.ly b/input/no-notation/parse2.ly index d1156d561b..53c7b82adf 100644 --- a/input/no-notation/parse2.ly +++ b/input/no-notation/parse2.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.4" % Test parser error diff --git a/input/no-notation/parse3.ly b/input/no-notation/parse3.ly index a133a2d4b2..d85b973a21 100644 --- a/input/no-notation/parse3.ly +++ b/input/no-notation/parse3.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.4" % Test parser error diff --git a/input/no-notation/parse4.ly b/input/no-notation/parse4.ly index a20fe9bc16..e4eeb9b3da 100644 --- a/input/no-notation/parse4.ly +++ b/input/no-notation/parse4.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.4" % Test parser error diff --git a/input/no-notation/parse5.ly b/input/no-notation/parse5.ly index 28b5be6d48..1945ac59e5 100644 --- a/input/no-notation/parse5.ly +++ b/input/no-notation/parse5.ly @@ -1,11 +1,11 @@ -\version "1.9.1" +\version "1.9.4" %If you specify two different key sigs at one point, a %warning is printed. \score { \notes -\context Voice < +\context Voice << { \key cis \major cis4 \key bes \major bes4 } { \key cis \major fis4 \key es \major g4 } -> +>> } diff --git a/input/no-notation/pc-direction.ly b/input/no-notation/pc-direction.ly index 471cdaf19a..a36ff6dce9 100644 --- a/input/no-notation/pc-direction.ly +++ b/input/no-notation/pc-direction.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" % move to regtest once it works? @@ -35,22 +35,22 @@ contrabasso = \notes\relative c { a1 } -violeStaff = \notes \context Staff = viole < - \context Voice=oneViole < +violeStaff = \notes \context Staff = viole << + \context Voice=oneViole << \property Staff.instrument = #"Viola" \property Staff.instr = #"Vla." \End - > - \context Voice=twoViole < + >> + \context Voice=twoViole << \property Staff.instrument = #"Viola II" \property Staff.instr = #"Vla. II" \End - > + >> \context Voice=oneViole \partcombine Voice \context Thread=oneViole \violaI \context Thread=twoViole \violaII -> +>> staffCombinePianoStaffProperties = { \property PianoStaff.devNullThread = #'() @@ -67,30 +67,30 @@ staffCombinePianoStaffProperties = { \score { - < - \context StaffGroup < + << + \context StaffGroup << \violeStaff - \context PianoStaff = bassi_group \notes < + \context PianoStaff = bassi_group \notes << \staffCombinePianoStaffProperties - \context Staff=oneBassi < \clef bass + \context Staff=oneBassi << \clef bass \property Staff.instrument = #'(lines "Violoncello" " e" "Contrabasso") \property Staff.instr = #"Vc." - \End > - \context Staff=twoBassi < \clef bass + \End >> + \context Staff=twoBassi << \clef bass \property Staff.instrument = #"Contrabasso" \property Staff.instr = #"Cb." - \End > + \End >> \context Staff=oneBassi \partcombine Staff \context Voice=oneBassi { \violoncello } \context Voice=twoBassi { \contrabasso } - > -> - > + >> +>> + >> \paper { % \paperSixteen linewidth = 80 * \staffspace diff --git a/input/no-notation/textcresc.ly b/input/no-notation/textcresc.ly index 13066d9777..71215de057 100644 --- a/input/no-notation/textcresc.ly +++ b/input/no-notation/textcresc.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.4" \header{ texidoc="crashes lily" } diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly index b28f154d92..44793116ae 100644 --- a/input/puer-fragment.ly +++ b/input/puer-fragment.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.4" \header { title = "Puer natus est nobis (excerptum)" subtitle = "Antiphona ad introitum VII" @@ -91,11 +91,11 @@ verba = \context Lyrics = verba \lyrics { } \score { - \context VaticanaVoice < + \context VaticanaVoice << \addlyrics \cantus \verba - > + >> \paper { stafflinethickness = \staffspace / 7.0 linewidth = 137.0\mm diff --git a/input/regression/+.ly b/input/regression/+.ly index eacf41865a..07277ca72d 100644 --- a/input/regression/+.ly +++ b/input/regression/+.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" %% +.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 2ef1a22bfe..0353c7a5bb 100644 --- a/input/regression/accidental-cautionary.ly +++ b/input/regression/accidental-cautionary.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Cautionary accidentals are indicated using either diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly index 4f5465c506..f8c70731c4 100644 --- a/input/regression/accidental-double.ly +++ b/input/regression/accidental-double.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "If two forced accidentals happen at the same time, only one sharp sign is printed." @@ -6,11 +6,11 @@ \score { \notes \transpose c c' - \context Staff < + \context Staff << \key g \major \context Voice=va { \stemUp c' fis! } \context Voice=vb { \stemDown c fis! } - > + >> \paper { raggedright= ##t } diff --git a/input/regression/accidental-ledger.ly b/input/regression/accidental-ledger.ly index 694e61bbb3..2b9699adce 100644 --- a/input/regression/accidental-ledger.ly +++ b/input/regression/accidental-ledger.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 d69bcd41fc..ac7862f0cb 100644 --- a/input/regression/accidental-octave.ly +++ b/input/regression/accidental-octave.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc=" @@ -55,28 +55,28 @@ mus = \notes { \property Score.autoAccidentals = #'(Staff (same-octave . 0)) - < s1^""^""^"$\\backslash$property Score.autoAccidentals = \\#'(Staff (same-octave . 0))" \mel > + << s1^""^""^"$\\backslash$property Score.autoAccidentals = \\#'(Staff (same-octave . 0))" \mel >> \property Score.autoAccidentals = #'(Staff (same-octave . 1)) - < s1^""^""^"$\\backslash$property Score.autoAccidentals = \\#'(Staff (same-octave . 1))" \mel > + << s1^""^""^"$\\backslash$property Score.autoAccidentals = \\#'(Staff (same-octave . 1))" \mel >> \property Score.autoAccidentals = #'(Staff (any-octave . 0)) - < s1^""^""^"$\\backslash$property Score.autoAccidentals = \\#'(Staff (any-octave . 0))" \mel > + << s1^""^""^"$\\backslash$property Score.autoAccidentals = \\#'(Staff (any-octave . 0))" \mel >> \property Score.autoAccidentals = #'(Staff (any-octave . 1)) - < s1^""^""^"$\\backslash$property Score.autoAccidentals = \\#'(Staff (any-octave . 1))" \mel > + << s1^""^""^"$\\backslash$property Score.autoAccidentals = \\#'(Staff (any-octave . 1))" \mel >> \modernAccidentals - < s1^""^""^"$\\backslash$modernAccidentals" \mel > + << s1^""^""^"$\\backslash$modernAccidentals" \mel >> \modernCautionaries - < s1^""^""^"$\\backslash$modernCautionaries" \mel > + << s1^""^""^"$\\backslash$modernCautionaries" \mel >> \noResetKey - < s1^""^""^"$\\backslash$noResetKey" \mel > + << s1^""^""^"$\\backslash$noResetKey" \mel >> \forgetAccidentals - < s1^""^""^"$\\backslash$forgetAccidentals" \mel > + << s1^""^""^"$\\backslash$forgetAccidentals" \mel >> } \score { - < \context Staff \mus + << \context Staff \mus \context NoteNames \apply #no-octaves \mus - > + >> \paper { indent=0.0 } diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly index 374e10dd73..fce0063658 100644 --- a/input/regression/accidental-placement.ly +++ b/input/regression/accidental-placement.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { @@ -15,18 +15,18 @@ flats in a sixth should be staggered. " cis4 c4 \transpose c c' { - <>4 - <> - <> - <> - <> + 4 + + + + } - <>4 - <> - <> - <> - <> - <> + 4 + + + + + } \paper { raggedright = ##t} } diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly index 60ced5fd34..62158b9f35 100644 --- a/input/regression/accidental-single-double.ly +++ b/input/regression/accidental-single-double.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" A sharp sign after a double sharp sign, as well as a flat sign @@ -14,11 +14,11 @@ thenotes = \notes \relative cis' { \time 4/4 gisis'4 gis gisis ges | } -\score { < \context Staff \thenotes +\score { << \context Staff \thenotes \context NoteNames { \property NoteNames.NoteName \override #'no-spacing-rods = ##f \thenotes } - > + >> } diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly index a2204bce51..751fdbcfa0 100644 --- a/input/regression/accidental-unbroken-tie-spacing.ly +++ b/input/regression/accidental-unbroken-tie-spacing.ly @@ -4,13 +4,13 @@ texidoc = "Tied accidentaled notes (which cause reminder accidentals) don't wrea the spacing when unbroken." } -\version "1.9.2" +\version "1.9.4" rechts = \notes \relative c' { \clef treble \time 3/4 - c8 b2 <>8 ~ | - <>8 + c8 b2 8 ~ | + 8 } \score { diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly index 5173cbe38c..d2d9e8fb90 100644 --- a/input/regression/accidental-voice.ly +++ b/input/regression/accidental-voice.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" @@ -47,14 +47,14 @@ voiceb = \notes \transpose c c' { } \score { - < + << \notes \new NoteNames \apply #no-octaves \voicea - \context Staff < + \context Staff << \modernVoiceCautionaries \new Voice \voicea \new Voice \voiceb - > + >> \new NoteNames \apply #no-octaves \voiceb - > + >> } diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly index 56356af15d..09e8d1486e 100644 --- a/input/regression/accidental.ly +++ b/input/regression/accidental.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" @@ -11,7 +11,7 @@ fourth show forced and courtesy accidentals. foo = \notes\relative c'' { \key as \major dis4 dis dis!^"force" dis? } \score { - < \foo + << \foo \context NoteNames \foo - > + >> } diff --git a/input/regression/accidentals.ly b/input/regression/accidentals.ly index f6dcd340ca..760d37c8bd 100644 --- a/input/regression/accidentals.ly +++ b/input/regression/accidentals.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" @@ -41,29 +41,29 @@ mel = \notes { \key d \major \time 4/4 } \score { \notes - < + << \context Staff \transpose c c'' { \mel % \property Score.oneMeasureLazy = ##t \property Score.autoAccidentals = #'(Staff (same-octave . 0)) - < s1^"$\\backslash$property Score.autoAccidentals = \\#'((same-octave . 0))" \mel > + << s1^"$\\backslash$property Score.autoAccidentals = \\#'((same-octave . 0))" \mel >> \property Score.autoAccidentals = #'(Staff (same-octave . 1)) - < s1^"$\\backslash$property Score.autoAccidentals = \\#'((same-octave . 1))" \mel > + << s1^"$\\backslash$property Score.autoAccidentals = \\#'((same-octave . 1))" \mel >> \property Score.autoAccidentals = #'(Staff (any-octave . 0)) - < s1^"$\\backslash$property Score.autoAccidentals = \\#'((any-octave . 0))" \mel > + << s1^"$\\backslash$property Score.autoAccidentals = \\#'((any-octave . 0))" \mel >> \property Score.autoAccidentals = #'(Staff (any-octave . 1)) - < s1^"$\\backslash$property Score.autoAccidentals = \\#'((any-octave . 1))" \mel > + << s1^"$\\backslash$property Score.autoAccidentals = \\#'((any-octave . 1))" \mel >> \modernAccidentals - < s1^"$\\backslash$modernAccidentals" \mel > + << s1^"$\\backslash$modernAccidentals" \mel >> \modernCautionaries - < s1^"$\\backslash$modernCautionaries" \mel > + << s1^"$\\backslash$modernCautionaries" \mel >> \noResetKey - < s1^"$\\backslash$noResetKey" \mel > + << s1^"$\\backslash$noResetKey" \mel >> \forgetAccidentals - < s1^"$\\backslash$forgetAccidentals" \mel > + << s1^"$\\backslash$forgetAccidentals" \mel >> } \context NoteNames \repeat unfold 9 \apply #no-octaves \mel - > + >> \paper { indent = 0.0 } diff --git a/input/regression/allfontstyle.ly b/input/regression/allfontstyle.ly index ba147ce078..ac670d1aca 100644 --- a/input/regression/allfontstyle.ly +++ b/input/regression/allfontstyle.ly @@ -1,4 +1,4 @@ -\version "1.9.3" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly index 766a40c6e7..193aabc44b 100644 --- a/input/regression/ambitus.ly +++ b/input/regression/ambitus.ly @@ -52,7 +52,7 @@ paper block: %} -\version "1.9.2" +\version "1.9.4" upper = \notes \relative c { \clef "treble" @@ -71,10 +71,10 @@ lower = \notes \relative c { } \score { \context ChoirStaff { - < + << \new Staff { \upper } \new Staff { \lower } - > } + >> } \paper { \translator { \ScoreContext diff --git a/input/regression/apply-context.ly b/input/regression/apply-context.ly index 7502c35f99..c33d0289e6 100644 --- a/input/regression/apply-context.ly +++ b/input/regression/apply-context.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly index 1fade8fa7b..ef3c994704 100644 --- a/input/regression/apply-output.ly +++ b/input/regression/apply-output.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "The @code{\applyoutput} expression is the most flexible way to @@ -38,10 +38,10 @@ position. \notes \context Voice \relative c' { \stemUp \property Voice.autoBeaming = ##f - { <>8 + { 8 \context Voice \applyoutput #mc-squared - <> + } } diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly index 5bface2330..8e335b282a 100644 --- a/input/regression/arpeggio-collision.ly +++ b/input/regression/arpeggio-collision.ly @@ -1,12 +1,12 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Arpeggio stays clear of accidentals and flipped note heads. Since Arpeggio engraver is Voice, it does nothing for voice collisions." } -hairyChord = \context Staff \notes\relative c' < +hairyChord = \context Staff \notes\relative c' << \new Voice { \property Voice.Stem \override #'direction = #1 \property Voice.NoteColumn \override #'horizontal-shift = #0 @@ -30,14 +30,14 @@ hairyChord = \context Staff \notes\relative c' < \property Voice.NoteColumn \override #'horizontal-shift = #-1 fis\arpeggio } -> +>> \score{ \notes \transpose c c' { - << fis'' g d a >>\arpeggio - << fis, g d a >>\arpeggio - << fis'' g d a >>\arpeggio + < fis'' g d a >\arpeggio + < fis, g d a >\arpeggio + < fis'' g d a >\arpeggio \hairyChord } \paper { diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly index af7efa9ea1..26fd62f56c 100644 --- a/input/regression/arpeggio.ly +++ b/input/regression/arpeggio.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" Arpeggios are supported, both cross-staff and broken single staff. @@ -9,22 +9,22 @@ Arpeggios are supported, both cross-staff and broken single staff. \score{ - \context PianoStaff < + \context PianoStaff << \new Staff \notes\relative c''{ - \context Voice << fis, d a >>\arpeggio + \context Voice < fis, d a >\arpeggio \property Staff.Arpeggio \override #'arpeggio-direction = #1 - \context Voice << fis, d a >>\arpeggio + \context Voice < fis, d a >\arpeggio %%\property PianoStaff.SpanArpeggio \override #'connect = ##t \property PianoStaff.connectArpeggios = ##t - <>\arpeggio + \arpeggio } \new Staff \notes\relative c{ \clef bass - \context Voice << g b d >>\arpeggio + \context Voice < g b d >\arpeggio \property Staff.Arpeggio \override #'arpeggio-direction = #-1 - \context Voice << g b d >>\arpeggio - <>\arpeggio + \context Voice < g b d >\arpeggio + \arpeggio } - > + >> \paper { raggedright= ##t } } diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly index 118b3c7385..61f74b9e8f 100644 --- a/input/regression/auto-beam-bar.ly +++ b/input/regression/auto-beam-bar.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly index 1be21e4963..b0535659e3 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.2" +\version "1.9.4" \score{ \notes\relative c''{ diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly index 85fd689d68..ddec6075f1 100644 --- a/input/regression/auto-beam-tuplets.ly +++ b/input/regression/auto-beam-tuplets.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 bc8e57a263..b0738ca7bc 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.2" +\version "1.9.4" diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly index 6dc001a2a3..e6801127d4 100644 --- a/input/regression/auto-change.ly +++ b/input/regression/auto-change.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { @@ -12,16 +12,16 @@ note. When central C is reached, we don't switch (by default). \paper { raggedright= ##t } \score { - \notes \context PianoStaff < + \notes \context PianoStaff << \context Staff = "up" { - \autochange Staff \context Voice = VA < \relative c' { g4 c e d c r4 a g } > + \autochange Staff \context Voice = VA << \relative c' { g4 c e d c r4 a g } >> } \context Staff = "down" { \clef bass s1*2 } - > + >> } diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly index 9086416c82..1bb1e12bc3 100644 --- a/input/regression/bar-number.ly +++ b/input/regression/bar-number.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly index 30c3634c0a..42426c7f9f 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.2" +\version "1.9.4" \header{ texidoc=" @@ -16,14 +16,14 @@ onestaff = \new Staff\notes\relative c'' { c1 \mark "A" \break c2 c2 \break } -grstaff = \notes \relative c'' \context GrandStaff < +grstaff = \notes \relative c'' \context GrandStaff << \new Staff { \property Staff.instr = instr \mark "B" \break c1 \mark "A" c2 } \new Staff { c1 c2 } -> +>> \score {\grstaff} diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly index 066535c121..7bfc5e19fa 100644 --- a/input/regression/beam-auto-knee.ly +++ b/input/regression/beam-auto-knee.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 4b6010c690..4b9e74cdef 100644 --- a/input/regression/beam-break.ly +++ b/input/regression/beam-break.ly @@ -4,7 +4,7 @@ " } -\version "1.9.2" +\version "1.9.4" \paper { raggedright= ##t } \score { \notes \relative c'' { diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly index cbc12449e6..170eaf365f 100644 --- a/input/regression/beam-center-slope.ly +++ b/input/regression/beam-center-slope.ly @@ -1,6 +1,6 @@ -\version "1.9.2" +\version "1.9.4" \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 9f50ac828c..fa06e402a9 100644 --- a/input/regression/beam-chord.ly +++ b/input/regression/beam-chord.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "If the first and last outer notes of a beam are the same, @@ -8,16 +8,16 @@ the beam should be be horizontal. " \score{ \notes \transpose c' c'{ - a'8[ <>] - a'16[ <>] - a'32[ <>] - a'8[ <>] - a'16[ <>] - a'32[ <>] - a'16[ <>] - c8[ <>] - c16[ <>] - c32[ <>] + a'8[ ] + a'16[ ] + a'32[ ] + a'8[ ] + a'16[ ] + a'32[ ] + a'16[ ] + c8[ ] + c16[ ] + c32[ ] } \paper{ raggedright = ##t diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly index 7e395d8b40..6354f5e4f7 100644 --- a/input/regression/beam-concave.ly +++ b/input/regression/beam-concave.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 f601b2cc5a..b74d4991ba 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.2" +\version "1.9.4" \header{ @@ -9,7 +9,7 @@ with explicit staff switches)." } \score { - \notes \context PianoStaff < + \notes \context PianoStaff << \context Staff = "up" \notes\relative c''{ b8[ \translator Staff="down" d,, ] c[ \translator Staff="up" c'' ] @@ -19,7 +19,7 @@ with explicit staff switches)." \clef bass s2. } - > + >> \paper{ raggedright = ##t } diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly index 522373697b..901baaf0ae 100644 --- a/input/regression/beam-cross-staff-slope.ly +++ b/input/regression/beam-cross-staff-slope.ly @@ -1,17 +1,17 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Cross staff (kneed) beams don't cause extreme slopes." } \score { - \notes\context PianoStaff < + \notes\context PianoStaff << \context Staff = up - \relative c'' < + \relative c'' << { \stemDown f16( \> d b\! \translator Staff = down \stemUp - \clef treble g ~ << g e>>8) + \clef treble g ~ < g e>8) e[ \translator Staff = up \stemDown @@ -24,10 +24,10 @@ e8.] } \\ - > + >> \context Staff = down { \time 3/8 \clef bass s4.*3 } - > + >> \paper { raggedright = ##t} } diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly index dd2f690ec7..726ce3c90f 100644 --- a/input/regression/beam-cross-staff.ly +++ b/input/regression/beam-cross-staff.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" Beams can be typeset over fixed distance aligned staves, beam @@ -8,7 +8,7 @@ behave well, wherever the switching point is. " } \score{ - \context PianoStaff < + \context PianoStaff << \context Staff=one \notes\relative c'{ \stemUp c8[ c \translator Staff=two \stemUp c c] c[ c c c] @@ -28,7 +28,7 @@ behave well, wherever the switching point is. s1 s1 } - > + >> } diff --git a/input/regression/beam-damp.ly b/input/regression/beam-damp.ly index 881cfc43ca..adf89b8307 100644 --- a/input/regression/beam-damp.ly +++ b/input/regression/beam-damp.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 de8dfd6711..8e7463aa2e 100644 --- a/input/regression/beam-default-lengths.ly +++ b/input/regression/beam-default-lengths.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc="Beamed stems have standard lengths if possible." diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index cf2154ade0..e7809791e0 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 aed34d6664..0b1facac37 100644 --- a/input/regression/beam-french.ly +++ b/input/regression/beam-french.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly index 2fe276ec2f..79377cf261 100644 --- a/input/regression/beam-funky-beamlet.ly +++ b/input/regression/beam-funky-beamlet.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 c7eaa33429..a68a822e55 100644 --- a/input/regression/beam-funky.ly +++ b/input/regression/beam-funky.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 8f68a8bc60..999f5d7e49 100644 --- a/input/regression/beam-knee-symmetry.ly +++ b/input/regression/beam-knee-symmetry.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Point-symmetric beams should receive the same diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly index 6e596a70e0..3bab4cddbb 100644 --- a/input/regression/beam-length.ly +++ b/input/regression/beam-length.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly index 4b5a8b1ee5..99bc04e752 100644 --- a/input/regression/beam-manual-beaming.ly +++ b/input/regression/beam-manual-beaming.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { diff --git a/input/regression/beam-manual.ly b/input/regression/beam-manual.ly index c22af80e21..8f63080785 100644 --- a/input/regression/beam-manual.ly +++ b/input/regression/beam-manual.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly index 0d5cb52534..5658d6a1a0 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.2" +\version "1.9.4" \header { texidoc = "Kneed beams (often happens with cross-staff beams) @@ -10,7 +10,7 @@ to the last beam. } \score { \notes - \context PianoStaff \relative c' < + \context PianoStaff \relative c' << \context Staff = SA { \stemDown c8[ c16 \translator Staff = SB \stemUp c16 ] @@ -25,7 +25,7 @@ to the last beam. b,8[ b16 \stemDown b''16 b ] } - > + >> \paper { raggedright= ##t } } diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly index db03d364aa..d4a17a8947 100644 --- a/input/regression/beam-over-barline.ly +++ b/input/regression/beam-over-barline.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Explicit beams may cross barlines. " } diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly index bf9b6f2880..e37212e813 100644 --- a/input/regression/beam-position.ly +++ b/input/regression/beam-position.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" Beams should always reach the middle staff line. The second beam diff --git a/input/regression/beam-postfix-notation.ly b/input/regression/beam-postfix-notation.ly index 36ec82cab7..859b2a70ef 100644 --- a/input/regression/beam-postfix-notation.ly +++ b/input/regression/beam-postfix-notation.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 b77ab9d85f..2cc6e6ed3c 100644 --- a/input/regression/beam-quanting-horizontal.ly +++ b/input/regression/beam-quanting-horizontal.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly index 81c477f159..9de2b417d6 100644 --- a/input/regression/beam-quarter.ly +++ b/input/regression/beam-quarter.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 aff906436f..7b8b735f81 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.2" +\version "1.9.4" \score { \notes \relative c, { \clef bass diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly index 2e24e5604d..978e893c12 100644 --- a/input/regression/beam-second.ly +++ b/input/regression/beam-second.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 897a4cd857..49ef2e2bef 100644 --- a/input/regression/beam-shortened-lengths.ly +++ b/input/regression/beam-shortened-lengths.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 aa52d3e71d..94826c9ca0 100644 --- a/input/regression/beamed-chord.ly +++ b/input/regression/beamed-chord.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc = "Hairy case for beam, chord, and automatic knees." @@ -16,6 +16,6 @@ texidoc = "Hairy case for beam, chord, and automatic knees." %\stemUp \clef alto \time 3/4 - r8 <>( bes') d <>-> r | + r8 ( bes') d -> r | } } diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly index 878c26ae49..59d7090167 100644 --- a/input/regression/beaming-ternary-metrum.ly +++ b/input/regression/beaming-ternary-metrum.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Automatic beaming works also in ternary time sigs." } diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly index ca5253d1b7..864860786e 100644 --- a/input/regression/beaming.ly +++ b/input/regression/beaming.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/beams.ly b/input/regression/beams.ly index 1fcadcfde3..2994281c45 100644 --- a/input/regression/beams.ly +++ b/input/regression/beams.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Beams (simple)." } diff --git a/input/regression/between-systems.ly b/input/regression/between-systems.ly index 57dfcd1fd3..aea1c75a51 100644 --- a/input/regression/between-systems.ly +++ b/input/regression/between-systems.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/break.ly b/input/regression/break.ly index 7737e60aec..a550f7cff2 100644 --- a/input/regression/break.ly +++ b/input/regression/break.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly index bef66328e3..208bb45a3f 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.2" +\version "1.9.4" \header{ texidoc=" Breathing signs, also used for phrasing, do normally not influence @@ -31,18 +31,18 @@ finalis, the latter three looking similar to bar glyphs. \key es \major \time 3/4 % this bar contains no \breathe - < + << { g4 as g } \\ { es4 bes es } - > | + >> | % by default, \breathe uses the rcomma, just as if saying: % \property Voice.BreathingSign \set #'text = % #(make-musicglyph-markup "scripts-rcomma") - < + << { g4 as g } \\ { es4 \breathe bes es } - > | + >> | % rvarcomma and lvarcomma are variations of the default rcomma % and lcomma @@ -50,10 +50,10 @@ finalis, the latter three looking similar to bar glyphs. % N.B.: must use Staff context here, since we start a Voice below \property Staff.BreathingSign \set #'text = #(make-musicglyph-markup "scripts-rvarcomma") - < + << { g4 as g } \\ { es4 \breathe bes es } - > | + >> | % wedge \property Voice.BreathingSign \set #'text = diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly index 75e3b032b1..0442c2ad55 100644 --- a/input/regression/chord-changes.ly +++ b/input/regression/chord-changes.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc="Property chordChanges: display chord names only when @@ -17,10 +17,10 @@ settings = { } \score { - \notes < - \context ChordNames < \scheme \settings > + \notes << + \context ChordNames << \scheme \settings >> \context Staff \transpose c c' \scheme - > + >> \paper{ linewidth = 40 * \staffspace } diff --git a/input/regression/chord-name-entry-11.ly b/input/regression/chord-name-entry-11.ly index ec133c94f0..e503286cf4 100644 --- a/input/regression/chord-name-entry-11.ly +++ b/input/regression/chord-name-entry-11.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { diff --git a/input/regression/chord-name-entry.ly b/input/regression/chord-name-entry.ly index 7b915462e8..13165a6f96 100644 --- a/input/regression/chord-name-entry.ly +++ b/input/regression/chord-name-entry.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { diff --git a/input/regression/chord-name-exceptions.ly b/input/regression/chord-name-exceptions.ly index d6a7441c2d..27c5dc2087 100644 --- a/input/regression/chord-name-exceptions.ly +++ b/input/regression/chord-name-exceptions.ly @@ -1,10 +1,10 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "The property @code{chordNameExceptions} can used to store a list of special notations for specific chords. Putting the exceptions list encoded as @example - \\notes @{ <>1\\markup @{ \\super \"7\" \"wahh\" @} @} + \\notes @{ 1\\markup @{ \\super \"7\" \"wahh\" @} @} @end example into @code{chordNameExceptions} takes a little manoeuvring. The following code transforms @code{chExceptionMusic} (which is a @@ -24,7 +24,7 @@ adds the new exceptions to the default ones, which are defined in % 7sus4 denoted with ^7 wahh chExceptionMusic = \notes { - <>1-\markup { \super "7" "wahh" }} + 1-\markup { \super "7" "wahh" }} % add to existing exceptions. chExceptions = #(append @@ -38,7 +38,7 @@ theMusic = \chords { \score { - < \context ChordNames \theMusic + << \context ChordNames \theMusic \context Voice \theMusic - > + >> } diff --git a/input/regression/chord-name-major7.ly b/input/regression/chord-name-major7.ly index 69ac0d3944..bac05115c6 100644 --- a/input/regression/chord-name-major7.ly +++ b/input/regression/chord-name-major7.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 f3fdb96093..fc60464523 100644 --- a/input/regression/chord-scripts.ly +++ b/input/regression/chord-scripts.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Scripts can also be attached to chord elements." @@ -8,13 +8,13 @@ texidoc = "Scripts can also be attached to chord elements." \score { \notes \relative c''{ - << c-. >> 4 - << c-> >> 4 - << c-. e-. g-. b-. >> - << c^^ >> 4 - << c_^ >> 4 - << c_^ e^^ >> 4 - << c_^ e^^ >> 4 + < c-. > 4 + < c-> > 4 + < c-. e-. g-. b-. > + < c^^ > 4 + < c_^ > 4 + < c_^ e^^ > 4 + < c_^ e^^ > 4 } diff --git a/input/regression/chord-tremolo.ly b/input/regression/chord-tremolo.ly index bbd3b9857a..3479c25402 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.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/chords-funky-ignatzek.ly b/input/regression/chords-funky-ignatzek.ly index 560be799ea..7378ff9f48 100644 --- a/input/regression/chords-funky-ignatzek.ly +++ b/input/regression/chords-funky-ignatzek.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { @@ -7,26 +7,26 @@ texidoc = "Jazz chords, unusual combinations." chs = \notes { -<>1 -<>1 -<>1 -<>1 -<>1 -<>1 -<>1 -<>1 -<>1 +1 +1 +1 +1 +1 +1 +1 +1 +1 } \score{ - < + << \context ChordNames { % #(set-chord-name-style 'ignatzek) \chs } \context Staff \notes \transpose c c' { \chs } - > + >> \paper{ \translator { \ChordNamesContext diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly index 6d7fc7cc63..754aad477c 100644 --- a/input/regression/clefs.ly +++ b/input/regression/clefs.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly index ece57ccd0b..9a1a49da52 100644 --- a/input/regression/cluster.ly +++ b/input/regression/cluster.ly @@ -1,20 +1,20 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Clusters are a device to denote that a complete range of notes is to be played." } fragment =\notes \relative c' { - c4 f4 <>4 - <>8 <> a4 c2 <>4 e4 + c4 f4 4 + 8 a4 c2 4 e4 c4 } \score { - \notes < + \notes << \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 6e59996700..d22a0fc9ab 100644 --- a/input/regression/collision-2.ly +++ b/input/regression/collision-2.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Collisions for single head notes. " } @@ -8,10 +8,10 @@ texidoc = "Collisions for single head notes. " \score { \notes - \context Staff \notes \transpose c c' < + \context Staff \notes \transpose c c' << { c4 d e f g2 g4 a | } \\ { g4 f e g g2 g2 } - > + >> } diff --git a/input/regression/collision-dots.ly b/input/regression/collision-dots.ly index 764c7ec189..f2a5a36b4f 100644 --- a/input/regression/collision-dots.ly +++ b/input/regression/collision-dots.ly @@ -5,12 +5,12 @@ on the right side." } -\version "1.9.2" +\version "1.9.4" \paper { raggedright= ##t } \score{ - \context Staff \notes < + \context Staff \notes << \clef "bass" \new Voice { \stemUp @@ -20,7 +20,7 @@ \stemDown b2 b2 } - > + >> } diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly index 61de436c96..18934d0685 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.2" +\version "1.9.4" \header { texidoc = "Note heads in collisions should be merged if they have the same positions in the extreme note heads. @@ -11,7 +11,7 @@ they have the same positions in the extreme note heads. \score { \notes \relative c'' { c4 - < { c4 d4 <>8 <> <> } \\ { c4 c <>8 <> <>8 } > + << { c4 d4 8 } \\ { c4 c 8 8 } >> } \paper {raggedright = ##t} } diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly index 0db80feee4..545a31a978 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.2" +\version "1.9.4" \header { texidoc = @@ -12,7 +12,7 @@ if the black note heads are from 8th or shorter notes. \paper { raggedright= ##t } -\score { \notes \context Staff\relative c''< +\score { \notes \context Staff\relative c''<< \new Voice { \voiceOne c2 c8 c4. @@ -30,5 +30,5 @@ if the black note heads are from 8th or shorter notes. c2 c4 } - > + >> } diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly index 17704c5fbb..28b94a3f9b 100644 --- a/input/regression/collision-merge-differently-dotted.ly +++ b/input/regression/collision-merge-differently-dotted.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "If NoteCollision has merge-differently-dotted set, note @@ -10,12 +10,12 @@ heads that have differing dot counts may be merged anyway." \score { \notes { - \context Staff < + \context Staff << \new Voice { \voiceOne g'8 g'8 \property Staff.NoteCollision \override #'merge-differently-dotted = ##t g'8 g'8 } \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 209bb2ffdc..615ab29be6 100644 --- a/input/regression/collision-mesh.ly +++ b/input/regression/collision-mesh.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Oppositely stemmed chords, meshing into each other, are resolved." @@ -11,20 +11,20 @@ are resolved." \context Staff \notes \transpose c c' { \time 3/4 % Here's what I was trying to do: - < { + << { d'4 d'4. - <>4 - <>4 - <>4. + 4 + 4 + 4. }\\ { - <>4 - <>4. - <>4 + 4 + 4. + 4 d'4 d'4. } - > + >> } } diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly index 6c7c28b942..faf759b289 100644 --- a/input/regression/collisions.ly +++ b/input/regression/collisions.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" Normal collisions. We have support for polyphony, where the @@ -12,35 +12,35 @@ copyright = "public domain" twovoice = -\notes \relative c' \context Staff \notes < +\notes \relative c' \context Staff \notes << { g4 f f e e d d c } \\ { c4 c d d e e f f } -> +>> -twovoicechords = \context Staff \notes < +twovoicechords = \context Staff \notes << \relative c' { e4 d c b a g f }\\ \relative c' { - <>4 <>4 <>4 <>4 <> - <> <> + 4 4 4 4 + } -> +>> -threevoice = \context Staff \notes < +threevoice = \context Staff \notes << { g4 f e f g a g2 } \\ { c4 d e d c d es } \\ { e4 e e e e e e e } -> +>> hairyChord = \context Staff \notes \relative c'' - < e \\ + << e \\ fis, \\ cis' \\ \\ ais - > + >> \score{ diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly index 2eb91bb9a0..47d094cb3e 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.2" +\version "1.9.4" \header { texidoc = "Completion heads are broken across bar lines. This was @@ -10,10 +10,10 @@ Completion heads are not fooled by polyphony with a different rhythm. } \score{ - \context Staff \notes \relative c'' < + \context Staff \notes \relative c'' << { c2. c bes2 } \\ { c,2. a8 g4 f4. g4 f } - > + >> \paper { \translator{ diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly index f64866151b..548866954a 100644 --- a/input/regression/completion-heads.ly +++ b/input/regression/completion-heads.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/custos.ly b/input/regression/custos.ly index 357dcd0fef..d57b47454b 100644 --- a/input/regression/custos.ly +++ b/input/regression/custos.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Custodes in various styles." } @@ -11,19 +11,19 @@ \property Staff.Custos \set #'style = #'hufnagel c'1^"Custos style = \#'hufnagel" - \break << d' a' f''>>1 + \break < d' a' f''>1 \property Staff.Custos \set #'style = #'medicaea c'1^"Custos style = \#'medicaea" - \break << d' a' f''>>1 + \break < d' a' f''>1 \property Staff.Custos \set #'style = #'vaticana c'1^"Custos style = \#'vaticana" - \break << d' a' f''>>1 + \break < d' a' f''>1 \property Staff.Custos \set #'style = #'mensural c'1^"Custos style = \#'mensural" - \break << d' a' f''>>1 + \break < d' a' f''>1 } \paper { \translator { diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly index e140f8842b..ffb0f7ca27 100644 --- a/input/regression/dot-flag-collision.ly +++ b/input/regression/dot-flag-collision.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 6205cc9dd3..cbce02d8e7 100644 --- a/input/regression/dots.ly +++ b/input/regression/dots.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" Noteheads can have dots, and rests can too. Augmentation dots should @@ -16,14 +16,14 @@ a column. The dots go along as rests are shifted to avoid collisions. \context Voice \notes\relative c'' { \time 6/8 d4. g,, - <>4. <> - <> <> + 4. + - \context Staff < - { f'' <> r4. }\\ - { b, <> r4. } - > + \context Staff << + { f'' r4. }\\ + { b, r4. } + >> } diff --git a/input/regression/drums.ly b/input/regression/drums.ly index 3044ce3825..0893e6b110 100644 --- a/input/regression/drums.ly +++ b/input/regression/drums.ly @@ -3,33 +3,33 @@ % scm/midi.scm for list of midi-drumkits. \header { -texidoc = "Drum notation, although kludgy, should work. Though, << chord >> does not work because the chords need to be split into threads." +texidoc = "Drum notation, although kludgy, should work. Though, < chord > does not work because the chords need to be split into threads." } \include "drumpitch-init.ly" -\version "1.9.2" +\version "1.9.4" 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 } +drl = \notes {\repeat "unfold" 3 {bd4 sn8 bd bd4 << bd ss >> } bd8 tommh tommh bd toml toml bd tomfh16 tomfh } timb = \notes \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 cb} \score { \repeat "volta" 2 - < - \context TwoLineStaff=timbst \notes < + << + \context TwoLineStaff=timbst \notes << \property Staff.instrument="timbales" \clef "percussion" \apply #(drums->paper 'timbales) \timb - > - \context Staff=drumst \notes < + >> + \context Staff=drumst \notes << \property Staff.instrument="drums" \clef "percussion" - \apply #(drums->paper 'drums) < + \apply #(drums->paper 'drums) << \context Voice=voa {\stemUp \drh } \context Voice=vob {\stemDown \drl } - > - > - > + >> + >> + >> \paper { \translator { \StaffContext @@ -52,12 +52,12 @@ timb = \notes \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 } \score { \repeat "unfold" 2 - \context Staff \notes < + \context Staff \notes << \property Staff.instrument="drums" \timb \drh \drl - > + >> \midi{ \tempo 4=120 } } diff --git a/input/regression/dynamics-broken-hairpin.ly b/input/regression/dynamics-broken-hairpin.ly index 3ccbf4bc2e..2486b8cd19 100644 --- a/input/regression/dynamics-broken-hairpin.ly +++ b/input/regression/dynamics-broken-hairpin.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 5d5613aacb..61b7b82d87 100644 --- a/input/regression/dynamics-glyphs.ly +++ b/input/regression/dynamics-glyphs.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 cf40cfeba4..c66b0276c0 100644 --- a/input/regression/dynamics-line.ly +++ b/input/regression/dynamics-line.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 1cbe39fd04..6e811dab98 100644 --- a/input/regression/dynamics-unbound-hairpin.ly +++ b/input/regression/dynamics-unbound-hairpin.ly @@ -1,11 +1,11 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Crescendi may start off-notes. In that case, they should not collapse into flat lines." } \score { \notes { \context Voice { - < f''1 { s4 s4 \< s4\! \> s4\! } > + << f''1 { s4 s4 \< s4\! \> s4\! } >> }} \paper { raggedright = ##t} diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly index 6823d67ac9..a1719f75a2 100644 --- a/input/regression/easy-notation.ly +++ b/input/regression/easy-notation.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = " Ez-notation prints names in note heads. diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly index c6bf7ef6e5..baeda507cb 100644 --- a/input/regression/figured-bass.ly +++ b/input/regression/figured-bass.ly @@ -1,17 +1,17 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = " Figured bass is created by the FiguredBass context which eats figured bass requests and rest-requests. You must enter these using the special @code{\figures @{ @}} mode, which allows you to type -numbers, like @code{<4 6+>}. +numbers, like @code{<<4 6+>>}. You can also type letters by entering quoted strings, as demonstrated in the last example. " } -\score { \notes < +\score { \notes << \context FiguredBass { - \figures { + \figures { <3 [5 7]> \once \property FiguredBass.BassFigure \set #'direction = #-1 <3 [5 7]> @@ -21,7 +21,7 @@ You can also type letters by entering quoted strings, as demonstrated in the las <3 _ 5 _ 7> \property FiguredBass.BassFigure \set #'font-family = #'roman <"V7" ["bla" 6] 7> - } + } } \context Voice { \clef bass @@ -30,7 +30,7 @@ You can also type letters by entering quoted strings, as demonstrated in the las g8 } -> +>> \paper { raggedright = ##t } } diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly index 40e3f6a819..56ca5ee9ab 100644 --- a/input/regression/finger-chords.ly +++ b/input/regression/finger-chords.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "With the new chord syntax it's possible to associate @@ -14,22 +14,22 @@ easier to process." \notes \relative c'{ %% input order is not 1 2 3 , output is. - <> 4 + 4 \property Voice.fingeringOrientations = #'(left) - << c-1 e-2 g-3 b-5 >> 4 + < c-1 e-2 g-3 b-5 > 4 \property Voice.fingeringOrientations = #'(down left) - << c-1 e-2 g-3 b-5 >> 4 + < c-1 e-2 g-3 b-5 > 4 \property Voice.fingeringOrientations = #'(down left up) - << c-1 e-2 g-3 b-5 >> 4 + < c-1 e-2 g-3 b-5 > 4 \property Voice.fingeringOrientations = #'(up left) - << c-1 e-2 g-3 b-5 >> 4 + < c-1 e-2 g-3 b-5 > 4 \property Voice.fingeringOrientations = #'(right) - << c-1 e-2 g-3 b-5 >> 4 + < c-1 e-2 g-3 b-5 > 4 diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly index 2a0f1b2803..63673423bc 100644 --- a/input/regression/fingering.ly +++ b/input/regression/fingering.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Automatic fingering tries to put fingering instructions @@ -14,8 +14,8 @@ next to noteheads. \notes\relative c' { c4-4 - <> - << c-1 e-2 g-3 b-4 >> + + < c-1 e-2 g-3 b-4 > }} diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly index f9583da7c9..9124c6731b 100644 --- a/input/regression/follow-voice-break.ly +++ b/input/regression/follow-voice-break.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc = " When put across line breaks, only the part before the line break is @@ -9,7 +9,7 @@ printed. The line-spanners connects to the Y position of the note on the next l } \score{ - \context PianoStaff < + \context PianoStaff << \property PianoStaff.followVoice = ##t \context Staff=one \notes\relative c''{ a1 \break @@ -17,7 +17,7 @@ printed. The line-spanners connects to the Y position of the note on the next l a, } \context Staff=two { \clef bass \skip 1*2 } - > + >> \paper{ raggedright = ##t } diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly index bd86af248e..c6cc6f3b59 100644 --- a/input/regression/font-magnification.ly +++ b/input/regression/font-magnification.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 7b6307b5bd..9e6ceb6b8c 100644 --- a/input/regression/font-name.ly +++ b/input/regression/font-name.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly index aa13d88027..34a4930f69 100644 --- a/input/regression/generic-output-property.ly +++ b/input/regression/generic-output-property.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly index ab999e7193..3aa4da93d2 100644 --- a/input/regression/glissando.ly +++ b/input/regression/glissando.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header{ @@ -7,7 +7,7 @@ texidoc=" Simple glissando lines between notes are supported. The first two glissandi are not consecutive. The engraver does no time-keeping, so it involves some trickery to get -< @{ s8 s8 s4 @} @{ c4 \\gliss d4 @} > working correctly. +<< @{ s8 s8 s4 @} @{ c4 \\gliss d4 @} >> working correctly. " } @@ -18,8 +18,8 @@ The engraver does no time-keeping, so it involves some trickery to get c4 \glissando d e \glissando f \glissando \break % consecutive c \glissando d, \glissando e' - < { \stemUp e8 \glissando g8 } - \context Voice = VB {\stemDown \repeat unfold 4 d16 } > + << { \stemUp e8 \glissando g8 } + \context Voice = VB {\stemDown \repeat unfold 4 d16 } >> \property Voice.Glissando \override #'style = #'zigzag c4 \glissando c,, \glissando c' \glissando d } diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly index 5b646c56b1..b28865a22e 100644 --- a/input/regression/grace-auto-beam.ly +++ b/input/regression/grace-auto-beam.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 8b964ff711..1dd0a688de 100644 --- a/input/regression/grace-bar-line.ly +++ b/input/regression/grace-bar-line.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 a9619a21ab..1150aeabd1 100644 --- a/input/regression/grace-bar-number.ly +++ b/input/regression/grace-bar-number.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 75ffb667f5..367469e1a2 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.2" +\version "1.9.4" \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 8d027d71bc..114ddf82d4 100644 --- a/input/regression/grace-dynamic.ly +++ b/input/regression/grace-dynamic.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 736a57a59d..48729b5a04 100644 --- a/input/regression/grace-end.ly +++ b/input/regression/grace-end.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc="@cindex Grace End diff --git a/input/regression/grace-nest.ly b/input/regression/grace-nest.ly index c61c0d4a5c..5c3c4eb4b8 100644 --- a/input/regression/grace-nest.ly +++ b/input/regression/grace-nest.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 c92238f873..3897affe09 100644 --- a/input/regression/grace-nest1.ly +++ b/input/regression/grace-nest1.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 498a68ed26..0cc5fa346e 100644 --- a/input/regression/grace-nest2.ly +++ b/input/regression/grace-nest2.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 aa7c442771..cca97fea58 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.2" +\version "1.9.4" \header { texidoc = "Another nested grace situation." } @@ -8,7 +8,7 @@ \score { \notes \relative c'' { f1 \grace e8 f1 - < { \grace { e8 } f1 } > + << { \grace { e8 } f1 } >> } } diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly index 5e3a7c04a0..abdc9be545 100644 --- a/input/regression/grace-nest4.ly +++ b/input/regression/grace-nest4.ly @@ -1,14 +1,14 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Another combination of grace note nesting." } \score { \notes \context Voice \relative c'' { - < + << { \grace g32 f4 } - > + >> \grace c16 c2. \bar "|." } \paper { raggedright = ##t } diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly index 736b3b384d..953eaa8120 100644 --- a/input/regression/grace-nest5.ly +++ b/input/regression/grace-nest5.ly @@ -1,12 +1,12 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Another nested grace situation." } \score { \notes \relative c'' { - s2 <>4 + s2 4 \grace g e4 } diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly index da358d6d01..db949d47ea 100644 --- a/input/regression/grace-part-combine.ly +++ b/input/regression/grace-part-combine.ly @@ -1,13 +1,13 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Partcombiner and grace notes can go together." } \paper { raggedright= ##t } \score { - \new StaffGroup < - \new Staff < + \new StaffGroup << + \new Staff << \context Voice=one \partcombine Voice \context Thread=one \notes \relative c'' { c4 d e f \grace f16 g1 @@ -15,7 +15,7 @@ \context Thread=two \notes \relative c' { c4 d e2 g1 } - > - > + >> + >> } diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly index d2f8e4ad70..3a9ae9ae43 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.2" +\version "1.9.4" \header{ texidoc = "Stripped version of trip.ly. Staffs should be of correct length." } @@ -7,7 +7,7 @@ texidoc = "Stripped version of trip.ly. Staffs should be of correct length." \paper { raggedright= ##t } \score{ - \context PianoStaff \notes \relative c'' < + \context PianoStaff \notes \relative c'' << \new Staff { r1 r1 @@ -19,7 +19,7 @@ texidoc = "Stripped version of trip.ly. Staffs should be of correct length." \grace { c16 } c1 } } - > + >> \paper { } } diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly index a4a3464050..89d0088210 100644 --- a/input/regression/grace-start.ly +++ b/input/regression/grace-start.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Pieces may begin with grace notes." } diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly index 51f337b549..a47636c95a 100644 --- a/input/regression/grace-stems.ly +++ b/input/regression/grace-stems.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 9b8a557846..0bfad62f5f 100644 --- a/input/regression/grace-sync.ly +++ b/input/regression/grace-sync.ly @@ -1,10 +1,10 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Grace notes in different voices/staves are synchronized." } -\score {\notes\relative c'' < \context Staff { c2 +\score {\notes\relative c'' << \context Staff { c2 \grace c8 c4 c4 } \new Staff { c2 \clef bass @@ -12,7 +12,7 @@ c4) c4 } \new Staff { c2 c4 c4 \bar "|." } - > + >> \paper { raggedright = ##t} } diff --git a/input/regression/grace-types.ly b/input/regression/grace-types.ly index 96307f2088..7e3d7c971a 100644 --- a/input/regression/grace-types.ly +++ b/input/regression/grace-types.ly @@ -1,4 +1,4 @@ -\version "1.9.3" +\version "1.9.4" \header { texidoc = "Different grace types explained: the base grace switches to smaller type. The appoggiatura also inserts a slur, and the acciaccatura inserts a slur and slashes the stem." diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly index 1bf347b3bc..6de0eb83c7 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.2" +\version "1.9.4" \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 9eaa33ae4c..2960e0f9be 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.2" +\version "1.9.4" \header { diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly index 85ac04ada8..4c659e93cd 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.2" +\version "1.9.4" \header { diff --git a/input/regression/grace.ly b/input/regression/grace.ly index 1a4ad492e3..8ee883cc96 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" @@ -24,7 +24,7 @@ not set. Main note scripts don't end up on the grace note. \grace { cis32[ dis32] } e4 \grace { c32[ d] }\times 2/3 { c8[ c c] } \grace { b32[ ( c32] } c4) - \grace <>16 c8[ c8] + \grace 16 c8[ c8] % \grace c16 c8[ c8] %% broken? %%\grace { \property Grace.graceAlignPosition = \right c16} c4 diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly index d2cfc780f4..4dd7cbb04a 100644 --- a/input/regression/hairpin-ending.ly +++ b/input/regression/hairpin-ending.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly index 571e950782..98bc5a1a35 100644 --- a/input/regression/hara-kiri-pianostaff.ly +++ b/input/regression/hara-kiri-pianostaff.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = @@ -22,11 +22,11 @@ alignment; this should not confuse the mechanism. \score { \notes \transpose c c'' - \context PianoStaff < + \context PianoStaff << \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 { \RemoveEmptyStaffContext diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly index e5e902a5c6..89e906db6c 100644 --- a/input/regression/instrument-name-markup.ly +++ b/input/regression/instrument-name-markup.ly @@ -7,14 +7,14 @@ including alterations. " } -\version "1.9.2" +\version "1.9.4" textFlat = \markup {\smaller \musicglyph #"accidentals--1"} \score { \notes \new Staff { \property Staff.instrument - = \markup { \column << "Clarinetti" { "in B" \textFlat } >> } + = \markup { \column < "Clarinetti" { "in B" \textFlat } > } \property Staff.instr = \markup { \smaller { "Cl(B" \textFlat ")" } } diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly index 487e025f26..b6df9a0a45 100644 --- a/input/regression/instrument-name-partial.ly +++ b/input/regression/instrument-name-partial.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 2d7f7b7d9b..340307efbf 100644 --- a/input/regression/instrument-name.ly +++ b/input/regression/instrument-name.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" Staff margins are also markings attached to barlines. They should be @@ -12,11 +12,11 @@ be on normal staves, but also on compound staves, like the PianoStaff. \score { - \notes \context PianoStaff < + \notes \context PianoStaff << \context Staff = treble { \property PianoStaff.instrument = "Piano " \property Staff.instrument = "Right " { c''4 }} - \context Staff = bass { \property Staff.instrument = "Left " \clef bass c4 }> + \context Staff = bass { \property Staff.instrument = "Left " \clef bass c4 }>> \paper { raggedright = ##t diff --git a/input/regression/key-clefs.ly b/input/regression/key-clefs.ly index a1cbc28d92..42e84481b5 100644 --- a/input/regression/key-clefs.ly +++ b/input/regression/key-clefs.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 7b11d4ddcb..354f5ddd38 100644 --- a/input/regression/key-signature-scordatura.ly +++ b/input/regression/key-signature-scordatura.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 597916ff1a..6fdae31c50 100644 --- a/input/regression/keys.ly +++ b/input/regression/keys.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 93eaeab09c..6ea27c1029 100644 --- a/input/regression/lyric-align.ly +++ b/input/regression/lyric-align.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" @@ -15,12 +15,12 @@ %\paper { raggedright = ##t} \score { -< \context Voice = "v" \notes \relative c'' { +<< \context Voice = "v" \notes \relative c'' { \property Staff.automaticMelismata = ##t \cadenzaOn a\breve \bar "||" a1 \bar "|" a \bar "|" a \bar "||" \break a \bar "|" a \bar "|" a \bar "|" a \bar "||" \break a \bar "|" a \bar "|." } - \context Lyrics < + \context Lyrics << \context LyricsVoice = "v-1" \lyrics { % \property LyricsVoice . stanza = "1:" \property Lyrics . LyricText \override #'ignore-length-mismatch = ##t @@ -76,7 +76,7 @@ % note' true' %% ? what are the last 2 for? } - > - > + >> + >> } diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index f8a0aacac6..02519376ca 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc ="Polyphonic rhythms and rests don't disturb @@ -11,7 +11,7 @@ texidoc ="Polyphonic rhythms and rests don't disturb \clef violin \time 8/8 \key des \major - < \context Voice = one { + << \context Voice = one { \voiceOne \addlyrics \notes { @@ -34,7 +34,7 @@ texidoc ="Polyphonic rhythms and rests don't disturb Do __ na } } - > + >> } \paper { raggedright = ##t} } diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly index 32b0a088db..6d18bf0217 100644 --- a/input/regression/lyric-combine.ly +++ b/input/regression/lyric-combine.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc= "Lyrics can be set to a melody automatically. Excess lyrics will be @@ -32,7 +32,7 @@ noise = \repeat unfold 6 \notes \relative c'' { g16 g g g } textII = \context LyricsVoice = "middle-1" \lyrics { da -- da __ da -- da da da da da } \score { - \notes < \context Staff = SA \noise + \notes << \context Staff = SA \noise \context Lyrics = LA { s1 } \context Staff = SB { s1 } \context Lyrics = LB { s1 } @@ -40,11 +40,11 @@ textII = \context LyricsVoice = "middle-1" \lyrics { da -- da __ da -- da da da \addlyrics \context Staff = SB \context Voice="middle" \m - < \context Lyrics = LA \textI + << \context Lyrics = LA \textI \context Lyrics = LB \textII - > + >> - > + >> } diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly index 3f135f4edc..f9fa1bf49e 100644 --- a/input/regression/lyric-extender.ly +++ b/input/regression/lyric-extender.ly @@ -1,13 +1,13 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header { texidoc= "Tests lyric extenders. "} \paper { raggedright= ##t } \score{ -\notes \relative c' < +\notes \relative c' << \context Staff { c (c) (c) c } \context Lyrics \lyrics { bla __ alb xxx __ yyy } - > + >> } diff --git a/input/regression/lyric-hyphen.ly b/input/regression/lyric-hyphen.ly index d581e2ad29..a8c795199f 100644 --- a/input/regression/lyric-hyphen.ly +++ b/input/regression/lyric-hyphen.ly @@ -1,10 +1,10 @@ -\version "1.9.2" +\version "1.9.4" \header {texidoc="Tests lyric hyphens. "} \score{ - < + << \context Staff \notes { c' (c') (c') c' } \context Lyrics \context LyricsVoice \lyrics { bla -- alb xxx -- yyy } - > + >> } diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly index c1c69d2f90..128fd0dfde 100644 --- a/input/regression/lyric-phrasing.ly +++ b/input/regression/lyric-phrasing.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc="Lyric phrasing @@ -30,7 +30,7 @@ \autoBeamOff a a a8 ( a) a4 } - \context Lyrics < + \context Lyrics << \context LyricsVoice = "v-1" \lyrics { \property LyricsVoice . stanza = "1:" Start sentence melisma end. @@ -39,6 +39,6 @@ \property LyricsVoice . stanza = "2:" x x x __ x. } - > + >> } diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly index 219e627456..f8c7f9ba44 100644 --- a/input/regression/lyrics-bar.ly +++ b/input/regression/lyrics-bar.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" @@ -8,11 +8,11 @@ lyrics don't collide with barlines. } \score { - \context StaffGroup < + \context StaffGroup << \notes \context Staff { b1 \bar "|:" b1 \bar ":|" } - \lyrics\context Lyrics < + \lyrics\context Lyrics << \context LyricsVoiceWithBars { % thisContextHasBarEngraver1 added ThisContextCertainlyHasBarEngraverAddedButThereHasBeenSomethingFunnyBefore1. Here. @@ -20,9 +20,9 @@ lyrics don't collide with barlines. \context LyricsVoice { this4 one has no BarEngraverAddedToContext1 } - > + >> \notes \new Staff { b1 b1 } - > + >> \paper { raggedright = ##t \translator { diff --git a/input/regression/lyrics-extender.ly b/input/regression/lyrics-extender.ly index f0bcf9b90e..02c86c2b9e 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.2" +\version "1.9.4" \header{ texidoc = @@ -11,7 +11,7 @@ Also shown: a trick to get an extender at the end of the staff. sopran = \notes \relative c'' { \time 3/4 a2.( | \break - g2) < g4 { s8 s8 } > | + g2) << g4 { s8 s8 } >> | } text = \lyrics { @@ -19,11 +19,11 @@ vielt __ Zeit. __ " " } \score { -< +<< \addlyrics \context Staff \sopran \context Lyrics \text -> +>> \paper { linewidth = 5.0\cm } } diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly index ee16767804..d3c4ff8377 100644 --- a/input/regression/lyrics-melisma-beam.ly +++ b/input/regression/lyrics-melisma-beam.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Melismata are triggered by manual beams." diff --git a/input/regression/lyrics-multi-stanza.ly b/input/regression/lyrics-multi-stanza.ly index 79eb20ba29..53a99a2ed1 100644 --- a/input/regression/lyrics-multi-stanza.ly +++ b/input/regression/lyrics-multi-stanza.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Lyrics syllables are aligned according to @@ -11,14 +11,14 @@ texidoc = "Lyrics syllables are aligned according to \score { \addlyrics \notes \relative c'' \context Voice = duet { \time 3/4 g2 e4 a2 f4 g2. } - \lyrics \context Lyrics < + \lyrics \context Lyrics << \context LyricsVoice = "duet-1" { \property LyricsVoice . stanza = "Bert" Hi, my name is bert. } \context LyricsVoice = "duet-2" { \property LyricsVoice . stanza = "Ernie" Ooooo, ch\'e -- ri, je t'aime. } - > + >> \paper { raggedright = ##t} } diff --git a/input/regression/markup-note.ly b/input/regression/markup-note.ly index 9415c3993b..a287d64fab 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.2" +\version "1.9.4" \score { \notes { c4^\markup { \note #0 #0 #1 diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly index b1cc9ae0cd..f2702ec34a 100644 --- a/input/regression/markup-stack.ly +++ b/input/regression/markup-stack.ly @@ -1,6 +1,6 @@ -\version "1.9.2" +\version "1.9.4" \header {texidoc="Stacking of markup scripts."} \paper { raggedright = ##t} -\score { \notes { c''^\markup { "a" \column << "1" \bold "2" "3" >> } } } +\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 72897c5b44..36615f67f4 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.2" +\version "1.9.4" %% TODO: should have 2/4 + 5/8 time sig style. diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly index 20c4eb4de5..af381fc219 100644 --- a/input/regression/mensural.ly +++ b/input/regression/mensural.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 c33117a138..471c51c87d 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.2" +\version "1.9.4" \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 233b95eeaa..41f3c24999 100644 --- a/input/regression/mm-rests2.ly +++ b/input/regression/mm-rests2.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" @@ -27,8 +27,8 @@ R1*10 | R1*11 | } -\score { < \context Staff \thenotes +\score { << \context Staff \thenotes - > + >> } diff --git a/input/regression/mmrest-collision.ly b/input/regression/mmrest-collision.ly index 568b8f46d4..e3650ae9ca 100644 --- a/input/regression/mmrest-collision.ly +++ b/input/regression/mmrest-collision.ly @@ -1,8 +1,8 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Tests a collision between multimeasure rests in different voices. " } \score { - \context Staff \notes < + \context Staff \notes << \new Voice { \property Voice.MultiMeasureRest \override #'staff-position = #3 R1 @@ -11,7 +11,7 @@ different voices. " } \property Voice.MultiMeasureRest \override #'staff-position = #-3 R1 } - > + >> \paper { \translator { \StaffContext diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly index 9851bab792..6643ff44a5 100644 --- a/input/regression/molecule-hacking.ly +++ b/input/regression/molecule-hacking.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 8eda9b4ace..3ca6dcdb63 100644 --- a/input/regression/multi-measure-rest-center.ly +++ b/input/regression/multi-measure-rest-center.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 23aed11d62..0e18194b64 100644 --- a/input/regression/multi-measure-rest-grace.ly +++ b/input/regression/multi-measure-rest-grace.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { @@ -6,8 +6,8 @@ texidoc= "Grace notes and multi-measure rests." } \score { -\notes < +\notes << \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 29f09ec73d..1b84a68f38 100644 --- a/input/regression/multi-measure-rest-instr-name.ly +++ b/input/regression/multi-measure-rest-instr-name.ly @@ -1,13 +1,13 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "This combines instrument names and multimeasure rests (there was an interesting bug in 1.3.98). " } \score{ - \context Staff < + \context Staff << \property Staff.instrument = "instrument" \property Staff.instr = "instr" \notes{c''1 \break R1 } - > + >> \paper { \translator { \StaffContext \consists Instrument_name_engraver diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly index 7b182420c6..168c9436c3 100644 --- a/input/regression/multi-measure-rest-text.ly +++ b/input/regression/multi-measure-rest-text.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { @@ -13,7 +13,7 @@ Texts may be added to the multi measure rests. \score { \notes { \time 3/4 \property Score.skipBars = ##t - R2._\markup { \center << \musicglyph #"scripts-dfermata" \roman "Ad lib" >> } + R2._\markup { \center < \musicglyph #"scripts-dfermata" \roman "Ad lib" > } R2.^\fermataMarkup R2.^"4" R2.*3_\markup { \roman "a1b2c3" } diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly index 18d3bf8b9c..efbf81c422 100644 --- a/input/regression/multi-measure-rest.ly +++ b/input/regression/multi-measure-rest.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/music-map.ly b/input/regression/music-map.ly index 361574d800..aa7e0b2c30 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.2" +\version "1.9.4" #(define (notes-to-skip m) "Convert all stuff with duration (notes, lyrics, bass figures, etc.) to skips. @@ -36,7 +36,7 @@ foobar = \notes \transpose c c' { c4\>-^ c4-^ c4\!-^ c4-^ } \notes \relative c'' \context Voice { \foobar - < \apply #(lambda (x) (music-map notes-to-skip x)) + << \apply #(lambda (x) (music-map notes-to-skip x)) \foobar - { d2 d2 } > + { d2 d2 } >> }} diff --git a/input/regression/new-markup-syntax.ly b/input/regression/new-markup-syntax.ly index 69883ab692..31d6e9f9c2 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.2" +\version "1.9.4" \score { @@ -13,7 +13,7 @@ texidoc = "New markup syntax." \raise #0.2 \hbracket \bold bar \override #'(baseline-skip . 4) - \bracket \column << baz bazr bla >> + \bracket \column < baz bazr bla > \hspace #2.0 \override #'(font-family . music) { \lookup #"noteheads-0" @@ -23,7 +23,7 @@ texidoc = "New markup syntax." \combine "X" "+" \combine "o" "/" % \char-number #"abc1234abc" - \box \column << { "string 1" } { "string 2" } >> + \box \column < { "string 1" } { "string 2" } > "$\\emptyset$" \italic Norsk \super "2" diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly index c04e375cfb..7512a376ec 100644 --- a/input/regression/non-empty-text.ly +++ b/input/regression/non-empty-text.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly index 1d49916e8d..93654c1cb9 100644 --- a/input/regression/note-group-bracket.ly +++ b/input/regression/note-group-bracket.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly index f932fe136d..1ee2a77df0 100644 --- a/input/regression/note-head-chord.ly +++ b/input/regression/note-head-chord.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Note heads are flipped on the stem to prevent collisions. @@ -12,10 +12,10 @@ It also works for whole heads that have invisible stems. \score { \notes \relative c'' \context Thread { - <>4 - <> - <> - <> - <>1 + 4 + + + + 1 }} diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly index c68b8046a0..85d059178a 100644 --- a/input/regression/note-head-style.ly +++ b/input/regression/note-head-style.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" Note head shapes are settable. The stem endings should be adjusted @@ -16,7 +16,7 @@ either up or down stems. \clef C \property Staff.NoteHead \set #'style = #'default - < + << \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'default" } @@ -26,11 +26,11 @@ either up or down stems. \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } - > + >> \break \property Staff.NoteHead \set #'style = #'baroque - < + << \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'baroque" } @@ -40,11 +40,11 @@ either up or down stems. \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } - > + >> \break \property Staff.NoteHead \set #'style = #'neo_mensural - < + << \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'neo\_mensural" } @@ -54,11 +54,11 @@ either up or down stems. \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } - > + >> \break \property Staff.NoteHead \set #'style = #'mensural - < + << \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'mensural" } @@ -68,11 +68,11 @@ either up or down stems. \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } - > + >> \break \property Staff.NoteHead \set #'style = #'harmonic - < + << \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'harmonic" } @@ -82,11 +82,11 @@ either up or down stems. \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } - > + >> \break \property Staff.NoteHead \set #'style = #'diamond - < + << \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'diamond" } @@ -96,11 +96,11 @@ either up or down stems. \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } - > + >> \break \property Staff.NoteHead \set #'style = #'cross - < + << \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'cross" } @@ -110,11 +110,11 @@ either up or down stems. \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } - > + >> \break \property Staff.NoteHead \set #'style = #'xcircle - < + << \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'xcircle" } @@ -124,11 +124,11 @@ either up or down stems. \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } - > + >> \break \property Staff.NoteHead \set #'style = #'triangle - < + << \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'triangle" } @@ -138,11 +138,11 @@ either up or down stems. \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } - > + >> \break \property Staff.NoteHead \set #'style = #'slash - < + << \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'style = \#'slash" } @@ -152,11 +152,11 @@ either up or down stems. \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } - > + >> \break \property Staff.NoteHead \override #'transparent = ##t - < + << \new Voice { \property Voice.Stem \set #'direction = #1 %up e'16^\markup { "NoteHead \#'transparent = \#\#t" } @@ -166,11 +166,11 @@ either up or down stems. \property Voice.Stem \set #'direction = #-1 %down a16 a16 a8 a4 a2 a1 a\breve a\longa } - > + >> \property Staff.NoteHead \revert #'transparent \break - \new Voice < + \new Voice << \new Thread { \property Thread.NoteHead \set #'style = #'cross \property Voice.Stem \set #'direction = #1 @@ -182,9 +182,9 @@ either up or down stems. \new Thread { \property Thread.NoteHead \set #'style = #'mensural d'16 } - > + >> - \context Voice < + \context Voice << \new Thread { \property Thread.NoteHead \set #'style = #'cross c'4 c'4 c'4 c'4 @@ -195,7 +195,7 @@ either up or down stems. \property Thread.NoteHead \set #'style = #'slash \stemUp c''4 \stemDown c'' } - > + >> } \paper { diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly index d771a8c1d1..ace1d0b48b 100644 --- a/input/regression/note-line.ly +++ b/input/regression/note-line.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Note head lines (e.g. glissando) @@ -10,7 +10,7 @@ sd = \notes{ \translator Staff = down} \score { \context PianoStaff - \notes < + \notes << \context Staff = up { \property PianoStaff.connectArpeggios = ##t \showStaffSwitch @@ -20,7 +20,7 @@ sd = \notes{ \translator Staff = down} \context Staff = down { \clef F s1*4 } - > + >> \paper { linewidth = 8.0 \cm } diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly index 0a36c9eba5..efdd48d209 100644 --- a/input/regression/number-staff-lines.ly +++ b/input/regression/number-staff-lines.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 6efcf2d4ea..77d263308b 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.2" +\version "1.9.4" \paper { raggedright = ##t} diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly index 2d76c44590..0a32a084ec 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.2" +\version "1.9.4" \paper { raggedright = ##t} diff --git a/input/regression/output-property.ly b/input/regression/output-property.ly index 9856e93b28..18ac8df94a 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.2" +\version "1.9.4" #(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 d27ac4bfd8..16449dbf3e 100644 --- a/input/regression/pc-mmrest.ly +++ b/input/regression/pc-mmrest.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc="Multi measure rests of second voice should not disappear." } @@ -33,13 +33,13 @@ two = \notes \relative c'' { } \score { - \notes < - \context Staff = Viole < + \notes << + \context Staff = Viole << \context Voice=one \partcombine Voice \context Thread=one \one \context Thread=two \two - > - > + >> + >> \paper { \translator { \ThreadContext diff --git a/input/regression/pc-switch-slur.ly b/input/regression/pc-switch-slur.ly index 817b0d2bd1..7fd28ae6c7 100644 --- a/input/regression/pc-switch-slur.ly +++ b/input/regression/pc-switch-slur.ly @@ -1,11 +1,11 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc="The partcombiner should not combine two small slurs into a big one." } \score{ - \context Staff < + \context Staff << \context Voice=one\skip 1 \context Voice=two\skip 1 \context Voice=one \partcombine Voice @@ -18,7 +18,7 @@ texidoc="The partcombiner should not combine two small slurs into a big one." a( b c a) } - > + >> \paper{ linewidth=140.\mm } diff --git a/input/regression/phrasing-slur.ly b/input/regression/phrasing-slur.ly index 65fd41f712..16fc3781f6 100644 --- a/input/regression/phrasing-slur.ly +++ b/input/regression/phrasing-slur.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 343687ded6..2d8fe0e34b 100644 --- a/input/regression/prefatory-empty-spacing.ly +++ b/input/regression/prefatory-empty-spacing.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly index d0b855b4ee..fb653d98e4 100644 --- a/input/regression/prefatory-spacing-matter.ly +++ b/input/regression/prefatory-spacing-matter.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Prefatory spacing. diff --git a/input/regression/property-once.ly b/input/regression/property-once.ly index c9d0dafa0f..0b8f1dfd55 100644 --- a/input/regression/property-once.ly +++ b/input/regression/property-once.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 3bb0b6a904..d7d3163514 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.2" +\version "1.9.4" global = \notes { @@ -14,7 +14,7 @@ global = \notes { s1 | \mark "12" s1 | \mark \default s1 | \mark "A2" - s1 | \mark \markup { mark \column << up \bold down >> } + s1 | \mark \markup { mark \column < up \bold down > } s1 } @@ -24,6 +24,6 @@ one = \notes \relative c { \score{ -\context Staff < \global \one > +\context Staff << \global \one >> } diff --git a/input/regression/repeat-fold.ly b/input/regression/repeat-fold.ly index efb10903f9..f61e6b9b7f 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.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/repeat-line-break.ly b/input/regression/repeat-line-break.ly index 9b1ebfb43c..d9ae3439b3 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.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/repeat-percent-skipbars.ly b/input/regression/repeat-percent-skipbars.ly index 195f838196..05c9113e1b 100644 --- a/input/regression/repeat-percent-skipbars.ly +++ b/input/regression/repeat-percent-skipbars.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { @@ -8,11 +8,11 @@ texidoc = "Percent repeats are not skipped, even when skipBars is set. " \paper { raggedright= ##t } \score { - \context Staff < + \context Staff << \property Score.skipBars = ##t \notes { \repeat "percent" 2 { g2 a g a } } - > + >> } diff --git a/input/regression/repeat-percent.ly b/input/regression/repeat-percent.ly index 68622b2d93..3954d1f674 100644 --- a/input/regression/repeat-percent.ly +++ b/input/regression/repeat-percent.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 29cd829839..24620c95d8 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.2" +\version "1.9.4" \header { texidoc = "Beat repeats are supported." } diff --git a/input/regression/repeat-unfold-all.ly b/input/regression/repeat-unfold-all.ly index afaaff46df..6bc807b92d 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.2" +\version "1.9.4" \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 88ed06eb24..f411161375 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.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly index 3429477e9c..9ca2a3d542 100644 --- a/input/regression/repeat-volta-skip-alternatives.ly +++ b/input/regression/repeat-volta-skip-alternatives.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 1080d08c10..bff3ea71ee 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.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/rest-collision-default.ly b/input/regression/rest-collision-default.ly index e258b91037..18d339547c 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.2" +\version "1.9.4" \header { @@ -11,10 +11,10 @@ texidoc = "Rests in collisions sit opposite of the note if no direction is \paper { raggedright= ##t } \score{\notes\relative c'' - \context Staff < + \context Staff << \time 2/4 \new Voice { r4 } \new Voice {\voiceTwo -b8 }>} +b8 }>>} diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly index 547f87273a..fe3ecd3727 100644 --- a/input/regression/rest-collision.ly +++ b/input/regression/rest-collision.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" Rests should not collide with beams, stems and noteheads. Rests may @@ -17,7 +17,7 @@ scale = \notes \relative c' { rests = \notes { r r r r r r r r r r r r r r r r } -different = < { +different = << { \notes \relative c'' { r8 a e4 a e } @@ -25,21 +25,21 @@ different = < { \notes \relative c'' { r1 - }} > + }} >> -scales = \context Staff \notes < +scales = \context Staff \notes << { 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 < { r8 } \\{ r8} > - \context Staff < { r8} r8 \\{ r8} > - \context Staff < { r8} r8 r8 \\ { r8} > - \context Staff < { r} \\ { r} > - \context Staff < { 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 7bbd55042d..7bb0c2dbbc 100644 --- a/input/regression/rest-ledger.ly +++ b/input/regression/rest-ledger.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 5434a169e4..7ad5a77cf1 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.2" +\version "1.9.4" \header { texidoc = "Rests can have pitches--these will be affected by @@ -14,8 +14,8 @@ collision will leave it alone." { a4\rest b4\rest c4\rest - - +<> +<> } } diff --git a/input/regression/rest.ly b/input/regression/rest.ly index f9152bf287..7c47b1b8e0 100644 --- a/input/regression/rest.ly +++ b/input/regression/rest.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/rhythmic-staff.ly b/input/regression/rhythmic-staff.ly index f0093ab1ae..c979de26ca 100644 --- a/input/regression/rhythmic-staff.ly +++ b/input/regression/rhythmic-staff.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly index 7fa6fc0757..ff97052cc5 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.2" +\version "1.9.4" \header { @@ -10,9 +10,9 @@ \score { \notes \relative c'' { c4 - <>\marcato - < { c4^^ }\\ - { d4_^ } > + \marcato + << { c4^^ }\\ + { d4_^ } >> } \paper { raggedright = ##t} } diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly index 381aae9d69..21d6945858 100644 --- a/input/regression/script-stack-order.ly +++ b/input/regression/script-stack-order.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 39ee607536..a84aecefa2 100644 --- a/input/regression/script-stacked.ly +++ b/input/regression/script-stacked.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \paper { raggedright= ##t } diff --git a/input/regression/size11.ly b/input/regression/size11.ly index 91f639d45b..c2eb7ddfde 100644 --- a/input/regression/size11.ly +++ b/input/regression/size11.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/size13.ly b/input/regression/size13.ly index fdc05de2d1..02c156191e 100644 --- a/input/regression/size13.ly +++ b/input/regression/size13.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" foollilypondbook = " \score " diff --git a/input/regression/size16.ly b/input/regression/size16.ly index dc2bcd946e..e776b0bf72 100644 --- a/input/regression/size16.ly +++ b/input/regression/size16.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" foollilypondbook = " \score " diff --git a/input/regression/size20.ly b/input/regression/size20.ly index 9e072743ff..35ffafafb3 100644 --- a/input/regression/size20.ly +++ b/input/regression/size20.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" foollilypondbook = " \score " diff --git a/input/regression/size23.ly b/input/regression/size23.ly index 570952a8bb..5462cd3c3f 100644 --- a/input/regression/size23.ly +++ b/input/regression/size23.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" foollilypondbook = " \score " diff --git a/input/regression/size26.ly b/input/regression/size26.ly index 22277fbb2b..90380143ab 100644 --- a/input/regression/size26.ly +++ b/input/regression/size26.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" foollilypondbook = " \score " diff --git a/input/regression/slur-area.ly b/input/regression/slur-area.ly index b6f370f2b9..5f445d16e4 100644 --- a/input/regression/slur-area.ly +++ b/input/regression/slur-area.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 db268a1381..9a12548d0d 100644 --- a/input/regression/slur-attachment.ly +++ b/input/regression/slur-attachment.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly index 5a0bc2f123..a51bae702e 100644 --- a/input/regression/slur-broken-trend.ly +++ b/input/regression/slur-broken-trend.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly index 08bf3089c3..a4e30e250a 100644 --- a/input/regression/slur-cross-staff.ly +++ b/input/regression/slur-cross-staff.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" The same goes for slurs. They behave decently when broken across @@ -9,7 +9,7 @@ linebreak. \score{ - \context PianoStaff < + \context PianoStaff << \context Staff=one \notes\relative c'{ \stemUp \slurUp c4( c \translator Staff=two c c) | @@ -44,7 +44,7 @@ linebreak. \clef bass s1 s1 s1 s1 s1 s1 s1 s1 s1 s1 } - > + >> } diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly index d022acc9c5..eedc912f9d 100644 --- a/input/regression/slur-dots.ly +++ b/input/regression/slur-dots.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 fb59f1fa65..96c53129ba 100644 --- a/input/regression/slur-nice.ly +++ b/input/regression/slur-nice.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 0aba0c09a4..2d80d292c3 100644 --- a/input/regression/slur-rest.ly +++ b/input/regression/slur-rest.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 057e43acb7..3aef541616 100644 --- a/input/regression/slur-staccato.ly +++ b/input/regression/slur-staccato.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 5437cbbfe4..4f439a9216 100644 --- a/input/regression/slur-stem-broken.ly +++ b/input/regression/slur-stem-broken.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 3afd90e34b..554c02e5d4 100644 --- a/input/regression/slur-symmetry-1.ly +++ b/input/regression/slur-symmetry-1.ly @@ -1,12 +1,12 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Symmetric figures should lead to symmetric slurs." } \score{ - \notes\relative c''< + \notes\relative c''<< \time 4/4 \context Staff{ f8(f f f) f(g g f) f(a a f) f(b b f) @@ -14,7 +14,7 @@ \new Staff{ e,(e e e) e(d d e) e(c c e) e(b b e) } - > + >> \paper{ raggedright = ##t } diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly index 9e1f32f63b..652744c60d 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.2" +\version "1.9.4" \header { texidoc = "Symmetric figures should lead to symmetric slurs." @@ -7,7 +7,7 @@ } \score{ - \notes\relative c'< + \notes\relative c'<< \time 6/8 \context Staff{ e8(e e) e(d e) e(c e) e(b e) @@ -15,7 +15,7 @@ \new Staff{ f'8(f f) f(g f) f(a f) f(b f) } - > + >> \paper{ raggedright = ##t } diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly index 92be39ede7..6e9581e6b7 100644 --- a/input/regression/spacing-accidental-staffs.ly +++ b/input/regression/spacing-accidental-staffs.ly @@ -1,19 +1,19 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Accidentals in different staffs don't effect the spacing of the quarter notes here." } -\score { \notes \relative c'' < \new Staff { \time 4/4 +\score { \notes \relative c'' << \new Staff { \time 4/4 c8[ c8 cis8 cis8] cis8[ cis8 cis8 cis] } - { \key d \major cis4 cis4 cis4 cis!4 } > + { \key d \major cis4 cis4 cis4 cis!4 } >> \paper { raggedright = ##t} } diff --git a/input/regression/spacing-accidental-stretch.ly b/input/regression/spacing-accidental-stretch.ly index e03adc8c80..3961f7476c 100644 --- a/input/regression/spacing-accidental-stretch.ly +++ b/input/regression/spacing-accidental-stretch.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 5787cda3c1..f9f2cafc67 100644 --- a/input/regression/spacing-accidental.ly +++ b/input/regression/spacing-accidental.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 a19962f05d..60acdf8a09 100644 --- a/input/regression/spacing-bar-stem.ly +++ b/input/regression/spacing-bar-stem.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 8b58bd857f..bb0a0cdf68 100644 --- a/input/regression/spacing-clef-first-note.ly +++ b/input/regression/spacing-clef-first-note.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Clef changes at the start of a line get much more space @@ -7,14 +7,14 @@ than clef changes halfway the line." } \score {\notes { - < \new Staff { + << \new Staff { c'2 \clef bass e16 f a \clef treble b } \new Staff { c'4 c'4 c'4 - }> + }>> } \paper { raggedright = ##t \translator { \StaffContext diff --git a/input/regression/spacing-end-of-line.ly b/input/regression/spacing-end-of-line.ly index e2fc3efefa..f67bc45829 100644 --- a/input/regression/spacing-end-of-line.ly +++ b/input/regression/spacing-end-of-line.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 b6ef294d32..5407536b0c 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.2" +\version "1.9.4" \header { texidoc = " A voicelet (a very short voice to get polyphonic chords correct) should not confuse the spacing engine." @@ -9,12 +9,12 @@ should not confuse the spacing engine." \score { \notes { \context Staff \relative c' { c4 - < + << { r4 dis'4 } \\ { r4 fis,4 } \\ { r bis } \\ { s gis } - > + >> c4 }} \paper { raggedright = ##t } diff --git a/input/regression/spacing-folded-clef.ly b/input/regression/spacing-folded-clef.ly index 0c6c2914db..b167ba7f49 100644 --- a/input/regression/spacing-folded-clef.ly +++ b/input/regression/spacing-folded-clef.ly @@ -1,14 +1,14 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \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'' < +\score { \notes \relative c'' << \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 64ed940d53..20499873db 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.2" +\version "1.9.4" \header { texidoc = "A clef can be folded below notes in a different staff, if @@ -7,10 +7,10 @@ there is space enough. With Paper_column molecule callbacks we can show where columns are in the score." } -\score { \notes \relative c'' < +\score { \notes \relative c'' << \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 163dea5fbf..354b316bd8 100644 --- a/input/regression/spacing-grace-duration.ly +++ b/input/regression/spacing-grace-duration.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 35c20cbf5f..e90388523c 100644 --- a/input/regression/spacing-grace.ly +++ b/input/regression/spacing-grace.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Grace note spacing. Should be tuned? " } diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly index 4faef8c681..0bab3c16d6 100644 --- a/input/regression/spacing-knee.ly +++ b/input/regression/spacing-knee.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 e43609066a..bf2f47c51b 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.2" +\version "1.9.4" \header{ texidoc = "Concurrent tuplets should be spaced equidistantly on all staffs. @@ -11,7 +11,7 @@ is. For non-raggedright, it still shows a bug: uneven spacing. multipart = \notes \relative c'{ - \context StaffGroup < + \context StaffGroup << \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] } @@ -20,7 +20,7 @@ multipart = \notes \relative c'{ \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] } } - > + >> } \score{ diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly index 6bcafd02c8..ef95e9c964 100644 --- a/input/regression/spacing-note-flags.ly +++ b/input/regression/spacing-note-flags.ly @@ -17,5 +17,5 @@ raggedright = ##t } } -\version "1.9.2" +\version "1.9.4" diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly index f18c3652ca..7a3b7dea4a 100644 --- a/input/regression/spacing-rest.ly +++ b/input/regression/spacing-rest.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 98cab3b876..b8cca1b7e8 100644 --- a/input/regression/spacing-short-notes.ly +++ b/input/regression/spacing-short-notes.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 ccca587a57..9939726a98 100644 --- a/input/regression/spacing-stem-bar.ly +++ b/input/regression/spacing-stem-bar.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 b534410859..458342dcd1 100644 --- a/input/regression/spacing-stem-direction.ly +++ b/input/regression/spacing-stem-direction.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly index 09f200b052..6c82631354 100644 --- a/input/regression/spacing-stem-same-direction.ly +++ b/input/regression/spacing-stem-same-direction.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 af0b19adef..b08f99c4bb 100644 --- a/input/regression/spacing-to-grace.ly +++ b/input/regression/spacing-to-grace.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 cc0f53691d..10e30e62a7 100644 --- a/input/regression/spacing-very-tight.ly +++ b/input/regression/spacing-very-tight.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = " When tightly spaced, hinterfleisch -> 0. diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly index 2e5e5b9624..518265e195 100644 --- a/input/regression/span-bar.ly +++ b/input/regression/span-bar.ly @@ -1,19 +1,19 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \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' \new StaffGroup < + \notes \relative c' \new StaffGroup << \new Staff { a1 a1 a1} - \new Lyrics \lyrics < + \new Lyrics \lyrics << { bla1 die bla } { foo bar foo } - > + >> \new Staff { f1 f1 f1} - > + >> \paper { \translator { \StaffContext diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly index 8f9f2729f6..b61334085f 100644 --- a/input/regression/staccato-pos.ly +++ b/input/regression/staccato-pos.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/staff-tweak.ly b/input/regression/staff-tweak.ly index 35e32f94d1..ae70ac9d5d 100644 --- a/input/regression/staff-tweak.ly +++ b/input/regression/staff-tweak.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 6d59d63988..6b7c2d4d00 100644 --- a/input/regression/stanza-number.ly +++ b/input/regression/stanza-number.ly @@ -1,10 +1,10 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Stanza numbers may differ for the first and following systems." } \score { -< +<< \context LyricsVoice \lyrics { \property LyricsVoice . stanza = "first" @@ -12,7 +12,7 @@ texidoc = "Stanza numbers may differ for the first and following systems." Foo1 Bar1 } \notes { c''1 \break c''1 } -> +>> \paper { raggedright = ##t } } diff --git a/input/regression/stem-direction.ly b/input/regression/stem-direction.ly index 7cc95b5933..44e4096e23 100644 --- a/input/regression/stem-direction.ly +++ b/input/regression/stem-direction.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/stem-shorten.ly b/input/regression/stem-shorten.ly index 9b7f5983fb..a553b8af01 100644 --- a/input/regression/stem-shorten.ly +++ b/input/regression/stem-shorten.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { diff --git a/input/regression/stem-spacing.ly b/input/regression/stem-spacing.ly index 685864eb1b..2f59207889 100644 --- a/input/regression/stem-spacing.ly +++ b/input/regression/stem-spacing.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly index ea680aa2f6..e4f897486b 100644 --- a/input/regression/stem-tremolo.ly +++ b/input/regression/stem-tremolo.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 0320505a47..0b971f2ef7 100644 --- a/input/regression/system-extents.ly +++ b/input/regression/system-extents.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 0c25d53151..4b7021bdf2 100644 --- a/input/regression/system-start-bracket.ly +++ b/input/regression/system-start-bracket.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = " @@ -8,12 +8,12 @@ The piano brace should be shifted horizontally if it is enclosed in a bracket. \score { \notes { - \context StaffGroup < + \context StaffGroup << c4 - \context PianoStaff << + \context PianoStaff < d e - >>4 - > + >4 + >> }\paper {raggedright = ##t}} diff --git a/input/regression/tag-filter.ly b/input/regression/tag-filter.ly index e7d5915276..9bc7472a3d 100644 --- a/input/regression/tag-filter.ly +++ b/input/regression/tag-filter.ly @@ -1,5 +1,5 @@ -\version "1.9.3" +\version "1.9.4" \header { texidoc = "The @code{\\tag} command marks music expressions with a @@ -17,15 +17,15 @@ common = \notes \relative c'' { c1 - \relative c' < - \tag #'part < + \relative c' << + \tag #'part << R1 \\ { \property Voice.fontSize = #-1 c4_"cue" f2 g4 } - > + >> \tag #'score R1 - > + >> c1-\tag #'part ^4 } diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly index 43cab57f87..ee27f07057 100644 --- a/input/regression/text-spanner.ly +++ b/input/regression/text-spanner.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 0f2fa42e5b..963b8b7bbf 100644 --- a/input/regression/tie-accidental.ly +++ b/input/regression/tie-accidental.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" @@ -50,9 +50,9 @@ thenotes = \notes \relative cis' { } \score { - < + << \context Staff \thenotes \context NoteNames \thenotes - > + >> } diff --git a/input/regression/tie-break-accidental.ly b/input/regression/tie-break-accidental.ly index 9b8c215156..5ba27074ba 100644 --- a/input/regression/tie-break-accidental.ly +++ b/input/regression/tie-break-accidental.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 c19149ad6f..addc1aaeee 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.2" +\version "1.9.4" \header { texidoc = "Tie engraver uses @code{busyGrobs} to keep track of @@ -10,12 +10,12 @@ note heads. Test if this queue works by throwing many mixed tuplets at it." \score { \notes \context Staff \relative c'' - < + << { \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 e1a2a0ed93..42b8129b45 100644 --- a/input/regression/tie-chord-partial.ly +++ b/input/regression/tie-chord-partial.ly @@ -6,14 +6,14 @@ putting the Tie engraver at Thread level, and redirecting untied notes to a different thread." } -\version "1.9.2" +\version "1.9.4" \paper { raggedright= ##t } \score { \notes \context Thread \relative c' { - < c~ e \new Thread c' > - < c e c' > + << c~ e \new Thread c' >> + << c e c' >> } diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly index b2ed3936c4..f3965ce421 100644 --- a/input/regression/tie-chord.ly +++ b/input/regression/tie-chord.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" When tieing chords, the outer slurs point outwards, the inner slurs @@ -9,7 +9,7 @@ point away from the center of the staff. Override with } -t = \notes \relative c' { <> ~ <> } +t = \notes \relative c' { ~ } \score { \notes \context Voice { diff --git a/input/regression/tie-dots.ly b/input/regression/tie-dots.ly index 34f1000260..6bf4030697 100644 --- a/input/regression/tie-dots.ly +++ b/input/regression/tie-dots.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Ties should not collide with dots." } diff --git a/input/regression/tie-grace.ly b/input/regression/tie-grace.ly index 920520441e..176c5efadf 100644 --- a/input/regression/tie-grace.ly +++ b/input/regression/tie-grace.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 9250ecc957..2c9ab51618 100644 --- a/input/regression/tie.ly +++ b/input/regression/tie.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly index 023212a235..3505d8552c 100644 --- a/input/regression/tuplet-beam.ly +++ b/input/regression/tuplet-beam.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 4b14578830..25d70d4d10 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 8b22aaed22..b3ebc1a64b 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.2" +\version "1.9.4" \score { diff --git a/input/regression/tuplet-rest.ly b/input/regression/tuplet-rest.ly index f1d6d30407..e01019a931 100644 --- a/input/regression/tuplet-rest.ly +++ b/input/regression/tuplet-rest.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header {texidoc = "Tests tuplet rests. "} \score { diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly index e657b65c60..48412d734d 100644 --- a/input/regression/tuplet-staffline-collision.ly +++ b/input/regression/tuplet-staffline-collision.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Horizontal tuplet brackets are shifted vertically diff --git a/input/regression/tuplets.ly b/input/regression/tuplets.ly index ae6a979f07..166150cee5 100644 --- a/input/regression/tuplets.ly +++ b/input/regression/tuplets.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc=" diff --git a/input/regression/voice-follower.ly b/input/regression/voice-follower.ly index 64d19ec2c6..ab84d342ae 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.2" +\version "1.9.4" \header { texidoc= " @@ -11,7 +11,7 @@ can be printed automatically. This is enabled if the property } \score { \notes \relative c' -\context PianoStaff < +\context PianoStaff << \property PianoStaff.followVoice = ##t \context Staff \context Voice { c1 @@ -19,6 +19,6 @@ can be printed automatically. This is enabled if the property b2 a } \new Staff {\clef bass \skip 1*2 } - >\paper{ + >>\paper{ linewidth =-1. }} diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly index 0813a8969f..7c05f96609 100644 --- a/input/regression/volta-broken-left-edge.ly +++ b/input/regression/volta-broken-left-edge.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc ="Broken volta spanners behave correctly at left edge in all cases." @@ -105,7 +105,7 @@ f f\break } } \score{ - \notes < + \notes << \new Staff @@ -117,7 +117,7 @@ f f\break \voiceE } - > + >> \paper { raggedright =##t } } diff --git a/input/regression/volta-multi-staff.ly b/input/regression/volta-multi-staff.ly index 4603334a4f..4fc24b4595 100644 --- a/input/regression/volta-multi-staff.ly +++ b/input/regression/volta-multi-staff.ly @@ -4,25 +4,25 @@ texidoc = "By setting @code{voltaOnThisStaff}, repeats can be put on more staffs in a score." } -\version "1.9.2" +\version "1.9.4" vmus = \notes { \repeat volta 2 c1 \alternative { d e } } \score { - \notes \relative c'' < - \new StaffGroup < + \notes \relative c'' << + \new StaffGroup << \context Staff \vmus \new Staff \vmus - > - \new StaffGroup < - \new Staff < + >> + \new StaffGroup << + \new Staff << \property Staff.voltaOnThisStaff = ##t - \vmus > + \vmus >> \new Staff \vmus - > - > + >> + >> \paper { raggedright = ##t } } diff --git a/input/screech-boink.ly b/input/screech-boink.ly index 1a7e14423d..dc2db6cb32 100644 --- a/input/screech-boink.ly +++ b/input/screech-boink.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.4" \header { title = "Screech and boink" subtitle = "Random complex notation" @@ -6,13 +6,13 @@ } \score { -\notes \context PianoStaff < +\notes \context PianoStaff << \context Staff = up { \time 4/8 \key c \minor -< { \property Voice.Stem \override #'direction = #'() \translator Staff = down +<< { \property Voice.Stem \override #'direction = #'() \translator Staff = down \property Voice.subdivideBeams = ##t g16.[ \translator Staff = up @@ -27,7 +27,7 @@ { s4 \times 2/3 { d'16[ f' g'] } as'32[ b''32 e'' d''] } \\ { s4 \autoBeamOff d''8.. f''32 } \\ { s4 es''4 } - > + >> } \context Staff = down { @@ -38,17 +38,17 @@ \property Voice.Beam \set #'thickness = #0.3 \property Voice.Stem \set #'thickness = #4.0 g'16[ b16 fis16 g16] -< \apply #notes-to-clusters { - as16 <> - <> - <> +<< \apply #notes-to-clusters { + as16 + + } \\ { \property Staff.Arpeggio \set #'arpeggio-direction =#-1 -<>4\arpeggio } - > +4\arpeggio } + >> } -> +>> \paper { linewidth = -1.0 diff --git a/input/template/gregorian-transcription.ly b/input/template/gregorian-transcription.ly index f46456f84d..4f3df05c56 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.2" +\version "1.9.4" \header { diff --git a/input/template/header.ly b/input/template/header.ly index 6b30d190ba..06883feff1 100644 --- a/input/template/header.ly +++ b/input/template/header.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { dedication = "dedication" title = "Title" diff --git a/input/template/jazz-combo.ly b/input/template/jazz-combo.ly index 9c7cd150ca..9c47a7159c 100644 --- a/input/template/jazz-combo.ly +++ b/input/template/jazz-combo.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { title = "Song" subtitle = "(tune)" @@ -47,9 +47,9 @@ trumpet = { \global \property Staff.instrument = #"Trumpet" \clef treble - \context Staff < + \context Staff << \trpt - > + >> } % ------ Alto Saxophone ------ @@ -63,9 +63,9 @@ altosax = { \global \property Staff.instrument = #"Alto Sax" \clef treble - \context Staff < + \context Staff << \alto - > + >> } % ------ Baritone Saxophone ------ @@ -79,9 +79,9 @@ barisax = { \global \property Staff.instrument = #"Bari Sax" \clef treble - \context Staff < + \context Staff << \bari - > + >> } % ------ Trombone ------ tbone = \notes \relative c { @@ -94,9 +94,9 @@ trombone = { \global \property Staff.instrument = #"Trombone" \clef bass - \context Staff < + \context Staff << \tbone - > + >> } % ############ Rhythm Section ############# % ------ Guitar ------ @@ -113,9 +113,9 @@ guitar = { \global \property Staff.instrument = #"Guitar" \clef treble - \context Staff < + \context Staff << \gtr - > + >> } %% ------ Piano ------ @@ -147,28 +147,28 @@ PianoRH = { \clef treble \global \property Staff.midiInstrument = "acoustic grand" - \context Staff < + \context Staff << \context Voice = one \rhUpper \context Voice = two \rhLower - > + >> } PianoLH = { \clef bass \global \property Staff.midiInstrument = "acoustic grand" - \context Staff < + \context Staff << \context Voice = one \lhUpper \context Voice = two \lhLower - > + >> } piano = { - \context PianoStaff < + \context PianoStaff << \property PianoStaff.instrument = #"Piano" \context Staff = upper \PianoRH \context Staff = lower \PianoLH - > + >> } % ------ Bass Guitar ------ @@ -181,16 +181,16 @@ bass = { \global \property Staff.instrument = #"Bass" \clef bass - \context Staff < + \context Staff << \bass - > + >> } % ------ Drums ------ \include "drumpitch-init.ly" up = \notes { - hh4 hh4 hh4 hh4 - hh4 hh4 + hh4 <> hh4 <> hh4 <> hh4 <> + hh4 <> hh4 <> } down = \notes { bd4 s bd s bd s bd s bd s bd s @@ -200,17 +200,17 @@ drums = \context Staff = drums { \global \property Staff.instrument = #"Drums" \clef percussion - < + << \context Voice = first { \voiceOne \up } \context Voice = second { \voiceTwo \down } - > + >> } %%%%%%%%% It All Goes Together Here %%%%%%%%%%%%%%%%%%%%%% \score { -< - \context StaffGroup = horns < +<< + \context StaffGroup = horns << \context Staff = trumpet \trumpet \context Staff = altosax \altosax @@ -220,9 +220,9 @@ drums = \context Staff = drums { \context Staff = barisax \barisax \context Staff = trombone \trombone - > + >> - \context StaffGroup = rhythm < + \context StaffGroup = rhythm << \context ChordNames = chords \gtrharmony \context Staff = guitar \guitar \context PianoStaff = piano \piano @@ -230,8 +230,8 @@ drums = \context Staff = drums { \context Staff = bass \bass \apply #(drums->paper 'drums) \drums - > -> + >> +>> \midi { \tempo 4 = 75 } \paper { linewidth = 15.0 \cm diff --git a/input/template/melody-chords.ly b/input/template/melody-chords.ly index 70991f0b3d..1e883bae48 100644 --- a/input/template/melody-chords.ly +++ b/input/template/melody-chords.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Lead sheet format: chords with melody." @@ -13,13 +13,13 @@ melody = \notes \relative c' { } \score { - \notes < + \notes << \context ChordNames { \property ChordNames.chordChanges = ##t \harmonies } \context Staff = one \melody - > + >> \paper{ } \midi{ } diff --git a/input/template/melody-lyrics-chords.ly b/input/template/melody-lyrics-chords.ly index 684fcf1f11..ea462ae084 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.2" +\version "1.9.4" \header { texidoc = "Popsong format: chords, melody and lyrics." @@ -18,7 +18,7 @@ accompaniment = \chords { } \score { - < + << \context ChordNames \accompaniment \addlyrics \context Staff = one { @@ -27,7 +27,7 @@ accompaniment = \chords { \melody } \context Lyrics \text - > + >> \paper { } \midi { } } diff --git a/input/template/melody-lyrics.ly b/input/template/melody-lyrics.ly index 033e2d7c6c..2dd7b50cb8 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.2" +\version "1.9.4" \header { texidoc = "Melody and lyrics." @@ -14,14 +14,14 @@ text = \lyrics { } \score { - < + << \addlyrics \context Staff = one { \property Staff.autoBeaming = ##f \melody } \context Lyrics \text - > + >> \paper { } \midi { } } diff --git a/input/template/melody.ly b/input/template/melody.ly index a4e658e3f0..47d4afdce8 100644 --- a/input/template/melody.ly +++ b/input/template/melody.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Only a melody." diff --git a/input/template/piano-4-voices.ly b/input/template/piano-4-voices.ly index d2f539b22c..20f94fe6e9 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.2" +\version "1.9.4" \header { texidoc ="Polyphonic piano music" @@ -26,18 +26,18 @@ lowerTwo = \notes\relative c { } \score { - \context PianoStaff < + \context PianoStaff << %\time 4/4 - \context Staff = upper < + \context Staff = upper << \context Voice = one \upperOne \context Voice = two \upperTwo - > - \context Staff = lower < + >> + \context Staff = lower << \clef bass \context Voice = one \lowerOne \context Voice = two \lowerTwo - > - > + >> + >> \paper { } \midi { } } diff --git a/input/template/piano-dynamics.ly b/input/template/piano-dynamics.ly index 6bfb2241f8..08e1641226 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.2" +\version "1.9.4" \header { texidoc =" Template that puts dynamics on a separate line, so it is neatly @@ -25,15 +25,15 @@ pedal = \notes { } \score { - \context PianoStaff < + \context PianoStaff << \context Staff=upper \upper \context Dynamics=dynamics \dynamics - \context Staff=lower < + \context Staff=lower << \clef bass \lower - > + >> \context Dynamics=pedal \pedal - > + >> \paper { \translator { \type "Engraver_group_engraver" diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly index f6d655e060..61767502f5 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.2" +\version "1.9.4" \header { texidoc ="Lyrics between two staffs." @@ -18,15 +18,15 @@ text = \lyrics { } \score { - \context GrandStaff < + \context GrandStaff << \addlyrics \context Staff = upper \upper \context Lyrics \text - \context Staff = lower < + \context Staff = lower << \clef bass \lower - > - > + >> + >> \paper { \translator { \GrandStaffContext diff --git a/input/template/piano-melody-lyrics.ly b/input/template/piano-melody-lyrics.ly index 3c3c1ee81f..6e557fd2a4 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.2" +\version "1.9.4" \header { texidoc ="Classical song format: one staff with melody and lyrics, @@ -24,7 +24,7 @@ lower = \notes\relative c { } \score { - < + << \addlyrics \context Staff = mel { \property Staff.autoBeaming = ##f @@ -33,14 +33,14 @@ lower = \notes\relative c { } \context Lyrics \text - \context PianoStaff < + \context PianoStaff << \context Staff = upper \upper - \context Staff = lower < + \context Staff = lower << \clef bass \lower - > - > - > + >> + >> + >> \paper { \translator { \RemoveEmptyStaffContext } } diff --git a/input/template/piano.ly b/input/template/piano.ly index 16935ad15a..d13f00edbc 100644 --- a/input/template/piano.ly +++ b/input/template/piano.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header { texidoc = "Simple piano music." @@ -14,14 +14,14 @@ lower = \notes\relative c { } \score { - \context PianoStaff < + \context PianoStaff << %\time 4/4 \context Staff = upper \upper - \context Staff = lower < + \context Staff = lower << \clef bass \lower - > - > + >> + >> \paper { } \midi { } } diff --git a/input/template/satb.ly b/input/template/satb.ly index 76f1583435..62e91b2614 100644 --- a/input/template/satb.ly +++ b/input/template/satb.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header { texidoc = " @@ -20,7 +20,7 @@ bassMusic = \notes \relative c { c4 c g c } bassWords = \lyrics { ho4 ho ho ho } \score { \notes - \context StaffGroup < + \context StaffGroup << \property Score.automaticMelismata = ##t \context Lyrics = sopLyrs { s1 } \context Staff = women { s1 } @@ -41,7 +41,7 @@ bassWords = \lyrics { ho4 ho ho ho } \context Staff = men \context Voice = VB { \voiceTwo \bassMusic } \context Lyrics = bassLyrs { \bassWords} - > + >> \paper { \translator { diff --git a/input/test/+.ly b/input/test/+.ly index 127c284721..7872f9cf84 100644 --- a/input/test/+.ly +++ b/input/test/+.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" %% +.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 d241cf692b..37198178e9 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.2" +\version "1.9.4" %% 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 @@ -30,20 +30,20 @@ basloopje = \notes\relative c{ accompany = \repeat unfold 4 \notes \relative c \basloopje \score{ - \notes \context PianoStaff< - \context Staff=up < + \notes \context PianoStaff<< + \context Staff=up << \global \context Voice=foo{ \voiceOne \melody } - > - \context Staff=down< + >> + \context Staff=down<< \global \clef bass \autochange Staff \context Voice \accompany - > - > + >> + >> \paper { \translator{ diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly index 8392fcf2a9..d39bda3281 100644 --- a/input/test/add-staccato.ly +++ b/input/test/add-staccato.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly index 9da7b4816c..14a2dfec2d 100644 --- a/input/test/add-text-script.ly +++ b/input/test/add-text-script.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc= "@cindex make-music Fingering diff --git a/input/test/ancient-accidentals.ly b/input/test/ancient-accidentals.ly index fc833d9e0f..5ffe8520df 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.2" +\version "1.9.4" \score { \context Voice \notes\relative c { diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index 37f753b81d..6829e7b242 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" % TODO: split ancient-font into seperate files; possibly in % different locations. \header { @@ -9,8 +9,8 @@ included in LilyPond's support of ancient notation. } -upperStaff = \context GregorianStaff = upperStaff < - \context GregorianVoice < +upperStaff = \context GregorianStaff = upperStaff << + \context GregorianVoice << \property Score.timing = ##f % \property Score.forceAccidental = ##t %%%%%%%% FIXME: what happened to this property? @@ -112,11 +112,11 @@ upperStaff = \context GregorianStaff = upperStaff < s32*1 % \break % 12 (32*1) } - > -> + >> +>> -lowerStaff = \context MensuralStaff = lowerStaff < - \context MensuralVoice < +lowerStaff = \context MensuralStaff = lowerStaff << + \context MensuralVoice << % this is broken until further notice -- see refman % \property Staff.StaffSymbol \override #'line-count = #5 @@ -211,14 +211,14 @@ lowerStaff = \context MensuralStaff = lowerStaff < es'! des'! cis'!1 \bar "||" % \break % 12 (8*1) } - > -> + >> +>> \score { - \context Score < + \context Score << \upperStaff \lowerStaff - > + >> \paper { % do we want to keep these settings? -gp linewidth = 17.25\cm diff --git a/input/test/ancient-time.ly b/input/test/ancient-time.ly index a805f9ac75..28d5f0f8b1 100644 --- a/input/test/ancient-time.ly +++ b/input/test/ancient-time.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" % 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 6fd35f698b..c36f1dc932 100644 --- a/input/test/bagpipe.ly +++ b/input/test/bagpipe.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "@cindex Bagpipe Music diff --git a/input/test/bar-always.ly b/input/test/bar-always.ly index 4e0c64aacd..ef5c4342d5 100644 --- a/input/test/bar-always.ly +++ b/input/test/bar-always.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "@cindex Bars Always diff --git a/input/test/bar-lines-lyric-only.ly b/input/test/bar-lines-lyric-only.ly index 7709d8b618..d716dc1a62 100644 --- a/input/test/bar-lines-lyric-only.ly +++ b/input/test/bar-lines-lyric-only.ly @@ -1,19 +1,19 @@ -\version "1.9.2" +\version "1.9.4" \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. " } \score { -\notes \relative c' \context ChoirStaff < +\notes \relative c' \context ChoirStaff << \new Staff { c1 c1 c1} - \context Lyrics \lyrics < + \context Lyrics \lyrics << { bla1 die bla } { foo bar foo } { foo bar foo } - > + >> \new Staff { c1 c1 c1} - > + >> \paper { diff --git a/input/test/bar-lines.ly b/input/test/bar-lines.ly index 4a8d88af7b..ea9e255098 100644 --- a/input/test/bar-lines.ly +++ b/input/test/bar-lines.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 ceb8321489..abe629f71e 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.2" +\version "1.9.4" \header { texidoc = "@cindex Bar Number Every Fifth Reset @@ -14,7 +14,7 @@ intervals, starting from the @code{\applycontext}. resetBarnum = \context Score \applycontext #(set-bar-number-visibility 4) \score { - < + << \notes \transpose c c'' { \property Score.BarNumber \override #'break-visibility =#end-of-line-invisible \property Score.RehearsalMark \override #'padding = #2.5 @@ -24,6 +24,6 @@ resetBarnum = \context Score \applycontext \repeat unfold 8 c \bar "|." } - > + >> \paper{raggedright = ##t} } diff --git a/input/test/bar-number-regular-interval.ly b/input/test/bar-number-regular-interval.ly index 6b147df799..7383db1b47 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.2" +\version "1.9.4" \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 55cad8d90f..45b6c37939 100644 --- a/input/test/bar-number-show-all.ly +++ b/input/test/bar-number-show-all.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 b55fccd4a2..675dcf67df 100644 --- a/input/test/beam-auto-4-8.ly +++ b/input/test/beam-auto-4-8.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % 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 8a106d4bba..59e5c5d387 100644 --- a/input/test/beam-auto-override.ly +++ b/input/test/beam-auto-override.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "@cindex Auto Beaming Override diff --git a/input/test/beam-auto.ly b/input/test/beam-auto.ly index ada307468c..32bbf28c31 100644 --- a/input/test/beam-auto.ly +++ b/input/test/beam-auto.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 25231bd06f..71786158a7 100644 --- a/input/test/beam-control.ly +++ b/input/test/beam-control.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc="@cindex Beam Position Control diff --git a/input/test/beam-count.ly b/input/test/beam-count.ly index 659a0abf00..a3a7e545b0 100644 --- a/input/test/beam-count.ly +++ b/input/test/beam-count.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc="@cindex Beam Count diff --git a/input/test/beam-dir-functions.ly b/input/test/beam-dir-functions.ly index f68a93e4fe..5ed333ceca 100644 --- a/input/test/beam-dir-functions.ly +++ b/input/test/beam-dir-functions.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "@cindex Beam Dir Functions diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index 89b7550232..6216e4fa99 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -1,11 +1,11 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc="@cindex Beam Isknee LilyPond can beam across a Piano Staff. " } \score{ - \context PianoStaff < + \context PianoStaff << \context Staff=one \notes\relative c'{ s1 } @@ -16,7 +16,7 @@ LilyPond can beam across a Piano Staff. s8 s2 } - > + >> \paper{ raggedright = ##t } diff --git a/input/test/beam-neutral-direction.ly b/input/test/beam-neutral-direction.ly index a2b185ad59..2381f49500 100644 --- a/input/test/beam-neutral-direction.ly +++ b/input/test/beam-neutral-direction.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 a3ccd14b12..e092c01cae 100644 --- a/input/test/beam-rest.ly +++ b/input/test/beam-rest.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc="@cindex Beam Over Rests diff --git a/input/test/blank-notes.ly b/input/test/blank-notes.ly index 4d376b5b16..476bd43b0a 100644 --- a/input/test/blank-notes.ly +++ b/input/test/blank-notes.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % 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 933e3e704c..827db07af2 100644 --- a/input/test/blank-paper-tab.ly +++ b/input/test/blank-paper-tab.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "@cindex Blank Paper Tab @@ -8,10 +8,10 @@ tablature staff. " } emptymusic = \notes { \repeat unfold 4 { s1\break } \bar "|." } \score { -\notes < +\notes << \context Staff \emptymusic \context TabStaff \emptymusic - > + >> \paper { diff --git a/input/test/blank-paper.ly b/input/test/blank-paper.ly index aa76576e87..a6522af2dd 100644 --- a/input/test/blank-paper.ly +++ b/input/test/blank-paper.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc="@cindex Blank Paper diff --git a/input/test/boxed-molecule.ly b/input/test/boxed-molecule.ly index 9f04fb92e1..3c03c74eda 100644 --- a/input/test/boxed-molecule.ly +++ b/input/test/boxed-molecule.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 22f9dd103f..1718f3e9a9 100644 --- a/input/test/caps.ly +++ b/input/test/caps.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "@cindex Capital Letters You can set the font to use small caps. @@ -8,11 +8,11 @@ You can set the font to use small caps. shapeSC = \property Lyrics.LyricText \override #'font-shape = #'caps shapeNorm = \property Lyrics.LyricText \revert #'font-shape -\score { < +\score { << \notes \relative c'' { c4 c4 c8 c8 c8 } \lyrics \context Lyrics { what4 is4 \shapeSC The8 Ma -- trix? } - > + >> \paper { raggedright = ##t} } diff --git a/input/test/cautionaries.ly b/input/test/cautionaries.ly index 36991ec8dd..1762295689 100644 --- a/input/test/cautionaries.ly +++ b/input/test/cautionaries.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc="@cindex Cautionary Accidentals LilyPond can display cautionary accidentals in different ways. @@ -7,11 +7,11 @@ LilyPond can display cautionary accidentals in different ways. \key d \major % \property Staff.autoReminders = #'cautionary \property Staff.Accidental \override #'font-relative-size = #0 - <>1 cis?2 d? + 1 cis?2 d? \property Staff.Accidental \override #'cautionary-style = #'smaller - <>1 cis?2 d? + 1 cis?2 d? \property Staff.Accidental \override #'cautionary-style = #'parentheses - <>1 cis?2 d? + 1 cis?2 d? } \paper{raggedright = ##t} diff --git a/input/test/chord-names-german.ly b/input/test/chord-names-german.ly index ec02957f57..6bc5ed623c 100644 --- a/input/test/chord-names-german.ly +++ b/input/test/chord-names-german.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "@cindex Chord Names German By setting @code{ChordNames.chordRootNamer}, the root @@ -20,7 +20,7 @@ scm = \chords { % beses/beses } \score { -\notes < +\notes << \context ChordNames { \scm } \new ChordNames { \property ChordNames.instrument = #"german" @@ -28,7 +28,7 @@ scm = \chords { \new ChordNames { \property ChordNames.instrument =#"semi-german" \semiGermanChords \scm } - \context Voice { \scm } > + \context Voice { \scm } >> \paper { raggedright = ##t \translator {\ChordNamesContext \consists Instrument_name_engraver }} diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly index 3923f309d4..6cb5be14cf 100644 --- a/input/test/chord-names-jazz.ly +++ b/input/test/chord-names-jazz.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { @@ -15,50 +15,50 @@ and an alternative Jazz chord notation. chs = \notes \transpose c' c' { - <>1 - <>% m = minor triad - <> - <> \break - <> - <> - <> % triangle = maj - <> - <> \break - <> - <> - <> - <>\break - <> % 6 = major triad with added sixth - <> % m6 = minor triad with added sixth - <> - <> \break - <> - <> - <> - <> \break - <> - <> - <> - <>\break - <> - <> - <> - <>\break - <> - <> - <> - <>\break - <> - <> - <> - <>\break - <> - <> - <> - <>\break - <> - <> % add9 - <> + 1 + % m = minor triad + + \break + + + % triangle = maj + + \break + + + + \break + % 6 = major triad with added sixth + % m6 = minor triad with added sixth + + \break + + + + \break + + + + \break + + + + \break + + + + \break + + + + \break + + + + \break + + % add9 + } @@ -67,29 +67,29 @@ chs = \notes \transpose c' c' efullmusicJazzAlt = \notes { - <>1-\markup { "+" } - <>-\markup { \normal-size-super + 1-\markup { "+" } + -\markup { \normal-size-super % \override #'(font-family . math) "N" } \override #'(font-family . math) "M" } %%c:3.5.7 = \markup { \override #'(font-family . math) "M" } %%c:3.5.7 = \markup { \normal-size-super "maj7" } - <>-\markup { \super "o" } % should be $\circ$ ? - <>-\markup { \super \combine "o" "/" } - <>-\markup { \super "o7" } + -\markup { \super "o" } % should be $\circ$ ? + -\markup { \super \combine "o" "/" } + -\markup { \super "o7" } } efullJazzAlt = #(sequential-music-to-chord-exceptions efullmusicJazzAlt #f) epartialmusicJazzAlt = \notes{ - <>1-\markup { \normal-size-super "2" } - <>-\markup { "m" } - <>-\markup { \normal-size-super "sus4" } - <>-\markup { \normal-size-super "5" } + 1-\markup { \normal-size-super "2" } + -\markup { "m" } + -\markup { \normal-size-super "sus4" } + -\markup { \normal-size-super "5" } %% TODO, partial exceptions - <>-\markup { "m" }-\markup { \normal-size-super "sus4" } - <>-\markup { "m" }-\markup { \normal-size-super "sus2" } + -\markup { "m" }-\markup { \normal-size-super "sus4" } + -\markup { "m" }-\markup { \normal-size-super "sus2" } } epartialJazzAlt = #(sequential-music-to-chord-exceptions epartialmusicJazzAlt #f) @@ -111,7 +111,7 @@ banterProperties = \sequential { } \score{ - < + << \context ChordNames { \property ChordNames.instrument = #"Ignatzek (default)" \property ChordNames.instr = #"Def" @@ -133,7 +133,7 @@ banterProperties = \sequential { } %} \context Staff \notes \transpose c c' { \chs } - > + >> \paper{ indent = 3.\cm \translator { diff --git a/input/test/chord-names-no-inversions.ly b/input/test/chord-names-no-inversions.ly index 7ac4c6a690..87202abcd4 100644 --- a/input/test/chord-names-no-inversions.ly +++ b/input/test/chord-names-no-inversions.ly @@ -1,19 +1,19 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc= "@cindex Chord Names No Inversions Chord names don't attempt to find inversions and bass notes. " } scheme = \notes { - <>1 - <> - <> + 1 + + } \score { - < + << \context ChordNames \scheme \context Staff \scheme - > + >> \paper { raggedright = ##t} } diff --git a/input/test/chords-without-melody.ly b/input/test/chords-without-melody.ly index 163eaaea68..a3d4cf4ea3 100644 --- a/input/test/chords-without-melody.ly +++ b/input/test/chords-without-melody.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 133ef8c1e7..1823bf659b 100644 --- a/input/test/clef-8-syntax.ly +++ b/input/test/clef-8-syntax.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 40e422568d..7e261e4d04 100644 --- a/input/test/clef-end-of-line.ly +++ b/input/test/clef-end-of-line.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "@cindex Clef End of Line diff --git a/input/test/clef-manual-control.ly b/input/test/clef-manual-control.ly index a0f531138c..a7fa8bd796 100644 --- a/input/test/clef-manual-control.ly +++ b/input/test/clef-manual-control.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc = " @cindex Clef Manual Control diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly index 0ddbe06ffc..174bb4f6d9 100644 --- a/input/test/coriolan-margin.ly +++ b/input/test/coriolan-margin.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % Ugh, we need to override some LaTeX titling stuff @@ -41,7 +41,7 @@ oboi = \notes \relative c' { clarinetti = \notes \relative c' { \property Staff.instrument - = \markup { \column << "Clarinetti" { "in B" \raisedFlat } >> } + = \markup { \column < "Clarinetti" { "in B" \raisedFlat } > } \property Staff.instr = \markup { \smaller { "Cl(B" \raisedFlat ")" } } @@ -56,7 +56,7 @@ fagotti = \notes \relative c' { corni = \notes \relative c' { \property Staff.instrument - = \markup { \column << "Corni" { "in E" \raisedFlat } >> } + = \markup { \column < "Corni" { "in E" \raisedFlat } > } \property Staff.instr = \markup { \smaller { "Cor(E" \raisedFlat ")" } } @@ -64,14 +64,14 @@ corni = \notes \relative c' { } trombe = \notes \relative c' { - \property Staff.instrument = \markup \column << "2 Trombe" "(C)" >> - \property Staff.instr = \markup \column << "Tbe." "(C)" >> + \property Staff.instrument = \markup \column < "2 Trombe" "(C)" > + \property Staff.instr = \markup \column < "Tbe." "(C)" > c1 c } timpani = \notes \relative c' { - \property Staff.instrument = \markup \column << "Timpani" "(C-G)" >> + \property Staff.instrument = \markup \column < "Timpani" "(C-G)" > \property Staff.instr = #"Timp." c1 c @@ -97,41 +97,41 @@ viola = \notes \relative c' { } violoncello = \notes \relative c' { - \property Staff.instrument = \markup \column << "Violoncello" "e" "Contrabasso" >> - \property Staff.instr = \markup \column << "Vc." "Cb." >> + \property Staff.instrument = \markup \column < "Violoncello" "e" "Contrabasso" > + \property Staff.instr = \markup \column < "Vc." "Cb." > c1 c } \score { - < - \context StaffGroup ="legni" < + << + \context StaffGroup ="legni" << \context Staff ="flauti" \flauti \context Staff ="oboi" \oboi \context Staff ="clarinetti" \clarinetti \context Staff ="fagotti" \fagotti - > - \context StaffGroup ="ottoni" < + >> + \context StaffGroup ="ottoni" << \context Staff ="corni" \corni \context Staff ="trombe" \trombe - > - \context StaffGroup ="timpani" < + >> + \context StaffGroup ="timpani" << \context Staff ="timpani" \timpani { \skip 1 % Hmm: this forces a staff-bracket, that's good! % However, I can't find where is decided on staff-bracket yes/no } - > - \context StaffGroup ="archi" < - \context GrandStaff ="violini" < + >> + \context StaffGroup ="archi" << + \context GrandStaff ="violini" << \context Staff ="violinoI" \violinoI \context Staff ="violinoII" \violinoII - > + >> \context Staff ="viola" \viola \context Staff ="violoncello" \violoncello - > - > + >> + >> \paper { \paperSixteen indent=100.0\mm diff --git a/input/test/count-systems.ly b/input/test/count-systems.ly index 1e369059c0..e1ed851cf1 100644 --- a/input/test/count-systems.ly +++ b/input/test/count-systems.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc="@cindex Count Systems diff --git a/input/test/crescendi.ly b/input/test/crescendi.ly index 454a62dd8f..7219b5893c 100644 --- a/input/test/crescendi.ly +++ b/input/test/crescendi.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 e8b92a7cff..e0d6d8e7ec 100644 --- a/input/test/cue-notes.ly +++ b/input/test/cue-notes.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" % TODO: check to see if this example can be simplified using \small % or \tiny. \header { texidoc = "@cindex Cue Notes @@ -13,7 +13,7 @@ Cue notes should be set in smaller type. " \property Staff.instrument = #"Horn in F" \property Score.skipBars = ##t R1*21 - < + << { \property Staff.MultiMeasureRest \override #'staff-position = #-6 R1 @@ -40,7 +40,7 @@ Cue notes should be set in smaller type. " \property Staff.fontSize\unset \clef treble - } > + } >> c'8^"Horn" cis' \property Staff.Clef \unset eis'4 fis'4 diff --git a/input/test/divisiones.ly b/input/test/divisiones.ly index 6408576838..2bd5bf7f41 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.2" +\version "1.9.4" \include "gregorian-init.ly" diff --git a/input/test/drarn-slurs.ly b/input/test/drarn-slurs.ly index 6f1b9083a0..ab38ebc481 100644 --- a/input/test/drarn-slurs.ly +++ b/input/test/drarn-slurs.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % 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 4c37d561f7..84865625be 100644 --- a/input/test/drarn.ly +++ b/input/test/drarn.ly @@ -1,11 +1,11 @@ -\version "1.9.2" +\version "1.9.4" \header{texidoc="@cindex Drarn You can attach slurs and ties to noteheads. " } \score { - \context Staff \notes < + \context Staff \notes << \relative c'' { \time 3/8 @@ -22,7 +22,7 @@ You can attach slurs and ties to noteheads. \property Voice.Slur \set #'attachment = #'(head . head) a8(a)~a } - > + >> \paper { linewidth = 40*\staffspace raggedright = ##t } } diff --git a/input/test/dynamic-absolute-volume.ly b/input/test/dynamic-absolute-volume.ly index e030617770..636c69e817 100644 --- a/input/test/dynamic-absolute-volume.ly +++ b/input/test/dynamic-absolute-volume.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 09e3b930ae..f4b021bd81 100644 --- a/input/test/dynamic-extra.ly +++ b/input/test/dynamic-extra.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % 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 6ca4ffc3f6..7b1b62d976 100644 --- a/input/test/embedded-postscript.ly +++ b/input/test/embedded-postscript.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 36daac8091..b9b43d0a4e 100644 --- a/input/test/embedded-scm.ly +++ b/input/test/embedded-scm.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % 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 a9265aea09..79679dea45 100644 --- a/input/test/embedded-tex.ly +++ b/input/test/embedded-tex.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 49642f6b44..efa5624b22 100644 --- a/input/test/explicit.ly +++ b/input/test/explicit.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 53be448aff..d9068e9c6c 100644 --- a/input/test/extra-offset.ly +++ b/input/test/extra-offset.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 35eac6c9f4..24bb53839e 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -1,23 +1,23 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" % definately wil be renamed to something. %{ (Message vers:9) -To: Adrian Mariano <>. +To: Adrian Mariano . cc: gnu-music-discuss@gnu.org Subject: Re: Switching from one staff to two staves Reply-To: janneke@gnu.org In-reply-to: Your message of "Tue, 19 Jan 1999 12:27:10 EST." - <<199901191727.MAA29757@avalanchecamcornelledu>>. + <199901191727.MAA29757@avalanchecamcornelledu>. Date: Wed, 20 Jan 1999 09:39:22 +0100 -From: Jan Nieuwenhuizen <> +From: Jan Nieuwenhuizen On Tuesday, 19 January 1999, Adrian Mariano writes: -> I want to typeset something which starts out with just one staff and then -> harmony comes in and there are two staves. I can't figure out how to do -> this. I get an extra blank staff during the second section (using -> Lily 1.1.15): +>> I want to typeset something which starts out with just one staff and then +>> harmony comes in and there are two staves. I can't figure out how to do +>> this. I get an extra blank staff during the second section (using +>> Lily 1.1.15): There used to be an example called 'multi.ly'... Try this (we'll include it in pl23/24): @@ -30,15 +30,15 @@ extra-staff.ly: You can add an extra staff after the beginning of a piece. "} \score { - < + << \new Staff \notes\relative c''{ c1 c c c c } \new StaffGroup \notes\relative c''{ \new Staff c1 c - < \new Staff { c1 } \new Staff { c1 } > + << \new Staff { c1 } \new Staff { c1 } >> c } - > + >> \paper { raggedright = ##t \translator{ diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly index c985cf6583..99619d1a89 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.2" +\version "1.9.4" %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 b3cf0920ad..3443415665 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.2" +\version "1.9.4" % 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 { - \new PianoStaff < + \new PianoStaff << \property PianoStaff.followVoice = ##t \context Staff=one \context Voice { \property Voice.VoiceFollower \set #'style = #'dashed-line @@ -22,7 +22,7 @@ property @code{followVoice}. " } a1 } \context Staff=two {\clef bass \skip 1*3 } - > + >> } \paper { raggedright = ##t } diff --git a/input/test/force-hshift.ly b/input/test/force-hshift.ly index 5f0f861ffd..f1797ca317 100644 --- a/input/test/force-hshift.ly +++ b/input/test/force-hshift.ly @@ -1,21 +1,21 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc="@cindex Force hshift Force hshift to override collisions. " } \score { \notes\relative c' - \context Staff < { - <> - <> + \context Staff << { + + } \\ { - <> + \once \property Voice.NoteColumn \override #'force-hshift = #1.7 - <> + } - > + >> \paper { raggedright = ##t } diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index e3bf200d47..792e75bcaf 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header{ texidoc="@cindex Gourlay @@ -10,11 +10,11 @@ breaking lines. " } \score{ - \notes \context Staff \relative c'' < + \notes \context Staff \relative c'' << { \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 84d1a6def6..1a3fe96fa7 100644 --- a/input/test/gregorian-scripts.ly +++ b/input/test/gregorian-scripts.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { title = "Gregorian Scripts" texidoc = "@cindex Gregorian Scripts diff --git a/input/test/harmonic.ly b/input/test/harmonic.ly index 0fd80a36fd..b9b93703d6 100644 --- a/input/test/harmonic.ly +++ b/input/test/harmonic.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc ="@cindex Artificial Harmonics For stringed instruments, artificial harmonics are notated with @@ -6,10 +6,10 @@ two different notehead styles on the same stem. " } \score { \notes { c'4 - < c'4 \new Thread { + << c'4 \new Thread { \property Thread.NoteHead \set #'style = #'harmonic g'4 - } > + } >> } \paper {raggedright=##t} diff --git a/input/test/header-ifelse.ly b/input/test/header-ifelse.ly index fe832236de..7cea09341d 100644 --- a/input/test/header-ifelse.ly +++ b/input/test/header-ifelse.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" #(define (my-ly-version) diff --git a/input/test/hshift.ly b/input/test/hshift.ly index cfb9ac8cc5..e35bfc20ab 100644 --- a/input/test/hshift.ly +++ b/input/test/hshift.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header { texidoc = "@cindex Horizontal Shift You can manually shift notes horizontally. " } @@ -12,13 +12,13 @@ shiftV = \property Voice.NoteColumn \override #'horizontal-shift = #4 \score { \context Voice \notes\relative c { - \context Staff < + \context Staff << \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 730be3ed54..3a58387674 100644 --- a/input/test/hymn.ly +++ b/input/test/hymn.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = " @@ -10,7 +10,7 @@ texts, so they should be switched off. " } \score{ - \context Staff < + \context Staff << \time 4/4 \context Voice=one \partcombine Voice \context Thread=one \notes\relative c'' { @@ -23,7 +23,7 @@ texts, so they should be switched off. g'4 c, e(f) | d2 a } - > + >> \paper{ linewidth=140.\mm \translator { diff --git a/input/test/improv.ly b/input/test/improv.ly index f3a2e61854..ac8dacab6b 100644 --- a/input/test/improv.ly +++ b/input/test/improv.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = @@ -19,17 +19,17 @@ improOff = \notes {\translator SquashVoice = melo } global = \notes { s1*3 \bar "|." } \score { - < + << \context ChordNames \chords {e8*7:m7 a2.:m7 bes4:m7 b1:m7 e8:m } - \context Staff \notes < + \context Staff \notes << \context SquashVoice = impro { \global } \context Voice = melo \transpose c c' { e8 e g a a16(bes)(a8) g \improOn e8 ~e2~e8 f4 fis8 ~fis2 \improOff a16(bes) a8 g e } - > - > + >> + >> \paper { \translator { \VoiceContext diff --git a/input/test/incipit.ly b/input/test/incipit.ly index f68818c173..5cec096eb5 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header { texidoc = "@cindex Incipit This shows how to make an ``incipit'' to indicate scordatora tuning of a violin part, using the clefStyle property. @@ -13,7 +13,7 @@ violinincipit = \notes\relative c''{ \time 2/2 \property Staff.TimeSignature \override #'style = #'old a4. b8 c4 fis | -% <>1 +% 1 \property Staff.TimeSignature \override #'style = #'C } @@ -34,7 +34,7 @@ violin = \notes\relative c''{ a4. b8 c4 fis | gis~ gis8 fis16^\trill (e) b8 c - <{ a d}\\ { es,4}>| + <<{ a d}\\ { es,4}>>| } BC = \notes\relative c{ @@ -48,7 +48,7 @@ BC = \notes\relative c{ } \score{ - < + << \context Staff = violin {\notes{ \property Staff.Clef \override #'transparent = ##t \violinincipit \bar ".|" @@ -63,7 +63,7 @@ BC = \notes\relative c{ \endincipit \BC }} - > + >> \paper { raggedright = ##t } } diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly index f50b2c55ff..7e86843b1f 100644 --- a/input/test/instrument-name-grandstaff.ly +++ b/input/test/instrument-name-grandstaff.ly @@ -1,14 +1,14 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "@cindex Instrument Name Grandstaff You can name the whole grandstaff in addition to individual staffs. " } \score { \notes - \notes \context GrandStaff < + \notes \context GrandStaff << \context Staff = treble { \property GrandStaff.instrument = "Violini " \property Staff.instrument = " vn I" { c''4 }} - \context Staff = bass { \property Staff.instrument = " vn II" c''4 }> + \context Staff = bass { \property Staff.instrument = " vn II" c''4 }>> \paper { diff --git a/input/test/ly2dvi-testpage.ly b/input/test/ly2dvi-testpage.ly index e9f1672bee..7ca3067697 100644 --- a/input/test/ly2dvi-testpage.ly +++ b/input/test/ly2dvi-testpage.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % MERGE with title.ly -gp %{ diff --git a/input/test/maximum-rest-count.ly b/input/test/maximum-rest-count.ly index 58e83878b8..8c2308273a 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.2" +\version "1.9.4" % possible rename to rest-foo \header { texidoc = "@cindex Rest Collision Count @@ -7,7 +7,7 @@ Control the number of rests in a collision with maximum-rest-count." } \score{ -\context Staff \notes\relative c''< +\context Staff \notes\relative c''<< \new Voice { a4 r @@ -38,7 +38,7 @@ Control the number of rests in a collision with maximum-rest-count." r r } - > + >> \paper{ raggedright = ##t } } diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly index 57f2527d35..7b8b4c44ab 100644 --- a/input/test/mensural-ligatures.ly +++ b/input/test/mensural-ligatures.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" % TODO: % check with ancient- stuff. rename, merge, something. -gp @@ -32,18 +32,18 @@ voice = \notes \transpose c c' { } \score { - \context ChoirStaff < - \new MensuralStaff < - \context MensuralVoice < + \context ChoirStaff << + \new MensuralStaff << + \context MensuralVoice << \voice - > - > - \new Staff < - \context Voice < + >> + >> + \new Staff << + \context Voice << \voice - > - > - > + >> + >> + >> \paper { stafflinethickness = \staffspace / 5.0 \translator { diff --git a/input/test/midi-scales.ly b/input/test/midi-scales.ly index 37c8a0e851..4bd96175b0 100644 --- a/input/test/midi-scales.ly +++ b/input/test/midi-scales.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % 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 bb075ab0bc..624ff0bac4 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.2" +\version "1.9.4" % possible rename to scheme- or something like that. -gp \header { texidoc= "@cindex Scheme Manual Accidentals Positions of accidentals may be manually set. This @@ -16,7 +16,7 @@ involves some scheme code. " } \score { \context Voice \notes \relative c'' { c2. - < + << \property Staff.AccidentalPlacement = \turnOff \context Staff \outputproperty #(make-acc-position-checker 9) #'extra-offset = #'(-1 . 0) @@ -30,7 +30,7 @@ involves some scheme code. " } eis gis d'! - > + >> } \paper { raggedright = ##t diff --git a/input/test/move-notehead.ly b/input/test/move-notehead.ly index a2121ae28a..138781ab40 100644 --- a/input/test/move-notehead.ly +++ b/input/test/move-notehead.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 99721dafa2..3de1690d4f 100644 --- a/input/test/move-specific-text.ly +++ b/input/test/move-specific-text.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % 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 c426a0813d..76deb44b4c 100644 --- a/input/test/music-box.ly +++ b/input/test/music-box.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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,26 +62,26 @@ using Scheme functions to avoid typing work. " } -\version "1.9.2" +\version "1.9.4" pat = \notes \transpose c c' \repeat unfold 2 { - < { \context Staff=up {r8 e16 f g e f g } } - { \context Staff=down < + << { \context Staff=up {r8 e16 f g e f g } } + { \context Staff=down << \context Voice=vup { \stemUp \tieUp r16 d8.~d4 } \context Voice=vdwn { \stemDown c2 } - > } - > + >> } + >> } enda = \notes { r8 f,16 a, c f c a, \stemUp c \translator Staff = down a, f, a, f, d, f, d, \translator Staff = up \stemBoth - r8 g16 h d' f' d' h d' h g h d f e\prall d <>1^\fermata \bar "|." + r8 g16 h d' f' d' h d' h g h d f e\prall d 1^\fermata \bar "|." } endb = \notes {\stemUp \tieUp r16 c,8.~c,4~c,2 r16 h,,8.~h,,4~h,,2 c,1 \bar "|."} endc = \notes {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata } \score { - \notes \transpose c c' \context PianoStaff < + \notes \transpose c c' \context PianoStaff << \context Staff=up { \clef "G" } \context Staff=down { \clef "F" } { \apply #transform {\pat {c e g c' e' } @@ -128,7 +128,7 @@ endc = \notes {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata } \pat {c,, c, g, b, e } %} } - > + >> \paper { \translator { \PianoStaffContext diff --git a/input/test/music-creation.ly b/input/test/music-creation.ly index c8cd7c6b2d..08653c3ef9 100644 --- a/input/test/music-creation.ly +++ b/input/test/music-creation.ly @@ -1,4 +1,4 @@ -\version "1.9.2" %% or actually: 1.7.1 ... +\version "1.9.4" %% 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 23383ea32b..1fe75165a7 100644 --- a/input/test/nested-groups.ly +++ b/input/test/nested-groups.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc="@cindex Nested Staff Groups LilyPond can print nested groups of staffs. " @@ -8,35 +8,35 @@ LilyPond can print nested groups of staffs. " } \score { \notes -< - \new StaffGroup < +<< + \new StaffGroup << \new Staff {c' d' e' f'} - \new InnerStaffGroup < + \new InnerStaffGroup << \new Staff {c' d' e' f'} - \new GrandStaff < + \new GrandStaff << \new Staff {c' d' e' f'} \new Staff {c' d' e' f'} - > + >> \new Staff {c' d' e' f'} - > - \new ChoirStaff < + >> + \new ChoirStaff << \new Staff {c' d' e' f'} - \new InnerStaffGroup < + \new InnerStaffGroup << \new Staff {c' d' e' f'} - > + >> \new Staff {c' d' e' f'} - > - > - \new ChoirStaff < + >> + >> + \new ChoirStaff << \new Staff {c' d' e' f'} - \new InnerStaffGroup < + \new InnerStaffGroup << \new Staff {c' d' e' f'} \new Staff {c' d' e' f'} - > + >> \new Staff {c' d' e' f'} - > + >> -> +>> \paper { raggedright = ##t} } diff --git a/input/test/no-bar-lines.ly b/input/test/no-bar-lines.ly index fcdf1ec876..7688ecd7e0 100644 --- a/input/test/no-bar-lines.ly +++ b/input/test/no-bar-lines.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % 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 73cafa21f5..2b049a1e38 100644 --- a/input/test/no-staff.ly +++ b/input/test/no-staff.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" % 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 8c95d64502..f44924a097 100644 --- a/input/test/octave-duplicate.ly +++ b/input/test/octave-duplicate.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc="@cindex Octave Doubling Octave doubling parts of music. " } @@ -11,13 +11,13 @@ upperOne = \notes\relative c'' { a4 a a a } -upperOctave = \notes < +upperOctave = \notes << \context Thread=upperOne { \transpose c' c \upperOne } \context Thread=upperOne { \property Thread.devNullThread = #'allways s1*2 \property Thread.devNullThread = #'() s1*2 } -> +>> lowerOne = \notes\relative c { a8 a a a a a a a @@ -31,31 +31,31 @@ firstEight = \notes { \property Thread.devNullThread = #'allways s8*7 } -lowerOctave = \notes < +lowerOctave = \notes << \context Thread=lowerOne { \transpose c' c \lowerOne } \context Thread=lowerOne { \repeat "unfold" 4 { \firstEight } } -> +>> \score { - < - \context PianoStaff < - \context Staff=upper < - \context Voice=upperOne < + << + \context PianoStaff << + \context Staff=upper << + \context Voice=upperOne << \upperOne \upperOctave - > - > - \context Staff=lower < + >> + >> + \context Staff=lower << \clef bass - \context Voice=lowerOne < + \context Voice=lowerOne << \lowerOne \lowerOctave - > - > - > - > + >> + >> + >> + >> \paper { } } diff --git a/input/test/ossia.ly b/input/test/ossia.ly index 39fcd547d1..1a2597d5ec 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" % pretty much a duplicate of extra-staff.ly. candidate for merge or delete. -gp \header { texidoc = "@cindex Ossia @@ -8,10 +8,10 @@ really supported, but can be somewhat faked in lily. " } \score { -\notes\relative c'' { c1 c1 < +\notes\relative c'' { c1 c1 << {\clef "treble" 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 e698542c8b..79c3bb81cf 100644 --- a/input/test/part-combine-moments.ly +++ b/input/test/part-combine-moments.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % 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 @@ -9,7 +9,7 @@ only have one stem. " } \score{ - \context PianoStaff < + \context PianoStaff << \context StaffCombineStaff=one \skip 1*2 \context StaffCombineStaff=two \skip 1*2 \context StaffCombineStaff=one \partcombine StaffCombineStaff @@ -23,7 +23,7 @@ only have one stem. " c4 d e f c2 e2 } - > + >> \paper { raggedright= ##t textheight = 295.0\mm diff --git a/input/test/part-combine-staff.ly b/input/test/part-combine-staff.ly index 12e84c90ba..e1ae34e7ba 100644 --- a/input/test/part-combine-staff.ly +++ b/input/test/part-combine-staff.ly @@ -1,11 +1,11 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "@cindex Part Combine Staff You can combine parts on two staffs, as well as two voices. " } \score{ - \context PianoStaff < + \context PianoStaff << \context StaffCombineStaff=one \skip 1*7 \context StaffCombineStaff=two \skip 1*7 \context StaffCombineStaff=one \partcombine StaffCombineStaff @@ -29,7 +29,7 @@ You can combine parts on two staffs, as well as two voices. " a4 a a a c2 e2 } - > + >> \paper { textheight = 295.0\mm linewidth = 180.0\mm diff --git a/input/test/part-combine.ly b/input/test/part-combine.ly index bc6e3e896f..c15b23177f 100644 --- a/input/test/part-combine.ly +++ b/input/test/part-combine.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc="@cindex Part Combine In orchestral scores and hymns, voices are traditionally combined onto @@ -9,7 +9,7 @@ voices according to actual rhythm and pitch. User-defined texts such as } \score{ - \notes \context Staff = flauti < + \notes \context Staff = flauti << \time 4/4 \context Voice=one \partcombine Voice \context Thread=one\relative c'' { @@ -22,7 +22,7 @@ voices according to actual rhythm and pitch. User-defined texts such as c r e r | r2 s2 | a,4 r a r | a r r a | a2 \property Voice.soloADue = ##f a | } - > + >> \paper{ raggedright = ##t linewidth = 80 * \staffspace diff --git a/input/test/partial-blank.ly b/input/test/partial-blank.ly index 1d6ef50cce..0fa4ab30d2 100644 --- a/input/test/partial-blank.ly +++ b/input/test/partial-blank.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % 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) @@ -15,8 +15,8 @@ quickmeasure = \notes { mel = \notes \relative c' {c16 d16 e8 a4 g2 e8 d c2. g'1 e4 d c2} \score { -\context PianoStaff \notes < - \new Staff < +\context PianoStaff \notes << + \new Staff << \clef G \new Voice {\mel} \new Voice { @@ -25,9 +25,9 @@ mel = \notes \relative c' {c16 d16 e8 a4 g2 e8 d c2. g'1 e4 d c2} \property Voice.Beam \override #'transparent = ##t \repeat unfold 4 \quickmeasure } - > + >> \new Staff \notes {\clef F s1*4} -> +>> \paper {} } diff --git a/input/test/pedal.ly b/input/test/pedal.ly index d2840c2708..31bf306c80 100644 --- a/input/test/pedal.ly +++ b/input/test/pedal.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 29bc31647b..55ed20cb97 100644 --- a/input/test/phrasing-slur-height.ly +++ b/input/test/phrasing-slur-height.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc="@cindex Phrasing Slur Height Make PhrasingSlur higher, to avoid colission from other slurs. " } diff --git a/input/test/polymetric-differing-notes.ly b/input/test/polymetric-differing-notes.ly index 47898be9fe..2817f04d53 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.2" +\version "1.9.4" \header{ texidoc=" @@ -46,7 +46,7 @@ what happens on the inside: a 3/4 time signature is combined with a \score { - \notes \relative c' < + \notes \relative c' << \new Staff { \time 3/4 c4 c c | c c c | @@ -66,6 +66,6 @@ what happens on the inside: a 3/4 time signature is combined with a \repeat unfold 2 { c8[ c] } | c4. c4. \times 2/3 { c8 c c } c4 } } - > + >> \paper { raggedright = ##t } } diff --git a/input/test/polymetric.ly b/input/test/polymetric.ly index 1381543035..b1ad28cbdd 100644 --- a/input/test/polymetric.ly +++ b/input/test/polymetric.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header{ texidoc="@cindex Time Signature Multiple @@ -15,7 +15,7 @@ command work correctly. Barlines distort the regular spacing, though. " } \score{ - \notes \relative c' < + \notes \relative c' << \new Staff { \time 3/4 c4 c c | c c c | @@ -29,7 +29,7 @@ command work correctly. Barlines distort the regular spacing, though. \time 3/8 c4. c8 c c c4. c8 c c } - > + >> \paper{ raggedright = ##t diff --git a/input/test/preset-extent.ly b/input/test/preset-extent.ly index 498e8d4ec6..b152538009 100644 --- a/input/test/preset-extent.ly +++ b/input/test/preset-extent.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = " @cindex Preset Extent diff --git a/input/test/repeat-manual.ly b/input/test/repeat-manual.ly index 130cf0c0c4..6b081a6f9d 100644 --- a/input/test/repeat-manual.ly +++ b/input/test/repeat-manual.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 9ace3bfd4f..9d5e660bf6 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.2" +\version "1.9.4" \header{ texidoc=" @@ -14,7 +14,7 @@ can be shortened. \score { - < + << \context Staff \notes\relative c''{ c c c c % coda-klugde: let volta span only one bar @@ -34,7 +34,7 @@ can be shortened. } five1 } - > + >> \paper{raggedright = ##t} } diff --git a/input/test/repeat.ly b/input/test/repeat.ly index 6f0d85dbde..bda546142c 100644 --- a/input/test/repeat.ly +++ b/input/test/repeat.ly @@ -1,19 +1,19 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" % 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. " } \score{ - < + << \context Staff \notes\relative c'{ c d e f \repeat "volta" 2 { g a b c } \alternative { { c b a g } { f e d c } } } \context Lyrics \lyrics { - De eer- ste < { maat } { moet } > + De eer- ste << { maat } { moet } >> \repeat fold 2 { } \alternative { { en dan twee keer } @@ -21,7 +21,7 @@ You can use alternate lyrics as well as alternate notes for repeats. " } en dan nog dit er ach- ter aan } - > + >> \paper{raggedright=##t} } diff --git a/input/test/rest-dot-positions.ly b/input/test/rest-dot-positions.ly index 9c518ee089..75c569b194 100644 --- a/input/test/rest-dot-positions.ly +++ b/input/test/rest-dot-positions.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % candidate for regression. -gp \header { texidoc = "@cindex Rest Dot Positions This file tests dotted rests. " } @@ -49,10 +49,10 @@ muz = \notes \relative c'' { \score { \context Staff { \muz \break - < + << { \muz } \\ { \muz } - > + >> } \paper{} } diff --git a/input/test/rests.ly b/input/test/rests.ly index 596cca60e9..e39f11993c 100644 --- a/input/test/rests.ly +++ b/input/test/rests.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "@cindex Rests diff --git a/input/test/reverse-music.ly b/input/test/reverse-music.ly index 100a786105..72fd6d99cd 100644 --- a/input/test/reverse-music.ly +++ b/input/test/reverse-music.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % 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 8c124cc600..c0270539fa 100644 --- a/input/test/rhythm-excercise.ly +++ b/input/test/rhythm-excercise.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 89e0e6b386..29218697fe 100644 --- a/input/test/scales-greek.ly +++ b/input/test/scales-greek.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "@cindex Scales Greek Show different scales." diff --git a/input/test/scheme-interactions.ly b/input/test/scheme-interactions.ly index db2c502c97..b6c5b640e6 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.2" +\version "1.9.4" \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 f4592cf2fb..dea56aa5f4 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.2" +\version "1.9.4" \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 45e901e4c0..a752b0c8f6 100644 --- a/input/test/script-chart.ly +++ b/input/test/script-chart.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" % this chart is used in the manual too. @@ -11,7 +11,7 @@ A chart showing all feta scripts. } \score { - < + << \property Score.LyricText \override #'font-family = #'typewriter \property Score.LyricText \override #'font-shape = #'upright \context Staff \notes { @@ -47,7 +47,7 @@ A chart showing all feta scripts. longfermata__ verylongfermata__ segno__ coda__ varcoda__ } - > + >> \paper { linewidth = 5.1\in indent = 0.0\mm diff --git a/input/test/script-priority.ly b/input/test/script-priority.ly index ede796e42e..1e0d3775c9 100644 --- a/input/test/script-priority.ly +++ b/input/test/script-priority.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 9169dec404..fee41cf5cc 100644 --- a/input/test/script-stack.ly +++ b/input/test/script-stack.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 a3e48d04ff..e4b4245bf5 100644 --- a/input/test/separate-staccato.ly +++ b/input/test/separate-staccato.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % possible rename. -gp \header { texidoc="@cindex Seperate Staccato @@ -12,10 +12,10 @@ staccatos = \notes { s4-. s-. s-. s s } music = \notes\relative c' { c4 d e f g a b c d e } \score { - \new Thread < + \new Thread << \music \repeat unfold 2 \staccatos - > + >> \paper{raggedright=##t} } diff --git a/input/test/slur-attachment-override.ly b/input/test/slur-attachment-override.ly index 7f107fdcae..9101a6afe7 100644 --- a/input/test/slur-attachment-override.ly +++ b/input/test/slur-attachment-override.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc="@cindex Slur Attachment Override @@ -8,7 +8,7 @@ In some cases you may want to set slur attachments by hand. " %% -%% except that both slurs are stem <-> stem. +%% except that both slurs are stem <<-> stem. %% fragment = \notes { diff --git a/input/test/slur-beautiful.ly b/input/test/slur-beautiful.ly index e80c29b3a2..0894e2c5d3 100644 --- a/input/test/slur-beautiful.ly +++ b/input/test/slur-beautiful.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % 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 00edd4cbf7..47861ce190 100644 --- a/input/test/slur-dash.ly +++ b/input/test/slur-dash.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 7ca80baea0..a540eede1f 100644 --- a/input/test/slur-minimum-length.ly +++ b/input/test/slur-minimum-length.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 0dfa3cf482..657485ff78 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.2" +\version "1.9.4" \header { texidoc = "Slurs become flatter as they grow longer. " @@ -11,7 +11,7 @@ x = { } \score { - \context Staff \notes\relative c < + \context Staff \notes\relative c << \new Voice { \x f(f) } \new Voice { \x g(s4g) } \new Voice { \x a(s4*2a) } @@ -39,7 +39,7 @@ x = { \new Voice { \x b(s4*24b) } \new Voice { \x c(s4*25c) } \new Voice { \x d(s4*26d) } - > + >> \paper { raggedright = ##t \translator{ diff --git a/input/test/slur-ugly.ly b/input/test/slur-ugly.ly index a2d3288dbc..333d66f3c1 100644 --- a/input/test/slur-ugly.ly +++ b/input/test/slur-ugly.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc="@cindex Slur Ugly You can get ugly slurs, if you want. " @@ -10,14 +10,14 @@ baseWalk = \notes \relative c { } \score { - \notes \context PianoStaff < + \notes \context PianoStaff << \time 6/4 \context Staff=up { s1 * 6/4 } - \context Staff=down < + \context Staff=down << \clef bass \autochange Staff \context Voice \baseWalk - > - > + >> + >> \paper { raggedright = ##t \translator { diff --git a/input/test/smart-transpose.ly b/input/test/smart-transpose.ly index 1862bfd16c..3198c0f4c0 100644 --- a/input/test/smart-transpose.ly +++ b/input/test/smart-transpose.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc="@cindex Smart Transpose @@ -7,7 +7,7 @@ texidoc="@cindex Smart Transpose Here's a copy of my feature request : @quotation Your task, if you accept it is to implement a \smarttranspose - command> that would translate such oddities into more natural + command>> that would translate such oddities into more natural notations. Double accidentals should be removed, as well as E-sharp (-> F), bC (-> B), bF (-> E), B-sharp (-> C). @end quotation diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index f531d1c220..deaccd1999 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.2" +\version "1.9.4" % more yummy regression goodness. -gp \header { texidoc = " @@ -11,18 +11,18 @@ texidoc = " \score { \notes \relative c'' - \context GrandStaff < - \new Staff < + \context GrandStaff << + \new Staff << \new Voice { \stemUp\slurUp\tieUp e4 dis4 e2 } \new Voice { \stemDown\slurDown\tieDown cis8[ a] fis[ b] gis2 } {\key e \major } - > + >> \new Staff { \clef "bass" \key e \major a,,16[ e dis e] b'8[ b,] e16[ e, gis b] e4 } -> +>> \paper { diff --git a/input/test/spanner-after-break-tweak.ly b/input/test/spanner-after-break-tweak.ly index cdf870eb0b..47edc42dde 100644 --- a/input/test/spanner-after-break-tweak.ly +++ b/input/test/spanner-after-break-tweak.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "@cindex Spanner after break diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly index 143878780f..a642ca3b53 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.2" +\version "1.9.4" \header{texidoc = "@cindex Staff Bracket Here's an example of staff brackets. " @@ -7,13 +7,13 @@ Here's an example of staff brackets. " \score { - \new StaffGroup \notes \relative c'' < + \new StaffGroup \notes \relative c'' << \new Staff { b1 } - \new PianoStaff < + \new PianoStaff << \new Staff \notes { b1 } \new Staff \notes { b1 } - > - > + >> + >> \paper { \translator diff --git a/input/test/staff-container.ly b/input/test/staff-container.ly index 2a2e09c712..27ce1e3c04 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.2" +\version "1.9.4" \header { @@ -25,21 +25,21 @@ what you would expect. quarterSkip = #(make-nonevent-skip (ly:make-duration 2 0)) \score { - \notes \relative c'' < + \notes \relative c'' << \new StaffContainer { - %% need < >, otherwise we descend to the voice inside SA - < \new Staff { c4 c4 } > + %% need << >>, otherwise we descend to the voice inside SA + << \new Staff { c4 c4 } >> \quarterSkip - < \new Staff { b4 b4 } > + << \new Staff { b4 b4 } >> } \new StaffContainer { \quarterSkip - < \context Staff { e d f } > + << \context Staff { e d f } >> \quarterSkip } - > + >> \paper { \translator { diff --git a/input/test/staff-lines.ly b/input/test/staff-lines.ly index 6bbbf0d1fb..30238451c7 100644 --- a/input/test/staff-lines.ly +++ b/input/test/staff-lines.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc="@cindex Staff Lines Staff symbol property set workaround. " @@ -15,19 +15,19 @@ lower = \notes\relative c { } \score { - \context PianoStaff < + \context PianoStaff << %\time 4/4 - \new Staff < + \new Staff << \upper \outputproperty #(make-type-checker 'staff-symbol-interface) #'line-count = #5 - > - \new Staff < + >> + \new Staff << \clef bass \lower \outputproperty #(make-type-checker 'staff-symbol-interface) #'line-count = #4 - > - > + >> + >> \paper { raggedright=##t} } diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index 03e6db5156..22a056fe3d 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.2" +\version "1.9.4" \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' < \new StaffContainer { + \notes \relative c' << \new StaffContainer { \property StaffContainer.StaffSymbol \set #'staff-space = #(/ 16 20) \property Staff.fontSize = #-1 @@ -30,7 +30,7 @@ Setting staff sizes is a little clumsy. There are two options: using \clef bass c8 c c c c c c c } -> +>> \paper { raggedright = ##t} } diff --git a/input/test/staff-space.ly b/input/test/staff-space.ly index 3e9d6eeaf3..a30135f672 100644 --- a/input/test/staff-space.ly +++ b/input/test/staff-space.ly @@ -1,21 +1,21 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header{ texidoc ="@cindex Staff Space Setting staff space on a staff. " } \score { - \notes \relative c'' \context GrandStaff < + \notes \relative c'' \context GrandStaff << \new Staff { c4 c4 } \new Staff { c4 - <>8[ + 8[ e] f[ c'] } -> +>> \paper { \translator { \StaffContext StaffSymbol \set #'staff-space = #5.5 diff --git a/input/test/stem-centered.ly b/input/test/stem-centered.ly index 3492411475..a9e31e0dad 100644 --- a/input/test/stem-centered.ly +++ b/input/test/stem-centered.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % 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 bc307cb5d0..6d516a1778 100644 --- a/input/test/stem-cross-staff.ly +++ b/input/test/stem-cross-staff.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "@cindex Stem Cross Staff There is no support for putting chords across staves. @@ -14,7 +14,7 @@ noFlag = \once \property Voice.Stem \override #'flag-style = #'no-flag \score { \notes \context PianoStaff - < \new Staff { + << \new Staff { \stemDown \stemExtend f'4 @@ -24,7 +24,7 @@ noFlag = \once \property Voice.Stem \override #'flag-style = #'no-flag \new Staff { \clef bass a4 a8 } - > + >> \paper { raggedright = ##t} } diff --git a/input/test/stem-extend.ly b/input/test/stem-extend.ly index e80d975c6e..b3e7297c7a 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.2" +\version "1.9.4" \header { texidoc = "@cindex Stem Extend You can stop LilyPond from extending stems to the center line. " @@ -7,7 +7,7 @@ You can stop LilyPond from extending stems to the center line. " \score { \context Voice \notes\relative c { - \context Staff < + \context Staff << \new Voice { f2 f8 g a b \property Voice.Stem \set #'no-stem-extend = ##t @@ -18,7 +18,7 @@ You can stop LilyPond from extending stems to the center line. " \property Voice.Stem \set #'no-stem-extend = ##t c2 c8 b a g } - > + >> } \paper { raggedright = ##t} diff --git a/input/test/stem-length.ly b/input/test/stem-length.ly index 1ced1c48d9..b7fae4e84c 100644 --- a/input/test/stem-length.ly +++ b/input/test/stem-length.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 7f1728ff4a..1d387317ef 100644 --- a/input/test/tablature-hammer.ly +++ b/input/test/tablature-hammer.ly @@ -1,17 +1,17 @@ -\version "1.9.2" +\version "1.9.4" \header {texidoc = "@cindex Tablature hammer You can fake a hammer in tablature with slurs. " } \score{ - \context TabStaff < + \context TabStaff << \notes\relative c''{ c(d) d(d) d(c) } - > + >> \paper{ raggedright = ##t} } diff --git a/input/test/tablature.ly b/input/test/tablature.ly index b6a5978e69..0f5f2d2f61 100644 --- a/input/test/tablature.ly +++ b/input/test/tablature.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc = "@cindex Tabulature A sample tablature, with both normal staff and tab. @@ -18,14 +18,14 @@ partition = \notes { } \score { - \context StaffGroup < - \context Staff < + \context StaffGroup << + \context Staff << \clef "G_8" \partition - > - \context TabStaff < + >> + \context TabStaff << \partition - > - > + >> + >> } diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly index 827e52b862..53ed99bd70 100644 --- a/input/test/text-spanner.ly +++ b/input/test/text-spanner.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % TODO: check about other ottava functions. \header { texidoc = "@cindex Ottava Spanner diff --git a/input/test/textscript.ly b/input/test/textscript.ly index 7445222f0b..aab9b880f2 100644 --- a/input/test/textscript.ly +++ b/input/test/textscript.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 fe96f9986f..c74ff8dfba 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.2" +\version "1.9.4" @@ -10,13 +10,13 @@ \score { \context Staff \notes { -\relative c'' < +\relative c'' << { \once \property Voice.Stem \set #'transparent = ##t b8~ b8 } \\ { b[ g8] } -> +>> } \paper { raggedright = ##t } } diff --git a/input/test/tie-sparse.ly b/input/test/tie-sparse.ly index 56ca6305d5..375863f5ca 100644 --- a/input/test/tie-sparse.ly +++ b/input/test/tie-sparse.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc = "@cindex Tie Sparse Setting sparseTies causes only one tie to be @@ -9,7 +9,7 @@ generated per chord pair. " \score { \context Voice \notes\relative c { \property Voice.sparseTies = ##t - c'' <> ~ <> + c'' ~ } \paper { raggedright = ##t } } diff --git a/input/test/time-signature-double.ly b/input/test/time-signature-double.ly index 20998c0937..3843ee2e97 100644 --- a/input/test/time-signature-double.ly +++ b/input/test/time-signature-double.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \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 8c93c6f4be..b24714aa5d 100644 --- a/input/test/time.ly +++ b/input/test/time.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % TODO: This file could be old. Ask about it later. -gp \header { texidoc = "@cindex Time @@ -42,7 +42,7 @@ properties will quite definitely change, and maybe the syntax of the \score { \context Voice \notes\relative c { - % LilyPond doesn't understand 'default => it does what you want + % LilyPond doesn't understand 'default =>> it does what you want \property Staff.TimeSignature \override #'style = #'default \time 1/1 c''1^"TimeSignature style = \#'default" diff --git a/input/test/timing.ly b/input/test/timing.ly index 55c7ea5e21..b1ae14c08d 100644 --- a/input/test/timing.ly +++ b/input/test/timing.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" % possible rename to bar-something. \header{ texidoc = "@cindex Bar Length diff --git a/input/test/title.ly b/input/test/title.ly index cabdf293f5..637a9a3cb1 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" % MERGE with ly2dvi- \header { filename = "title.ly" diff --git a/input/test/to-xml.ly b/input/test/to-xml.ly index 6f0d9a6466..a2d2e88b11 100644 --- a/input/test/to-xml.ly +++ b/input/test/to-xml.ly @@ -1,6 +1,6 @@ -\version "1.9.2" +\version "1.9.4" -fooBar = \notes { < c''4 \\ g'4 > } +fooBar = \notes { << c''4 \\ g'4 >> } #(ly:set-option 'parse-protect #f) #(load-from-path "to-xml.scm") diff --git a/input/test/transposition.ly b/input/test/transposition.ly index c31ebae0e1..152a07f57a 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -1,5 +1,5 @@ -\version "1.9.2" +\version "1.9.4" \header{ texidoc = "@cindex Transposition Transposition test file." @@ -11,7 +11,7 @@ Hi all, I have extend Mats' patches to allow accidental transposition: \keysignature bes es fis - = \transpose c' d => + = \transpose c' d =>> \keysignature gis As you can see in output = the example file "test.ly" there are a few problems left: @@ -61,12 +61,12 @@ vThree = \notes \relative c''{ vFour = \notes \transpose c d \vThree \score { - \context StaffGroup < + \context StaffGroup << \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 6a82f36630..04fbe3a389 100644 --- a/input/test/trill.ly +++ b/input/test/trill.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \header { texidoc="@cindex Trill Show trill line type. " diff --git a/input/test/trills.ly b/input/test/trills.ly index 3dfb7ffa4f..ec09e820a8 100644 --- a/input/test/trills.ly +++ b/input/test/trills.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.2" +\version "1.9.4" \header { texidoc="@cindex Trills @@ -37,8 +37,8 @@ endHorizScript = { \score { - < - \context GrandStaff < + << + \context GrandStaff << \new Staff \notes\relative c'' { \time 1/4 c4\prall @@ -52,10 +52,10 @@ endHorizScript = { \time 3/4 b4 c^\turn d \time 1/4 - <{ d4}\\ + <<{ d4}\\ { \property Voice.Script \override #'extra-offset = #'(-0.8 . 2.0) - b_\turn}> + b_\turn}>> \startHorizScript %{ FIXME \comma does not exist @@ -68,9 +68,9 @@ endHorizScript = { %} \endHorizScript \time 2/2 \slurDown - <{c2}{s4 \invisible d1*1/4 ( \visible }> e2) - <{a,2}{s4 \invisible b1*1/4 ( \visible }> d2) - <{a2}{s4 \invisible b1*1/4 ( \visible }> d2) + <<{c2}{s4 \invisible d1*1/4 ( \visible }>> e2) + <<{a,2}{s4 \invisible b1*1/4 ( \visible }>> d2) + <<{a2}{s4 \invisible b1*1/4 ( \visible }>> d2) \time 3/4 d2^\prallup e4 } @@ -114,8 +114,8 @@ endHorizScript = { c32[( b a16 b c)] b32[ \repeat unfold 5 { c d32 } c] } - > - > + >> + >> \paper{ } } diff --git a/input/test/unfold-all-repeats.ly b/input/test/unfold-all-repeats.ly index 5277899fad..b50edb66b8 100644 --- a/input/test/unfold-all-repeats.ly +++ b/input/test/unfold-all-repeats.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" % regression. -gp \header { diff --git a/input/test/vaticana.ly b/input/test/vaticana.ly index dc3676698d..57d3bb8eb9 100644 --- a/input/test/vaticana.ly +++ b/input/test/vaticana.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" % possible rename to ancient-something. \header { texidoc = "Ancient Vaticana @@ -22,10 +22,10 @@ verba = \context Lyrics = verba \lyrics { } \score { - \context VaticanaVoice < + \context VaticanaVoice << \cantus \verba - > + >> \paper { stafflinethickness = \staffspace / 7.0 linewidth = 137.0 \mm diff --git a/input/test/version-output.ly b/input/test/version-output.ly index efda0e4aff..77e61cb0bd 100644 --- a/input/test/version-output.ly +++ b/input/test/version-output.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" \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 ca2cca84e8..147f7fc3e3 100644 --- a/input/test/vertical-extent.ly +++ b/input/test/vertical-extent.ly @@ -1,4 +1,4 @@ -\version "1.9.2" +\version "1.9.4" % TODO: huh? what's this file about? -gp \header { texidoc = " @@ -9,7 +9,7 @@ associated context finishes, so using it in \property works. " } \score { - \notes < + \notes << \new Staff { \property Staff.verticalExtent = #'(-15.0 . 0.0) \clef alto @@ -20,7 +20,7 @@ associated context finishes, so using it in \property works. \clef alto g1 } - > + >> \paper{ raggedright = ##t } diff --git a/input/tutorial/brahms-original.ly b/input/tutorial/brahms-original.ly index 3e1e3b8cfc..c4bba51410 100644 --- a/input/tutorial/brahms-original.ly +++ b/input/tutorial/brahms-original.ly @@ -1,23 +1,23 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" \score { - \notes\context PianoStaff < + \notes\context PianoStaff << \context Staff = up - \relative c'' < + \relative c'' << { \key d\major fis4-3_\p(~ fis16 a)-5 } \\ { fis16(\> d b\! \translator Staff = down - \clef treble g~ <>8) } \\ + \clef treble g~ 8) } \\ { s16 d' - ~ <>4 } - > + ~ 4 } + >> \context Staff = down { \key d \major \time 3/8 \clef bass s4. } - > + >> \paper { raggedright = ##t} } diff --git a/input/tutorial/brahms-tweaked.ly b/input/tutorial/brahms-tweaked.ly index 776aef3cb3..fd424ba7f3 100644 --- a/input/tutorial/brahms-tweaked.ly +++ b/input/tutorial/brahms-tweaked.ly @@ -1,9 +1,9 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" \score { - \notes\context PianoStaff < + \notes\context PianoStaff << \context Staff = up - \relative c'' < + \relative c'' << { \key d\major \property Voice.Slur \set #'attachment = #'(stem . stem) @@ -20,16 +20,16 @@ \tieUp fis16(\> d b\! \translator Staff = down \stemUp - \clef treble g~ <>8) } \\ + \clef treble g~ 8) } \\ { s16 \once \property Voice.Stem \set #'transparent = ##t d' - ~ <>4 } - > + ~ 4 } + >> \context Staff = down { \key d \major \time 3/8 \clef bass s4. } - > + >> \paper { raggedright = ##t} } diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index 3706006216..0ffda2e1cf 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.1" +\version "1.9.4" \header{ filename = "twinkle-pop.ly" xtitle = "Ah, vous dirais-je, maman " @@ -46,11 +46,11 @@ text = \lyrics{ } \score { - < + << \context ChordNames \acc \context Staff=melody \melodie \context Lyrics \text - > + >> \header{ title = "Ah, vous dirais-je, maman " } @@ -58,11 +58,11 @@ text = \lyrics{ } \score { - < + << \chords \context ChordNames \transpose c d\acc \notes \context Staff=melody \transpose c d\melodie \lyrics \context Lyrics \text - > + >> \header{ piece = "clarinet in B$\flat$" } diff --git a/lily/lexer.ll b/lily/lexer.ll index 7cf2e195d2..fe914c85fa 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -312,12 +312,12 @@ HYPHEN -- yylval.scm = sval; return SCM_T; } -{ +{ \<\< { - return CHORD_OPEN; + return LESSLESS; } \>\> { - return CHORD_CLOSE; + return MOREMORE; } } { @@ -468,6 +468,12 @@ HYPHEN -- \" { start_quote (); } + \< { + return '<'; + } + \> { + return '>'; + } {MARKUPCOMMAND} { String str (YYText() + 1); SCM s = lookup_markup_command (str); diff --git a/lily/parser.yy b/lily/parser.yy index e8c710b8ac..d238193ae2 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -245,8 +245,8 @@ yylex (YYSTYPE *s, void * v) %token BREATHE %token CHORDMODIFIERS %token CHORDS -%token CHORD_CLOSE -%token CHORD_OPEN +%token LESSLESS +%token MOREMORE %token CLEF %token COMMANDSPANREQUEST %token CONSISTS @@ -870,7 +870,7 @@ Simultaneous_music: $$->set_spot(THIS->here_input()); } - | '<' Music_list '>' { + | simul_open Music_list simul_close { $$ = MY_MAKE_MUSIC("SimultaneousMusic"); $$->set_mus_property ("elements", ly_car ($2)); $$->set_spot(THIS->here_input()); @@ -1341,8 +1341,20 @@ note_chord_element: } ; +chord_open: '<' + ; + +chord_close: '>' + ; + +simul_open: LESSLESS + ; + +simul_close: MOREMORE + ; + chord_body: - CHORD_OPEN chord_body_elements CHORD_CLOSE + chord_open chord_body_elements chord_close { $$ = MY_MAKE_MUSIC("EventChord"); $$->set_mus_property ("elements", @@ -2347,7 +2359,7 @@ markup: ; markup_list: - CHORD_OPEN markup_list_body CHORD_CLOSE { $$ = scm_reverse_x ($2, SCM_EOL); } + chord_open markup_list_body chord_close { $$ = scm_reverse_x ($2, SCM_EOL); } ; markup_line: diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly index a5c99754cc..a6fa7a9d73 100644 --- a/ly/chord-modifiers-init.ly +++ b/ly/chord-modifiers-init.ly @@ -1,4 +1,4 @@ -\version "1.9.1" +\version "1.9.4" \chordmodifiers #default-chord-modifier-list @@ -9,24 +9,24 @@ blackTriangleMarkup = #(make-override-markup '(font-family . math) (make-simple-markup "N")) ignatzekExceptionMusic = \notes{ - <>1-\markup { "+" } - <>-\markup { \super "o" } % should be $\circ$ ? - <>-\markup { \super \combine "o" "/" } - <>-\markup { \super "o7" } + 1-\markup { "+" } + -\markup { \super "o" } % should be $\circ$ ? + -\markup { \super \combine "o" "/" } + -\markup { \super "o7" } } ignatzekExceptions = #(sequential-music-to-chord-exceptions ignatzekExceptionMusic #t) partialJazzMusic = \notes{ - <>1-\markup { \normal-size-super "2" } - <>-\markup { "m" } - <>-\markup { \normal-size-super "sus4" } - <>-\markup { \normal-size-super "5" } + 1-\markup { \normal-size-super "2" } + -\markup { "m" } + -\markup { \normal-size-super "sus4" } + -\markup { \normal-size-super "5" } %% TODO, partial exceptions - <>-\markup { "m" }-\markup { \normal-size-super "sus4" } - <>-\markup { "m" }-\markup { \normal-size-super "sus2" } + -\markup { "m" }-\markup { \normal-size-super "sus4" } + -\markup { "m" }-\markup { \normal-size-super "sus2" } } %% TODO: compatibility ignatzek code diff --git a/ly/nederlands.ly b/ly/nederlands.ly index 15e7f03e34..262ac28b41 100644 --- a/ly/nederlands.ly +++ b/ly/nederlands.ly @@ -46,11 +46,3 @@ ) - - -foo= \notes { - <>-\markup { \normal-size-super - % \override #'(font-family . math) "N" } - \override #'(font-family . math) "M" } -} - diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index d95c10955e..53dda4c13b 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1445,7 +1445,7 @@ if 1: str = re.sub ('accacciatura', 'acciaccatura', str) - if re.search ("context-spec-music"): + if re.search ("context-spec-music", str): sys.stderr.write ("context-spec-music takes a symbol for the context now. Update by hand.") raise FatalConversionError() @@ -1461,7 +1461,39 @@ if 1: """\acciaccatura misspelling, fingerHorizontalDirection -> fingeringOrientations""")) - +def conv (str): + if re.search ('\\figures', str): + sys.stderr.write ("Warning: attempting automatic \\figures conversion. Check results!"); + + + def figures_replace (m): + s = m.group (1) + s = re.sub ('<', '@FIGOPEN@',s) + s = re.sub ('>', '@FIGCLOSE@',s) + return '\\figures { %s }' % s + + str = re.sub (r'\\figures[ \t\n]*{([^}]+)}', figures_replace, str) + str = re.sub (r'\\<', '@STARTCRESC@', str) + str = re.sub (r'\\>', '@STARTDECRESC@', str) + str = re.sub (r'([-^_])>', r'\1@ACCENT@', str) + str = re.sub (r'<<', '@STARTCHORD@', str) + str = re.sub (r'>>', '@ENDCHORD@', str) + str = re.sub (r'>', '@ENDSIMUL@', str) + str = re.sub (r'<', '@STARTSIMUL@', str) + str = re.sub ('@STARTDECRESC@', '\\>', str) + str = re.sub ('@STARTCRESC@', '\\<', str) + str = re.sub ('@ACCENT@', '>', str) + str = re.sub ('@ENDCHORD@', '>', str) + str = re.sub ('@STARTCHORD@', '<', str) + str = re.sub ('@STARTSIMUL@', '<<', str) + str = re.sub ('@ENDSIMUL@', '>>', str) + str = re.sub ('@FIGOPEN@', '<', str) + str = re.sub ('@FIGCLOSE@', '>', str) + + return str + +conversions.append (((1,9,4), conv, 'Swap < > and << >>')) + ################################ # END OF CONVERSIONS diff --git a/stepmake/stepmake/script-rules.make b/stepmake/stepmake/script-rules.make index 9c7e0e7cef..9fdd799eb3 100644 --- a/stepmake/stepmake/script-rules.make +++ b/stepmake/stepmake/script-rules.make @@ -1,25 +1,25 @@ -$(outdir)/%: %.pl $(config_make) +$(outdir)/%: %.pl $(config_make) $(depth)/VERSION cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -$(outdir)/%: %.bash $(config_make) +$(outdir)/%: %.bash $(config_make) $(depth)/VERSION cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -$(outdir)/%: %.scm $(config_make) +$(outdir)/%: %.scm $(config_make) $(depth)/VERSION cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -$(outdir)/%: %.expect $(config_make) +$(outdir)/%: %.expect $(config_make) $(depth)/VERSION cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -$(outdir)/%: %.sh $(config_make) +$(outdir)/%: %.sh $(config_make) $(depth)/VERSION cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -$(outdir)/%: %.py $(config_make) +$(outdir)/%: %.py $(config_make) $(depth)/VERSION cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -- 2.39.2