From e9bd265943d37689b1a6892217cb6f67bbe69f73 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 26 Aug 2003 09:09:01 +0000 Subject: [PATCH] (conv): dashes rule. Apply rule. --- 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 | 2 +- input/ascii-art/standchen-as5.ly | 4 +- input/ascii-art/standchen-as9.ly | 4 +- input/ascii-art/twinkle-as5.ly | 2 +- input/bugs/+.ly | 2 +- input/bugs/dynamic-switch.ly | 2 +- input/example-1.ly | 2 +- input/example-2.ly | 2 +- input/example-3.ly | 2 +- input/les-nereides.ly | 104 +++++------ input/mutopia-header.ly | 2 +- .../E.Satie/petite-ouverture-a-danser.ly | 28 +-- input/mutopia/F.Schubert/standchen.ly | 104 +++++------ .../J.S.Bach/baerenreiter-sarabande.ly | 64 +++---- input/mutopia/J.S.Bach/bwv940.ly | 14 +- input/mutopia/J.S.Bach/wtk1-fugue2.ly | 2 +- input/mutopia/R.Schumann/romanze-op28-2.ly | 160 ++++++++-------- input/mutopia/W.A.Mozart/mozart-hrn-3.ly | 2 +- .../mutopia/W.A.Mozart/mozart-hrn3-allegro.ly | 176 +++++++++--------- input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly | 2 +- .../mutopia/W.A.Mozart/mozart-hrn3-romanze.ly | 74 ++++---- input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly | 144 +++++++------- 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 | 2 +- input/no-notation/midi-grace.ly | 2 +- input/no-notation/midi-transposing.ly | 2 +- input/no-notation/midi-tuplets.ly | 2 +- input/no-notation/midi-volume-equaliser.ly | 24 +-- 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 | 2 +- input/no-notation/pc-direction.ly | 2 +- input/no-notation/textcresc.ly | 2 +- input/puer-fragment.ly | 22 +-- input/regression/+.ly | 2 +- input/regression/accidental-cautionary.ly | 2 +- input/regression/accidental-double.ly | 2 +- input/regression/accidental-ledger.ly | 2 +- input/regression/accidental-octave.ly | 2 +- input/regression/accidental-placement.ly | 2 +- input/regression/accidental-single-double.ly | 2 +- .../accidental-unbroken-tie-spacing.ly | 2 +- input/regression/accidental-voice.ly | 2 +- input/regression/accidental.ly | 2 +- input/regression/accidentals.ly | 2 +- input/regression/allfontstyle.ly | 4 +- input/regression/ambitus.ly | 2 +- input/regression/apply-context.ly | 2 +- input/regression/apply-output.ly | 14 +- input/regression/arpeggio-collision.ly | 16 +- input/regression/arpeggio.ly | 14 +- input/regression/auto-beam-bar.ly | 2 +- input/regression/auto-beam-triplet.ly | 2 +- input/regression/auto-beam-tuplets.ly | 4 +- input/regression/auto-beam.ly | 2 +- input/regression/auto-change.ly | 2 +- input/regression/bar-number.ly | 2 +- input/regression/bar-scripts.ly | 2 +- input/regression/beam-auto-knee.ly | 6 +- input/regression/beam-break.ly | 4 +- input/regression/beam-center-slope.ly | 30 +-- input/regression/beam-chord.ly | 22 +-- input/regression/beam-concave.ly | 12 +- .../regression/beam-cross-staff-auto-knee.ly | 2 +- input/regression/beam-cross-staff-slope.ly | 8 +- input/regression/beam-cross-staff.ly | 12 +- input/regression/beam-damp.ly | 18 +- input/regression/beam-default-lengths.ly | 4 +- input/regression/beam-extreme.ly | 12 +- input/regression/beam-french.ly | 8 +- input/regression/beam-funky-beamlet.ly | 2 +- input/regression/beam-funky.ly | 8 +- input/regression/beam-knee-symmetry.ly | 6 +- input/regression/beam-length.ly | 4 +- input/regression/beam-manual-beaming.ly | 4 +- input/regression/beam-manual.ly | 4 +- input/regression/beam-multiple-cross-staff.ly | 10 +- input/regression/beam-over-barline.ly | 4 +- input/regression/beam-position.ly | 10 +- input/regression/beam-postfix-notation.ly | 4 +- input/regression/beam-quanting-horizontal.ly | 22 +-- input/regression/beam-quarter.ly | 4 +- input/regression/beam-rest.ly | 4 +- input/regression/beam-second.ly | 8 +- input/regression/beam-shortened-lengths.ly | 4 +- input/regression/beamed-chord.ly | 4 +- input/regression/beaming-ternary-metrum.ly | 4 +- input/regression/beaming.ly | 28 +-- input/regression/beams.ly | 10 +- input/regression/between-systems.ly | 2 +- input/regression/break.ly | 2 +- input/regression/breathing-sign.ly | 4 +- input/regression/chord-changes.ly | 2 +- input/regression/chord-name-entry-11.ly | 2 +- input/regression/chord-name-entry.ly | 2 +- input/regression/chord-name-exceptions.ly | 6 +- input/regression/chord-name-major7.ly | 2 +- input/regression/chord-scripts.ly | 2 +- input/regression/chord-tremolo.ly | 2 +- input/regression/chords-funky-ignatzek.ly | 2 +- input/regression/clefs.ly | 2 +- input/regression/cluster.ly | 2 +- input/regression/collision-2.ly | 2 +- input/regression/collision-dots.ly | 2 +- input/regression/collision-head-chords.ly | 2 +- input/regression/collision-heads.ly | 2 +- .../collision-merge-differently-dotted.ly | 4 +- input/regression/collision-mesh.ly | 2 +- input/regression/collisions.ly | 2 +- .../regression/completion-heads-polyphony.ly | 2 +- input/regression/completion-heads.ly | 2 +- input/regression/custos.ly | 2 +- input/regression/dot-flag-collision.ly | 2 +- input/regression/dots.ly | 2 +- input/regression/drums.ly | 2 +- input/regression/dynamics-broken-hairpin.ly | 4 +- input/regression/dynamics-glyphs.ly | 14 +- input/regression/dynamics-line.ly | 6 +- input/regression/dynamics-unbound-hairpin.ly | 4 +- input/regression/easy-notation.ly | 2 +- input/regression/figured-bass.ly | 2 +- input/regression/finger-chords.ly | 4 +- input/regression/fingering.ly | 2 +- input/regression/follow-voice-break.ly | 2 +- input/regression/font-magnification.ly | 4 +- input/regression/font-name.ly | 2 +- input/regression/generic-output-property.ly | 2 +- input/regression/glissando.ly | 2 +- input/regression/grace-auto-beam.ly | 2 +- input/regression/grace-bar-line.ly | 4 +- input/regression/grace-bar-number.ly | 2 +- input/regression/grace-beam.ly | 4 +- input/regression/grace-dynamic.ly | 2 +- input/regression/grace-end.ly | 4 +- input/regression/grace-nest.ly | 2 +- input/regression/grace-nest1.ly | 2 +- input/regression/grace-nest2.ly | 2 +- input/regression/grace-nest3.ly | 2 +- input/regression/grace-nest4.ly | 2 +- input/regression/grace-nest5.ly | 2 +- input/regression/grace-part-combine.ly | 2 +- input/regression/grace-staff-length.ly | 2 +- input/regression/grace-start.ly | 6 +- input/regression/grace-stems.ly | 6 +- input/regression/grace-sync.ly | 6 +- input/regression/grace-unfold-repeat.ly | 2 +- input/regression/grace-volta-repeat-2.ly | 2 +- input/regression/grace-volta-repeat.ly | 6 +- input/regression/grace.ly | 16 +- input/regression/hairpin-ending.ly | 4 +- input/regression/hara-kiri-pianostaff.ly | 2 +- input/regression/instrument-name-markup.ly | 2 +- input/regression/instrument-name-partial.ly | 2 +- input/regression/instrument-name.ly | 2 +- input/regression/key-clefs.ly | 2 +- input/regression/key-signature-scordatura.ly | 2 +- input/regression/keys.ly | 2 +- input/regression/lyric-align.ly | 2 +- input/regression/lyric-combine-polyphonic.ly | 2 +- input/regression/lyric-combine.ly | 4 +- input/regression/lyric-extender.ly | 4 +- input/regression/lyric-hyphen.ly | 4 +- input/regression/lyric-phrasing.ly | 4 +- input/regression/lyrics-bar.ly | 2 +- input/regression/lyrics-extender.ly | 4 +- input/regression/lyrics-melisma-beam.ly | 4 +- input/regression/lyrics-multi-stanza.ly | 2 +- input/regression/markup-note.ly | 2 +- input/regression/markup-stack.ly | 2 +- input/regression/measure-grouping.ly | 6 +- input/regression/mensural.ly | 2 +- input/regression/metronome-marking.ly | 2 +- input/regression/mm-rests2.ly | 2 +- input/regression/mmrest-collision.ly | 2 +- input/regression/molecule-hacking.ly | 2 +- input/regression/multi-measure-rest-center.ly | 2 +- input/regression/multi-measure-rest-grace.ly | 2 +- .../multi-measure-rest-instr-name.ly | 2 +- input/regression/multi-measure-rest-text.ly | 2 +- input/regression/multi-measure-rest.ly | 2 +- input/regression/music-map.ly | 4 +- input/regression/new-markup-syntax.ly | 4 +- input/regression/non-empty-text.ly | 2 +- input/regression/note-group-bracket.ly | 14 +- input/regression/note-head-chord.ly | 2 +- input/regression/note-head-style.ly | 2 +- input/regression/note-line.ly | 2 +- input/regression/number-staff-lines.ly | 2 +- input/regression/ottava-broken.ly | 2 +- input/regression/ottava.ly | 2 +- input/regression/output-property.ly | 4 +- input/regression/pc-mmrest.ly | 8 +- input/regression/pc-switch-slur.ly | 10 +- input/regression/phrasing-slur.ly | 4 +- input/regression/prefatory-empty-spacing.ly | 2 +- input/regression/prefatory-spacing-matter.ly | 2 +- input/regression/property-once.ly | 2 +- input/regression/rehearsal-mark.ly | 2 +- input/regression/repeat-fold.ly | 2 +- input/regression/repeat-line-break.ly | 2 +- input/regression/repeat-percent-skipbars.ly | 2 +- input/regression/repeat-percent.ly | 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 | 2 +- input/regression/rest-collision.ly | 14 +- input/regression/rest-ledger.ly | 2 +- input/regression/rest-pitch.ly | 2 +- input/regression/rest.ly | 2 +- input/regression/rhythmic-staff.ly | 2 +- input/regression/script-collision.ly | 4 +- 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 | 22 +-- input/regression/slur-attachment.ly | 10 +- input/regression/slur-broken-trend.ly | 8 +- input/regression/slur-cross-staff.ly | 20 +- input/regression/slur-dots.ly | 4 +- input/regression/slur-nice.ly | 10 +- input/regression/slur-rest.ly | 6 +- input/regression/slur-staccato.ly | 6 +- input/regression/slur-stem-broken.ly | 4 +- 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 | 2 +- input/regression/spacing-end-of-line.ly | 2 +- input/regression/spacing-ended-voice.ly | 2 +- input/regression/spacing-folded-clef.ly | 4 +- input/regression/spacing-folded-clef2.ly | 2 +- input/regression/spacing-grace-duration.ly | 6 +- input/regression/spacing-grace.ly | 4 +- input/regression/spacing-knee.ly | 8 +- input/regression/spacing-multi-tuplet.ly | 10 +- input/regression/spacing-note-flags.ly | 4 +- 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 | 4 +- input/regression/spacing-to-grace.ly | 2 +- input/regression/spacing-very-tight.ly | 2 +- input/regression/span-bar.ly | 2 +- input/regression/staccato-pos.ly | 2 +- input/regression/staff-tweak.ly | 2 +- input/regression/stanza-number.ly | 2 +- input/regression/stem-direction.ly | 4 +- input/regression/stem-shorten.ly | 2 +- input/regression/stem-spacing.ly | 2 +- input/regression/stem-tremolo.ly | 2 +- input/regression/system-extents.ly | 4 +- input/regression/system-start-bracket.ly | 2 +- input/regression/text-spanner.ly | 4 +- input/regression/tie-accidental.ly | 6 +- input/regression/tie-break-accidental.ly | 2 +- input/regression/tie-busy-grobs.ly | 2 +- input/regression/tie-chord-partial.ly | 4 +- input/regression/tie-chord.ly | 2 +- input/regression/tie-dots.ly | 2 +- input/regression/tie-grace.ly | 2 +- input/regression/tie.ly | 2 +- input/regression/tuplet-beam.ly | 8 +- input/regression/tuplet-nest.ly | 2 +- input/regression/tuplet-properties.ly | 12 +- input/regression/tuplet-rest.ly | 2 +- .../regression/tuplet-staffline-collision.ly | 2 +- input/regression/tuplets.ly | 4 +- input/regression/voice-follower.ly | 2 +- input/regression/volta-broken-left-edge.ly | 2 +- input/regression/volta-multi-staff.ly | 2 +- input/screech-boink.ly | 14 +- input/template/gregorian-transcription.ly | 6 +- input/template/header.ly | 2 +- input/template/jazz-combo.ly | 2 +- input/template/melody-chords.ly | 2 +- input/template/melody-lyrics-chords.ly | 2 +- input/template/melody-lyrics.ly | 2 +- input/template/melody.ly | 2 +- input/template/piano-4-voices.ly | 2 +- input/template/piano-dynamics.ly | 6 +- input/template/piano-lyrics.ly | 2 +- input/template/piano-melody-lyrics.ly | 2 +- input/template/piano.ly | 2 +- input/template/satb.ly | 4 +- input/test/+.ly | 2 +- input/test/ac-extra-voice.ly | 6 +- input/test/add-staccato.ly | 2 +- input/test/add-text-script.ly | 4 +- input/test/ancient-accidentals.ly | 2 +- input/test/ancient-font.ly | 2 +- input/test/ancient-time.ly | 2 +- input/test/bagpipe.ly | 56 +++--- input/test/bar-always.ly | 2 +- input/test/bar-lines-lyric-only.ly | 2 +- input/test/bar-lines.ly | 2 +- input/test/bar-number-every-five-reset.ly | 2 +- input/test/bar-number-regular-interval.ly | 2 +- input/test/bar-number-show-all.ly | 2 +- input/test/beam-auto-4-8.ly | 2 +- input/test/beam-auto-override.ly | 4 +- input/test/beam-auto.ly | 2 +- input/test/beam-control.ly | 8 +- input/test/beam-count.ly | 2 +- input/test/beam-dir-functions.ly | 14 +- input/test/beam-isknee.ly | 4 +- input/test/beam-neutral-direction.ly | 8 +- input/test/beam-rest.ly | 8 +- input/test/blank-notes.ly | 2 +- input/test/blank-paper-tab.ly | 2 +- input/test/blank-paper.ly | 2 +- input/test/boxed-molecule.ly | 6 +- input/test/caps.ly | 2 +- input/test/cautionaries.ly | 2 +- input/test/chord-names-german.ly | 2 +- input/test/chord-names-jazz.ly | 26 +-- input/test/chord-names-no-inversions.ly | 2 +- input/test/chords-without-melody.ly | 2 +- input/test/clef-8-syntax.ly | 2 +- input/test/clef-end-of-line.ly | 2 +- input/test/clef-manual-control.ly | 2 +- input/test/coriolan-margin.ly | 2 +- input/test/count-systems.ly | 2 +- input/test/crescendi.ly | 10 +- input/test/cue-notes.ly | 4 +- input/test/divisiones.ly | 16 +- input/test/drarn-slurs.ly | 4 +- input/test/drarn.ly | 6 +- input/test/dynamic-absolute-volume.ly | 16 +- input/test/dynamic-extra.ly | 8 +- 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 | 2 +- input/test/fill-a4.ly | 2 +- input/test/follow-thread.ly | 2 +- input/test/force-hshift.ly | 2 +- input/test/gourlay.ly | 2 +- input/test/gregorian-scripts.ly | 12 +- input/test/harmonic.ly | 2 +- input/test/header-ifelse.ly | 2 +- input/test/hshift.ly | 2 +- input/test/hymn.ly | 10 +- input/test/improv.ly | 6 +- input/test/incipit.ly | 4 +- input/test/instrument-name-grandstaff.ly | 2 +- input/test/ly2dvi-testpage.ly | 2 +- input/test/maximum-rest-count.ly | 2 +- input/test/mensural-ligatures.ly | 2 +- input/test/midi-scales.ly | 2 +- input/test/move-accidentals.ly | 2 +- input/test/move-specific-text.ly | 4 +- input/test/music-box.ly | 6 +- input/test/music-creation.ly | 2 +- input/test/nested-groups.ly | 2 +- input/test/no-bar-lines.ly | 2 +- input/test/no-staff.ly | 2 +- input/test/octave-duplicate.ly | 2 +- input/test/ossia.ly | 2 +- input/test/part-combine-moments.ly | 2 +- input/test/part-combine-staff.ly | 2 +- input/test/part-combine.ly | 2 +- input/test/partial-blank.ly | 2 +- input/test/pedal.ly | 16 +- input/test/phrasing-slur-height.ly | 6 +- input/test/polymetric-differing-notes.ly | 8 +- input/test/polymetric.ly | 2 +- input/test/preset-extent.ly | 2 +- input/test/repeat-manual.ly | 2 +- input/test/repeat-shorter-bracket.ly | 2 +- input/test/repeat.ly | 2 +- input/test/rest-dot-positions.ly | 2 +- 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 | 6 +- input/test/script-chart.ly | 28 +-- input/test/script-priority.ly | 2 +- input/test/script-stack.ly | 2 +- input/test/separate-staccato.ly | 2 +- input/test/slur-attachment-override.ly | 6 +- input/test/slur-beautiful.ly | 8 +- input/test/slur-dash.ly | 12 +- input/test/slur-minimum-length.ly | 4 +- input/test/slur-shape.ly | 56 +++--- input/test/slur-ugly.ly | 4 +- input/test/smart-transpose.ly | 2 +- input/test/spacing-2.ly | 6 +- input/test/spanner-after-break-tweak.ly | 2 +- input/test/staff-bracket.ly | 2 +- input/test/staff-container.ly | 2 +- input/test/staff-lines.ly | 2 +- input/test/staff-size.ly | 6 +- input/test/staff-space.ly | 6 +- input/test/stem-centered.ly | 2 +- input/test/stem-cross-staff.ly | 2 +- input/test/stem-extend.ly | 2 +- input/test/stem-length.ly | 2 +- input/test/tablature-hammer.ly | 8 +- input/test/tablature.ly | 2 +- input/test/text-spanner.ly | 2 +- input/test/textscript.ly | 2 +- input/test/tie-sparse.ly | 2 +- input/test/time-signature-double.ly | 2 +- input/test/time.ly | 2 +- input/test/timing.ly | 4 +- input/test/title.ly | 2 +- input/test/to-xml.ly | 2 +- input/test/transposition.ly | 2 +- input/test/trill.ly | 4 +- input/test/trills.ly | 26 +-- input/test/unfold-all-repeats.ly | 2 +- input/test/vaticana.ly | 2 +- input/test/version-output.ly | 2 +- input/test/vertical-extent.ly | 2 +- input/tutorial/brahms-original.ly | 10 +- input/tutorial/brahms-tweaked.ly | 10 +- input/twinkle-pop.ly | 2 +- ly/a3-init.ly | 2 +- ly/a4-init.ly | 2 +- ly/accordion-defs-init.ly | 2 +- ly/book-init-init.ly | 2 +- ly/catalan.ly | 2 +- ly/center-init.ly | 2 +- ly/chord-modifiers-init.ly | 30 +-- ly/declarations-init.ly | 2 +- ly/deutsch.ly | 2 +- ly/drumpitch-init.ly | 2 +- ly/dynamic-scripts-init.ly | 2 +- ly/english.ly | 2 +- ly/engraver-init.ly | 8 +- ly/espanol.ly | 2 +- ly/generate-documentation.ly | 2 +- ly/generate-interface-doc-init.ly | 2 +- ly/generic-paper-init.ly | 2 +- ly/grace-init.ly | 2 +- ly/gregorian-init.ly | 2 +- ly/init.ly | 2 +- ly/italiano.ly | 2 +- ly/ledger-init.ly | 2 +- ly/legal-init.ly | 2 +- ly/letter-init.ly | 2 +- ly/midi-init.ly | 2 +- ly/nederlands.ly | 2 +- ly/norsk.ly | 2 +- ly/paper-as5-init.ly | 2 +- ly/paper-as5.ly | 2 +- ly/paper-as9-init.ly | 2 +- ly/paper-as9.ly | 2 +- ly/paper-init.ly | 2 +- ly/paper11-init.ly | 2 +- ly/paper11.ly | 2 +- ly/paper13-init.ly | 2 +- ly/paper13.ly | 2 +- ly/paper16-init.ly | 2 +- ly/paper16.ly | 2 +- ly/paper19-init.ly | 2 +- ly/paper19.ly | 2 +- ly/paper20-init.ly | 2 +- ly/paper20.ly | 2 +- ly/paper23-init.ly | 2 +- ly/paper23.ly | 2 +- ly/paper26-init.ly | 2 +- ly/paper26.ly | 2 +- ly/params-as-init.ly | 2 +- ly/params-init.ly | 2 +- ly/part-paper-init.ly | 2 +- ly/performer-init.ly | 2 +- ly/property-init.ly | 12 +- ly/scale-definitions-init.ly | 2 +- ly/script-init.ly | 2 +- ly/spanners-init.ly | 2 +- ly/suomi.ly | 2 +- ly/svenska.ly | 2 +- scripts/convert-ly.py | 1 - 499 files changed, 1445 insertions(+), 1446 deletions(-) diff --git a/input/ascii-art/as-email.ly b/input/ascii-art/as-email.ly index 56d929d0e2..2da58c9fb1 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.0" +\version "1.9.1" % ASCII Art output % % Process as: diff --git a/input/ascii-art/as1.ly b/input/ascii-art/as1.ly index 9066555e13..cf310912c8 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.0" +\version "1.9.1" \score { \context Voice \notes\relative c { diff --git a/input/ascii-art/as2.ly b/input/ascii-art/as2.ly index d3beeb90ab..3d0959193b 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.0" +\version "1.9.1" % test for ascii-art output diff --git a/input/ascii-art/asciiscript5.ly b/input/ascii-art/asciiscript5.ly index deb1d512d5..7f20238f65 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.0" +\version "1.9.1" % ASCII Art output % % Process as: diff --git a/input/ascii-art/asciiscript9.ly b/input/ascii-art/asciiscript9.ly index 49fad8607a..96858589ca 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.0" +\version "1.9.1" % ASCII Art output % % Process as: diff --git a/input/ascii-art/r-as.ly b/input/ascii-art/r-as.ly index 47cf4d037f..3de5511e9e 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.0" +\version "1.9.1" % ASCII Art output % % Process as: diff --git a/input/ascii-art/standchen-as5.ly b/input/ascii-art/standchen-as5.ly index 4175f7c973..1f170cba65 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.0" +\version "1.9.1" % ASCII Art output % % Process as: @@ -15,7 +15,7 @@ \context Staff=upper \notes\relative c{ \key f \major \time 3/4 - r8^"Moderato" %-\pp + r8^"Moderato" %\pp | r8 } diff --git a/input/ascii-art/standchen-as9.ly b/input/ascii-art/standchen-as9.ly index 40a32c338f..22ba0e21d2 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.0" +\version "1.9.1" % ASCII Art output % Process as: @@ -16,7 +16,7 @@ \context Staff=upper \notes\relative c{ \key f \major \time 3/4 - r8^"Moderato" %-\pp + r8^"Moderato" %\pp | r8 } diff --git a/input/ascii-art/twinkle-as5.ly b/input/ascii-art/twinkle-as5.ly index f5c5e76d38..fcf0c7cb51 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.0" +\version "1.9.1" % ASCII Art output % % Process as: diff --git a/input/bugs/+.ly b/input/bugs/+.ly index d854c7f8cc..6c5ad2297e 100644 --- a/input/bugs/+.ly +++ b/input/bugs/+.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" %% +.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/bugs/dynamic-switch.ly b/input/bugs/dynamic-switch.ly index af0d2fc166..31517433f1 100644 --- a/input/bugs/dynamic-switch.ly +++ b/input/bugs/dynamic-switch.ly @@ -6,7 +6,7 @@ texidoc="The decrescendo disappears when the part combiner decides that the a2 and c2 should be a chord in one voice. Using the commented version, with a c2 instead of a2, the decrescendo reappears." } -\version "1.9.0" +\version "1.9.1" \score{ \context Staff < diff --git a/input/example-1.ly b/input/example-1.ly index 268389ba01..3adfef97b5 100644 --- a/input/example-1.ly +++ b/input/example-1.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % A simple scale in LilyPond % % Type: diff --git a/input/example-2.ly b/input/example-2.ly index b380bed753..9760c07b0c 100644 --- a/input/example-2.ly +++ b/input/example-2.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % Some beamed and slurred notes of different taste in LilyPond % % Type: diff --git a/input/example-3.ly b/input/example-3.ly index 83fd194100..00bad3cacb 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" one = \notes\relative c{ c'' d e f diff --git a/input/les-nereides.ly b/input/les-nereides.ly index b802151a81..f47077e109 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { composer = "ARTHUR GRAY" @@ -37,18 +37,18 @@ treble = \context Voice=treble \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." } + cis,16^2(^\markup {\small \italic "m.d." } <>8 <> | %4 - <>4-) + <>4) \translator Staff=treble @@ -60,37 +60,37 @@ treble = \context Voice=treble \notes\relative c''{ \once\property Voice.TextScript \set #'extra-offset = #'(-3 . -2) %tweak \tieUp - cis''''4^\markup { \small \italic "m.g." }-\arpeggio-~ + cis''''4^\markup { \small \italic "m.g." }\arpeggio~ \grace { cis8 %\stemBoth Hmm \property Voice.Stem \set #'direction = #0 - a16-[-5( fis dis-] + a16[-5( fis dis] #(set-octavation 0) - cis32-[ a-1 fis-4 dis] cis-[ a fis-)-2] + cis32[ a-1 fis-4 dis] cis[ a fis)-2] % the small grace in lower staff comes after us s32 } \stemUp - cis'4( bis-) + 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 +107,18 @@ trebleTwo = \context Voice=trebleTwo \notes\relative c''{ s1*2 | %4 s4 - <>4-\arpeggio + <>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 = \context Voice=bass \notes\relative c{ @@ -132,13 +132,13 @@ bass = \context Voice=bass \notes\relative c{ \dynamicUp - r8. e,16-(-\f_2 <>8-[ <>] + r8. e,16(\f_2 <>8[ <>] | %2 <>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 @@ -158,7 +158,7 @@ bass = \context Voice=bass \notes\relative c{ \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 @@ -172,7 +172,7 @@ bass = \context Voice=bass \notes\relative c{ \stemBoth < %urg: staff-change: ! on dis - <>-\arpeggio + <>\arpeggio > \grace { @@ -182,8 +182,8 @@ bass = \context Voice=bass \notes\relative c{ s s s \clef bass \property Voice.fontSize = #-3 - <>32-( - } <>2-) + <>32( + } <>2) | %5 \slurUp @@ -191,24 +191,24 @@ bass = \context Voice=bass \notes\relative c{ % \fingerDown \property Voice.Fingering \set #'direction = #-1 - %%a,8 e'-[-5-(<>-]-) - a,8 e'-[-5-(<>-]-)-2-3 + %%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-( + e,8[-5( | %6 \once \property Voice.Fingering \set #'extra-offset = #'(0 . -1) %tweak - a-)-2] + a)-2] \slurUp - e'-[(<>-)] r b, <>4 + e'[(<>)] r b, <>4 \slurBoth - e,8-[( + e,8[( | %7 - a-)] + a)] } bassTwo = \context Voice=bassTwo \notes\relative c{ @@ -219,7 +219,7 @@ bassTwo = \context Voice=bassTwo \notes\relative c{ \stemUp \slurUp - cis'4-( bis-) + cis'4( bis) } middleDynamics = \context Dynamics=middle \notes{ @@ -233,8 +233,8 @@ middleDynamics = \context Dynamics=middle \notes{ s16 s s s32 s \once\property Dynamics.Hairpin \set #'extra-offset = #'(0 . 2) %tweak - s-\> s - s32 s s s-\! + s\> s + s32 s s s\! } s32 s-"rall." s s s8 s4 | %5 @@ -242,35 +242,35 @@ middleDynamics = \context Dynamics=middle \notes{ \once\property Dynamics.Hairpin \set #'extra-offset = #'(1 . 0) %tweak s \> s s | %6 - s8-\! - s2 s8 s-\> s + s8\! + s2 s8 s\> s | %7 - s8-\! + s8\! } lowerDynamics = \context Dynamics=lower \notes{ s2 | %2 - s2-\sustainDown s8. s16-\sustainUp s4 + s2\sustainDown s8. s16\sustainUp s4 | %3 - s2-\sustainDown s8. s16-\sustainUp s4 + s2\sustainDown s8. s16\sustainUp s4 | %4 - s4-\sustainDown + s4\sustainDown \property Dynamics.pedalSustainStrings = #'("Ped." "*Ped." "*") % grace destroys pedal-line-spanner? % let's do manual tweak: \once\property Dynamics.SustainPedal \set #'extra-offset = #'(10 . 0) %tweak - s8-\sustainUp + s8\sustainUp \once\property Dynamics.SustainPedal \set #'extra-offset = #'(16 . 0) %tweak - s8-\sustainDown + s8\sustainDown %{ s4 \grace { s8 s16 s s - s32 s s s-\sustainUp - s32 s s s-\sustainDown + s32 s s s\sustainUp + s32 s s s\sustainDown } %} s2 @@ -283,19 +283,19 @@ lowerDynamics = \context Dynamics=lower \notes{ % that's what gray wants, anyway. \property Dynamics.pedalSustainStyle = #'mixed - s8-\sustainDown s s - s s-\sustainUp-\sustainDown s + s8\sustainDown s s + s s\sustainUp\sustainDown s s \once \property Dynamics.pedalSustainStyle = #'text - s-\sustainUp + s\sustainUp | %6 \property Dynamics.pedalSustainStyle = #'mixed - s8-\sustainDown s s - s s-\sustainUp-\sustainDown s + s8\sustainDown s s + s s\sustainUp\sustainDown s s \once \property Dynamics.pedalSustainStyle = #'text - s-\sustainUp + s\sustainUp | %7 } diff --git a/input/mutopia-header.ly b/input/mutopia-header.ly index 5841258b97..8456e55443 100644 --- a/input/mutopia-header.ly +++ b/input/mutopia-header.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \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 7cdf75a8f8..bbc26cb360 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.0" +\version "1.9.1" \include "nederlands.ly" @@ -37,27 +37,27 @@ i = \context Staff \notes\relative c''{ \context Voice=i \voiceOne - c8.( es16 bes4 ~ | bes8-) r c8.( bes16 | des4 c8. bes16 | c4 ~ c8-) r | - c4( f,8. as16 | bes4 ~ bes8-) r | f8.( es16 f4 | es f-) | - g8.( es16 f4 ~ | f-) f8 r + c8.( es16 bes4 ~ | bes8) r c8.( bes16 | des4 c8. bes16 | c4 ~ c8) r | + c4( f,8. as16 | bes4 ~ bes8) r | f8.( es16 f4 | es f) | + g8.( es16 f4 ~ | f) f8 r % Au mouvement - f4 ( g | a2 ~ | a-) | a4-- a-> ~ | a8 r b!8.( a16 | b4-) c-- ~ | - c8 r b8.( d16 | a4 ~ a8-) r | d4( cis | c! b8. d16 | a4 ~ a8-) r + f4 ( g | a2 ~ | a) | a4-- a-> ~ | a8 r b!8.( a16 | b4) c-- ~ | + c8 r b8.( d16 | a4 ~ a8) r | d4( cis | c! b8. d16 | a4 ~ a8) r - a8.( g16 a4 ~ a8-) r | + a8.( g16 a4 ~ a8) r | - a4-> ~ a8 r | g8.( a16 fis4-) | e8.( d16 e4 | fis ~ fis8-) r + a4-> ~ a8 r | g8.( a16 fis4) | e8.( d16 e4 | fis ~ fis8) r - d4( d-- ~ d8-) r e4( f!2 ~ | + d4( d-- ~ d8) r e4( f!2 ~ | - f4 ~ f8-) r | es4( g | as bes ~ | bes-) c( | b!2-) | c4( d | bes2-) | c4~ c8 r | + f4 ~ f8) r | es4( g | as bes ~ | bes) c( | b!2) | c4( d | bes2) | c4~ c8 r | % copy from begin: 1-10 - c8.( es16 bes4 ~ | bes8-) r c8.( bes16 | des4 c8. bes16 | c4 ~ c8-) r | - c4( f,8. as16 | bes4 ~ bes8-) r | f8.( es16 f4 | es f-) | -% g8.( es16 f4 ~ | f-) f8 r ? - g8.( es16 f4 ~ | f-) ~ f8 r + c8.( es16 bes4 ~ | bes8) r c8.( bes16 | des4 c8. bes16 | c4 ~ c8) r | + c4( f,8. as16 | bes4 ~ bes8) r | f8.( es16 f4 | es f) | +% g8.( es16 f4 ~ | f) f8 r ? + g8.( es16 f4 ~ | f) ~ f8 r } diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly index 8c0ddd5a47..1e4f2be1ea 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.0" +\version "1.9.1" dynamicUp = \property Voice.DynamicLineSpanner \override #'direction = #1 dynamicRevert = \property Voice.DynamicLineSpanner \revert #'direction @@ -51,30 +51,30 @@ dynamicRevert = \property Voice.DynamicLineSpanner \revert #'direction vocalVerse = \notes\relative c''{ \dynamicUp - \times 2/3 { g8-[( as-)] g } c4. g8 | - \times 2/3 { f8-[( g-)] f } c'4 f,8 r | - g4.-> f8 \times 2/3 { f-[( es-)] d } | + \times 2/3 { g8[( as)] g } c4. g8 | + \times 2/3 { f8[( g)] f } c'4 f,8 r | + g4.-> f8 \times 2/3 { f[( es)] d } | es2 r4 | R2. | R2. | - \times 2/3 { g8-[( as-)] g } es'4. g,8 | - \times 2/3 { f8-[( g-)] f } d'4. c8 | - bes4. as8 \times 2/3 { as-[( g-)] f } | + \times 2/3 { g8[( as)] g } es'4. g,8 | + \times 2/3 { f8[( g)] f } d'4. c8 | + bes4. as8 \times 2/3 { as[( g)] f } | g2 r4 | R2. | R2. | g8. b16 es4. d8 | c8. g16 es4. c8 | - \grace { as'32-[( bes ] } \times 2/3 { as8-[-)( g-)] as } c4. as8 | + \grace { as'32[( bes ] } \times 2/3 { as8[)( g)] as } c4. as8 | g2. | - \grace { f32-[( g ] } \times 2/3 { f8-[-)( e-)] f } as4. f8 | + \grace { f32[( g ] } \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 { a'32[( b ] } \times 2/3 { a!8[)( gis)] a } c4. a8 | g!2. | - \times 2/3 { d'8-[-\f( cis-)] d } f4. b,8 | + \times 2/3 { d'8[\f( cis)] d } f4. b,8 | c!2. | } @@ -84,13 +84,13 @@ vocalThrough = \notes\relative c{ c4 b r | g4. b8 d8. c16 | b2 r4 | - e4. d8 \times 2/3 { d-[( c-)] b } | + e4. d8 \times 2/3 { d[( c)] b } | a8. b16 c4-> a8 r | R2. | R2. | - \grace { a32-[( b ] } \times 2/3 { a!8-[-)( gis-)] a } c4. a8 | + \grace { a32[( b ] } \times 2/3 { a!8[)( gis)] a } c4. a8 | g!2. | - \times 2/3 { d'8-[-\f( cis-)] d } f4. b,8 | + \times 2/3 { d'8[\f( cis)] d } f4. b,8 | c!2. ~ | % bug: slur on other staff fools lily into extending melisma c4 r c | @@ -140,7 +140,7 @@ lyricThrough = \lyrics{ } trebleIntro = \notes\relative c{ - r8^"\bf M\\\"a\\ss ig"-\pp <>-. <>-. <>-. <>-. <>-. | + r8^"\bf M\\\"a\\ss ig"\pp <>-. <>-. <>-. <>-. <>-. | r8 <>-. <>-. <>-. <>-. <>-. | r8 <>-. <>-. <>-. <>-. <>-. | r8 <>-. <>-. <>-. <>-. <>-. | @@ -152,8 +152,8 @@ trebleVerseOne = \notes\relative c{ r8 <> <> <> <> <> | r8 <> <> <> <> <> | r8 <> <> <> <> <> | - <>4.-( <>8-) - \times 2/3 { <>-(-[ <> <>-)-] } + <>4.( <>8) + \times 2/3 { <>([ <> <>)] } %10 <>2. | @@ -161,46 +161,46 @@ trebleVerseOne = \notes\relative c{ r8 <> <> <> <> <> | r8 <> <> <> <> <> | r8 - <>-[ + <>[ <> <> - <>-] - <>-( - <>4.-(-) - <>8-) + <>] + <>( + <>4.() + <>8) - \times 2/3 { <>-(-[ <> <>-)-] } + \times 2/3 { <>([ <> <>)] } %16 <>2. | r8 <> <> <> <> <> | r8 <> <> <> <> <> | - r8-\pp <> <> <> <> <> | + r8\pp <> <> <> <> <> | %20 r8 <> <> <> <> <> | \property Voice.Slur \override #'attachment = #'(stem . stem) - \grace { as'32-[( bes ] } - \times 2/3 { as8-[-)( g as] } c4.-> as8-) | + \grace { as'32[( bes ] } + \times 2/3 { as8[)( g as] } c4.-> as8) | \property Voice.Slur \revert #'attachment g2. | r8 <> <> <> <> <> | r8 <> <> <> <> <> | r8 <> <> <> <> <> | r8 <> <> <> <> <> | - \times 2/3 { <>-\f-( <> <> } - <>4.-> <>8-) | + \times 2/3 { <>\f( <> <> } + <>4.-> <>8) | } trebleEentje = \notes \relative c' \context Voice { \stemBoth <>2 r4 | - <>2-\(-\mf <>8.-(-> <>16-)-\) | + <>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 | } @@ -210,18 +210,18 @@ trebleThrough = \notes \relative c'{ <>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] | %65 - <>2.-~-(-\f - <>2-) r4 + <>2.~(\f + <>2) r4 < - { a'8. b16 c4^> ( a8-) r | - a8. b16 c4^> ( a8-) r | + { a'8. b16 c4^> ( a8) r | + a8. b16 c4^> ( a8) r | }\\{ <>4 <>2 | <>4 <>2 | @@ -231,9 +231,9 @@ trebleThrough = \notes \relative c'{ r8 <> <> <> <> <> | %70 r8 <> <> <> <> <> | - \times 2/3 { <>8-( <> <> } + \times 2/3 { <>8( <> <> } - <>4.-> <>8-) + <>4.-> <>8) <>2. | <>2. | \property Voice . TextScript \override #'font-shape = #'italic @@ -242,12 +242,12 @@ trebleThrough = \notes \relative c'{ %75 <>2. | - <>2 <>4-\pp | + <>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 @@ -255,7 +255,7 @@ trebleThrough = \notes \relative c'{ \property Voice . TextScript \revert #'font-shape <>2. | - <>2.-\fermata | + <>2.\fermata | } bassIntro = \notes\relative c{ @@ -320,16 +320,16 @@ bassThrough = \notes\relative c{ <>8 <>[ <> <> <>-> <>] | <>8 <>[ <> <> <>-> <>] | %65 - <>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>> -\! <> <> <>] | + c,8\> <>[ << e g c>> \! <> <> <>] | <>8 <>[ <> <> <> <>] | <>8 <>[ <> <> <> <>] | @@ -457,7 +457,7 @@ grandStaff = \context PianoStaff < % linewidth = 190.\mm % to get this on 3 pages of a4. - % Mandatory Mutopia settings yield 4 pages :-( + % Mandatory Mutopia settings yield 4 pages :( textheight = 270.0\mm linewidth = 180.0\mm diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly index 41d7d9742a..6fd589fe73 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.0" +\version "1.9.1" % #(ly:set-point-and-click 'line-column) @@ -53,78 +53,78 @@ sarabandeA = \context Voice \notes \relative c { \property Staff.NoteCollision \set #'merge-differently-dotted = ##t - < { d8. e16 e4.-\trill d16 e } \\ + < { 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] | + <>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] | + %% c4.\trill bes8[ a g] | - < { d'8. e16 e4.-\trill d16 e | - f4. d8-[ e f] } + < { d'8. e16 e4.\trill d16 e | + f4. d8[ e f] } \\ { <>4 a2 <>4. } > | %%7 - g8 bes16(a-) c(bes-) a(g-) d'8 f, | - < e4.-\trill + g8 bes16(a) c(bes) a(g) d'8 f, | + < e4.\trill \\ <>4 > - d8-[ c bes] + d8[ c bes] %%9 - < { f'8 g16(a-) a4. g16(f-) | - g8 a16(bes-) bes4. c16(d-) } + < { f'8 g16(a) a4. g16(f) | + g8 a16(bes) bes4. c16(d) } \\ { a,4 <>4. r8 bes4 <>2 } > | \forcedBreak %% 11 - e,8-[ f] c,-[ g'] f'-[ e] | + 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'] - a,-[ fis'] - es'-[ d] | + fis8.\trill es16 d8 c | + bes[ g'] + a,[ fis'] + es'[ d] | \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] | - cis8 e16 a a,8. g'16 f8(e-) | + cis,[ bes'] a[ g16 f] e!8[ f16 d] | + cis8 e16 a a,8. g'16 f8(e) | \forcedBreak %%21 - < { d e16(f-) f4. e16(d-) | - e8 f16(g-) g4. a16(bes-) | - a8 cis16 d d,8 e16 f32 g f8-\trill 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 } > | \stemUp - d4 d,16 a'( b cis d e f g-) | + d4 d,16 a'( b cis d e f g) | \stemBoth \forcedLastBreak %%25 - < { a16(b c b-) c4. b16(a-) | - b cis d cis d4. e16(f-) | } + < { a16(b c b) c4. b16(a) | + b cis d cis d4. e16(f) | } \\ { f,4 fis4. s8 | <>4 gis4. } > \voiceOne - d16(cis d-) f, - a,8-[ e'] + d16(cis d) f, + a,8[ e'] \oneVoice - d'-[ cis] | + d'[ cis] | %% d4 d,,2 | d4 \property Thread.NoteHead diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly index 6354a626a6..95300bb8cb 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.0" +\version "1.9.1" %{ Header for Petites Preludes. @@ -47,7 +47,7 @@ one = \notes\relative c{ r4 d''2 cis4 | \stemBoth d16 a' g f e f cis d - e8.-\mordent f16 d8.-\prall cis16 | + e8.\mordent f16 d8.\prall cis16 | \stemUp\tieUp cis4 ~ cis16 a d8 ~ d4 a | %5 @@ -64,7 +64,7 @@ one = \notes\relative c{ two = \notes\relative c{ r16 d'' c bes a bes f g - a8.-\mordent bes16 g8.-\prall f16 | + a8.\mordent bes16 g8.\prall f16 | \stemDown f2 e2 | \translator Staff=lower \stemUp @@ -73,7 +73,7 @@ two = \notes\relative c{ r16 b' a g f8. f16 e2 ~ | %5 e2 ~ e4 ~ e16 e f! d | - s4 e4_\mordent-~ e4 d4 ~ | + s4 e4_\mordent~ e4 d4 ~ | d4. cis16 d cis4 d ~ | d8 r r16 e f d r16 e f d r d e cis | r16 e d c! bes! d8. s4 r16 bes' a g | @@ -86,12 +86,12 @@ three = \notes\relative c{ f2 e | \stemBoth d16 d' c bes a bes f g - a8.-\mordent bes16 - g8.-\prall f16 | + a8.\mordent bes16 + g8.\prall f16 | f2 g4 gis | a2 ~ a16 a g f e f c d | %5 - e8.-\mordent f16 d8.-\prall c16 \stemBoth c4. d8 | + e8.\mordent f16 d8.\prall c16 \stemBoth c4. d8 | \stemDown \tieDown e4 ~ e16 f e d cis a b cis d e f d | diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly index e50f223a3a..3ab00313b5 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.0" +\version "1.9.1" diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index 9ce3186fbc..c3239c8a09 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.0" +\version "1.9.1" \header { title = "Romanzen" @@ -38,51 +38,51 @@ righta = \notes \transpose c cis' { \property Voice.Slur \override #'attachment = #'(stem . stem) \repeat volta 2 { \property Voice.TextScript \override #'extra-offset = #'(-8.0 . 2.5) - \m a,16-[^\p( \u c^\markup { + \m a,16[^\p( \u c^\markup { \large "Einfach (" \note #3 #0 #1 \large " = 100)" } - a c -] \m g,-[ \u c^3 -] \m b,-[ \u c^2 b c-] \m a,-[ \u c^3-]-) | + a c ] \m g,[ \u c^3 ] \m b,[ \u c^2 b c] \m a,[ \u c^3]) | \property Voice.TextScript \revert #'extra-offset - \m f,-[( \u c f c-] \m g,-[ \u c^4-] \m a,-[ \u c^2 a c8 c16-)-] | - \m c16-[( \u f c' f-] \m b,-[ \u f-] \m d-[ \u f^3 d' f^2-] \m c-[ \u f-)^4-] | - \m f,16-[( \u c16^3 f c-] \m g,-[ \u c^4-] \m a,-[ \u c^2 a c8 c16-)-] | - \m a,-[( \u c a c-] \m c-[ \u d c' d-] \m b,-[ \u d-] \m a,-[ \u d-)^3-] | - \m g,-[( \u c^2 g c-] \m b,-[ \u c b c-] \m a,-[ \u c-] \m g,-[ \u cis-)^3-] | - \m f,-[( \u d^3 f d-] \m g,-[ \u d g d-] \m g,-[ \u c-] \m a,-[ \u a-)-] | - \m g,-[( \u c g c-] \m f,-[ \u h,^2 g h,-] \m e,-[ \u c^2 g c-)-] | + \m f,[( \u c f c] \m g,[ \u c^4] \m a,[ \u c^2 a c8 c16)] | + \m c16[( \u f c' f] \m b,[ \u f] \m d[ \u f^3 d' f^2] \m c[ \u f)^4] | + \m f,16[( \u c16^3 f c] \m g,[ \u c^4] \m a,[ \u c^2 a c8 c16)] | + \m a,[( \u c a c] \m c[ \u d c' d] \m b,[ \u d] \m a,[ \u d)^3] | + \m g,[( \u c^2 g c] \m b,[ \u c b c] \m a,[ \u c] \m g,[ \u cis)^3] | + \m f,[( \u d^3 f d] \m g,[ \u d g d] \m g,[ \u c] \m a,[ \u a)] | + \m g,[( \u c g c] \m f,[ \u h,^2 g h,] \m e,[ \u c^2 g c)] | } \forcedBreak \stemUp \slurUp \tieUp b4^5( <>8~<> a g^4 | - f4^5 e8^5~e d4-)^4 | + f4^5 e8^5~e d4)^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-) | + es4^5 d8^5~d c4)^4 | + 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."-] | + 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."] | \forcedBreak - \m a,16-[^\p( \u c a c-] \m g,-[ \u c^3-] \m b,-[ \u c^2 b c-] \m a,-[ \u c-)^3 -]| - \m f,-[( \u c f c-] \m g,-[ \u c^4-] \m a,-[ \u c^2 a c8 c16-)-] | - \m c16-[( \u f c' f-] \m b,-[ \u f-] \m d-[ \u f^3 d' f^2-] \m c-[ \u f-)-]^4 | - \m f,-[( \u c^3 f c-] \m g,-[ \u c^4-] \m a,-[ \u c^2 a c8 cis16-)-] | - \m a,-[( \u d^2 a d-] \m c-[ \u d c' d-] \m b,-[ \u d-)^3] r8 | - \m c16-[( \u f c' f-] \m es-[ \u f es' f-] \m d-[ \u f-)^3-] \m f-[( \u as^2-] | - f'-[ as-)-] \m f-[( \u as f' as-)] r8^\fermata r16 e'^2( f' g' | \stemBoth \tieBoth - as' des'^1 c'8^\markup { \finger "2-3" } h~h c'16-) \clef F e,16-[(^2 f, g,] | + \m a,16[^\p( \u c a c] \m g,[ \u c^3] \m b,[ \u c^2 b c] \m a,[ \u c)^3 ]| + \m f,[( \u c f c] \m g,[ \u c^4] \m a,[ \u c^2 a c8 c16)] | + \m c16[( \u f c' f] \m b,[ \u f] \m d[ \u f^3 d' f^2] \m c[ \u f)]^4 | + \m f,[( \u c^3 f c] \m g,[ \u c^4] \m a,[ \u c^2 a c8 cis16)] | + \m a,[( \u d^2 a d] \m c[ \u d c' d] \m b,[ \u d)^3] r8 | + \m c16[( \u f c' f] \m es[ \u f es' f] \m d[ \u f)^3] \m f[( \u as^2] | + f'[ as)] \m f[( \u as f' as)] r8^\fermata r16 e'^2( f' g' | \stemBoth \tieBoth + 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 "|." @@ -93,13 +93,13 @@ rightb = \notes \transpose c cis' { \relative c { \stemDown \slurDown \repeat volta 2 { a4^1( g8^1 b4^1 a8^1 | - f8..^1 f32^1 g8^2 a4.-)^1 | + f8..^1 f32^1 g8^2 a4.)^1 | c4^1( b8 d4 c8 | - f,8.. f32^1 g8^2 a4.-) | + f,8.. f32^1 g8^2 a4.) | a4(^1 c8^1_\accent~c b^1 a^1 | - g4-) b8^1_\accent(~b a^1 g^1 | - f4-)^1 g8_\accent(~g g_. a_. | - g4 f8~f e4-) | + g4) b8^1_\accent(~b a^1 g^1 | + f4)^1 g8_\accent(~g g_. a_. | + g4 f8~f e4) | } } \u \slurUp @@ -111,35 +111,35 @@ rightb = \notes \transpose c cis' { e des b,\< des g e_3 ces_4 d_2 f^3 d cis d | \property Voice.PhrasingSlur \override #'extra-offset = #'(0 . 3) \property Voice.PhrasingSlur \override #'beautiful = #42 - g\( fes des fes b g_3 es_1-\! ges_2 a^3 ges f_1 ges_2 | - r ges_2 b des_1 ges b,_2 des ges,^1 b, \d des,^1 \stemDown \transpose c' c { b,-[_1 as,] | - g,8 b,16-[ g, e, cis,] d,-\)_4 \< f, h, d_3 f_2 r16-\! } + g\( fes des fes b g_3 es_1\! ges_2 a^3 ges f_1 ges_2 | + r ges_2 b des_1 ges b,_2 des ges,^1 b, \d des,^1 \stemDown \transpose c' c { b,[_1 as,] | + g,8 b,16[ g, e, cis,] d,\)_4 \< f, h, d_3 f_2 r16\! } \property Voice.PhrasingSlur \revert #'extra-offset \property Voice.PhrasingSlur \revert #'beautiful \translator Staff=mid \relative c { \stemDown \slurDown a4^1( g8^1 b4^1 a8^1 | - f8..^1 f32^1 g8^2 a4.-)^1 | + f8..^1 f32^1 g8^2 a4.)^1 | c4^1( b8 d4 c8 | - f,8.. f32^1 g8^2 a4.-) | - a4^1-( c8^1_\accent~[c b-)] [g16^1( b^2] | - c4-)^1 es8^1~es d^1 f^1~ | + f,8.. f32^1 g8^2 a4.) | + a4^1( c8^1_\accent~[c b)] [g16^1( b^2] | + c4)^1 es8^1~es d^1 f^1~ | \property PianoStaff.Arpeggio \override #'direction = #1 - f f8.. f32^1( as4.-)^\fermata-\arpeggio ~ | + f f8.. f32^1( as4.)^\fermata\arpeggio ~ | \property PianoStaff.Arpeggio \revert #'direction \stemUp \tieUp as r4 r8 | } s2. s - \u s4. \grace {f8(} f4-) e8 | + \u s4. \grace {f8(} 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.-\>-) ~ | - a~ a-\!^\fermata \bar "|." + f8..^1 f32^1 g8^2 a8..) \slurUp <>32( <>8 | + <>8..) <>32( <>8 <>4.\>) ~ | + a~ a\!^\fermata \bar "|." } } @@ -147,13 +147,13 @@ lefta = \notes \transpose c cis { \stemUp \slurUp \tieUp \repeat volta 2 { f4^1( e8^1 g4^1 f8^1 | - d8..^1 d32^2 e8^1 f4.-) | + d8..^1 d32^2 e8^1 f4.) | a4^1( g8 b4 a8 | - d8..^1 d32^2 e8^1 f4.-) | + d8..^1 d32^2 e8^1 f4.) | fis4^1 a8^1^\accent(~a g^1 f^1 | - e4-)^1 g8^1^\accent(~g f^1 e^1 | - d4-)^1 f8^1^\accent(~f e^. dis^1^. | - e4^1 d8^1~d c4-)^1 | + e4)^1 g8^1^\accent(~g f^1 e^1 | + d4)^1 f8^1^\accent(~f e^. dis^1^. | + e4^1 d8^1~d c4)^1 | } \d \tieBoth \slurDown < @@ -162,34 +162,34 @@ lefta = \notes \transpose c cis { 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~ | - es' des'4^1~ \stemDown des'8.-[ c'16] } + 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 | - \stemDown \tieDown des'4.-)_5~des'~ | + 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 | + \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.-) | + d8..^1 d32^2 e8^1 f4.) | a4^1( g8 b4 a8 | - d8..^1 d32^2 e8^1 f4.-) | + d8..^1 d32^2 e8^1 f4.) | fis4 a8^\accent~a g s | - a4 c'8^\accent(~c' b-) d'^\accent~ | + a4 c'8^\accent(~c' b) d'^\accent~ | 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. + 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. s2. f4^1( e8 g4 f8 | - d8..^1 d32-2 e8^1 f8..-) d32^2( e8^1 | - f8..-) d32-2( e8^1 f4.-)^1 ~ | - f~ f-\fermata | + d8..^1 d32-2 e8^1 f8..) d32^2( e8^1 | + f8..) d32-2( e8^1 f4.)^1 ~ | + f~ f\fermata | } leftb = \notes \transpose c cis { @@ -199,10 +199,10 @@ leftb = \notes \transpose c cis { d c f, c-3 e c f c f, c8 c16-3 | a16 c f, c g c-3 b c f, c a c | d c f, c-3 e c f c-2 f, c8 c16 | - fis d-2 d, d a-[ d] g, d g d f h,-3 | - e c-2 c, c g-[ c] f, c f c e a,-3 | - d a, d, a, f-[ g,-2] h,, g, e c, dis fis,-5 | - e c g,-4 c d g,-2 c,-[ g, c g,] c,8 | + fis d-2 d, d a[ d] g, d g d f h,-3 | + e c-2 c, c g[ c] f, c f c e a,-3 | + d a, d, a, f[ g,-2] h,, g, e c, dis fis,-5 | + e c g,-4 c d g,-2 c,[ g, c g,] c,8 | } s2.*9 | @@ -211,18 +211,18 @@ leftb = \notes \transpose c cis { d c c, c-3 e c f c f, c8 c16-3 | a16 c f, c g c-3 b c f, c a c | d c f, c-3 e c f c-2 f, c8 cis16 | - fis^1 d d, d a-[ d_2] g, d g d_3 b,-[_5( g_2] | - 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 ~ + fis^1 d d, d a[ d_2] g, d g d_3 b,[_5( g_2] | + 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( | - d-) e( f16_4 d_5 c4.-)_ \markup { \finger "4-3" }~ | + es as,_3 g,8 fis,~fis, g,_4\arpeggio gis,_5~ | + 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-) | + c16( h,_4 c_3 cis_1 d_2 b,_3 a,_4 as,_1 g,8 c,8) | \translator Staff = down \stemDown \tieDown f16^\pp c f, c e c-3 g c-2 f, c f c | d c f, c-3 e c f c-2 f, c-3 e c | diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly index 3eade1954f..f6c9c1ee3f 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.0" +\version "1.9.1" \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 ba65f73d80..97c4f8100a 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.0" +\version "1.9.1" \include "mozart-hrn3-defs.ly" allegro = @@ -20,58 +20,58 @@ allegro = R1*18 r2 r4^"Solo" g'4 | \mark "A" - e'4. ( c8-) f-[ (d c b-) ] - b-[( c-)] g4 r8 g-[ c e] - g2. g16-[( f e f-)] - dis4 ( e4-) r8 c8-[-. c-. c-.] - c4.( d16-[ e] f4 e-) - a,( d g, c-) + e'4. ( c8) f[ (d c b) ] + b[( c)] g4 r8 g[ c e] + g2. g16[( f e f)] + dis4 ( e4) r8 c8[-. c-. c-.] + c4.( d16[ e] f4 e) + a,( d g, c) d-. d-. \grace e16( d8.[) c16 d8. e16] c4 r r2 R1*3 - c,2 ~ c8-[ e g c] - c-[ b ] b4 r2 - c,8-[ ( e-) g c] e-[( g-) e c] - c-[( b-)] b4 r2 - c4.( g8 e'4. c8-) - g'-[( d-) ] d4 r4 d - d8-[ ( c-)] c4.( d16-[ e] d8-[ c-)] - c8-[(-\trill b-)] b4 r2 | - d2( ~ d8-[ e16 d] c8-[ b-)] | - b-[( a-)] a4 r8 a-[ a a] - a4( cis e g-) + c,2 ~ c8[ e g c] + c[ b ] b4 r2 + c,8[ ( e) g c] e[( g) e c] + c[( b)] b4 r2 + c4.( g8 e'4. c8) + g'[( d) ] d4 r4 d + d8[ ( c)] c4.( d16[ e] d8[ c)] + c8[(\trill b)] b4 r2 | + d2( ~ d8[ e16 d] c8[ b)] | + b[( a)] a4 r8 a[ a a] + a4( cis e g) \grace { \longgrace g16( \endlonggrace } - fis8[)( e16 d-)] d4-. r2 | + fis8[)( e16 d)] d4-. r2 | \mark "B" R1*3 - r2 r4 d8-[-(_\markup { \italic \bold "con espressione" } b-) ] - a-[( g-) d'( b-)] a-[( g-) e'( c-) ] - b8-[( a-)] a4 r4 a8-[ a] - a-[( \< b c cis-\!-\> ] d4 c-\!-) - ais8-[( b-)] r8 \cresc b b-[( c-)] r c - cis-[ ( d-)] r4 r2 - \endcresc g,1-\f ~ g2 ~ g8-[ a16 b] c-[( d-) e c] + r2 r4 d8[(_\markup { \italic \bold "con espressione" } b) ] + a[( g) d'( b)] a[( g) e'( c) ] + b8[( a)] a4 r4 a8[ a] + a[( \< b c cis\!\> ] d4 c\!) + ais8[( b)] r8 \cresc b b[( c)] r c + cis[ ( d)] r4 r2 + \endcresc g,1\f ~ g2 ~ g8[ a16 b] c[( d) e c] %% 64 f4-. d-. b-. g-. R1 - c,2-\p e4 g c \cresc e g4. e8 | - \endcresc d4.-\f e16-[ fis] g-[ ( fis-) e d] c-[( b-) a g] + 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{ g16[ a] } } > \mark "C" - g4-) r r2 + g4) r r2 R1*15 \mark "D" - bes2-\mf d4 f - g,2~ g8-[ g' es c]| - bes4( a4.-) c8-[( d es-)] - cis4( d-) r8 bes-[ (c d-)] - es2 ( d4-) r - es2 ( d4-) r - c8-[( g' es c-)] bes4( c-) - c4.( cis8 d4-) r + bes2\mf d4 f + g,2~ g8[ g' es c]| + bes4( a4.) c8[( d es)] + cis4( d) r8 bes[ (c d)] + es2 ( d4) r + es2 ( d4) r + c8[( g' es c)] bes4( c) + c4.( cis8 d4) r R1*2 es1~es1| e! @@ -80,80 +80,80 @@ allegro = c, e' e, - c'2 b8-[( a gis a-)] - gis8-[ e gis b ] e4 r | - r8 e,-[ a c] dis4 r - r8 e,-[ a c] dis4 r - r8 e,-[ g b] e4 r - r8 fis,-[ b dis] fis4 r - r8 gis,-[ b d] f4 r - r8 g,-[ b d_\ritenuto ] f4 r + c'2 b8[( a gis a)] + gis8[ e gis b ] e4 r | + r8 e,[ a c] dis4 r + r8 e,[ a c] dis4 r + r8 e,[ g b] e4 r + r8 fis,[ b dis] fis4 r + r8 gis,[ b d] f4 r + r8 g,[ b d_\ritenuto ] f4 r \mark "E" R1*8 - r2 r8 g,-[ g g] - e'4.( c8-) f-[( d c b-)] - b-[( c-)] g4 r8 g-[ c e] | - g2. g16-[( f e f-)] - dis4( e-) r8 c-[-. c-. c-.] - c4.( d16-[ e] f4 e-) - a, ( d g, c-) + r2 r8 g,[ g g] + e'4.( c8) f[( d c b)] + b[( c)] g4 r8 g[ c e] | + g2. g16[( f e f)] + dis4( e) r8 c[-. c-. c-.] + c4.( d16[ e] f4 e) + a, ( d g, c) d d \grace { e8( } d8.[) c16 d8. e16] c4 r r2 \mark "F" R1*3 - c,2~ c8-[ e g c] - c8-[( b-)] b4 r2 - 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 | + c,2~ c8[ e g c] + c8[( b)] b4 r2 + 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 | R1*3 - r2 r4 g'8-[( e-)] + r2 r4 g'8[( e)] \mark "G" - d-[( c-) g'( e-)] d-[( c-) a'( f-)] - e-[( d-)] d4 r d8-[ d] - d4(~ d16-[ e d e-)] g8-[( f-) e d] | + d[( c) g'( e)] d[( c) a'( f)] + e[( d)] d4 r d8[ d] + d4(~ d16[ e d e)] g8[( f) e d] | c4 r r2 R1 c1 ~ c | - c8-[-. c-.] r c-. cis-[( d-)] r\cresc d-. | - dis-[( e-)] r e-. e-[( f-)] r f-. | - g4-.-\f\endcresc e-. c-. bes-. | - g-.-\ff e-. c-. r | - a'2 ~ a8-[_""_\markup { \bold \italic "sempre " \dynamic "f" } b16 c] d-[( e d e-)] + c8[-. c-.] r c-. cis[( d)] r\cresc d-. | + dis[( e)] r e-. e[( f)] r f-. | + g4-.\f\endcresc e-. c-. bes-. | + g-.\ff e-. c-. r | + a'2 ~ a8[_""_\markup { \bold \italic "sempre " \dynamic "f" } b16 c] d[( e d e)] - f4. ( d8-) f8-[ ( d-) f d] - c-[ (e] g2-) \grace { \longgrace f16( \endlonggrace } e8[)( d16 c-)] + f4. ( d8) f8[ ( d) f d] + c[ (e] g2) \grace { \longgrace f16( \endlonggrace } e8[)( d16 c)] - < d1-\trill ( - { s2 \grace { c16-[ d] } } > + < d1\trill ( + { s2 \grace { c16[ d] } } > - c4-) r r2 + c4) r r2 R1 | \mark "H" - \times 2/3 { c8-[ b a ] } \times 2/3 { g-[ a b] } - \times 2/3 { c-[ d e] } \times 2/3 { f-[ e d] } | - \times 2/3 { c-[ b a ] } \times 2/3 { g-[ a b] } - \times 2/3 { c-[ d e] } \times 2/3 { f-[ e d] }| - c4 \times 2/3 { r8 g'-[( e-)]} c4 \times 2/3 { r8 e-[ ( c-)]} | - 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]| + \times 2/3 { c8[ b a ] } \times 2/3 { g[ a b] } + \times 2/3 { c[ d e] } \times 2/3 { f[ e d] } | + \times 2/3 { c[ b a ] } \times 2/3 { g[ a b] } + \times 2/3 { c[ d e] } \times 2/3 { f[ e d] }| + c4 \times 2/3 { r8 g'[( e)]} c4 \times 2/3 { r8 e[ ( c)]} | + 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] } } > - c4-) r r2 + < d1(\trill + { s2 \grace { c16[ d] } } > + c4) r r2 R1*3 - c4.^\fermata_"Cadenza ad lib." ( d8-) d4.-\trill^\fermata ( c16-[ d-)] + c4.^\fermata_"Cadenza ad lib." ( d8) d4.\trill^\fermata ( c16[ d)] c4 r r2 R1*8 - r4 c8.-[^"tutti"-\f c16] c4 c - c c,8.-[ c16] c4 c| + r4 c8.[^"tutti"\f c16] c4 c + c c,8.[ c16] c4 c| c2 r2 \bar "|." } diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly index a807df5889..e69eccc852 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.0" +\version "1.9.1" 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 9e20822969..25707e423b 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.0" +\version "1.9.1" \include "mozart-hrn3-defs.ly" romanze = \notes \relative c' { @@ -9,77 +9,77 @@ romanze = \notes \relative c' { \property Score.skipBars = ##t c'4.( _\markup { \dynamic "p" \italic { "" con molto espressione } } - f8-) a,4 a - bes8-[( c d bes] g4-) r8 g - a r bes r c r d-[( bes-)] - a2( g8[-) a( bes b-)] - c4. ( f8-) a,4 a | + f8) a,4 a + bes8[( c d bes] g4) r8 g + a r bes r c r d[( bes)] + a2( g8[) a( bes b)] + c4. ( f8) a,4 a | % 6 - bes8-[ (c d bes-)] g4 r8 c, - c8-[( e g bes-)] a-[( c f d-)] + bes8[ (c d bes)] g4 r8 c, + c8[( e g bes)] a[( c f d)] c r e r f r r4 \mark "A" R1*8 - g4.-\mf f8 e-[ d c bes] + g4.\mf f8 e[ d c bes] % 18 - bes-[( a d c-)] c4 r + bes[( a d c)] c4 r R1*2 - g'4. f8 e-[ d c bes] - bes-[ (a d c-)] c4 r + g'4. f8 e[ d c bes] + bes[ (a d c)] c4 r R1 % 25 - c16-[ ( d c d-)] e-[ ( f e f-)] g-[( e-) c-. c-.] f-[( d-) b-. b-.] - c16-[-\p ( d c d-)] e-[ ( f e f-)] g-[( e-) c-. c-.] f-[( d-) b-. b-.] - c8-[ \< c, c c] c-[ c c c-\!-] + c16[ ( d c d)] e[ ( f e f)] g[( e) c-. c-.] f[( d) b-. b-.] + c16[\p ( d c d)] e[ ( f e f)] g[( e) c-. c-.] f[( d) b-. b-.] + c8[ \< c, c c] c[ c c c\!] \mark "B" - c1-\f + c1\f R1*9 - f'4.(-\p d8-) b4 r8 g - g'4.( e8-) c4 r8 cis | + f'4.(\p d8) b4 r8 g + g'4.( e8) c4 r8 cis | % 39 - d4(~ d16-[ e d e-)] f8-[ ( d-) f( d-)] - c2( b4-) r + d4(~ d16[ e d e)] f8[ ( d) f( d)] + c2( b4) r R1*4 - e4. ( g8-) c,4 ( cis-) - d8-[( e f d-)] b4 r8 g - c-[ ( e-) g g] g-[( f e d-)] + e4. ( g8) c,4 ( cis) + d8[( e f d)] b4 r8 g + c[ ( e) g g] g[( f e d)] c4( \grace { \longgrace e16 \endlonggrace } - d8.-[ c16-) \< ] c8-[ c-.( c-. c-)-.-]-\! + d8.[ c16) \< ] c8[ c-.( c-. c)-.]\! \mark "C" %% this is a trick to get the sfp-s to align. \property Voice.Hairpin \override #'transparent = ##t des1\sfp \> - g,1\sfp-\! \> - c\sfp -\! \> - c,\sfp-\! + g,1\sfp\! \> + c\sfp \! \> + c,\sfp\! \property Voice.Hairpin \revert #'transparent R1*3 - r8 c-[-\p c c] c2~ - c8-[ c' c c] c2~ - c8-[ \< e( g f] e-[ d-\!-\> c bes] + r8 c[\p c c] c2~ + c8[ c' c c] c2~ + c8[ \< e( g f] e[ d\!\> c bes] \mark "D" - a4-\!-) r r2 + a4\!) r r2 R1*3 - c4.-\p ( f8-) a,4 a | - bes8-[ (c d bes-)] g4 r8 c, - c8-[( e g bes-)] a-[( c f d-)] + c4.\p ( f8) a,4 a | + bes8[ (c d bes)] g4 r8 c, + c8[( e g bes)] a[( c f d)] c r e r f4 r4 R1*3 r2 r4 r8 c,8 - c8-[( e g bes-)] a-[( c f d-)] + c8[( e g bes)] a[( c f d)] c r e r f4 r4 g,1 c,2 c4. c8 - c8-[( e g bes-)] a-[( c f d-)] + c8[( e g bes)] a[( c f d)] c r e r f4 r4 % -. ? R1 c8-. r e-. r f4 r4 % Finish with F if played separately - c8-.( r c,-. r c4-) r4| + c8-.( r c,-. r c4) r4| \bar "|." } diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly index 8f8b69f2c5..3cf551c173 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly @@ -1,25 +1,25 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % \include "mozart-hrn3-defs.ly" rondotheme = \notes \relative c' { - c'8-[ c c] c-[ c c] - c4( cis8 d-) r g, - d'8-[ d d] d-[ d d] - d4( dis8 e-) r c | - c-[( d-) e] f-[ g a] - g-[ ( e-) c] c4 d8 - e4( d8-) e4( f8-) - e4.( d8-) r r | + c'8[ c c] c[ c c] + c4( cis8 d) r g, + d'8[ d d] d[ d d] + d4( dis8 e) r c | + c[( d) e] f[ g a] + g[ ( e) c] c4 d8 + e4( d8) e4( f8) + e4.( d8) r r | } lipbreaker = \notes \relative c' { - r8 g'-[-. g-.] c-[( e-) g,-.] - c-[( e-) g,-.] c-[( e-) g,-.] - c-[ c, c] c-[ c c] - c-[ c c] c-[ c c] + r8 g'[-. g-.] c[( e) g,-.] + c[( e) g,-.] c[( e) g,-.] + c[ c, c] c[ c c] + c[ c c] c[ c c] } rightsixteenth = { \property Voice.stemLeftBeamCount = 1 @@ -35,58 +35,58 @@ rondo = \notes \relative c' \time 6/8 \key c \major - g'8-\p | + g'8\p | \rondotheme R2.*13 | - r8 r^\fermata d d-[ e f] - g-[ ( e-) c-.] d-[( e-) d-.] - c4 c8 d-[ e f] - g-[( e-) c-.] d-[( e-) d-.] + r8 r^\fermata d d[ e f] + g[ ( e) c-.] d[( e) d-.] + c4 c8 d[ e f] + g[( e) c-.] d[( e) d-.] c4 r8 r4 r8 | R2.*7 \mark "A" - c4.-\p \grace { e16( } d8-[-) c d] + c4.\p \grace { e16( } d8[) c d] c4 r8 r4 r8 - e4. \grace g16( f8-[-) e f] + e4. \grace g16( f8[) e f] e4 r8 r4 r8 g4. e4 c8 g2.~ - g8-[ a b] c-[ d e ] - e4.( d8-) r r + g8[ a b] c[ d e ] + e4.( d8) r r R2.*4 e2.~ | - e8-[ d c] c-[ b a] + e8[ d c] c[ b a] d2.~ - d8-[ c b] b-[ a g] - g'4( e8-) b4( cis8-) + d8[ c b] b[ a g] + g'4( e8) b4( cis8) \mark "B" d4 r8 r4 r8 R2.*3 | - r8 d-[-. d-.] d-[( g-) d-.] - d-[( g-) d-.] d-[ d d] - d-[( g-)] r r4 r8 + r8 d[-. d-.] d[( g) d-.] + d[( g) d-.] d[ d d] + d[( g)] r r4 r8 R2.*1 \lipbreaker - c4 r8 c'-[ d e] - d4( g8-) c,-[ d e] + c4 r8 c'[ d e] + d4( g8) c,[ d e] d4 r8 r4 r8 R2. | - r4 r8 c-[-. d-. e-.] - d4( g8-) c,-[ d e] - d-[( g-) fis] e-[ d c] - b-[ ( e-) d] c-[ b a] + r4 r8 c[-. d-. e-.] + d4( g8) c,[ d e] + d[( g) fis] e[ d c] + b[ ( e) d] c[ b a] \mark "C" g4 r8 r4 r8 R2. | % - r8 g-[-\f g] g-[( b-) b-.] - b-[( d-) d-.] d-[( g-) g-.] + r8 g[\f g] g[( b) b-.] + b[( d) d-.] d[( g) g-.] g2.~ - g8-[ \> a g] f-[ e d] + g8[ \> a g] f[ e d] < \rondotheme - { s8-\!-\p } > + { s8\!\p } > R2.*12 r4 r8 r4 c8 @@ -98,83 +98,83 @@ rondo = \notes \relative c' R2.*3 r4 r8 r4 c8 a4. c - f ~ f8.-[ \rightsixteenth e16( \bothsixteenth d c-)] + f ~ f8.[ \rightsixteenth e16( \bothsixteenth d c)] bes4 g8 e4 g8 c,4. ~ c8 r r R2.*3| r4 r8 r4 c'8 - b4( c8-) b4( c8-) + b4( c8) b4( c8) bes4. ~ bes4 g8 - a4 ( c8-) f4 ( b,8-) - d4. ( c8-) r r + a4 ( c8) f4 ( b,8) + d4. ( c8) r r R2.*3| r4 r8 r4 c8 - b4( c8-) b4( c8-) + b4( c8) b4( c8) bes4. ~ bes4 g8 - a4 c8 f-[ ( d-) b!] - d4. ( c8-) r r + a4 c8 f[ ( d) b!] + d4. ( c8) r r \mark "E" R2.*9 | \lipbreaker - c8-[ c' c] c4.~ - c8-[ c d] e-[ e fis] + c8[ c' c] c4.~ + c8[ c d] e[ e fis] g4 r8 r4 r8 R2. - r8 g,-[ g] g-[ g g] | - es'4. ~ es8-[ d c] + r8 g,[ g] g[ g g] | + es'4. ~ es8[ d c] b4 r8 r4 r8 R2. | - r8 g-[ g] g-[ g g] - es'4. ~ es8-[ d c] + r8 g[ g] g[ g g] + es'4. ~ es8[ d c] \cresc b4. c4. d4. e4. \mark "F" \endcresc - f2.-\f ~ | + f2.\f ~ | f4 r8 r4 r8 - r8 g,-[\> g] g-[ g g] + r8 g,[\> g] g[ g g] % Edition breitkopf says a-flat (silly!) - fis-[ g gis] - a-[ bes b-]-\! + fis[ g gis] + a[ bes b]\! %% EB does the slur in the Rondo differently from the 1st adn 2nd time. %% why. Should check with MS. < \rondotheme - { s8-\p } > + { s8\p } > R2.*7 \mark "G" R2.*4 - c,4.-\mf c4 c8 + c,4.\mf c4 c8 c4. e4 c8 g'4. g4 g8 g4. g,4 g8 c4 r8 r4 r8 r4 r8 r4 g'8 - c-[ ( e-) g,-.] c-[ ( e-) g,-.] - c-[ ( e-) g,-.] c-[ ( e-) g,-.] + c[ ( e) g,-.] c[ ( e) g,-.] + c[ ( e) g,-.] c[ ( e) g,-.] \mark "H" \cresc g'2. bes,2. - a4. b16-[ c d e f g] + a4. b16[ c d e f g] a4. f4 d8 - [\endcresc c8-\f g' e] c-[ g e] - c-[ e' c] g-[ e c] - g4 r8 g''8-[ e c] + [\endcresc c8\f g' e] c[ g e] + c[ e' c] g[ e c] + g4 r8 g''8[ e c] - < d2.(-\trill - { s2 \grace { c16-[ d] } } > + < d2.(\trill + { s2 \grace { c16[ d] } } > - c4-) r8 r4 r8 + c4) r8 r4 r8 R2.*5 - r8 r8^\fermata d8-\p d-[ e f] - g-[ ( e-) c] d-[( e-) d] - \cresc c-[ c c] d-[ e f] - g-[( e-) c] d-[( e-) d] - \endcresc c4-\f r8 r4 r8 + r8 r8^\fermata d8\p d[ e f] + g[ ( e) c] d[( e) d] + \cresc c[ c c] d[ e f] + g[( e) c] d[( e) d] + \endcresc c4\f r8 r4 r8 R2.*5 - c8-[-\f c, c] c-[ c c] + c8[\f c, c] c[ c c] c4 r8 c4 r8 %This is technically incorrect, since we started with an 8th diff --git a/input/no-notation/bar-check.ly b/input/no-notation/bar-check.ly index a570d39117..368ec9b3be 100644 --- a/input/no-notation/bar-check.ly +++ b/input/no-notation/bar-check.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { diff --git a/input/no-notation/beam-warn.ly b/input/no-notation/beam-warn.ly index fd11b9e9d8..2def790b58 100644 --- a/input/no-notation/beam-warn.ly +++ b/input/no-notation/beam-warn.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { diff --git a/input/no-notation/denneboom.ly b/input/no-notation/denneboom.ly index 812d9e8c77..f2b75faac9 100644 --- a/input/no-notation/denneboom.ly +++ b/input/no-notation/denneboom.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header{ filename = "denneboom.ly" enteredby = "jcn" diff --git a/input/no-notation/die-staff.ly b/input/no-notation/die-staff.ly index af56a53f21..c3327ba8b0 100644 --- a/input/no-notation/die-staff.ly +++ b/input/no-notation/die-staff.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "a staff should really die, if no one's referencing it." diff --git a/input/no-notation/midi-grace.ly b/input/no-notation/midi-grace.ly index 0ab922f0ff..1e287f65d8 100644 --- a/input/no-notation/midi-grace.ly +++ b/input/no-notation/midi-grace.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc = "Tests MIDI output with grace notes. " } \score { diff --git a/input/no-notation/midi-transposing.ly b/input/no-notation/midi-transposing.ly index eb70bf1104..d9a0732c50 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.0" +\version "1.9.1" \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 46b5140331..2292bca68e 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.0" +\version "1.9.1" \header { texidoc = " diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly index 890c8e1709..0c271ddff1 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.0" +\version "1.9.1" \header { texidoc = "@cindex Midi Volume Equaliser The full orchestra plays a notes, where groups stop one after @@ -26,7 +26,7 @@ flauti = \notes \relative c' { \property Staff.instrument = #"2 Flauti" \property Staff.instr = #"Fl." - c1-\f R1*10 + c1\f R1*10 } oboi = \notes \relative c' { @@ -34,7 +34,7 @@ oboi = \notes \relative c' { \property Staff.instrument = #"2 Oboi" \property Staff.instr = #"Ob." - R1*1 c1-\f R1*9 + R1*1 c1\f R1*9 } clarinetti = \notes \relative c' { @@ -42,7 +42,7 @@ clarinetti = \notes \relative c' { \property Staff.instrument = #"Clarinetti" \property Staff.instr = #"Cl" - R1*2 c1-\f R1*8 + R1*2 c1\f R1*8 } fagotti = \notes \relative c' { @@ -51,7 +51,7 @@ fagotti = \notes \relative c' { \property Staff.instr = #"Fg." \clef bass - R1*3 c1-\f R1*7 + R1*3 c1\f R1*7 } corni = \notes \relative c' { @@ -59,7 +59,7 @@ corni = \notes \relative c' { \property Staff.instrument = #"Corni" \property Staff.instr = #"Cor" - R1*4 c1-\f R1*6 + R1*4 c1\f R1*6 } trombe = \notes \relative c' { @@ -68,7 +68,7 @@ trombe = \notes \relative c' { \property Staff.instr = #"Tp." \clef bass - R1*5 c1-\f R1*5 + R1*5 c1\f R1*5 } timpani = \notes \relative c' { @@ -76,7 +76,7 @@ timpani = \notes \relative c' { \property Staff.instrument = #"Timpani" \property Staff.instr = #"Timp." - R1*6 c1-\f R1*4 + R1*6 c1\f R1*4 } violinoI = \notes \relative c' { @@ -84,7 +84,7 @@ violinoI = \notes \relative c' { \property Staff.instrument = #"Violino I " \property Staff.instr = #"Vl. I " - R1*7 c1-\f R1*3 + R1*7 c1\f R1*3 } violinoII = \notes \relative c' { @@ -92,7 +92,7 @@ violinoII = \notes \relative c' { \property Staff.instrument = #"Violino II " \property Staff.instr = #"Vl. II " - R1*8 c1-\f R1*2 + R1*8 c1\f R1*2 } viola = \notes \relative c' { @@ -101,7 +101,7 @@ viola = \notes \relative c' { \property Staff.instr = #"Vla." \clef alto - R1*9 c1-\f R1*1 + R1*9 c1\f R1*1 } violoncello = \notes \relative c' { @@ -111,7 +111,7 @@ violoncello = \notes \relative c' { \property Staff.instr = #"Vc." \clef bass - R1*10 c1-\f + R1*10 c1\f } diff --git a/input/no-notation/parse.ly b/input/no-notation/parse.ly index 16b3b47707..fb2ab070e9 100644 --- a/input/no-notation/parse.ly +++ b/input/no-notation/parse.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % Test parser error diff --git a/input/no-notation/parse2.ly b/input/no-notation/parse2.ly index 3962917b5a..d1156d561b 100644 --- a/input/no-notation/parse2.ly +++ b/input/no-notation/parse2.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % Test parser error diff --git a/input/no-notation/parse3.ly b/input/no-notation/parse3.ly index 81212889c8..a133a2d4b2 100644 --- a/input/no-notation/parse3.ly +++ b/input/no-notation/parse3.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % Test parser error diff --git a/input/no-notation/parse4.ly b/input/no-notation/parse4.ly index 8196471772..a20fe9bc16 100644 --- a/input/no-notation/parse4.ly +++ b/input/no-notation/parse4.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % Test parser error diff --git a/input/no-notation/parse5.ly b/input/no-notation/parse5.ly index 476f0b7a3b..28b5be6d48 100644 --- a/input/no-notation/parse5.ly +++ b/input/no-notation/parse5.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" %If you specify two different key sigs at one point, a %warning is printed. diff --git a/input/no-notation/pc-direction.ly b/input/no-notation/pc-direction.ly index aa28210379..471cdaf19a 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.0" +\version "1.9.1" % move to regtest once it works? diff --git a/input/no-notation/textcresc.ly b/input/no-notation/textcresc.ly index ad3f00c1b5..13066d9777 100644 --- a/input/no-notation/textcresc.ly +++ b/input/no-notation/textcresc.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header{ texidoc="crashes lily" } diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly index 576a73b79a..b28f154d92 100644 --- a/input/puer-fragment.ly +++ b/input/puer-fragment.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { title = "Puer natus est nobis (excerptum)" subtitle = "Antiphona ad introitum VII" @@ -28,59 +28,59 @@ cantus = \notes { \[ g4 ( %%% Pu- \pes - d'-) + d') \] d' %%% er \[ d' ( %%% na- \pes e' \flexa - d'-) + d') \] c' %%% tus \[ c' ( %%% est c' - c'-) + c') \] \[ d' ( %%% no- \flexa c' e' \flexa - d'-) + d') \] d' %%% bis, \divisioMaior \[ g ( %%% et \pes \deminutum - d'-) + d') \] \[ d' ( %%% fi- \pes e' \flexa - d'-) + d') \] \[ c' ( %%% li- \flexa - b-) + b) \] a %%% us \[ c' ( %%% da- c' \pes - d'-) + d') \] c' %%% tus- c' %%% est \[ c' ( %%% no- \pes d' \flexa c' - c'-) + c') \] \[ g ( %%% bis: \pes a \flexa - g-) + g) \] \divisioMaxima } diff --git a/input/regression/+.ly b/input/regression/+.ly index 4683d8896a..96ea39f645 100644 --- a/input/regression/+.ly +++ b/input/regression/+.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" %% +.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 8a9fbb597a..ff1e65ccf5 100644 --- a/input/regression/accidental-cautionary.ly +++ b/input/regression/accidental-cautionary.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Cautionary accidentals are indicated using either diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly index 58ce1165b8..99c3131833 100644 --- a/input/regression/accidental-double.ly +++ b/input/regression/accidental-double.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "If two forced accidentals happen at the same time, only one sharp sign is printed." diff --git a/input/regression/accidental-ledger.ly b/input/regression/accidental-ledger.ly index f99223a091..3c4275b362 100644 --- a/input/regression/accidental-ledger.ly +++ b/input/regression/accidental-ledger.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \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 b724caae69..b07157a38a 100644 --- a/input/regression/accidental-octave.ly +++ b/input/regression/accidental-octave.ly @@ -1,5 +1,5 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc=" diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly index ea075e47cb..f7a45c064c 100644 --- a/input/regression/accidental-placement.ly +++ b/input/regression/accidental-placement.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly index 8e30e38b29..4391992306 100644 --- a/input/regression/accidental-single-double.ly +++ b/input/regression/accidental-single-double.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" A sharp sign after a double sharp sign, as well as a flat sign diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly index 7a6b6f9a2c..53f95b3068 100644 --- a/input/regression/accidental-unbroken-tie-spacing.ly +++ b/input/regression/accidental-unbroken-tie-spacing.ly @@ -4,7 +4,7 @@ texidoc = "Tied accidentaled notes (which cause reminder accidentals) don't wrea the spacing when unbroken." } -\version "1.9.0" +\version "1.9.1" \include "deutsch.ly" rechts = \notes \relative c' { diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly index 5b4d2e7e30..bd02782d23 100644 --- a/input/regression/accidental-voice.ly +++ b/input/regression/accidental-voice.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly index 9a6f06b576..0fed2637ba 100644 --- a/input/regression/accidental.ly +++ b/input/regression/accidental.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/accidentals.ly b/input/regression/accidentals.ly index 4b620313fb..6d36c28f4a 100644 --- a/input/regression/accidentals.ly +++ b/input/regression/accidentals.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/allfontstyle.ly b/input/regression/allfontstyle.ly index be3639f986..9ac37d04ca 100644 --- a/input/regression/allfontstyle.ly +++ b/input/regression/allfontstyle.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" @@ -15,7 +15,7 @@ Different text styles are used for various purposes. { \property Voice.TextScript \set #'font-style = #'italic d-4_"cantabile" } { e } } \grace { c16 } \property Voice.TextScript \set #'font-style = #'large - f4-\ff^""^"Largo" \mark "B" g + f4\ff^""^"Largo" \mark "B" g } \paper { raggedright = ##t % \translator {\BarNumberingStaffContext} } diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly index ec79d0d445..d136f82ff8 100644 --- a/input/regression/ambitus.ly +++ b/input/regression/ambitus.ly @@ -52,7 +52,7 @@ paper block: %} -\version "1.9.0" +\version "1.9.1" upper = \notes \relative c { \clef "treble" diff --git a/input/regression/apply-context.ly b/input/regression/apply-context.ly index db059b66c1..9e6320ef62 100644 --- a/input/regression/apply-context.ly +++ b/input/regression/apply-context.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly index b180e90691..4077e2519c 100644 --- a/input/regression/apply-output.ly +++ b/input/regression/apply-output.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "The @code{\applyoutput} expression is the most flexible way to @@ -20,16 +20,16 @@ position. (if (and (memq 'note-head-interface ifs) (memq sp '(-2 -3 -5))) (begin - (ly:set-grob-property! gr 'molecule-callback brew-new-markup-molecule) + (ly:set-grob-property! gr 'molecule-callback brew-new@\markup-molecule) (ly:set-grob-property! gr 'font-family 'roman) (ly:set-grob-property! gr 'text - (make-raise-markup -0.5 + (make-raise@\markup -0.5 (case sp - ((-5) (make-simple-markup "m")) - ((-3) (make-simple-markup "c ")) - ((-2) (make-smaller-markup (make-bold-markup "2"))) - (else (make-simple-markup "bla")) + ((-5) (make-simple@\markup "m")) + ((-3) (make-simple@\markup "c ")) + ((-2) (make-smaller@\markup (make-bold@\markup "2"))) + (else (make-simple@\markup "bla")) )))) ))) diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly index c9ec7cd175..99d8f10815 100644 --- a/input/regression/arpeggio-collision.ly +++ b/input/regression/arpeggio-collision.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Arpeggio stays clear of accidentals and flipped note heads. @@ -10,34 +10,34 @@ hairyChord = \context Staff \notes\relative c' < \context Voice=one { \property Voice.Stem \override #'direction = #1 \property Voice.NoteColumn \override #'horizontal-shift = #0 - e4-\arpeggio + e4\arpeggio } \context Voice=two { \property Voice.Stem \override #'direction = #1 \property Voice.NoteColumn \override #'horizontal-shift = #1 - cis-\arpeggio + cis\arpeggio } \context Voice=three { \property Voice.Stem \override #'direction = #1 \property Voice.NoteColumn \override #'horizontal-shift = #2 - ais-\arpeggio + ais\arpeggio } \context Voice=four { \property Voice.Stem \override #'direction = #-1 \property Voice.NoteColumn \override #'horizontal-shift = #-1 - fis-\arpeggio + 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 d1667106e1..303c8dd9a9 100644 --- a/input/regression/arpeggio.ly +++ b/input/regression/arpeggio.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" Arpeggios are supported, both cross-staff and broken single staff. @@ -11,19 +11,19 @@ Arpeggios are supported, both cross-staff and broken single staff. \score{ \context PianoStaff < \context Staff=one \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 } \context Staff=two \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 de240c2e8a..e864261f78 100644 --- a/input/regression/auto-beam-bar.ly +++ b/input/regression/auto-beam-bar.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly index aca6402a64..d2ecfcb2eb 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.0" +\version "1.9.1" \score{ \notes\relative c''{ diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly index bf57e4075b..9656496596 100644 --- a/input/regression/auto-beam-tuplets.ly +++ b/input/regression/auto-beam-tuplets.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Tuplet-spanner should not put (visible) brackets on @@ -10,7 +10,7 @@ beams even if they're auto generated." \property Voice.tupletSpannerDuration = #(ly:make-moment 1 4) \property Voice.TupletBracket \override #'bracket-visibility = #'if-no-beam \times 2/3 { - f8-[ f f ] f8-[ f f ] f f f f f f + f8[ f f ] f8[ f f ] f f f f f f } } \paper { raggedright= ##t } diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly index 12bb215133..8848aadda3 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.0" +\version "1.9.1" diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly index d0fb375e4a..5585613c21 100644 --- a/input/regression/auto-change.ly +++ b/input/regression/auto-change.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly index 634331192a..4ea24600ed 100644 --- a/input/regression/bar-number.ly +++ b/input/regression/bar-number.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly index b4a4e76780..5270fa9833 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.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly index 0e20972396..d8211f9739 100644 --- a/input/regression/beam-auto-knee.ly +++ b/input/regression/beam-auto-knee.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 @@ -9,8 +9,8 @@ threshold. \score { \context Staff \notes\relative c''{ - c'8-[ c,,] c8-[ e'] - c,16-[ e g c e g c c,,] + c'8[ c,,] c8[ e'] + c,16[ e g c e g c c,,] } \paper{ linewidth = 40*\staffspace diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly index 9b8650c30c..f66a5c34a7 100644 --- a/input/regression/beam-break.ly +++ b/input/regression/beam-break.ly @@ -4,9 +4,9 @@ " } -\version "1.9.0" +\version "1.9.1" \paper { raggedright= ##t } \score { \notes \relative c'' { \property Score.forbidBeamBreak = ##f - c2. c8-[ c8 \break c8 c8-] } } + c2. c8[ c8 \break c8 c8] } } diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly index 3d595f87f8..2221ca2b07 100644 --- a/input/regression/beam-center-slope.ly +++ b/input/regression/beam-center-slope.ly @@ -1,6 +1,6 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="Simple beams on middle staffline are allowed to be @@ -12,28 +12,28 @@ \score{ \notes\relative c'{ %%\property Staff.Stem \set #'beamed-lengths = #'(3.50) - %% c8-[ d] - %% d-[ c] + %% c8[ d] + %% d[ c] %% r2 %% \property Staff.Stem \set #'beamed-lengths = #'(3.26) - a8-[^"small slope" b] - b-[ a] + a8[^"small slope" b] + b[ a] - c''-[ b] - b-[ c] + c''[ b] + b[ c] - c,,-[ d] - d-[ c] + c,,[ d] + d[ c] - a''-[ g] - g-[ a] + a''[ g] + g[ a] - c,,-[^"bigger slope" e] - e-[ c] + c,,[^"bigger slope" e] + e[ c] - a''-[ f] - f-[ a] + a''[ f] + f[ a] } \paper{ linewidth = 0.0 diff --git a/input/regression/beam-chord.ly b/input/regression/beam-chord.ly index 8ba4788eb5..3846a9dd55 100644 --- a/input/regression/beam-chord.ly +++ b/input/regression/beam-chord.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \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 5b1ef400a1..46be76e827 100644 --- a/input/regression/beam-concave.ly +++ b/input/regression/beam-concave.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc = "Concave beams should be horizontal. Informally spoken, @@ -47,27 +47,27 @@ beams this way." %% sloped %% concaveness: 0.00 \stemUp - d,16-[ a' b cis] + d,16[ a' b cis] %% Sarabande: m25 %% horizontal %% concaveness:a: 0.12 - a'16-[^"horiz." b c b] + a'16[^"horiz." b c b] % Hmm. Concaveness of both: 1.75 % %% SCS-VI Prelude, m81 % %% slope = 0.0 % \stemBoth % \key d\major -% e,8-[ cis a'] +% e,8[ cis a'] % %% SCS-VI Prelude, m82 % %% slope = 0.1ss (possibly b.o. context?) -% g,-[ e' cis] +% g,[ e' cis] %%% Han-Wen: this should be concave - a,16-[^"horiz." a' a a] + a,16[^"horiz." a' a a] \clef treble diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly index 34ed9b7202..2c17f6e818 100644 --- a/input/regression/beam-cross-staff-auto-knee.ly +++ b/input/regression/beam-cross-staff-auto-knee.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly index 3343b59903..fbc9747511 100644 --- a/input/regression/beam-cross-staff-slope.ly +++ b/input/regression/beam-cross-staff-slope.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Cross staff (kneed) beams don't cause extreme slopes." } @@ -10,10 +10,10 @@ \relative c'' < { \stemDown - f16( \> d b-\! \translator Staff = down \stemUp - \clef treble g ~ << g e>>8-) + f16( \> d b\! \translator Staff = down \stemUp + \clef treble g ~ << g e>>8) - e-[ \translator Staff = up + e[ \translator Staff = up \stemDown e e] \translator Staff = down diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly index 3e798a30a4..00a13bb8a7 100644 --- a/input/regression/beam-cross-staff.ly +++ b/input/regression/beam-cross-staff.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" Beams can be typeset over fixed distance aligned staves, beam @@ -10,15 +10,15 @@ behave well, wherever the switching point is. \score{ \context PianoStaff < \context Staff=one \notes\relative c'{ - \stemUp c8-[ c \translator Staff=two \stemUp c c] - c-[ c c c] + \stemUp c8[ c \translator Staff=two \stemUp c c] + c[ c c c] \translator Staff=one - \stemDown c8-[ c \translator Staff=two \stemUp c c] + \stemDown c8[ c \translator Staff=two \stemUp c c] r2 - \stemDown c8-[ c \translator Staff=one \stemDown c c] + \stemDown c8[ c \translator Staff=one \stemDown c c] r2 \translator Staff=two - \stemUp c8-[ c \translator Staff=one \stemDown c c] + \stemUp c8[ c \translator Staff=one \stemDown c c] r2 } \context Staff=two \notes\relative c'{ diff --git a/input/regression/beam-damp.ly b/input/regression/beam-damp.ly index 4362d03f09..ec90c22ac0 100644 --- a/input/regression/beam-damp.ly +++ b/input/regression/beam-damp.ly @@ -1,22 +1,22 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Beam Damp Beams are less steep than the notes they encompass. " } \score{ \notes\relative c''{ % \stemUp -% a16-[ b b c] -% c-[ b b a] +% a16[ b b c] +% c[ b b a] % \stemDown -% c-[ b b a] -% a-[ b b c] +% c[ b b a] +% a[ b b c] \stemUp - g16-[ a b c] - c-[ b a g] + g16[ a b c] + c[ b a g] \stemDown - d'-[ c b a] - a-[ b c d] + d'[ c b a] + a[ b c d] } \paper{ raggedright = ##t diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly index ff001c3197..01a82fc6b4 100644 --- a/input/regression/beam-default-lengths.ly +++ b/input/regression/beam-default-lengths.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="Beamed stems have standard lengths if possible." @@ -12,7 +12,7 @@ ,Beam::check_concave ,Beam::slope_damping) - f4 f8-[ f] f16-[ f] f32-[ f] f64-[ f] f128-[ f] + f4 f8[ f] f16[ f] f32[ f] f64[ f] f128[ f] } \paper{ raggedright = ##t} } diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index 2c8d7ddf74..61b2a09c60 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" Beams should behave reasonably well, even under extreme circumstances. @@ -11,19 +11,19 @@ Beam.auto-knee-gap was set to false. extreme = \notes\relative c'' { \stemBoth - g8-[ c c,] - c16-[ c'' a f] + g8[ c c,] + c16[ c'' a f] \stemUp - c,,32-[ c'' a f] + c,,32[ c'' a f] %%%%%%% \stemBoth - \times 2/3{ d16-[ fis' d,]} \times 2/3{ cis-[ g'' cis,,]} + \times 2/3{ d16[ fis' d,]} \times 2/3{ cis[ g'' cis,,]} a'16 cis a, g''' % Used to give a nice beam directed upwards. \stemBoth \transpose c c { - \stemDown e'8-[ e e'] + \stemDown e'8[ e e'] } } diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly index a7f9c6fd59..120f7d1e31 100644 --- a/input/regression/beam-french.ly +++ b/input/regression/beam-french.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { @@ -12,9 +12,9 @@ \relative c' { \property Voice.Stem \override #'french-beaming = ##t - c16-[ c c c] - c8-[ c16 c16 c8] - c8-[ c16 e16 g8] + c16[ c c c] + c8[ c16 c16 c8] + c8[ c16 e16 g8] } \paper { raggedright= ##t } diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly index e479332bca..640a74f697 100644 --- a/input/regression/beam-funky-beamlet.ly +++ b/input/regression/beam-funky-beamlet.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 601884a0b8..91c7fd06c0 100644 --- a/input/regression/beam-funky.ly +++ b/input/regression/beam-funky.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Knee beaming, complex configurations. According to @@ -15,15 +15,15 @@ beam. This is in disagreement with the current algorithm." \property Voice.Beam \set #'auto-knee-gap = #7 \property Voice.subdivideBeams = ##t \time 8/8 - c,16-[ g'''16 + c,16[ g'''16 c,,,16 g'''16 c,,,16 g'''16 c,,,16 g'''16 ] - c,,,16-[ c c c + c,,,16[ c c c b''' b b b] - \transpose c' a, { \relative b'' { g,16-[ g'''16 + \transpose c' a, { \relative b'' { g,16[ g'''16 g,,,16 g'''16 g,,,16 g'''16 g,,,16 g'''16 diff --git a/input/regression/beam-knee-symmetry.ly b/input/regression/beam-knee-symmetry.ly index 21145e8753..0160d0b03d 100644 --- a/input/regression/beam-knee-symmetry.ly +++ b/input/regression/beam-knee-symmetry.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Point-symmetric beams should receive the same @@ -9,8 +9,8 @@ \score{ \notes\relative c'{ - a8-[ b'' a,, b''] - b8-[ a,, b'' a,,] + a8[ b'' a,, b''] + b8[ a,, b'' a,,] } \paper{ raggedright = ##t diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly index a515689d59..e7c51165a5 100644 --- a/input/regression/beam-length.ly +++ b/input/regression/beam-length.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" @@ -11,7 +11,7 @@ Beams should look the same. \score { \context Voice \notes\relative c { - d''8-[ d d] d-[ g d] + d''8[ d d] d[ g d] c c } } diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly index c5306c1a66..5903482718 100644 --- a/input/regression/beam-manual-beaming.ly +++ b/input/regression/beam-manual-beaming.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { @@ -8,7 +8,7 @@ texidoc = } \score { \notes \relative c'' { - c32-[ c + c32[ c %% WARNING: #'beaming is written, so this diff --git a/input/regression/beam-manual.ly b/input/regression/beam-manual.ly index 32da21bfb8..6e0cfea60e 100644 --- a/input/regression/beam-manual.ly +++ b/input/regression/beam-manual.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { @@ -14,7 +14,7 @@ \property Voice.Beam \override #'auto-knee-gap = ##f \property Voice.Beam \override #'positions = #'(-10 . 10) \stemUp - c16-[ c'' a f] + c16[ c'' a f] } } diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly index e3bd69a48e..29b556388a 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.0" +\version "1.9.1" \header { texidoc = "Kneed beams (often happens with cross-staff beams) @@ -13,16 +13,16 @@ to the last beam. \context PianoStaff \relative c' < \context Staff = SA { \stemDown - c8-[ c16 \translator Staff = SB \stemUp c16 ] + c8[ c16 \translator Staff = SB \stemUp c16 ] \stemBoth - f-[ g \translator Staff = SA a c] + f[ g \translator Staff = SA a c] } \context Staff = SB \relative c' { \clef bass - b8-[ b16 \stemUp b,,16 ] + b8[ b16 \stemUp b,,16 ] g'4\rest - b,8-[ b16 \stemDown b''16 b ] + b,8[ b16 \stemDown b''16 b ] } > diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly index ebc44eba68..497f1ff193 100644 --- a/input/regression/beam-over-barline.ly +++ b/input/regression/beam-over-barline.ly @@ -1,10 +1,10 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Explicit beams may cross barlines. " } \score { -\notes \relative c'' { c2. c8-[ c8 c8 c8] } +\notes \relative c'' { c2. c8[ c8 c8 c8] } \paper { raggedright= ##t } diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly index fdf7f1eaa0..fac9615d9f 100644 --- a/input/regression/beam-position.ly +++ b/input/regression/beam-position.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" Beams should always reach the middle staff line. The second beam @@ -12,14 +12,14 @@ Override with @code{noStemExtend}. \score { \context Voice \notes\relative c { - f8-[ f] f64-[ f] + f8[ f] f64[ f] \grace { - f8-[ e8] + f8[ e8] \property Voice.Stem \override #'no-stem-extend = ##f - f8-[ e8] + f8[ e8] \property Voice.Stem \revert #'no-stem-extend } - f8-[ f] + f8[ f] } \paper { diff --git a/input/regression/beam-postfix-notation.ly b/input/regression/beam-postfix-notation.ly index cef6d48e42..4075beab9f 100644 --- a/input/regression/beam-postfix-notation.ly +++ b/input/regression/beam-postfix-notation.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Beams and ties may be entered in postfix notation, separating the @@ -13,6 +13,6 @@ texidoc = "Beams and ties may be entered in postfix notation, separating the { \notes\relative c'' { - c8-[-~ c-] + c8[~ c] } } diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly index bb3daa39b1..984d20a91e 100644 --- a/input/regression/beam-quanting-horizontal.ly +++ b/input/regression/beam-quanting-horizontal.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ @@ -11,17 +11,17 @@ lengths are between 2 and 1.5." \score{ \notes\relative c' { - c8-[ c] a''-[ a] - a,-[ a] c-[ c] - d,8-[ d] g'-[ g] - g,-[ g] d'-[ d] - c,16-[ c] a''-[ a] - a,-[ a ] c-[ c] + c8[ c] a''[ a] + a,[ a] c[ c] + d,8[ d] g'[ g] + g,[ g] d'[ d] + c,16[ c] a''[ a] + a,[ a ] c[ c] \break - c,32-[ c] a''-[ a] - f,-[ f] e'-[ e] - c,64-[ c] a''-[ a] - f,-[ f] e'-[ e] + c,32[ c] a''[ a] + f,[ f] e'[ e] + c,64[ c] a''[ a] + f,[ f] e'[ e] \break } } diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly index f1afe18d50..174120e42a 100644 --- a/input/regression/beam-quarter.ly +++ b/input/regression/beam-quarter.ly @@ -1,12 +1,12 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc= "Quarter notes may be beamed: the beam is halted momentarily." } \score {\notes \relative c'' { - c8-[ c4 c8] % should warn here! + c8[ c4 c8] % should warn here! } \paper { raggedright = ##t} } diff --git a/input/regression/beam-rest.ly b/input/regression/beam-rest.ly index 0742614292..34ff1d9041 100644 --- a/input/regression/beam-rest.ly +++ b/input/regression/beam-rest.ly @@ -3,11 +3,11 @@ texidoc = "The number of beams doesn't change on a rest." } -\version "1.9.0" +\version "1.9.1" \score { \notes \relative c, { \clef bass - e8-[ r16 f d'8 e16 e16] c8-[ c16 r16 bes8 r16 c16-] | + e8[ r16 f d'8 e16 e16] c8[ c16 r16 bes8 r16 c16] | } \paper { raggedright = ##t} } diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly index 18b49d2da0..1dd2cdf73c 100644 --- a/input/regression/beam-second.ly +++ b/input/regression/beam-second.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" Seconds are tricky. We used to have problems with seconds being too @@ -10,9 +10,9 @@ seconds, you'll spot something fishy very quickly. \score{ \notes\relative c''{ \stemUp - b8-[ c] - b16-[ c] - a'-[ b] + b8[ c] + b16[ c] + a'[ b] } \paper{ raggedright = ##t diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly index af59c37daf..a06f2c0e3d 100644 --- a/input/regression/beam-shortened-lengths.ly +++ b/input/regression/beam-shortened-lengths.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="Beams in unnatural direction, have shortened stems, but do not look too short." @@ -12,7 +12,7 @@ ,Beam::check_concave ,Beam::slope_damping) \stemUp - f'4 f8-[ f] f16-[ f] f32-[ f] f64-[ f] f128-[ f] + f'4 f8[ f] f16[ f] f32[ f] f64[ f] f128[ f] } \paper{ raggedright = ##t} } diff --git a/input/regression/beamed-chord.ly b/input/regression/beamed-chord.ly index ba36bc3c4b..3596817c7e 100644 --- a/input/regression/beamed-chord.ly +++ b/input/regression/beamed-chord.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 bac17da693..cced3839bc 100644 --- a/input/regression/beaming-ternary-metrum.ly +++ b/input/regression/beaming-ternary-metrum.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Automatic beaming works also in ternary time sigs." } @@ -7,7 +7,7 @@ texidoc = "Automatic beaming works also in ternary time sigs." \score { \notes \relative c'' { \time 6/8 - c8.-[ c16 c16 c16] + c8.[ c16 c16 c16] } \paper { raggedright = ##t} } diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly index f9ac599b54..94815dcfde 100644 --- a/input/regression/beaming.ly +++ b/input/regression/beaming.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" @@ -10,22 +10,22 @@ hidden just as with breakable bar lines. } \score { \context Staff \notes \relative c'' { - c8.-[ c16] - c8.-[ c16 c8. c16] - c16-[ c8.] | - c8.-[ c16 c16 c8.] - c8.-[ c32 c32] - c8-[ c8] | - c16-[ c16] - c32-[ c32] - c64-[ c64] + c8.[ c16] + c8.[ c16 c8. c16] + c16[ c8.] | + c8.[ c16 c16 c8.] + c8.[ c32 c32] + c8[ c8] | + c16[ c16] + c32[ c32] + c64[ c64] c32 c2 - c8-[ c c] c8 % over barline - c16-[ c8 c16] - c32-[ c16 c16 c16 c32] - c32-[ c16 c8 c32] % hmm ? + c8[ c c] c8 % over barline + c16[ c8 c16] + c32[ c16 c16 c16 c32] + c32[ c16 c8 c32] % hmm ? }} diff --git a/input/regression/beams.ly b/input/regression/beams.ly index 392cae18f1..4aff48da6c 100644 --- a/input/regression/beams.ly +++ b/input/regression/beams.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Beams (simple)." } @@ -9,9 +9,9 @@ \score { \notes \relative c' { - c16-[ c8.] - c8.-[ c16] - c8-[ c16 c16 c8] - c8-[ c16 e16 g8] + c16[ c8.] + c8.[ c16] + c8[ c16 c16 c8] + c8[ c16 e16 g8] }} diff --git a/input/regression/between-systems.ly b/input/regression/between-systems.ly index 1ae84b834a..e496a42125 100644 --- a/input/regression/between-systems.ly +++ b/input/regression/between-systems.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/break.ly b/input/regression/break.ly index a9690c6284..a166c8aa0e 100644 --- a/input/regression/break.ly +++ b/input/regression/break.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly index cb2f4e3d90..5b5bd4d04c 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.0" +\version "1.9.1" \header{ texidoc=" Breathing signs, also used for phrasing, do normally not influence @@ -48,7 +48,7 @@ finalis, the latter three looking similar to bar glyphs. % caesura \property Voice.BreathingSign \set #'text = #"scripts-caesura" - es8-[ d] \breathe es-[ f g f] | + es8[ d] \breathe es[ f g f] | es2 r4 \bar "||" \break % diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly index 2f0a6f8edf..155b3107b8 100644 --- a/input/regression/chord-changes.ly +++ b/input/regression/chord-changes.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header{ texidoc="Property chordChanges: display chord names only when diff --git a/input/regression/chord-name-entry-11.ly b/input/regression/chord-name-entry-11.ly index d889a752f2..27ee59284a 100644 --- a/input/regression/chord-name-entry-11.ly +++ b/input/regression/chord-name-entry-11.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { diff --git a/input/regression/chord-name-entry.ly b/input/regression/chord-name-entry.ly index dc18dc5b1d..b275fadfce 100644 --- a/input/regression/chord-name-entry.ly +++ b/input/regression/chord-name-entry.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { diff --git a/input/regression/chord-name-exceptions.ly b/input/regression/chord-name-exceptions.ly index 521f1de28b..d93ff544b7 100644 --- a/input/regression/chord-name-exceptions.ly +++ b/input/regression/chord-name-exceptions.ly @@ -1,10 +1,10 @@ -\version "1.9.0" +\version "1.9.1" \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 diff --git a/input/regression/chord-name-major7.ly b/input/regression/chord-name-major7.ly index 52ccd3bafa..63ea28a700 100644 --- a/input/regression/chord-name-major7.ly +++ b/input/regression/chord-name-major7.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \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 f2e668b8f2..6a785c4c8b 100644 --- a/input/regression/chord-scripts.ly +++ b/input/regression/chord-scripts.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Scripts can also be attached to chord elements." diff --git a/input/regression/chord-tremolo.ly b/input/regression/chord-tremolo.ly index 2fbb83e5a5..34b10c818b 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.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/chords-funky-ignatzek.ly b/input/regression/chords-funky-ignatzek.ly index bc7ddc62e5..48785dec02 100644 --- a/input/regression/chords-funky-ignatzek.ly +++ b/input/regression/chords-funky-ignatzek.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly index 4654545dcd..e320d83a13 100644 --- a/input/regression/clefs.ly +++ b/input/regression/clefs.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly index f87a31ecc9..a68deb7187 100644 --- a/input/regression/cluster.ly +++ b/input/regression/cluster.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Clusters are a device to denote that a complete range of notes is to be played." diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly index d9383596ee..cdc5bb044f 100644 --- a/input/regression/collision-2.ly +++ b/input/regression/collision-2.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Collisions for single head notes. " } diff --git a/input/regression/collision-dots.ly b/input/regression/collision-dots.ly index dc808a8fa2..76417e0efb 100644 --- a/input/regression/collision-dots.ly +++ b/input/regression/collision-dots.ly @@ -5,7 +5,7 @@ on the right side." } -\version "1.9.0" +\version "1.9.1" \paper { raggedright= ##t } diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly index 9f5e85cb67..7abee32b07 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.0" +\version "1.9.1" \header { texidoc = "Note heads in collisions should be merged if they have the same positions in the extreme note heads. diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly index 4dc394000a..90a07557d8 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.0" +\version "1.9.1" \header { texidoc = diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly index 6140e4261f..eb51799b60 100644 --- a/input/regression/collision-merge-differently-dotted.ly +++ b/input/regression/collision-merge-differently-dotted.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "If NoteCollision has merge-differently-dotted set, note @@ -15,7 +15,7 @@ heads that have differing dot counts may be merged anyway." \property Staff.NoteCollision \override #'merge-differently-dotted = ##t g'8 g'8 } - \context Voice = VB { \voiceTwo g'8.-[ f16] g'8.-[ f'16] } + \context Voice = VB { \voiceTwo g'8.[ f16] g'8.[ f'16] } > }} diff --git a/input/regression/collision-mesh.ly b/input/regression/collision-mesh.ly index 19248de66c..62f754c4d0 100644 --- a/input/regression/collision-mesh.ly +++ b/input/regression/collision-mesh.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Oppositely stemmed chords, meshing into each other, are resolved." diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly index 0c4cb7a121..4854553c59 100644 --- a/input/regression/collisions.ly +++ b/input/regression/collisions.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" Normal collisions. We have support for polyphony, where the diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly index 744fac9921..c14fec7466 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.0" +\version "1.9.1" \header { texidoc = "Completion heads are broken across bar lines. This was diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly index c11f2c4ec2..4111eb0ffa 100644 --- a/input/regression/completion-heads.ly +++ b/input/regression/completion-heads.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/custos.ly b/input/regression/custos.ly index d6eedcf5d2..69310094b4 100644 --- a/input/regression/custos.ly +++ b/input/regression/custos.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Custodes in various styles." } diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly index a55d225211..b8f6387ad8 100644 --- a/input/regression/dot-flag-collision.ly +++ b/input/regression/dot-flag-collision.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 9e0b14069e..c374b4b298 100644 --- a/input/regression/dots.ly +++ b/input/regression/dots.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" Noteheads can have dots, and rests can too. Augmentation dots should diff --git a/input/regression/drums.ly b/input/regression/drums.ly index 86ca73505b..60627908c3 100644 --- a/input/regression/drums.ly +++ b/input/regression/drums.ly @@ -8,7 +8,7 @@ texidoc = "Drum notation, although kludgy, should work. Though, << chord >> does \include "drumpitch-init.ly" -\version "1.9.0" +\version "1.9.1" drh = \notes { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 } drl = \notes {\repeat "unfold" 3 {bd4 sn8 bd bd4 < bd ss > } bd8 tommh tommh bd toml toml bd tomfh16 tomfh } diff --git a/input/regression/dynamics-broken-hairpin.ly b/input/regression/dynamics-broken-hairpin.ly index 3587e805b3..0e38c38c39 100644 --- a/input/regression/dynamics-broken-hairpin.ly +++ b/input/regression/dynamics-broken-hairpin.ly @@ -1,11 +1,11 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc = "Broken crescendi should be open on one side." } \score { \notes \relative c'' { - c1 \< \break c1-\! \> \break c1-\! + c1 \< \break c1\! \> \break c1\! } \paper { linewidth = 4.\cm diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly index 06ab519c4d..1c5dc497b9 100644 --- a/input/regression/dynamics-glyphs.ly +++ b/input/regression/dynamics-glyphs.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header {texidoc = "Dynamic letters are kerned, and their weight matches that of the hairpin signs. The dynamic scripts should be @@ -9,13 +9,13 @@ closer to the note head (staccato, accent) are reckoned with. \score { -\notes\relative c'' { c1-\ff - e,-.-> -\f +\notes\relative c'' { c1\ff + e,-.-> \f e \rfz - c' -\mf - c -\mp \> - c-\!-\ppppp \< - c-\sfp-\! + c' \mf + c \mp \> + c\!\ppppp \< + c\sfp\! } } diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly index 0df83597a6..6c65940d74 100644 --- a/input/regression/dynamics-line.ly +++ b/input/regression/dynamics-line.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" Dynamics appear below or above the staff. If multiple dynamics are linked with (de)crescendi, they should be on the same @@ -12,14 +12,14 @@ line. Isolated dynamics may be forced up or down. \score{ \notes\relative c''{ a1^\sfz -a1-\fff\> c,,-\!-\pp a'' a-\p +a1\fff\> c,,\!\pp a'' a\p % We need this to test if we get two Dynamic line spanners a % because do_removal_processing () % doesn't seem to post_process elements -d-\f +d\f a diff --git a/input/regression/dynamics-unbound-hairpin.ly b/input/regression/dynamics-unbound-hairpin.ly index 9b0ac62a0f..0b4dcd17ab 100644 --- a/input/regression/dynamics-unbound-hairpin.ly +++ b/input/regression/dynamics-unbound-hairpin.ly @@ -1,11 +1,11 @@ -\version "1.9.0" +\version "1.9.1" \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 1a8514c77d..6da74425bc 100644 --- a/input/regression/easy-notation.ly +++ b/input/regression/easy-notation.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = " Ez-notation prints names in note heads. diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly index ea4fbf8cc5..fd7c1bf71a 100644 --- a/input/regression/figured-bass.ly +++ b/input/regression/figured-bass.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = " Figured bass is created by the FiguredBass context which eats diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly index fb16e4ad92..bb6f10d66a 100644 --- a/input/regression/finger-chords.ly +++ b/input/regression/finger-chords.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "With the new chord syntax it's possible to associate @@ -24,7 +24,7 @@ easier to process." \property Voice.fingerHorizontalDirection = #LEFT << c-1 es-3 g-5 >> 4 \property Voice.fingerHorizontalDirection = #RIGHT - << c-1 e-2 g-3 b-5 >> 4-\arpeggio + << c-1 e-2 g-3 b-5 >> 4\arpeggio \property Voice.fingerHorizontalDirection = #LEFT << c_1 e-2 g-3 b^5 >> 4 diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly index 2184db5dca..92c23287fc 100644 --- a/input/regression/fingering.ly +++ b/input/regression/fingering.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Automatic fingering tries to put fingering instructions diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly index c1872deeaa..4a168aa3ad 100644 --- a/input/regression/follow-voice-break.ly +++ b/input/regression/follow-voice-break.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc = " When put across line breaks, only the part before the line break is diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly index 97d8bcc95f..678604505f 100644 --- a/input/regression/font-magnification.ly +++ b/input/regression/font-magnification.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "The magnification can be set for any font. Note that this doesn't change variable symbols such as beams or slurs. " } @@ -12,7 +12,7 @@ c4 c4-"normal" % why doesn't this work? - c4-\markup \bold \magnify #2.0 "foobar" + c4\markup \bold \magnify #2.0 "foobar" \property Voice .NoteHead \set #'font-magnification = #1.2 \property Voice.TextScript \set #'font-magnification = #2.0 diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly index 944c773253..efc1d90f30 100644 --- a/input/regression/font-name.ly +++ b/input/regression/font-name.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly index 66b5e3a91c..87a03e5c62 100644 --- a/input/regression/generic-output-property.ly +++ b/input/regression/generic-output-property.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly index 4ca6fdc25c..6a1660ebf3 100644 --- a/input/regression/glissando.ly +++ b/input/regression/glissando.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly index f614b64cb0..6a429f8b02 100644 --- a/input/regression/grace-auto-beam.ly +++ b/input/regression/grace-auto-beam.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 3a937c0c68..6214f60f4c 100644 --- a/input/regression/grace-bar-line.ly +++ b/input/regression/grace-bar-line.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Bar line should come before the grace note." } @@ -9,7 +9,7 @@ texidoc = "Bar line should come before the grace note." \score {\notes \relative c' \context Staff { - f1 \grace { a'16-[ f] } g1 } + f1 \grace { a'16[ f] } g1 } \paper { raggedright = ##t} } diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly index eeee3d94d5..8a7ebc0d9f 100644 --- a/input/regression/grace-bar-number.ly +++ b/input/regression/grace-bar-number.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 44e363918a..c97d17fd4c 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.0" -\score { \notes\relative c'' { c4 d8-[ \grace { e32-[ d c d] } e8] e-[ e \grace { f16 } e8 e] }} +\version "1.9.1" +\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 671bd4bd41..22bc88bffa 100644 --- a/input/regression/grace-dynamic.ly +++ b/input/regression/grace-dynamic.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 fdfc3f110e..34e5247230 100644 --- a/input/regression/grace-end.ly +++ b/input/regression/grace-end.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc="@cindex Grace End @@ -11,7 +11,7 @@ \score { \context Voice \notes\relative c' { - c4 \grace { d16-[ d16] } + c4 \grace { d16[ d16] } } \paper { diff --git a/input/regression/grace-nest.ly b/input/regression/grace-nest.ly index 0e1cdf3026..bc73155013 100644 --- a/input/regression/grace-nest.ly +++ b/input/regression/grace-nest.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \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 4326850a10..7414eec1fe 100644 --- a/input/regression/grace-nest1.ly +++ b/input/regression/grace-nest1.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \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 a2fdc1505a..73a4234417 100644 --- a/input/regression/grace-nest2.ly +++ b/input/regression/grace-nest2.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \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 cc724246ab..c3e072e2b2 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.0" +\version "1.9.1" \header { texidoc = "Another nested grace situation." } diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly index 9d2f916234..bc134b1940 100644 --- a/input/regression/grace-nest4.ly +++ b/input/regression/grace-nest4.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Another combination of grace note nesting." } diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly index 6e74e8ad01..362994ec24 100644 --- a/input/regression/grace-nest5.ly +++ b/input/regression/grace-nest5.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Another nested grace situation." } diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly index 6cb2fc318e..e6bd449b7b 100644 --- a/input/regression/grace-part-combine.ly +++ b/input/regression/grace-part-combine.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Partcombiner and grace notes can go together." } diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly index 37e8c46f55..c0c0199b78 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.0" +\version "1.9.1" \header{ texidoc = "Stripped version of trip.ly. Staffs should be of correct length." } diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly index 11b310fa2c..f9ed41ccbe 100644 --- a/input/regression/grace-start.ly +++ b/input/regression/grace-start.ly @@ -1,12 +1,12 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Pieces may begin with grace notes." } \score {\notes \relative c' \context Staff { - \grace { a'16-[ f] } g1 + \grace { a'16[ f] } g1 \bar "||" % test if | and || are synced. - \grace { a16-[ bes] } c1 + \grace { a16[ bes] } c1 \bar "||" % test if | and || are synced. } \paper { raggedright = ##t} diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly index 24feff4201..e5d32c2b80 100644 --- a/input/regression/grace-stems.ly +++ b/input/regression/grace-stems.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc = "Here startGraceMusic should set no-stem-extend to true; the two grace beams should be the same here. @@ -10,9 +10,9 @@ the two grace beams should be the same here. \score { \context Voice \notes\relative c { \grace { - f8-[ e8] + f8[ e8] \property Voice.Stem \override #'no-stem-extend = ##t - f8-[ e8] + f8[ e8] \property Voice.Stem \revert #'no-stem-extend } a4 diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly index ef1e4f7b33..8a323cf0c4 100644 --- a/input/regression/grace-sync.ly +++ b/input/regression/grace-sync.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Grace notes in different voices/staves are synchronized." } @@ -8,9 +8,9 @@ \grace c8 c4 c4 } \context Staff = SB { c2 \clef bass - \grace { dis8-[ ( d8] \key es\major } + \grace { dis8[ ( d8] \key es\major } - c4-) c4 } + c4) c4 } \context Staff = SC { c2 c4 c4 \bar "|." } > \paper { raggedright = ##t} diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly index 29a5e80526..c286bdea6c 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.0" +\version "1.9.1" \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 4875290c1d..bc3553bee9 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.0" +\version "1.9.1" \header { diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly index 10ea1b4d7a..0f57e60e82 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.0" +\version "1.9.1" \header { @@ -11,8 +11,8 @@ \score{ \notes\relative c'''{\key a \minor \time 2/4 \repeat "volta" 2 { - \grace { a16-[( c] } c,4 c4 | - \grace { e'16-[( gis] } c,4 c4 | + \grace { a16[( c] } c,4 c4 | + \grace { e'16[( gis] } c,4 c4 | } } diff --git a/input/regression/grace.ly b/input/regression/grace.ly index 8d7388c317..8a719937bc 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" @@ -19,13 +19,13 @@ not set. Main note scripts don't end up on the grace note. } \score {\notes \context Voice = VA \relative c'' { - \grace b8 c4-\fermata - \grace { c32-[ cis32] } gis4 - \grace { cis32-[ dis32] } e4 - \grace { c32-[ d] }\times 2/3 { c8-[ c c] } - \grace { b32-[ ( c32] } c4-) - \grace <>16 c8-[ c8] -% \grace c16 c8-[ c8] + \grace b8 c4\fermata + \grace { c32[ cis32] } gis4 + \grace { cis32[ dis32] } e4 + \grace { c32[ d] }\times 2/3 { c8[ c c] } + \grace { b32[ ( c32] } c4) + \grace <>16 c8[ c8] +% \grace c16 c8[ c8] %% broken? %%\grace { \property Grace.graceAlignPosition = \right c16} c4 c4 \grace { c16 } c4 diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly index af43a6defa..b9e8fc7c7d 100644 --- a/input/regression/hairpin-ending.ly +++ b/input/regression/hairpin-ending.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { @@ -11,7 +11,7 @@ into them." \score { -\notes \relative c'' { c4 \> c4 c4-\! c4_\ff \> c4 c4-\!-\p } +\notes \relative c'' { c4 \> c4 c4\! c4_\ff \> c4 c4\!\p } \paper { raggedright = ##t} } diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly index 2ec11ff238..068cd13f9a 100644 --- a/input/regression/hara-kiri-pianostaff.ly +++ b/input/regression/hara-kiri-pianostaff.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly index 5a58fb6877..9d8a58d5b6 100644 --- a/input/regression/instrument-name-markup.ly +++ b/input/regression/instrument-name-markup.ly @@ -7,7 +7,7 @@ including alterations. " } -\version "1.9.0" +\version "1.9.1" textFlat = \markup {\smaller \musicglyph #"accidentals--1"} diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly index 067847e25e..d301d9ead8 100644 --- a/input/regression/instrument-name-partial.ly +++ b/input/regression/instrument-name-partial.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 1237600135..fcc76cf287 100644 --- a/input/regression/instrument-name.ly +++ b/input/regression/instrument-name.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" Staff margins are also markings attached to barlines. They should be diff --git a/input/regression/key-clefs.ly b/input/regression/key-clefs.ly index 504757c6fe..288077a50d 100644 --- a/input/regression/key-clefs.ly +++ b/input/regression/key-clefs.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 d810d4471a..27bb6bda64 100644 --- a/input/regression/key-signature-scordatura.ly +++ b/input/regression/key-signature-scordatura.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 84440827d8..86b207e0d1 100644 --- a/input/regression/keys.ly +++ b/input/regression/keys.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 5a00e1ec42..41e1f3f528 100644 --- a/input/regression/lyric-align.ly +++ b/input/regression/lyric-align.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index 9d942f7549..b28a886c4d 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc ="Polyphonic rhythms and rests don't disturb diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly index ec3ce498fa..0708d90f5e 100644 --- a/input/regression/lyric-combine.ly +++ b/input/regression/lyric-combine.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc= "Lyrics can be set to a melody automatically. Excess lyrics will be @@ -20,7 +20,7 @@ to work." m = \notes \relative c'' { \property Staff.automaticMelismata = ##t \autoBeamOff - g8-( a-) r8 \times 2/3 { g'8-( f e-) } r8 \grace { d16-[ c b] } e4 + g8( a) r8 \times 2/3 { g'8( f e) } r8 \grace { d16[ c b] } e4 \emptyText d8.^"melisma" \melisma c16 \melismaEnd diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly index 9161cec784..42b42cd642 100644 --- a/input/regression/lyric-extender.ly +++ b/input/regression/lyric-extender.ly @@ -1,11 +1,11 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc= "Tests lyric extenders. "} \paper { raggedright= ##t } \score{ \notes \relative c' < - \context Staff { c (c-) (c-) 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 2ff027ed49..95e31c05f5 100644 --- a/input/regression/lyric-hyphen.ly +++ b/input/regression/lyric-hyphen.ly @@ -1,8 +1,8 @@ -\version "1.9.0" +\version "1.9.1" \header {texidoc="Tests lyric hyphens. "} \score{ < - \context Staff \notes { c' (c'-) (c'-) c' } + \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 97d659c94e..f66d2b5a7f 100644 --- a/input/regression/lyric-phrasing.ly +++ b/input/regression/lyric-phrasing.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="Lyric phrasing @@ -28,7 +28,7 @@ \context Voice = "v" \notes \relative c'' { \property Staff.automaticMelismata = ##t \autoBeamOff - a a a8 ( a-) a4 + a a a8 ( a) a4 } \context Lyrics < \context LyricsVoice = "v-1" \lyrics { diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly index dca8055e1b..e29ff5e6c6 100644 --- a/input/regression/lyrics-bar.ly +++ b/input/regression/lyrics-bar.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/lyrics-extender.ly b/input/regression/lyrics-extender.ly index 6f95ea1fa5..862772c7e6 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.0" +\version "1.9.1" \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 { diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly index 9b2baf2961..e45346316e 100644 --- a/input/regression/lyrics-melisma-beam.ly +++ b/input/regression/lyrics-melisma-beam.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Melismata are triggered by manual beams." @@ -12,7 +12,7 @@ \context Staff = mel \notes \relative c'' { \property Staff.autoBeaming = ##f - c8 c8-[ c8 c8-] c8 } + c8 c8[ c8 c8] c8 } \context Lyrics \lyrics { bla bla bla } } diff --git a/input/regression/lyrics-multi-stanza.ly b/input/regression/lyrics-multi-stanza.ly index c92a19352b..8de8ed6a91 100644 --- a/input/regression/lyrics-multi-stanza.ly +++ b/input/regression/lyrics-multi-stanza.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Lyrics syllables are aligned according to diff --git a/input/regression/markup-note.ly b/input/regression/markup-note.ly index 59f050cf57..ebdebb1543 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.0" +\version "1.9.1" \score { \notes { c4^\markup { \note #0 #0 #1 diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly index cc24cc7aec..b5949de741 100644 --- a/input/regression/markup-stack.ly +++ b/input/regression/markup-stack.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header {texidoc="Stacking of markup scripts."} \paper { raggedright = ##t} \score { \notes { c''^\markup { "a" \column << "1" \bold "2" "3" >> } } } diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly index 9d8b251f48..70c1baf8fa 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.0" +\version "1.9.1" %% TODO: should have 2/4 + 5/8 time sig style. @@ -16,11 +16,11 @@ of Steve Martland's Dance Works. " \context Staff \relative c' { #(set-time-signature 2 4) - c8 a'4 a8-~ + c8 a'4 a8~ #(set-time-signature 5 8 '(3 2)) a8 bes4 r8 bes8-> \time 2/4 - c,8 g'4 g8-~ + c,8 g'4 g8~ #(set-time-signature 5 8 '(3 2)) g8 a4 g a-> } diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly index 15d8b93773..779213fee1 100644 --- a/input/regression/mensural.ly +++ b/input/regression/mensural.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \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 0da2bf2110..8e4a5bff79 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.0" +\version "1.9.1" \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 7e8f96127d..10415956f2 100644 --- a/input/regression/mm-rests2.ly +++ b/input/regression/mm-rests2.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/mmrest-collision.ly b/input/regression/mmrest-collision.ly index 0fb4df78e6..c13eaa0db9 100644 --- a/input/regression/mmrest-collision.ly +++ b/input/regression/mmrest-collision.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Tests a collision between multimeasure rests in different voices. " } \score { diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly index f2ea5632ee..9ff0451161 100644 --- a/input/regression/molecule-hacking.ly +++ b/input/regression/molecule-hacking.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 69d2547a55..135d47aff8 100644 --- a/input/regression/multi-measure-rest-center.ly +++ b/input/regression/multi-measure-rest-center.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \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 69d309b09f..c8e42524a9 100644 --- a/input/regression/multi-measure-rest-grace.ly +++ b/input/regression/multi-measure-rest-grace.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly index 1236e9d84e..e904e88100 100644 --- a/input/regression/multi-measure-rest-instr-name.ly +++ b/input/regression/multi-measure-rest-instr-name.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "This combines instrument names and multimeasure rests (there was an interesting bug in 1.3.98). " } diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly index 0eff234d0f..5219246670 100644 --- a/input/regression/multi-measure-rest-text.ly +++ b/input/regression/multi-measure-rest-text.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly index ab6cb7eba3..56a03fd565 100644 --- a/input/regression/multi-measure-rest.ly +++ b/input/regression/multi-measure-rest.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/music-map.ly b/input/regression/music-map.ly index 0286525735..b231cd0700 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.0" +\version "1.9.1" #(define (notes-to-skip m) "Convert all stuff with duration (notes, lyrics, bass figures, etc.) to skips. @@ -30,7 +30,7 @@ Scripts and dynamics are maintained. \paper { raggedright= ##t } -foobar = \notes \transpose c c' { c4-\>-^ c4-^ c4-\!-^ c4-^ } +foobar = \notes \transpose c c' { c4\>-^ c4-^ c4\!-^ c4-^ } \score { \notes \relative c'' \context Voice { diff --git a/input/regression/new-markup-syntax.ly b/input/regression/new-markup-syntax.ly index 59b24ed9a2..7353ec2a49 100644 --- a/input/regression/new-markup-syntax.ly +++ b/input/regression/new-markup-syntax.ly @@ -2,13 +2,13 @@ texidoc = "New markup syntax." } -\version "1.9.0" +\version "1.9.1" \score { \notes { - f'-\markup { + f'\markup { foo \raise #0.2 \hbracket \bold bar \override #'(baseline-skip . 4) diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly index df9f39a37d..bc7ea18514 100644 --- a/input/regression/non-empty-text.ly +++ b/input/regression/non-empty-text.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly index 5a23a27475..c45b80de07 100644 --- a/input/regression/note-group-bracket.ly +++ b/input/regression/note-group-bracket.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { @@ -20,12 +20,12 @@ brackets for analysis start and end. \score { \notes\relative c'' { - c4-\startGroup-\startGroup-\startGroup - c4-\stopGroup - c4-\startGroup - c4-\stopGroup-\stopGroup - c4-\startGroup - c4-\stopGroup-\stopGroup + c4\startGroup\startGroup\startGroup + c4\stopGroup + c4\startGroup + c4\stopGroup\stopGroup + c4\startGroup + c4\stopGroup\stopGroup } \paper { diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly index 0e7b16b810..2d3e03611a 100644 --- a/input/regression/note-head-chord.ly +++ b/input/regression/note-head-chord.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Note heads are flipped on the stem to prevent collisions. diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly index 7cabf9883f..10a4707c2c 100644 --- a/input/regression/note-head-style.ly +++ b/input/regression/note-head-style.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" Note head shapes are settable. The stem endings should be adjusted diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly index c7c6fe5eb9..0e5a472f91 100644 --- a/input/regression/note-line.ly +++ b/input/regression/note-line.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Note head lines (e.g. glissando) diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly index 04e897e897..9b03a38842 100644 --- a/input/regression/number-staff-lines.ly +++ b/input/regression/number-staff-lines.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 29c1baa7d9..c0f8b176d4 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.0" +\version "1.9.1" \paper { raggedright = ##t} diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly index 094bcf1562..272d23f75b 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.0" +\version "1.9.1" \paper { raggedright = ##t} diff --git a/input/regression/output-property.ly b/input/regression/output-property.ly index 7d7f3603b3..9efd4cfadc 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.0" +\version "1.9.1" #(define (make-text-checker text) (lambda (grob) (equal? text (ly:get-grob-property grob 'text)))) @@ -20,7 +20,7 @@ possible to use @code{\override} would shift both texts. \notes\relative c''' { a^"two"^"m.d." \context Voice - \outputproperty #(make-text-checker (make-simple-markup "m.d.")) + \outputproperty #(make-text-checker (make-simple@\markup "m.d.")) #'extra-offset = #'(-4.0 . -3.5) a^"two"^"m.d." a^"two"^"m.d." diff --git a/input/regression/pc-mmrest.ly b/input/regression/pc-mmrest.ly index 165fc8ba92..4a638d47d9 100644 --- a/input/regression/pc-mmrest.ly +++ b/input/regression/pc-mmrest.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc="Multi measure rests of second voice should not disappear." } @@ -14,14 +14,14 @@ TODO: what does this test? The contexts are tweaked too much. #(ly:set-point-and-click 'line-column) one = \notes\relative c'' { - f4 e-\!-.-\f r2| + f4 e\!-.\f r2| R1| - f2-\p-(es -)| + f2\p(es )| d1\<| d1| d2 d2| d2 d2| - f1-\!-\ff | + f1\!\ff | f1 } diff --git a/input/regression/pc-switch-slur.ly b/input/regression/pc-switch-slur.ly index 3af02b251c..9d647e1a18 100644 --- a/input/regression/pc-switch-slur.ly +++ b/input/regression/pc-switch-slur.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="The partcombiner should not combine two small slurs into a big one." } @@ -10,12 +10,12 @@ texidoc="The partcombiner should not combine two small slurs into a big one." \context Voice=two\skip 1 \context Voice=one \partcombine Voice \context Thread=one \notes\relative c'' { - c4( c b a-) - a( b c d-) + c4( c b a) + a( b c d) } \context Thread=two \notes\relative c'' { - a4( c b a-) - a( b c a-) + a4( c b a) + a( b c a) } > diff --git a/input/regression/phrasing-slur.ly b/input/regression/phrasing-slur.ly index aa23eea05d..7b564d4d56 100644 --- a/input/regression/phrasing-slur.ly +++ b/input/regression/phrasing-slur.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc="Slurs play well with phrasing slur." @@ -7,7 +7,7 @@ texidoc="Slurs play well with phrasing slur." \score { \notes\relative c'' { - \time 6/4 c\((d e-) f(e d-)-\) + \time 6/4 c\((d e) f(e d)\) } \paper { raggedright = ##t diff --git a/input/regression/prefatory-empty-spacing.ly b/input/regression/prefatory-empty-spacing.ly index d9756c8065..86da70ab06 100644 --- a/input/regression/prefatory-empty-spacing.ly +++ b/input/regression/prefatory-empty-spacing.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly index 3f88033aab..e1c76a3821 100644 --- a/input/regression/prefatory-spacing-matter.ly +++ b/input/regression/prefatory-spacing-matter.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Prefatory spacing. diff --git a/input/regression/property-once.ly b/input/regression/property-once.ly index db4d43b67c..dbd276dbb4 100644 --- a/input/regression/property-once.ly +++ b/input/regression/property-once.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 6b486a4858..df8a83f1bd 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.0" +\version "1.9.1" global = \notes { diff --git a/input/regression/repeat-fold.ly b/input/regression/repeat-fold.ly index eb65e749ca..fd8108a122 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.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/repeat-line-break.ly b/input/regression/repeat-line-break.ly index 26b1dd8c7b..418c618b7d 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.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/repeat-percent-skipbars.ly b/input/regression/repeat-percent-skipbars.ly index 5ed7f657c9..530020e1b4 100644 --- a/input/regression/repeat-percent-skipbars.ly +++ b/input/regression/repeat-percent-skipbars.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { diff --git a/input/regression/repeat-percent.ly b/input/regression/repeat-percent.ly index d17b988979..79e31a2c1e 100644 --- a/input/regression/repeat-percent.ly +++ b/input/regression/repeat-percent.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 3613c5cdcb..a0ac87b6a3 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.0" +\version "1.9.1" \header { texidoc = "Beat repeats are supported." } diff --git a/input/regression/repeat-unfold-all.ly b/input/regression/repeat-unfold-all.ly index aef95eeb7a..ba9e5fc2e5 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.0" +\version "1.9.1" \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 bd083a7af0..927a8d4f9d 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.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly index d3332efdc6..6213acb8b6 100644 --- a/input/regression/repeat-volta-skip-alternatives.ly +++ b/input/regression/repeat-volta-skip-alternatives.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \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 6eec67e8a6..7553e72bc0 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.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/rest-collision-default.ly b/input/regression/rest-collision-default.ly index b4e9d420ba..bfffe17221 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.0" +\version "1.9.1" \header { diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly index 26a1a745de..2ada75e60c 100644 --- a/input/regression/rest-collision.ly +++ b/input/regression/rest-collision.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" Rests should not collide with beams, stems and noteheads. Rests may @@ -42,13 +42,13 @@ restsII = \context Staff \notes { \context Staff < {\stemUp r} { \stemDown r} > \context Staff < {\stemUp r} r { \stemDown r} > \stemUp - \transpose c c' { c''8-[ r8 c''8 c''8] - c8-[ r8 c8 c8] - c8-[ r8 r8 c'''8] + \transpose c c' { c''8[ r8 c''8 c''8] + c8[ r8 c8 c8] + c8[ r8 r8 c'''8] \stemDown - c8-[ r8 c8 c8] - c''8-[ r8 c''8 c''8] - c'8-[ r8 r8 c'''8] + c8[ r8 c8 c8] + c''8[ r8 c''8 c''8] + c'8[ r8 r8 c'''8] \different } } diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly index e731e2426e..33e8c42790 100644 --- a/input/regression/rest-ledger.ly +++ b/input/regression/rest-ledger.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \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 4428ce106d..ca4e0f9066 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.0" +\version "1.9.1" \header { texidoc = "Rests can have pitches--these will be affected by diff --git a/input/regression/rest.ly b/input/regression/rest.ly index 2e08d2abbc..bffc140f43 100644 --- a/input/regression/rest.ly +++ b/input/regression/rest.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/rhythmic-staff.ly b/input/regression/rhythmic-staff.ly index 68e8c5d370..00c393c164 100644 --- a/input/regression/rhythmic-staff.ly +++ b/input/regression/rhythmic-staff.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly index c5709402ed..8e610517f2 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.0" +\version "1.9.1" \header { @@ -10,7 +10,7 @@ \score { \notes \relative c'' { c4 - <>-\marcato + <>\marcato < \context Voice = VA { \voiceOne c4^^ } \context Voice = VB { \voiceTwo d4_^} > } diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly index 7de9359008..61c9421185 100644 --- a/input/regression/script-stack-order.ly +++ b/input/regression/script-stack-order.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 9b33c1bc18..6a86a5d250 100644 --- a/input/regression/script-stacked.ly +++ b/input/regression/script-stacked.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \paper { raggedright= ##t } diff --git a/input/regression/size11.ly b/input/regression/size11.ly index 23c6b2d39b..5ef46e5722 100644 --- a/input/regression/size11.ly +++ b/input/regression/size11.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/size13.ly b/input/regression/size13.ly index 2cea4adf69..d7ec3ba764 100644 --- a/input/regression/size13.ly +++ b/input/regression/size13.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" foollilypondbook = " \score " diff --git a/input/regression/size16.ly b/input/regression/size16.ly index c7e7cfbc7c..c8c1a3860c 100644 --- a/input/regression/size16.ly +++ b/input/regression/size16.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" foollilypondbook = " \score " diff --git a/input/regression/size20.ly b/input/regression/size20.ly index 70f1fefed9..cd05cac59c 100644 --- a/input/regression/size20.ly +++ b/input/regression/size20.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" foollilypondbook = " \score " diff --git a/input/regression/size23.ly b/input/regression/size23.ly index 4f2a5b7259..4202eb3b9b 100644 --- a/input/regression/size23.ly +++ b/input/regression/size23.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" foollilypondbook = " \score " diff --git a/input/regression/size26.ly b/input/regression/size26.ly index 5ac0859fd2..166499a7c6 100644 --- a/input/regression/size26.ly +++ b/input/regression/size26.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" foollilypondbook = " \score " diff --git a/input/regression/slur-area.ly b/input/regression/slur-area.ly index 770c917ebc..beafcb18ef 100644 --- a/input/regression/slur-area.ly +++ b/input/regression/slur-area.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "The area underneath an (up) slur is minimised to improve the shape. " @@ -11,21 +11,21 @@ \slurUp \stemDown -a(a' a, a-) -a(a a' a,-) -a(d a a-) -a(a d a-) +a(a' a, a) +a(a a' a,) +a(d a a) +a(a d a) -e'8(e e e e e e e-) -a,8(d a a a a a a-) -a(a a a a a d a-) +e'8(e e e e e e e) +a,8(d a a a a a a) +a(a a a a a d a) -c,(g' c e f d b g-) -c,(g' c e f d b g-) +c,(g' c e f d b g) +c,(g' c e f d b g) \property Voice.autoBeaming = ##f \stemUp -a8(a a a a a a a-) +a8(a a a a a a a) } \paper{ diff --git a/input/regression/slur-attachment.ly b/input/regression/slur-attachment.ly index 1df59448ca..c90feee844 100644 --- a/input/regression/slur-attachment.ly +++ b/input/regression/slur-attachment.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" @@ -10,10 +10,10 @@ with beams. \score{ \notes \relative c''{ \property Voice.Slur \set #'direction = #1 - a8-( a a4-) - a4-( a8 a-) - a8 a(a4-) - a4-( a8-) a + a8( a a4) + a4( a8 a) + a8 a(a4) + a4( a8) a } \paper{ indent = 0.0 diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly index 2c18202dc4..ac8acee881 100644 --- a/input/regression/slur-broken-trend.ly +++ b/input/regression/slur-broken-trend.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" @@ -11,11 +11,11 @@ in unbroken state. } \score{ \notes \relative c''{ - e1( \break a,-) + e1( \break a,) \time 2/4 - e'2( \break a,-)(\break + e'2( \break a,)(\break a2\break - e'2-) + e'2) } \paper { linewidth=40.\mm diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly index 0982acd71f..279380f457 100644 --- a/input/regression/slur-cross-staff.ly +++ b/input/regression/slur-cross-staff.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" The same goes for slurs. They behave decently when broken across @@ -12,32 +12,32 @@ linebreak. \context PianoStaff < \context Staff=one \notes\relative c'{ \stemUp \slurUp - c4( c \translator Staff=two c c-) | + c4( c \translator Staff=two c c) | \translator Staff=one \stemUp \slurUp - c4( c \translator Staff=two c c-) | + c4( c \translator Staff=two c c) | \stemUp \slurUp - c4( c \translator Staff=one c c-) | + c4( c \translator Staff=one c c) | \translator Staff=two \stemUp \slurUp - c4( c \translator Staff=one c c-) | + c4( c \translator Staff=one c c) | \translator Staff=two \stemUp \slurUp - c4( \translator Staff=one c c c-) | + c4( \translator Staff=one c c c) | r2 \translator Staff=two \stemUp \slurUp c4( \translator Staff=one c \break - c c-) + c c) r2 % \stemDown \slurDown -% c4( \translator Staff=two c c \translator Staff=one c-) +% c4( \translator Staff=two c c \translator Staff=one c) \stemDown \slurDown - d4( \translator Staff=two c c \translator Staff=one d-) + d4( \translator Staff=two c c \translator Staff=one d) \translator Staff=two \stemUp \slurUp - c4( \translator Staff=one c c \translator Staff=two c-) + c4( \translator Staff=one c c \translator Staff=two c) r1 } \context Staff=two \notes\relative c'{ diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly index 34dcfdd1c6..6ecdfa6c2f 100644 --- a/input/regression/slur-dots.ly +++ b/input/regression/slur-dots.ly @@ -1,12 +1,12 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="Slurs should not get confused by augmentation dots. We use a lot of dots here, to make problems more visible." } \score { \notes\relative c'' { - c4.............-( c-) + c4.............( c) } \paper { raggedright = ##t diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly index de784d1ef9..2ab603f030 100644 --- a/input/regression/slur-nice.ly +++ b/input/regression/slur-nice.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" Slurs should look nice and symmetric. The curvature may increase @@ -12,12 +12,12 @@ run through noteheads or stems. \notes\relative c''{ \time 3/4 \slurUp - \stemBoth a ( \stemDown a \stemBoth a-) a( c a-) a( e' a,-) a( g' a,-) - \stemUp a( e' a,-) + \stemBoth a ( \stemDown a \stemBoth a) a( c a) a( e' a,) a( g' a,) + \stemUp a( e' a,) \break \slurDown - \stemBoth c ( \stemUp c \stemBoth c-) c ( a c-) c( d, c'-) c( f, c'-) - \stemDown c( f, c'-) + \stemBoth c ( \stemUp c \stemBoth c) c ( a c) c( d, c') c( f, c') + \stemDown c( f, c') } \paper{ linewidth = 120.\mm diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly index 24d832b397..59afb5adba 100644 --- a/input/regression/slur-rest.ly +++ b/input/regression/slur-rest.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc ="Slurs may be placed over rest. The slur will avoid colliding with @@ -7,11 +7,11 @@ the rest. " } -\score{ \notes { \stemDown c'4 ( r4 c'2-) +\score{ \notes { \stemDown c'4 ( r4 c'2) \relative c'' { % Finish with F if played separately - c8-.( r c,-. r c4-) r4| } + c8-.( r c,-. r c4) r4| } } diff --git a/input/regression/slur-staccato.ly b/input/regression/slur-staccato.ly index de3b0ee994..86bc06dd30 100644 --- a/input/regression/slur-staccato.ly +++ b/input/regression/slur-staccato.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc="Manual hack for slur and staccato." } @@ -10,9 +10,9 @@ texidoc="Manual hack for slur and staccato." \context Staff \notes\relative c'' { \property Voice.Slur \override #'attachment-offset = #'((0 . 1) . (0 . 1)) - a-.( g-. a-)-. + a-.( g-. a)-. \property Voice.Slur \override #'attachment-offset = #'((0 . 1.5) . (0 . 1.5)) - b-.( a-. b-)-. + b-.( a-. b)-. } } diff --git a/input/regression/slur-stem-broken.ly b/input/regression/slur-stem-broken.ly index fb7f967413..fce1298d76 100644 --- a/input/regression/slur-stem-broken.ly +++ b/input/regression/slur-stem-broken.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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." @@ -8,7 +8,7 @@ follow the same vertical direction it would have had in unbroken state." \notes\relative c' { \property Voice.Slur \override #'attachment = #'(stem . stem) f( c' c c \break - c c c \stemUp c-) + c c c \stemUp c) } \paper { linewidth=40*\staffspace diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly index f7c76abcb1..d76e9328dd 100644 --- a/input/regression/slur-symmetry-1.ly +++ b/input/regression/slur-symmetry-1.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Symmetric figures should lead to symmetric slurs." @@ -9,10 +9,10 @@ \notes\relative c''< \time 4/4 \context Staff{ - f8(f f f-) f(g g f-) f(a a f-) f(b b f-) + f8(f f f) f(g g f) f(a a f) f(b b f) } \context Staff=x{ - e,(e e e-) e(d d e-) e(c c e-) e(b b e-) + e,(e e e) e(d d e) e(c c e) e(b b e) } > \paper{ diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly index 4c2da0cc96..809856ad6c 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.0" +\version "1.9.1" \header { texidoc = "Symmetric figures should lead to symmetric slurs." @@ -10,10 +10,10 @@ \notes\relative c'< \time 6/8 \context Staff{ - e8(e e-) e(d e-) e(c e-) e(b e-) + e8(e e) e(d e) e(c e) e(b e) } \context Staff=x{ - f'8(f f-) f(g f-) f(a f-) f(b f-) + f'8(f f) f(g f) f(a f) f(b f) } > \paper{ diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly index 9e4e1b6972..7a96778aae 100644 --- a/input/regression/spacing-accidental-staffs.ly +++ b/input/regression/spacing-accidental-staffs.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Accidentals in different staffs don't effect the @@ -8,8 +8,8 @@ spacing of the quarter notes here." \score { \notes \relative c'' < \context Staff = SA { \time 4/4 - c8-[ c8 cis8 cis8] - cis8-[ cis8 cis8 cis] + c8[ c8 cis8 cis8] + cis8[ cis8 cis8 cis] } diff --git a/input/regression/spacing-accidental-stretch.ly b/input/regression/spacing-accidental-stretch.ly index bdf32b67a6..4042c672df 100644 --- a/input/regression/spacing-accidental-stretch.ly +++ b/input/regression/spacing-accidental-stretch.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 5a424be50f..e70937b378 100644 --- a/input/regression/spacing-accidental.ly +++ b/input/regression/spacing-accidental.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 67e99ed771..22bd4e3de4 100644 --- a/input/regression/spacing-bar-stem.ly +++ b/input/regression/spacing-bar-stem.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 2facc9257e..b0f7d1f8e9 100644 --- a/input/regression/spacing-clef-first-note.ly +++ b/input/regression/spacing-clef-first-note.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Clef changes at the start of a line get much more space diff --git a/input/regression/spacing-end-of-line.ly b/input/regression/spacing-end-of-line.ly index dc5793eb06..bff8443ec5 100644 --- a/input/regression/spacing-end-of-line.ly +++ b/input/regression/spacing-end-of-line.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 cb6d363382..eda8b19ba7 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.0" +\version "1.9.1" \header { texidoc = " A voicelet (a very short voice to get polyphonic chords correct) should not confuse the spacing engine." diff --git a/input/regression/spacing-folded-clef.ly b/input/regression/spacing-folded-clef.ly index 432ec1b702..b0b8e180a1 100644 --- a/input/regression/spacing-folded-clef.ly +++ b/input/regression/spacing-folded-clef.ly @@ -1,12 +1,12 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "A clef can be folded below notes in a different staff, if this doesn't disrupt the flow of the notes." } \score { \notes \relative c'' < -\context Staff = SA { c4 c16-[ c c c] c4 c4 } +\context Staff = SA { c4 c16[ c c c] c4 c4 } \context Staff = SB { \clef bass c,2 \clef treble c'2 } > diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly index 45b014e4b8..3b38c9826e 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.0" +\version "1.9.1" \header { texidoc = "A clef can be folded below notes in a different staff, if diff --git a/input/regression/spacing-grace-duration.ly b/input/regression/spacing-grace-duration.ly index a5ddf4a08d..cc2d6ac704 100644 --- a/input/regression/spacing-grace-duration.ly +++ b/input/regression/spacing-grace-duration.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Spacing uses the duration of the notes, but disregards @@ -12,9 +12,9 @@ \score { \notes \relative c'' \context Voice { - c8-[ c8] + c8[ c8] \grace { b16 } - c8-[ c8] c8-[ c8] + c8[ c8] c8[ c8] } diff --git a/input/regression/spacing-grace.ly b/input/regression/spacing-grace.ly index 98fe9ea38e..d8f04a59a7 100644 --- a/input/regression/spacing-grace.ly +++ b/input/regression/spacing-grace.ly @@ -1,11 +1,11 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Grace note spacing. Should be tuned? " } \score { - \notes \context Voice \relative c'' { \grace { c16-[ d] } c4 } + \notes \context Voice \relative c'' { \grace { c16[ d] } c4 } \paper { raggedright = ##t} } diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly index ecebd0d1ce..d64179de5b 100644 --- a/input/regression/spacing-knee.ly +++ b/input/regression/spacing-knee.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "For knees, the spacing correction is such that the @@ -8,13 +8,13 @@ width of the note heads and the thickness of the stem. } \score { \notes { - g''8-[ g g'' g''] + g''8[ g g'' g''] % check code independent of default settings. \property Voice.NoteSpacing \override #'knee-spacing-correction = #1.0 - g''8-[ g g'' g''] + g''8[ g g'' g''] \property Voice.Stem \override #'thickness = #10 - g''8-[ g g'' g''] + g''8[ g g'' g''] } \paper { raggedright = ##t} } diff --git a/input/regression/spacing-multi-tuplet.ly b/input/regression/spacing-multi-tuplet.ly index b4d67b07a5..fa484ad014 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.0" +\version "1.9.1" \header{ texidoc = "Concurrent tuplets should be spaced equidistantly on all staffs. @@ -13,12 +13,12 @@ is. For non-raggedright, it still shows a bug: uneven spacing. multipart = \notes \relative c'{ \context StaffGroup < \context Staff = ten \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] } + \times 2/10 { c8[ c c c c c c c c c] } + \times 2/10 { c[ c c c c c c c c c] } } \context Staff = eleven \context Voice { - \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] } + \times 2/11 { c8[ c c c c c c c c c c] } + \times 2/11 { c[ c c c c c c c c c c] } } > } diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly index 1fd32c5e2e..d2a803aa8b 100644 --- a/input/regression/spacing-note-flags.ly +++ b/input/regression/spacing-note-flags.ly @@ -9,7 +9,7 @@ texidoc = "The flags of 8th notes take some space, but not \score { \notes \relative c'' \context Staff { \property Voice.autoBeaming = ##f - a8-[ a8 a8 a8] + a8[ a8 a8 a8] a8 a8 a8 a8 } \paper { @@ -17,5 +17,5 @@ raggedright = ##t } } -\version "1.9.0" +\version "1.9.1" diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly index dea5658694..7e8c5f8948 100644 --- a/input/regression/spacing-rest.ly +++ b/input/regression/spacing-rest.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 ff1c50c1c9..ab22229ebb 100644 --- a/input/regression/spacing-short-notes.ly +++ b/input/regression/spacing-short-notes.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 7e78c204ba..6679745d27 100644 --- a/input/regression/spacing-stem-bar.ly +++ b/input/regression/spacing-stem-bar.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 7e2cabaa2f..07c38a1e00 100644 --- a/input/regression/spacing-stem-direction.ly +++ b/input/regression/spacing-stem-direction.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly index dff80156df..133943d55c 100644 --- a/input/regression/spacing-stem-same-direction.ly +++ b/input/regression/spacing-stem-same-direction.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "For juxtaposed chords with the same direction, a slight optical correction is used. It is constant, and only works if @@ -10,7 +10,7 @@ two chords have no common head-positions range." \stemDown \time 12/4 f8[ - e f e] f-[ d f d] f-[ c f c] f-[ b, f' b,] f'-[ a, f' a,] + e f e] f[ d f d] f[ c f c] f[ b, f' b,] f'[ a, f' a,] } \paper { raggedright = ##t} } diff --git a/input/regression/spacing-to-grace.ly b/input/regression/spacing-to-grace.ly index 76b31a2188..1b7baffc42 100644 --- a/input/regression/spacing-to-grace.ly +++ b/input/regression/spacing-to-grace.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 c6f1085dae..8291dbbca2 100644 --- a/input/regression/spacing-very-tight.ly +++ b/input/regression/spacing-very-tight.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = " When tightly spaced, hinterfleisch -> 0. diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly index 7415039e4e..6113f072e6 100644 --- a/input/regression/span-bar.ly +++ b/input/regression/span-bar.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Span bars draw only in between staff bar lines, so setting those to transparent shows bar lines between systems only. " diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly index 46773f559b..c7d2246e62 100644 --- a/input/regression/staccato-pos.ly +++ b/input/regression/staccato-pos.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/staff-tweak.ly b/input/regression/staff-tweak.ly index 0f9aa451c7..2819006b16 100644 --- a/input/regression/staff-tweak.ly +++ b/input/regression/staff-tweak.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \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 229a7706b8..74dfa050c6 100644 --- a/input/regression/stanza-number.ly +++ b/input/regression/stanza-number.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Stanza numbers may differ for the first and following systems." } diff --git a/input/regression/stem-direction.ly b/input/regression/stem-direction.ly index 2fff66d9d6..c3d210e002 100644 --- a/input/regression/stem-direction.ly +++ b/input/regression/stem-direction.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" @@ -16,7 +16,7 @@ notes, and up for low notes. \score { \context Voice \notes\relative c { - b''4 ~ b8-(b8-) e4 e, + b''4 ~ b8(b8) e4 e, } \paper { diff --git a/input/regression/stem-shorten.ly b/input/regression/stem-shorten.ly index 0eacc05e65..b95d611c55 100644 --- a/input/regression/stem-shorten.ly +++ b/input/regression/stem-shorten.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { diff --git a/input/regression/stem-spacing.ly b/input/regression/stem-spacing.ly index 505c3f4dec..4545b3fd35 100644 --- a/input/regression/stem-spacing.ly +++ b/input/regression/stem-spacing.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly index 1ee5c2bef3..8fa868fa2a 100644 --- a/input/regression/stem-tremolo.ly +++ b/input/regression/stem-tremolo.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 0f4575cb71..b6a9e14a85 100644 --- a/input/regression/system-extents.ly +++ b/input/regression/system-extents.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "LilyPond correctly determines the size of every @@ -9,7 +9,7 @@ \score { \notes \context Voice { \property Staff.minimumVerticalExtent \unset - \slurDown c4 ( g4 c''4-) + \slurDown c4 ( g4 c''4) } diff --git a/input/regression/system-start-bracket.ly b/input/regression/system-start-bracket.ly index a723aac8e8..6129aab7b1 100644 --- a/input/regression/system-start-bracket.ly +++ b/input/regression/system-start-bracket.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = " diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly index c4b46c3776..23b18efea9 100644 --- a/input/regression/text-spanner.ly +++ b/input/regression/text-spanner.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc= "Text spanners should not repeat start text when broken." } @@ -9,7 +9,7 @@ texidoc= "Text spanners should not repeat start text when broken." \property Voice.crescendoText = #"cresc." \property Voice.crescendoSpanner = #'dashed-line c1\< c \break - c1 c-\! \break + c1 c\! \break } \paper { linewidth = 40*\staffspace diff --git a/input/regression/tie-accidental.ly b/input/regression/tie-accidental.ly index 4b113b0cae..14bf840558 100644 --- a/input/regression/tie-accidental.ly +++ b/input/regression/tie-accidental.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" @@ -24,7 +24,7 @@ thenotes = \notes \relative cis' { g2 gis ~ | gis g4 gis | g2 gis( | - g!-) gis4 gis | + g!) gis4 gis | \break \key a \major gis2 gis ~ | @@ -44,7 +44,7 @@ thenotes = \notes \relative cis' { % should get an accidental but it looks a bit silly and redundant. % See last g. - g!-) gis4 gis ~ | \break + g!) gis4 gis ~ | \break gis2 gis ~ | gis g ~\break g2 g } diff --git a/input/regression/tie-break-accidental.ly b/input/regression/tie-break-accidental.ly index d84a3d7c19..8a842019ed 100644 --- a/input/regression/tie-break-accidental.ly +++ b/input/regression/tie-break-accidental.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \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 c1be2174d3..22e28934be 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.0" +\version "1.9.1" \header { texidoc = "Tie engraver uses @code{busyGrobs} to keep track of diff --git a/input/regression/tie-chord-partial.ly b/input/regression/tie-chord-partial.ly index 9ff810c5a2..c6bd6357fe 100644 --- a/input/regression/tie-chord-partial.ly +++ b/input/regression/tie-chord-partial.ly @@ -6,13 +6,13 @@ putting the Tie engraver at Thread level, and redirecting untied notes to a different thread." } -\version "1.9.0" +\version "1.9.1" \paper { raggedright= ##t } \score { \notes \context Thread \relative c' { - < c-~ e \context Thread = "untied" c' > + < c~ e \context Thread = "untied" c' > < c e c' > } diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly index 85867e292d..fd1ce2b328 100644 --- a/input/regression/tie-chord.ly +++ b/input/regression/tie-chord.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" When tieing chords, the outer slurs point outwards, the inner slurs diff --git a/input/regression/tie-dots.ly b/input/regression/tie-dots.ly index 45262b9833..e00955d147 100644 --- a/input/regression/tie-dots.ly +++ b/input/regression/tie-dots.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Ties should not collide with dots." } diff --git a/input/regression/tie-grace.ly b/input/regression/tie-grace.ly index 8cd1215a6b..8b98fc21fc 100644 --- a/input/regression/tie-grace.ly +++ b/input/regression/tie-grace.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 f7e3183d36..014d67c0c2 100644 --- a/input/regression/tie.ly +++ b/input/regression/tie.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly index 7395536eac..a6a506727e 100644 --- a/input/regression/tuplet-beam.ly +++ b/input/regression/tuplet-beam.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "In combination with a beam, the bracket of the tuplet @@ -10,8 +10,8 @@ the bracket." \paper { raggedright= ##t } \score { \notes \context Voice\relative c'' { -\times 2/3 { r c8-[ c8] } -\times 2/3 { c8-[ c c] } -\times 2/3 { c16-[ c16] c8-[ c8] } +\times 2/3 { r c8[ c8] } +\times 2/3 { c8[ c c] } +\times 2/3 { c16[ c16] c8[ c8] } }} diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly index ebf21bbacd..f8a1315376 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 0209fe7747..8b08311ff0 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.0" +\version "1.9.1" \score { @@ -16,17 +16,17 @@ NB should have no bracket, B should have bracket. \times 2/3 { c'8 c'' c,, } - \times 2/3 { c8-[^"NB" c c] } + \times 2/3 { c8[^"NB" c c] } - \times 2/3 { c8^"B" c-[ c] } - \times 2/4 { r8_"B" c,-[ c'] r8 } + \times 2/3 { c8^"B" c[ c] } + \times 2/4 { r8_"B" c,[ c'] r8 } \property Voice.TupletBracket \override #'bracket-visibility = #'if-no-beam - \times 2/3 { c8-[ c c] } + \times 2/3 { c8[ c c] } \property Voice.TupletBracket \override #'direction = #1 \property Voice.TupletBracket \override #'number-visibility = ##f - \times 2/3 { c8^""^""^"up, no digit" c-[ c] } + \times 2/3 { c8^""^""^"up, no digit" c[ c] } \property Voice.TupletBracket \revert #'number-visibility \property Voice.TupletBracket \override #'bracket-visibility = ##t diff --git a/input/regression/tuplet-rest.ly b/input/regression/tuplet-rest.ly index 17d8173473..ab78f09ac6 100644 --- a/input/regression/tuplet-rest.ly +++ b/input/regression/tuplet-rest.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header {texidoc = "Tests tuplet rests. "} \score { diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly index 71e017b6a0..6be4bbeeac 100644 --- a/input/regression/tuplet-staffline-collision.ly +++ b/input/regression/tuplet-staffline-collision.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Horizontal tuplet brackets are shifted vertically diff --git a/input/regression/tuplets.ly b/input/regression/tuplets.ly index 9a2f98ad2c..72480a34f5 100644 --- a/input/regression/tuplets.ly +++ b/input/regression/tuplets.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc=" @@ -21,7 +21,7 @@ direction as the bracket. The endings can be adjusted with \score{ \notes \context Voice \relative c'' { \times 2/3 { a8 b c } - \times 2/3 { r8 b-[ f] } + \times 2/3 { r8 b[ f] } \property Voice.TupletBracket \set #'bracket-flare = #'(0.5 . 0.5) \times 2/3 { r8 b r8 } c4 | diff --git a/input/regression/voice-follower.ly b/input/regression/voice-follower.ly index 8ab1b77a64..498d75b129 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.0" +\version "1.9.1" \header { texidoc= " diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly index 4d3241b18e..30e3b1508c 100644 --- a/input/regression/volta-broken-left-edge.ly +++ b/input/regression/volta-broken-left-edge.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc ="Broken volta spanners behave correctly at left edge in all cases." diff --git a/input/regression/volta-multi-staff.ly b/input/regression/volta-multi-staff.ly index dea4f89940..ab9ca031f6 100644 --- a/input/regression/volta-multi-staff.ly +++ b/input/regression/volta-multi-staff.ly @@ -4,7 +4,7 @@ texidoc = "By setting @code{voltaOnThisStaff}, repeats can be put on more staffs in a score." } -\version "1.9.0" +\version "1.9.1" vmus = \notes { \repeat volta 2 c1 \alternative { d e } } diff --git a/input/screech-boink.ly b/input/screech-boink.ly index 8d3c05e7f2..1a7e14423d 100644 --- a/input/screech-boink.ly +++ b/input/screech-boink.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { title = "Screech and boink" subtitle = "Random complex notation" @@ -14,17 +14,17 @@ < { \property Voice.Stem \override #'direction = #'() \translator Staff = down \property Voice.subdivideBeams = ##t - g16.-[ + g16.[ \translator Staff = up c'''32 \translator Staff = down g32 \translator Staff = up c'''32 \translator Staff = down - g16-] + g16] \translator Staff = up \property Voice.Stem \revert #'direction \property Voice.followVoice = ##t - c'''32-(-[ b''16 a''16 gis''16 g''32-)-] } \\ - { s4 \times 2/3 { d'16-[ f' g'-] } as'32-[ b''32 e'' d''-] } \\ + c'''32([ b''16 a''16 gis''16 g''32)] } \\ + { s4 \times 2/3 { d'16[ f' g'] } as'32[ b''32 e'' d''] } \\ { s4 \autoBeamOff d''8.. f''32 } \\ { s4 es''4 } > @@ -37,7 +37,7 @@ \property Voice.Stem \set #'french-beaming = ##t \property Voice.Beam \set #'thickness = #0.3 \property Voice.Stem \set #'thickness = #4.0 - g'16-[ b16 fis16 g16] + g'16[ b16 fis16 g16] < \apply #notes-to-clusters { as16 <> <> @@ -45,7 +45,7 @@ } \\ { \property Staff.Arpeggio \set #'arpeggio-direction =#-1 -<>4-\arpeggio } +<>4\arpeggio } > } > diff --git a/input/template/gregorian-transcription.ly b/input/template/gregorian-transcription.ly index 105613dc23..ab168d71b2 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.0" +\version "1.9.1" \header { @@ -20,10 +20,10 @@ barTwo = \notes { \once \property Staff.BarLine \override #'extra-offset = #'(0 \notes \relative c' { \property Score.timing = ##f \property Staff.Stem \set #'transparent = ##t - f4 a2 \barTwo g4 a2 f2 \barOne g4( f-) f( + f4 a2 \barTwo g4 a2 f2 \barOne g4( f) f( \bar "empty" \break - g-) a2 + g) a2 } } diff --git a/input/template/header.ly b/input/template/header.ly index 2d037e7451..0cf128854b 100644 --- a/input/template/header.ly +++ b/input/template/header.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { dedication = "dedication" title = "Title" diff --git a/input/template/jazz-combo.ly b/input/template/jazz-combo.ly index 87232d7554..7bdb0cfe8c 100644 --- a/input/template/jazz-combo.ly +++ b/input/template/jazz-combo.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { title = "Song" subtitle = "(tune)" diff --git a/input/template/melody-chords.ly b/input/template/melody-chords.ly index f5039ef23e..d77223c069 100644 --- a/input/template/melody-chords.ly +++ b/input/template/melody-chords.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Lead sheet format: chords with melody." diff --git a/input/template/melody-lyrics-chords.ly b/input/template/melody-lyrics-chords.ly index 00480dbd9e..edd75e836f 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.0" +\version "1.9.1" \header { texidoc = "Popsong format: chords, melody and lyrics." diff --git a/input/template/melody-lyrics.ly b/input/template/melody-lyrics.ly index 8aa22857d7..bc2f9fe0d0 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.0" +\version "1.9.1" \header { texidoc = "Melody and lyrics." diff --git a/input/template/melody.ly b/input/template/melody.ly index 54c79cddb7..b54d35f071 100644 --- a/input/template/melody.ly +++ b/input/template/melody.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Only a melody." diff --git a/input/template/piano-4-voices.ly b/input/template/piano-4-voices.ly index 13931c9d75..42758a7765 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.0" +\version "1.9.1" \header { texidoc ="Polyphonic piano music" diff --git a/input/template/piano-dynamics.ly b/input/template/piano-dynamics.ly index 5ca09aa5c7..dddca044da 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.0" +\version "1.9.1" \header { texidoc =" Template that puts dynamics on a separate line, so it is neatly @@ -17,11 +17,11 @@ lower = \notes\relative c { dynamics = \notes { s2\fff\> s4 - s-\!-\pp + s\!\pp } pedal = \notes { - s2-\sustainDown s2-\sustainUp + s2\sustainDown s2\sustainUp } \score { diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly index 1b45789956..6e305fa984 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.0" +\version "1.9.1" \header { texidoc ="Lyrics between two staffs." diff --git a/input/template/piano-melody-lyrics.ly b/input/template/piano-melody-lyrics.ly index 10e61b4e81..226c7ee4cb 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.0" +\version "1.9.1" \header { texidoc ="Classical song format: one staff with melody and lyrics, diff --git a/input/template/piano.ly b/input/template/piano.ly index e371d0286d..25f5af60a4 100644 --- a/input/template/piano.ly +++ b/input/template/piano.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "Simple piano music." diff --git a/input/template/satb.ly b/input/template/satb.ly index 42dff9d196..3bf862fdd3 100644 --- a/input/template/satb.ly +++ b/input/template/satb.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = " @@ -7,7 +7,7 @@ " } -sopMusic = \notes \relative c'' { c4 c c8-[-( b-)-] c4 } +sopMusic = \notes \relative c'' { c4 c c8[( b)] c4 } sopWords = \lyrics { hi4 hi hi hi } altoMusic = \notes \relative c' { e4 f d e } diff --git a/input/test/+.ly b/input/test/+.ly index 59edc58a76..f765104c3e 100644 --- a/input/test/+.ly +++ b/input/test/+.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" %% +.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 5f8f6eef02..81f5c450c5 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.0" +\version "1.9.1" %% 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 @@ -19,12 +19,12 @@ global = \notes{ melody = \notes\relative c''{ r2 r r r2 r r - r4 a'8-- \< a-- a-- a-- c-- b-\!-- a--\> gis f e-\! + r4 a'8-- \< a-- a-- a-- c-- b\!-- a-\> gis f e\! es8 \grace b c r4 r2 r } basloopje = \notes\relative c{ - d,8( a' d f a d f d a f d a-) + d,8( a' d f a d f d a f d a) } accompany = \repeat unfold 4 \notes \relative c \basloopje diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly index bba8876a3d..09c1371bd2 100644 --- a/input/test/add-staccato.ly +++ b/input/test/add-staccato.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly index 90cbeeb891..8ae76b9dba 100644 --- a/input/test/add-text-script.ly +++ b/input/test/add-text-script.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc= "@cindex make-music Fingering @@ -13,7 +13,7 @@ create, then write a function that will build the structure for you. #(define (make-text-script x) (let ((m (make-music-by-name 'TextScriptEvent))) (ly:set-mus-property! m 'direction DOWN) - (ly:set-mus-property! m 'text (make-simple-markup x)) + (ly:set-mus-property! m 'text (make-simple@\markup x)) m)) #(define (add-text-script m x) diff --git a/input/test/ancient-accidentals.ly b/input/test/ancient-accidentals.ly index 20df3fb803..c2c64ceab5 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.0" +\version "1.9.1" \score { \context Voice \notes\relative c { diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index 3825e78d45..4a60a41505 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % TODO: split ancient-font into seperate files; possibly in % different locations. \header { diff --git a/input/test/ancient-time.ly b/input/test/ancient-time.ly index d760b1fd06..3fc64c5a61 100644 --- a/input/test/ancient-time.ly +++ b/input/test/ancient-time.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % 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 c81fac2457..6ac300e4c4 100644 --- a/input/test/bagpipe.ly +++ b/input/test/bagpipe.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Bagpipe Music @@ -10,7 +10,7 @@ Here's an example of bagpipe music. #(add-to-grace-init "Voice" 'Stem 'stroke-style '()) % doen't work?? -%#(add-to-grace-init "Voice" 'Stem 'font-relative-size -) +%#(add-to-grace-init "Voice" 'Stem 'font-relative-size ) \paper { linewidth = 14.0 \cm @@ -22,29 +22,29 @@ Here's an example of bagpipe music. } } -taor = \notes{ \grace { g32-[ d g e]}} -grip = \notes{ \grace { g32-[ b g ]}} -thrd = \notes{ \grace { g32-[ d c] }} -birl = \notes{ \grace { g32-[ a g] }} -gstd = \notes{ \grace { g'32-[ d g] }} +taor = \notes{ \grace { g32[ d g e]}} +grip = \notes{ \grace { g32[ b g ]}} +thrd = \notes{ \grace { g32[ d c] }} +birl = \notes{ \grace { g32[ a g] }} +gstd = \notes{ \grace { g'32[ d g] }} lgg = \notes{ \grace { g32 }} lag = \notes{ \grace { a32 }} - fgg = \notes{ \grace { f32-[ g'32] }} -dblb = \notes{ \grace { g'32-[ b d] }} -dblc = \notes{ \grace { g'32-[ c d] }} -dble = \notes{ \grace { g'32-[ e f] }} -dblf = \notes{ \grace { g'32-[ f g'] }} -dblg = \notes{ \grace { g'32-[ f] }} -dbla = \notes{ \grace { a'32-[ g'] }} + fgg = \notes{ \grace { f32[ g'32] }} +dblb = \notes{ \grace { g'32[ b d] }} +dblc = \notes{ \grace { g'32[ c d] }} +dble = \notes{ \grace { g'32[ e f] }} +dblf = \notes{ \grace { g'32[ f g'] }} +dblg = \notes{ \grace { g'32[ f] }} +dbla = \notes{ \grace { a'32[ g'] }} cg = \notes{ \grace { c32 }} eg = \notes{ \grace { e32 }} gg = \notes{ \grace { g'32 }} dg = \notes{ \grace { d32 }} hag = \notes{ \grace { a'32 }} -gefg = \notes{ \grace { g'32-[ e f] }} -efg = \notes{ \grace { e32-[ f] }} -gdcg = \notes{ \grace { g'32-[ d c]}} -gcdg = \notes{ \grace { g'32-[ c d]}} +gefg = \notes{ \grace { g'32[ e f] }} +efg = \notes{ \grace { e32[ f] }} +gdcg = \notes{ \grace { g'32[ d c]}} +gcdg = \notes{ \grace { g'32[ c d]}} @@ -55,31 +55,31 @@ gcdg = \notes{ \grace { g'32-[ c d]}} \slurUp f4 | \gg f4 e8 \thrd d4. | -\eg a4.(a4-) d8 | +\eg a4.(a4) d8 | \gg d4 f8 \dble e4. ( | \noBreak -e8-) d4 \gg d4 e8 | +e8) d4 \gg d4 e8 | \break \time 9/8 -\dblf f2.( f4-) d8 | +\dblf f2.( f4) d8 | \time 6/8 \dblg g'4 a'8 \gg a'4. | -\thrd d4.( d4-) \eg a8 | +\thrd d4.( d4) \eg a8 | \time 9/8 -\dble e4 \lag e8 \gg e16-[ d8. e8] \gg f4 g'8 | +\dble e4 \lag e8 \gg e16[ d8. e8] \gg f4 g'8 | \break \time 6/8 \gg f4 e8 \thrd d4. | -\eg a4.( a4-) d8 | +\eg a4.( a4) d8 | \dblg g'4 a'8 \gg a'4. | -\thrd d4.( d4-) f8 | +\thrd d4.( d4) f8 | \break -\dblg g'4 e4 \dblf f8.-[ e16] | -\thrd d4.( d4-) \cg d8 | +\dblg g'4 e4 \dblf f8.[ e16] | +\thrd d4.( d4) \cg d8 | \gg c4 e8 \thrd d4.( | -d4.-) \gdcg d4. +d4.) \gdcg d4. } } diff --git a/input/test/bar-always.ly b/input/test/bar-always.ly index 83c0842e6d..da3ca6b5a6 100644 --- a/input/test/bar-always.ly +++ b/input/test/bar-always.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Bars Always diff --git a/input/test/bar-lines-lyric-only.ly b/input/test/bar-lines-lyric-only.ly index 0aed0d6dc5..4c92d67082 100644 --- a/input/test/bar-lines-lyric-only.ly +++ b/input/test/bar-lines-lyric-only.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Bar line lyric only You can move around @code{Bar_engraver} and @code{Span_bar_engraver} if you want bar lines on lyrics. " diff --git a/input/test/bar-lines.ly b/input/test/bar-lines.ly index c49a694a4f..70f21d6810 100644 --- a/input/test/bar-lines.ly +++ b/input/test/bar-lines.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 fe8bf2653c..9c42183433 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.0" +\version "1.9.1" \header { texidoc = "@cindex Bar Number Every Fifth Reset diff --git a/input/test/bar-number-regular-interval.ly b/input/test/bar-number-regular-interval.ly index 6b60ee893e..2297cd773a 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.0" +\version "1.9.1" \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 a6ca63b956..91848ef8d1 100644 --- a/input/test/bar-number-show-all.ly +++ b/input/test/bar-number-show-all.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 9e8a1e26fa..fe9a9ff08c 100644 --- a/input/test/beam-auto-4-8.ly +++ b/input/test/beam-auto-4-8.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % 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 fe4d9439b9..562ed46e00 100644 --- a/input/test/beam-auto-override.ly +++ b/input/test/beam-auto-override.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Auto Beaming Override @@ -34,7 +34,7 @@ The beam will be ended also when now % beamAutoEnd = 0. c8 c c c % manually override autobeam with weird beaming - c8 c-[ c] c + c8 c[ c] c c8 c c r c8 c c4 r8 c c c diff --git a/input/test/beam-auto.ly b/input/test/beam-auto.ly index e132ba5ac5..400ee4a643 100644 --- a/input/test/beam-auto.ly +++ b/input/test/beam-auto.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 9d0544a273..2954c76102 100644 --- a/input/test/beam-control.ly +++ b/input/test/beam-control.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="@cindex Beam Position Control @@ -10,16 +10,16 @@ Beam positions may be controlled manually, by setting @code{positions} in the @c \context Voice \notes\relative c { %% from upper staffline (position 4) to centre (position 0) \property Voice.Beam \override #'positions = #'(2 . 0) - c'8-[ c] + c'8[ c] %% from center to one above centre (position 2) \property Voice.Beam \override #'positions = #'(0 . 1) - c-[ c] + c[ c] %% normal beam-algorithm \property Voice.Beam \revert #'positions \property Voice.Beam \revert #'positions - c-[ e] e-[ c] + c[ e] e[ c] } \paper{raggedright = ##t} } diff --git a/input/test/beam-count.ly b/input/test/beam-count.ly index c8e13695aa..1e5b7d01fe 100644 --- a/input/test/beam-count.ly +++ b/input/test/beam-count.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="@cindex Beam Count diff --git a/input/test/beam-dir-functions.ly b/input/test/beam-dir-functions.ly index eae7884258..d4969bc606 100644 --- a/input/test/beam-dir-functions.ly +++ b/input/test/beam-dir-functions.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Beam Dir Functions @@ -25,19 +25,19 @@ your favourite algorithm isn't one of these, you can hook up your own. \score { \notes\relative c'' {\time 3/4 \property Voice.Beam \set #'dir-function = #beam-dir-majority - c8-[ g] + c8[ g] \property Voice.Beam \set #'dir-function = #beam-dir-mean - c-[ g] + c[ g] \property Voice.Beam \set #'dir-function = #beam-dir-median - c-[ g] + c[ g] \time 3/8 \property Voice.Beam \set #'dir-function = #beam-dir-majority - c8-[ c g] + c8[ c g] \property Voice.Beam \set #'dir-function = #beam-dir-mean - c-[ c g] + c[ c g] \property Voice.Beam \set #'dir-function = #beam-dir-median - c-[ c g] + c[ c g] } \paper{raggedright = ##t} } diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index 607c96ae8d..fc87e7b784 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="@cindex Beam Isknee LilyPond can beam across a Piano Staff. @@ -12,7 +12,7 @@ LilyPond can beam across a Piano Staff. \context Staff=two \notes\relative c'{ \clef bass % no knee - \stemUp c8-[ \translator Staff=one \stemDown g'16 f] + \stemUp c8[ \translator Staff=one \stemDown g'16 f] s8 s2 } diff --git a/input/test/beam-neutral-direction.ly b/input/test/beam-neutral-direction.ly index cb4df5c896..b5848bbd88 100644 --- a/input/test/beam-neutral-direction.ly +++ b/input/test/beam-neutral-direction.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="@cindex Beam Neutral Direction When a beam falls in the middle of the staff, LilyPond normally @@ -8,11 +8,11 @@ altered if desired. " } fragment = \notes { - b''8-[ b] + b''8[ b] \property Voice.Beam \set #'neutral-direction = #-1 - b-[ b] + b[ b] \property Voice.Beam \set #'neutral-direction = #1 - b-[ b] + b[ b] } \paper { raggedright = ##t} diff --git a/input/test/beam-rest.ly b/input/test/beam-rest.ly index a6756b2c47..d8dbce206b 100644 --- a/input/test/beam-rest.ly +++ b/input/test/beam-rest.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="@cindex Beam Over Rests @@ -8,9 +8,9 @@ Beams over rests. \score{ \context Staff=one \notes\relative c''{ - r4 r8-[ g a] - bes8-[ r16 f g a] - bes8-[ r16 \property Voice.stemLeftBeamCount = #1 f g a] + r4 r8[ g a] + bes8[ r16 f g a] + bes8[ r16 \property Voice.stemLeftBeamCount = #1 f g a] } \paper{ diff --git a/input/test/blank-notes.ly b/input/test/blank-notes.ly index e4a4a4c0fe..1c96ce7247 100644 --- a/input/test/blank-notes.ly +++ b/input/test/blank-notes.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % 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 4444503f36..c60f4cc008 100644 --- a/input/test/blank-paper-tab.ly +++ b/input/test/blank-paper-tab.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Blank Paper Tab diff --git a/input/test/blank-paper.ly b/input/test/blank-paper.ly index 24030d4d80..1794212727 100644 --- a/input/test/blank-paper.ly +++ b/input/test/blank-paper.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc="@cindex Blank Paper diff --git a/input/test/boxed-molecule.ly b/input/test/boxed-molecule.ly index 10a41cf5d1..db880634c7 100644 --- a/input/test/boxed-molecule.ly +++ b/input/test/boxed-molecule.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Boxed Molecule You can override the molecule callback to draw a box around @@ -9,7 +9,7 @@ arbitrary grobs. " } \score { \notes \relative c'' { \property Voice.TextScript \override #'molecule-callback = - #(make-molecule-boxer 0.1 0.3 0.2 brew-new-markup-molecule) + #(make-molecule-boxer 0.1 0.3 0.2 brew-new@\markup-molecule) c'4^"foo" @@ -17,7 +17,7 @@ arbitrary grobs. " } #(make-molecule-boxer 0.05 0.25 0.25 Stem::brew_molecule) \property Score.RehearsalMark \override #'molecule-callback = - #(make-molecule-boxer 0.15 0.3 0.3 brew-new-markup-molecule) + #(make-molecule-boxer 0.15 0.3 0.3 brew-new@\markup-molecule) c8 \property Voice.Stem \revert #'molecule-callback diff --git a/input/test/caps.ly b/input/test/caps.ly index 8dd6e01e30..6fc6a94a0a 100644 --- a/input/test/caps.ly +++ b/input/test/caps.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Capital Letters You can set the font to use small caps. diff --git a/input/test/cautionaries.ly b/input/test/cautionaries.ly index d58cbc403a..6017bc52d8 100644 --- a/input/test/cautionaries.ly +++ b/input/test/cautionaries.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header{ texidoc="@cindex Cautionary Accidentals LilyPond can display cautionary accidentals in different ways. diff --git a/input/test/chord-names-german.ly b/input/test/chord-names-german.ly index 81aa0620aa..0983328780 100644 --- a/input/test/chord-names-german.ly +++ b/input/test/chord-names-german.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Chord Names German By setting @code{ChordNames.chordRootNamer}, the root diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly index 2fce34c306..ba9ad70401 100644 --- a/input/test/chord-names-jazz.ly +++ b/input/test/chord-names-jazz.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { @@ -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) @@ -98,7 +98,7 @@ jazzAltProperties = \sequential { \property ChordNames.majorSevenSymbol = #whiteTriangleMarkup - \property ChordNames.chordNameSeparator = #(make-simple-markup "/") + \property ChordNames.chordNameSeparator = #(make-simple@\markup "/") \property ChordNames.chordNameExceptionsFull = #efullJazzAlt \property ChordNames.chordNameExceptionsPartial = #epartialJazzAlt \property ChordNames.chordNameFunction = #jazz-chord-names diff --git a/input/test/chord-names-no-inversions.ly b/input/test/chord-names-no-inversions.ly index 49bd37c426..bdbc9d0823 100644 --- a/input/test/chord-names-no-inversions.ly +++ b/input/test/chord-names-no-inversions.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc= "@cindex Chord Names No Inversions Chord names don't attempt to find inversions and bass notes. " } diff --git a/input/test/chords-without-melody.ly b/input/test/chords-without-melody.ly index 9707c6f683..474c8dd026 100644 --- a/input/test/chords-without-melody.ly +++ b/input/test/chords-without-melody.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \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 3ba41bb409..ded15d04da 100644 --- a/input/test/clef-8-syntax.ly +++ b/input/test/clef-8-syntax.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 5ee96d22fd..aaa45082ab 100644 --- a/input/test/clef-end-of-line.ly +++ b/input/test/clef-end-of-line.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Clef End of Line diff --git a/input/test/clef-manual-control.ly b/input/test/clef-manual-control.ly index ca094e015f..2bc6bd59ad 100644 --- a/input/test/clef-manual-control.ly +++ b/input/test/clef-manual-control.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header{ texidoc = " @cindex Clef Manual Control diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly index c9d33a42f6..6e28ba7353 100644 --- a/input/test/coriolan-margin.ly +++ b/input/test/coriolan-margin.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % Ugh, we need to override some LaTeX titling stuff diff --git a/input/test/count-systems.ly b/input/test/count-systems.ly index cebde02432..57b425f325 100644 --- a/input/test/count-systems.ly +++ b/input/test/count-systems.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="@cindex Count Systems diff --git a/input/test/crescendi.ly b/input/test/crescendi.ly index 96b31bdd94..83fb68eb72 100644 --- a/input/test/crescendi.ly +++ b/input/test/crescendi.ly @@ -1,17 +1,17 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="@cindex Crescendi LilyPond can print crescendi in a number of different ways. " } \score{ \notes\relative c''{ -a1\fff\> a-\pp-\! -a\< a-\! +a1\fff\> a\pp\! +a\< a\! \property Voice.crescendoText = \markup { \italic \bold "cresc." } \property Voice.crescendoSpanner = #'dashed-line -a-\mf\< a a-\! -a\< a-\! +a\mf\< a a\! +a\< a\! } \paper{ raggedright = ##t diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly index 872fe16edc..c523c9d969 100644 --- a/input/test/cue-notes.ly +++ b/input/test/cue-notes.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % TODO: check to see if this example can be simplified using \small % or \tiny. \header { texidoc = "@cindex Cue Notes @@ -29,7 +29,7 @@ Cue notes should be set in smaller type. " \property Voice.Beam \override #'space-function = #(lambda (beam mult) (* 0.8 (Beam::space_function beam mult))) - r8^"Bsn." c'8 f'8-[ f'8] + r8^"Bsn." c'8 f'8[ f'8] % note: the clef should be cancelled from the cue. % this is under debate; I don't think it should. - Graham diff --git a/input/test/divisiones.ly b/input/test/divisiones.ly index 4863632e06..70fef04d79 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.0" +\version "1.9.1" \include "gregorian-init.ly" @@ -19,26 +19,26 @@ Choices are @code{divisioMinima}, @code{divisioMaior} \property Voice.TextScript \set #'padding = #3 \property Staff.BarLine \override #'transparent = ##t \property Voice.Stem \override #'transparent = ##t - g4( a-) g e( f-) e + g4( a) g e( f) e ^\markup { "divisio minima" } \divisioMinima - g4( a-) g e( f-) e + g4( a) g e( f) e ^\markup { "divisio maior" } \divisioMaior - g4( a-) g e( f-) e + g4( a) g e( f) e ^\markup { "divisio maxima" } \divisioMaxima - g4( a-) g e( f-) e + g4( a) g e( f) e ^\markup { "finalis" } \finalis - g4( a-) g e( f-) e + g4( a) g e( f) e ^\markup { "virgula" } \virgula - g4( a-) g e( f-) e + g4( a) g e( f) e ^\markup { "caesura" } \caesura - g4( a-) g e( f-) e + g4( a) g e( f) e } \context Lyrics = lyrics \lyrics { Blah blub, blah blam. diff --git a/input/test/drarn-slurs.ly b/input/test/drarn-slurs.ly index 90763d3494..b98c25f6ac 100644 --- a/input/test/drarn-slurs.ly +++ b/input/test/drarn-slurs.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % possible rename to slurs-? % TODO: find out what drarn means, and if there's an overlap with drarn.ly \header{ @@ -11,7 +11,7 @@ Slurs can be forced to always attach to note heads. fragment = \notes { \property Voice.Slur \set #'direction = #1 \property Voice.Slur \set #'attachment = #'(head . head) - g''16(g-)(g-)(g-)(d'-)(d-)(d-)(d-) + g''16(g)(g)(g)(d')(d)(d)(d) } \paper { raggedright = ##t} diff --git a/input/test/drarn.ly b/input/test/drarn.ly index 7f97c5b589..25f0575c7f 100644 --- a/input/test/drarn.ly +++ b/input/test/drarn.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{texidoc="@cindex Drarn You can attach slurs and ties to noteheads. " } @@ -12,14 +12,14 @@ You can attach slurs and ties to noteheads. \property Voice.Tie \set #'direction = #1 \property Voice.Slur \set #'direction = #1 \property Voice.Slur \set #'attachment = #'(head . head) - c8~c(c-) + c8~c(c) } \context Voice=two \relative c'' { \property Voice.Stem \set #'direction = #-1 \property Voice.Tie \set #'direction = #-1 \property Voice.Slur \set #'direction = #-1 \property Voice.Slur \set #'attachment = #'(head . head) - a8(a-)-~a + a8(a)~a } > \paper { linewidth = 40*\staffspace diff --git a/input/test/dynamic-absolute-volume.ly b/input/test/dynamic-absolute-volume.ly index eabdf22eb1..21c88addf4 100644 --- a/input/test/dynamic-absolute-volume.ly +++ b/input/test/dynamic-absolute-volume.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Dynamic Absolute Volume Absolute dynamics have effect in MIDI files. @@ -10,13 +10,13 @@ Absolute dynamics have effect in MIDI files. \score{ \notes\relative c''{ %segfault in engraver -a1-\ppp -a1-\pp -a-\p -a-\mp -a-\mf -a-\f -a-\ff +a1\ppp +a1\pp +a\p +a\mp +a\mf +a\f +a\ff a\fff a\sf } diff --git a/input/test/dynamic-extra.ly b/input/test/dynamic-extra.ly index 8923bbe151..4814204ada 100644 --- a/input/test/dynamic-extra.ly +++ b/input/test/dynamic-extra.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % probably should be merged into refman. \header{ texidoc = "@cindex Dynamic Piu Forte @@ -9,11 +9,11 @@ piuf = \markup { \italic "pi\\`u" \dynamic "f" } \score{ \notes\relative c''{ - c-\piuf + c\piuf c - c2\< c2-\! + c2\< c2\! - c2\< c2-\! + c2\< c2\! } \paper{raggedright = ##t} } diff --git a/input/test/embedded-postscript.ly b/input/test/embedded-postscript.ly index 7be56a9254..e9f91f46c0 100644 --- a/input/test/embedded-postscript.ly +++ b/input/test/embedded-postscript.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 db2ae3532d..c6c07ad63a 100644 --- a/input/test/embedded-scm.ly +++ b/input/test/embedded-scm.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % 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 95024426d1..ff00ad55ca 100644 --- a/input/test/embedded-tex.ly +++ b/input/test/embedded-tex.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 2c4921dac5..f057ae5090 100644 --- a/input/test/explicit.ly +++ b/input/test/explicit.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \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 9a5a7d7de4..fbbfd9d8c9 100644 --- a/input/test/extra-offset.ly +++ b/input/test/extra-offset.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 39128f0536..fbae22ce51 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % definately wil be renamed to something. %{ (Message vers:9) diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly index 5175231377..c1b82bfb84 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.0" +\version "1.9.1" %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 fd0d920f93..500adcd757 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.0" +\version "1.9.1" % MERGED: stuff from follow-break.ly to follow-thread.ly % followVoice: connect note heads with line when thread switches staff diff --git a/input/test/force-hshift.ly b/input/test/force-hshift.ly index 8bebfa9659..2e029f61b5 100644 --- a/input/test/force-hshift.ly +++ b/input/test/force-hshift.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc="@cindex Force hshift Force hshift to override collisions. " } diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index 62246421c7..e3d6aad448 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="@cindex Gourlay diff --git a/input/test/gregorian-scripts.ly b/input/test/gregorian-scripts.ly index 20e1648e59..0b8bd106b6 100644 --- a/input/test/gregorian-scripts.ly +++ b/input/test/gregorian-scripts.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { title = "Gregorian Scripts" texidoc = "@cindex Gregorian Scripts @@ -25,13 +25,13 @@ FIXME: padding/minimum-distance is fragile. \context VaticanaVoice { \property VaticanaVoice.Script \set #'padding = #-0.5 \notes { - a-\ictus - a-\circulus - a-\semicirculus - a-\accentus + a\ictus + a\circulus + a\semicirculus + a\accentus %{ %% TODO: augmentum: - a-\augmentum + a\augmentum \[ \augmentumInitium b \flexa a \augmentumFinis \] %} diff --git a/input/test/harmonic.ly b/input/test/harmonic.ly index 8e155245c1..7a4479357c 100644 --- a/input/test/harmonic.ly +++ b/input/test/harmonic.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc ="@cindex Artificial Harmonics For stringed instruments, artificial harmonics are notated with diff --git a/input/test/header-ifelse.ly b/input/test/header-ifelse.ly index c589736047..cbbde85227 100644 --- a/input/test/header-ifelse.ly +++ b/input/test/header-ifelse.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" #(define (my-ly-version) diff --git a/input/test/hshift.ly b/input/test/hshift.ly index 9734295576..c7629a7cc9 100644 --- a/input/test/hshift.ly +++ b/input/test/hshift.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Horizontal Shift You can manually shift notes horizontally. " } diff --git a/input/test/hymn.ly b/input/test/hymn.ly index 3ba2e5a546..e95229d97c 100644 --- a/input/test/hymn.ly +++ b/input/test/hymn.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = " @@ -14,13 +14,13 @@ texts, so they should be switched off. \time 4/4 \context Voice=one \partcombine Voice \context Thread=one \notes\relative c'' { - a4 c4.(g8-) a4 | - g4 e' g(f-) | + a4 c4.(g8) a4 | + g4 e' g(f) | b, a c2 } \context Thread=two \notes\relative c'' { - g4 e4.(d8-) c4 | - g'4 c, e(f-) | + g4 e4.(d8) c4 | + g'4 c, e(f) | d2 a } > diff --git a/input/test/improv.ly b/input/test/improv.ly index 11550a97d7..f948694e8c 100644 --- a/input/test/improv.ly +++ b/input/test/improv.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = @@ -24,9 +24,9 @@ global = \notes { s1*3 \bar "|." } \context Staff \notes < \context SquashVoice = impro { \global } \context Voice = melo \transpose c c' { - e8 e g a a16(bes-)(a8-) g \improOn e8 + e8 e g a a16(bes)(a8) g \improOn e8 ~e2~e8 f4 fis8 - ~fis2 \improOff a16(bes-) a8 g e + ~fis2 \improOff a16(bes) a8 g e } > > diff --git a/input/test/incipit.ly b/input/test/incipit.ly index 0e474a3fc7..6677642c8c 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Incipit This shows how to make an ``incipit'' to indicate scordatora tuning of a violin part, using the clefStyle property. @@ -33,7 +33,7 @@ violin = \notes\relative c''{ \clef treble a4. b8 c4 fis | -V gis~ gis8 fis16^\trill (e-) b8 c +V gis~ gis8 fis16^\trill (e) b8 c <{ a d}\\ { es,4}>| } diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly index d26f7043db..58358b1c65 100644 --- a/input/test/instrument-name-grandstaff.ly +++ b/input/test/instrument-name-grandstaff.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Instrument Name Grandstaff You can name the whole grandstaff in addition to individual staffs. " } diff --git a/input/test/ly2dvi-testpage.ly b/input/test/ly2dvi-testpage.ly index 6b150d962e..2f68490423 100644 --- a/input/test/ly2dvi-testpage.ly +++ b/input/test/ly2dvi-testpage.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % MERGE with title.ly -gp %{ diff --git a/input/test/maximum-rest-count.ly b/input/test/maximum-rest-count.ly index 90472319a2..e5340ba10e 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.0" +\version "1.9.1" % possible rename to rest-foo \header { texidoc = "@cindex Rest Collision Count diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly index 5fc0992abe..8e59687e1d 100644 --- a/input/test/mensural-ligatures.ly +++ b/input/test/mensural-ligatures.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % TODO: % check with ancient- stuff. rename, merge, something. -gp diff --git a/input/test/midi-scales.ly b/input/test/midi-scales.ly index f26c00bbce..af72243593 100644 --- a/input/test/midi-scales.ly +++ b/input/test/midi-scales.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % 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 ae3ca126fb..acf2460a20 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.0" +\version "1.9.1" % possible rename to scheme- or something like that. -gp \header { texidoc= "@cindex Scheme Manual Accidentals Positions of accidentals may be manually set. This diff --git a/input/test/move-specific-text.ly b/input/test/move-specific-text.ly index 8f01941020..d3138d529f 100644 --- a/input/test/move-specific-text.ly +++ b/input/test/move-specific-text.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % 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 @@ -11,7 +11,7 @@ move text around. " } \score { \notes\relative c''' { \property Voice.Stem \set #'direction = #1 - \outputproperty #(make-text-checker (make-simple-markup "m.d.")) + \outputproperty #(make-text-checker (make-simple@\markup "m.d.")) #'extra-offset = #'(-3.5 . -4.5) a^2^"m.d." } diff --git a/input/test/music-box.ly b/input/test/music-box.ly index f5aa85376e..249dd85ea4 100644 --- a/input/test/music-box.ly +++ b/input/test/music-box.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \include "deutsch.ly" % possible rename to scheme- something. -gp % TODO: ask if it needs to have so many empty bars in the middle. -gp @@ -62,7 +62,7 @@ using Scheme functions to avoid typing work. " } -\version "1.9.0" +\version "1.9.1" pat = \notes \transpose c c' \repeat unfold 2 { < { \context Staff=up {r8 e16 f g e f g } } @@ -75,7 +75,7 @@ pat = \notes \transpose c c' \repeat unfold 2 { 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 } diff --git a/input/test/music-creation.ly b/input/test/music-creation.ly index 742889b1be..e26894fa56 100644 --- a/input/test/music-creation.ly +++ b/input/test/music-creation.ly @@ -1,4 +1,4 @@ -\version "1.9.0" %% or actually: 1.7.1 ... +\version "1.9.1" %% 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 767954b6b5..5795081389 100644 --- a/input/test/nested-groups.ly +++ b/input/test/nested-groups.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header{ texidoc="@cindex Nested Staff Groups LilyPond can print nested groups of staffs. " diff --git a/input/test/no-bar-lines.ly b/input/test/no-bar-lines.ly index 989191ec17..480af1c4e9 100644 --- a/input/test/no-bar-lines.ly +++ b/input/test/no-bar-lines.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % 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 fe2e01ae76..d8dd600f4c 100644 --- a/input/test/no-staff.ly +++ b/input/test/no-staff.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % 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 9be0670696..22164c10b2 100644 --- a/input/test/octave-duplicate.ly +++ b/input/test/octave-duplicate.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc="@cindex Octave Doubling Octave doubling parts of music. " } diff --git a/input/test/ossia.ly b/input/test/ossia.ly index d06a974b43..69436190f7 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % pretty much a duplicate of extra-staff.ly. candidate for merge or delete. -gp \header { texidoc = "@cindex Ossia diff --git a/input/test/part-combine-moments.ly b/input/test/part-combine-moments.ly index 28b7a88cef..78d8bc6210 100644 --- a/input/test/part-combine-moments.ly +++ b/input/test/part-combine-moments.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % TODO: this example has a ton of text for very little output. % Is it all needed? -gp % should this go to regression or be delete'd? -gp diff --git a/input/test/part-combine-staff.ly b/input/test/part-combine-staff.ly index 9a5cdccb17..2b0f3d70ca 100644 --- a/input/test/part-combine-staff.ly +++ b/input/test/part-combine-staff.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Part Combine Staff You can combine parts on two staffs, as well as two voices. " } diff --git a/input/test/part-combine.ly b/input/test/part-combine.ly index f2a0a8fb2b..c4bab60285 100644 --- a/input/test/part-combine.ly +++ b/input/test/part-combine.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="@cindex Part Combine In orchestral scores and hymns, voices are traditionally combined onto diff --git a/input/test/partial-blank.ly b/input/test/partial-blank.ly index c4214b4296..26667edea6 100644 --- a/input/test/partial-blank.ly +++ b/input/test/partial-blank.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % 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) diff --git a/input/test/pedal.ly b/input/test/pedal.ly index ca5024d280..16eab39aa4 100644 --- a/input/test/pedal.ly +++ b/input/test/pedal.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc = "@cindex Pedal Piano pedal symbols merge stop and start. The strings are configurable. @@ -10,18 +10,18 @@ Text style, bracket style, and a mixture of both are supported. " \context Staff \notes\relative c'{ c4 d e f g - -\sustainDown b c - c, d16-[ c c c] e-[ e -\sustainUp -\sustainDown e e ] f4 -\sustainUp - g-\sustainDown b -\sustainUp c + \sustainDown b c + c, d16[ c c c] e[ e \sustainUp \sustainDown e e ] f4 \sustainUp + g\sustainDown b \sustainUp c \property Staff.pedalSustainStrings = #'("-" "-P" "P") \property Staff.SustainPedal \override #'padding = #-2 - c, -\sustainDown d e -\sustainUp -\sustainDown f - -\sustainUp g b c + c, \sustainDown d e \sustainUp \sustainDown f + \sustainUp g b c \property Staff.pedalSustainStyle = #'bracket - c4 d e -\sustainDown b c c, -\sustainUp -\sustainDown d8-[ c] e8-[ e -\sustainUp -\sustainDown] f4 d - -\sustainUp g -\sustainDown b b, -\sustainUp c' + c4 d e \sustainDown b c c, \sustainUp \sustainDown d8[ c] e8[ e \sustainUp \sustainDown] f4 d + \sustainUp g \sustainDown b b, \sustainUp c' \property Staff.pedalUnaCordaStyle = #'mixed diff --git a/input/test/phrasing-slur-height.ly b/input/test/phrasing-slur-height.ly index 1fe78771d9..141998b181 100644 --- a/input/test/phrasing-slur-height.ly +++ b/input/test/phrasing-slur-height.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="@cindex Phrasing Slur Height Make PhrasingSlur higher, to avoid colission from other slurs. " } @@ -7,8 +7,8 @@ Make PhrasingSlur higher, to avoid colission from other slurs. " \score { \context Staff = melody \notes\relative c''{ \property Staff.PhrasingSlur \override #'height-limit = #8.0 - c8 \( (d e f-) g ( a b c-) - | c ( b a g-) f ( e d c-)-\) + c8 \( (d e f) g ( a b c) + | c ( b a g) f ( e d c)\) } \paper { raggedright = ##t } } diff --git a/input/test/polymetric-differing-notes.ly b/input/test/polymetric-differing-notes.ly index 0dc4142341..023adba623 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.0" +\version "1.9.1" \header{ texidoc=" @@ -55,15 +55,15 @@ what happens on the inside: a 3/4 time signature is combined with a \time 3/4 \property Staff.timeSignatureFraction= #'(9 . 8) \apply #display-music \apply #(scale-music-function '(2 . 3)) - \repeat unfold 6 { c8-[ c c-] } + \repeat unfold 6 { c8[ c c] } } \context Staff= DS { \time 3/4 \property Staff.timeSignatureFraction= #'(10 . 8) \apply #display-music \apply #(scale-music-function '(3 . 5)) - { \repeat unfold 2 { c8-[ c c-] } - \repeat unfold 2 { c8-[ c-] } + { \repeat unfold 2 { c8[ c c] } + \repeat unfold 2 { c8[ c] } | c4. c4. \times 2/3 { c8 c c } c4 } } > diff --git a/input/test/polymetric.ly b/input/test/polymetric.ly index 01aaa436e9..d9bf261834 100644 --- a/input/test/polymetric.ly +++ b/input/test/polymetric.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="@cindex Time Signature Multiple diff --git a/input/test/preset-extent.ly b/input/test/preset-extent.ly index 6c85fbcc17..06bcef0b77 100644 --- a/input/test/preset-extent.ly +++ b/input/test/preset-extent.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = " @cindex Preset Extent diff --git a/input/test/repeat-manual.ly b/input/test/repeat-manual.ly index a7c5f5a22f..7540bf74e6 100644 --- a/input/test/repeat-manual.ly +++ b/input/test/repeat-manual.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 1b494420d1..64aa711378 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.0" +\version "1.9.1" \header{ texidoc=" diff --git a/input/test/repeat.ly b/input/test/repeat.ly index 322940417b..28d85d5ba7 100644 --- a/input/test/repeat.ly +++ b/input/test/repeat.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % possible rename to lyric-repeat or repeat-lyric. \header{ texidoc = "@cindex Repeat Lyrics You can use alternate lyrics as well as alternate notes for repeats. " diff --git a/input/test/rest-dot-positions.ly b/input/test/rest-dot-positions.ly index e31096e827..63d117f706 100644 --- a/input/test/rest-dot-positions.ly +++ b/input/test/rest-dot-positions.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % candidate for regression. -gp \header { texidoc = "@cindex Rest Dot Positions This file tests dotted rests. " } diff --git a/input/test/rests.ly b/input/test/rests.ly index 1be79f3506..f50ee2f64b 100644 --- a/input/test/rests.ly +++ b/input/test/rests.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Rests diff --git a/input/test/reverse-music.ly b/input/test/reverse-music.ly index 544df0a09e..77db66b19d 100644 --- a/input/test/reverse-music.ly +++ b/input/test/reverse-music.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % 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 5ebd3647aa..1d0c13e3ef 100644 --- a/input/test/rhythm-excercise.ly +++ b/input/test/rhythm-excercise.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \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 b42aab957e..a47412253a 100644 --- a/input/test/scales-greek.ly +++ b/input/test/scales-greek.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Scales Greek Show different scales." diff --git a/input/test/scheme-interactions.ly b/input/test/scheme-interactions.ly index f405459700..cbc859e495 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.0" +\version "1.9.1" \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 14edef62f2..5cb8f8919a 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.0" +\version "1.9.1" \header { texidoc = "@cindex Script Abbreviations Some scripts may be entered using an abbreviation. @@ -19,8 +19,8 @@ Some scripts may be entered using an abbreviation. c''4-+_"c-+" s4 c''4-|_"c-|" s4 c''4->_"c->" s4 - c''4-^_"c-\\^{ }" s4 - c''4-__"c-\_" s4 + c''4-^_"c\\^{ }" s4 + c''4-__"c\_" s4 } } diff --git a/input/test/script-chart.ly b/input/test/script-chart.ly index 43127d5971..8038f93926 100644 --- a/input/test/script-chart.ly +++ b/input/test/script-chart.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % this chart is used in the manual too. @@ -18,19 +18,19 @@ A chart showing all feta scripts. \property Score.timing = ##f \property Score.barAlways = ##t \property Staff.BarLine \override #'transparent = ##t - c''-\accent c''-\marcato c''-\staccatissimo - c''-\staccato c''-\tenuto c''-\portato - c''-\upbow c''-\downbow c''-\flageolet - c''-\thumb c''^\lheel c''-\rheel - c''^\ltoe c''-\rtoe c''-\open - c''-\stopped c''-\turn c''-\reverseturn - c''-\trill c''-\prall c''-\mordent - c''-\prallprall c''-\prallmordent c''-\upprall - c''-\downprall c''-\upmordent c''-\downmordent - c''-\pralldown c''-\prallup c''-\lineprall - c''-\signumcongruentiae c''-\shortfermata c''-\fermata - c''-\longfermata c''-\verylongfermata c''-\segno - c''-\coda c''-\varcoda + c''\accent c''\marcato c''\staccatissimo + c''\staccato c''\tenuto c''\portato + c''\upbow c''\downbow c''\flageolet + c''\thumb c''^\lheel c''\rheel + c''^\ltoe c''\rtoe c''\open + c''\stopped c''\turn c''\reverseturn + c''\trill c''\prall c''\mordent + c''\prallprall c''\prallmordent c''\upprall + c''\downprall c''\upmordent c''\downmordent + c''\pralldown c''\prallup c''\lineprall + c''\signumcongruentiae c''\shortfermata c''\fermata + c''\longfermata c''\verylongfermata c''\segno + c''\coda c''\varcoda } \context Lyrics \lyrics { accent__ marcato__ staccatissimo__ diff --git a/input/test/script-priority.ly b/input/test/script-priority.ly index 20e96ed0c8..3fc020eb35 100644 --- a/input/test/script-priority.ly +++ b/input/test/script-priority.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 7212d41874..ce4bd661c4 100644 --- a/input/test/script-stack.ly +++ b/input/test/script-stack.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 222e4095ec..feb6e20488 100644 --- a/input/test/separate-staccato.ly +++ b/input/test/separate-staccato.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % possible rename. -gp \header { texidoc="@cindex Seperate Staccato diff --git a/input/test/slur-attachment-override.ly b/input/test/slur-attachment-override.ly index 98f568ab68..62481132e7 100644 --- a/input/test/slur-attachment-override.ly +++ b/input/test/slur-attachment-override.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc="@cindex Slur Attachment Override @@ -15,9 +15,9 @@ fragment = \notes { \property Voice.autoBeaming = ##f \property Voice.Stem \set #'direction = #1 \property Voice.Slur \set #'direction = #1 - d'32( f'4 d8..-) + d'32( f'4 d8..) \property Voice.Slur \set #'attachment = #'(stem . stem) - d,32( f'4 d8.-) + d,32( f'4 d8.) } diff --git a/input/test/slur-beautiful.ly b/input/test/slur-beautiful.ly index 7dd4dda5d5..7e9e9f1870 100644 --- a/input/test/slur-beautiful.ly +++ b/input/test/slur-beautiful.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % 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 @@ -15,10 +15,10 @@ one. You can indicate this preference by increasing the \score { \notes {\relative c' { \stemDown \slurUp - c16-( a' f' a a f a, c,-) - c-( a' f' a a f d, c-) + c16( a' f' a a f a, c,) + c( a' f' a a f d, c) \property Voice.Slur \override #'beautiful = #5.0 - c-( a' f' a a f d, c-) + c( a' f' a a f d, c) }} \paper { raggedright = ##t } } diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly index 83725490e9..5178aea37b 100644 --- a/input/test/slur-dash.ly +++ b/input/test/slur-dash.ly @@ -1,18 +1,18 @@ -\version "1.9.0" +\version "1.9.1" \header {texidoc = "@cindex Slur, dotted You can print different kinds of slurs (dotted, dashed, etc). " } \score{ \notes{ - c( d e c-) | + c( d e c) | \slurDotted - c( d e c-) | + c( d e c) | \slurSolid - c( d e c-) | + c( d e c) | \property Voice. Slur \set #'dashed = #0.0 - c( d e c-) | + c( d e c) | \slurSolid - c( d e c-) | + c( d e c) | } \paper{ raggedright=##t } % indent = 0.0\pt diff --git a/input/test/slur-minimum-length.ly b/input/test/slur-minimum-length.ly index f99482d26d..c9a98379d1 100644 --- a/input/test/slur-minimum-length.ly +++ b/input/test/slur-minimum-length.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Slur Minimum Length You can set the minimum length of a slur. " @@ -9,7 +9,7 @@ You can set the minimum length of a slur. " \notes\relative c''{ \time 2/4 \property Voice.Slur \set #'minimum-length = #40 - c(c-) + c(c) c~c\break } } diff --git a/input/test/slur-shape.ly b/input/test/slur-shape.ly index 35f4a2851a..71d939aa0c 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.0" +\version "1.9.1" \header { texidoc = "Slurs become flatter as they grow longer. " @@ -12,33 +12,33 @@ x = { \score { \context Staff \notes\relative c < - \context Voice=va { \x f(f-) } - \context Voice=vb { \x g(s4g-) } - \context Voice=vc { \x a(s4*2a-) } - \context Voice=vd { \x b(s4*3b-) } - \context Voice=ve { \x c(s4*4c-) } - \context Voice=vf { \x d(s4*5d-) } - \context Voice=vg { \x e(s4*6e-) } - \context Voice=vh { \x f(s4*7f-) } - \context Voice=vi { \x g(s4*8g-) } - \context Voice=vj { \x a(s4*9a-) } - \context Voice=vk { \x b(s4*10b-) } - \context Voice=vl { \x c(s4*11c-) } - \context Voice=vm { \x d(s4*12d-) } - \context Voice=vn { \x e(s4*13e-) } - \context Voice=vo { \x f(s4*14f-) } - \context Voice=vp { \x g(s4*15g-) } - \context Voice=vq { \x a(s4*16a-) } - \context Voice=vr { \x b(s4*17b-) } - \context Voice=vs { \x c(s4*18c-) } - \context Voice=vt { \x d(s4*19d-) } - \context Voice=vu { \x e(s4*20e-) } - \context Voice=vv { \x f(s4*21f-) } - \context Voice=vw { \x g(s4*22g-) } - \context Voice=vx { \x a(s4*23a-) } - \context Voice=vy { \x b(s4*24b-) } - \context Voice=vz { \x c(s4*25c-) } - \context Voice=wa { \x d(s4*26d-) } + \context Voice=va { \x f(f) } + \context Voice=vb { \x g(s4g) } + \context Voice=vc { \x a(s4*2a) } + \context Voice=vd { \x b(s4*3b) } + \context Voice=ve { \x c(s4*4c) } + \context Voice=vf { \x d(s4*5d) } + \context Voice=vg { \x e(s4*6e) } + \context Voice=vh { \x f(s4*7f) } + \context Voice=vi { \x g(s4*8g) } + \context Voice=vj { \x a(s4*9a) } + \context Voice=vk { \x b(s4*10b) } + \context Voice=vl { \x c(s4*11c) } + \context Voice=vm { \x d(s4*12d) } + \context Voice=vn { \x e(s4*13e) } + \context Voice=vo { \x f(s4*14f) } + \context Voice=vp { \x g(s4*15g) } + \context Voice=vq { \x a(s4*16a) } + \context Voice=vr { \x b(s4*17b) } + \context Voice=vs { \x c(s4*18c) } + \context Voice=vt { \x d(s4*19d) } + \context Voice=vu { \x e(s4*20e) } + \context Voice=vv { \x f(s4*21f) } + \context Voice=vw { \x g(s4*22g) } + \context Voice=vx { \x a(s4*23a) } + \context Voice=vy { \x b(s4*24b) } + \context Voice=vz { \x c(s4*25c) } + \context Voice=wa { \x d(s4*26d) } > \paper { raggedright = ##t diff --git a/input/test/slur-ugly.ly b/input/test/slur-ugly.ly index f4275f2565..6974532d8a 100644 --- a/input/test/slur-ugly.ly +++ b/input/test/slur-ugly.ly @@ -1,12 +1,12 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc="@cindex Slur Ugly You can get ugly slurs, if you want. " } baseWalk = \notes \relative c { - d,8( a' d f a d f d a f d a-) + d,8( a' d f a d f d a f d a) } \score { diff --git a/input/test/smart-transpose.ly b/input/test/smart-transpose.ly index c3c504df00..05ed0cda9c 100644 --- a/input/test/smart-transpose.ly +++ b/input/test/smart-transpose.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc="@cindex Smart Transpose diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index ce3cd47469..1e5957eb46 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.0" +\version "1.9.1" % more yummy regression goodness. -gp \header { texidoc = " @@ -16,11 +16,11 @@ texidoc = " \context Voice = VA { \stemUp\slurUp\tieUp e4 dis4 e2 } \context Voice = VB { \stemDown\slurDown\tieDown - cis8-[ a] fis-[ b] gis2 } + cis8[ a] fis[ b] gis2 } {\key e \major } > \context Staff = SB { \clef "bass" \key e \major - a,,16-[ e dis e] b'8-[ b,] e16-[ e, gis b] e4 + a,,16[ e dis e] b'8[ b,] e16[ e, gis b] e4 } > diff --git a/input/test/spanner-after-break-tweak.ly b/input/test/spanner-after-break-tweak.ly index 8bbcefbab5..a01d4796b8 100644 --- a/input/test/spanner-after-break-tweak.ly +++ b/input/test/spanner-after-break-tweak.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Spanner after break diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly index 0dbdf37283..8b57de1966 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.0" +\version "1.9.1" \header{texidoc = "@cindex Staff Bracket Here's an example of staff brackets. " diff --git a/input/test/staff-container.ly b/input/test/staff-container.ly index 485a5b3192..4337550654 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.0" +\version "1.9.1" \header { diff --git a/input/test/staff-lines.ly b/input/test/staff-lines.ly index abfdb46d73..a5f3e51107 100644 --- a/input/test/staff-lines.ly +++ b/input/test/staff-lines.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc="@cindex Staff Lines Staff symbol property set workaround. " diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index 94d2a52575..2df82c477d 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.0" +\version "1.9.1" \header { texidoc = "@cindex Staff Size @@ -19,10 +19,10 @@ Setting staff sizes is a little clumsy. There are two options: using \dynamicUp\stemDown %\key gis \major - c8 d e-[ f g a] b c -\ff + c8 d e[ f g a] b c \ff } -\context Staff = SB \relative c'' { \dynamicDown c,,4 -\ff c c c } +\context Staff = SB \relative c'' { \dynamicDown c,,4 \ff c c c } \context Staff = SC { \context Staff \outputproperty #(make-type-checker 'staff-symbol-interface) #'staff-space = #0.8 diff --git a/input/test/staff-space.ly b/input/test/staff-space.ly index 7b89a8be4d..31c565a0fa 100644 --- a/input/test/staff-space.ly +++ b/input/test/staff-space.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc ="@cindex Staff Space Setting staff space on a staff. " @@ -11,9 +11,9 @@ Setting staff space on a staff. " \context Staff = down { c4 - <>8-[ + <>8[ e] - f-[ c'] + f[ c'] } > \paper { \translator { diff --git a/input/test/stem-centered.ly b/input/test/stem-centered.ly index 83525aec83..36f4500dcd 100644 --- a/input/test/stem-centered.ly +++ b/input/test/stem-centered.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % 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 fd3c0c4dfe..39c5d93f24 100644 --- a/input/test/stem-cross-staff.ly +++ b/input/test/stem-cross-staff.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Stem Cross Staff There is no support for putting chords across staves. diff --git a/input/test/stem-extend.ly b/input/test/stem-extend.ly index 7123d55e7d..38cbdd87b5 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.0" +\version "1.9.1" \header { texidoc = "@cindex Stem Extend You can stop LilyPond from extending stems to the center line. " diff --git a/input/test/stem-length.ly b/input/test/stem-length.ly index 168ac65841..8d2b7eb0f7 100644 --- a/input/test/stem-length.ly +++ b/input/test/stem-length.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 15e182c2d4..7e6b241648 100644 --- a/input/test/tablature-hammer.ly +++ b/input/test/tablature-hammer.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header {texidoc = "@cindex Tablature hammer You can fake a hammer in tablature with slurs. " } @@ -7,9 +7,9 @@ You can fake a hammer in tablature with slurs. " \score{ \context TabStaff < \notes\relative c''{ - c(d-) - d(d-) - d(c-) + c(d) + d(d) + d(c) } > \paper{ raggedright = ##t} diff --git a/input/test/tablature.ly b/input/test/tablature.ly index 5599815696..65dcfb22eb 100644 --- a/input/test/tablature.ly +++ b/input/test/tablature.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header{ texidoc = "@cindex Tabulature A sample tablature, with both normal staff and tab. diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly index 7566dbe49a..d0c9bb60a0 100644 --- a/input/test/text-spanner.ly +++ b/input/test/text-spanner.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % TODO: check about other ottava functions. \header { texidoc = "@cindex Ottava Spanner diff --git a/input/test/textscript.ly b/input/test/textscript.ly index 442d472f25..710d88f037 100644 --- a/input/test/textscript.ly +++ b/input/test/textscript.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Textscript Test font selection and scm text markup. " diff --git a/input/test/tie-sparse.ly b/input/test/tie-sparse.ly index 26df8243dd..d8e714ed90 100644 --- a/input/test/tie-sparse.ly +++ b/input/test/tie-sparse.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc = "@cindex Tie Sparse Setting sparseTies causes only one tie to be diff --git a/input/test/time-signature-double.ly b/input/test/time-signature-double.ly index 9c430f8198..d5ed3f1f9f 100644 --- a/input/test/time-signature-double.ly +++ b/input/test/time-signature-double.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \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 df407f5253..2043ac8c3d 100644 --- a/input/test/time.ly +++ b/input/test/time.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % TODO: This file could be old. Ask about it later. -gp \header { texidoc = "@cindex Time diff --git a/input/test/timing.ly b/input/test/timing.ly index 48784fa785..b6ca6232ca 100644 --- a/input/test/timing.ly +++ b/input/test/timing.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % possible rename to bar-something. \header{ texidoc = "@cindex Bar Length @@ -15,7 +15,7 @@ You can alter the length of bars by setting % \property Score. measurePosition = #(ly:make-moment -1 4) \partial 4 c''4 c4 c4 c2 c1 - \cadenzaOn c8-[ d e f] g-[ a b c b c b c] + \cadenzaOn c8[ d e f] g[ a b c b c b c] \cadenzaOff c4 c4 c4 c4 \property Score. measureLength = #(ly:make-moment 5 4) diff --git a/input/test/title.ly b/input/test/title.ly index 668fd0f6da..e3ce894e56 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" % MERGE with ly2dvi- \header { filename = "title.ly" diff --git a/input/test/to-xml.ly b/input/test/to-xml.ly index efac32d7dd..d0c49c1c66 100644 --- a/input/test/to-xml.ly +++ b/input/test/to-xml.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" fooBar = \notes { < c''4 \\ g'4 > } diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 4c72d50d1c..89b9868a21 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ texidoc = "@cindex Transposition Transposition test file." diff --git a/input/test/trill.ly b/input/test/trill.ly index 634776b1b6..9bfdd7052e 100644 --- a/input/test/trill.ly +++ b/input/test/trill.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \header { texidoc="@cindex Trill Show trill line type. " @@ -18,7 +18,7 @@ Show trill line type. " \property Voice.TextSpanner \set #'style = #'trill \property Voice.TextSpanner \set #'edge-height = #'(0 . 0) \property Voice.TextSpanner \set #'edge-text - = #(cons (make-musicglyph-markup "scripts-trill") "") + = #(cons (make-musicglyph@\markup "scripts-trill") "") a#(ly:export (make-span-event 'TextSpanEvent START)) b c a #(ly:export (make-span-event 'TextSpanEvent STOP)) } \paper { raggedright = ##t} diff --git a/input/test/trills.ly b/input/test/trills.ly index 6d1b2aa674..8aca17afca 100644 --- a/input/test/trills.ly +++ b/input/test/trills.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header { texidoc="@cindex Trills @@ -41,14 +41,14 @@ endHorizScript = { \context GrandStaff < \context Staff=upper \notes\relative c'' { \time 1/4 - c4-\prall + c4\prall \time 3/8 c4.^\lineprall - c4.-\downprall - c4.-\upprall + c4.\downprall + c4.\upprall \time 5/8 - c4-\turn c4.-\upprall - d4-\turn b4.-\downprall + c4\turn c4.\upprall + d4\turn b4.\downprall \time 3/4 b4 c^\turn d \time 1/4 @@ -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 } @@ -107,12 +107,12 @@ endHorizScript = { } \context Staff=lower \notes\relative c'' { % autobeamer has som problems here - d32-[ \repeat unfold 3 { c d } c-] - d8 ~ d32-[\repeat unfold 3 { d32 c } c-] + d32[ \repeat unfold 3 { c d } c] + d8 ~ d32[\repeat unfold 3 { d32 c } c] d32 c b c \repeat unfold 4 { d32 c } b32 c d c \repeat unfold 4 { d32 c } - c32-[-( b a16 b c-)-] - b32-[ \repeat unfold 5 { c d32 } c-] + c32[( b a16 b c)] + b32[ \repeat unfold 5 { c d32 } c] } > > diff --git a/input/test/unfold-all-repeats.ly b/input/test/unfold-all-repeats.ly index be58199a98..28a7cb1a64 100644 --- a/input/test/unfold-all-repeats.ly +++ b/input/test/unfold-all-repeats.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % regression. -gp \header { diff --git a/input/test/vaticana.ly b/input/test/vaticana.ly index 2895a9d0d2..8ae73fa0ac 100644 --- a/input/test/vaticana.ly +++ b/input/test/vaticana.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % possible rename to ancient-something. \header { texidoc = "Ancient Vaticana diff --git a/input/test/version-output.ly b/input/test/version-output.ly index d0d432e2bf..727939e225 100644 --- a/input/test/version-output.ly +++ b/input/test/version-output.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \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 59491682de..bc390a1a1a 100644 --- a/input/test/vertical-extent.ly +++ b/input/test/vertical-extent.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % TODO: huh? what's this file about? -gp \header { texidoc = " diff --git a/input/tutorial/brahms-original.ly b/input/tutorial/brahms-original.ly index 77fc569ce3..3e1e3b8cfc 100644 --- a/input/tutorial/brahms-original.ly +++ b/input/tutorial/brahms-original.ly @@ -1,15 +1,15 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \score { \notes\context PianoStaff < \context Staff = up \relative c'' < { \key d\major - fis4-3_\p-(-~ - fis16 a-)-5 } \\ + fis4-3_\p(~ + fis16 a)-5 } \\ { - fis16-(-\> d b-\! \translator Staff = down - \clef treble g-~ <>8-) } \\ + fis16(\> d b\! \translator Staff = down + \clef treble g~ <>8) } \\ { s16 d' ~ <>4 } diff --git a/input/tutorial/brahms-tweaked.ly b/input/tutorial/brahms-tweaked.ly index c71bf86d04..776aef3cb3 100644 --- a/input/tutorial/brahms-tweaked.ly +++ b/input/tutorial/brahms-tweaked.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \score { \notes\context PianoStaff < \context Staff = up @@ -9,18 +9,18 @@ \once \property Voice.Fingering \override #'extra-offset = #'(-0.3 . -1.8) - fis4-3_\p-(-~ + fis4-3_\p(~ - fis16 a-)^" "^\markup { \finger "5" } } \\ + fis16 a)^" "^\markup { \finger "5" } } \\ { \dynamicUp \property Voice.DynamicLineSpanner \override #'padding = #5.0 \tieUp - fis16-(-\> d b-\! \translator Staff = down + fis16(\> d b\! \translator Staff = down \stemUp - \clef treble g-~ <>8-) } \\ + \clef treble g~ <>8) } \\ { s16 \once \property Voice.Stem \set #'transparent = ##t d' diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index f09f613c47..cb875ca68c 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" \header{ filename = "twinkle-pop.ly" xtitle = "Ah, vous dirais-je, maman " diff --git a/ly/a3-init.ly b/ly/a3-init.ly index 1035f90673..9e857cd464 100644 --- a/ly/a3-init.ly +++ b/ly/a3-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % a3-init.ly hsize = 296.9 \mm diff --git a/ly/a4-init.ly b/ly/a4-init.ly index 39b2ba1e4c..b99eee730c 100644 --- a/ly/a4-init.ly +++ b/ly/a4-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % a4.ly hsize = 210.0 \mm diff --git a/ly/accordion-defs-init.ly b/ly/accordion-defs-init.ly index d962fff7c9..1696122d03 100644 --- a/ly/accordion-defs-init.ly +++ b/ly/accordion-defs-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % Symbols needed to print accordion music % % 2' = T diff --git a/ly/book-init-init.ly b/ly/book-init-init.ly index 79a3438437..c0c63ba244 100644 --- a/ly/book-init-init.ly +++ b/ly/book-init-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.9.0" +\version "1.9.1" \include "declarations-init.ly" diff --git a/ly/catalan.ly b/ly/catalan.ly index bb083511db..dcb1ba84cf 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -73,4 +73,4 @@ -\version "1.9.0" +\version "1.9.1" diff --git a/ly/center-init.ly b/ly/center-init.ly index 837716ba91..d03e79f3dd 100644 --- a/ly/center-init.ly +++ b/ly/center-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.9.0" +\version "1.9.1" \include "declarations-init.ly" diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly index c0576259f1..c12446db3d 100644 --- a/ly/chord-modifiers-init.ly +++ b/ly/chord-modifiers-init.ly @@ -1,32 +1,32 @@ -\version "1.9.0" +\version "1.9.1" \chordmodifiers #default-chord-modifier-list -whiteTriangleMarkup = #(make-override-markup - '(font-family . math) (make-simple-markup "M")) +whiteTriangleMarkup = #(make-override@\markup + '(font-family . math) (make-simple@\markup "M")) -blackTriangleMarkup = #(make-override-markup - '(font-family . math) (make-simple-markup "N")) +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/declarations-init.ly b/ly/declarations-init.ly index 3f160f5e0e..efad98ca01 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -1,6 +1,6 @@ #(ly:set-option 'old-relative) -\version "1.9.0" +\version "1.9.1" breve = \duration #(ly:make-duration -1 0) longa = \duration #(ly:make-duration -2 0 ) maxima = \duration #(ly:make-duration -3 0) diff --git a/ly/deutsch.ly b/ly/deutsch.ly index 721763f3e7..805d4da9a1 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -49,4 +49,4 @@ -\version "1.9.0" +\version "1.9.1" diff --git a/ly/drumpitch-init.ly b/ly/drumpitch-init.ly index 162fdd8358..705b91a89f 100644 --- a/ly/drumpitch-init.ly +++ b/ly/drumpitch-init.ly @@ -5,4 +5,4 @@ ) -\version "1.9.0" +\version "1.9.1" diff --git a/ly/dynamic-scripts-init.ly b/ly/dynamic-scripts-init.ly index 0a520c205c..21657e9c9d 100644 --- a/ly/dynamic-scripts-init.ly +++ b/ly/dynamic-scripts-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % % declare the standard dynamic identifiers. diff --git a/ly/english.ly b/ly/english.ly index 96ec7113c8..71450351ff 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -78,5 +78,5 @@ (bss . ,(ly:make-pitch -1 6 2 )) ) -\version "1.9.0" +\version "1.9.1" diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index bc3c4ae292..636e119dfd 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" @@ -503,7 +503,7 @@ ScoreContext = \translator { %% chord names: chordNameFunction = #ignatzek-chord-names majorSevenSymbol = #whiteTriangleMarkup - chordNameSeparator = #(make-simple-markup "/") + chordNameSeparator = #(make-simple@\markup "/") chordNameExceptions = #ignatzekExceptions chordNoteNamer = #'() chordRootNamer = #note-name->markup @@ -521,8 +521,8 @@ ScoreContext = \translator { tablatureFormat = #fret-number-tablature-format %% - bassFigureFormatFunction = #make-bass-figure-markup - metronomeMarkFormatter = #make-metronome-markup + bassFigureFormatFunction = #make-bass-figure@\markup + metronomeMarkFormatter = #make-metronome@\markup \grobdescriptions #all-grob-descriptions } diff --git a/ly/espanol.ly b/ly/espanol.ly index 3539c3f709..971e8b0899 100644 --- a/ly/espanol.ly +++ b/ly/espanol.ly @@ -58,4 +58,4 @@ -\version "1.9.0" +\version "1.9.1" diff --git a/ly/generate-documentation.ly b/ly/generate-documentation.ly index ca3e5aa1a9..8eb93dfab6 100644 --- a/ly/generate-documentation.ly +++ b/ly/generate-documentation.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % % Running LilyPond on this file generates the documentation diff --git a/ly/generate-interface-doc-init.ly b/ly/generate-interface-doc-init.ly index eda491dc65..c9bbcdc448 100644 --- a/ly/generate-interface-doc-init.ly +++ b/ly/generate-interface-doc-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % % Running LilyPond on this file generates the short interface doc diff --git a/ly/generic-paper-init.ly b/ly/generic-paper-init.ly index 32b9c9c6c3..31559f9b6b 100644 --- a/ly/generic-paper-init.ly +++ b/ly/generic-paper-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \paper { texsetting = "" diff --git a/ly/grace-init.ly b/ly/grace-init.ly index 9b74c3f958..5c1db95bd6 100644 --- a/ly/grace-init.ly +++ b/ly/grace-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" %% %% TODO: these definitions should be read and executed out dynamically diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly index f9a1616b1c..87b7bac7ec 100644 --- a/ly/gregorian-init.ly +++ b/ly/gregorian-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" %%%%%%%% %%%%%%%% shortcuts common for all styles of gregorian chant notation diff --git a/ly/init.ly b/ly/init.ly index 96cc5a7895..bc66f5aaaf 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -5,7 +5,7 @@ #(reset-drum-kit) -\version "1.9.0" +\version "1.9.1" \include "declarations-init.ly" diff --git a/ly/italiano.ly b/ly/italiano.ly index f250e6cb62..63b3457b46 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -48,4 +48,4 @@ (sidd . ,(ly:make-pitch -1 6 2 )) ) -\version "1.9.0" +\version "1.9.1" diff --git a/ly/ledger-init.ly b/ly/ledger-init.ly index 8be0a4c91e..b91d1727db 100644 --- a/ly/ledger-init.ly +++ b/ly/ledger-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % ledger.ly diff --git a/ly/legal-init.ly b/ly/legal-init.ly index 506d51fa70..495aa45040 100644 --- a/ly/legal-init.ly +++ b/ly/legal-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % legal-init.ly hsize = 8.5 \in diff --git a/ly/letter-init.ly b/ly/letter-init.ly index fa7ce3291d..0ca3d92c82 100644 --- a/ly/letter-init.ly +++ b/ly/letter-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % letter-init.ly hsize = 8.5 \in diff --git a/ly/midi-init.ly b/ly/midi-init.ly index aa83b34a3d..3da33fb8ab 100644 --- a/ly/midi-init.ly +++ b/ly/midi-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" \midi { \tempo 4=60 \include "performer-init.ly" diff --git a/ly/nederlands.ly b/ly/nederlands.ly index ba86bfa540..b54f851206 100644 --- a/ly/nederlands.ly +++ b/ly/nederlands.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" %{ common dutch names for notes. es means flat, is means sharp %} diff --git a/ly/norsk.ly b/ly/norsk.ly index b9d7978e2f..1b4a69c165 100644 --- a/ly/norsk.ly +++ b/ly/norsk.ly @@ -104,4 +104,4 @@ -\version "1.9.0" +\version "1.9.1" diff --git a/ly/paper-as5-init.ly b/ly/paper-as5-init.ly index b8104a8524..68d233c8ea 100644 --- a/ly/paper-as5-init.ly +++ b/ly/paper-as5-init.ly @@ -1,6 +1,6 @@ % paper-as5-init.ly -\version "1.9.0" +\version "1.9.1" paperAsFive = \paper { staffheight = 5.\char diff --git a/ly/paper-as5.ly b/ly/paper-as5.ly index 5c1effc874..e5dc599b06 100644 --- a/ly/paper-as5.ly +++ b/ly/paper-as5.ly @@ -1,3 +1,3 @@ -\version "1.9.0" +\version "1.9.1" \include "paper-as5-init.ly" diff --git a/ly/paper-as9-init.ly b/ly/paper-as9-init.ly index 1319604047..2eab7466ed 100644 --- a/ly/paper-as9-init.ly +++ b/ly/paper-as9-init.ly @@ -1,6 +1,6 @@ % paper-as9-init.ly -\version "1.9.0" +\version "1.9.1" paperAsNine = \paper { staffheight = 9.\char diff --git a/ly/paper-as9.ly b/ly/paper-as9.ly index 58bdc62eb8..ea7a8be04d 100644 --- a/ly/paper-as9.ly +++ b/ly/paper-as9.ly @@ -1,3 +1,3 @@ -\version "1.9.0" +\version "1.9.1" \include "paper-as9-init.ly" diff --git a/ly/paper-init.ly b/ly/paper-init.ly index 7da01b00a6..78c279fba2 100644 --- a/ly/paper-init.ly +++ b/ly/paper-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % paper-init.ly %% Why som complicated? /MB diff --git a/ly/paper11-init.ly b/ly/paper11-init.ly index a8ab6fb69e..779a555280 100644 --- a/ly/paper11-init.ly +++ b/ly/paper11-init.ly @@ -1,6 +1,6 @@ % paper11-init.ly -\version "1.9.0" +\version "1.9.1" paperEleven = \paper { staffheight = 11.0\pt diff --git a/ly/paper11.ly b/ly/paper11.ly index fbb3e50c02..020174e09c 100644 --- a/ly/paper11.ly +++ b/ly/paper11.ly @@ -1,3 +1,3 @@ -\version "1.9.0" +\version "1.9.1" \include "paper11-init.ly" diff --git a/ly/paper13-init.ly b/ly/paper13-init.ly index 32d0f67c0c..0bb6cdf9bc 100644 --- a/ly/paper13-init.ly +++ b/ly/paper13-init.ly @@ -1,7 +1,7 @@ % paper13-init.ly -\version "1.9.0" +\version "1.9.1" paperThirteen = \paper { staffheight = 13.0\pt diff --git a/ly/paper13.ly b/ly/paper13.ly index f67817edf5..9fb30ce279 100644 --- a/ly/paper13.ly +++ b/ly/paper13.ly @@ -1,3 +1,3 @@ -\version "1.9.0" +\version "1.9.1" \include "paper13-init.ly" diff --git a/ly/paper16-init.ly b/ly/paper16-init.ly index 8b6cffb53c..bbe4268f68 100644 --- a/ly/paper16-init.ly +++ b/ly/paper16-init.ly @@ -1,7 +1,7 @@ % paper16-init.ly -\version "1.9.0" +\version "1.9.1" paperSixteen = \paper { staffheight = 16.0\pt diff --git a/ly/paper16.ly b/ly/paper16.ly index 32ffb7554f..797090f525 100644 --- a/ly/paper16.ly +++ b/ly/paper16.ly @@ -1,3 +1,3 @@ -\version "1.9.0" +\version "1.9.1" \include "paper16-init.ly" diff --git a/ly/paper19-init.ly b/ly/paper19-init.ly index 292c2283ac..696e75e3d2 100644 --- a/ly/paper19-init.ly +++ b/ly/paper19-init.ly @@ -1,7 +1,7 @@ % paper19-init.ly -\version "1.9.0" +\version "1.9.1" paperNineteen = \paper { staffheight = 19.0\pt diff --git a/ly/paper19.ly b/ly/paper19.ly index 990238f3c0..2ce1d7031c 100644 --- a/ly/paper19.ly +++ b/ly/paper19.ly @@ -1,3 +1,3 @@ -\version "1.9.0" +\version "1.9.1" \include "paper19-init.ly" diff --git a/ly/paper20-init.ly b/ly/paper20-init.ly index 219574496f..fc0e954bf4 100644 --- a/ly/paper20-init.ly +++ b/ly/paper20-init.ly @@ -1,7 +1,7 @@ % paper20-init.ly -\version "1.9.0" +\version "1.9.1" paperTwenty = \paper { staffheight = 20.0\pt diff --git a/ly/paper20.ly b/ly/paper20.ly index 61d655e49d..efef69eea4 100644 --- a/ly/paper20.ly +++ b/ly/paper20.ly @@ -1,3 +1,3 @@ -\version "1.9.0" +\version "1.9.1" \include "paper20-init.ly" diff --git a/ly/paper23-init.ly b/ly/paper23-init.ly index 9d97011ad0..743d70af6d 100644 --- a/ly/paper23-init.ly +++ b/ly/paper23-init.ly @@ -1,7 +1,7 @@ % paper23-init.ly -\version "1.9.0" +\version "1.9.1" paperTwentythree = \paper { staffheight = 23.0\pt diff --git a/ly/paper23.ly b/ly/paper23.ly index d8f321638f..b260c747b2 100644 --- a/ly/paper23.ly +++ b/ly/paper23.ly @@ -1,3 +1,3 @@ -\version "1.9.0" +\version "1.9.1" \include "paper23-init.ly" diff --git a/ly/paper26-init.ly b/ly/paper26-init.ly index 74a19dee35..a356e95cc9 100644 --- a/ly/paper26-init.ly +++ b/ly/paper26-init.ly @@ -1,6 +1,6 @@ % paper26-init.ly -\version "1.9.0" +\version "1.9.1" paperTwentysix = \paper { staffheight = 26.0\pt diff --git a/ly/paper26.ly b/ly/paper26.ly index 9acef1713b..b16a518c2f 100644 --- a/ly/paper26.ly +++ b/ly/paper26.ly @@ -1,3 +1,3 @@ -\version "1.9.0" +\version "1.9.1" \include "paper26-init.ly" diff --git a/ly/params-as-init.ly b/ly/params-as-init.ly index fbb52529df..08449252e0 100644 --- a/ly/params-as-init.ly +++ b/ly/params-as-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % params-as-init.ly % generic paper parameters diff --git a/ly/params-init.ly b/ly/params-init.ly index 26c1441ef0..55a37b4eb8 100644 --- a/ly/params-init.ly +++ b/ly/params-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % JUNKME. %% deprecated diff --git a/ly/part-paper-init.ly b/ly/part-paper-init.ly index bef4ce3216..4375cc3fd2 100644 --- a/ly/part-paper-init.ly +++ b/ly/part-paper-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % JUNKME %part-paper-init.ly diff --git a/ly/performer-init.ly b/ly/performer-init.ly index 547749d1eb..7edd61bbbb 100644 --- a/ly/performer-init.ly +++ b/ly/performer-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" % % setup for Request->Element conversion. Guru-only diff --git a/ly/property-init.ly b/ly/property-init.ly index 09578b2940..a5b3a1705f 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -1,6 +1,6 @@ % property-init.ly -\version "1.9.0" +\version "1.9.1" stemUp = \property Voice.Stem \set #'direction = #1 stemDown = \property Voice.Stem \set #'direction = #-1 @@ -220,7 +220,7 @@ forgetAccidentals = { %% DO NOT USE THIS. IT CAN LEAD TO CRASHES. turnOff = #'() -% For drawing vertical chord brackets with -\arpeggio +% For drawing vertical chord brackets with \arpeggio % This is a shorthand for the value of the molecule-callback property % of either Staff.Arpeggio or PianoStaff.Arpeggio, depending whether % cross-staff brackets are desired. @@ -255,10 +255,10 @@ unHideNotes = \sequential { } germanChords = { - \property ChordNames. chordRootNamer = #(chord-name->german-markup #t) - \property ChordNames. chordNoteNamer = #note-name->german-markup + \property ChordNames. chordRootNamer = #(chord-name->german@\markup #t) + \property ChordNames. chordNoteNamer = #note-name->german@\markup } semiGermanChords = { - \property ChordNames. chordRootNamer = #(chord-name->german-markup #f) - \property ChordNames. chordNoteNamer = #note-name->german-markup + \property ChordNames. chordRootNamer = #(chord-name->german@\markup #f) + \property ChordNames. chordNoteNamer = #note-name->german@\markup } diff --git a/ly/scale-definitions-init.ly b/ly/scale-definitions-init.ly index 269994d736..1c075be3a2 100644 --- a/ly/scale-definitions-init.ly +++ b/ly/scale-definitions-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" major = #'( diff --git a/ly/script-init.ly b/ly/script-init.ly index 896a1b7848..21fd9560ea 100644 --- a/ly/script-init.ly +++ b/ly/script-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" dashHat= "marcato" diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly index c7fd8f93cf..ff0d621faa 100644 --- a/ly/spanners-init.ly +++ b/ly/spanners-init.ly @@ -1,4 +1,4 @@ -\version "1.9.0" +\version "1.9.1" startGroup = #(make-span-event 'NoteGroupingEvent START) stopGroup = #(make-span-event 'NoteGroupingEvent STOP) diff --git a/ly/suomi.ly b/ly/suomi.ly index 084421b7dc..449c2122c0 100644 --- a/ly/suomi.ly +++ b/ly/suomi.ly @@ -45,4 +45,4 @@ (his . ,(ly:make-pitch -1 6 1 )) (hisis . ,(ly:make-pitch -1 6 2 )) ) -\version "1.9.0" +\version "1.9.1" diff --git a/ly/svenska.ly b/ly/svenska.ly index 386296a3f1..bea79c8c06 100644 --- a/ly/svenska.ly +++ b/ly/svenska.ly @@ -40,4 +40,4 @@ (hiss . ,(ly:make-pitch -1 6 1 )) (hississ . ,(ly:make-pitch -1 6 2 )) ) -\version "1.9.0" +\version "1.9.1" diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 519be984fa..efb0f20d09 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1406,7 +1406,6 @@ if 1: Postfix articulations, new chord syntax.""")) def conv (str): - str = re.sub ('-\\markup', '@\\markup', str) str = re.sub (r'-\\', r'\\', str) str = re.sub (r'-\)', ')', str) -- 2.39.2