From 51159f8679de00e6cd526ca2a16e1ea4d4294f81 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 14 Jun 2004 20:52:08 +0000 Subject: [PATCH] * scripts/convert-ly.py (conv): remove \notes. apply to input examples. * lily/paper-outputter.cc (output_stencil): don't use smobify_self() but self_scm() (ouch). * lily/include/ly-smobs.icc (IMPLEMENT_SMOBS): don't return SCM from smobify_self(). * lily/paper-book.cc (output): load framework module scm_c_resolve_module(). --- ChangeLog | 9 ++++ input/example-1.ly | 4 +- input/example-2.ly | 4 +- input/example-3.ly | 6 +-- input/les-nereides.ly | 12 ++--- input/mutopia-header.ly | 2 +- input/puer-fragment.ly | 4 +- input/regression/+.ly | 2 +- input/regression/accidental-cautionary.ly | 4 +- input/regression/accidental-double.ly | 4 +- input/regression/accidental-ledger.ly | 4 +- input/regression/accidental-octave.ly | 4 +- input/regression/accidental-placement.ly | 4 +- input/regression/accidental-quarter.ly | 4 +- input/regression/accidental-single-double.ly | 4 +- input/regression/accidental-tie.ly | 6 +-- .../accidental-unbroken-tie-spacing.ly | 4 +- input/regression/accidental-voice.ly | 8 +-- input/regression/accidental.ly | 4 +- input/regression/accidentals.ly | 6 +-- input/regression/ambitus.ly | 6 +-- input/regression/apply-context.ly | 4 +- input/regression/apply-output.ly | 4 +- input/regression/arpeggio-bracket.ly | 4 +- input/regression/arpeggio-collision.ly | 4 +- input/regression/arpeggio.ly | 4 +- input/regression/auto-beam-bar.ly | 4 +- input/regression/auto-beam-no-beam.ly | 4 +- input/regression/auto-beam-triplet.ly | 4 +- input/regression/auto-beam-tuplets.ly | 4 +- input/regression/auto-beam.ly | 4 +- input/regression/auto-change.ly | 4 +- input/regression/balloon.ly | 4 +- input/regression/bar-check-redefine.ly | 4 +- input/regression/bar-number.ly | 4 +- input/regression/bar-scripts.ly | 6 +-- input/regression/beam-auto-knee.ly | 4 +- input/regression/beam-break.ly | 4 +- input/regression/beam-center-slope.ly | 4 +- input/regression/beam-concave.ly | 4 +- .../regression/beam-cross-staff-auto-knee.ly | 6 +-- input/regression/beam-cross-staff-slope.ly | 4 +- input/regression/beam-cross-staff.ly | 6 +-- input/regression/beam-damp.ly | 4 +- input/regression/beam-default-lengths.ly | 4 +- input/regression/beam-extreme.ly | 4 +- input/regression/beam-french.ly | 4 +- input/regression/beam-funky-beamlet.ly | 4 +- input/regression/beam-funky.ly | 4 +- input/regression/beam-knee-symmetry.ly | 4 +- input/regression/beam-length.ly | 4 +- input/regression/beam-manual-beaming.ly | 4 +- input/regression/beam-multiple-cross-staff.ly | 4 +- input/regression/beam-over-barline.ly | 4 +- input/regression/beam-position.ly | 4 +- input/regression/beam-postfix-notation.ly | 4 +- input/regression/beam-quanting-32nd.ly | 4 +- input/regression/beam-quanting-horizontal.ly | 4 +- input/regression/beam-quarter.ly | 4 +- input/regression/beam-rest.ly | 4 +- input/regression/beam-second.ly | 4 +- input/regression/beam-shortened-lengths.ly | 4 +- input/regression/beamed-chord.ly | 4 +- input/regression/beaming-ternary-metrum.ly | 4 +- input/regression/beaming.ly | 4 +- input/regression/beams.ly | 4 +- input/regression/break.ly | 4 +- input/regression/breathing-sign-ancient.ly | 4 +- input/regression/breathing-sign.ly | 4 +- input/regression/chord-changes.ly | 4 +- input/regression/chord-name-entry-11.ly | 2 +- input/regression/chord-name-entry.ly | 4 +- input/regression/chord-name-exceptions.ly | 6 +-- input/regression/chord-name-major7.ly | 2 +- input/regression/chord-names-bass.ly | 2 +- input/regression/chord-scripts.ly | 4 +- input/regression/chord-tremolo-short.ly | 4 +- input/regression/chord-tremolo.ly | 4 +- input/regression/chords-funky-ignatzek.ly | 6 +-- input/regression/clef-oct.ly | 4 +- input/regression/clefs.ly | 4 +- input/regression/cluster-cross-staff.ly | 4 +- input/regression/cluster.ly | 6 +-- input/regression/collision-2.ly | 6 +-- input/regression/collision-dots-invert.ly | 4 +- input/regression/collision-dots-move.ly | 4 +- input/regression/collision-dots.ly | 4 +- input/regression/collision-head-chords.ly | 4 +- input/regression/collision-heads.ly | 4 +- .../collision-merge-differently-dotted.ly | 4 +- input/regression/collision-merge-dots.ly | 4 +- input/regression/collision-mesh.ly | 4 +- input/regression/collisions.ly | 12 ++--- .../regression/completion-heads-polyphony.ly | 4 +- input/regression/completion-heads.ly | 4 +- input/regression/custos.ly | 4 +- input/regression/dot-flag-collision.ly | 4 +- input/regression/dots.ly | 4 +- input/regression/drums.ly | 2 +- input/regression/dynamics-broken-hairpin.ly | 4 +- input/regression/dynamics-glyphs.ly | 4 +- input/regression/dynamics-line.ly | 4 +- input/regression/dynamics-unbound-hairpin.ly | 4 +- input/regression/easy-notation.ly | 4 +- input/regression/figured-bass.ly | 4 +- input/regression/finger-chords.ly | 4 +- input/regression/fingering.ly | 4 +- input/regression/follow-voice-break.ly | 4 +- input/regression/font-magnification.ly | 4 +- input/regression/font-name.ly | 4 +- input/regression/generic-output-property.ly | 4 +- input/regression/glissando.ly | 4 +- input/regression/grace-auto-beam.ly | 4 +- input/regression/grace-bar-line.ly | 4 +- input/regression/grace-bar-number.ly | 4 +- input/regression/grace-beam.ly | 4 +- input/regression/grace-end.ly | 4 +- input/regression/grace-nest.ly | 4 +- input/regression/grace-nest1.ly | 4 +- input/regression/grace-nest2.ly | 4 +- input/regression/grace-nest3.ly | 4 +- input/regression/grace-nest4.ly | 4 +- input/regression/grace-nest5.ly | 4 +- input/regression/grace-part-combine.ly | 6 +-- input/regression/grace-staff-length.ly | 4 +- input/regression/grace-start.ly | 4 +- input/regression/grace-stems.ly | 4 +- input/regression/grace-sync.ly | 4 +- input/regression/grace-types.ly | 4 +- input/regression/grace-unfold-repeat.ly | 4 +- input/regression/grace-volta-repeat-2.ly | 4 +- input/regression/grace-volta-repeat.ly | 4 +- input/regression/grace.ly | 4 +- input/regression/hairpin-dashed.ly | 4 +- input/regression/hairpin-ending.ly | 4 +- input/regression/hara-kiri-pianostaff.ly | 4 +- input/regression/instrument-name-markup.ly | 4 +- input/regression/instrument-name-partial.ly | 4 +- input/regression/instrument-name.ly | 4 +- input/regression/key-clefs.ly | 4 +- input/regression/key-signature-scordatura.ly | 4 +- input/regression/keys.ly | 4 +- input/regression/lyric-combine-new.ly | 4 +- input/regression/lyric-combine-polyphonic.ly | 4 +- input/regression/lyric-combine.ly | 8 +-- input/regression/lyric-extender-broken.ly | 4 +- input/regression/lyric-extender.ly | 4 +- input/regression/lyric-hyphen-break.ly | 4 +- input/regression/lyric-hyphen.ly | 4 +- input/regression/lyric-phrasing.ly | 4 +- input/regression/lyrics-bar.ly | 6 +-- input/regression/lyrics-melisma-beam.ly | 4 +- input/regression/markup-note.ly | 4 +- input/regression/markup-stack.ly | 4 +- input/regression/markup-user.ly | 4 +- input/regression/measure-grouping.ly | 4 +- input/regression/mensural.ly | 4 +- input/regression/metronome-marking.ly | 4 +- input/regression/mm-rests2.ly | 4 +- input/regression/molecule-hacking.ly | 4 +- input/regression/multi-measure-rest-center.ly | 4 +- input/regression/multi-measure-rest-grace.ly | 4 +- .../multi-measure-rest-instr-name.ly | 4 +- .../multi-measure-rest-multi-staff-center.ly | 4 +- .../regression/multi-measure-rest-spacing.ly | 4 +- input/regression/multi-measure-rest-text.ly | 4 +- input/regression/multi-measure-rest.ly | 4 +- input/regression/music-function.ly | 4 +- input/regression/music-map.ly | 6 +-- input/regression/new-markup-scheme.ly | 4 +- input/regression/new-markup-syntax.ly | 4 +- input/regression/newaddlyrics.ly | 2 +- input/regression/non-empty-text.ly | 4 +- input/regression/note-group-bracket.ly | 4 +- input/regression/note-head-chord.ly | 4 +- input/regression/note-head-harmonic.ly | 4 +- input/regression/note-head-style.ly | 6 +-- input/regression/note-line.ly | 8 +-- input/regression/number-staff-lines.ly | 4 +- input/regression/ottava-broken.ly | 4 +- input/regression/ottava.ly | 4 +- input/regression/part-combine-a2.ly | 6 +-- input/regression/part-combine-cross.ly | 6 +-- input/regression/part-combine-global.ly | 6 +-- input/regression/part-combine-solo-end.ly | 6 +-- input/regression/part-combine-solo-global.ly | 6 +-- input/regression/part-combine-solo.ly | 6 +-- input/regression/part-combine-text.ly | 6 +-- input/regression/part-combine.ly | 6 +-- input/regression/pedal-bracket.ly | 4 +- input/regression/pedal-end.ly | 4 +- input/regression/pedal-ped.ly | 4 +- input/regression/phrasing-slur.ly | 4 +- input/regression/prefatory-empty-spacing.ly | 4 +- input/regression/prefatory-spacing-matter.ly | 4 +- input/regression/property-grace-polyphony.ly | 4 +- input/regression/property-once.ly | 4 +- input/regression/quote-transposition.ly | 8 +-- input/regression/quote.ly | 6 +-- input/regression/rehearsal-mark-letter.ly | 4 +- input/regression/rehearsal-mark-number.ly | 4 +- input/regression/repeat-fold.ly | 4 +- input/regression/repeat-line-break.ly | 4 +- input/regression/repeat-percent-skipbars.ly | 4 +- input/regression/repeat-percent.ly | 4 +- input/regression/repeat-slash.ly | 4 +- input/regression/repeat-unfold-all.ly | 6 +-- input/regression/repeat-unfold-tremolo.ly | 4 +- input/regression/repeat-unfold.ly | 4 +- .../repeat-volta-skip-alternatives.ly | 4 +- input/regression/repeat-volta.ly | 4 +- input/regression/rest-collision-beam.ly | 6 +-- input/regression/rest-collision.ly | 16 +++--- input/regression/rest-ledger.ly | 4 +- input/regression/rest-pitch.ly | 4 +- input/regression/rest-polyphonic.ly | 4 +- input/regression/rest.ly | 4 +- input/regression/rhythmic-staff.ly | 4 +- input/regression/script-collision.ly | 4 +- input/regression/script-stack-order.ly | 4 +- input/regression/script-stacked.ly | 4 +- 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 | 4 +- input/regression/slur-attachment.ly | 4 +- input/regression/slur-broken-trend.ly | 4 +- input/regression/slur-cross-staff.ly | 6 +-- input/regression/slur-dots.ly | 4 +- input/regression/slur-nice.ly | 4 +- input/regression/slur-rest.ly | 4 +- input/regression/slur-staccato.ly | 4 +- input/regression/slur-stem-broken.ly | 4 +- input/regression/slur-symmetry-1.ly | 4 +- input/regression/slur-symmetry.ly | 4 +- input/regression/spacing-accidental-staffs.ly | 4 +- .../regression/spacing-accidental-stretch.ly | 4 +- input/regression/spacing-accidental.ly | 4 +- input/regression/spacing-bar-stem.ly | 4 +- input/regression/spacing-clef-first-note.ly | 4 +- input/regression/spacing-end-of-line.ly | 4 +- input/regression/spacing-ended-voice.ly | 4 +- input/regression/spacing-folded-clef.ly | 4 +- input/regression/spacing-folded-clef2.ly | 4 +- input/regression/spacing-grace-duration.ly | 4 +- input/regression/spacing-grace.ly | 4 +- input/regression/spacing-knee.ly | 4 +- input/regression/spacing-multi-tuplet.ly | 6 +-- input/regression/spacing-note-flags.ly | 4 +- input/regression/spacing-ragged-last.ly | 4 +- input/regression/spacing-rest.ly | 4 +- input/regression/spacing-short-notes.ly | 4 +- input/regression/spacing-stem-bar.ly | 4 +- input/regression/spacing-stem-direction.ly | 4 +- .../regression/spacing-stem-same-direction.ly | 4 +- input/regression/spacing-to-grace.ly | 4 +- input/regression/spacing-very-tight.ly | 4 +- input/regression/span-bar-break.ly | 2 +- input/regression/span-bar.ly | 4 +- input/regression/staccato-pos.ly | 4 +- input/regression/staff-halfway.ly | 4 +- input/regression/staff-mixed-size.ly | 6 +-- input/regression/staff-tweak.ly | 6 +-- input/regression/stanza-number.ly | 4 +- input/regression/stem-direction.ly | 4 +- input/regression/stem-shorten.ly | 4 +- input/regression/stem-spacing.ly | 6 +-- input/regression/stem-tremolo.ly | 4 +- input/regression/system-extents.ly | 4 +- input/regression/system-start-bracket.ly | 4 +- input/regression/tablature-string-tunings.ly | 4 +- input/regression/tablature.ly | 4 +- input/regression/tag-filter.ly | 6 +-- input/regression/text-spanner.ly | 4 +- input/regression/tie-busy-grobs.ly | 2 +- input/regression/tie-chord.ly | 6 +-- input/regression/tie-dots.ly | 4 +- input/regression/tie-grace.ly | 4 +- input/regression/tie.ly | 4 +- input/regression/tuplet-beam.ly | 4 +- input/regression/tuplet-gap.ly | 4 +- input/regression/tuplet-nest.ly | 2 +- input/regression/tuplet-properties.ly | 4 +- input/regression/tuplet-rest.ly | 4 +- input/regression/tuplet-slope.ly | 4 +- .../regression/tuplet-staffline-collision.ly | 4 +- input/regression/tuplets.ly | 4 +- input/regression/voice-follower.ly | 4 +- input/regression/volta-broken-left-edge.ly | 12 ++--- input/regression/volta-multi-staff.ly | 6 +-- input/screech-boink.ly | 4 +- input/simple-song.ly | 2 +- input/simple.ly | 2 +- input/test/+.ly | 2 +- input/test/add-staccato.ly | 4 +- input/test/add-text-script.ly | 4 +- input/test/ambitus-mixed.ly | 6 +-- input/test/ancient-accidentals.ly | 4 +- input/test/ancient-font.ly | 6 +-- input/test/ancient-time.ly | 4 +- input/test/bagpipe.ly | 50 +++++++++---------- input/test/bar-always.ly | 4 +- input/test/bar-lines-lyric-only.ly | 4 +- input/test/bar-lines.ly | 4 +- input/test/bar-number-every-five-reset.ly | 4 +- input/test/bar-number-regular-interval.ly | 4 +- input/test/bar-number-show-all.ly | 4 +- input/test/beam-alternate.ly | 4 +- input/test/beam-auto-4-8.ly | 4 +- input/test/beam-auto-override.ly | 4 +- input/test/beam-auto.ly | 4 +- input/test/beam-control.ly | 4 +- input/test/beam-count.ly | 6 +-- input/test/beam-dir-functions.ly | 4 +- input/test/beam-isknee.ly | 6 +-- input/test/beam-neutral-direction.ly | 6 +-- input/test/beam-rest.ly | 4 +- input/test/blank-notes.ly | 4 +- input/test/blank-paper-tab.ly | 6 +-- input/test/blank-paper.ly | 2 +- input/test/boxed-stencil.ly | 4 +- input/test/cadenza-skip.ly | 6 +-- input/test/caps.ly | 4 +- input/test/cautionaries.ly | 4 +- input/test/chord-names-german.ly | 4 +- input/test/chord-names-jazz.ly | 10 ++-- input/test/chord-names-no-inversions.ly | 4 +- input/test/chords-without-melody.ly | 2 +- input/test/clef-8-syntax.ly | 4 +- input/test/clef-end-of-line.ly | 4 +- input/test/clef-manual-control.ly | 4 +- input/test/coriolan-margin.ly | 24 ++++----- input/test/count-systems.ly | 4 +- input/test/crescendi.ly | 4 +- input/test/cue-notes.ly | 4 +- input/test/divisiones.ly | 4 +- input/test/drarn-slurs.ly | 6 +-- input/test/drarn.ly | 4 +- input/test/dynamic-absolute-volume.ly | 4 +- input/test/dynamic-extra.ly | 4 +- input/test/embedded-postscript.ly | 4 +- input/test/embedded-scm.ly | 4 +- input/test/embedded-tex.ly | 6 +-- input/test/engraver-contexts.ly | 2 +- input/test/engraver-one-by-one.ly | 2 +- input/test/extra-staff.ly | 6 +-- input/test/figured-bass-alternate.ly | 4 +- input/test/follow-voice.ly | 4 +- input/test/force-hshift.ly | 4 +- input/test/fret-diagram.ly | 4 +- input/test/gourlay.ly | 4 +- input/test/gregorian-scripts.ly | 4 +- input/test/harmonic.ly | 4 +- input/test/header-ifelse.ly | 4 +- input/test/hshift.ly | 4 +- input/test/hymn.ly | 6 +-- input/test/improv.ly | 10 ++-- input/test/incipit.ly | 14 +++--- input/test/instrument-name-grandstaff.ly | 6 +-- input/test/ligature-vaticana.ly | 4 +- input/test/lilypond-testpage.ly | 6 +-- input/test/lyric-hyphen-retain.ly | 4 +- input/test/lyrics-skip-notes.ly | 6 +-- input/test/markup-score.ly | 2 +- input/test/mensural-ligatures.ly | 4 +- input/test/mensural-note-heads.ly | 4 +- input/test/midi-scales.ly | 4 +- input/test/move-accidentals.ly | 4 +- input/test/move-specific-text.ly | 4 +- input/test/music-box.ly | 14 +++--- input/test/music-creation.ly | 2 +- input/test/no-bar-lines.ly | 4 +- input/test/no-staff.ly | 4 +- input/test/ossia.ly | 4 +- input/test/page-breaks.ly | 4 +- input/test/part-combine.ly | 4 +- input/test/partial-blank.ly | 10 ++-- input/test/phrasing-slur-height.ly | 4 +- input/test/piano-staff-distance.ly | 4 +- input/test/polymetric-differing-notes.ly | 4 +- input/test/polymetric.ly | 4 +- input/test/preset-extent.ly | 2 +- input/test/repeat-manual.ly | 4 +- input/test/repeat-shorter-bracket.ly | 4 +- input/test/repeat.ly | 4 +- input/test/rest-dot-positions.ly | 4 +- input/test/rests.ly | 4 +- input/test/reverse-music.ly | 4 +- input/test/rhythm-excercise.ly | 4 +- input/test/scales-greek.ly | 4 +- input/test/scheme-interactions.ly | 8 +-- input/test/script-abbreviations.ly | 4 +- input/test/script-chart.ly | 4 +- input/test/script-priority.ly | 4 +- input/test/script-stack.ly | 4 +- input/test/separate-staccato.ly | 6 +-- input/test/slur-attachment-override.ly | 6 +-- input/test/slur-beautiful.ly | 4 +- input/test/slur-dash.ly | 4 +- input/test/slur-manual.ly | 4 +- input/test/slur-minimum-length.ly | 4 +- input/test/slur-ugly.ly | 6 +-- input/test/smart-transpose.ly | 6 +-- input/test/spacing-2.ly | 4 +- input/test/spanner-after-break-tweak.ly | 4 +- input/test/staff-bracket.ly | 4 +- input/test/staff-container.ly | 4 +- input/test/staff-lines.ly | 6 +-- input/test/staff-size.ly | 4 +- input/test/staff-space.ly | 4 +- input/test/stem-cross-staff.ly | 4 +- input/test/stem-extend.ly | 4 +- input/test/stem-length.ly | 4 +- input/test/tablature-hammer.ly | 4 +- input/test/tablature.ly | 4 +- input/test/temporary-stave.ly | 4 +- input/test/text-rotate.ly | 4 +- input/test/text-spanner.ly | 4 +- input/test/textscript.ly | 4 +- input/test/tie-cross-voice.ly | 4 +- input/test/time-signature-double.ly | 4 +- input/test/time.ly | 4 +- input/test/timing.ly | 4 +- input/test/title-markup.ly | 6 +-- input/test/title.ly | 6 +-- input/test/to-xml.ly | 4 +- input/test/transposition.ly | 10 ++-- input/test/trill.ly | 4 +- input/test/trills.ly | 6 +-- input/test/unfold-all-repeats.ly | 6 +-- input/test/version-output.ly | 4 +- input/test/vertical-extent.ly | 4 +- input/twinkle-pop.ly | 4 +- input/wilhelmus.ly | 8 +-- lily/include/ly-smobs.icc | 4 +- lily/include/smobs.hh | 2 +- lily/paper-book.cc | 7 ++- lily/paper-outputter.cc | 2 +- scm/lily.scm | 27 +--------- scripts/convert-ly.py | 8 +++ 443 files changed, 1016 insertions(+), 1019 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0134056269..d34eefdd41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2004-06-14 Han-Wen Nienhuys + * scripts/convert-ly.py (conv): remove \notes. + apply to input examples. + + * lily/paper-outputter.cc (output_stencil): don't use + smobify_self() but self_scm() (ouch). + + * lily/include/ly-smobs.icc (IMPLEMENT_SMOBS): don't return SCM + from smobify_self(). + * lily/paper-book.cc (output): load framework module scm_c_resolve_module(). diff --git a/input/example-1.ly b/input/example-1.ly index 544b3a96d9..2b0d81953c 100644 --- a/input/example-1.ly +++ b/input/example-1.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" % A simple scale in LilyPond % @@ -14,7 +14,7 @@ %% \score { - \context Voice \notes\relative c { + \context Voice \relative c { c' d e f g a b c } \paper { } diff --git a/input/example-2.ly b/input/example-2.ly index 4700804231..223b70b958 100644 --- a/input/example-2.ly +++ b/input/example-2.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" % Some beamed and slurred notes of different taste in LilyPond % % Type: @@ -13,7 +13,7 @@ %% \score { - \context Voice \notes\relative c { + \context Voice \relative c { a''2 ~ a4( e8[ )e] a,16[ a a a] } \paper { } diff --git a/input/example-3.ly b/input/example-3.ly index 7dd92ae7bc..436457e388 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,11 +1,11 @@ #(ly:set-option 'old-relative) -\version "2.2.0" +\version "2.3.4" -one = \notes\relative c{ +one = \relative c{ c'' d e f } -two = \notes\relative c{ +two = \relative c{ \clef "bass" c'2 g2 } diff --git a/input/les-nereides.ly b/input/les-nereides.ly index 07d264fd2c..d8ee23019e 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.3.2" +\version "2.3.4" \encoding "latin1" \header { composer = "ARTHUR GRAY" @@ -32,7 +32,7 @@ possibly more impressive to render without tweaks? (lambda (elt) (equal? text (ly:get-grob-property elt 'text)))) -treble = \new Voice \notes\relative c''{ +treble = \new Voice \relative c''{ \key a \major r2 | %2 @@ -97,7 +97,7 @@ treble = \new Voice \notes\relative c''{ \bar "||" } -trebleTwo = \new Voice \notes\relative c''{ +trebleTwo = \new Voice \relative c''{ \stemDown \slurDown % \fingerDown @@ -122,7 +122,7 @@ trebleTwo = \new Voice \notes\relative c''{ )] } -bass = \new Voice \notes\relative c{ +bass = \new Voice \relative c{ \partial 2 \key a \major @@ -223,7 +223,7 @@ bass = \new Voice \notes\relative c{ a)] } -bassTwo = \new Voice \notes\relative c{ +bassTwo = \new Voice \relative c{ \skip 2 \skip 1*2 \skip 2 @@ -234,7 +234,7 @@ bassTwo = \new Voice \notes\relative c{ cis'4( bis) } -middleDynamics = \notes{ +middleDynamics = { \override Dynamics.TextScript #'padding = #-1 %tweak s2 s1*2 diff --git a/input/mutopia-header.ly b/input/mutopia-header.ly index a680b952c9..43b9945db9 100644 --- a/input/mutopia-header.ly +++ b/input/mutopia-header.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { title = "Title" subtitle = "Subtitle" diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly index 2f993b2cb7..21865956cf 100644 --- a/input/puer-fragment.ly +++ b/input/puer-fragment.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { title = "Puer natus est nobis (excerptum)" subtitle = "Antiphona ad introitum VII" @@ -24,7 +24,7 @@ before the ligature (not demonstrated in this example)." %%% but this is intentional for editorial purposes (simplifies some %%% global search/replace operations in emacs). -cantus = \context VaticanaVoice = "cantus" \notes { +cantus = \context VaticanaVoice = "cantus" { \[ g4\melisma %%% Pu- \pes d'\melismaEnd diff --git a/input/regression/+.ly b/input/regression/+.ly index 801731a24b..6a085ac054 100644 --- a/input/regression/+.ly +++ b/input/regression/+.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" %% +.ly: Be the first .ly file for lys-to-tely.py. %% Better to make lys-to-tely.py include "introduction.texi" or %% other .texi documents too? diff --git a/input/regression/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly index e940f5a9b0..c98bd362b4 100644 --- a/input/regression/accidental-cautionary.ly +++ b/input/regression/accidental-cautionary.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Cautionary accidentals are indicated using either @@ -9,7 +9,7 @@ parentheses (default) or smaller accidentals. } \score { - \notes { + { c''4 cis''?4 \override Staff.Accidental #'cautionary-style = #'smaller diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly index 211d7801d5..97ad3068a0 100644 --- a/input/regression/accidental-double.ly +++ b/input/regression/accidental-double.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "If two forced accidentals happen at the same time, only one sharp sign is printed." } -\score { \notes \transpose c c' +\score { \transpose c c' \context Staff << \key g \major \context Voice=va { \stemUp c' fis! } diff --git a/input/regression/accidental-ledger.ly b/input/regression/accidental-ledger.ly index 8fd0f25009..5fe270b384 100644 --- a/input/regression/accidental-ledger.ly +++ b/input/regression/accidental-ledger.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -10,7 +10,7 @@ and only if the accidental is horizontally close to the head. " \score { - \notes + \relative c { disis dis diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly index ac86e81c6d..5101fc77a4 100644 --- a/input/regression/accidental-octave.ly +++ b/input/regression/accidental-octave.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc=" @@ -12,7 +12,7 @@ are also automatically printed but the octavation has been dropped out. -mel = \notes \transpose c c' { +mel = \transpose c c' { \time 4/4 \key d \major gis4 g' g gis' | gis2 g' | g1 | gis | g | gis' | g | fis4 f' f fis' | fis2 f' | f1 | fis | f | fis' | f | diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly index 5f92ee0501..4b3728c9b0 100644 --- a/input/regression/accidental-placement.ly +++ b/input/regression/accidental-placement.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -12,7 +12,7 @@ flats in a sixth should be staggered. " \score { - \notes \context Voice \relative c' + \context Voice \relative c' { cis4 c4 diff --git a/input/regression/accidental-quarter.ly b/input/regression/accidental-quarter.ly index 888cc09b6c..de1e842786 100644 --- a/input/regression/accidental-quarter.ly +++ b/input/regression/accidental-quarter.ly @@ -3,10 +3,10 @@ texidoc = "Quarter tone notation is supported, including threequarters flat." } -\version "2.2.0" +\version "2.3.4" \score { - \notes \relative c'' { + \relative c'' { \time 12/4 ceses4 ceseh diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly index 6f3d31deae..7fa9f88e2e 100644 --- a/input/regression/accidental-single-double.ly +++ b/input/regression/accidental-single-double.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" A sharp sign after a double sharp sign, as well as a flat sign @@ -10,7 +10,7 @@ natural sign. -thenotes = \notes \relative cis' { \time 4/4 +thenotes = \relative cis' { \time 4/4 gisis'4 gis gisis ges | } diff --git a/input/regression/accidental-tie.ly b/input/regression/accidental-tie.ly index e11a349add..2bd01ab660 100644 --- a/input/regression/accidental-tie.ly +++ b/input/regression/accidental-tie.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -9,7 +9,7 @@ } -mus = \notes \relative c' { +mus = \relative c' { f1~ f2~f4 % ~ f8 fis8 gis8 ~ @@ -18,7 +18,7 @@ mus = \notes \relative c' { } \score { - \notes << + << \new NoteNames \mus \new Voice { \key g \major \mus } >> diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly index 10b5b1a90a..fd65e18a3d 100644 --- a/input/regression/accidental-unbroken-tie-spacing.ly +++ b/input/regression/accidental-unbroken-tie-spacing.ly @@ -4,9 +4,9 @@ texidoc = "Tied accidentaled notes (which cause reminder accidentals) do not wreak havoc in the spacing when unbroken." } -\version "2.2.0" +\version "2.3.4" -rechts = \notes \relative c' { +rechts = \relative c' { \clef treble \time 3/4 c8 b2 8 ~ | diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly index 996e7a7127..24afacd265 100644 --- a/input/regression/accidental-voice.ly +++ b/input/regression/accidental-voice.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -11,18 +11,18 @@ The last f gets cautionary natural because fis was only in the other voice. -voicea = \notes \transpose c c' { +voicea = \transpose c c' { \stemUp fis2 a2 f4 fis a2 } -voiceb = \notes \transpose c c' { +voiceb = \transpose c c' { \stemDown c2 fis2 f4 c f2 } \score { << - \notes + \new NoteNames { \set printOctaveNames = ##f \voicea diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly index b81b46ab30..8ab848e632 100644 --- a/input/regression/accidental.ly +++ b/input/regression/accidental.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -8,7 +8,7 @@ fourth show forced and courtesy accidentals. " } -foo = \notes\relative c'' { \key as \major dis4 dis dis!^"force" dis? } +foo = \relative c'' { \key as \major dis4 dis dis!^"force" dis? } \score { << \foo diff --git a/input/regression/accidentals.ly b/input/regression/accidentals.ly index e3d980b60b..8136dde6dd 100644 --- a/input/regression/accidentals.ly +++ b/input/regression/accidentals.ly @@ -1,16 +1,16 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" This shows how accidentals are handled. " } -mel = \notes { \key d \major \time 4/4 +mel = { \key d \major \time 4/4 d4 dis dis8 dis, d4 | d dis disis8 d, dis4 | d des disis8 dis, d4 | dis deses d dis ~ | dis dis ~ dis8 d, dis4 ~ | \break dis dis cis c | c cis cisis cis | c ces cisis c | cis ceses c cis ~ | cis cis ~ cis cis \bar "|." | \break } -\score { \notes +\score { << \context Staff \transpose c c'' \mel \context NoteNames{ diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly index 835df220c1..f0f56d73c8 100644 --- a/input/regression/ambitus.ly +++ b/input/regression/ambitus.ly @@ -52,9 +52,9 @@ paper block: %} -\version "2.3.2" +\version "2.3.4" -upper = \notes \relative c { +upper = \relative c { \clef "treble" \key c \minor as'' c e bes f cis d e f g f e d f d e @@ -62,7 +62,7 @@ upper = \notes \relative c { f d e e d f d e e d f d e e d f d e } -lower = \notes \relative c { +lower = \relative c { \clef "treble" \key e \major e'2 b4 g a c es fis a cis b a g f e d diff --git a/input/regression/apply-context.ly b/input/regression/apply-context.ly index 9bca0035a8..7b838a5f1d 100644 --- a/input/regression/apply-context.ly +++ b/input/regression/apply-context.ly @@ -1,5 +1,5 @@ -\version "2.3.1" +\version "2.3.4" \header { @@ -17,7 +17,7 @@ This example prints a bar-number during processing on stdout. \paper { raggedright= ##t } -\score { \notes \relative c'' { +\score { \relative c'' { c1 c1 %% todo: should put something interesting in the .tex output. diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly index 853eb29cef..ade644945d 100644 --- a/input/regression/apply-output.ly +++ b/input/regression/apply-output.ly @@ -1,5 +1,5 @@ -\version "2.3.1" +\version "2.3.4" \header { texidoc = "The @code{\applyoutput} expression is the most flexible way to @@ -35,7 +35,7 @@ position. \score { -\notes \context Voice \relative c' { + \context Voice \relative c' { \stemUp \set autoBeaming = ##f { 8 diff --git a/input/regression/arpeggio-bracket.ly b/input/regression/arpeggio-bracket.ly index 88f98b8ec8..d5070c5fdb 100644 --- a/input/regression/arpeggio-bracket.ly +++ b/input/regression/arpeggio-bracket.ly @@ -1,6 +1,6 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" A square bracket on the left indicates that the player should not @@ -9,7 +9,7 @@ arpeggiate the chord. } \score{ - \notes\relative c''{ + \relative c''{ \arpeggioBracket \arpeggio diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly index 2976beb350..b24a423e00 100644 --- a/input/regression/arpeggio-collision.ly +++ b/input/regression/arpeggio-collision.ly @@ -1,11 +1,11 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "Arpeggio stays clear of accidentals and flipped note heads." } \score{ - \notes \transpose c c' { + \transpose c c' { \arpeggio \arpeggio \arpeggio diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly index 933d961569..3179372359 100644 --- a/input/regression/arpeggio.ly +++ b/input/regression/arpeggio.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" Arpeggios are supported, both cross-staff and broken single staff. @@ -9,7 +9,7 @@ Arpeggios are supported, both cross-staff and broken single staff. \score{ - \context PianoStaff\notes << + \context PianoStaff << \new Staff \relative c''{ \arpeggio \override Staff.Arpeggio #'arpeggio-direction = #1 diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly index d873cdb466..f7de9c2726 100644 --- a/input/regression/auto-beam-bar.ly +++ b/input/regression/auto-beam-bar.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="No auto beams will be put over (manual) repeat bars." } \score { - \notes { + { \time 3/4 a'4 b' c''8 \bar ":|:" d''8 } diff --git a/input/regression/auto-beam-no-beam.ly b/input/regression/auto-beam-no-beam.ly index 5d19f31221..96c4c89a09 100644 --- a/input/regression/auto-beam-no-beam.ly +++ b/input/regression/auto-beam-no-beam.ly @@ -5,8 +5,8 @@ } -\version "2.2.0" +\version "2.3.4" \score { - \notes { c8 c-\noBeam c c } + { c8 c-\noBeam c c } } diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly index 2c50be3851..26f548cc48 100644 --- a/input/regression/auto-beam-triplet.ly +++ b/input/regression/auto-beam-triplet.ly @@ -4,10 +4,10 @@ texidoc = "Automatic beaming is also done on tuplets." } -\version "2.2.0" +\version "2.3.4" \score{ - \notes\relative c''{ + \relative c''{ c8 c c c \times 4/6 { c c c c c c} } diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly index 0517559374..6d8c392d47 100644 --- a/input/regression/auto-beam-tuplets.ly +++ b/input/regression/auto-beam-tuplets.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Tuplet-spanner should not put (visible) brackets on beams even if they're auto generated." } -\score { \notes \relative c' { +\score { \relative c' { \set tupletSpannerDuration = #(ly:make-moment 1 4) \override TupletBracket #'bracket-visibility = #'if-no-beam \times 2/3 { diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly index 396ab34772..e5e61b0ea6 100644 --- a/input/regression/auto-beam.ly +++ b/input/regression/auto-beam.ly @@ -6,14 +6,14 @@ beam." } -\version "2.3.2" +\version "2.3.4" \paper { raggedright = ##t } \score { - \notes \relative c'' { + \relative c'' { a\longa a\breve a1 a2 a4 a8 a16 a32 a64 a64 } diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly index 61a6554734..50baa2f03a 100644 --- a/input/regression/auto-change.ly +++ b/input/regression/auto-change.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -12,7 +12,7 @@ note. When central C is reached, staff is not yet switched (by default). \paper { raggedright= ##t } \score { - \notes \context PianoStaff << + \context PianoStaff << \context Staff = "up" { \autochange \context Voice = VA << \relative c' { g4 c e d c r4 a g } >> } diff --git a/input/regression/balloon.ly b/input/regression/balloon.ly index 63fa72a1a8..4c16136215 100644 --- a/input/regression/balloon.ly +++ b/input/regression/balloon.ly @@ -3,10 +3,10 @@ texidoc = "With balloon texts, objects in the output can be marked, with lines and explanatory text added." } -\version "2.3.1" +\version "2.3.4" \score { - \notes { + { \relative c' { diff --git a/input/regression/bar-check-redefine.ly b/input/regression/bar-check-redefine.ly index a2e65f0b09..24860d30d3 100644 --- a/input/regression/bar-check-redefine.ly +++ b/input/regression/bar-check-redefine.ly @@ -1,4 +1,4 @@ -\version "2.3.0" +\version "2.3.4" \header { texidoc = "The meaning of @code{|} is stored in the identifier @code{pipeSymbol}." @@ -7,6 +7,6 @@ identifier @code{pipeSymbol}." pipeSymbol = \bar "||" \score { - \notes { c'2 | c'2 | } + { c'2 | c'2 | } } diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly index 272d640aa2..aea7fae835 100644 --- a/input/regression/bar-number.ly +++ b/input/regression/bar-number.ly @@ -1,5 +1,5 @@ -\version "2.3.2" +\version "2.3.4" \header { @@ -13,7 +13,7 @@ be increased. } \score { - \notes \relative c'' { + \relative c'' { \partial 4 c4 c1 c c \set Score.currentBarNumber = #99999 diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly index dc76a86278..f4503aad37 100644 --- a/input/regression/bar-scripts.ly +++ b/input/regression/bar-scripts.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -8,13 +8,13 @@ Markings can be attached to (invisible) barlines. \paper { raggedright = ##t } -onestaff = \new Staff\notes\relative c'' { +onestaff = \new Staff\relative c'' { \set Staff.instr = instr \set Staff.instrument = instrument \mark "B" c1 \mark "A" \break c2 c2 \break } -grstaff = \notes \relative c'' +grstaff = \relative c'' \context GrandStaff << \new Staff { diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly index 8b69c9e799..c85205e609 100644 --- a/input/regression/beam-auto-knee.ly +++ b/input/regression/beam-auto-knee.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="A knee is made automatically when a horizontal beam fits in a gap between note heads that is larger than a predefined @@ -8,7 +8,7 @@ threshold. } \score { - \context Staff \notes\relative c''{ + \context Staff \relative c''{ c'8[ c,,] c8[ e'] c,16[ e g c e g c c,,] } diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly index 91f552a983..97a4165837 100644 --- a/input/regression/beam-break.ly +++ b/input/regression/beam-break.ly @@ -4,10 +4,10 @@ " } -\version "2.2.0" +\version "2.3.4" \paper { raggedright= ##t } -\score { \notes \relative c'' { +\score { \relative c'' { \set Score.allowBeamBreak = ##t \time 3/16 c16-[ d e \break f-] }} diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly index 9515d68e70..f5850b24b4 100644 --- a/input/regression/beam-center-slope.ly +++ b/input/regression/beam-center-slope.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="Simple beams on middle staffline are allowed to be @@ -9,7 +9,7 @@ } \score{ - \notes\relative c'{ + \relative c'{ %%\override Staff.Stem #'beamed-lengths = #'(3.50) %% c8[ d] %% d[ c] diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly index 936a9f6cf0..b7c607b40b 100644 --- a/input/regression/beam-concave.ly +++ b/input/regression/beam-concave.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc = "Concave beams should be horizontal. Informally spoken, @@ -23,7 +23,7 @@ beams this way." \score{ - \notes\relative c'{ + \relative c'{ %% This case seems easy: second beam should be horizontal. diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly index 5024f23fd0..c05e7598a3 100644 --- a/input/regression/beam-cross-staff-auto-knee.ly +++ b/input/regression/beam-cross-staff-auto-knee.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ @@ -9,8 +9,8 @@ produced with explicit staff switches)." } \score { - \notes \context PianoStaff << - \context Staff = "up" \notes\relative c''{ + \context PianoStaff << + \context Staff = "up" \relative c''{ b8[ \change Staff="down" d,, ] c[ \change Staff="up" c'' ] b,[ \change Staff="down" d^"no knee" ] diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly index a0ec281b84..fff4b861f6 100644 --- a/input/regression/beam-cross-staff-slope.ly +++ b/input/regression/beam-cross-staff-slope.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Cross staff (kneed) beams do not cause extreme slopes." } \score { - \notes\context PianoStaff << + \context PianoStaff << \context Staff = up \relative c'' << { diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly index 845929e883..9e639dbc66 100644 --- a/input/regression/beam-cross-staff.ly +++ b/input/regression/beam-cross-staff.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" Beams can be typeset over fixed distance aligned staves, beam @@ -9,7 +9,7 @@ behave well, wherever the switching point is. } \score{ \context PianoStaff << - \context Staff=one \notes\relative c'{ + \context Staff=one \relative c'{ \stemUp c8[ c \change Staff=two \stemUp c c] c[ c c c] \change Staff=one @@ -21,7 +21,7 @@ behave well, wherever the switching point is. \stemUp c8[ c \change Staff=one \stemDown c c] r2 } - \context Staff=two \notes\relative c'{ + \context Staff=two \relative c'{ \clef bass s1 s1 diff --git a/input/regression/beam-damp.ly b/input/regression/beam-damp.ly index b4c634ea92..07976170ac 100644 --- a/input/regression/beam-damp.ly +++ b/input/regression/beam-damp.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Beam Damp Beams are less steep than the notes they encompass. " } \score{ - \notes\relative c''{ + \relative c''{ % \stemUp % a16[ b b c] % c[ b b a] diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly index 7687581471..152f97ca86 100644 --- a/input/regression/beam-default-lengths.ly +++ b/input/regression/beam-default-lengths.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="Beamed stems have standard lengths if possible. Quantization is switched off in this example." } \score{ - \notes\relative c'{ + \relative c'{ \override Beam #'position-callbacks = #`(,Beam::least_squares ,Beam::check_concave diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index 5dee280f00..69717918a9 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" Beams should behave reasonably well, even under extreme circumstances. @@ -9,7 +9,7 @@ under normal circumstances, these beams would get knees here " } -extreme = \notes\relative c'' { +extreme = \relative c'' { \stemBoth g8[ c c,] c16[ c'' a f] diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly index ae8b496764..b0df3b694b 100644 --- a/input/regression/beam-french.ly +++ b/input/regression/beam-french.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -7,7 +7,7 @@ } -\score { \notes +\score { \relative c' { \override Stem #'french-beaming = ##t diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly index f505ac3588..f2a983626a 100644 --- a/input/regression/beam-funky-beamlet.ly +++ b/input/regression/beam-funky-beamlet.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc=" Funky kneed beams with beamlets also work. The beamlets @@ -10,7 +10,7 @@ should be pointing to the note head. \score { - \notes\relative c' { + \relative c' { c16 c''8 c,,16 c16 c''8 c16 c16 c,,8 c16 diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly index 0c0784face..06e7e2fa29 100644 --- a/input/regression/beam-funky.ly +++ b/input/regression/beam-funky.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "In complex configurations of knee beaming, according to @@ -9,7 +9,7 @@ beam. This is in disagreement with the current algorithm." } -\score { \notes +\score { \relative c' { \override Beam #'auto-knee-gap = #7 diff --git a/input/regression/beam-knee-symmetry.ly b/input/regression/beam-knee-symmetry.ly index aa2f0240e7..01330e6695 100644 --- a/input/regression/beam-knee-symmetry.ly +++ b/input/regression/beam-knee-symmetry.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Point-symmetric beams should receive the same @@ -8,7 +8,7 @@ } \score{ - \notes\relative c'{ + \relative c'{ a8[ b'' a,, b''] b8[ a,, b'' a,,] } diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly index ee98597ff4..83fc0c0060 100644 --- a/input/regression/beam-length.ly +++ b/input/regression/beam-length.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -10,7 +10,7 @@ Beams should look the same. \score { - \context Voice \notes\relative c { + \context Voice \relative c { d''8[ d d] d[ g d] c c } diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly index ac5e24537b..4ddc0ce48c 100644 --- a/input/regression/beam-manual-beaming.ly +++ b/input/regression/beam-manual-beaming.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -7,7 +7,7 @@ "Beaming can be overidden for individual stems." } \score { - \notes \relative c'' { + \relative c'' { c32[ c %% WARNING: #'beaming is written, so this diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly index e6537462a5..ecc6b0d709 100644 --- a/input/regression/beam-multiple-cross-staff.ly +++ b/input/regression/beam-multiple-cross-staff.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Kneed beams (often happens with cross-staff beams) @@ -8,7 +8,7 @@ to the last beam. " } -\score { \notes +\score { \context PianoStaff \relative c' << \context Staff = SA { \stemDown diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly index 6be0ca34aa..3c27b0eb53 100644 --- a/input/regression/beam-over-barline.ly +++ b/input/regression/beam-over-barline.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Explicit beams may cross barlines. " } \score { -\notes \relative c'' { c2. c8[ c8 c8 c8] } + \relative c'' { c2. c8[ c8 c8 c8] } \paper { raggedright= ##t } diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly index 5eb888c0d8..60bf2897c8 100644 --- a/input/regression/beam-position.ly +++ b/input/regression/beam-position.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" Beams on ledgered notes should always reach the middle staff @@ -11,7 +11,7 @@ note beams. Override with @code{no-stem-extend}. " \score { - \context Voice \notes\relative c { + \context Voice \relative c { f8[ f] f64[ f] \grace { f8[ e8] diff --git a/input/regression/beam-postfix-notation.ly b/input/regression/beam-postfix-notation.ly index 3ba37df17e..5ecbc3435e 100644 --- a/input/regression/beam-postfix-notation.ly +++ b/input/regression/beam-postfix-notation.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Beams and ties may be entered in postfix notation, separating the @@ -11,7 +11,7 @@ texidoc = "Beams and ties may be entered in postfix notation, separating the \score { - \notes\relative c'' + \relative c'' { c8[~ c] } diff --git a/input/regression/beam-quanting-32nd.ly b/input/regression/beam-quanting-32nd.ly index 5fa18b429f..f3f67732c4 100644 --- a/input/regression/beam-quanting-32nd.ly +++ b/input/regression/beam-quanting-32nd.ly @@ -8,10 +8,10 @@ texidoc = "Stem lengths take precedence over beam quants: `forbidden' } -\version "2.2.0" +\version "2.3.4" \score { - \notes \relative c''{ + \relative c''{ \time 3/8 a'16[ b] g[ b] a32[ b] g[ b] diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly index 75d53c2620..d1519b10b0 100644 --- a/input/regression/beam-quanting-horizontal.ly +++ b/input/regression/beam-quanting-horizontal.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ @@ -10,7 +10,7 @@ lengths are between 2 and 1.5." } \score{ - \notes\relative c' { + \relative c' { c8[ c] a''[ a] a,[ a] c[ c] d,8[ d] g'[ g] diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly index d8131b86b9..d5f894bc29 100644 --- a/input/regression/beam-quarter.ly +++ b/input/regression/beam-quarter.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc= "Quarter notes may be beamed: the beam is halted momentarily." } -\score {\notes \relative c'' { +\score { \relative c'' { c8[ c4 c8] % should warn here! } \paper { raggedright = ##t} diff --git a/input/regression/beam-rest.ly b/input/regression/beam-rest.ly index 024abddb08..735fd5d77b 100644 --- a/input/regression/beam-rest.ly +++ b/input/regression/beam-rest.ly @@ -3,9 +3,9 @@ texidoc = "The number of beams does not change on a rest." } -\version "2.2.0" +\version "2.3.4" -\score { \notes \relative c, { +\score { \relative c, { \clef bass e8[ r16 f d'8 e16 e16] c8[ c16 r16 bes8 r16 c16] | } diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly index 1da9d9c64a..822fe15b56 100644 --- a/input/regression/beam-second.ly +++ b/input/regression/beam-second.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" Engraving second intervals is tricky. We used to have problems with seconds @@ -8,7 +8,7 @@ seconds, you'll spot something fishy very quickly. " } \score{ - \notes\relative c''{ + \relative c''{ \stemUp b8[ c] b16[ c] diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly index 5716c38eec..eadac0e389 100644 --- a/input/regression/beam-shortened-lengths.ly +++ b/input/regression/beam-shortened-lengths.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="Beams in unnatural direction, have shortened stems, but do not look too short." } \score{ - \notes\relative c'{ + \relative c'{ \override Beam #'position-callbacks = #`(,Beam::least_squares ,Beam::check_concave diff --git a/input/regression/beamed-chord.ly b/input/regression/beamed-chord.ly index 34c4afdfaa..a98e54d5bd 100644 --- a/input/regression/beamed-chord.ly +++ b/input/regression/beamed-chord.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc = "Hairy case for beam, chord, and automatic knees." @@ -12,7 +12,7 @@ texidoc = "Hairy case for beam, chord, and automatic knees." \score{ - \notes\relative c'{ + \relative c'{ %\stemUp \clef alto \time 3/4 diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly index fe1bb535cc..4561952d11 100644 --- a/input/regression/beaming-ternary-metrum.ly +++ b/input/regression/beaming-ternary-metrum.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Automatic beaming works also in ternary time sigs." } \score { - \notes \relative c'' { + \relative c'' { \time 6/8 c8.[ c16 c16 c16] } diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly index bafb081cc6..4551ba2189 100644 --- a/input/regression/beaming.ly +++ b/input/regression/beaming.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -9,7 +9,7 @@ hidden just as with breakable bar lines. " } -\score { \context Staff \notes \relative c'' { +\score { \context Staff \relative c'' { c8.[ c16] c8.[ c16 c8. c16] c16[ c8.] | diff --git a/input/regression/beams.ly b/input/regression/beams.ly index a4df9cd8a0..675ca37520 100644 --- a/input/regression/beams.ly +++ b/input/regression/beams.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Beaming can be also given explicitly." } \paper { raggedright= ##t } -\score { \notes +\score { \relative c' { c16[ c8.] diff --git a/input/regression/break.ly b/input/regression/break.ly index 4107e26789..7e7c1c7d23 100644 --- a/input/regression/break.ly +++ b/input/regression/break.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -9,7 +9,7 @@ Breaks can be encouraged and discouraged using @code{\\break} and \score{ - \notes\relative c'' \context Voice{ + \relative c'' \context Voice{ \emptyText c1 \noBreak c1 \noBreak \mark "nobreak" c1 \noBreak c1 \break \mark "break" c1 \break \mark "break" c1 diff --git a/input/regression/breathing-sign-ancient.ly b/input/regression/breathing-sign-ancient.ly index 4975590aa2..b47b386289 100644 --- a/input/regression/breathing-sign-ancient.ly +++ b/input/regression/breathing-sign-ancient.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -17,7 +17,7 @@ finalis, the latter three looking similar to bar glyphs. % Gregorian notation: % \context VaticanaStaff { - \notes \relative c' { + \relative c' { % we turn bars and bar numbers off for Gregorian stuff \override Staff.BarLine #'transparent = ##t diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly index b0de04de7f..5ed19747cb 100644 --- a/input/regression/breathing-sign.ly +++ b/input/regression/breathing-sign.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" Breathing signs are available in different tastes: commas (default), @@ -14,7 +14,7 @@ ticks, vees and `railroad tracks' (caesura)." % Modern notation: % \new Staff { - \notes \relative c'' { + \relative c'' { \key es \major \time 3/4 % this bar contains no \breathe diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly index e99a4787a8..33117b4347 100644 --- a/input/regression/chord-changes.ly +++ b/input/regression/chord-changes.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="Property chordChanges: display chord names only when @@ -17,7 +17,7 @@ settings = { } \score { - \notes << + << \context ChordNames << \scheme \settings >> \context Staff \transpose c c' \scheme >> diff --git a/input/regression/chord-name-entry-11.ly b/input/regression/chord-name-entry-11.ly index cd7d4eb2db..a2f4903e8d 100644 --- a/input/regression/chord-name-entry-11.ly +++ b/input/regression/chord-name-entry-11.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { diff --git a/input/regression/chord-name-entry.ly b/input/regression/chord-name-entry.ly index 44dc003602..efae9f0edc 100644 --- a/input/regression/chord-name-entry.ly +++ b/input/regression/chord-name-entry.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -12,7 +12,7 @@ the suffixes are printed below pitches. \score { -\notes { \context Voice \chords { + { \context Voice \chords { c1_"(nothing)" c:7_":7" c:m_":m" diff --git a/input/regression/chord-name-exceptions.ly b/input/regression/chord-name-exceptions.ly index 3dd8824fb4..d0d9ac6d39 100644 --- a/input/regression/chord-name-exceptions.ly +++ b/input/regression/chord-name-exceptions.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "The property @code{chordNameExceptions} can used to store a list of special notations for specific chords. Putting the exceptions list encoded as @example - \\notes @{ 1\\markup @{ \\super \"7\" \"wahh\" @} @} + \ @{ 1\\markup @{ \\super \"7\" \"wahh\" @} @} @end example into @code{chordNameExceptions} takes a little manoeuvring. The following code transforms @code{chExceptionMusic} (which is a @@ -23,7 +23,7 @@ adds the new exceptions to the default ones, which are defined in % 7sus4 denoted with ^7 wahh -chExceptionMusic = \notes { +chExceptionMusic = { 1-\markup { \super "7" "wahh" }} % add to existing exceptions. diff --git a/input/regression/chord-name-major7.ly b/input/regression/chord-name-major7.ly index 683a95a9ac..93fdaf8fcc 100644 --- a/input/regression/chord-name-major7.ly +++ b/input/regression/chord-name-major7.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "The layout of the major 7 can be tuned with @code{majorSevenSymbol}." diff --git a/input/regression/chord-names-bass.ly b/input/regression/chord-names-bass.ly index aaecb58a41..27e37ac15f 100644 --- a/input/regression/chord-names-bass.ly +++ b/input/regression/chord-names-bass.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly index 922e593062..ba2ea192f9 100644 --- a/input/regression/chord-scripts.ly +++ b/input/regression/chord-scripts.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Scripts can also be attached to chord elements." @@ -7,7 +7,7 @@ texidoc = "Scripts can also be attached to chord elements." } \score { - \notes \relative c''{ + \relative c''{ < c-. > 4 < c-> > 4 < c-. e-. g-. b-. > diff --git a/input/regression/chord-tremolo-short.ly b/input/regression/chord-tremolo-short.ly index cb4ef1a438..e6d823c992 100644 --- a/input/regression/chord-tremolo-short.ly +++ b/input/regression/chord-tremolo-short.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = " Tremolo repeats can be constructed for short tremolos (total duration smaller than 1/4) too. Only some of the beams are connected to the stems. @@ -6,7 +6,7 @@ } \score { - \context Staff \notes \relative c' { + \context Staff \relative c' { \repeat "tremolo" 2 { c32 e32 } \stemDown \repeat "tremolo" 2 { c32 e32 } diff --git a/input/regression/chord-tremolo.ly b/input/regression/chord-tremolo.ly index e4d855a0d4..fb135a845c 100644 --- a/input/regression/chord-tremolo.ly +++ b/input/regression/chord-tremolo.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -17,7 +17,7 @@ notes as well.) } \score { - \context Voice \notes\relative c' { + \context Voice \relative c' { \time 4/4 \repeat "tremolo" 16 { d32 e } \repeat "tremolo" 8 { d16 e } diff --git a/input/regression/chords-funky-ignatzek.ly b/input/regression/chords-funky-ignatzek.ly index 84eaac398b..55062c45eb 100644 --- a/input/regression/chords-funky-ignatzek.ly +++ b/input/regression/chords-funky-ignatzek.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Jazz chords may have unusual combinations." } -chs = \notes +chs = { 1 1 @@ -25,6 +25,6 @@ chs = \notes % #(set-chord-name-style 'ignatzek) \chs } - \context Staff \notes \transpose c c' { \chs } + \context Staff \transpose c c' { \chs } >> } diff --git a/input/regression/clef-oct.ly b/input/regression/clef-oct.ly index 36d1c8ae72..f2e409cc56 100644 --- a/input/regression/clef-oct.ly +++ b/input/regression/clef-oct.ly @@ -1,5 +1,5 @@ -\version "2.2.0" \header { +\version "2.3.4" \header { texidoc = "Octavation signs may be added to clefs. These octavation signs may be placed below or above (meaning an octave @@ -7,7 +7,7 @@ higher or lower), and can take any value, including 15 for two octaves." } -\score { \notes +\score { \relative c'' { diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly index 12520dc1f8..0580f35df4 100644 --- a/input/regression/clefs.ly +++ b/input/regression/clefs.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ @@ -11,7 +11,7 @@ or below the clef respectively." \score { - \notes{ + { \clef "treble" c'1^"{treble}" \bar "||" \clef "french"c'1^"{french}" \bar "||" diff --git a/input/regression/cluster-cross-staff.ly b/input/regression/cluster-cross-staff.ly index ba52e278ae..067b3a0fc6 100644 --- a/input/regression/cluster-cross-staff.ly +++ b/input/regression/cluster-cross-staff.ly @@ -4,10 +4,10 @@ } -\version "2.3.1" +\version "2.3.4" \score { -\notes \new PianoStaff << + \new PianoStaff << \context Staff = up { s1 *2 } diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly index aa16d05396..c0e27b9ff9 100644 --- a/input/regression/cluster.ly +++ b/input/regression/cluster.ly @@ -1,17 +1,17 @@ -\version "2.3.1" +\version "2.3.4" \header { texidoc = "Clusters are a device to denote that a complete range of notes is to be played." } -fragment =\notes \relative c' { +fragment = \relative c' { c4 f4 4 8 a4 c2 4 e4 c4 } \score { - \notes << + << \new Staff \fragment \new Staff \applymusic #notes-to-clusters \fragment >> diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly index 9d6d10dd80..76bd97da8b 100644 --- a/input/regression/collision-2.ly +++ b/input/regression/collision-2.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Single head notes may collide. " } @@ -6,9 +6,9 @@ texidoc = "Single head notes may collide. " \score { - \notes + - \context Staff \notes \transpose c c' << + \context Staff \transpose c c' << { c4 d e f g2 g4 a | } \\ { g4 f e g g2 g2 } >> diff --git a/input/regression/collision-dots-invert.ly b/input/regression/collision-dots-invert.ly index c631c2bd7d..6b964bc14e 100644 --- a/input/regression/collision-dots-invert.ly +++ b/input/regression/collision-dots-invert.ly @@ -4,9 +4,9 @@ dots: notes with dots should go to the right, if there could be confusion to which notes the dots belong." } -\version "2.2.0" +\version "2.3.4" \score { - \notes \relative c'' { + \relative c'' { << 2\\ { 4 4 } >> << { 2 } \\ { 4. 8 } >> } diff --git a/input/regression/collision-dots-move.ly b/input/regression/collision-dots-move.ly index 64cca530b6..4a6719ffac 100644 --- a/input/regression/collision-dots-move.ly +++ b/input/regression/collision-dots-move.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "If collision resolution finds dotted note head must @@ -9,7 +9,7 @@ \paper { raggedright = ##t } \score { - \notes \relative c { + \relative c { \key d \minor \clef bass << 4 \\ { g'8. bes16} >> diff --git a/input/regression/collision-dots.ly b/input/regression/collision-dots.ly index 3e5b702fe6..9e8183d799 100644 --- a/input/regression/collision-dots.ly +++ b/input/regression/collision-dots.ly @@ -5,12 +5,12 @@ on the right side." } -\version "2.2.0" +\version "2.3.4" \paper { raggedright= ##t } % todo: b2 (up) + b8 down looks strange compared to c2up + b8. (down) \score{ - \context Staff \notes << + \context Staff << \clef "bass" { b8. c'16 d'4 b8 c'8 d'4 b2 b2 } \\ diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly index 3da9f8509e..e5b7b99ecc 100644 --- a/input/regression/collision-head-chords.ly +++ b/input/regression/collision-head-chords.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Note heads in collisions should be merged if they have the same positions in the extreme note heads. @@ -8,7 +8,7 @@ they have the same positions in the extreme note heads. \score { -\notes \relative c'' { + \relative c'' { c4 << { c4 d4 8 } \\ { c4 c 8 8 } >> } diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly index f3a17595db..870213c4a1 100644 --- a/input/regression/collision-heads.ly +++ b/input/regression/collision-heads.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = @@ -13,7 +13,7 @@ if the black note heads are from 8th or shorter notes. \score { - \context Staff \notes \relative c'' << + \context Staff \relative c'' << { c2 c8 c4. diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly index 227fd8c446..ee87191d76 100644 --- a/input/regression/collision-merge-differently-dotted.ly +++ b/input/regression/collision-merge-differently-dotted.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "If NoteCollision has merge-differently-dotted = ##t note @@ -10,7 +10,7 @@ should not disappear when merging similar note heads." \paper { raggedright= ##t } \score { - \context Staff \notes\relative c'' << + \context Staff \relative c'' << { g8[ g8] \override Staff.NoteCollision #'merge-differently-dotted = ##t diff --git a/input/regression/collision-merge-dots.ly b/input/regression/collision-merge-dots.ly index 23937dc753..a19bd5174d 100644 --- a/input/regression/collision-merge-dots.ly +++ b/input/regression/collision-merge-dots.ly @@ -2,10 +2,10 @@ texidoc = "When merging heads, the dots are merged too." } -\version "2.2.0" +\version "2.3.4" \score { -\notes { + { \relative c'' \new Staff { << { d8. e16 } \\ { d8. b16 } >> } diff --git a/input/regression/collision-mesh.ly b/input/regression/collision-mesh.ly index 2aba54b356..1518ebfafe 100644 --- a/input/regression/collision-mesh.ly +++ b/input/regression/collision-mesh.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Oppositely stemmed chords, meshing into each other, are resolved." @@ -8,7 +8,7 @@ are resolved." \score { - \context Staff \notes \transpose c c' { + \context Staff \transpose c c' { \time 3/4 % Here's what I was trying to do: << { diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly index 50e11d37b9..4be0dae1a0 100644 --- a/input/regression/collisions.ly +++ b/input/regression/collisions.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" In addition to normal collision rules, there is support for polyphony, @@ -12,12 +12,12 @@ copyright = "public domain" twovoice = -\notes \relative c' \context Staff \notes << + \relative c' \context Staff << { g4 f f e e d d c } \\ { c4 c d d e e f f } >> -twovoicechords = \context Staff \notes << +twovoicechords = \context Staff << \relative c' { e4 d c b a g f }\\ @@ -28,13 +28,13 @@ twovoicechords = \context Staff \notes << >> -threevoice = \context Staff \notes << +threevoice = \context Staff << { g4 f e f g a g2 } \\ { c4 d e d c d es } \\ { e4 e e e e e e e } >> -hairyChord = \context Staff \notes \relative c'' +hairyChord = \context Staff \relative c'' << e \\ fis, \\ cis' \\ @@ -44,7 +44,7 @@ hairyChord = \context Staff \notes \relative c'' \score{ - \notes { \transpose c c' { + { \transpose c c' { \twovoice \twovoicechords \threevoice } diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly index 3218502659..a5771122fd 100644 --- a/input/regression/completion-heads-polyphony.ly +++ b/input/regression/completion-heads-polyphony.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "Completion heads are broken across bar lines. This was @@ -9,7 +9,7 @@ Completion heads are not fooled by polyphony with a different rhythm. } \score{ - \context Staff \notes \relative c'' << + \context Staff \relative c'' << { c2. c bes2 } \\ { c2. a8 g4 f4. g4 f } >> diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly index c40d0a28d8..d1175b4290 100644 --- a/input/regression/completion-heads.ly +++ b/input/regression/completion-heads.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header{ texidoc=" @@ -13,7 +13,7 @@ If the @code{Note_heads_engraver} is replaced by the @code{Completion_heads_engr \score{ - \notes\relative c'{ + \relative c'{ \time 2/4 c2. c8 d4 e f g a b c2.. b8 a g16 f4 e d c8. c2 diff --git a/input/regression/custos.ly b/input/regression/custos.ly index bb2382d700..b83116b33e 100644 --- a/input/regression/custos.ly +++ b/input/regression/custos.ly @@ -1,10 +1,10 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "Custodes may be engraved in various styles." } \score { - \notes { + { \override Staff.Custos #'neutral-position = #4 \override Staff.Custos #'style = #'hufnagel diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly index bafb770e11..16511814e4 100644 --- a/input/regression/dot-flag-collision.ly +++ b/input/regression/dot-flag-collision.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Dots move to the right when a collision with the (up)flag happens." } \score { - \notes\relative c'' + \relative c'' { \time 8/4 \set Staff.autoBeaming = ##f diff --git a/input/regression/dots.ly b/input/regression/dots.ly index 42be683422..14345aba88 100644 --- a/input/regression/dots.ly +++ b/input/regression/dots.ly @@ -1,4 +1,4 @@ -\version "2.2.0" \header{ +\version "2.3.4" \header{ texidoc=" Noteheads can have dots, and rests too. @@ -23,7 +23,7 @@ The priorities to print the dots are (ranked in importance): \score { - \context Voice \notes\relative c'' { + \context Voice \relative c'' { \time 6/8 d4. g,, \stemDown diff --git a/input/regression/drums.ly b/input/regression/drums.ly index 5d04bca863..b7ff9ceaf0 100644 --- a/input/regression/drums.ly +++ b/input/regression/drums.ly @@ -7,7 +7,7 @@ } -\version "2.2.0" +\version "2.3.4" drh = \drums { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 } drl = \drums {\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 e9c7a26bf6..b23885f71c 100644 --- a/input/regression/dynamics-broken-hairpin.ly +++ b/input/regression/dynamics-broken-hairpin.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc = "Broken crescendi should be open on one side." } -\score { \notes \relative c'' { +\score { \relative c'' { c1 \< \break c1\! \> \break c1\! } \paper { diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly index a6c5eddc56..9f6069259d 100644 --- a/input/regression/dynamics-glyphs.ly +++ b/input/regression/dynamics-glyphs.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header {texidoc = "Dynamic letters are kerned, and their weight matches that of the hairpin signs. The dynamic scripts should be @@ -9,7 +9,7 @@ closer to the note head (staccato, accent) are reckoned with. \score { -\notes\relative c'' { c1\ff +\relative c'' { c1\ff e,-.-> \f e \rfz c' \mf diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly index b4c2f9f67e..43aed0155d 100644 --- a/input/regression/dynamics-line.ly +++ b/input/regression/dynamics-line.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" Dynamics appear below or above the staff. If multiple dynamics are linked with (de)crescendi, they should be on the same @@ -10,7 +10,7 @@ line. Isolated dynamics may be forced up or down. \score{ -\notes\relative c''{ +\relative c''{ a1^\sfz a1\fff\> c,,\!\pp a'' a\p diff --git a/input/regression/dynamics-unbound-hairpin.ly b/input/regression/dynamics-unbound-hairpin.ly index 5b6a92d89f..a953b878e1 100644 --- a/input/regression/dynamics-unbound-hairpin.ly +++ b/input/regression/dynamics-unbound-hairpin.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Crescendi may start off-notes, however, they should not collapse into flat lines." } -\score { \notes { \context Voice { +\score { { \context Voice { << f''1 { s4 s4 \< s4\! \> s4\! } >> }} diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly index bfe14905a5..e44136eca6 100644 --- a/input/regression/easy-notation.ly +++ b/input/regression/easy-notation.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = " Easy-notation (or Ez-notation) prints names in note heads. @@ -6,7 +6,7 @@ You also get ledger lines, of course." } \score { - \notes { + { \setEasyHeads c'2 g'2 | g'1 \override NoteHead #'note-names = ##("U" "V" "W" "X" "Y" "Z" "z") diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly index 27de09a203..4fc5afced0 100644 --- a/input/regression/figured-bass.ly +++ b/input/regression/figured-bass.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = " Figured bass is created by the FiguredBass context which eats @@ -11,7 +11,7 @@ last bass figure. " } -\score { \notes << +\score { << \context FiguredBass { \figures { <3 [5 7]> diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly index f2ba10a7df..d11c8d7299 100644 --- a/input/regression/finger-chords.ly +++ b/input/regression/finger-chords.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "With the new chord syntax, it is possible to associate @@ -11,7 +11,7 @@ easier to process." \score { - \notes \relative c'{ + \relative c'{ %% input order is not 1 2 3 , output is. 4 diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly index 39fc777e2b..33ea305f71 100644 --- a/input/regression/fingering.ly +++ b/input/regression/fingering.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Automatic fingering tries to put fingering instructions @@ -12,7 +12,7 @@ next to noteheads. \score { - \notes\relative c' { + \relative c' { c4-4 < c-1 e-2 g-3 b-4 > diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly index 336b416ad8..8ae62b150b 100644 --- a/input/regression/follow-voice-break.ly +++ b/input/regression/follow-voice-break.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc = " The line-spanners connects to the Y position of the note on the next line. @@ -12,7 +12,7 @@ printed. \score{ \context PianoStaff << \set PianoStaff.followVoice = ##t - \context Staff=one \notes\relative c''{ + \context Staff=one \relative c''{ a1 \break \change Staff=two a, diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly index 301be653ec..fa138eac77 100644 --- a/input/regression/font-magnification.ly +++ b/input/regression/font-magnification.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "The magnification can be set for any font. Note that this does not change variable symbols such as beams or slurs. " } \score { -\notes \relative c'' \context Voice { + \relative c'' \context Voice { \override NoteHead #'font-magnification = #0.9 c4 \override NoteHead #'font-magnification = #0.8 diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly index 91644304d7..1da5cad7a5 100644 --- a/input/regression/font-name.ly +++ b/input/regression/font-name.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -19,7 +19,7 @@ available through (La)TeX. %} \score { - \notes { + { \override Staff.TimeSignature #'font-name = #"cmr17" \set Score.skipBars = ##t diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly index 7a8bafbe8e..c5dc8a2dd6 100644 --- a/input/regression/generic-output-property.ly +++ b/input/regression/generic-output-property.ly @@ -1,5 +1,5 @@ -\version "2.3.1" +\version "2.3.4" \header{ texidoc=" @@ -9,7 +9,7 @@ setting the @code{extra-offset} of a grob. } \score{ - \notes\relative c''{ + \relative c''{ \context Bottom \applyoutput #(outputproperty-compatibility (make-type-checker 'note-head-interface) diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly index adf346789b..7c3d8b6a8b 100644 --- a/input/regression/glissando.ly +++ b/input/regression/glissando.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.3.2" +\version "2.3.4" \header{ @@ -13,7 +13,7 @@ The engraver does no time-keeping, so it involves some trickery to get } \score{ - \context Staff=one \notes\relative c''{ + \context Staff=one \relative c''{ % gliss non gliss and c4 \glissando d e \glissando f \glissando \break % consecutive diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly index 54ab64db6e..5688e674e1 100644 --- a/input/regression/grace-auto-beam.ly +++ b/input/regression/grace-auto-beam.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "The autobeamer is not confused by grace notes." } \score{ - \notes\context Voice \relative c''{ + \context Voice \relative c''{ \grace a8 g16 f e f \grace a8 g16 f e f \grace a8 g16 f e f \grace a8 g16 f e f | diff --git a/input/regression/grace-bar-line.ly b/input/regression/grace-bar-line.ly index 4a1d633809..9f17fd308d 100644 --- a/input/regression/grace-bar-line.ly +++ b/input/regression/grace-bar-line.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Bar line should come before the grace note." } @@ -8,7 +8,7 @@ texidoc = "Bar line should come before the grace note." -\score {\notes \relative c' \context Staff { +\score { \relative c' \context Staff { f1 \grace { a'16[ f] } g1 } \paper { raggedright = ##t} } diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly index d1943c08bc..44e208cc04 100644 --- a/input/regression/grace-bar-number.ly +++ b/input/regression/grace-bar-number.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Grace notes do tricky things with timing. If a measure @@ -10,7 +10,7 @@ printed correctly. " } -\score { \notes\relative c'' { c1 \break +\score { \relative c'' { c1 \break \grace c8 c1 } diff --git a/input/regression/grace-beam.ly b/input/regression/grace-beam.ly index 7863404341..77a2a08c85 100644 --- a/input/regression/grace-beam.ly +++ b/input/regression/grace-beam.ly @@ -9,6 +9,6 @@ Unbeamed grace notes are not put into normal beams. \paper { raggedright= ##t } -\version "2.2.0" -\score { \notes\relative c'' { c4 d8[ \grace { e32[ d c d] } e8] e[ e \grace { f16 } e8 e] }} +\version "2.3.4" +\score { \relative c'' { c4 d8[ \grace { e32[ d c d] } e8] e[ e \grace { f16 } e8 e] }} diff --git a/input/regression/grace-end.ly b/input/regression/grace-end.ly index bfd768efc4..d1243af87f 100644 --- a/input/regression/grace-end.ly +++ b/input/regression/grace-end.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc="@cindex Grace End @@ -9,7 +9,7 @@ } \score { - \context Voice \notes\relative c' { + \context Voice \relative c' { c4 \grace { d16[ d16] } diff --git a/input/regression/grace-nest.ly b/input/regression/grace-nest.ly index 4a5be6db9f..7d47102865 100644 --- a/input/regression/grace-nest.ly +++ b/input/regression/grace-nest.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." } \score { - \notes { + { c''2 { \grace b'16 c''2 } \bar "|." } \paper { diff --git a/input/regression/grace-nest1.ly b/input/regression/grace-nest1.ly index 19817c4b05..6632b61ef8 100644 --- a/input/regression/grace-nest1.ly +++ b/input/regression/grace-nest1.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." @@ -7,7 +7,7 @@ texidoc = "Grace code should not be confused by nested sequential musics, contai \score{ -\notes + { c''2 { \grace b'16 c''2 } \bar "|." } \paper { diff --git a/input/regression/grace-nest2.ly b/input/regression/grace-nest2.ly index d942d33d7e..b1a955de19 100644 --- a/input/regression/grace-nest2.ly +++ b/input/regression/grace-nest2.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." @@ -6,7 +6,7 @@ texidoc = "Grace code should not be confused by nested sequential musics, contai \paper { raggedright= ##t } -\score { \notes \context Voice { +\score { \context Voice { { \grace b'8 c''2 } \grace b'16 c''4 c''4 \bar "|." }} diff --git a/input/regression/grace-nest3.ly b/input/regression/grace-nest3.ly index 5abe644a3b..69998b2f1e 100644 --- a/input/regression/grace-nest3.ly +++ b/input/regression/grace-nest3.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "In nested syntax, graces are still properly handled." } \paper { raggedright= ##t } -\score { \notes \relative c'' { +\score { \relative c'' { f1 \grace e8 f1 << { \grace { e8 } f1 } >> diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly index 595d1be571..81de595741 100644 --- a/input/regression/grace-nest4.ly +++ b/input/regression/grace-nest4.ly @@ -1,9 +1,9 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Also in the nested syntax here, grace notes appear rightly." } -\score { \notes \context Voice \relative c'' { +\score { \context Voice \relative c'' { << { \grace g32 f4 } diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly index 9f988689c5..dcf3602cb9 100644 --- a/input/regression/grace-nest5.ly +++ b/input/regression/grace-nest5.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Graces notes may have the same duration as the main note." } \score -{ \notes \relative c'' { +{ \relative c'' { s2 4 \grace g e4 } diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly index 413633ea79..8837a2b122 100644 --- a/input/regression/grace-part-combine.ly +++ b/input/regression/grace-part-combine.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Grace notes may be put in a @code{partcombine}r." } @@ -9,10 +9,10 @@ \score { \new Staff \partcombine - \notes \relative c'' { + \relative c'' { c4 d e f \grace f16 g1 } - \notes \relative c' { + \relative c' { c4 d e2 g1 } diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly index 8469b9a776..26adf5c95b 100644 --- a/input/regression/grace-staff-length.ly +++ b/input/regression/grace-staff-length.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc = "Stripped version of trip.ly. Staves should be of correct length." } @@ -6,7 +6,7 @@ texidoc = "Stripped version of trip.ly. Staves should be of correct length." \paper { raggedright= ##t } \score{ - \context PianoStaff \notes \relative c'' << + \context PianoStaff \relative c'' << \new Staff { r1 r1 diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly index e560c173e3..cc25fb2a10 100644 --- a/input/regression/grace-start.ly +++ b/input/regression/grace-start.ly @@ -1,9 +1,9 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Pieces may begin with grace notes." } -\score {\notes \relative c' \context Staff { +\score { \relative c' \context Staff { \grace { a'16[ f] } g1 \bar "||" % test if | and || are synced. \grace { a16[ bes] } c1 diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly index 61bcb4fff7..d933bfcec0 100644 --- a/input/regression/grace-stems.ly +++ b/input/regression/grace-stems.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc = "Here @code{startGraceMusic} should set @code{no-stem-extend} to true; the two grace beams should be the same here. @@ -8,7 +8,7 @@ true; the two grace beams should be the same here. \score { - \context Voice \notes\relative c { + \context Voice \relative c { \grace { f8[ e8] \override Stem #'no-stem-extend = ##t diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly index 6f8560c1a2..684941d510 100644 --- a/input/regression/grace-sync.ly +++ b/input/regression/grace-sync.ly @@ -1,9 +1,9 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Grace notes in different voices/staves are synchronized." } -\score {\notes\relative c'' << \context Staff { c2 +\score {\relative c'' << \context Staff { c2 \grace c8 c4 c4 } \new Staff { c2 \clef bass diff --git a/input/regression/grace-types.ly b/input/regression/grace-types.ly index b71cdf6ad9..dba893ecfd 100644 --- a/input/regression/grace-types.ly +++ b/input/regression/grace-types.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "There are three different kinds of grace types: the base grace switches to smaller type, the appoggiatura inserts also a slur, and the @@ -6,7 +6,7 @@ acciaccatura inserts a slur and slashes the stem." } \score { - \notes \relative c'' { c4 \grace { d8 } c4 + \relative c'' { c4 \grace { d8 } c4 \appoggiatura { d8 } c \acciaccatura { d } c } diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly index 72b331dda2..0addd65e57 100644 --- a/input/regression/grace-unfold-repeat.ly +++ b/input/regression/grace-unfold-repeat.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "When grace notes are entered with unfolded repeats, line breaks take place before grace notes. @@ -7,7 +7,7 @@ line breaks take place before grace notes. \score{ - \notes\context Voice \relative c'{ + \context Voice \relative c'{ \repeat unfold 10 {\grace d8 c4 d e f} } diff --git a/input/regression/grace-volta-repeat-2.ly b/input/regression/grace-volta-repeat-2.ly index b280d16740..0aaf85c0ce 100644 --- a/input/regression/grace-volta-repeat-2.ly +++ b/input/regression/grace-volta-repeat-2.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -9,7 +9,7 @@ \paper { raggedright= ##t } -\score {\notes\relative c' { +\score {\relative c' { \repeat volta 2 { c1 } diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly index 5b93e49bed..3ccfab8838 100644 --- a/input/regression/grace-volta-repeat.ly +++ b/input/regression/grace-volta-repeat.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -8,7 +8,7 @@ } \score{ - \notes\relative c''{\key a \minor \time 2/4 + \relative c''{\key a \minor \time 2/4 \repeat "volta" 2 { \grace { a16[ b] } c4 c4 | \grace { d16[ b] } c4 c4 | diff --git a/input/regression/grace.ly b/input/regression/grace.ly index fcd45c58c2..72f1a80d7e 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -18,7 +18,7 @@ not set. Main note scripts do not end up on the grace note. " } -\score {\notes \context Voice = VA \relative c'' { +\score { \context Voice = VA \relative c'' { \grace b8 c4\fermata \grace { c32[ cis32] } gis4 \grace { cis32[ dis32] } e4 diff --git a/input/regression/hairpin-dashed.ly b/input/regression/hairpin-dashed.ly index ebb8a5b3ef..06fc70ad85 100644 --- a/input/regression/hairpin-dashed.ly +++ b/input/regression/hairpin-dashed.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc ="Hairpin crescendi may be dashed. " @@ -6,7 +6,7 @@ texidoc ="Hairpin crescendi may be dashed. " } \score { - \notes \relative c' { + \relative c' { \override Hairpin #'dash-fraction = #0.4 \override Hairpin #'dash-period = #1 f2\< g c1 d4\> b a gis\! } diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly index 76640a9f66..26a66fd693 100644 --- a/input/regression/hairpin-ending.ly +++ b/input/regression/hairpin-ending.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -11,7 +11,7 @@ into them." \score { -\notes \relative c'' { c4 \> c4 c4\! c4_\ff \> c4 c4\!\p } + \relative c'' { c4 \> c4 c4\! c4_\ff \> c4 c4\!\p } \paper { raggedright = ##t} } diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly index 93c1dcad51..7c01d8136e 100644 --- a/input/regression/hara-kiri-pianostaff.ly +++ b/input/regression/hara-kiri-pianostaff.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = @@ -21,7 +21,7 @@ alignment; this should not confuse the mechanism. \paper { raggedright= ##t } -\score { \notes \transpose c c'' +\score { \transpose c c'' \context PianoStaff << \new Staff { c4 c c c \break s1 \break c4 c c c \break c c c c} \new Staff { d4 d d d s1 s1 s1 s1 } diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly index f047952af2..966d8c2708 100644 --- a/input/regression/instrument-name-markup.ly +++ b/input/regression/instrument-name-markup.ly @@ -7,13 +7,13 @@ including alterations. " } -\version "2.2.0" +\version "2.3.4" textFlat = \markup {\smaller \flat} \score { - \notes \new Staff { + \new Staff { \set Staff.instrument = \markup { \column < "Clarinetti" { "in B" \textFlat } > } \set Staff.instr = \markup { \smaller { "Cl(B" \textFlat ")" } } diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly index 14cfa64d13..2e2821b0a1 100644 --- a/input/regression/instrument-name-partial.ly +++ b/input/regression/instrument-name-partial.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Instrument names are also printed on partial starting measures." } \score { - \notes \relative c'' { \set Staff.instrument = "foo" \partial 4 c4 c1 } + \relative c'' { \set Staff.instrument = "foo" \partial 4 c4 c1 } \paper { raggedright = ##t } } diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly index dbef5d15ac..c7d8bf7a01 100644 --- a/input/regression/instrument-name.ly +++ b/input/regression/instrument-name.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" Staff margins are also markings attached to barlines. They should be @@ -13,7 +13,7 @@ PianoStaff. \score { - \notes \context PianoStaff << + \context PianoStaff << \context Staff = treble { \set PianoStaff.instrument = "Piano " \set Staff.instrument = "Right " { c''4 }} diff --git a/input/regression/key-clefs.ly b/input/regression/key-clefs.ly index 556a26ffa9..ea4594cdd7 100644 --- a/input/regression/key-clefs.ly +++ b/input/regression/key-clefs.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Each clef have own accidental placing rules. " } #(set-global-staff-size 16) -\score { \notes +\score { \relative cis' { % \clef french % same as octaviated bass diff --git a/input/regression/key-signature-scordatura.ly b/input/regression/key-signature-scordatura.ly index 75f7387cbd..76a750ac53 100644 --- a/input/regression/key-signature-scordatura.ly +++ b/input/regression/key-signature-scordatura.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "By setting @code{Staff.keySignature} directly, key signatures can be set invidually per pitch. " } -\score { \notes +\score { \relative c' \context Staff { \set Staff.keySignature = #'(((1 . 2) . 1) ((0 . 3) . -1)) diff --git a/input/regression/keys.ly b/input/regression/keys.ly index bec8f91a26..390d25f935 100644 --- a/input/regression/keys.ly +++ b/input/regression/keys.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" Key signatures may appear on key changes, even without a barline. @@ -12,7 +12,7 @@ are created also on a clef change. \score { - \notes \relative c'' + \relative c'' { \set Staff.createKeyOnClefChange = ##t \key bes \major c2 diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly index 0e1568b20b..069a8d07fc 100644 --- a/input/regression/lyric-combine-new.ly +++ b/input/regression/lyric-combine-new.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "With the @code{\\lyricsto} mechanism, individual lyric @@ -9,7 +9,7 @@ \score { << - \notes \context Voice = "bla" \relative c'' { + \context Voice = "bla" \relative c'' { \autoBeamOff c2( d4) e8[ c b c] f4 } diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index 872b87a72c..53ff8461b9 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc ="Polyphonic rhythms and rests do not disturb @@ -7,7 +7,7 @@ texidoc ="Polyphonic rhythms and rests do not disturb } \score { - \notes { + { \clef violin \time 8/8 \key des \major diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly index 5cd90ed3c6..ddec9c87f1 100644 --- a/input/regression/lyric-combine.ly +++ b/input/regression/lyric-combine.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc= "Lyrics can be set to a melody automatically. Excess lyrics will be @@ -17,7 +17,7 @@ to work." -m = \notes \relative c'' { +m = \relative c'' { \autoBeamOff g8( a) r8 \times 2/3 { g'8( f e) } r8 \grace { d16[ c b] } e4 \emptyText @@ -25,13 +25,13 @@ m = \notes \relative c'' { \melismaEnd b } -noise = \repeat unfold 6 \notes \relative c'' { g16 g g g } +noise = \repeat unfold 6 \relative c'' { g16 g g g } textI = \context Lyrics = "middle-1" \lyrics { la2 __ la -- la __ la la la la la } textII = \context Lyrics = "middle-1" \lyrics { da -- da __ da -- da da da da da } \score { - \notes << \context Staff = SA \noise + << \context Staff = SA \noise \context Lyrics = LA { s1 } \context Staff = SB { s1 } \context Lyrics = LB { s1 } diff --git a/input/regression/lyric-extender-broken.ly b/input/regression/lyric-extender-broken.ly index 6403934d1d..6cf8dc12c1 100644 --- a/input/regression/lyric-extender-broken.ly +++ b/input/regression/lyric-extender-broken.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -10,7 +10,7 @@ of the melisma." \score { << - \context Voice=A \notes { + \context Voice=A { a1 ( a1 \break a) a2( b) \break a2 diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly index 2c57dbf0ec..a4fd43c7a8 100644 --- a/input/regression/lyric-extender.ly +++ b/input/regression/lyric-extender.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc= "In lyric extenders, a syllable may be extended over several notes. "} \paper { raggedright= ##t } \score{ -\notes \relative c' << + \relative c' << \context Voice = melody { c8[ ( d] ) r4 f4 } diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly index 65dc67de82..eba8af76ac 100644 --- a/input/regression/lyric-hyphen-break.ly +++ b/input/regression/lyric-hyphen-break.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { @@ -8,7 +8,7 @@ they go past the first note. " } \score { -<< \notes \new Staff \relative c'' { \time 1/4 c16[ c c c] +<< \new Staff \relative c'' { \time 1/4 c16[ c c c] \time 1/4 c16[ c c c] \time 1/4 diff --git a/input/regression/lyric-hyphen.ly b/input/regression/lyric-hyphen.ly index 774fd46242..886796a0d3 100644 --- a/input/regression/lyric-hyphen.ly +++ b/input/regression/lyric-hyphen.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "In lyrics, hyphens may be used." } \score{ << - \context Staff \notes { c' (c') c'( c') } + \context Staff { c' (c') c'( c') } \context Lyrics \lyrics { bla -- alb xxx -- yyy } >> } diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly index 4a7ef608a4..a6cc56ed38 100644 --- a/input/regression/lyric-phrasing.ly +++ b/input/regression/lyric-phrasing.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = " @@ -11,7 +11,7 @@ texidoc = " \score{ << - \notes \relative c' \context Voice = "bla" { + \relative c' \context Voice = "bla" { \autoBeamOff c4( c16 d c b) c4 d16[ e f g] diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly index 6ca77e3ba7..581d03afa8 100644 --- a/input/regression/lyrics-bar.ly +++ b/input/regression/lyrics-bar.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header{ texidoc=" @@ -9,7 +9,7 @@ lyrics do not collide with barlines. \score { \context StaffGroup << - \notes \context Staff { + \context Staff { b1 \bar "|:" b1 \bar ":|" } \lyrics << @@ -21,7 +21,7 @@ lyrics do not collide with barlines. this4 one has no BarEngraverAddedToContext1 } >> - \notes \new Staff { b1 b1 } + \new Staff { b1 b1 } >> \paper { raggedright = ##t diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly index cb304d9818..74a6b33393 100644 --- a/input/regression/lyrics-melisma-beam.ly +++ b/input/regression/lyrics-melisma-beam.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Melismata are triggered by manual beams." @@ -8,7 +8,7 @@ \score { << \new Staff - \notes \relative c'' { + \relative c'' { \set Staff.autoBeaming = ##f c8 c8[ c8 c8] c8 } diff --git a/input/regression/markup-note.ly b/input/regression/markup-note.ly index 24b404bf94..4f0c9b445c 100644 --- a/input/regression/markup-note.ly +++ b/input/regression/markup-note.ly @@ -3,9 +3,9 @@ texidoc = "The note markup function may be used to make metronome markings. It works for a variety of flag, dot and duration settings." } -\version "2.2.0" +\version "2.3.4" -\score { \notes { c4^\markup { +\score { { c4^\markup { \note #"1" #1 \note #"2" #1 \note #"4" #1 diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly index 62e9a9c316..688518984d 100644 --- a/input/regression/markup-stack.ly +++ b/input/regression/markup-stack.ly @@ -1,6 +1,6 @@ -\version "2.2.0" +\version "2.3.4" \header {texidoc="Markup scripts may be stacked."} \paper { raggedright = ##t} -\score { \notes { c''^\markup { "a" \column < "1" \bold "2" "3" > } } } +\score { { c''^\markup { "a" \column < "1" \bold "2" "3" > } } } diff --git a/input/regression/markup-user.ly b/input/regression/markup-user.ly index 1a12d9a059..4c27aae3b4 100644 --- a/input/regression/markup-user.ly +++ b/input/regression/markup-user.ly @@ -7,14 +7,14 @@ } -\version "2.2.0" % to be updated +\version "2.3.4" % to be updated #(def-markup-command (upcase paper props str) (string?) "Upcase the string characters. Syntax: \\upcase #\"string\"" (interpret-markup paper props (make-simple-markup (string-upcase str)))) \score { - \notes { + { c''-\markup \upcase #"hello world" % produces a "HELLO WORLD" markup } diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly index 328a7ff0a4..70ff1b85bb 100644 --- a/input/regression/measure-grouping.ly +++ b/input/regression/measure-grouping.ly @@ -7,11 +7,11 @@ brackets above beats when the beats of a time signature are grouped. " } -\version "2.3.2" +\version "2.3.4" %% TODO: should have 2/4 + 5/8 time sig style. -\score { \notes +\score { \context Staff \relative c' { #(set-time-signature 2 4) diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly index f570e13579..fa7c65622e 100644 --- a/input/regression/mensural.ly +++ b/input/regression/mensural.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "There is limited support for mensural notation: note head @@ -8,7 +8,7 @@ both for up and down stems." } -\score {\notes { \context Voice { +\score { { \context Voice { \override NoteHead #'style = #'mensural \transpose c d'' { c4 c2 c8 c16 c16 c1 c\breve c\longa } \transpose c c' { c4 c2 c8 c16 c16 c1 c\breve c\longa } diff --git a/input/regression/metronome-marking.ly b/input/regression/metronome-marking.ly index 9fc39da4e4..44b81b4c2a 100644 --- a/input/regression/metronome-marking.ly +++ b/input/regression/metronome-marking.ly @@ -9,9 +9,9 @@ The marking is left aligned with the time signature, if there is one. } -\version "2.2.0" +\version "2.3.4" -\score { \notes \relative c'' { \tempo \breve = 100 c1 c1 \tempo 8.. = 50 c1 } +\score { \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 330256a620..1732b98c48 100644 --- a/input/regression/mm-rests2.ly +++ b/input/regression/mm-rests2.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -10,7 +10,7 @@ The number of bars will be written above the sign. " } -thenotes = \notes \relative cis' { +thenotes = \relative cis' { \set Score.skipBars = ##t \time 4/4 R1 | diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly index a22164dd44..853479e47a 100644 --- a/input/regression/molecule-hacking.ly +++ b/input/regression/molecule-hacking.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc=" You can write stencil callbacks in Scheme, thus providing custom glyphs for notation elements. A simple example is @@ -57,7 +57,7 @@ GROB. The dimensions of the stencil is not affected. \score { - \notes \relative c' { c4 e + \relative c' { c4 e \override NoteHead #'print-function = diff --git a/input/regression/multi-measure-rest-center.ly b/input/regression/multi-measure-rest-center.ly index 95e6646e42..cf503fe58f 100644 --- a/input/regression/multi-measure-rest-center.ly +++ b/input/regression/multi-measure-rest-center.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "The multimeasure rest is centered exactly between bar lines." @@ -6,7 +6,7 @@ } \score { - \notes + { \set Score.skipBars = ##t \override Staff.BarLine #'hair-thickness = #7.5 diff --git a/input/regression/multi-measure-rest-grace.ly b/input/regression/multi-measure-rest-grace.ly index 8bc952e5ce..e766b599e6 100644 --- a/input/regression/multi-measure-rest-grace.ly +++ b/input/regression/multi-measure-rest-grace.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -6,7 +6,7 @@ texidoc= "Multi-measure rests are centered also in the case of grace notes." } \score { -\notes << + << \new Staff { R1 R1 R1*3 } \new Staff { \clef bass c1 \grace c8 c2 c2 c1 \grace c16 c2 c2 c1 } >> diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly index 14ae73ba29..a84e2c27a9 100644 --- a/input/regression/multi-measure-rest-instr-name.ly +++ b/input/regression/multi-measure-rest-instr-name.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "There are both long and short instrument names. @@ -11,7 +11,7 @@ multimeasure rests. " \context Staff << \set Staff.instrument = "instrument" \set Staff.instr = "instr" - \notes{c''1 \break R1 } + {c''1 \break R1 } >> \paper { raggedright = ##t diff --git a/input/regression/multi-measure-rest-multi-staff-center.ly b/input/regression/multi-measure-rest-multi-staff-center.ly index 4f6407fc31..d3ad29e042 100644 --- a/input/regression/multi-measure-rest-multi-staff-center.ly +++ b/input/regression/multi-measure-rest-multi-staff-center.ly @@ -2,10 +2,10 @@ independent on prefatory matter in other staves." } -\version "2.2.0" +\version "2.3.4" \score { -\notes << \new Staff { R1 } + << \new Staff { R1 } \new Staff { f'1 \clef bass } >> diff --git a/input/regression/multi-measure-rest-spacing.ly b/input/regression/multi-measure-rest-spacing.ly index be92325f28..7be7c393af 100644 --- a/input/regression/multi-measure-rest-spacing.ly +++ b/input/regression/multi-measure-rest-spacing.ly @@ -3,12 +3,12 @@ texidoc = "By setting texts starting with a multi-measure rest, an extra spacing column is created. This should not cause problems." } -\version "2.2.0" +\version "2.3.4" \score { << \set Score.skipBars = ##t - \context Staff = flute \notes \new Voice { + \context Staff = flute \new Voice { << { R1*40 } { s1*0^"bla" }>> } >> diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly index 2978ab7220..bbf9429aa8 100644 --- a/input/regression/multi-measure-rest-text.ly +++ b/input/regression/multi-measure-rest-text.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -10,7 +10,7 @@ Texts may be added to the multi-measure rests. } -\score { \notes { +\score { { \time 3/4 \set Score.skipBars = ##t R2._\markup { \center-align < \musicglyph #"scripts-dfermata" \roman "Ad lib" > } diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly index 24fecfee73..7a9c761440 100644 --- a/input/regression/multi-measure-rest.ly +++ b/input/regression/multi-measure-rest.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header{ texidoc=" @@ -15,7 +15,7 @@ are used then a different symbol is used. } -\score { \notes { +\score { { \time 3/4 \key cis \major R2.*15 diff --git a/input/regression/music-function.ly b/input/regression/music-function.ly index 0c538b655c..ade2e15585 100644 --- a/input/regression/music-function.ly +++ b/input/regression/music-function.ly @@ -4,7 +4,7 @@ texidoc = "Music function are generic music transformation functions, which can be used to extend music syntax seamlessly." } -\version "2.3.1" +\version "2.3.4" #(define myBar (ly:make-music-function @@ -17,7 +17,7 @@ which can be used to extend music syntax seamlessly." )) \score{ - \notes { + { d4 \myBar #"|:" d4 } diff --git a/input/regression/music-map.ly b/input/regression/music-map.ly index 6246f42dc6..cdac8f07eb 100644 --- a/input/regression/music-map.ly +++ b/input/regression/music-map.ly @@ -10,7 +10,7 @@ dynamics are left over. These are put onto the 2nd measure." } -\version "2.3.1" +\version "2.3.4" #(define (notes-to-skip m) "Convert all stuff with duration (notes, lyrics, bass figures, etc.) to skips. @@ -29,10 +29,10 @@ Scripts and dynamics are maintained. \paper { raggedright= ##t } -foobar = \notes \transpose c c' { c4\>-^ c4-^ c4\!-^ c4-^ } +foobar = \transpose c c' { c4\>-^ c4-^ c4\!-^ c4-^ } \score { - \notes \relative c'' \context Voice { + \relative c'' \context Voice { \foobar << \applymusic #(lambda (x) (music-map notes-to-skip x)) diff --git a/input/regression/new-markup-scheme.ly b/input/regression/new-markup-scheme.ly index e804e348bc..4f00cdb6ec 100644 --- a/input/regression/new-markup-scheme.ly +++ b/input/regression/new-markup-scheme.ly @@ -5,9 +5,9 @@ texts using a similar syntax as @code{\\markup}." } -\version "2.3.2" +\version "2.3.4" \score { - \notes { + { \fatText f'1-\markup { foo diff --git a/input/regression/new-markup-syntax.ly b/input/regression/new-markup-syntax.ly index 328eae461a..6c88014b20 100644 --- a/input/regression/new-markup-syntax.ly +++ b/input/regression/new-markup-syntax.ly @@ -2,11 +2,11 @@ texidoc = "With the new markup syntax, text may be written in various manners." } -\version "2.2.0" +\version "2.3.4" \score { - \notes + { f'-\markup { foo diff --git a/input/regression/newaddlyrics.ly b/input/regression/newaddlyrics.ly index c38d6bc13d..91065b3d1f 100644 --- a/input/regression/newaddlyrics.ly +++ b/input/regression/newaddlyrics.ly @@ -40,4 +40,4 @@ } >> -\version "2.3.0" +\version "2.3.4" diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly index 40f5e1275c..1eab0692ed 100644 --- a/input/regression/non-empty-text.ly +++ b/input/regression/non-empty-text.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" By default, text is set with empty horizontal dimensions. @@ -7,7 +7,7 @@ The boolean property @code{no-spacing-rods} in @code{TextScript} is used to control the horizontal size of text. " } \score{ - \notes\relative c''{ + \relative c''{ %% \emptyText %% short for \override TextScript #'no-spacing-rods = ##t c2_"very wide and long text" c | \break diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly index aa5a3496e4..703c0fc762 100644 --- a/input/regression/note-group-bracket.ly +++ b/input/regression/note-group-bracket.ly @@ -1,5 +1,5 @@ -\version "2.3.2" +\version "2.3.4" \header { @@ -18,7 +18,7 @@ analysis brackets start and end. \score { - \notes\relative c'' + \relative c'' { c4\startGroup\startGroup\startGroup c4\stopGroup diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly index a7f0efc146..306b0ddd1e 100644 --- a/input/regression/note-head-chord.ly +++ b/input/regression/note-head-chord.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Note heads are flipped on the stem to prevent collisions. @@ -10,7 +10,7 @@ It also works for whole heads that have invisible stems. \paper { raggedright= ##t } -\score { \notes \relative c'' +\score { \relative c'' \context Voice { 4 diff --git a/input/regression/note-head-harmonic.ly b/input/regression/note-head-harmonic.ly index 7d0645e8f3..2cd98405a6 100644 --- a/input/regression/note-head-harmonic.ly +++ b/input/regression/note-head-harmonic.ly @@ -6,10 +6,10 @@ Harmonic heads do not get dots. If @code{harmonicAccidentals} is unset, they also don't get accidentals." } -\version "2.2.0" +\version "2.3.4" \score { - \notes { + { < c'' f''\harmonic >4 \stemUp < c'' f''\harmonic >4. diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly index c805073744..e705902925 100644 --- a/input/regression/note-head-style.ly +++ b/input/regression/note-head-style.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" Note head shapes may be set from several choices. @@ -11,7 +11,7 @@ dimensions. " } -pattern = \notes << +pattern = << \new Voice { \override Stem #'direction = #UP e'4 @@ -24,7 +24,7 @@ pattern = \notes << >> \score { - \notes \transpose c c { + \transpose c c { \clef C \override Staff.NoteHead #'style = #'default diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly index d17d69d922..8c423cb6d3 100644 --- a/input/regression/note-line.ly +++ b/input/regression/note-line.ly @@ -1,16 +1,16 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Note head lines (e.g. glissando) run between centers of the note heads." } -su = \notes{ \change Staff = up} -sd = \notes{ \change Staff = down} +su = { \change Staff = up} +sd = { \change Staff = down} \score { \context PianoStaff - \notes << + << \context Staff = up { \set PianoStaff.connectArpeggios = ##t \showStaffSwitch diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly index afbc508cf8..69a798e164 100644 --- a/input/regression/number-staff-lines.ly +++ b/input/regression/number-staff-lines.ly @@ -1,5 +1,5 @@ -\version "2.3.2" +\version "2.3.4" \header{ texidoc=" The number of stafflines of a staff can be set. Ledger @@ -8,7 +8,7 @@ adjusted accordingly. " } \score { -\context Voice \notes\relative c { +\context Voice \relative c { c' c c c | g' g g g \bar ":|" } \paper { diff --git a/input/regression/ottava-broken.ly b/input/regression/ottava-broken.ly index ec1667f4ec..e03b138e12 100644 --- a/input/regression/ottava-broken.ly +++ b/input/regression/ottava-broken.ly @@ -8,12 +8,12 @@ their horizontal line does not stick out." } -\version "2.2.0" +\version "2.3.4" \paper { raggedright = ##t} \score { - \notes\relative c''' \notes { + \relative c''' { a2 b #(set-octavation 1) a2 b \break c''1 \break diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly index 40f759fee3..3b1a765f8e 100644 --- a/input/regression/ottava.ly +++ b/input/regression/ottava.ly @@ -10,7 +10,7 @@ string can be tuned with @code{Staff.ottavation}. " } -\version "2.2.0" +\version "2.3.4" % . There must be a minimum distance between the octavation line and the % topmost staff line, taking into account the height of the closing @@ -34,7 +34,7 @@ string can be tuned with @code{Staff.ottavation}. \paper { raggedright = ##t} \score { - \notes\relative c''' \notes { + \relative c''' { a b c a #(set-octavation 1) a b c a diff --git a/input/regression/part-combine-a2.ly b/input/regression/part-combine-a2.ly index 242483b2fc..16a8ff4af4 100644 --- a/input/regression/part-combine-a2.ly +++ b/input/regression/part-combine-a2.ly @@ -1,13 +1,13 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc ="The a2 string is printed only on notes (i.e. not on rests), and only after chords, solo or polyphony." } -vone = \notes \relative a' { R1*2 g2 r2 g2 r2 a4 r4 g +vone = \relative a' { R1*2 g2 r2 g2 r2 a4 r4 g } -vtwo = \notes \relative a' { R1*2 g2 r2 g2 r2 f4 r4 g } +vtwo = \relative a' { R1*2 g2 r2 g2 r2 f4 r4 g } \score { << \set Score.skipBars = ##t diff --git a/input/regression/part-combine-cross.ly b/input/regression/part-combine-cross.ly index 1d885e938b..6a60f9c34f 100644 --- a/input/regression/part-combine-cross.ly +++ b/input/regression/part-combine-cross.ly @@ -4,10 +4,10 @@ " } -\version "2.2.0" +\version "2.3.4" -vone = \notes \relative a' { g4 g f f e e d d } -vtwo = \notes \relative a' { e4 e f f g g a a } +vone = \relative a' { g4 g f f e e d d } +vtwo = \relative a' { e4 e f f g g a a } \score { \partcombine \vone \vtwo diff --git a/input/regression/part-combine-global.ly b/input/regression/part-combine-global.ly index 5a1b30259d..655df4d37a 100644 --- a/input/regression/part-combine-global.ly +++ b/input/regression/part-combine-global.ly @@ -11,9 +11,9 @@ voices. " } -\version "2.2.0" +\version "2.3.4" -vone =\notes +vone = %%%%%%%%%%%%%% 0 1 2 3 \relative c'' { @@ -22,7 +22,7 @@ vone =\notes a8[ a] a8[ a] } -vtwo =\notes +vtwo = \relative c' { \time 2/4 f8[ f]~ f8[ f] | diff --git a/input/regression/part-combine-solo-end.ly b/input/regression/part-combine-solo-end.ly index 2d01f8a40f..8a5169d034 100644 --- a/input/regression/part-combine-solo-end.ly +++ b/input/regression/part-combine-solo-end.ly @@ -5,13 +5,13 @@ } -\version "2.3.0" +\version "2.3.4" \score { << \new Staff \partcombine - \notes { R1 * 2 } - \notes { c'8\> c'\! r2. } + { R1 * 2 } + { c'8\> c'\! r2. } >> } diff --git a/input/regression/part-combine-solo-global.ly b/input/regression/part-combine-solo-global.ly index 8026a15af9..f6c655d248 100644 --- a/input/regression/part-combine-solo-global.ly +++ b/input/regression/part-combine-solo-global.ly @@ -5,15 +5,15 @@ } -\version "2.2.0" +\version "2.3.4" \score { \new Staff - \partcombine \notes \relative c'' { + \partcombine \relative c'' { bes2( a4) } - \notes \relative c' { + \relative c' { r2 cis4 } } diff --git a/input/regression/part-combine-solo.ly b/input/regression/part-combine-solo.ly index 541c37eee8..c9ee486ebc 100644 --- a/input/regression/part-combine-solo.ly +++ b/input/regression/part-combine-solo.ly @@ -14,10 +14,10 @@ Solo 1/2 can not be used when a spanner is active, so there is no solo " } -vone = \notes \relative a' { d4 r8 d8 d8 r8 d8 r8 d2 ~ d2 ~ d4 } -vtwo = \notes \relative g' { g4. g8 r2 g4 r4 r2 g4 } +vone = \relative a' { d4 r8 d8 d8 r8 d8 r8 d2 ~ d2 ~ d4 } +vtwo = \relative g' { g4. g8 r2 g4 r4 r2 g4 } -\version "2.2.0" +\version "2.3.4" \score { diff --git a/input/regression/part-combine-text.ly b/input/regression/part-combine-text.ly index e53bc2c5b2..49edf2ad18 100644 --- a/input/regression/part-combine-text.ly +++ b/input/regression/part-combine-text.ly @@ -9,10 +9,10 @@ texts accordingly. } -\version "2.2.0" +\version "2.3.4" -vone = \notes \relative a' { R1 a2 r4 r a a a a } -vtwo = \notes \relative a' { R1 f4 f4 f4 f f f a a } +vone = \relative a' { R1 a2 r4 r a a a a } +vtwo = \relative a' { R1 f4 f4 f4 f f f a a } \score { \partcombine \vone \vtwo diff --git a/input/regression/part-combine.ly b/input/regression/part-combine.ly index 35703a0177..de8d453333 100644 --- a/input/regression/part-combine.ly +++ b/input/regression/part-combine.ly @@ -9,12 +9,12 @@ " } -\version "2.2.0" +\version "2.3.4" -vone = \notes \relative a' { g2 g g g4 g f' c c( c) c c c ~ c +vone = \relative a' { g2 g g g4 g f' c c( c) c c c ~ c c2. c4 c } -vtwo = \notes \relative a' { f2 f4 f f2 g4 g c, f f f f f~ f ~ f +vtwo = \relative a' { f2 f4 f f2 g4 g c, f f f f f~ f ~ f f4 f2. ~ f4 } diff --git a/input/regression/pedal-bracket.ly b/input/regression/pedal-bracket.ly index 82321ec102..95dcd65cc9 100644 --- a/input/regression/pedal-bracket.ly +++ b/input/regression/pedal-bracket.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -9,7 +9,7 @@ At a line-break, there are no vertical endings. " } \score { - \notes \relative c'' { + \relative c'' { \set Staff.pedalSustainStyle = #'bracket c4 d e \sustainDown b c c, \sustainUp \sustainDown d8[ c] e8[ diff --git a/input/regression/pedal-end.ly b/input/regression/pedal-end.ly index eca0a71ee3..3921d5d393 100644 --- a/input/regression/pedal-end.ly +++ b/input/regression/pedal-end.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Unterminated piano pedal brackets run to the end of the piece. " @@ -6,7 +6,7 @@ } \score { - \notes { + { \set Staff.pedalSustainStyle = #'bracket c4 \sustainDown \bar "|." diff --git a/input/regression/pedal-ped.ly b/input/regression/pedal-ped.ly index b9538f83e5..19f58e3f8c 100644 --- a/input/regression/pedal-ped.ly +++ b/input/regression/pedal-ped.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "The standard piano pedals style comes with Ped symbols. @@ -8,7 +8,7 @@ at the end of the melody." } \score{ - \context Staff \notes\relative c'{ + \context Staff \relative c'{ c4 d e f g \sustainDown b c c, d16[ c c c] e[ e \sustainUp \sustainDown e e ] f4 \sustainUp diff --git a/input/regression/phrasing-slur.ly b/input/regression/phrasing-slur.ly index 32837b2d9f..77c6a57d32 100644 --- a/input/regression/phrasing-slur.ly +++ b/input/regression/phrasing-slur.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc="Ordinary slurs should work well with phrasing slur." } \score { - \notes\relative c'' { + \relative c'' { \time 6/4 c\((d e) f(e d)\) } \paper { diff --git a/input/regression/prefatory-empty-spacing.ly b/input/regression/prefatory-empty-spacing.ly index 84022701e2..9fd3a57f5d 100644 --- a/input/regression/prefatory-empty-spacing.ly +++ b/input/regression/prefatory-empty-spacing.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -10,7 +10,7 @@ the break alignment." \paper { raggedright= ##t } -\score{ \notes { +\score{ { a a a a \break \mark A a a a a}} diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly index 9648e54100..3ccd25a508 100644 --- a/input/regression/prefatory-spacing-matter.ly +++ b/input/regression/prefatory-spacing-matter.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Distances between prefatory items (e.g. clef, bar, @@ -10,7 +10,7 @@ bar-line is different from the start of line. } -\score { \notes \relative c'' { +\score { \relative c'' { \set Staff.instrument = "fobar" \bar "||:" \key cis \major diff --git a/input/regression/property-grace-polyphony.ly b/input/regression/property-grace-polyphony.ly index f1a75db9da..46202ef924 100644 --- a/input/regression/property-grace-polyphony.ly +++ b/input/regression/property-grace-polyphony.ly @@ -6,9 +6,9 @@ } -\version "2.2.0" +\version "2.3.4" \score { - \notes \relative c'' { + \relative c'' { << { \grace e8 d2 } \\ { a2 } >> diff --git a/input/regression/property-once.ly b/input/regression/property-once.ly index d4b1c3eb21..233a809603 100644 --- a/input/regression/property-once.ly +++ b/input/regression/property-once.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Once properties take effect during a single time step only." } \score { - \notes \relative c' { + \relative c' { c4 \once \set Stem = #'() c4 diff --git a/input/regression/quote-transposition.ly b/input/regression/quote-transposition.ly index e8c624b208..d7c2a5cc7a 100644 --- a/input/regression/quote-transposition.ly +++ b/input/regression/quote-transposition.ly @@ -6,23 +6,23 @@ In this example, all instruments play sounding central C, the target is a instrument in F." } -\version "2.2.0" +\version "2.3.4" -\addquote clarinet \notes { +\addquote clarinet { \transposition bes d'16 d'16 d'8 d'16 d'16 d'8 d'16 d'16 d'8 d'16 d'16 d'8 } -\addquote sax \notes { +\addquote sax { \transposition es' a8 a a a a a a a } \score { - \notes{ + { \transposition f % french horn g'4 diff --git a/input/regression/quote.ly b/input/regression/quote.ly index eb349a88dd..6f175b4eb5 100644 --- a/input/regression/quote.ly +++ b/input/regression/quote.ly @@ -5,13 +5,13 @@ music may be quoted. " } -\version "2.2.0" +\version "2.3.4" -\addquote bla \notes\relative c' { +\addquote bla \relative c' { fis4 g a b } \score { - \notes \relative c'' { + \relative c'' { c8 d8 \quote bla 2 es8 gis } } diff --git a/input/regression/rehearsal-mark-letter.ly b/input/regression/rehearsal-mark-letter.ly index f5a7271381..0105a5f94c 100644 --- a/input/regression/rehearsal-mark-letter.ly +++ b/input/regression/rehearsal-mark-letter.ly @@ -5,8 +5,8 @@ and after Z, double letters are used. The mark may be set with @code{\mark NUMBER}, or with @code{Score.rehearsalMark}." } -\version "2.2.0" -\score { \notes \relative c'' { +\version "2.3.4" +\score { \relative c'' { c1 \mark \default c1 \mark #7 c1 \mark \default diff --git a/input/regression/rehearsal-mark-number.ly b/input/regression/rehearsal-mark-number.ly index 42d94eb021..b60cc014e0 100644 --- a/input/regression/rehearsal-mark-number.ly +++ b/input/regression/rehearsal-mark-number.ly @@ -5,9 +5,9 @@ By setting @code{markFormatter} we may choose a different style of mark printing } -\version "2.2.0" +\version "2.3.4" \score { - \notes \relative c''{ + \relative c''{ \set Score.markFormatter = #format-mark-numbers c1 | \mark \markup { \musicglyph #"scripts-coda" } c1 | \mark \default diff --git a/input/regression/repeat-fold.ly b/input/regression/repeat-fold.ly index f0f2f4d855..e70b21340f 100644 --- a/input/regression/repeat-fold.ly +++ b/input/regression/repeat-fold.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -8,7 +8,7 @@ should not be more alternatives than repeats. } \score { - \context Staff \notes \relative c'' { + \context Staff \relative c'' { \repeat fold 3 { c^"3$\\times$ 0alt" d } % less alts than body \repeat fold 4 { c^"4$\\times$ 2alt" d } \alternative { e f } diff --git a/input/regression/repeat-line-break.ly b/input/regression/repeat-line-break.ly index 7cd2389679..e58fcc7888 100644 --- a/input/regression/repeat-line-break.ly +++ b/input/regression/repeat-line-break.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -10,7 +10,7 @@ bracket should be equal. \paper { raggedright= ##t } \score { -\notes + \context Staff\relative c'' { \repeat "volta" 2 { c1 \break } \alternative { d e } c1 diff --git a/input/regression/repeat-percent-skipbars.ly b/input/regression/repeat-percent-skipbars.ly index a1e559e429..4c0594d3e1 100644 --- a/input/regression/repeat-percent-skipbars.ly +++ b/input/regression/repeat-percent-skipbars.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -10,7 +10,7 @@ texidoc = "Percent repeats are not skipped, even when @code{skipBars} is set." \score { \context Staff << \set Score.skipBars = ##t - \notes { + { \repeat "percent" 2 { g2 a g a } } >> diff --git a/input/regression/repeat-percent.ly b/input/regression/repeat-percent.ly index 23a9e687bf..5abe042ab7 100644 --- a/input/regression/repeat-percent.ly +++ b/input/regression/repeat-percent.ly @@ -1,9 +1,9 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Measure repeats may be nested with beat repeats." } -\score { \notes \relative c'' \context Voice { \time 4/4 +\score { \relative c'' \context Voice { \time 4/4 % riff \repeat "percent" 2 { r8. a16 g8. a16 bes8. a16 f8 d | a c8 ~ c8 d8 ~ d8 r8 r4 } diff --git a/input/regression/repeat-slash.ly b/input/regression/repeat-slash.ly index 0ee7c70faf..e212d45384 100644 --- a/input/regression/repeat-slash.ly +++ b/input/regression/repeat-slash.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Within a bar, beat repeats denote that a music snippet should be played again." } -\score { \notes \relative c' +\score { \relative c' \context Voice { \time 4/4 \repeat "percent" 2 { c2 } diff --git a/input/regression/repeat-unfold-all.ly b/input/regression/repeat-unfold-all.ly index 07d34f1c87..821731207e 100644 --- a/input/regression/repeat-unfold-all.ly +++ b/input/regression/repeat-unfold-all.ly @@ -1,16 +1,16 @@ -\version "2.3.1" +\version "2.3.4" \header { texidoc = "Volta repeats may be unfolded through the Scheme function @code{unfold-repeats}." } -nots = \notes\relative c' { +nots = \relative c' { c4 \repeat volta 2 c4 \alternative { d e } } \score { - \notes \context Voice { + \context Voice { \nots \bar "||" \applymusic #unfold-repeats \nots diff --git a/input/regression/repeat-unfold-tremolo.ly b/input/regression/repeat-unfold-tremolo.ly index 350fa9e975..6778729e70 100644 --- a/input/regression/repeat-unfold-tremolo.ly +++ b/input/regression/repeat-unfold-tremolo.ly @@ -1,4 +1,4 @@ -\version "2.3.1" +\version "2.3.4" \header { texidoc = "Unfolding tremolo repeats. All fragments fill one @@ -8,7 +8,7 @@ \score{ - \notes{ + { \time 2/4 \applymusic #unfold-repeats { \repeat tremolo 4 { c'16 e' } | diff --git a/input/regression/repeat-unfold.ly b/input/regression/repeat-unfold.ly index b1761ef65e..461d05ffe1 100644 --- a/input/regression/repeat-unfold.ly +++ b/input/regression/repeat-unfold.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -17,7 +17,7 @@ Unfolded behavior: \score { - \context Voice \notes\relative c'' { + \context Voice \relative c'' { \repeat unfold 3 { c^"3x 0a" d } % less alts than body \repeat unfold 4 { c^"4x 0a" d } \alternative { e f } diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly index 9b359bd9b3..6956721043 100644 --- a/input/regression/repeat-volta-skip-alternatives.ly +++ b/input/regression/repeat-volta-skip-alternatives.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "When too few alternatives are present, the first @@ -7,7 +7,7 @@ alternative is repeated, by printing a range for the 1st repeat." } -\score { \notes \relative c'' \context Voice { +\score { \relative c'' \context Voice { \repeat volta 3 c1 \alternative { d f } e4 } } diff --git a/input/regression/repeat-volta.ly b/input/regression/repeat-volta.ly index db76a9ce4d..646d48393e 100644 --- a/input/regression/repeat-volta.ly +++ b/input/regression/repeat-volta.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -9,7 +9,7 @@ If they don't barlines should still be shown. % no alts. \score { - \notes \context Voice \relative c'' { + \context Voice \relative c'' { % repeat non aligning with barlines. \repeat volta 3 { c^"3$\\times$ 0alt" d e } % less alts than body diff --git a/input/regression/rest-collision-beam.ly b/input/regression/rest-collision-beam.ly index 2d40194357..2968667bff 100644 --- a/input/regression/rest-collision-beam.ly +++ b/input/regression/rest-collision-beam.ly @@ -2,15 +2,15 @@ texidoc = "Rests under beams are only moved if necessary." } -\version "2.2.0" +\version "2.3.4" -fig = \notes \relative c' { +fig = \relative c' { 8[ r r r ] r | } \score { - \notes \relative c' \new Staff { + \relative c' \new Staff { \fig \transpose c c, \fig \new Voice { \stemUp \transpose c f \fig } diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly index eec4d9e90a..b951be6cec 100644 --- a/input/regression/rest-collision.ly +++ b/input/regression/rest-collision.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" Rests should not collide with beams, stems and noteheads. Rests may @@ -10,30 +10,30 @@ cases. " } -scale = \notes \relative c' { +scale = \relative c' { c8 d e f g a b c c d e f g a b c } -rests = \notes { +rests = { r r r r r r r r r r r r r r r r } different = << { - \notes \relative c'' { + \relative c'' { r8 a e4 a e } }\\ { - \notes \relative c'' { + \relative c'' { r1 }} >> -scales = \context Staff \notes << +scales = \context Staff << { r1 r2 r2 \scale c''1 c'2 a'2 \rests } \\ { a'1 a'2 d'2 \rests r1 r2 r2 \scale } >> -restsII = \context Staff \notes { +restsII = \context Staff { r4 r8 \context Staff << { r8 } \\{ r8} >> \context Staff << { r8} r8 \\{ r8} >> @@ -44,7 +44,7 @@ restsII = \context Staff \notes { } \score{ - \notes { + { \scales \restsII } diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly index 8118f096b4..cb09aa2012 100644 --- a/input/regression/rest-ledger.ly +++ b/input/regression/rest-ledger.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Whole and half rests moving outside the staff should get ledger lines." @@ -6,7 +6,7 @@ ledger lines." \score { -\notes { + { \override Rest #'staff-position = #4 r1 \override Rest #'staff-position = #5 r1 \override Rest #'staff-position = #6 diff --git a/input/regression/rest-pitch.ly b/input/regression/rest-pitch.ly index 80cac1b2f2..1d8f61a84d 100644 --- a/input/regression/rest-pitch.ly +++ b/input/regression/rest-pitch.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Rests can have pitches--these will be affected by @@ -9,7 +9,7 @@ beam/rest collision resolving will leave it alone." \paper { raggedright= ##t } -\score { \notes\relative c'' +\score { \relative c'' { a4\rest b4\rest c4\rest diff --git a/input/regression/rest-polyphonic.ly b/input/regression/rest-polyphonic.ly index 5f28e73a9c..1a15c62f17 100644 --- a/input/regression/rest-polyphonic.ly +++ b/input/regression/rest-polyphonic.ly @@ -7,10 +7,10 @@ even if there is no opposite note or rest. The amount is two } -\version "2.2.0" +\version "2.3.4" \score { - \new Staff \notes \relative c' { + \new Staff \relative c' { << { r8 g''4 g8 r g4 g8 } \\ { d,4 r d r } >> } diff --git a/input/regression/rest.ly b/input/regression/rest.ly index ad8aa8baaa..49ed735981 100644 --- a/input/regression/rest.ly +++ b/input/regression/rest.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -9,7 +9,7 @@ whole rest are centered on the middle staff line. } - \score { \notes { + \score { { \time 4/4 r \longa * 1/4 r\breve * 1/2 r1 r2 r4 r8 r16 r32 r64 r128 r128 diff --git a/input/regression/rhythmic-staff.ly b/input/regression/rhythmic-staff.ly index 7d264bf25b..8274163b01 100644 --- a/input/regression/rhythmic-staff.ly +++ b/input/regression/rhythmic-staff.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "In rhythmic staves stems should go up, and bar lines have the size for a 5 line staff. The whole note hangs from the rhythmic staff." } -\score { \notes \context RhythmicStaff +\score { \context RhythmicStaff { r4 c4. c8 r8 c8 | c2 r2 | r1 } diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly index 6568073133..8ffc85a8ac 100644 --- a/input/regression/script-collision.ly +++ b/input/regression/script-collision.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -7,7 +7,7 @@ } \score { -\notes \relative c'' { + \relative c'' { c4 \marcato << { c4^^ }\\ diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly index 9e0386a5bb..300682ff1e 100644 --- a/input/regression/script-stack-order.ly +++ b/input/regression/script-stack-order.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Scripts can be stacked. The order is determined by a priority field, but when objects have the same priority, the input @@ -7,7 +7,7 @@ order determines the order. Objects specified first are closest to the note. " } -\score{ \notes\relative c'' { c4^"inner up"^"outer up"_"inner down"_"outer down" } +\score{ \relative c'' { c4^"inner up"^"outer up"_"inner down"_"outer down" } \paper { raggedright = ##t} } diff --git a/input/regression/script-stacked.ly b/input/regression/script-stacked.ly index 09718c7a42..5d2558bdce 100644 --- a/input/regression/script-stacked.ly +++ b/input/regression/script-stacked.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \paper { raggedright= ##t } @@ -6,5 +6,5 @@ texidoc = "Scripts may be stacked." } -\score { \notes { c'''->-. } } +\score { { c'''->-. } } diff --git a/input/regression/size11.ly b/input/regression/size11.ly index 629ff083d0..048f3ac484 100644 --- a/input/regression/size11.ly +++ b/input/regression/size11.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" diff --git a/input/regression/size13.ly b/input/regression/size13.ly index a98b2140dd..1400035cbb 100644 --- a/input/regression/size13.ly +++ b/input/regression/size13.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" foollilypondbook = " \score " diff --git a/input/regression/size16.ly b/input/regression/size16.ly index e515aab944..0cffa4eb4a 100644 --- a/input/regression/size16.ly +++ b/input/regression/size16.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" foollilypondbook = " \score " diff --git a/input/regression/size20.ly b/input/regression/size20.ly index 72ad331c5f..5a28aaeb3d 100644 --- a/input/regression/size20.ly +++ b/input/regression/size20.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" foollilypondbook = " \score " diff --git a/input/regression/size23.ly b/input/regression/size23.ly index f0e502866f..557dc9699d 100644 --- a/input/regression/size23.ly +++ b/input/regression/size23.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" foollilypondbook = " \score " diff --git a/input/regression/size26.ly b/input/regression/size26.ly index 1368409e79..e4ce8be2a1 100644 --- a/input/regression/size26.ly +++ b/input/regression/size26.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" foollilypondbook = " \score " diff --git a/input/regression/slur-area.ly b/input/regression/slur-area.ly index 4fc342756f..be1b21a7a0 100644 --- a/input/regression/slur-area.ly +++ b/input/regression/slur-area.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "The area underneath an (up) slur is minimised to improve the shape. " @@ -7,7 +7,7 @@ } \score{ -\notes\relative c''{ +\relative c''{ \slurUp \stemDown diff --git a/input/regression/slur-attachment.ly b/input/regression/slur-attachment.ly index 77a07df65c..24c1427fed 100644 --- a/input/regression/slur-attachment.ly +++ b/input/regression/slur-attachment.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -8,7 +8,7 @@ with beams. " } \score{ - \notes \relative c''{ + \relative c''{ \override Slur #'direction = #1 a8( a a4) a4( a8 a) diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly index d141ec79f1..4c435c60cc 100644 --- a/input/regression/slur-broken-trend.ly +++ b/input/regression/slur-broken-trend.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -10,7 +10,7 @@ in unbroken state. " } \score{ - \notes \relative c''{ + \relative c''{ e1( \break a,) \time 2/4 e'2( \break a,)(\break diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly index b8dc7a787f..5d19240984 100644 --- a/input/regression/slur-cross-staff.ly +++ b/input/regression/slur-cross-staff.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" Slurs behave decently when broken across a linebreak. @@ -9,7 +9,7 @@ Slurs behave decently when broken across a linebreak. \score{ \context PianoStaff << - \context Staff=one \notes\relative c'{ + \context Staff=one \relative c'{ \stemUp \slurUp c4( c \change Staff=two c c) | \change Staff=one @@ -39,7 +39,7 @@ Slurs behave decently when broken across a linebreak. c4( \change Staff=one c c \change Staff=two c) r1 } - \context Staff=two \notes\relative c'{ + \context Staff=two \relative c'{ \clef bass s1 s1 s1 s1 s1 s1 s1 s1 s1 s1 } diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly index 078e09e09c..2365e8bf18 100644 --- a/input/regression/slur-dots.ly +++ b/input/regression/slur-dots.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="Slurs should not get confused by augmentation dots. With a lot of dots, the problems becomes more visible." } \score { - \notes\relative c'' { + \relative c'' { c4.............( c) } \paper { diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly index 9939ddaeb5..c2afcda842 100644 --- a/input/regression/slur-nice.ly +++ b/input/regression/slur-nice.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" Slurs should look nice and symmetric. The curvature may increase @@ -9,7 +9,7 @@ run through noteheads or stems. } \score{ - \notes\relative c''{ + \relative c''{ \time 3/4 \slurUp \stemBoth a ( \stemDown a \stemBoth a) a( c a) a( e' a,) a( g' a,) diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly index 860bf5dac1..ace379b5a8 100644 --- a/input/regression/slur-rest.ly +++ b/input/regression/slur-rest.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc ="Slurs may be placed over rest. The slur will avoid colliding with @@ -7,7 +7,7 @@ the rest. " } -\score{ \notes { \stemDown c'4 ( r4 c'2) +\score{ { \stemDown c'4 ( r4 c'2) \relative c'' { % Finish with F if played separately diff --git a/input/regression/slur-staccato.ly b/input/regression/slur-staccato.ly index 71fa204f3f..0841c171b8 100644 --- a/input/regression/slur-staccato.ly +++ b/input/regression/slur-staccato.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc="An extra offset may be added between a slur and staccato(s)." } @@ -7,7 +7,7 @@ texidoc="An extra offset may be added between a slur and staccato(s)." \paper { raggedright = ##t} \score { - \context Staff \notes\relative c'' { + \context Staff \relative c'' { \override Slur #'attachment-offset = #'((0 . 1) . (0 . 1)) a-.( g-. a)-. diff --git a/input/regression/slur-stem-broken.ly b/input/regression/slur-stem-broken.ly index 26969c420c..ace158908c 100644 --- a/input/regression/slur-stem-broken.ly +++ b/input/regression/slur-stem-broken.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc="Trend of broken slur with user-overridden stem attachment should also follow the same vertical direction it would have had in unbroken state." } \score { - \notes\relative c' { + \relative c' { \override Slur #'attachment = #'(stem . stem) f( c' c c \break c c c \stemUp c) diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly index 547cec842e..9790aea1cf 100644 --- a/input/regression/slur-symmetry-1.ly +++ b/input/regression/slur-symmetry-1.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Symmetric figures should lead to symmetric slurs." } \score{ - \notes\relative c''<< + \relative c''<< \time 4/4 \context Staff{ f8(f f f) f(g g f) f(a a f) f(b b f) diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly index 626859ec46..8b45739f6c 100644 --- a/input/regression/slur-symmetry.ly +++ b/input/regression/slur-symmetry.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Symmetric figures should lead to symmetric slurs." @@ -6,7 +6,7 @@ } \score{ - \notes\relative c'<< + \relative c'<< \time 6/8 \context Staff{ e8(e e) e(d e) e(c e) e(b e) diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly index 4244909a07..63680cecdf 100644 --- a/input/regression/spacing-accidental-staffs.ly +++ b/input/regression/spacing-accidental-staffs.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Accidentals in different staves do not affect the spacing of the quarter notes here." } -\score { \notes \relative c'' << \new Staff { \time 4/4 +\score { \relative c'' << \new Staff { \time 4/4 c8[ c8 cis8 cis8] cis8[ cis8 cis8 cis] diff --git a/input/regression/spacing-accidental-stretch.ly b/input/regression/spacing-accidental-stretch.ly index a8bab93f4e..ef5e1230d2 100644 --- a/input/regression/spacing-accidental-stretch.ly +++ b/input/regression/spacing-accidental-stretch.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Accidentals do not influence the amount of stretchable space. @@ -8,7 +8,7 @@ The accidental does add a little non-stretchable space. } \score { - \notes \relative c'' \context GrandStaff { + \relative c'' \context GrandStaff { #(set-accidental-style 'piano-cautionary) d16 d d d d d cis d diff --git a/input/regression/spacing-accidental.ly b/input/regression/spacing-accidental.ly index 0ee6aeb1c8..840833fba0 100644 --- a/input/regression/spacing-accidental.ly +++ b/input/regression/spacing-accidental.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Accidentals sticking out to the left of a note will take a little more space, but only if the spacing is tight." } -\score { \notes \relative c'' { +\score { \relative c'' { \time 8/4 c2 c2 cis2 cis2 | c8 c8 cis8 cis8 cis c c c] diff --git a/input/regression/spacing-bar-stem.ly b/input/regression/spacing-bar-stem.ly index 1bd933b6bd..a9d7fb09c6 100644 --- a/input/regression/spacing-bar-stem.ly +++ b/input/regression/spacing-bar-stem.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Downstem notes following a barline are printed with some extra space. This is an optical correction similar @@ -11,7 +11,7 @@ Accidentals after the barline get some space as well. sd = \override Stem #'direction = #-1 su = \override Stem #'direction = #1 -\score { \notes\relative c'' +\score { \relative c'' { %\override Staff.StaffSpacing #'stem-spacing-correction = #10 diff --git a/input/regression/spacing-clef-first-note.ly b/input/regression/spacing-clef-first-note.ly index c283941aa1..a3812b7c33 100644 --- a/input/regression/spacing-clef-first-note.ly +++ b/input/regression/spacing-clef-first-note.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "Clef changes at the start of a line get much more space @@ -6,7 +6,7 @@ than clef changes halfway the line." } -\score {\notes { +\score { { << \new Staff { c'2 \clef bass e16 f a diff --git a/input/regression/spacing-end-of-line.ly b/input/regression/spacing-end-of-line.ly index 8f5b91c035..cc14ecc473 100644 --- a/input/regression/spacing-end-of-line.ly +++ b/input/regression/spacing-end-of-line.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc ="Broken engraving of a bar at the end of a line does not upset @@ -7,7 +7,7 @@ \score { -\notes \relative c' { + \relative c' { c2.. r8 c2.. r8 \time 3/4 \break diff --git a/input/regression/spacing-ended-voice.ly b/input/regression/spacing-ended-voice.ly index 959614c667..016a7c4cd0 100644 --- a/input/regression/spacing-ended-voice.ly +++ b/input/regression/spacing-ended-voice.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.2.0" +\version "2.3.4" \header { texidoc = " A voicelet (a very short voice to get polyphonic chords correct) should not confuse the spacing engine." @@ -7,7 +7,7 @@ should not confuse the spacing engine." \score { -\notes { \context Staff \relative c' { + { \context Staff \relative c' { c4 << { r4 dis'4 } \\ diff --git a/input/regression/spacing-folded-clef.ly b/input/regression/spacing-folded-clef.ly index d14e69d7c6..bdf5719a2d 100644 --- a/input/regression/spacing-folded-clef.ly +++ b/input/regression/spacing-folded-clef.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "A clef can be folded below notes in a different staff, if this does not disrupt the flow of the notes." } -\score { \notes \relative c'' << +\score { \relative c'' << \new Staff { c4 c16[ c c c] c4 c4 } \new Staff { \clef bass c,2 \clef treble c'2 } >> diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly index 6cb5203c3c..69d125a2fa 100644 --- a/input/regression/spacing-folded-clef2.ly +++ b/input/regression/spacing-folded-clef2.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "A clef can be folded below notes in a different staff, if @@ -6,7 +6,7 @@ there is space enough. With @code{Paper_column} stencil callbacks we can show where columns are in the score." } -\score { \notes \relative c'' << +\score { \relative c'' << \new Staff { c4 c4 c4 \bar "|." } \new Staff { \clef bass c,2 \clef treble c'2 } >> diff --git a/input/regression/spacing-grace-duration.ly b/input/regression/spacing-grace-duration.ly index 8b645f4bfe..77187702b8 100644 --- a/input/regression/spacing-grace-duration.ly +++ b/input/regression/spacing-grace-duration.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Spacing uses the duration of the notes, but disregards @@ -9,7 +9,7 @@ " } -\score { \notes \relative c'' +\score { \relative c'' \context Voice { c8[ c8] diff --git a/input/regression/spacing-grace.ly b/input/regression/spacing-grace.ly index 3cbe630924..4b63a944eb 100644 --- a/input/regression/spacing-grace.ly +++ b/input/regression/spacing-grace.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Grace note spacing. Should it be tuned? " } \score { - \notes \context Voice \relative c'' { \grace { c16[ d] } c4 } + \context Voice \relative c'' { \grace { c16[ d] } c4 } \paper { raggedright = ##t} } diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly index 3fa0bb9087..13f4a1399e 100644 --- a/input/regression/spacing-knee.ly +++ b/input/regression/spacing-knee.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "For knees, the spacing correction is such that the @@ -6,7 +6,7 @@ stems are put at regular distances. This effect takes into account the width of the note heads and the thickness of the stem. " } -\score { \notes +\score { { g''8[ g g'' g''] diff --git a/input/regression/spacing-multi-tuplet.ly b/input/regression/spacing-multi-tuplet.ly index d05dc752a7..8e7270886a 100644 --- a/input/regression/spacing-multi-tuplet.ly +++ b/input/regression/spacing-multi-tuplet.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc = "Concurrent tuplets should be equidistant on all staffs. @@ -9,7 +9,7 @@ uneven spacing. -multipart = \notes \relative c'{ +multipart = \relative c'{ \context StaffGroup << \new Staff \context Voice { \times 2/10 { c8[ c c c c c c c c c] } @@ -23,7 +23,7 @@ multipart = \notes \relative c'{ } \score{ - \notes { + { \multipart } diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly index 7a000c56b0..b6fef5be21 100644 --- a/input/regression/spacing-note-flags.ly +++ b/input/regression/spacing-note-flags.ly @@ -7,7 +7,7 @@ texidoc = "The flags of 8th notes take some space, but not } -\score { \notes \relative c'' \context Staff { +\score { \relative c'' \context Staff { \set autoBeaming = ##f a8[ a8 a8 a8] a8 a8 a8 a8 @@ -17,5 +17,5 @@ raggedright = ##t } } -\version "2.2.0" +\version "2.3.4" diff --git a/input/regression/spacing-ragged-last.ly b/input/regression/spacing-ragged-last.ly index 70b258240d..f188986014 100644 --- a/input/regression/spacing-ragged-last.ly +++ b/input/regression/spacing-ragged-last.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -10,7 +10,7 @@ \score { - \notes \relative c'' \new Staff { \repeat unfold 20 { c1 } } + \relative c'' \new Staff { \repeat unfold 20 { c1 } } \paper{ raggedlast = ##t } diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly index 559477dbf8..6c09a54794 100644 --- a/input/regression/spacing-rest.ly +++ b/input/regression/spacing-rest.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Rests get a little less space, since they are narrower. However, the quarter rest in feta font is relatively wide, causing this effect to be very small. " } -\score { \notes \relative c'' \context Staff { +\score { \relative c'' \context Staff { \time 12/4 r4 c4 c4 c4 r4 r4 c4 } diff --git a/input/regression/spacing-short-notes.ly b/input/regression/spacing-short-notes.ly index bfba06f52d..a4d95d0ed8 100644 --- a/input/regression/spacing-short-notes.ly +++ b/input/regression/spacing-short-notes.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Notes that are shorter than the common shortest note get a @@ -10,7 +10,7 @@ eighth note. " } -\score { \notes \relative c'' +\score { \relative c'' { \time 2/4 c16 c c c c4 c4 diff --git a/input/regression/spacing-stem-bar.ly b/input/regression/spacing-stem-bar.ly index f5cc5b3e88..6688f4f3d0 100644 --- a/input/regression/spacing-stem-bar.ly +++ b/input/regression/spacing-stem-bar.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Upstem notes before a barline are printed with some extra @@ -10,7 +10,7 @@ space. This is an optical correction similar to juxtaposed stems. sd = \override Stem #'direction = #-1 su = \override Stem #'direction = #1 -\score { \notes\relative e' +\score { \relative e' { %\override Staff.StaffSpacing #'stem-spacing-correction = #0.5 diff --git a/input/regression/spacing-stem-direction.ly b/input/regression/spacing-stem-direction.ly index c32e930274..9b103a12fd 100644 --- a/input/regression/spacing-stem-direction.ly +++ b/input/regression/spacing-stem-direction.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ @@ -12,7 +12,7 @@ much to correct." } \score { - \context Voice \notes\relative c { + \context Voice \relative c { % make sure neutral is down. \override Stem #'neutral-direction = #-1 \time 16/4 c''4 c c, c' d, c' e, c' f, c' g c a c b c diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly index 4b8f592b89..d54797b783 100644 --- a/input/regression/spacing-stem-same-direction.ly +++ b/input/regression/spacing-stem-same-direction.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "For juxtaposed chords with the same direction, a slight optical correction is used. It is constant, and works only if two chords have no common head-positions range." } -\score { \notes \relative c'' { +\score { \relative c'' { \stemDown \time 12/4 f8[ diff --git a/input/regression/spacing-to-grace.ly b/input/regression/spacing-to-grace.ly index fb7358ea89..235443eb66 100644 --- a/input/regression/spacing-to-grace.ly +++ b/input/regression/spacing-to-grace.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc ="Space from a normal note (or barline) to a grace note is @@ -8,7 +8,7 @@ } \score { - \context Voice \notes + \context Voice { \time 2/4 \relative c'' { e8 e \grace d8 e e \grace f8 e es, d' d diff --git a/input/regression/spacing-very-tight.ly b/input/regression/spacing-very-tight.ly index f293050bad..7ddca62965 100644 --- a/input/regression/spacing-very-tight.ly +++ b/input/regression/spacing-very-tight.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = " When tightly spaced, the spaces between elements (hinterfleisch?) @@ -14,7 +14,7 @@ texidoc = " } \score { - \notes \relative c''{ + \relative c''{ r1 e4 f, e' f, } \paper { diff --git a/input/regression/span-bar-break.ly b/input/regression/span-bar-break.ly index ac7a50d37f..5498eea986 100644 --- a/input/regression/span-bar-break.ly +++ b/input/regression/span-bar-break.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly index cb28fd748c..d75dee2f1c 100644 --- a/input/regression/span-bar.ly +++ b/input/regression/span-bar.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "Span bars are drawn only between staff bar lines. By setting bar lines to transparent, they are shown only between systems. @@ -10,7 +10,7 @@ between systems. } \score { - \notes \relative c' \new StaffGroup << + \relative c' \new StaffGroup << \new Staff { \override Score.BarLine #'transparent = ##t a1 a1 diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly index 2e75baa864..2d84917481 100644 --- a/input/regression/staccato-pos.ly +++ b/input/regression/staccato-pos.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ @@ -11,7 +11,7 @@ to it. " } \score { - \context Voice \notes\relative c' { + \context Voice \relative c' { e'4-. f-. g-. d-. c-. b-. \stemDown e,-. d-. c-. b-. a-. g-. diff --git a/input/regression/staff-halfway.ly b/input/regression/staff-halfway.ly index cbfab0d4ad..f55c55847c 100644 --- a/input/regression/staff-halfway.ly +++ b/input/regression/staff-halfway.ly @@ -2,10 +2,10 @@ \header { texidoc = " Staves starting and ending halfway include clefs and bar lines. " } -\version "2.2.0" +\version "2.3.4" \score { - \new StaffGroup \notes \relative c'' << + \new StaffGroup \relative c'' << \new Staff { c4 c c c \bar "||" c c c c } { \skip 4 \new Staff { c c c } } >> diff --git a/input/regression/staff-mixed-size.ly b/input/regression/staff-mixed-size.ly index a34d309c16..0a9ce17428 100644 --- a/input/regression/staff-mixed-size.ly +++ b/input/regression/staff-mixed-size.ly @@ -7,7 +7,7 @@ large on smaller staves." } -\version "2.2.0" +\version "2.3.4" \score { << @@ -15,12 +15,12 @@ large on smaller staves." fontSize = #-4 \override StaffSymbol #'staff-space = #(magstep -4) } - \notes \relative c' { + \relative c' { \override DynamicText #'extra-offset = #'(0 . 3) s1-\f c''8[(\< r a g]) e[ r d( ])\! \times 2/3 { d4 d d } } \new Staff - \notes \relative c' { + \relative c' { \override DynamicText #'extra-offset = #'(0 . 3) s1-\f c''8[(\< r a g]) e[ r d( ])\! \times 2/3 { d4 d d } } diff --git a/input/regression/staff-tweak.ly b/input/regression/staff-tweak.ly index ab3ceff435..86b6ef69e6 100644 --- a/input/regression/staff-tweak.ly +++ b/input/regression/staff-tweak.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "The staff is a grob (graphical object) which may be adjusted as well, for example, to have 6 thick lines and a slightly large @code{staff-space}. @@ -7,10 +7,10 @@ However, beams remain correctly quantized." } -mus = \notes \relative c' { c4 g' d'8 d d d } +mus = \relative c' { c4 g' d'8 d d d } \score { - \notes << + << \new Staff { \override Staff.StaffSymbol #'thickness = #2.0 \override Staff.StaffSymbol #'line-count = #6 diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly index 287a811ea2..e2c401aae8 100644 --- a/input/regression/stanza-number.ly +++ b/input/regression/stanza-number.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Stanza numbers are put left of their lyric. Theyr are aligned in a column." @@ -6,7 +6,7 @@ texidoc = "Stanza numbers are put left of their lyric. Theyr are aligned in a co \score { << - \context Voice = "A" \notes \relative c'' { r4 r4 c4 c4 } + \context Voice = "A" \relative c'' { r4 r4 c4 c4 } \lyricsto A \new Lyrics \lyrics { \skip 2 \set stanza = "1." diff --git a/input/regression/stem-direction.ly b/input/regression/stem-direction.ly index 65b78db6d8..0ca5526079 100644 --- a/input/regression/stem-direction.ly +++ b/input/regression/stem-direction.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -15,7 +15,7 @@ notes, and up for low notes. \score { - \context Voice \notes\relative c { + \context Voice \relative c { b''4 ~ b8(b8) e4 e, } diff --git a/input/regression/stem-shorten.ly b/input/regression/stem-shorten.ly index 6ec6b134da..753b6759f2 100644 --- a/input/regression/stem-shorten.ly +++ b/input/regression/stem-shorten.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -10,7 +10,7 @@ } \score { - \notes \relative c'' { + \relative c'' { \stemDown d c b a g f e \stemBoth \stemUp a b c d e f g a diff --git a/input/regression/stem-spacing.ly b/input/regression/stem-spacing.ly index 54e5c6187e..69ae2718b4 100644 --- a/input/regression/stem-spacing.ly +++ b/input/regression/stem-spacing.ly @@ -1,5 +1,5 @@ -\version "2.3.2" +\version "2.3.4" \header{ texidoc=" @@ -10,7 +10,7 @@ In this example, space for opposite pointed stems is adjusted. } \score { - \context Voice \notes\relative c { + \context Voice \relative c { \time 12/4 c''4 c c c a f' f, a @@ -21,7 +21,7 @@ In this example, space for opposite pointed stems is adjusted. } \score { - \context Voice \notes\relative c { + \context Voice \relative c { \time 12/4 c''4 c c c a f' f, a diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly index a37065b2fb..5a200f02f3 100644 --- a/input/regression/stem-tremolo.ly +++ b/input/regression/stem-tremolo.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" Stem tremolos or rolls are tremolo signs that look like beam segments @@ -11,7 +11,7 @@ tremolo must be centered on the note. \score{ - \context Voice\notes \relative c''{ + \context Voice \relative c''{ \override TextScript #'direction = #1 \override TextScript #'padding = #5 a1:4^":4" a:8^":8" c:16^":16" a:32^":32" a^"x" a:^":" diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly index 61b60ec272..346d7aea63 100644 --- a/input/regression/system-extents.ly +++ b/input/regression/system-extents.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "The size of every system is correctly determined; this @@ -6,7 +6,7 @@ } -\score { \notes +\score { \context Voice { \unset Staff.minimumVerticalExtent \slurDown c4 ( g4 c''4) diff --git a/input/regression/system-start-bracket.ly b/input/regression/system-start-bracket.ly index b02641ac21..7ee7c61335 100644 --- a/input/regression/system-start-bracket.ly +++ b/input/regression/system-start-bracket.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = " @@ -7,7 +7,7 @@ The piano brace should be shifted horizontally if it is enclosed in a bracket. } -\score { \notes { +\score { { \context StaffGroup << c4 \context PianoStaff << diff --git a/input/regression/tablature-string-tunings.ly b/input/regression/tablature-string-tunings.ly index d2be7f20ea..8841ae4730 100644 --- a/input/regression/tablature-string-tunings.ly +++ b/input/regression/tablature-string-tunings.ly @@ -6,10 +6,10 @@ } -\version "2.2.0" +\version "2.3.4" \score { - \notes \new TabStaff { + \new TabStaff { \set TabStaff.stringTunings = #'(5 10 15 20) \relative c'' { c4 d e f } } diff --git a/input/regression/tablature.ly b/input/regression/tablature.ly index 8c1044fd61..e23ccaa854 100644 --- a/input/regression/tablature.ly +++ b/input/regression/tablature.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc = "@cindex Tabulature A sample tablature, with both normal staff and tab. @@ -12,7 +12,7 @@ chord articulations (outside a chord) " } -partition = \notes { +partition = { \key e \major diff --git a/input/regression/tag-filter.ly b/input/regression/tag-filter.ly index 593c89b2aa..77af936b35 100644 --- a/input/regression/tag-filter.ly +++ b/input/regression/tag-filter.ly @@ -1,5 +1,5 @@ -\version "2.3.1" +\version "2.3.4" \header { texidoc = "The @code{\\tag} command marks music expressions with a @@ -14,7 +14,7 @@ notes and fingerings, but the score has not." \paper { raggedright= ##t } common = -\notes \relative c'' { + \relative c'' { c1 \relative c' << @@ -31,7 +31,7 @@ common = \score { - \notes \simultaneous { + \simultaneous { \new Staff { \set Staff.instrument = #"both" \common diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly index 3543fea5d5..af435dd6a9 100644 --- a/input/regression/text-spanner.ly +++ b/input/regression/text-spanner.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc= "Text spanners should not repeat start text when broken." } \score { - \notes \relative c'' { + \relative c'' { \set crescendoText = #"cresc." \set crescendoSpanner = #'dashed-line c1\< c \break diff --git a/input/regression/tie-busy-grobs.ly b/input/regression/tie-busy-grobs.ly index 811d9229b4..f0fb19edbe 100644 --- a/input/regression/tie-busy-grobs.ly +++ b/input/regression/tie-busy-grobs.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Tie engraver uses @code{busyGrobs} to keep track of diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly index d7116afc80..42f3a8759c 100644 --- a/input/regression/tie-chord.ly +++ b/input/regression/tie-chord.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" When tying chords, the outer slurs point outwards, the inner slurs @@ -9,10 +9,10 @@ by setting explicitly the @code{direction} of a @code{TieColumn}. } -t = \notes \relative c' { ~ } +t = \relative c' { ~ } \score { -\notes \context Voice { + \context Voice { \t \transpose c g \t diff --git a/input/regression/tie-dots.ly b/input/regression/tie-dots.ly index f62873b2a2..029d747f03 100644 --- a/input/regression/tie-dots.ly +++ b/input/regression/tie-dots.ly @@ -1,9 +1,9 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Ties should not collide with dots." } -\score{\notes{\time 9/8 \key f \major\clef bass +\score{{\time 9/8 \key f \major\clef bass g4 d8 bes4. ~ bes4 a8 \bar "|" a8 gis8 d8 f4. gis,4. \bar "|" a,4. ~ a,4 r8 r4 r8 \bar "|" diff --git a/input/regression/tie-grace.ly b/input/regression/tie-grace.ly index 49205ed924..c8d2f2f4fc 100644 --- a/input/regression/tie-grace.ly +++ b/input/regression/tie-grace.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Tieing a grace to the to a following grace or main note works." } \paper { raggedright= ##t } -\score { \notes \context Voice \relative c'' { +\score { \context Voice \relative c'' { c4 \grace { c8 ~ c16 ~ } c4 } } diff --git a/input/regression/tie.ly b/input/regression/tie.ly index 877132d799..4142552d81 100644 --- a/input/regression/tie.ly +++ b/input/regression/tie.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -8,7 +8,7 @@ The horizontal middle should not overlap with a staffline. " } \score{ - \notes\relative c''{ + \relative c''{ %b2~b4~b8~b16~b32~b64 r64\break %a2~a4~a8~a16~a32~a64 r64 \time 8/4 diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly index e88466f627..bb0341995d 100644 --- a/input/regression/tuplet-beam.ly +++ b/input/regression/tuplet-beam.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "In combination with a beam, the bracket of the tuplet @@ -9,7 +9,7 @@ the bracket." } \paper { raggedright= ##t } -\score { \notes \context Voice\relative c'' { +\score { \context Voice\relative c'' { \times 2/3 { r c8[ c8] } \times 2/3 { c8[ c c] } \times 2/3 { c16[ c16] c8[ c8] } diff --git a/input/regression/tuplet-gap.ly b/input/regression/tuplet-gap.ly index e673f8cc39..6ddc3a97b5 100644 --- a/input/regression/tuplet-gap.ly +++ b/input/regression/tuplet-gap.ly @@ -5,7 +5,7 @@ } -\version "2.2.0" +\version "2.3.4" \paper { indent = 0.0\mm @@ -13,7 +13,7 @@ } \score{ - \notes \relative c'' { + \relative c'' { \set tupletNumberFormatFunction = #fraction-tuplet-formatter \times 17/12 { c8 c4 c8 c8} } diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly index f03cd4782d..74e884cf5b 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -1,5 +1,5 @@ -\version "2.3.1" +\version "2.3.4" \header { diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly index 0555270984..eb38718348 100644 --- a/input/regression/tuplet-properties.ly +++ b/input/regression/tuplet-properties.ly @@ -6,11 +6,11 @@ for instance, bracketed (B) and non-bracketed (NB). } -\version "2.2.0" +\version "2.3.4" \score { - \context Voice \notes\relative c'' { + \context Voice \relative c'' { \times 2/3 { c'8 c,, c } \times 2/3 { c'8 c'' c,, } diff --git a/input/regression/tuplet-rest.ly b/input/regression/tuplet-rest.ly index 02a88275f9..de7568ccaf 100644 --- a/input/regression/tuplet-rest.ly +++ b/input/regression/tuplet-rest.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Tuplets may contain rests. " @@ -7,7 +7,7 @@ } \score { - \context Voice \notes \relative c'' { + \context Voice \relative c'' { \time 2/4 \times 2/3 { r c,,, c''' } \times 2/3 { r c c } diff --git a/input/regression/tuplet-slope.ly b/input/regression/tuplet-slope.ly index dda9397581..6489a4bb1d 100644 --- a/input/regression/tuplet-slope.ly +++ b/input/regression/tuplet-slope.ly @@ -12,10 +12,10 @@ The bracket direction is determined by the dominating stem direction. } -\version "2.2.0" +\version "2.3.4" \score { - \notes \relative c' { + \relative c' { \times 4/5 { a'4 as g fis f } \times 4/5 { fis4 e es d des } \times 4/5 { fis,4 e es d des } diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly index 1e786112bb..47d86ad358 100644 --- a/input/regression/tuplet-staffline-collision.ly +++ b/input/regression/tuplet-staffline-collision.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Horizontal tuplet brackets are shifted vertically @@ -9,7 +9,7 @@ to avoid staff line collisions." \paper { raggedright= ##t } -\score { \notes \context Voice\relative c'' { +\score { \context Voice\relative c'' { \times 2/3 { b'4 b b } \times 2/3 { f4 f f } \times 2/3 { g4 g g } diff --git a/input/regression/tuplets.ly b/input/regression/tuplets.ly index b17bada1a8..6160d80f19 100644 --- a/input/regression/tuplets.ly +++ b/input/regression/tuplets.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -19,7 +19,7 @@ direction as the bracket. The endings can be adjusted with \paper { raggedright= ##t } \score{ - \notes \context Voice \relative c'' { + \context Voice \relative c'' { \times 2/3 { a8 b c } \times 2/3 { r8 b[ f] } \override TupletBracket #'bracket-flare = #'(0.5 . 0.5) diff --git a/input/regression/voice-follower.ly b/input/regression/voice-follower.ly index a5f2b231be..6c7ce00ecf 100644 --- a/input/regression/voice-follower.ly +++ b/input/regression/voice-follower.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc= " @@ -9,7 +9,7 @@ can be printed automatically. This is enabled if the property } \score { - \notes \relative c' + \relative c' \context PianoStaff << \set PianoStaff.followVoice = ##t \context Staff = one \context Voice { diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly index 32da07c0a5..18237a7cfd 100644 --- a/input/regression/volta-broken-left-edge.ly +++ b/input/regression/volta-broken-left-edge.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc ="Broken volta spanners behave correctly at their left edge in all cases." @@ -39,7 +39,7 @@ Bar 23 Perfect %} -voiceB = \notes { +voiceB = { \clef bass \set Staff.instrument = "Bass" \set Staff.instr = "B" @@ -61,7 +61,7 @@ voiceB = \notes { } } } -voiceC = \notes { +voiceC = { \repeat volta 2 { f f @@ -74,7 +74,7 @@ f f } } -voiceD = \notes { +voiceD = { \repeat volta 2 { f f @@ -88,7 +88,7 @@ f f } } } -voiceE = \notes { +voiceE = { \repeat volta 2 { f f\break @@ -105,7 +105,7 @@ f f\break } } \score{ - \notes << + << \new Staff diff --git a/input/regression/volta-multi-staff.ly b/input/regression/volta-multi-staff.ly index 861aa717c5..a806d8155f 100644 --- a/input/regression/volta-multi-staff.ly +++ b/input/regression/volta-multi-staff.ly @@ -4,14 +4,14 @@ on more staves in a score." } -\version "2.2.0" +\version "2.3.4" -vmus = \notes { \repeat volta 2 c1 \alternative { d e } } +vmus = { \repeat volta 2 c1 \alternative { d e } } \score { - \notes \relative c'' << + \relative c'' << \new StaffGroup << \context Staff \vmus \new Staff \vmus diff --git a/input/screech-boink.ly b/input/screech-boink.ly index 1008d7575c..aa9cba8024 100644 --- a/input/screech-boink.ly +++ b/input/screech-boink.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { title = "Screech and boink" subtitle = "Random complex notation" @@ -6,7 +6,7 @@ } \score { - \notes \context PianoStaff << + \context PianoStaff << \context Staff = up { \time 4/8 \key c \minor diff --git a/input/simple-song.ly b/input/simple-song.ly index 634fa9faa4..2a98ae5cad 100644 --- a/input/simple-song.ly +++ b/input/simple-song.ly @@ -15,4 +15,4 @@ >> %% Optional helper for automatic updating by convert-ly. May be omitted. -\version "2.3.0" +\version "2.3.4" diff --git a/input/simple.ly b/input/simple.ly index 744a969c13..edb093dfd6 100644 --- a/input/simple.ly +++ b/input/simple.ly @@ -4,4 +4,4 @@ } %% Optional helper for automatic updating by convert-ly. May be omitted. -\version "2.3.0" +\version "2.3.4" diff --git a/input/test/+.ly b/input/test/+.ly index 404cba5b14..b7016f37ea 100644 --- a/input/test/+.ly +++ b/input/test/+.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" %% +.ly: Be the first .ly file for lys-to-tely.py. %% Better to make lys-to-tely.py include "introduction.texi" or %% other .texi documents too? diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly index fa6498658d..aec219f626 100644 --- a/input/test/add-staccato.ly +++ b/input/test/add-staccato.ly @@ -1,5 +1,5 @@ -\version "2.3.1" +\version "2.3.4" \header { @@ -26,7 +26,7 @@ it is not necessary to use scm constructs (see @code{separate-staccato.ly}). (add-script m "staccato")) \score { - \notes\relative c'' { + \relative c'' { a b \applymusic #(lambda (x) (music-map add-staccato x)) { c c } } \paper{ raggedright = ##t } diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly index c9d32e4da2..78cabb6d2f 100644 --- a/input/test/add-text-script.ly +++ b/input/test/add-text-script.ly @@ -1,4 +1,4 @@ -\version "2.3.1" +\version "2.3.4" \header { texidoc= "@cindex make-music Fingering @@ -28,7 +28,7 @@ create, then write a function that will structure the music for you. m) \score { - \applymusic #(lambda (x) (add-text-script x "6") (display-music x) x ) \notes { c'4-3 } + \applymusic #(lambda (x) (add-text-script x "6") (display-music x) x ) { c'4-3 } \paper{ raggedright = ##t } } diff --git a/input/test/ambitus-mixed.ly b/input/test/ambitus-mixed.ly index 79f2576aaa..afe076779c 100644 --- a/input/test/ambitus-mixed.ly +++ b/input/test/ambitus-mixed.ly @@ -13,7 +13,7 @@ in the same score (not demonstrated in this file). " } -\version "2.3.2" +\version "2.3.4" #(define (kill-ambitus grob grob-context apply-context) (if (memq 'ambitus-interface (ly:grob-property grob 'interfaces)) @@ -27,10 +27,10 @@ in the same score (not demonstrated in this file). -voiceA = \notes \relative c'' { +voiceA = \relative c'' { c4 a d e f2 } -voiceB = \notes \relative c' { +voiceB = \relative c' { es4 f g as b2 } \score { diff --git a/input/test/ancient-accidentals.ly b/input/test/ancient-accidentals.ly index 7351d0e563..6ab7145024 100644 --- a/input/test/ancient-accidentals.ly +++ b/input/test/ancient-accidentals.ly @@ -6,10 +6,10 @@ are collected here. " } -\version "2.2.0" +\version "2.3.4" \score { - \context Voice \notes\relative c { + \context Voice \relative c { \time 3/4 \override Staff.Accidental #'style = #'default cisis''^"Accidental style = \#'default" cisis! cisis? | diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index 9268eeb072..8ad4cf4ea6 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" % TODO: split ancient-font into seperate files; possibly in % different locations. \header { @@ -16,7 +16,7 @@ upperStaff = \context GregorianStaff = upperStaff << \override Staff.StaffSymbol #'line-count = #4 - \notes \transpose c c { + \transpose c c { \override Staff.KeySignature #'style = #'vaticana \override Staff.Accidental #'style = #'vaticana \override NoteHead #'style = #'vaticana_punctum @@ -119,7 +119,7 @@ lowerStaff = \context MensuralStaff = lowerStaff << % \override Staff.StaffSymbol #'line-count = #5 \context Staff \applyoutput #(outputproperty-compatibility (make-type-checker 'staff-symbol-interface) 'line-count 5) - \notes \transpose c c { + \transpose c c { \set autoBeaming = ##f \override NoteHead #'style = #'neo_mensural \override Rest #'style = #'neo_mensural diff --git a/input/test/ancient-time.ly b/input/test/ancient-time.ly index 590156202e..4548dc0f4f 100644 --- a/input/test/ancient-time.ly +++ b/input/test/ancient-time.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" % TODO: move stuff from ancient-font into here? See comment % for ancient-font.ly \header { @@ -8,7 +8,7 @@ Time signatures may also be engraved in an old style. } \score { - \notes { + { \override Staff.TimeSignature #'style = #'neo_mensural s1 } diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly index 059e479031..5361ae41b7 100644 --- a/input/test/bagpipe.ly +++ b/input/test/bagpipe.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "@cindex Bagpipe Music @@ -16,123 +16,123 @@ Here's an example of bagpipe music. } } -taor = \notes{ \grace { +taor = { \grace { g32[ d' g e'] } } -grip = \notes { +grip = { \grace { g32[ b g ] } } -thrd = \notes { +thrd = { \grace { g32[ d' c'] } } -birl = \notes { +birl = { \grace { g32[ a g] } } -gstd = \notes { +gstd = { \grace { g'32[ d' g] } } -lgg = \notes { +lgg = { \grace { g32 } } -lag = \notes { +lag = { \grace { a32 } } -fgg = \notes { +fgg = { \grace { f32[ g'32] } } -dblb = \notes { +dblb = { \grace { g'32[ b d'] } } -dblc = \notes { +dblc = { \grace { g'32[ c' d'] } } -dble = \notes { +dble = { \grace { g'32[ e' f'] } } -dblf = \notes { +dblf = { \grace { g'32[ f' g'] } } -dblg = \notes { +dblg = { \grace { g'32[ f'] } } -dbla = \notes { +dbla = { \grace { a'32[ g'] } } -cg = \notes { +cg = { \grace { c'32 } } -eg = \notes { +eg = { \grace { e'32 } } -gg = \notes { +gg = { \grace { g'32 } } -dg = \notes { +dg = { \grace { d'32 } } -hag = \notes { +hag = { \grace { a'32 } } -gefg = \notes { +gefg = { \grace { g'32[ e' f'] } } -efg = \notes { +efg = { \grace { e'32[ f'] } } -gdcg = \notes { +gdcg = { \grace { g'32[ d' c'] } } -gcdg = \notes { +gcdg = { \grace { g'32[ c' d'] } } \score { - \notes { + { \time 6/8 \partial 4 \tieUp \slurUp diff --git a/input/test/bar-always.ly b/input/test/bar-always.ly index cb77541926..2ae0adb7ec 100644 --- a/input/test/bar-always.ly +++ b/input/test/bar-always.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Bars Always @@ -10,7 +10,7 @@ By setting @code{barAlways} and @code{defaultBarType}, barlines may be inserted \score { - \notes \relative c''{ + \relative c''{ \set Score.barAlways = ##t \set Score.defaultBarType = ":|:" c4 c4 c4 c4 } diff --git a/input/test/bar-lines-lyric-only.ly b/input/test/bar-lines-lyric-only.ly index 56bf0c7f68..705793bf55 100644 --- a/input/test/bar-lines-lyric-only.ly +++ b/input/test/bar-lines-lyric-only.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "@cindex Bar line lyric only You can move @code{Bar_engraver} and @code{Span_bar_engraver} to a different engraving context, if you want, for example, bar lines @@ -6,7 +6,7 @@ on lyrics. " } \score { -\notes \relative c' \context ChoirStaff << + \relative c' \context ChoirStaff << \new Staff { c1 c1 c1} \context Lyrics \lyrics << { bla1 die bla } diff --git a/input/test/bar-lines.ly b/input/test/bar-lines.ly index 1ee707fdf7..ff13cafa81 100644 --- a/input/test/bar-lines.ly +++ b/input/test/bar-lines.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Bar Lines There a many types of bar lines available. @@ -7,7 +7,7 @@ There a many types of bar lines available. % TODO: dashed "|", HJJ \score { -\notes \relative c'' { + \relative c'' { c4 \bar "|." c \bar "|:"c diff --git a/input/test/bar-number-every-five-reset.ly b/input/test/bar-number-every-five-reset.ly index 571acee991..540c8f3ce4 100644 --- a/input/test/bar-number-every-five-reset.ly +++ b/input/test/bar-number-every-five-reset.ly @@ -1,4 +1,4 @@ -\version "2.3.1" +\version "2.3.4" \header { texidoc = "@cindex Bar Number Every Fifth Reset @@ -16,7 +16,7 @@ resetBarnum = \context Score \applycontext #(set-bar-number-visibility 4) \score { << - \notes \transpose c c'' { + \transpose c c'' { \override Score.BarNumber #'break-visibility =#end-of-line-invisible \override Score.RehearsalMark #'padding = #2.5 \mark "A" \resetBarnum diff --git a/input/test/bar-number-regular-interval.ly b/input/test/bar-number-regular-interval.ly index 616f0f31ba..e014f432ef 100644 --- a/input/test/bar-number-regular-interval.ly +++ b/input/test/bar-number-regular-interval.ly @@ -5,10 +5,10 @@ Bar numbers can also be printed inside boxes. " } -\version "2.2.0" +\version "2.3.4" \score { - \context Staff \notes \transpose c c' { + \context Staff \transpose c c' { \override Score.BarNumber #'break-visibility = #end-of-line-invisible \set Score.barNumberVisibility = #(every-nth-bar-number-visible 4) \override Score.BarNumber #'print-function = diff --git a/input/test/bar-number-show-all.ly b/input/test/bar-number-show-all.ly index b0aea06fbf..eeef69e44a 100644 --- a/input/test/bar-number-show-all.ly +++ b/input/test/bar-number-show-all.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="@cindex Bar Number Show All By default, bar numbers are printed only in the first measure. This @@ -7,7 +7,7 @@ setting can be overridden, so that bar numbers on start of every measure. " } \score{ - \notes\relative c'{ + \relative c'{ c1 c c \override Score.BarNumber #'break-visibility = #end-of-line-invisible diff --git a/input/test/beam-alternate.ly b/input/test/beam-alternate.ly index dc461604af..bb06101860 100644 --- a/input/test/beam-alternate.ly +++ b/input/test/beam-alternate.ly @@ -8,7 +8,7 @@ } -\version "2.2.0" +\version "2.3.4" wipeNote = { \once \override NoteHead #'transparent = ##t @@ -17,7 +17,7 @@ wipeNote = { \score { - \notes \relative c'' { + \relative c'' { << { c8[~ \wipeNote diff --git a/input/test/beam-auto-4-8.ly b/input/test/beam-auto-4-8.ly index 7e942e8813..276afd786f 100644 --- a/input/test/beam-auto-4-8.ly +++ b/input/test/beam-auto-4-8.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" % keep for now, although merging into beam-auto-override is a possibility. \header { texidoc = "@cindex Auto Beaming 4/8 @@ -8,7 +8,7 @@ You can override the automatic beaming settings. } \score{ - \notes\relative c''{ + \relative c''{ \time 4/8 %{ diff --git a/input/test/beam-auto-override.ly b/input/test/beam-auto-override.ly index 86a512c5bd..b9c674606d 100644 --- a/input/test/beam-auto-override.ly +++ b/input/test/beam-auto-override.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Auto Beaming Override @@ -23,7 +23,7 @@ The @code{autoBeaming} can also be turned off. %% TODO: check doc string. -hw \score{ - \notes \relative c''{ + \relative c''{ #(override-auto-beam-setting '(end * * * *) 1 2) \time 2/4 % one beam per measure diff --git a/input/test/beam-auto.ly b/input/test/beam-auto.ly index f50fba3f2a..8723477dda 100644 --- a/input/test/beam-auto.ly +++ b/input/test/beam-auto.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc = "@cindex Beaming Presets There are presets for the @code{auto-beam} engraver in the case of common time signatures. " } \score{ - \notes \relative c''{ + \relative c''{ \time 1/2 c8 c c c diff --git a/input/test/beam-control.ly b/input/test/beam-control.ly index c225ba57c9..722408ad2c 100644 --- a/input/test/beam-control.ly +++ b/input/test/beam-control.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="@cindex Beam Position Control @@ -7,7 +7,7 @@ Beam positions may be controlled manually, by overriding the @code{positions} se " } \score { - \context Voice \notes\relative c { + \context Voice \relative c { %% from upper staffline (position 4) to centre (position 0) \override Beam #'positions = #'(2 . 0) c'8[ c] diff --git a/input/test/beam-count.ly b/input/test/beam-count.ly index 0e34ed00f2..3ba759919d 100644 --- a/input/test/beam-count.ly +++ b/input/test/beam-count.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="@cindex Beam Count @@ -8,7 +8,7 @@ two sets of four 32nds are joined, as if they were 8th notes. " } -fragment = \notes { +fragment = { #(override-auto-beam-setting '(end * * * *) 1 4) f32 g a b b a g f @@ -20,7 +20,7 @@ fragment = \notes { \score { - \notes\relative c \fragment + \relative c \fragment \paper { raggedright = ##t} } diff --git a/input/test/beam-dir-functions.ly b/input/test/beam-dir-functions.ly index db8dd4dce5..6078eae629 100644 --- a/input/test/beam-dir-functions.ly +++ b/input/test/beam-dir-functions.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Beam Dir Functions @@ -23,7 +23,7 @@ own one. \paper { raggedright = ##t} \score { - \notes\relative c'' {\time 3/4 + \relative c'' {\time 3/4 \override Beam #'dir-function = #beam-dir-majority c8[ g] \override Beam #'dir-function = #beam-dir-mean diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index 81f04c4f23..6e582b461f 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="@cindex Beam Isknee @@ -10,10 +10,10 @@ Beams can be placed across a @code{PianoStaff}. } \score{ \context PianoStaff << - \context Staff=one \notes\relative c'{ + \context Staff=one \relative c'{ s1 } - \context Staff=two \notes\relative c'{ + \context Staff=two \relative c'{ \clef bass % no knee \stemUp c8[ \change Staff=one \stemDown g'16 f] diff --git a/input/test/beam-neutral-direction.ly b/input/test/beam-neutral-direction.ly index 746df4a813..5123ffba11 100644 --- a/input/test/beam-neutral-direction.ly +++ b/input/test/beam-neutral-direction.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="@cindex Beam Neutral Direction When a beam falls in the middle of the staff, the beams point normally down. However, this behaviour can be altered, if desired. " } -fragment = \notes { +fragment = { b''8[ b] \override Beam #'neutral-direction = #-1 b[ b] @@ -17,7 +17,7 @@ fragment = \notes { \paper { raggedright = ##t} \score { - \notes\relative c \fragment + \relative c \fragment \paper {raggedright = ##t } } diff --git a/input/test/beam-rest.ly b/input/test/beam-rest.ly index 6c1b76bb3e..104d6b3254 100644 --- a/input/test/beam-rest.ly +++ b/input/test/beam-rest.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="@cindex Beam Over Rests @@ -7,7 +7,7 @@ Beams may be forced to be over rests. " } \score{ - \notes\relative c''{ + \relative c''{ r4 r8[ g a] bes8[ r16 f g a] bes8[ r16 \set stemLeftBeamCount = #1 f g a] diff --git a/input/test/blank-notes.ly b/input/test/blank-notes.ly index 89e1de2df5..e050241d60 100644 --- a/input/test/blank-notes.ly +++ b/input/test/blank-notes.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" % possible rename to invis-notes.ly % check if other documents call this "blank notes", though. I think % invisible notes sounds better, but whatever it is, it should be @@ -18,7 +18,7 @@ unblanknotes = { \revert NoteHead #'transparent \score { - \notes \relative c'' { c4 d4 + \relative c'' { c4 d4 \blanknotes e4 f4 \unblanknotes g4 a } diff --git a/input/test/blank-paper-tab.ly b/input/test/blank-paper-tab.ly index 4fdc65471b..fc068ba963 100644 --- a/input/test/blank-paper-tab.ly +++ b/input/test/blank-paper-tab.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "@cindex Blank Paper Tab @@ -6,10 +6,10 @@ A blank music paper can be produced by using spacer rests, and removing @code{Bar_number_engraver}. Here is an empty staff with a tablature staff. " } -emptymusic = \notes { \repeat unfold 4 { s1\break } \bar "|." } +emptymusic = { \repeat unfold 4 { s1\break } \bar "|." } \score { -\notes << + << \context Staff \emptymusic \context TabStaff \emptymusic >> diff --git a/input/test/blank-paper.ly b/input/test/blank-paper.ly index fb614d6c30..2b0a2f63c3 100644 --- a/input/test/blank-paper.ly +++ b/input/test/blank-paper.ly @@ -1,4 +1,4 @@ -\version "2.3.0" +\version "2.3.4" \header { texidoc="@cindex Blank Paper diff --git a/input/test/boxed-stencil.ly b/input/test/boxed-stencil.ly index 0fb6829b1a..a7d254867b 100644 --- a/input/test/boxed-stencil.ly +++ b/input/test/boxed-stencil.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Boxed Stencil @@ -7,7 +7,7 @@ The @code{print-function} can be overridden to draw a box around an arbitrary grob. " } - \score { \notes \relative c'' { + \score { \relative c'' { \override TextScript #'print-function = #(make-stencil-boxer 0.1 0.3 0.2 Text_item::print) diff --git a/input/test/cadenza-skip.ly b/input/test/cadenza-skip.ly index 323724b145..256aa9a39d 100644 --- a/input/test/cadenza-skip.ly +++ b/input/test/cadenza-skip.ly @@ -7,9 +7,9 @@ } -\version "2.2.0" +\version "2.3.4" -cadenza = \notes \relative c' { +cadenza = \relative c' { c4 d8 << { e f g } \\ { d4. } >> g4 f2 g4 g } @@ -40,7 +40,7 @@ cadenza = \notes \relative c' { \score { - \notes + \relative c' \new GrandStaff << \new Staff { \cadenza c4 \bar "|." } \new Staff { diff --git a/input/test/caps.ly b/input/test/caps.ly index a2d6b0d346..014141d34b 100644 --- a/input/test/caps.ly +++ b/input/test/caps.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Capital Letters The font can be changed to small caps. @@ -9,7 +9,7 @@ shapeSC = \override LyricText #'font-shape = #'caps shapeNorm = \revert LyricText #'font-shape \score { << - \notes \relative c'' { c4 c4 c8 c8 c8 } + \relative c'' { c4 c4 c8 c8 c8 } \context Lyrics \lyrics { what4 is4 \shapeSC The8 Ma -- trix? } >> diff --git a/input/test/cautionaries.ly b/input/test/cautionaries.ly index 1f95942c22..545847d0b6 100644 --- a/input/test/cautionaries.ly +++ b/input/test/cautionaries.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="@cindex Cautionary Accidentals Cautinary accidentals are displayed in slurs by default. They can be shown also with accidentals of smaller size. " } -\score { \notes \context Staff \transpose c c'' { +\score { \context Staff \transpose c c'' { \key d \major % \set Staff.autoReminders = #'cautionary \override Staff.Accidental #'font-size = #0 diff --git a/input/test/chord-names-german.ly b/input/test/chord-names-german.ly index 50cb424a31..e05b39904a 100644 --- a/input/test/chord-names-german.ly +++ b/input/test/chord-names-german.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "@cindex Chord Names German The english naming of chords (default) can be changed to german @@ -16,7 +16,7 @@ scm = \chords { % beses/beses } \score { -\notes << + << \context ChordNames { \scm } \new ChordNames { \set instrument = #"german" diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly index d225edf569..5d282eaa47 100644 --- a/input/test/chord-names-jazz.ly +++ b/input/test/chord-names-jazz.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { @@ -15,7 +15,7 @@ are turned off for brevity. } -chs = \notes \transpose c' c' +chs = \transpose c' c' { 1 % m = minor triad @@ -67,7 +67,7 @@ chs = \notes \transpose c' c' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % alternate Jazz notation -efullmusicJazzAlt = \notes +efullmusicJazzAlt = { 1-\markup { "+" } -\markup { \normal-size-super @@ -83,7 +83,7 @@ efullmusicJazzAlt = \notes efullJazzAlt = #(sequential-music-to-chord-exceptions efullmusicJazzAlt #f) -epartialmusicJazzAlt = \notes{ +epartialmusicJazzAlt = { 1-\markup { \normal-size-super "2" } -\markup { "m" } -\markup { \normal-size-super "sus4" } @@ -141,7 +141,7 @@ banterProperties = \sequential { } %} - \new Staff \notes \transpose c c' { \chs } + \new Staff \transpose c c' { \chs } >> \paper { indent = 3.\cm diff --git a/input/test/chord-names-no-inversions.ly b/input/test/chord-names-no-inversions.ly index fe240dd5e9..66f5cffc74 100644 --- a/input/test/chord-names-no-inversions.ly +++ b/input/test/chord-names-no-inversions.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc= "@cindex Chord Names No Inversions Since there are several interpretations for recognizing chord names, the lowest note is the bass note of a chord and the inversion of the chord is found accordingly. " } -scheme = \notes { +scheme = { 1 diff --git a/input/test/chords-without-melody.ly b/input/test/chords-without-melody.ly index 36be7ea5ba..2013001da3 100644 --- a/input/test/chords-without-melody.ly +++ b/input/test/chords-without-melody.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "Jazz chord names can also be printed without notes." } diff --git a/input/test/clef-8-syntax.ly b/input/test/clef-8-syntax.ly index 35b29ddde3..2d99edc066 100644 --- a/input/test/clef-8-syntax.ly +++ b/input/test/clef-8-syntax.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Chord Octavation Appending @code{_8} or @code{^8} to a clef name will @@ -8,7 +8,7 @@ is given in quotes (such as \"treble^8\"). " } \score { - \context Voice \notes\relative c { + \context Voice \relative c { \clef "bass_8" c4 c c c | \clef "treble^8" c'''4 c c c | } diff --git a/input/test/clef-end-of-line.ly b/input/test/clef-end-of-line.ly index 53c3f09952..28e6e93f29 100644 --- a/input/test/clef-end-of-line.ly +++ b/input/test/clef-end-of-line.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Clef End of Line @@ -6,7 +6,7 @@ In these scales, the clef and key signature are shown at the end of the line. " } \score { - \notes \transpose c c' { + \transpose c c' { \override Staff.Clef #'break-visibility = #end-of-line-visible \override Staff.KeySignature #'break-visibility = #end-of-line-visible \set Staff.explicitClefVisibility = #end-of-line-visible diff --git a/input/test/clef-manual-control.ly b/input/test/clef-manual-control.ly index 464774d4c9..1f25fd4718 100644 --- a/input/test/clef-manual-control.ly +++ b/input/test/clef-manual-control.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc = " @cindex Clef Manual Control @@ -9,7 +9,7 @@ are central C." } -\score { \notes { +\score { { \set Staff.clefGlyph = #"clefs-F" \set Staff.clefPosition = #2 c'4 diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly index f9c1fe29ba..36bc794b56 100644 --- a/input/test/coriolan-margin.ly +++ b/input/test/coriolan-margin.ly @@ -1,5 +1,5 @@ -\version "2.3.2" +\version "2.3.4" % Ugh, we need to override some LaTeX titling stuff @@ -24,7 +24,7 @@ raisedFlat = \markup { \raise #0.4 \smaller \smaller \flat } -flauti = \notes \relative c' { +flauti = \relative c' { \set Staff.instrument = #"2 Flauti" \set Staff.instr = #"Fl." \time 4/4 @@ -35,66 +35,66 @@ flauti = \notes \relative c' { \bar"|." } -oboi = \notes \relative c' { +oboi = \relative c' { \set Staff.instrument = #"2 Oboi" \set Staff.instr = #"Ob." c1 c } -clarinetti = \notes \relative c' { +clarinetti = \relative c' { \set Staff.instrument = \markup { \column < "Clarinetti" { "in B" \raisedFlat } > } \set Staff.instr = \markup { \smaller { "Cl(B" \raisedFlat ")" } } c1 c } -fagotti = \notes \relative c' { +fagotti = \relative c' { \set Staff.instrument = #"2 Fagotti" \set Staff.instr = #"Fg." c1 c } -corni = \notes \relative c' { +corni = \relative c' { \set Staff.instrument = \markup { \column < "Corni" { "in E" \raisedFlat } > } \set Staff.instr = \markup { \smaller { "Cor(E" \raisedFlat ")" } } c1 c } -trombe = \notes \relative c' { +trombe = \relative c' { \set Staff.instrument = \markup \column < "2 Trombe" "(C)" > \set Staff.instr = \markup \column < "Tbe." "(C)" > c1 c } -timpani = \notes \relative c' { +timpani = \relative c' { \set Staff.instrument = \markup \column < "Timpani" "(C-G)" > \set Staff.instr = #"Timp." c1 c } -violinoI = \notes \relative c' { +violinoI = \relative c' { \set Staff.instrument = #"Violino I " \set Staff.instr = #"Vl. I " c1 c } -violinoII = \notes \relative c' { +violinoII = \relative c' { \set Staff.instrument = #"Violino II " \set Staff.instr = #"Vl. II " c1 c } -viola = \notes \relative c' { +viola = \relative c' { \set Staff.instrument = #"Viola" \set Staff.instr = #"Vla." c1 c %c } -violoncello = \notes \relative c' { +violoncello = \relative c' { \set Staff.instrument = \markup \column < "Violoncello" "e" "Contrabasso" > \set Staff.instr = \markup \column < "Vc." "Cb." > c1 c diff --git a/input/test/count-systems.ly b/input/test/count-systems.ly index f96be2491e..d109376b04 100644 --- a/input/test/count-systems.ly +++ b/input/test/count-systems.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="@cindex Count Systems @@ -40,7 +40,7 @@ to the number of systems or the system number of a grob. \score{ - \notes\relative c''{ + \relative c''{ \override NoteHead #'after-line-breaking-callback = #display-system-count % = #display-systemno diff --git a/input/test/crescendi.ly b/input/test/crescendi.ly index c09c197064..b44b7bf40c 100644 --- a/input/test/crescendi.ly +++ b/input/test/crescendi.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="@cindex Crescendi Crescendi can be printed in a number of different ways. " } \score{ -\notes\relative c''{ +\relative c''{ a1\fff\> a\pp\! a\< a\! \set crescendoText = \markup { \italic \bold "cresc." } diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly index e34fee613d..a2cd412f76 100644 --- a/input/test/cue-notes.ly +++ b/input/test/cue-notes.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" % TODO: check to see if this example can be simplified using \small % or \tiny. \header { texidoc = "@cindex Cue Notes @@ -8,7 +8,7 @@ Cue notes are typeset in a smaller font. " \score { - \notes + { \set Staff.instrument = #"Horn in F" \set Score.skipBars = ##t diff --git a/input/test/divisiones.ly b/input/test/divisiones.ly index 01aa710436..2b4f58ba9d 100644 --- a/input/test/divisiones.ly +++ b/input/test/divisiones.ly @@ -7,13 +7,13 @@ Choices are @code{divisioMinima}, @code{divisioMaior}, @code{caesura}. " } -\version "2.2.0" +\version "2.3.4" \include "gregorian-init.ly" \score { << - \context Voice \notes \transpose c c' { + \context Voice \transpose c c' { \set Score.timing = ##f \set Score.barAlways = ##t \override TextScript #'padding = #3 diff --git a/input/test/drarn-slurs.ly b/input/test/drarn-slurs.ly index 4272c2007f..105b6a7682 100644 --- a/input/test/drarn-slurs.ly +++ b/input/test/drarn-slurs.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" % possible rename to slurs-? % TODO: find out what drarn means, and if there's an overlap with drarn.ly \header{ @@ -8,7 +8,7 @@ Slurs can be forced to always attach to note heads. " } -fragment = \notes { +fragment = { \override Slur #'direction = #1 \override Slur #'attachment = #'(head . head) g''16(g)(g)(g)(d')(d)(d)(d) @@ -17,7 +17,7 @@ fragment = \notes { \paper { raggedright = ##t} \score { - \notes\relative c \fragment + \relative c \fragment \paper { raggedright = ##t} } diff --git a/input/test/drarn.ly b/input/test/drarn.ly index c5b533f3a6..4435d71319 100644 --- a/input/test/drarn.ly +++ b/input/test/drarn.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header{texidoc="@cindex Drarn You can attach slurs and ties to noteheads. " } \score { - \context Staff \notes << + \context Staff << \relative c'' { \time 3/8 diff --git a/input/test/dynamic-absolute-volume.ly b/input/test/dynamic-absolute-volume.ly index d3072fdf30..b7df4e727b 100644 --- a/input/test/dynamic-absolute-volume.ly +++ b/input/test/dynamic-absolute-volume.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Dynamic Absolute Volume Absolute dynamics have an effect on MIDI files. @@ -8,7 +8,7 @@ Absolute dynamics have an effect on MIDI files. \score{ -\notes\relative c''{ +\relative c''{ %segfault in engraver a1\ppp a1\pp diff --git a/input/test/dynamic-extra.ly b/input/test/dynamic-extra.ly index c0f0658776..82c0eaa268 100644 --- a/input/test/dynamic-extra.ly +++ b/input/test/dynamic-extra.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" % probably should be merged into refman. \header{ texidoc = "@cindex Dynamic Piu Forte @@ -8,7 +8,7 @@ Pi piuf = \markup { \italic "pi\\`u" \dynamic "f" } \score{ - \notes\relative c''{ + \relative c''{ c-\piuf c c2\< c2\! diff --git a/input/test/embedded-postscript.ly b/input/test/embedded-postscript.ly index fa17ee48c9..adb6e4949e 100644 --- a/input/test/embedded-postscript.ly +++ b/input/test/embedded-postscript.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Embedded Postscript By inserting the @TeX{} command \embeddedps, you can @@ -14,7 +14,7 @@ insert postscript directly into the output. % \score { - \notes \relative c'' { + \relative c'' { a-"\\embeddedps{3 4 moveto 5 3 rlineto stroke}" -"\\embeddedps{ [ 0 1 ] 0 setdash 3 5 moveto 5 -3 rlineto stroke}" b-"\\embeddedps{3 4 moveto 0 0 1 2 8 4 20 3.5 rcurveto stroke}" diff --git a/input/test/embedded-scm.ly b/input/test/embedded-scm.ly index 9237122f77..90d95e5d4e 100644 --- a/input/test/embedded-scm.ly +++ b/input/test/embedded-scm.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Embedded scm @@ -15,7 +15,7 @@ output, ``hello world'' is printed to the console. (newline)) \score { - \notes\relative c' { c } + \relative c' { c } \paper {raggedright = ##t} } diff --git a/input/test/embedded-tex.ly b/input/test/embedded-tex.ly index c6614c37b3..b7a291cb53 100644 --- a/input/test/embedded-tex.ly +++ b/input/test/embedded-tex.ly @@ -1,16 +1,16 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="@cindex Embedded Tex You can embed Tex commands in your score. "} -fragment = \notes { +fragment = { a''^"3 $\\times$ \\`a deux" } \paper { raggedright = ##t} \score { - \notes\relative c \fragment + \relative c \fragment \paper { raggedright = ##t } } diff --git a/input/test/engraver-contexts.ly b/input/test/engraver-contexts.ly index 8ce64c737b..d404affde9 100644 --- a/input/test/engraver-contexts.ly +++ b/input/test/engraver-contexts.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc ="In polyphonic notation, many voices can share a staff: In diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly index 9ae1ddc752..06b506ec04 100644 --- a/input/test/engraver-one-by-one.ly +++ b/input/test/engraver-one-by-one.ly @@ -1,5 +1,5 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "The notation problem, creating a certain symbol, diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index 964db8fef5..e291179076 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -1,5 +1,5 @@ -\version "2.3.2" +\version "2.3.4" % definitely wil be renamed to something. %{ @@ -35,8 +35,8 @@ a piece. " \score { << - \new Staff \notes\relative c''{ c1 c c c c } - \new StaffGroup \notes\relative c''{ + \new Staff \relative c''{ c1 c c c c } + \new StaffGroup \relative c''{ \new Staff c1 c << c1 \new Staff { c1 } >> diff --git a/input/test/figured-bass-alternate.ly b/input/test/figured-bass-alternate.ly index e7f0bd5f52..186b79efb4 100644 --- a/input/test/figured-bass-alternate.ly +++ b/input/test/figured-bass-alternate.ly @@ -3,14 +3,14 @@ texidoc = "An alternate method to make bass figures is to use @code{markup} texts." } -\version "2.2.0" +\version "2.3.4" nat = \markup { \natural } sh = \markup { \smaller \raise #0.6 \sharp } fl = \markup { \flat } \score { - \context Voice \notes { + \context Voice { \clef bass \override TextScript #'font-family = #'number \override TextScript #'font-size = #-6 diff --git a/input/test/follow-voice.ly b/input/test/follow-voice.ly index 46d372e9f8..fd3471e85f 100644 --- a/input/test/follow-voice.ly +++ b/input/test/follow-voice.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" % MERGED: stuff from follow-break.ly to follow-thread.ly % followVoice: connect note heads with line when thread switches staff @@ -8,7 +8,7 @@ Voices can be traced automatically when they switch staves by setting \score { - \notes\relative c { + \relative c { \new PianoStaff << \set PianoStaff.followVoice = ##t \context Staff=one \context Voice { diff --git a/input/test/force-hshift.ly b/input/test/force-hshift.ly index 1636ed3904..b1592ab4df 100644 --- a/input/test/force-hshift.ly +++ b/input/test/force-hshift.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc="@cindex Force hshift Horizontal shift (@code{hshift}) can be forced in order to avoid collisions. " } \score { - \notes\relative c' + \relative c' \context Staff << { diff --git a/input/test/fret-diagram.ly b/input/test/fret-diagram.ly index 38243e95a3..b0d2537e8c 100644 --- a/input/test/fret-diagram.ly +++ b/input/test/fret-diagram.ly @@ -3,13 +3,13 @@ texidoc = "Frets are supported as markup commands." } -\version "2.3.1" +\version "2.3.4" \score { << \new ChordNames \chords {c2. f d s bes} - \notes \context Voice=mel { + \context Voice=mel { % c'2. c' c' c' c' c'2.^\markup \override #'(staff-padding . 4.0) {\fret-diagram #1 #"f:2;6-x;5-3-3;4-2-2;3-o;2-1-1;1-o;"} f'^\markup {\fret-diagram #1 #"c:6-1-1;p:0.5;6-1;5-3;4-3;3-2;2-1;1-1;"} diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index 5d35e4260b..32ad292e47 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="@cindex Gourlay @@ -9,7 +9,7 @@ Gourlay's paper on breaking lines. " } \score{ - \notes \context Staff \relative c'' << + \context Staff \relative c'' << { \stemUp d2 d | d d | d4 d2. | \break c1 } \\ { \stemDown g4 g g g | \times 2/3 { g2 g2 g2 } | g4. g8 g2 | c1 } diff --git a/input/test/gregorian-scripts.ly b/input/test/gregorian-scripts.ly index fd363da219..a3b3e900b9 100644 --- a/input/test/gregorian-scripts.ly +++ b/input/test/gregorian-scripts.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { title = "Gregorian Scripts" texidoc = "@cindex Gregorian Scripts @@ -30,7 +30,7 @@ FIXME: episem stops one notehead too early. \score { \context VaticanaVoice { \override VaticanaScript #'padding = #-0.5 - \notes { + { a\ictus a\circulus a\semicirculus diff --git a/input/test/harmonic.ly b/input/test/harmonic.ly index 19a55459a8..21a196d352 100644 --- a/input/test/harmonic.ly +++ b/input/test/harmonic.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc ="@cindex Artificial Harmonics @@ -8,7 +8,7 @@ marking the harmonic pitch with @code{\harmonic}." } \score { - \notes { + { 4 } \paper { diff --git a/input/test/header-ifelse.ly b/input/test/header-ifelse.ly index d52fbefc2d..2efe3a7302 100644 --- a/input/test/header-ifelse.ly +++ b/input/test/header-ifelse.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" #(if (not (defined? 'pieceTagLine)) @@ -18,7 +18,7 @@ however, the tagline is not printed to the collated webpage snippets. " } -\score{ \notes{ c'4 } +\score{ { c'4 } \paper {raggedright=##t} } diff --git a/input/test/hshift.ly b/input/test/hshift.ly index e12a3fc507..b2d1b1df41 100644 --- a/input/test/hshift.ly +++ b/input/test/hshift.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Horizontal Shift Notes may be manually horizontally shifted. " } @@ -9,7 +9,7 @@ shiftIV = \override NoteColumn #'horizontal-shift = #3 shiftV = \override NoteColumn #'horizontal-shift = #4 \score { - \context Voice \notes\relative c { + \context Voice \relative c { \context Staff << \new Voice {\stemUp \shiftI g'' } diff --git a/input/test/hymn.ly b/input/test/hymn.ly index 67c3ea2269..af9c86a926 100644 --- a/input/test/hymn.ly +++ b/input/test/hymn.ly @@ -1,5 +1,5 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = " @@ -13,12 +13,12 @@ texts, so they should be switched off. \context Staff << \time 4/4 \partcombine - \notes\relative c'' { + \relative c'' { a4 c4.(g8) a4 | g4 e' g(f) | b, a c2 } - \notes\relative c'' { + \relative c'' { g4 e4.(d8) c4 | g'4 c, e(f) | d2 a diff --git a/input/test/improv.ly b/input/test/improv.ly index c34c822b7d..010d9aa409 100644 --- a/input/test/improv.ly +++ b/input/test/improv.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = @@ -14,24 +14,24 @@ improvisation is active. } -improOn = \notes { +improOn = { \set squashedPosition = #0 \override NoteHead #'style = #'slash } -improOff = \notes { +improOff = { \unset squashedPosition \revert NoteHead #'style } -global = \notes { s1*3 \bar "|." } +global = { s1*3 \bar "|." } \score { << \context ChordNames \chords { e8*7:m7 a2.:m7 bes4:m7 b1:m7 e8:m } - \notes << + << \context Voice = melo \transpose c c' { e8 e g a a16(bes)(a8) g \improOn e8 diff --git a/input/test/incipit.ly b/input/test/incipit.ly index 7b46bb7679..8a2fb5df5c 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Incipit This example shows how to make an ``incipit'' to indicate scordatora tuning of a violin part, by overriding the @code{style} of @@ -8,7 +8,7 @@ Here are the two first bars of Biber's Rosary sonata III. " } -violinincipit = \notes\relative c''{ +violinincipit = \relative c''{ \clef "french" \time 2/2 \override Staff.TimeSignature #'style = #'old @@ -17,14 +17,14 @@ violinincipit = \notes\relative c''{ \override Staff.TimeSignature #'style = #'C } -bcincipit = \notes\relative c{ +bcincipit = \relative c{ \clef bass \override Staff.TimeSignature #'style = #'old b2. cis4 | \override Staff.TimeSignature #'style = #'C } -violin = \notes\relative c''{ +violin = \relative c''{ % Key signatures with different alterations in different octaves % are broken since 1.3.58! % \specialkey \keysignature f' fis'' g' gis'' @@ -37,7 +37,7 @@ violin = \notes\relative c''{ <<{ a d}\\ { es,4}>>| } -BC = \notes\relative c{ +BC = \relative c{ \key d \major \time 2/2 \clef "bass" @@ -49,14 +49,14 @@ BC = \notes\relative c{ \score{ << - \context Staff = violin {\notes{ + \context Staff = violin {{ \override Staff.Clef #'transparent = ##t \violinincipit \bar ".|" \revert Staff.Clef #'transparent \endincipit \violin }} - \new Staff {\notes{ + \new Staff {{ \override Staff.Clef #'transparent = ##t \bcincipit \bar ".|" \revert Staff.Clef #'transparent diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly index 1f2ecbbc6d..230b8bfc32 100644 --- a/input/test/instrument-name-grandstaff.ly +++ b/input/test/instrument-name-grandstaff.ly @@ -1,11 +1,11 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "@cindex Instrument Name Grandstaff You can have a name for the whole @code{GrandStaff} in addition to individual @code{Staff}s. " } \score { - \notes - \notes \context GrandStaff << + + \context GrandStaff << \context Staff = treble { \set GrandStaff.instrument = "Violini " \set Staff.instrument = " vn I" { c''4 }} diff --git a/input/test/ligature-vaticana.ly b/input/test/ligature-vaticana.ly index b24522c67b..13549ef01c 100644 --- a/input/test/ligature-vaticana.ly +++ b/input/test/ligature-vaticana.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "@cindex Ancient Vaticana Vaticana ligature uses four staff lines, special clef, an notes @@ -7,7 +7,7 @@ calligraphic notes. " \include "gregorian-init.ly" -cantus = \context VaticanaVoice = "cantus" \notes { +cantus = \context VaticanaVoice = "cantus" { \clef "vaticana_fa2" \[ f\melisma \quilisma g \auctum \descendens a\melismaEnd \] \[ \virga a\melisma g \pes a \inclinatum f \inclinatum d diff --git a/input/test/lilypond-testpage.ly b/input/test/lilypond-testpage.ly index dd72b7966a..b9972af910 100644 --- a/input/test/lilypond-testpage.ly +++ b/input/test/lilypond-testpage.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" % MERGE with title.ly -gp %{ @@ -26,11 +26,11 @@ texidoc = "In the generated output for printing, there are several titles which \score { - \notes \relative c'' { c1 c1 c1 c1 } + \relative c'' { c1 c1 c1 c1 } } \score { - \notes \relative c'' { c1 c1 c1 c1 } + \relative c'' { c1 c1 c1 c1 } \header { diff --git a/input/test/lyric-hyphen-retain.ly b/input/test/lyric-hyphen-retain.ly index e6eab5480e..960ad8672a 100644 --- a/input/test/lyric-hyphen-retain.ly +++ b/input/test/lyric-hyphen-retain.ly @@ -1,5 +1,5 @@ -\version "2.3.2" +\version "2.3.4" \header { @@ -17,7 +17,7 @@ the @code{LyricHyphen} grob. } \score { -<< \notes \new Staff \relative c'' { \time 1/4 c16[ c c c] +<< \new Staff \relative c'' { \time 1/4 c16[ c c c] \time 1/4 c16[ c c c] \time 1/4 diff --git a/input/test/lyrics-skip-notes.ly b/input/test/lyrics-skip-notes.ly index d90664e089..8c3607b3d1 100644 --- a/input/test/lyrics-skip-notes.ly +++ b/input/test/lyrics-skip-notes.ly @@ -11,12 +11,12 @@ less lyric syllables to a melody. % shorthand for Skip Lyric -sl = \notes { \skip 4 } +sl = { \skip 4 } -\version "2.2.0" +\version "2.3.4" \score { << - \context Voice = "A" \notes {c4 c c c} + \context Voice = "A" {c4 c c c} \lyricsto "A" \context Lyrics=A \lyrics { foo __ \sl \sl bar } \lyricsto "A" \context Lyrics=B \lyrics { foo -- \sl baz bar } \lyricsto "A" \context Lyrics=C \lyrics { foo -- baz -- baaz bar } diff --git a/input/test/markup-score.ly b/input/test/markup-score.ly index 3fb864c62f..ad0bc4c65e 100644 --- a/input/test/markup-score.ly +++ b/input/test/markup-score.ly @@ -3,7 +3,7 @@ texidoc = "Use \\score block as markup command." } -\version "2.3.2" +\version "2.3.4" tuning = \markup { \score { diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly index 51d77865c5..b2878f3275 100644 --- a/input/test/mensural-ligatures.ly +++ b/input/test/mensural-ligatures.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" % TODO: % check with ancient- stuff. rename, merge, something. -gp @@ -13,7 +13,7 @@ in a tight manner." % graphical width of the ligatures rather to the musical moment in time. % This is intended behaviour. -voice = \notes \transpose c c' { +voice = \transpose c c' { \set Score.timing = ##f \set Score.defaultBarType = "empty" g\longa c\breve a\breve f\breve d'\longa^\fermata diff --git a/input/test/mensural-note-heads.ly b/input/test/mensural-note-heads.ly index a6e45d67ad..55ebeb4053 100644 --- a/input/test/mensural-note-heads.ly +++ b/input/test/mensural-note-heads.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc ="@cindex Ancient Mensural Note Heads @@ -7,7 +7,7 @@ Mensural notes may also have note heads. " } \score { - \notes { + { \relative c'' { \override NoteHead #'style = #'mensural c\maxima*1/8 diff --git a/input/test/midi-scales.ly b/input/test/midi-scales.ly index 6241fe6d21..d1602a20a9 100644 --- a/input/test/midi-scales.ly +++ b/input/test/midi-scales.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" % candidate for regression. -gp \header { texidoc="Converting LilyPond input to MIDI and then again back with @@ -27,7 +27,7 @@ %} -scales = \notes \relative c { +scales = \relative c { % [INSTRUMENT_NAME] bright acoustic \key c \major % sharp-major diff --git a/input/test/move-accidentals.ly b/input/test/move-accidentals.ly index 12ab42a909..f5dbbb8c67 100644 --- a/input/test/move-accidentals.ly +++ b/input/test/move-accidentals.ly @@ -1,4 +1,4 @@ -\version "2.3.1" +\version "2.3.4" % possible rename to scheme- or something like that. -gp \header { texidoc= "@cindex Scheme Manual Accidentals @@ -14,7 +14,7 @@ some Scheme code. " } (ly:grob-parent elt 1) 'staff-position) pos)))) \score { - \context Voice \notes \relative c'' { + \context Voice \relative c'' { c2. << \set Staff.AccidentalPlacement = \turnOff diff --git a/input/test/move-specific-text.ly b/input/test/move-specific-text.ly index 37aa14827f..098e78959e 100644 --- a/input/test/move-specific-text.ly +++ b/input/test/move-specific-text.ly @@ -1,5 +1,5 @@ -\version "2.3.1" +\version "2.3.4" % possible rename to scheme- or something like that. -gp \header { texidoc = "@cindex Scheme Move Text Objects, like text, can be moved around by using some Scheme code. @@ -9,7 +9,7 @@ Objects, like text, can be moved around by using some Scheme code. (lambda (grob) (equal? text (ly:grob-property grob 'text)))) \score { - \notes\relative c''' { + \relative c''' { \override Stem #'direction = #1 \applyoutput #(outputproperty-compatibility (make-text-checker (make-simple-markup "m.d.")) 'extra-offset '(-3.5 . -4.5)) diff --git a/input/test/music-box.ly b/input/test/music-box.ly index 7b3a2583fc..ac190a0a22 100644 --- a/input/test/music-box.ly +++ b/input/test/music-box.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \include "deutsch.ly" % possible rename to scheme- something. -gp % TODO: ask if it needs to have so many empty bars in the middle. -gp @@ -62,9 +62,9 @@ using Scheme functions to avoid typing work. " } -\version "2.3.2" +\version "2.3.4" -pat = \notes \transpose c c' \repeat unfold 2 { +pat = \transpose c c' \repeat unfold 2 { << { \context Staff=up {r8 e16 f g e f g } } { \context Staff=down << \context Voice=vup { \stemUp \tieUp r16 d8.~d4 } @@ -73,15 +73,15 @@ pat = \notes \transpose c c' \repeat unfold 2 { >> } -enda = \notes { r8 f,16 a, c f c a, \stemUp c \change Staff = down +enda = { r8 f,16 a, c f c a, \stemUp c \change Staff = down a, f, a, f, d, f, d, \change Staff = up \stemBoth r8 g16 h d' f' d' h d' h g h d f e\prall d 1^\fermata \bar "|." } -endb = \notes {\stemUp \tieUp r16 c,8.~c,4~c,2 r16 h,,8.~h,,4~h,,2 c,1 \bar "|."} -endc = \notes {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata } +endb = {\stemUp \tieUp r16 c,8.~c,4~c,2 r16 h,,8.~h,,4~h,,2 c,1 \bar "|."} +endc = {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata } \score { - \notes \transpose c c' \context PianoStaff << + \transpose c c' \context PianoStaff << \context Staff=up { \clef "G" } \context Staff=down { \clef "F" } { \applymusic #transform {\pat {c e g c' e' } diff --git a/input/test/music-creation.ly b/input/test/music-creation.ly index f54d7f4d2b..093fd052ac 100644 --- a/input/test/music-creation.ly +++ b/input/test/music-creation.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" % possible rename to scheme- something. -gp \header { texidoc = "@cindex Scheme Music Creation diff --git a/input/test/no-bar-lines.ly b/input/test/no-bar-lines.ly index 63519187a7..2a18e7389f 100644 --- a/input/test/no-bar-lines.ly +++ b/input/test/no-bar-lines.ly @@ -1,5 +1,5 @@ -\version "2.3.2" +\version "2.3.4" % possible rename to bar-lines-foo. -gp \header{ texidoc = "@cindex Bar Lines Remove @@ -9,7 +9,7 @@ have been removed. } \score { - \notes \relative c'' { + \relative c'' { a b c d d c b a } diff --git a/input/test/no-staff.ly b/input/test/no-staff.ly index 5f8b33e1d9..cc56cac608 100644 --- a/input/test/no-staff.ly +++ b/input/test/no-staff.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" % possible rename to staff-something. -gp \header{ texidoc = "@cindex Staff Remove @@ -8,7 +8,7 @@ corresponding engraver. } \score { - \notes { c4 d4 e8 d8 } + { c4 d4 e8 d8 } \paper { raggedright = ##t \context { diff --git a/input/test/ossia.ly b/input/test/ossia.ly index 7d559488f1..aeb1ac3141 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -4,10 +4,10 @@ @code{RemoveEmptyStaffContext} take out the unused parts. " } -\version "2.3.2" +\version "2.3.4" \score { - \notes\relative c'' + \relative c'' \new StaffGroup \with { \remove "System_start_delimiter_engraver" \override SpanBar #'glyph = #":" diff --git a/input/test/page-breaks.ly b/input/test/page-breaks.ly index aed5b3ad9d..470d73758b 100644 --- a/input/test/page-breaks.ly +++ b/input/test/page-breaks.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -26,7 +26,7 @@ texidoc = "Stress optimal page breaking. This should look pattern = { a b c d \break } \book { \score { - \context Staff \notes \relative c' { + \context Staff \relative c' { %% 16: ideally cramped %% 17: very bad without density % \repeat unfold 17 { a b c d \break } diff --git a/input/test/part-combine.ly b/input/test/part-combine.ly index 718bb63c50..6781daa18d 100644 --- a/input/test/part-combine.ly +++ b/input/test/part-combine.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="@cindex Part Combine In orchestral scores and hymns, voices are traditionally combined into @@ -10,7 +10,7 @@ places. " } \score{ - \notes \context Staff = flauti << + \context Staff = flauti << \time 4/4 \partcombine \relative c'' { diff --git a/input/test/partial-blank.ly b/input/test/partial-blank.ly index 80ae96945f..473775d016 100644 --- a/input/test/partial-blank.ly +++ b/input/test/partial-blank.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" % check with invisible-notes or blank-notes. possible rename. -gp \header{ texidoc = "@cindex Partial Blank When entering partially typeset music (i.e. for students to be @@ -8,14 +8,14 @@ timing of notes: all measures have same length, etc. It can be implemented by adding an invisible staff with a lot of fast notes. " } -quickmeasure = \notes { +quickmeasure = { \repeat unfold 16 c''16 } -mel = \notes \relative c' {c16 d16 e8 a4 g2 e8 d c2. g'1 e4 d c2} +mel = \relative c' {c16 d16 e8 a4 g2 e8 d c2. g'1 e4 d c2} \score { -\context PianoStaff \notes << +\context PianoStaff << \new Staff << \clef G \new Voice {\mel} @@ -26,7 +26,7 @@ mel = \notes \relative c' {c16 d16 e8 a4 g2 e8 d c2. g'1 e4 d c2} \repeat unfold 4 \quickmeasure } >> - \new Staff \notes {\clef F s1*4} + \new Staff {\clef F s1*4} >> \paper {} } diff --git a/input/test/phrasing-slur-height.ly b/input/test/phrasing-slur-height.ly index 0a2bf75199..ffff47138d 100644 --- a/input/test/phrasing-slur-height.ly +++ b/input/test/phrasing-slur-height.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="@cindex Phrasing Slur Height The @code{PhrasingSlur} can be made higher in order to avoid collision with other slurs. " } \score { - \new Staff \notes\relative c''{ + \new Staff \relative c''{ \override Staff.PhrasingSlur #'height-limit = #8.0 c8 \( (d e f) g ( a b c) | c ( b a g) f ( e d c)\) diff --git a/input/test/piano-staff-distance.ly b/input/test/piano-staff-distance.ly index 15fd1bc4d4..40b04ed396 100644 --- a/input/test/piano-staff-distance.ly +++ b/input/test/piano-staff-distance.ly @@ -8,7 +8,7 @@ Currently, this is for testing purposes. " } -\version "2.2.0" +\version "2.3.4" #(define ((futz-alignment-callback distance count) grob axis) @@ -32,7 +32,7 @@ DISTANCE; then call the original callback. " (Align_interface::fixed_distance_alignment_callback grob axis)) ) \score { - \notes \relative c'' \context PianoStaff + \relative c'' \context PianoStaff \with { verticalAlignmentChildCallback = #(futz-alignment-callback 20 1) diff --git a/input/test/polymetric-differing-notes.ly b/input/test/polymetric-differing-notes.ly index 0e8d843da8..0b8a37986a 100644 --- a/input/test/polymetric-differing-notes.ly +++ b/input/test/polymetric-differing-notes.ly @@ -1,4 +1,4 @@ -\version "2.3.1" +\version "2.3.4" \header{ texidoc=" @@ -29,7 +29,7 @@ multiplied by 3/5, so that 3/5 * 10/8 = 3/4. \score { - \notes \relative c' << + \relative c' << \new Staff { \time 3/4 c4 c c | c c c | diff --git a/input/test/polymetric.ly b/input/test/polymetric.ly index 246099767e..95983062f9 100644 --- a/input/test/polymetric.ly +++ b/input/test/polymetric.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header{ texidoc="@cindex Time Signature Multiple @@ -17,7 +17,7 @@ lines seem to distort the regular spacing. %% Should print bar lines according to the time signature of each staff. -HJJ \score{ - \notes \relative c' << + \relative c' << \new Staff { \time 3/4 c4 c c | c c c | diff --git a/input/test/preset-extent.ly b/input/test/preset-extent.ly index 1cda63ae66..fb0caaebd0 100644 --- a/input/test/preset-extent.ly +++ b/input/test/preset-extent.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = " @cindex Preset Extent diff --git a/input/test/repeat-manual.ly b/input/test/repeat-manual.ly index 4212de4c5c..af7c9278f4 100644 --- a/input/test/repeat-manual.ly +++ b/input/test/repeat-manual.ly @@ -1,11 +1,11 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Repeat Manual By controlling manually the signs and numbers in repeats, an unusual output can be produced. " } -\score { \notes \relative c'' { +\score { \relative c'' { % First a normal looking repeat: c2 c \set Score.repeatCommands = #'((volta "1.")) diff --git a/input/test/repeat-shorter-bracket.ly b/input/test/repeat-shorter-bracket.ly index 57952b9e05..1666e8173b 100644 --- a/input/test/repeat-shorter-bracket.ly +++ b/input/test/repeat-shorter-bracket.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc=" @@ -14,7 +14,7 @@ bracket can be shortened. \score { << - \context Staff \notes\relative c''{ + \context Staff \relative c''{ c c c c % coda-klugde: let volta span only one bar \set Staff.voltaSpannerDuration = #(ly:make-moment 1 1) diff --git a/input/test/repeat.ly b/input/test/repeat.ly index eb8c18aff8..7d0de5dc5d 100644 --- a/input/test/repeat.ly +++ b/input/test/repeat.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" % possible rename to lyric-repeat or repeat-lyric. @@ -11,7 +11,7 @@ Alternate lyrics can be used, as well as alternate notes for repeats. " \score{ << - \context Staff \notes\relative c'{ + \context Staff \relative c'{ c d e f \repeat "volta" 2 { g a b c } \alternative { { c b a g } { f e d c } } diff --git a/input/test/rest-dot-positions.ly b/input/test/rest-dot-positions.ly index 2cd214e852..534b0c3fad 100644 --- a/input/test/rest-dot-positions.ly +++ b/input/test/rest-dot-positions.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" % candidate for regression. -gp \header { texidoc = "@cindex Rest Dot Positions Dots of rests should follow the rest positions. " } -muz = \notes \relative c'' { +muz = \relative c'' { \time 6/1 r\longa r\breve | r\longa. | diff --git a/input/test/rests.ly b/input/test/rests.ly index 4466456ace..08089ae93b 100644 --- a/input/test/rests.ly +++ b/input/test/rests.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Rests @@ -13,7 +13,7 @@ Rests may be used in various styles. % happen, since there are no notes/stems in this example. \score { - \context Staff \notes\relative c { + \context Staff \relative c { \set Score.timing = ##f \override Staff.Rest #'style = #'mensural r\maxima^"Rest style = \#'mensural" diff --git a/input/test/reverse-music.ly b/input/test/reverse-music.ly index 7dbfcaafd9..1a060da9fe 100644 --- a/input/test/reverse-music.ly +++ b/input/test/reverse-music.ly @@ -1,5 +1,5 @@ -\version "2.3.1" +\version "2.3.4" % possible rename to scheme-something. \header { texidoc="@cindex Scheme Reverse Music Symmetric, or palindromical music can be produced, first, by printing @@ -8,7 +8,7 @@ function to reverse the syntax. " } -music = \notes \relative c'' { c4 d4( e4 f4 } +music = \relative c'' { c4 d4( e4 f4 } #(define (reverse-music music) (let* ((elements (ly:music-property music 'elements)) diff --git a/input/test/rhythm-excercise.ly b/input/test/rhythm-excercise.ly index 14e39408d3..2d979998b9 100644 --- a/input/test/rhythm-excercise.ly +++ b/input/test/rhythm-excercise.ly @@ -1,11 +1,11 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "@cindex Rhythm Exercise Rythmic exercises may be produced by removing the @code{Clef} engraver, putting all notes to the same pitch and using transparent staff lines. " } -\score { \notes { c4 c4 c8[ c8] c2 c2 } +\score { { c4 c4 c8[ c8] c2 c2 } \paper { \context { \Staff diff --git a/input/test/scales-greek.ly b/input/test/scales-greek.ly index 94cce528a2..da4324394e 100644 --- a/input/test/scales-greek.ly +++ b/input/test/scales-greek.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = " @@ -9,7 +9,7 @@ aeolian (= minor), and locrian. All these scales are in the key of C. " } -\score { \notes { +\score { { \key c \ionian c'8 -"C ionian, major" d'8 e'8 f'8 g'8 a'8 b'8 c''8 diff --git a/input/test/scheme-interactions.ly b/input/test/scheme-interactions.ly index 800c158b9e..e98e552447 100644 --- a/input/test/scheme-interactions.ly +++ b/input/test/scheme-interactions.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Scheme Interactions Using @code{ly:export}, the result of Scheme expressions can be passed as LilyPond input. Within a Scheme expression, you can use, define or @@ -8,12 +8,12 @@ generated using scheme functions, and between there are manually " } -foo = \notes \transpose c c { d''4-. } -bra = \notes \transpose c c { e'4-. } +foo = \transpose c c { d''4-. } +bra = \transpose c c { e'4-. } \score { - \context Voice \notes\relative c' { + \context Voice \relative c' { c4 #(ly:export (make-sequential-music (list foo foo foo ))) #(begin (define baz (make-simultaneous-music (list foo bra))) diff --git a/input/test/script-abbreviations.ly b/input/test/script-abbreviations.ly index 5f895fc1df..5fbe5cda2e 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 "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Script Abbreviations Some articulations may be entered using an abbreviation. @@ -11,7 +11,7 @@ Some articulations may be entered using an abbreviation. } \score { - \notes \context Voice { + \context Voice { \override TextScript #'font-family = #'typewriter \override TextScript #'font-shape = #'upright c''4-._"c-." s4 diff --git a/input/test/script-chart.ly b/input/test/script-chart.ly index 20c2ce189b..0c4f652036 100644 --- a/input/test/script-chart.ly +++ b/input/test/script-chart.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" % this chart is used in the manual too. @@ -14,7 +14,7 @@ This chart shows all articulations, or scripts, that feta font contains. << \override Score.LyricText #'font-family = #'typewriter \override Score.LyricText #'font-shape = #'upright - \context Staff \notes { + \context Staff { \set Score.timing = ##f \set Score.barAlways = ##t \override Staff.BarLine #'transparent = ##t diff --git a/input/test/script-priority.ly b/input/test/script-priority.ly index 403152efc3..2a3da902a7 100644 --- a/input/test/script-priority.ly +++ b/input/test/script-priority.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Script Priority Relative placements of different script types can be controlled @@ -13,7 +13,7 @@ script symbols. \score{ - \context Staff \notes \relative g''{ + \context Staff \relative g''{ \override Score.TextScript #'script-priority = #-100 a4^\prall^\markup { \sharp } diff --git a/input/test/script-stack.ly b/input/test/script-stack.ly index aaaf0c796d..668c0d216c 100644 --- a/input/test/script-stack.ly +++ b/input/test/script-stack.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Stacked Text Articulation Text and articulations may be stacked on top of each other. " } \score { - \notes\relative c' { + \relative c' { c2_"geen gedonder"_"jij gaat onder" c2^^^.^|^"down"^"up" } diff --git a/input/test/separate-staccato.ly b/input/test/separate-staccato.ly index bf1fa05e1b..31a4db73d7 100644 --- a/input/test/separate-staccato.ly +++ b/input/test/separate-staccato.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" % possible rename. -gp \header { texidoc="@cindex Seperate Staccato @@ -8,9 +8,9 @@ them into one thread. In this example, a repead series of staccato dots is attached to the notes." } -staccatos = \notes { s4-. s-. s-. s s } +staccatos = { s4-. s-. s-. s s } -music = \notes\relative c' { c4 d e f g a b c d e } +music = \relative c' { c4 d e f g a b c d e } \score { \context Voice << diff --git a/input/test/slur-attachment-override.ly b/input/test/slur-attachment-override.ly index beb8b492b0..eaad3e2d0b 100644 --- a/input/test/slur-attachment-override.ly +++ b/input/test/slur-attachment-override.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="@cindex Slur Attachment Override @@ -12,7 +12,7 @@ by hand. " %% except that both slurs are stem <<-> stem. %% -fragment = \notes { +fragment = { \set autoBeaming = ##f \override Stem #'direction = #1 \override Slur #'direction = #1 @@ -23,7 +23,7 @@ fragment = \notes { \score { - \notes\relative c \fragment + \relative c \fragment \paper { raggedright = ##t} } diff --git a/input/test/slur-beautiful.ly b/input/test/slur-beautiful.ly index c57f6f2bf4..e3e754c528 100644 --- a/input/test/slur-beautiful.ly +++ b/input/test/slur-beautiful.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc ="@cindex Slur Beautiful The curvature of a slur is adjusted to stay away from note heads and @@ -11,7 +11,7 @@ keep slurs more curved. " } -\score { \notes {\relative c' { +\score { {\relative c' { \stemDown \slurUp c16( a' f' a a f a, c,) c( a' f' a a f d, c) diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly index c98b0fc196..a686ebff9b 100644 --- a/input/test/slur-dash.ly +++ b/input/test/slur-dash.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header {texidoc = "@cindex Slur, dotted The appearance of slurs may be changed from solid to dotted or dashed. " } \score{ - \notes\relative c'{ + \relative c'{ c( d e c) | \slurDotted c( d e c) | diff --git a/input/test/slur-manual.ly b/input/test/slur-manual.ly index 1d46c9c0ba..d75187b4aa 100644 --- a/input/test/slur-manual.ly +++ b/input/test/slur-manual.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -11,7 +11,7 @@ } \score { - \notes \new PianoStaff + \new PianoStaff << \context Staff = up { \clef bass diff --git a/input/test/slur-minimum-length.ly b/input/test/slur-minimum-length.ly index f54c6afe31..3984879a1c 100644 --- a/input/test/slur-minimum-length.ly +++ b/input/test/slur-minimum-length.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Slur Minimum Length By setting the minimum length of a slur, notes are more separated. " } \score{ - \notes\relative c''{ + \relative c''{ \time 2/4 \override Slur #'minimum-length = #40 c(c) diff --git a/input/test/slur-ugly.ly b/input/test/slur-ugly.ly index e21c8a862d..e21f729099 100644 --- a/input/test/slur-ugly.ly +++ b/input/test/slur-ugly.ly @@ -1,16 +1,16 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc="@cindex Slur Ugly Strange slurs can be produced by setting properties by hand. " } -baseWalk = \notes \relative c { +baseWalk = \relative c { d,8( a' d f a d f d a f d a) } \score { - \notes \context PianoStaff << + \context PianoStaff << \time 6/4 \context Staff=up { s1 * 6/4 } \context Staff=down << diff --git a/input/test/smart-transpose.ly b/input/test/smart-transpose.ly index 3894820e81..d17c67a5db 100644 --- a/input/test/smart-transpose.ly +++ b/input/test/smart-transpose.ly @@ -1,5 +1,5 @@ -\version "2.3.1" +\version "2.3.4" \header { texidoc="@cindex Smart Transpose @@ -64,10 +64,10 @@ In that manner, the most natural enharmonic notes are chosen in this example. music)) -music = \notes \relative c' { c4 d e f g a b c } +music = \relative c' { c4 d e f g a b c } \score { - \notes \context Staff { + \context Staff { \transpose c ais \music \applymusic #naturalise \transpose c ais \music \transpose c deses \music diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index 12203fc877..25a460c57e 100644 --- a/input/test/spacing-2.ly +++ b/input/test/spacing-2.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" % more yummy regression goodness. -gp \header { @@ -9,7 +9,7 @@ Eighth notes should be spaced equidistantly. } \score { - \notes \relative c'' + \relative c'' \context GrandStaff << \new Staff << \new Voice { \stemUp\slurUp\tieUp diff --git a/input/test/spanner-after-break-tweak.ly b/input/test/spanner-after-break-tweak.ly index 29bb7f78b9..5ad1560c57 100644 --- a/input/test/spanner-after-break-tweak.ly +++ b/input/test/spanner-after-break-tweak.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Spanner after break @@ -25,7 +25,7 @@ after the line break in this example is moved around. " #(debug-enable 'backtrace) -\score {\notes \relative c'' { +\score { \relative c'' { \override Tie #'after-line-breaking-callback = #my-callback c1 ~ \break c2 ~ c diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly index 1377581085..1399e32c43 100644 --- a/input/test/staff-bracket.ly +++ b/input/test/staff-bracket.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc="@cindex Nested Staff Groups Staffs can be nested in various combinations. Here, @code{StaffGroup} @@ -9,7 +9,7 @@ and @code{InnerChoirStaff}, the brackets are shifted leftwards. " } -\score { \notes +\score { << \new StaffGroup << \new Staff {c' d' e' f'} diff --git a/input/test/staff-container.ly b/input/test/staff-container.ly index 27910a90d9..55cce286af 100644 --- a/input/test/staff-container.ly +++ b/input/test/staff-container.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { @@ -20,7 +20,7 @@ what you would expect.) \score { - \notes \relative c'' << + \relative c'' << \new StaffContainer { %% need << >>, otherwise we descend to the voice inside SA diff --git a/input/test/staff-lines.ly b/input/test/staff-lines.ly index edb516b696..2b15132bb5 100644 --- a/input/test/staff-lines.ly +++ b/input/test/staff-lines.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -11,11 +11,11 @@ in the properties of @code{StaffSymbol}. } -upper = \notes\relative c'' { +upper = \relative c'' { c1 d e f } -lower = \notes\relative c { +lower = \relative c { c1 b a g } diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index 4210765ddf..80dc63ad86 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Staff Size @@ -8,7 +8,7 @@ must be scaled." } \score { - \notes \relative c' << + \relative c' << \new Staff \relative c'' { \dynamicDown c,,4 \ff c c c } diff --git a/input/test/staff-space.ly b/input/test/staff-space.ly index e2bd4672ea..b02523bf0c 100644 --- a/input/test/staff-space.ly +++ b/input/test/staff-space.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header{ texidoc ="@cindex Staff Space By just increasing @code{staff-space} on a staff, you may produce strange @@ -6,7 +6,7 @@ results. " } \score { - \notes \relative c'' \context GrandStaff << + \relative c'' \context GrandStaff << \new Staff { c4 c4 } \new Staff { c4 diff --git a/input/test/stem-cross-staff.ly b/input/test/stem-cross-staff.ly index 03e09fee21..423d93afb3 100644 --- a/input/test/stem-cross-staff.ly +++ b/input/test/stem-cross-staff.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Stem Cross Staff The chords which exceptionally cross staves may be produced by increasing @@ -12,7 +12,7 @@ stemExtend = \once \override Stem #'length = #22 noFlag = \once \override Stem #'flag-style = #'no-flag -\score { \notes +\score { \context PianoStaff << \new Staff { \stemDown diff --git a/input/test/stem-extend.ly b/input/test/stem-extend.ly index 0e016c1031..a8a1635154 100644 --- a/input/test/stem-extend.ly +++ b/input/test/stem-extend.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Stem Extend Extending stems to the center line may be prevented using @code{no-stem-extend}. @@ -6,7 +6,7 @@ Extending stems to the center line may be prevented using @code{no-stem-extend}. } \score { - \context Voice \notes\relative c { + \context Voice \relative c { \context Staff << \new Voice { f2 f8 g a b diff --git a/input/test/stem-length.ly b/input/test/stem-length.ly index f5a9ba30de..8858f1faf7 100644 --- a/input/test/stem-length.ly +++ b/input/test/stem-length.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc = "@cindex Stem Length The length of stems can be altered. " } \score { - \context Voice \notes\relative c { + \context Voice \relative c { g''4 \override Stem #'length = #14 g4 \override Stem #'length = #3 g4 g,,4 } diff --git a/input/test/tablature-hammer.ly b/input/test/tablature-hammer.ly index a57c72ca7d..7915f9efc7 100644 --- a/input/test/tablature-hammer.ly +++ b/input/test/tablature-hammer.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header {texidoc = "@cindex Tablature hammer A hammer in tablature can be faked with slurs. " } \score{ \context TabStaff << - \notes\relative c''{ + \relative c''{ c(d) d(d) d(c) diff --git a/input/test/tablature.ly b/input/test/tablature.ly index 1c5d6fafbd..347359e735 100644 --- a/input/test/tablature.ly +++ b/input/test/tablature.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc = "@cindex Tabulature Tablature is internally done by overriding the note-head formatting function @@ -12,7 +12,7 @@ possible, according to @code{minimumFret}. " } -partition = \notes { +partition = { \key e \major e8\5 fis\5 gis\5 a\5 b\5 cis'\5 dis'\5 e'\5 e8\4 fis\4 gis\4 a\4 b\4 cis'\4 dis'\4 e'\4 diff --git a/input/test/temporary-stave.ly b/input/test/temporary-stave.ly index 8c3807ad04..9310a53ae9 100644 --- a/input/test/temporary-stave.ly +++ b/input/test/temporary-stave.ly @@ -1,5 +1,5 @@ -\version "2.3.2" +\version "2.3.4" \header { @@ -11,7 +11,7 @@ time and key signatures and clef at the beginning of the extra stave. } \score { - \notes { + { \relative c' { \context Staff = One { c4 d e f } << diff --git a/input/test/text-rotate.ly b/input/test/text-rotate.ly index fe2415a876..a79d711ca0 100644 --- a/input/test/text-rotate.ly +++ b/input/test/text-rotate.ly @@ -16,10 +16,10 @@ output for printing of the source of this example (commenting one line). } -\version "2.2.0" +\version "2.3.4" \score { -\new Staff \notes \relative c'' { +\new Staff \relative c'' { \set Staff.instrument = #"rotatebox{90}{Chor}" %% uncomment this for rotation diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly index 60b8b60459..e74a68974e 100644 --- a/input/test/text-spanner.ly +++ b/input/test/text-spanner.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex text spanner Text spanners can be used in the similar manner than markings for pedals @@ -8,7 +8,7 @@ or octavation. } \score{ - \notes\relative c''{ + \relative c''{ \override TextSpanner #'edge-text = #'("bla" . "blu") a \startTextSpan b c diff --git a/input/test/textscript.ly b/input/test/textscript.ly index 1a90db7931..161b601363 100644 --- a/input/test/textscript.ly +++ b/input/test/textscript.ly @@ -1,12 +1,12 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "@cindex Textscript There are different fonts and glyphs to be used with @code{\markup} command. " } \score{ - \notes\relative c''{ + \relative c''{ \override TextScript #'font-shape = #'upright c1^\markup { \dynamic "p" "ma sosten." } c^\markup \huge "ABCD" diff --git a/input/test/tie-cross-voice.ly b/input/test/tie-cross-voice.ly index 5ca13ef893..3239179877 100644 --- a/input/test/tie-cross-voice.ly +++ b/input/test/tie-cross-voice.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" @@ -8,7 +8,7 @@ \score { -\context Staff \notes { +\context Staff { \relative c'' << { \once \override Stem #'transparent = ##t diff --git a/input/test/time-signature-double.ly b/input/test/time-signature-double.ly index 396166d0d6..afd41af1ca 100644 --- a/input/test/time-signature-double.ly +++ b/input/test/time-signature-double.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc= " @@ -21,7 +21,7 @@ tsMarkup = }} -\score { \notes \relative c' +\score { \relative c' { \override Staff.TimeSignature #'print-function = #Text_item::print \override Staff.TimeSignature #'text = #tsMarkup diff --git a/input/test/time.ly b/input/test/time.ly index 43cda4dd9c..c4c189f507 100644 --- a/input/test/time.ly +++ b/input/test/time.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" % TODO: This file could be old. Ask about it later. -gp \header { texidoc = "@cindex Time @@ -41,7 +41,7 @@ properties will quite definitely change, and maybe the syntax of the %} \score { - \context Voice \notes\relative c { + \context Voice \relative c { % LilyPond doesn't understand 'default =>> it does what you want \override Staff.TimeSignature #'style = #'default \time 1/1 diff --git a/input/test/timing.ly b/input/test/timing.ly index 5326e3f13a..c74738a04b 100644 --- a/input/test/timing.ly +++ b/input/test/timing.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" % possible rename to bar-something. \header{ texidoc = "@cindex Bar Length @@ -9,7 +9,7 @@ You can alter the length of bars by setting explicitly } \score { - \context Voice \notes\relative c { + \context Voice \relative c { % \set Score.measurePosition = #(ly:make-moment -1 4) diff --git a/input/test/title-markup.ly b/input/test/title-markup.ly index e4b38623d4..61498e3ea6 100644 --- a/input/test/title-markup.ly +++ b/input/test/title-markup.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" %{ Markup titles also available for direct PostScript output: @@ -91,7 +91,7 @@ spaceTest = \markup { "two space chars" } \book { \score { - \context Staff \notes \relative c' { + \context Staff \relative c' { c2-\sizeTest c2-\spaceTest } \paper { @@ -100,7 +100,7 @@ spaceTest = \markup { "two space chars" } } \score { - \context Staff \notes \relative c' { + \context Staff \relative c' { %% stress page breaking: %% 35 keep on 3 pages %% 36 spread evenly over 4 pages diff --git a/input/test/title.ly b/input/test/title.ly index 9f46792667..d74cf074f3 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" % MERGE with lilypond- \header { filename = "title.ly" @@ -22,7 +22,7 @@ } \score { - \context Staff \notes \relative c' { + \context Staff \relative c' { \repeat unfold 10 { c d e f f e d c \break c d e f f e d c @@ -35,7 +35,7 @@ } \score { - \notes \relative c' { + \relative c' { f e d c c d e f \break f e d c c d e f } diff --git a/input/test/to-xml.ly b/input/test/to-xml.ly index 15cd1d7c34..0dbba5cbda 100644 --- a/input/test/to-xml.ly +++ b/input/test/to-xml.ly @@ -1,6 +1,6 @@ -\version "2.2.0" +\version "2.3.4" -fooBar = \notes { << c''4 \\ g'4 >> } +fooBar = { << c''4 \\ g'4 >> } #(ly:set-option 'parse-protect #f) #(load-from-path "to-xml.scm") diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 1f0a668e84..1262ddfdde 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.4" \header{ texidoc = "@cindex Transposition Transposing has also an effect key signature, if it is given using @@ -10,7 +10,7 @@ the key signature is not transposed." % should the explicitly set key signature transpose also? -HJJ -vOne = \notes \relative c''{ +vOne = \relative c''{ \clef"violin" \key d \major \time 2/4 @@ -21,9 +21,9 @@ vOne = \notes \relative c''{ c4 c | } -vTwo = \notes \transpose c d { \vOne } +vTwo = \transpose c d { \vOne } -vThree = \notes \relative c''{ +vThree = \relative c''{ \clef"violin" % keysignature fis cis \set Staff.keySignature = #'((0 . 2)(3 . 2)) @@ -38,7 +38,7 @@ vThree = \notes \relative c''{ } -vFour = \notes \transpose c d \vThree +vFour = \transpose c d \vThree \score { \context StaffGroup << diff --git a/input/test/trill.ly b/input/test/trill.ly index 0fdb12a8b6..0c8fca9ec5 100644 --- a/input/test/trill.ly +++ b/input/test/trill.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc="@cindex Trill The extended trill may be produced using @code{TextSpanner} with @code{trill} @@ -8,7 +8,7 @@ spanner style. \score { - \context RhythmicStaff \notes { + \context RhythmicStaff { \stemDown \override Stem #'transparent = ##t \override TextSpanner #'dash-fraction = #0.0 diff --git a/input/test/trills.ly b/input/test/trills.ly index df02e1cb25..eda80c1a1b 100644 --- a/input/test/trills.ly +++ b/input/test/trills.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc="@cindex Trills @@ -25,7 +25,7 @@ visible = \revert NoteHead #'transparent \score { << \context GrandStaff << - \new Staff \notes\relative c'' { + \new Staff \relative c'' { \time 1/4 c4\prall \time 3/8 @@ -91,7 +91,7 @@ visible = \revert NoteHead #'transparent "de suite"1 %} } - \new Staff \notes\relative c'' { + \new Staff \relative c'' { % autobeamer has som problems here d32[ \repeat unfold 3 { c d } c] d8 ~ d32[\repeat unfold 3 { c32 d } c] diff --git a/input/test/unfold-all-repeats.ly b/input/test/unfold-all-repeats.ly index b5af649865..733bfce6c7 100644 --- a/input/test/unfold-all-repeats.ly +++ b/input/test/unfold-all-repeats.ly @@ -1,4 +1,4 @@ -\version "2.3.1" +\version "2.3.4" % regression. -gp \header { @@ -7,7 +7,7 @@ recursively all repeats for a correct MIDI output." } -mel = \notes \context Staff { +mel = \context Staff { \repeat tremolo 8 {c'32 e' } \repeat percent 2 { c''8 d'' } \repeat volta 2 {c'4 d' e' f'} @@ -18,7 +18,7 @@ mel = \notes \context Staff { \bar "|." } -\score { \notes { +\score { { \mel \break \applymusic #unfold-repeats \mel } diff --git a/input/test/version-output.ly b/input/test/version-output.ly index 9655570181..31c2c50f73 100644 --- a/input/test/version-output.ly +++ b/input/test/version-output.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -14,7 +14,7 @@ } -\score { \context Lyrics \notes { +\score { \context Lyrics { \override Score.RehearsalMark #'self-alignment-X = #LEFT \mark #(ly:export (string-append "Processed with LilyPond version " (lilypond-version))) s2 diff --git a/input/test/vertical-extent.ly b/input/test/vertical-extent.ly index c5a289f3ca..60a88ab1e5 100644 --- a/input/test/vertical-extent.ly +++ b/input/test/vertical-extent.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" % TODO: huh? what's this file about? -gp \header { texidoc = " @@ -8,7 +8,7 @@ Vertical extents may increased by setting @code{minimumVerticalExtent}, " } \score { - \notes << + << \new Staff { \set Staff.verticalExtent = #'(-15.0 . 0.0) \clef alto diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index 476d699c01..af52075e83 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.2.0" +\version "2.3.4" \header{ filename = "twinkle-pop.ly" xtitle = "Ah, vous dirais-je, maman " @@ -9,7 +9,7 @@ copyright = "public domain" } -melodie = \notes\relative c'' { +melodie = \relative c'' { \clef "violin" \time 2/4 diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly index 26e1990de7..e177457485 100644 --- a/input/wilhelmus.ly +++ b/input/wilhelmus.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = "Wilhelmus van Nassouwe" @@ -26,7 +26,7 @@ (prepend-grob-property grob-name 'space-alist (cons entry (cons 'extra-space value)))) -noclefs = \notes { +noclefs = { s1 \override Staff.Clef #'break-visibility = #(lambda (dir) (cons #t #t)) } @@ -61,7 +61,7 @@ myBreak = { \bar "" \break } textheight = 270.0\mm } -voice = \notes \relative c' { +voice = \relative c' { \clef violin \key g \major d4 | g g a a b | a8 \myBreak @@ -92,7 +92,7 @@ voice = \notes \relative c' { \bar "|." } -stich = \notes \relative c'' { +stich = \relative c'' { \override Staff.NoteCollision #'merge-differently-dotted = ##t \set fontSize = #-3 %% broken? diff --git a/lily/include/ly-smobs.icc b/lily/include/ly-smobs.icc index 2296448400..5578826718 100644 --- a/lily/include/ly-smobs.icc +++ b/lily/include/ly-smobs.icc @@ -79,10 +79,10 @@ SCM CL::smobbed_copy () const \ #define IMPLEMENT_SMOBS(CL) \ IMPLEMENT_BASE_SMOBS (CL) \ -SCM \ +void \ CL::smobify_self () \ { \ - SCM s = unprotected_smobify_self ();\ + SCM s = unprotected_smobify_self ();\ scm_gc_protect_object (s);\ return s;\ }\ diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh index 5a5b5ce181..80a20eecce 100644 --- a/lily/include/smobs.hh +++ b/lily/include/smobs.hh @@ -121,7 +121,7 @@ protected:\ virtual ~CL ();\ SCM unprotected_smobify_self ();\ private: \ - SCM smobify_self (); \ + void smobify_self (); \ SCM self_scm_; \ public: \ SCM self_scm () const { return self_scm_; } \ diff --git a/lily/paper-book.cc b/lily/paper-book.cc index fe7105d9ea..aafbb0c998 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -175,8 +175,13 @@ Paper_book::classic_output (String outname) String format = output_formats[i]; String func_nm = format; func_nm = "output-classic-framework-" + func_nm; + String mod_nm = "scm framework-" + format; + + SCM mod = scm_c_resolve_module (mod_nm.to_str0 ()); + SCM func = scm_c_module_lookup (mod, func_nm.to_str0 ()); + + func = scm_variable_ref (func); - SCM func = ly_scheme_function (func_nm.to_str0 ()); Paper_outputter *out = get_paper_outputter (outname + "." + format, format); diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 809b8dbd78..8c7e2ef5ab 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -102,7 +102,7 @@ Paper_outputter::output_stencil (Stencil stil) { ly_interpret_stencil (stil.expr (), ly_scheme_function ("ly:paper-outputter-dump"), - smobify_self (), + self_scm (), ly_offset2scm (Offset (0, 0))); } diff --git a/scm/lily.scm b/scm/lily.scm index 69a6f686f3..e33299fbe1 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -378,36 +378,11 @@ L1 is copied, L2 not. (make-module 1021 (list (resolve-interface '(scm output-tex))))) (define output-ps-module (make-module 1021 (list (resolve-interface '(scm output-ps))))) -(define-public (tex-output-expression expr port) - (display (eval expr output-tex-module) port)) + (define-public (ps-output-expression expr port) (display (eval expr output-ps-module) port)) -(define output-alist - `( - ("tex" . ("TeX output. The default output form." ,tex-output-expression)) - ("scm" . ("Scheme dump: debug scheme stencil expressions" ,write)) -; ("sketch" . ("Bare bones Sketch output." ,sketch-output-expression)) -; ("sodipodi" . ("Bare bones Sodipodi output." ,sodipodi-output-expression)) -; ("pdftex" . ("PDFTeX output. Was last seen nonfunctioning." ,pdftex-output-expression)) - )) - - -(define (document-format-dumpers) - (map - (lambda (x) - (display (string-append (pad-string-to 5 (car x)) (cadr x) "\n")) - output-alist) - )) - -(define-public (find-dumper format) - (let ((d (assoc format output-alist))) - (if (pair? d) - (caddr d) - (scm-error "Could not find dumper for format ~s" format)))) - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; other files. diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index f1a402901a..965d6d6978 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -2107,6 +2107,14 @@ def conv (str): conversions.append (((2, 3, 2), conv, '''\\FooContext -> \\Foo''')) +def conv (str): + str = re.sub (r'\\notes\b', '', str) + + return str + +conversions.append (((2, 3, 4), conv, + '''remove \\notes''')) + ################################ # END OF CONVERSIONS ################################ -- 2.39.2