From 955f829883aa125b2b633b1e71f6256da5b773fa Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 25 Aug 2003 21:15:58 +0000 Subject: [PATCH] Massive changes - see ChangeLog. --- ChangeLog | 43 ++- Documentation/GNUmakefile | 2 +- Documentation/topdocs/NEWS.texi | 45 ++++ Documentation/user/cheatsheet.itely | 18 +- Documentation/user/internals.itely | 1 - Documentation/user/music-glossary.tely | 2 +- Documentation/user/refman.itely | 82 ++++-- Documentation/user/tutorial.itely | 14 +- buildscripts/convert-new-chords.py | 249 ------------------ buildscripts/mutopia-index.py | 2 - flower/include/string-handle.hh | 1 - flower/include/string-handle.icc | 1 - input/ascii-art/as-email.ly | 3 +- input/ascii-art/as1.ly | 3 +- input/ascii-art/as2.ly | 3 +- input/ascii-art/asciiscript5.ly | 3 +- input/ascii-art/asciiscript9.ly | 3 +- input/ascii-art/r-as.ly | 3 +- input/ascii-art/standchen-as5.ly | 3 +- input/ascii-art/standchen-as9.ly | 3 +- input/ascii-art/twinkle-as5.ly | 3 +- input/bugs/+.ly | 2 +- input/bugs/dynamic-switch.ly | 3 +- input/example-1.ly | 3 +- input/example-2.ly | 3 +- input/example-3.ly | 3 +- input/les-nereides.ly | 3 +- input/mutopia-header.ly | 2 +- .../E.Satie/petite-ouverture-a-danser.ly | 3 +- input/mutopia/F.Schubert/standchen.ly | 79 +++--- .../J.S.Bach/baerenreiter-sarabande.ly | 14 +- input/mutopia/J.S.Bach/bwv940.ly | 3 +- input/mutopia/J.S.Bach/wtk1-fugue2.ly | 3 +- input/mutopia/R.Schumann/romanze-op28-2.ly | 5 +- input/mutopia/W.A.Mozart/mozart-hrn-3.ly | 2 +- .../mutopia/W.A.Mozart/mozart-hrn3-allegro.ly | 13 +- input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly | 2 +- .../mutopia/W.A.Mozart/mozart-hrn3-romanze.ly | 5 +- input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly | 3 +- 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 | 3 +- input/no-notation/midi-transposing.ly | 3 +- input/no-notation/midi-tuplets.ly | 3 +- input/no-notation/midi-volume-equaliser.ly | 3 +- 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 | 5 +- input/no-notation/textcresc.ly | 2 +- input/puer-fragment.ly | 2 +- 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 | 3 +- input/regression/accidental-single-double.ly | 3 +- .../accidental-unbroken-tie-spacing.ly | 3 +- input/regression/accidental-voice.ly | 2 +- input/regression/accidental.ly | 3 +- input/regression/accidentals.ly | 2 +- input/regression/allfontstyle.ly | 5 +- input/regression/ambitus.ly | 3 +- input/regression/apply-context.ly | 3 +- input/regression/apply-output.ly | 3 +- input/regression/arpeggio-collision.ly | 3 +- input/regression/arpeggio.ly | 3 +- input/regression/auto-beam-bar.ly | 3 +- input/regression/auto-beam-triplet.ly | 3 +- input/regression/auto-beam-tuplets.ly | 3 +- input/regression/auto-beam.ly | 3 +- input/regression/auto-change.ly | 3 +- input/regression/bar-number.ly | 3 +- input/regression/bar-scripts.ly | 3 +- input/regression/beam-auto-knee.ly | 3 +- input/regression/beam-break.ly | 3 +- input/regression/beam-center-slope.ly | 3 +- input/regression/beam-chord.ly | 2 +- input/regression/beam-concave.ly | 3 +- .../regression/beam-cross-staff-auto-knee.ly | 3 +- input/regression/beam-cross-staff-slope.ly | 3 +- input/regression/beam-cross-staff.ly | 3 +- input/regression/beam-damp.ly | 3 +- input/regression/beam-default-lengths.ly | 3 +- input/regression/beam-extreme.ly | 3 +- input/regression/beam-french.ly | 3 +- input/regression/beam-funky-beamlet.ly | 3 +- input/regression/beam-funky.ly | 3 +- input/regression/beam-knee-symmetry.ly | 3 +- input/regression/beam-length.ly | 3 +- input/regression/beam-manual-beaming.ly | 3 +- input/regression/beam-manual.ly | 3 +- input/regression/beam-multiple-cross-staff.ly | 3 +- input/regression/beam-over-barline.ly | 3 +- input/regression/beam-position.ly | 3 +- input/regression/beam-postfix-notation.ly | 3 +- input/regression/beam-quanting-horizontal.ly | 3 +- input/regression/beam-quarter.ly | 3 +- input/regression/beam-rest.ly | 3 +- input/regression/beam-second.ly | 3 +- input/regression/beam-shortened-lengths.ly | 3 +- input/regression/beamed-chord.ly | 3 +- input/regression/beaming-ternary-metrum.ly | 3 +- input/regression/beaming.ly | 3 +- input/regression/beams.ly | 3 +- input/regression/between-systems.ly | 3 +- input/regression/break.ly | 3 +- input/regression/breathing-sign.ly | 3 +- input/regression/chord-changes.ly | 2 +- input/regression/chord-name-entry-11.ly | 2 +- input/regression/chord-name-entry.ly | 2 +- input/regression/chord-name-exceptions.ly | 2 +- input/regression/chord-name-major7.ly | 2 +- input/regression/chord-scripts.ly | 3 +- input/regression/chord-tremolo.ly | 3 +- input/regression/chords-funky-ignatzek.ly | 2 +- input/regression/clefs.ly | 2 +- input/regression/cluster.ly | 3 +- input/regression/collision-2.ly | 2 +- input/regression/collision-dots.ly | 2 +- input/regression/collision-head-chords.ly | 3 +- input/regression/collision-heads.ly | 3 +- .../collision-merge-differently-dotted.ly | 2 +- input/regression/collision-mesh.ly | 2 +- input/regression/collisions.ly | 3 +- .../regression/completion-heads-polyphony.ly | 3 +- input/regression/completion-heads.ly | 3 +- input/regression/custos.ly | 2 +- input/regression/dot-flag-collision.ly | 3 +- input/regression/dots.ly | 3 +- input/regression/drums.ly | 2 +- input/regression/dynamics-broken-hairpin.ly | 3 +- input/regression/dynamics-glyphs.ly | 3 +- input/regression/dynamics-line.ly | 3 +- input/regression/dynamics-unbound-hairpin.ly | 2 +- input/regression/easy-notation.ly | 2 +- input/regression/figured-bass.ly | 2 +- input/regression/finger-chords.ly | 3 +- input/regression/fingering.ly | 3 +- input/regression/follow-voice-break.ly | 3 +- input/regression/font-magnification.ly | 3 +- input/regression/font-name.ly | 2 +- input/regression/generic-output-property.ly | 3 +- input/regression/glissando.ly | 3 +- input/regression/grace-auto-beam.ly | 3 +- input/regression/grace-bar-line.ly | 3 +- input/regression/grace-bar-number.ly | 3 +- input/regression/grace-beam.ly | 3 +- input/regression/grace-dynamic.ly | 3 +- input/regression/grace-end.ly | 3 +- input/regression/grace-nest.ly | 2 +- input/regression/grace-nest1.ly | 2 +- input/regression/grace-nest2.ly | 2 +- input/regression/grace-nest3.ly | 3 +- input/regression/grace-nest4.ly | 3 +- input/regression/grace-nest5.ly | 3 +- input/regression/grace-part-combine.ly | 3 +- input/regression/grace-staff-length.ly | 3 +- input/regression/grace-start.ly | 3 +- input/regression/grace-stems.ly | 3 +- input/regression/grace-sync.ly | 3 +- input/regression/grace-unfold-repeat.ly | 3 +- input/regression/grace-volta-repeat-2.ly | 3 +- input/regression/grace-volta-repeat.ly | 3 +- input/regression/grace.ly | 3 +- input/regression/hairpin-ending.ly | 3 +- input/regression/hara-kiri-pianostaff.ly | 2 +- input/regression/instrument-name-markup.ly | 2 +- input/regression/instrument-name-partial.ly | 3 +- input/regression/instrument-name.ly | 2 +- input/regression/key-clefs.ly | 3 +- input/regression/key-signature-scordatura.ly | 3 +- input/regression/keys.ly | 3 +- input/regression/lyric-align.ly | 3 +- input/regression/lyric-combine-polyphonic.ly | 2 +- input/regression/lyric-combine.ly | 3 +- input/regression/lyric-extender.ly | 3 +- input/regression/lyric-hyphen.ly | 2 +- input/regression/lyric-phrasing.ly | 3 +- input/regression/lyrics-bar.ly | 2 +- input/regression/lyrics-extender.ly | 3 +- input/regression/lyrics-melisma-beam.ly | 3 +- input/regression/lyrics-multi-stanza.ly | 3 +- input/regression/markup-note.ly | 2 +- input/regression/markup-stack.ly | 2 +- input/regression/measure-grouping.ly | 3 +- input/regression/mensural.ly | 2 +- input/regression/metronome-marking.ly | 3 +- input/regression/mm-rests2.ly | 3 +- input/regression/mmrest-collision.ly | 2 +- input/regression/molecule-hacking.ly | 3 +- 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 | 3 +- input/regression/new-markup-syntax.ly | 2 +- input/regression/non-empty-text.ly | 3 +- input/regression/note-group-bracket.ly | 3 +- input/regression/note-head-chord.ly | 3 +- input/regression/note-head-style.ly | 2 +- input/regression/note-line.ly | 2 +- input/regression/number-staff-lines.ly | 3 +- input/regression/ottava-broken.ly | 3 +- input/regression/ottava.ly | 3 +- input/regression/output-property.ly | 3 +- input/regression/pc-mmrest.ly | 3 +- input/regression/pc-switch-slur.ly | 3 +- input/regression/phrasing-slur.ly | 3 +- input/regression/prefatory-empty-spacing.ly | 2 +- input/regression/prefatory-spacing-matter.ly | 3 +- input/regression/property-once.ly | 3 +- input/regression/rehearsal-mark.ly | 3 +- input/regression/repeat-fold.ly | 3 +- input/regression/repeat-line-break.ly | 3 +- input/regression/repeat-percent-skipbars.ly | 2 +- input/regression/repeat-percent.ly | 3 +- input/regression/repeat-slash.ly | 3 +- input/regression/repeat-unfold-all.ly | 3 +- input/regression/repeat-unfold.ly | 3 +- .../repeat-volta-skip-alternatives.ly | 2 +- input/regression/repeat-volta.ly | 3 +- input/regression/rest-collision-default.ly | 3 +- input/regression/rest-collision.ly | 3 +- input/regression/rest-ledger.ly | 2 +- input/regression/rest-pitch.ly | 3 +- input/regression/rest.ly | 2 +- input/regression/rhythmic-staff.ly | 2 +- input/regression/script-collision.ly | 3 +- input/regression/script-stack-order.ly | 3 +- 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 | 3 +- input/regression/slur-attachment.ly | 3 +- input/regression/slur-broken-trend.ly | 3 +- input/regression/slur-cross-staff.ly | 3 +- input/regression/slur-dots.ly | 3 +- input/regression/slur-nice.ly | 3 +- input/regression/slur-rest.ly | 3 +- input/regression/slur-staccato.ly | 3 +- input/regression/slur-stem-broken.ly | 3 +- input/regression/slur-symmetry-1.ly | 3 +- input/regression/slur-symmetry.ly | 3 +- input/regression/spacing-accidental-staffs.ly | 3 +- .../regression/spacing-accidental-stretch.ly | 3 +- input/regression/spacing-accidental.ly | 3 +- input/regression/spacing-bar-stem.ly | 3 +- input/regression/spacing-clef-first-note.ly | 2 +- input/regression/spacing-end-of-line.ly | 3 +- input/regression/spacing-ended-voice.ly | 3 +- input/regression/spacing-folded-clef.ly | 3 +- input/regression/spacing-folded-clef2.ly | 3 +- input/regression/spacing-grace-duration.ly | 3 +- input/regression/spacing-grace.ly | 3 +- input/regression/spacing-knee.ly | 2 +- input/regression/spacing-multi-tuplet.ly | 3 +- input/regression/spacing-note-flags.ly | 3 +- input/regression/spacing-rest.ly | 3 +- input/regression/spacing-short-notes.ly | 3 +- input/regression/spacing-stem-bar.ly | 3 +- input/regression/spacing-stem-direction.ly | 3 +- .../regression/spacing-stem-same-direction.ly | 3 +- input/regression/spacing-to-grace.ly | 3 +- input/regression/spacing-very-tight.ly | 3 +- input/regression/span-bar.ly | 3 +- input/regression/staccato-pos.ly | 3 +- input/regression/staff-tweak.ly | 2 +- input/regression/stanza-number.ly | 2 +- input/regression/stem-direction.ly | 3 +- input/regression/stem-shorten.ly | 3 +- input/regression/stem-spacing.ly | 3 +- input/regression/stem-tremolo.ly | 3 +- input/regression/system-extents.ly | 2 +- input/regression/system-start-bracket.ly | 2 +- input/regression/text-spanner.ly | 3 +- input/regression/tie-accidental.ly | 3 +- input/regression/tie-break-accidental.ly | 2 +- input/regression/tie-busy-grobs.ly | 3 +- input/regression/tie-chord-partial.ly | 3 +- input/regression/tie-chord.ly | 3 +- input/regression/tie-dots.ly | 2 +- input/regression/tie-grace.ly | 3 +- input/regression/tie.ly | 3 +- input/regression/tuplet-beam.ly | 3 +- input/regression/tuplet-nest.ly | 3 +- input/regression/tuplet-properties.ly | 3 +- input/regression/tuplet-rest.ly | 3 +- .../regression/tuplet-staffline-collision.ly | 3 +- input/regression/tuplets.ly | 3 +- input/regression/voice-follower.ly | 3 +- input/regression/volta-broken-left-edge.ly | 2 +- input/regression/volta-multi-staff.ly | 3 +- input/screech-boink.ly | 9 +- input/template/gregorian-transcription.ly | 3 +- input/template/header.ly | 2 +- input/template/jazz-combo.ly | 3 +- input/template/melody-chords.ly | 3 +- input/template/melody-lyrics-chords.ly | 3 +- input/template/melody-lyrics.ly | 3 +- input/template/melody.ly | 3 +- input/template/piano-4-voices.ly | 3 +- input/template/piano-dynamics.ly | 3 +- input/template/piano-lyrics.ly | 3 +- input/template/piano-melody-lyrics.ly | 5 +- input/template/piano.ly | 3 +- input/template/satb.ly | 3 +- input/test/+.ly | 2 +- input/test/ac-extra-voice.ly | 3 +- input/test/add-staccato.ly | 3 +- input/test/add-text-script.ly | 2 +- input/test/ancient-accidentals.ly | 3 +- input/test/ancient-font.ly | 2 +- input/test/ancient-time.ly | 2 +- input/test/bagpipe.ly | 2 +- input/test/bar-always.ly | 3 +- input/test/bar-lines-lyric-only.ly | 3 +- input/test/bar-lines.ly | 3 +- input/test/bar-number-every-five-reset.ly | 2 +- input/test/bar-number-regular-interval.ly | 2 +- input/test/bar-number-show-all.ly | 3 +- input/test/beam-auto-4-8.ly | 3 +- input/test/beam-auto-override.ly | 3 +- input/test/beam-auto.ly | 3 +- input/test/beam-control.ly | 3 +- input/test/beam-count.ly | 3 +- input/test/beam-dir-functions.ly | 3 +- input/test/beam-isknee.ly | 3 +- input/test/beam-neutral-direction.ly | 3 +- input/test/beam-rest.ly | 3 +- input/test/blank-notes.ly | 3 +- input/test/blank-paper-tab.ly | 2 +- input/test/blank-paper.ly | 2 +- input/test/boxed-molecule.ly | 3 +- input/test/caps.ly | 3 +- input/test/cautionaries.ly | 2 +- input/test/chord-names-german.ly | 2 +- input/test/chord-names-jazz.ly | 2 +- input/test/chord-names-no-inversions.ly | 2 +- input/test/chords-without-melody.ly | 2 +- input/test/clef-8-syntax.ly | 3 +- input/test/clef-end-of-line.ly | 2 +- input/test/clef-manual-control.ly | 2 +- input/test/coriolan-margin.ly | 3 +- input/test/count-systems.ly | 3 +- input/test/crescendi.ly | 3 +- input/test/cue-notes.ly | 2 +- input/test/divisiones.ly | 2 +- input/test/drarn-slurs.ly | 3 +- input/test/drarn.ly | 3 +- input/test/dynamic-absolute-volume.ly | 3 +- input/test/dynamic-extra.ly | 3 +- input/test/embedded-postscript.ly | 3 +- input/test/embedded-scm.ly | 3 +- input/test/embedded-tex.ly | 3 +- input/test/explicit.ly | 2 +- input/test/extra-offset.ly | 3 +- input/test/extra-staff.ly | 3 +- input/test/fill-a4.ly | 3 +- input/test/follow-thread.ly | 3 +- input/test/force-hshift.ly | 3 +- input/test/gourlay.ly | 3 +- input/test/gregorian-scripts.ly | 2 +- input/test/harmonic.ly | 2 +- input/test/header-ifelse.ly | 2 +- input/test/hshift.ly | 3 +- input/test/hymn.ly | 3 +- input/test/improv.ly | 2 +- input/test/incipit.ly | 3 +- input/test/instrument-name-grandstaff.ly | 2 +- input/test/ly2dvi-testpage.ly | 3 +- input/test/maximum-rest-count.ly | 3 +- input/test/mensural-ligatures.ly | 2 +- input/test/midi-scales.ly | 3 +- input/test/move-accidentals.ly | 3 +- input/test/move-specific-text.ly | 3 +- input/test/music-box.ly | 4 +- input/test/music-creation.ly | 2 +- input/test/nested-groups.ly | 2 +- input/test/no-bar-lines.ly | 3 +- input/test/no-staff.ly | 2 +- input/test/octave-duplicate.ly | 3 +- input/test/ossia.ly | 3 +- input/test/part-combine-moments.ly | 3 +- input/test/part-combine-staff.ly | 3 +- input/test/part-combine.ly | 3 +- input/test/partial-blank.ly | 3 +- input/test/pedal.ly | 3 +- input/test/phrasing-slur-height.ly | 3 +- input/test/polymetric-differing-notes.ly | 3 +- input/test/polymetric.ly | 3 +- input/test/preset-extent.ly | 2 +- input/test/repeat-manual.ly | 3 +- input/test/repeat-shorter-bracket.ly | 3 +- input/test/repeat.ly | 3 +- input/test/rest-dot-positions.ly | 3 +- input/test/rests.ly | 3 +- input/test/reverse-music.ly | 3 +- input/test/rhythm-excercise.ly | 2 +- input/test/scales-greek.ly | 2 +- input/test/scheme-interactions.ly | 3 +- input/test/script-abbreviations.ly | 2 +- input/test/script-chart.ly | 2 +- input/test/script-priority.ly | 3 +- input/test/script-stack.ly | 3 +- input/test/separate-staccato.ly | 3 +- input/test/slur-attachment-override.ly | 3 +- input/test/slur-beautiful.ly | 3 +- input/test/slur-dash.ly | 2 +- input/test/slur-minimum-length.ly | 3 +- input/test/slur-shape.ly | 3 +- input/test/slur-ugly.ly | 3 +- input/test/smart-transpose.ly | 3 +- input/test/spacing-2.ly | 3 +- input/test/spanner-after-break-tweak.ly | 3 +- input/test/staff-bracket.ly | 3 +- input/test/staff-container.ly | 3 +- input/test/staff-lines.ly | 3 +- input/test/staff-size.ly | 3 +- input/test/staff-space.ly | 3 +- input/test/stem-centered.ly | 3 +- input/test/stem-cross-staff.ly | 2 +- input/test/stem-extend.ly | 3 +- input/test/stem-length.ly | 3 +- input/test/tablature-hammer.ly | 3 +- input/test/tablature.ly | 2 +- input/test/text-spanner.ly | 3 +- input/test/textscript.ly | 3 +- input/test/tie-sparse.ly | 3 +- input/test/time-signature-double.ly | 3 +- input/test/time.ly | 3 +- input/test/timing.ly | 3 +- input/test/title.ly | 3 +- input/test/to-xml.ly | 2 +- input/test/transposition.ly | 3 +- input/test/trill.ly | 2 +- input/test/trills.ly | 3 +- 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 | 3 +- input/tutorial/brahms-tweaked.ly | 3 +- input/twinkle-pop.ly | 3 +- lily/include/music.hh | 2 - lily/include/relative-music.hh | 2 +- lily/include/relative-octave-check.hh | 25 ++ lily/include/scm-option.hh | 1 + lily/include/source-file.hh | 3 +- lily/input-file-results.cc | 1 - lily/lexer.ll | 25 +- lily/my-lily-lexer.cc | 35 +-- lily/parser.yy | 13 +- lily/relative-octave-check.cc | 38 +++ lily/relative-octave-music.cc | 19 +- lily/repeated-music.cc | 2 + lily/scm-option.cc | 35 ++- lily/simultaneous-music.cc | 15 +- lily/source-file.cc | 8 +- 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 | 2 +- ly/declarations-init.ly | 3 +- ly/deutsch.ly | 2 +- ly/drumpitch-init.ly | 2 +- ly/dynamic-scripts-init.ly | 2 +- ly/english.ly | 2 +- ly/engraver-init.ly | 4 +- 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 | 9 +- 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 | 2 +- ly/scale-definitions-init.ly | 2 +- ly/script-init.ly | 2 +- ly/spanners-init.ly | 2 +- ly/suomi.ly | 2 +- ly/svenska.ly | 2 +- python/lilylib.py | 4 +- scm/define-music-types.scm | 6 + scripts/convert-ly.py | 156 +++++++++++ scripts/lilypond-book.py | 10 +- scripts/ly2dvi.py | 5 +- 530 files changed, 1398 insertions(+), 903 deletions(-) delete mode 100644 buildscripts/convert-new-chords.py create mode 100644 lily/include/relative-octave-check.hh create mode 100644 lily/relative-octave-check.cc diff --git a/ChangeLog b/ChangeLog index b1984f8daf..ae8148af4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,41 @@ +2003-08-25 Han-Wen Nienhuys + + * scripts/convert-ly.py + (FatalConversionError.articulation_substitute): add + convert-new-chords code. Remove convert-new-chords.py + + * Documentation/user/refman.itely (Octave check): document + \octave. + + * Documentation/topdocs/NEWS.texi: add \octave, postfix and + \relative changes. + + * lily/parser.yy (command_element): octave check: + + \octave PITCH + + checks that PITCH (without octave) yields PITCH (with octave) in + \relative + + * lily/relative-octave-music.cc (to_relative_octave): octave check. + + * lily/scm-option.cc: ly:set-option now has the default argument + #t. + + * lily/lexer.ll: add \renameinput + + * python/lilylib.py (command_name): robustifications. + + * scripts/ly2dvi.py (run_latex): use >& for redirection iso. of + /dev/stderr. This is ash compatible. + + * ly/init.ly: add warning if compatibility was not necessary. + + * lily/scm-option.cc (LY_DEFINE): add ly:get-option + + * flower/include/string-handle.icc: formatting cleanups, rename + references by ref_count_. + 2003-08-25 Heikki Junes * make/lilypond.mandrake.spec.in: syncronize the spec file with @@ -6,11 +44,6 @@ invoking `unset out', declare menus, use only one icon-file, fix doc-path in menu. -2003-08-25 Han-Wen Nienhuys - - * flower/include/string-handle.icc: formatting cleanups, rename - references by ref_count_. - 2003-08-23 Han-Wen Nienhuys * scripts/convert-ly.py (FatalConversionError.conv): typo diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 7e6285cf81..2fbfeeae17 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -6,7 +6,7 @@ STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"' README_TOP_FILES= DEDICATION ChangeLog -EXTRA_DIST_FILES= ChangeLog-1.5 +EXTRA_DIST_FILES= include $(depth)/make/stepmake.make diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi index 469c6246ea..63012cd2b1 100644 --- a/Documentation/topdocs/NEWS.texi +++ b/Documentation/topdocs/NEWS.texi @@ -5,6 +5,51 @@ @node Top, , , @top +@chapter New features in 1.9 since 1.8 + +@itemize + +@item +Octave checks make octave errors easier to correct. +The syntax is +@example + \octave @var{pitch} +@end example + +This checks that @var{pitch} (without octave) yields @var{pitch} (with +octave) in \relative mode. If not, a warning is printed, and the +octave is corrected. + +@item +All articulations must now be entered postfix. For example, + +@example + c8[( d8]) +@end example +is a pair of beamed slurred eighth notes. + +@item +The definition of @code{\relative} has been simplified. Octaves are +now always propagated in the order that music is entered. In the +following example, +@example + PRE + \repeat "unfold" 3 BODY \alternative { ALT1 ALT2 ALT3 } + POST +@end example +the octave of BODY is based on PRE, the starting octave of ALT1 on +BODY, the starting octave of ALT2 on ALT1, etc. + +The same mechanism is used for all other music expressions, except the +chord. Backwards compatibility is retained through a special option, +which is invoked as + +@example + #(ly:set-option 'old-relative) +@end example + + + @chapter New features in 1.8 since 1.6 diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely index 5bb8a30e77..528b015e04 100644 --- a/Documentation/user/cheatsheet.itely +++ b/Documentation/user/cheatsheet.itely @@ -113,7 +113,7 @@ c c, @end lilypond -@item @code{-( -)} +@item @code{( )} @tab slur @tab @lilypond[fragment, relative 1] @@ -121,11 +121,11 @@ c c, \property Staff.TimeSignature = \turnOff \property Staff.autoBeaming = ##f \property Staff.Clef = \turnOff -c-( d e-) +c( d e) @end lilypond -@item @code{-\( -\)} +@item @code{\( \)} @tab phrasing slur @tab @lilypond[fragment, relative 1] @@ -133,7 +133,7 @@ c-( d e-) \property Staff.TimeSignature = \turnOff \property Staff.autoBeaming = ##f \property Staff.Clef = \turnOff -c-\( c-( d-) e-\) +c\( c( d) e\) @end lilypond @@ -168,17 +168,17 @@ c-> c-. @end lilypond -@item @code{-\mf -\sfz} +@item @code{\mf \sfz} @tab dynamics @tab @lilypond[fragment, relative 1] \property Staff.TimeSignature = \turnOff \property Staff.Clef = \turnOff -c-\mf c-\sfz +c\mf c\sfz @end lilypond -@item @code{-\< -\!} +@item @code{\< \!} @tab crescendo @tab @lilypond[fragment, relative 1] @@ -189,7 +189,7 @@ c-\mf c-\sfz a\< a \!a @end lilypond -@item @code{-\> -\!} +@item @code{\> \!} @tab decrescendo @tab @lilypond[fragment, relative 1] @@ -197,7 +197,7 @@ a\< a \!a \property Staff.TimeSignature = \turnOff \property Staff.autoBeaming = ##f \property Staff.Clef = \turnOff -a-\> a a-\! +a\> a a\! @end lilypond diff --git a/Documentation/user/internals.itely b/Documentation/user/internals.itely index 519569f0b2..c66013c6c0 100644 --- a/Documentation/user/internals.itely +++ b/Documentation/user/internals.itely @@ -841,7 +841,6 @@ that contains no spaces can be written without the quotes. Strings can be concatenated with the @code{+} operator. - @node Output details @section Output details diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely index 05bc15a38b..fd400c31e9 100644 --- a/Documentation/user/music-glossary.tely +++ b/Documentation/user/music-glossary.tely @@ -1054,7 +1054,7 @@ of the 20th century \property Staff.Custos \set #'adjust-if-on-staffline = ##t \property Staff.Custos \set #'style = #'hufnagel - c'1^"Custos style = \#'hufnagel" + c'1 \break << d' a' f''>>1 } \paper { diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 9596110b6b..47bd848c35 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -560,6 +560,7 @@ shown on screen. See @ref{Point and click} for more information. @menu * Relative octaves:: +* Octave check:: * Bar check:: * Skipping corrected music:: * Automatic note splitting :: @@ -631,6 +632,44 @@ The relative conversion will not affect @code{\transpose}, want to use relative within transposed music, you must place an additional @code{\relative} inside the @code{\transpose}. +@node Octave check +@subsection Octave check + + +Octave checks make octave errors easier to correct. +The syntax is +@example + \octave @var{pitch} +@end example + +This checks that @var{pitch} (without octave) yields @var{pitch} (with +octave) in \relative mode. If not, a warning is printed, and the +octave is corrected, for example, the first check is passed +successfully. The second check fails with an error message. The +octave is adjusted so the following notes are in the correct octave +once again. +@example + \relative c' @{ + e + \octave a' + \octave b' + @} +@end example + + +The octave of a note following an octave check is determined with +respect to the note preceding it. In the next fragment, the last note +is a @code{a'}, above central C. + +@lilypond[verbatim,fragment] + \relative c' { + e + \octave b + a + } +@end lilypond + + @node Bar check @subsection Bar check @@ -1791,7 +1830,7 @@ indicate a musical sentence. It is started using @code{\(} and @code{\)} respectively: @lilypond[fragment,verbatim,center,relative] - \time 6/4 c'-\( d( e) f( e) d-\) + \time 6/4 c'\( d( e) f( e) d\) @end lilypond Typographically, the phrasing slur behaves almost exactly like a @@ -1890,7 +1929,7 @@ properties: \relative c' { c1 \property Voice.TextSpanner \set #'direction = #-1 \property Voice.TextSpanner \set #'edge-text = #'("rall " . "") - c2-\startTextSpan b c-\stopTextSpan a } + c2\startTextSpan b c\stopTextSpan a } @end lilypond @@ -1916,10 +1955,10 @@ To use this, add the @internalsref{Horizontal_bracket_engraver} to @lilypond[singleline,verbatim] \score { \notes \relative c'' { - c4-\startGroup-\startGroup - c4-\stopGroup - c4-\startGroup - c4-\stopGroup-\stopGroup + c4\startGroup\startGroup + c4\stopGroup + c4\startGroup + c4\stopGroup\stopGroup } \paper { \translator { \StaffContext \consists "Horizontal_bracket_engraver" @@ -1959,8 +1998,15 @@ put them up: @end lilypond Other symbols can be added using the syntax -@var{note}@code{-\}@var{name}, e.g. @code{c4-\fermata}. Again, they -can be forced up or down using @code{^} and @code{_}: +@var{note}@code{\}@var{name}, e.g. @code{c4\fermata}. Again, they +can be forced up or down using @code{^} and @code{_}, +eg. + +@lilypond[verbatim,fragment,relative 2] + c\fermata c^\fermata c_\fermata +@end lilypond + + @cindex accent @cindex marcato @@ -4394,14 +4440,6 @@ appearance of the affected graphical objects can be accomodated for a specific notation flavour without need for introducing any new notational concept. -@menu -* Ancient note heads:: -* Ancient accidentals:: -* Ancient rests:: -* Ancient clefs:: -* Ancient flags:: -* Ancient time signatures:: -@end menu Other aspects of ancient notation can not that easily be expressed as in terms of just changing a style property of a graphical object. @@ -4409,11 +4447,19 @@ Therefore, some notational concepts are introduced specifically for ancient notation, see @ref{Custodes}, @ref{Divisiones}, @ref{Ligatures}, and @ref{Figured bass}. + @menu +* Ancient note heads:: +* Ancient accidentals:: +* Ancient rests:: +* Ancient clefs:: +* Ancient flags:: +* Ancient time signatures:: * Custodes:: * Divisiones:: * Ligatures:: * Figured bass:: +* Vaticana style contexts:: @end menu If this all is way too much of documentation for you, and you just @@ -4423,10 +4469,6 @@ predefined contexts (see @ref{Vaticana style contexts}). Use them to set up predefined style-specific voice and staff contexts, and directly go ahead with the note entry. -@menu -* Vaticana style contexts:: -@end menu - @refbugs Ligatures need special spacing that has not yet been implemented. As diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index cf56e931c0..e484713656 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -801,7 +801,7 @@ Similarly, fingering indications can be added to a note using a dash Dynamic signs are made by adding the markings to the note: @quotation @lilypond[verbatim,relative 1] -c-\ff c-\mf +c\ff c\mf @end lilypond @end quotation @separate @@ -815,7 +815,7 @@ Crescendi and decrescendi are started with the commands @code{\<} and is attached to: @quotation @lilypond[verbatim,relative 1] -c2-\< c2-\!-\ff c2-\> c2-\! +c2\< c2\!\ff c2\> c2\! @end lilypond @end quotation @separate @@ -850,7 +850,7 @@ phrasing), you can also make a phrasing slur with @code{\(} and @quotation @lilypond[fragment,relative 1, verbatim] -a8(-\( ais b c) cis2 b'2 a4 cis, c-\) +a8(\( ais b c) cis2 b'2 a4 cis, c\) @end lilypond @end quotation @@ -884,11 +884,11 @@ r4 <>8[ <>]-~ <> @quotation @example -r4 <>8-\>( <> <> <>8-\!) +r4 <>8\>( <> <> <>8\!) @end example @lilypond[relative 0, fragment] \slurUp -r4 <>8-\>( <> <> <>8-\!) +r4 <>8\>( <> <> <>8\!) @end lilypond @end quotation @separate @@ -1504,9 +1504,9 @@ example; a more elaborate explanation is in @ref{Constructing a tweak}: @lilypond[relative 1] - c2-\fermata + c2\fermata \property Voice.Script \set #'padding = #3 - b2-\fermata + b2\fermata @end lilypond @end itemize diff --git a/buildscripts/convert-new-chords.py b/buildscripts/convert-new-chords.py deleted file mode 100644 index 5941d445d0..0000000000 --- a/buildscripts/convert-new-chords.py +++ /dev/null @@ -1,249 +0,0 @@ - -# to nwe chord syntax. -import re -import string -import sys -import getopt -import os - - -def sub_chord (m): - str = m.group(1) - - origstr = '<%s>' % str - if re.search (r'\\\\', str): - return origstr - - if re.search (r'\\property', str): - return origstr - - if re.match (r'^\s*\)?\s*\\[a-zA-Z]+', str): - return origstr - - durs = [] - def sub_durs (m): - durs.append(m.group(2)) - return m.group (1) - - str = re.sub ("([a-z]+[,'!? ]*)([0-9.]+)", sub_durs, str) - dur_str = '' - - for d in durs: - if dur_str == '': - dur_str = d - if dur_str <> d: - return '<%s>' % m.group (1) - - pslur_strs = [''] - dyns = [''] - slur_strs = [''] - - last_str = '' - while last_str <> str: - last_str = str - def sub_dyn_end (m): - dyns.append (' -\!') - return ' ' + m.group(2) - - str = re.sub (r'(\\!)\s*([a-z]+)', sub_dyn_end, str) - def sub_slurs(m): - if '-)' not in slur_strs: - slur_strs.append ( '-)') - return m.group(1) - def sub_p_slurs(m): - if '-\)' not in slur_strs: - slur_strs.append ( '-\)') - return m.group(1) - str = re.sub (r"\)[ ]*([a-z]+)", sub_slurs, str) - str = re.sub (r"\\\)[ ]*([a-z]+)", sub_p_slurs, str) - def sub_begin_slurs(m): - if '-(' not in slur_strs: - slur_strs.append ( '-(') - return m.group(1) - str = re.sub (r"([a-z]+[,'!?0-9 ]*)\(", sub_begin_slurs, str) - def sub_begin_p_slurs(m): - if '-\(' not in slur_strs: - slur_strs.append ( '-\(') - return m.group(1) - - str = re.sub (r"([a-z]+[,'!?0-9 ]*)\\\(", sub_begin_p_slurs, str) - - def sub_dyns (m): - s = m.group(0) - if s == '@STARTCRESC@': - slur_strs.append ("-\\<") - elif s == '@STARTDECRESC@': - slur_strs.append ("-\\>") - elif s == r'-?\\!': - slur_strs.append ('-\\!') - return '' - - str = re.sub (r'@STARTCRESC@', sub_dyns, str) - str = re.sub (r'-?\\!', sub_dyns, str) - - def sub_articulations (m): - a = m.group(1) - if a not in slur_strs: - slur_strs.append (a) - return '' - - str = re.sub (r"([_^-]\@ACCENT\@)", sub_articulations, str) - str = re.sub (r"([_^-]\\[a-z]+)", sub_articulations, str) - str = re.sub (r"([_^-][>_.+|^-])", sub_articulations, str) - - def sub_pslurs(m): - slur_strs.append ( ' -\\)') - return m.group(1) - str = re.sub (r"\\\)[ ]*([a-z]+)", sub_pslurs, str) - - suffix = string.join (slur_strs, '') + string.join (pslur_strs, '') \ - + string.join (dyns, '') - - return '@STARTCHORD@%s@ENDCHORD@%s%s' % (str , dur_str, suffix) - - - - -simend = '}' -simstart = "\n\\simultaneous {" -chordstart = '<' -chordend = '>' - -old_syntax = 1 - -if old_syntax: - simend = '>' - simstart = "<" - chordstart = '<<' - chordend = '>>' - - -marker_str = '%% new-chords-done %%' - -def sub_chords (str): - if re.search (marker_str,str): - return str - str= re.sub (r'\\<', '@STARTCRESC@', str) - str= re.sub (r'\\>', '@STARTDECRESC@', str) - str= re.sub (r'([_^-])>', r'\1@ACCENT@', str) - str = re.sub ('<([^<>{}]+)>', sub_chord, str) - - str = re.sub (r'\[ *(@STARTCHORD@[^@]+@ENDCHORD@[0-9.]+)', - r'\1-[', - str) - str = re.sub (r'\\! *(@STARTCHORD@[^@]+@ENDCHORD@[0-9.]+)', - r'\1-\\!', - str) - str = re.sub ('<([^?])', r'%s\1' % simstart, str) - str = re.sub ('>([^?])', r'%s\1' % simend, str) - str = re.sub ('@STARTCRESC@', r'\\<', str) - str = re.sub ('@STARTDECRESC@', r'\\>' ,str) - str = re.sub (r'\\context *Voice *@STARTCHORD@', '@STARTCHORD@', str) - str = re.sub ('@STARTCHORD@', chordstart, str) - str = re.sub ('@ENDCHORD@', chordend, str) - str = re.sub (r'@ACCENT@', '>', str) - return str - -def articulation_substitute (str): - str = re.sub (r"""([^-])\[ *([a-z]+[,']*[!?]?[0-9:]*\.*)""", - r" \1 \2-[", str) - str = re.sub (r"""([^-])\) *([a-z]+[,']*[!?]?[0-9:]*\.*)""", - r"\1 \2-)", str) - str = re.sub (r"""([^-])\\! *([a-z]+[,']*[!?]?[0-9:]*\.*)""", - r"\1 \2-\\!", str) - return str - -def help (): - print r""" -new-chords.py -- update .ly files to new syntax. - -Usage: - new-chords.py [OPTIONS] FILE(S) - -Options - - -e, --edit in-place edit - -h, --help this help - -Description - - This script converts old chord notation to new chord notation, i.e. - - \< - - becomes - - <> -\< -) - - It will also convert slur-end, beam-start and cresc-end to postfix - notation, i.e. - - [ \! )a - - becomes - - a-\!-)-[ - - By default, the script will print the result on stdout. Use with -e - if you are confident that it does the right thing. - -Warning - - This conversion does not convert all files correctly. It is - recommended to verify the output of the new file manually. - In particular, files with extensive Scheme code (markups, like - - #'(italic "foo") - - and Scheme function definitions may be garbled by the textual - substitution. - -""" - - -(opts, files)= getopt.getopt( sys.argv[1:], 'eh',['help','edit']) -edit = 0 -for (o,a) in opts: - if o == '-e' or o == '--edit': - edit = 1 - if o == '-h' or o == '--help': - help () - sys.exit (0) - -if not files: - print 'Error: no input files.\n use -h for help.' - sys.exit(2) - - -for a in files: - str = open (a).read() - if re.search (marker_str, str): - continue - - sys.stderr.write ("processing %s\n" %a) - - str = sub_chords (str) + marker_str + '\n' - str = articulation_substitute (str) - - if edit: - open (a + '.NEW', 'w').write (str) - os.rename (a, a + '~') - os.rename (a + '.NEW', a) - else: - print str - - -## -## regexes for postfix slur & beam: -## -#PYTHON -## -#EMACS -## \([^-]\)\[ *\([a-z]+[!?]?[,']*[0-9:]*\.*\) -#### -> -## \1 \2-[ -## -## \([^-]\)) *\([a-z]+[!?]?[,']*[0-9:]*\.*\) -#### -> -## \1 \2-) - diff --git a/buildscripts/mutopia-index.py b/buildscripts/mutopia-index.py index e6a0f022b3..b6447bb32d 100644 --- a/buildscripts/mutopia-index.py +++ b/buildscripts/mutopia-index.py @@ -213,7 +213,5 @@ allfiles = [] for d in dirs: allfiles = allfiles + find ('*.ly.txt', d) -print allfiles - gen_list (allfiles, outfile) diff --git a/flower/include/string-handle.hh b/flower/include/string-handle.hh index c4619e3b8f..90e9aad4df 100644 --- a/flower/include/string-handle.hh +++ b/flower/include/string-handle.hh @@ -26,7 +26,6 @@ class String_handle { /// decrease ref count. Named kind of like a Tanenbaum semafore void down (); - /// increase ref count void up (String_data *d); /** make sure data has only one reference. diff --git a/flower/include/string-handle.icc b/flower/include/string-handle.icc index 66125c12ee..bb6524b34d 100644 --- a/flower/include/string-handle.icc +++ b/flower/include/string-handle.icc @@ -29,7 +29,6 @@ String_handle::down () THIS does not have to be initialized. */ - INLINE void String_handle::up (String_data *d) { diff --git a/input/ascii-art/as-email.ly b/input/ascii-art/as-email.ly index ec4635d094..56d929d0e2 100644 --- a/input/ascii-art/as-email.ly +++ b/input/ascii-art/as-email.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % ASCII Art output % % Process as: diff --git a/input/ascii-art/as1.ly b/input/ascii-art/as1.ly index c206eadbaf..9066555e13 100644 --- a/input/ascii-art/as1.ly +++ b/input/ascii-art/as1.ly @@ -1,5 +1,6 @@ +#(ly:set-option 'old-relative) -\version "1.7.18" +\version "1.9.0" \score { \context Voice \notes\relative c { diff --git a/input/ascii-art/as2.ly b/input/ascii-art/as2.ly index f99db28bb9..d3beeb90ab 100644 --- a/input/ascii-art/as2.ly +++ b/input/ascii-art/as2.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % test for ascii-art output diff --git a/input/ascii-art/asciiscript5.ly b/input/ascii-art/asciiscript5.ly index 05a78f9da3..deb1d512d5 100644 --- a/input/ascii-art/asciiscript5.ly +++ b/input/ascii-art/asciiscript5.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % ASCII Art output % % Process as: diff --git a/input/ascii-art/asciiscript9.ly b/input/ascii-art/asciiscript9.ly index 83ed444b1f..49fad8607a 100644 --- a/input/ascii-art/asciiscript9.ly +++ b/input/ascii-art/asciiscript9.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % ASCII Art output % % Process as: diff --git a/input/ascii-art/r-as.ly b/input/ascii-art/r-as.ly index 0a1d95b712..47cf4d037f 100644 --- a/input/ascii-art/r-as.ly +++ b/input/ascii-art/r-as.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % ASCII Art output % % Process as: diff --git a/input/ascii-art/standchen-as5.ly b/input/ascii-art/standchen-as5.ly index 8b4b444e25..4175f7c973 100644 --- a/input/ascii-art/standchen-as5.ly +++ b/input/ascii-art/standchen-as5.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % ASCII Art output % % Process as: diff --git a/input/ascii-art/standchen-as9.ly b/input/ascii-art/standchen-as9.ly index 5c809c9b72..40a32c338f 100644 --- a/input/ascii-art/standchen-as9.ly +++ b/input/ascii-art/standchen-as9.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % ASCII Art output % Process as: diff --git a/input/ascii-art/twinkle-as5.ly b/input/ascii-art/twinkle-as5.ly index 9b52e75ee9..f5c5e76d38 100644 --- a/input/ascii-art/twinkle-as5.ly +++ b/input/ascii-art/twinkle-as5.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % ASCII Art output % % Process as: diff --git a/input/bugs/+.ly b/input/bugs/+.ly index ab54c2ef2c..d854c7f8cc 100644 --- a/input/bugs/+.ly +++ b/input/bugs/+.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" %% +.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 d1cd6f3b67..af0d2fc166 100644 --- a/input/bugs/dynamic-switch.ly +++ b/input/bugs/dynamic-switch.ly @@ -1,3 +1,4 @@ +#(ly:set-option 'old-relative) \header{ % what's the problem? % well, that's elementary my dear watson @@ -5,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.7.18" +\version "1.9.0" \score{ \context Staff < diff --git a/input/example-1.ly b/input/example-1.ly index b3c9599755..268389ba01 100644 --- a/input/example-1.ly +++ b/input/example-1.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % A simple scale in LilyPond % % Type: diff --git a/input/example-2.ly b/input/example-2.ly index 76c66e9e60..b380bed753 100644 --- a/input/example-2.ly +++ b/input/example-2.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % Some beamed and slurred notes of different taste in LilyPond % % Type: diff --git a/input/example-3.ly b/input/example-3.ly index b457695f0a..83fd194100 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" one = \notes\relative c{ c'' d e f diff --git a/input/les-nereides.ly b/input/les-nereides.ly index f77693d701..b802151a81 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { composer = "ARTHUR GRAY" diff --git a/input/mutopia-header.ly b/input/mutopia-header.ly index d8e2a17c27..5841258b97 100644 --- a/input/mutopia-header.ly +++ b/input/mutopia-header.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 927f39c87a..7cdf75a8f8 100644 --- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -1,3 +1,4 @@ +#(ly:set-option 'old-relative) \header { title = "Petite Ouverture \\`a danser" subtitle = "4" @@ -7,7 +8,7 @@ copyright = "Public Domain" } -\version "1.7.18" +\version "1.9.0" \include "nederlands.ly" diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly index 29d2d36a90..8c0ddd5a47 100644 --- a/input/mutopia/F.Schubert/standchen.ly +++ b/input/mutopia/F.Schubert/standchen.ly @@ -1,3 +1,4 @@ +#(ly:set-option 'old-relative) % #(ly:set-point-and-click 'line-column) @@ -41,7 +42,7 @@ instrument = "Piano" footer = "Mutopia-2001/04/27-xx" } -\version "1.7.18" +\version "1.9.0" dynamicUp = \property Voice.DynamicLineSpanner \override #'direction = #1 dynamicRevert = \property Voice.DynamicLineSpanner \revert #'direction @@ -209,12 +210,12 @@ 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. <>8 [<>8.-> c16] | + <>4. <>8 <>8.->[ c16] | %65 <>2.-~-(-\f <>2-) r4 @@ -274,73 +275,73 @@ bassVerseOne = \notes\relative c{ <>2 r4 | <>2 r4 | <>2 r4 | - <>8 [<> <> <> <> <>] | + <>8 <>[ <> <> <> <>] | %10 - <>8 [<> <> <> <> <>] | + <>8 <>[ <> <> <> <>] | <>2 r4 | <>2 r4 | <>2 r4 | <>2 r4 | %15 - bes'8 [<> <> <> <> <>] | - es,8 [<> <> <> <> <>] | + bes'8 <>[ <> <> <> <>] | + es,8 <>[ <> <> <> <>] | <>2 r4 | <>2 r4 | <>2 r4 | <>2 r4 | - <>8 [<> <> <> <> <>] | - <>8 [<> <> <> <> <>] | + <>8 <>[ <> <> <> <>] | + <>8 <>[ <> <> <> <>] | <>2 r4 | <>2 r4 | <>2 r4 | <>2 r4 | - <>8 [<> <> <> <> <>] | - c,8 [<> <> <> <> <>] | + <>8 <>[ <> <> <> <>] | + c,8 <>[ <> <> <> <>] | } bassEentje = \notes\relative c{ \dynamicUp - <>8 [<> <> <> <> <>] | - c,8 [<> <> <> <> <>] | - <>8 [<> <> <> <> <>] | - c,8 [<> <> <> <> <>] | - <>8 [<> <> <> <> <>] | - c,8 [<> <> <> <> <>] | - <>8 [<> <> <> <> <>] | - c,8 [<> <> <> <> <>] | + <>8 <>[ <> <> <> <>] | + c,8 <>[ <> <> <> <>] | + <>8 <>[ <> <> <> <>] | + c,8 <>[ <> <> <> <>] | + <>8 <>[ <> <> <> <>] | + c,8 <>[ <> <> <> <>] | + <>8 <>[ <> <> <> <>] | + c,8 <>[ <> <> <> <>] | } bassThrough = \notes\relative c{ \dynamicUp %61 - <>8^"cresc." [<> <> <> <>-> <>] | - <>8 [<> <> <> <>-> <>] | + <>8^"cresc." <>[ <> <> <>-> <>] | + <>8 <>[ <> <> <>-> <>] | % copied - <>8 [<> <> <> <>-> <>] | - <>8 [<> <> <> <>-> <>] | + <>8 <>[ <> <> <>-> <>] | + <>8 <>[ <> <> <>-> <>] | %65 - <>8 [<>-\> <> <> <> <> -\!] | - <>8 [<> <> <> <> <>] | - <>8 [<> <> <> <> <>] | - <>8 [<> <> <> <> <>] | + <>8 <>[-\> <> <> <> <> -\!] | + <>8 <>[ <> <> <> <>] | + <>8 <>[ <> <> <> <>] | + <>8 <>[ <> <> <> <>] | % 4 bars copied from end verse1 <>2-\p r4 | %70 <>2 r4 | - <>8 [<> <> <> <> <>] | - c,8\> [<> << e g c>> -\! <> <> <>] | + <>8 <>[ <> <> <> <>] | + c,8\> <>[ << e g c>> -\! <> <> <>] | - <>8 [<> <> <> <> <>] | - <>8 [<> <> <> <> <>] | + <>8 <>[ <> <> <> <>] | + <>8 <>[ <> <> <> <>] | %75 - <>8 [<> <> <> <> <>] | - c,8 [<> <> <> <> <>] | - c,8 [<> <> <> <> <>] | - c,8 [<> <> <> <> <>] | - g,8 [<> <> <> <> <>] | + <>8 <>[ <> <> <> <>] | + c,8 <>[ <> <> <> <>] | + c,8 <>[ <> <> <> <>] | + c,8 <>[ <> <> <> <>] | + g,8 <>[ <> <> <> <>] | %80 - c,8 [<> <> <> <> <>] | - c,8 [<> <> <> <> <>] | + c,8 <>[ <> <> <> <>] | + c,8 <>[ <> <> <> <>] | <>2._\fermata | } @@ -460,7 +461,7 @@ grandStaff = \context PianoStaff < textheight = 270.0\mm linewidth = 180.0\mm - \translator { \HaraKiriStaffContext } + \translator { \RemoveEmptyStaffContext } } \midi{ \tempo 4 = 54 diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly index 848d7d78da..41d7d9742a 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.7.18" +\version "1.9.0" % #(ly:set-point-and-click 'line-column) @@ -62,19 +62,19 @@ sarabandeA = \context Voice \notes \relative c { %% check spacing without accs: %% c4.-\trill bes8-[ a g] | - \relative c < { d'8. e16 e4.-\trill d16 e | + < { 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, | - \relative c < e4.-\trill + < e4.-\trill \\ <>4 > d8-[ c bes] %%9 - \relative c < { f8 g16(a-) a4. g16(f-) | + < { f'8 g16(a-) a4. g16(f-) | g8 a16(bes-) bes4. c16(d-) } \\ { a,4 <>4. r8 bes4 <>2 } @@ -82,7 +82,7 @@ sarabandeA = \context Voice \notes \relative c { \forcedBreak %% 11 - e'8-[ f] c,-[ g'] f'-[ e] | + e,8-[ f] c,-[ g'] f'-[ e] | f4 f,2 | < { a'4 a4.-\trill bes8 c bes16 a } \\ @@ -115,13 +115,13 @@ sarabandeA = \context Voice \notes \relative c { \stemBoth \forcedLastBreak %%25 - \relative c' < { a16(b c b-) c4. b16(a-) | + < { a16(b c b-) c4. b16(a-) | b cis d cis d4. e16(f-) | } \\ { f,4 fis4. s8 | <>4 gis4. } > \voiceOne - d'16(cis d-) f, + d16(cis d-) f, a,8-[ e'] \oneVoice d'-[ cis] | diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly index a03c519e01..6354a626a6 100644 --- a/input/mutopia/J.S.Bach/bwv940.ly +++ b/input/mutopia/J.S.Bach/bwv940.ly @@ -1,4 +1,5 @@ -\version "1.8.0" +#(ly:set-option 'old-relative) +\version "1.9.0" %{ Header for Petites Preludes. diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly index 8f01dead25..e50f223a3a 100644 --- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -1,3 +1,4 @@ +#(ly:set-option 'old-relative) \header { title = "Fuga a 3 voci" opus = "BWV 847-Fuga" @@ -37,7 +38,7 @@ %} -\version "1.7.18" +\version "1.9.0" diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index aa775b96dc..9ce3186fbc 100644 --- a/input/mutopia/R.Schumann/romanze-op28-2.ly +++ b/input/mutopia/R.Schumann/romanze-op28-2.ly @@ -1,3 +1,4 @@ +#(ly:set-option 'old-relative) % NOT FINISHED!!!! \include "deutsch.ly" @@ -5,7 +6,7 @@ %% 19 is broken --hwn. %\include "paper19.ly" \include "paper16.ly" -\version "1.7.18" +\version "1.9.0" \header { title = "Romanzen" @@ -268,7 +269,7 @@ leftb = \notes \transpose c cis { pagenumber = no linewidth = 17.0 \cm \translator { - \HaraKiriStaffContext + \RemoveEmptyStaffContext } \translator { \ScoreContext diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly index e5e5ed1797..3eade1954f 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.7.18" +\version "1.9.0" \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 0c08620e5b..ba65f73d80 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \include "mozart-hrn3-defs.ly" allegro = @@ -25,7 +26,7 @@ allegro = dis4 ( e4-) r8 c8-[-. c-. c-.] c4.( d16-[ e] f4 e-) a,( d g, c-) - d-. d-. \grace e16( [ d8.-) c16 d8. e16] + d-. d-. \grace e16( d8.[) c16 d8. e16] c4 r r2 R1*3 c,2 ~ c8-[ e g c] @@ -40,7 +41,7 @@ allegro = 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-) ] @@ -98,7 +99,7 @@ allegro = a, ( d g, c-) d d \grace { e8( } - [ d8.-) c16 d8. e16] + d8.[) c16 d8. e16] c4 r r2 \mark "F" R1*3 @@ -107,7 +108,7 @@ allegro = c,8-[ e g c ] e-[ ( g-) e c] c-[( b-)] b4 r2 c2 (bes a-) a8-[(b c cis-)] - d2( ~ d8-[ e16 d] \grace { \longgrace d16( \endlonggrace } [ c8-) b16 c-)] + 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-)] @@ -127,7 +128,7 @@ allegro = f4. ( d8-) f8-[ ( d-) f d] - c-[ (e] g2-) \grace { \longgrace f16( \endlonggrace } [ e8-)( d16 c-)] + c-[ (e] g2-) \grace { \longgrace f16( \endlonggrace } e8[)( d16 c-)] < d1-\trill ( { s2 \grace { c16-[ d] } } > diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly index f43362f505..a807df5889 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.7.18" +\version "1.9.0" 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 56849923f5..9e20822969 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly @@ -1,5 +1,6 @@ +#(ly:set-option 'old-relative) -\version "1.7.18" +\version "1.9.0" \include "mozart-hrn3-defs.ly" romanze = \notes \relative c' { @@ -11,7 +12,7 @@ romanze = \notes \relative c' { f8-) a,4 a bes8-[( c d bes] g4-) r8 g a r bes r c r d-[( bes-)] - a2( [ g8-) a( bes b-)] + a2( g8[-) a( bes b-)] c4. ( f8-) a,4 a | % 6 bes8-[ (c d bes-)] g4 r8 c, diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly index d0bccea6ef..8f8b69f2c5 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % \include "mozart-hrn3-defs.ly" diff --git a/input/no-notation/bar-check.ly b/input/no-notation/bar-check.ly index 33f2d51de3..a570d39117 100644 --- a/input/no-notation/bar-check.ly +++ b/input/no-notation/bar-check.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { diff --git a/input/no-notation/beam-warn.ly b/input/no-notation/beam-warn.ly index d853f5a4e5..fd11b9e9d8 100644 --- a/input/no-notation/beam-warn.ly +++ b/input/no-notation/beam-warn.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { diff --git a/input/no-notation/denneboom.ly b/input/no-notation/denneboom.ly index aaae5b902e..812d9e8c77 100644 --- a/input/no-notation/denneboom.ly +++ b/input/no-notation/denneboom.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header{ filename = "denneboom.ly" enteredby = "jcn" diff --git a/input/no-notation/die-staff.ly b/input/no-notation/die-staff.ly index 5423bada0f..af56a53f21 100644 --- a/input/no-notation/die-staff.ly +++ b/input/no-notation/die-staff.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 ca8c1d437b..0ab922f0ff 100644 --- a/input/no-notation/midi-grace.ly +++ b/input/no-notation/midi-grace.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 426aec78d2..eb70bf1104 100644 --- a/input/no-notation/midi-transposing.ly +++ b/input/no-notation/midi-transposing.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 dd2d0e2bde..46b5140331 100644 --- a/input/no-notation/midi-tuplets.ly +++ b/input/no-notation/midi-tuplets.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = " diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly index acadc67b06..890c8e1709 100644 --- a/input/no-notation/midi-volume-equaliser.ly +++ b/input/no-notation/midi-volume-equaliser.ly @@ -1,4 +1,5 @@ -\version "1.7.19" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "@cindex Midi Volume Equaliser The full orchestra plays a notes, where groups stop one after diff --git a/input/no-notation/parse.ly b/input/no-notation/parse.ly index ac5a3f815a..16b3b47707 100644 --- a/input/no-notation/parse.ly +++ b/input/no-notation/parse.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % Test parser error diff --git a/input/no-notation/parse2.ly b/input/no-notation/parse2.ly index 1bee0a6992..3962917b5a 100644 --- a/input/no-notation/parse2.ly +++ b/input/no-notation/parse2.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % Test parser error diff --git a/input/no-notation/parse3.ly b/input/no-notation/parse3.ly index 322240dcca..81212889c8 100644 --- a/input/no-notation/parse3.ly +++ b/input/no-notation/parse3.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % Test parser error diff --git a/input/no-notation/parse4.ly b/input/no-notation/parse4.ly index ea335b3ab9..8196471772 100644 --- a/input/no-notation/parse4.ly +++ b/input/no-notation/parse4.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % Test parser error diff --git a/input/no-notation/parse5.ly b/input/no-notation/parse5.ly index cf3c6c8be5..476f0b7a3b 100644 --- a/input/no-notation/parse5.ly +++ b/input/no-notation/parse5.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" %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 c8915dc70e..aa28210379 100644 --- a/input/no-notation/pc-direction.ly +++ b/input/no-notation/pc-direction.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % move to regtest once it works? @@ -116,7 +117,7 @@ staffCombinePianoStaffProperties = { \consists "Thread_devnull_engraver" } \translator{ - \HaraKiriStaffContext + \RemoveEmptyStaffContext \consists "Mark_engraver" } \translator { diff --git a/input/no-notation/textcresc.ly b/input/no-notation/textcresc.ly index 44bc9e8b14..ad3f00c1b5 100644 --- a/input/no-notation/textcresc.ly +++ b/input/no-notation/textcresc.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header{ texidoc="crashes lily" } diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly index b521b67fba..576a73b79a 100644 --- a/input/puer-fragment.ly +++ b/input/puer-fragment.ly @@ -1,4 +1,4 @@ -\version "1.8.0" +\version "1.9.0" \header { title = "Puer natus est nobis (excerptum)" subtitle = "Antiphona ad introitum VII" diff --git a/input/regression/+.ly b/input/regression/+.ly index f7ee566dc1..4683d8896a 100644 --- a/input/regression/+.ly +++ b/input/regression/+.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" %% +.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 5c0462bc00..8a9fbb597a 100644 --- a/input/regression/accidental-cautionary.ly +++ b/input/regression/accidental-cautionary.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = "Cautionary accidentals are indicated using either diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly index 3701c1daad..58ce1165b8 100644 --- a/input/regression/accidental-double.ly +++ b/input/regression/accidental-double.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 42f86e68e5..f99223a091 100644 --- a/input/regression/accidental-ledger.ly +++ b/input/regression/accidental-ledger.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 0362e7e073..b724caae69 100644 --- a/input/regression/accidental-octave.ly +++ b/input/regression/accidental-octave.ly @@ -1,5 +1,5 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc=" diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly index 709d091b1d..ea075e47cb 100644 --- a/input/regression/accidental-placement.ly +++ b/input/regression/accidental-placement.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly index b3bd975b2c..8e30e38b29 100644 --- a/input/regression/accidental-single-double.ly +++ b/input/regression/accidental-single-double.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 3adc0ada82..7a6b6f9a2c 100644 --- a/input/regression/accidental-unbroken-tie-spacing.ly +++ b/input/regression/accidental-unbroken-tie-spacing.ly @@ -1,9 +1,10 @@ +#(ly:set-option 'old-relative) \header { texidoc = "Tied accidentaled notes (which cause reminder accidentals) don't wreak havoc in the spacing when unbroken." } -\version "1.7.18" +\version "1.9.0" \include "deutsch.ly" rechts = \notes \relative c' { diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly index de8a5c7ee7..5b4d2e7e30 100644 --- a/input/regression/accidental-voice.ly +++ b/input/regression/accidental-voice.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly index 4a08fff710..9a6f06b576 100644 --- a/input/regression/accidental.ly +++ b/input/regression/accidental.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/accidentals.ly b/input/regression/accidentals.ly index 5914a1c876..4b620313fb 100644 --- a/input/regression/accidentals.ly +++ b/input/regression/accidentals.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/allfontstyle.ly b/input/regression/allfontstyle.ly index 87e0ac7392..be3639f986 100644 --- a/input/regression/allfontstyle.ly +++ b/input/regression/allfontstyle.ly @@ -1,4 +1,5 @@ -\version "1.5.68" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" @@ -16,7 +17,7 @@ Different text styles are used for various purposes. \property Voice.TextScript \set #'font-style = #'large f4-\ff^""^"Largo" \mark "B" g } - \paper { linewidth = -1.0 + \paper { raggedright = ##t % \translator {\BarNumberingStaffContext} } } } diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly index 92b40def9a..ec79d0d445 100644 --- a/input/regression/ambitus.ly +++ b/input/regression/ambitus.ly @@ -1,3 +1,4 @@ +#(ly:set-option 'old-relative) \header { texidoc = "Ambituses indicate pitch ranges for voices. @@ -51,7 +52,7 @@ paper block: %} -\version "1.7.18" +\version "1.9.0" upper = \notes \relative c { \clef "treble" diff --git a/input/regression/apply-context.ly b/input/regression/apply-context.ly index 1a0feef327..db059b66c1 100644 --- a/input/regression/apply-context.ly +++ b/input/regression/apply-context.ly @@ -1,4 +1,5 @@ -\version "1.7.23" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly index e2af5aca61..b180e90691 100644 --- a/input/regression/apply-output.ly +++ b/input/regression/apply-output.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "The @code{\applyoutput} expression is the most flexible way to diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly index a7f353bc14..c9ec7cd175 100644 --- a/input/regression/arpeggio-collision.ly +++ b/input/regression/arpeggio-collision.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Arpeggio stays clear of accidentals and flipped note heads. diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly index b0a864d2a1..d1667106e1 100644 --- a/input/regression/arpeggio.ly +++ b/input/regression/arpeggio.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" Arpeggios are supported, both cross-staff and broken single staff. diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly index 3bdbf42828..de240c2e8a 100644 --- a/input/regression/auto-beam-bar.ly +++ b/input/regression/auto-beam-bar.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly index 8fdf47f9b1..aca6402a64 100644 --- a/input/regression/auto-beam-triplet.ly +++ b/input/regression/auto-beam-triplet.ly @@ -1,9 +1,10 @@ +#(ly:set-option 'old-relative) \header { texidoc = "Automatic beaming is also done on tuplets." } -\version "1.7.18" +\version "1.9.0" \score{ \notes\relative c''{ diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly index 889f8ec5b1..bf57e4075b 100644 --- a/input/regression/auto-beam-tuplets.ly +++ b/input/regression/auto-beam-tuplets.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Tuplet-spanner should not put (visible) brackets on diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly index 0bfbd636e2..12bb215133 100644 --- a/input/regression/auto-beam.ly +++ b/input/regression/auto-beam.ly @@ -1,10 +1,11 @@ +#(ly:set-option 'old-relative) \header { texidoc="Test automatic beamer: the last measure should have a single beam." } -\version "1.7.18" +\version "1.9.0" diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly index f84d904b9f..d0fb375e4a 100644 --- a/input/regression/auto-change.ly +++ b/input/regression/auto-change.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly index eb6e42de6f..634331192a 100644 --- a/input/regression/bar-number.ly +++ b/input/regression/bar-number.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly index 2391cf902e..b4a4e76780 100644 --- a/input/regression/bar-scripts.ly +++ b/input/regression/bar-scripts.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly index c13919f2bf..0e20972396 100644 --- a/input/regression/beam-auto-knee.ly +++ b/input/regression/beam-auto-knee.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc="Automatic kneeing. A knee is made when a horizontal beam fits in a gap between note heads that is larger than a predefined diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly index 3be4bb42e4..9b8650c30c 100644 --- a/input/regression/beam-break.ly +++ b/input/regression/beam-break.ly @@ -1,9 +1,10 @@ +#(ly:set-option 'old-relative) \header { texidoc = "Beams can be printed across line breaks if forced. " } -\version "1.7.19" +\version "1.9.0" \paper { raggedright= ##t } \score { \notes \relative c'' { diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly index 6b86d60460..3d595f87f8 100644 --- a/input/regression/beam-center-slope.ly +++ b/input/regression/beam-center-slope.ly @@ -1,5 +1,6 @@ +#(ly:set-option 'old-relative) -\version "1.7.18" +\version "1.9.0" \header{ texidoc="Simple beams on middle staffline are allowed to be diff --git a/input/regression/beam-chord.ly b/input/regression/beam-chord.ly index e4f7a8fc2b..8ba4788eb5 100644 --- a/input/regression/beam-chord.ly +++ b/input/regression/beam-chord.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = "If the first and last outer notes of a beam are the same, diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly index 451cfa24a8..5b1ef400a1 100644 --- a/input/regression/beam-concave.ly +++ b/input/regression/beam-concave.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc = "Concave beams should be horizontal. Informally spoken, diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly index 243625bb49..34ed9b7202 100644 --- a/input/regression/beam-cross-staff-auto-knee.ly +++ b/input/regression/beam-cross-staff-auto-knee.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly index 7ea902a817..3343b59903 100644 --- a/input/regression/beam-cross-staff-slope.ly +++ b/input/regression/beam-cross-staff-slope.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Cross staff (kneed) beams don't cause extreme slopes." } diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly index 93af05a998..3e798a30a4 100644 --- a/input/regression/beam-cross-staff.ly +++ b/input/regression/beam-cross-staff.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" Beams can be typeset over fixed distance aligned staves, beam diff --git a/input/regression/beam-damp.ly b/input/regression/beam-damp.ly index c5ce6378fa..4362d03f09 100644 --- a/input/regression/beam-damp.ly +++ b/input/regression/beam-damp.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "@cindex Beam Damp Beams are less steep than the notes they encompass. " } diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly index dc8fdfe192..ff001c3197 100644 --- a/input/regression/beam-default-lengths.ly +++ b/input/regression/beam-default-lengths.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc="Beamed stems have standard lengths if possible." diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index bb0c7f0259..2c8d7ddf74 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" Beams should behave reasonably well, even under extreme circumstances. diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly index 62dbcd7595..a7f9c6fd59 100644 --- a/input/regression/beam-french.ly +++ b/input/regression/beam-french.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly index f03936795f..e479332bca 100644 --- a/input/regression/beam-funky-beamlet.ly +++ b/input/regression/beam-funky-beamlet.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 6af59043bb..601884a0b8 100644 --- a/input/regression/beam-funky.ly +++ b/input/regression/beam-funky.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Knee beaming, complex configurations. According to diff --git a/input/regression/beam-knee-symmetry.ly b/input/regression/beam-knee-symmetry.ly index f074d700df..21145e8753 100644 --- a/input/regression/beam-knee-symmetry.ly +++ b/input/regression/beam-knee-symmetry.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Point-symmetric beams should receive the same diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly index 58e2f35a86..a515689d59 100644 --- a/input/regression/beam-length.ly +++ b/input/regression/beam-length.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly index 36e04df415..c5306c1a66 100644 --- a/input/regression/beam-manual-beaming.ly +++ b/input/regression/beam-manual-beaming.ly @@ -1,4 +1,5 @@ -\version "1.7.23" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { diff --git a/input/regression/beam-manual.ly b/input/regression/beam-manual.ly index 476ed4a9e3..32da21bfb8 100644 --- a/input/regression/beam-manual.ly +++ b/input/regression/beam-manual.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly index 0dc544d61b..e3bd69a48e 100644 --- a/input/regression/beam-multiple-cross-staff.ly +++ b/input/regression/beam-multiple-cross-staff.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Kneed beams (often happens with cross-staff beams) diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly index 7a555af0b5..ebc44eba68 100644 --- a/input/regression/beam-over-barline.ly +++ b/input/regression/beam-over-barline.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Explicit beams may cross barlines. " } diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly index bfa652c922..fdf7f1eaa0 100644 --- a/input/regression/beam-position.ly +++ b/input/regression/beam-position.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" Beams should always reach the middle staff line. The second beam diff --git a/input/regression/beam-postfix-notation.ly b/input/regression/beam-postfix-notation.ly index 7959292ad4..cef6d48e42 100644 --- a/input/regression/beam-postfix-notation.ly +++ b/input/regression/beam-postfix-notation.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Beams and ties may be entered in postfix notation, separating the diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly index 4387d0b3b1..bb3daa39b1 100644 --- a/input/regression/beam-quanting-horizontal.ly +++ b/input/regression/beam-quanting-horizontal.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly index f6891ad2be..f1afe18d50 100644 --- a/input/regression/beam-quarter.ly +++ b/input/regression/beam-quarter.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc= "Quarter notes may be beamed: the beam is halted momentarily." diff --git a/input/regression/beam-rest.ly b/input/regression/beam-rest.ly index 40c8702c6f..0742614292 100644 --- a/input/regression/beam-rest.ly +++ b/input/regression/beam-rest.ly @@ -1,8 +1,9 @@ +#(ly:set-option 'old-relative) \header { texidoc = "The number of beams doesn't change on a rest." } -\version "1.7.18" +\version "1.9.0" \score { \notes \relative c, { \clef bass diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly index ed9e789030..18b49d2da0 100644 --- a/input/regression/beam-second.ly +++ b/input/regression/beam-second.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" Seconds are tricky. We used to have problems with seconds being too diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly index 0a8321f9fc..af59c37daf 100644 --- a/input/regression/beam-shortened-lengths.ly +++ b/input/regression/beam-shortened-lengths.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc="Beams in unnatural direction, have shortened stems, but do not look too short." diff --git a/input/regression/beamed-chord.ly b/input/regression/beamed-chord.ly index 7d9bd54bee..ba36bc3c4b 100644 --- a/input/regression/beamed-chord.ly +++ b/input/regression/beamed-chord.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc = "Hairy case for beam, chord, and automatic knees." diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly index 8094595ed4..bac17da693 100644 --- a/input/regression/beaming-ternary-metrum.ly +++ b/input/regression/beaming-ternary-metrum.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Automatic beaming works also in ternary time sigs." } diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly index 7a85e00f7a..f9ac599b54 100644 --- a/input/regression/beaming.ly +++ b/input/regression/beaming.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/beams.ly b/input/regression/beams.ly index 6031672680..392cae18f1 100644 --- a/input/regression/beams.ly +++ b/input/regression/beams.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Beams (simple)." } diff --git a/input/regression/between-systems.ly b/input/regression/between-systems.ly index eb7a36ef27..1ae84b834a 100644 --- a/input/regression/between-systems.ly +++ b/input/regression/between-systems.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/break.ly b/input/regression/break.ly index 86595cee65..a9690c6284 100644 --- a/input/regression/break.ly +++ b/input/regression/break.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly index cf66bd4ee1..cb2f4e3d90 100644 --- a/input/regression/breathing-sign.ly +++ b/input/regression/breathing-sign.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" Breathing signs, also used for phrasing, do normally not influence diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly index 79130fec7a..2f0a6f8edf 100644 --- a/input/regression/chord-changes.ly +++ b/input/regression/chord-changes.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 7c58dd3fa4..d889a752f2 100644 --- a/input/regression/chord-name-entry-11.ly +++ b/input/regression/chord-name-entry-11.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { diff --git a/input/regression/chord-name-entry.ly b/input/regression/chord-name-entry.ly index 9a2006e18f..dc18dc5b1d 100644 --- a/input/regression/chord-name-entry.ly +++ b/input/regression/chord-name-entry.ly @@ -1,4 +1,4 @@ -\version "1.7.23" +\version "1.9.0" \header { diff --git a/input/regression/chord-name-exceptions.ly b/input/regression/chord-name-exceptions.ly index c71362cc91..521f1de28b 100644 --- a/input/regression/chord-name-exceptions.ly +++ b/input/regression/chord-name-exceptions.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = "The property @code{chordNameExceptions} can used to store a list of special notations for specific chords. diff --git a/input/regression/chord-name-major7.ly b/input/regression/chord-name-major7.ly index 416d52fae6..52ccd3bafa 100644 --- a/input/regression/chord-name-major7.ly +++ b/input/regression/chord-name-major7.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 baa1bfadfc..f2e668b8f2 100644 --- a/input/regression/chord-scripts.ly +++ b/input/regression/chord-scripts.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 38c73e171f..2fbb83e5a5 100644 --- a/input/regression/chord-tremolo.ly +++ b/input/regression/chord-tremolo.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/chords-funky-ignatzek.ly b/input/regression/chords-funky-ignatzek.ly index 24363d7297..bc7ddc62e5 100644 --- a/input/regression/chords-funky-ignatzek.ly +++ b/input/regression/chords-funky-ignatzek.ly @@ -1,4 +1,4 @@ -\version "1.7.23" +\version "1.9.0" \header { diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly index ce4145459d..4654545dcd 100644 --- a/input/regression/clefs.ly +++ b/input/regression/clefs.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly index 1daceec9d7..f87a31ecc9 100644 --- a/input/regression/cluster.ly +++ b/input/regression/cluster.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 3983d8f884..d9383596ee 100644 --- a/input/regression/collision-2.ly +++ b/input/regression/collision-2.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = "Collisions for single head notes. " } diff --git a/input/regression/collision-dots.ly b/input/regression/collision-dots.ly index b9eea075bc..dc808a8fa2 100644 --- a/input/regression/collision-dots.ly +++ b/input/regression/collision-dots.ly @@ -5,7 +5,7 @@ on the right side." } -\version "1.7.18" +\version "1.9.0" \paper { raggedright= ##t } diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly index 2b387197f3..9f5e85cb67 100644 --- a/input/regression/collision-head-chords.ly +++ b/input/regression/collision-head-chords.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 2b01470640..4dc394000a 100644 --- a/input/regression/collision-heads.ly +++ b/input/regression/collision-heads.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly index 8ff1addee1..6140e4261f 100644 --- a/input/regression/collision-merge-differently-dotted.ly +++ b/input/regression/collision-merge-differently-dotted.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = "If NoteCollision has merge-differently-dotted set, note diff --git a/input/regression/collision-mesh.ly b/input/regression/collision-mesh.ly index 812e2f0583..19248de66c 100644 --- a/input/regression/collision-mesh.ly +++ b/input/regression/collision-mesh.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = "Oppositely stemmed chords, meshing into each other, are resolved." diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly index bfc0a20d2c..0c4cb7a121 100644 --- a/input/regression/collisions.ly +++ b/input/regression/collisions.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 56eda0ece0..744fac9921 100644 --- a/input/regression/completion-heads-polyphony.ly +++ b/input/regression/completion-heads-polyphony.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 1cf0e953c0..c11f2c4ec2 100644 --- a/input/regression/completion-heads.ly +++ b/input/regression/completion-heads.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/custos.ly b/input/regression/custos.ly index e5280ca1ee..d6eedcf5d2 100644 --- a/input/regression/custos.ly +++ b/input/regression/custos.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = "Custodes in various styles." } diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly index e36b36c256..a55d225211 100644 --- a/input/regression/dot-flag-collision.ly +++ b/input/regression/dot-flag-collision.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 6d73632ea4..9e0b14069e 100644 --- a/input/regression/dots.ly +++ b/input/regression/dots.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 c0409f770f..86ca73505b 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.7.18" +\version "1.9.0" 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 fc30b64dc2..3587e805b3 100644 --- a/input/regression/dynamics-broken-hairpin.ly +++ b/input/regression/dynamics-broken-hairpin.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc = "Broken crescendi should be open on one side." } diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly index 396a1479fe..06ab519c4d 100644 --- a/input/regression/dynamics-glyphs.ly +++ b/input/regression/dynamics-glyphs.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header {texidoc = "Dynamic letters are kerned, and their weight matches that of the hairpin signs. The dynamic scripts should be diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly index 937d321adc..0df83597a6 100644 --- a/input/regression/dynamics-line.ly +++ b/input/regression/dynamics-line.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" Dynamics appear below or above the staff. If multiple dynamics are linked with (de)crescendi, they should be on the same diff --git a/input/regression/dynamics-unbound-hairpin.ly b/input/regression/dynamics-unbound-hairpin.ly index 6711927c62..9b0ac62a0f 100644 --- a/input/regression/dynamics-unbound-hairpin.ly +++ b/input/regression/dynamics-unbound-hairpin.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = "Crescendi may start off-notes. In that case, they should not collapse into flat lines." diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly index a8f282e89c..1a8514c77d 100644 --- a/input/regression/easy-notation.ly +++ b/input/regression/easy-notation.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = " Ez-notation prints names in note heads. diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly index 2e67bf0535..ea4fbf8cc5 100644 --- a/input/regression/figured-bass.ly +++ b/input/regression/figured-bass.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 c6b0e85be4..fb16e4ad92 100644 --- a/input/regression/finger-chords.ly +++ b/input/regression/finger-chords.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "With the new chord syntax it's possible to associate diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly index d65e781f65..2184db5dca 100644 --- a/input/regression/fingering.ly +++ b/input/regression/fingering.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 9ec1c91bcc..c1872deeaa 100644 --- a/input/regression/follow-voice-break.ly +++ b/input/regression/follow-voice-break.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 b08da1b43e..97d8bcc95f 100644 --- a/input/regression/font-magnification.ly +++ b/input/regression/font-magnification.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "The magnification can be set for any font. Note that this doesn't change variable symbols such as beams or slurs. " } diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly index 8af926acd7..944c773253 100644 --- a/input/regression/font-name.ly +++ b/input/regression/font-name.ly @@ -1,4 +1,4 @@ -\version "1.7.28" +\version "1.9.0" \header { diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly index e3c93d6cf7..66b5e3a91c 100644 --- a/input/regression/generic-output-property.ly +++ b/input/regression/generic-output-property.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly index 0241445b72..4ca6fdc25c 100644 --- a/input/regression/glissando.ly +++ b/input/regression/glissando.ly @@ -1,4 +1,5 @@ -\version "1.7.22" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly index 275349a7dc..f614b64cb0 100644 --- a/input/regression/grace-auto-beam.ly +++ b/input/regression/grace-auto-beam.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 2e5939766d..3a937c0c68 100644 --- a/input/regression/grace-bar-line.ly +++ b/input/regression/grace-bar-line.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Bar line should come before the grace note." } diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly index 97dfab6830..eeee3d94d5 100644 --- a/input/regression/grace-bar-number.ly +++ b/input/regression/grace-bar-number.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 22ab0f28bd..44e363918a 100644 --- a/input/regression/grace-beam.ly +++ b/input/regression/grace-beam.ly @@ -1,3 +1,4 @@ +#(ly:set-option 'old-relative) \header { texidoc = "Grace beams and normal beams may occur simultaneously. @@ -8,6 +9,6 @@ Unbeamed grace notes are not put into normal beams. \paper { raggedright= ##t } -\version "1.7.18" +\version "1.9.0" \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 5c72e1ea2d..671bd4bd41 100644 --- a/input/regression/grace-dynamic.ly +++ b/input/regression/grace-dynamic.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 3619666123..fdfc3f110e 100644 --- a/input/regression/grace-end.ly +++ b/input/regression/grace-end.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc="@cindex Grace End diff --git a/input/regression/grace-nest.ly b/input/regression/grace-nest.ly index abdb3484ed..0e1cdf3026 100644 --- a/input/regression/grace-nest.ly +++ b/input/regression/grace-nest.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 2dcf59764d..4326850a10 100644 --- a/input/regression/grace-nest1.ly +++ b/input/regression/grace-nest1.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 8255e47645..a2fdc1505a 100644 --- a/input/regression/grace-nest2.ly +++ b/input/regression/grace-nest2.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 ccaf4c5d76..cc724246ab 100644 --- a/input/regression/grace-nest3.ly +++ b/input/regression/grace-nest3.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Another nested grace situation." } diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly index d5c8fc7a9f..9d2f916234 100644 --- a/input/regression/grace-nest4.ly +++ b/input/regression/grace-nest4.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Another combination of grace note nesting." } diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly index 3ef541d7af..6e74e8ad01 100644 --- a/input/regression/grace-nest5.ly +++ b/input/regression/grace-nest5.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Another nested grace situation." } diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly index 8884623017..6cb2fc318e 100644 --- a/input/regression/grace-part-combine.ly +++ b/input/regression/grace-part-combine.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 9c7890f21b..37e8c46f55 100644 --- a/input/regression/grace-staff-length.ly +++ b/input/regression/grace-staff-length.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 5889422b6e..11b310fa2c 100644 --- a/input/regression/grace-start.ly +++ b/input/regression/grace-start.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Pieces may begin with grace notes." } diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly index bf42565b1e..24feff4201 100644 --- a/input/regression/grace-stems.ly +++ b/input/regression/grace-stems.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc = "Here startGraceMusic should set no-stem-extend to true; the two grace beams should be the same here. diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly index 7c753a215c..ef1e4f7b33 100644 --- a/input/regression/grace-sync.ly +++ b/input/regression/grace-sync.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Grace notes in different voices/staves are synchronized." } diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly index 7169848ab9..29a5e80526 100644 --- a/input/regression/grace-unfold-repeat.ly +++ b/input/regression/grace-unfold-repeat.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 711d5021a4..4875290c1d 100644 --- a/input/regression/grace-volta-repeat-2.ly +++ b/input/regression/grace-volta-repeat-2.ly @@ -1,4 +1,5 @@ -\version "1.7.22" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly index 8a15d73f48..10ea1b4d7a 100644 --- a/input/regression/grace-volta-repeat.ly +++ b/input/regression/grace-volta-repeat.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { diff --git a/input/regression/grace.ly b/input/regression/grace.ly index e611c48416..8d7388c317 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly index 76a3886076..af43a6defa 100644 --- a/input/regression/hairpin-ending.ly +++ b/input/regression/hairpin-ending.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly index 6ac1a71b43..2ec11ff238 100644 --- a/input/regression/hara-kiri-pianostaff.ly +++ b/input/regression/hara-kiri-pianostaff.ly @@ -1,4 +1,4 @@ -\version "1.7.19" +\version "1.9.0" \header { texidoc = diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly index ddc57dec8a..5a58fb6877 100644 --- a/input/regression/instrument-name-markup.ly +++ b/input/regression/instrument-name-markup.ly @@ -7,7 +7,7 @@ including alterations. " } -\version "1.7.18" +\version "1.9.0" textFlat = \markup {\smaller \musicglyph #"accidentals--1"} diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly index ce50eeaf51..067847e25e 100644 --- a/input/regression/instrument-name-partial.ly +++ b/input/regression/instrument-name-partial.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 a2c46ee560..1237600135 100644 --- a/input/regression/instrument-name.ly +++ b/input/regression/instrument-name.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 5603e38df4..504757c6fe 100644 --- a/input/regression/key-clefs.ly +++ b/input/regression/key-clefs.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 198d2a93e6..d810d4471a 100644 --- a/input/regression/key-signature-scordatura.ly +++ b/input/regression/key-signature-scordatura.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 366a22903a..84440827d8 100644 --- a/input/regression/keys.ly +++ b/input/regression/keys.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 b574b64cd4..5a00e1ec42 100644 --- a/input/regression/lyric-align.ly +++ b/input/regression/lyric-align.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index 2f2b89a044..9d942f7549 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc ="Polyphonic rhythms and rests don't disturb diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly index b53f3fc587..ec3ce498fa 100644 --- a/input/regression/lyric-combine.ly +++ b/input/regression/lyric-combine.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc= "Lyrics can be set to a melody automatically. Excess lyrics will be diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly index e98329bd57..9161cec784 100644 --- a/input/regression/lyric-extender.ly +++ b/input/regression/lyric-extender.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc= "Tests lyric extenders. "} \paper { raggedright= ##t } diff --git a/input/regression/lyric-hyphen.ly b/input/regression/lyric-hyphen.ly index 7a19e3c88a..2ff027ed49 100644 --- a/input/regression/lyric-hyphen.ly +++ b/input/regression/lyric-hyphen.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header {texidoc="Tests lyric hyphens. "} \score{ < diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly index 5d91f38847..97d659c94e 100644 --- a/input/regression/lyric-phrasing.ly +++ b/input/regression/lyric-phrasing.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc="Lyric phrasing diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly index f11cf1c386..dca8055e1b 100644 --- a/input/regression/lyrics-bar.ly +++ b/input/regression/lyrics-bar.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/lyrics-extender.ly b/input/regression/lyrics-extender.ly index 0c75276927..6f95ea1fa5 100644 --- a/input/regression/lyrics-extender.ly +++ b/input/regression/lyrics-extender.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc = diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly index fa4582918b..9b2baf2961 100644 --- a/input/regression/lyrics-melisma-beam.ly +++ b/input/regression/lyrics-melisma-beam.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Melismata are triggered by manual beams." diff --git a/input/regression/lyrics-multi-stanza.ly b/input/regression/lyrics-multi-stanza.ly index b6001112d8..c92a19352b 100644 --- a/input/regression/lyrics-multi-stanza.ly +++ b/input/regression/lyrics-multi-stanza.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Lyrics syllables are aligned according to diff --git a/input/regression/markup-note.ly b/input/regression/markup-note.ly index 8f342f7ad5..59f050cf57 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.7.18" +\version "1.9.0" \score { \notes { c4^\markup { \note #0 #0 #1 diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly index c7bfa98c12..cc24cc7aec 100644 --- a/input/regression/markup-stack.ly +++ b/input/regression/markup-stack.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 0a290a64d5..9d8b251f48 100644 --- a/input/regression/measure-grouping.ly +++ b/input/regression/measure-grouping.ly @@ -1,3 +1,4 @@ +#(ly:set-option 'old-relative) \header { @@ -7,7 +8,7 @@ of Steve Martland's Dance Works. " } -\version "1.7.18" +\version "1.9.0" %% TODO: should have 2/4 + 5/8 time sig style. diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly index 53f79d90a1..15d8b93773 100644 --- a/input/regression/mensural.ly +++ b/input/regression/mensural.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 ddd6725810..0da2bf2110 100644 --- a/input/regression/metronome-marking.ly +++ b/input/regression/metronome-marking.ly @@ -1,3 +1,4 @@ +#(ly:set-option 'old-relative) \header { @@ -8,7 +9,7 @@ The marking is left aligned with the time signature, if there is one. } -\version "1.7.18" +\version "1.9.0" \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 b1c68d14d8..7e8f96127d 100644 --- a/input/regression/mm-rests2.ly +++ b/input/regression/mm-rests2.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/mmrest-collision.ly b/input/regression/mmrest-collision.ly index 0a8cfe40cb..0fb4df78e6 100644 --- a/input/regression/mmrest-collision.ly +++ b/input/regression/mmrest-collision.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 e0cb4bc845..f2ea5632ee 100644 --- a/input/regression/molecule-hacking.ly +++ b/input/regression/molecule-hacking.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 ce6292c09d..69d2547a55 100644 --- a/input/regression/multi-measure-rest-center.ly +++ b/input/regression/multi-measure-rest-center.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 b5903161b2..69d309b09f 100644 --- a/input/regression/multi-measure-rest-grace.ly +++ b/input/regression/multi-measure-rest-grace.ly @@ -1,4 +1,4 @@ -\version "1.7.23" +\version "1.9.0" \header { diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly index efa2dbab89..1236e9d84e 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.7.18" +\version "1.9.0" \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 8d2937ce21..0eff234d0f 100644 --- a/input/regression/multi-measure-rest-text.ly +++ b/input/regression/multi-measure-rest-text.ly @@ -1,4 +1,4 @@ -\version "1.7.23" +\version "1.9.0" \header { diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly index cfdfa8839f..ab6cb7eba3 100644 --- a/input/regression/multi-measure-rest.ly +++ b/input/regression/multi-measure-rest.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/music-map.ly b/input/regression/music-map.ly index 6ff691438c..0286525735 100644 --- a/input/regression/music-map.ly +++ b/input/regression/music-map.ly @@ -1,3 +1,4 @@ +#(ly:set-option 'old-relative) \header { texidoc = @@ -10,7 +11,7 @@ dynamics are left over. These are put onto the 2nd measure." } -\version "1.7.18" +\version "1.9.0" #(define (notes-to-skip m) "Convert all stuff with duration (notes, lyrics, bass figures, etc.) to skips. diff --git a/input/regression/new-markup-syntax.ly b/input/regression/new-markup-syntax.ly index 95a234aea7..59b24ed9a2 100644 --- a/input/regression/new-markup-syntax.ly +++ b/input/regression/new-markup-syntax.ly @@ -2,7 +2,7 @@ texidoc = "New markup syntax." } -\version "1.7.18" +\version "1.9.0" \score { diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly index d989b6c368..df9f39a37d 100644 --- a/input/regression/non-empty-text.ly +++ b/input/regression/non-empty-text.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly index 6bea3c8306..5a23a27475 100644 --- a/input/regression/note-group-bracket.ly +++ b/input/regression/note-group-bracket.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly index 2c9ec9dbd8..0e7b16b810 100644 --- a/input/regression/note-head-chord.ly +++ b/input/regression/note-head-chord.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 6115f83490..7cabf9883f 100644 --- a/input/regression/note-head-style.ly +++ b/input/regression/note-head-style.ly @@ -1,4 +1,4 @@ -\version "1.8.0" +\version "1.9.0" \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 ac8bffd0de..c7c6fe5eb9 100644 --- a/input/regression/note-line.ly +++ b/input/regression/note-line.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 47db220e4b..04e897e897 100644 --- a/input/regression/number-staff-lines.ly +++ b/input/regression/number-staff-lines.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 7a6599092d..29c1baa7d9 100644 --- a/input/regression/ottava-broken.ly +++ b/input/regression/ottava-broken.ly @@ -1,3 +1,4 @@ +#(ly:set-option 'old-relative) \header { @@ -7,7 +8,7 @@ line, and the horizontal line doesn't stick out." } -\version "1.7.19" +\version "1.9.0" \paper { raggedright = ##t} diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly index 7d2953c817..094bcf1562 100644 --- a/input/regression/ottava.ly +++ b/input/regression/ottava.ly @@ -1,3 +1,4 @@ +#(ly:set-option 'old-relative) \header { texidoc = "Ottava brackets are supported, through the @@ -5,7 +6,7 @@ use of the scheme function @code{set-octavation}. " } -\version "1.7.18" +\version "1.9.0" \paper { raggedright = ##t} diff --git a/input/regression/output-property.ly b/input/regression/output-property.ly index ab1f004129..7d7f3603b3 100644 --- a/input/regression/output-property.ly +++ b/input/regression/output-property.ly @@ -1,3 +1,4 @@ +#(ly:set-option 'old-relative) \header { texidoc = " Setting @code{\outputproperty} is a clumsy and deprecated way of changing @@ -10,7 +11,7 @@ possible to use @code{\override} would shift both texts. } -\version "1.7.18" +\version "1.9.0" #(define (make-text-checker text) (lambda (grob) (equal? text (ly:get-grob-property grob 'text)))) diff --git a/input/regression/pc-mmrest.ly b/input/regression/pc-mmrest.ly index 8e8ca17312..165fc8ba92 100644 --- a/input/regression/pc-mmrest.ly +++ b/input/regression/pc-mmrest.ly @@ -1,4 +1,5 @@ -\version "1.7.19" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc="Multi measure rests of second voice should not disappear." } diff --git a/input/regression/pc-switch-slur.ly b/input/regression/pc-switch-slur.ly index ac71cfa0b0..3af02b251c 100644 --- a/input/regression/pc-switch-slur.ly +++ b/input/regression/pc-switch-slur.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc="The partcombiner should not combine two small slurs into a big one." } diff --git a/input/regression/phrasing-slur.ly b/input/regression/phrasing-slur.ly index 5abc6b204a..aa23eea05d 100644 --- a/input/regression/phrasing-slur.ly +++ b/input/regression/phrasing-slur.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc="Slurs play well with phrasing slur." diff --git a/input/regression/prefatory-empty-spacing.ly b/input/regression/prefatory-empty-spacing.ly index 0499558217..d9756c8065 100644 --- a/input/regression/prefatory-empty-spacing.ly +++ b/input/regression/prefatory-empty-spacing.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly index 8cfd48a9b2..3f88033aab 100644 --- a/input/regression/prefatory-spacing-matter.ly +++ b/input/regression/prefatory-spacing-matter.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Prefatory spacing. diff --git a/input/regression/property-once.ly b/input/regression/property-once.ly index 154c7fbe5e..db4d43b67c 100644 --- a/input/regression/property-once.ly +++ b/input/regression/property-once.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 20ffcee0eb..6b486a4858 100644 --- a/input/regression/rehearsal-mark.ly +++ b/input/regression/rehearsal-mark.ly @@ -1,9 +1,10 @@ +#(ly:set-option 'old-relative) \header { texidoc= " Rehearsal marks are printed over barlines. They can be incremented automatically or manually. "} -\version "1.7.18" +\version "1.9.0" global = \notes { diff --git a/input/regression/repeat-fold.ly b/input/regression/repeat-fold.ly index de2e9388fa..eb65e749ca 100644 --- a/input/regression/repeat-fold.ly +++ b/input/regression/repeat-fold.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/repeat-line-break.ly b/input/regression/repeat-line-break.ly index e21ee6b3f6..26b1dd8c7b 100644 --- a/input/regression/repeat-line-break.ly +++ b/input/regression/repeat-line-break.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/repeat-percent-skipbars.ly b/input/regression/repeat-percent-skipbars.ly index 3a3a633543..5ed7f657c9 100644 --- a/input/regression/repeat-percent-skipbars.ly +++ b/input/regression/repeat-percent-skipbars.ly @@ -1,4 +1,4 @@ -\version "1.7.23" +\version "1.9.0" \header { diff --git a/input/regression/repeat-percent.ly b/input/regression/repeat-percent.ly index e801872ce1..d17b988979 100644 --- a/input/regression/repeat-percent.ly +++ b/input/regression/repeat-percent.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 f572ed0a46..3613c5cdcb 100644 --- a/input/regression/repeat-slash.ly +++ b/input/regression/repeat-slash.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Beat repeats are supported." } diff --git a/input/regression/repeat-unfold-all.ly b/input/regression/repeat-unfold-all.ly index 3cc8c60fa7..aef95eeb7a 100644 --- a/input/regression/repeat-unfold-all.ly +++ b/input/regression/repeat-unfold-all.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 f11747ea77..bd083a7af0 100644 --- a/input/regression/repeat-unfold.ly +++ b/input/regression/repeat-unfold.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly index dfdc4a8c6e..d3332efdc6 100644 --- a/input/regression/repeat-volta-skip-alternatives.ly +++ b/input/regression/repeat-volta-skip-alternatives.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 a9fb0e37d0..6eec67e8a6 100644 --- a/input/regression/repeat-volta.ly +++ b/input/regression/repeat-volta.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/rest-collision-default.ly b/input/regression/rest-collision-default.ly index f790ca4f3c..b4e9d420ba 100644 --- a/input/regression/rest-collision-default.ly +++ b/input/regression/rest-collision-default.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly index 7b73793654..26a1a745de 100644 --- a/input/regression/rest-collision.ly +++ b/input/regression/rest-collision.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" Rests should not collide with beams, stems and noteheads. Rests may diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly index 34433f29fb..e731e2426e 100644 --- a/input/regression/rest-ledger.ly +++ b/input/regression/rest-ledger.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 7cd390cc86..4428ce106d 100644 --- a/input/regression/rest-pitch.ly +++ b/input/regression/rest-pitch.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Rests can have pitches--these will be affected by diff --git a/input/regression/rest.ly b/input/regression/rest.ly index b86eae5034..2e08d2abbc 100644 --- a/input/regression/rest.ly +++ b/input/regression/rest.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/rhythmic-staff.ly b/input/regression/rhythmic-staff.ly index bbaf6b3dac..68e8c5d370 100644 --- a/input/regression/rhythmic-staff.ly +++ b/input/regression/rhythmic-staff.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly index b1f5d4ae01..c5709402ed 100644 --- a/input/regression/script-collision.ly +++ b/input/regression/script-collision.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly index 4acfd1f5e6..7de9359008 100644 --- a/input/regression/script-stack-order.ly +++ b/input/regression/script-stack-order.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 b5ca9e46c8..9b33c1bc18 100644 --- a/input/regression/script-stacked.ly +++ b/input/regression/script-stacked.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \paper { raggedright= ##t } diff --git a/input/regression/size11.ly b/input/regression/size11.ly index c7260910cc..23c6b2d39b 100644 --- a/input/regression/size11.ly +++ b/input/regression/size11.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/size13.ly b/input/regression/size13.ly index 2a680596c2..2cea4adf69 100644 --- a/input/regression/size13.ly +++ b/input/regression/size13.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" foollilypondbook = " \score " diff --git a/input/regression/size16.ly b/input/regression/size16.ly index 2781250ffd..c7e7cfbc7c 100644 --- a/input/regression/size16.ly +++ b/input/regression/size16.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" foollilypondbook = " \score " diff --git a/input/regression/size20.ly b/input/regression/size20.ly index 300a37b8e8..70f1fefed9 100644 --- a/input/regression/size20.ly +++ b/input/regression/size20.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" foollilypondbook = " \score " diff --git a/input/regression/size23.ly b/input/regression/size23.ly index 426ae46a76..4f2a5b7259 100644 --- a/input/regression/size23.ly +++ b/input/regression/size23.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" foollilypondbook = " \score " diff --git a/input/regression/size26.ly b/input/regression/size26.ly index e355ca19f2..5ac0859fd2 100644 --- a/input/regression/size26.ly +++ b/input/regression/size26.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" foollilypondbook = " \score " diff --git a/input/regression/slur-area.ly b/input/regression/slur-area.ly index 4ef3f7afce..770c917ebc 100644 --- a/input/regression/slur-area.ly +++ b/input/regression/slur-area.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "The area underneath an (up) slur is minimised to improve the shape. " diff --git a/input/regression/slur-attachment.ly b/input/regression/slur-attachment.ly index a774106f94..1df59448ca 100644 --- a/input/regression/slur-attachment.ly +++ b/input/regression/slur-attachment.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly index 520e2614e3..2c18202dc4 100644 --- a/input/regression/slur-broken-trend.ly +++ b/input/regression/slur-broken-trend.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly index 41fb906a0c..0982acd71f 100644 --- a/input/regression/slur-cross-staff.ly +++ b/input/regression/slur-cross-staff.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" The same goes for slurs. They behave decently when broken across diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly index d807e798bb..34dcfdd1c6 100644 --- a/input/regression/slur-dots.ly +++ b/input/regression/slur-dots.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc="Slurs should not get confused by augmentation dots. We use a lot of dots here, to make problems more visible." diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly index dd7713c4a4..de784d1ef9 100644 --- a/input/regression/slur-nice.ly +++ b/input/regression/slur-nice.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" Slurs should look nice and symmetric. The curvature may increase diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly index 20c1daf7c0..24d832b397 100644 --- a/input/regression/slur-rest.ly +++ b/input/regression/slur-rest.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc ="Slurs may be placed over rest. The slur will avoid colliding with diff --git a/input/regression/slur-staccato.ly b/input/regression/slur-staccato.ly index d6a51c3076..de3b0ee994 100644 --- a/input/regression/slur-staccato.ly +++ b/input/regression/slur-staccato.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc="Manual hack for slur and staccato." } diff --git a/input/regression/slur-stem-broken.ly b/input/regression/slur-stem-broken.ly index ec07994758..fb7f967413 100644 --- a/input/regression/slur-stem-broken.ly +++ b/input/regression/slur-stem-broken.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc="Trend of broken slur with user-overridden stem attachment should also follow the same vertical direction it would have had in unbroken state." diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly index a077e63f92..f7c76abcb1 100644 --- a/input/regression/slur-symmetry-1.ly +++ b/input/regression/slur-symmetry-1.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Symmetric figures should lead to symmetric slurs." diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly index 4a66e5f468..4c2da0cc96 100644 --- a/input/regression/slur-symmetry.ly +++ b/input/regression/slur-symmetry.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Symmetric figures should lead to symmetric slurs." diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly index 667b705cb1..9e4e1b6972 100644 --- a/input/regression/spacing-accidental-staffs.ly +++ b/input/regression/spacing-accidental-staffs.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Accidentals in different staffs don't effect the diff --git a/input/regression/spacing-accidental-stretch.ly b/input/regression/spacing-accidental-stretch.ly index 3b6ddcf5c6..bdf32b67a6 100644 --- a/input/regression/spacing-accidental-stretch.ly +++ b/input/regression/spacing-accidental-stretch.ly @@ -1,4 +1,5 @@ -\version "1.7.21" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 43cf662a7d..5a424be50f 100644 --- a/input/regression/spacing-accidental.ly +++ b/input/regression/spacing-accidental.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 868d6b9cef..67e99ed771 100644 --- a/input/regression/spacing-bar-stem.ly +++ b/input/regression/spacing-bar-stem.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 87ec8a4bd0..2facc9257e 100644 --- a/input/regression/spacing-clef-first-note.ly +++ b/input/regression/spacing-clef-first-note.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 b4cf8fd574..dc5793eb06 100644 --- a/input/regression/spacing-end-of-line.ly +++ b/input/regression/spacing-end-of-line.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 1a288256f6..cb6d363382 100644 --- a/input/regression/spacing-ended-voice.ly +++ b/input/regression/spacing-ended-voice.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 b6b82f403a..432ec1b702 100644 --- a/input/regression/spacing-folded-clef.ly +++ b/input/regression/spacing-folded-clef.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "A clef can be folded below notes in a different staff, if this doesn't disrupt the flow of the notes." diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly index da2158a08e..45b014e4b8 100644 --- a/input/regression/spacing-folded-clef2.ly +++ b/input/regression/spacing-folded-clef2.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 7e98fd4396..a5ddf4a08d 100644 --- a/input/regression/spacing-grace-duration.ly +++ b/input/regression/spacing-grace-duration.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Spacing uses the duration of the notes, but disregards diff --git a/input/regression/spacing-grace.ly b/input/regression/spacing-grace.ly index 2019153814..98fe9ea38e 100644 --- a/input/regression/spacing-grace.ly +++ b/input/regression/spacing-grace.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Grace note spacing. Should be tuned? " } diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly index 5a0f124231..ecebd0d1ce 100644 --- a/input/regression/spacing-knee.ly +++ b/input/regression/spacing-knee.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = "For knees, the spacing correction is such that the diff --git a/input/regression/spacing-multi-tuplet.ly b/input/regression/spacing-multi-tuplet.ly index 4e0a753501..b4d67b07a5 100644 --- a/input/regression/spacing-multi-tuplet.ly +++ b/input/regression/spacing-multi-tuplet.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc = "Concurrent tuplets should be spaced equidistantly on all staffs. diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly index aefd46c2c6..1fd32c5e2e 100644 --- a/input/regression/spacing-note-flags.ly +++ b/input/regression/spacing-note-flags.ly @@ -1,3 +1,4 @@ +#(ly:set-option 'old-relative) \header { texidoc = "The flags of 8th notes take some space, but not @@ -16,5 +17,5 @@ raggedright = ##t } } -\version "1.7.18" +\version "1.9.0" diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly index c569a40c2b..dea5658694 100644 --- a/input/regression/spacing-rest.ly +++ b/input/regression/spacing-rest.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 96be64da57..ff1c50c1c9 100644 --- a/input/regression/spacing-short-notes.ly +++ b/input/regression/spacing-short-notes.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 922f369d46..7e78c204ba 100644 --- a/input/regression/spacing-stem-bar.ly +++ b/input/regression/spacing-stem-bar.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 0ff80b6c4f..7e2cabaa2f 100644 --- a/input/regression/spacing-stem-direction.ly +++ b/input/regression/spacing-stem-direction.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly index bea37eba1e..dff80156df 100644 --- a/input/regression/spacing-stem-same-direction.ly +++ b/input/regression/spacing-stem-same-direction.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "For juxtaposed chords with the same direction, a slight optical correction is used. It is constant, and only works if diff --git a/input/regression/spacing-to-grace.ly b/input/regression/spacing-to-grace.ly index 81bb46f9a2..76b31a2188 100644 --- a/input/regression/spacing-to-grace.ly +++ b/input/regression/spacing-to-grace.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 73f2a18ffd..c6f1085dae 100644 --- a/input/regression/spacing-very-tight.ly +++ b/input/regression/spacing-very-tight.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = " When tightly spaced, hinterfleisch -> 0. diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly index 58056fff03..7415039e4e 100644 --- a/input/regression/span-bar.ly +++ b/input/regression/span-bar.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 7f3cfa589e..46773f559b 100644 --- a/input/regression/staccato-pos.ly +++ b/input/regression/staccato-pos.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/staff-tweak.ly b/input/regression/staff-tweak.ly index 397588ffcf..0f9aa451c7 100644 --- a/input/regression/staff-tweak.ly +++ b/input/regression/staff-tweak.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 f35080f302..229a7706b8 100644 --- a/input/regression/stanza-number.ly +++ b/input/regression/stanza-number.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 09ff17dfec..2fff66d9d6 100644 --- a/input/regression/stem-direction.ly +++ b/input/regression/stem-direction.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/stem-shorten.ly b/input/regression/stem-shorten.ly index 8cfe94da71..0eacc05e65 100644 --- a/input/regression/stem-shorten.ly +++ b/input/regression/stem-shorten.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { diff --git a/input/regression/stem-spacing.ly b/input/regression/stem-spacing.ly index 8b5acd8743..505c3f4dec 100644 --- a/input/regression/stem-spacing.ly +++ b/input/regression/stem-spacing.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly index 84a8bd87ea..1ee5c2bef3 100644 --- a/input/regression/stem-tremolo.ly +++ b/input/regression/stem-tremolo.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 09a26cc18a..0f4575cb71 100644 --- a/input/regression/system-extents.ly +++ b/input/regression/system-extents.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = "LilyPond correctly determines the size of every diff --git a/input/regression/system-start-bracket.ly b/input/regression/system-start-bracket.ly index c3a72d563b..a723aac8e8 100644 --- a/input/regression/system-start-bracket.ly +++ b/input/regression/system-start-bracket.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = " diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly index a8b14705af..c4b46c3776 100644 --- a/input/regression/text-spanner.ly +++ b/input/regression/text-spanner.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc= "Text spanners should not repeat start text when broken." } diff --git a/input/regression/tie-accidental.ly b/input/regression/tie-accidental.ly index fa95ee5fff..4b113b0cae 100644 --- a/input/regression/tie-accidental.ly +++ b/input/regression/tie-accidental.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/tie-break-accidental.ly b/input/regression/tie-break-accidental.ly index d3cd922bbb..d84a3d7c19 100644 --- a/input/regression/tie-break-accidental.ly +++ b/input/regression/tie-break-accidental.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 86a79c1674..c1be2174d3 100644 --- a/input/regression/tie-busy-grobs.ly +++ b/input/regression/tie-busy-grobs.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 f510230bb7..9ff810c5a2 100644 --- a/input/regression/tie-chord-partial.ly +++ b/input/regression/tie-chord-partial.ly @@ -1,3 +1,4 @@ +#(ly:set-option 'old-relative) \header { texidoc = "Tieing only parts of chords is possible. It requires @@ -5,7 +6,7 @@ putting the Tie engraver at Thread level, and redirecting untied notes to a different thread." } -\version "1.7.18" +\version "1.9.0" \paper { raggedright= ##t } \score { diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly index 21b6fd57a8..85867e292d 100644 --- a/input/regression/tie-chord.ly +++ b/input/regression/tie-chord.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 edf615e86a..45262b9833 100644 --- a/input/regression/tie-dots.ly +++ b/input/regression/tie-dots.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = "Ties should not collide with dots." } diff --git a/input/regression/tie-grace.ly b/input/regression/tie-grace.ly index 4cf3d09e5a..8cd1215a6b 100644 --- a/input/regression/tie-grace.ly +++ b/input/regression/tie-grace.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 3d613f2e40..f7e3183d36 100644 --- a/input/regression/tie.ly +++ b/input/regression/tie.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly index 9a6f294917..7395536eac 100644 --- a/input/regression/tuplet-beam.ly +++ b/input/regression/tuplet-beam.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "In combination with a beam, the bracket of the tuplet diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly index a26fddbc3d..ebf21bbacd 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 ef7f0871e1..0209fe7747 100644 --- a/input/regression/tuplet-properties.ly +++ b/input/regression/tuplet-properties.ly @@ -1,3 +1,4 @@ +#(ly:set-option 'old-relative) \header { texidoc = "Tuplet bracket formatting supports numerous options: NB should have no bracket, B should have bracket. @@ -5,7 +6,7 @@ NB should have no bracket, B should have bracket. } -\version "1.7.18" +\version "1.9.0" \score { diff --git a/input/regression/tuplet-rest.ly b/input/regression/tuplet-rest.ly index de0dd67d67..17d8173473 100644 --- a/input/regression/tuplet-rest.ly +++ b/input/regression/tuplet-rest.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header {texidoc = "Tests tuplet rests. "} \score { diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly index ca448184e2..71e017b6a0 100644 --- a/input/regression/tuplet-staffline-collision.ly +++ b/input/regression/tuplet-staffline-collision.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Horizontal tuplet brackets are shifted vertically diff --git a/input/regression/tuplets.ly b/input/regression/tuplets.ly index 1fa765f176..9a2f98ad2c 100644 --- a/input/regression/tuplets.ly +++ b/input/regression/tuplets.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/regression/voice-follower.ly b/input/regression/voice-follower.ly index e5ff04bbc2..8ab1b77a64 100644 --- a/input/regression/voice-follower.ly +++ b/input/regression/voice-follower.ly @@ -1,4 +1,5 @@ -\version "1.7.23" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc= " diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly index 5829022704..4d3241b18e 100644 --- a/input/regression/volta-broken-left-edge.ly +++ b/input/regression/volta-broken-left-edge.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 c0a3c0c2f7..dea4f89940 100644 --- a/input/regression/volta-multi-staff.ly +++ b/input/regression/volta-multi-staff.ly @@ -1,9 +1,10 @@ +#(ly:set-option 'old-relative) \header { texidoc = "By setting @code{voltaOnThisStaff}, repeats can be put on more staffs in a score." } -\version "1.7.22" +\version "1.9.0" vmus = \notes { \repeat volta 2 c1 \alternative { d e } } diff --git a/input/screech-boink.ly b/input/screech-boink.ly index f99daec80f..8d3c05e7f2 100644 --- a/input/screech-boink.ly +++ b/input/screech-boink.ly @@ -1,6 +1,9 @@ - -\version "1.7.23" - +\version "1.9.0" +\header { + title = "Screech and boink" + subtitle = "Random complex notation" + composer = "Han-Wen Nienhuys" + } \score { \notes \context PianoStaff < diff --git a/input/template/gregorian-transcription.ly b/input/template/gregorian-transcription.ly index f6391162c2..105613dc23 100644 --- a/input/template/gregorian-transcription.ly +++ b/input/template/gregorian-transcription.ly @@ -1,4 +1,5 @@ -\version "1.7.23" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { diff --git a/input/template/header.ly b/input/template/header.ly index 3c81823ca3..2d037e7451 100644 --- a/input/template/header.ly +++ b/input/template/header.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { dedication = "dedication" title = "Title" diff --git a/input/template/jazz-combo.ly b/input/template/jazz-combo.ly index cfbab5b317..87232d7554 100644 --- a/input/template/jazz-combo.ly +++ b/input/template/jazz-combo.ly @@ -1,4 +1,5 @@ -\version "1.7.23" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { title = "Song" subtitle = "(tune)" diff --git a/input/template/melody-chords.ly b/input/template/melody-chords.ly index 4ee67f4f27..91b218a098 100644 --- a/input/template/melody-chords.ly +++ b/input/template/melody-chords.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 78c8a029fa..00480dbd9e 100644 --- a/input/template/melody-lyrics-chords.ly +++ b/input/template/melody-lyrics-chords.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Popsong format: chords, melody and lyrics." diff --git a/input/template/melody-lyrics.ly b/input/template/melody-lyrics.ly index 4b14c3b71e..8aa22857d7 100644 --- a/input/template/melody-lyrics.ly +++ b/input/template/melody-lyrics.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Melody and lyrics." diff --git a/input/template/melody.ly b/input/template/melody.ly index 0d09308b8f..54c79cddb7 100644 --- a/input/template/melody.ly +++ b/input/template/melody.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Only a melody." diff --git a/input/template/piano-4-voices.ly b/input/template/piano-4-voices.ly index 45d6832570..13931c9d75 100644 --- a/input/template/piano-4-voices.ly +++ b/input/template/piano-4-voices.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc ="Polyphonic piano music" diff --git a/input/template/piano-dynamics.ly b/input/template/piano-dynamics.ly index 3ceda0dd1d..5ca09aa5c7 100644 --- a/input/template/piano-dynamics.ly +++ b/input/template/piano-dynamics.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc =" Template that puts dynamics on a separate line, so it is neatly diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly index 43a61a3ed5..1b45789956 100644 --- a/input/template/piano-lyrics.ly +++ b/input/template/piano-lyrics.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc ="Lyrics between two staffs." diff --git a/input/template/piano-melody-lyrics.ly b/input/template/piano-melody-lyrics.ly index dd5fcd42a9..10e61b4e81 100644 --- a/input/template/piano-melody-lyrics.ly +++ b/input/template/piano-melody-lyrics.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc ="Classical song format: one staff with melody and lyrics, @@ -41,7 +42,7 @@ lower = \notes\relative c { > > \paper { - \translator { \HaraKiriStaffContext } + \translator { \RemoveEmptyStaffContext } } \midi { } } diff --git a/input/template/piano.ly b/input/template/piano.ly index 7ea5e3b706..e371d0286d 100644 --- a/input/template/piano.ly +++ b/input/template/piano.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Simple piano music." diff --git a/input/template/satb.ly b/input/template/satb.ly index 00f1230779..42dff9d196 100644 --- a/input/template/satb.ly +++ b/input/template/satb.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = " diff --git a/input/test/+.ly b/input/test/+.ly index e3b6041029..59edc58a76 100644 --- a/input/test/+.ly +++ b/input/test/+.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" %% +.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 57fb8b01ee..5f8f6eef02 100644 --- a/input/test/ac-extra-voice.ly +++ b/input/test/ac-extra-voice.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" %% I don't know what this example is supposed to do. delete it? %% It shows how to use the autochange feature together with an extra diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly index 98c7fea756..bba8876a3d 100644 --- a/input/test/add-staccato.ly +++ b/input/test/add-staccato.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly index 46e8f4450b..90cbeeb891 100644 --- a/input/test/add-text-script.ly +++ b/input/test/add-text-script.ly @@ -1,4 +1,4 @@ -\version "1.7.23" +\version "1.9.0" \header { texidoc= "@cindex make-music Fingering diff --git a/input/test/ancient-accidentals.ly b/input/test/ancient-accidentals.ly index 57e85cf6f3..20df3fb803 100644 --- a/input/test/ancient-accidentals.ly +++ b/input/test/ancient-accidentals.ly @@ -1,3 +1,4 @@ +#(ly:set-option 'old-relative) \header { texidoc = "@cindex Ancient Accidentals Accidentals are available in different ancient styles. This @@ -5,7 +6,7 @@ file lists all of them. " } -\version "1.7.18" +\version "1.9.0" \score { \context Voice \notes\relative c { diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index d4b614d59f..3825e78d45 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -1,4 +1,4 @@ -\version "1.7.19" +\version "1.9.0" % 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 577679cd8b..d760b1fd06 100644 --- a/input/test/ancient-time.ly +++ b/input/test/ancient-time.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % 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 e8c4b9ec4b..c81fac2457 100644 --- a/input/test/bagpipe.ly +++ b/input/test/bagpipe.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = "@cindex Bagpipe Music diff --git a/input/test/bar-always.ly b/input/test/bar-always.ly index 002978c2d6..83c0842e6d 100644 --- a/input/test/bar-always.ly +++ b/input/test/bar-always.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "@cindex Bars Always diff --git a/input/test/bar-lines-lyric-only.ly b/input/test/bar-lines-lyric-only.ly index 8b920a8830..0aed0d6dc5 100644 --- a/input/test/bar-lines-lyric-only.ly +++ b/input/test/bar-lines-lyric-only.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 12927f20f8..c49a694a4f 100644 --- a/input/test/bar-lines.ly +++ b/input/test/bar-lines.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 fdb10ab62e..fe8bf2653c 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.7.18" +\version "1.9.0" \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 523280ca9e..6b60ee893e 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.7.18" +\version "1.9.0" \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 f93ee7c0b7..a6ca63b956 100644 --- a/input/test/bar-number-show-all.ly +++ b/input/test/bar-number-show-all.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 022e7e0f47..9e8a1e26fa 100644 --- a/input/test/beam-auto-4-8.ly +++ b/input/test/beam-auto-4-8.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % 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 2d1e84f1d8..fe4d9439b9 100644 --- a/input/test/beam-auto-override.ly +++ b/input/test/beam-auto-override.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "@cindex Auto Beaming Override diff --git a/input/test/beam-auto.ly b/input/test/beam-auto.ly index 86cbd36078..e132ba5ac5 100644 --- a/input/test/beam-auto.ly +++ b/input/test/beam-auto.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 a55060e096..9d0544a273 100644 --- a/input/test/beam-control.ly +++ b/input/test/beam-control.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc="@cindex Beam Position Control diff --git a/input/test/beam-count.ly b/input/test/beam-count.ly index 53cf9e68f3..c8e13695aa 100644 --- a/input/test/beam-count.ly +++ b/input/test/beam-count.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc="@cindex Beam Count diff --git a/input/test/beam-dir-functions.ly b/input/test/beam-dir-functions.ly index 906f8d64fb..eae7884258 100644 --- a/input/test/beam-dir-functions.ly +++ b/input/test/beam-dir-functions.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "@cindex Beam Dir Functions diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index ad02714603..607c96ae8d 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc="@cindex Beam Isknee LilyPond can beam across a Piano Staff. diff --git a/input/test/beam-neutral-direction.ly b/input/test/beam-neutral-direction.ly index a61acaa8ba..cb4df5c896 100644 --- a/input/test/beam-neutral-direction.ly +++ b/input/test/beam-neutral-direction.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc="@cindex Beam Neutral Direction When a beam falls in the middle of the staff, LilyPond normally diff --git a/input/test/beam-rest.ly b/input/test/beam-rest.ly index 6cb13110d2..a6756b2c47 100644 --- a/input/test/beam-rest.ly +++ b/input/test/beam-rest.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc="@cindex Beam Over Rests diff --git a/input/test/blank-notes.ly b/input/test/blank-notes.ly index fb655888fb..e4a4a4c0fe 100644 --- a/input/test/blank-notes.ly +++ b/input/test/blank-notes.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % 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 c4bb2c9fdc..4444503f36 100644 --- a/input/test/blank-paper-tab.ly +++ b/input/test/blank-paper-tab.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = "@cindex Blank Paper Tab diff --git a/input/test/blank-paper.ly b/input/test/blank-paper.ly index d40a4b85ef..24030d4d80 100644 --- a/input/test/blank-paper.ly +++ b/input/test/blank-paper.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc="@cindex Blank Paper diff --git a/input/test/boxed-molecule.ly b/input/test/boxed-molecule.ly index 4466b6d2d6..10a41cf5d1 100644 --- a/input/test/boxed-molecule.ly +++ b/input/test/boxed-molecule.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "@cindex Boxed Molecule You can override the molecule callback to draw a box around diff --git a/input/test/caps.ly b/input/test/caps.ly index 8d1adb6c8f..8dd6e01e30 100644 --- a/input/test/caps.ly +++ b/input/test/caps.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 661edddce3..d58cbc403a 100644 --- a/input/test/cautionaries.ly +++ b/input/test/cautionaries.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 ecdf20802f..81aa0620aa 100644 --- a/input/test/chord-names-german.ly +++ b/input/test/chord-names-german.ly @@ -1,4 +1,4 @@ -\version "1.7.20" +\version "1.9.0" \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 4d6737eace..2fce34c306 100644 --- a/input/test/chord-names-jazz.ly +++ b/input/test/chord-names-jazz.ly @@ -1,4 +1,4 @@ -\version "1.7.23" +\version "1.9.0" \header { diff --git a/input/test/chord-names-no-inversions.ly b/input/test/chord-names-no-inversions.ly index 1baee09b8b..49bd37c426 100644 --- a/input/test/chord-names-no-inversions.ly +++ b/input/test/chord-names-no-inversions.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 c1f3750b51..9707c6f683 100644 --- a/input/test/chords-without-melody.ly +++ b/input/test/chords-without-melody.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 e33701e05b..3ba41bb409 100644 --- a/input/test/clef-8-syntax.ly +++ b/input/test/clef-8-syntax.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 b996b70510..5ee96d22fd 100644 --- a/input/test/clef-end-of-line.ly +++ b/input/test/clef-end-of-line.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = "@cindex Clef End of Line diff --git a/input/test/clef-manual-control.ly b/input/test/clef-manual-control.ly index ec112070cf..ca094e015f 100644 --- a/input/test/clef-manual-control.ly +++ b/input/test/clef-manual-control.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header{ texidoc = " @cindex Clef Manual Control diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly index 34379d4b4a..c9d33a42f6 100644 --- a/input/test/coriolan-margin.ly +++ b/input/test/coriolan-margin.ly @@ -1,4 +1,5 @@ -\version "1.7.19" +#(ly:set-option 'old-relative) +\version "1.9.0" % Ugh, we need to override some LaTeX titling stuff diff --git a/input/test/count-systems.ly b/input/test/count-systems.ly index 2cd7afc7bf..cebde02432 100644 --- a/input/test/count-systems.ly +++ b/input/test/count-systems.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc="@cindex Count Systems diff --git a/input/test/crescendi.ly b/input/test/crescendi.ly index 26043b0d93..96b31bdd94 100644 --- a/input/test/crescendi.ly +++ b/input/test/crescendi.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc="@cindex Crescendi LilyPond can print crescendi in a number of different ways. diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly index 4445f7df14..872fe16edc 100644 --- a/input/test/cue-notes.ly +++ b/input/test/cue-notes.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % TODO: check to see if this example can be simplified using \small % or \tiny. \header { texidoc = "@cindex Cue Notes diff --git a/input/test/divisiones.ly b/input/test/divisiones.ly index 061c0224ec..4863632e06 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.7.18" +\version "1.9.0" \include "gregorian-init.ly" diff --git a/input/test/drarn-slurs.ly b/input/test/drarn-slurs.ly index b49b20e01b..90763d3494 100644 --- a/input/test/drarn-slurs.ly +++ b/input/test/drarn-slurs.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % possible rename to slurs-? % TODO: find out what drarn means, and if there's an overlap with drarn.ly \header{ diff --git a/input/test/drarn.ly b/input/test/drarn.ly index 4c6cc24a83..7f97c5b589 100644 --- a/input/test/drarn.ly +++ b/input/test/drarn.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{texidoc="@cindex Drarn You can attach slurs and ties to noteheads. " } diff --git a/input/test/dynamic-absolute-volume.ly b/input/test/dynamic-absolute-volume.ly index ade535bf4d..eabdf22eb1 100644 --- a/input/test/dynamic-absolute-volume.ly +++ b/input/test/dynamic-absolute-volume.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "@cindex Dynamic Absolute Volume Absolute dynamics have effect in MIDI files. diff --git a/input/test/dynamic-extra.ly b/input/test/dynamic-extra.ly index f5a7b5d786..8923bbe151 100644 --- a/input/test/dynamic-extra.ly +++ b/input/test/dynamic-extra.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % probably should be merged into refman. \header{ texidoc = "@cindex Dynamic Piu Forte diff --git a/input/test/embedded-postscript.ly b/input/test/embedded-postscript.ly index afc2b3628f..7be56a9254 100644 --- a/input/test/embedded-postscript.ly +++ b/input/test/embedded-postscript.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 4673dadce1..db2ae3532d 100644 --- a/input/test/embedded-scm.ly +++ b/input/test/embedded-scm.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % 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 96df96c1b6..95024426d1 100644 --- a/input/test/embedded-tex.ly +++ b/input/test/embedded-tex.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 a2b223aa4e..2c4921dac5 100644 --- a/input/test/explicit.ly +++ b/input/test/explicit.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 098b5b13c3..9a5a7d7de4 100644 --- a/input/test/extra-offset.ly +++ b/input/test/extra-offset.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 8c86a958e0..39128f0536 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % definately wil be renamed to something. %{ (Message vers:9) diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly index 2a0cc25819..5175231377 100644 --- a/input/test/fill-a4.ly +++ b/input/test/fill-a4.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" %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 9da1a9f537..fd0d920f93 100644 --- a/input/test/follow-thread.ly +++ b/input/test/follow-thread.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % 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 ed3c60b75b..8bebfa9659 100644 --- a/input/test/force-hshift.ly +++ b/input/test/force-hshift.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc="@cindex Force hshift Force hshift to override collisions. " } diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index deea577eb6..62246421c7 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc="@cindex Gourlay diff --git a/input/test/gregorian-scripts.ly b/input/test/gregorian-scripts.ly index 29f4dc3034..20e1648e59 100644 --- a/input/test/gregorian-scripts.ly +++ b/input/test/gregorian-scripts.ly @@ -1,4 +1,4 @@ -\version "1.8.0" +\version "1.9.0" \header { title = "Gregorian Scripts" texidoc = "@cindex Gregorian Scripts diff --git a/input/test/harmonic.ly b/input/test/harmonic.ly index 1732e51beb..8e155245c1 100644 --- a/input/test/harmonic.ly +++ b/input/test/harmonic.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 6b05a28c24..c589736047 100644 --- a/input/test/header-ifelse.ly +++ b/input/test/header-ifelse.ly @@ -1,4 +1,4 @@ -\version "1.7.20" +\version "1.9.0" #(define (my-ly-version) diff --git a/input/test/hshift.ly b/input/test/hshift.ly index 40ef119501..9734295576 100644 --- a/input/test/hshift.ly +++ b/input/test/hshift.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "@cindex Horizontal Shift You can manually shift notes horizontally. " } diff --git a/input/test/hymn.ly b/input/test/hymn.ly index f60d1ddcec..3ba2e5a546 100644 --- a/input/test/hymn.ly +++ b/input/test/hymn.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = " diff --git a/input/test/improv.ly b/input/test/improv.ly index fc8faf52cb..11550a97d7 100644 --- a/input/test/improv.ly +++ b/input/test/improv.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = diff --git a/input/test/incipit.ly b/input/test/incipit.ly index 231e3d9706..0e474a3fc7 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "@cindex Incipit This shows how to make an ``incipit'' to indicate scordatora tuning of a violin part, using the clefStyle property. diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly index 403177d715..d26f7043db 100644 --- a/input/test/instrument-name-grandstaff.ly +++ b/input/test/instrument-name-grandstaff.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 309733ddd3..6b150d962e 100644 --- a/input/test/ly2dvi-testpage.ly +++ b/input/test/ly2dvi-testpage.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % MERGE with title.ly -gp %{ diff --git a/input/test/maximum-rest-count.ly b/input/test/maximum-rest-count.ly index 5aa47fa3ea..90472319a2 100644 --- a/input/test/maximum-rest-count.ly +++ b/input/test/maximum-rest-count.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % 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 770ad6f5c9..5fc0992abe 100644 --- a/input/test/mensural-ligatures.ly +++ b/input/test/mensural-ligatures.ly @@ -1,4 +1,4 @@ -\version "1.7.19" +\version "1.9.0" % TODO: % check with ancient- stuff. rename, merge, something. -gp diff --git a/input/test/midi-scales.ly b/input/test/midi-scales.ly index 01733eba68..f26c00bbce 100644 --- a/input/test/midi-scales.ly +++ b/input/test/midi-scales.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % 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 2f4c63ddfe..ae3ca126fb 100644 --- a/input/test/move-accidentals.ly +++ b/input/test/move-accidentals.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % 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 b894ac9355..8f01941020 100644 --- a/input/test/move-specific-text.ly +++ b/input/test/move-specific-text.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % possible rename to scheme- or something like that. -gp \header { texidoc = "@cindex Scheme Move Text You can move objects around with scheme. This example shows how to diff --git a/input/test/music-box.ly b/input/test/music-box.ly index e151b2e33f..f5aa85376e 100644 --- a/input/test/music-box.ly +++ b/input/test/music-box.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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.7.18" +\version "1.9.0" pat = \notes \transpose c c' \repeat unfold 2 { < { \context Staff=up {r8 e16 f g e f g } } diff --git a/input/test/music-creation.ly b/input/test/music-creation.ly index 012c14d7a5..742889b1be 100644 --- a/input/test/music-creation.ly +++ b/input/test/music-creation.ly @@ -1,4 +1,4 @@ -\version "1.7.18" %% or actually: 1.7.1 ... +\version "1.9.0" %% 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 ef49349cea..767954b6b5 100644 --- a/input/test/nested-groups.ly +++ b/input/test/nested-groups.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 487c07ac72..989191ec17 100644 --- a/input/test/no-bar-lines.ly +++ b/input/test/no-bar-lines.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % 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 7c06648e6b..fe2e01ae76 100644 --- a/input/test/no-staff.ly +++ b/input/test/no-staff.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % 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 b0b75fb856..9be0670696 100644 --- a/input/test/octave-duplicate.ly +++ b/input/test/octave-duplicate.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc="@cindex Octave Doubling Octave doubling parts of music. " } diff --git a/input/test/ossia.ly b/input/test/ossia.ly index 9af2e55631..d06a974b43 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % 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 af96f80f54..28b7a88cef 100644 --- a/input/test/part-combine-moments.ly +++ b/input/test/part-combine-moments.ly @@ -1,4 +1,5 @@ -\version "1.7.19" +#(ly:set-option 'old-relative) +\version "1.9.0" % 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 8c20e1cab2..9a5cdccb17 100644 --- a/input/test/part-combine-staff.ly +++ b/input/test/part-combine-staff.ly @@ -1,4 +1,5 @@ -\version "1.7.19" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 9e95a44c26..f2a0a8fb2b 100644 --- a/input/test/part-combine.ly +++ b/input/test/part-combine.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 1fecce0687..c4214b4296 100644 --- a/input/test/partial-blank.ly +++ b/input/test/partial-blank.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % 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 7ccb608cfc..ca5024d280 100644 --- a/input/test/pedal.ly +++ b/input/test/pedal.ly @@ -1,4 +1,5 @@ -\version "1.7.28" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc = "@cindex Pedal Piano pedal symbols merge stop and start. The strings are configurable. diff --git a/input/test/phrasing-slur-height.ly b/input/test/phrasing-slur-height.ly index ed30e95210..1fe78771d9 100644 --- a/input/test/phrasing-slur-height.ly +++ b/input/test/phrasing-slur-height.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc="@cindex Phrasing Slur Height Make PhrasingSlur higher, to avoid colission from other slurs. " } diff --git a/input/test/polymetric-differing-notes.ly b/input/test/polymetric-differing-notes.ly index b2c8f8ee3a..0dc4142341 100644 --- a/input/test/polymetric-differing-notes.ly +++ b/input/test/polymetric-differing-notes.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/test/polymetric.ly b/input/test/polymetric.ly index 3bf0888ef8..01aaa436e9 100644 --- a/input/test/polymetric.ly +++ b/input/test/polymetric.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc="@cindex Time Signature Multiple diff --git a/input/test/preset-extent.ly b/input/test/preset-extent.ly index 1d9639c033..6c85fbcc17 100644 --- a/input/test/preset-extent.ly +++ b/input/test/preset-extent.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = " @cindex Preset Extent diff --git a/input/test/repeat-manual.ly b/input/test/repeat-manual.ly index d14a99115c..a7c5f5a22f 100644 --- a/input/test/repeat-manual.ly +++ b/input/test/repeat-manual.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 cf99492c7c..1b494420d1 100644 --- a/input/test/repeat-shorter-bracket.ly +++ b/input/test/repeat-shorter-bracket.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc=" diff --git a/input/test/repeat.ly b/input/test/repeat.ly index 6bae364825..322940417b 100644 --- a/input/test/repeat.ly +++ b/input/test/repeat.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % 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 19609ae2d5..e31096e827 100644 --- a/input/test/rest-dot-positions.ly +++ b/input/test/rest-dot-positions.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % 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 62aa814626..1be79f3506 100644 --- a/input/test/rests.ly +++ b/input/test/rests.ly @@ -1,4 +1,5 @@ -\version "1.8.0" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "@cindex Rests diff --git a/input/test/reverse-music.ly b/input/test/reverse-music.ly index 4d368bec98..544df0a09e 100644 --- a/input/test/reverse-music.ly +++ b/input/test/reverse-music.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % 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 82502a6c31..cddbd6b0fb 100644 --- a/input/test/rhythm-excercise.ly +++ b/input/test/rhythm-excercise.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 090202259d..b42aab957e 100644 --- a/input/test/scales-greek.ly +++ b/input/test/scales-greek.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header { texidoc = "@cindex Scales Greek Show different scales." diff --git a/input/test/scheme-interactions.ly b/input/test/scheme-interactions.ly index 0450c45c98..f405459700 100644 --- a/input/test/scheme-interactions.ly +++ b/input/test/scheme-interactions.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 5832d4d967..14edef62f2 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.7.18" +\version "1.9.0" \header { texidoc = "@cindex Script Abbreviations Some scripts may be entered using an abbreviation. diff --git a/input/test/script-chart.ly b/input/test/script-chart.ly index ef3974f782..43127d5971 100644 --- a/input/test/script-chart.ly +++ b/input/test/script-chart.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % this chart is used in the manual too. diff --git a/input/test/script-priority.ly b/input/test/script-priority.ly index dc759e2cb8..20e96ed0c8 100644 --- a/input/test/script-priority.ly +++ b/input/test/script-priority.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 485f8238d9..7212d41874 100644 --- a/input/test/script-stack.ly +++ b/input/test/script-stack.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 023fc9b2fe..222e4095ec 100644 --- a/input/test/separate-staccato.ly +++ b/input/test/separate-staccato.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % 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 5dcb50483e..98f568ab68 100644 --- a/input/test/slur-attachment-override.ly +++ b/input/test/slur-attachment-override.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc="@cindex Slur Attachment Override diff --git a/input/test/slur-beautiful.ly b/input/test/slur-beautiful.ly index 23d8e72494..7dd4dda5d5 100644 --- a/input/test/slur-beautiful.ly +++ b/input/test/slur-beautiful.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % TODO bit too wordy; edit a bit to cut stuff. -gp \header { texidoc ="@cindex Slur Beautiful Similarly, the curvature of a slur is adjusted to stay clear of note diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly index e8ac2010f5..83725490e9 100644 --- a/input/test/slur-dash.ly +++ b/input/test/slur-dash.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \header {texidoc = "@cindex Slur, dotted You can print different kinds of slurs (dotted, dashed, etc). " } diff --git a/input/test/slur-minimum-length.ly b/input/test/slur-minimum-length.ly index eea15e54be..f99482d26d 100644 --- a/input/test/slur-minimum-length.ly +++ b/input/test/slur-minimum-length.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "@cindex Slur Minimum Length You can set the minimum length of a slur. " diff --git a/input/test/slur-shape.ly b/input/test/slur-shape.ly index c2c7d470f7..35f4a2851a 100644 --- a/input/test/slur-shape.ly +++ b/input/test/slur-shape.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "Slurs become flatter as they grow longer. " diff --git a/input/test/slur-ugly.ly b/input/test/slur-ugly.ly index c23023bae1..f4275f2565 100644 --- a/input/test/slur-ugly.ly +++ b/input/test/slur-ugly.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc="@cindex Slur Ugly You can get ugly slurs, if you want. " diff --git a/input/test/smart-transpose.ly b/input/test/smart-transpose.ly index f9096c6ee8..c3c504df00 100644 --- a/input/test/smart-transpose.ly +++ b/input/test/smart-transpose.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc="@cindex Smart Transpose diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index b52dc843c6..ce3cd47469 100644 --- a/input/test/spacing-2.ly +++ b/input/test/spacing-2.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % more yummy regression goodness. -gp \header { texidoc = " diff --git a/input/test/spanner-after-break-tweak.ly b/input/test/spanner-after-break-tweak.ly index 1ecf9d8b0f..8bbcefbab5 100644 --- a/input/test/spanner-after-break-tweak.ly +++ b/input/test/spanner-after-break-tweak.ly @@ -1,4 +1,5 @@ -\version "1.7.21" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "@cindex Spanner after break diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly index b8db965e89..0dbdf37283 100644 --- a/input/test/staff-bracket.ly +++ b/input/test/staff-bracket.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 160ff05a68..485a5b3192 100644 --- a/input/test/staff-container.ly +++ b/input/test/staff-container.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { diff --git a/input/test/staff-lines.ly b/input/test/staff-lines.ly index 7bf78eaa9a..abfdb46d73 100644 --- a/input/test/staff-lines.ly +++ b/input/test/staff-lines.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 05d7cde1b1..94d2a52575 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc = "@cindex Staff Size diff --git a/input/test/staff-space.ly b/input/test/staff-space.ly index 2fda9741ed..7b89a8be4d 100644 --- a/input/test/staff-space.ly +++ b/input/test/staff-space.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc ="@cindex Staff Space Setting staff space on a staff. " diff --git a/input/test/stem-centered.ly b/input/test/stem-centered.ly index df87762cfd..83525aec83 100644 --- a/input/test/stem-centered.ly +++ b/input/test/stem-centered.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % 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 631025e297..fd3c0c4dfe 100644 --- a/input/test/stem-cross-staff.ly +++ b/input/test/stem-cross-staff.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 bed2c0b30c..7123d55e7d 100644 --- a/input/test/stem-extend.ly +++ b/input/test/stem-extend.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 55ea59b043..168ac65841 100644 --- a/input/test/stem-length.ly +++ b/input/test/stem-length.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 42228affb9..15e182c2d4 100644 --- a/input/test/tablature-hammer.ly +++ b/input/test/tablature-hammer.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header {texidoc = "@cindex Tablature hammer You can fake a hammer in tablature with slurs. " } diff --git a/input/test/tablature.ly b/input/test/tablature.ly index 96a8d78d17..5599815696 100644 --- a/input/test/tablature.ly +++ b/input/test/tablature.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \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 097a68d2bc..7566dbe49a 100644 --- a/input/test/text-spanner.ly +++ b/input/test/text-spanner.ly @@ -1,4 +1,5 @@ -\version "1.7.22" +#(ly:set-option 'old-relative) +\version "1.9.0" % TODO: check about other ottava functions. \header { texidoc = "@cindex Ottava Spanner diff --git a/input/test/textscript.ly b/input/test/textscript.ly index e1dd7ab732..442d472f25 100644 --- a/input/test/textscript.ly +++ b/input/test/textscript.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 9a3bbb74bc..26df8243dd 100644 --- a/input/test/tie-sparse.ly +++ b/input/test/tie-sparse.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 890b685345..9c430f8198 100644 --- a/input/test/time-signature-double.ly +++ b/input/test/time-signature-double.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \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 b6faaf7ae1..df407f5253 100644 --- a/input/test/time.ly +++ b/input/test/time.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % 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 118938056a..48784fa785 100644 --- a/input/test/timing.ly +++ b/input/test/timing.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % possible rename to bar-something. \header{ texidoc = "@cindex Bar Length diff --git a/input/test/title.ly b/input/test/title.ly index a0b5b35830..668fd0f6da 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" % MERGE with ly2dvi- \header { filename = "title.ly" diff --git a/input/test/to-xml.ly b/input/test/to-xml.ly index c9772854af..efac32d7dd 100644 --- a/input/test/to-xml.ly +++ b/input/test/to-xml.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" fooBar = \notes { < c''4 \\ g'4 > } diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 2425dbd740..4c72d50d1c 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ texidoc = "@cindex Transposition Transposition test file." diff --git a/input/test/trill.ly b/input/test/trill.ly index 31feed815b..634776b1b6 100644 --- a/input/test/trill.ly +++ b/input/test/trill.ly @@ -1,4 +1,4 @@ -\version "1.7.22" +\version "1.9.0" \header { texidoc="@cindex Trill Show trill line type. " diff --git a/input/test/trills.ly b/input/test/trills.ly index 33f869b6fa..6d1b2aa674 100644 --- a/input/test/trills.ly +++ b/input/test/trills.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header { texidoc="@cindex Trills diff --git a/input/test/unfold-all-repeats.ly b/input/test/unfold-all-repeats.ly index 29ac880a3b..be58199a98 100644 --- a/input/test/unfold-all-repeats.ly +++ b/input/test/unfold-all-repeats.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % regression. -gp \header { diff --git a/input/test/vaticana.ly b/input/test/vaticana.ly index 5878392129..2895a9d0d2 100644 --- a/input/test/vaticana.ly +++ b/input/test/vaticana.ly @@ -1,4 +1,4 @@ -\version "1.8.0" +\version "1.9.0" % possible rename to ancient-something. \header { texidoc = "Ancient Vaticana diff --git a/input/test/version-output.ly b/input/test/version-output.ly index db2e825d30..d0d432e2bf 100644 --- a/input/test/version-output.ly +++ b/input/test/version-output.ly @@ -1,4 +1,4 @@ -\version "1.7.30" +\version "1.9.0" \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 336ae0d8f5..59491682de 100644 --- a/input/test/vertical-extent.ly +++ b/input/test/vertical-extent.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % 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 a130e6d8e4..77fc569ce3 100644 --- a/input/tutorial/brahms-original.ly +++ b/input/tutorial/brahms-original.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \score { \notes\context PianoStaff < \context Staff = up diff --git a/input/tutorial/brahms-tweaked.ly b/input/tutorial/brahms-tweaked.ly index e9a26a017c..c71bf86d04 100644 --- a/input/tutorial/brahms-tweaked.ly +++ b/input/tutorial/brahms-tweaked.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \score { \notes\context PianoStaff < \context Staff = up diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index d60c670516..f09f613c47 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -1,4 +1,5 @@ -\version "1.7.18" +#(ly:set-option 'old-relative) +\version "1.9.0" \header{ filename = "twinkle-pop.ly" xtitle = "Ah, vous dirais-je, maman " diff --git a/lily/include/music.hh b/lily/include/music.hh index 7020acd18b..f85ecd8bb3 100644 --- a/lily/include/music.hh +++ b/lily/include/music.hh @@ -72,6 +72,4 @@ DECLARE_UNSMOB(Music,music); Music* make_music_by_name (SCM sym); -extern bool lily_1_8_relative; - #endif // MUSIC_HH diff --git a/lily/include/relative-music.hh b/lily/include/relative-music.hh index 36da2d081b..010c4ec733 100644 --- a/lily/include/relative-music.hh +++ b/lily/include/relative-music.hh @@ -21,6 +21,6 @@ public: virtual Pitch to_relative_octave (Pitch); }; - #endif /* RELATIVE_MUSIC_HH */ + diff --git a/lily/include/relative-octave-check.hh b/lily/include/relative-octave-check.hh new file mode 100644 index 0000000000..a8ec180621 --- /dev/null +++ b/lily/include/relative-octave-check.hh @@ -0,0 +1,25 @@ +/* + relative-octave-check.hh -- declare Relative_octave_octave-check + + source file of GNU LilyPond + + (c) 2003 Han-Wen Nienhuys + + */ + +#ifndef RELATIVE_OCTAVE_CHECK_HH +#define RELATIVE_OCTAVE_CHECK_HH + +#include "music.hh" + +class Relative_octave_check : public Music +{ +public: + VIRTUAL_COPY_CONS(Music); + virtual Pitch to_relative_octave (Pitch); +}; + + +#endif /* RELATIVE_MUSIC_HH */ + + diff --git a/lily/include/scm-option.hh b/lily/include/scm-option.hh index 78855833d9..0316e41e84 100644 --- a/lily/include/scm-option.hh +++ b/lily/include/scm-option.hh @@ -12,5 +12,6 @@ extern bool midi_debug_global_b; extern int testing_level_global; extern bool lily_1_8_relative; +extern bool lily_1_8_compatibility_used; #endif /* SCM_OPTION_HH */ diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh index fff428f8ac..a41476186b 100644 --- a/lily/include/source-file.hh +++ b/lily/include/source-file.hh @@ -58,8 +58,9 @@ public: char const* pos_str0_; SCM get_port()const { return str_port_; } + String name_; + private: - String name_string_; Link_array newline_locations_; std::istream* istream_; char * contents_str0_; diff --git a/lily/input-file-results.cc b/lily/input-file-results.cc index 37e0a3a639..8239852e4b 100644 --- a/lily/input-file-results.cc +++ b/lily/input-file-results.cc @@ -163,7 +163,6 @@ Input_file_results::Input_file_results (String init_string, String file_string) { header_ = SCM_EOL; global_input_file = this; - ly_set_point_and_click (SCM_BOOL_F); sources_.set_path (&global_path); diff --git a/lily/lexer.ll b/lily/lexer.ll index 7fc5828206..baa1d6f0f0 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -33,6 +33,7 @@ #include using namespace std; +#include "source-file.hh" #include "parse-scm.hh" #include "lily-guile.hh" #include "string.hh" @@ -97,6 +98,7 @@ SCM (* scm_parse_error_handler) (void *); %option never-interactive %option warn +%x renameinput %x version %x chords %x incl @@ -161,18 +163,33 @@ HYPHEN -- \\version{WHITE}* { yy_push_state (version); } +\\renameinput{WHITE}* { + yy_push_state (renameinput); +} \"[^"]*\" { /* got the version number */ String s (YYText ()+1); s = s.left_string (s.index_last ('\"')); - yy_pop_state (); - if (!valid_version_b (s)) + yy_pop_state(); + if (!valid_version_b (s)) return INVALID; } +\"[^"]*\" { /* got the version number */ + String s (YYText ()+1); + s = s.left_string (s.index_last ('\"')); + + yy_pop_state(); + this->here_input().source_file_->name_ = s; +} + . { LexerError ("No quoted string found after \\version"); yy_pop_state (); } +. { + LexerError ("No quoted string found after \\renameinput"); + yy_pop_state (); +} { [^\%]* { } @@ -728,8 +745,8 @@ strip_trailing_white (String&s) -/* 1.3.146 == removal of ; */ -Lilypond_version oldest_version ("1.3.146"); +/* 1.9.0 == postfix articulations */ +Lilypond_version oldest_version ("1.9.0"); bool diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 8513720acb..5e4e92e5c8 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -26,15 +26,14 @@ static Keyword_ent the_key_tab[]={ + {"accepts", ACCEPTS}, + {"addlyrics", ADDLYRICS}, {"alias", ALIAS}, + {"alternative", ALTERNATIVE}, {"apply", APPLY}, {"applycontext", APPLYCONTEXT}, {"applyoutput", APPLYOUTPUT}, {"autochange", AUTOCHANGE}, - {"simultaneous", SIMULTANEOUS}, - {"sequential", SEQUENTIAL}, - {"accepts", ACCEPTS}, - {"alternative", ALTERNATIVE}, {"bar", BAR}, {"breathe", BREATHE}, {"chordmodifiers", CHORDMODIFIERS}, @@ -47,38 +46,40 @@ static Keyword_ent the_key_tab[]={ {"denies", DENIES}, {"description", DESCRIPTION}, {"duration", DURATION}, - {"grobdescriptions", GROBDESCRIPTIONS}, {"figures",FIGURES}, {"grace", GRACE}, + {"grobdescriptions", GROBDESCRIPTIONS}, {"header", HEADER}, - {"lyrics", LYRICS}, {"key", KEY}, + {"lyrics", LYRICS}, {"mark", MARK}, {"markup", MARKUP}, - {"once", ONCE}, - {"pitch", PITCH}, - {"time", TIME_T}, - {"times", TIMES}, {"midi", MIDI}, {"name", NAME}, - {"pitchnames", PITCHNAMES}, {"notes", NOTES}, + {"octave", OCTAVE}, + {"once", ONCE}, {"outputproperty", OUTPUTPROPERTY}, {"override", OVERRIDE}, - {"set", SET}, - {"rest", REST}, - {"revert", REVERT}, - {"partial", PARTIAL}, {"paper", PAPER}, + {"partcombine", PARTCOMBINE}, + {"partial", PARTIAL}, + {"pitch", PITCH}, + {"pitchnames", PITCHNAMES}, {"property", PROPERTY}, {"relative", RELATIVE}, {"remove", REMOVE}, {"repeat", REPEAT}, - {"addlyrics", ADDLYRICS}, - {"partcombine", PARTCOMBINE}, + {"rest", REST}, + {"revert", REVERT}, {"score", SCORE}, + {"sequential", SEQUENTIAL}, + {"set", SET}, + {"simultaneous", SIMULTANEOUS}, {"skip", SKIP}, {"tempo", TEMPO}, + {"time", TIME_T}, + {"times", TIMES}, {"translator", TRANSLATOR}, {"transpose", TRANSPOSE}, {"type", TYPE}, diff --git a/lily/parser.yy b/lily/parser.yy index 9059bd8700..3650603e31 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -50,7 +50,7 @@ TODO: #include - +#include "scm-option.hh" #include "translator-def.hh" #include "lily-guile.hh" #include "misc.hh" @@ -265,6 +265,7 @@ yylex (YYSTYPE *s, void * v) %token COMMANDSPANREQUEST %token TEMPO %token OUTPUTPROPERTY +%token OCTAVE %token TIME_T %token TIMES %token TRANSLATOR @@ -273,7 +274,6 @@ yylex (YYSTYPE *s, void * v) %token UNSET %token CONTEXT %token REST - %token CHORD_OPEN %token CHORD_CLOSE @@ -1314,11 +1314,18 @@ command_element: command_req { $$ = MY_MAKE_MUSIC("EventChord"); $$->set_mus_property ("elements", scm_cons ($1->self_scm (), SCM_EOL)); - scm_gc_unprotect_object ($1->self_scm()); + scm_gc_unprotect_object ($1->self_scm()); $$-> set_spot (THIS->here_input ()); $1-> set_spot (THIS->here_input ()); } + | OCTAVE { THIS->push_spot (); } + pitch { + Music *l = MY_MAKE_MUSIC("RelativeOctaveCheck"); + $$ = l; + $$->set_spot (THIS->pop_spot ()); + $$->set_mus_property ("pitch", $3); + } | E_LEFTSQUARE { Music *l = MY_MAKE_MUSIC("LigatureEvent"); l->set_mus_property ("span-direction", gh_int2scm (START)); diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc new file mode 100644 index 0000000000..4a6ff01f01 --- /dev/null +++ b/lily/relative-octave-check.cc @@ -0,0 +1,38 @@ +#include "relative-octave-check.hh" +#include "input.hh" +#include "pitch.hh" + +/* + yeah, so this should be in a separate file. + I'm lazy. + */ +Pitch +Relative_octave_check::to_relative_octave (Pitch p) +{ + Pitch * check_p = unsmob_pitch (get_mus_property ("pitch")); + + int delta_oct = 0; + if (check_p) + { + Pitch no_octave (-1, + check_p->get_notename (), + check_p->get_alteration()); + + Pitch result = no_octave.to_relative_octave (p); + + if (result != *check_p) + { + String s = _("Failed octave check, got: "); + s += result.to_string (); + + origin ()->warning (s); + + delta_oct = check_p->get_octave () - result.get_octave (); + } + } + + return Pitch (p.get_octave () + delta_oct, + p.get_notename (), p.get_alteration ()); +} + +ADD_MUSIC(Relative_octave_check); diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc index 15c9c54566..5eadf5d3f2 100644 --- a/lily/relative-octave-music.cc +++ b/lily/relative-octave-music.cc @@ -6,10 +6,9 @@ (c) 1998--2003 Han-Wen Nienhuys */ - #include "relative-music.hh" #include "warn.hh" - +#include "scm-option.hh" Pitch @@ -17,16 +16,16 @@ Relative_octave_music::to_relative_octave (Pitch p) { if (lily_1_8_relative) { - - /* - ugh: last-pitch should be junked. + lily_1_8_compatibility_used = true; + /* + ugh: last-pitch should be junked. - Change this for lilypond 2.0. When you do, - then B should start where A left off. + Change this for lilypond 2.0. When you do, + then B should start where A left off. - \relative { A \relative { ...} B } + \relative { A \relative { ...} B } - */ + */ return * unsmob_pitch (get_mus_property ("last-pitch")); } else @@ -39,3 +38,5 @@ Relative_octave_music::Relative_octave_music () } ADD_MUSIC (Relative_octave_music); + + diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index e874e42451..186696b115 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -12,6 +12,7 @@ #include "pitch.hh" #include "warn.hh" #include "music-sequence.hh" +#include "scm-option.hh" Music * Repeated_music::body ()const @@ -33,6 +34,7 @@ Repeated_music::to_relative_octave (Pitch p) { if (lily_1_8_relative) { + lily_1_8_compatibility_used = true; if (body ()) p = body ()->to_relative_octave (p); diff --git a/lily/scm-option.cc b/lily/scm-option.cc index ec9186dbcf..3b5de500c1 100644 --- a/lily/scm-option.cc +++ b/lily/scm-option.cc @@ -38,6 +38,8 @@ int testing_level_global; Backwards compatibility. */ bool lily_1_8_relative = true; +bool lily_1_8_compatibility_used = false; + /* crash if internally the wrong type is used for a grob property. */ @@ -75,7 +77,7 @@ don't timestamp the output @item -t,--test Switch on any experimental features. Not for general public use. */ -LY_DEFINE (ly_set_option, "ly:set-option", 2, 0, 0, (SCM var, SCM val), +LY_DEFINE (ly_set_option, "ly:set-option", 1, 1, 0, (SCM var, SCM val), "Set a global option value. Supported options include\n" "\n" "@table @code\n" @@ -95,8 +97,11 @@ LY_DEFINE (ly_set_option, "ly:set-option", 2, 0, 0, (SCM var, SCM val), "@end table\n" "\n" "This function is useful to call from the command line: @code{lilypond -e\n" -"\"(ly-set-option 'midi-debug #t)\"}.\n") +"\"(ly-set-option 'midi-debug #t_)\"}.\n") { + if (val == SCM_UNDEFINED) + val = SCM_BOOL_T; + if (var == ly_symbol2scm ("help")) { /* lilypond -e "(ly-set-option 'help #t)" */ @@ -121,6 +126,7 @@ LY_DEFINE (ly_set_option, "ly:set-option", 2, 0, 0, (SCM var, SCM val), else if (var == ly_symbol2scm ("old-relative")) { lily_1_8_relative = true; + lily_1_8_compatibility_used = false; } else if (var == ly_symbol2scm ("new-relative")) { @@ -135,3 +141,28 @@ LY_DEFINE (ly_set_option, "ly:set-option", 2, 0, 0, (SCM var, SCM val), } +LY_DEFINE (ly_get_option, "ly:get-option", 1, 0, 0, (SCM var), + "Get a global option setting. Supported options include\n" + "@table @code\n" + "@item old-relative-used\n" + "Report whether old-relative compatibility mode is necessary\n" + "@item old-relative\n" + "Report whether old-relative compatibility mode is used\n" + "@end table\n" + "\n") +{ + if (var == ly_symbol2scm ("old-relative-used")) + { + return gh_bool2scm (lily_1_8_compatibility_used); + } + if (var == ly_symbol2scm ("old-relative")) + { + return gh_bool2scm (lily_1_8_relative); + } + else + { + warning (_("Unknown internal option!")); + } + + return SCM_UNSPECIFIED; +} diff --git a/lily/simultaneous-music.cc b/lily/simultaneous-music.cc index 315989e38f..97933a5dbe 100644 --- a/lily/simultaneous-music.cc +++ b/lily/simultaneous-music.cc @@ -1,7 +1,17 @@ +/* + simultaneous-music.cc -- implement Simultaneous_music + + source file of the GNU LilyPond music typesetter + + (c) 1998--2003 Han-Wen Nienhuys + +*/ + #include "input.hh" #include "moment.hh" #include "pitch.hh" #include "music-list.hh" +#include "scm-option.hh" Moment Simultaneous_music::get_length () const @@ -23,7 +33,10 @@ Simultaneous_music::Simultaneous_music() Pitch Simultaneous_music::to_relative_octave (Pitch p) { - return music_list_to_relative (music_list(),p, lily_1_8_relative); + if (lily_1_8_relative) + lily_1_8_compatibility_used = true; + + return music_list_to_relative (music_list(), p, lily_1_8_relative); } ADD_MUSIC (Simultaneous_music); diff --git a/lily/source-file.cc b/lily/source-file.cc index 63d9909234..80248ce2b0 100644 --- a/lily/source-file.cc +++ b/lily/source-file.cc @@ -77,7 +77,7 @@ gulp_file (String fn, int* len) */ Source_file::Source_file (String filename, String data) { - name_string_ = filename; + name_ = filename; istream_ = 0; contents_str0_ = data.get_copy_str0(); length_ = data.length(); @@ -87,7 +87,7 @@ Source_file::Source_file (String filename, String data) Source_file::Source_file (String filename_string) { - name_string_ = filename_string; + name_ = filename_string; istream_ = 0; contents_str0_ = 0; @@ -113,7 +113,7 @@ Source_file::init_port () str_port_ = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_RDNG, __FUNCTION__); scm_set_port_filename_x (str_port_, - scm_makfrom0str (name_string_.get_str0())); + scm_makfrom0str (name_.get_str0())); } int @@ -152,7 +152,7 @@ Source_file::file_line_column_string (char const *context_str0) const String Source_file::name_string () const { - return name_string_; + return name_; } Source_file::~Source_file () diff --git a/ly/a3-init.ly b/ly/a3-init.ly index a238cc4a38..1035f90673 100644 --- a/ly/a3-init.ly +++ b/ly/a3-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % a3-init.ly hsize = 296.9 \mm diff --git a/ly/a4-init.ly b/ly/a4-init.ly index 1d35ecfb67..39b2ba1e4c 100644 --- a/ly/a4-init.ly +++ b/ly/a4-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % a4.ly hsize = 210.0 \mm diff --git a/ly/accordion-defs-init.ly b/ly/accordion-defs-init.ly index 918da5c091..d962fff7c9 100644 --- a/ly/accordion-defs-init.ly +++ b/ly/accordion-defs-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % Symbols needed to print accordion music % % 2' = T diff --git a/ly/book-init-init.ly b/ly/book-init-init.ly index bdad6d403e..79a3438437 100644 --- a/ly/book-init-init.ly +++ b/ly/book-init-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.7.18" +\version "1.9.0" \include "declarations-init.ly" diff --git a/ly/catalan.ly b/ly/catalan.ly index eea562b567..bb083511db 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -73,4 +73,4 @@ -\version "1.7.18" +\version "1.9.0" diff --git a/ly/center-init.ly b/ly/center-init.ly index 0aecc5d336..837716ba91 100644 --- a/ly/center-init.ly +++ b/ly/center-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.7.18" +\version "1.9.0" \include "declarations-init.ly" diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly index e941550a5b..c0576259f1 100644 --- a/ly/chord-modifiers-init.ly +++ b/ly/chord-modifiers-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \chordmodifiers #default-chord-modifier-list diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index 71711a257f..3f160f5e0e 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -1,5 +1,6 @@ +#(ly:set-option 'old-relative) -\version "1.7.18" +\version "1.9.0" 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 3b66a3954f..721763f3e7 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -49,4 +49,4 @@ -\version "1.7.18" +\version "1.9.0" diff --git a/ly/drumpitch-init.ly b/ly/drumpitch-init.ly index 77b4bdb617..162fdd8358 100644 --- a/ly/drumpitch-init.ly +++ b/ly/drumpitch-init.ly @@ -5,4 +5,4 @@ ) -\version "1.7.18" +\version "1.9.0" diff --git a/ly/dynamic-scripts-init.ly b/ly/dynamic-scripts-init.ly index bc1da18726..0a520c205c 100644 --- a/ly/dynamic-scripts-init.ly +++ b/ly/dynamic-scripts-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % % declare the standard dynamic identifiers. diff --git a/ly/english.ly b/ly/english.ly index 41cada43e5..96ec7113c8 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -78,5 +78,5 @@ (bss . ,(ly:make-pitch -1 6 2 )) ) -\version "1.7.18" +\version "1.9.0" diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 67e827de26..bc3c4ae292 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" @@ -375,7 +375,7 @@ RemoveEmptyStaffContext = \translator { Beam \override #'auto-knee-gap = #'() } -HaraKiriStaffContext = \translator { +RemoveEmptyStaffContext = \translator { \RemoveEmptyStaffContext \accepts "VaticanaVoice" \accepts "GregorianTranscriptionVoice" diff --git a/ly/espanol.ly b/ly/espanol.ly index de0ee56ca5..3539c3f709 100644 --- a/ly/espanol.ly +++ b/ly/espanol.ly @@ -58,4 +58,4 @@ -\version "1.7.18" +\version "1.9.0" diff --git a/ly/generate-documentation.ly b/ly/generate-documentation.ly index 0f02b8cc4c..ca3e5aa1a9 100644 --- a/ly/generate-documentation.ly +++ b/ly/generate-documentation.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % % 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 7b9705be0f..eda491dc65 100644 --- a/ly/generate-interface-doc-init.ly +++ b/ly/generate-interface-doc-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % % 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 f2af16a58b..32b9c9c6c3 100644 --- a/ly/generic-paper-init.ly +++ b/ly/generic-paper-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \paper { texsetting = "" diff --git a/ly/grace-init.ly b/ly/grace-init.ly index 2e70c5ad8a..9b74c3f958 100644 --- a/ly/grace-init.ly +++ b/ly/grace-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" %% %% TODO: these definitions should be read and executed out dynamically diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly index 8111cae230..f9a1616b1c 100644 --- a/ly/gregorian-init.ly +++ b/ly/gregorian-init.ly @@ -1,4 +1,4 @@ -\version "1.8.0" +\version "1.9.0" %%%%%%%% %%%%%%%% shortcuts common for all styles of gregorian chant notation diff --git a/ly/init.ly b/ly/init.ly index 7d9a77aa59..96cc5a7895 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -5,8 +5,15 @@ #(reset-drum-kit) -\version "1.7.18" +\version "1.9.0" \include "declarations-init.ly" +#(ly:set-option 'old-relative #t) +#(ly:set-point-and-click #f) + \maininput + +#(if (and (ly:get-option 'old-relative) + (not (ly:get-option 'old-relative-used))) + (ly:warn "Old relative compatibility was not used.")) diff --git a/ly/italiano.ly b/ly/italiano.ly index 3889a06ede..f250e6cb62 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -48,4 +48,4 @@ (sidd . ,(ly:make-pitch -1 6 2 )) ) -\version "1.7.18" +\version "1.9.0" diff --git a/ly/ledger-init.ly b/ly/ledger-init.ly index 93a4f6f2e7..8be0a4c91e 100644 --- a/ly/ledger-init.ly +++ b/ly/ledger-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % ledger.ly diff --git a/ly/legal-init.ly b/ly/legal-init.ly index 601ff5e6b0..506d51fa70 100644 --- a/ly/legal-init.ly +++ b/ly/legal-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % legal-init.ly hsize = 8.5 \in diff --git a/ly/letter-init.ly b/ly/letter-init.ly index 9c47b1a8a3..fa7ce3291d 100644 --- a/ly/letter-init.ly +++ b/ly/letter-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % letter-init.ly hsize = 8.5 \in diff --git a/ly/midi-init.ly b/ly/midi-init.ly index 594c0ccbf9..aa83b34a3d 100644 --- a/ly/midi-init.ly +++ b/ly/midi-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" \midi { \tempo 4=60 \include "performer-init.ly" diff --git a/ly/nederlands.ly b/ly/nederlands.ly index fcfb4e98c0..ba86bfa540 100644 --- a/ly/nederlands.ly +++ b/ly/nederlands.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" %{ common dutch names for notes. es means flat, is means sharp %} diff --git a/ly/norsk.ly b/ly/norsk.ly index c2a13eead2..b9d7978e2f 100644 --- a/ly/norsk.ly +++ b/ly/norsk.ly @@ -104,4 +104,4 @@ -\version "1.7.18" +\version "1.9.0" diff --git a/ly/paper-as5-init.ly b/ly/paper-as5-init.ly index 28967de073..b8104a8524 100644 --- a/ly/paper-as5-init.ly +++ b/ly/paper-as5-init.ly @@ -1,6 +1,6 @@ % paper-as5-init.ly -\version "1.7.18" +\version "1.9.0" paperAsFive = \paper { staffheight = 5.\char diff --git a/ly/paper-as5.ly b/ly/paper-as5.ly index fec97d1004..5c1effc874 100644 --- a/ly/paper-as5.ly +++ b/ly/paper-as5.ly @@ -1,3 +1,3 @@ -\version "1.7.18" +\version "1.9.0" \include "paper-as5-init.ly" diff --git a/ly/paper-as9-init.ly b/ly/paper-as9-init.ly index 9e57e1a9a0..1319604047 100644 --- a/ly/paper-as9-init.ly +++ b/ly/paper-as9-init.ly @@ -1,6 +1,6 @@ % paper-as9-init.ly -\version "1.7.18" +\version "1.9.0" paperAsNine = \paper { staffheight = 9.\char diff --git a/ly/paper-as9.ly b/ly/paper-as9.ly index c14b0da90f..58bdc62eb8 100644 --- a/ly/paper-as9.ly +++ b/ly/paper-as9.ly @@ -1,3 +1,3 @@ -\version "1.7.18" +\version "1.9.0" \include "paper-as9-init.ly" diff --git a/ly/paper-init.ly b/ly/paper-init.ly index 7ae1ea4a71..7da01b00a6 100644 --- a/ly/paper-init.ly +++ b/ly/paper-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % paper-init.ly %% Why som complicated? /MB diff --git a/ly/paper11-init.ly b/ly/paper11-init.ly index 39576f061a..a8ab6fb69e 100644 --- a/ly/paper11-init.ly +++ b/ly/paper11-init.ly @@ -1,6 +1,6 @@ % paper11-init.ly -\version "1.7.18" +\version "1.9.0" paperEleven = \paper { staffheight = 11.0\pt diff --git a/ly/paper11.ly b/ly/paper11.ly index 9e3a1e8d5e..fbb3e50c02 100644 --- a/ly/paper11.ly +++ b/ly/paper11.ly @@ -1,3 +1,3 @@ -\version "1.7.18" +\version "1.9.0" \include "paper11-init.ly" diff --git a/ly/paper13-init.ly b/ly/paper13-init.ly index 4651f0d0f3..32d0f67c0c 100644 --- a/ly/paper13-init.ly +++ b/ly/paper13-init.ly @@ -1,7 +1,7 @@ % paper13-init.ly -\version "1.7.18" +\version "1.9.0" paperThirteen = \paper { staffheight = 13.0\pt diff --git a/ly/paper13.ly b/ly/paper13.ly index e5afa73600..f67817edf5 100644 --- a/ly/paper13.ly +++ b/ly/paper13.ly @@ -1,3 +1,3 @@ -\version "1.7.18" +\version "1.9.0" \include "paper13-init.ly" diff --git a/ly/paper16-init.ly b/ly/paper16-init.ly index 45546ea8a4..8b6cffb53c 100644 --- a/ly/paper16-init.ly +++ b/ly/paper16-init.ly @@ -1,7 +1,7 @@ % paper16-init.ly -\version "1.7.18" +\version "1.9.0" paperSixteen = \paper { staffheight = 16.0\pt diff --git a/ly/paper16.ly b/ly/paper16.ly index 4c3334941d..32ffb7554f 100644 --- a/ly/paper16.ly +++ b/ly/paper16.ly @@ -1,3 +1,3 @@ -\version "1.7.18" +\version "1.9.0" \include "paper16-init.ly" diff --git a/ly/paper19-init.ly b/ly/paper19-init.ly index 08b050369f..292c2283ac 100644 --- a/ly/paper19-init.ly +++ b/ly/paper19-init.ly @@ -1,7 +1,7 @@ % paper19-init.ly -\version "1.7.18" +\version "1.9.0" paperNineteen = \paper { staffheight = 19.0\pt diff --git a/ly/paper19.ly b/ly/paper19.ly index 0c0d776a9e..990238f3c0 100644 --- a/ly/paper19.ly +++ b/ly/paper19.ly @@ -1,3 +1,3 @@ -\version "1.7.18" +\version "1.9.0" \include "paper19-init.ly" diff --git a/ly/paper20-init.ly b/ly/paper20-init.ly index e340e6dc28..219574496f 100644 --- a/ly/paper20-init.ly +++ b/ly/paper20-init.ly @@ -1,7 +1,7 @@ % paper20-init.ly -\version "1.7.18" +\version "1.9.0" paperTwenty = \paper { staffheight = 20.0\pt diff --git a/ly/paper20.ly b/ly/paper20.ly index 8663c4b68b..61d655e49d 100644 --- a/ly/paper20.ly +++ b/ly/paper20.ly @@ -1,3 +1,3 @@ -\version "1.7.18" +\version "1.9.0" \include "paper20-init.ly" diff --git a/ly/paper23-init.ly b/ly/paper23-init.ly index 9ba550655f..9d97011ad0 100644 --- a/ly/paper23-init.ly +++ b/ly/paper23-init.ly @@ -1,7 +1,7 @@ % paper23-init.ly -\version "1.7.18" +\version "1.9.0" paperTwentythree = \paper { staffheight = 23.0\pt diff --git a/ly/paper23.ly b/ly/paper23.ly index 587970fbb2..d8f321638f 100644 --- a/ly/paper23.ly +++ b/ly/paper23.ly @@ -1,3 +1,3 @@ -\version "1.7.18" +\version "1.9.0" \include "paper23-init.ly" diff --git a/ly/paper26-init.ly b/ly/paper26-init.ly index 7504b30748..74a19dee35 100644 --- a/ly/paper26-init.ly +++ b/ly/paper26-init.ly @@ -1,6 +1,6 @@ % paper26-init.ly -\version "1.7.18" +\version "1.9.0" paperTwentysix = \paper { staffheight = 26.0\pt diff --git a/ly/paper26.ly b/ly/paper26.ly index 19e4db7b88..9acef1713b 100644 --- a/ly/paper26.ly +++ b/ly/paper26.ly @@ -1,3 +1,3 @@ -\version "1.7.18" +\version "1.9.0" \include "paper26-init.ly" diff --git a/ly/params-as-init.ly b/ly/params-as-init.ly index b0f158bdc2..fbb52529df 100644 --- a/ly/params-as-init.ly +++ b/ly/params-as-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % params-as-init.ly % generic paper parameters diff --git a/ly/params-init.ly b/ly/params-init.ly index 821511744d..26c1441ef0 100644 --- a/ly/params-init.ly +++ b/ly/params-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % JUNKME. %% deprecated diff --git a/ly/part-paper-init.ly b/ly/part-paper-init.ly index 7f8dcf0fb8..bef4ce3216 100644 --- a/ly/part-paper-init.ly +++ b/ly/part-paper-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % JUNKME %part-paper-init.ly diff --git a/ly/performer-init.ly b/ly/performer-init.ly index 2f54e69c06..547749d1eb 100644 --- a/ly/performer-init.ly +++ b/ly/performer-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" % % setup for Request->Element conversion. Guru-only diff --git a/ly/property-init.ly b/ly/property-init.ly index b13f712c37..09578b2940 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -1,6 +1,6 @@ % property-init.ly -\version "1.7.18" +\version "1.9.0" stemUp = \property Voice.Stem \set #'direction = #1 stemDown = \property Voice.Stem \set #'direction = #-1 diff --git a/ly/scale-definitions-init.ly b/ly/scale-definitions-init.ly index 4cb144e870..269994d736 100644 --- a/ly/scale-definitions-init.ly +++ b/ly/scale-definitions-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" major = #'( diff --git a/ly/script-init.ly b/ly/script-init.ly index 8dd3521cac..896a1b7848 100644 --- a/ly/script-init.ly +++ b/ly/script-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" dashHat= "marcato" diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly index 1c448e4507..c7fd8f93cf 100644 --- a/ly/spanners-init.ly +++ b/ly/spanners-init.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.9.0" startGroup = #(make-span-event 'NoteGroupingEvent START) stopGroup = #(make-span-event 'NoteGroupingEvent STOP) diff --git a/ly/suomi.ly b/ly/suomi.ly index a140055249..084421b7dc 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.7.18" +\version "1.9.0" diff --git a/ly/svenska.ly b/ly/svenska.ly index 759e4f78c2..386296a3f1 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.7.18" +\version "1.9.0" diff --git a/python/lilylib.py b/python/lilylib.py index f31ecc5130..89104b84e9 100644 --- a/python/lilylib.py +++ b/python/lilylib.py @@ -234,10 +234,10 @@ def setup_temp (): return __main__.temp_dir def command_name (cmd): - return re.match ('^[ \t]*([^ \t]*)', cmd).group (1) + return re.match ('^[^a-z0-9_-]*([a-z0-9_-]*)', cmd).group (1) def error_log (name): - name = re.sub('[/:]','x',name) + name = re.sub('[^a-z]','x',name) return tempfile.mktemp ('%s.errorlog' % name) def read_pipe (cmd, mode = 'r'): diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm index 1eabfbe00f..d981db254e 100644 --- a/scm/define-music-types.scm +++ b/scm/define-music-types.scm @@ -341,6 +341,12 @@ goes down).") (types . (general-music pes-or-flexa-event event)) )) + (RelativeOctaveCheck + . ((description . "Check if a pitch is in the correct octave.") + (internal-class-name . "Relative_octave_check") + (types . (general-music relative-octave-check)) + )) + (RepeatedMusic . ( (description . "Repeat music in different ways") diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 832404318c..d13fad6140 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1249,6 +1249,162 @@ if 1: +if 1: + + def sub_chord (m): + str = m.group(1) + + origstr = '<%s>' % str + if re.search (r'\\\\', str): + return origstr + + if re.search (r'\\property', str): + return origstr + + if re.match (r'^\s*\)?\s*\\[a-zA-Z]+', str): + return origstr + + durs = [] + def sub_durs (m): + durs.append(m.group(2)) + return m.group (1) + + str = re.sub ("([a-z]+[,'!? ]*)([0-9.]+)", sub_durs, str) + dur_str = '' + + for d in durs: + if dur_str == '': + dur_str = d + if dur_str <> d: + return '<%s>' % m.group (1) + + pslur_strs = [''] + dyns = [''] + slur_strs = [''] + + last_str = '' + while last_str <> str: + last_str = str + def sub_dyn_end (m): + dyns.append (' -\!') + return ' ' + m.group(2) + + str = re.sub (r'(\\!)\s*([a-z]+)', sub_dyn_end, str) + def sub_slurs(m): + if '-)' not in slur_strs: + slur_strs.append ( '-)') + return m.group(1) + def sub_p_slurs(m): + if '-\)' not in slur_strs: + slur_strs.append ( '-\)') + return m.group(1) + str = re.sub (r"\)[ ]*([a-z]+)", sub_slurs, str) + str = re.sub (r"\\\)[ ]*([a-z]+)", sub_p_slurs, str) + def sub_begin_slurs(m): + if '-(' not in slur_strs: + slur_strs.append ( '-(') + return m.group(1) + str = re.sub (r"([a-z]+[,'!?0-9 ]*)\(", sub_begin_slurs, str) + def sub_begin_p_slurs(m): + if '-\(' not in slur_strs: + slur_strs.append ( '-\(') + return m.group(1) + + str = re.sub (r"([a-z]+[,'!?0-9 ]*)\\\(", sub_begin_p_slurs, str) + + def sub_dyns (m): + s = m.group(0) + if s == '@STARTCRESC@': + slur_strs.append ("-\\<") + elif s == '@STARTDECRESC@': + slur_strs.append ("-\\>") + elif s == r'-?\\!': + slur_strs.append ('-\\!') + return '' + + str = re.sub (r'@STARTCRESC@', sub_dyns, str) + str = re.sub (r'-?\\!', sub_dyns, str) + + def sub_articulations (m): + a = m.group(1) + if a not in slur_strs: + slur_strs.append (a) + return '' + + str = re.sub (r"([_^-]\@ACCENT\@)", sub_articulations, str) + str = re.sub (r"([_^-]\\[a-z]+)", sub_articulations, str) + str = re.sub (r"([_^-][>_.+|^-])", sub_articulations, str) + + def sub_pslurs(m): + slur_strs.append ( ' -\\)') + return m.group(1) + str = re.sub (r"\\\)[ ]*([a-z]+)", sub_pslurs, str) + + suffix = string.join (slur_strs, '') + string.join (pslur_strs, '') \ + + string.join (dyns, '') + + return '@STARTCHORD@%s@ENDCHORD@%s%s' % (str , dur_str, suffix) + + + + + + def sub_chords (str): + simend = '>' + simstart = "<" + chordstart = '<<' + chordend = '>>' + + if re.search (marker_str,str): + return str + str= re.sub (r'\\<', '@STARTCRESC@', str) + str= re.sub (r'\\>', '@STARTDECRESC@', str) + str= re.sub (r'([_^-])>', r'\1@ACCENT@', str) + str = re.sub ('<([^<>{}]+)>', sub_chord, str) + + str = re.sub (r'\[ *(@STARTCHORD@[^@]+@ENDCHORD@[0-9.]+)', + r'\1-[', + str) + str = re.sub (r'\\! *(@STARTCHORD@[^@]+@ENDCHORD@[0-9.]+)', + r'\1-\\!', + str) + str = re.sub ('<([^?])', r'%s\1' % simstart, str) + str = re.sub ('>([^?])', r'%s\1' % simend, str) + str = re.sub ('@STARTCRESC@', r'\\<', str) + str = re.sub ('@STARTDECRESC@', r'\\>' ,str) + str = re.sub (r'\\context *Voice *@STARTCHORD@', '@STARTCHORD@', str) + str = re.sub ('@STARTCHORD@', chordstart, str) + str = re.sub ('@ENDCHORD@', chordend, str) + str = re.sub (r'@ACCENT@', '>', str) + return str + + def articulation_substitute (str): + str = re.sub (r"""([^-])\[ *([a-z]+[,']*[!?]?[0-9:]*\.*)""", + r" \1 \2-[", str) + str = re.sub (r"""([^-])\) *([a-z]+[,']*[!?]?[0-9:]*\.*)""", + r"\1 \2-)", str) + str = re.sub (r"""([^-])\\! *([a-z]+[,']*[!?]?[0-9:]*\.*)""", + r"\1 \2-\\!", str) + return str + + def conv_relative(str): + if re.search (r"\\relative", str): + str= "#(ly:set-option 'old-relative)\n" + str + + return str + + def conv (str): + str = conv_relative (str) + if re.search (marker_str, str) == None : + str = sub_chords (str) + + str = articulation_substitute (str) + + return str + + conversions.append (((1,9,0), conv, """New relative mode, +Postfix articulations, new chord syntax.")) + ################################ # END OF CONVERSIONS ################################ diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 1797084fad..7ae8ccb323 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -690,6 +690,7 @@ def compose_full_body (body, opts): } ''' + orig_name = '' for o in opts: m= re.search ('relative(.*)', o) v = 0 @@ -707,7 +708,10 @@ def compose_full_body (body, opts): pitch = pitch + '\'' * v body = '\\relative %s { %s }' % (pitch, body) - + m =re.search ("filename=(.*)", o) + if m: + orig_name = m.group (1) + if is_fragment: body = r''' \score { @@ -731,6 +735,10 @@ def compose_full_body (body, opts): } ''' % (optstring, music_size, linewidth, indent, notime) + body + if orig_name: + body = '\\renameinput \"%s\"\n%s' % (orig_name, body) + + # ughUGH not original options return body diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 7d204fc73e..1c5c6208eb 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -492,12 +492,13 @@ None f.close () cmd = latex_cmd + ' \\\\nonstopmode \\\\input %s' % latex_fn + # Ugh. (La)TeX writes progress and error messages on stdout # Redirect to stderr - cmd += ' 1>/dev/stderr' + cmd = '(( %s >&2 ) >&- )' % cmd status = ly.system (cmd, ignore_error = 1) signal = 0xf & status - exit_status = status >> 8 + exit_status = status >> 8 if exit_status: -- 2.39.2