From d6ea2dbcdb39dd65c7fd423782fa31ccbdaf34a9 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 26 Aug 2003 11:38:23 +0000 Subject: [PATCH] * input/regression/bar-number.ly: remove unnecessary old-relative options. * Documentation/user/internals.itely (Creating contexts): document \newcontext * lily/parser.yy (Composite_music): add \newcontext * Documentation/user/refman.itely (MIDI block): add note about dotted tempos. * lily/my-lily-lexer.cc (start_main_input): define input-file-name as Scheme variable. --- ChangeLog | 8 ++ Documentation/topdocs/NEWS.texi | 15 ++++ Documentation/user/cheatsheet.itely | 6 +- Documentation/user/internals.itely | 14 ++- Documentation/user/refman.itely | 89 ++++++++++--------- Documentation/user/tutorial.itely | 28 +++--- input/regression/accidental-placement.ly | 2 +- input/regression/accidental-single-double.ly | 2 +- .../accidental-unbroken-tie-spacing.ly | 2 +- input/regression/accidental.ly | 2 +- input/regression/ambitus.ly | 2 +- input/regression/apply-context.ly | 2 +- input/regression/apply-output.ly | 2 +- input/regression/arpeggio.ly | 2 +- input/regression/auto-beam-bar.ly | 2 +- input/regression/auto-beam-triplet.ly | 2 +- input/regression/auto-beam-tuplets.ly | 2 +- input/regression/auto-beam.ly | 2 +- input/regression/auto-change.ly | 2 +- input/regression/bar-number.ly | 2 +- input/regression/beam-auto-knee.ly | 2 +- input/regression/beam-break.ly | 2 +- input/regression/beam-center-slope.ly | 2 +- input/regression/beam-concave.ly | 2 +- .../regression/beam-cross-staff-auto-knee.ly | 2 +- input/regression/beam-cross-staff.ly | 2 +- input/regression/beam-damp.ly | 2 +- input/regression/beam-default-lengths.ly | 2 +- input/regression/beam-extreme.ly | 2 +- input/regression/beam-french.ly | 2 +- input/regression/beam-funky-beamlet.ly | 2 +- input/regression/beam-funky.ly | 2 +- input/regression/beam-knee-symmetry.ly | 2 +- input/regression/beam-length.ly | 2 +- input/regression/beam-manual-beaming.ly | 2 +- input/regression/beam-manual.ly | 2 +- input/regression/beam-over-barline.ly | 2 +- input/regression/beam-position.ly | 2 +- input/regression/beam-postfix-notation.ly | 2 +- input/regression/beam-quanting-horizontal.ly | 2 +- input/regression/beam-quarter.ly | 2 +- input/regression/beam-rest.ly | 2 +- input/regression/beam-second.ly | 2 +- input/regression/beam-shortened-lengths.ly | 2 +- input/regression/beamed-chord.ly | 2 +- input/regression/beaming-ternary-metrum.ly | 2 +- input/regression/beaming.ly | 2 +- input/regression/beams.ly | 2 +- input/regression/between-systems.ly | 2 +- input/regression/break.ly | 2 +- input/regression/chord-scripts.ly | 2 +- input/regression/cluster.ly | 2 +- input/regression/completion-heads.ly | 2 +- input/regression/dot-flag-collision.ly | 2 +- input/regression/dynamics-broken-hairpin.ly | 2 +- input/regression/dynamics-glyphs.ly | 2 +- input/regression/dynamics-line.ly | 2 +- input/regression/finger-chords.ly | 2 +- input/regression/fingering.ly | 2 +- input/regression/follow-voice-break.ly | 2 +- input/regression/font-magnification.ly | 2 +- input/regression/generic-output-property.ly | 2 +- input/regression/grace-auto-beam.ly | 2 +- input/regression/grace-bar-line.ly | 2 +- input/regression/grace-bar-number.ly | 2 +- input/regression/grace-beam.ly | 2 +- input/regression/grace-dynamic.ly | 2 +- input/regression/grace-end.ly | 2 +- input/regression/grace-nest5.ly | 2 +- input/regression/grace-part-combine.ly | 2 +- input/regression/grace-start.ly | 2 +- input/regression/grace-stems.ly | 2 +- input/regression/grace.ly | 2 +- input/regression/hairpin-ending.ly | 2 +- input/regression/instrument-name-partial.ly | 2 +- input/regression/key-clefs.ly | 2 +- input/regression/key-signature-scordatura.ly | 2 +- input/regression/keys.ly | 2 +- input/regression/lyric-align.ly | 2 +- input/regression/lyric-combine.ly | 2 +- input/regression/lyric-phrasing.ly | 2 +- input/regression/lyrics-melisma-beam.ly | 2 +- input/regression/lyrics-multi-stanza.ly | 2 +- input/regression/measure-grouping.ly | 2 +- input/regression/metronome-marking.ly | 2 +- input/regression/mm-rests2.ly | 2 +- input/regression/molecule-hacking.ly | 2 +- input/regression/non-empty-text.ly | 2 +- input/regression/note-group-bracket.ly | 2 +- input/regression/note-head-chord.ly | 2 +- input/regression/number-staff-lines.ly | 2 +- input/regression/ottava-broken.ly | 2 +- input/regression/ottava.ly | 2 +- input/regression/output-property.ly | 2 +- input/regression/pc-mmrest.ly | 2 +- input/test/beam-rest.ly | 2 +- lily/my-lily-lexer.cc | 1 + lily/parser.yy | 64 ++++++++----- lily/scm-option.cc | 2 +- ly/init.ly | 2 +- 100 files changed, 231 insertions(+), 178 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa4c77b406..d0604419e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2003-08-26 Han-Wen Nienhuys + * input/regression/bar-number.ly: remove unnecessary old-relative + options. + + * Documentation/user/internals.itely (Creating contexts): document + \newcontext + + * lily/parser.yy (Composite_music): add \newcontext + * Documentation/user/refman.itely (MIDI block): add note about dotted tempos. diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi index 6c207e4ba0..ccdb2e4dc7 100644 --- a/Documentation/topdocs/NEWS.texi +++ b/Documentation/topdocs/NEWS.texi @@ -9,6 +9,21 @@ @itemize +@item +The @code{\newcontext} command will create a context with a unique +name automatically. Hence, for multi-staff scores, it is no longer +necessary to invent arbitrary context names. For example, a two-staff +score may be created by + +@example + \simultaneous @{ + \newcontext Staff @{ @var{notes for 1st staff} @} + \newcontext Staff @{ @var{notes for 2nd staff} @} + @} +@end example + + + @item Octave checks make octave errors easier to correct. The syntax is diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely index 528b015e04..277f49c797 100644 --- a/Documentation/user/cheatsheet.itely +++ b/Documentation/user/cheatsheet.itely @@ -149,12 +149,12 @@ a8-[ b-] @end lilypond -@item @code{< \context Staff ... >} +@item @code{< \newcontext Staff ... >} @tab more staves @tab @lilypond[fragment] -< \context Staff = SA { c'1 } - \context Staff = SB { c'1 } > +< \newcontext Staff { c'1 } + \newcontext Staff { c'1 } > @end lilypond diff --git a/Documentation/user/internals.itely b/Documentation/user/internals.itely index c66013c6c0..cfadcc9ac0 100644 --- a/Documentation/user/internals.itely +++ b/Documentation/user/internals.itely @@ -74,10 +74,11 @@ performance contexts can be found in @file{ly/engraver-init.ly} and @cindex @code{\context} @cindex context selection -Contexts for a music expression can be selected manually, using the -following music expression: +Contexts for a music expression can be selected manually, using one of +the following music expressions: @example +\newcontext @var{contexttype} @var{musicexpr} \context @var{contexttype} [= @var{contextname}] @var{musicexpr} @end example @@ -102,6 +103,15 @@ Within @code{another}, a (default) Voice context is created for the @code{e4}. A context is ended when when all music referring it has finished, so after the third quarter, @code{another} is removed. +The @code{\newcontext} construction creates a context with a +generated, unique @var{contextname}. An expression with +@code{\newcontext} always leads to a new context. This is convenient +for creating multiple staffs, multiple lyric lines, etc. + +When using automatic staff changes, automatic phrasing, etc., the +context names have special meanings, so @code{\newcontext} cannot be +used. + @node Default contexts @subsection Default contexts diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 9030b57be8..ae561b2f22 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1103,11 +1103,11 @@ connected between different staves of a @internalsref{StaffGroup}: @c @lilypond[fragment, verbatim] < \context StaffGroup < - \context Staff = up { e'4 d' + \newcontext Staff { e'4 d' \bar "||" f' e' } - \context Staff = down { \clef bass c4 g e g } > -\context Staff = pedal { \clef bass c2 c2 } > + \newcontext Staff { \clef bass c4 g e g } > +\newcontext Staff { \clef bass c2 c2 } > @end lilypond @@ -1158,7 +1158,7 @@ is to split chords using the separator @code{\\}. You can use it for small, short-lived voices or for single chords: @lilypond[verbatim,fragment] -\context Voice = VA \relative c'' { +\context Staff \relative c'' { c4 < { f d e } \\ { b c2 } > c4 < g' \\ b, \\ f' \\ d > } @end lilypond @@ -1176,9 +1176,9 @@ a stem directions and horizontal shift for each part: @lilypond[singleline, verbatim] \relative c'' -\context Staff < \context Voice = VA { \voiceOne cis2 b } - \context Voice = VB { \voiceThree b4 ais ~ ais4 gis4 } - \context Voice = VC { \voiceTwo fis4~ fis4 f ~ f } > +\context Staff < \newcontext Voice { \voiceOne cis2 b } + \newcontext Voice { \voiceThree b4 ais ~ ais4 gis4 } + \newcontext Voice { \voiceTwo fis4~ fis4 f ~ f } > @end lilypond Normally, note heads with a different number of dots are not merged, but @@ -1517,26 +1517,26 @@ creation of the piano staff: @example \score @{ \notes \relative c'' < - \context Staff = sa @{ cis4 d e2 @} + \newcontext Staff @{ cis4 d e2 @} \context GrandStaff < \pianoAccidentals - \context Staff = sb @{ cis4 d e2 @} - \context Staff = sc @{ es2 c @} + \newcontext Staff @{ cis4 d e2 @} + \newcontext Staff @{ es2 c @} > - \context Staff = sd @{ es2 c @} + \newcontext Staff @{ es2 c @} > @} @end example @lilypond[singleline] \score { \notes \relative c'' < - \context Staff = sa { cis4 d e2 } + \newcontext Staff { cis4 d e2 } \context GrandStaff < \pianoAccidentals - \context Staff = sb { cis4 d e2 } - \context Staff = sc { es2 c } + \newcontext Staff { cis4 d e2 } + \newcontext Staff { es2 c } > - \context Staff = sd { es2 c } + \newcontext Staff { es2 c } > \paper { \translator { @@ -2182,8 +2182,8 @@ In the following example, there are two sixteenth graces notes for every eighth grace note: @lilypond[relative=2,verbatim,fragment] -< \context Staff = SA { e4 \grace { c16[ d e f] } e4 } - \context Staff = SB { c'4 \grace { g8[ b] } c4 } > +< \newcontext Staff { e4 \grace { c16[ d e f] } e4 } + \newcontext Staff { c'4 \grace { g8[ b] } c4 } > @end lilypond @@ -2274,8 +2274,8 @@ such as key signatures, barlines, etc. are also synchronized. Take care when you mix staves with grace notes and staves without, for example, @lilypond[relative=2,verbatim,fragment] -< \context Staff = SA { e4 \bar "|:" \grace c16 d4 } - \context Staff = SB { c4 \bar "|:" d4 } > +< \newcontext Staff { e4 \bar "|:" \grace c16 d4 } + \newcontext Staff { c4 \bar "|:" d4 } > @end lilypond Grace sections should only be used within sequential music @@ -2720,8 +2720,8 @@ down = \notes { bassdrum4 snare8 bd r bd sn4 } \score { \apply #(drums->paper 'drums) \context Staff < \clef percussion - \context Voice = up { \voiceOne \up } - \context Voice = down { \voiceTwo \down } + \newcontext Voice { \voiceOne \up } + \newcontext Voice { \voiceTwo \down } > } @@ -2911,8 +2911,8 @@ down = \notes { bd4 sn bd toml8 toml } \score { \apply #(drums->paper 'mydrums) \context Staff < \clef percussion - \context Voice = up { \voiceOne \up } - \context Voice = down { \voiceTwo \down } + \newcontext Voice { \voiceOne \up } + \newcontext Voice { \voiceTwo \down } > } @end lilypond @@ -2940,12 +2940,12 @@ down = \notes { bassdrum4 snare8 bd r bd sn4 } bass = \notes \transpose c c,, { a4. e8 r e g e } \score { < - \apply #(drums->paper 'drums) \context Staff = drums < + \apply #(drums->paper 'drums) \newcontext Staff < \clef percussion - \context Voice = up { \voiceOne \up } - \context Voice = down { \voiceTwo \down } + \newcontext Voice { \voiceOne \up } + \newcontext Voice { \voiceTwo \down } > - \context Staff = bass { \clef "F_8" \bass } + \newcontext Staff { \clef "F_8" \bass } > } @end lilypond @@ -3030,7 +3030,10 @@ Voices can switch automatically between the top and the bottom staff. The syntax for this is @example \autochange Staff \context Voice @{ @dots{}@var{music}@dots{} @} -@end example +@end example +The two staffs of the piano staff must be named @code{up} and +@code{down}. + The autochanger switches on basis of pitch (central C is the turning point), and it looks ahead skipping over rests to switch in advance. Here is a practical example: @@ -3166,8 +3169,8 @@ in both staves, and set @lilypond[fragment,relative,verbatim] \context PianoStaff < \property PianoStaff.connectArpeggios = ##t - \context Voice = one { <>-\arpeggio } - \context Voice = other { \clef bass <>-\arpeggio } + \newcontext Staff { <>-\arpeggio } + \newcontext Staff { \clef bass <>-\arpeggio } > @end lilypond @@ -3374,24 +3377,24 @@ more complex orderings, the best way is to setup the hierarchy of staves and lyrics first, e.g. @example \context ChoirStaff \notes < - \context Lyrics = LA @{ s1 @} - \context Staff = SA @{ s1 @} - \context Lyrics = LB @{ s1 @} - \context Staff = SB @{ s1 @} + \newcontext Lyrics @{ s1 @} + \newcontext Staff @{ s1 @} + \newcontext Lyrics @{ s1 @} + \newcontext Staff @{ s1 @} > @end example and then combine the appropriate melodies and lyric lines: @example \addlyrics - \context Staff = SA @emph{the music} - \context Lyrics = LA @emph{the lyrics} + \newcontext Staff @emph{the music} + \newcontext Lyrics @emph{the lyrics} @end example putting both together, you would get @example \context ChoirStaff \notes < - \context Lyrics = LA @dots{} - \context Staff = SB @dots{} + \newcontext Lyrics @dots{} + \newcontext Staff @dots{} \addlyrics @dots{} > @end example @@ -3548,8 +3551,8 @@ lower = \notes \relative c { \score { \context ChoirStaff { < - \context Staff = one { \upper } - \context Staff = three { \lower } + \newcontext Staff { \upper } + \newcontext Staff { \lower } > } \paper { @@ -4117,7 +4120,7 @@ You can also use markup texts to construct more complicated instrument names: @lilypond[fragment,verbatim,singleline] - \notes \context Staff = treble { + \notes { \property Staff.instrument = \markup { \column << "Clarinetti" { "in B" @@ -4389,8 +4392,8 @@ in this example disappears in the second line: @lilypond[verbatim] \score { \notes \relative c' < - \context Staff = SA { e4 f g a \break c1 } - \context Staff = SB { c4 d e f \break R1 } + \newcontext Staff { e4 f g a \break c1 } + \newcontext Staff { c4 d e f \break R1 } > \paper { linewidth = 6.\cm diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index e484713656..8c90864b2e 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -655,8 +655,8 @@ staff is marked by adding @code{\context Staff} before it. These @quotation @lilypond[fragment,verbatim] \simultaneous { - \context Staff = staffA { \clef violin c'' } - \context Staff = staffB { \clef bass c } + \newcontext Staff { \clef violin c'' } + \newcontext Staff { \clef bass c } } @end lilypond @end quotation @@ -696,14 +696,14 @@ We can now typeset a melody with two staves: @lilypond[verbatim,singleline] \score { \notes - < \context Staff = staffA { + < \newcontext Staff { \time 3/4 \clef violin \relative c'' { e2( d4 c2 b4 a8[ a] b[ b] g[ g] a2.) } } - \context Staff = staffB { + \newcontext Staff { \clef bass c2 e4 g2. f4 e d c2. @@ -1273,11 +1273,11 @@ Again, these expressions can be nested arbitrarily: @lilypond[fragment] < - \context Staff = staffA + \newcontext Staff \relative c'' < { a4 g2 f4-~ f4 } \\ { s4 g4 f2 f4 } > - \context Staff = staffB + \newcontext Staff < { \clef bass <>1 } \\ { f4 d e2 } > @@ -1299,8 +1299,8 @@ Piano music is always typeset in two staves connected by a brace. Printing such a staff is done similar to the polyphonic example in @ref{Combining music into compound expressions}: @example - < \context Staff = up @{ @dots{} @} - \context Staff = down @{ @dots{} @} + < \newcontext Staff @{ @dots{} @} + \newcontext Staff @{ @dots{} @} > @end example but now this entire expression must be interpreted as a @@ -1313,9 +1313,9 @@ Here is a full-fledged example: @lilypond[relative 0,fragment] \context PianoStaff - < \context Staff = up { \time 2/4 + < \newcontext Staff { \time 2/4 c4 c g' g } - \context Staff = down { + \newcontext Staff { \clef bass c,, c' e c } > @end lilypond @@ -1652,8 +1652,8 @@ file @file{bassoon-music.ly}: \score @{ \simultaneous @{ - \context Staff = hornStaff \hornNotes - \context Staff = bsnStaff \bassoonNotes + \newcontext Staff \hornNotes + \newcontext Staff \bassoonNotes @} @} @end example @@ -1662,10 +1662,10 @@ This would lead to the simple score depicted below: @lilypond[singleline] \score { \notes \relative c \simultaneous { - \context Staff = hornStaff { \time 2/4 + \newcontext Staff { \time 2/4 R2*3 r4 f8 a cis4 f e d } - \context Staff = fagStaff { \clef bass + \newcontext Staff { \clef bass r4 d,8 f | gis4 c | b bes | a8 e f4 | g d | gis f } } } diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly index f7a45c064c..a424618789 100644 --- a/input/regression/accidental-placement.ly +++ b/input/regression/accidental-placement.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly index 4391992306..7e96efe590 100644 --- a/input/regression/accidental-single-double.ly +++ b/input/regression/accidental-single-double.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ texidoc=" diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly index 53f95b3068..9587d656d4 100644 --- a/input/regression/accidental-unbroken-tie-spacing.ly +++ b/input/regression/accidental-unbroken-tie-spacing.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \header { texidoc = "Tied accidentaled notes (which cause reminder accidentals) don't wreak havoc in the spacing when unbroken." diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly index 0fed2637ba..83468c0b00 100644 --- a/input/regression/accidental.ly +++ b/input/regression/accidental.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly index d136f82ff8..fb38cd23e0 100644 --- a/input/regression/ambitus.ly +++ b/input/regression/ambitus.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \header { texidoc = "Ambituses indicate pitch ranges for voices. diff --git a/input/regression/apply-context.ly b/input/regression/apply-context.ly index 9e6320ef62..0b9c57712c 100644 --- a/input/regression/apply-context.ly +++ b/input/regression/apply-context.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly index cd4bf3728c..88e9b7045f 100644 --- a/input/regression/apply-output.ly +++ b/input/regression/apply-output.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly index 303c8dd9a9..277b308961 100644 --- a/input/regression/arpeggio.ly +++ b/input/regression/arpeggio.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ texidoc=" diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly index e864261f78..5364837395 100644 --- a/input/regression/auto-beam-bar.ly +++ b/input/regression/auto-beam-bar.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly index d2ecfcb2eb..3f3a0306d5 100644 --- a/input/regression/auto-beam-triplet.ly +++ b/input/regression/auto-beam-triplet.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \header { texidoc = "Automatic beaming is also done on tuplets." diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly index 9656496596..c0d9aea33b 100644 --- a/input/regression/auto-beam-tuplets.ly +++ b/input/regression/auto-beam-tuplets.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly index 8848aadda3..234cfe4487 100644 --- a/input/regression/auto-beam.ly +++ b/input/regression/auto-beam.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \header { texidoc="Test automatic beamer: the last measure should have a single beam." diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly index 5585613c21..01567777e7 100644 --- a/input/regression/auto-change.ly +++ b/input/regression/auto-change.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly index 4ea24600ed..2e595a9de7 100644 --- a/input/regression/bar-number.ly +++ b/input/regression/bar-number.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly index d8211f9739..8d4c5ec1f3 100644 --- a/input/regression/beam-auto-knee.ly +++ b/input/regression/beam-auto-knee.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ texidoc="Automatic kneeing. A knee is made when a horizontal diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly index f66a5c34a7..fceb8c164f 100644 --- a/input/regression/beam-break.ly +++ b/input/regression/beam-break.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \header { texidoc = "Beams can be printed across line breaks if forced. " diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly index 2221ca2b07..4e642b01be 100644 --- a/input/regression/beam-center-slope.ly +++ b/input/regression/beam-center-slope.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly index 46be76e827..1d52cadeed 100644 --- a/input/regression/beam-concave.ly +++ b/input/regression/beam-concave.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly index 2c17f6e818..7da8577341 100644 --- a/input/regression/beam-cross-staff-auto-knee.ly +++ b/input/regression/beam-cross-staff-auto-knee.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly index 00a13bb8a7..2f4c6e2982 100644 --- a/input/regression/beam-cross-staff.ly +++ b/input/regression/beam-cross-staff.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ texidoc=" diff --git a/input/regression/beam-damp.ly b/input/regression/beam-damp.ly index ec90c22ac0..f98aef0424 100644 --- a/input/regression/beam-damp.ly +++ b/input/regression/beam-damp.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { texidoc = "@cindex Beam Damp Beams are less steep than the notes they encompass. " } diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly index 01a82fc6b4..a6db3c9fbb 100644 --- a/input/regression/beam-default-lengths.ly +++ b/input/regression/beam-default-lengths.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index 61b2a09c60..5cae7ef76b 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ texidoc=" diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly index 120f7d1e31..d4027f6c3e 100644 --- a/input/regression/beam-french.ly +++ b/input/regression/beam-french.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly index 640a74f697..20282b72f1 100644 --- a/input/regression/beam-funky-beamlet.ly +++ b/input/regression/beam-funky-beamlet.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly index 91c7fd06c0..609408c1c2 100644 --- a/input/regression/beam-funky.ly +++ b/input/regression/beam-funky.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/beam-knee-symmetry.ly b/input/regression/beam-knee-symmetry.ly index 0160d0b03d..030f19f331 100644 --- a/input/regression/beam-knee-symmetry.ly +++ b/input/regression/beam-knee-symmetry.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly index e7c51165a5..d3242c0352 100644 --- a/input/regression/beam-length.ly +++ b/input/regression/beam-length.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly index 5903482718..ed73fd8635 100644 --- a/input/regression/beam-manual-beaming.ly +++ b/input/regression/beam-manual-beaming.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" diff --git a/input/regression/beam-manual.ly b/input/regression/beam-manual.ly index 6e0cfea60e..9a75c064a7 100644 --- a/input/regression/beam-manual.ly +++ b/input/regression/beam-manual.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly index 497f1ff193..bba4a7cf22 100644 --- a/input/regression/beam-over-barline.ly +++ b/input/regression/beam-over-barline.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { texidoc = "Explicit beams may cross barlines. " diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly index fac9615d9f..21ff0b9919 100644 --- a/input/regression/beam-position.ly +++ b/input/regression/beam-position.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ texidoc=" diff --git a/input/regression/beam-postfix-notation.ly b/input/regression/beam-postfix-notation.ly index 4075beab9f..218f693a9a 100644 --- a/input/regression/beam-postfix-notation.ly +++ b/input/regression/beam-postfix-notation.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly index 984d20a91e..320cf2b942 100644 --- a/input/regression/beam-quanting-horizontal.ly +++ b/input/regression/beam-quanting-horizontal.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly index 174120e42a..3925765d0f 100644 --- a/input/regression/beam-quarter.ly +++ b/input/regression/beam-quarter.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/beam-rest.ly b/input/regression/beam-rest.ly index 34ff1d9041..d33bfc99ff 100644 --- a/input/regression/beam-rest.ly +++ b/input/regression/beam-rest.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \header { texidoc = "The number of beams doesn't change on a rest." } diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly index 1dd2cdf73c..c47e38287f 100644 --- a/input/regression/beam-second.ly +++ b/input/regression/beam-second.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ texidoc=" diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly index a06f2c0e3d..c95d984695 100644 --- a/input/regression/beam-shortened-lengths.ly +++ b/input/regression/beam-shortened-lengths.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/beamed-chord.ly b/input/regression/beamed-chord.ly index 3596817c7e..929ecda4d1 100644 --- a/input/regression/beamed-chord.ly +++ b/input/regression/beamed-chord.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly index cced3839bc..3e5003b5e5 100644 --- a/input/regression/beaming-ternary-metrum.ly +++ b/input/regression/beaming-ternary-metrum.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { texidoc = "Automatic beaming works also in ternary time sigs." diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly index 94815dcfde..ee46ce2859 100644 --- a/input/regression/beaming.ly +++ b/input/regression/beaming.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/beams.ly b/input/regression/beams.ly index 4aff48da6c..0a1b930e8c 100644 --- a/input/regression/beams.ly +++ b/input/regression/beams.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { texidoc = "Beams (simple)." diff --git a/input/regression/between-systems.ly b/input/regression/between-systems.ly index e496a42125..2d332bfc10 100644 --- a/input/regression/between-systems.ly +++ b/input/regression/between-systems.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/break.ly b/input/regression/break.ly index a166c8aa0e..0a77a28559 100644 --- a/input/regression/break.ly +++ b/input/regression/break.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly index 6a785c4c8b..6fff693ebd 100644 --- a/input/regression/chord-scripts.ly +++ b/input/regression/chord-scripts.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly index a68deb7187..9ca98bc437 100644 --- a/input/regression/cluster.ly +++ b/input/regression/cluster.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { texidoc = "Clusters are a device to denote that a complete range of diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly index 4111eb0ffa..54b7692b02 100644 --- a/input/regression/completion-heads.ly +++ b/input/regression/completion-heads.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly index b8f6387ad8..17193d48c9 100644 --- a/input/regression/dot-flag-collision.ly +++ b/input/regression/dot-flag-collision.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { texidoc = "Dots move to the right when a collision with the (up)flag happens." diff --git a/input/regression/dynamics-broken-hairpin.ly b/input/regression/dynamics-broken-hairpin.ly index 0e38c38c39..5cfdf800f7 100644 --- a/input/regression/dynamics-broken-hairpin.ly +++ b/input/regression/dynamics-broken-hairpin.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ texidoc = "Broken crescendi should be open on one side." diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly index 1c5dc497b9..03d508af63 100644 --- a/input/regression/dynamics-glyphs.ly +++ b/input/regression/dynamics-glyphs.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header {texidoc = "Dynamic letters are kerned, and their weight diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly index 6c65940d74..7e0a892115 100644 --- a/input/regression/dynamics-line.ly +++ b/input/regression/dynamics-line.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ texidoc=" Dynamics appear below or above the staff. If multiple diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly index bb6f10d66a..04ba72932c 100644 --- a/input/regression/finger-chords.ly +++ b/input/regression/finger-chords.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly index 92c23287fc..4c37ce9938 100644 --- a/input/regression/fingering.ly +++ b/input/regression/fingering.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly index 4a168aa3ad..2cebbb1997 100644 --- a/input/regression/follow-voice-break.ly +++ b/input/regression/follow-voice-break.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ texidoc = " diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly index 3e739b36f6..b4dbfbfece 100644 --- a/input/regression/font-magnification.ly +++ b/input/regression/font-magnification.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { texidoc = "The magnification can be set for any font. Note that this doesn't change variable symbols such as beams or slurs. " } diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly index 87a03e5c62..f1d757fc73 100644 --- a/input/regression/generic-output-property.ly +++ b/input/regression/generic-output-property.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly index 6a429f8b02..8b81abbbef 100644 --- a/input/regression/grace-auto-beam.ly +++ b/input/regression/grace-auto-beam.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/grace-bar-line.ly b/input/regression/grace-bar-line.ly index 6214f60f4c..39cf0665f6 100644 --- a/input/regression/grace-bar-line.ly +++ b/input/regression/grace-bar-line.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { texidoc = "Bar line should come before the grace note." diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly index 8a7ebc0d9f..7fedb2816c 100644 --- a/input/regression/grace-bar-number.ly +++ b/input/regression/grace-bar-number.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/grace-beam.ly b/input/regression/grace-beam.ly index c97d17fd4c..8a51accbc9 100644 --- a/input/regression/grace-beam.ly +++ b/input/regression/grace-beam.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \header { texidoc = "Grace beams and normal beams may occur simultaneously. diff --git a/input/regression/grace-dynamic.ly b/input/regression/grace-dynamic.ly index 22bc88bffa..b73ccae4e4 100644 --- a/input/regression/grace-dynamic.ly +++ b/input/regression/grace-dynamic.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ % ? diff --git a/input/regression/grace-end.ly b/input/regression/grace-end.ly index 34e5247230..b1c572f64a 100644 --- a/input/regression/grace-end.ly +++ b/input/regression/grace-end.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly index 362994ec24..ef991e9df3 100644 --- a/input/regression/grace-nest5.ly +++ b/input/regression/grace-nest5.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { texidoc = "Another nested grace situation." diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly index e6bd449b7b..43e8dd3c2f 100644 --- a/input/regression/grace-part-combine.ly +++ b/input/regression/grace-part-combine.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { texidoc = "Partcombiner and grace notes can go together." diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly index f9ed41ccbe..23ec247bbb 100644 --- a/input/regression/grace-start.ly +++ b/input/regression/grace-start.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { texidoc = "Pieces may begin with grace notes." diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly index e5d32c2b80..2ed71f6d1f 100644 --- a/input/regression/grace-stems.ly +++ b/input/regression/grace-stems.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ texidoc = "Here startGraceMusic should set no-stem-extend to true; diff --git a/input/regression/grace.ly b/input/regression/grace.ly index 8a719937bc..5304ed0f80 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly index b9e8fc7c7d..715f8f51d0 100644 --- a/input/regression/hairpin-ending.ly +++ b/input/regression/hairpin-ending.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly index d301d9ead8..ccabed0205 100644 --- a/input/regression/instrument-name-partial.ly +++ b/input/regression/instrument-name-partial.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { texidoc = "Instrument names are also printed on partial starting measures." diff --git a/input/regression/key-clefs.ly b/input/regression/key-clefs.ly index 288077a50d..893744602c 100644 --- a/input/regression/key-clefs.ly +++ b/input/regression/key-clefs.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { texidoc = "Tests placement of accidentals in every clef. " } diff --git a/input/regression/key-signature-scordatura.ly b/input/regression/key-signature-scordatura.ly index 27bb6bda64..e34bb8ca54 100644 --- a/input/regression/key-signature-scordatura.ly +++ b/input/regression/key-signature-scordatura.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { texidoc = "Key signatures can be set per pitch diff --git a/input/regression/keys.ly b/input/regression/keys.ly index 86b207e0d1..b9eb85cb29 100644 --- a/input/regression/keys.ly +++ b/input/regression/keys.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ texidoc=" diff --git a/input/regression/lyric-align.ly b/input/regression/lyric-align.ly index 41e1f3f528..696a7b034f 100644 --- a/input/regression/lyric-align.ly +++ b/input/regression/lyric-align.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ texidoc=" diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly index 0708d90f5e..a4cb15f50c 100644 --- a/input/regression/lyric-combine.ly +++ b/input/regression/lyric-combine.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly index f66d2b5a7f..a66dcc5e41 100644 --- a/input/regression/lyric-phrasing.ly +++ b/input/regression/lyric-phrasing.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ texidoc="Lyric phrasing diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly index e45346316e..7720dfc935 100644 --- a/input/regression/lyrics-melisma-beam.ly +++ b/input/regression/lyrics-melisma-beam.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/lyrics-multi-stanza.ly b/input/regression/lyrics-multi-stanza.ly index 8de8ed6a91..2ab13a4e30 100644 --- a/input/regression/lyrics-multi-stanza.ly +++ b/input/regression/lyrics-multi-stanza.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly index 70c1baf8fa..45fd1db9ed 100644 --- a/input/regression/measure-grouping.ly +++ b/input/regression/measure-grouping.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \header { diff --git a/input/regression/metronome-marking.ly b/input/regression/metronome-marking.ly index 8e4a5bff79..d1a1452112 100644 --- a/input/regression/metronome-marking.ly +++ b/input/regression/metronome-marking.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \header { diff --git a/input/regression/mm-rests2.ly b/input/regression/mm-rests2.ly index 10415956f2..fafe8c9ef1 100644 --- a/input/regression/mm-rests2.ly +++ b/input/regression/mm-rests2.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly index 9ff0451161..f12a480740 100644 --- a/input/regression/molecule-hacking.ly +++ b/input/regression/molecule-hacking.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { texidoc=" You can write molecule callbacks in Scheme, thus diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly index bc7ea18514..71bc0debe9 100644 --- a/input/regression/non-empty-text.ly +++ b/input/regression/non-empty-text.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly index c45b80de07..f9ac6ef38b 100644 --- a/input/regression/note-group-bracket.ly +++ b/input/regression/note-group-bracket.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly index 2d3e03611a..df002efdf8 100644 --- a/input/regression/note-head-chord.ly +++ b/input/regression/note-head-chord.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly index 9b03a38842..9e65db846d 100644 --- a/input/regression/number-staff-lines.ly +++ b/input/regression/number-staff-lines.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/input/regression/ottava-broken.ly b/input/regression/ottava-broken.ly index c0f8b176d4..7579bc7e3e 100644 --- a/input/regression/ottava-broken.ly +++ b/input/regression/ottava-broken.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \header { diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly index 272d23f75b..115ff53295 100644 --- a/input/regression/ottava.ly +++ b/input/regression/ottava.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \header { texidoc = "Ottava brackets are supported, through the diff --git a/input/regression/output-property.ly b/input/regression/output-property.ly index c21b5d8a30..09af5dbee8 100644 --- a/input/regression/output-property.ly +++ b/input/regression/output-property.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \header { texidoc = " Setting @code{\outputproperty} is a clumsy and deprecated way of changing diff --git a/input/regression/pc-mmrest.ly b/input/regression/pc-mmrest.ly index 4a638d47d9..40c9544e92 100644 --- a/input/regression/pc-mmrest.ly +++ b/input/regression/pc-mmrest.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header { texidoc="Multi measure rests of second voice should not disappear." diff --git a/input/test/beam-rest.ly b/input/test/beam-rest.ly index d8dbce206b..2f4a68dbfb 100644 --- a/input/test/beam-rest.ly +++ b/input/test/beam-rest.ly @@ -1,4 +1,4 @@ -#(ly:set-option 'old-relative) + \version "1.9.1" \header{ diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index d84f6f4e52..c1fe8e04b3 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -56,6 +56,7 @@ static Keyword_ent the_key_tab[]={ {"markup", MARKUP}, {"midi", MIDI}, {"name", NAME}, + {"newcontext", NEWCONTEXT}, {"notes", NOTES}, {"octave", OCTAVE}, {"once", ONCE}, diff --git a/lily/parser.yy b/lily/parser.yy index 9d9ff455e3..239b8f68f1 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -210,72 +210,73 @@ yylex (YYSTYPE *s, void * v) %pure_parser -/* tokens which are not keywords */ -%token AUTOCHANGE + +%token ACCEPTS +%token ADDLYRICS %token ALIAS +%token ALTERNATIVE +%token APPLY %token APPLYCONTEXT %token APPLYOUTPUT -%token APPLY -%token ACCEPTS -%token ALTERNATIVE +%token AUTOCHANGE %token BAR %token BREATHE %token CHORDMODIFIERS %token CHORDS +%token CHORD_CLOSE +%token CHORD_OPEN %token CLEF +%token COMMANDSPANREQUEST %token CONSISTS -%token DURATION -%token SEQUENTIAL -%token GROBDESCRIPTIONS -%token SIMULTANEOUS %token CONSISTSEND +%token CONTEXT +%token DEFAULT %token DENIES %token DESCRIPTION +%token DURATION %token EXTENDER %token FIGURES FIGURE_OPEN FIGURE_CLOSE %token FIGURE_BRACKET_CLOSE FIGURE_BRACKET_OPEN %token GRACE +%token GROBDESCRIPTIONS %token HEADER %token HYPHEN %token INVALID %token KEY %token LYRICS %token MARK -%token MULTI_MEASURE_REST %token MIDI -%token PITCH -%token DEFAULT +%token MULTI_MEASURE_REST %token NAME -%token PITCHNAMES +%token NEWCONTEXT %token NOTES +%token OCTAVE %token ONCE +%token OUTPUTPROPERTY +%token OVERRIDE SET REVERT %token PAPER +%token PARTCOMBINE %token PARTIAL +%token PITCH +%token PITCHNAMES %token PROPERTY -%token OVERRIDE SET REVERT %token RELATIVE %token REMOVE %token REPEAT -%token ADDLYRICS -%token PARTCOMBINE +%token REST %token SCM_T %token SCORE +%token SEQUENTIAL +%token SIMULTANEOUS %token SKIP %token SPANREQUEST -%token COMMANDSPANREQUEST %token TEMPO -%token OUTPUTPROPERTY -%token OCTAVE -%token TIME_T %token TIMES +%token TIME_T %token TRANSLATOR %token TRANSPOSE %token TYPE %token UNSET -%token CONTEXT -%token REST -%token CHORD_OPEN -%token CHORD_CLOSE /* escaped */ @@ -966,6 +967,21 @@ Composite_music: $$ = csm; } + | NEWCONTEXT string Music { + static int new_context_count; + + Music * csm = MY_MAKE_MUSIC("ContextSpeccedMusic"); + + csm->set_mus_property ("element", $3->self_scm ()); + scm_gc_unprotect_object ($3->self_scm ()); + + csm->set_mus_property ("context-type", $2); + + SCM new_id = scm_number_to_string (gh_int2scm (new_context_count ++), + gh_int2scm (10)); + csm->set_mus_property ("context-id", new_id); + $$ = csm; + } | TIMES { THIS->push_spot (); } diff --git a/lily/scm-option.cc b/lily/scm-option.cc index 3b5de500c1..ffa343dc53 100644 --- a/lily/scm-option.cc +++ b/lily/scm-option.cc @@ -37,7 +37,7 @@ int testing_level_global; /* Backwards compatibility. */ -bool lily_1_8_relative = true; +bool lily_1_8_relative = false; bool lily_1_8_compatibility_used = false; /* diff --git a/ly/init.ly b/ly/init.ly index ce58a26a4d..4608c01120 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -9,7 +9,7 @@ \include "declarations-init.ly" -#(ly:set-option 'old-relative #t) +#(ly:set-option 'new-relative) #(ly:set-point-and-click #f) \maininput -- 2.39.2