From 8b88bf025331c789167734067001a3d79501b433 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 3 Mar 2001 17:19:00 +0100 Subject: [PATCH] patch::: 1.3.134.jcn1 1.3.134.jcn1 ============ * Small doco update. * Silly build and website-build fixes. * convert-ly: added conversions, converted glossary, refman and examples. --- CHANGES | 9 ++ Documentation/regression-test.tely | 2 + Documentation/user/glossary.tely | 126 +++++++++--------- Documentation/user/refman.itely | 39 +++--- Documentation/user/tutorial.itely | 36 ++--- VERSION | 2 +- input/bugs/abe.ly | 1 + input/bugs/accidental-collision.ly | 1 + input/bugs/auto-beam-tuplets.ly | 1 + input/bugs/auto-beam.ly | 1 + input/bugs/barline.ly | 1 + input/bugs/beamed-chord.ly | 1 + input/bugs/beaming.ly | 1 + input/bugs/broken-tuplet.ly | 1 + input/bugs/die-staff.ly | 1 + input/bugs/different-time.ly | 1 + input/bugs/dots.ly | 1 + input/bugs/dynamic-collide.ly | 1 + input/bugs/dynamic-switch.ly | 1 + input/bugs/gr-instrument.ly | 2 +- input/bugs/grace-dynamic.ly | 1 + input/bugs/grace-finger.ly | 1 + input/bugs/grace-gets-slur.ly | 1 + input/bugs/grace-pedal.ly | 3 +- input/bugs/hinterfleisch-gone.ly | 1 + input/bugs/mb.ly | 1 + input/bugs/partial-beam.ly | 3 +- input/bugs/pc-core.ly | 1 + input/bugs/pc-direction.ly | 1 + input/bugs/prefatory-spacing.ly | 1 + input/bugs/repeat.ly | 1 + input/bugs/script.ly | 1 + input/bugs/slur-attachment.ly | 1 + input/bugs/slur-dots.ly | 3 +- input/bugs/slur-dx.ly | 1 + input/bugs/slur-steep-broken.ly | 1 + input/bugs/spacing-very-tight.ly | 1 + input/bugs/staff-size.ly | 2 +- input/bugs/steep-beam.ly | 1 + input/bugs/steep.ly | 1 + input/bugs/stem-through-beam.ly | 1 + input/bugs/text-kerning.ly | 1 + input/bugs/text-spanner.ly | 3 +- input/bugs/textstyle.ly | 1 + input/bugs/tie-break-accidental.ly | 1 + input/bugs/ties.ly | 1 + input/bugs/time.ly | 1 + input/bugs/triplets.ly | 5 +- input/bugs/voice-switch-slur.ly | 1 + input/denneboom.ly | 2 +- input/emacs-lily.fly | 1 + input/example-1.ly | 1 + input/example-2.ly | 1 + input/example-3.ly | 1 - input/just-friends.ly | 2 +- input/les-nereides.ly | 36 ++--- input/minimal.ly | 1 + input/opus-130.ly | 6 +- input/praeludium-fuga-E.ly | 16 +-- input/regression/accidental-single-double.ly | 4 +- input/regression/accidental.ly | 1 + input/regression/allfontstyle.ly | 5 +- input/regression/arpeggio-collision.ly | 3 +- input/regression/arpeggio.ly | 2 +- input/regression/auto-beam-bar.ly | 3 +- input/regression/auto-change.ly | 1 + input/regression/auto-isknee.ly | 1 + input/regression/auto-knee.ly | 1 + input/regression/bar-number.ly | 1 + input/regression/bar-scripts.ly | 2 +- input/regression/beam-cross-staff.ly | 2 +- input/regression/beam-extreme.ly | 2 +- input/regression/beam-length.ly | 1 + input/regression/beam-position.ly | 2 +- input/regression/beaming.ly | 1 + input/regression/between-systems.ly | 1 + input/regression/break.ly | 1 + input/regression/breathing-sign.ly | 2 +- input/regression/chord-changes.ly | 1 + input/regression/chord-names.ly | 4 +- input/regression/chord-tremolo.ly | 1 + input/regression/clefs.ly | 2 +- input/regression/collisions.ly | 2 +- input/regression/dots.ly | 2 +- input/regression/dynamics-line.ly | 2 +- input/regression/easy-notation.ly | 4 + input/regression/generic-output-property.ly | 1 + input/regression/generic-property-override.ly | 2 +- input/regression/glissando.ly | 1 + input/regression/grace.ly | 1 + input/regression/hara-kiri-short.ly | 2 +- input/regression/keys.ly | 2 +- input/regression/lyric-combine.ly | 2 +- input/regression/lyrics-bar.ly | 1 + input/regression/lyrics-multi-stanza.ly | 1 + input/regression/mm-rests2.ly | 1 + input/regression/molecule-hacking.ly | 1 + input/regression/multi-measure-rest.ly | 2 +- input/regression/non-empty-text.ly | 1 + input/regression/note-line.ly | 1 + input/regression/noteheadstyle.ly | 2 +- input/regression/number-staff-lines.ly | 1 + input/regression/phrasing-slur.ly | 3 +- input/regression/repeat-fold.ly | 17 ++- input/regression/repeat-line-break.ly | 1 + input/regression/repeat-unfold.ly | 1 + .../repeat-volta-skip-alternatives.ly | 1 + input/regression/repeat-volta.ly | 27 ++-- input/regression/rest-collision.ly | 2 +- input/regression/rest.ly | 1 + input/regression/size11.ly | 1 + input/regression/size13.ly | 1 + input/regression/size16.ly | 1 + input/regression/size20.ly | 1 + input/regression/size23.ly | 1 + input/regression/size26.ly | 1 + input/regression/slur-attachment.ly | 1 + input/regression/slur-broken-trend.ly | 1 + input/regression/slur-cross-staff.ly | 2 +- input/regression/slur-nice.ly | 2 +- input/regression/slur-symmetry-1.ly | 1 + input/regression/slur-symmetry.ly | 1 + input/regression/spacing-loose.ly | 1 + input/regression/spacing-natural.ly | 1 + input/regression/spacing-tight.ly | 1 + input/regression/staccato-pos.ly | 1 + input/regression/staff-margin.ly | 2 +- input/regression/stem-direction-down.ly | 1 + input/regression/stem-direction.ly | 1 + input/regression/stem-spacing.ly | 1 + input/regression/stem-tremolo.ly | 2 +- input/regression/tie-accidental.ly | 1 + input/regression/tie-chord.ly | 2 +- input/regression/tie.ly | 1 + input/regression/triplets.ly | 1 + input/regression/tup.ly | 2 +- input/regression/volta-broken-left-edge.ly | 17 +-- input/rhythm.ly | 2 +- input/scarlatti-paper.ly | 4 +- input/scarlatti-properties.ly | 6 +- input/scarlatti-test.ly | 4 +- input/star-spangled-banner.ly | 2 +- input/test/absolute-volume.ly | 1 + input/test/ac-extra-voice.ly | 6 +- input/test/accid.ly | 1 + input/test/accidental-spacing.ly | 1 + input/test/american-chords.ly | 6 +- input/test/ancient-font.ly | 2 +- input/test/as.ly | 1 + input/test/as1.ly | 1 + input/test/as2.ly | 1 + input/test/asciscript5.ly | 3 +- input/test/auto-beam-4-8.ly | 4 +- input/test/auto-beam-override.ly | 2 +- input/test/auto-beam-triplet.ly | 1 + input/test/auto-beam.ly | 1 + input/test/bagpipe.ly | 6 +- input/test/banter-chords.ly | 2 +- input/test/bar-break.ly | 1 + input/test/bar-lines.ly | 1 + input/test/bar-script-visibility.ly | 1 + input/test/beam-abbrev.ly | 2 +- input/test/beam-chord.ly | 2 +- input/test/beam-control.ly | 1 + input/test/beam-damp.ly | 2 +- input/test/beam-dir.ly | 1 + input/test/beam-isknee.ly | 2 +- input/test/beam-pos.ly | 1 + input/test/beam-quanting.ly | 1 + input/test/beam-slope.ly | 1 + input/test/beam-suspect.ly | 2 +- input/test/beam-trend.ly | 2 +- input/test/beam-urg.ly | 1 + input/test/beamed-slur-endings.ly | 17 +-- input/test/beams.ly | 2 +- input/test/broken-thread-line.ly | 1 + input/test/broken.ly | 2 +- input/test/chord-changes.ly | 1 + input/test/chord-inversion.ly | 2 +- input/test/chord-table.ly | 2 +- input/test/chords.ly | 4 +- input/test/clef-8-syntax.ly | 1 + input/test/coda-kludge.ly | 2 +- input/test/collision-merge-dotted.ly | 2 +- input/test/coriolan-margin.ly | 8 +- input/test/crescendi.ly | 1 + input/test/cue-notes.ly | 14 +- input/test/custos.ly | 1 + input/test/defaultbars.ly | 2 +- input/test/different-time-signatures.ly | 1 + input/test/diverse-spacing.ly | 1 + input/test/dynamic-dir.ly | 3 +- input/test/embedded-scm.ly | 1 + input/test/equaliser.ly | 7 +- input/test/explicit.ly | 3 +- input/test/extra-staff.ly | 2 +- input/test/figured-bass.ly | 2 +- input/test/fill-a4.ly | 3 +- input/test/fingering.ly | 1 + input/test/font-body.ly | 2 +- input/test/font.ly | 2 +- input/test/font11.ly | 3 +- input/test/font13.ly | 3 +- input/test/font16.ly | 2 +- input/test/font20.ly | 2 +- input/test/font26.ly | 3 +- input/test/force-hshift.ly | 2 +- input/test/gmsusd.ly | 2 +- input/test/gourlay.ly | 2 +- input/test/grace-end.ly | 1 + input/test/hara-kiri-switch.ly | 2 +- input/test/hara-kiri.ly | 2 +- input/test/harmonics.ly | 1 + input/test/hshift.ly | 2 +- input/test/hymn.ly | 1 + input/test/incipit.ly | 2 +- input/test/instrument-name-grandstaff.ly | 2 +- input/test/instrument-name-mmrest.ly | 2 +- input/test/instrument-name.ly | 2 +- input/test/jazz-chords.ly | 6 +- input/test/key-clefs.ly | 3 +- input/test/keys2.ly | 2 +- input/test/knee-mult.ly | 2 +- input/test/knee.ly | 2 +- input/test/lines.ly | 3 +- input/test/ly2dvi-testpage.ly | 1 + input/test/lyric-extender.ly | 2 +- input/test/lyric-hyphen.ly | 2 +- input/test/lyric-phrasing.ly | 2 +- input/test/lyrics.ly | 8 +- input/test/manual-clef.ly | 2 +- input/test/manual-volta.ly | 1 + input/test/mark.ly | 2 +- input/test/markup.ly | 2 +- input/test/maximum-rest-count.ly | 1 + input/test/memory.ly | 2 +- input/test/monstrous.ly | 1 + input/test/move-mark.ly | 1 + input/test/multi-rest.ly | 2 +- input/test/multi-slope.ly | 1 + input/test/no-stem-extend.ly | 1 + input/test/note-chords.ly | 1 + input/test/note-shift.ly | 15 ++- input/test/notemode-chords.ly | 2 +- input/test/orchestalpart.ly | 1 + input/test/orchestscore.ly | 2 +- input/test/ossia.ly | 2 +- input/test/parse.ly | 1 + input/test/parse2.ly | 1 + input/test/parse3.ly | 1 + input/test/parse4.ly | 1 + input/test/part-combine-moments.ly | 3 +- input/test/part-combine-score.ly | 1 + input/test/part-combine-staff.ly | 3 +- input/test/pedal.ly | 2 +- input/test/perform-grace.ly | 1 + input/test/perform-tie.ly | 1 + input/test/pushproperty.ly | 2 +- input/test/r-as.ly | 1 + input/test/repeat.ly | 1 + input/test/repeatbar.ly | 1 + input/test/rests.ly | 1 + input/test/rhythmic-staff.ly | 1 + input/test/scales-greek.ly | 3 +- input/test/scales.ly | 1 + input/test/script-horizontal.ly | 1 + input/test/scripts.ly | 2 +- input/test/short-part-combine.ly | 1 + input/test/simple-slur-endings.ly | 11 +- input/test/sizes.ly | 1 + input/test/sleur.ly | 2 +- input/test/slur-area.ly | 7 +- input/test/slur-broken-cross-staff.ly | 2 +- input/test/slur-broken.ly | 1 + input/test/slur-damping.ly | 2 +- input/test/slur-dash.ly | 8 +- input/test/slur-follow-music.ly | 2 +- input/test/slur-mininum.ly | 1 + input/test/slur-positions.ly | 1 + input/test/slur-proof.ly | 1 + input/test/slur-symmetry-2.ly | 1 + input/test/slur-symmetry-3.ly | 1 + input/test/slurs.ly | 2 +- input/test/solo-a2.ly | 1 + input/test/spacing-2.ly | 6 +- input/test/spacing.ly | 2 +- input/test/span-bars.ly | 2 +- input/test/stacked-scripts.ly | 1 + input/test/staff-bracket.ly | 3 +- input/test/staff-line-leading.ly | 3 +- input/test/staff-margin-partial.ly | 2 +- input/test/staff-side-slur.ly | 2 +- input/test/staff-size.ly | 2 +- input/test/standchen-as5.ly | 8 +- input/test/standchen-as9.ly | 11 +- input/test/stem-centered.ly | 3 +- input/test/stem-length.ly | 1 + input/test/stem.ly | 2 +- input/test/system-start-brace.ly | 1 + input/test/system-start-bracket.ly | 1 + input/test/tab-staff.ly | 14 +- input/test/tchaikovsky.ly | 2 +- input/test/text-spanner.ly | 2 +- input/test/textscript.ly | 2 +- input/test/thumb.ly | 2 +- input/test/tie-broken.ly | 1 + input/test/tie-minimum.ly | 1 + input/test/tie-sparse.ly | 1 + input/test/time.ly | 1 + input/test/timing.ly | 1 + input/test/title.ly | 2 +- input/test/top-staff-volta.ly | 1 + input/test/transposing.ly | 1 + input/test/transposition.ly | 2 +- input/test/tuplet-rest.ly | 1 + input/test/tuplet-spanner-duration.ly | 1 + input/test/tuplet.ly | 2 +- input/test/twinkle-as5.ly | 2 +- input/test/two-slurs.ly | 2 +- input/test/uniform-breaking.ly | 1 + input/test/updown.ly | 2 +- input/test/vertical-align.ly | 2 +- input/test/vertical-extent.ly | 1 + input/test/vertical-text.ly | 2 +- input/test/voice-switch.ly | 1 + input/test/volta-start.ly | 2 +- input/test/volta.ly | 4 +- input/test/warnings.ly | 1 + input/tricks/beam-count.ly | 1 + input/tricks/beam-dir-function.ly | 1 + input/tricks/beam-neutral-direction.ly | 1 + input/tricks/beam-position.ly | 1 + input/tricks/beam-rest.ly | 1 + input/tricks/beam-slope.ly | 1 + input/tricks/crescendo-text.ly | 1 + input/tricks/embedded-postscript.ly | 1 + input/tricks/embedded-tex.ly | 1 + input/tricks/follow-thread.ly | 1 + input/tricks/fragment.ly | 1 + input/tricks/german-chords.ly | 3 +- input/tricks/metronome.ly | 2 +- input/tricks/mmrest-collision.ly | 1 + input/tricks/move-notehead.ly | 1 + input/tricks/move-specific-text.ly | 1 + input/tricks/no-bar-lines.ly | 1 + input/tricks/no-staff.ly | 1 + input/tricks/ophee-slurs.ly | 1 + input/tricks/ottava.ly | 1 + input/tricks/part-combine.ly | 1 + input/tricks/partial-blank.ly | 2 +- input/tricks/reverse-music.ly | 1 + input/tricks/slur-attachment-override.ly | 1 + input/tricks/slur-attachment.ly | 1 + input/tricks/slur-ugly.ly | 1 + input/tricks/smart-transpose.ly | 1 + input/tricks/staff-container.ly | 1 + input/trip.ly | 2 +- input/tutorial/flowing.ly | 1 + input/tutorial/galuppi.ly | 9 +- input/tutorial/ly2dvi.ly | 1 + input/tutorial/menuet.ly | 1 + input/tutorial/orchestral-score.ly | 2 +- input/tutorial/sammartini.ly | 17 +-- input/tutorial/singing-saw.ly | 1 + input/tutorial/test.ly | 1 + input/tutorial/wss.ly | 1 + input/twinkle-pop.ly | 3 +- input/twinkle.ly | 2 +- scm/backend-documentation-lib.scm | 2 +- scm/font.scm | 1 + scm/grob-description.scm | 7 +- scm/grob-property-description.scm | 1 + scm/interface-description.scm | 2 +- scripts/convert-ly.py | 19 ++- 374 files changed, 670 insertions(+), 408 deletions(-) diff --git a/CHANGES b/CHANGES index e23e5ea743..9e07294723 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,12 @@ +1.3.134.jcn1 +============ + +* Small doco update. + +* Silly build and website-build fixes. + +* convert-ly: added conversions, converted glossary, refman and examples. + 1.3.133.jcn5 ============ diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely index fc18c140bd..470b7cec0f 100644 --- a/Documentation/regression-test.tely +++ b/Documentation/regression-test.tely @@ -23,6 +23,8 @@ and documenting bugfixes. @lilypondfile[printfilename]{noteheadstyle.ly} +@lilypondfile[printfilename]{easy-notation.ly} + @lilypondfile[printfilename]{dots.ly} @lilypondfile[printfilename]{accidental.ly} diff --git a/Documentation/user/glossary.tely b/Documentation/user/glossary.tely index eb37c2d8ac..48f69da042 100644 --- a/Documentation/user/glossary.tely +++ b/Documentation/user/glossary.tely @@ -62,7 +62,7 @@ accidental. @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \notes\relative c'' { gis1_"sharp" s s2 gisis1_"db. sharp" s s2 @@ -141,16 +141,16 @@ the duration of the long a. is proportionate to that of the main note. @lilypond[13pt,eps] \emptyText -%\property Voice.textEmptyDimension = ##t -\property Voice.textStyle = "large" +%\property Voice.textNonEmpty = ##f +\property Voice.TextScript \set #'font-style = #'large \notes\relative c'' { \key d \major; \time 4/4; r -{ \property Grace.flagStyle = "" +{ \property Grace.Stem \override #'flag-style = ##f \grace g16 } fis8 e16 fis -{ \property Grace.flagStyle = "" +{ \property Grace.Stem \override #'flag-style = ##f \grace a16 } g8 fis16 g | a4 \bar "||"; } \notes\relative c'' { @@ -163,7 +163,7 @@ An appoggiatura may have more notes preceding the main note. @lilypond[13pt,eps] \emptyText -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \notes\relative c'' { \key as \major; \time 2/4; @@ -277,7 +277,7 @@ beams determine the note value of the connected notes. @lilypond[13pt,eps] \property Score.barNonAuto = ##t \emptyText -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \notes\relative c'' { [g8_"1/8" g g g] s16 [g16_"1/16" g g g] s16 @@ -436,7 +436,7 @@ chords are denoted open chords @lilypond[13pt,eps] \property Score.barNonAuto = ##t \property Voice.textNonEmpty = ##t -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \time 4/4; \notes\relative c'' { @@ -543,7 +543,7 @@ composition methods. @ @lilypond[13pt,eps] -\property Score.timeSignatureStyle = "C2/2" +\property Score.TimeSignature \override #'style = #'C2/2 \context GrandStaff < \notes\relative c' { \key bes \major; @@ -632,7 +632,7 @@ frequently near the beginning marked by a sign: @ @lilypond[13pt,eps] -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \key g \major; \time 4/4; \notes\relative c'' { d1 | g,4^\segno a b c | b a g2_"d.s." \bar "|."; } @end lilypond @@ -674,8 +674,8 @@ also to some extent in newer jazz music. @lilypond[13pt,eps] \emptyText \property Score.barNonAuto = ##t -\property Lyrics.textStyle = "large" -\property Voice.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large +\property Voice.TextScript \set #'font-style = #'large \addlyrics \notes\relative c' { c1 d @@ -689,8 +689,8 @@ also to some extent in newer jazz music. @lilypond[13pt,eps] \emptyText \property Score.barNonAuto = ##t -\property Lyrics.textStyle = "large" -\property Voice.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large +\property Voice.TextScript \set #'font-style = #'large \addlyrics \notes\relative c' { d1 @@ -705,8 +705,8 @@ also to some extent in newer jazz music. @lilypond[13pt,eps] \emptyText \property Score.barNonAuto = ##t -\property Lyrics.textStyle = "large" -\property Voice.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large +\property Voice.TextScript \set #'font-style = #'large \addlyrics \notes\relative c' { \property Voice.textScriptPadding = #-10 @@ -720,8 +720,8 @@ also to some extent in newer jazz music. @lilypond[13pt,eps] \emptyText \property Score.barNonAuto = ##t -\property Lyrics.textStyle = "large" -\property Voice.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large +\property Voice.TextScript \set #'font-style = #'large \addlyrics \notes\relative c' { f1 g a @@ -735,8 +735,8 @@ also to some extent in newer jazz music. @lilypond[13pt,eps] \emptyText \property Score.barNonAuto = ##t -\property Lyrics.textStyle = "large" -\property Voice.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large +\property Voice.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { g1 a @@ -750,8 +750,8 @@ also to some extent in newer jazz music. @lilypond[13pt,eps] \emptyText \property Score.barNonAuto = ##t -\property Lyrics.textStyle = "large" -\property Voice.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large +\property Voice.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { a1 @@ -770,8 +770,8 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and @lilypond[13pt,eps] \emptyText \property Score.barNonAuto = ##t -\property Lyrics.textStyle = "large" -\property Voice.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large +\property Voice.TextScript \set #'font-style = #'large \addlyrics \notes\relative c' { c1 d @@ -785,8 +785,8 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and @lilypond[13pt,eps] \emptyText \property Score.barNonAuto = ##t -\property Lyrics.textStyle = "large" -\property Voice.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large +\property Voice.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { a1 @@ -800,8 +800,8 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and @lilypond[13pt,eps] \emptyText \property Score.barNonAuto = ##t -\property Lyrics.textStyle = "large" -\property Voice.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large +\property Voice.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { a1 @@ -819,8 +819,8 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and @lilypond[13pt,eps] \emptyText \property Score.barNonAuto = ##t -\property Lyrics.textStyle = "large" -\property Voice.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large +\property Voice.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { a1 @@ -1006,7 +1006,7 @@ but equal pitch. @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \notes\relative c'' { gis1_"g sharp" s as1_"a flat" s s < des_"dim fifth" g,! > s s < cis_"augm fourth" g! > s s @@ -1047,7 +1047,7 @@ octave lower (for example on double bass @w{@ar{}@strong{strings}}). @lilypond[13pt,eps] \property Score.barNonAuto = ##t \property Staff.clefStyle = #"fullSizeChanges" -\property Lyrics.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large \addlyrics \notes\relative c { % \clef "F3"; @@ -1111,7 +1111,7 @@ a quarter note. The number of flags determines the @w{@ar{}@strong{note value}}. @lilypond[13pt,eps] \property Score.barNonAuto = ##t \emptyText -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \notes\relative c'' { g8_"1/8" s8 g16_"1/16" s8 @@ -1158,13 +1158,13 @@ of the base chords. @lilypond[13pt,eps] \emptyText \property Score.barNonAuto = ##t -\property Lyrics.textStyle = "large" -\property Voice.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large +\property Voice.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { < g1 e c > < a f d > < b g e > < c a f > < d b g > < e c a > < f d b > } -\context Lyrics \lyrics { T Sp Dp S D Tp "D{\\kern-5pt}$\\mid$" } +\context Lyrics \lyrics { T Sp Dp S D Tp "D{\\kern-5pt}$\\mid$" } @end lilypond @item G @@ -1185,7 +1185,7 @@ that). @lilypond[13pt,eps] \property Score.barNonAuto = ##t \property Staff.clefStyle = #"fullSizeChanges" -\property Lyrics.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large \addlyrics \notes\relative c'' { \clef french; @@ -1259,7 +1259,7 @@ section. @ar{}@w{}@strong{functional harmony} \time 4/4; \clef treble; \partial 4; < c4 g e > | < c a f > < b g d > < c2 g e > } - \property Lyrics.textStyle = "large" + \property Lyrics.LyricText \set #'font-style = #'large \addlyrics \notes\relative c { \clef bass; @@ -1281,7 +1281,7 @@ Consonances: @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \notes\relative c'' { s s @@ -1299,7 +1299,7 @@ Dissonances: @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \notes\relative c'' { s s @@ -1330,8 +1330,8 @@ forms an octave. @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Lyrics.textStyle = "large" -\property Voice.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large +\property Voice.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { < g1 g > s @@ -1351,8 +1351,8 @@ forms an octave. @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Lyrics.textStyle = "large" -\property Voice.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large +\property Voice.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { < g1^"perfect" c > s @@ -1372,8 +1372,8 @@ forms an octave. @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Lyrics.textStyle = "large" -\property Voice.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large +\property Voice.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { < gis1^"dimin" f'! > s @@ -1399,7 +1399,7 @@ The difference between an interval and an octave. @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \notes\relative c'' { < g1_"second" a > s < g'_"seventh" a, > s \bar "||"; < g,_"third" b > s < g'_"sixth" b, > s \bar "||"; @@ -1471,7 +1471,7 @@ unlike @emph{leggiero} or @emph{non-legato} (b), @emph{portato} (c) and @lilypond[13pt,eps] \property Score.barNonAuto = ##t \emptyText -\property Lyrics.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large \addlyrics \notes\relative c'' { c4( d )e \bar "||"; @@ -1675,9 +1675,9 @@ subject. @ @lilypond[13pt,eps] -\property Score.timeSignatureStyle = "C2/2" +\property Score.TimeSignature \override #'style = #'C2/2 \emptyText -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \notes\relative c'' { \time 4/4; \key g \major; @@ -1759,7 +1759,7 @@ but sometimes (mostly in pre baroque music) the double length note value @ @lilypond[13pt,eps] -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \property Score.barNonAuto = ##t \notes\relative c'' { \property Voice.noteHeadStyle = #'mensural @@ -1770,7 +1770,7 @@ but sometimes (mostly in pre baroque music) the double length note value @end lilypond @lilypond[13pt,eps] -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \property Score.barNonAuto = ##t \notes\relative c'' { r\longa_"longa" r\breve_"breve" @@ -1785,7 +1785,7 @@ half. Another dot adds yet a fourth of the duration. @lilypond[13pt,eps] \emptyText -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \notes\relative c'' { \time 4/4; g4._"pointed" g8 g2 | g4 () g8 g g2 \bar "||"; @@ -1800,7 +1800,7 @@ frequently used. @ @lilypond[13pt,eps] -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \emptyText \notes\relative c'' { \time 4/4; @@ -1838,7 +1838,7 @@ the upper note is played first. < \context Staff = sa { \emptyText - \property Voice.textStyle = "large" + \property Voice.TextScript \set #'font-style = #'large \notes\relative c'' { c2._"pre-1850" b4\trill | c1 \bar "||"; c2._"post-1850" b4\trill | c1 \bar "||"; @@ -1860,7 +1860,7 @@ Other frequently used ornaments are the @emph{turn}, the @emph{mordent} and the < \context Staff = sa { \emptyText - \property Voice.textStyle = "large" + \property Voice.TextScript \set #'font-style = #'large \notes\relative c'' { a4_"turn" b\turn c2 \bar "||"; g4_"mordent" a b\mordent a \bar "||"; @@ -2004,7 +2004,7 @@ the same @w{@ar{}@strong{signature}}. @lilypond[13pt,eps] \emptyText \property Score.barNonAuto = ##t -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \notes\relative c' { \key es \major; es1_"e flat major" f g as bes c d es @@ -2075,7 +2075,7 @@ sub@-do@-mi@-nant (S) and V = dominant (D). @lilypond[13pt,eps] \emptyText \property Score.barNonAuto = ##t -\property Lyrics.textStyle = "large" +\property Lyrics.LyricText \set #'font-style = #'large \property Lyrics.minVerticalAlign = 8 \addlyrics \notes\relative c' { @@ -2263,7 +2263,7 @@ note. @w{@ar{}@strong{beam}} \property Score.noAutoBeaming = ##t \property Score.barNonAuto = ##t \emptyText -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \notes\relative c'' { g2_"1/2" g' s16 g,4_"1/4" g' s16 @@ -2337,7 +2337,7 @@ the underlaying (normal) pulse and the actual (abnormal) rhythm. @lilypond[13pt,eps] \emptyText -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \time 4/4; \notes\relative c' { \partial 4; @@ -2434,8 +2434,8 @@ with figures designating the chief @w{@ar{}@strong{interval}}s and < bes8 g > as < as f > g < g es > f < d f > es | < g4 es > } > } - \property Voice.textStyle = "large" - \property Lyrics.textStyle = "Large" + \property Voice.TextScript \set #'font-style = #'large + \property Lyrics.LyricText \set #'font-style = #'Large \property Lyrics.minVerticalAlign = 6 \addlyrics \notes\relative c' { @@ -2527,7 +2527,7 @@ a @w{@ar{}@strong{chord}}, usually in the distance of a third @lilypond[13pt,eps] \emptyText \property Score.barNonAuto = ##t -\property Voice.textStyle = "large" +\property Voice.TextScript \set #'font-style = #'large \notes\relative c' { % e2:32_"a" f:32 [ e8:16 f:16 g:16 a:16 ] s4 [:32 e1_"b" g] % e2:32_"a" f:32 [ e8:16 f:16 g:16 a:16 ] s4 \repeat "tremolo" 16 { e32_"b" g } diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index e4f278c778..9dfeaf081a 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1148,7 +1148,7 @@ You cannot have the grace note after the main note, in terms of duration, and main notes, but you can typeset the grace notes to the right of the main note using the property @code{graceAlignPosition}. -@cindex @code{flagStyle} +@cindex @code{flag-style} When grace music is interpreted, a score-within-a-score is set up: @var{musicexpr} has its own time bookkeeping, and you could (for @@ -1156,13 +1156,13 @@ example) have a separate time signature within grace notes. While in this score-within-a-score, you can create notes, beams, slurs, etc. Unbeamed eighth notes and shorter by default have a slash through the stem. This behavior can be controlled with the -@code{flagStyle} property. +@code{Stem}.@code{flag-style} property. @quotation @lilypond[fragment,verbatim] \relative c'' { \grace c8 c4 \grace { [c16 c16] } c4 - \grace { \property Grace.flagStyle = "" c16 } c4 + \grace { \property Grace.Stem \override #'flag-style = ##f c16 } c4 } @end lilypond @@ -2456,14 +2456,12 @@ multimeasure rest. @cindex automatic part combining @cindex part combiner -You will already have seen that LilyPond can combine several Threads -into one Voice, and put several Voices onto one Staff. The automatic -part combiner takes this a step further. Two parts of music can be -combined together in an intelligent way, ie, when the two parts are -identical for a period of time, only one can be showed. In places where -the two parts differ, stem directions can be set automatically. That is -why the part combiner is of great use for the typesetting of Hymns and -orchestral scores. +Automatic part combining is used to merge two parts of music onto on +staff in an intelligent way. It is aimed primarily at typesetting Hymns +and orchestral scores. When the two parts are identical for a period of +time, only will be shown. In places where the two parts differ, stem +directions are set automatically. Also, soli and @`{a} due parts can be +identified and marke. @subsubsection Part combine syntax @@ -2539,7 +2537,7 @@ not the textual markings, you may set the property @var{soloADue} to false: \translator { \VoiceContext soloADue = ##f - } } + } } } @end lilypond @@ -2646,7 +2644,7 @@ A grob definition is an association list, that is stored in a context property. By assigning to that property (using plain @code{\property}), you can change the resulting grobs. @lilypond[verbatim, fragment] -c'4 \property Voice.Stem = #'((meta . ((interfaces . ())))) c'4 +c'4 \property Voice.Stem \override #'meta = #'((interfaces . ())) c'4 @end lilypond The @code{\property} statement effectively empties the definition of the Stem object. One of the effects is that property specifying how it @@ -2797,13 +2795,16 @@ form text markup expressions by composing scheme expressions in the following way. @lilypond[verbatim] -\score { \notes \relative c' { - b-#"text" - c-#'(bold "text") - d-#'(lines "one" (bold "text")) - e-#'(music (named "noteheads-2" "flags-u3")) +\score { + \notes \relative c' { + b-#"italic" + c-#'(upright "upright") + c-#'((bold upright) "bold") + d-#'(lines "one" ((bold upright) "two")) + e-#'(music (named "noteheads-2" "flags-u3")) + } + \paper { linewidth = 10.\cm; } } -\paper { linewidth = 10.\cm; } } @end lilypond Normally, the Scheme markup text is stored in the @code{text} property diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index d332e0d938..222f7682ef 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -1104,46 +1104,46 @@ under the name @file{sammartini.ly}. @lilypond[verbatim] \include "paper16.ly"; -stemdown = \property Voice.Stem \override #'direction = #-1 -stemup = \property Voice.Stem \override #'direction = #1 -stemboth = \property Voice.Stem \revert #'direction +stemDown = \property Voice.Stem \override #'direction = #-1 +stemUp = \property Voice.Stem \override #'direction = #1 +stemBoth = \property Voice.Stem \revert #'direction viola = \notes \relative c' \context Voice = viola { - \stemdown g'8. b,16 + \stemDown g'8. b,16 s1 s2. r4 g } oboes = \notes \relative c'' \context Voice = oboe { - \stemup s4 g8. b,16 c8 r + \stemUp s4 g8. b,16 c8 r \grace \times 2/3 { } < { \times 2/3 { a8 g c } \! c2 } \context Voice = oboeTwo { - \stemdown + \stemDown \grace { \property Grace.Stem \override #'direction = #-1 [f,16 g] } f8 e e2 } > - \stemboth + \stemBoth \grace <)b8. d8.-\trill> | [ < )f8. a>] <)b,8 d> r [ ] r | [ < )e8. g>] } hoomPah = \repeat unfold 8 - \notes \transpose c' { c8 \stemdown c'8 \stemup } + \notes \transpose c' { c8 \stemDown c'8 \stemUp } bassvoices = \notes \relative c' { c4 g8. b,16 \autochange Staff \hoomPah \translator Staff = down - \stemdown [c8 c'8] r4 + \stemDown [c8 c'8] r4 r4 - < {\stemup r2 } - \context Voice = reallyLow {\stemdown g2 ~ | g4 c8 } > + < {\stemUp r2 } + \context Voice = reallyLow {\stemDown g2 ~ | g4 c8 } > } \score { @@ -1167,7 +1167,7 @@ If it looks like incomprehensible gibberish to you, then you are right. This example has been doctored to have as many quirks as possible. @example - stemdown = \property Voice.Stem \override #'direction = #-1 + stemDown = \property Voice.Stem \override #'direction = #-1 @end example As you can see, this example features more voices on one staff. To make @@ -1190,7 +1190,7 @@ setting remains in effect until it is reverted. @end example This statement reverts the old setting. If you do this, the effect of a -@code{\stemdown} or @code{\stemup} is neutralised. +@code{\stemDown} or @code{\stemUp} is neutralised. @code{\override} and @code{\revert} function like a stack: you can push values onto the grob-setting-stack with @code{\override} and you pop @@ -1233,7 +1233,7 @@ note. signifying an arpeggio. @example - \stemdown + \stemDown @end example @@ -1261,9 +1261,9 @@ print the notes as one voice that makes chords. Again, we insure that these notes are indeed processed by precisely one context with @code{\context}. @example -\stemup s4 g8. b,16 c8 r +\stemUp s4 g8. b,16 c8 r @end example -@code{\stemup} is a reference to the @code{\property \override} command +@code{\stemUp} is a reference to the @code{\property \override} command defined above. . @example \grace < d4 f> @@ -1351,11 +1351,11 @@ the @code{f}. @end example This ends the two-part section. @example -\stemboth +\stemBoth \grace <)b8. d8.-\trill> | @end example @cindex trill -@cindex stemboth +@cindex stemBoth @code{\stemBoth} ends the forced stem directions. From here, stems are positioned as if it were single part music. diff --git a/VERSION b/VERSION index 578469acf8..6ae3d034b5 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=134 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/bugs/abe.ly b/input/bugs/abe.ly index a0622989a1..69a611427a 100644 --- a/input/bugs/abe.ly +++ b/input/bugs/abe.ly @@ -1,4 +1,5 @@ + % Generated by mudela-book.py; options are \include "paper16.ly" \paper { linewidth = 390.000000 \pt; } diff --git a/input/bugs/accidental-collision.ly b/input/bugs/accidental-collision.ly index 63fdaa347e..76318dc101 100644 --- a/input/bugs/accidental-collision.ly +++ b/input/bugs/accidental-collision.ly @@ -1,5 +1,6 @@ + \include "paper16.ly"; \score { \notes { diff --git a/input/bugs/auto-beam-tuplets.ly b/input/bugs/auto-beam-tuplets.ly index 203e14a472..41f707abfe 100644 --- a/input/bugs/auto-beam-tuplets.ly +++ b/input/bugs/auto-beam-tuplets.ly @@ -1,3 +1,4 @@ + \header { texidoc = "tuplet-spanner should not put visible brackets on beams even if they're auto generated."; } diff --git a/input/bugs/auto-beam.ly b/input/bugs/auto-beam.ly index a816ff774a..0d6ee48976 100644 --- a/input/bugs/auto-beam.ly +++ b/input/bugs/auto-beam.ly @@ -1,3 +1,4 @@ + \header { texidoc ="Auto beam can not be put on the final notes of a score "; } diff --git a/input/bugs/barline.ly b/input/bugs/barline.ly index 5ce93268bb..e8e8742637 100644 --- a/input/bugs/barline.ly +++ b/input/bugs/barline.ly @@ -1,3 +1,4 @@ + \header { texidoc= "Staffs that end half way a system should end at the bar line."; } diff --git a/input/bugs/beamed-chord.ly b/input/bugs/beamed-chord.ly index c274b48a40..935174e64f 100644 --- a/input/bugs/beamed-chord.ly +++ b/input/bugs/beamed-chord.ly @@ -1,3 +1,4 @@ + \header{ texidoc="Beam thinks that first two notes should be stem down. Can be fixed by uncommenting \stemUp"; } diff --git a/input/bugs/beaming.ly b/input/bugs/beaming.ly index 4d718747fe..ae0ccd55a0 100644 --- a/input/bugs/beaming.ly +++ b/input/bugs/beaming.ly @@ -1,3 +1,4 @@ + \score { \notes { [\times 2/3 {c16 c c} c8] diff --git a/input/bugs/broken-tuplet.ly b/input/bugs/broken-tuplet.ly index 56dc693f7e..9f4cbaff30 100644 --- a/input/bugs/broken-tuplet.ly +++ b/input/bugs/broken-tuplet.ly @@ -1,3 +1,4 @@ + \header { texidoc ="tuplet bracket doesn't behave properly at line break. Not a real problem."; diff --git a/input/bugs/die-staff.ly b/input/bugs/die-staff.ly index 2bd1925c09..294847a1b2 100644 --- a/input/bugs/die-staff.ly +++ b/input/bugs/die-staff.ly @@ -1,3 +1,4 @@ + \header { texidoc = "a staff should really die, if no one's referencing it." } diff --git a/input/bugs/different-time.ly b/input/bugs/different-time.ly index 8f329c68d8..c7031adcc9 100644 --- a/input/bugs/different-time.ly +++ b/input/bugs/different-time.ly @@ -1,3 +1,4 @@ + \header { texidoc =" Spacing for one staff in polymetric music should be not hampered by a staff in another time signature."; diff --git a/input/bugs/dots.ly b/input/bugs/dots.ly index 9fed6eeec1..f48fe19b75 100644 --- a/input/bugs/dots.ly +++ b/input/bugs/dots.ly @@ -1,3 +1,4 @@ + \header { texidoc = "Dots should remain close to the heads they belong to, but should not overlap."; } diff --git a/input/bugs/dynamic-collide.ly b/input/bugs/dynamic-collide.ly index d72cee53ca..e9aee2cefc 100644 --- a/input/bugs/dynamic-collide.ly +++ b/input/bugs/dynamic-collide.ly @@ -1,3 +1,4 @@ + % dynamics should not collide with staff % dynamics (of two voices) should not collide with eachother % strange stem through beam bug in bar 8 on viola staff diff --git a/input/bugs/dynamic-switch.ly b/input/bugs/dynamic-switch.ly index 543ffa9a40..1365e5ea99 100644 --- a/input/bugs/dynamic-switch.ly +++ b/input/bugs/dynamic-switch.ly @@ -1,3 +1,4 @@ + \score{ \context Staff < \context Voice=one \skip 1; diff --git a/input/bugs/gr-instrument.ly b/input/bugs/gr-instrument.ly index 1530f769a6..f48cf46251 100644 --- a/input/bugs/gr-instrument.ly +++ b/input/bugs/gr-instrument.ly @@ -2,7 +2,7 @@ instrument names on grandstaffs. GR is centered on entire score %} -\version "1.3.129" + \include "paper20.ly" \header{ latexpackages = "amsmath"; diff --git a/input/bugs/grace-dynamic.ly b/input/bugs/grace-dynamic.ly index 3f0767d537..b79d9753fd 100644 --- a/input/bugs/grace-dynamic.ly +++ b/input/bugs/grace-dynamic.ly @@ -1,2 +1,3 @@ + \score { \notes {\grace {c'_\f} d e f g}} diff --git a/input/bugs/grace-finger.ly b/input/bugs/grace-finger.ly index 8b2bb446c4..38095ef78b 100644 --- a/input/bugs/grace-finger.ly +++ b/input/bugs/grace-finger.ly @@ -1,5 +1,6 @@ + \score { \notes \context Voice = VA \relative c'' { \grace {[b8^1 c^2]} d4^3 diff --git a/input/bugs/grace-gets-slur.ly b/input/bugs/grace-gets-slur.ly index 8836127897..65703e7b81 100644 --- a/input/bugs/grace-gets-slur.ly +++ b/input/bugs/grace-gets-slur.ly @@ -1,4 +1,5 @@ + \score { \notes\relative c''{ \grace g8 g'2 ( )g diff --git a/input/bugs/grace-pedal.ly b/input/bugs/grace-pedal.ly index aba9e1d075..0d381d1dda 100644 --- a/input/bugs/grace-pedal.ly +++ b/input/bugs/grace-pedal.ly @@ -1,6 +1,7 @@ + % dumps core: 1.3.93 \score{ \notes{ - \grace { } <)gis'2 e> + \grace { } <)gis'2 e> } } diff --git a/input/bugs/hinterfleisch-gone.ly b/input/bugs/hinterfleisch-gone.ly index bb838c8cdd..19db673359 100644 --- a/input/bugs/hinterfleisch-gone.ly +++ b/input/bugs/hinterfleisch-gone.ly @@ -1,3 +1,4 @@ + % jij had zoon mooi tight spacing example, % kan zo'n harde space ook niet voor en na maatstreep! \score { diff --git a/input/bugs/mb.ly b/input/bugs/mb.ly index 946ff23437..e1fd2d76e4 100644 --- a/input/bugs/mb.ly +++ b/input/bugs/mb.ly @@ -1,3 +1,4 @@ + % mb.ly: midi-bug % midi notes get stuck diff --git a/input/bugs/partial-beam.ly b/input/bugs/partial-beam.ly index e3d0192523..fb881816ad 100644 --- a/input/bugs/partial-beam.ly +++ b/input/bugs/partial-beam.ly @@ -1,3 +1,4 @@ + \include "paper20.ly" Sopnotes = \notes { \time 4/4; @@ -13,7 +14,7 @@ Sopnotes = \notes { < \context Staff="sop" < - \$Sopnotes + \Sopnotes > > \paper { diff --git a/input/bugs/pc-core.ly b/input/bugs/pc-core.ly index 89a24a4e2b..9160fe4bcf 100644 --- a/input/bugs/pc-core.ly +++ b/input/bugs/pc-core.ly @@ -1,3 +1,4 @@ + % on their own staff, voices should be stemboth (not up/down) End = { \skip 1*8; } diff --git a/input/bugs/pc-direction.ly b/input/bugs/pc-direction.ly index c9836b5c2c..b6e9b2ec4a 100644 --- a/input/bugs/pc-direction.ly +++ b/input/bugs/pc-direction.ly @@ -1,3 +1,4 @@ + % move to regtest once it works? \header { diff --git a/input/bugs/prefatory-spacing.ly b/input/bugs/prefatory-spacing.ly index b9526768ad..ba788f5f1d 100644 --- a/input/bugs/prefatory-spacing.ly +++ b/input/bugs/prefatory-spacing.ly @@ -1,3 +1,4 @@ + \header { texidoc= "Spacing after clef/key should be stretched equidistantly for large stretching, but should stay clear of prefatory matter for small stretching. Support in the spacing engine for diff --git a/input/bugs/repeat.ly b/input/bugs/repeat.ly index c9f7e36b6f..dde3c8e74a 100644 --- a/input/bugs/repeat.ly +++ b/input/bugs/repeat.ly @@ -1,2 +1,3 @@ + \score { \context Staff \notes \repeat volta 3 c1 \alternative { d1 e1 }} diff --git a/input/bugs/script.ly b/input/bugs/script.ly index b6b1b67d4e..1f60ff08ff 100644 --- a/input/bugs/script.ly +++ b/input/bugs/script.ly @@ -1,4 +1,5 @@ + % the \stopped collides with the %beam. diff --git a/input/bugs/slur-attachment.ly b/input/bugs/slur-attachment.ly index 7a00de8687..c6fabda6a0 100644 --- a/input/bugs/slur-attachment.ly +++ b/input/bugs/slur-attachment.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Slurs should be attached to note heads, except when they would collide diff --git a/input/bugs/slur-dots.ly b/input/bugs/slur-dots.ly index 3985fe3246..5b52064c6b 100644 --- a/input/bugs/slur-dots.ly +++ b/input/bugs/slur-dots.ly @@ -1,3 +1,4 @@ + % Placement of slur uses x-extent of note-head which includes dots \score { @@ -7,4 +8,4 @@ \paper { linewidth = -1.; } -} \ No newline at end of file +} diff --git a/input/bugs/slur-dx.ly b/input/bugs/slur-dx.ly index b565cc0b96..745e8ab1a1 100644 --- a/input/bugs/slur-dx.ly +++ b/input/bugs/slur-dx.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Right ending of slur is too far right. diff --git a/input/bugs/slur-steep-broken.ly b/input/bugs/slur-steep-broken.ly index f5f495e700..e98f3473e7 100644 --- a/input/bugs/slur-steep-broken.ly +++ b/input/bugs/slur-steep-broken.ly @@ -1,3 +1,4 @@ + \score{ \notes\relative c''{ \time 2/4; diff --git a/input/bugs/spacing-very-tight.ly b/input/bugs/spacing-very-tight.ly index fb03b9155f..b863ef4841 100644 --- a/input/bugs/spacing-very-tight.ly +++ b/input/bugs/spacing-very-tight.ly @@ -1,3 +1,4 @@ + % When tightly spaced, hinterfleisch -> 0. % Stems may touch the bar lines, opposite stems may touch eachother. % We need a mininum of about a note-width/interline space in these diff --git a/input/bugs/staff-size.ly b/input/bugs/staff-size.ly index 12482575ee..699155acd2 100644 --- a/input/bugs/staff-size.ly +++ b/input/bugs/staff-size.ly @@ -17,4 +17,4 @@ > \paper { linewidth = -1.; } } -\version "1.3.117"; + diff --git a/input/bugs/steep-beam.ly b/input/bugs/steep-beam.ly index 6a719c43c1..35b38662de 100644 --- a/input/bugs/steep-beam.ly +++ b/input/bugs/steep-beam.ly @@ -1,3 +1,4 @@ + \header { texidoc ="1st beam should prob. be horizontal."; } diff --git a/input/bugs/steep.ly b/input/bugs/steep.ly index ae7d10cac2..474d80ca94 100644 --- a/input/bugs/steep.ly +++ b/input/bugs/steep.ly @@ -1,5 +1,6 @@ + \score{ \notes\relative c''{ a'( a a [a8...] b,32\break diff --git a/input/bugs/stem-through-beam.ly b/input/bugs/stem-through-beam.ly index 63b665001a..5f24905a74 100644 --- a/input/bugs/stem-through-beam.ly +++ b/input/bugs/stem-through-beam.ly @@ -1,3 +1,4 @@ + % strange bug with stems through beams in second beam End = { \skip 1*8; } diff --git a/input/bugs/text-kerning.ly b/input/bugs/text-kerning.ly index 21bf734277..ad72afbbfe 100644 --- a/input/bugs/text-kerning.ly +++ b/input/bugs/text-kerning.ly @@ -1,4 +1,5 @@ + \header { texidoc= "LilyPond doesn't kern text, but TeX does, leading to skewed results: the VAVAVAVA takes less space than LilyPond thinks it does."; } diff --git a/input/bugs/text-spanner.ly b/input/bugs/text-spanner.ly index 493c93f771..31a114cf2c 100644 --- a/input/bugs/text-spanner.ly +++ b/input/bugs/text-spanner.ly @@ -1,3 +1,4 @@ + % text spanners should not repeat start text when broken \score { @@ -10,4 +11,4 @@ \paper { linewidth = 40*\staffspace; } -} \ No newline at end of file +} diff --git a/input/bugs/textstyle.ly b/input/bugs/textstyle.ly index a015574434..15b5f9a235 100644 --- a/input/bugs/textstyle.ly +++ b/input/bugs/textstyle.ly @@ -1,4 +1,5 @@ + \score { \notes { c4_"foo" } } diff --git a/input/bugs/tie-break-accidental.ly b/input/bugs/tie-break-accidental.ly index 0b2c0e8ede..88a35de6d4 100644 --- a/input/bugs/tie-break-accidental.ly +++ b/input/bugs/tie-break-accidental.ly @@ -1,3 +1,4 @@ + \header { texidoc = "First and second bes (tied across line break) should get an accidental, but others should not"; diff --git a/input/bugs/ties.ly b/input/bugs/ties.ly index d00f255e4a..4555481052 100644 --- a/input/bugs/ties.ly +++ b/input/bugs/ties.ly @@ -1,3 +1,4 @@ + \header { texidoc="Positioning of last ties is incorrect; ties between 2-1 and 1-1 durations differ."; diff --git a/input/bugs/time.ly b/input/bugs/time.ly index 8311227ebe..88e9bf5cf3 100644 --- a/input/bugs/time.ly +++ b/input/bugs/time.ly @@ -1,3 +1,4 @@ + % Uses old style \score { diff --git a/input/bugs/triplets.ly b/input/bugs/triplets.ly index a29c59da62..9cc8704429 100644 --- a/input/bugs/triplets.ly +++ b/input/bugs/triplets.ly @@ -1,3 +1,4 @@ + \header { texidoc="Simple beams. This broke somewhere < 1.3.110 "; @@ -13,7 +14,7 @@ texidoc="Simple beams. This broke somewhere < 1.3.110 linebreak = \penalty -1000; -$ex8 = \notes \relative c' { +exI = \notes \relative c' { \repeat "volta" 2 { \times 2/3 {c8( cis d} \times 2/3 {dis e f} \times 2/3 {fis g gis} \times 2/3 {a bes b} | @@ -29,4 +30,4 @@ $ex8 = \notes \relative c' { c1 || \linebreak } -\score { \context Staff { \notes { \$ex8 } } } +\score { \context Staff { \notes { \exI } } } diff --git a/input/bugs/voice-switch-slur.ly b/input/bugs/voice-switch-slur.ly index c2215de608..306dc2b0df 100644 --- a/input/bugs/voice-switch-slur.ly +++ b/input/bugs/voice-switch-slur.ly @@ -1,4 +1,5 @@ + % docme. \score{ \context Staff < diff --git a/input/denneboom.ly b/input/denneboom.ly index 7c2a080e46..a68d3f565e 100644 --- a/input/denneboom.ly +++ b/input/denneboom.ly @@ -7,7 +7,7 @@ copyright = "public domain"; \include "paper20.ly" -\version "1.3.120"; + oden = \lyrics{ O | diff --git a/input/emacs-lily.fly b/input/emacs-lily.fly index 39a93dd204..fefa8e317e 100644 --- a/input/emacs-lily.fly +++ b/input/emacs-lily.fly @@ -1 +1,2 @@ +\ cpp -P -traditional -o l-fake.ly -DFAKE_GRACE les-nereides.ly diff --git a/input/example-1.ly b/input/example-1.ly index f9ac3b298b..475ab4811d 100644 --- a/input/example-1.ly +++ b/input/example-1.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { c' d e f g a b c diff --git a/input/example-2.ly b/input/example-2.ly index 1c7c56208c..116e0ad818 100644 --- a/input/example-2.ly +++ b/input/example-2.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { a''2 ~ c4( [e8 )e] [a,16 a a a] diff --git a/input/example-3.ly b/input/example-3.ly index 5444bb21b9..547f2fa40a 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,4 +1,3 @@ -\version "1.3.117"; one = \notes\relative c{ c'' d e f diff --git a/input/just-friends.ly b/input/just-friends.ly index 0f4082a2d8..9d704f3a9e 100644 --- a/input/just-friends.ly +++ b/input/just-friends.ly @@ -56,4 +56,4 @@ of a certain tune (Jazz, Real Book, for example), like } } -\version "1.3.117"; + diff --git a/input/les-nereides.ly b/input/les-nereides.ly index 85a28ffe39..1ec8d19574 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -3,7 +3,7 @@ cpp -P -traditional -o l.ly les-nereides.ly cpp -P -traditional -o l-fake.ly -DFAKE_GRACE les-nereides.ly %} -\version "1.3.117"; + \header{ composer = "ARTHUR GRAY"; @@ -218,7 +218,7 @@ bass = \context Voice=bass \notes\relative c{ \property Voice.Stem \override #'direction = #-1 \property Voice.slurEndAttachment = #'stem <)a''4\arpeggio eis cis> - %\stemboth + %\stemBoth \property Voice.slurEndAttachment = ##f % Huh, urg? Implicit \context Staff lifts us up to Staff context??? \translator Staff=bass @@ -358,39 +358,39 @@ middleDynamics = \context Dynamics=middle \notes{ lowerDynamics = \context Dynamics=lower \notes{ s2 %2 - s2\sustaindown s8. s16\sustainup s4 + s2\sustainDown s8. s16\sustainUp s4 %3 - s2\sustaindown s8. s16\sustainup s4 + s2\sustainDown s8. s16\sustainUp s4 %3 #ifndef FAKE_GRACE - s4\sustaindown s16 - s32 s s\sustainup s - s32\sustaindown s s s + s4\sustainDown s16 + s32 s s\sustainUp s + s32\sustainDown s s s s8 #else - s2\sustaindown + s2\sustainDown s32*12 - s32 s s\sustainup s - s32\sustaindown s s s + s32 s s\sustainUp s + s32\sustainDown s s s #endif \property Dynamics.stopSustain = #"" - s4 s16. s32\sustainup + s4 s16. s32\sustainUp %5 - s8\sustaindown s s + s8\sustainDown s s \property Dynamics.stopSustain = #"*" \property Dynamics.stopStartSustain = #"-P" - s s\sustainup\sustaindown s s - s\sustainup + s s\sustainUp\sustainDown s s + s\sustainUp %6 \property Dynamics.stopStartSustain = #"" - s8\sustaindown s s + s8\sustainDown s s \property Dynamics.stopStartSustain = #"-P" - s s\sustainup\sustaindown s s - s\sustainup + s s\sustainUp\sustainDown s s + s\sustainUp } \score{ @@ -420,7 +420,7 @@ lowerDynamics = \context Dynamics=lower \notes{ magnification_italic = 1.; \translator { \ScoreContext - TimeSignature \override #'style = #"C" + TimeSignature \override #'style = #'C SpacingSpanner \override #'maximum-duration-for-spacing = #(make-moment 1 4) \remove Bar_number_engraver; diff --git a/input/minimal.ly b/input/minimal.ly index b654a3a666..1bbd71a52d 100644 --- a/input/minimal.ly +++ b/input/minimal.ly @@ -1,5 +1,6 @@ + \score{ \sequential {\clef bass ; } \paper { \translator { \type Score_engraver ; \name "Score"; } linewidth =1.5\cm; diff --git a/input/opus-130.ly b/input/opus-130.ly index 06ba443e75..eae4c98e89 100644 --- a/input/opus-130.ly +++ b/input/opus-130.ly @@ -8,10 +8,10 @@ enteredby = "JCN"; copyright = "public domain"; } -% \version "1.0.16"; +% \; tempi = \notes { - \property Voice.textStyle = "large" + \property Voice.TextScript \set #'font-style = #'large s8^"Allegro assai" } @@ -21,7 +21,7 @@ dynamics = \notes { } global = \notes { - \key g; + \key g \major; \time 3/8; < \dynamics diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index 3b421a3525..970a1053e5 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -22,7 +22,7 @@ * organ staff... %} -\version "1.3.117"; + @@ -114,22 +114,22 @@ fugaIIRight = \notes \relative c'' { \context Staff \notes\relative c''< \context Voice=one { - \property Voice.horizontalNoteShift=0 - \property Voice.verticalDirection=1 + \property Voice.NoteColumn \override #'horizontal-shift = #0 + \stemUp\slurUp\tieUp e4 } \context Voice=two { - \property Voice.verticalDirection=1 - \property Voice.horizontalNoteShift=1 + \stemUp\slurUp\tieUp + \property Voice.NoteColumn \override #'horizontal-shift = #1 cis } \context Voice=three { - \property Voice.horizontalNoteShift=2 - \property Voice.verticalDirection=1 + \property Voice.NoteColumn \override #'horizontal-shift = #2 + \stemUp\slurUp\tieUp ais } \context Voice=four { - \property Voice.verticalDirection=-1 + \stemDown\slurDown\tieDown \property Voice.horizontalNoteShift=-1 fis } diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly index 765cdff810..65586dc312 100644 --- a/input/regression/accidental-single-double.ly +++ b/input/regression/accidental-single-double.ly @@ -5,7 +5,7 @@ after a double flat sign is automatically prepended with a natural sign. "; } -\version "1.3.117"; + thenotes = \notes \relative cis' { \time 4/4; @@ -22,7 +22,7 @@ gis g ges g | \score { < \context Staff \thenotes \context NoteNames { - \property NoteNames.basicNoteNameProperties \override #'no-spacing-rods = ##f + \property NoteNames.NoteName \override #'no-spacing-rods = ##f \thenotes } > diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly index c7ebadec80..24dda163dd 100644 --- a/input/regression/accidental.ly +++ b/input/regression/accidental.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Accidentals work: the second note does not get a sharp. The third and diff --git a/input/regression/allfontstyle.ly b/input/regression/allfontstyle.ly index d25e2391c6..2f1ff104f0 100644 --- a/input/regression/allfontstyle.ly +++ b/input/regression/allfontstyle.ly @@ -1,14 +1,15 @@ + \score { \notes \relative c'' \context Staff { \emptyText \repeat volta 2 { \time 4/4; c4^"cuivr\\'e"_\fermata } \alternative { - { \property Voice.textStyle = "italic" d-4_"cantabile" } + { \property Voice.TextScript \set #'font-style = #'italic d-4_"cantabile" } { e } } \grace { c16 } - \property Voice.textStyle = "large" + \property Voice.TextScript \set #'font-style = #'large f4-\ff^""^"Largo" \mark "B"; g } \paper { linewidth = -1.0; diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly index d7d9907af4..6425b98217 100644 --- a/input/regression/arpeggio-collision.ly +++ b/input/regression/arpeggio-collision.ly @@ -1,4 +1,5 @@ -\header = { + +xheader = { texidoc = "arpeggio stays clear of accidentals and flipped note heads. Since Arpeggio engraver is Voice, it does nothing for voice collisions." }; diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly index 1699fa7dc7..ed110a28e7 100644 --- a/input/regression/arpeggio.ly +++ b/input/regression/arpeggio.ly @@ -4,7 +4,7 @@ Arpeggios are supported, both cross-staff and broken single staff. "; } -\version "1.3.117"; + \score{ \context PianoStaff < diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly index 645c62de7c..6cfae818e6 100644 --- a/input/regression/auto-beam-bar.ly +++ b/input/regression/auto-beam-bar.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" The first two a8 notes should not be beamed. @@ -17,4 +18,4 @@ a16 g a bes c d % ees8 d c \paper{ linewidth=-1.; } -} \ No newline at end of file +} diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly index ee0b5d18ba..733864f02d 100644 --- a/input/regression/auto-change.ly +++ b/input/regression/auto-change.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Auto change piano staff switches voices between up and down staffs diff --git a/input/regression/auto-isknee.ly b/input/regression/auto-isknee.ly index fa3256b668..6e135acc49 100644 --- a/input/regression/auto-isknee.ly +++ b/input/regression/auto-isknee.ly @@ -1,3 +1,4 @@ + \header{ texidoc="Two automatic knees"; } diff --git a/input/regression/auto-knee.ly b/input/regression/auto-knee.ly index b49954b60c..6c5c0f84c1 100644 --- a/input/regression/auto-knee.ly +++ b/input/regression/auto-knee.ly @@ -1,3 +1,4 @@ + \header{ texidoc="One automatic knee"; } diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly index e0617c0acc..9a3fd2a534 100644 --- a/input/regression/bar-number.ly +++ b/input/regression/bar-number.ly @@ -1,3 +1,4 @@ + \header { texidoc="Bar number settable and padding adjustable."; } diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly index 7808e156f1..91a9b3d4d1 100644 --- a/input/regression/bar-scripts.ly +++ b/input/regression/bar-scripts.ly @@ -6,7 +6,7 @@ knowing it. Consequently, they fall over often. "; } -\version "1.3.117"; + onestaff = \context Staff = foo\notes { \property Staff.instr = instr diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly index 72b3c288fa..2d3449b0d9 100644 --- a/input/regression/beam-cross-staff.ly +++ b/input/regression/beam-cross-staff.ly @@ -29,4 +29,4 @@ behave well, wherever the switching point is. > } -\version "1.3.117"; + diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index 3c3bb28577..4a077562d3 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -6,7 +6,7 @@ under normal circumstances, these beams would get knees; here Beam.auto-knee-gap was set to false. "; } -\version "1.3.117"; + \score{ \notes\relative c''{ [g8 c c,] diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly index 3c2a8f16be..5a6163ac04 100644 --- a/input/regression/beam-length.ly +++ b/input/regression/beam-length.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" beams should look the same diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly index 88f5749d5b..6b5624029e 100644 --- a/input/regression/beam-position.ly +++ b/input/regression/beam-position.ly @@ -6,7 +6,7 @@ second staff line. This does not hold for grace note beams. Override with @code{noStemExtend}. "; } -\version "1.3.117"; + \score { \context Voice \notes\relative c { diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly index b1673319bf..6882707a4b 100644 --- a/input/regression/beaming.ly +++ b/input/regression/beaming.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Beaming is generated automatically. Beams may cross bar lines. In that diff --git a/input/regression/between-systems.ly b/input/regression/between-systems.ly index e5d3577845..65ae97a1d5 100644 --- a/input/regression/between-systems.ly +++ b/input/regression/between-systems.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" The same mechanism can be used to force pagebreaks. diff --git a/input/regression/break.ly b/input/regression/break.ly index 49f7ddde61..1a0e1b6383 100644 --- a/input/regression/break.ly +++ b/input/regression/break.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Breaks can be encouraged and discouraged using @code{\break} and diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly index 70e375fe7a..9c77128101 100644 --- a/input/regression/breathing-sign.ly +++ b/input/regression/breathing-sign.ly @@ -9,7 +9,7 @@ two measures all have the same distance from each other: } -\version "1.3.117"; + \score { \notes \relative c' { diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly index 60258e2407..274736c2d7 100644 --- a/input/regression/chord-changes.ly +++ b/input/regression/chord-changes.ly @@ -1,3 +1,4 @@ + \header{ texidoc="property chordChanges: only display chord names when there's a change in the chords scheme, but always display the diff --git a/input/regression/chord-names.ly b/input/regression/chord-names.ly index 2d233f5e19..b775cacea9 100644 --- a/input/regression/chord-names.ly +++ b/input/regression/chord-names.ly @@ -5,7 +5,7 @@ from guile. For some unlogical names, guile customisation is used by default. "; } -\version "1.3.117" + chord = \notes\transpose c''\chords{ c1 c:m @@ -30,7 +30,7 @@ chord = \notes\transpose c''\chords{ \translator { \ChordNamesContext - ChordName \override #'word-space = #1 + ChordNames \override #'word-space = #1 } } } diff --git a/input/regression/chord-tremolo.ly b/input/regression/chord-tremolo.ly index 4da0b5ab7e..6267949f9f 100644 --- a/input/regression/chord-tremolo.ly +++ b/input/regression/chord-tremolo.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Chord tremolos look like beams, but are a kind of repeat symbol. diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly index 5b01e40d69..23d494e50a 100644 --- a/input/regression/clefs.ly +++ b/input/regression/clefs.ly @@ -9,7 +9,7 @@ way, so this is fragile as well. "; } -\version "1.3.117"; + \score { \notes{ diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly index 1933d10097..57193d7a64 100644 --- a/input/regression/collisions.ly +++ b/input/regression/collisions.ly @@ -9,7 +9,7 @@ enteredby = "HWN,JCN"; copyright = "public domain"; Tested = "test the Collision resolution "; } -\version "1.3.117"; + twovoice = \context Staff \notes < \context Voice=i { \stemDown c4 d e f g2~ g4 a [c8 d e f] c2| } diff --git a/input/regression/dots.ly b/input/regression/dots.ly index fbb8855d0d..c26e91b26d 100644 --- a/input/regression/dots.ly +++ b/input/regression/dots.ly @@ -9,7 +9,7 @@ a column. The dots go along as rests are shifted to avoid collisions. } -\version "1.3.117"; + \score { \context Voice \notes\relative c'' { \time 6/8; diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly index 70bdeb37b3..95f6b6068c 100644 --- a/input/regression/dynamics-line.ly +++ b/input/regression/dynamics-line.ly @@ -4,7 +4,7 @@ dynamics are linked with (de)crescendi, they should be on the same line. Isolated dynamics may be forced up or down. "; } -\version "1.3.122"; + \score{ \notes\relative c''{ diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly index a169cbe494..d91693adde 100644 --- a/input/regression/easy-notation.ly +++ b/input/regression/easy-notation.ly @@ -1,7 +1,11 @@ + \header { texidoc = " Ez-notation prints names in note heads."; } +\include "paper26.ly"; +\paper { \paperTwentysix } + \score { \notes { c'2 e'4 f' | g'1 } \paper { \translator { \EasyNotation } } diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly index f3a5586586..6ef8eaf794 100644 --- a/input/regression/generic-output-property.ly +++ b/input/regression/generic-output-property.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" As a last resort, the placement of grobs can be adjusted manually, by diff --git a/input/regression/generic-property-override.ly b/input/regression/generic-property-override.ly index c3cb0d25b1..990c40be4c 100644 --- a/input/regression/generic-property-override.ly +++ b/input/regression/generic-property-override.ly @@ -4,7 +4,7 @@ More specific settings take precendence over less specific settings. The second slur has slurDirection set to down, overriding the stemup setting. "; } -\version "1.3.117"; + \score { \notes \relative c'' \context Voice { diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly index 115c5c2883..2d981f7d5d 100644 --- a/input/regression/glissando.ly +++ b/input/regression/glissando.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Simple glissando lines between notes are supported. diff --git a/input/regression/grace.ly b/input/regression/grace.ly index dbc42a872c..14d8aef43a 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Grace notes are typeset as an encapsulated piece of music. You can diff --git a/input/regression/hara-kiri-short.ly b/input/regression/hara-kiri-short.ly index 1cb4fdbedd..a759a591d7 100644 --- a/input/regression/hara-kiri-short.ly +++ b/input/regression/hara-kiri-short.ly @@ -6,7 +6,7 @@ therefore removed. Also, any staff brackets and braces are removed. "; } -\version "1.3.117"; + zager = \context Staff = zager \notes \relative c'' { \clef treble; c1 diff --git a/input/regression/keys.ly b/input/regression/keys.ly index 3013dd1ca4..999df4c4a5 100644 --- a/input/regression/keys.ly +++ b/input/regression/keys.ly @@ -7,7 +7,7 @@ also created on a clef change. "; } -\version "1.3.117"; + \score { \notes \relative c'' diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly index 1d67184f26..871557e2e5 100644 --- a/input/regression/lyric-combine.ly +++ b/input/regression/lyric-combine.ly @@ -20,7 +20,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.117"; + m = \notes \relative c'' { \property Staff.automaticMelismata = ##t diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly index 58b6abea2d..c4b98d58bc 100644 --- a/input/regression/lyrics-bar.ly +++ b/input/regression/lyrics-bar.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Adding a @code{Bar_engraver} to the LyricsVoice context makes sure that diff --git a/input/regression/lyrics-multi-stanza.ly b/input/regression/lyrics-multi-stanza.ly index 9d879a06ea..9aa98b4565 100644 --- a/input/regression/lyrics-multi-stanza.ly +++ b/input/regression/lyrics-multi-stanza.ly @@ -1,4 +1,5 @@ + \score { \addlyrics diff --git a/input/regression/mm-rests2.ly b/input/regression/mm-rests2.ly index c801ec4c67..97040a44ba 100644 --- a/input/regression/mm-rests2.ly +++ b/input/regression/mm-rests2.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" If @code{Score.skipBars} is set, diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly index 49a9ce9f4f..8f8936ede1 100644 --- a/input/regression/molecule-hacking.ly +++ b/input/regression/molecule-hacking.ly @@ -1,4 +1,5 @@ + \header { texidoc=" You can write molecule callbacks in Scheme, thus providing custom glyphs for notation elements. A simple example is adding parentheses to existing molecule callbacks. diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly index 01732e4e88..c99aa0a88e 100644 --- a/input/regression/multi-measure-rest.ly +++ b/input/regression/multi-measure-rest.ly @@ -6,7 +6,7 @@ multi-measure-rest is a Spanner, minimum distances are set to keep it colliding from barlines. "; } -\version "1.3.117"; + \score { \notes { \time 3/4; \key cis \major; R2.*15 R2. R2.*7 } diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly index 1d445c81fb..03bdf52fe9 100644 --- a/input/regression/non-empty-text.ly +++ b/input/regression/non-empty-text.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Text is set with empty horizontal dimensions. The boolean property diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly index dc08702697..8345ef200a 100644 --- a/input/regression/note-line.ly +++ b/input/regression/note-line.ly @@ -1,3 +1,4 @@ + \header { texidoc = "Note head lines (eg glissando) run between centers of the note heads."; diff --git a/input/regression/noteheadstyle.ly b/input/regression/noteheadstyle.ly index c59f40c073..1254c6b505 100644 --- a/input/regression/noteheadstyle.ly +++ b/input/regression/noteheadstyle.ly @@ -10,7 +10,7 @@ either up or down stems. "; } -\version "1.3.117"; + \score { \notes \relative c{ diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly index 5494d66c52..b7ee88fdc0 100644 --- a/input/regression/number-staff-lines.ly +++ b/input/regression/number-staff-lines.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" The number of stafflines of a staff can be set. Ledger diff --git a/input/regression/phrasing-slur.ly b/input/regression/phrasing-slur.ly index 2436f62409..c49a98a983 100644 --- a/input/regression/phrasing-slur.ly +++ b/input/regression/phrasing-slur.ly @@ -1,3 +1,4 @@ + \header { texidoc="Slurs play well with phrasing slur."; } @@ -9,4 +10,4 @@ texidoc="Slurs play well with phrasing slur."; \paper { linewidth = -1.; } -} \ No newline at end of file +} diff --git a/input/regression/repeat-fold.ly b/input/regression/repeat-fold.ly index 28313665a5..189f5ae568 100644 --- a/input/regression/repeat-fold.ly +++ b/input/regression/repeat-fold.ly @@ -1,14 +1,17 @@ + \header{ texidoc=" Folded. This doesn't make sense without alternatives, but it works. "; } -\score { \notes\context Staff\relative c'' { -\repeat fold 3 { c^"3$\\times$ 0alt" d } -% less alts than body -\repeat fold 4 { c^"4$\\times$ 2alt" d } \alternative { e f } -% more alts than body -\repeat fold 2 { c^"2$\\times$ 3alt" d } \alternative { e f g } -}} +\score { + \context Staff \notes \relative c'' { + \repeat fold 3 { c^"3$\\times$ 0alt" d } + % less alts than body + \repeat fold 4 { c^"4$\\times$ 2alt" d } \alternative { e f } + % more alts than body + \repeat fold 2 { c^"2$\\times$ 3alt" d } \alternative { e f g } + } +} diff --git a/input/regression/repeat-line-break.ly b/input/regression/repeat-line-break.ly index ae6a06de0d..7405d4797a 100644 --- a/input/regression/repeat-line-break.ly +++ b/input/regression/repeat-line-break.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Across linebreaks, the left edge of a first and second alternative diff --git a/input/regression/repeat-unfold.ly b/input/regression/repeat-unfold.ly index cb965c1610..8f09b3812f 100644 --- a/input/regression/repeat-unfold.ly +++ b/input/regression/repeat-unfold.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" LilyPond has three modes for repeats: folded, unfolded and diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly index ed612cef84..0f5304ed87 100644 --- a/input/regression/repeat-volta-skip-alternatives.ly +++ b/input/regression/repeat-volta-skip-alternatives.ly @@ -1,3 +1,4 @@ + \score { \notes \context Voice { \repeat volta 3 c1 \alternative { d f } e4 } } diff --git a/input/regression/repeat-volta.ly b/input/regression/repeat-volta.ly index 634ba4dadd..ec12a9e3c0 100644 --- a/input/regression/repeat-volta.ly +++ b/input/regression/repeat-volta.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Volta (Semi folded) behavior. Voltas can start on non-barline moments. @@ -6,20 +7,16 @@ If they don't barlines should still be shown. } % no alts. -\score { \notes - \relative c'' { -% repeat non aligning with barlines. -e -\repeat volta 3 { c^"3$\\times$ 0alt" d e } -% less alts than body -\repeat volta 4 { c^"4$\\times$ 2alt" d } \alternative { e f } - -% more alts than body -\repeat volta 2 { c^"2$\\times$ 3alt" d } \alternative { e f g } -} - - \midi{} - \paper{} - +\score { + \notes \relative c'' { + % repeat non aligning with barlines. + \repeat volta 3 { c^"3$\\times$ 0alt" d e } + % less alts than body + \repeat volta 4 { c^"4$\\times$ 2alt" d } \alternative { e f } + % more alts than body + \repeat volta 2 { c^"2$\\times$ 3alt" d } \alternative { e f g } + } + \paper {} + \midi {} } diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly index 276afa516a..f7a4852524 100644 --- a/input/regression/rest-collision.ly +++ b/input/regression/rest-collision.ly @@ -58,4 +58,4 @@ restsII = \context Staff \notes { } } -\version "1.3.117"; + diff --git a/input/regression/rest.ly b/input/regression/rest.ly index 0e7eea1703..cc9e91ffdf 100644 --- a/input/regression/rest.ly +++ b/input/regression/rest.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Rests. Note that the dot of 8th, 16th and 32nd rests rest should be diff --git a/input/regression/size11.ly b/input/regression/size11.ly index 6bc299ba38..a7ebba1a1c 100644 --- a/input/regression/size11.ly +++ b/input/regression/size11.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Fonts are available in a default set of sizes: 11, 13, 16, 20, 23 and diff --git a/input/regression/size13.ly b/input/regression/size13.ly index ac58c4dd65..e95aba97a3 100644 --- a/input/regression/size13.ly +++ b/input/regression/size13.ly @@ -1,2 +1,3 @@ + \include "paper13.ly" \include "allfontstyle.ly"; diff --git a/input/regression/size16.ly b/input/regression/size16.ly index 69352ff59d..14a3abe275 100644 --- a/input/regression/size16.ly +++ b/input/regression/size16.ly @@ -1,2 +1,3 @@ + \include "paper16.ly" \include "allfontstyle.ly"; diff --git a/input/regression/size20.ly b/input/regression/size20.ly index d76a6cdb03..2bdbb4816b 100644 --- a/input/regression/size20.ly +++ b/input/regression/size20.ly @@ -1,2 +1,3 @@ + \include "paper20.ly" \include "allfontstyle.ly"; diff --git a/input/regression/size23.ly b/input/regression/size23.ly index c5accc9f90..16085a5aac 100644 --- a/input/regression/size23.ly +++ b/input/regression/size23.ly @@ -1,2 +1,3 @@ + \include "paper23.ly" \include "allfontstyle.ly"; diff --git a/input/regression/size26.ly b/input/regression/size26.ly index 919c6e07cd..7d6e90177d 100644 --- a/input/regression/size26.ly +++ b/input/regression/size26.ly @@ -1,2 +1,3 @@ + \include "paper26.ly" \include "allfontstyle.ly"; diff --git a/input/regression/slur-attachment.ly b/input/regression/slur-attachment.ly index 7a00de8687..c6fabda6a0 100644 --- a/input/regression/slur-attachment.ly +++ b/input/regression/slur-attachment.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Slurs should be attached to note heads, except when they would collide diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly index 868d156491..a727b9212a 100644 --- a/input/regression/slur-broken-trend.ly +++ b/input/regression/slur-broken-trend.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Across line breaks, slurs behave nicely. On the left, they extend to diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly index e2ada8c8e7..4a108abf3e 100644 --- a/input/regression/slur-cross-staff.ly +++ b/input/regression/slur-cross-staff.ly @@ -45,4 +45,4 @@ linebreak. > } -\version "1.3.117"; + diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly index fce8f94686..69485a3005 100644 --- a/input/regression/slur-nice.ly +++ b/input/regression/slur-nice.ly @@ -5,7 +5,7 @@ only to avoid noteheads, and as little as possible. Slurs never run through noteheads or stems. "; } -\version "1.3.117"; + \score{ \notes\relative c''{ \time 3/4; diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly index 6e2ea7c67b..ef9115f116 100644 --- a/input/regression/slur-symmetry-1.ly +++ b/input/regression/slur-symmetry-1.ly @@ -1,3 +1,4 @@ + \score{ \notes\relative c''< \time 4/4; diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly index 41ebe836b3..c09ba9c61d 100644 --- a/input/regression/slur-symmetry.ly +++ b/input/regression/slur-symmetry.ly @@ -1,3 +1,4 @@ + \score{ \notes\relative c'< \time 6/8; diff --git a/input/regression/spacing-loose.ly b/input/regression/spacing-loose.ly index eaac633a28..4507c14979 100644 --- a/input/regression/spacing-loose.ly +++ b/input/regression/spacing-loose.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Loose: diff --git a/input/regression/spacing-natural.ly b/input/regression/spacing-natural.ly index 74e9f6f0f7..eae9e31269 100644 --- a/input/regression/spacing-natural.ly +++ b/input/regression/spacing-natural.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Natural: diff --git a/input/regression/spacing-tight.ly b/input/regression/spacing-tight.ly index 75c7d16f97..d4845a2792 100644 --- a/input/regression/spacing-tight.ly +++ b/input/regression/spacing-tight.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" If there are accidentals in the music, we add space, but the space diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly index aa3ac8a27f..ec84117adc 100644 --- a/input/regression/staccato-pos.ly +++ b/input/regression/staccato-pos.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" The staccato dot (and all scripts with follow-into-staff set), must diff --git a/input/regression/staff-margin.ly b/input/regression/staff-margin.ly index bb2b30f36b..11f9f0fec8 100644 --- a/input/regression/staff-margin.ly +++ b/input/regression/staff-margin.ly @@ -7,7 +7,7 @@ be on normal staffs, but also on compound staffs, like the PianoStaff } -\version "1.3.117"; + \score { diff --git a/input/regression/stem-direction-down.ly b/input/regression/stem-direction-down.ly index 1733d3995f..b9bed6ec7c 100644 --- a/input/regression/stem-direction-down.ly +++ b/input/regression/stem-direction-down.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" @c FIXME diff --git a/input/regression/stem-direction.ly b/input/regression/stem-direction.ly index 78f20f5182..d8b3fa8cfa 100644 --- a/input/regression/stem-direction.ly +++ b/input/regression/stem-direction.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Beams, stems and noteheads often have communication troubles, since diff --git a/input/regression/stem-spacing.ly b/input/regression/stem-spacing.ly index 765416f54c..cc51d18a16 100644 --- a/input/regression/stem-spacing.ly +++ b/input/regression/stem-spacing.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" In a limited number of cases, LilyPond corrects for optical spacing diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly index 3493dabef1..7afaf52fb4 100644 --- a/input/regression/stem-tremolo.ly +++ b/input/regression/stem-tremolo.ly @@ -7,7 +7,7 @@ tremolo must be centered on the note. "; } -\version "1.3.117"; + \score{ \context Voice\notes \relative c''{ \property Voice.Text \set #'direction = #1 diff --git a/input/regression/tie-accidental.ly b/input/regression/tie-accidental.ly index d332e20b10..5068a65244 100644 --- a/input/regression/tie-accidental.ly +++ b/input/regression/tie-accidental.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" When tieing notes with accidentals across a bar boundary, the diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly index 2068c371ae..650ddddf42 100644 --- a/input/regression/tie-chord.ly +++ b/input/regression/tie-chord.ly @@ -5,7 +5,7 @@ point away from the center of the staff. Override with @code{tieVerticalDirection}. "; } -\version "1.3.117"; + t = \notes \relative c' { ~ } diff --git a/input/regression/tie.ly b/input/regression/tie.ly index 6cc474c3b6..6bd1c09872 100644 --- a/input/regression/tie.ly +++ b/input/regression/tie.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Ties are strictly horizontal. They are placed in between note heads. diff --git a/input/regression/triplets.ly b/input/regression/triplets.ly index 04f9ecbbac..322311405d 100644 --- a/input/regression/triplets.ly +++ b/input/regression/triplets.ly @@ -1,3 +1,4 @@ + \header { texidoc="Simple beams. This broke somewhere < 1.3.110 "; diff --git a/input/regression/tup.ly b/input/regression/tup.ly index 649feb5d22..955c18b3f2 100644 --- a/input/regression/tup.ly +++ b/input/regression/tup.ly @@ -16,4 +16,4 @@ centered in the gap in the bracket. } } -\version "1.3.117"; + diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly index 28400c43e0..1eeef6e003 100644 --- a/input/regression/volta-broken-left-edge.ly +++ b/input/regression/volta-broken-left-edge.ly @@ -1,3 +1,4 @@ + \header { texidoc ="Broken volta spanners behave correctly at left edge in all cases." }; @@ -36,7 +37,7 @@ Bar 23 Perfect %} -voice1 = \notes { +voiceB = \notes { \clef bass; \property Staff.instrument = "Bass" \property Staff.instr = "B" @@ -62,7 +63,7 @@ voice1 = \notes { } } } -voice2 = \notes { +voiceC = \notes { \repeat volta 2 { bes8 bes8 c'8 c'8 a4 r8 g16 f16 | @@ -77,7 +78,7 @@ voice2 = \notes { } } } -voice3 = \notes { +voiceD = \notes { \repeat volta 2 { bes8 bes8 c'8 c'8 a4 r8 g16 f16 | @@ -94,7 +95,7 @@ voice3 = \notes { } } } -voice4 = \notes { +voiceE = \notes { \repeat volta 2 { bes8 bes8 c'8 c'8 a4 r8 g16 f16 | @@ -118,11 +119,11 @@ voice4 = \notes { \context Staff="4" { - \$voice1 - \$voice2 + \voiceB + \voiceC \break - \$voice3 - \$voice4 + \voiceD + \voiceE } > diff --git a/input/rhythm.ly b/input/rhythm.ly index 2593429df9..f8654604b3 100644 --- a/input/rhythm.ly +++ b/input/rhythm.ly @@ -7,7 +7,7 @@ TestedFeatures = "multiple meters, beaming, unsynced bars, userdefd engravers" -\version "1.3.117"; + ritme = \notes\transpose c'' { \time 4/4; diff --git a/input/scarlatti-paper.ly b/input/scarlatti-paper.ly index e723151862..8627c7b475 100644 --- a/input/scarlatti-paper.ly +++ b/input/scarlatti-paper.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + \paper{ %my standard paper block @@ -21,7 +21,7 @@ minVerticalAlign=8.4; } \translator{\StaffContext - TimeSignature \override #'style = #"C" + TimeSignature \override #'style = #'C } \translator{\VoiceContext noStemExtend = ##t diff --git a/input/scarlatti-properties.ly b/input/scarlatti-properties.ly index 0654de3170..aa7d6611e0 100644 --- a/input/scarlatti-properties.ly +++ b/input/scarlatti-properties.ly @@ -1,7 +1,7 @@ -\version "1.3.117"; + rh=\property Thread.NoteHead \override #'style = #'default lh=\property Thread.NoteHead \override #'style = #'diamond @@ -9,8 +9,8 @@ lh=\property Thread.NoteHead \override #'style = #'diamond n = \property Thread.NoteHead \revert #'font-relative-size % = #'diamond %\property Thread.fontSize=#0 sm=\property Thread.NoteHead \override #'font-relative-size = #-1 -% su=\property Voice.verticalDirection=#1 -% sd=\property Voice.verticalDirection=#-1 +% su=\stemUp\slurUp\tieUp +% sd=\stemDown\slurDown\tieDown su=\property Voice.Stem \override #'direction = #1 sd=\property Voice.Stem \override #'direction = #-1 diff --git a/input/scarlatti-test.ly b/input/scarlatti-test.ly index 47b82b2e36..988f0f92ad 100644 --- a/input/scarlatti-test.ly +++ b/input/scarlatti-test.ly @@ -1,6 +1,6 @@ %K000.ly LilyPond 1.2.16 -\version "1.3.117" + \include "scarlatti-properties.ly" \include "scarlatti-paper.ly" @@ -19,7 +19,7 @@ %{ %standard properties list rh={\property Thread.noteHeadStyle=""} -lh={\property Thread.noteHeadStyle="diamond"} +lh={\property Thread.noteHeadStyle = #'diamond} n={\property Thread.fontSize="0"} sm={\property Thread.fontSize="-1"} su={\property Voice.verticalDirection="1"} diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly index 150ed56921..c72646beff 100644 --- a/input/star-spangled-banner.ly +++ b/input/star-spangled-banner.ly @@ -4,7 +4,7 @@ http://www.Arkkra.com/doc/star.html http://www.Arkkra.com/doc/star.ps %} -\version "1.3.120"; + \header{ title="The Star Spangled Banner"; diff --git a/input/test/absolute-volume.ly b/input/test/absolute-volume.ly index b372e4772d..e56c69269e 100644 --- a/input/test/absolute-volume.ly +++ b/input/test/absolute-volume.ly @@ -1,3 +1,4 @@ + \score{ \notes\relative c''{ %segfault in engraver diff --git a/input/test/ac-extra-voice.ly b/input/test/ac-extra-voice.ly index 03afe8b2ad..316dee02c6 100644 --- a/input/test/ac-extra-voice.ly +++ b/input/test/ac-extra-voice.ly @@ -1,5 +1,5 @@ -\version "1.3.117"; + global = \notes { \key a \minor; @@ -31,8 +31,8 @@ accompany = \notes \relative c{ \context Staff=up < \global \context Voice=foo { - \property Voice.verticalDirection = #1 - \property Voice.scriptVerticalDirection = #1 + \stemUp\slurUp\tieUp + \scriptUp \melody } > diff --git a/input/test/accid.ly b/input/test/accid.ly index ec686fadc0..884fafd865 100644 --- a/input/test/accid.ly +++ b/input/test/accid.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { \time 3/4; diff --git a/input/test/accidental-spacing.ly b/input/test/accidental-spacing.ly index 22217e1208..3884b75747 100644 --- a/input/test/accidental-spacing.ly +++ b/input/test/accidental-spacing.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { c''4 c4 cis4 cis [c8 c \clef "bass"; f,, f] diff --git a/input/test/american-chords.ly b/input/test/american-chords.ly index 97a6bb6ca4..0b356c2980 100644 --- a/input/test/american-chords.ly +++ b/input/test/american-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.117" + %{ See scm/chord-names.scm: chord::names-alist-american James Hammons @@ -48,8 +48,8 @@ scheme = \chords { \paper { \translator { \ChordNamesContext - ChordName \override #'word-space = #1 - ChordName \override #'style = #'american + ChordNames \override #'word-space = #1 + ChordNames \override #'style = #'american } } } diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index 37e39a8e37..fa45aac506 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -3,7 +3,7 @@ date = "2000"; } -\version "1.3.120"; + \include "paper26.ly" diff --git a/input/test/as.ly b/input/test/as.ly index 06cc24dea3..3d45eb331d 100644 --- a/input/test/as.ly +++ b/input/test/as.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { \time 4/4; diff --git a/input/test/as1.ly b/input/test/as1.ly index 2003013d42..f26aebabb1 100644 --- a/input/test/as1.ly +++ b/input/test/as1.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { \time 4/4; diff --git a/input/test/as2.ly b/input/test/as2.ly index 02d781dd92..1dc7fef399 100644 --- a/input/test/as2.ly +++ b/input/test/as2.ly @@ -1,4 +1,5 @@ + \include "paper-as9.ly" \score { diff --git a/input/test/asciscript5.ly b/input/test/asciscript5.ly index cdc0727eb1..0d937897a3 100644 --- a/input/test/asciscript5.ly +++ b/input/test/asciscript5.ly @@ -1,3 +1,4 @@ + \include "paper-as5.ly" \score { @@ -8,7 +9,7 @@ g4 a b c } \paper { - \paper_as_five + \paperAs_five \translator { \StaffContext barSize = #5 } } diff --git a/input/test/auto-beam-4-8.ly b/input/test/auto-beam-4-8.ly index 14c8b3a412..d315c3957f 100644 --- a/input/test/auto-beam-4-8.ly +++ b/input/test/auto-beam-4-8.ly @@ -1,5 +1,5 @@ -\version "1.3.117"; + \score{ \notes\relative c''{ @@ -20,7 +20,7 @@ | | | |--| x| x| x| x| x| %} - %\property Voice.beamAutoEnd = #(make-moment 2 4) + %\property Voice.autoBeamSettings \override #'(end * * * *) = #(make-moment 2 4) \property Voice.autoBeamSettings \override #'(end * * * *) = #(make-moment 2 4) c8 c c c16 c diff --git a/input/test/auto-beam-override.ly b/input/test/auto-beam-override.ly index 257646facc..e03f7867ef 100644 --- a/input/test/auto-beam-override.ly +++ b/input/test/auto-beam-override.ly @@ -1,5 +1,5 @@ -\version "1.3.117"; + %{ Currently (1.1.27.jcn3), the auto-beam engraver will only engrave diff --git a/input/test/auto-beam-triplet.ly b/input/test/auto-beam-triplet.ly index 4f3e4b7f62..a8798b0bf3 100644 --- a/input/test/auto-beam-triplet.ly +++ b/input/test/auto-beam-triplet.ly @@ -1,3 +1,4 @@ + \score{ \notes\relative c''{ c8 c c c diff --git a/input/test/auto-beam.ly b/input/test/auto-beam.ly index 6839be6600..d24a1ff20d 100644 --- a/input/test/auto-beam.ly +++ b/input/test/auto-beam.ly @@ -1,3 +1,4 @@ + %{ The auto-beam engraver has presets for common time signatures. %} diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly index d4ece6d717..df732da9bf 100644 --- a/input/test/bagpipe.ly +++ b/input/test/bagpipe.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + % bagpipe music. \header @@ -71,12 +71,12 @@ gcdg = \notes{ \grace { [g'32 c d]}} % \score { \notes { \time 6/8; \partial 4; - \property Voice.tieVerticalDirection = \up + \tieUp \slurUp f4 | \gg f4 e8 \thrd d4. | \eg a4.()a4 d8 | -\gg d4 f8 \dble e4. ( | \nobreak +\gg d4 f8 \dble e4. ( | \noBreak )e8 d4 \gg d4 e8 | \break diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly index 9e34d2327f..1dcbe9077d 100644 --- a/input/test/banter-chords.ly +++ b/input/test/banter-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + \header{ enteredby = "jcn"; diff --git a/input/test/bar-break.ly b/input/test/bar-break.ly index 8b13789179..139597f9cb 100644 --- a/input/test/bar-break.ly +++ b/input/test/bar-break.ly @@ -1 +1,2 @@ + diff --git a/input/test/bar-lines.ly b/input/test/bar-lines.ly index d9e99a30bc..3c1894780c 100644 --- a/input/test/bar-lines.ly +++ b/input/test/bar-lines.ly @@ -1,4 +1,5 @@ + \score { \notes \relative c'' { diff --git a/input/test/bar-script-visibility.ly b/input/test/bar-script-visibility.ly index 48b2479172..26f96aabec 100644 --- a/input/test/bar-script-visibility.ly +++ b/input/test/bar-script-visibility.ly @@ -1,4 +1,5 @@ + \score { \notes { c1 c1 \break c1 c1 } \paper { diff --git a/input/test/beam-abbrev.ly b/input/test/beam-abbrev.ly index 8631863bda..bf1d184a4b 100644 --- a/input/test/beam-abbrev.ly +++ b/input/test/beam-abbrev.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + \score { \context Voice \notes\relative c { c'1:16 diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly index c004035c46..ae67cfee1e 100644 --- a/input/test/beam-chord.ly +++ b/input/test/beam-chord.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + \score{ \notes\transpose c'{ diff --git a/input/test/beam-control.ly b/input/test/beam-control.ly index f15ddae723..1853cabe8b 100644 --- a/input/test/beam-control.ly +++ b/input/test/beam-control.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { % beam-control.fly diff --git a/input/test/beam-damp.ly b/input/test/beam-damp.ly index 6ca851e206..1cd572507f 100644 --- a/input/test/beam-damp.ly +++ b/input/test/beam-damp.ly @@ -17,4 +17,4 @@ linewidth=-1.; } } -\version "1.3.117"; + diff --git a/input/test/beam-dir.ly b/input/test/beam-dir.ly index 6b95542399..1dd3dc9fb8 100644 --- a/input/test/beam-dir.ly +++ b/input/test/beam-dir.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { [b''16 a] diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index 64da0a5419..a3a7e4dc1d 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -16,4 +16,4 @@ } } -\version "1.3.117"; + diff --git a/input/test/beam-pos.ly b/input/test/beam-pos.ly index 0e21966204..3bb6876830 100644 --- a/input/test/beam-pos.ly +++ b/input/test/beam-pos.ly @@ -1,3 +1,4 @@ + \header{ filename = "beam-pos.ly"; composer = "jcn"; diff --git a/input/test/beam-quanting.ly b/input/test/beam-quanting.ly index f0f9cc1ef0..e608a71add 100644 --- a/input/test/beam-quanting.ly +++ b/input/test/beam-quanting.ly @@ -1,3 +1,4 @@ + %{ Have some fun beam quanting %} diff --git a/input/test/beam-slope.ly b/input/test/beam-slope.ly index 47eb49c3b5..95860f1477 100644 --- a/input/test/beam-slope.ly +++ b/input/test/beam-slope.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { [c''16 b] [a b] diff --git a/input/test/beam-suspect.ly b/input/test/beam-suspect.ly index cd78c2344c..e29d27780d 100644 --- a/input/test/beam-suspect.ly +++ b/input/test/beam-suspect.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + \score{ \notes\relative c'{ \stemUp diff --git a/input/test/beam-trend.ly b/input/test/beam-trend.ly index 2ff53e8386..16814d8605 100644 --- a/input/test/beam-trend.ly +++ b/input/test/beam-trend.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + \score{ \notes\relative c'{ \stemUp diff --git a/input/test/beam-urg.ly b/input/test/beam-urg.ly index ba7bf68498..54c1accf07 100644 --- a/input/test/beam-urg.ly +++ b/input/test/beam-urg.ly @@ -1,3 +1,4 @@ + \score{ \notes\relative c''{ \property Score.beamQuantisation = #'none diff --git a/input/test/beamed-slur-endings.ly b/input/test/beamed-slur-endings.ly index df91eec6a4..1f082c0b5a 100644 --- a/input/test/beamed-slur-endings.ly +++ b/input/test/beamed-slur-endings.ly @@ -1,19 +1,20 @@ + \score{ \notes \relative c''{ - \property Voice.slurVerticalDirection = #1 c8(()c())c4 - \property Voice.slurVerticalDirection = #-1 a8(()a)a4 + \slurUp c8(()c())c4 + \slurDown a8(()a)a4 \break - \property Voice.slurVerticalDirection = #-1 a8(()a())a4 - \property Voice.slurVerticalDirection = #1 c8(()c)c4 + \slurDown a8(()a())a4 + \slurUp c8(()c)c4 \break - \property Voice.slurVerticalDirection = #-1 e8(()e())e4 - \property Voice.slurVerticalDirection = #1 f,8(()f)f4 + \slurDown e8(()e())e4 + \slurUp f,8(()f)f4 \break - \property Voice.slurVerticalDirection = #1 e8(()e())e4 - \property Voice.slurVerticalDirection = #-1 f'8(()f)f4 + \slurUp e8(()e())e4 + \slurDown f'8(()f)f4 \break } diff --git a/input/test/beams.ly b/input/test/beams.ly index 46544617e7..c1172a46c6 100644 --- a/input/test/beams.ly +++ b/input/test/beams.ly @@ -6,7 +6,7 @@ copyright = "PD"; TestedFeatures = "beams and beamflags"; } -\version "1.3.117"; + \score{ < diff --git a/input/test/broken-thread-line.ly b/input/test/broken-thread-line.ly index 6c765fe44b..466b8d0991 100644 --- a/input/test/broken-thread-line.ly +++ b/input/test/broken-thread-line.ly @@ -1,5 +1,6 @@ + % followThread: connect note heads with line when thread switches staff \score{ diff --git a/input/test/broken.ly b/input/test/broken.ly index 96abe81c12..38387f31fb 100644 --- a/input/test/broken.ly +++ b/input/test/broken.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.117"; + shortlong = \notes{ c4()c( c c | diff --git a/input/test/chord-changes.ly b/input/test/chord-changes.ly index f9a7697319..f7552843bb 100644 --- a/input/test/chord-changes.ly +++ b/input/test/chord-changes.ly @@ -1,3 +1,4 @@ + \header{ texidoc="property chordChanges: only display chord names when there's a change in the chords scheme, but always display the diff --git a/input/test/chord-inversion.ly b/input/test/chord-inversion.ly index 2570025f69..4794dc55fd 100644 --- a/input/test/chord-inversion.ly +++ b/input/test/chord-inversion.ly @@ -20,4 +20,4 @@ inversions = \notes\transpose c''\chords{ > } -\version "1.3.117"; + diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly index 0076002a3b..fdb855e3ce 100644 --- a/input/test/chord-table.ly +++ b/input/test/chord-table.ly @@ -41,4 +41,4 @@ tab = \notes\transpose c'''\chords{ } -\version "1.3.117"; + diff --git a/input/test/chords.ly b/input/test/chords.ly index 260ce11d29..051ea928d4 100644 --- a/input/test/chords.ly +++ b/input/test/chords.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + %{ Would this be acceptable/good enough/convenient for entry? @@ -62,7 +62,7 @@ keys = \notes{ \paper{ \translator { \ChordNamesContext - ChordName \override #'word-space = #1 + ChordNames \override #'word-space = #1 } } } diff --git a/input/test/clef-8-syntax.ly b/input/test/clef-8-syntax.ly index 9cf891a06f..7f6af2578c 100644 --- a/input/test/clef-8-syntax.ly +++ b/input/test/clef-8-syntax.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { \clef "bass_8"; c4 diff --git a/input/test/coda-kludge.ly b/input/test/coda-kludge.ly index 193f1eaa3e..9518c931bb 100644 --- a/input/test/coda-kludge.ly +++ b/input/test/coda-kludge.ly @@ -55,4 +55,4 @@ Hi, } -%\version "1.0.16"; +%; diff --git a/input/test/collision-merge-dotted.ly b/input/test/collision-merge-dotted.ly index 9db13c6589..2d53c3d00b 100644 --- a/input/test/collision-merge-dotted.ly +++ b/input/test/collision-merge-dotted.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + \score { \context Voice \notes\relative c { diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly index b09bc2997c..2a003157e3 100644 --- a/input/test/coriolan-margin.ly +++ b/input/test/coriolan-margin.ly @@ -1,4 +1,4 @@ -\version "1.3.122" + % Ugh, we need to override some LaTeX titling stuff \header { @@ -63,13 +63,13 @@ timpani = \notes \relative c' { c1 c } -violino1 = \notes \relative c' { +violinoB = \notes \relative c' { \property Staff.instrument = #"Violino I " \property Staff.instr = #"Vl. I " c1 c } -violino2 = \notes \relative c' { +violinoC = \notes \relative c' { \property Staff.instrument = #"Violino II " \property Staff.instr = #"Vl. II " c1 c @@ -128,7 +128,7 @@ violoncello = \notes \relative c' { } \translator { \OrchestralScoreContext - timeSignatureStyle = #"C" + TimeSignature \override #'style = #'C } } } diff --git a/input/test/crescendi.ly b/input/test/crescendi.ly index 7e9287904d..ba7238f6e0 100644 --- a/input/test/crescendi.ly +++ b/input/test/crescendi.ly @@ -1,3 +1,4 @@ + \score{ \notes\relative c''{ a1\fff\> \!a\pp diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly index 753b2bda79..1694b42c08 100644 --- a/input/test/cue-notes.ly +++ b/input/test/cue-notes.ly @@ -1,5 +1,5 @@ -\version "1.3.117"; + % add cue notes context @@ -7,12 +7,12 @@ CueVoiceContext = \translator { \VoiceContext \name CueVoice; - basicNoteHeadProperties \override #'font-relative-size = #-1 - basicStemProperties \override #'font-relative-size = #-1 - basicBeamProperties \override #'font-relative-size = #-1 - basicTextScriptProperties \override #'font-relative-size = #-1 - basicSlurProperties \override #'font-relative-size = #-1 - basicLocalKeyProperties \override #'font-relative-size = #-1 + NoteHead \override #'font-relative-size = #-1 + Stem \override #'font-relative-size = #-1 + Beam \override #'font-relative-size = #-1 + TextScript \override #'font-relative-size = #-1 + Slur \override #'font-relative-size = #-1 + Accidentals \override #'font-relative-size = #-1 }; \translator{ \CueVoiceContext } StaffContext = \translator{\StaffContext diff --git a/input/test/custos.ly b/input/test/custos.ly index 0bb2995c0d..4de138736b 100644 --- a/input/test/custos.ly +++ b/input/test/custos.ly @@ -1,4 +1,5 @@ + \score { \notes { c'1 \break < d'1 f' a'> } \paper {\translator { \StaffContext \consists Custos_engraver; diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly index 5c55dabafa..9bbc4502f5 100644 --- a/input/test/defaultbars.ly +++ b/input/test/defaultbars.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + \score { diff --git a/input/test/different-time-signatures.ly b/input/test/different-time-signatures.ly index 2081cf67f6..954268be9c 100644 --- a/input/test/different-time-signatures.ly +++ b/input/test/different-time-signatures.ly @@ -1,4 +1,5 @@ + % barline spacing disrupts visual rhythm. #(set! space-alist (assoc-set! space-alist '("Staff_bar" "begin-of-note") '(minimum_space 0.0))) diff --git a/input/test/diverse-spacing.ly b/input/test/diverse-spacing.ly index 6aa560976c..eaed7652f6 100644 --- a/input/test/diverse-spacing.ly +++ b/input/test/diverse-spacing.ly @@ -1,4 +1,5 @@ + % a few 32nds shouldn't stretch spacing enormously. \score { \notes { \time 3/4; diff --git a/input/test/dynamic-dir.ly b/input/test/dynamic-dir.ly index b7d353b09f..8134fb9cbe 100644 --- a/input/test/dynamic-dir.ly +++ b/input/test/dynamic-dir.ly @@ -1,8 +1,9 @@ + %non of the dynamics properties work anymore \score { \context Voice \notes\relative c { -% \property Voice.verticalDirection = #-1 +% \stemDown\slurDown\tieDown \property Voice.dynamicDirection = #1 \property Voice.dynamicPadding = #40 diff --git a/input/test/embedded-scm.ly b/input/test/embedded-scm.ly index d530c85965..977b3adfce 100644 --- a/input/test/embedded-scm.ly +++ b/input/test/embedded-scm.ly @@ -1,3 +1,4 @@ + #(begin (newline)(display "hello world")(newline))\score{ \notes\relative c'{ c } } diff --git a/input/test/equaliser.ly b/input/test/equaliser.ly index 2a449f8561..6a4d8588da 100644 --- a/input/test/equaliser.ly +++ b/input/test/equaliser.ly @@ -1,4 +1,5 @@ + flauti = \notes \relative c' { \property Staff.midiInstrument = #"flute" \property Staff.instrument = #"2 Flauti" @@ -55,7 +56,7 @@ timpani = \notes \relative c' { R1*6 c1 R1*4 } -violino1 = \notes \relative c' { +violinoB = \notes \relative c' { \property Staff.midiInstrument = #"violin" \property Staff.instrument = #"Violino I" \property Staff.instr = #"Vl. I" @@ -63,7 +64,7 @@ violino1 = \notes \relative c' { R1*7 c1 R1*3 } -violino2 = \notes \relative c' { +violinoC = \notes \relative c' { \property Staff.midiInstrument = #"violin" \property Staff.instrument = #"Violino II" \property Staff.instr = #"Vl. II" @@ -129,7 +130,7 @@ violoncello = \notes \relative c' { } \paper { - \paper_sixteen + \paperSixteen indent=100.0\mm; linewidth=150.0\mm; \translator { diff --git a/input/test/explicit.ly b/input/test/explicit.ly index 83ffd57083..7757a93caa 100644 --- a/input/test/explicit.ly +++ b/input/test/explicit.ly @@ -1,3 +1,4 @@ + \header{ texidoc="Explicit pitches and durations."; } @@ -7,4 +8,4 @@ texidoc="Explicit pitches and durations."; \pitch #(make-pitch 1 1 1) \duration #(make-duration 2 0) } -} \ No newline at end of file +} diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index 458ca1a7e7..83d986483c 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -42,4 +42,4 @@ extra-staff.ly: } -\version "1.3.117"; + diff --git a/input/test/figured-bass.ly b/input/test/figured-bass.ly index 7d97e2c74b..0f6368114d 100644 --- a/input/test/figured-bass.ly +++ b/input/test/figured-bass.ly @@ -2,7 +2,7 @@ % (An alternative is to use a lyrics line if you want the figures % aligned vertically.) -\version "1.3.117"; + % Scheme macros for accidentals. Note how they can be combined % with other strings, for example in: d^#`(rows ,sharp "4") diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly index ff82211fb2..504a4aa82c 100644 --- a/input/test/fill-a4.ly +++ b/input/test/fill-a4.ly @@ -1,3 +1,4 @@ + % % test file to get a4 paper really filled, % without having to resort to the ever-ugly oversizing hack: @@ -17,7 +18,7 @@ tagline="Ligly"; \repeat "unfold" 36 c1 } \paper{ - \paper_thirteen + \paperThirteen indent = 0.0\mm; % URG % Vertical space is rather precious when typesetting diff --git a/input/test/fingering.ly b/input/test/fingering.ly index 8b2bb446c4..38095ef78b 100644 --- a/input/test/fingering.ly +++ b/input/test/fingering.ly @@ -1,5 +1,6 @@ + \score { \notes \context Voice = VA \relative c'' { \grace {[b8^1 c^2]} d4^3 diff --git a/input/test/font-body.ly b/input/test/font-body.ly index e5a9a07319..a2536530ef 100644 --- a/input/test/font-body.ly +++ b/input/test/font-body.ly @@ -1,4 +1,4 @@ -\version "1.3.122"; + FontBody= \notes\transpose c''{ \bar "|:"; diff --git a/input/test/font.ly b/input/test/font.ly index 513a42b887..241d195fcb 100644 --- a/input/test/font.ly +++ b/input/test/font.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.120"; + \include "font-body.ly" \score{ diff --git a/input/test/font11.ly b/input/test/font11.ly index 9530ebe19d..c283b7aab0 100644 --- a/input/test/font11.ly +++ b/input/test/font11.ly @@ -1,4 +1,5 @@ + \header{ title= "The Feta Font"; subtitle = "proofsheet"; @@ -14,7 +15,7 @@ description = "This file tests the Feta music font, 11pt"; \score{ \FontBody \paper{ - \paper_eleven + \paperEleven linewidth = 17.5 \cm; gourlay_maxmeasures =5.; } diff --git a/input/test/font13.ly b/input/test/font13.ly index d4e2d4d71d..d738759ac0 100644 --- a/input/test/font13.ly +++ b/input/test/font13.ly @@ -1,4 +1,5 @@ + \header{ title= "The Feta Font"; subtitle = "proofsheet"; @@ -14,7 +15,7 @@ description = "This file tests the Feta music font, 11pt"; \score{ \FontBody \paper{ - \paper_thirteen + \paperThirteen linewidth = 17.5 \cm; gourlay_maxmeasures =5.; } diff --git a/input/test/font16.ly b/input/test/font16.ly index ca8d872dc1..54ce1e0cef 100644 --- a/input/test/font16.ly +++ b/input/test/font16.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.120"; + \include "paper16.ly" \include "font-body.ly" diff --git a/input/test/font20.ly b/input/test/font20.ly index e6cffda88d..8233c2c68a 100644 --- a/input/test/font20.ly +++ b/input/test/font20.ly @@ -17,5 +17,5 @@ TestedFeatures = gourlay_maxmeasures =5.; } } -\version "1.3.117"; + diff --git a/input/test/font26.ly b/input/test/font26.ly index e811da1d99..d30ec2c093 100644 --- a/input/test/font26.ly +++ b/input/test/font26.ly @@ -1,3 +1,4 @@ + \header{ title= "The Feta Font"; subtitle = "proofsheet"; @@ -13,7 +14,7 @@ description = "This file tests the Feta music font"; \score{ \FontBody \paper{ - \paper_twentysix + \paperTwentysix linewidth = 17.5 \cm; gourlay_maxmeasures =5.; } diff --git a/input/test/force-hshift.ly b/input/test/force-hshift.ly index b6f97fd182..a70006b152 100644 --- a/input/test/force-hshift.ly +++ b/input/test/force-hshift.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + \score { \context Voice \notes\relative c { diff --git a/input/test/gmsusd.ly b/input/test/gmsusd.ly index f53b5a92d7..06d5039630 100644 --- a/input/test/gmsusd.ly +++ b/input/test/gmsusd.ly @@ -3,7 +3,7 @@ % perhaps the current modifier approach is too simplistic -\version "1.3.117"; + gmsus=\notes\relative c \chords{ g1 diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index ecf56cefdc..bee50d8103 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + %{ diff --git a/input/test/grace-end.ly b/input/test/grace-end.ly index 0fbacee532..969e9cfbb6 100644 --- a/input/test/grace-end.ly +++ b/input/test/grace-end.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly index 080882b201..e14a6e3897 100644 --- a/input/test/hara-kiri-switch.ly +++ b/input/test/hara-kiri-switch.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + voiceOne = \notes \relative c'' { a1 a a diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index cdf375b43e..c67a6648f7 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + toeterI = \notes\relative c <{ \property Staff.instrument = #"Toeters" diff --git a/input/test/harmonics.ly b/input/test/harmonics.ly index 30c4db4622..6c25e77507 100644 --- a/input/test/harmonics.ly +++ b/input/test/harmonics.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { diff --git a/input/test/hshift.ly b/input/test/hshift.ly index 996640bb22..23d8341616 100644 --- a/input/test/hshift.ly +++ b/input/test/hshift.ly @@ -1,5 +1,5 @@ -\version "1.3.117"; + shiftI \property Voice.NoteColumn \override #'horizontal-shift = #0 diff --git a/input/test/hymn.ly b/input/test/hymn.ly index cecbbfc731..5cd0c36757 100644 --- a/input/test/hymn.ly +++ b/input/test/hymn.ly @@ -1,3 +1,4 @@ + \score{ \context Staff < \time 4/4; diff --git a/input/test/incipit.ly b/input/test/incipit.ly index b65dcf1eb5..61edcd7bfb 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -6,7 +6,7 @@ /Mats B %} -\version "1.3.117"; + violinincipit = \notes\relative c''{ \clef "french"; diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly index be169ea15b..b93302b285 100644 --- a/input/test/instrument-name-grandstaff.ly +++ b/input/test/instrument-name-grandstaff.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + \score { \notes diff --git a/input/test/instrument-name-mmrest.ly b/input/test/instrument-name-mmrest.ly index 7b66394b10..4cea19a177 100644 --- a/input/test/instrument-name-mmrest.ly +++ b/input/test/instrument-name-mmrest.ly @@ -6,7 +6,7 @@ interesting bug in 1.3.98) %} -\version "1.3.117"; + \score{ \context Staff < \property Staff.instrument = "instrument" diff --git a/input/test/instrument-name.ly b/input/test/instrument-name.ly index 3718fcfc2f..35a363d705 100644 --- a/input/test/instrument-name.ly +++ b/input/test/instrument-name.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + \score { diff --git a/input/test/jazz-chords.ly b/input/test/jazz-chords.ly index 3eb5a65639..59f350aebb 100644 --- a/input/test/jazz-chords.ly +++ b/input/test/jazz-chords.ly @@ -1,5 +1,5 @@ -\version "1.3.117"; + %% This should only be necessary if your kpathsea setup is broken % @@ -60,8 +60,8 @@ scheme = \chords { \paper { \translator { \ChordNamesContext - ChordName \override #'word-space = #1 - ChordName \override #'style = #'jazz + ChordNames \override #'word-space = #1 + ChordNames \override #'style = #'jazz } } } diff --git a/input/test/key-clefs.ly b/input/test/key-clefs.ly index 4eb5b6725a..fc216de533 100644 --- a/input/test/key-clefs.ly +++ b/input/test/key-clefs.ly @@ -1,3 +1,4 @@ + \include "paper16.ly" \score { \notes @@ -20,6 +21,6 @@ \key cis \major; cis \key ces \major; ces } - \paper{\paper_sixteen} + \paper{\paperSixteen} } diff --git a/input/test/keys2.ly b/input/test/keys2.ly index 328a723bac..caf59fe006 100644 --- a/input/test/keys2.ly +++ b/input/test/keys2.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + blah = \notes { diff --git a/input/test/knee-mult.ly b/input/test/knee-mult.ly index 6925c301ba..8c3c320b3a 100644 --- a/input/test/knee-mult.ly +++ b/input/test/knee-mult.ly @@ -16,4 +16,4 @@ } } -\version "1.3.117"; + diff --git a/input/test/knee.ly b/input/test/knee.ly index 2f80ff0cf0..453f005050 100644 --- a/input/test/knee.ly +++ b/input/test/knee.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + \score{ \notes\relative c'{ [c16 \stemDown c'' \stemBoth c,, d] diff --git a/input/test/lines.ly b/input/test/lines.ly index 1f9352a12a..31bead8aed 100644 --- a/input/test/lines.ly +++ b/input/test/lines.ly @@ -1,3 +1,4 @@ + \header { texidoc=" Draw abritrary lines. This brings LilyPond on par with Mup. @@ -18,4 +19,4 @@ Draw abritrary lines. This brings LilyPond on par with Mup. \paper { linewidth = 70.0*\staffspace; } -} \ No newline at end of file +} diff --git a/input/test/ly2dvi-testpage.ly b/input/test/ly2dvi-testpage.ly index ba3e51f172..5efd3b6371 100644 --- a/input/test/ly2dvi-testpage.ly +++ b/input/test/ly2dvi-testpage.ly @@ -1,4 +1,5 @@ + %{ Test ly2dvi features. %} diff --git a/input/test/lyric-extender.ly b/input/test/lyric-extender.ly index 959e68c061..64cfcb97aa 100644 --- a/input/test/lyric-extender.ly +++ b/input/test/lyric-extender.ly @@ -5,4 +5,4 @@ > } -\version "1.3.117"; + diff --git a/input/test/lyric-hyphen.ly b/input/test/lyric-hyphen.ly index 06286fddb1..91132c11f7 100644 --- a/input/test/lyric-hyphen.ly +++ b/input/test/lyric-hyphen.ly @@ -5,7 +5,7 @@ > } -\version "1.3.117"; + diff --git a/input/test/lyric-phrasing.ly b/input/test/lyric-phrasing.ly index 7f0875362a..a9dbba6b41 100644 --- a/input/test/lyric-phrasing.ly +++ b/input/test/lyric-phrasing.ly @@ -7,7 +7,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.117"; + m = \notes \relative c'' { \property Staff.automaticMelismata = ##t diff --git a/input/test/lyrics.ly b/input/test/lyrics.ly index 5680f882e5..a7e1fc562d 100644 --- a/input/test/lyrics.ly +++ b/input/test/lyrics.ly @@ -1,7 +1,7 @@ -\version "1.3.117"; + somewhatLong = \lyrics{ - \property Lyrics . textStyle = "roman" + \property Lyrics.LyricText \set #'font-style = #'roman AaaaaaA2 BbbbbbB2 CcccccC2 @@ -11,7 +11,7 @@ somewhatLong = \lyrics{ } ratherLong = \lyrics{ - \property Lyrics . textStyle = "roman" + \property Lyrics.LyricText \set #'font-style = #'roman LLLLoooonggggg2 Syyllllaaabbble2 LLLLoooonggggg2 @@ -21,7 +21,7 @@ ratherLong = \lyrics{ } quiteLong = \lyrics{ - \property Lyrics . textStyle = "roman" + \property Lyrics.LyricText \set #'font-style = #'roman LLLLLLLLLooooongggggggg2 Syyyyyyyyyyyyylllllllaaaaaabbble2 LLLLLLLLLooooongggggggg2 diff --git a/input/test/manual-clef.ly b/input/test/manual-clef.ly index 2fc6fd7d05..994937d6ec 100644 --- a/input/test/manual-clef.ly +++ b/input/test/manual-clef.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + %{ diff --git a/input/test/manual-volta.ly b/input/test/manual-volta.ly index e458b78781..a00d2e2fcf 100644 --- a/input/test/manual-volta.ly +++ b/input/test/manual-volta.ly @@ -1,4 +1,5 @@ + \score { \notes { c4 \property Score.repeatCommands = #'((volta "93") end-repeat) diff --git a/input/test/mark.ly b/input/test/mark.ly index 538cdfbf9b..27093fb019 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + global = \notes { s1 | \mark "A"; diff --git a/input/test/markup.ly b/input/test/markup.ly index 8ef49ed00d..b1436200d8 100644 --- a/input/test/markup.ly +++ b/input/test/markup.ly @@ -1,5 +1,5 @@ -\version "1.3.117"; + % % Test new font selection and scm text markup diff --git a/input/test/maximum-rest-count.ly b/input/test/maximum-rest-count.ly index 6e1759a170..0a2b392414 100644 --- a/input/test/maximum-rest-count.ly +++ b/input/test/maximum-rest-count.ly @@ -1,3 +1,4 @@ + \score{ \context Staff \notes\relative c''< \context Voice = x { diff --git a/input/test/memory.ly b/input/test/memory.ly index c5114349a9..3760d4364e 100644 --- a/input/test/memory.ly +++ b/input/test/memory.ly @@ -11,5 +11,5 @@ bla = \notes { > \paper { Gourlay_maxmeaures = 2.; } } -\version "1.3.117"; + diff --git a/input/test/monstrous.ly b/input/test/monstrous.ly index d9c8dbf47e..1257d62b40 100644 --- a/input/test/monstrous.ly +++ b/input/test/monstrous.ly @@ -1,4 +1,5 @@ + %% Chord gurus, is this ok now?? monstrous= \chords{ diff --git a/input/test/move-mark.ly b/input/test/move-mark.ly index 13716b5f0f..695be4a214 100644 --- a/input/test/move-mark.ly +++ b/input/test/move-mark.ly @@ -1,3 +1,4 @@ + \score{ \context Staff \notes\relative c''{ c1 diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly index 506e1fc046..6d0781c4f7 100644 --- a/input/test/multi-rest.ly +++ b/input/test/multi-rest.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + voiceOne = \notes\transpose c''{ \stemUp R1 * 2 | f'4-. r r2 | R1 * 3 | diff --git a/input/test/multi-slope.ly b/input/test/multi-slope.ly index 045d649728..ab3dcecb73 100644 --- a/input/test/multi-slope.ly +++ b/input/test/multi-slope.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { [c8 c16 c16] diff --git a/input/test/no-stem-extend.ly b/input/test/no-stem-extend.ly index fe48d84f5d..36966f2d51 100644 --- a/input/test/no-stem-extend.ly +++ b/input/test/no-stem-extend.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { % test noStemExtend diff --git a/input/test/note-chords.ly b/input/test/note-chords.ly index 2b6cfe905d..662c235ced 100644 --- a/input/test/note-chords.ly +++ b/input/test/note-chords.ly @@ -1,3 +1,4 @@ + scheme = \notes { diff --git a/input/test/note-shift.ly b/input/test/note-shift.ly index d4affe5ea9..49a0a04db1 100644 --- a/input/test/note-shift.ly +++ b/input/test/note-shift.ly @@ -1,23 +1,24 @@ + \score { \context Voice \notes\relative c { \context Staff \notes\relative c''< \context Voice=one { - \property Voice.horizontalNoteShift=0 - \property Voice.verticalDirection=1 + \property Voice.NoteColumn \override #'horizontal-shift = #0 + \stemUp\slurUp\tieUp e4 } \context Voice=two { - \property Voice.verticalDirection=1 - \property Voice.horizontalNoteShift=1 + \stemUp\slurUp\tieUp + \property Voice.NoteColumn \override #'horizontal-shift = #1 cis } \context Voice=three { - \property Voice.horizontalNoteShift=2 - \property Voice.verticalDirection=1 + \property Voice.NoteColumn \override #'horizontal-shift = #2 + \stemUp\slurUp\tieUp ais } \context Voice=four { - \property Voice.verticalDirection=-1 + \stemDown\slurDown\tieDown \property Voice.horizontalNoteShift=-1 fis } diff --git a/input/test/notemode-chords.ly b/input/test/notemode-chords.ly index 49819c10ab..62136719ca 100644 --- a/input/test/notemode-chords.ly +++ b/input/test/notemode-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + \score{ \notes \transpose c''{ diff --git a/input/test/orchestalpart.ly b/input/test/orchestalpart.ly index e36598c3d9..139765cc7e 100644 --- a/input/test/orchestalpart.ly +++ b/input/test/orchestalpart.ly @@ -1,4 +1,5 @@ + \score { \notes { c1 c1 \property Score.skipBars = ##t c1 \break R1*8 c1 c1 c1 c1 diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly index 5dc33ef467..5e372200ae 100644 --- a/input/test/orchestscore.ly +++ b/input/test/orchestscore.ly @@ -2,7 +2,7 @@ latexpackages="graphicx"; } -\version "1.3.126"; + m = \notes \relative c''{ diff --git a/input/test/ossia.ly b/input/test/ossia.ly index 6a887b2e66..2ce3d45a45 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + \score { diff --git a/input/test/parse.ly b/input/test/parse.ly index fda93852c6..1c165825ac 100644 --- a/input/test/parse.ly +++ b/input/test/parse.ly @@ -1,3 +1,4 @@ + % Test parser error \score{ diff --git a/input/test/parse2.ly b/input/test/parse2.ly index 41ef087e29..8339c274dc 100644 --- a/input/test/parse2.ly +++ b/input/test/parse2.ly @@ -1,3 +1,4 @@ + % Test parser error foo = \notes{ diff --git a/input/test/parse3.ly b/input/test/parse3.ly index 3b401890be..b167ae49a7 100644 --- a/input/test/parse3.ly +++ b/input/test/parse3.ly @@ -1,3 +1,4 @@ + % Test parser error foo = \notes{ diff --git a/input/test/parse4.ly b/input/test/parse4.ly index 1194381dcb..ecb5abd6cb 100644 --- a/input/test/parse4.ly +++ b/input/test/parse4.ly @@ -1,3 +1,4 @@ + % Test parser error foo = \notes{ diff --git a/input/test/part-combine-moments.ly b/input/test/part-combine-moments.ly index 8953992bac..f4eab06289 100644 --- a/input/test/part-combine-moments.ly +++ b/input/test/part-combine-moments.ly @@ -1,3 +1,4 @@ + \score{ \context PianoStaff < \context StaffCombineStaff=one \skip 1*2; @@ -89,7 +90,7 @@ barNumberScriptPadding = #15 %% URG: this changes dynamics too %%textStyle = #"italic" - timeSignatureStyle = #"C" + TimeSignature \override #'style = #'C maximumRestCount = #1 } } diff --git a/input/test/part-combine-score.ly b/input/test/part-combine-score.ly index 8affccb12a..551357882e 100644 --- a/input/test/part-combine-score.ly +++ b/input/test/part-combine-score.ly @@ -1,3 +1,4 @@ + \header { texidoc="Template for part-combining orchestral scores"; } diff --git a/input/test/part-combine-staff.ly b/input/test/part-combine-staff.ly index 0e69ad05b4..728df55c17 100644 --- a/input/test/part-combine-staff.ly +++ b/input/test/part-combine-staff.ly @@ -1,3 +1,4 @@ + \score{ \context PianoStaff < \context StaffCombineStaff=one \skip 1*7; @@ -99,7 +100,7 @@ barNumberScriptPadding = #15 %% URG: this changes dynamics too %%textStyle = #"italic" - timeSignatureStyle = #"C" + TimeSignature \override #'style = #'C maximumRestCount = #1 } } diff --git a/input/test/pedal.ly b/input/test/pedal.ly index 840947a5b0..490ecbfd86 100644 --- a/input/test/pedal.ly +++ b/input/test/pedal.ly @@ -2,7 +2,7 @@ texidoc = "Piano pedal symbols merge stop and start. The strings are configurable. "; } -\version "1.3.120"; + \score{ diff --git a/input/test/perform-grace.ly b/input/test/perform-grace.ly index 7842d17156..518661f9d1 100644 --- a/input/test/perform-grace.ly +++ b/input/test/perform-grace.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { \context Voice=VoiceOne diff --git a/input/test/perform-tie.ly b/input/test/perform-tie.ly index e4cbd45844..4b68eeee6a 100644 --- a/input/test/perform-tie.ly +++ b/input/test/perform-tie.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { c8 c c ~ c c c c ~ c ~ c ~ c c c diff --git a/input/test/pushproperty.ly b/input/test/pushproperty.ly index 2d176934f1..c532befb5b 100644 --- a/input/test/pushproperty.ly +++ b/input/test/pushproperty.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + %{ diff --git a/input/test/r-as.ly b/input/test/r-as.ly index 489fc8e238..09ab543a35 100644 --- a/input/test/r-as.ly +++ b/input/test/r-as.ly @@ -1,3 +1,4 @@ + \score{ < \context Staff \notes\relative c'{ diff --git a/input/test/repeat.ly b/input/test/repeat.ly index 489fc8e238..09ab543a35 100644 --- a/input/test/repeat.ly +++ b/input/test/repeat.ly @@ -1,3 +1,4 @@ + \score{ < \context Staff \notes\relative c'{ diff --git a/input/test/repeatbar.ly b/input/test/repeatbar.ly index b606718f09..9c23cc4390 100644 --- a/input/test/repeatbar.ly +++ b/input/test/repeatbar.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { c'' d e f | \repetitions1*3 | diff --git a/input/test/rests.ly b/input/test/rests.ly index 7c944f5f98..5eca6dcd59 100644 --- a/input/test/rests.ly +++ b/input/test/rests.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 diff --git a/input/test/rhythmic-staff.ly b/input/test/rhythmic-staff.ly index 313e700e07..40a4a2b155 100644 --- a/input/test/rhythmic-staff.ly +++ b/input/test/rhythmic-staff.ly @@ -1,4 +1,5 @@ + \score{ \context RhythmicStaff { \notes\relative c''{ diff --git a/input/test/scales-greek.ly b/input/test/scales-greek.ly index 37f77a94ce..2eea44d390 100644 --- a/input/test/scales-greek.ly +++ b/input/test/scales-greek.ly @@ -1,3 +1,4 @@ + \header { crossRefNumber = "1"; tagline = "Lily was here 1.3.98 -- automatically converted from ABC"; @@ -32,7 +33,7 @@ e'8 f'8 g'8 a'8 bes'8 c''8 \context Staff="default" { - \$voicedefault + \voicedefault } > diff --git a/input/test/scales.ly b/input/test/scales.ly index 9399edf7b5..38f747cbdc 100644 --- a/input/test/scales.ly +++ b/input/test/scales.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { % sharp-major diff --git a/input/test/script-horizontal.ly b/input/test/script-horizontal.ly index a0090ba8e8..56309bd268 100644 --- a/input/test/script-horizontal.ly +++ b/input/test/script-horizontal.ly @@ -1,5 +1,6 @@ + %{ Please don't use this Scheme hacking unless you have a good reason. diff --git a/input/test/scripts.ly b/input/test/scripts.ly index 9cb1550d92..694e6c8353 100644 --- a/input/test/scripts.ly +++ b/input/test/scripts.ly @@ -1,5 +1,5 @@ -\version "1.3.117"; + blah = \notes{ \transpose c'' { diff --git a/input/test/short-part-combine.ly b/input/test/short-part-combine.ly index 2869207c00..806f1fcdf9 100644 --- a/input/test/short-part-combine.ly +++ b/input/test/short-part-combine.ly @@ -1,3 +1,4 @@ + \score{ \context Staff < \context Voice=one \partcombine Voice diff --git a/input/test/simple-slur-endings.ly b/input/test/simple-slur-endings.ly index 03e482615b..500008620e 100644 --- a/input/test/simple-slur-endings.ly +++ b/input/test/simple-slur-endings.ly @@ -1,10 +1,11 @@ + \score{ \notes \relative c''{ - \property Voice.slurVerticalDirection = #1 c()a d()g,\break - \property Voice.slurVerticalDirection = #-1 c()a d()g,\break - \property Voice.slurVerticalDirection = #1 a()c d()g,\break - \property Voice.slurVerticalDirection = #-1 a()c d()g,\break - \property Voice.slurVerticalDirection = #-1 a()c d()g,\break + \slurUp c()a d()g,\break + \slurDown c()a d()g,\break + \slurUp a()c d()g,\break + \slurDown a()c d()g,\break + \slurDown a()c d()g,\break } \paper{ indent = 0.0; diff --git a/input/test/sizes.ly b/input/test/sizes.ly index c4a32baebf..a0779c39da 100644 --- a/input/test/sizes.ly +++ b/input/test/sizes.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { % to see the magic: uncomment size stuff in init/paper20.ly diff --git a/input/test/sleur.ly b/input/test/sleur.ly index 5bbb52da48..16a8a7243d 100644 --- a/input/test/sleur.ly +++ b/input/test/sleur.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.117"; + shortlong = \notes{ c4()c( c c | diff --git a/input/test/slur-area.ly b/input/test/slur-area.ly index f16bb43838..cbe360f773 100644 --- a/input/test/slur-area.ly +++ b/input/test/slur-area.ly @@ -1,8 +1,9 @@ + \score{ \notes\relative c''{ -\property Voice.slurVerticalDirection = #1 -\property Voice.stemVerticalDirection = #-1 +\slurUp +\stemDown a(a' a,)a a(a a')a, a(d a)a @@ -16,7 +17,7 @@ c,(g' c e f d b)g c,(g' c e f d b)g \property Voice.noAutoBeaming = ##t -\property Voice.stemVerticalDirection = #1 +\stemUp a8(a a a a a a)a } diff --git a/input/test/slur-broken-cross-staff.ly b/input/test/slur-broken-cross-staff.ly index 42afbb9940..0570ed95a6 100644 --- a/input/test/slur-broken-cross-staff.ly +++ b/input/test/slur-broken-cross-staff.ly @@ -49,4 +49,4 @@ linebreak. \paper { indent = 0.; linewidth = 40.*\staffspace; } } -\version "1.3.110"; + diff --git a/input/test/slur-broken.ly b/input/test/slur-broken.ly index 44d453151e..0d76b37c76 100644 --- a/input/test/slur-broken.ly +++ b/input/test/slur-broken.ly @@ -1,3 +1,4 @@ + \score{ \notes\relative c''{ \time 2/4; diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly index 3b03fbbc89..511b46a24a 100644 --- a/input/test/slur-damping.ly +++ b/input/test/slur-damping.ly @@ -1,5 +1,5 @@ % test damping -\version "1.3.117"; + \score{ \notes\relative c'{ diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly index dd190257d9..aa33b0d44a 100644 --- a/input/test/slur-dash.ly +++ b/input/test/slur-dash.ly @@ -1,15 +1,15 @@ -\version "1.3.117"; + \score{ \notes{ c( d e )c | - \slurdotted + \slurDotted c( d e )c | - \slurnormal + \slurNoDots c( d e )c | \property Voice.slurDash = #0.0 c( d e )c | - \slurnormal + \slurNoDots c( d e )c | } \paper{ diff --git a/input/test/slur-follow-music.ly b/input/test/slur-follow-music.ly index cb4d50a351..3f8891d512 100644 --- a/input/test/slur-follow-music.ly +++ b/input/test/slur-follow-music.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + \score { \context Voice \notes\relative c { % CASE 3 diff --git a/input/test/slur-mininum.ly b/input/test/slur-mininum.ly index 5144ab9dba..f12280b73c 100644 --- a/input/test/slur-mininum.ly +++ b/input/test/slur-mininum.ly @@ -1,3 +1,4 @@ + \score{ \notes\relative c''{ \time 2/4; diff --git a/input/test/slur-positions.ly b/input/test/slur-positions.ly index c904ac5eef..1ebbf4fce1 100644 --- a/input/test/slur-positions.ly +++ b/input/test/slur-positions.ly @@ -1,3 +1,4 @@ + \score{ \notes\relative c''{ \slurUp diff --git a/input/test/slur-proof.ly b/input/test/slur-proof.ly index ba2bf2c2e0..3629d69138 100644 --- a/input/test/slur-proof.ly +++ b/input/test/slur-proof.ly @@ -1,4 +1,5 @@ + x = { \outputproperty #(make-type-checker 'note-head-interface) #'extra-offset = #'(-1 . 0) diff --git a/input/test/slur-symmetry-2.ly b/input/test/slur-symmetry-2.ly index ef86eedfd1..1da057b168 100644 --- a/input/test/slur-symmetry-2.ly +++ b/input/test/slur-symmetry-2.ly @@ -1,3 +1,4 @@ + \header{ % should look the same title="symmetry"; diff --git a/input/test/slur-symmetry-3.ly b/input/test/slur-symmetry-3.ly index 23a0a3903b..9d345db716 100644 --- a/input/test/slur-symmetry-3.ly +++ b/input/test/slur-symmetry-3.ly @@ -1,3 +1,4 @@ + \header{ % should look the same title="symmetry"; diff --git a/input/test/slurs.ly b/input/test/slurs.ly index 737c2df43f..06927c256d 100644 --- a/input/test/slurs.ly +++ b/input/test/slurs.ly @@ -1,5 +1,5 @@ -\version "1.3.117"; + \score{ \notes\transpose c'{ diff --git a/input/test/solo-a2.ly b/input/test/solo-a2.ly index e3054214df..b886c7a9c4 100644 --- a/input/test/solo-a2.ly +++ b/input/test/solo-a2.ly @@ -1,3 +1,4 @@ + \score{ \context Staff = one < \context Voice=one { \skip 1; } diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index 0cbbadda14..f9f03b2173 100644 --- a/input/test/spacing-2.ly +++ b/input/test/spacing-2.ly @@ -14,9 +14,9 @@ source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; \notes \relative c'' \context GrandStaff < \context Staff = SA < - \context Voice = VA { \property Voice.verticalDirection= 1 + \context Voice = VA { \stemUp\slurUp\tieUp e4 dis4 e2 } - \context Voice = VB { \property Voice.verticalDirection= -1 + \context Voice = VB { \stemDown\slurDown\tieDown [cis8 a] [fis b] gis2 } {\key e \major; } > @@ -33,4 +33,4 @@ source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; } } -\version "1.3.117"; + diff --git a/input/test/spacing.ly b/input/test/spacing.ly index 76c52636a3..46e752aa12 100644 --- a/input/test/spacing.ly +++ b/input/test/spacing.ly @@ -6,7 +6,7 @@ copyright = "public domain"; TestedFeatures = "This file tests various spacings"; } -\version "1.3.117"; + multipart = \notes \relative c'{ \context StaffGroup < diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly index 2ae91398a3..1e21d1559e 100644 --- a/input/test/span-bars.ly +++ b/input/test/span-bars.ly @@ -1,5 +1,5 @@ -\version "1.3.117"; + nt = \notes { c1 \break c1 c1 } stuff = \notes \relative c'' < \context Staff = stone { \nt } diff --git a/input/test/stacked-scripts.ly b/input/test/stacked-scripts.ly index fa21ad8328..e43495ef1c 100644 --- a/input/test/stacked-scripts.ly +++ b/input/test/stacked-scripts.ly @@ -1,3 +1,4 @@ + \score { \notes { c2_"geen gedonder"_"jij gaat onder" diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly index b3d5b5807f..69bce2efda 100644 --- a/input/test/staff-bracket.ly +++ b/input/test/staff-bracket.ly @@ -1,3 +1,4 @@ + \score { \context StaffGroup = a < @@ -13,7 +14,7 @@ \translator { \StaffContext - \consists Staff_margin_engraver; + \consists Instrument_name_engraver; numberOfStaffLines = #1 } diff --git a/input/test/staff-line-leading.ly b/input/test/staff-line-leading.ly index dbf97cf071..972a387e81 100644 --- a/input/test/staff-line-leading.ly +++ b/input/test/staff-line-leading.ly @@ -1,7 +1,8 @@ + \score { \notes \relative c'' \context GrandStaff < \context Staff = up { c4 c4 } - \context Staff = down { \property Staff. staffLineLeading = #5.5 c4 + \context Staff = down { \property Staff. staffSpace = #5.5 c4 [ e] [f c'] diff --git a/input/test/staff-margin-partial.ly b/input/test/staff-margin-partial.ly index f24531ffcd..bf67887c5e 100644 --- a/input/test/staff-margin-partial.ly +++ b/input/test/staff-margin-partial.ly @@ -1,6 +1,6 @@ % test staff margin with partial measure. -\version "1.3.117"; + \score { \notes { \property Staff.instrument = "foo" \partial 4; c4 c1 } diff --git a/input/test/staff-side-slur.ly b/input/test/staff-side-slur.ly index 769668fd4f..2958ac03ef 100644 --- a/input/test/staff-side-slur.ly +++ b/input/test/staff-side-slur.ly @@ -18,4 +18,4 @@ } -\version "1.3.117"; + diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index 449f3bfcd0..641ad37f3a 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -14,4 +14,4 @@ > \paper { linewidth = -1.; } } -\version "1.3.117"; + diff --git a/input/test/standchen-as5.ly b/input/test/standchen-as5.ly index 76187250dc..cb8660d560 100644 --- a/input/test/standchen-as5.ly +++ b/input/test/standchen-as5.ly @@ -1,5 +1,5 @@ -\version "1.3.120"; + \include "paper-as5.ly" @@ -7,14 +7,14 @@ \score { \context StaffGroup < \context Staff=upper \notes\relative c{ - \key f; + \key f \major; \time 3/4; r8^"Moderato" %\pp | r8 } \context Staff=lower \notes\relative c{ - \key f; + \key f \major; \time 3/4; \clef "bass"; r4 @@ -31,7 +31,7 @@ \VoiceContext beamHeight = ##f autoBeamSettings \override (begin * * * *) = #(make-moment 0 1) - textEmptyDimension = ##t + textNonEmpty = ##f } } diff --git a/input/test/standchen-as9.ly b/input/test/standchen-as9.ly index 84c3c7394b..bae5a8666c 100644 --- a/input/test/standchen-as9.ly +++ b/input/test/standchen-as9.ly @@ -1,17 +1,18 @@ + \include "paper-as9.ly" \score { \context GrandStaff < \context Staff=upper \notes\relative c{ - \key F; + \key f \major; \time 3/4; r8^"Moderato" %\pp | r8 } \context Staff=lower \notes\relative c{ - \key F; + \key f \major; \time 3/4; \clef "bass"; r4 @@ -19,7 +20,7 @@ } > \paper { -% \paper_as_nine +% \paperAs_nine indent=4.0\char; linewidth=78.0\char; %\translator { \StaffContext barSize = #9 } @@ -27,8 +28,8 @@ \translator { \VoiceContext beamHeight = ##f - autoBeamSettings \push (begin * * * *) = #(make-moment 0 1) - textEmptyDimension = ##t + autoBeamSettings \override (begin * * * *) = #(make-moment 0 1) + textNonEmpty = ##f } } diff --git a/input/test/stem-centered.ly b/input/test/stem-centered.ly index 9bd08cd036..984eee93a7 100644 --- a/input/test/stem-centered.ly +++ b/input/test/stem-centered.ly @@ -1,8 +1,9 @@ + \score { \notes { \relative c'' { -\property Voice . noteHeadStyle = "mensural" +\property Voice . noteHeadStyle = #'mensural \property Voice. stemCentered = ##t c\maxima*1/8 c\longa*1/4 c\breve*1/2 c1 c2 c4 c8 diff --git a/input/test/stem-length.ly b/input/test/stem-length.ly index 2061a8262d..c27c72254d 100644 --- a/input/test/stem-length.ly +++ b/input/test/stem-length.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { diff --git a/input/test/stem.ly b/input/test/stem.ly index c1f84ec278..cdba9179ba 100644 --- a/input/test/stem.ly +++ b/input/test/stem.ly @@ -8,7 +8,7 @@ of beams"; } -\version "1.3.117"; + beamintervals = \notes{ \time 7/4; diff --git a/input/test/system-start-brace.ly b/input/test/system-start-brace.ly index 8c696ff3e2..a6880cc87d 100644 --- a/input/test/system-start-brace.ly +++ b/input/test/system-start-brace.ly @@ -1,4 +1,5 @@ + \score { \notes \context PianoStaff < \context Staff = SA { s1 } \context Staff = SB { s1 }> diff --git a/input/test/system-start-bracket.ly b/input/test/system-start-bracket.ly index de612ed6f8..9f4510b99c 100644 --- a/input/test/system-start-bracket.ly +++ b/input/test/system-start-bracket.ly @@ -1,4 +1,5 @@ + \score { \notes \context StaffGroup < \context Staff = SA { s1 } \context Staff = SB { s1 }> diff --git a/input/test/tab-staff.ly b/input/test/tab-staff.ly index 554fbbdca2..b440df1c8b 100644 --- a/input/test/tab-staff.ly +++ b/input/test/tab-staff.ly @@ -1,5 +1,5 @@ -\version "1.3.117"; + %{ @@ -20,16 +20,16 @@ bla = \notes \relative c' { } \translator { \StaffContext \name TabStaff; - basicStaffSymbolProperties \override #'line-count = #6 + StaffSymbol \override #'line-count = #6 \remove "Clef_engraver"; \remove "Time_signature_engraver"; \consists "Pitch_squash_engraver"; - basicNoteHeadProperties \override #'transparent = ##t - basicStemProperties \override #'transparent = ##t - basicNoteHeadProperties \override #'staff-position = #-6 - basicDotsProperties \override #'transparent = ##t + NoteHead \override #'transparent = ##t + Stem \override #'transparent = ##t + NoteHead \override #'staff-position = #-6 + Dots \override #'transparent = ##t squashedPosition = #-4 - basicStemProperties \override #'length = #12 + Stem \override #'length = #12 } \translator { \ScoreContext diff --git a/input/test/tchaikovsky.ly b/input/test/tchaikovsky.ly index 7c78ebaecc..a57f7035f1 100644 --- a/input/test/tchaikovsky.ly +++ b/input/test/tchaikovsky.ly @@ -7,7 +7,7 @@ enteredby = "Maarten Storm"; instrument= "Violoncello"; } -\version "1.3.117"; + % this is an example of extreme dynamics diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly index 499b3e9a1b..06d4682402 100644 --- a/input/test/text-spanner.ly +++ b/input/test/text-spanner.ly @@ -1,5 +1,5 @@ -\version "1.3.117"; + \score{ \notes\relative c''{ diff --git a/input/test/textscript.ly b/input/test/textscript.ly index 7ca80d427f..92ec7d04f5 100644 --- a/input/test/textscript.ly +++ b/input/test/textscript.ly @@ -1,4 +1,4 @@ -\version "1.3.123"; + % % Test font selection and scm text markup diff --git a/input/test/thumb.ly b/input/test/thumb.ly index ba6f1259a2..2fa3257022 100644 --- a/input/test/thumb.ly +++ b/input/test/thumb.ly @@ -7,7 +7,7 @@ % the thumb-script is used in cello music to indicate a note that should % be played with your thumb. -\version "1.3.117"; + \score { \notes \relative c'' { [ <)b_\thumb b'-3> diff --git a/input/test/tie-broken.ly b/input/test/tie-broken.ly index 166cd40abe..0235ec5aaf 100644 --- a/input/test/tie-broken.ly +++ b/input/test/tie-broken.ly @@ -1,3 +1,4 @@ + \score{ \notes \relative c''{ c1~\break c diff --git a/input/test/tie-minimum.ly b/input/test/tie-minimum.ly index 676dc2a51e..7f0f785fb3 100644 --- a/input/test/tie-minimum.ly +++ b/input/test/tie-minimum.ly @@ -1,3 +1,4 @@ + \score{ \notes\relative c''{ \time 2/4; diff --git a/input/test/tie-sparse.ly b/input/test/tie-sparse.ly index e00e10e648..a63b26b9e4 100644 --- a/input/test/tie-sparse.ly +++ b/input/test/tie-sparse.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { diff --git a/input/test/time.ly b/input/test/time.ly index 0731002786..a4f3357f47 100644 --- a/input/test/time.ly +++ b/input/test/time.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { \property Staff.TimeSignature \override #'style = #'C diff --git a/input/test/timing.ly b/input/test/timing.ly index 4c0f7a5f80..86ea3d3985 100644 --- a/input/test/timing.ly +++ b/input/test/timing.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { diff --git a/input/test/title.ly b/input/test/title.ly index dec8970290..ca66d36e33 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -10,7 +10,7 @@ source = "urtext"; instrument= "Instrument"; } -\version "1.3.117"; + \score{ \notes diff --git a/input/test/top-staff-volta.ly b/input/test/top-staff-volta.ly index 189286af31..5a1f20d4f7 100644 --- a/input/test/top-staff-volta.ly +++ b/input/test/top-staff-volta.ly @@ -1,4 +1,5 @@ + voltaCommands = \notes { s1 \property Staff.repeatCommands = #((volta . "1")) c4 c4 c4 c4 diff --git a/input/test/transposing.ly b/input/test/transposing.ly index f4439b5529..676372b10a 100644 --- a/input/test/transposing.ly +++ b/input/test/transposing.ly @@ -1,3 +1,4 @@ + \score { \context Voice \notes\relative c { % btw: this is not how transposing is done in mudela, diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 40cedf07c4..ee8388b370 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -22,7 +22,7 @@ copyright = "public domain"; } -\version "1.3.117"; + vOne = \notes \relative c''{ \clef"violin"; diff --git a/input/test/tuplet-rest.ly b/input/test/tuplet-rest.ly index d31e4f6f7e..c93911005f 100644 --- a/input/test/tuplet-rest.ly +++ b/input/test/tuplet-rest.ly @@ -1,5 +1,6 @@ + \score { \context Voice \notes \relative c'' { \time 2/4; diff --git a/input/test/tuplet-spanner-duration.ly b/input/test/tuplet-spanner-duration.ly index 92f58c1a5e..70f48cc2d5 100644 --- a/input/test/tuplet-spanner-duration.ly +++ b/input/test/tuplet-spanner-duration.ly @@ -1,4 +1,5 @@ + \score { \context Voice \notes \relative c'' { diff --git a/input/test/tuplet.ly b/input/test/tuplet.ly index 0aa77a925c..4c56c81228 100644 --- a/input/test/tuplet.ly +++ b/input/test/tuplet.ly @@ -1,4 +1,4 @@ -\version "1.3.117" + \score { \context Voice \notes\relative c'' { diff --git a/input/test/twinkle-as5.ly b/input/test/twinkle-as5.ly index c2b20d66b2..38723655a3 100644 --- a/input/test/twinkle-as5.ly +++ b/input/test/twinkle-as5.ly @@ -6,7 +6,7 @@ enteredby = "hwn and jcn"; copyright = "public domain"; } -\version "1.3.117"; + \include "paper-as5.ly" diff --git a/input/test/two-slurs.ly b/input/test/two-slurs.ly index d089a6475d..2e7e9ed58f 100644 --- a/input/test/two-slurs.ly +++ b/input/test/two-slurs.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; + % % We'd want to combine the stems, but have two slurs too... % Looks like the a-due engraver diff --git a/input/test/uniform-breaking.ly b/input/test/uniform-breaking.ly index b07a7b21a6..b4eb46fd4c 100644 --- a/input/test/uniform-breaking.ly +++ b/input/test/uniform-breaking.ly @@ -1,3 +1,4 @@ + %{ Hmm, ik vraag me af of dit al helemaal koel is. diff --git a/input/test/updown.ly b/input/test/updown.ly index 72ac92165b..2e0a473fdc 100644 --- a/input/test/updown.ly +++ b/input/test/updown.ly @@ -10,7 +10,7 @@ {\voiceTwo c}> - \version "1.3.117"; + ; } \paper { } diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly index 924669e953..ff8013c903 100644 --- a/input/test/vertical-align.ly +++ b/input/test/vertical-align.ly @@ -1,5 +1,5 @@ -\version "1.3.117"; + \score { \notes < diff --git a/input/test/vertical-extent.ly b/input/test/vertical-extent.ly index f548ae3080..d961cbfdf3 100644 --- a/input/test/vertical-extent.ly +++ b/input/test/vertical-extent.ly @@ -1,4 +1,5 @@ + \score { \notes < \context Staff = upper { diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly index 3039700865..bd091ac8f3 100644 --- a/input/test/vertical-text.ly +++ b/input/test/vertical-text.ly @@ -15,4 +15,4 @@ } } -\version "1.3.117"; + diff --git a/input/test/voice-switch.ly b/input/test/voice-switch.ly index d515666e94..0682bf8029 100644 --- a/input/test/voice-switch.ly +++ b/input/test/voice-switch.ly @@ -1,3 +1,4 @@ + \score{ \context Staff < \context Voice=one\skip 1; diff --git a/input/test/volta-start.ly b/input/test/volta-start.ly index 22da2abbbe..2e01d3c8d6 100644 --- a/input/test/volta-start.ly +++ b/input/test/volta-start.ly @@ -6,7 +6,7 @@ line, they should always start after the prefatory matter. "; } -\version "1.3.117"; + voiceB = \notes { \clef bass; diff --git a/input/test/volta.ly b/input/test/volta.ly index 927fe285d8..5ff5265dd5 100644 --- a/input/test/volta.ly +++ b/input/test/volta.ly @@ -1,5 +1,5 @@ -\version "1.3.117"; + voiceE = \notes { @@ -40,7 +40,7 @@ voicedefault = \notes { font_normal = 12.; \translator { \StaffContext - TimeSignature \override #'style = #"C" + TimeSignature \override #'style = #'C \consists Instrument_name_engraver; } } diff --git a/input/test/warnings.ly b/input/test/warnings.ly index 655d27c9a8..34d64ff246 100644 --- a/input/test/warnings.ly +++ b/input/test/warnings.ly @@ -1,3 +1,4 @@ + \header { texidoc="Various warnings "; diff --git a/input/tricks/beam-count.ly b/input/tricks/beam-count.ly index 89167f101e..8258679872 100644 --- a/input/tricks/beam-count.ly +++ b/input/tricks/beam-count.ly @@ -1,4 +1,5 @@ + fragment = \notes { f'32 g a b b a g f diff --git a/input/tricks/beam-dir-function.ly b/input/tricks/beam-dir-function.ly index d445468a09..ef044f8e2f 100644 --- a/input/tricks/beam-dir-function.ly +++ b/input/tricks/beam-dir-function.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" There are several ways to calculate the direction of a beam diff --git a/input/tricks/beam-neutral-direction.ly b/input/tricks/beam-neutral-direction.ly index f8e156810c..41187d8aa2 100644 --- a/input/tricks/beam-neutral-direction.ly +++ b/input/tricks/beam-neutral-direction.ly @@ -1,4 +1,5 @@ + fragment = \notes { [b''8 b] \property Voice.Beam \set #'default-neutral-direction = #-1 diff --git a/input/tricks/beam-position.ly b/input/tricks/beam-position.ly index b581904761..19c4922353 100644 --- a/input/tricks/beam-position.ly +++ b/input/tricks/beam-position.ly @@ -1,4 +1,5 @@ + fragment = \notes { \property Voice.Beam \set #'staff-position = #2 \property Voice.Beam \set #'height = #-2 diff --git a/input/tricks/beam-rest.ly b/input/tricks/beam-rest.ly index 736a84708e..bcdfe5b952 100644 --- a/input/tricks/beam-rest.ly +++ b/input/tricks/beam-rest.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Beams over rests. diff --git a/input/tricks/beam-slope.ly b/input/tricks/beam-slope.ly index 254a5cbc89..a31582b76a 100644 --- a/input/tricks/beam-slope.ly +++ b/input/tricks/beam-slope.ly @@ -1,4 +1,5 @@ + fragment = \notes { \property Voice.Beam \set #'direction = #1 \property Voice.Beam \set #'height-hs = #0 diff --git a/input/tricks/crescendo-text.ly b/input/tricks/crescendo-text.ly index b9b6edbf8a..fea7996def 100644 --- a/input/tricks/crescendo-text.ly +++ b/input/tricks/crescendo-text.ly @@ -1,4 +1,5 @@ + fragment = \notes { \context Voice { \property Voice.crescendoText = "cresc." diff --git a/input/tricks/embedded-postscript.ly b/input/tricks/embedded-postscript.ly index 9667149b14..491257bbb1 100644 --- a/input/tricks/embedded-postscript.ly +++ b/input/tricks/embedded-postscript.ly @@ -1,3 +1,4 @@ + \score { \notes \relative c'' { a-#"\\embeddedps{3 4 moveto 5 3 rlineto stroke}" diff --git a/input/tricks/embedded-tex.ly b/input/tricks/embedded-tex.ly index 970e2fce41..8a6e0465b6 100644 --- a/input/tricks/embedded-tex.ly +++ b/input/tricks/embedded-tex.ly @@ -1,4 +1,5 @@ + fragment = \notes { a''^"3 $\\times$ \\`a deux" } diff --git a/input/tricks/follow-thread.ly b/input/tricks/follow-thread.ly index bf370780cc..30dfa9d1fc 100644 --- a/input/tricks/follow-thread.ly +++ b/input/tricks/follow-thread.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Theads can be traced automagically when they switch staffs by setting diff --git a/input/tricks/fragment.ly b/input/tricks/fragment.ly index 8e37abee63..b4865d6787 100644 --- a/input/tricks/fragment.ly +++ b/input/tricks/fragment.ly @@ -1,3 +1,4 @@ + fragment = \notes { } diff --git a/input/tricks/german-chords.ly b/input/tricks/german-chords.ly index c88b747fff..b04aa71cb8 100644 --- a/input/tricks/german-chords.ly +++ b/input/tricks/german-chords.ly @@ -1,3 +1,4 @@ + % german-chords.ly: % german/norwegian/danish? @@ -33,4 +34,4 @@ linewidth = -1; } } - \ No newline at end of file + diff --git a/input/tricks/metronome.ly b/input/tricks/metronome.ly index 859f09f4c5..d712999f77 100644 --- a/input/tricks/metronome.ly +++ b/input/tricks/metronome.ly @@ -1,5 +1,5 @@ -\version "1.3.117"; + % Test scm markup text and kerning diff --git a/input/tricks/mmrest-collision.ly b/input/tricks/mmrest-collision.ly index 255b9e6fab..0fd96e72e8 100644 --- a/input/tricks/mmrest-collision.ly +++ b/input/tricks/mmrest-collision.ly @@ -1,3 +1,4 @@ + \score { \context Staff \notes < \context Voice=i { diff --git a/input/tricks/move-notehead.ly b/input/tricks/move-notehead.ly index 20d69836f9..87deb18689 100644 --- a/input/tricks/move-notehead.ly +++ b/input/tricks/move-notehead.ly @@ -1,4 +1,5 @@ + fragment = \notes { \outputproperty #(make-type-checker 'note-head-interface) #'extra-offset = #'(2 . 3) diff --git a/input/tricks/move-specific-text.ly b/input/tricks/move-specific-text.ly index 08c909a777..572a34c58b 100644 --- a/input/tricks/move-specific-text.ly +++ b/input/tricks/move-specific-text.ly @@ -1,3 +1,4 @@ + #(define (make-text-checker text) (lambda (grob) (equal? text (ly-get-elt-property grob 'text)))) diff --git a/input/tricks/no-bar-lines.ly b/input/tricks/no-bar-lines.ly index 6624407df6..1cd7f3cba5 100644 --- a/input/tricks/no-bar-lines.ly +++ b/input/tricks/no-bar-lines.ly @@ -1,3 +1,4 @@ + \score { \notes \relative c'' { a b c d diff --git a/input/tricks/no-staff.ly b/input/tricks/no-staff.ly index 05eba6615a..5385aa24d1 100644 --- a/input/tricks/no-staff.ly +++ b/input/tricks/no-staff.ly @@ -1,3 +1,4 @@ + \score { \notes { c4 c4 c8 c8 } \paper { diff --git a/input/tricks/ophee-slurs.ly b/input/tricks/ophee-slurs.ly index d32dd6c789..663856a909 100644 --- a/input/tricks/ophee-slurs.ly +++ b/input/tricks/ophee-slurs.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" Slurs can be forced to always attach to note heads. diff --git a/input/tricks/ottava.ly b/input/tricks/ottava.ly index 513946dab5..590bd730a8 100644 --- a/input/tricks/ottava.ly +++ b/input/tricks/ottava.ly @@ -1,4 +1,5 @@ + fragment = \notes { a'''' b c a \property Voice.TextSpanner \set #'type = #'dotted-line diff --git a/input/tricks/part-combine.ly b/input/tricks/part-combine.ly index ec4262f3a8..3e04e524b3 100644 --- a/input/tricks/part-combine.ly +++ b/input/tricks/part-combine.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" In orchestral scores and hymns, voices are traditionally combined onto diff --git a/input/tricks/partial-blank.ly b/input/tricks/partial-blank.ly index 52131592eb..9b15bde29d 100644 --- a/input/tricks/partial-blank.ly +++ b/input/tricks/partial-blank.ly @@ -5,7 +5,7 @@ %} \include "paper16.ly" -\version "1.3.129"; + quickmeasure = \notes {[\repeat unfold 16 c''16]} mel = \notes \relative c' {c16 d16 e8 a4 g2 e8 d c2. g'1 e4 d c2} diff --git a/input/tricks/reverse-music.ly b/input/tricks/reverse-music.ly index 0d9fe6a522..d93a8ec542 100644 --- a/input/tricks/reverse-music.ly +++ b/input/tricks/reverse-music.ly @@ -1,3 +1,4 @@ + \header { texidoc=" Simple customised music apply. diff --git a/input/tricks/slur-attachment-override.ly b/input/tricks/slur-attachment-override.ly index 67e7435a47..90f91188d1 100644 --- a/input/tricks/slur-attachment-override.ly +++ b/input/tricks/slur-attachment-override.ly @@ -1,3 +1,4 @@ + \header{ texidoc=" In some cases, you may want to set slur attachments by hand. diff --git a/input/tricks/slur-attachment.ly b/input/tricks/slur-attachment.ly index 4182bb38c6..3b1ea943e2 100644 --- a/input/tricks/slur-attachment.ly +++ b/input/tricks/slur-attachment.ly @@ -1,4 +1,5 @@ + fragment = \notes { \property Voice.Slur \set #'direction = #1 \property Voice.Stem \set #'length = #5.5 diff --git a/input/tricks/slur-ugly.ly b/input/tricks/slur-ugly.ly index 7406ba233b..5e021dd199 100644 --- a/input/tricks/slur-ugly.ly +++ b/input/tricks/slur-ugly.ly @@ -1,3 +1,4 @@ + \header { texidoc="You can get ugly slurs, if you want. "; diff --git a/input/tricks/smart-transpose.ly b/input/tricks/smart-transpose.ly index 697c54585e..27d4df98b6 100644 --- a/input/tricks/smart-transpose.ly +++ b/input/tricks/smart-transpose.ly @@ -1,3 +1,4 @@ + \header { texidoc=" @example diff --git a/input/tricks/staff-container.ly b/input/tricks/staff-container.ly index fb67f54158..647a3765ce 100644 --- a/input/tricks/staff-container.ly +++ b/input/tricks/staff-container.ly @@ -1,4 +1,5 @@ + \header { texidoc = "By splitting the grouping (Axis_group_engraver) and diff --git a/input/trip.ly b/input/trip.ly index 53b5cb9cde..79da706d91 100644 --- a/input/trip.ly +++ b/input/trip.ly @@ -19,7 +19,7 @@ TODO: %} -\version "1.3.117"; + praeludiumRight = \notes { \key e \major; \clef violin; diff --git a/input/tutorial/flowing.ly b/input/tutorial/flowing.ly index 8307139e96..9ef044063d 100644 --- a/input/tutorial/flowing.ly +++ b/input/tutorial/flowing.ly @@ -1,3 +1,4 @@ + \header { title = "The river is flowing"; composer = "Traditonal (?)"; diff --git a/input/tutorial/galuppi.ly b/input/tutorial/galuppi.ly index 64384ec1c2..44e40c4e36 100644 --- a/input/tutorial/galuppi.ly +++ b/input/tutorial/galuppi.ly @@ -1,4 +1,5 @@ + soprano = \notes \relative c'' { fis8 g g8.-\trill fis32 g a8 d, r a b4 ~ \times 2/3 { [b16 cis d] } \times 2/3 { [e fis g] } @@ -7,12 +8,12 @@ soprano = \notes \relative c'' { } bass = \notes \relative c { - \property Voice.verticalDirection = \down + \stemDown\slurDown\tieDown d4 e fis r8 fis | g4. g8 fis4. fis8 e8 e a a d,4 } tenor = \notes \relative c' { - \property Voice.verticalDirection = \up + \stemUp\slurUp\tieUp r8 d4 cis8 r d16. cis32 d4 | r8 e16. dis32 e4 ~ e8 d16. cis32 d4 ~ | [d8 d8] [cis cis] d4 @@ -21,10 +22,10 @@ tenor = \notes \relative c' { \score { \context PianoStaff \notes < - \context Staff = top { \key d; \time 4/4; + \context Staff = top { \key d \major; \time 4/4; \soprano } - \context Staff = bottom < \key d; \time 4/4; \clef bass; + \context Staff = bottom < \key d \major; \time 4/4; \clef bass; \context Voice = up { \tenor } \context Voice = down { \bass } > diff --git a/input/tutorial/ly2dvi.ly b/input/tutorial/ly2dvi.ly index 2d0fb5ab03..669c020759 100644 --- a/input/tutorial/ly2dvi.ly +++ b/input/tutorial/ly2dvi.ly @@ -1,3 +1,4 @@ + \header { title = "Two miniatures"; } diff --git a/input/tutorial/menuet.ly b/input/tutorial/menuet.ly index a1eb48cb46..6cef8dee95 100644 --- a/input/tutorial/menuet.ly +++ b/input/tutorial/menuet.ly @@ -1,3 +1,4 @@ + % lines preceded by a percent are comments. \include "paper16.ly" \score { diff --git a/input/tutorial/orchestral-score.ly b/input/tutorial/orchestral-score.ly index 58a188dbaa..aad42f87e0 100644 --- a/input/tutorial/orchestral-score.ly +++ b/input/tutorial/orchestral-score.ly @@ -1,4 +1,4 @@ -\version "1.3.130"; + \include "paper13.ly"; diff --git a/input/tutorial/sammartini.ly b/input/tutorial/sammartini.ly index 8b48be1813..653c26a661 100644 --- a/input/tutorial/sammartini.ly +++ b/input/tutorial/sammartini.ly @@ -1,3 +1,4 @@ + \include "paper16.ly"; stemdown = \property Voice.Stem \override #'direction = #-1 @@ -6,40 +7,40 @@ stemboth = \property Voice.Stem \revert #'direction viola = \notes \relative c' \context Voice = viola { - \stemdown g'8. b,16 + \stemDown g'8. b,16 s1 s2. r4 g } oboes = \notes \relative c'' \context Voice = oboe { - \stemup s4 g8. b,16 c8 r + \stemUp s4 g8. b,16 c8 r \grace \times 2/3 { } < { \times 2/3 { a8 g c } \! c2 } \context Voice = oboeTwo { - \stemdown + \stemDown \grace { \property Grace.Stem \override #'direction = #-1 [f,16 g] } f8 e e2 } > - \stemboth + \stemBoth \grace <)b8. d8.-\trill> | [ < )f8. a>] <)b,8 d> r [ ] r | [ < )e8. g>] } hoomPah = \repeat unfold 8 - \notes \transpose c' { c8 \stemdown c'8 \stemup } + \notes \transpose c' { c8 \stemDown c'8 \stemUp } bassvoices = \notes \relative c' { c4 g8. b,16 \autochange Staff \hoomPah \translator Staff = down - \stemdown [c8 c'8] r4 + \stemDown [c8 c'8] r4 r4 - < {\stemup r2 } - \context Voice = reallyLow {\stemdown g2 ~ | g4 c8 } > + < {\stemUp r2 } + \context Voice = reallyLow {\stemDown g2 ~ | g4 c8 } > } \score { diff --git a/input/tutorial/singing-saw.ly b/input/tutorial/singing-saw.ly index b6080d8579..bd55955050 100644 --- a/input/tutorial/singing-saw.ly +++ b/input/tutorial/singing-saw.ly @@ -1,4 +1,5 @@ + accompMotif = \notes \relative c { \times 2/3 { c8 g' es' } \times 2/3 { c' es, g, } diff --git a/input/tutorial/test.ly b/input/tutorial/test.ly index 072908b685..c1fc4dbff3 100644 --- a/input/tutorial/test.ly +++ b/input/tutorial/test.ly @@ -1,4 +1,5 @@ + \header { title = "Test"; } diff --git a/input/tutorial/wss.ly b/input/tutorial/wss.ly index a74b650124..cd51984d24 100644 --- a/input/tutorial/wss.ly +++ b/input/tutorial/wss.ly @@ -1,4 +1,5 @@ + \score { \notes {\notes \reletive c' { diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index e47c8317d6..f95be9930c 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -7,7 +7,6 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.117"; melodie = \notes\relative c'' { \clef "violin"; @@ -34,7 +33,7 @@ acc = \chords { } text = \lyrics{ - \property Lyrics . textStyle = "italic" + \property Lyrics.LyricText \set #'font-style = #'italic Ah!4 vous dir -- ai -- je ma man2 Ce4 qui cau -- se mon tour -- ment2 diff --git a/input/twinkle.ly b/input/twinkle.ly index 0407456491..9e9ff0faee 100644 --- a/input/twinkle.ly +++ b/input/twinkle.ly @@ -20,7 +20,7 @@ Tested Features: lyrics, interleaving lyrics and staffs, repeats, auto beaming, adding lyrics to notes, hyphens %} -\version "1.3.117"; + melody = \notes \relative c'' { \clef violin; diff --git a/scm/backend-documentation-lib.scm b/scm/backend-documentation-lib.scm index ace2bec64f..4c14181208 100644 --- a/scm/backend-documentation-lib.scm +++ b/scm/backend-documentation-lib.scm @@ -34,7 +34,7 @@ "(unset)" (scm->texi (cdr handle)))) (propdoc (backend-property->texi sym))) - + (cons (car propdoc) (string-append (cdr propdoc) "\nDefault value: " defval)))) diff --git a/scm/font.scm b/scm/font.scm index 7c50827b44..59bfb5458d 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -217,6 +217,7 @@ (music . ((font-family . music) (lookup . name))) (finger . ((font-style . finger))) (bold . ((font-series . bold))) + (upright . ((font-shape . upright))) (italic . ((font-shape . italic))) (named . ((lookup . name))) (super . ((raise . 1) (font-relative-size . -1))) diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 32e7a67705..0456f5093d 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -136,7 +136,7 @@ (visibility-lambda . ,end-of-line-visible) (style . vaticana) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) - (meta . ,(grob-description "Custos" custos-interface staff-symbol-interface break-aligned-interface) ) + (meta . ,(grob-description "Custos" custos-interface staff-symbol-referencer-interface break-aligned-interface) ) )) (Hairpin . ( @@ -428,6 +428,7 @@ (Script . ( (molecule-callback . ,Script::brew_molecule) + (direction . -1) (X-offset-callbacks . (,Side_position_interface::centered_on_parent)) (after-line-breaking-callback . ,Script::after_line_breaking) (meta . ,(grob-description "Script" script-interface side-position-interface font-interface)) @@ -510,6 +511,7 @@ )) (SostenutoPedal . ( (molecule-callback . ,Text_item::brew_molecule) + (direction . -1) (X-offset-callbacks . (,Side_position_interface::aligned_on_self)) (Y-offset-callbacks . (,Side_position_interface::aligned_side @@ -564,6 +566,7 @@ (no-spacing-rods . #t) (molecule-callback . ,Sustain_pedal::brew_molecule) (self-alignment-X . 0) + (direction . -1) (X-offset-callbacks . (,Side_position_interface::aligned_on_self)) (Y-offset-callbacks . (,Side_position_interface::aligned_side @@ -599,6 +602,7 @@ (TextScript . ( (molecule-callback . ,Text_item::brew_molecule) (no-spacing-rods . #t) + (direction . -1) (padding . 0.5) (baseline-skip . 2) (font-family . roman) @@ -661,6 +665,7 @@ (font-shape . italic) (no-spacing-rods . #t) (self-alignment-X . 0) + (direction . -1) (X-offset-callbacks . (,Side_position_interface::aligned_on_self)) (Y-offset-callbacks . (,Side_position_interface::aligned_side diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index 0c3306f56e..0cd604e3d0 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -246,6 +246,7 @@ itself. Return value is ignored.") (grob-property-description 'stacking-dir dir? "stack contents of grobs in which direction ?.") (grob-property-description 'staff-space number? "Amount of line leading relative to global staffspace.") (grob-property-description 'staff-position number? "vertical position in staff spaces, counted from the middle line.") +(grob-property-description 'staff-symbol boolean? "the staff symbol grob that we're in.") (grob-property-description 'staffline-clearance number? "don't get closer than this to stafflines.") (grob-property-description 'stem ly-grob? "pointer to Stem object.") (grob-property-description 'stem-centered boolean? "Center stems on note heads. Useful for mensural notation.") diff --git a/scm/interface-description.scm b/scm/interface-description.scm index 8087d3e8b3..a16c61a49b 100644 --- a/scm/interface-description.scm +++ b/scm/interface-description.scm @@ -782,5 +782,5 @@ direction = Forced direction for all ties" all-interfaces))) -(define interface-names (map (lambda (x) (symbol->string (car x))) all-interfaces)) +(define (interface-names) (map (lambda (x) (symbol->string (car x))) all-interfaces)) diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 3481615241..2596951399 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -570,8 +570,18 @@ if 1: str = re.sub ('\\\\property *"?([^.]+)"? *[.] *"?timeSignatureStyle"? *= *"([^"]*)"', '\\\\property \\1.TimeSignature \\\\override #\'style = #\'\\2', str) - str = re.sub ('\\\\property *"?([^.]+)"? *[.] *"?horizontalNoteShift"? *= *"?#?([0-9]+)"?', '\\\\property \\1.NoteColumn \\\\override #\'horizonta-shift = #\\2', str) + str = re.sub ('"?timeSignatureStyle"? *= *#?""', 'TimeSignature \\\\override #\'style = ##f, str) + + str = re.sub ('"?timeSignatureStyle"? *= *#?"([^"]*)"', 'TimeSignature \\\\override #\'style = #\'\\1', str) + + str = re.sub ('#\'style *= #*"([^"])"', '#\'style = #\'\\1', str) + + str = re.sub ('\\\\property *"?([^.]+)"? *[.] *"?horizontalNoteShift"? *= *"?#?([0-9]+)"?', '\\\\property \\1.NoteColumn \\\\override #\'horizontal-shift = #\\2', str) + # ugh + str = re.sub ('\\\\property *"?([^.]+)"? *[.] *"?flagStyle"? *= *""', '\\\\property \\1.Stem \\\\override #\'flag-style = ##f', str) + + str = re.sub ('\\\\property *"?([^.]+)"? *[.] *"?flagStyle"? *= *"([^"]*)"', '\\\\property \\1.Stem \\\\override #\'flag-style = #\'\\2', str) return str conversions.append (((1,3,98), conv, 'CONTEXT.textStyle -> GROB.#font-style ')) @@ -695,10 +705,13 @@ def do_conversion (infile, from_version, outfile, to_version): if last_conversion: sys.stderr.write ('\n') new_ver = '\\version \"%s\"' % tup_to_str (last_conversion) + # JUNKME? + # ugh: this all really doesn't help + # esp. as current conversion rules are soo incomplete if re.search (lilypond_version_re_str, str): str = re.sub (lilypond_version_re_str,'\\'+new_ver , str) - else: - str = new_ver + '\n' + str + #else: + # str = new_ver + '\n' + str outfile.write(str) -- 2.39.2