From 3db08de4502e30616808fc348b054d32822e5cc4 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 3 Jul 2003 23:12:10 +0000 Subject: [PATCH] * buildscripts/mf-to-table.py (base): break table every three symbols. * input/tutorial: remove os-flute-2.ly os-score.ly miniatures.ly os-music.ly --- ChangeLog | 12 + Documentation/user/cheatsheet.itely | 4 +- Documentation/user/macros.itexi | 2 +- Documentation/user/refman.itely | 6 +- Documentation/user/tutorial.itely | 12 +- buildscripts/mf-to-table.py | 16 +- .../E.Satie/petite-ouverture-a-danser.ly | 2 +- input/mutopia/F.Schubert/standchen.ly | 2 +- .../J.S.Bach/Petites-Preludes/header.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-1.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-2.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-3.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-4.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-5.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-6.ly | 2 +- .../Petites-Preludes/preludes-score.ly | 2 +- .../J.S.Bach/baerenreiter-sarabande.ly | 2 +- input/mutopia/J.S.Bach/wtk1-fugue1.ly | 2 +- input/mutopia/J.S.Bach/wtk1-fugue2.ly | 2 +- input/mutopia/J.S.Bach/wtk1-prelude1.ly | 2 +- input/mutopia/R.Schumann/romanze-op28-2.ly | 2 +- input/mutopia/W.A.Mozart/mozart-hrn-3.ly | 2 +- .../mutopia/W.A.Mozart/mozart-hrn3-allegro.ly | 2 +- input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly | 2 +- .../mutopia/W.A.Mozart/mozart-hrn3-romanze.ly | 2 +- input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly | 2 +- input/no-notation/midi-grace.ly | 2 +- input/no-notation/parse5.ly | 2 +- input/regression/accidental-cautionary.ly | 2 +- input/regression/accidental-double.ly | 2 +- input/regression/accidental-ledger.ly | 1 - input/regression/accidental-octave.ly | 2 +- input/regression/accidental-placement.ly | 2 +- input/regression/accidental-single-double.ly | 2 +- .../accidental-unbroken-tie-spacing.ly | 1 - input/regression/accidental-voice.ly | 1 - input/regression/accidental.ly | 1 - input/regression/accidentals.ly | 1 - input/regression/ambitus.ly | 2 +- input/regression/arpeggio-collision.ly | 2 +- input/regression/auto-beam-bar.ly | 1 - input/regression/auto-beam-triplet.ly | 1 - input/regression/auto-beam-tuplets.ly | 1 - input/regression/auto-beam.ly | 2 +- input/regression/auto-change.ly | 2 +- input/regression/bar-number.ly | 1 - input/regression/bar-scripts.ly | 1 - input/regression/beam-auto-knee.ly | 1 - input/regression/beam-center-slope.ly | 2 +- input/regression/beam-chord.ly | 2 +- input/regression/beam-concave.ly | 1 - .../regression/beam-cross-staff-auto-knee.ly | 1 - input/regression/beam-cross-staff-slope.ly | 1 - input/regression/beam-cross-staff.ly | 1 - input/regression/beam-damp.ly | 2 +- input/regression/beam-default-lengths.ly | 2 +- input/regression/beam-extreme.ly | 1 - input/regression/beam-french.ly | 2 +- input/regression/beam-funky-beamlet.ly | 1 - input/regression/beam-funky.ly | 2 +- input/regression/beam-knee-symmetry.ly | 2 +- input/regression/beam-length.ly | 1 - input/regression/beam-manual.ly | 1 - input/regression/beam-multiple-cross-staff.ly | 1 - input/regression/beam-over-barline.ly | 1 - input/regression/beam-position.ly | 1 - input/regression/beam-postfix-notation.ly | 1 - input/regression/beam-quanting-horizontal.ly | 2 +- input/regression/beam-quarter.ly | 1 - input/regression/beam-second.ly | 2 +- input/regression/beam-shortened-lengths.ly | 1 - input/regression/beamed-chord.ly | 1 - input/regression/beaming-ternary-metrum.ly | 2 +- input/regression/beaming.ly | 1 - input/regression/beams.ly | 1 - input/regression/between-systems.ly | 2 +- input/regression/break.ly | 1 - input/regression/chord-changes.ly | 1 - input/regression/chord-scripts.ly | 3 +- input/regression/chord-tremolo.ly | 2 +- input/regression/cluster.ly | 2 +- input/regression/collision-2.ly | 2 +- input/regression/collision-dots.ly | 2 +- input/regression/collision-head-chords.ly | 2 +- input/regression/collision-heads.ly | 1 - input/regression/collision-mesh.ly | 1 - input/regression/collisions.ly | 2 +- .../regression/completion-heads-polyphony.ly | 1 - input/regression/completion-heads.ly | 2 +- input/regression/custos.ly | 2 +- input/regression/dot-flag-collision.ly | 2 +- input/regression/dots.ly | 2 +- input/regression/drums.ly | 2 +- input/regression/dynamics-broken-hairpin.ly | 2 +- input/regression/dynamics-glyphs.ly | 2 +- input/regression/dynamics-line.ly | 2 +- input/regression/dynamics-unbound-hairpin.ly | 2 +- input/regression/easy-notation.ly | 2 +- input/regression/figured-bass.ly | 2 +- input/regression/finger-chords.ly | 6 +- input/regression/fingering.ly | 4 +- input/regression/font-magnification.ly | 2 +- input/regression/generic-output-property.ly | 2 +- input/regression/glissando.ly | 2 +- input/regression/grace-auto-beam.ly | 2 +- input/regression/grace-bar-line.ly | 2 +- input/regression/grace-bar-number.ly | 2 +- input/regression/grace-beam.ly | 2 +- input/regression/grace-dynamic.ly | 2 +- input/regression/grace-end.ly | 2 +- input/regression/grace-nest.ly | 2 +- input/regression/grace-nest1.ly | 2 +- input/regression/grace-nest2.ly | 2 +- input/regression/grace-nest3.ly | 2 +- input/regression/grace-nest4.ly | 2 +- input/regression/grace-nest5.ly | 2 +- input/regression/grace-part-combine.ly | 2 +- input/regression/grace-staff-length.ly | 2 +- input/regression/grace-start.ly | 2 +- input/regression/grace-stems.ly | 2 +- input/regression/grace-sync.ly | 2 +- input/regression/grace-unfold-repeat.ly | 2 +- input/regression/grace-volta-repeat.ly | 2 +- input/regression/grace.ly | 2 +- input/regression/hairpin-ending.ly | 2 +- input/regression/hara-kiri-pianostaff.ly | 2 +- input/regression/hara-kiri-short.ly | 2 +- input/regression/instrument-name-markup.ly | 2 +- input/regression/instrument-name.ly | 2 +- input/regression/key-clefs.ly | 2 +- input/regression/key-signature-scordatura.ly | 2 +- input/regression/keys.ly | 2 +- input/regression/lyric-align.ly | 2 +- input/regression/lyric-combine-polyphonic.ly | 2 +- input/regression/lyric-combine.ly | 2 +- input/regression/lyric-extender.ly | 2 +- input/regression/lyric-hyphen.ly | 2 +- input/regression/lyric-phrasing.ly | 2 +- input/regression/lyrics-bar.ly | 2 +- input/regression/lyrics-extender.ly | 2 +- input/regression/lyrics-multi-stanza.ly | 2 +- input/regression/markup-stack.ly | 2 +- input/regression/measure-grouping.ly | 2 +- input/regression/mensural.ly | 2 +- input/regression/merge-differently-dotted.ly | 2 +- input/regression/mm-rests2.ly | 2 +- input/regression/mmrest-collision.ly | 2 +- input/regression/molecule-hacking.ly | 2 +- input/regression/multi-measure-rest-center.ly | 2 +- .../multi-measure-rest-instr-name.ly | 2 +- input/regression/multi-measure-rest.ly | 2 +- input/regression/non-empty-text.ly | 2 +- input/regression/note-group-bracket.ly | 2 +- input/regression/note-head-chord.ly | 2 +- input/regression/note-head-style.ly | 2 +- input/regression/note-line.ly | 2 +- input/regression/number-staff-lines.ly | 2 +- input/regression/pc-mmrest.ly | 2 +- input/regression/pc-switch-slur.ly | 2 +- input/regression/pedal.ly | 2 +- input/regression/phrasing-slur.ly | 2 +- input/regression/prefatory-empty-spacing.ly | 2 +- input/regression/prefatory-spacing-matter.ly | 2 +- input/regression/property-once.ly | 2 +- input/regression/rehearsal-mark.ly | 2 +- input/regression/repeat-fold.ly | 2 +- input/regression/repeat-line-break.ly | 2 +- input/regression/repeat-percent.ly | 2 +- input/regression/repeat-unfold-all.ly | 2 +- input/regression/repeat-unfold.ly | 2 +- .../repeat-volta-skip-alternatives.ly | 2 +- input/regression/repeat-volta.ly | 2 +- input/regression/rest-collision-default.ly | 2 +- input/regression/rest-collision.ly | 2 +- input/regression/rest-ledger.ly | 2 +- input/regression/rest-pitch.ly | 2 +- input/regression/rest.ly | 2 +- input/regression/rhythmic-staff.ly | 2 +- input/regression/script-collision.ly | 2 +- input/regression/script-stack-order.ly | 2 +- input/regression/script-stacked.ly | 2 +- input/regression/slur-attachment.ly | 2 +- input/regression/slur-broken-trend.ly | 2 +- input/regression/slur-cross-staff.ly | 2 +- input/regression/slur-dots.ly | 2 +- input/regression/slur-nice.ly | 2 +- input/regression/slur-rest.ly | 2 +- input/regression/slur-staccato.ly | 2 +- input/regression/slur-stem-broken.ly | 2 +- input/regression/slur-symmetry-1.ly | 2 +- input/regression/slur-symmetry.ly | 2 +- input/regression/spacing-accidental-staffs.ly | 2 +- input/regression/spacing-accidental.ly | 2 +- input/regression/spacing-bar-stem.ly | 2 +- input/regression/spacing-clef-first-note.ly | 2 +- input/regression/spacing-end-of-line.ly | 2 +- input/regression/spacing-ended-voice.ly | 2 +- input/regression/spacing-folded-clef.ly | 2 +- input/regression/spacing-folded-clef2.ly | 2 +- input/regression/spacing-grace-duration.ly | 2 +- input/regression/spacing-grace.ly | 2 +- input/regression/spacing-knee.ly | 2 +- input/regression/spacing-multi-tuplet.ly | 2 +- input/regression/spacing-note-flags.ly | 2 +- input/regression/spacing-rest.ly | 2 +- input/regression/spacing-short-notes.ly | 2 +- input/regression/spacing-stem-bar.ly | 2 +- input/regression/spacing-stem-direction.ly | 2 +- .../regression/spacing-stem-same-direction.ly | 2 +- input/regression/spacing-to-grace.ly | 2 +- input/regression/spacing-very-tight.ly | 2 +- input/regression/span-bar.ly | 2 +- input/regression/staccato-pos.ly | 2 +- input/regression/staff-tweak.ly | 2 +- input/regression/stanza-number.ly | 2 +- input/regression/stem-direction-down.ly | 2 +- input/regression/stem-direction.ly | 2 +- input/regression/stem-spacing.ly | 2 +- input/regression/stem-tremolo.ly | 2 +- input/regression/system-extents.ly | 2 +- input/regression/system-start-bracket.ly | 2 +- input/regression/text-spanner.ly | 2 +- input/regression/tie-accidental.ly | 2 +- input/regression/tie-break-accidental.ly | 2 +- input/regression/tie-busy-grobs.ly | 2 +- input/regression/tie-chord-partial.ly | 2 +- input/regression/tie-chord.ly | 2 +- input/regression/tie-dots.ly | 2 +- input/regression/tie-grace.ly | 2 +- input/regression/tie.ly | 2 +- input/regression/triplets.ly | 2 +- input/regression/tup.ly | 2 +- input/regression/tuplet-beam.ly | 2 +- input/regression/tuplet-nest.ly | 2 +- input/regression/tuplet-properties.ly | 2 +- input/regression/tuplet-rest.ly | 2 +- .../regression/tuplet-staffline-collision.ly | 2 +- input/regression/volta-broken-left-edge.ly | 2 +- input/sondag-morgen/sondag-morgen-folded.ly | 10 - input/sondag-morgen/sondag-morgen-lyrics.ly | 66 ---- .../sondag-morgen-omkvaed-volta1.ly | 141 -------- .../sondag-morgen-omkvaed-volta3.ly | 91 ----- input/sondag-morgen/sondag-morgen-outro.ly | 186 ----------- .../sondag-morgen-vers-volta1.ly | 89 ----- input/sondag-morgen/sondag-morgen-vers.ly | 313 ------------------ input/test/+.ly | 2 +- input/test/ac-extra-voice.ly | 2 +- input/test/add-staccato.ly | 2 +- input/test/add-text-script.ly | 2 +- input/test/ancient-accidentals.ly | 2 +- input/test/ancient-font.ly | 2 +- input/test/ancient-time.ly | 2 +- input/test/bagpipe.ly | 2 +- input/test/bar-always.ly | 2 +- input/test/bar-lines-lyric-only.ly | 2 +- input/test/bar-lines.ly | 2 +- input/test/bar-number-every-fifth.ly | 2 +- input/test/bar-number-show-all.ly | 2 +- input/test/beam-auto-4-8.ly | 2 +- input/test/beam-auto-override.ly | 2 +- input/test/beam-auto.ly | 2 +- input/test/beam-control.ly | 2 +- input/test/beam-count.ly | 2 +- input/test/beam-dir-functions.ly | 2 +- input/test/beam-isknee.ly | 2 +- input/test/beam-neutral-direction.ly | 2 +- input/test/beam-rest.ly | 2 +- input/test/blank-notes.ly | 2 +- input/test/blank-paper-tab.ly | 2 +- input/test/blank-paper.ly | 2 +- input/test/boxed-molecule.ly | 2 +- input/test/broken-spanner-adjustment.ly | 2 +- input/test/caps.ly | 2 +- input/test/cautionaries.ly | 2 +- input/test/chord-markup.ly | 2 +- input/test/chord-names-jazz.ly | 2 +- input/test/chord-names-no-inversions.ly | 2 +- input/test/chords.ly | 2 +- input/test/clef-8-syntax.ly | 2 +- input/test/clef-end-of-line.ly | 2 +- input/test/coda-kludge.ly | 2 +- input/test/coriolan-margin.ly | 2 +- input/test/count-systems.ly | 2 +- input/test/crescendi.ly | 2 +- input/test/cue-notes.ly | 2 +- input/test/different-time-signatures.ly | 2 +- input/test/drarn-slurs.ly | 2 +- input/test/drarn.ly | 2 +- input/test/dynamic-absolute-volume.ly | 2 +- input/test/dynamic-extra.ly | 2 +- input/test/embedded-postscript.ly | 2 +- input/test/embedded-scm.ly | 2 +- input/test/embedded-tex.ly | 2 +- input/test/explicit.ly | 2 +- input/test/extra-staff.ly | 2 +- input/test/fill-a4.ly | 2 +- input/test/follow-thread.ly | 2 +- input/test/force-hshift.ly | 2 +- input/test/gourlay.ly | 2 +- input/test/hara-kiri-switch.ly | 2 +- input/test/hara-kiri.ly | 2 +- input/test/harmonic.ly | 2 +- input/test/header-ifelse.ly | 2 +- input/test/hshift.ly | 2 +- input/test/hymn.ly | 2 +- input/test/improv.ly | 2 +- input/test/incipit.ly | 2 +- input/test/instrument-name-grandstaff.ly | 2 +- input/test/ly2dvi-testpage.ly | 2 +- input/test/manual-clef.ly | 2 +- input/test/maximum-rest-count.ly | 2 +- input/test/mensural-ligatures.ly | 2 +- input/test/midi-scales.ly | 2 +- input/test/midi-tuplets.ly | 2 +- input/test/midi-volume-equaliser.ly | 2 +- input/test/move-accidentals.ly | 2 +- input/test/move-mark.ly | 2 +- input/test/move-notehead.ly | 2 +- input/test/move-specific-text.ly | 2 +- input/test/music-box.ly | 2 +- input/test/music-creation.ly | 2 +- input/test/nested-groups.ly | 2 +- input/test/no-bar-lines.ly | 2 +- input/test/no-staff.ly | 2 +- input/test/octave-duplicate.ly | 2 +- input/test/ossia.ly | 2 +- input/test/part-combine-moments.ly | 2 +- input/test/part-combine-staff.ly | 2 +- input/test/part-combine.ly | 2 +- input/test/partial-blank.ly | 2 +- input/test/pedal.ly | 2 +- input/test/phrasing-slur-height.ly | 2 +- input/test/poly-metric.ly | 2 +- input/test/preset-extent.ly | 2 +- input/test/repeat-manual.ly | 2 +- input/test/repeat.ly | 2 +- input/test/rest-dot-positions.ly | 2 +- input/test/rests.ly | 2 +- input/test/reverse-music.ly | 2 +- input/test/rhythm-excercise.ly | 2 +- input/test/scales-greek.ly | 2 +- input/test/scales.ly | 2 +- input/test/scheme-interactions.ly | 2 +- input/test/script-abbreviations.ly | 2 +- input/test/script-chart.ly | 2 +- input/test/script-priority.ly | 2 +- input/test/separate-staccato.ly | 2 +- input/test/simple-slur-endings.ly | 2 +- input/test/slur-area.ly | 2 +- input/test/slur-attachment-override.ly | 2 +- input/test/slur-attachment.ly | 2 +- input/test/slur-broken-cross-staff.ly | 2 +- input/test/slur-broken.ly | 2 +- input/test/slur-damping.ly | 2 +- input/test/slur-dash.ly | 2 +- input/test/slur-follow-music.ly | 2 +- input/test/slur-minimum-length.ly | 2 +- input/test/slur-positions.ly | 2 +- input/test/slur-proof.ly | 2 +- input/test/slur-symmetry-2.ly | 2 +- input/test/slur-symmetry-3.ly | 2 +- input/test/slur-ugly.ly | 2 +- input/test/smart-transpose.ly | 2 +- input/test/solo-a2.ly | 2 +- input/test/spacing-2.ly | 2 +- input/test/span-bars.ly | 2 +- input/test/stacked-scripts.ly | 2 +- input/test/staff-bracket.ly | 2 +- input/test/staff-container.ly | 2 +- input/test/staff-lines.ly | 2 +- input/test/staff-margin-partial.ly | 2 +- input/test/staff-size.ly | 2 +- input/test/staff-space.ly | 2 +- input/test/stem-centered.ly | 2 +- input/test/stem-cross-staff.ly | 2 +- input/test/stem-extend.ly | 2 +- input/test/stem-length.ly | 2 +- input/test/stem.ly | 2 +- input/test/tablature-hammer.ly | 2 +- input/test/tablature.ly | 2 +- input/test/text-spanner.ly | 2 +- input/test/textscript.ly | 2 +- input/test/tie-broken.ly | 2 +- input/test/tie-sparse.ly | 2 +- input/test/time.ly | 2 +- input/test/timing.ly | 2 +- input/test/title.ly | 2 +- input/test/to-xml.ly | 2 +- input/test/transposing.ly | 2 +- input/test/transposition.ly | 2 +- input/test/trill.ly | 2 +- input/test/trills.ly | 2 +- input/test/unfold-all-repeats.ly | 2 +- input/test/uniform-breaking.ly | 2 +- input/test/vertical-extent.ly | 2 +- input/test/vertical-text.ly | 2 +- input/tutorial/brahms-original.ly | 2 +- input/tutorial/brahms-tweaked.ly | 2 +- input/tutorial/miniatures.ly | 23 -- input/tutorial/os-flute-2.ly | 29 -- input/tutorial/os-music.ly | 36 -- input/tutorial/os-score.ly | 75 ----- lily/beam-quanting.cc | 16 +- 403 files changed, 399 insertions(+), 1472 deletions(-) delete mode 100644 input/sondag-morgen/sondag-morgen-folded.ly delete mode 100644 input/sondag-morgen/sondag-morgen-lyrics.ly delete mode 100644 input/sondag-morgen/sondag-morgen-omkvaed-volta1.ly delete mode 100644 input/sondag-morgen/sondag-morgen-omkvaed-volta3.ly delete mode 100644 input/sondag-morgen/sondag-morgen-outro.ly delete mode 100644 input/sondag-morgen/sondag-morgen-vers-volta1.ly delete mode 100644 input/sondag-morgen/sondag-morgen-vers.ly delete mode 100644 input/tutorial/miniatures.ly delete mode 100644 input/tutorial/os-flute-2.ly delete mode 100644 input/tutorial/os-music.ly delete mode 100644 input/tutorial/os-score.ly diff --git a/ChangeLog b/ChangeLog index 276799af6a..91f54d8aa8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2003-07-04 Han-Wen Nienhuys + + * Documentation/user/*.itely: various fixes. + + * buildscripts/mf-to-table.py (base): break table every three + symbols. + + * input/: remove %% new-chords-done %% . + + * input/tutorial: remove os-flute-2.ly os-score.ly miniatures.ly + os-music.ly + 2003-07-03 Han-Wen Nienhuys * make/lilypond.redhat.spec.in: require GUILE >= 1.6.4-7 diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely index 98b502447b..9af26d928d 100644 --- a/Documentation/user/cheatsheet.itely +++ b/Documentation/user/cheatsheet.itely @@ -212,7 +212,7 @@ a-\> a a-\! @item @code{\partial 8} @tab upstep @tab -@lilypond[fragment] +@lilypond[fragment,relative 1] \partial 8 f8 c2 d e @end lilypond @@ -230,7 +230,7 @@ a-\> a a-\! @tab grace notes @tab @lilypond[relative 1,fragment] - \grace b16 c4 +\context Voice { \grace b16 c4 } @end lilypond @item @code{\lyrics @{ @dots{} @}} diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index 5e18d7bcb7..65ab012cd1 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -162,7 +162,7 @@ internals document, @internalsref{\NAME\} @macro refcommand{WHAT} @cindex @code{\WHAT\} -@code{\WHAT\} +@code{\WHAT\}, @end macro @macro syntax diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 4a6526d909..61fdaa9cf8 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1119,7 +1119,7 @@ Normally, note heads with a different number of dots are not merged, but when the object property @code{merge-differently-dotted} is set in the @internalsref{NoteCollision} object, they are: @lilypond[verbatim,fragment,singleline] -\relative c' \context Voice < { +\relative c'' \context Voice < { g8 g8 \property Staff.NoteCollision \override #'merge-differently-dotted = ##t @@ -1249,9 +1249,8 @@ same effect as twiddling with @code{stemLeftBeamCount} and c16-[ c c c c c c c-] \property Voice.subdivideBeams = ##t c16-[ c c c c c c c-] - c32-[ c c c c c c c c c c c c c c c-] \property Score.beatLength = #(ly:make-moment 1 8) - c32-[ c c c c c c c c c c c c c c c-] + c16-[ c c c c c c c-] @end lilypond @cindex subdivideBeams @@ -6847,6 +6846,7 @@ LilyPond version. @c [TODO: revise for new site.] Suppose we want to move the fingering indication in the fragment below + @lilypond[relative=2] c-2 \stemUp diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 0b8887f843..cbd0e07317 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -839,7 +839,7 @@ The lyrics can be set to these notes, combining both with the @end example The final result is -@lilypond[singleline,verbatim] +@lilypond[verbatim,linewidth=6.0cm] \score { \notes { \addlyrics @@ -1072,7 +1072,7 @@ voices with @code{\\}: < @{ a4 g2 f4-~ f4 @} \\ @{ r4 g4 f2 f4 @} > @end example -@lilypond[relative=1] +@lilypond[relative=2] \context Staff < { a4 g2 f4-~ f4 } \\ { r4 g4 f2 f4 } > @end lilypond @@ -1084,7 +1084,7 @@ temporarily do not play: < @{ a4 g2 f4-~ f4 @} \\ @{ s4 g4 f2 f4 @} > @end example -@lilypond[relative] +@lilypond[relative=2] \context Staff < { a4 g2 f4-~ f4 } \\ { s4 g4 f2 f4 } > @end lilypond @@ -1118,7 +1118,7 @@ Here is a full-fledged example: @lilypond[relative 0,fragment] \context PianoStaff < \context Staff = up { - c4 c g g } + c4 c g' g } \context Staff = down { \clef bass c, c' e c } > @@ -1263,7 +1263,7 @@ little to the left, and 1.8 staff space downwards. @cindex setting object properties -@lilypond[relative=2,verbatim] +@lilypond[relative 2,verbatim] \stemUp f-5 \once \property Voice.Fingering @@ -1285,7 +1285,7 @@ using ties. Normally ties only happen between notes of the same voice. By introducing a tie in a different voice, and blanking a stem in that voice, the tie appears to cross voices. -@lilypond[fragment,relative=1] +@lilypond[fragment,relative 1] \context Staff < { \once \property Voice.Stem \set #'transparent = ##t b8~ b8 diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py index 17d653ab5b..a63cdc0c17 100644 --- a/buildscripts/mf-to-table.py +++ b/buildscripts/mf-to-table.py @@ -154,13 +154,18 @@ def write_ps_encoding (file, global_info, charmetrics): def write_fontlist (file, global_info, charmetrics): ##nm = global_info['FontFamily'] nm = font_family + per_line = 3 file.write (r""" -% Lilypond file to list all font symbols and the corresponding names -% Automatically generated by mf-to-table.py -\score{\notes{\fatText -""") +%% Lilypond file to list all font symbols and the corresponding names +%% Automatically generated by mf-to-table.py +\score{\notes{\fatText\time %d/4 +""" % per_line) + + count = 0 for m in charmetrics: + count += 1 + ## \musicglyph and \markup require "_" to be escaped differently: musicglyphname=re.sub('_','\\\\_', m['name']) markupname=re.sub('_','\\\\_', musicglyphname) @@ -169,6 +174,9 @@ def write_fontlist (file, global_info, charmetrics): markupname=re.sub('--','-{}-', markupname) file.write (' s^\\markup { \\musicglyph #"%s" "%s" }\n' % (musicglyphname, markupname)) + + if (count % 3) ==0: + file.write (' \\break\n') file.write (r""" } \paper{ diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly index 54ae01709b..927f39c87a 100644 --- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -154,4 +154,4 @@ lower = \context Staff \notes \relative c{ } } -%% new-chords-done %% + diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly index c11ba27592..9aeeec55e4 100644 --- a/input/mutopia/F.Schubert/standchen.ly +++ b/input/mutopia/F.Schubert/standchen.ly @@ -457,4 +457,4 @@ grandStaff = \context PianoStaff < \tempo 4 = 54 } } -%% new-chords-done %% + diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/header.ly b/input/mutopia/J.S.Bach/Petites-Preludes/header.ly index 28070de2a5..666dffd113 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/header.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/header.ly @@ -39,4 +39,4 @@ instrument = "Piano" tagline = \mutopiapublicdomain footer = "pre-Mutopia-200y/mm/dd-nr" } -%% new-chords-done %% + diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index 8039e44a40..59b583a1d2 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly @@ -130,4 +130,4 @@ global = \notes{ piece = \piece } } -%% new-chords-done %% + diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly index 8c03af5a3c..f05b0c01a5 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly @@ -98,4 +98,4 @@ global = \notes{ } } -%% new-chords-done %% + diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly index 6a14883154..a3f0baf298 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly @@ -156,4 +156,4 @@ global = \notes{ piece = \piece } } -%% new-chords-done %% + diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly index 9cd5cebe5e..3b1e3eee94 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly @@ -205,4 +205,4 @@ global = \notes{ piece = \piece } } -%% new-chords-done %% + diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly index dc9bb1aed6..0d9df34128 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly @@ -202,4 +202,4 @@ global = \notes{ } } -%% new-chords-done %% + diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly index 64833086c6..e213f61513 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly @@ -127,4 +127,4 @@ global = \notes{ } } -%% new-chords-done %% + diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly index 4fc83529c2..987b52a7c0 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly @@ -12,4 +12,4 @@ \include "preludes-5.ly" \include "preludes-6.ly" -%% new-chords-done %% + diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly index e4032735c7..df1a257a12 100644 --- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly +++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly @@ -191,4 +191,4 @@ baerPaper = \paper { %%% Local variables: %%% LilyPond-indent-level:2 %%% End: -%% new-chords-done %% + diff --git a/input/mutopia/J.S.Bach/wtk1-fugue1.ly b/input/mutopia/J.S.Bach/wtk1-fugue1.ly index 98077a4a7a..8170181262 100644 --- a/input/mutopia/J.S.Bach/wtk1-fugue1.ly +++ b/input/mutopia/J.S.Bach/wtk1-fugue1.ly @@ -196,4 +196,4 @@ bass = \context Voice = bassvoice \midi { \tempo 4 = 84 } } -%% new-chords-done %% + diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly index 423878159c..8f01dead25 100644 --- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -222,4 +222,4 @@ bassdux = \context Voice=three \notes \relative c' { } } -%% new-chords-done %% + diff --git a/input/mutopia/J.S.Bach/wtk1-prelude1.ly b/input/mutopia/J.S.Bach/wtk1-prelude1.ly index fa9facd97b..ac7168a205 100644 --- a/input/mutopia/J.S.Bach/wtk1-prelude1.ly +++ b/input/mutopia/J.S.Bach/wtk1-prelude1.ly @@ -174,4 +174,4 @@ bass = % EOF -%% new-chords-done %% + diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index 3df77a4f9c..bad26f4374 100644 --- a/input/mutopia/R.Schumann/romanze-op28-2.ly +++ b/input/mutopia/R.Schumann/romanze-op28-2.ly @@ -282,4 +282,4 @@ leftb = \notes \transpose c cis { \midi { \tempo 8=100 } } -%% new-chords-done %% + diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly index 05ea22910f..e5e5ed1797 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly @@ -38,4 +38,4 @@ virtuoso that taught in Geneva. \include "mozart-hrn3-rondo.ly" -%% new-chords-done %% + diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly index 32bdba0fbb..78d3efe1ed 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly @@ -165,4 +165,4 @@ allegro = \header { piece = "allegro" opus = "" } \midi{ \tempo 4=90 } } -%% new-chords-done %% + diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly index 9593b09f29..f43362f505 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly @@ -56,4 +56,4 @@ stopGraceMusic= \sequential { linewidth = 189. \mm } -%% new-chords-done %% + diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly index f1c6b06563..9c947cd6d3 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly @@ -91,4 +91,4 @@ romanze = \notes \relative c' { \midi{ \tempo 4 = 70 } \paper{} } -%% new-chords-done %% + diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly index 26321c7ad7..926dba257c 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly @@ -192,4 +192,4 @@ rondo = \notes \relative c' \midi{ \tempo 4 = 100 } \paper { } } -%% new-chords-done %% + diff --git a/input/no-notation/midi-grace.ly b/input/no-notation/midi-grace.ly index 75665a801c..ca8c1d437b 100644 --- a/input/no-notation/midi-grace.ly +++ b/input/no-notation/midi-grace.ly @@ -11,4 +11,4 @@ \paper { } \midi { } } -%% new-chords-done %% + diff --git a/input/no-notation/parse5.ly b/input/no-notation/parse5.ly index 9347c82b14..cf3c6c8be5 100644 --- a/input/no-notation/parse5.ly +++ b/input/no-notation/parse5.ly @@ -8,4 +8,4 @@ { \key cis \major fis4 \key es \major g4 } > } -%% new-chords-done %% + diff --git a/input/regression/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly index 9376f3ab1f..5c0462bc00 100644 --- a/input/regression/accidental-cautionary.ly +++ b/input/regression/accidental-cautionary.ly @@ -20,4 +20,4 @@ parentheses (default) or smaller accidentals. \paper { raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly index f551fcb16c..fc81a6d704 100644 --- a/input/regression/accidental-double.ly +++ b/input/regression/accidental-double.ly @@ -14,4 +14,4 @@ } -%% new-chords-done %% + diff --git a/input/regression/accidental-ledger.ly b/input/regression/accidental-ledger.ly index ff45bffcba..8ee07ae398 100644 --- a/input/regression/accidental-ledger.ly +++ b/input/regression/accidental-ledger.ly @@ -10,4 +10,3 @@ } \paper { raggedright = ##t} } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly index 93d8449cc3..8665e0ac65 100644 --- a/input/regression/accidental-octave.ly +++ b/input/regression/accidental-octave.ly @@ -82,4 +82,4 @@ mus = \notes { indent=0.0 } } -%% new-chords-done %% + diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly index ebd62ced08..709d091b1d 100644 --- a/input/regression/accidental-placement.ly +++ b/input/regression/accidental-placement.ly @@ -30,4 +30,4 @@ flats in a sixth should be staggered. " \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly index 22fb639c6c..b3bd975b2c 100644 --- a/input/regression/accidental-single-double.ly +++ b/input/regression/accidental-single-double.ly @@ -20,4 +20,4 @@ gisis'4 gis gisis ges | } > } -%% new-chords-done %% + diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly index caa2a25f35..3adc0ada82 100644 --- a/input/regression/accidental-unbroken-tie-spacing.ly +++ b/input/regression/accidental-unbroken-tie-spacing.ly @@ -26,4 +26,3 @@ Rechts = \context Staff \notes { raggedright = ##t } } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly index 998c23f2ad..de8a5c7ee7 100644 --- a/input/regression/accidental-voice.ly +++ b/input/regression/accidental-voice.ly @@ -58,4 +58,3 @@ voiceb = \notes \transpose c c' { \context NoteNames=namesb \apply #no-octaves \voiceb > } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly index fbee80c7a1..4a08fff710 100644 --- a/input/regression/accidental.ly +++ b/input/regression/accidental.ly @@ -14,4 +14,3 @@ foo = \notes\relative c'' { \key as \major dis4 dis dis!^"force" dis? } \context NoteNames \foo > } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/accidentals.ly b/input/regression/accidentals.ly index 00d927b14d..5914a1c876 100644 --- a/input/regression/accidentals.ly +++ b/input/regression/accidentals.ly @@ -69,4 +69,3 @@ mel = \notes { \key d \major \time 4/4 } } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly index 7149015661..92b40def9a 100644 --- a/input/regression/ambitus.ly +++ b/input/regression/ambitus.ly @@ -96,4 +96,4 @@ lower = \notes \relative c { } } } -%% new-chords-done %% + diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly index 90b938e628..4f9f7d99bd 100644 --- a/input/regression/arpeggio-collision.ly +++ b/input/regression/arpeggio-collision.ly @@ -48,4 +48,4 @@ hairyChord = \context Staff \notes\relative c' < } } -%% new-chords-done %% + diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly index 1892444ea0..3bdbf42828 100644 --- a/input/regression/auto-beam-bar.ly +++ b/input/regression/auto-beam-bar.ly @@ -20,4 +20,3 @@ a16 g a bes c d % ees8 d c raggedright = ##t } } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly index 77f5e1ec6f..2181af3225 100644 --- a/input/regression/auto-beam-triplet.ly +++ b/input/regression/auto-beam-triplet.ly @@ -12,4 +12,3 @@ texidoc = "Automatic beaming is also done on tuplets." } \paper{ } } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly index 6b8b75e85d..72a8f118f3 100644 --- a/input/regression/auto-beam-tuplets.ly +++ b/input/regression/auto-beam-tuplets.ly @@ -12,4 +12,3 @@ beams even if they're auto generated." f8-[ f f ] f8-[ f f ] f f f f f f } }} -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly index 38ba933f89..0bfbd636e2 100644 --- a/input/regression/auto-beam.ly +++ b/input/regression/auto-beam.ly @@ -23,4 +23,4 @@ texidoc="Test automatic beamer: the last measure should have a single beam." } } } -%% new-chords-done %% + diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly index 1a5137bfe9..c8c512b46a 100644 --- a/input/regression/auto-change.ly +++ b/input/regression/auto-change.ly @@ -22,4 +22,4 @@ note. When central C is reached, we don't switch (by default). > } -%% new-chords-done %% + diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly index 7ea8f437d6..fe5f1b05b6 100644 --- a/input/regression/bar-number.ly +++ b/input/regression/bar-number.ly @@ -23,4 +23,3 @@ start counting after the anacrusis." } } } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly index a380bd0b80..5044b902b7 100644 --- a/input/regression/bar-scripts.ly +++ b/input/regression/bar-scripts.ly @@ -53,4 +53,3 @@ stscore = \score { \onestaff \paper { \score{\notes c''} \score {\scscore} -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly index e90550f2e2..c13919f2bf 100644 --- a/input/regression/beam-auto-knee.ly +++ b/input/regression/beam-auto-knee.ly @@ -15,4 +15,3 @@ threshold. linewidth = 40*\staffspace } } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly index fb419b80c9..6b86d60460 100644 --- a/input/regression/beam-center-slope.ly +++ b/input/regression/beam-center-slope.ly @@ -38,4 +38,4 @@ linewidth = 0.0 } } -%% new-chords-done %% + diff --git a/input/regression/beam-chord.ly b/input/regression/beam-chord.ly index bfbd0a7f12..e4f7a8fc2b 100644 --- a/input/regression/beam-chord.ly +++ b/input/regression/beam-chord.ly @@ -23,4 +23,4 @@ the beam should be be horizontal. " raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly index 52d66c107d..0d17e0c5b6 100644 --- a/input/regression/beam-concave.ly +++ b/input/regression/beam-concave.ly @@ -81,4 +81,3 @@ beams this way." %% Local variables: %% LilyPond-indent-level:2 %% End: -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly index fc9f83517a..0f7f7b8349 100644 --- a/input/regression/beam-cross-staff-auto-knee.ly +++ b/input/regression/beam-cross-staff-auto-knee.ly @@ -23,4 +23,3 @@ with explicit staff switches)." raggedright = ##t } } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly index a69583cd16..bb88cbde66 100644 --- a/input/regression/beam-cross-staff-slope.ly +++ b/input/regression/beam-cross-staff-slope.ly @@ -31,4 +31,3 @@ don't cause extreme slopes" \paper { raggedright = ##t} } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly index 3e2aedf433..93af05a998 100644 --- a/input/regression/beam-cross-staff.ly +++ b/input/regression/beam-cross-staff.ly @@ -31,4 +31,3 @@ behave well, wherever the switching point is. } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-damp.ly b/input/regression/beam-damp.ly index 8b9be4e509..c5ce6378fa 100644 --- a/input/regression/beam-damp.ly +++ b/input/regression/beam-damp.ly @@ -22,4 +22,4 @@ Beams are less steep than the notes they encompass. " } } } -%% new-chords-done %% + diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly index a3de4b2f77..459fda070b 100644 --- a/input/regression/beam-default-lengths.ly +++ b/input/regression/beam-default-lengths.ly @@ -14,4 +14,4 @@ f4 f8-[ f] f16-[ f] f32-[ f] f64-[ f] f128-[ f] } \paper{ raggedright = ##t} -} %% new-chords-done %% \ No newline at end of file +} \ No newline at end of file diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index fae4c08134..bb0c7f0259 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -45,4 +45,3 @@ extreme = \notes\relative c'' { raggedright = ##t } } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly index f7fe947038..89064d2513 100644 --- a/input/regression/beam-french.ly +++ b/input/regression/beam-french.ly @@ -17,4 +17,4 @@ } } -%% new-chords-done %% + diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly index 5e31c44409..f03936795f 100644 --- a/input/regression/beam-funky-beamlet.ly +++ b/input/regression/beam-funky-beamlet.ly @@ -18,4 +18,3 @@ should be pointing to the note head. \paper { raggedright = ##t} } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly index cbd6aaac54..6af59043bb 100644 --- a/input/regression/beam-funky.ly +++ b/input/regression/beam-funky.ly @@ -35,4 +35,4 @@ beam. This is in disagreement with the current algorithm." \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/beam-knee-symmetry.ly b/input/regression/beam-knee-symmetry.ly index c82f968af0..f074d700df 100644 --- a/input/regression/beam-knee-symmetry.ly +++ b/input/regression/beam-knee-symmetry.ly @@ -14,4 +14,4 @@ \paper{ raggedright = ##t } -}%% new-chords-done %% +} diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly index 42d25bde94..38ba76dff7 100644 --- a/input/regression/beam-length.ly +++ b/input/regression/beam-length.ly @@ -12,4 +12,3 @@ beams should look the same c c } } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-manual.ly b/input/regression/beam-manual.ly index 4a8fb3e782..06948fcd6e 100644 --- a/input/regression/beam-manual.ly +++ b/input/regression/beam-manual.ly @@ -21,4 +21,3 @@ raggedright = ##t } } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly index ecbaa16c7f..bf0c827652 100644 --- a/input/regression/beam-multiple-cross-staff.ly +++ b/input/regression/beam-multiple-cross-staff.ly @@ -27,4 +27,3 @@ to the last beam. > } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly index c9a2b93b75..bf477edb50 100644 --- a/input/regression/beam-over-barline.ly +++ b/input/regression/beam-over-barline.ly @@ -5,4 +5,3 @@ texidoc = "explicit beams may cross barlines. " \score { \notes \context Voice { c2. c8-[ c8 c8 c8] } } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly index 98de0c3885..bfa652c922 100644 --- a/input/regression/beam-position.ly +++ b/input/regression/beam-position.ly @@ -26,4 +26,3 @@ Override with @code{noStemExtend}. } \midi { } } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-postfix-notation.ly b/input/regression/beam-postfix-notation.ly index c145f84a17..41b627d6bd 100644 --- a/input/regression/beam-postfix-notation.ly +++ b/input/regression/beam-postfix-notation.ly @@ -13,4 +13,3 @@ texidoc = "Beams and ties may be entered in postfix notation, separating the c8-[-~ c-] } } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly index 957d56926d..4387d0b3b1 100644 --- a/input/regression/beam-quanting-horizontal.ly +++ b/input/regression/beam-quanting-horizontal.ly @@ -25,4 +25,4 @@ lengths are between 2 and 1.5." } } -%% new-chords-done %% + diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly index 790e632c22..f6891ad2be 100644 --- a/input/regression/beam-quarter.ly +++ b/input/regression/beam-quarter.ly @@ -9,4 +9,3 @@ } \paper { raggedright = ##t} } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly index dd9bcf0033..ed9e789030 100644 --- a/input/regression/beam-second.ly +++ b/input/regression/beam-second.ly @@ -16,4 +16,4 @@ seconds, you'll spot something fishy very quickly. \paper{ raggedright = ##t } -}%% new-chords-done %% +} diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly index 56ebb84f06..0a8321f9fc 100644 --- a/input/regression/beam-shortened-lengths.ly +++ b/input/regression/beam-shortened-lengths.ly @@ -15,4 +15,3 @@ } \paper{ raggedright = ##t} } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beamed-chord.ly b/input/regression/beamed-chord.ly index 4f3d701084..06c49f8726 100644 --- a/input/regression/beamed-chord.ly +++ b/input/regression/beamed-chord.ly @@ -15,4 +15,3 @@ texidoc = "Hairy case for beam, chord, and automatic knees." r8 <>-( ) bes' d <>-> r | } } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly index 124fd6b0a1..ec04821346 100644 --- a/input/regression/beaming-ternary-metrum.ly +++ b/input/regression/beaming-ternary-metrum.ly @@ -10,4 +10,4 @@ texidoc = "automatic beaming also works in ternary time sigs." } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly index 5c14759792..7a85e00f7a 100644 --- a/input/regression/beaming.ly +++ b/input/regression/beaming.ly @@ -28,4 +28,3 @@ hidden just as with breakable bar lines. }} -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beams.ly b/input/regression/beams.ly index 620596916c..12620ac878 100644 --- a/input/regression/beams.ly +++ b/input/regression/beams.ly @@ -11,4 +11,3 @@ c8-[ c16 e16 g8] }} -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/between-systems.ly b/input/regression/between-systems.ly index 6e21f14d98..5aca60dc04 100644 --- a/input/regression/between-systems.ly +++ b/input/regression/between-systems.ly @@ -19,4 +19,4 @@ By inserting @TeX{} commands between systems, you can force pagebreaks. c1 } } -%% new-chords-done %% + diff --git a/input/regression/break.ly b/input/regression/break.ly index aa1bec5650..86595cee65 100644 --- a/input/regression/break.ly +++ b/input/regression/break.ly @@ -17,4 +17,3 @@ Breaks can be encouraged and discouraged using @code{\\break} and indent = 0.0 linewidth = 4.0\cm} } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly index ba7fd98abc..70632928e0 100644 --- a/input/regression/chord-changes.ly +++ b/input/regression/chord-changes.ly @@ -25,4 +25,3 @@ settings = { linewidth = 40 * \staffspace } } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly index ebf386562f..baa1bfadfc 100644 --- a/input/regression/chord-scripts.ly +++ b/input/regression/chord-scripts.ly @@ -19,5 +19,4 @@ texidoc = "Scripts can also be attached to chord elements." } } -%% new-chords-done %% -%% new-chords-done %% \ No newline at end of file + diff --git a/input/regression/chord-tremolo.ly b/input/regression/chord-tremolo.ly index ce5967870b..38c73e171f 100644 --- a/input/regression/chord-tremolo.ly +++ b/input/regression/chord-tremolo.ly @@ -43,4 +43,4 @@ notes as well.) \midi { } \paper {} } -%% new-chords-done %% + diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly index 5c9625efce..ece5d6f3bd 100644 --- a/input/regression/cluster.ly +++ b/input/regression/cluster.ly @@ -25,4 +25,4 @@ fragment =\notes \relative c' { } -%% new-chords-done %% + diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly index 85962a05ed..0b558c2a1b 100644 --- a/input/regression/collision-2.ly +++ b/input/regression/collision-2.ly @@ -12,4 +12,4 @@ texidoc = "Collisions for single head notes. " > } -%% new-chords-done %% + diff --git a/input/regression/collision-dots.ly b/input/regression/collision-dots.ly index d31b5923e8..a1f70b7f0d 100644 --- a/input/regression/collision-dots.ly +++ b/input/regression/collision-dots.ly @@ -22,4 +22,4 @@ } -%% new-chords-done %% + diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly index 99e9f5f096..2b387197f3 100644 --- a/input/regression/collision-head-chords.ly +++ b/input/regression/collision-head-chords.ly @@ -15,4 +15,4 @@ c4 \paper {raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly index 0afcb8f725..627fcbd231 100644 --- a/input/regression/collision-heads.ly +++ b/input/regression/collision-heads.ly @@ -28,4 +28,3 @@ if the black note heads are from 8th or shorter notes. } > } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/collision-mesh.ly b/input/regression/collision-mesh.ly index 66a90954e3..6c015b45d4 100644 --- a/input/regression/collision-mesh.ly +++ b/input/regression/collision-mesh.ly @@ -31,4 +31,3 @@ are resolved." -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly index bf45a57697..bfc0a20d2c 100644 --- a/input/regression/collisions.ly +++ b/input/regression/collisions.ly @@ -52,4 +52,4 @@ hairyChord = \context Staff \notes \relative c'' % \midi { \tempo 4:80 } } -%% new-chords-done %% + diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly index 9cc82c2f1c..5433620fa6 100644 --- a/input/regression/completion-heads-polyphony.ly +++ b/input/regression/completion-heads-polyphony.ly @@ -22,4 +22,3 @@ Completion heads are not fooled by polyphony with a different rhythm. } } } -%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly index c749262271..030fcaa472 100644 --- a/input/regression/completion-heads.ly +++ b/input/regression/completion-heads.ly @@ -21,4 +21,4 @@ notes that cross bar lines are split into tied notes. \consists "Completion_heads_engraver" } } -}%% new-chords-done %% \ No newline at end of file +} \ No newline at end of file diff --git a/input/regression/custos.ly b/input/regression/custos.ly index f83f23dd8d..ed268cf7f3 100644 --- a/input/regression/custos.ly +++ b/input/regression/custos.ly @@ -33,4 +33,4 @@ raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly index 422ef79bf9..94165b758b 100644 --- a/input/regression/dot-flag-collision.ly +++ b/input/regression/dot-flag-collision.ly @@ -15,4 +15,4 @@ \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/dots.ly b/input/regression/dots.ly index 1e3bc351f9..6d73632ea4 100644 --- a/input/regression/dots.ly +++ b/input/regression/dots.ly @@ -29,4 +29,4 @@ a column. The dots go along as rests are shifted to avoid collisions. \paper { } \midi { } } -%% new-chords-done %% + diff --git a/input/regression/drums.ly b/input/regression/drums.ly index ae5b88903f..c0409f770f 100644 --- a/input/regression/drums.ly +++ b/input/regression/drums.ly @@ -61,4 +61,4 @@ timb = \notes \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 \midi{ \tempo 4=120 } } -%% new-chords-done %% + diff --git a/input/regression/dynamics-broken-hairpin.ly b/input/regression/dynamics-broken-hairpin.ly index db6cf5c5a1..c852898974 100644 --- a/input/regression/dynamics-broken-hairpin.ly +++ b/input/regression/dynamics-broken-hairpin.ly @@ -11,4 +11,4 @@ texidoc = "Broken crescendi should be open on one side." } } -%% new-chords-done %% + diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly index f6db30974c..449b9c877c 100644 --- a/input/regression/dynamics-glyphs.ly +++ b/input/regression/dynamics-glyphs.ly @@ -18,4 +18,4 @@ closer to the note head (staccato, accent) are reckoned with. } } -%% new-chords-done %% + diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly index 0d50e9b040..76141e4161 100644 --- a/input/regression/dynamics-line.ly +++ b/input/regression/dynamics-line.ly @@ -29,4 +29,4 @@ a \tempo 1 = 60 } } -%% new-chords-done %% + diff --git a/input/regression/dynamics-unbound-hairpin.ly b/input/regression/dynamics-unbound-hairpin.ly index a9410f9c16..ce6db9ec40 100644 --- a/input/regression/dynamics-unbound-hairpin.ly +++ b/input/regression/dynamics-unbound-hairpin.ly @@ -10,4 +10,4 @@ texidoc = "Crescendi may start off-notes. In that case, they should not collaps \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly index d4275f8dca..a8f282e89c 100644 --- a/input/regression/easy-notation.ly +++ b/input/regression/easy-notation.ly @@ -11,4 +11,4 @@ You also get ledger lines, of course." raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly index 529695353a..50504c8c42 100644 --- a/input/regression/figured-bass.ly +++ b/input/regression/figured-bass.ly @@ -31,4 +31,4 @@ numbers, like @code{<4 6+>}. \paper { raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly index 84ebb9a367..127a79abff 100644 --- a/input/regression/finger-chords.ly +++ b/input/regression/finger-chords.ly @@ -28,6 +28,6 @@ easier to process." } -%% new-chords-done %% -%% new-chords-done %% -%% new-chords-done %% + + + diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly index b67467fd28..1eedce77b7 100644 --- a/input/regression/fingering.ly +++ b/input/regression/fingering.ly @@ -14,5 +14,5 @@ next to noteheads. << c-1 e-2 g-3 b-4 >> }} -%% new-chords-done %% -%% new-chords-done %% + + diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly index 425e486238..b08da1b43e 100644 --- a/input/regression/font-magnification.ly +++ b/input/regression/font-magnification.ly @@ -22,4 +22,4 @@ c4-"normal" } -%% new-chords-done %% + diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly index dab64e3aa3..e3c93d6cf7 100644 --- a/input/regression/generic-output-property.ly +++ b/input/regression/generic-output-property.ly @@ -26,4 +26,4 @@ setting the @code{extra-offset} of a grob. raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly index 4938d08cdc..0241445b72 100644 --- a/input/regression/glissando.ly +++ b/input/regression/glissando.ly @@ -31,4 +31,4 @@ The engraver does no time-keeping, so it involves some trickery to get } } } -%% new-chords-done %% + diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly index f7d5d16da6..854b01fe81 100644 --- a/input/regression/grace-auto-beam.ly +++ b/input/regression/grace-auto-beam.ly @@ -12,4 +12,4 @@ } \paper { raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/grace-bar-line.ly b/input/regression/grace-bar-line.ly index 38168c39c3..2e5939766d 100644 --- a/input/regression/grace-bar-line.ly +++ b/input/regression/grace-bar-line.ly @@ -11,4 +11,4 @@ texidoc = "Bar line should come before the grace note." f1 \grace { a'16-[ f] } g1 } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly index 9f8b64d26c..a426044e5d 100644 --- a/input/regression/grace-bar-number.ly +++ b/input/regression/grace-bar-number.ly @@ -15,4 +15,4 @@ c1 } \paper { raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/grace-beam.ly b/input/regression/grace-beam.ly index 2a48592195..fa171aa398 100644 --- a/input/regression/grace-beam.ly +++ b/input/regression/grace-beam.ly @@ -7,4 +7,4 @@ Unbeamed grace notes are not put into normal beams. \version "1.7.18" \score { \notes\relative c'' { c4 d8-[ \grace { e32-[ d c d] } e8] e-[ e \grace { f16 } e8 e] }} -%% new-chords-done %% + diff --git a/input/regression/grace-dynamic.ly b/input/regression/grace-dynamic.ly index eba3373849..5c72e1ea2d 100644 --- a/input/regression/grace-dynamic.ly +++ b/input/regression/grace-dynamic.ly @@ -11,4 +11,4 @@ texidoc="Dynamics on grace notes are small and behave nicely (don't crash into t } -%% new-chords-done %% + diff --git a/input/regression/grace-end.ly b/input/regression/grace-end.ly index b0909aefcc..e1db125095 100644 --- a/input/regression/grace-end.ly +++ b/input/regression/grace-end.ly @@ -18,4 +18,4 @@ } \midi { } } -%% new-chords-done %% + diff --git a/input/regression/grace-nest.ly b/input/regression/grace-nest.ly index 0400619e35..dd82a24d0d 100644 --- a/input/regression/grace-nest.ly +++ b/input/regression/grace-nest.ly @@ -11,4 +11,4 @@ texidoc = "grace code should not be confused by nested sequential musics, contai } } -%% new-chords-done %% + diff --git a/input/regression/grace-nest1.ly b/input/regression/grace-nest1.ly index 0400619e35..dd82a24d0d 100644 --- a/input/regression/grace-nest1.ly +++ b/input/regression/grace-nest1.ly @@ -11,4 +11,4 @@ texidoc = "grace code should not be confused by nested sequential musics, contai } } -%% new-chords-done %% + diff --git a/input/regression/grace-nest2.ly b/input/regression/grace-nest2.ly index 05445599f9..3d149d2f37 100644 --- a/input/regression/grace-nest2.ly +++ b/input/regression/grace-nest2.ly @@ -8,4 +8,4 @@ texidoc = "grace code should not be confused by nested sequential musics, contai { \grace b'8 c''2 } \grace b'16 c''4 c''4 \bar "|." }} -%% new-chords-done %% + diff --git a/input/regression/grace-nest3.ly b/input/regression/grace-nest3.ly index 57b8985848..a0ba328692 100644 --- a/input/regression/grace-nest3.ly +++ b/input/regression/grace-nest3.ly @@ -6,4 +6,4 @@ < { \grace { e8 } f1 } > } } -%% new-chords-done %% + diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly index bffc916ee9..d5c8fc7a9f 100644 --- a/input/regression/grace-nest4.ly +++ b/input/regression/grace-nest4.ly @@ -15,4 +15,4 @@ texidoc = "Another combination of grace note nesting." } -%% new-chords-done %% + diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly index f6e7662f03..0c5c45b3c9 100644 --- a/input/regression/grace-nest5.ly +++ b/input/regression/grace-nest5.ly @@ -8,4 +8,4 @@ \paper { raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly index 7cd0030e33..8fe664141b 100644 --- a/input/regression/grace-part-combine.ly +++ b/input/regression/grace-part-combine.ly @@ -16,4 +16,4 @@ > > } -%% new-chords-done %% + diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly index da723fe9f8..68f694d101 100644 --- a/input/regression/grace-staff-length.ly +++ b/input/regression/grace-staff-length.ly @@ -18,4 +18,4 @@ texidoc = "Stripped version of trip.ly. Staffs should be of correct length." > \paper { } } -%% new-chords-done %% + diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly index 50b5c2353f..5889422b6e 100644 --- a/input/regression/grace-start.ly +++ b/input/regression/grace-start.ly @@ -10,4 +10,4 @@ texidoc = "Pieces may begin with grace notes." } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly index 72dc204484..4221b14b9a 100644 --- a/input/regression/grace-stems.ly +++ b/input/regression/grace-stems.ly @@ -22,4 +22,4 @@ the two grace beams should be the same here. } \midi { } } -%% new-chords-done %% + diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly index 6a87b9dd5b..30c9df70da 100644 --- a/input/regression/grace-sync.ly +++ b/input/regression/grace-sync.ly @@ -14,4 +14,4 @@ > \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly index 4e472d133b..7169848ab9 100644 --- a/input/regression/grace-unfold-repeat.ly +++ b/input/regression/grace-unfold-repeat.ly @@ -14,4 +14,4 @@ Line breaks may happen before grace notes. } } -%% new-chords-done %% + diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly index 27298fe49a..8a15d73f48 100644 --- a/input/regression/grace-volta-repeat.ly +++ b/input/regression/grace-volta-repeat.ly @@ -19,4 +19,4 @@ } -%% new-chords-done %% + diff --git a/input/regression/grace.ly b/input/regression/grace.ly index c6edd2561c..e611c48416 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -32,4 +32,4 @@ not set. Main note scripts don't end up on the grace note. \paper {raggedright = ##t} \midi{ } } -%% new-chords-done %% + diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly index 4569db4300..04312ce95a 100644 --- a/input/regression/hairpin-ending.ly +++ b/input/regression/hairpin-ending.ly @@ -13,4 +13,4 @@ into them." \notes \relative c'' { c4 \> c4 \! c4 c4_\ff \> c4 \! c4 -\p } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly index 4f69b459dd..bca6a36ac9 100644 --- a/input/regression/hara-kiri-pianostaff.ly +++ b/input/regression/hara-kiri-pianostaff.ly @@ -17,4 +17,4 @@ texidoc = "Hara kiri should not upset fixed distance alignment like in pianostaf } } -%% new-chords-done %% + diff --git a/input/regression/hara-kiri-short.ly b/input/regression/hara-kiri-short.ly index 98745ecb50..8a9a9c0044 100644 --- a/input/regression/hara-kiri-short.ly +++ b/input/regression/hara-kiri-short.ly @@ -46,4 +46,4 @@ zagers = \context StaffGroup < } -%% new-chords-done %% + diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly index dfdb533851..ddc57dec8a 100644 --- a/input/regression/instrument-name-markup.ly +++ b/input/regression/instrument-name-markup.ly @@ -24,4 +24,4 @@ textFlat = \markup {\smaller \musicglyph #"accidentals--1"} \paper { linewidth= 8.0\cm } } -%% new-chords-done %% + diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly index d38f1e0d2d..1529624e7e 100644 --- a/input/regression/instrument-name.ly +++ b/input/regression/instrument-name.ly @@ -22,4 +22,4 @@ be on normal staves, but also on compound staves, like the PianoStaff raggedright = ##t }} -%% new-chords-done %% + diff --git a/input/regression/key-clefs.ly b/input/regression/key-clefs.ly index 6a19e0d3b9..5603e38df4 100644 --- a/input/regression/key-clefs.ly +++ b/input/regression/key-clefs.ly @@ -24,4 +24,4 @@ \paper{\paperSixteen} } -%% new-chords-done %% + diff --git a/input/regression/key-signature-scordatura.ly b/input/regression/key-signature-scordatura.ly index 97990de626..198d2a93e6 100644 --- a/input/regression/key-signature-scordatura.ly +++ b/input/regression/key-signature-scordatura.ly @@ -14,4 +14,4 @@ directly." e a, g a } } -%% new-chords-done %% + diff --git a/input/regression/keys.ly b/input/regression/keys.ly index d6e45ccf3e..366a22903a 100644 --- a/input/regression/keys.ly +++ b/input/regression/keys.ly @@ -25,4 +25,4 @@ also created on a clef change. e2 } } -%% new-chords-done %% + diff --git a/input/regression/lyric-align.ly b/input/regression/lyric-align.ly index 83399492ad..2196d8c598 100644 --- a/input/regression/lyric-align.ly +++ b/input/regression/lyric-align.ly @@ -78,4 +78,4 @@ > > } -%% new-chords-done %% + diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index e39e75322d..0b8b2be7f5 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -38,4 +38,4 @@ texidoc ="polyphonic rhythms and rests don't disturb } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly index 239cc5edfd..e07104284f 100644 --- a/input/regression/lyric-combine.ly +++ b/input/regression/lyric-combine.ly @@ -44,4 +44,4 @@ textII = \context LyricsVoice = "middle-1" \lyrics { da -- da __ da -- da da da > } -%% new-chords-done %% + diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly index 050af628d0..853914d0d4 100644 --- a/input/regression/lyric-extender.ly +++ b/input/regression/lyric-extender.ly @@ -8,4 +8,4 @@ } -%% new-chords-done %% + diff --git a/input/regression/lyric-hyphen.ly b/input/regression/lyric-hyphen.ly index e42af8ac58..7a19e3c88a 100644 --- a/input/regression/lyric-hyphen.ly +++ b/input/regression/lyric-hyphen.ly @@ -11,4 +11,4 @@ -%% new-chords-done %% + diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly index 87721d46b1..5d91f38847 100644 --- a/input/regression/lyric-phrasing.ly +++ b/input/regression/lyric-phrasing.ly @@ -40,4 +40,4 @@ } > } -%% new-chords-done %% + diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly index af147d719a..f11cf1c386 100644 --- a/input/regression/lyrics-bar.ly +++ b/input/regression/lyrics-bar.ly @@ -39,4 +39,4 @@ lyrics don't collide with barlines. } } } -%% new-chords-done %% + diff --git a/input/regression/lyrics-extender.ly b/input/regression/lyrics-extender.ly index 30f7c11b23..e00bcc7d4a 100644 --- a/input/regression/lyrics-extender.ly +++ b/input/regression/lyrics-extender.ly @@ -26,4 +26,4 @@ vielt __ Zeit. __ " " \paper { linewidth = 5.0\cm } } -%% new-chords-done %% + diff --git a/input/regression/lyrics-multi-stanza.ly b/input/regression/lyrics-multi-stanza.ly index c630209cda..b6001112d8 100644 --- a/input/regression/lyrics-multi-stanza.ly +++ b/input/regression/lyrics-multi-stanza.ly @@ -21,4 +21,4 @@ texidoc = "Lyrics syllables are aligned according to \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly index b3836fb250..c7bfa98c12 100644 --- a/input/regression/markup-stack.ly +++ b/input/regression/markup-stack.ly @@ -3,4 +3,4 @@ \paper { raggedright = ##t} \score { \notes { c''^\markup { "a" \column << "1" \bold "2" "3" >> } } } -%% new-chords-done %% + diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly index ce8970d41d..0a290a64d5 100644 --- a/input/regression/measure-grouping.ly +++ b/input/regression/measure-grouping.ly @@ -30,4 +30,4 @@ of Steve Martland's Dance Works. " } } } -%% new-chords-done %% + diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly index ddcbbdb06e..53f79d90a1 100644 --- a/input/regression/mensural.ly +++ b/input/regression/mensural.ly @@ -14,4 +14,4 @@ both for up and down stems." \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 } }}} -%% new-chords-done %% + diff --git a/input/regression/merge-differently-dotted.ly b/input/regression/merge-differently-dotted.ly index b70f10221c..78f63af970 100644 --- a/input/regression/merge-differently-dotted.ly +++ b/input/regression/merge-differently-dotted.ly @@ -15,4 +15,4 @@ heads that have differing dot counts may be merged anyway." \context Voice = VB { \voiceTwo g'8.-[ f16] g'8.-[ f'16] } > }} -%% new-chords-done %% + diff --git a/input/regression/mm-rests2.ly b/input/regression/mm-rests2.ly index 9dca0018b1..b1c68d14d8 100644 --- a/input/regression/mm-rests2.ly +++ b/input/regression/mm-rests2.ly @@ -30,4 +30,4 @@ R1*11 | > } -%% new-chords-done %% + diff --git a/input/regression/mmrest-collision.ly b/input/regression/mmrest-collision.ly index fd6016169d..0a8cfe40cb 100644 --- a/input/regression/mmrest-collision.ly +++ b/input/regression/mmrest-collision.ly @@ -26,4 +26,4 @@ different voices. " } raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly index 8a402232d3..e0cb4bc845 100644 --- a/input/regression/molecule-hacking.ly +++ b/input/regression/molecule-hacking.ly @@ -74,4 +74,4 @@ GROB. The dimensions of the molecule is not affected. \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/multi-measure-rest-center.ly b/input/regression/multi-measure-rest-center.ly index 8385626e4f..ce6292c09d 100644 --- a/input/regression/multi-measure-rest-center.ly +++ b/input/regression/multi-measure-rest-center.ly @@ -17,4 +17,4 @@ \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly index 32041c6d60..efa2dbab89 100644 --- a/input/regression/multi-measure-rest-instr-name.ly +++ b/input/regression/multi-measure-rest-instr-name.ly @@ -17,4 +17,4 @@ interesting bug in 1.3.98). " } \paper { raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly index 02fbc674ee..cfdfa8839f 100644 --- a/input/regression/multi-measure-rest.ly +++ b/input/regression/multi-measure-rest.ly @@ -34,4 +34,4 @@ are used then a different symbol is used. raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly index 0e4e5784a6..63cb0b59d7 100644 --- a/input/regression/non-empty-text.ly +++ b/input/regression/non-empty-text.ly @@ -20,4 +20,4 @@ TextScript.no-spacing-rods is used to control the horizontal size of text. linewidth = 3.0\cm } } -%% new-chords-done %% + diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly index 45837cc7d9..bf2d6dda9b 100644 --- a/input/regression/note-group-bracket.ly +++ b/input/regression/note-group-bracket.ly @@ -34,4 +34,4 @@ brackets for analysis start and end. raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly index 239cc22dac..d21f37e978 100644 --- a/input/regression/note-head-chord.ly +++ b/input/regression/note-head-chord.ly @@ -15,4 +15,4 @@ It also works for whole heads that have invisible stems. <> <>1 }} -%% new-chords-done %% + diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly index cbca664a9d..c11c6092d3 100644 --- a/input/regression/note-head-style.ly +++ b/input/regression/note-head-style.ly @@ -66,4 +66,4 @@ c4 c2 c8 c16 c16 c1 c\breve c\longa b4 b2 b8 b16 b16 b1 b\breve b\longa \brea \paper {} } -%% new-chords-done %% + diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly index 2b91de2be7..b04a44bbfd 100644 --- a/input/regression/note-line.ly +++ b/input/regression/note-line.ly @@ -26,4 +26,4 @@ sd = \notes{ \translator Staff = down} } } -%% new-chords-done %% + diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly index fa9deb01a2..47db220e4b 100644 --- a/input/regression/number-staff-lines.ly +++ b/input/regression/number-staff-lines.ly @@ -17,4 +17,4 @@ StaffSymbol \override #'line-count = #3 } } \midi { } } -%% new-chords-done %% + diff --git a/input/regression/pc-mmrest.ly b/input/regression/pc-mmrest.ly index 5898bd2ac2..8350094b7f 100644 --- a/input/regression/pc-mmrest.ly +++ b/input/regression/pc-mmrest.ly @@ -54,4 +54,4 @@ two = \notes \relative c'' { RestCollision \override #'maximum-rest-count = #1 } } -}%% new-chords-done %% +} diff --git a/input/regression/pc-switch-slur.ly b/input/regression/pc-switch-slur.ly index a25b987787..ac71cfa0b0 100644 --- a/input/regression/pc-switch-slur.ly +++ b/input/regression/pc-switch-slur.ly @@ -24,4 +24,4 @@ texidoc="The partcombiner should not combine two small slurs into a big one." } -%% new-chords-done %% + diff --git a/input/regression/pedal.ly b/input/regression/pedal.ly index 0c268fced4..fd19a08589 100644 --- a/input/regression/pedal.ly +++ b/input/regression/pedal.ly @@ -45,4 +45,4 @@ c4 \tempo 4 = 60 } } -%% new-chords-done %% + diff --git a/input/regression/phrasing-slur.ly b/input/regression/phrasing-slur.ly index 71fff22898..5abc6b204a 100644 --- a/input/regression/phrasing-slur.ly +++ b/input/regression/phrasing-slur.ly @@ -12,4 +12,4 @@ texidoc="Slurs play well with phrasing slur." raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/prefatory-empty-spacing.ly b/input/regression/prefatory-empty-spacing.ly index d5b983852b..c970c837f6 100644 --- a/input/regression/prefatory-empty-spacing.ly +++ b/input/regression/prefatory-empty-spacing.ly @@ -12,4 +12,4 @@ the break alignment." a a a a \break \mark A a a a a}} -%% new-chords-done %% + diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly index 6dd55848b1..e8de91ceff 100644 --- a/input/regression/prefatory-spacing-matter.ly +++ b/input/regression/prefatory-spacing-matter.ly @@ -14,4 +14,4 @@ TODO: show all common combinations to check for spacing anomalies. } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/property-once.ly b/input/regression/property-once.ly index 9dd65713c2..154c7fbe5e 100644 --- a/input/regression/property-once.ly +++ b/input/regression/property-once.ly @@ -14,4 +14,4 @@ } } -%% new-chords-done %% + diff --git a/input/regression/rehearsal-mark.ly b/input/regression/rehearsal-mark.ly index e8868341f3..20ffcee0eb 100644 --- a/input/regression/rehearsal-mark.ly +++ b/input/regression/rehearsal-mark.ly @@ -25,4 +25,4 @@ one = \notes \relative c { \score{ \context Staff < \global \one > } -%% new-chords-done %% + diff --git a/input/regression/repeat-fold.ly b/input/regression/repeat-fold.ly index d369a19082..de2e9388fa 100644 --- a/input/regression/repeat-fold.ly +++ b/input/regression/repeat-fold.ly @@ -16,4 +16,4 @@ Folded. This doesn't make sense without alternatives, but it works. } } -%% new-chords-done %% + diff --git a/input/regression/repeat-line-break.ly b/input/regression/repeat-line-break.ly index f801f4c150..0be66d9de1 100644 --- a/input/regression/repeat-line-break.ly +++ b/input/regression/repeat-line-break.ly @@ -16,4 +16,4 @@ bracket should be equal } } -%% new-chords-done %% + diff --git a/input/regression/repeat-percent.ly b/input/regression/repeat-percent.ly index b28f6cb6e4..e801872ce1 100644 --- a/input/regression/repeat-percent.ly +++ b/input/regression/repeat-percent.ly @@ -10,4 +10,4 @@ texidoc = "Measure repeats are supported, and may be nested with beat repeats." \repeat "percent" 2 { \repeat "percent" 4 { c8 es } } } } -%% new-chords-done %% + diff --git a/input/regression/repeat-unfold-all.ly b/input/regression/repeat-unfold-all.ly index 7880a13d97..3cc8c60fa7 100644 --- a/input/regression/repeat-unfold-all.ly +++ b/input/regression/repeat-unfold-all.ly @@ -15,4 +15,4 @@ nots = \notes\relative c' { } \paper {raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/repeat-unfold.ly b/input/regression/repeat-unfold.ly index 7155a239d9..f11747ea77 100644 --- a/input/regression/repeat-unfold.ly +++ b/input/regression/repeat-unfold.ly @@ -25,4 +25,4 @@ Unfolded behavior: \repeat unfold 2 { c^"2x 3a" d } \alternative { e f g } }} -%% new-chords-done %% + diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly index 8142165380..6a01d7a6e3 100644 --- a/input/regression/repeat-volta-skip-alternatives.ly +++ b/input/regression/repeat-volta-skip-alternatives.ly @@ -3,4 +3,4 @@ \score { \notes \context Voice { \repeat volta 3 c1 \alternative { d f } e4 } } -%% new-chords-done %% + diff --git a/input/regression/repeat-volta.ly b/input/regression/repeat-volta.ly index aadb54d807..a9fb0e37d0 100644 --- a/input/regression/repeat-volta.ly +++ b/input/regression/repeat-volta.ly @@ -21,4 +21,4 @@ If they don't barlines should still be shown. \midi {} } -%% new-chords-done %% + diff --git a/input/regression/rest-collision-default.ly b/input/regression/rest-collision-default.ly index f115380a36..1277955254 100644 --- a/input/regression/rest-collision-default.ly +++ b/input/regression/rest-collision-default.ly @@ -14,4 +14,4 @@ texidoc = "Rests in collisions sit opposite of the note if no direction is r4 } \context Voice=lower {\voiceTwo b8 }>} -%% new-chords-done %% + diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly index 6dbce686e5..7b73793654 100644 --- a/input/regression/rest-collision.ly +++ b/input/regression/rest-collision.ly @@ -60,4 +60,4 @@ restsII = \context Staff \notes { } -%% new-chords-done %% + diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly index d810d4333b..f82e0649d7 100644 --- a/input/regression/rest-ledger.ly +++ b/input/regression/rest-ledger.ly @@ -29,4 +29,4 @@ ledger lines" }} -%% new-chords-done %% + diff --git a/input/regression/rest-pitch.ly b/input/regression/rest-pitch.ly index e92093aa0b..0331dd7861 100644 --- a/input/regression/rest-pitch.ly +++ b/input/regression/rest-pitch.ly @@ -15,4 +15,4 @@ collision will leave it alone." } } -%% new-chords-done %% + diff --git a/input/regression/rest.ly b/input/regression/rest.ly index f5c3d7246a..b86eae5034 100644 --- a/input/regression/rest.ly +++ b/input/regression/rest.ly @@ -16,4 +16,4 @@ r1 r2 r4 r8 r16 r32 r64 r128 r128 \time 6/4 r1. r2. r4. r8. r16. r32. r64. r128. r128. }} -%% new-chords-done %% + diff --git a/input/regression/rhythmic-staff.ly b/input/regression/rhythmic-staff.ly index 91a47d29ea..bbaf6b3dac 100644 --- a/input/regression/rhythmic-staff.ly +++ b/input/regression/rhythmic-staff.ly @@ -10,4 +10,4 @@ r4 c4. c8 r8 c8 | c2 r2 | r1 } } -%% new-chords-done %% + diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly index 93daa86658..b1f5d4ae01 100644 --- a/input/regression/script-collision.ly +++ b/input/regression/script-collision.ly @@ -15,4 +15,4 @@ } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly index 5e9bee0afb..7559ed7e2c 100644 --- a/input/regression/script-stack-order.ly +++ b/input/regression/script-stack-order.ly @@ -9,4 +9,4 @@ order determines the order. Objects specified first are closest to the note. \score{ \notes { c4^"inner up"^"outer up"_"inner down"_"outer down" } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/script-stacked.ly b/input/regression/script-stacked.ly index 990075ec17..b3eb46e942 100644 --- a/input/regression/script-stacked.ly +++ b/input/regression/script-stacked.ly @@ -5,4 +5,4 @@ texidoc = "Scripts may be stacked." } \score { \notes { c'''->-. } } -%% new-chords-done %% + diff --git a/input/regression/slur-attachment.ly b/input/regression/slur-attachment.ly index 40bc5b420e..a774106f94 100644 --- a/input/regression/slur-attachment.ly +++ b/input/regression/slur-attachment.ly @@ -19,4 +19,4 @@ with beams. linewidth = 100.\mm } } -%% new-chords-done %% + diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly index a512ff31ff..520e2614e3 100644 --- a/input/regression/slur-broken-trend.ly +++ b/input/regression/slur-broken-trend.ly @@ -21,4 +21,4 @@ in unbroken state. indent=0. } } -%% new-chords-done %% + diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly index a996f547bb..41fb906a0c 100644 --- a/input/regression/slur-cross-staff.ly +++ b/input/regression/slur-cross-staff.ly @@ -47,4 +47,4 @@ linebreak. } -%% new-chords-done %% + diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly index f4aaa4424f..d807e798bb 100644 --- a/input/regression/slur-dots.ly +++ b/input/regression/slur-dots.ly @@ -12,4 +12,4 @@ of dots here, to make problems more visible." } } -%% new-chords-done %% + diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly index 00535f7bfd..dd7713c4a4 100644 --- a/input/regression/slur-nice.ly +++ b/input/regression/slur-nice.ly @@ -22,4 +22,4 @@ run through noteheads or stems. linewidth = 120.\mm } } -%% new-chords-done %% + diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly index 0536e6d904..6bcf475ed0 100644 --- a/input/regression/slur-rest.ly +++ b/input/regression/slur-rest.ly @@ -16,4 +16,4 @@ the rest } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/slur-staccato.ly b/input/regression/slur-staccato.ly index 5278914728..d6a51c3076 100644 --- a/input/regression/slur-staccato.ly +++ b/input/regression/slur-staccato.ly @@ -14,4 +14,4 @@ texidoc="Manual hack for slur and staccato." #'attachment-offset = #'((0 . 1.5) . (0 . 1.5)) b-.( a-. b-)-. } -} %% new-chords-done %% +} diff --git a/input/regression/slur-stem-broken.ly b/input/regression/slur-stem-broken.ly index adf235bf42..ec07994758 100644 --- a/input/regression/slur-stem-broken.ly +++ b/input/regression/slur-stem-broken.ly @@ -13,4 +13,4 @@ follow the same vertical direction it would have had in unbroken state." linewidth=40*\staffspace } } -%% new-chords-done %% + diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly index 1928224055..dfac6626ac 100644 --- a/input/regression/slur-symmetry-1.ly +++ b/input/regression/slur-symmetry-1.ly @@ -14,4 +14,4 @@ raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly index 411058672d..aa06e7219a 100644 --- a/input/regression/slur-symmetry.ly +++ b/input/regression/slur-symmetry.ly @@ -14,4 +14,4 @@ raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly index 7da8a1492e..667b705cb1 100644 --- a/input/regression/spacing-accidental-staffs.ly +++ b/input/regression/spacing-accidental-staffs.ly @@ -18,4 +18,4 @@ spacing of the quarter notes here." } -%% new-chords-done %% + diff --git a/input/regression/spacing-accidental.ly b/input/regression/spacing-accidental.ly index 9c58b30f45..43cf662a7d 100644 --- a/input/regression/spacing-accidental.ly +++ b/input/regression/spacing-accidental.ly @@ -14,4 +14,4 @@ of a note will take a little more space, but only if the spacing is tight." } -%% new-chords-done %% + diff --git a/input/regression/spacing-bar-stem.ly b/input/regression/spacing-bar-stem.ly index 2d29378d72..868d6b9cef 100644 --- a/input/regression/spacing-bar-stem.ly +++ b/input/regression/spacing-bar-stem.ly @@ -22,4 +22,4 @@ su = \property Voice.Stem \set #'direction = #1 } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/spacing-clef-first-note.ly b/input/regression/spacing-clef-first-note.ly index 23e1e892ad..26162d801b 100644 --- a/input/regression/spacing-clef-first-note.ly +++ b/input/regression/spacing-clef-first-note.ly @@ -22,4 +22,4 @@ than clef changes halfway the line." } }} -%% new-chords-done %% + diff --git a/input/regression/spacing-end-of-line.ly b/input/regression/spacing-end-of-line.ly index ea17b888bd..b4cf8fd574 100644 --- a/input/regression/spacing-end-of-line.ly +++ b/input/regression/spacing-end-of-line.ly @@ -15,4 +15,4 @@ \paper { raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/spacing-ended-voice.ly b/input/regression/spacing-ended-voice.ly index 484b7df837..1a288256f6 100644 --- a/input/regression/spacing-ended-voice.ly +++ b/input/regression/spacing-ended-voice.ly @@ -18,4 +18,4 @@ should not confuse the spacing engine." }} \paper { raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/spacing-folded-clef.ly b/input/regression/spacing-folded-clef.ly index 1e8578f680..b6b82f403a 100644 --- a/input/regression/spacing-folded-clef.ly +++ b/input/regression/spacing-folded-clef.ly @@ -11,4 +11,4 @@ this doesn't disrupt the flow of the notes." \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly index 4f020641ab..da2158a08e 100644 --- a/input/regression/spacing-folded-clef2.ly +++ b/input/regression/spacing-folded-clef2.ly @@ -22,4 +22,4 @@ show where columns are in the score." } }} -%% new-chords-done %% + diff --git a/input/regression/spacing-grace-duration.ly b/input/regression/spacing-grace-duration.ly index f3450a12cd..7e98fd4396 100644 --- a/input/regression/spacing-grace-duration.ly +++ b/input/regression/spacing-grace-duration.ly @@ -19,4 +19,4 @@ \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/spacing-grace.ly b/input/regression/spacing-grace.ly index b2d62c7c86..2019153814 100644 --- a/input/regression/spacing-grace.ly +++ b/input/regression/spacing-grace.ly @@ -8,4 +8,4 @@ \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly index 9ff5c2ba51..5a0f124231 100644 --- a/input/regression/spacing-knee.ly +++ b/input/regression/spacing-knee.ly @@ -19,4 +19,4 @@ width of the note heads and the thickness of the stem. \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/spacing-multi-tuplet.ly b/input/regression/spacing-multi-tuplet.ly index 6025267459..4e0a753501 100644 --- a/input/regression/spacing-multi-tuplet.ly +++ b/input/regression/spacing-multi-tuplet.ly @@ -31,4 +31,4 @@ multipart = \notes \relative c'{ } -%% new-chords-done %% + diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly index 7f9e36527a..52a4e38a16 100644 --- a/input/regression/spacing-note-flags.ly +++ b/input/regression/spacing-note-flags.ly @@ -18,4 +18,4 @@ raggedright = ##t } \version "1.7.18" -%% new-chords-done %% + diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly index ff5e7594e0..758bf7df56 100644 --- a/input/regression/spacing-rest.ly +++ b/input/regression/spacing-rest.ly @@ -14,4 +14,4 @@ very small. raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/spacing-short-notes.ly b/input/regression/spacing-short-notes.ly index 723c698e79..96be64da57 100644 --- a/input/regression/spacing-short-notes.ly +++ b/input/regression/spacing-short-notes.ly @@ -21,4 +21,4 @@ eighth note. " \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/spacing-stem-bar.ly b/input/regression/spacing-stem-bar.ly index c0f92707af..922f369d46 100644 --- a/input/regression/spacing-stem-bar.ly +++ b/input/regression/spacing-stem-bar.ly @@ -25,4 +25,4 @@ e e e } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/spacing-stem-direction.ly b/input/regression/spacing-stem-direction.ly index 0881417e55..0ff80b6c4f 100644 --- a/input/regression/spacing-stem-direction.ly +++ b/input/regression/spacing-stem-direction.ly @@ -21,4 +21,4 @@ much to correct." raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly index 3d58de3a4b..d1b1f2a1b5 100644 --- a/input/regression/spacing-stem-same-direction.ly +++ b/input/regression/spacing-stem-same-direction.ly @@ -12,4 +12,4 @@ two chords have no common head-positions range." } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/spacing-to-grace.ly b/input/regression/spacing-to-grace.ly index c74c4cc570..29af2881e2 100644 --- a/input/regression/spacing-to-grace.ly +++ b/input/regression/spacing-to-grace.ly @@ -18,4 +18,4 @@ } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/spacing-very-tight.ly b/input/regression/spacing-very-tight.ly index 56b42ab5ff..73f2a18ffd 100644 --- a/input/regression/spacing-very-tight.ly +++ b/input/regression/spacing-very-tight.ly @@ -19,4 +19,4 @@ texidoc = " indent = 0.0\mm } } -%% new-chords-done %% + diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly index f7e080b236..58056fff03 100644 --- a/input/regression/span-bar.ly +++ b/input/regression/span-bar.ly @@ -21,4 +21,4 @@ texidoc = "Span bars draw only in between staff bar lines, so setting those to t raggedright =##t } } -%% new-chords-done %% + diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly index 2f9141b07b..7f3cfa589e 100644 --- a/input/regression/staccato-pos.ly +++ b/input/regression/staccato-pos.ly @@ -14,4 +14,4 @@ not be on staff lines. raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/staff-tweak.ly b/input/regression/staff-tweak.ly index be26d83aa6..397588ffcf 100644 --- a/input/regression/staff-tweak.ly +++ b/input/regression/staff-tweak.ly @@ -19,4 +19,4 @@ Beams remain correctly quantized. } } -%% new-chords-done %% + diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly index 52c273d425..f35080f302 100644 --- a/input/regression/stanza-number.ly +++ b/input/regression/stanza-number.ly @@ -17,4 +17,4 @@ texidoc = "Stanza numbers may differ for the first and following systems." \paper { raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/regression/stem-direction-down.ly b/input/regression/stem-direction-down.ly index e0f1a84313..80eadc7ee0 100644 --- a/input/regression/stem-direction-down.ly +++ b/input/regression/stem-direction-down.ly @@ -16,4 +16,4 @@ texidoc="Similarly, if @code{'neutral-direction} is set to @code{-1}. " } } -%% new-chords-done %% + diff --git a/input/regression/stem-direction.ly b/input/regression/stem-direction.ly index 7c4ba76196..09ff17dfec 100644 --- a/input/regression/stem-direction.ly +++ b/input/regression/stem-direction.ly @@ -23,4 +23,4 @@ notes, and up for low notes. } \midi { } } -%% new-chords-done %% + diff --git a/input/regression/stem-spacing.ly b/input/regression/stem-spacing.ly index 1c802219ea..8540932215 100644 --- a/input/regression/stem-spacing.ly +++ b/input/regression/stem-spacing.ly @@ -31,4 +31,4 @@ effects. In this example, space for opposite pointed stems is adjuste SpacingSpanner \override #'stem-spacing-correction = #0.0 } } } - %% new-chords-done %% + diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly index d6648be74a..175edccc01 100644 --- a/input/regression/stem-tremolo.ly +++ b/input/regression/stem-tremolo.ly @@ -28,4 +28,4 @@ tremolo must be centered on the note. c8:32 f: b: e: } } -%% new-chords-done %% + diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly index aa1250d7ef..09a26cc18a 100644 --- a/input/regression/system-extents.ly +++ b/input/regression/system-extents.ly @@ -20,4 +20,4 @@ } } } -%% new-chords-done %% + diff --git a/input/regression/system-start-bracket.ly b/input/regression/system-start-bracket.ly index 95ac7e7806..c3a72d563b 100644 --- a/input/regression/system-start-bracket.ly +++ b/input/regression/system-start-bracket.ly @@ -16,4 +16,4 @@ The piano brace should be shifted horizontally if it is enclosed in a bracket. >>4 > }\paper {raggedright = ##t}} -%% new-chords-done %% + diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly index 00fa517a20..51e02aa182 100644 --- a/input/regression/text-spanner.ly +++ b/input/regression/text-spanner.ly @@ -13,4 +13,4 @@ linewidth = 40*\staffspace } } -%% new-chords-done %% + diff --git a/input/regression/tie-accidental.ly b/input/regression/tie-accidental.ly index df5915f190..fa95ee5fff 100644 --- a/input/regression/tie-accidental.ly +++ b/input/regression/tie-accidental.ly @@ -54,4 +54,4 @@ thenotes = \notes \relative cis' { \context NoteNames \thenotes > } -%% new-chords-done %% + diff --git a/input/regression/tie-break-accidental.ly b/input/regression/tie-break-accidental.ly index 3a3de4b1bf..d3cd922bbb 100644 --- a/input/regression/tie-break-accidental.ly +++ b/input/regression/tie-break-accidental.ly @@ -17,4 +17,4 @@ Only first B should get natural sign." linewidth = 40*\staffspace } } -%% new-chords-done %% + diff --git a/input/regression/tie-busy-grobs.ly b/input/regression/tie-busy-grobs.ly index 9b177c658c..86a79c1674 100644 --- a/input/regression/tie-busy-grobs.ly +++ b/input/regression/tie-busy-grobs.ly @@ -15,4 +15,4 @@ note heads. Test if this queue works by throwing many mixed tuplets at it." \context Voice = VIII { \voiceTwo \times 2/5 { a,4 ~a4 ~a4~ a4~ a4 }} > } -%% new-chords-done %% + diff --git a/input/regression/tie-chord-partial.ly b/input/regression/tie-chord-partial.ly index 372e9b9d98..2dfe8df45c 100644 --- a/input/regression/tie-chord-partial.ly +++ b/input/regression/tie-chord-partial.ly @@ -28,4 +28,4 @@ to a different thread." } }} -%% new-chords-done %% + diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly index ec994ccba5..21b6fd57a8 100644 --- a/input/regression/tie-chord.ly +++ b/input/regression/tie-chord.ly @@ -20,4 +20,4 @@ t = \notes \relative c' { <> ~ <> } } } -%% new-chords-done %% + diff --git a/input/regression/tie-dots.ly b/input/regression/tie-dots.ly index 411aeddd7a..edf615e86a 100644 --- a/input/regression/tie-dots.ly +++ b/input/regression/tie-dots.ly @@ -10,4 +10,4 @@ texidoc = "Ties should not collide with dots." c4. ~ c8 a8 g8 f8 }} -%% new-chords-done %% + diff --git a/input/regression/tie-grace.ly b/input/regression/tie-grace.ly index 5255f8eaf3..2b7e1fdd01 100644 --- a/input/regression/tie-grace.ly +++ b/input/regression/tie-grace.ly @@ -7,4 +7,4 @@ c4 \grace { c8 ~ c16 ~ } c4 } } -%% new-chords-done %% + diff --git a/input/regression/tie.ly b/input/regression/tie.ly index ca067e1b35..3d613f2e40 100644 --- a/input/regression/tie.ly +++ b/input/regression/tie.ly @@ -19,4 +19,4 @@ The horizontal middle should not overlap with a staffline. linewidth=0. } } -%% new-chords-done %% + diff --git a/input/regression/triplets.ly b/input/regression/triplets.ly index 09de4e4862..aa3a745453 100644 --- a/input/regression/triplets.ly +++ b/input/regression/triplets.ly @@ -25,4 +25,4 @@ ex = \notes \relative c' { } \score { \context Staff { \notes { \ex } } } -%% new-chords-done %% + diff --git a/input/regression/tup.ly b/input/regression/tup.ly index 88b57cee24..e2dc24106f 100644 --- a/input/regression/tup.ly +++ b/input/regression/tup.ly @@ -31,4 +31,4 @@ direction as the } -%% new-chords-done %% + diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly index 21df20e929..64d30ab89e 100644 --- a/input/regression/tuplet-beam.ly +++ b/input/regression/tuplet-beam.ly @@ -12,4 +12,4 @@ the bracket." \times 2/3 { c8-[ c c] } \times 2/3 { c16-[ c16] c8-[ c8] } }} -%% new-chords-done %% + diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly index 75e1478ecd..a26fddbc3d 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -30,4 +30,4 @@ } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly index d233d67aaf..a65e13e1ec 100644 --- a/input/regression/tuplet-properties.ly +++ b/input/regression/tuplet-properties.ly @@ -41,4 +41,4 @@ NB should have no bracket, B should have bracket. } } -%% new-chords-done %% + diff --git a/input/regression/tuplet-rest.ly b/input/regression/tuplet-rest.ly index 2a674e44d4..de0dd67d67 100644 --- a/input/regression/tuplet-rest.ly +++ b/input/regression/tuplet-rest.ly @@ -15,4 +15,4 @@ } } -%% new-chords-done %% + diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly index d8630b3b1a..f2948f99aa 100644 --- a/input/regression/tuplet-staffline-collision.ly +++ b/input/regression/tuplet-staffline-collision.ly @@ -12,4 +12,4 @@ to avoid staff line collisions." \times 2/3 { g4 g g } \times 2/3 { a4 a a } }} -%% new-chords-done %% + diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly index aec5f311f4..5829022704 100644 --- a/input/regression/volta-broken-left-edge.ly +++ b/input/regression/volta-broken-left-edge.ly @@ -120,4 +120,4 @@ f f\break > \paper { raggedright =##t } } -%% new-chords-done %% + diff --git a/input/sondag-morgen/sondag-morgen-folded.ly b/input/sondag-morgen/sondag-morgen-folded.ly deleted file mode 100644 index dd70fb33aa..0000000000 --- a/input/sondag-morgen/sondag-morgen-folded.ly +++ /dev/null @@ -1,10 +0,0 @@ -\version "1.7.18" -\include "sondag-morgen-intro.ly" -\include "sondag-morgen-vers.ly" -\include "sondag-morgen-vers-volta1.ly" -\include "sondag-morgen-vers-volta2.ly" -\include "sondag-morgen-omkvaed.ly" -\include "sondag-morgen-omkvaed-volta1.ly" -\include "sondag-morgen-omkvaed-volta2.ly" -\include "sondag-morgen-omkvaed-volta3.ly" -\include "sondag-morgen-outro.ly" diff --git a/input/sondag-morgen/sondag-morgen-lyrics.ly b/input/sondag-morgen/sondag-morgen-lyrics.ly deleted file mode 100644 index f4c7708288..0000000000 --- a/input/sondag-morgen/sondag-morgen-lyrics.ly +++ /dev/null @@ -1,66 +0,0 @@ -\version "1.7.18" -lyr = \lyrics { - \context LyricsVoice = va { - Nu er det søn -- dag, - uh, wah, - fug -- le -- ne kvid -- rer, - uh, wah, - } - < - \context LyricsVoice = va { - Nu er det søn -- dag og folk de er gla -- de, - de har fri ef -- ter u -- gen der gik. - Jeg sku' ta -- ge til stran -- den og ba -- de, - men jeg sve -- der i tysk gra -- ma -- tik. - Min eng -- elsk -- læ- rer si'r jeg bør dum -- pe - og fy -- sik -- ken den sort -- ner som blæk. - I gym -- na -- si -- et er jeg en tum -- pe, - som der ik -- ke kan fat -- te et kvæk. - På ba -- re kvæk. - } - \context LyricsVoice = vb { - "" "" "" seks da -- ge skab -- te Han ver -- den, - syv' -- nde dag slap -- ped' Ska -- be -- ren af. - Men som var jeg prin -- ses -- sen på ær -- ten, - er jeg gul, grøn og blå i min bag. - Mit vær'l -- se lig -- ner et bom -- bet lo -- kum, - og jeg fø -- ler mig selv li -- ge så. - Jeg er træt af det fuc -- king gym -- na -- sium, - hvor jeg alt -- så er nødt til at "" "" "" "" gå! - } - > - \context LyricsVoice = va { - Hvor -- for kan jeg ik -- ke - ba -- re slap -- pe af når det er søn -- dag i dag? - Jeg tror at jeg krad -- ser af - hvis ikk' jeg ta'r den lidt med ro! - Hvor -- for kan jeg ik -- ke - ba -- re hol -- de fri på den -- ne søn -- dag i dag? - - Jeg tror at jeg krad -- ser af... Nu er det - - Jeg kan da ikk' hol -- de ud at sid -- de her når det er - søn -- dag, søn -- dag, søn -- dag, søn -- dag, åh, søn -- dag, - søn -- dag. Hvor -- for - - Jeg tror at jeg krad -- ser af hvis ikk' jeg ta'r den lidt med ro... - - Nu er det søn -- dag, - uh, wah, - fug -- le -- ne kvid -- rer, - uh. - } -} - -korlyr = \lyrics { - Uh søn -- dag, uh, wah, - uh, kvid -- rer, uh, wah. - "" "" "" "" "" "" "" "" "" - "" "" "" "" "" "" "" "" "" "" - "" "" "" "" "" "" "" - "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" - Uh søn -- dag, uh, wah, - uh, kvid -- rer, uh. - -} - diff --git a/input/sondag-morgen/sondag-morgen-omkvaed-volta1.ly b/input/sondag-morgen/sondag-morgen-omkvaed-volta1.ly deleted file mode 100644 index 6ecb4f6a55..0000000000 --- a/input/sondag-morgen/sondag-morgen-omkvaed-volta1.ly +++ /dev/null @@ -1,141 +0,0 @@ -\version "1.7.18" -\include "deutsch.ly" - -marks = \lyrics { - \marks - ""1*5 -} - -ned = \downbow -op = \upbow - -global = \notes { - \global - \property Score.repeatCommands = #'((volta "1")) - s1*4 s2.. - \mark #'(rows "D. S. " (music "scripts-segno")) - s8 -} - -akk = \lyrics { - \akk - "A11"2 "H11" - "Em7" "G$\\Delta$" "Am7"1 "Dsus4" "D" -} - - -mel = \notes { - \mel - \relative g' { - r2 r8 e'4 d8 ~ | - d8 h4 e8~e h g a ~| - a1 ~ | - a1 ~ | - a2 r8 d, g a - } -} - -kormel = \notes { - \kormel - \relative c'' { - r2 r8 e4 d8~ - d h4 e8~e d h d~ - d1~d1~d2 r2 - } -} - -sopsax = \notes { - \sopsax - \context Voice=sax \relative c'' { - a8 h4 d8 r d4 e8-\sfz | - r4 g,8-\mf r r fis r8 e8~ | - e4. g'8->-\f ~g \> g e4 | - g-> a8 d, ~ d4 \! d | - d2-\p r | - } -} -altsax = \notes { - \altsax - \context Voice=sax \relative c'' { - a8 h4 d8 r d4 e8-\sfz | - r4 e,8-\mf r r d r8 c | - ~ c4. d'8->-\f ~d8 \> d c4 | - d4 e8 d ~ d4 \! h | - a2-\p r | - } -} -tensax = \notes { - \tensax - \context Voice=sax \relative c' { - a8 h4 d8 r d4 e8-\sf | - r4 h8-\mf r r a r g | - ~ g4. a'8->-\f ~ a \> a g4 | - a4-> a8 a ~ a4 \! g | - fis2-\p r| - } -} - -piar = \notes { - \piar - \relative c'' { - r8 r8 | - r2 r4 r8 ~| - | - | - r8 d g a | - } -} -U = -\sustainUp -D = -\sustainDown -Su = { \su \stemDown } -Sd = { \sd \stemUp } -pial = \notes { - \pial - \stemBoth a,, a, e, r e,8 | - e,,8 e, \Su \Sd g, g,, \Su \Sd e, ~ - \stemBoth | - | - r | -} -guitar = \notes { - \guitar - e8\2 e\2 < a\3 d'\4> e\2 e\2 < a\3 d'\4> e\2 < h\3 e'\4> | - e8\2 < d'\4 g'\5> e\2 e\2 < e'\4 a'\5> e\2 e\2 ~ | - - ~ - r | -} - -cello = \notes { - \cello - R1*5 -} - -bas = \notes { - \bas - a,8 a, r h, r d4 e8 | - e,8 e, r8 g, g, g, r a,~ | - a,2. ~ a,4 \glissando | - d1 | - r2 d4 d | -} - -\include "drumpitch-init.ly" -drhi = \notes { - \drhi - hh8 hh hh hho r cymc4 cymc8 - hh8 hh hh hh hh hh hh cymc ~ - cymc4. tommh8 r tommh toml4 | - cymr4. cymr8~cymr4 cymr4 | - cymr2 hhc4 hho | -} -drlo = \notes { - \drlo - bd8 sn bd bd hhp bd4 bd8 | - bd4 sn8 bd bd4 sn8 bd | - bd4. bd8 r bd bd4 | - bd4. bd8 r2 | - r2 bd4 < - bd8 sn - > sn | -} diff --git a/input/sondag-morgen/sondag-morgen-omkvaed-volta3.ly b/input/sondag-morgen/sondag-morgen-omkvaed-volta3.ly deleted file mode 100644 index c577538446..0000000000 --- a/input/sondag-morgen/sondag-morgen-omkvaed-volta3.ly +++ /dev/null @@ -1,91 +0,0 @@ -\version "1.7.18" -\include "deutsch.ly" - -marks = \lyrics { - \marks - ""1 -} - -ned = \downbow -op = \upbow - -global = \notes { - \global - \property Score.repeatCommands = #'((volta #f)(volta "3")) - \bar ":|" - s1*1 -} - -akk = \lyrics { - \akk - "A11"2 "H11" -} - - -mel = \notes { - \mel - \relative c'' { - r2 r8 e4 d8 ~ | - } -} - -kormel = \notes { - \kormel - R1 -} - -sopsax = \notes { - \sopsax - \context Voice=sax \relative c'' { - a8 h4 d8 r d4 e8 | - } -} -altsax = \notes { - \altsax - \context Voice=sax \relative c'' { - a8 h4 d8 r d4 e8 | - } -} -tensax = \notes { - \tensax - \context Voice=sax \relative c' { - a8 h4 d8 r d4 e8 | - } -} - -piar = \notes { - \piar - \relative c'' { - r8 r8 | - } -} -U = -\sustainUp -D = -\sustainDown -pial = \notes { - \pial - \stemBoth a,,8 a, e, r e,8 | -} -guitar = \notes { - \guitar - e8\2 e\2 < a\3 d'\4> e\2 e\2 < a\3 d'\4> e\2 < h\3 e'\4> | -} - -cello = \notes { - \cello - R1 -} - -bas = \notes { - \bas - a,8 a, r h, r d4 e8~ | -} - -\include "drumpitch-init.ly" -drhi = \notes { - \drhi - hh8 hh hh hho r cymc4 cymc8 | -} -drlo = \notes { - \drlo - bd8 sn bd bd hhp bd4 bd8 | -} diff --git a/input/sondag-morgen/sondag-morgen-outro.ly b/input/sondag-morgen/sondag-morgen-outro.ly deleted file mode 100644 index d0845c9dcd..0000000000 --- a/input/sondag-morgen/sondag-morgen-outro.ly +++ /dev/null @@ -1,186 +0,0 @@ -\version "1.7.18" -\include "deutsch.ly" - -marks = \lyrics { - \marks - "\large\framebox{\bf{OUTRO}}"1*11 -} - -ned = \downbow -op = \upbow - -global = \notes { - \global - \property Score.repeatCommands = #'((volta #f)) - \bar ".|" - s1*11 - \bar "|." -} - -akk = \lyrics { - \akk - "Em7"2 "G"2 "Hm7"1 "Em7" "Hm7" "Em7" "Hm7" - "Em7"1 "Hm7" "Em7" "Hm7" "Em7" - -} - - -mel = \notes { - \mel - \time 2/2 - \relative c'' { - d8 h4 e8~e h g a ~| - a b a g a b a g | - e1 - R1 - g2 ~ g8 a g fis ~ | - fis h,2.. | - e1 | - fis2. r4 | - g2 ~ g8 a g fis ~ | - fis h,2.. | - e1 | - } -} - -kormel = \notes { - \kormel - \time 2/2 - \relative g' { - R1*4 - h2.. a8 ~ | - a d,2.. | - g1 | - d2. r4 | - h'2.. a8 ~ | - a d,2.. | - g1 | - } -} - -sopsax = \notes { - \sopsax - \time 2/2 - \relative c''' { - r2 g-\p( fis d )h1~h1 - h2.. a8~ a fis2.. | - g2( a )a2 d | - h2.. a8 ~ a fis2.. | - g2 r2 - } -} -altsax = \notes { - \altsax - \time 2/2 - \relative c'' { - r1 r1 r1 r1 - g2-\p ~g8 a g fis ~ fis d2..| - e2( g )fis a | - g2~g8 a g fis ~ fis d2..| - e2 r - } -} -tensax = \notes { - \tensax - \time 2/2 - \relative c'' { - r1 r1 r2 g-\p( fis d - )e2.. d8 ~ d h2.. | - h2( d )d d | - e2.. d8 ~ d h2.. | - h2 r - } -} - -piar = \notes { - \piar - \time 2/2 - \relative c' { - r2 - - fis'8( g d' fis, g d' fis, )g | - - R1 - fis8( g d' fis, g d' fis, )g | - - R1 - fis8( g d' fis, g d' fis, )g | - - \clef "G^8" - \property PianoStaff.Arpeggio \override #'arpeggio-direction = #1 - \property PianoStaff.connectArpeggios = ##t - - } -} -U = -\sustainUp -D = -\sustainDown -pial = \notes { - \pial - \clef "F" - \time 2/2 - - \relative e { -

- - - - - - - - s8 \U - s2 \U - } -} -guitar = \notes{ - \guitar - \time 2/2 - r2 | - \property Staff.Arpeggio \override #'arpeggio-direction = #1 - a8\3( d'\4 a'\5 a\3 d'\4 a'\5 a\3 )d'\4 | - - g'8\5 fis'4\5 d'8\4 r8 h4.\3 | - a8\3( d'\4 a'\5 a\3 d'\4 a'\5 a\3 )d'\4 | - - g'8\5 fis'4\5 d'8\4 r8 h4.\3 | - a8\3( d'\4 a'\5 a\3 d'\4 a'\5 a\3 )d'\4 | - - g'8\5 fis'4\5 d'8\4 r8 h4.\3 | - -} - -cello = \notes { - \cello - \time 2/2 - \relative c { - e1 d2( fis g h d fis )e1 fis2( d - )e1 d2( h g e fis d )e1 - } -} - -bas = \notes { - \bas - \time 2/2 - e2 g, | - h,2 r8 a h4 | - e2 r8 a,4 h,8 | - r h a fis a h g4 | - e2 r8 d4 h,8 ~ | - h,2 r2 - e2 r8 a,4 h,8 ~ | - h,2 r8 a h4 | - e2 r8 a,4 h,8 | - r h a fis a h g4 | - e1 | -} - -\include "drumpitch-init.ly" -drhi = \notes { - \drhi - \repeat percent 10 { cymr2 cymr } - cymr1 -} -drlo = \notes { - \drlo - s1*11 -} diff --git a/input/sondag-morgen/sondag-morgen-vers-volta1.ly b/input/sondag-morgen/sondag-morgen-vers-volta1.ly deleted file mode 100644 index 5aa08933e5..0000000000 --- a/input/sondag-morgen/sondag-morgen-vers-volta1.ly +++ /dev/null @@ -1,89 +0,0 @@ -\version "1.7.18" -\include "deutsch.ly" - -marks = \lyrics { - \marks - ""1 -} - -ned = \downbow -op = \upbow - -global = \notes { - \global - \property Score.repeatCommands = #'((volta "1")) - s1 -} - -akk = \lyrics { - \akk - "D11"1 -} - - -mel = \notes { - \mel - \relative g' { - a2 r8 d,8 [g a] | - } -} - -kormel = \notes { - \kormel - \relative c'' { - d2 R2 - } -} - -sopsax = \notes { - \sopsax - \context Voice = sax \relative c'' { a2 r2 } -} -altsax = \notes { - \altsax - \context Voice = sax \relative c' {e2 r2 } -} -tensax = \notes { - \tensax - \context Voice = sax \relative c' {c2 r2 } -} - -piar = \notes { - \piar - \relative c' { - r8 d g a - } -} -U = -\sustainUp -D = -\sustainDown -pial = \notes { - \pial - s1*0 \D d1*1/2 \U \D s2 \U | - -} -guitar = \notes { - \guitar - \relative c' { - r2 | - } -} - -cello = \notes { - \cello - R1 -} - -bas = \notes { - \bas - d1 | -} - -\include "drumpitch-init.ly" -drhi = \notes { - \drhi - cymc4 tommh8 toml sn hho sn sn | -} -drlo = \notes { - \drlo - bd4. bd8 bd4 bd4 -} diff --git a/input/sondag-morgen/sondag-morgen-vers.ly b/input/sondag-morgen/sondag-morgen-vers.ly deleted file mode 100644 index 5d64a1504f..0000000000 --- a/input/sondag-morgen/sondag-morgen-vers.ly +++ /dev/null @@ -1,313 +0,0 @@ -\version "1.7.18" -\include "deutsch.ly" - -marks = \lyrics { - \marks - "\large\framebox{\bf{VERS}}"4*54 -} - -ned = \downbow -op = \upbow - -#(define meter '(rows (music "noteheads-2" ((kern . -0.1) "flags-stem")) " = 125")) - -global = \notes { - \global - \mark #'(music "scripts-segno") - \bar "|:" - s4*54 -} - -akk = \lyrics { - \akk - "Gm7"4. "Dm7"2 - "Cm7"4. ""4 "Dm7"4 - "Gm7"4. "Dm7"2 - "Cm7"4. ""4 "Dm7"4 - "Gm7"4. "Dm7"2 - "Cm7"4. ""4 "Dm7"4 - "E$\\flat\\Delta$"4. "F6"2 - "D11"8*7 "D/fis"4 - "G"4. "D"2 - "C$\\Delta$"4. ""4 "D" - "G"4. "D"2 - "C$\\Delta$"4. ""4 "D" - "Em7"4. "Hm7"2 - "Am9"4. ""4 "Hm7" - "C$\\Delta$"2 "Am9" -} - - -mel = \notes { - \mel - \time 7/8 - \key g \minor - \relative c'' { - [b8 a g] a4 [g8 f] | - g4 d8 g4 a | - b4 a8 [g a] [g f] | - g4. r8 g a4 | - [b8 a g] a4 [g8 f] | - g4 d8 g4 a | - [b8 a g] a4 [g8 f]| - \time 9/8 - g4. r4 r8 d [g a] | - \time 7/8 - \key g \major - [h8 a g] a4 d | - h g8 g4 a | - h4 a8 [g a] [h d] | - g,4. r8 g a4 | - [h8 a g] a4 [h8 d] | - h4 g8 g4 a | - \time 4/4 - \repeat unfold 2 \times 2/3 { h4 a g }| - } -} - -kormel = \notes { - \kormel - \time 7/8 - \relative c' { - R1*7/8*5 | - r4 r8 b'4 c | - [d8 c b] c4 [b8 c] | - \time 9/8 - d4. R4 R4 R4 - \time 7/8 - R1*7/8*5 | - r4 r8 h4 c | - \time 4/4 - \repeat unfold 2 \times 2/3 {d4 c h} - } -} - -sopsax = \notes { - \sopsax - \context Voice=sax \relative c'' { - \key g \minor - \time 7/8 - % s1*0_"1 $\\times$ tacet" - R1*7/8 - r4. g4-\mf a | - b4. r2 | - R1*7/8*2 - r4. b4 c | - d4. \< d4 d | - \time 9/8 - e4.~ \! e4 r4 d | - \time 7/8 - \key g \major - \repeat percent 3 { - h4.-\mf a4 d | - g,4. g4 a | - } - \time 4/4 - \tupletUp - \times 2/3 { h4 \ g d] [ f][ f] | - [ es b] [ es][ f] | - } - [ g d] [ f][ f] | - \time 9/8 - ~ | - \time 7/8 - \key g \major - s1*0-\mf - \repeat percent 3 { - [ g d] | - [ g' e] | - } - \time 4/4 - | - } -} -U = -\sustainUp -D = -\sustainDown -pial = \notes { - \pial - \key g \minor - \time 7/8 - \repeat unfold 3 { - g4.\D d4 \U \D d4*1/2 \U \D s8 \U - c4.\D c4 \U \D d4*1/2 \U \D s8 \U - } - es4. \D f4 \U \D f4*1/2 \U \D s8 \U - \time 9/8 - d4. \D ~d4 d \U \D fis4*1/2 \U \D s8 \U - \time 7/8 - \key g \major - \repeat unfold 2 { - g4.\D d4 \U \D d4*1/2 \U \D s8 \U - c4.\D c4 \U \D d4*1/2 \U \D s8 \U - } - e4. \D h,4 \U \D h,4*1/2 \U \D s8 \U - a,4.\D a,4 \U \D h,4*1/2 \U \D s8 \U | - \time 4/4 - c2 \D a,2 \U | -} -guitar = \notes { - \guitar - \relative c' { - \key g \minor - \time 7/8 - s1*0_"NO FLANGE" - \repeat percent 3 { - [ ] [ ] []| - [ ] [ ][ ] | - } - [ ] [ ] []| - \time 9/8 - - r4 [ ] [ ] | - \time 7/8 - \key g \major - \repeat percent 3 { - [ ] [ ] []| - [ ] [ ][ ] | - } - \time 4/4 - s1*0-\mf \repeat unfold 2 - - - } -} - -cello = \notes { - \cello - \time 7/8 - \key g \minor - R1*7/8*7 - \time 9/8 - R1*9/8 - \time 7/8 - \key g \major - R1*7/8*6 - \time 4/4 - R1 -} - -bas = \notes { - \bas - \key g \minor - \time 7/8 - g4. d4 d - c4. c4 d - g4. d4 d - c4. c4 d - g4. d4 d - c4. c4 d - es4. f4 f - \time 9/8 - d4.~d4 d fis - \time 7/8 - \key g \major - g4. d4 d - c4. c4 d - g4. d4 d - c4. c4 d - e4. h,4 h, - a,4. a,4 h, | - \time 4/4 - c2 a,2 | -} - -\include "drumpitch-init.ly" -drhi = \notes { - \drhi - \time 7/8 - cymc4 hh8 r hh r hh - r8 hh4 hhc hho | - \repeat percent 2 { - hh4 hh8 r hh r hh - r8 hh4 hhc hho | - } - hh4 hh8 r hh r hh | - \time 9/8 - r8 hh4 hh hhc hho | - \repeat percent 3 { - hh4 hh8 r hh r hh - r8 hh4 hhc hho | - } - \repeat unfold 2 \times 2/3 { hh4 hhc4 hho4 } - -} -drlo = \notes { - \drlo - \time 7/8 - bd4 sn8 bd4 [bd8 sn] | - bd4 sn8 bd4 [bd8 sn] | - \repeat percent 2 { - bd4 sn8 bd4 [bd8 sn] | - bd4 sn8 bd4 [bd8 sn] | - } - bd4 sn8 bd4 [bd8 sn] | - \time 9/8 - bd4. r4 bd [< - bd8 sn - > sn] | - \time 7/8 - \repeat percent 3 { - bd4 sn8 bd4 [bd8 sn] | - bd4 sn8 bd4 [bd8 sn] | - } - \time 4/4 - bd4 bd bd bd | -} diff --git a/input/test/+.ly b/input/test/+.ly index 05716ec5cf..e3b6041029 100644 --- a/input/test/+.ly +++ b/input/test/+.ly @@ -24,4 +24,4 @@ foollilypondbook = " \score{ \context Lyrics \lyrics { "." } } -%% new-chords-done %% + diff --git a/input/test/ac-extra-voice.ly b/input/test/ac-extra-voice.ly index 8d1e297890..221c609094 100644 --- a/input/test/ac-extra-voice.ly +++ b/input/test/ac-extra-voice.ly @@ -56,4 +56,4 @@ accompany = \repeat unfold 4 \notes \relative c \basloopje } } -%% new-chords-done %% + diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly index 0809d44bfd..996196b511 100644 --- a/input/test/add-staccato.ly +++ b/input/test/add-staccato.ly @@ -38,4 +38,4 @@ one would not use scm constructs. See separate-staccato.ly first. \paper{ raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly index 14afb59786..8af91c2292 100644 --- a/input/test/add-text-script.ly +++ b/input/test/add-text-script.ly @@ -33,4 +33,4 @@ create, then write a function that will build the structure for you. \paper{ raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/ancient-accidentals.ly b/input/test/ancient-accidentals.ly index 474d153060..57e85cf6f3 100644 --- a/input/test/ancient-accidentals.ly +++ b/input/test/ancient-accidentals.ly @@ -51,4 +51,4 @@ file lists all of them. } } -%% new-chords-done %% + diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index dbae323c52..71fa447ca4 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -296,4 +296,4 @@ lowerStaff = \context MensuralStaff = lowerStaff < } } } -%% new-chords-done %% + diff --git a/input/test/ancient-time.ly b/input/test/ancient-time.ly index 36aa0b9e24..577679cd8b 100644 --- a/input/test/ancient-time.ly +++ b/input/test/ancient-time.ly @@ -14,4 +14,4 @@ Should use old style. } \paper {raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly index 8367f093d8..68aa570476 100644 --- a/input/test/bagpipe.ly +++ b/input/test/bagpipe.ly @@ -82,4 +82,4 @@ e8-) d4 \gg d4 e8 | d4.-) \gdcg d4. } } -%% new-chords-done %% + diff --git a/input/test/bar-always.ly b/input/test/bar-always.ly index e80da0daa4..d3809d2c6a 100644 --- a/input/test/bar-always.ly +++ b/input/test/bar-always.ly @@ -14,4 +14,4 @@ automatically insert barlines everywhere. c4 c4 c4 c4 } \paper{raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/bar-lines-lyric-only.ly b/input/test/bar-lines-lyric-only.ly index a664af407e..8324f0395a 100644 --- a/input/test/bar-lines-lyric-only.ly +++ b/input/test/bar-lines-lyric-only.ly @@ -38,4 +38,4 @@ Span_bar_engraver if you want bar lines on lyrics. \remove "Span_bar_engraver" } }} -%% new-chords-done %% + diff --git a/input/test/bar-lines.ly b/input/test/bar-lines.ly index df79d92e66..12927f20f8 100644 --- a/input/test/bar-lines.ly +++ b/input/test/bar-lines.ly @@ -18,4 +18,4 @@ c4 } \paper{raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/bar-number-every-fifth.ly b/input/test/bar-number-every-fifth.ly index 45349de57b..5c07446afd 100644 --- a/input/test/bar-number-every-fifth.ly +++ b/input/test/bar-number-every-fifth.ly @@ -16,4 +16,4 @@ Bar numbers can also be printed at regular intervals. } } -%% new-chords-done %% + diff --git a/input/test/bar-number-show-all.ly b/input/test/bar-number-show-all.ly index 53a176445d..f93ee7c0b7 100644 --- a/input/test/bar-number-show-all.ly +++ b/input/test/bar-number-show-all.ly @@ -15,4 +15,4 @@ Second line has bar numbers on start of every measure. \paper{ raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/beam-auto-4-8.ly b/input/test/beam-auto-4-8.ly index 86b50e1bcc..54e8f958a5 100644 --- a/input/test/beam-auto-4-8.ly +++ b/input/test/beam-auto-4-8.ly @@ -32,4 +32,4 @@ You can override Lilypond's automatic beaming. \paper{raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/beam-auto-override.ly b/input/test/beam-auto-override.ly index a339a414ef..7964c93b7d 100644 --- a/input/test/beam-auto-override.ly +++ b/input/test/beam-auto-override.ly @@ -48,4 +48,4 @@ The beam will be ended also when now % beamAutoEnd = 0 \paper{raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/beam-auto.ly b/input/test/beam-auto.ly index 566aa24a50..86cbd36078 100644 --- a/input/test/beam-auto.ly +++ b/input/test/beam-auto.ly @@ -59,4 +59,4 @@ The auto-beam engraver has presets for common time signatures. " } \paper{ } } -%% new-chords-done %% + diff --git a/input/test/beam-control.ly b/input/test/beam-control.ly index 13e7388147..4418acdabd 100644 --- a/input/test/beam-control.ly +++ b/input/test/beam-control.ly @@ -21,4 +21,4 @@ Controlling beam positions. } \paper{raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/beam-count.ly b/input/test/beam-count.ly index c23e849aab..e66aac98e6 100644 --- a/input/test/beam-count.ly +++ b/input/test/beam-count.ly @@ -24,4 +24,4 @@ fragment = \notes { \notes\relative c \fragment \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/beam-dir-functions.ly b/input/test/beam-dir-functions.ly index 26445f0e3b..f76398505f 100644 --- a/input/test/beam-dir-functions.ly +++ b/input/test/beam-dir-functions.ly @@ -46,4 +46,4 @@ your favourite algorithm isn't one of these, you can hook up your own. %% End: -%% new-chords-done %% + diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index 1af618998b..88526b28fa 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -22,4 +22,4 @@ Lilypond can beam across a Piano Staff. } -%% new-chords-done %% + diff --git a/input/test/beam-neutral-direction.ly b/input/test/beam-neutral-direction.ly index ae6bdc570b..2461d35240 100644 --- a/input/test/beam-neutral-direction.ly +++ b/input/test/beam-neutral-direction.ly @@ -20,4 +20,4 @@ fragment = \notes { \notes\relative c \fragment \paper {raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/beam-rest.ly b/input/test/beam-rest.ly index d5fcc0bb55..6cb13110d2 100644 --- a/input/test/beam-rest.ly +++ b/input/test/beam-rest.ly @@ -16,4 +16,4 @@ Beams over rests. raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/blank-notes.ly b/input/test/blank-notes.ly index 15a92a5fa8..028f10a4c5 100644 --- a/input/test/blank-notes.ly +++ b/input/test/blank-notes.ly @@ -30,4 +30,4 @@ unblanknotes = { \property Voice.NoteHead \paper{raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/blank-paper-tab.ly b/input/test/blank-paper-tab.ly index 119ab548a6..c4bb2c9fdc 100644 --- a/input/test/blank-paper-tab.ly +++ b/input/test/blank-paper-tab.ly @@ -21,4 +21,4 @@ emptymusic = \notes { \repeat unfold 4 { s1\break } \bar "|." } } } } -%% new-chords-done %% + diff --git a/input/test/blank-paper.ly b/input/test/blank-paper.ly index 4320b3d001..1da9b90df5 100644 --- a/input/test/blank-paper.ly +++ b/input/test/blank-paper.ly @@ -19,4 +19,4 @@ Blank music paper with clefs. } } } -%% new-chords-done %% + diff --git a/input/test/boxed-molecule.ly b/input/test/boxed-molecule.ly index 6fb994c055..d6cabd9d4f 100644 --- a/input/test/boxed-molecule.ly +++ b/input/test/boxed-molecule.ly @@ -28,4 +28,4 @@ TODO: circled molecules. } \paper{raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/broken-spanner-adjustment.ly b/input/test/broken-spanner-adjustment.ly index b059e3d1e9..63f7bcb8b9 100644 --- a/input/test/broken-spanner-adjustment.ly +++ b/input/test/broken-spanner-adjustment.ly @@ -29,4 +29,4 @@ this requires complicated scheme code. } \paper { linewidth= 5.0 \cm } } -%% new-chords-done %% + diff --git a/input/test/caps.ly b/input/test/caps.ly index e2d6703cfe..747ec955fb 100644 --- a/input/test/caps.ly +++ b/input/test/caps.ly @@ -12,4 +12,4 @@ shapeSC = \property Lyrics.LyricText \override #'font-shape = #'caps what4 is4 \shapeSC Bud8 -- dha?8 }> \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/cautionaries.ly b/input/test/cautionaries.ly index 0cba11ddc5..c05c68e27d 100644 --- a/input/test/cautionaries.ly +++ b/input/test/cautionaries.ly @@ -17,4 +17,4 @@ Lilypond can display cautionary accidentals in different ways. \paper{raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/chord-markup.ly b/input/test/chord-markup.ly index e0ad3ab3f1..6c173773c9 100644 --- a/input/test/chord-markup.ly +++ b/input/test/chord-markup.ly @@ -21,4 +21,4 @@ chord/markup test. > \paper{raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly index 97f4cea53a..3c57618fe8 100644 --- a/input/test/chord-names-jazz.ly +++ b/input/test/chord-names-jazz.ly @@ -71,5 +71,5 @@ scheme = \chords { \context Staff \transpose c c' \scheme > } -%% new-chords-done %% + %} diff --git a/input/test/chord-names-no-inversions.ly b/input/test/chord-names-no-inversions.ly index 042bb23659..1baee09b8b 100644 --- a/input/test/chord-names-no-inversions.ly +++ b/input/test/chord-names-no-inversions.ly @@ -16,4 +16,4 @@ scheme = \notes { > \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/chords.ly b/input/test/chords.ly index 0f725f6fb4..7455346197 100644 --- a/input/test/chords.ly +++ b/input/test/chords.ly @@ -72,5 +72,5 @@ keys = \notes{ } } } -%% new-chords-done %% + %} diff --git a/input/test/clef-8-syntax.ly b/input/test/clef-8-syntax.ly index 74e46ea653..e33701e05b 100644 --- a/input/test/clef-8-syntax.ly +++ b/input/test/clef-8-syntax.ly @@ -17,4 +17,4 @@ name needs to be in quotes (such as \"treble^8\"). \midi { } } -%% new-chords-done %% + diff --git a/input/test/clef-end-of-line.ly b/input/test/clef-end-of-line.ly index 41a4d5e4e6..b996b70510 100644 --- a/input/test/clef-end-of-line.ly +++ b/input/test/clef-end-of-line.ly @@ -31,4 +31,4 @@ Scales, but with clef and key signature at the end of the line. \break \time 4/4 } } -%% new-chords-done %% + diff --git a/input/test/coda-kludge.ly b/input/test/coda-kludge.ly index 4c9d911fab..94508d399a 100644 --- a/input/test/coda-kludge.ly +++ b/input/test/coda-kludge.ly @@ -59,4 +59,4 @@ Hi, % -%% new-chords-done %% + diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly index d2a376e4cf..205ac612ee 100644 --- a/input/test/coriolan-margin.ly +++ b/input/test/coriolan-margin.ly @@ -141,4 +141,4 @@ violoncello = \notes \relative c' { } } -%% new-chords-done %% + diff --git a/input/test/count-systems.ly b/input/test/count-systems.ly index ab4fc82b5f..2cd7afc7bf 100644 --- a/input/test/count-systems.ly +++ b/input/test/count-systems.ly @@ -37,4 +37,4 @@ specified number of lines. raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/crescendi.ly b/input/test/crescendi.ly index ab8ee81b2f..ae5ac584bd 100644 --- a/input/test/crescendi.ly +++ b/input/test/crescendi.ly @@ -19,4 +19,4 @@ raggedright = ##t \tempo 1 = 60 } } -%% new-chords-done %% + diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly index 7f94613aa5..26b23c4053 100644 --- a/input/test/cue-notes.ly +++ b/input/test/cue-notes.ly @@ -43,4 +43,4 @@ usually not restored explicitly. eis'4 fis'4 } \paper { raggedright = ##t} -}%% new-chords-done %% +} diff --git a/input/test/different-time-signatures.ly b/input/test/different-time-signatures.ly index cdc69eb447..76dedfc9f0 100644 --- a/input/test/different-time-signatures.ly +++ b/input/test/different-time-signatures.ly @@ -41,4 +41,4 @@ You can have multiple time signatures occuring at the same time. } } } -%% new-chords-done %% + diff --git a/input/test/drarn-slurs.ly b/input/test/drarn-slurs.ly index 3729530b8a..b49b20e01b 100644 --- a/input/test/drarn-slurs.ly +++ b/input/test/drarn-slurs.ly @@ -19,4 +19,4 @@ fragment = \notes { \notes\relative c \fragment \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/drarn.ly b/input/test/drarn.ly index 02db4fb375..4c6cc24a83 100644 --- a/input/test/drarn.ly +++ b/input/test/drarn.ly @@ -24,4 +24,4 @@ You can attach slurs and ties to noteheads. \paper { linewidth = 40*\staffspace raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/dynamic-absolute-volume.ly b/input/test/dynamic-absolute-volume.ly index 22324fa3aa..ade535bf4d 100644 --- a/input/test/dynamic-absolute-volume.ly +++ b/input/test/dynamic-absolute-volume.ly @@ -24,4 +24,4 @@ a\sf \tempo 1 = 60 } } -%% new-chords-done %% + diff --git a/input/test/dynamic-extra.ly b/input/test/dynamic-extra.ly index fa88957e9a..f108ed63d4 100644 --- a/input/test/dynamic-extra.ly +++ b/input/test/dynamic-extra.ly @@ -17,4 +17,4 @@ piuf = \markup { \italic "pi\\`u" \dynamic "f" } \paper{raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/embedded-postscript.ly b/input/test/embedded-postscript.ly index d3b650255f..6a126e130f 100644 --- a/input/test/embedded-postscript.ly +++ b/input/test/embedded-postscript.ly @@ -20,4 +20,4 @@ TODO: make molecule-callback to do this. % raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/embedded-scm.ly b/input/test/embedded-scm.ly index d3b119ca6b..4673dadce1 100644 --- a/input/test/embedded-scm.ly +++ b/input/test/embedded-scm.ly @@ -9,4 +9,4 @@ You can embed scm functions in your scores. \paper{raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/embedded-tex.ly b/input/test/embedded-tex.ly index d926731b6a..96df96c1b6 100644 --- a/input/test/embedded-tex.ly +++ b/input/test/embedded-tex.ly @@ -12,4 +12,4 @@ fragment = \notes { \notes\relative c \fragment \paper { raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/explicit.ly b/input/test/explicit.ly index 98a60ecf41..a2b223aa4e 100644 --- a/input/test/explicit.ly +++ b/input/test/explicit.ly @@ -11,4 +11,4 @@ Explicit pitches and durations. " } \paper{raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index 253541e2b0..8c86a958e0 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -49,4 +49,4 @@ You can add an extra staff after the beginning of a piece. "} -%% new-chords-done %% + diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly index 0230e6e8c0..3742c5ff29 100644 --- a/input/test/fill-a4.ly +++ b/input/test/fill-a4.ly @@ -40,4 +40,4 @@ This should fill a4 paper. " } } } -%% new-chords-done %% + diff --git a/input/test/follow-thread.ly b/input/test/follow-thread.ly index a789707626..9da1a9f537 100644 --- a/input/test/follow-thread.ly +++ b/input/test/follow-thread.ly @@ -26,4 +26,4 @@ property @code{followVoice}. " } \paper { raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/force-hshift.ly b/input/test/force-hshift.ly index 9dd87b81a3..ed3c60b75b 100644 --- a/input/test/force-hshift.ly +++ b/input/test/force-hshift.ly @@ -25,4 +25,4 @@ Force hshift to override collisions. " } raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index 1b0a170ccd..deea577eb6 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -18,4 +18,4 @@ breaking lines. " } } -%% new-chords-done %% + diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly index a977511289..1d4111149b 100644 --- a/input/test/hara-kiri-switch.ly +++ b/input/test/hara-kiri-switch.ly @@ -56,4 +56,4 @@ grandstaff = \context GrandStaff = one < } -%% new-chords-done %% + diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index 8c4edc52dd..793274bde0 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -97,4 +97,4 @@ zagers = \context GrandStaff < } -%% new-chords-done %% + diff --git a/input/test/harmonic.ly b/input/test/harmonic.ly index 92a7e355cd..1732e51beb 100644 --- a/input/test/harmonic.ly +++ b/input/test/harmonic.ly @@ -14,4 +14,4 @@ two different notehead styles on the same stem. " } } \paper {raggedright=##t} } -%% new-chords-done %% + diff --git a/input/test/header-ifelse.ly b/input/test/header-ifelse.ly index c38dc8b22c..910fd40e91 100644 --- a/input/test/header-ifelse.ly +++ b/input/test/header-ifelse.ly @@ -20,4 +20,4 @@ High level functionality can be accomplished with GUILE. Semantics aren't nice t \score{ \notes{ c4 } \paper {raggedright=##t} } -%% new-chords-done %% + diff --git a/input/test/hshift.ly b/input/test/hshift.ly index a0bf5aba04..40ef119501 100644 --- a/input/test/hshift.ly +++ b/input/test/hshift.ly @@ -21,4 +21,4 @@ shiftV = \property Voice.NoteColumn \override #'horizontal-shift = #4 } \paper { raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/hymn.ly b/input/test/hymn.ly index 83eebc6fe2..e916091699 100644 --- a/input/test/hymn.ly +++ b/input/test/hymn.ly @@ -35,4 +35,4 @@ You can combine two parts on the same staff. " } } } -%% new-chords-done %% + diff --git a/input/test/improv.ly b/input/test/improv.ly index 0cf2940b47..efa4a7cd5d 100644 --- a/input/test/improv.ly +++ b/input/test/improv.ly @@ -51,4 +51,4 @@ global = \notes { s1*3 \bar "|." } raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/incipit.ly b/input/test/incipit.ly index b430c7cbf1..c6ff08bbce 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -62,4 +62,4 @@ BC = \notes\relative c{ \paper { raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly index 6cae0a4908..403177d715 100644 --- a/input/test/instrument-name-grandstaff.ly +++ b/input/test/instrument-name-grandstaff.ly @@ -18,4 +18,4 @@ raggedright = ##t } \translator { \GrandStaffContext \consists "Instrument_name_engraver" } }} -%% new-chords-done %% + diff --git a/input/test/ly2dvi-testpage.ly b/input/test/ly2dvi-testpage.ly index dd662cd279..42f13d23a0 100644 --- a/input/test/ly2dvi-testpage.ly +++ b/input/test/ly2dvi-testpage.ly @@ -45,4 +45,4 @@ texidoc = "This file tests ly2dvi titling. It should be processed with ly2dvi. " copyright = "localcopyright" } } -%% new-chords-done %% + diff --git a/input/test/manual-clef.ly b/input/test/manual-clef.ly index 27c3b6ba41..cf27f37260 100644 --- a/input/test/manual-clef.ly +++ b/input/test/manual-clef.ly @@ -24,4 +24,4 @@ is merely a front-end to this. " } } \paper{ raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/maximum-rest-count.ly b/input/test/maximum-rest-count.ly index 75e6bf62a6..5aa47fa3ea 100644 --- a/input/test/maximum-rest-count.ly +++ b/input/test/maximum-rest-count.ly @@ -40,4 +40,4 @@ Control the number of rests in a collision with maximum-rest-count." > \paper{ raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly index 10a90eaaa8..c3abb393b6 100644 --- a/input/test/mensural-ligatures.ly +++ b/input/test/mensural-ligatures.ly @@ -81,4 +81,4 @@ voice = \notes \transpose c c' { } } } -%% new-chords-done %% + diff --git a/input/test/midi-scales.ly b/input/test/midi-scales.ly index 4819b40e05..5a40b1456b 100644 --- a/input/test/midi-scales.ly +++ b/input/test/midi-scales.ly @@ -103,4 +103,4 @@ scales = \notes \relative c { \paper { } \midi { } } -%% new-chords-done %% + diff --git a/input/test/midi-tuplets.ly b/input/test/midi-tuplets.ly index d411b18fe6..852ac62488 100644 --- a/input/test/midi-tuplets.ly +++ b/input/test/midi-tuplets.ly @@ -33,4 +33,4 @@ Midi2ly tuplet test. \midi { } } -%% new-chords-done %% + diff --git a/input/test/midi-volume-equaliser.ly b/input/test/midi-volume-equaliser.ly index 7afa9c153f..87f1ff2a55 100644 --- a/input/test/midi-volume-equaliser.ly +++ b/input/test/midi-volume-equaliser.ly @@ -140,4 +140,4 @@ violoncello = \notes \relative c' { } } -%% new-chords-done %% + diff --git a/input/test/move-accidentals.ly b/input/test/move-accidentals.ly index a9f686cece..2f4c63ddfe 100644 --- a/input/test/move-accidentals.ly +++ b/input/test/move-accidentals.ly @@ -35,4 +35,4 @@ involves some scheme code. " } raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/move-mark.ly b/input/test/move-mark.ly index cd33b72bd6..4960a95656 100644 --- a/input/test/move-mark.ly +++ b/input/test/move-mark.ly @@ -24,4 +24,4 @@ move marks around. " } } } } -%% new-chords-done %% + diff --git a/input/test/move-notehead.ly b/input/test/move-notehead.ly index d9404c18da..d5fc3fc45d 100644 --- a/input/test/move-notehead.ly +++ b/input/test/move-notehead.ly @@ -16,4 +16,4 @@ fragment = \notes { \notes\relative c \fragment \paper { } } -%% new-chords-done %% + diff --git a/input/test/move-specific-text.ly b/input/test/move-specific-text.ly index bb6332529c..b894ac9355 100644 --- a/input/test/move-specific-text.ly +++ b/input/test/move-specific-text.ly @@ -16,4 +16,4 @@ move text around. " } } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/music-box.ly b/input/test/music-box.ly index 1ba8b58c86..74e4e1ef88 100644 --- a/input/test/music-box.ly +++ b/input/test/music-box.ly @@ -143,4 +143,4 @@ endc = \notes {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata } \tempo 4 = 80 } } -%% new-chords-done %% + diff --git a/input/test/music-creation.ly b/input/test/music-creation.ly index 9b731a3330..012c14d7a5 100644 --- a/input/test/music-creation.ly +++ b/input/test/music-creation.ly @@ -30,4 +30,4 @@ fooMusic = #(seq-music-list \score { \fooMusic \paper { raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/nested-groups.ly b/input/test/nested-groups.ly index 480ffaff73..0988eca16d 100644 --- a/input/test/nested-groups.ly +++ b/input/test/nested-groups.ly @@ -40,4 +40,4 @@ Lilypond can print nested groups of staffs. " \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/no-bar-lines.ly b/input/test/no-bar-lines.ly index d9e2f1f928..487b0bc330 100644 --- a/input/test/no-bar-lines.ly +++ b/input/test/no-bar-lines.ly @@ -20,4 +20,4 @@ You can stop Lilypond from printing bar lines by removing the engraver. " } } -%% new-chords-done %% + diff --git a/input/test/no-staff.ly b/input/test/no-staff.ly index 3ac30c3b63..2c9bab33f3 100644 --- a/input/test/no-staff.ly +++ b/input/test/no-staff.ly @@ -18,4 +18,4 @@ You can stop Lilypond from printing the staff by removing the engraver. " } } -%% new-chords-done %% + diff --git a/input/test/octave-duplicate.ly b/input/test/octave-duplicate.ly index 677c95bd5f..b0b75fb856 100644 --- a/input/test/octave-duplicate.ly +++ b/input/test/octave-duplicate.ly @@ -57,4 +57,4 @@ lowerOctave = \notes < > \paper { } } -%% new-chords-done %% + diff --git a/input/test/ossia.ly b/input/test/ossia.ly index a3c57f8b1b..dc42a5288e 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -14,4 +14,4 @@ really supported, but can be somewhat faked in lily. " } \paper {raggedright= ##t} } -%% new-chords-done %% + diff --git a/input/test/part-combine-moments.ly b/input/test/part-combine-moments.ly index 949417181e..1574efbb24 100644 --- a/input/test/part-combine-moments.ly +++ b/input/test/part-combine-moments.ly @@ -101,4 +101,4 @@ only have one stem. " } } } -%% new-chords-done %% + diff --git a/input/test/part-combine-staff.ly b/input/test/part-combine-staff.ly index 5be11d47c9..8c20e1cab2 100644 --- a/input/test/part-combine-staff.ly +++ b/input/test/part-combine-staff.ly @@ -109,4 +109,4 @@ You can combine parts on two staffs, as well as two voices. " } } } -%% new-chords-done %% + diff --git a/input/test/part-combine.ly b/input/test/part-combine.ly index 35333cdf63..9e95a44c26 100644 --- a/input/test/part-combine.ly +++ b/input/test/part-combine.ly @@ -36,4 +36,4 @@ voices according to actual rhythm and pitch. User-defined texts such as } } -%% new-chords-done %% + diff --git a/input/test/partial-blank.ly b/input/test/partial-blank.ly index a8f0b88d6b..d84b349926 100644 --- a/input/test/partial-blank.ly +++ b/input/test/partial-blank.ly @@ -26,4 +26,4 @@ mel = \notes \relative c' {c16 d16 e8 a4 g2 e8 d c2. g'1 e4 d c2} > \paper {} } -%% new-chords-done %% + diff --git a/input/test/pedal.ly b/input/test/pedal.ly index 7a45e19067..1f6619978a 100644 --- a/input/test/pedal.ly +++ b/input/test/pedal.ly @@ -29,4 +29,4 @@ Text style, bracket style, and a mixture of both are supported. " } } -%% new-chords-done %% + diff --git a/input/test/phrasing-slur-height.ly b/input/test/phrasing-slur-height.ly index c863f37790..ed30e95210 100644 --- a/input/test/phrasing-slur-height.ly +++ b/input/test/phrasing-slur-height.ly @@ -11,4 +11,4 @@ Make PhrasingSlur higher, to avoid colission from other slurs. " } \paper { raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/poly-metric.ly b/input/test/poly-metric.ly index 2ba8a559da..234f809f14 100644 --- a/input/test/poly-metric.ly +++ b/input/test/poly-metric.ly @@ -31,4 +31,4 @@ by moving the timing engraver to staff context. " raggedright= ##t } } -%% new-chords-done %% + diff --git a/input/test/preset-extent.ly b/input/test/preset-extent.ly index 38d3437b33..3f56ef36bc 100644 --- a/input/test/preset-extent.ly +++ b/input/test/preset-extent.ly @@ -15,4 +15,4 @@ requires Grob::preset_extent () function. " \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/repeat-manual.ly b/input/test/repeat-manual.ly index 3c2809ccfd..0f6765c68d 100644 --- a/input/test/repeat-manual.ly +++ b/input/test/repeat-manual.ly @@ -21,4 +21,4 @@ unusual output. " } \paper{raggedright=##t} } -%% new-chords-done %% + diff --git a/input/test/repeat.ly b/input/test/repeat.ly index ae6e17eea6..6bae364825 100644 --- a/input/test/repeat.ly +++ b/input/test/repeat.ly @@ -23,4 +23,4 @@ You can use alternate lyrics as well as alternate notes for repeats. " > \paper{raggedright=##t} } -%% new-chords-done %% + diff --git a/input/test/rest-dot-positions.ly b/input/test/rest-dot-positions.ly index a9d822d39e..19609ae2d5 100644 --- a/input/test/rest-dot-positions.ly +++ b/input/test/rest-dot-positions.ly @@ -55,4 +55,4 @@ muz = \notes \relative c'' { } \paper{} } -%% new-chords-done %% + diff --git a/input/test/rests.ly b/input/test/rests.ly index 42b60dc71e..c4805f0811 100644 --- a/input/test/rests.ly +++ b/input/test/rests.ly @@ -43,4 +43,4 @@ Rests in various styles." } } } -%% new-chords-done %% + diff --git a/input/test/reverse-music.ly b/input/test/reverse-music.ly index 5195a5d849..4d368bec98 100644 --- a/input/test/reverse-music.ly +++ b/input/test/reverse-music.ly @@ -34,4 +34,4 @@ music = \notes \relative c'' { c4 d4( e4 f4 } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/rhythm-excercise.ly b/input/test/rhythm-excercise.ly index cd53b36a0a..ced2539088 100644 --- a/input/test/rhythm-excercise.ly +++ b/input/test/rhythm-excercise.ly @@ -15,4 +15,4 @@ Lilypond (e.g. no staff but retaining the barlines. " } \paper{raggedright= ##t} } -%% new-chords-done %% + diff --git a/input/test/scales-greek.ly b/input/test/scales-greek.ly index b89889e362..090202259d 100644 --- a/input/test/scales-greek.ly +++ b/input/test/scales-greek.ly @@ -57,4 +57,4 @@ voicedefault = \notes { \paper { } \midi {} } -%% new-chords-done %% + diff --git a/input/test/scales.ly b/input/test/scales.ly index 07d0c34d15..dfa69e313b 100644 --- a/input/test/scales.ly +++ b/input/test/scales.ly @@ -110,4 +110,4 @@ Prints scales. " \paper { } } -%% new-chords-done %% + diff --git a/input/test/scheme-interactions.ly b/input/test/scheme-interactions.ly index 8aabb25a00..039e45e9cc 100644 --- a/input/test/scheme-interactions.ly +++ b/input/test/scheme-interactions.ly @@ -20,4 +20,4 @@ bra = \notes \transpose c c { e'4-. } } \paper {raggedright=##t} } -%% new-chords-done %% + diff --git a/input/test/script-abbreviations.ly b/input/test/script-abbreviations.ly index 7e114bcbe0..d7ae6461ab 100644 --- a/input/test/script-abbreviations.ly +++ b/input/test/script-abbreviations.ly @@ -17,4 +17,4 @@ Some scripts may be entered using an abbreviation. " c''4-__"c-\_" s4 } } -%% new-chords-done %% + diff --git a/input/test/script-chart.ly b/input/test/script-chart.ly index 79da0bc424..406817f17f 100644 --- a/input/test/script-chart.ly +++ b/input/test/script-chart.ly @@ -49,4 +49,4 @@ A chart showing all feta scripts. " } } -%% new-chords-done %% + diff --git a/input/test/script-priority.ly b/input/test/script-priority.ly index e0ee7c3279..dc759e2cb8 100644 --- a/input/test/script-priority.ly +++ b/input/test/script-priority.ly @@ -20,4 +20,4 @@ by overriding script-priority. " } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/separate-staccato.ly b/input/test/separate-staccato.ly index 3da0c28fc6..023fc9b2fe 100644 --- a/input/test/separate-staccato.ly +++ b/input/test/separate-staccato.ly @@ -17,4 +17,4 @@ music = \notes\relative c' { c4 d e f g a b c d e } > \paper{raggedright=##t} } -%% new-chords-done %% + diff --git a/input/test/simple-slur-endings.ly b/input/test/simple-slur-endings.ly index dc0cd168d3..823163f9a6 100644 --- a/input/test/simple-slur-endings.ly +++ b/input/test/simple-slur-endings.ly @@ -14,4 +14,4 @@ linewidth = 60.0\mm } } -%% new-chords-done %% + diff --git a/input/test/slur-area.ly b/input/test/slur-area.ly index 4826791d49..c810c181b0 100644 --- a/input/test/slur-area.ly +++ b/input/test/slur-area.ly @@ -29,4 +29,4 @@ a8(a a a a a a a-) indent=0.0\mm } } -%% new-chords-done %% + diff --git a/input/test/slur-attachment-override.ly b/input/test/slur-attachment-override.ly index 75b08033f5..5dcb50483e 100644 --- a/input/test/slur-attachment-override.ly +++ b/input/test/slur-attachment-override.ly @@ -24,4 +24,4 @@ fragment = \notes { \notes\relative c \fragment \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/slur-attachment.ly b/input/test/slur-attachment.ly index 9f6915b675..0e70e52f13 100644 --- a/input/test/slur-attachment.ly +++ b/input/test/slur-attachment.ly @@ -18,4 +18,4 @@ fragment = \notes { \notes\relative c \fragment \paper { } } -%% new-chords-done %% + diff --git a/input/test/slur-broken-cross-staff.ly b/input/test/slur-broken-cross-staff.ly index 2c31043525..fff384fe53 100644 --- a/input/test/slur-broken-cross-staff.ly +++ b/input/test/slur-broken-cross-staff.ly @@ -49,4 +49,4 @@ Slur behave decently when broken across linebreak. " } -%% new-chords-done %% + diff --git a/input/test/slur-broken.ly b/input/test/slur-broken.ly index 0b4d12f944..123845fecb 100644 --- a/input/test/slur-broken.ly +++ b/input/test/slur-broken.ly @@ -16,4 +16,4 @@ linewidth = 60.\mm } } -%% new-chords-done %% + diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly index 4c8038445c..968799171c 100644 --- a/input/test/slur-damping.ly +++ b/input/test/slur-damping.ly @@ -11,4 +11,4 @@ c c c c } } -%% new-chords-done %% + diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly index fba9e2ed10..e8ac2010f5 100644 --- a/input/test/slur-dash.ly +++ b/input/test/slur-dash.ly @@ -22,4 +22,4 @@ You can print different kinds of slurs (dotted, dashed, etc). " } -%% new-chords-done %% + diff --git a/input/test/slur-follow-music.ly b/input/test/slur-follow-music.ly index 303162520c..00d93568b1 100644 --- a/input/test/slur-follow-music.ly +++ b/input/test/slur-follow-music.ly @@ -25,4 +25,4 @@ raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/slur-minimum-length.ly b/input/test/slur-minimum-length.ly index 2b313bea5d..eea15e54be 100644 --- a/input/test/slur-minimum-length.ly +++ b/input/test/slur-minimum-length.ly @@ -12,4 +12,4 @@ You can set the minimum length of a slur. " c~c\break } } -%% new-chords-done %% + diff --git a/input/test/slur-positions.ly b/input/test/slur-positions.ly index 908ec19252..00735cfffc 100644 --- a/input/test/slur-positions.ly +++ b/input/test/slur-positions.ly @@ -19,4 +19,4 @@ if this test isn't covered in regression, we're in trouble. :) DELETE. "} } } -%% new-chords-done %% + diff --git a/input/test/slur-proof.ly b/input/test/slur-proof.ly index 58be644ea4..61e2910515 100644 --- a/input/test/slur-proof.ly +++ b/input/test/slur-proof.ly @@ -47,4 +47,4 @@ x = { } } } -%% new-chords-done %% + diff --git a/input/test/slur-symmetry-2.ly b/input/test/slur-symmetry-2.ly index 916a63ebfe..a01a0cecba 100644 --- a/input/test/slur-symmetry-2.ly +++ b/input/test/slur-symmetry-2.ly @@ -17,4 +17,4 @@ linewidth = 50.0\mm } } -%% new-chords-done %% + diff --git a/input/test/slur-symmetry-3.ly b/input/test/slur-symmetry-3.ly index abdaea5d5c..919f0cf35e 100644 --- a/input/test/slur-symmetry-3.ly +++ b/input/test/slur-symmetry-3.ly @@ -17,4 +17,4 @@ raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/slur-ugly.ly b/input/test/slur-ugly.ly index 2578d4a591..c23023bae1 100644 --- a/input/test/slur-ugly.ly +++ b/input/test/slur-ugly.ly @@ -34,4 +34,4 @@ baseWalk = \notes \relative c { } } -%% new-chords-done %% + diff --git a/input/test/smart-transpose.ly b/input/test/smart-transpose.ly index 46fc91e108..c095793d35 100644 --- a/input/test/smart-transpose.ly +++ b/input/test/smart-transpose.ly @@ -71,4 +71,4 @@ music = \notes \relative c' { c4 d e f g a b c } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/solo-a2.ly b/input/test/solo-a2.ly index 79378eb94d..cb3a488bec 100644 --- a/input/test/solo-a2.ly +++ b/input/test/solo-a2.ly @@ -26,4 +26,4 @@ raggedright=##t } } -%% new-chords-done %% + diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index cffeb0552e..13a90a9dd4 100644 --- a/input/test/spacing-2.ly +++ b/input/test/spacing-2.ly @@ -32,4 +32,4 @@ texidoc = " } -%% new-chords-done %% + diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly index 9f562c1ba1..b63bbe41a3 100644 --- a/input/test/span-bars.ly +++ b/input/test/span-bars.ly @@ -23,4 +23,4 @@ stuff = \notes \relative c'' < } -%% new-chords-done %% + diff --git a/input/test/stacked-scripts.ly b/input/test/stacked-scripts.ly index bcb5d5ebd2..074d5d84e9 100644 --- a/input/test/stacked-scripts.ly +++ b/input/test/stacked-scripts.ly @@ -11,4 +11,4 @@ You can stack text and articulations. " } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly index dcddbc6acc..015c1cb85f 100644 --- a/input/test/staff-bracket.ly +++ b/input/test/staff-bracket.ly @@ -28,4 +28,4 @@ Here's an example of staff brackets. " raggedright=##t } } -%% new-chords-done %% + diff --git a/input/test/staff-container.ly b/input/test/staff-container.ly index ce8d3633d3..acd307e6b8 100644 --- a/input/test/staff-container.ly +++ b/input/test/staff-container.ly @@ -36,4 +36,4 @@ interesting things. You can also drop the \consistsend feature. " } } -%% new-chords-done %% + diff --git a/input/test/staff-lines.ly b/input/test/staff-lines.ly index ab0d55e09e..7bf78eaa9a 100644 --- a/input/test/staff-lines.ly +++ b/input/test/staff-lines.ly @@ -29,4 +29,4 @@ lower = \notes\relative c { > > \paper { raggedright=##t} -}%% new-chords-done %% +} diff --git a/input/test/staff-margin-partial.ly b/input/test/staff-margin-partial.ly index 588003d2df..555d0dc1df 100644 --- a/input/test/staff-margin-partial.ly +++ b/input/test/staff-margin-partial.ly @@ -8,4 +8,4 @@ \translator { \StaffContext \consists Instrument_name_engraver } } } -%% new-chords-done %% + diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index 650d6d49e7..c36f1a9238 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -31,4 +31,4 @@ are two options: using StaffContainer and override/revert, or \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/staff-space.ly b/input/test/staff-space.ly index 6add28626b..2fda9741ed 100644 --- a/input/test/staff-space.ly +++ b/input/test/staff-space.ly @@ -21,4 +21,4 @@ Setting staff space on a staff. " } raggedright=##t } } -%% new-chords-done %% + diff --git a/input/test/stem-centered.ly b/input/test/stem-centered.ly index 5ca85a1418..df87762cfd 100644 --- a/input/test/stem-centered.ly +++ b/input/test/stem-centered.ly @@ -15,4 +15,4 @@ Mensural note heads. " } \paper{raggedright=##t} } -%% new-chords-done %% + diff --git a/input/test/stem-cross-staff.ly b/input/test/stem-cross-staff.ly index 2310911129..631025e297 100644 --- a/input/test/stem-cross-staff.ly +++ b/input/test/stem-cross-staff.ly @@ -28,4 +28,4 @@ noFlag = \once \property Voice.Stem \override #'flag-style = #'no-flag \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/stem-extend.ly b/input/test/stem-extend.ly index 7b94e3016a..b0d2106f28 100644 --- a/input/test/stem-extend.ly +++ b/input/test/stem-extend.ly @@ -22,4 +22,4 @@ You can stop Lilypond from extending stems to the center line. " } \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/stem-length.ly b/input/test/stem-length.ly index 7c5ad94e03..55ea59b043 100644 --- a/input/test/stem-length.ly +++ b/input/test/stem-length.ly @@ -11,4 +11,4 @@ You can alter the length of stems. " } \paper { raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/stem.ly b/input/test/stem.ly index b8f6441d10..4e8e7af999 100644 --- a/input/test/stem.ly +++ b/input/test/stem.ly @@ -60,4 +60,4 @@ beamintervals = \notes{ %%% Local variables: %%% LilyPond-indent-level:2 %%% End: -%% new-chords-done %% + diff --git a/input/test/tablature-hammer.ly b/input/test/tablature-hammer.ly index edebb53082..42228affb9 100644 --- a/input/test/tablature-hammer.ly +++ b/input/test/tablature-hammer.ly @@ -13,4 +13,4 @@ You can fake a hammer in tablature with slurs. " > \paper{ raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/tablature.ly b/input/test/tablature.ly index 2a89af2501..96a8d78d17 100644 --- a/input/test/tablature.ly +++ b/input/test/tablature.ly @@ -28,4 +28,4 @@ partition = \notes { > > } -%% new-chords-done %% + diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly index c98ea47f4b..1c8a2339ae 100644 --- a/input/test/text-spanner.ly +++ b/input/test/text-spanner.ly @@ -37,4 +37,4 @@ You can make Lilypond print ottava spanners. " } \paper{ raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/textscript.ly b/input/test/textscript.ly index 1b7472ab7f..e1dd7ab732 100644 --- a/input/test/textscript.ly +++ b/input/test/textscript.ly @@ -15,4 +15,4 @@ Test font selection and scm text markup. " } \paper{ } } -%% new-chords-done %% + diff --git a/input/test/tie-broken.ly b/input/test/tie-broken.ly index 07597c00c1..b2b1b350ef 100644 --- a/input/test/tie-broken.ly +++ b/input/test/tie-broken.ly @@ -20,4 +20,4 @@ indent=0. } } -%% new-chords-done %% + diff --git a/input/test/tie-sparse.ly b/input/test/tie-sparse.ly index 6ad2d6be80..6c8f3743d9 100644 --- a/input/test/tie-sparse.ly +++ b/input/test/tie-sparse.ly @@ -12,4 +12,4 @@ generated per chord pair. " } \paper { raggedright = ##t } } -%% new-chords-done %% + diff --git a/input/test/time.ly b/input/test/time.ly index f736cc7cf2..699a5cf34d 100644 --- a/input/test/time.ly +++ b/input/test/time.ly @@ -177,4 +177,4 @@ right side of the nominator). -- jr \paper { } \midi { } } -%% new-chords-done %% + diff --git a/input/test/timing.ly b/input/test/timing.ly index 3771e838aa..da749f4243 100644 --- a/input/test/timing.ly +++ b/input/test/timing.ly @@ -27,4 +27,4 @@ You can alter the length of bars in a number of ways. " } \paper { raggedright= ##t} } -%% new-chords-done %% + diff --git a/input/test/title.ly b/input/test/title.ly index 8309c4c700..7928ca95b4 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -42,4 +42,4 @@ } } -%% new-chords-done %% + diff --git a/input/test/to-xml.ly b/input/test/to-xml.ly index 62b7919fd1..c9772854af 100644 --- a/input/test/to-xml.ly +++ b/input/test/to-xml.ly @@ -24,4 +24,4 @@ fooBar = \notes { < c''4 \\ g'4 > } \score { \fooBar } -%% new-chords-done %% + diff --git a/input/test/transposing.ly b/input/test/transposing.ly index 4d4069866d..72450d071c 100644 --- a/input/test/transposing.ly +++ b/input/test/transposing.ly @@ -22,4 +22,4 @@ The transposing property leaves output invariant, but has effect on MIDI. " \paper { raggedright = ##t } \midi { } } -%% new-chords-done %% + diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 22a7aa59cd..1e263603a1 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -71,4 +71,4 @@ vFour = \notes \transpose c d \vThree -%% new-chords-done %% + diff --git a/input/test/trill.ly b/input/test/trill.ly index 4378350dca..31feed815b 100644 --- a/input/test/trill.ly +++ b/input/test/trill.ly @@ -24,4 +24,4 @@ Show trill line type. " \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/test/trills.ly b/input/test/trills.ly index 801db32db2..9116b30b22 100644 --- a/input/test/trills.ly +++ b/input/test/trills.ly @@ -114,4 +114,4 @@ endHorizScript = { > \paper{ } } -%% new-chords-done %% + diff --git a/input/test/unfold-all-repeats.ly b/input/test/unfold-all-repeats.ly index 2be72c3682..3ec109ad6d 100644 --- a/input/test/unfold-all-repeats.ly +++ b/input/test/unfold-all-repeats.ly @@ -25,4 +25,4 @@ mel = \notes \context Staff { } -%% new-chords-done %% + diff --git a/input/test/uniform-breaking.ly b/input/test/uniform-breaking.ly index 8a8dce87d0..ae70cb4b69 100644 --- a/input/test/uniform-breaking.ly +++ b/input/test/uniform-breaking.ly @@ -116,4 +116,4 @@ Heb niet zomaar beter idee, nog. } -%% new-chords-done %% + diff --git a/input/test/vertical-extent.ly b/input/test/vertical-extent.ly index c1e5690a70..b51a0d91c9 100644 --- a/input/test/vertical-extent.ly +++ b/input/test/vertical-extent.ly @@ -28,4 +28,4 @@ associated context finishes, so using it in \property works. \translator{\StaffContext minimumVerticalExtent = #'(-2.0 . 2.0)} } } -%% new-chords-done %% + diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly index 2c29945486..a2e529f456 100644 --- a/input/test/vertical-text.ly +++ b/input/test/vertical-text.ly @@ -19,4 +19,4 @@ } -%% new-chords-done %% + diff --git a/input/tutorial/brahms-original.ly b/input/tutorial/brahms-original.ly index 029c1d3ca2..a130e6d8e4 100644 --- a/input/tutorial/brahms-original.ly +++ b/input/tutorial/brahms-original.ly @@ -20,5 +20,5 @@ \paper { raggedright = ##t} } -%% new-chords-done %% + diff --git a/input/tutorial/brahms-tweaked.ly b/input/tutorial/brahms-tweaked.ly index 1ec5e2f3e1..e9a26a017c 100644 --- a/input/tutorial/brahms-tweaked.ly +++ b/input/tutorial/brahms-tweaked.ly @@ -33,4 +33,4 @@ } -%% new-chords-done %% + diff --git a/input/tutorial/miniatures.ly b/input/tutorial/miniatures.ly deleted file mode 100644 index 755404eb7a..0000000000 --- a/input/tutorial/miniatures.ly +++ /dev/null @@ -1,23 +0,0 @@ -\version "1.7.18" -\header { - title = "Two miniatures" - tagline = "Small is beatiful" -} - -#(ly:set-point-and-click 'line-column) - -\paper { raggedright = ##t} - -\score { - \notes { c'4 d'4 } - \header { - opus = "Opus 1." - piece = "Up" } -} - -\score { - \notes { d'4 c'4 } - \header { - opus = "Opus 2." - piece = "Down" } -} diff --git a/input/tutorial/os-flute-2.ly b/input/tutorial/os-flute-2.ly deleted file mode 100644 index 24bbf7f060..0000000000 --- a/input/tutorial/os-flute-2.ly +++ /dev/null @@ -1,29 +0,0 @@ -\version "1.7.18" - -\include "os-music.ly" -\include "paper16.ly" - -\score { - \context Staff < - \property Score.skipBars = ##t - \property Staff.midiInstrument = #"flute" - \global - \Key - \flautoII - > - \header { - instrument = "flute I" - } - \paper { - linewidth = 80 * \staffspace - textheight = 40 * \staffspace - } - \midi { - \tempo 4 = 75 - } -} - - -% switch off settings of -score file, so the rest of the -% tutorial isn't \special -#(ly:set-point-and-click 'none) diff --git a/input/tutorial/os-music.ly b/input/tutorial/os-music.ly deleted file mode 100644 index ec74d3db1c..0000000000 --- a/input/tutorial/os-music.ly +++ /dev/null @@ -1,36 +0,0 @@ -\version "1.7.18" -% include file for tutorial - -\header { - title = "Zo, goed lieverd?" - subtitle = "How's, this babe?" - composer = "JCN" - opus = "1" - piece = "Laid back" -} -global = { - \time 2/4 - \skip 2*4 \bar "|." -} -Key = \notes \key as \major -flautoI = \notes\relative c'' { - f8 g f g f g f g - bes as bes as bes as bes as -} -flautoII = \notes\relative c'' { - as8 bes as bes R1 d4-~ d -} -tromboI = \notes\relative c'' { - c4. c8 c8 c4. es4 r as, r -} -tromboII = \notes\relative c'' { - as4. as8 as8 as4. R1*1/2 as4 es' -} -timpani = \notes\relative c, { - \times 2/3 { f4 f f } - \times 4/5 { as8 as as as as } - R1 -} -corno = \notes\relative c' { - bes4 d f, bes d f, bes d -} diff --git a/input/tutorial/os-score.ly b/input/tutorial/os-score.ly deleted file mode 100644 index 2d30ff73fa..0000000000 --- a/input/tutorial/os-score.ly +++ /dev/null @@ -1,75 +0,0 @@ -\version "1.7.18" - -\include "os-music.ly" -\include "paper13.ly" - -#(ly:set-point-and-click 'line-column) -textFlat = \markup {\smaller \musicglyph #"accidentals--1"} -\score { - < - \global - \property Score.BarNumber \override #'padding = #3 - \context StaffGroup = woodwind < - \context Staff = flauti < - \property Staff.midiInstrument = #"flute" - \property Staff.instrument = "2 Flauti" - \property Staff.instr = "Fl." - \Key - \context Voice=one { \voiceOne \flautoI } - \context Voice=two { \voiceTwo \flautoII } - > - > - \context StaffGroup = timpani < - \context Staff = timpani < - \property Staff.midiInstrument = #"timpani" - \property Staff.instrument = - \markup { \column << "Timpani" "(C-G)" >> } - \property Staff.instr = #"Timp." - \clef bass - \Key - \timpani - > - > - \context StaffGroup = brass < - \context Staff = trombe < - \property Staff.midiInstrument = #"trumpet" - \property Staff.instrument = - \markup { \column << "2 Trombe" "(C)" >> } - \property Staff.instr = - \markup{ \column << "Tbe." "(C)">> } - \Key - \context Voice=one \partcombine Voice - \context Thread=one \tromboI - \context Thread=two \tromboII - > - \context Staff = corni < - \property Staff.midiInstrument = #"french horn" - \property Staff.instrument - = \markup { \column << "Corno" { "(E" \textFlat ")" } >> } - \property Staff.instr - = \markup { \column << "Cor." { "(E" \textFlat ")" } >> } - \property Staff.transposing = #3 - \notes \key bes \major - \context Voice=one \corno - > - > - > - \paper { - indent = 15 * \staffspace - linewidth = 60 * \staffspace - textheight = 90 * \staffspace - \translator{ - \VoiceContext - \consists "Multi_measure_rest_engraver" - } - \translator{ - \HaraKiriStaffContext - \remove "Multi_measure_rest_engraver" - } - } - \midi { - \tempo 4 = 75 - } -} - - diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc index 04ee4217ce..4d95ed4e65 100644 --- a/lily/beam-quanting.cc +++ b/lily/beam-quanting.cc @@ -343,7 +343,7 @@ my_modf (Real x) Real Beam::score_forbidden_quants (Real yl, Real yr, - Real rad, + Real radius, Real slt, Real thickness, Real beam_translation, int beam_count, @@ -355,7 +355,7 @@ Beam::score_forbidden_quants (Real yl, Real yr, for (int i = 0; i < 2; i++) { Real y = i? yl : yr; - if (fabs (y) <= (rad + 0.5) && fabs ( my_modf (y) - 0.5) < 1e-3) + if (fabs (y) <= (radius + 0.5) && fabs ( my_modf (y) - 0.5) < 1e-3) dem += INTER_QUANT_PENALTY; } @@ -368,10 +368,10 @@ Beam::score_forbidden_quants (Real yl, Real yr, Real hang = 1.0 - (thickness - slt) / 2; - if (fabs (yl - ldir * beam_translation) < rad + if (fabs (yl - ldir * beam_translation) < radius && fabs (my_modf (yl) - inter) < 1e-3) dem += SECONDARY_BEAM_DEMERIT; - if (fabs (yr - rdir * beam_translation) < rad + if (fabs (yr - rdir * beam_translation) < radius && fabs (my_modf (yr) - inter) < 1e-3) dem += SECONDARY_BEAM_DEMERIT; @@ -388,7 +388,7 @@ Beam::score_forbidden_quants (Real yl, Real yr, // hmm, without Interval/Drul_array, you get ~ 4x same code... - if (fabs (yl - ldir * beam_translation) < rad + inter) + if (fabs (yl - ldir * beam_translation) < radius + inter) { if (ldir == UP && dy <= eps && fabs (my_modf (yl) - sit) < eps) @@ -399,7 +399,7 @@ Beam::score_forbidden_quants (Real yl, Real yr, dem += SECONDARY_BEAM_DEMERIT; } - if (fabs (yr - rdir * beam_translation) < rad + inter) + if (fabs (yr - rdir * beam_translation) < radius + inter) { if (rdir == UP && dy >= eps && fabs (my_modf (yr) - sit) < eps) @@ -412,7 +412,7 @@ Beam::score_forbidden_quants (Real yl, Real yr, if (beam_count >= 3) { - if (fabs (yl - 2 * ldir * beam_translation) < rad + inter) + if (fabs (yl - 2 * ldir * beam_translation) < radius + inter) { if (ldir == UP && dy <= eps && fabs (my_modf (yl) - straddle) < eps) @@ -423,7 +423,7 @@ Beam::score_forbidden_quants (Real yl, Real yr, dem += SECONDARY_BEAM_DEMERIT; } - if (fabs (yr - 2 * rdir * beam_translation) < rad + inter) + if (fabs (yr - 2 * rdir * beam_translation) < radius + inter) { if (rdir == UP && dy >= eps && fabs (my_modf (yr) - straddle) < eps) -- 2.39.2