From: Jan Nieuwenhuizen Date: Fri, 13 Feb 2004 08:58:44 +0000 (+0000) Subject: * input/: Convert ly files that still had \property. Fixes make X-Git-Tag: release/2.1.23~14 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1395665466e349117f251da681262bd56c44d04e;p=lilypond.git * input/: Convert ly files that still had \property. Fixes make web. Remove exta spaces around '='. * scripts/convert-ly.py (conv): Redundant space fixes. --- diff --git a/ChangeLog b/ChangeLog index 33efc29c75..ff551cb98e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-02-13 Jan Nieuwenhuizen + * input/: Convert ly files that still had \property. Fixes make + web. Remove exta spaces around '='. + + * scripts/convert-ly.py (conv): Redundant space fixes. + * scripts/lilypond-book.py (compile-ly): python2.1 fix. 2004-02-13 Han-Wen Nienhuys diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely index 63ed9dea03..b07f0a5213 100644 --- a/Documentation/user/cheatsheet.itely +++ b/Documentation/user/cheatsheet.itely @@ -14,8 +14,8 @@ @tab durations @tab @lilypond[relative=1,notime] -\set Staff.autoBeaming = ##f -\set Staff.Clef = \turnOff +\set Staff.autoBeaming = ##f +\set Staff.Clef = \turnOff c1 c2 c8 c16 @end lilypond @@ -23,7 +23,7 @@ c1 c2 c8 c16 @tab augmentation dots @tab @lilypond[relative=1,notime] -\set Staff.Clef = \turnOff +\set Staff.Clef = \turnOff c4. c4.. @end lilypond @@ -67,7 +67,7 @@ s16_" " @tab rest @tab @lilypond[relative=1,notime] -\set Staff.Clef = \turnOff +\set Staff.Clef = \turnOff r4 r8 @end lilypond @@ -75,8 +75,8 @@ r4 r8 @tab tie @tab @lilypond[relative=1,notime] -\set Score.timing = ##f -\set Staff.autoBeaming = ##f +\set Score.timing = ##f +\set Staff.autoBeaming = ##f d ~ d @end lilypond @@ -93,8 +93,8 @@ s4 @tab raise octave @tab @lilypond[relative=1,notime] -\set Score.timing = ##f -\set Staff.autoBeaming = ##f +\set Score.timing = ##f +\set Staff.autoBeaming = ##f a a' @end lilypond @@ -102,8 +102,8 @@ a a' @tab lower octave @tab @lilypond[relative=1,notime] -\set Score.timing = ##f -\set Staff.autoBeaming = ##f +\set Score.timing = ##f +\set Staff.autoBeaming = ##f c c, @end lilypond @@ -112,9 +112,9 @@ c c, @tab slur @tab @lilypond[fragment,relative=1] -\set Score.timing = ##f -\set Staff.TimeSignature = \turnOff -\set Staff.autoBeaming = ##f +\set Score.timing = ##f +\set Staff.TimeSignature = \turnOff +\set Staff.autoBeaming = ##f c( d e) @end lilypond @@ -123,9 +123,9 @@ c( d e) @tab phrasing slur @tab @lilypond[fragment,relative=1] -\set Score.timing = ##f -\set Staff.TimeSignature = \turnOff -\set Staff.autoBeaming = ##f +\set Score.timing = ##f +\set Staff.TimeSignature = \turnOff +\set Staff.autoBeaming = ##f c\( c( d) e\) @end lilypond @@ -134,9 +134,9 @@ c\( c( d) e\) @tab beam @tab @lilypond[fragment,relative=1] -\set Score.timing = ##f -\set Staff.TimeSignature = \turnOff -\set Staff.autoBeaming = ##f +\set Score.timing = ##f +\set Staff.TimeSignature = \turnOff +\set Staff.autoBeaming = ##f a8-[ b-] @end lilypond @@ -154,7 +154,7 @@ a8-[ b-] @tab articulations @tab @lilypond[fragment,relative=1] -\set Staff.TimeSignature = \turnOff +\set Staff.TimeSignature = \turnOff c-> c-. @end lilypond @@ -163,7 +163,7 @@ c-> c-. @tab dynamics @tab @lilypond[fragment,relative=1] -\set Staff.TimeSignature = \turnOff +\set Staff.TimeSignature = \turnOff c\mf c\sfz @end lilypond @@ -172,9 +172,9 @@ c\mf c\sfz @tab crescendo @tab @lilypond[fragment,relative=1] -\set Score.timing = ##f -\set Staff.TimeSignature = \turnOff -\set Staff.autoBeaming = ##f +\set Score.timing = ##f +\set Staff.TimeSignature = \turnOff +\set Staff.autoBeaming = ##f a\< a \!a @end lilypond @@ -182,9 +182,9 @@ a\< a \!a @tab decrescendo @tab @lilypond[fragment,relative=1] -\set Score.timing = ##f -\set Staff.TimeSignature = \turnOff -\set Staff.autoBeaming = ##f +\set Score.timing = ##f +\set Staff.TimeSignature = \turnOff +\set Staff.autoBeaming = ##f a\> a a\! @end lilypond diff --git a/Documentation/user/internals.itely b/Documentation/user/internals.itely index ad325068bb..c055d73db2 100644 --- a/Documentation/user/internals.itely +++ b/Documentation/user/internals.itely @@ -72,7 +72,7 @@ regularly. For example, beaming behavior is tuned with These use mixed-caps naming: @code{autoBeamSettings}, @code{ignoreMelismata}. They are assigned as follows: @example - \set ignoreMelismata = ... + \set ignoreMelismata = ... @end example @item Layout properties @@ -243,7 +243,7 @@ file using the following expression: @cindex properties, context @example -\set @var{contextname}.@var{propname} = @var{value} +\set @var{contextname}.@var{propname} = @var{value} @end example @noindent @@ -460,7 +460,7 @@ The complete list of context modifiers is the following: @itemize @bullet @item @code{\alias} @var{alternate-name}: This specifies a different name. In the above example, -@code{\set Staff.X = Y} will also work on @code{SimpleStaff}s. +@code{\set Staff.X = Y} will also work on @code{SimpleStaff}s. @item @code{\consistsend} @var{engravername}: Analogous to @code{\consists}, but makes sure that @@ -529,7 +529,7 @@ evaluated as Scheme. For example, the boolean value @var{true} is @code{#t} in Scheme, so for LilyPond @var{true} looks like @code{##t}, and can be used in property assignments: @example - \set Staff.autoBeaming = ##f + \set Staff.autoBeaming = ##f @end example diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index 1d99f4f979..247847f7ff 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -312,14 +312,14 @@ and with some corrections. Can you spot which fragment is which? @lilypond[noindent] \score { \notes { \override Staff.NoteSpacing #'stem-spacing-correction - = #0.6 + = #0.6 c'4 e''4 e'4 b'4 | \stemDown b'4 e''4 a'4 e''4| \stemBoth \bar "||" \override Staff.NoteSpacing #'stem-spacing-correction - = #0.0 + = #0.0 \override Staff.StaffSpacing #'stem-spacing-correction - = #0.0 + = #0.0 c'4 e''4 e'4 b'4 | \stemDown b'4 e''4 a'4 e''4| } @@ -450,7 +450,7 @@ example above is calculated by the function this function by a more advanced one, we could issue @example \override DynamicLineSpanner #'Y-offset-callbacks - = #(list gee-whiz-gadget) + = #(list gee-whiz-gadget) @end example @noindent diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely index 4693161b15..cb90e9ef61 100644 --- a/Documentation/user/music-glossary.tely +++ b/Documentation/user/music-glossary.tely @@ -213,7 +213,7 @@ flat lowers it by a whole tone. A natural cancels the effect of a previous accidental. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override TextScript #'font-style = #'large \addlyrics \context Staff \notes\relative c'' { @@ -323,7 +323,7 @@ FI: luonnollinen molliasteikko, N: ?. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f \notes\relative c'' { a1 b c d e f g a } @end lilypond @@ -572,7 +572,7 @@ Line connecting a series of notes (shorter than a quarter note). The number of beams determine the note value of the connected notes. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override TextScript #'font-style = #'large \notes\relative c'' { g8_"1/8"[ g g g] s16 @@ -630,7 +630,7 @@ orchestral or choral score. @lilypond \context StaffGroup << -% \set StaffGroup.minVerticalAlign = #12 +% \set StaffGroup.minVerticalAlign = #12 \notes\relative c'' \context Staff = SA { \clef treble g4 e c2 } \notes\relative c \context Staff = SB { \clef bass c1 \bar "|." } >> @end lilypond @@ -677,7 +677,7 @@ N: ?. in pre-1650 music. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f \notes\relative c'' { g\breve } @end lilypond @@ -707,7 +707,7 @@ Clef symbol indicating the position of the central C. Used on all note lines. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f \override Score.Clef #'full-size-change = ##t %\override Score.LyricText #'font-style = #'large \addlyrics @@ -806,7 +806,7 @@ third above the lower notes to define their quality as major or minor. Such chords are denoted open chords @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override TextScript #'font-style = #'large \addlyrics \context Staff \notes\relative c'' { @@ -838,7 +838,7 @@ N: ?. A scale consisting of all 11 @aref{semitone}s. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f \notes\relative c' { c1 cis d dis e f fis g gis a ais b c } @end lilypond @@ -1210,7 +1210,7 @@ The church modes are used in gregorial chant and pre baroque early music but also to some extent in newer jazz music. @lilypond[notime,linewidth=110\mm] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics @@ -1225,7 +1225,7 @@ also to some extent in newer jazz music. @end lilypond @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics @@ -1240,7 +1240,7 @@ also to some extent in newer jazz music. @end lilypond @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics @@ -1254,7 +1254,7 @@ also to some extent in newer jazz music. @end lilypond @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics @@ -1269,7 +1269,7 @@ also to some extent in newer jazz music. @end lilypond @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics @@ -1283,7 +1283,7 @@ also to some extent in newer jazz music. @end lilypond @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics @@ -1303,7 +1303,7 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and 7th tone. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics @@ -1318,7 +1318,7 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and @end lilypond @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics @@ -1333,7 +1333,7 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and @end lilypond @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics @@ -1348,7 +1348,7 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and @end lilypond @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics @@ -1694,7 +1694,7 @@ Two notes, intervals, or scales are enharmonic if they have different names but equal pitch. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large \addlyrics \context Staff \notes\relative c'' { @@ -1765,7 +1765,7 @@ symbol indicates playing an octave lower (for example on double bass @aref{strings}). @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f \override Staff.Clef #'full-size-change = ##t %\override Score.LyricText #'font-style = #'large \addlyrics @@ -1858,7 +1858,7 @@ less than a quarter note. The number of flags determines the @aref{note value}. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large \notes\relative c'' { g8_"1/8" s8 @@ -1942,7 +1942,7 @@ dominant (D, the chord on the fifth note). Other are considered to be variants of the base chords. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics @@ -1981,7 +1981,7 @@ indicates playing or singing an octave lower (most tenor parts in choral scores are notated like that). @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f \override Staff.Clef #'full-size-change = ##t %\override Score.LyricText #'font-style = #'large \addlyrics @@ -2139,7 +2139,7 @@ Tones sounding simultaneously. Two note harmonies fall into the categories Consonances: @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large \context Voice \notes\relative c'' { 1_"unisone " s @@ -2155,7 +2155,7 @@ Consonances: Dissonances: @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large \context Voice \notes\relative c'' { 1_"second " s s @@ -2198,7 +2198,7 @@ because they consist of three @aref{whole tone}s. The addition of such two forms an octave. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics @@ -2219,7 +2219,7 @@ of such two forms an octave. @end lilypond @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics @@ -2240,7 +2240,7 @@ of such two forms an octave. @end lilypond @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics @@ -2274,7 +2274,7 @@ N: ?. The difference between an interval and an octave. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large \context Staff \notes\relative c'' { < g a >1_"second " s s < g' a, >_"seventh " s s \bar "||" @@ -2368,7 +2368,7 @@ N: ?. A ledger line is an extension of the staff. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f \notes\relative c'' { a,1 s c'' } @end lilypond @@ -2388,7 +2388,7 @@ unlike (b) @emph{leggiero} or @emph{non-legato}, (c) @emph{portato} and (d) @aref{staccato}. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f \addlyrics \context Staff \notes\relative c'' { c4-( d e-) \bar "||" @@ -2463,7 +2463,7 @@ Note value: double length of @aref{breve}. @aref{note value}. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f \notes\relative c'' { \override NoteHead #'style = #'mensural g\longa @@ -2665,7 +2665,7 @@ N: ?. First C below the 440 Hz A. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f \override Staff.Clef #'full-size-change = ##t \notes\relative c' { \clef bass c1 s @@ -2889,7 +2889,7 @@ but sometimes (mostly in pre baroque music) the double length note value @lilypond[notime] %\override Score.TextScript #'font-style = #'large -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f \notes\relative c'' { \override NoteHead #'style = #'mensural g\longa_"longa" g\breve_"breve" @@ -2900,7 +2900,7 @@ but sometimes (mostly in pre baroque music) the double length note value @lilypond[notime] %\override Score.TextScript #'font-style = #'large -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f \notes\relative c'' { r\longa_"longa" r\breve_"breve" r1_"1/1" r2_"1/2" r4_"1/4" s16 r8_"1/8" s16 @@ -3269,7 +3269,7 @@ N: ?. with the same @aref{key signature}. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large \notes\relative c' { \key es \major @@ -3279,7 +3279,7 @@ with the same @aref{key signature}. @end lilypond @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large \notes\relative c' { \key es \major @@ -3397,9 +3397,9 @@ roots of chords. The most important are degrees I = tonic (T), IV = sub@-do@-mi@-nant (S) and V = dominant (D). @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large -%\set minVerticalAlign = #8 +%\set minVerticalAlign = #8 \addlyrics \context Staff \notes\relative c' { c1 d e f g a b c @@ -3461,7 +3461,7 @@ semitone. An octave may be divided into 12@w{ }semitones. @aref{interval}, @aref{chromatic scale}. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f \notes\relative c'' { g1 gis s a bes s b! c } @end lilypond @@ -3713,8 +3713,8 @@ Vertical line above or below a @aref{note head} shorter than a whole note. @aref{beam}. @lilypond[notime] -\set Score.autoBeaming = ##f -\set Score.automaticBars = ##f +\set Score.autoBeaming = ##f +\set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large \notes\relative c'' { g2_"1/2" g' s16 @@ -4041,7 +4041,7 @@ connects two succesive notes of the same pitch, and which has the function of uniting them into a single sound equal to the combined durations. @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f \notes\relative c'' { g2 ~ g4. } @end lilypond @@ -4152,7 +4152,7 @@ a @aref{chord}, usually in the distance of a third (@aref{interval}). @lilypond[notime] -\set Score.automaticBars = ##f +\set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large \notes\relative c' { e2:32_"a" diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 2729fc5556..ba5bc8a411 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -481,7 +481,7 @@ example, there are two triplets shown, while @code{\times} was only used once: @lilypond[fragment,relative,raggedright,verbatim] -\set tupletSpannerDuration = #(ly:make-moment 1 4) +\set tupletSpannerDuration = #(ly:make-moment 1 4) \times 2/3 { c'8 c c c c c } @end lilypond @@ -710,9 +710,9 @@ been checked for errors: @lilypond[fragment,raggedright,verbatim] \relative c'' { c8 d -\set Score.skipTypesetting = ##t +\set Score.skipTypesetting = ##t e f g a g c, f e d -\set Score.skipTypesetting = ##f +\set Score.skipTypesetting = ##f c d b bes a g c2 } @end lilypond @@ -957,7 +957,7 @@ The @code{set-octavation} function also takes -1 (for 8va bassa) and 2 @example #(set-octavation 1) - \set Staff.ottavation = #"8" + \set Staff.ottavation = #"8" @end example @seealso @@ -1057,7 +1057,7 @@ The syntax for this command is @end example This is internally translated into @example - \set Timing.measurePosition = -@var{length of duration} + \set Timing.measurePosition = -@var{length of duration} @end example @cindex @code{|} The property @code{measurePosition} contains a rational number @@ -1137,7 +1137,7 @@ connected between different staves of a @internalsref{StaffGroup}: The command @code{\bar @var{bartype}} is a short cut for doing -@code{\set Score.whichBar = @var{bartype}} Whenever +@code{\set Score.whichBar = @var{bartype}} Whenever @code{whichBar} is set to a string, a bar line of that type is created. At the start of a measure it is set to @code{defaultBarType}. The contents of @code{repeatCommands} are used @@ -1362,7 +1362,7 @@ is set, its value will be used only once, and then it is erased. @lilypond[fragment,relative,verbatim] \context Staff { f8[ r16 f g a] - f8[ r16 \set stemLeftBeamCount = #1 f g a] + f8[ r16 \set stemLeftBeamCount = #1 f g a] } @end lilypond @cindex @code{stemRightBeamCount} @@ -1377,9 +1377,9 @@ but it take less typing: @lilypond[relative=1,verbatim,noindent] c16[ c c c c c c c] - \set subdivideBeams = ##t + \set subdivideBeams = ##t c16[ c c c c c c c] - \set Score.beatLength = #(ly:make-moment 1 8) + \set Score.beatLength = #(ly:make-moment 1 8) c16[ c c c c c c c] @end lilypond @cindex subdivideBeams @@ -1464,7 +1464,7 @@ replacing the second asterisks by @var{N} and @var{M}. For example, a rule for 6/8 time exclusively looks like @example \override autoBeamSettings - #'(begin * * 6 8) = ... + #'(begin * * 6 8) = ... @end example If a rule should be to applied only to certain types of beams, use the @@ -1767,7 +1767,7 @@ accidentals depending on the order in which the notes occur in the input file: @lilypond[raggedright,fragment,verbatim] -\set Staff.autoAccidentals = #'( Staff (any-octave . 0) ) +\set Staff.autoAccidentals = #'( Staff (any-octave . 0) ) cis'4 r2 | cis'4 r2 | r | r | @end lilypond @@ -2156,9 +2156,9 @@ In this case, setting @code{fingeringOrientations} will put fingerings next to note heads: @lilypond[verbatim,raggedright,fragment,relative=1] - \set fingeringOrientations = #'(left down) + \set fingeringOrientations = #'(left down) 4 - \set fingeringOrientations = #'(up right down) + \set fingeringOrientations = #'(up right down) 4 @end lilypond @@ -2462,8 +2462,8 @@ is an example how to do it: You can also supply your own texts: @lilypond[fragment,relative,verbatim] \context Voice { - \set crescendoText = \markup { \italic "cresc. poco" } - \set crescendoSpanner = #'dashed-line + \set crescendoText = \markup { \italic "cresc. poco" } + \set crescendoSpanner = #'dashed-line a'2\< a a a\!\mf } @end lilypond @@ -2649,9 +2649,9 @@ alphabetic characters. Or, @lilypond[verbatim,fragment,relative=2] c4 - \set Score.repeatCommands = #'((volta "93") end-repeat) + \set Score.repeatCommands = #'((volta "93") end-repeat) c4 c4 - \set Score.repeatCommands = #'((volta #f)) + \set Score.repeatCommands = #'((volta #f)) c4 c4 @end lilypond @@ -2848,8 +2848,8 @@ mus = \drums { cymc cyms cymr hh | hhc hho hhho hhp | \break cb hc << \new DrumStaff\with { \remove Bar_engraver \remove Time_signature_engraver - Stem \set #'transparent = ##t - Stem \set #'Y-extent-callback = ##f + Stem \set #'transparent = ##t + Stem \set #'Y-extent-callback = ##f minimumVerticalExtent = #'(-4.0 . 5.0) } \mus \context Lyrics \nam @@ -2878,8 +2878,8 @@ mus = \drums { timh ssh timl ssl cb s16 } \context DrumStaff \with { \remove Bar_engraver \remove Time_signature_engraver - Stem \set #'transparent = ##t - Stem \set #'Y-extent-callback = ##f + Stem \set #'transparent = ##t + Stem \set #'Y-extent-callback = ##f StaffSymbol \override #'line-count = #2 StaffSymbol \override #'staff-space = #2 minimumVerticalExtent = #'(-3.0 . 4.0) @@ -2905,8 +2905,8 @@ mus = \drums { cgh cgho cghm ssh cgl cglo cglm ssl s16 } %% this sucks; it will lengthen stems. StaffSymbol \override #'staff-space = #2 - Stem \set #'transparent = ##t - Stem \set #'Y-extent-callback = ##f + Stem \set #'transparent = ##t + Stem \set #'Y-extent-callback = ##f } \mus \context Lyrics \nam >> @@ -2928,8 +2928,8 @@ mus = \drums { boh boho bohm ssh bol bolo bolm ssl s16 } %% this sucks; it will lengthen stems. StaffSymbol \override #'staff-space = #2 - Stem \set #'transparent = ##t - Stem \set #'Y-extent-callback = ##f + Stem \set #'transparent = ##t + Stem \set #'Y-extent-callback = ##f } \mus \context Lyrics \nam >> @@ -2948,8 +2948,8 @@ mus = \drums { tri trio trim gui guis guil cb cl tamb cab mar hc s16 } drumStyleTable = #percussion-style StaffSymbol \override #'line-count = #1 \remove Time_signature_engraver - Stem \set #'transparent = ##t - Stem \set #'Y-extent-callback = ##f + Stem \set #'transparent = ##t + Stem \set #'Y-extent-callback = ##f } \mus \context Lyrics \nam >> @@ -2973,7 +2973,7 @@ down = \drums { bd4 sn bd toml8 toml } \score { \new DrumStaff << \set DrumStaff.drumStyleTable - = #(alist->hash-table mydrums) + = #(alist->hash-table mydrums) \new DrumVoice { \voiceOne \up } \new DrumVoice { \voiceTwo \down } >> @@ -3128,7 +3128,7 @@ Pedals can also be indicated by a sequence of brackets, by setting the @code{pedalSustainStyle} property to @code{bracket} objects: @lilypond[fragment,verbatim] - \set Staff.pedalSustainStyle = #'bracket + \set Staff.pedalSustainStyle = #'bracket c''4\sustainDown d''4 e''4 a'4\sustainUp\sustainDown f'4 g'4 a'4\sustainUp @@ -3139,7 +3139,7 @@ obtained by setting the @code{pedalSustainStyle} style property to @code{mixed}: @lilypond[fragment,verbatim] - \set Staff.pedalSustainStyle = #'mixed + \set Staff.pedalSustainStyle = #'mixed c''4\sustainDown d''4 e''4 c'4\sustainUp\sustainDown f'4 g'4 a'4\sustainUp @@ -3187,7 +3187,7 @@ in both staves, and set @lilypond[fragment,relative,verbatim] \context PianoStaff << - \set PianoStaff.connectArpeggios = ##t + \set PianoStaff.connectArpeggios = ##t \new Staff { \arpeggio } \new Staff { \clef bass \arpeggio } >> @@ -3252,7 +3252,7 @@ can be printed automatically. This is enabled if the property @lilypond[fragment,relative,verbatim] \context PianoStaff << - \set PianoStaff.followVoice = ##t + \set PianoStaff.followVoice = ##t \context Staff \context Voice { c1 \change Staff=two @@ -3523,10 +3523,10 @@ The complete example is shown here: << \notes \relative c'' \context Voice = duet { \time 3/4 g2 e4 a2 f4 g2. } \lyrics << \lyricsto "duet" \new Lyrics { - \set stanza = "1" + \set stanza = "1" Hi, my name is bert. } \lyricsto "duet" \new Lyrics { - \set stanza = "2" + \set stanza = "2" Ooooo, ch\'e -- ri, je t'aime. } >> >> } @@ -3539,9 +3539,9 @@ The complete example is shown here: Stanza numbers can be added by setting @code{stanza}, e.g. @example - \set stanza = "Bert" + \set stanza = "Bert" @dots{} - \set stanza = "Ernie" + \set stanza = "Ernie" @end example Notice how dots are surrounded with spaces in @code{\lyrics} mode, to @@ -3708,14 +3708,14 @@ value for @code{minimumFret} is 0: @example e8 fis gis a b cis' dis' e' -\set TabStaff.minimumFret = #8 +\set TabStaff.minimumFret = #8 e8 fis gis a b cis' dis' e' @end example @lilypond[noindent] frag = \notes { \key e \major e8 fis gis a b cis' dis' e' - \set TabStaff.minimumFret = #8 + \set TabStaff.minimumFret = #8 e8 fis gis a b cis' dis' e' } \score { @@ -3755,7 +3755,7 @@ g: @lilypond[fragment,verbatim] \context TabStaff << - \set TabStaff.stringTunings = #'(-5 -10 -15 -20) + \set TabStaff.stringTunings = #'(-5 -10 -15 -20) \notes { a,4 c' a e' e c' a e' @@ -3967,7 +3967,7 @@ scheme = \chords { \score { \notes << \context ChordNames { - \set chordChanges = ##t + \set chordChanges = ##t \scheme } \context Staff \transpose c c' \scheme >> @@ -4003,7 +4003,7 @@ separators, e.g. \context ChordNames \chords { c:7sus4 \set chordNameSeparator - = \markup { \typewriter "|" } + = \markup { \typewriter "|" } c:7sus4 } @end lilypond @@ -4148,11 +4148,11 @@ example, @code{markFormatter} is set to a canned procedure. After a few measures, it is set to function that produces a boxed number. @lilypond[verbatim,fragment,relative=1] - \set Score.markFormatter = #format-mark-numbers + \set Score.markFormatter = #format-mark-numbers c1 \mark \default c1 \mark \default \set Score.markFormatter - = #(lambda (mark context) + = #(lambda (mark context) (make-bold-markup (make-box-markup (number->string mark)))) c1 \mark \default c1 \mark \default @@ -4252,7 +4252,7 @@ used, for the next ones @code{instr} is used: @quotation @lilypond[verbatim,raggedright] - \set Staff.instrument = "ploink " { c''4 } + \set Staff.instrument = "ploink " { c''4 } @end lilypond @end quotation @@ -4262,7 +4262,7 @@ names: @quotation @lilypond[fragment,verbatim,raggedright] \notes { - \set Staff.instrument = \markup { + \set Staff.instrument = \markup { \column < "Clarinetti" { "in B" \smaller \musicglyph #"accidentals--1" @@ -4364,7 +4364,7 @@ be expanded, and the appropriate number is added automatically: @lilypond[fragment,verbatim] \time 4/4 r1 | R1 | R1*2 - \set Score.skipBars = ##t R1*17 R1*4 + \set Score.skipBars = ##t R1*17 R1*4 @end lilypond The @code{1} in @code{R1} is similar to the duration notation used for @@ -4372,7 +4372,7 @@ notes. Hence, for time signatures other than 4/4, you must enter other durations. This can be done with augmentation dots or fractions: @lilypond[fragment,verbatim] - \set Score.skipBars = ##t + \set Score.skipBars = ##t \time 3/4 R2. | R2.*2 \time 13/8 @@ -4491,7 +4491,7 @@ may set the property @var{soloADue} to false: @lilypond[verbatim,raggedright,fragment] \new Staff << - \set Staff.soloADue = ##f + \set Staff.soloADue = ##f \partcombine { g a( b) r @@ -4571,7 +4571,7 @@ for the full score, and one with cue notes for the instrumental part: \tag #'part << R1 \\ @{ - \set fontSize = #-1 + \set fontSize = #-1 c4_"cue" f2 g4 @} >> \tag #'score R1 @@ -4627,8 +4627,8 @@ output: @cindex @code{transposing} @example - \set Staff.instrument = #"Cl. in B-flat" - \set Staff.transposing = #-2 + \set Staff.instrument = #"Cl. in B-flat" + \set Staff.transposing = #-2 @end example @@ -4967,7 +4967,7 @@ historic style mensural G clef @tab Editio Vaticana style do clef @tab @code{vaticana_do1}, @code{vaticana_do2}, @code{vaticana_do3} @tab @lilypond[relative,notime] - \override Staff.StaffSymbol #'line-count = #4 + \override Staff.StaffSymbol #'line-count = #4 \override Staff.TimeSignature #'transparent = ##t \clef "vaticana_do2" c @end lilypond @@ -4977,7 +4977,7 @@ Editio Vaticana style do clef @tab Editio Vaticana style fa clef @tab @code{vaticana_fa1}, @code{vaticana_fa2} @tab @lilypond[relative,notime] - \override Staff.StaffSymbol #'line-count = #4 + \override Staff.StaffSymbol #'line-count = #4 \override Staff.TimeSignature #'transparent = ##t \clef "vaticana_fa2" c @end lilypond @@ -4987,7 +4987,7 @@ Editio Vaticana style fa clef @tab Editio Medicaea style do clef @tab @code{medicaea_do1}, @code{medicaea_do2}, @code{medicaea_do3} @tab @lilypond[relative,notime] - \override Staff.StaffSymbol #'line-count = #4 + \override Staff.StaffSymbol #'line-count = #4 \override Staff.TimeSignature #'transparent = ##t \clef "medicaea_do2" c @end lilypond @@ -4997,7 +4997,7 @@ Editio Medicaea style do clef @tab Editio Medicaea style fa clef @tab @code{medicaea_fa1}, @code{medicaea_fa2} @tab @lilypond[relative,notime] - \override Staff.StaffSymbol #'line-count = #4 + \override Staff.StaffSymbol #'line-count = #4 \override Staff.TimeSignature #'transparent = ##t \clef "medicaea_fa2" c @end lilypond @@ -5007,7 +5007,7 @@ Editio Medicaea style fa clef @tab historic style hufnagel do clef @tab @code{hufnagel_do1}, @code{hufnagel_do2}, @code{hufnagel_do3} @tab @lilypond[relative,notime] - \override Staff.StaffSymbol #'line-count = #4 + \override Staff.StaffSymbol #'line-count = #4 \override Staff.TimeSignature #'transparent = ##t \clef "hufnagel_do2" c @end lilypond @@ -5017,7 +5017,7 @@ historic style hufnagel do clef @tab historic style hufnagel fa clef @tab @code{hufnagel_fa1}, @code{hufnagel_fa2} @tab @lilypond[relative,notime] - \override Staff.StaffSymbol #'line-count = #4 + \override Staff.StaffSymbol #'line-count = #4 \override Staff.TimeSignature #'transparent = ##t \clef "hufnagel_fa2" c @end lilypond @@ -5135,8 +5135,8 @@ following table: @lilypond \score { \notes { - \set Score.timing = ##f - \set Score.barAlways = ##t + \set Score.timing = ##f + \set Score.barAlways = ##t s_\markup { "$\\backslash$time 4/4" } ^\markup { " " \musicglyph #"timesig-neo_mensural4/4" } s @@ -5499,8 +5499,8 @@ automatic transcription of the ligatures. For example, @example - \set Score.timing = ##f - \set Score.defaultBarType = "empty" + \set Score.timing = ##f + \set Score.defaultBarType = "empty" \override NoteHead #'style = #'neo_mensural \override Staff.TimeSignature #'style = #'neo_mensural \clef "petrucci_g" @@ -5511,8 +5511,8 @@ For example, @lilypond[raggedright] \score { \notes \transpose c c' { - \set Score.timing = ##f - \set Score.defaultBarType = "empty" + \set Score.timing = ##f + \set Score.defaultBarType = "empty" \override NoteHead #'style = #'neo_mensural \override Staff.TimeSignature #'style = #'neo_mensural \clef "petrucci_g" @@ -5537,8 +5537,8 @@ to the following: @lilypond[raggedright] \score { \notes \transpose c c' { - \set Score.timing = ##f - \set Score.defaultBarType = "empty" + \set Score.timing = ##f + \set Score.defaultBarType = "empty" \override NoteHead #'style = #'neo_mensural \override Staff.TimeSignature #'style = #'neo_mensural \clef "petrucci_g" @@ -7541,7 +7541,7 @@ Do not confuse layout properties with translation properties. Translation properties always use a mixed caps style naming, and are manipulated using @code{\set} and @code{\unset}: @example - \set Context.propertyName = @var{value} + \set Context.propertyName = @var{value} @end example Layout properties are use Scheme style variable naming, i.e. lower @@ -7875,7 +7875,7 @@ negative numbers make the font smaller, positive numbers larger. An example is given below: @c @lilypond[fragment,relative=1,verbatim,quote] - c4 c4 \set fontSize = #-1 + c4 c4 \set fontSize = #-1 f4 g4 @end lilypond This command will set @code{font-size} (see below), and does @@ -7938,7 +7938,7 @@ to override default setting, which are always present. For example: @example \override Lyrics .LyricText #'font-series = #'bold \override Lyrics .LyricText #'font-family = #'typewriter - \override Lyrics .LyricText #'font-shape = #'* + \override Lyrics .LyricText #'font-shape = #'* @end example @cindex @code{font-style} @@ -8339,7 +8339,7 @@ done with the property @code{minimumVerticalExtent}. It takes a pair of numbers, so if you want to make it smaller from its, then you could set @example - \set Staff.minimumVerticalExtent = #'(-4 . 4) + \set Staff.minimumVerticalExtent = #'(-4 . 4) @end example This sets the vertical size of the current staff to 4 staff spaces on either side of the center staff line. The argument of @@ -8442,9 +8442,9 @@ exaggerated corrections: c'4 e''4 e'4 b'4 | b'4 e''4 b'4 e''4| \override Staff.NoteSpacing #'stem-spacing-correction - = #1.5 + = #1.5 \override Staff.StaffSpacing #'stem-spacing-correction - = #1.5 + = #1.5 c'4 e''4 e'4 b'4 | b'4 e''4 b'4 e''4| } diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 1a4198c931..0713abf346 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -127,8 +127,8 @@ r2 r4 r8 r16 @lilypond[fragment] \set Score.timing = ##f -\set Staff.Clef = \turnOff -\set Staff.TimeSignature = \turnOff +\set Staff.Clef = \turnOff +\set Staff.TimeSignature = \turnOff r2 r4 r8 r16 s16_" " @end lilypond @@ -401,7 +401,7 @@ g @end example @lilypond[fragment] -\set Staff.TimeSignature = \turnOff +\set Staff.TimeSignature = \turnOff \key d \major g'1 \key c \minor @@ -427,7 +427,7 @@ not be added automatically, and you must enter what you want to hear. For example, in this example: @lilypond[fragment] -\set Staff.TimeSignature = \turnOff +\set Staff.TimeSignature = \turnOff \key d \major d' cis' fis' @end lilypond @@ -567,7 +567,7 @@ c'4 c'' c''' \clef bass c c, @lilypond[fragment] \set Score.timing = ##f -\set Staff.TimeSignature = \turnOff +\set Staff.TimeSignature = \turnOff c'4 c'' c''' \clef bass c c, @end lilypond @end quotation @@ -600,7 +600,7 @@ one. For example, @code{c f} goes up while @code{c g} goes down: @lilypond[fragment] \set Score.timing = ##f -\set Staff.TimeSignature = \turnOff +\set Staff.TimeSignature = \turnOff \relative c'' { c f c g c } @@ -637,7 +637,7 @@ Larger intervals are made by adding octavation quotes. @lilypond[fragment] \set Score.timing = ##f -\set Staff.TimeSignature = \turnOff +\set Staff.TimeSignature = \turnOff \relative c'' { c f, f c' c g' c, } @@ -666,7 +666,7 @@ Here is an example of the difference between relative mode and @lilypond[fragment] \set Score.timing = ##f -\set Staff.TimeSignature = \turnOff +\set Staff.TimeSignature = \turnOff \relative a { \clef bass a d a e d c' d' @@ -683,7 +683,7 @@ Here is an example of the difference between relative mode and @lilypond[fragment] \set Score.timing = ##f -\set Staff.TimeSignature = \turnOff +\set Staff.TimeSignature = \turnOff \clef bass a d a e d c' d' @end lilypond @@ -1617,7 +1617,7 @@ In the next example, a two note motive is repeated two times by using variable substitution: @lilypond[raggedright,verbatim] -seufzer = \notes { +seufzer = \notes { dis'8 e'8 } \score { \notes { diff --git a/input/ascii-art/twinkle-as5.ly b/input/ascii-art/twinkle-as5.ly index acbe248a99..aaa5925b44 100644 --- a/input/ascii-art/twinkle-as5.ly +++ b/input/ascii-art/twinkle-as5.ly @@ -20,7 +20,7 @@ copyright = "public domain" \include "paper-as5.ly" -melody = \notes \relative c'' { +melody = \notes \relative c'' { \time 2/4 c4 c | g' g | a a | g g | %{ @@ -34,7 +34,7 @@ melody = \notes \relative c'' { %} } -accompany = \notes \relative c { +accompany = \notes \relative c { \clef "bass" \time 2/4 c4 c' | e c | f c | e c | @@ -50,7 +50,7 @@ accompany = \notes \relative c { } -text = \lyrics{ +text = \lyrics{ Twin -- kle, twin -- kle, lit -- tle star, " " %{ How I won -- der what you " " are. diff --git a/input/example-3.ly b/input/example-3.ly index 84c7f60c8e..7fa347f7e6 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,11 +1,11 @@ #(ly:set-option 'old-relative) \version "2.1.22" -one = \notes\relative c{ +one = \notes\relative c{ c'' d e f } -two = \notes\relative c{ +two = \notes\relative c{ \clef "bass" c'2 g2 } diff --git a/input/les-nereides.ly b/input/les-nereides.ly index c30b847237..033c62c6e5 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -2,12 +2,12 @@ \version "2.1.22" \header { - composer = "ARTHUR GRAY" - title = "LES NÉRÉIDES" - subtitle = "THE NEREIDS" - enteredby = "JCN" - piece = "Allegretto scherzando" - copyright = "public domain" + composer = "ARTHUR GRAY" + title = "LES NÉRÉIDES" + subtitle = "THE NEREIDS" + enteredby = "JCN" + piece = "Allegretto scherzando" + copyright = "public domain" } %{ @@ -53,7 +53,7 @@ treble = \new Voice \notes\relative c''{ \change Staff=treble \slurUp - \set PianoStaff.connectArpeggios = ##t + \set PianoStaff.connectArpeggios = ##t #(set-octavation 1) @@ -102,7 +102,7 @@ treble = \new Voice \notes\relative c''{ \bar "||" } -trebleTwo = \new Voice \notes\relative c''{ +trebleTwo = \new Voice \notes\relative c''{ \stemDown \slurDown % \fingerDown @@ -127,7 +127,7 @@ trebleTwo = \new Voice \notes\relative c''{ )] } -bass = \new Voice \notes\relative c{ +bass = \new Voice \notes\relative c{ \partial 2 \key a \major @@ -221,7 +221,7 @@ bass = \new Voice \notes\relative c{ a)] } -bassTwo = \new Voice \notes\relative c{ +bassTwo = \new Voice \notes\relative c{ \skip 2 \skip 1*2 \skip 2 @@ -270,7 +270,7 @@ lowerDynamics = \notes{ s2\sustainDown s8. s16\sustainUp s4 | %4 s4\sustainDown - \set Dynamics.pedalSustainStrings = #'("Ped." "*Ped." "*") + \set Dynamics.pedalSustainStrings = #'("Ped." "*Ped." "*") % grace destroys pedal-line-spanner? % let's do manual tweak: @@ -300,19 +300,19 @@ lowerDynamics = \notes{ % % that's what gray wants, anyway. - \set Dynamics.pedalSustainStyle = #'mixed + \set Dynamics.pedalSustainStyle = #'mixed s8\sustainDown s s s s\sustainUp\sustainDown s s - \once \set Dynamics.pedalSustainStyle = #'text + \once \set Dynamics.pedalSustainStyle = #'text s\sustainUp | %6 - \set Dynamics.pedalSustainStyle = #'mixed + \set Dynamics.pedalSustainStyle = #'mixed s8\sustainDown s s s s\sustainUp\sustainDown s s - \once \set Dynamics.pedalSustainStyle = #'text + \once \set Dynamics.pedalSustainStyle = #'text s\sustainUp | %7 } diff --git a/input/mutopia-header.ly b/input/mutopia-header.ly index 8a145e3944..67558b4b89 100644 --- a/input/mutopia-header.ly +++ b/input/mutopia-header.ly @@ -3,7 +3,7 @@ title = "Title" subtitle = "Subtitle" subsubtitle = "Subsubtitle" - opus = "Opus 1" + opus = "Opus 1" piece = "Piece" composer = "Composer" enteredby = "JCN" diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly index 7794bfe524..48eac1ba2d 100644 --- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -1,17 +1,17 @@ \header { - title = "Petite Ouverture à danser" + title = "Petite Ouverture à danser" subtitle = "4" - source = "" - composer = "Erik Satie (1866-1925)" - enteredby = "jcn" - copyright = "Public Domain" + source = "" + composer = "Erik Satie (1866-1925)" + enteredby = "jcn" + copyright = "Public Domain" } \version "2.1.7" \include "nederlands.ly" -global = \notes { +global = \notes { \key a \minor \time 2/4 s2*10 @@ -32,7 +32,7 @@ global = \notes { \bar "|." } -i = \context Staff \notes\relative c''{ +i = \context Staff \notes\relative c''{ \context Voice=i \voiceOne @@ -60,7 +60,7 @@ i = \context Staff \notes\relative c''{ } -ii = \context Staff \notes\relative c'{ +ii = \context Staff \notes\relative c'{ \context Voice=ii \voiceTwo @@ -98,7 +98,7 @@ ii = \context Staff \notes\relative c'{ } -lower = \context Staff \notes \relative c{ +lower = \context Staff \notes \relative c{ \context Voice=iii 4 | r | | r | diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly index 8d008ce4b9..19a2d926e7 100644 --- a/input/mutopia/F.Schubert/morgenlied.ly +++ b/input/mutopia/F.Schubert/morgenlied.ly @@ -1,6 +1,6 @@ \header { title = "Sängers Morgenlied" - composer = "Franz Schubert" + composer = "Franz Schubert" date = "27. Februar 1815" source = "Edition Peters" editor = "Paul Losse" @@ -26,7 +26,7 @@ } -\version "2.1.21" +\version "2.1.22" manuscriptBreak = { \break } @@ -39,9 +39,9 @@ manuscriptBreak = { \break } } modernAccidentals = { - \property Staff.extraNatural = ##f - \property Staff.autoAccidentals = #'(Staff (same-octave . 1) (any-octave . 0)) - \property Staff.autoCautionaries = #'() + \set Staff.extraNatural = ##f + \set Staff.autoAccidentals = #'(Staff (same-octave . 1) (any-octave . 0)) + \set Staff.autoCautionaries = #'() } @@ -73,12 +73,12 @@ melody = \notes \relative c'' \repeat volta 2 \context Voice = singer { } -ignoreMelisma = \property Lyrics . ignoreMelismata = ##t -ignoreMelismaOff = \property Lyrics . ignoreMelismata \unset +ignoreMelisma = \set ignoreMelismata = ##t +ignoreMelismaOff = \unset ignoreMelismata firstVerse = \lyrics { - \property Lyrics . stanza = "1." + \set stanza = "1." Sü -- ßes Licht! Aus \ignoreMelisma @@ -93,7 +93,7 @@ firstVerse = \lyrics { } secondVerse = \lyrics { - \property Lyrics . stanza = "2." + \set stanza = "2." Ach, der Lie -- be sanf -- tes We -- hen schwellt mir | das be -- weg -- te __ Herz, sanft, wie ein ge -- lieb -- ter Schmerz. __ Dürft ich | @@ -106,7 +106,7 @@ pianoRH = \notes \relative c''' \repeat volta 2 { g16(_\p fis a g fis g f e d c b a ) | 8( ) r8 r | r8 c'( e,) f r a | - \once \property Voice.DynamicLineSpanner \set #'padding =#3 + \once \override DynamicLineSpanner #'padding =#3 r8_\> << { s8 s8-\! } << { fis( g) } \\ { c,4 } >> >> r8 | 4. r8 \clef bass | @@ -136,7 +136,7 @@ pianoLH = \notes \relative c'' \repeat volta 2 { fis r4 8( | 4.) - \once \property Voice.Slur \set #'height-limit = #1.0 + \once \override Slur #'height-limit = #1.0 4.( | 4.) | c,4 r8 g4 r8 | @@ -155,7 +155,7 @@ pianoLH = \notes \relative c'' \repeat volta 2 { \lyricsto "singer" \new Lyrics \firstVerse \lyricsto "singer" \new Lyrics \secondVerse \new PianoStaff << - \property PianoStaff.instrument = \markup { + \set PianoStaff.instrument = \markup { \bold \bigger\bigger\bigger\bigger \huge "2. " } \new Staff \pianoRH diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly index f0d45209b4..590fae3b82 100644 --- a/input/mutopia/F.Schubert/standchen.ly +++ b/input/mutopia/F.Schubert/standchen.ly @@ -42,14 +42,14 @@ instrument = "Piano" footer = "Mutopia-2001/04/27-xx" } -\version "2.1.21" +\version "2.1.22" -dynamicUp = \property Voice.DynamicLineSpanner \override #'direction = #1 -dynamicRevert = \property Voice.DynamicLineSpanner \revert #'direction +dynamicUp = \override DynamicLineSpanner #'direction = #1 +dynamicRevert = \revert DynamicLineSpanner #'direction #(set-global-staff-size 16) -vocalVerse = \notes\relative c''{ +vocalVerse = \notes\relative c''{ \dynamicUp \times 2/3 { g8[( as)] g } c4. g8 | \times 2/3 { f8[( g)] f } c'4 f,8 r | @@ -66,31 +66,31 @@ vocalVerse = \notes\relative c''{ g8. b16 es4. d8 | c8. g16 es4. c8 | \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" as'32[( bes ] - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } \times 2/3 { as8[)( g)] as } c4. as8 | g2. | \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" f32[( g ] - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } \times 2/3 { f8[)( e)] f } as4. f8 | es!2. | g8. b16 es4. d8 | c8. g16 e4. c8 | \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" a'32[( b ] - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } \times 2/3 { a!8[)( gis)] a } c4. a8 | g!2. | \times 2/3 { d'8[\f( cis)] d } f4. b,8 | c!2. | } -vocalThrough = \notes\relative c{ +vocalThrough = \notes\relative c{ \dynamicUp g''8. g16 b8. b16 d8. d16 | c4 b r | @@ -101,9 +101,9 @@ vocalThrough = \notes\relative c{ R2. | R2. | \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" a32[( b ] - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } \times 2/3 { a!8[)( gis)] a } c4. a8 | g!2. | \times 2/3 { d'8[\f( cis)] d } f4. b,8 | @@ -115,7 +115,7 @@ vocalThrough = \notes\relative c{ e2 r4 | } -lyricVerseOne = \lyrics { +lyricVerseOne = \lyrics { Lei -- se fle -- hen mei -- ne Lie -- der durch die Nacht zu dir; in den stil -- len Hain her nie -- der, @@ -130,7 +130,7 @@ lyricVerseOne = \lyrics { fürch -- te, Hol -- de, nicht. } -lyricVerseTwo = \lyrics{ +lyricVerseTwo = \lyrics{ Hörst die Nach -- ti -- gal -- len schla -- gen? ach! sie fle -- hen dich, mit der Tö -- ne sü -- "\ss en" Kla -- gen @@ -145,7 +145,7 @@ lyricVerseTwo = \lyrics{ jed -- es wei -- che Herz. } -lyricThrough = \lyrics{ +lyricThrough = \lyrics{ La\ss auch dir die Brust be -- we -- gen Lieb -- chen, hö -- re mich! be -- bend harr' ich dir ent -- ge -- gen! @@ -155,14 +155,14 @@ lyricThrough = \lyrics{ be -- glük -- ke mich! } -trebleIntro = \notes\relative c{ +trebleIntro = \notes\relative c{ r8^"\bf Mäßig"\pp -. -. -. -. -. | r8 -. -. -. -. -. | r8 -. -. -. -. -. | r8 -. -. -. -. -. | } -trebleVerseOne = \notes\relative c{ +trebleVerseOne = \notes\relative c{ %5 r8 | r8 | @@ -193,14 +193,14 @@ trebleVerseOne = \notes\relative c{ r8\pp | %20 r8 | - \property Voice.Slur \override #'attachment = #'(stem . stem) + \override Slur #'attachment = #'(stem . stem) \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" as'32[( bes ] - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } \times 2/3 { as8[)( g as] } c4.-> as8) | - \property Voice.Slur \revert #'attachment + \revert Slur #'attachment g2. | r8 | r8 | @@ -210,7 +210,7 @@ trebleVerseOne = \notes\relative c{ 4.-> 8) | } -trebleEentje = \notes \relative c' \context Voice { +trebleEentje = \notes \relative c' \context Voice { \stemBoth 2 r4 | 2\(\mf 8.(-> 16)\) | @@ -225,7 +225,7 @@ trebleEentje = \notes \relative c' \context Voice { 2 r4 | } -trebleThrough = \notes \relative c'{ +trebleThrough = \notes \relative c'{ \stemBoth 2. | %61 @@ -256,9 +256,9 @@ trebleThrough = \notes \relative c'{ 4.-> 8) 2. | 2. | - \property Voice . TextScript \override #'font-shape = #'italic + \override TextScript #'font-shape = #'italic 2._"decresc." - \property Voice . TextScript \revert #'font-shape + \revert TextScript #'font-shape %75 2. | @@ -270,15 +270,15 @@ trebleThrough = \notes \relative c'{ 4. 8(-. -. )-. | %80 - \property Voice . TextScript \override #'font-shape = #'italic + \override TextScript #'font-shape = #'italic 2._"dim." - \property Voice . TextScript \revert #'font-shape + \revert TextScript #'font-shape 2. | 2.\fermata | } -bassIntro = \notes\relative c{ +bassIntro = \notes\relative c{ \dynamicUp %1 2 r4 | @@ -287,7 +287,7 @@ bassIntro = \notes\relative c{ 2 r4 | } -bassVerseOne = \notes\relative c{ +bassVerseOne = \notes\relative c{ % \clef bass \dynamicUp %5 @@ -319,7 +319,7 @@ bassVerseOne = \notes\relative c{ c,8 [ ] | } -bassEentje = \notes\relative c{ +bassEentje = \notes\relative c{ \dynamicUp 8 [ ] | c,8 [ ] | @@ -331,7 +331,7 @@ bassEentje = \notes\relative c{ c,8 [ ] | } -bassThrough = \notes\relative c{ +bassThrough = \notes\relative c{ \dynamicUp %61 8^"cresc." [ -> ] | @@ -365,7 +365,7 @@ bassThrough = \notes\relative c{ 2._\fermata | } -global = \notes{ +global = \notes{ \time 3/4 \key es \major \skip 1 * 3/4 * 4 @@ -380,7 +380,7 @@ global = \notes{ \bar "|." } -allLyrics = { +allLyrics = { % maybe should be bigger by default, in grob-description.scm ? \lyricsto "leise" \new Lyrics { \lyricVerseOne @@ -403,11 +403,11 @@ vocals = \context Voice = leise \notes { R1 * 3/4 * 6 } -trebleStaff = \context Staff = treble<< - \property Staff.midiInstrument = "acoustic grand" +trebleStaff = \context Staff = treble<< + \set Staff.midiInstrument = "acoustic grand" \global {\clef treble - \property Voice.autoBeamSettings \override #'(begin * * * *) = #(ly:make-moment 0 1) + \override autoBeamSettings #'(begin * * * *) = #(ly:make-moment 0 1) \trebleIntro \trebleVerseOne \trebleEentje @@ -415,8 +415,8 @@ trebleStaff = \context Staff = treble<< \trebleThrough } >> -bassStaff = \context Staff = bass<< - \property Staff.midiInstrument = "acoustic grand" +bassStaff = \context Staff = bass<< + \set Staff.midiInstrument = "acoustic grand" \global \clef bass {\bassIntro @@ -430,7 +430,7 @@ bassStaff = \context Staff = bass<< \score{ << \new Staff << - \property Staff.midiInstrument = "synth voice" + \set Staff.midiInstrument = "synth voice" %% insert \transpose if necessary, depending on voice range. \global \vocals diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly index a32f548f74..fd1e032212 100644 --- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly +++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly @@ -1,4 +1,4 @@ -\version "2.1.21" +\version "2.1.22" % #(ly:set-point-and-click 'line-column) @@ -46,8 +46,8 @@ half way in measure 13 has been forgotten. } -sarabandeA = \context Voice \notes \relative c { - \property Staff.NoteCollision \set #'merge-differently-dotted = ##t +sarabandeA = \context Voice \notes \relative c { + \override Staff.NoteCollision #'merge-differently-dotted = ##t << { d8. e16 e4.\trill d16 e } \\ @@ -121,14 +121,14 @@ sarabandeA = \context Voice \notes \relative c { d'[ cis] | %% d4 d,,2 | d4 - \property Voice.NoteHead - \override #'after-line-breaking-callback - = #(lambda (smob) (assert-system-count smob 6)) + \override NoteHead + #'after-line-breaking-callback + = #(lambda (smob) (assert-system-count smob 6)) d,,2 | } -sarabandeCelloGlobal = \notes{ +sarabandeCelloGlobal = \notes{ \time 3/4 \key f \major \clef bass @@ -139,10 +139,10 @@ sarabandeCelloGlobal = \notes{ } } -sarabandeCelloScripts = \notes{ +sarabandeCelloScripts = \notes{ } -sarabandeCelloStaff = \context Staff << +sarabandeCelloStaff = \context Staff << \sarabandeA \sarabandeCelloGlobal \sarabandeCelloScripts @@ -168,7 +168,7 @@ baerPaper = \paper { interscoreline=4.0\mm \translator { \ScoreContext -% System \override #'print-function = #box-grob-molecule +% System \override #'print-function = #box-grob-stencil } } diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly index 06995fe580..de797eb545 100644 --- a/input/mutopia/J.S.Bach/bwv940.ly +++ b/input/mutopia/J.S.Bach/bwv940.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.1.7" +\version "2.1.22" %{ Header for Petites Preludes. @@ -41,7 +41,7 @@ footer = "Mutopia-2003/08/22-nr" } -one = \notes\relative c{ +one = \notes\relative c{ \skip 1 | \stemUp r4 d''2 cis4 | @@ -62,7 +62,7 @@ one = \notes\relative c{ \bar "|." } -two = \notes\relative c{ +two = \notes\relative c{ r16 d'' c bes a bes f g a8.\mordent bes16 g8.\prall f16 | \stemDown @@ -95,7 +95,7 @@ three = \notes\relative c{ \stemDown \tieDown e4 ~ e16 f e d cis a b cis d e f d | - \property Voice.TextScript \set #'font-style = #'finger + \override TextScript #'font-style = #'finger bes2 a ~ | a a | d, cis' | @@ -104,19 +104,19 @@ three = \notes\relative c{ \bar "|." } -four = \notes\relative c{ +four = \notes\relative c{ \stemDown d2 cis | \skip 1*2 | \skip 4*3 \change Staff=upper \stemUp - \property Voice.NoteColumn \override #'horizontal-shift = #1 + \override NoteColumn #'horizontal-shift = #1 c''4 | %5 a gis ~ gis16 gis fis e \skip 4*1 \change Staff=lower \stemDown - \property Voice.NoteColumn \override #'horizontal-shift = #0 + \override NoteColumn #'horizontal-shift = #0 \stemUp\tieUp b2 a | g a4. gis16 a | @@ -129,7 +129,7 @@ four = \notes\relative c{ >> } -global = \notes{ +global = \notes{ \time 4/4 \key f \major } diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly index 8fdf10a48a..be847ef371 100644 --- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -1,9 +1,9 @@ \header { - title = "Fuga a 3 voci" - opus = "BWV 847-Fuga" - source = "Henle's Urtext" - composer = "Johann Sebastian Bach (1685-1750)" - enteredby = "hwn, wl, jcn" + title = "Fuga a 3 voci" + opus = "BWV 847-Fuga" + source = "Henle's Urtext" + composer = "Johann Sebastian Bach (1685-1750)" + enteredby = "hwn, wl, jcn" % mutopia headers. mutopiatitle = "Das Wohltemperierte Clavier I, Fuga II (c-minor)" @@ -36,12 +36,12 @@ %} -\version "2.1.7" +\version "2.1.22" -dux = \context Voice=two \notes \relative c''{ +dux = \context Voice=two \notes \relative c''{ \voiceTwo \clef violin @@ -103,9 +103,9 @@ dux = \context Voice=two \notes \relative c''{ } -comes = \context Voice=one \notes \relative c'' { +comes = \context Voice=one \notes \relative c'' { \voiceOne - \property Voice.MultiMeasureRest \override #'staff-position = #6 + \override MultiMeasureRest #'staff-position = #6 R1 | R1 | r8 g'16 fis g8 c, es g16 fis g8 a | @@ -145,7 +145,7 @@ comes = \context Voice=one \notes \relative c'' { f,16 g as4 g16 f e2 | } -bassdux = \context Voice=three \notes \relative c' { +bassdux = \context Voice=three \notes \relative c' { \clef bass R1 | R | @@ -192,7 +192,7 @@ bassdux = \context Voice=three \notes \relative c' { \score { \notes \context PianoStaff << - \property Score.TimeSignature \override #'style = #'C + \override Score.TimeSignature #'style = #'C \context Staff = treble << \key c \minor \dux diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index 2d32473ee1..eec9e00ff2 100644 --- a/input/mutopia/R.Schumann/romanze-op28-2.ly +++ b/input/mutopia/R.Schumann/romanze-op28-2.ly @@ -4,7 +4,7 @@ \include "deutsch.ly" #(set-global-staff-size 16) -\version "2.1.21" +\version "2.1.22" \header { title = "Romanzen" @@ -26,22 +26,22 @@ d = { \change Staff = down \stemUp } forcedBreak = \break global = \notes { \key fis \major \time 6/8 - \property Score.beatLength = #(ly:make-moment 3 8) + \set Score.beatLength = #(ly:make-moment 3 8) \repeat volta 2 { s2.*8 } s2.*26 \bar "|." } righta = \notes \transpose c cis' { % \stemUp \slurUp \tieUp \stemUp - \property Voice.Slur \override #'attachment = #'(stem . stem) + \override Slur #'attachment = #'(stem . stem) \repeat volta 2 { - \property Voice.TextScript \override #'extra-offset = #'(-8.0 . 2.5) + \override TextScript #'extra-offset = #'(-8.0 . 2.5) \m a,16[^\p( \u c^\markup { \large "Einfach (" \note #"8" #1 \large " = 100)" } a c ] \m g,[ \u c^3 ] \m b,[ \u c^2 b c] \m a,[ \u c^3]) | - \property Voice.TextScript \revert #'extra-offset + \revert TextScript #'extra-offset \m f,[( \u c f c] \m g,[ \u c^4] \m a,[ \u c^2 a c8 c16)] | \m c16[( \u f c' f] \m b,[ \u f] \m d[ \u f^3 d' f^2] \m c[ \u f)^4] | \m f,16[( \u c16^3 f c] \m g,[ \u c^4] \m a,[ \u c^2 a c8 c16)] | @@ -107,13 +107,13 @@ rightb = \notes \transpose c cis' { c_3 g,_2 es, g, h,_4 g, d, g, c g,8 f,16 | c g, es, g, es c_3 as, c^2 d^3 c h, c | e des b,\< des g e_3 ces_4 d_2 f^3 d cis d | - \property Voice.PhrasingSlur \override #'extra-offset = #'(0 . 3) - \property Voice.PhrasingSlur \override #'beautiful = #42 + \override PhrasingSlur #'extra-offset = #'(0 . 3) + \override PhrasingSlur #'beautiful = #42 g\( fes des fes b g_3 es_1\! ges_2 a^3 ges f_1 ges_2 | r ges_2 b des_1 ges b,_2 des ges,^1 b, \d des,^1 \stemDown \transpose c' c { b,[_1 as,] | g,8 b,16[ g, e, cis,] d,\)_4 \< f, h, d_3 f_2 r16\! } - \property Voice.PhrasingSlur \revert #'extra-offset - \property Voice.PhrasingSlur \revert #'beautiful + \revert PhrasingSlur #'extra-offset + \revert PhrasingSlur #'beautiful \change Staff=mid \relative c { \stemDown \slurDown @@ -123,16 +123,16 @@ rightb = \notes \transpose c cis' { f,8.. f32^1 g8^2 a4.) | a4^1( c8^1_\accent~[c b)] g16^1([ b^2] | c4)^1 es8^1~es d^1 f^1~ | - \property PianoStaff.Arpeggio \override #'direction = #1 + \override PianoStaff.Arpeggio #'direction = #1 f f8.. f32^1( as4.)^\fermata\arpeggio ~ | - \property PianoStaff.Arpeggio \revert #'direction + \revert PianoStaff.Arpeggio #'direction \stemUp \tieUp as r4 r8 | } s2. s \u s4. \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" f8( - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } f4) e8 | f g16_2 b_1 a_2 gis_1 c_2 h, c cis_1 d_2 b,_1 | \tieDown c4.~16\< \tieBoth ~ < f^3 h >8[\>\! < e b^2> \!] | @@ -172,7 +172,7 @@ lefta = \notes \transpose c cis { c4) r8 f4-4( as8-5~ | as g-4 b)-5 as4-5( ces'8-4~ | ces' b des'-4 c'4)-5( 8 | \stemDown \tieDown des'4.)_5~des'~ | - \property Voice.NoteColumn \override #'horizontal-shift = #-1 des' s + \override NoteColumn #'horizontal-shift = #-1 des' s } >> \change Staff=down \stemUp \slurUp \tieUp \phrasingSlurUp @@ -186,9 +186,9 @@ lefta = \notes \transpose c cis { s2.*2 s8 r16 h\( c' d' es' as g8\arpeggio fis( ges)\) f16-2( a-1 c'-3 f')-1 \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" \stemDown \slurUp b,[( f] \stemUp - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } e')-1( d' c' b-1 a-2\prall g f16)-4 f' d'-1 c'-2 h-1 s4. s2. @@ -239,30 +239,30 @@ leftb = \notes \transpose c cis { \score { \notes \context PianoStaff << \pianoCautionaries - \property PianoStaff.NoteCollision \override #'merge-differently-dotted = ##t - \property PianoStaff.connectArpeggios = ##t - \property PianoStaff.Arpeggio \override #'print-function = \arpeggioBracket + \override PianoStaff.NoteCollision #'merge-differently-dotted = ##t + \set PianoStaff.connectArpeggios = ##t + \override PianoStaff.Arpeggio #'print-function = \arpeggioBracket - \property PianoStaff.InstrumentName \set #'font-size = #6 - \property PianoStaff.InstrumentName \set #'font-shape = #'italic - \property PianoStaff.InstrumentName \set #'font-magnification = #3 + \override PianoStaff.InstrumentName #'font-size = #6 + \override PianoStaff.InstrumentName #'font-shape = #'italic + \override PianoStaff.InstrumentName #'font-magnification = #3 - \property PianoStaff.instrument="2. " + \set PianoStaff.instrument = "2. " \context Staff = up { - \property Staff.DynamicLineSpanner \override #'direction = #-1 + \override Staff.DynamicLineSpanner #'direction = #-1 \clef G <<\global \context Voice=upv \righta >> } \context Staff = mid { - \property Staff.InstrumentName \set #'font-size = #0 - \property Staff.InstrumentName \set #'font-shape = #'upright - \property Staff.InstrumentName \set #'font-magnification = #1 - \property Staff.InstrumentName \set #'extra-offset = #'(0 . 6) - % \property Staff.instrument="\\begin{turn}{-90}{Rechte Hand}\\end{turn}" - \property Staff.instrument= \markup { \column < Rechte Hand > } + \override Staff.InstrumentName #'font-size = #0 + \override Staff.InstrumentName #'font-shape = #'upright + \override Staff.InstrumentName #'font-magnification = #1 + \override Staff.InstrumentName #'extra-offset = #'(0 . 6) + % \set Staff.instrument = "\\begin{turn}{-90}{Rechte Hand}\\end{turn}" + \set Staff.instrument = \markup { \column < Rechte Hand > } \clef F <<\global \context Voice=midv \rightb>> } \context Staff = down { - \property Staff.DynamicLineSpanner \override #'direction = #1 + \override Staff.DynamicLineSpanner #'direction = #1 \clef F << \global \context Voice=lva \lefta \context Voice=lvb \leftb >> } diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly index 6c18d94845..e84625f017 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly @@ -19,7 +19,7 @@ source = "Edition Breitkopf 2563" footer = "Mutopia-2002/05/21-25" - tagline = "\\parbox{\hsize}{\\thefooter\\quad\\small This music is part of the Mutopia project, \\texttt{http://sca.uwaterloo.ca/Mutopia/}. It has been typeset and placed in the public domain by " + \maintainer + ". Unrestricted modification and redistribution is permitted and encouraged---copy this music and share it!}" + tagline = "\\parbox{\hsize}{\\thefooter\\quad\\small This music is part of the Mutopia project, \\texttt{http://sca.uwaterloo.ca/Mutopia/}. It has been typeset and placed in the public domain by " + \maintainer + ". Unrestricted modification and redistribution is permitted and encouraged---copy this music and share it!}" } %{ diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly index f2ba62f4e0..f8ea2c4df1 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.1.7" +\version "2.1.22" \include "mozart-hrn3-defs.ly" allegro = @@ -27,9 +27,9 @@ allegro = c4.( d16[ e] f4 e) a,( d g, c) d-. d-. \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" e16( - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } d8.[) c16 d8. e16] c4 r r2 R1*3 @@ -45,9 +45,9 @@ allegro = b[( a)] a4 r8 a[ a a] a4( cis e g) \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" \longgrace g16( \endlonggrace - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } fis8[)( e16 d)] d4-. r2 | \mark "B" @@ -68,9 +68,9 @@ allegro = << a1(\trill { s2 \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" g16[ a] - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } } >> \mark "C" g4) r r2 @@ -111,9 +111,9 @@ allegro = a, ( d g, c) d d \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" e8( - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } d8.[) c16 d8. e16] c4 r r2 @@ -125,14 +125,14 @@ allegro = c[( b)] b4 r2 c2 (bes a) a8[(b c cis)] d2( ~ d8[ e16 d] \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" \longgrace d16( \endlonggrace - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } c8[) b16 c)] \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" \longgrace c16 \endlonggrace - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } b8[( a16 g)] g4 r2 | R1*3 r2 r4 g'8[( e)] @@ -153,16 +153,16 @@ allegro = f4. ( d8) f8[ ( d) f d] c[ (e] g2) \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" \longgrace f16( \endlonggrace - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } e8[)( d16 c)] << d1\trill ( { s2 \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" c16[ d] - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } } >> c4) r r2 @@ -178,9 +178,9 @@ allegro = << d1(\trill { s2 \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" c16[ d] - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } } >> c4) r r2 R1*3 diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly index a2070ed616..00d7157397 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly @@ -1,15 +1,15 @@ % #(ly:set-point-and-click 'line-column) -longgrace = \property Voice.Stem \override #'stroke-style = #'() -endlonggrace = \property Voice.Stem \revert #'stroke-style +longgrace = \override Stem #'stroke-style = #'() +endlonggrace = \revert Stem #'stroke-style ritenuto = \markup { \italic "rit." } -\version "2.1.7" +\version "2.1.22" cresc = \notes { #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) - \property Voice.crescendoText = \markup { \italic \bold "cresc." } - \property Voice.crescendoSpanner = #'dashed-line + \set crescendoText = \markup { \italic \bold "cresc." } + \set crescendoSpanner = #'dashed-line } %% @@ -18,14 +18,14 @@ cresc = \notes { startGraceMusic = \sequential { \startGraceMusic - \property Voice.Beam \override #'space-function - = #(lambda (beam mult) (* 0.8 0.8)) - \property Voice.Beam \override #'thickness = #(* 0.384 (/ 0.6 0.48)) + \override Beam #'space-function + = #(lambda (beam mult) (* 0.8 0.8)) + \override Beam #'thickness = #(* 0.384 (/ 0.6 0.48)) } stopGraceMusic= \sequential { - \property Voice.Beam \revert #'thickness - \property Voice.Beam \revert #'space-function + \revert Beam #'thickness + \revert Beam #'space-function \stopGraceMusic } diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly index 64b08c77b7..c7d39cd873 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly @@ -1,12 +1,12 @@ #(ly:set-option 'old-relative) -\version "2.1.7" +\version "2.1.22" \include "mozart-hrn3-defs.ly" romanze = \notes \relative c' { \key f \major \time 2/2 - \property Score.skipBars = ##t + \set Score.skipBars = ##t c'4.( _\markup { \dynamic "p" \italic { "" con molto espressione } } f8) a,4 a @@ -45,20 +45,20 @@ romanze = \notes \relative c' { c[ ( e) g g] g[( f e d)] c4( \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" \longgrace e16 \endlonggrace - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } d8.[ c16) \< ] c8[ c-.( c-. c)-.]\! \mark "C" %% this is a trick to get the sfp-s to align. - \property Voice.Hairpin \override #'transparent = ##t + \override Hairpin #'transparent = ##t des1\sfp \> g,1\sfp\! \> c\sfp \! \> c,\sfp\! - \property Voice.Hairpin \revert #'transparent + \revert Hairpin #'transparent R1*3 r8 c[\p c c] c2~ c8[ c' c c] c2~ diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly index ef5d0d8929..e706c51740 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.1.7" +\version "2.1.22" % \include "mozart-hrn3-defs.ly" @@ -22,12 +22,12 @@ lipbreaker = \notes \relative c' c[ c c] c[ c c] } -rightsixteenth = { \property Voice.stemLeftBeamCount = 1 - \property Voice.stemRightBeamCount = 2 } -leftsixteenth = { \property Voice.stemLeftBeamCount = 2 - \property Voice.stemRightBeamCount = 1 } -bothsixteenth = { \property Voice.stemLeftBeamCount = 2 - \property Voice.stemRightBeamCount = 2 } +rightsixteenth = { \set stemLeftBeamCount = 1 + \set stemRightBeamCount = 2 } +leftsixteenth = { \set stemLeftBeamCount = 2 + \set stemRightBeamCount = 1 } +bothsixteenth = { \set stemLeftBeamCount = 2 + \set stemRightBeamCount = 2 } rondo = \notes \relative c' { @@ -48,15 +48,15 @@ rondo = \notes \relative c' R2.*7 \mark "A" c4.\p \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" e16( - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } d8[) c d] c4 r8 r4 r8 e4. \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" g16( - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } f8[) e f] e4 r8 r4 r8 g4. e4 c8 @@ -172,9 +172,9 @@ rondo = \notes \relative c' << d2.(\trill { s2 \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" c16[ d] - \property Voice.Stem \revert #'stroke-style } + \revert Stem #'stroke-style } } >> diff --git a/input/no-notation/bar-check.ly b/input/no-notation/bar-check.ly index aec0911af5..29d7f82dde 100644 --- a/input/no-notation/bar-check.ly +++ b/input/no-notation/bar-check.ly @@ -7,7 +7,7 @@ texidoc = "skipTypesetting doesn't affect bar checks." } \score { \notes { - \set Score.skipTypesetting = ##t + \set Score.skipTypesetting = ##t c4 c4 | c4 c4 }} diff --git a/input/no-notation/midi-transposing.ly b/input/no-notation/midi-transposing.ly index e4b9d76dc8..2f3dbbaf4e 100644 --- a/input/no-notation/midi-transposing.ly +++ b/input/no-notation/midi-transposing.ly @@ -9,14 +9,14 @@ The transposing property leaves output invariant, but has effect on MIDI. " \context Voice \notes\relative c { % btw: this is not how transposing is done in lilypond % this is a transposing performer, i.e. for midi-output only - \set Staff.transposing = #0 c - \set Staff.transposing = #2 c - \set Staff.transposing = #4 c - \set Staff.transposing = #5 c - \set Staff.transposing = #7 c - \set Staff.transposing = #9 c - \set Staff.transposing = #11 c - \set Staff.transposing = #12 c + \set Staff.transposing = #0 c + \set Staff.transposing = #2 c + \set Staff.transposing = #4 c + \set Staff.transposing = #5 c + \set Staff.transposing = #7 c + \set Staff.transposing = #9 c + \set Staff.transposing = #11 c + \set Staff.transposing = #12 c } \paper { raggedright = ##t } diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly index 713d301d2a..38906c4e89 100644 --- a/input/no-notation/midi-volume-equaliser.ly +++ b/input/no-notation/midi-volume-equaliser.ly @@ -22,93 +22,93 @@ Override, see scm/midi.scm: %} flauti = \notes \relative c' { - \set Staff.midiInstrument = #"flute" - \set Staff.instrument = #"2 Flauti" - \set Staff.instr = #"Fl." + \set Staff.midiInstrument = #"flute" + \set Staff.instrument = #"2 Flauti" + \set Staff.instr = #"Fl." c1\f R1*10 } oboi = \notes \relative c' { - \set Staff.midiInstrument = #"oboe" - \set Staff.instrument = #"2 Oboi" - \set Staff.instr = #"Ob." + \set Staff.midiInstrument = #"oboe" + \set Staff.instrument = #"2 Oboi" + \set Staff.instr = #"Ob." R1*1 c1\f R1*9 } clarinetti = \notes \relative c' { - \set Staff.midiInstrument = #"clarinet" - \set Staff.instrument = #"Clarinetti" - \set Staff.instr = #"Cl" + \set Staff.midiInstrument = #"clarinet" + \set Staff.instrument = #"Clarinetti" + \set Staff.instr = #"Cl" R1*2 c1\f R1*8 } fagotti = \notes \relative c' { - \set Staff.midiInstrument = #"bassoon" - \set Staff.instrument = #"2 Fagotti" - \set Staff.instr = #"Fg." + \set Staff.midiInstrument = #"bassoon" + \set Staff.instrument = #"2 Fagotti" + \set Staff.instr = #"Fg." \clef bass R1*3 c1\f R1*7 } corni = \notes \relative c' { - \set Staff.midiInstrument = #"french horn" - \set Staff.instrument = #"Corni" - \set Staff.instr = #"Cor" + \set Staff.midiInstrument = #"french horn" + \set Staff.instrument = #"Corni" + \set Staff.instr = #"Cor" R1*4 c1\f R1*6 } trombe = \notes \relative c' { - \set Staff.midiInstrument = #"trumpet" - \set Staff.instrument = #"Trombe" - \set Staff.instr = #"Tp." + \set Staff.midiInstrument = #"trumpet" + \set Staff.instrument = #"Trombe" + \set Staff.instr = #"Tp." \clef bass R1*5 c1\f R1*5 } timpani = \notes \relative c' { - \set Staff.midiInstrument = #"timpani" - \set Staff.instrument = #"Timpani" - \set Staff.instr = #"Timp." + \set Staff.midiInstrument = #"timpani" + \set Staff.instrument = #"Timpani" + \set Staff.instr = #"Timp." R1*6 c1\f R1*4 } violinoI = \notes \relative c' { - \set Staff.midiInstrument = #"violin" - \set Staff.instrument = #"Violino I " - \set Staff.instr = #"Vl. I " + \set Staff.midiInstrument = #"violin" + \set Staff.instrument = #"Violino I " + \set Staff.instr = #"Vl. I " R1*7 c1\f R1*3 } violinoII = \notes \relative c' { - \set Staff.midiInstrument = #"violin" - \set Staff.instrument = #"Violino II " - \set Staff.instr = #"Vl. II " + \set Staff.midiInstrument = #"violin" + \set Staff.instrument = #"Violino II " + \set Staff.instr = #"Vl. II " R1*8 c1\f R1*2 } viola = \notes \relative c' { - \set Staff.midiInstrument = #"viola" - \set Staff.instrument = #"Viola" - \set Staff.instr = #"Vla." + \set Staff.midiInstrument = #"viola" + \set Staff.instrument = #"Viola" + \set Staff.instr = #"Vla." \clef alto R1*9 c1\f R1*1 } violoncello = \notes \relative c' { - \set Staff.midiInstrument = #"cello" - %\set Staff.midiInstrument = #"contrabass" - \set Staff.instrument = #"Violoncello" - \set Staff.instr = #"Vc." + \set Staff.midiInstrument = #"cello" + %\set Staff.midiInstrument = #"contrabass" + \set Staff.instrument = #"Violoncello" + \set Staff.instr = #"Vc." \clef bass R1*10 c1\f diff --git a/input/no-notation/textcresc.ly b/input/no-notation/textcresc.ly index 85e8f4bb22..9c86ec96cf 100644 --- a/input/no-notation/textcresc.ly +++ b/input/no-notation/textcresc.ly @@ -5,8 +5,8 @@ texidoc="crashes lily" \score { \notes { \context Voice { - \set crescendoText = "cresc." - \set crescendoSpanner = #'dashed-line + \set crescendoText = "cresc." + \set crescendoSpanner = #'dashed-line c2. r8 c8 \< \break \! c1 } } diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly index 38d6c87c01..7214e988bc 100644 --- a/input/regression/accidental-single-double.ly +++ b/input/regression/accidental-single-double.ly @@ -10,13 +10,13 @@ natural sign. -thenotes = \notes \relative cis' { \time 4/4 +thenotes = \notes \relative cis' { \time 4/4 gisis'4 gis gisis ges | } \score { << \context Staff \thenotes \context NoteNames { - \override NoteNames.NoteName #'no-spacing-rods = ##f + \override NoteNames.NoteName #'no-spacing-rods = ##f \thenotes } >> diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly index 83f353f9bf..77e9cccb36 100644 --- a/input/regression/arpeggio.ly +++ b/input/regression/arpeggio.ly @@ -15,7 +15,7 @@ Arpeggios are supported, both cross-staff and broken single staff. \override Staff.Arpeggio #'arpeggio-direction = #1 \arpeggio %%\override PianoStaff.SpanArpeggio #'connect = ##t - \set PianoStaff.connectArpeggios = ##t + \set PianoStaff.connectArpeggios = ##t \arpeggio } \new Staff\relative c{ diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly index 9424bccad2..4638eae1c3 100644 --- a/input/regression/auto-beam-tuplets.ly +++ b/input/regression/auto-beam-tuplets.ly @@ -7,7 +7,7 @@ beams even if they're auto generated." } \score { \notes \relative c' { - \set tupletSpannerDuration = #(ly:make-moment 1 4) + \set tupletSpannerDuration = #(ly:make-moment 1 4) \override TupletBracket #'bracket-visibility = #'if-no-beam \times 2/3 { f8[ f f ] f8[ f f ] f f f f f f diff --git a/input/regression/balloon.ly b/input/regression/balloon.ly index 61d99de846..591dd1a00b 100644 --- a/input/regression/balloon.ly +++ b/input/regression/balloon.ly @@ -16,7 +16,7 @@ with lines and explanatory text added." \once\override Stem #'balloon-text = #"I'm a stem" \once\override Stem #'balloon-text-offset = #'(3 . 4) \once\override Stem #'balloon-text-props - = #'((font-family . roman)) + = #'((font-family . roman)) %% use predefd function. diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly index 8782656ec3..43b6bdc841 100644 --- a/input/regression/bar-number.ly +++ b/input/regression/bar-number.ly @@ -16,7 +16,7 @@ The padding should be increased, to prevent clashes at the start of the line. \notes \relative c'' { \partial 4 c4 c1 c c - \set Score.currentBarNumber = #99999 + \set Score.currentBarNumber = #99999 \override Score.BarNumber #'padding = #3 c1 c } diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly index a567165e31..28f5cdf29c 100644 --- a/input/regression/bar-scripts.ly +++ b/input/regression/bar-scripts.ly @@ -10,16 +10,16 @@ knowing it. Consequently, they fall over often. \paper { raggedright = ##t } -onestaff = \new Staff\notes\relative c'' { - \set Staff.instr = instr - \set Staff.instrument = instrument \mark "B" +onestaff = \new Staff\notes\relative c'' { + \set Staff.instr = instr + \set Staff.instrument = instrument \mark "B" c1 \mark "A" \break c2 c2 \break } -grstaff = \notes \relative c'' \context GrandStaff << +grstaff = \notes \relative c'' \context GrandStaff << \new Staff { - \set Staff.instr = instr + \set Staff.instr = instr \mark "B" \break c1 \mark "A" c2 } \new Staff { c1 c2 } diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly index e316f1201f..5019e29eaa 100644 --- a/input/regression/beam-break.ly +++ b/input/regression/beam-break.ly @@ -8,6 +8,6 @@ \paper { raggedright= ##t } \score { \notes \relative c'' { - \set Score.forbidBeamBreak = ##f + \set Score.forbidBeamBreak = ##f \time 3/16 c16-[ d e \break f-] }} diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly index a2def9831e..82cfcdae0e 100644 --- a/input/regression/beam-funky.ly +++ b/input/regression/beam-funky.ly @@ -13,7 +13,7 @@ beam. This is in disagreement with the current algorithm." \relative c' { \override Beam #'auto-knee-gap = #7 - \set subdivideBeams = ##t + \set subdivideBeams = ##t \time 8/8 c,16[ g'''16 c,,,16 g'''16 diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly index 5664f0a6e6..2b3907471c 100644 --- a/input/regression/beam-manual-beaming.ly +++ b/input/regression/beam-manual-beaming.ly @@ -3,7 +3,7 @@ \header { -texidoc = +texidoc = "Beaming can be overidden for individual stems." } \score { diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly index 34b9a741a0..eb189215eb 100644 --- a/input/regression/chord-changes.ly +++ b/input/regression/chord-changes.ly @@ -13,7 +13,7 @@ scheme = \chords { } settings = { - \set chordChanges = ##t + \set chordChanges = ##t } \score { diff --git a/input/regression/chord-name-exceptions.ly b/input/regression/chord-name-exceptions.ly index 0fbac71da0..3182f1daf4 100644 --- a/input/regression/chord-name-exceptions.ly +++ b/input/regression/chord-name-exceptions.ly @@ -31,9 +31,9 @@ chExceptions = #(append (sequential-music-to-chord-exceptions chExceptionMusic #t) ignatzekExceptions) -theMusic = \chords { +theMusic = \chords { c:7sus4 c:dim7/+f - \set Current.chordNameExceptions = #chExceptions + \set Current.chordNameExceptions = #chExceptions c:7sus4 c:dim7/+f } diff --git a/input/regression/chord-name-major7.ly b/input/regression/chord-name-major7.ly index 28c26ad117..2dacaf6e0f 100644 --- a/input/regression/chord-name-major7.ly +++ b/input/regression/chord-name-major7.ly @@ -6,6 +6,6 @@ \score {\context ChordNames \chords { c:7+ - \set majorSevenSymbol = \markup { "j7" } + \set majorSevenSymbol = \markup { "j7" } c:7+ } } diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly index efccf654f6..6dcde40e1d 100644 --- a/input/regression/clefs.ly +++ b/input/regression/clefs.ly @@ -23,7 +23,7 @@ or below the clef respectively." \clef "varbaritone"c'1^"{varbaritone}" \bar "||" \clef "bass"c'1^"{bass}" \bar "||" \clef "subbass"c'1^"{subbass}" \bar "||" - \override Staff.Clef #'full-size-change = ##t + \override Staff.Clef #'full-size-change = ##t \clef "treble" c'1^"full-size-change = \#t" \bar "|." } \paper{ diff --git a/input/regression/collision-merge-dots.ly b/input/regression/collision-merge-dots.ly index 0cd7eecc6c..cdedd9b69f 100644 --- a/input/regression/collision-merge-dots.ly +++ b/input/regression/collision-merge-dots.ly @@ -1,6 +1,6 @@ \header { - texidoc = "When merging heads, the dots are merged too." + texidoc = "When merging heads, the dots are merged too." } \version "2.1.22" diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly index c4e6e803ff..d0b5cf53f8 100644 --- a/input/regression/collisions.ly +++ b/input/regression/collisions.ly @@ -28,13 +28,13 @@ twovoicechords = \context Staff \notes << >> -threevoice = \context Staff \notes << +threevoice = \context Staff \notes << { g4 f e f g a g2 } \\ { c4 d e d c d es } \\ { e4 e e e e e e e } >> -hairyChord = \context Staff \notes \relative c'' +hairyChord = \context Staff \notes \relative c'' << e \\ fis, \\ cis' \\ diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly index 511bc0e0f4..1b19890641 100644 --- a/input/regression/dot-flag-collision.ly +++ b/input/regression/dot-flag-collision.ly @@ -8,7 +8,7 @@ \notes\relative c'' { \time 8/4 - \set Staff.autoBeaming = ##f + \set Staff.autoBeaming = ##f a,16. g''16. a,4. a8 a8. a16. c,16. g16. diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly index a111c3ce1c..4782932a5a 100644 --- a/input/regression/easy-notation.ly +++ b/input/regression/easy-notation.ly @@ -1,7 +1,7 @@ \version "2.1.22" \header { -texidoc = " Ez-notation prints names in note heads. +texidoc = " Ez-notation prints names in note heads. You also get ledger lines, of course." } diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly index 352f1b0ade..d7684f77c9 100644 --- a/input/regression/finger-chords.ly +++ b/input/regression/finger-chords.ly @@ -16,22 +16,22 @@ easier to process." %% input order is not 1 2 3 , output is. 4 - \set fingeringOrientations = #'(left) + \set fingeringOrientations = #'(left) < c-1 e-2 g-3 b-5 > 4 - \set fingeringOrientations = #'(down left) + \set fingeringOrientations = #'(down left) < c-1 e-2 g-3 b-5 > 4 - \set fingeringOrientations = #'(down left up) + \set fingeringOrientations = #'(down left up) < c-1 e-2 g-3 b-5 > 4 \once \override Fingering #'staff-padding = #'() < c-1 e-2 g-3 b-5 > 4 - \set fingeringOrientations = #'(up left) + \set fingeringOrientations = #'(up left) < c-1 e-2 g-3 b-5 > 4 - \set fingeringOrientations = #'(right) + \set fingeringOrientations = #'(right) < c-1 e-2 g-3 b-5 > 4 diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly index 7403e791b9..4e03fe69e1 100644 --- a/input/regression/follow-voice-break.ly +++ b/input/regression/follow-voice-break.ly @@ -10,7 +10,7 @@ printed. The line-spanners connects to the Y position of the note on the next l \score{ \context PianoStaff << - \set PianoStaff.followVoice = ##t + \set PianoStaff.followVoice = ##t \context Staff=one \notes\relative c''{ a1 \break \change Staff=two diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly index 4fc2f7c5fd..d2ea32412a 100644 --- a/input/regression/font-name.ly +++ b/input/regression/font-name.ly @@ -21,7 +21,7 @@ available through (La)TeX. \score { \notes { \override Staff.TimeSignature #'font-name = #"cmr17" - \set Score.skipBars = ##t + \set Score.skipBars = ##t % use font-name putri8r for Utopia Italic : diff --git a/input/regression/grace.ly b/input/regression/grace.ly index 1bc0242ad0..36f6f59fc8 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -27,7 +27,7 @@ not set. Main note scripts don't end up on the grace note. \grace 16 c8[ c8] % \grace c16 c8[ c8] %% broken? - %%\grace { \set Grace.graceAlignPosition = \right c16} c4 + %%\grace { \set Grace.graceAlignPosition = \right c16} c4 c4 \grace { c16 } c4 } \paper {raggedright = ##t} diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly index 74c478f273..ffd694df1e 100644 --- a/input/regression/instrument-name-markup.ly +++ b/input/regression/instrument-name-markup.ly @@ -14,8 +14,8 @@ textFlat = \markup {\smaller \semiflat} \score { \notes \new Staff { - \set Staff.instrument = \markup { \column < "Clarinetti" { "in B" \textFlat } > } - \set Staff.instr = \markup { \smaller { "Cl(B" \textFlat ")" } } + \set Staff.instrument = \markup { \column < "Clarinetti" { "in B" \textFlat } > } + \set Staff.instr = \markup { \smaller { "Cl(B" \textFlat ")" } } { c''1 \break c'' } diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly index 4c34e616fc..501b6364fc 100644 --- a/input/regression/instrument-name-partial.ly +++ b/input/regression/instrument-name-partial.ly @@ -5,7 +5,7 @@ } \score { - \notes \relative c'' { \set Staff.instrument = "foo" \partial 4 c4 c1 } + \notes \relative c'' { \set Staff.instrument = "foo" \partial 4 c4 c1 } \paper { raggedright = ##t } } diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly index d0a29256af..9d8920b147 100644 --- a/input/regression/instrument-name.ly +++ b/input/regression/instrument-name.ly @@ -14,9 +14,9 @@ be on normal staves, but also on compound staves, like the PianoStaff. \notes \context PianoStaff << \context Staff = treble { - \set PianoStaff.instrument = "Piano " - \set Staff.instrument = "Right " { c''4 }} - \context Staff = bass { \set Staff.instrument = "Left " \clef bass c4 }>> + \set PianoStaff.instrument = "Piano " + \set Staff.instrument = "Right " { c''4 }} + \context Staff = bass { \set Staff.instrument = "Left " \clef bass c4 }>> \paper { raggedright = ##t diff --git a/input/regression/key-signature-scordatura.ly b/input/regression/key-signature-scordatura.ly index 7d1e3c99d7..9f9747909f 100644 --- a/input/regression/key-signature-scordatura.ly +++ b/input/regression/key-signature-scordatura.ly @@ -9,9 +9,9 @@ directly." \score { \notes \relative c' \context Staff { - \set Staff.keySignature = #'(((1 . 2) . 1) ((0 . 3) . -1)) + \set Staff.keySignature = #'(((1 . 2) . 1) ((0 . 3) . -1)) f8 a c e - \set Staff.keySignature = #'(((1 . 2) . -1) ((0 . 4) . 2)) + \set Staff.keySignature = #'(((1 . 2) . -1) ((0 . 4) . 2)) e a, g a } } diff --git a/input/regression/keys.ly b/input/regression/keys.ly index c92579627b..06a257c6a4 100644 --- a/input/regression/keys.ly +++ b/input/regression/keys.ly @@ -14,7 +14,7 @@ also created on a clef change. \score { \notes \relative c'' { - \set Staff.createKeyOnClefChange = ##t + \set Staff.createKeyOnClefChange = ##t \key bes \major c2 % \key c \major % \minor \key es \major % \minor @@ -22,7 +22,7 @@ also created on a clef change. \break \key bes \major % \major c2 \clef alto c2 \key d \major \clef treble c2 - \set Staff.keySignature = #'((2 . -1) (6 . 3) (4 . -2)) + \set Staff.keySignature = #'((2 . -1) (6 . 3) (4 . -2)) e2 } } diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly index 378543c61d..d2a8546e07 100644 --- a/input/regression/lyric-combine-new.ly +++ b/input/regression/lyric-combine-new.ly @@ -17,7 +17,7 @@ \lyricsto "bla" \lyrics \new Lyrics { bla - \set ignoreMelismata = ##t + \set ignoreMelismata = ##t blob diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly index b3027efacc..0a95242c02 100644 --- a/input/regression/lyric-hyphen-break.ly +++ b/input/regression/lyric-hyphen-break.ly @@ -22,7 +22,7 @@ r c16[ c c] }>> \paper { indent = 0.0 \cm - linewidth = 3.4 \cm + linewidth = 3.4 \cm \translator { \StaffContext \remove "Time_signature_engraver" diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly index 7905af558c..b8147edf90 100644 --- a/input/regression/lyric-phrasing.ly +++ b/input/regression/lyric-phrasing.ly @@ -31,11 +31,11 @@ } << \new Lyrics \lyricsto "v" \lyrics { - \set stanza = "1:" + \set stanza = "1:" Start sentence melisma end. } \new Lyrics \lyricsto "v" \lyrics { - \set stanza = "2:" + \set stanza = "2:" x x x __ x. } >> diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly index afaba806ba..9b491bb078 100644 --- a/input/regression/lyrics-melisma-beam.ly +++ b/input/regression/lyrics-melisma-beam.ly @@ -9,7 +9,7 @@ << \new Staff \notes \relative c'' { - \set Staff.autoBeaming = ##f + \set Staff.autoBeaming = ##f c8 c8[ c8 c8] c8 } \lyricsto "" \new Lyrics \lyrics { bla bla bla } diff --git a/input/regression/mm-rests2.ly b/input/regression/mm-rests2.ly index 116a1b34b1..287272661f 100644 --- a/input/regression/mm-rests2.ly +++ b/input/regression/mm-rests2.ly @@ -11,7 +11,7 @@ The number of bars will be written above the sign. } thenotes = \notes \relative cis' { -\set Score.skipBars = ##t +\set Score.skipBars = ##t \time 4/4 R1 | R1*1 | diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly index e173a0da78..d7372e301c 100644 --- a/input/regression/molecule-hacking.ly +++ b/input/regression/molecule-hacking.ly @@ -17,7 +17,7 @@ parens are also not seen by accidentals. Example usage: \\property NoteHead \\override #'print-function - = + = #(parenthesize-callback Note_head::print) " @@ -60,12 +60,12 @@ GROB. The dimensions of the stencil is not affected. \notes \relative c' { c4 e \override NoteHead #'print-function - = + = #(parenthesize-callback Note_head::print) g bes \revert NoteHead #'print-function \override Beam #'print-function - = + = #(parenthesize-callback Beam::print) a8 gis8 a2. diff --git a/input/regression/multi-measure-rest-center.ly b/input/regression/multi-measure-rest-center.ly index 5bc9497eb3..d083d41a99 100644 --- a/input/regression/multi-measure-rest-center.ly +++ b/input/regression/multi-measure-rest-center.ly @@ -8,7 +8,7 @@ \score { \notes { - \set Score.skipBars = ##t + \set Score.skipBars = ##t \override Staff.BarLine #'hair-thickness = #7.5 \override Staff.MultiMeasureRest #'hair-thickness = #10 diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly index 8e293426fc..d8299eda15 100644 --- a/input/regression/multi-measure-rest-instr-name.ly +++ b/input/regression/multi-measure-rest-instr-name.ly @@ -4,8 +4,8 @@ interesting bug in 1.3.98). " } \score{ \context Staff << - \set Staff.instrument = "instrument" - \set Staff.instr = "instr" + \set Staff.instrument = "instrument" + \set Staff.instr = "instr" \notes{c''1 \break R1 } >> \paper { @@ -14,7 +14,7 @@ interesting bug in 1.3.98). " } } } - \paper { raggedright = ##t } + \paper { raggedright = ##t } } diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly index d49670954e..cd28968db4 100644 --- a/input/regression/multi-measure-rest-text.ly +++ b/input/regression/multi-measure-rest-text.ly @@ -12,7 +12,7 @@ Texts may be added to the multi measure rests. \score { \notes { \time 3/4 - \set Score.skipBars = ##t + \set Score.skipBars = ##t R2._\markup { \center < \musicglyph #"scripts-dfermata" \roman "Ad lib" > } R2.^\fermataMarkup R2.^"4" diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly index fdd464806d..e93e1039f0 100644 --- a/input/regression/non-empty-text.ly +++ b/input/regression/non-empty-text.ly @@ -16,7 +16,7 @@ to control the horizontal size of text. " } c_"very wide and long text" c } \paper { - linewidth = 3.0\cm + linewidth = 3.0\cm } } diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly index e88189ac7c..945ff9024d 100644 --- a/input/regression/note-line.ly +++ b/input/regression/note-line.ly @@ -12,7 +12,7 @@ sd = \notes{ \change Staff = down} \context PianoStaff \notes << \context Staff = up { - \set PianoStaff.connectArpeggios = ##t + \set PianoStaff.connectArpeggios = ##t \showStaffSwitch \clef F c4 d \sd b a g8 f16 e32 d \su g2 \glissando a,4 \sd \break a2. \su g4 \glissando f1 diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly index 7d3c8a2019..88c704e808 100644 --- a/input/regression/ottava.ly +++ b/input/regression/ottava.ly @@ -48,7 +48,7 @@ with @code{Staff.ottavation}. \break a, #(set-octavation 1) - \set Staff.ottavation = #"8" + \set Staff.ottavation = #"8" b #(set-octavation 0) c a @@ -56,12 +56,12 @@ with @code{Staff.ottavation}. #(set-octavation 0) c #(set-octavation -1) - \set Staff.ottavation = #"8" + \set Staff.ottavation = #"8" c,,16 #(set-octavation 0) c'16 #(set-octavation -1) - \set Staff.ottavation = #"8" + \set Staff.ottavation = #"8" g,,16 } } diff --git a/input/regression/part-combine-a2.ly b/input/regression/part-combine-a2.ly index 1afbc80e5f..24e53c8422 100644 --- a/input/regression/part-combine-a2.ly +++ b/input/regression/part-combine-a2.ly @@ -10,7 +10,7 @@ vone = \notes \relative a' { R1*2 g2 r2 g2 r2 a4 r4 g vtwo = \notes \relative a' { R1*2 g2 r2 g2 r2 f4 r4 g } \score { - << \set Score.skipBars = ##t + << \set Score.skipBars = ##t \partcombine \vone \vtwo >> } diff --git a/input/regression/part-combine-solo.ly b/input/regression/part-combine-solo.ly index 8d85a52025..5cbd41b968 100644 --- a/input/regression/part-combine-solo.ly +++ b/input/regression/part-combine-solo.ly @@ -21,7 +21,7 @@ vtwo = \notes \relative g' { g4. g8 r2 g4 r4 r2 g4 } \score { - << \set Score.skipBars = ##t + << \set Score.skipBars = ##t \partcombine \vone \vtwo >> } diff --git a/input/regression/pedal-bracket.ly b/input/regression/pedal-bracket.ly index 5f2d7588ef..f3da680f36 100644 --- a/input/regression/pedal-bracket.ly +++ b/input/regression/pedal-bracket.ly @@ -1,3 +1,4 @@ +\version "2.1.22" \header { @@ -9,13 +10,13 @@ There are no vertical endings at a line-break. " } \score { \notes \relative c'' { - \property Staff.pedalSustainStyle = #'bracket + \set Staff.pedalSustainStyle = #'bracket c4 d e \sustainDown b c c, \sustainUp \sustainDown d8[ c] e8[ e \sustainUp \sustainDown] f4 d \sustainUp g \sustainDown b b, \sustainUp c' - \property Staff.pedalUnaCordaStyle = #'mixed + \set Staff.pedalUnaCordaStyle = #'mixed c4 d \unaCorda e f g b | \break c b c \treCorde c diff --git a/input/regression/pedal-ped.ly b/input/regression/pedal-ped.ly index 94d31bc196..da1a7e60c2 100644 --- a/input/regression/pedal-ped.ly +++ b/input/regression/pedal-ped.ly @@ -1,3 +1,4 @@ +\version "2.1.22" \header { texidoc = "Piano pedals: the standard style is with Ped symbols. @@ -14,8 +15,8 @@ at the end of the melody." \sustainDown b c c, d16[ c c c] e[ e \sustainUp \sustainDown e e ] f4 \sustainUp g\sustainDown b \sustainUp c - \property Staff.pedalSustainStrings = #'("-" "-P" "P") - \property Staff.SustainPedal \override #'padding = #-2 + \set Staff.pedalSustainStrings = #'("-" "-P" "P") + \override Staff.SustainPedal #'padding = #-2 c, \sustainDown d e \sustainUp \sustainDown f \sustainUp g b c diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly index db972fca93..852c9bc188 100644 --- a/input/regression/prefatory-spacing-matter.ly +++ b/input/regression/prefatory-spacing-matter.ly @@ -9,7 +9,7 @@ } \score { \notes \relative c'' { - \set Staff.instrument = "fobar" + \set Staff.instrument = "fobar" \bar "||:" \key cis \major cis4 cis4 cis4 cis4 \clef bass cis,1 diff --git a/input/regression/property-once.ly b/input/regression/property-once.ly index ba307fbe7e..c0da8f8e14 100644 --- a/input/regression/property-once.ly +++ b/input/regression/property-once.ly @@ -7,7 +7,7 @@ \score { \notes \relative c' { c4 - \once \set Stem = #'() + \once \set Stem = #'() c4 \once \override Stem #'thickness = #5.0 c4 diff --git a/input/regression/rehearsal-mark-letter.ly b/input/regression/rehearsal-mark-letter.ly index 27c6c0d0ca..1ead1b0ff5 100644 --- a/input/regression/rehearsal-mark-letter.ly +++ b/input/regression/rehearsal-mark-letter.ly @@ -12,7 +12,7 @@ with @code{\mark NUMBER}, or with @code{Score.rehearsalMark}." c1 \mark \default c1 \mark \default c1 \mark \default - \set Score.rehearsalMark = #24 + \set Score.rehearsalMark = #24 c1 \mark \default c1 \mark \default c1 \mark \default diff --git a/input/regression/rehearsal-mark-number.ly b/input/regression/rehearsal-mark-number.ly index 545b3d4d11..6d24a46843 100644 --- a/input/regression/rehearsal-mark-number.ly +++ b/input/regression/rehearsal-mark-number.ly @@ -8,11 +8,11 @@ By setting @code{markFormatter} we may choose a different style of mark printing \version "2.1.22" \score { \notes \relative c''{ - \set Score.markFormatter = #format-mark-numbers + \set Score.markFormatter = #format-mark-numbers c1 | \mark \markup { \musicglyph #"scripts-coda" } c1 | \mark \default c1 | \mark \default - \set Score.markFormatter = #(lambda (mark context) + \set Score.markFormatter = #(lambda (mark context) (make-bold-markup (make-box-markup (number->string mark)))) c1 | \mark \default diff --git a/input/regression/repeat-percent-skipbars.ly b/input/regression/repeat-percent-skipbars.ly index 02ef608ddd..8e33df0122 100644 --- a/input/regression/repeat-percent-skipbars.ly +++ b/input/regression/repeat-percent-skipbars.ly @@ -9,7 +9,7 @@ texidoc = "Percent repeats are not skipped, even when skipBars is set. " \score { \context Staff << - \set Score.skipBars = ##t + \set Score.skipBars = ##t \notes { \repeat "percent" 2 { g2 a g a } } diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly index b0681923a8..8a27460371 100644 --- a/input/regression/rest-collision.ly +++ b/input/regression/rest-collision.ly @@ -10,11 +10,11 @@ cases. " } -scale = \notes \relative c' { +scale = \notes \relative c' { c8 d e f g a b c c d e f g a b c } -rests = \notes { +rests = \notes { r r r r r r r r r r r r r r r r } different = << { @@ -27,13 +27,13 @@ different = << { r1 }} >> -scales = \context Staff \notes << +scales = \context Staff \notes << { r1 r2 r2 \scale c''1 c'2 a'2 \rests } \\ { a'1 a'2 d'2 \rests r1 r2 r2 \scale } >> -restsII = \context Staff \notes { +restsII = \context Staff \notes { r4 r8 \context Staff << { r8 } \\{ r8} >> \context Staff << { r8} r8 \\{ r8} >> diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly index 12626d4379..c583628e88 100644 --- a/input/regression/rest-ledger.ly +++ b/input/regression/rest-ledger.ly @@ -7,22 +7,22 @@ ledger lines." \score { \notes { - \override Rest #'staff-position = #4 - r1 \override Rest #'staff-position = #5 - r1 \override Rest #'staff-position = #6 + \override Rest #'staff-position = #4 + r1 \override Rest #'staff-position = #5 + r1 \override Rest #'staff-position = #6 - r1 \override Rest #'staff-position = #-6 - r1 \override Rest #'staff-position = #-7 - r1 \override Rest #'staff-position = #-8 + r1 \override Rest #'staff-position = #-6 + r1 \override Rest #'staff-position = #-7 + r1 \override Rest #'staff-position = #-8 r1 - \override Rest #'staff-position = #6 - r2 \override Rest #'staff-position = #7 - r2 \override Rest #'staff-position = #8 + \override Rest #'staff-position = #6 + r2 \override Rest #'staff-position = #7 + r2 \override Rest #'staff-position = #8 - r2 \override Rest #'staff-position = #-4 - r2 \override Rest #'staff-position = #-5 - r2 \override Rest #'staff-position = #-6 + r2 \override Rest #'staff-position = #-4 + r2 \override Rest #'staff-position = #-5 + r2 \override Rest #'staff-position = #-6 r2 diff --git a/input/regression/slur-area.ly b/input/regression/slur-area.ly index 9be0c6ebfe..dc50a38214 100644 --- a/input/regression/slur-area.ly +++ b/input/regression/slur-area.ly @@ -23,7 +23,7 @@ a(a a a a a d a) c,(g' c e f d b g) c,(g' c e f d b g) -\set autoBeaming = ##f +\set autoBeaming = ##f \stemUp a8(a a a a a a a) diff --git a/input/regression/spacing-multi-tuplet.ly b/input/regression/spacing-multi-tuplet.ly index d9e17e36de..f2dd5cc2e9 100644 --- a/input/regression/spacing-multi-tuplet.ly +++ b/input/regression/spacing-multi-tuplet.ly @@ -1,6 +1,6 @@ \version "2.1.22" \header{ -texidoc = "Concurrent tuplets should be spaced equidistantly on +texidoc = "Concurrent tuplets should be spaced equidistantly on all staffs. Note that this only spaces correctly (exactly) when raggedright @@ -9,7 +9,7 @@ is. For non-raggedright, it still shows a bug: uneven spacing. -multipart = \notes \relative c'{ +multipart = \notes \relative c'{ \context StaffGroup << \new Staff \context Voice { \times 2/10 { c8[ c c c c c c c c c] } diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly index f96967bcfa..52d86cdd2a 100644 --- a/input/regression/spacing-note-flags.ly +++ b/input/regression/spacing-note-flags.ly @@ -8,7 +8,7 @@ texidoc = "The flags of 8th notes take some space, but not } \score { \notes \relative c'' \context Staff { - \set autoBeaming = ##f + \set autoBeaming = ##f a8[ a8 a8 a8] a8 a8 a8 a8 } diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly index ac9604d698..ec65e2f767 100644 --- a/input/regression/stanza-number.ly +++ b/input/regression/stanza-number.ly @@ -10,7 +10,7 @@ texidoc = "Stanza numbers are put left of their lyric." \context Lyrics \lyrics { \skip 2 - \set stanza = "1." + \set stanza = "1." Foo8 Bar8 } >> diff --git a/input/regression/tag-filter.ly b/input/regression/tag-filter.ly index c73fd5b717..67468a87b6 100644 --- a/input/regression/tag-filter.ly +++ b/input/regression/tag-filter.ly @@ -21,7 +21,7 @@ common = \tag #'part << R1 \\ { - \set fontSize = #-1 + \set fontSize = #-1 c4_"cue" f2 g4 } >> \tag #'score R1 @@ -33,15 +33,15 @@ common = \score { \notes \simultaneous { \new Staff { - \set Staff.instrument = #"both" + \set Staff.instrument = #"both" \common } \new Staff { - \set Staff.instrument = #"part" + \set Staff.instrument = #"part" \apply #(remove-tag 'score) \common } \new Staff { - \set Staff.instrument = #"score" + \set Staff.instrument = #"score" \apply #(remove-tag 'part) \common } } diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly index a64f7fee7a..f6788f7ab0 100644 --- a/input/regression/text-spanner.ly +++ b/input/regression/text-spanner.ly @@ -6,8 +6,8 @@ texidoc= "Text spanners should not repeat start text when broken." \score { \notes \relative c'' { - \set crescendoText = #"cresc." - \set crescendoSpanner = #'dashed-line + \set crescendoText = #"cresc." + \set crescendoSpanner = #'dashed-line c1\< c \break c1 c\! \break } diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly index f8ae66c17c..8d68236166 100644 --- a/input/regression/tie-chord.ly +++ b/input/regression/tie-chord.ly @@ -9,7 +9,7 @@ point away from the center of the staff. Override with } -t = \notes \relative c' { ~ } +t = \notes \relative c' { ~ } \score { \notes \context Voice { diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly index d8650f102b..23733fba19 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -16,7 +16,7 @@ \score { \notes\relative c'' { - \set tupletNumberFormatFunction = #fraction-tuplet-formatter + \set tupletNumberFormatFunction = #fraction-tuplet-formatter \applyoutput #(outputproperty-compatibility (make-text-checker-once "2:3") 'extra-offset '(0 . 1.5)) diff --git a/input/regression/voice-follower.ly b/input/regression/voice-follower.ly index 993307cb10..bee2837939 100644 --- a/input/regression/voice-follower.ly +++ b/input/regression/voice-follower.ly @@ -11,7 +11,7 @@ can be printed automatically. This is enabled if the property \score { \notes \relative c' \context PianoStaff << - \set PianoStaff.followVoice = ##t + \set PianoStaff.followVoice = ##t \context Staff = one \context Voice { c1 \change Staff=two diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly index 80a68a7c7e..dab875e259 100644 --- a/input/regression/volta-broken-left-edge.ly +++ b/input/regression/volta-broken-left-edge.ly @@ -41,8 +41,8 @@ Bar 23 Perfect voiceB = \notes { \clef bass - \set Staff.instrument = "Bass" - \set Staff.instr = "B" + \set Staff.instrument = "Bass" + \set Staff.instr = "B" \key f \minor \time 4/4 f1 diff --git a/input/regression/volta-multi-staff.ly b/input/regression/volta-multi-staff.ly index d036fe460a..e0e6e7c778 100644 --- a/input/regression/volta-multi-staff.ly +++ b/input/regression/volta-multi-staff.ly @@ -17,7 +17,7 @@ vmus = \notes { \repeat volta 2 c1 \alternative { d e } } >> \new StaffGroup << \new Staff << - \set Staff.voltaOnThisStaff = ##t + \set Staff.voltaOnThisStaff = ##t \vmus >> \new Staff \vmus >> diff --git a/input/screech-boink.ly b/input/screech-boink.ly index 2db75a5bd1..9ec78d8026 100644 --- a/input/screech-boink.ly +++ b/input/screech-boink.ly @@ -15,7 +15,7 @@ << { \revert Stem #'direction \change Staff = down - \set subdivideBeams = ##t + \set subdivideBeams = ##t g16.[ \change Staff = up c'''32 \change Staff = down @@ -24,7 +24,7 @@ g16] \change Staff = up \override Stem #'direction = #1 - \set followVoice = ##t + \set followVoice = ##t c'''32([ b''16 a''16 gis''16 g''32)] } \\ { s4 \times 2/3 { d'16[ f' g'] } as'32[ b''32 e'' d''] } \\ { s4 \autoBeamOff d''8.. f''32 } \\ @@ -35,8 +35,8 @@ \context Staff = down { \clef bass \key c \minor - \set subdivideBeams = ##f - \override Stem #'french-beaming = ##t + \set subdivideBeams = ##f + \override Stem #'french-beaming = ##t \override Beam #'thickness = #0.3 \override Stem #'thickness = #4.0 g'16[ b16 fis16 g16] diff --git a/input/template/gregorian-transcription.ly b/input/template/gregorian-transcription.ly index a8cedc98c1..276f3f1e5f 100644 --- a/input/template/gregorian-transcription.ly +++ b/input/template/gregorian-transcription.ly @@ -18,7 +18,7 @@ barTwo = \notes { \once \override Staff.BarLine #'extra-offset = #'(0 . 2) \score { \notes \relative c' { - \set Score.timing = ##f + \set Score.timing = ##f \override Staff.Stem #'transparent = ##t f4 a2 \barTwo g4 a2 f2 \barOne g4( f) f( \bar "empty" diff --git a/input/template/header.ly b/input/template/header.ly index bdba9cbf51..615ad8222d 100644 --- a/input/template/header.ly +++ b/input/template/header.ly @@ -12,7 +12,7 @@ poet = "Poet" texttranslator = "Translator" copyright = "public domain" - source = "urtext " + source = "urtext " enteredby = "your name here" maintainerEmail = "your email here" texidoc = "The standard header that ought to be in top of a file." diff --git a/input/template/jazz-combo.ly b/input/template/jazz-combo.ly index 03978234ae..d77b4248f3 100644 --- a/input/template/jazz-combo.ly +++ b/input/template/jazz-combo.ly @@ -48,7 +48,7 @@ trpt = \notes \transpose c d \relative c'' { trpharmony = \chords \transpose c' d { \jzchords } trumpet = { \global - \set Staff.instrument = #"Trumpet" + \set Staff.instrument = #"Trumpet" \clef treble \context Staff << \trpt @@ -64,7 +64,7 @@ alto = \notes \transpose c a \relative c' { altoharmony = \chords \transpose c' a { \jzchords } altosax = { \global - \set Staff.instrument = #"Alto Sax" + \set Staff.instrument = #"Alto Sax" \clef treble \context Staff << \alto @@ -80,7 +80,7 @@ bari = \notes \transpose c a' \relative c { bariharmony = \chords \transpose c' a { \jzchords s1 s d2:maj e:m7 } barisax = { \global - \set Staff.instrument = #"Bari Sax" + \set Staff.instrument = #"Bari Sax" \clef treble \context Staff << \bari @@ -95,7 +95,7 @@ tbone = \notes \relative c { tboneharmony = \chords { \jzchords } trombone = { \global - \set Staff.instrument = #"Trombone" + \set Staff.instrument = #"Trombone" \clef bass \context Staff << \tbone @@ -114,7 +114,7 @@ gtrharmony = \chords { \jzchords guitar = { \global - \set Staff.instrument = #"Guitar" + \set Staff.instrument = #"Guitar" \clef treble \context Staff << \gtr @@ -149,7 +149,7 @@ lhLower = \notes \relative c { PianoRH = { \clef treble \global - \set Staff.midiInstrument = "acoustic grand" + \set Staff.midiInstrument = "acoustic grand" \context Staff << \context Voice = one \rhUpper \context Voice = two \rhLower @@ -159,7 +159,7 @@ PianoRH = { PianoLH = { \clef bass \global - \set Staff.midiInstrument = "acoustic grand" + \set Staff.midiInstrument = "acoustic grand" \context Staff << \context Voice = one \lhUpper \context Voice = two \lhLower @@ -168,7 +168,7 @@ PianoLH = { piano = { \context PianoStaff << - \set PianoStaff.instrument = #"Piano" + \set PianoStaff.instrument = #"Piano" \context Staff = upper \PianoRH \context Staff = lower \PianoLH >> @@ -182,7 +182,7 @@ bass = \notes \relative c { bass = { \global - \set Staff.instrument = #"Bass" + \set Staff.instrument = #"Bass" \clef bass \context Staff << \bass @@ -205,7 +205,7 @@ down = \drums { drumContents = { \global << - \set DrumStaff.instrument = #"Drums" + \set DrumStaff.instrument = #"Drums" \new DrumVoice { \voiceOne \up } \new DrumVoice { \voiceTwo \down } >> diff --git a/input/template/melody-chords.ly b/input/template/melody-chords.ly index f89f8dc2ec..199d275704 100644 --- a/input/template/melody-chords.ly +++ b/input/template/melody-chords.ly @@ -15,7 +15,7 @@ melody = \notes \relative c' { \score { \notes << \context ChordNames { - \set chordChanges = ##t + \set chordChanges = ##t \harmonies } \context Staff = one \melody diff --git a/input/template/melody-lyrics.ly b/input/template/melody-lyrics.ly index 70d7dd1644..fe0db8630b 100644 --- a/input/template/melody-lyrics.ly +++ b/input/template/melody-lyrics.ly @@ -15,7 +15,7 @@ text = \lyrics { \score { << \context Voice = one { - \set Staff.autoBeaming = ##f + \set Staff.autoBeaming = ##f \melody } \lyricsto "one" \new Lyrics \text diff --git a/input/test/ac-extra-voice.ly b/input/test/ac-extra-voice.ly index 589937670d..e0dc17fc8c 100644 --- a/input/test/ac-extra-voice.ly +++ b/input/test/ac-extra-voice.ly @@ -48,7 +48,7 @@ accompany = \repeat unfold 4 \basloopje \translator{ \StaffContext autoBeamSettings \override #'(end * * * *) - = #(ly:make-moment 1 2) + = #(ly:make-moment 1 2) } } \midi { diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index 2c7a7c9d60..d1fc2fc94c 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -9,10 +9,10 @@ included in LilyPond's support of ancient notation. } -upperStaff = \context GregorianStaff = upperStaff << +upperStaff = \context GregorianStaff = upperStaff << \context GregorianVoice << - \set Score.timing = ##f -% \set Score.forceAccidental = ##t %%%%%%%% FIXME: what happened to this property? + \set Score.timing = ##f +% \set Score.forceAccidental = ##t %%%%%%%% FIXME: what happened to this property? \override Staff.StaffSymbol #'line-count = #4 @@ -112,7 +112,7 @@ upperStaff = \context GregorianStaff = upperStaff << >> >> -lowerStaff = \context MensuralStaff = lowerStaff << +lowerStaff = \context MensuralStaff = lowerStaff << \context MensuralVoice << % this is broken until further notice -- see refman @@ -120,7 +120,7 @@ lowerStaff = \context MensuralStaff = lowerStaff << \context Staff \applyoutput #(outputproperty-compatibility (make-type-checker 'staff-symbol-interface) 'line-count 5) \notes \transpose c c { - \set autoBeaming = ##f + \set autoBeaming = ##f \override NoteHead #'style = #'neo_mensural \override Rest #'style = #'neo_mensural \key a \major @@ -133,7 +133,7 @@ lowerStaff = \context MensuralStaff = lowerStaff << % on many ligatures such as BB. cis'1 d'\breve gis'\breve e'\breve \[ e'\longa fis'\longa \] - \set Staff.forceClef = ##t + \set Staff.forceClef = ##t \clef "neo_mensural_c2" cis1 \bar "|" @@ -147,7 +147,7 @@ lowerStaff = \context MensuralStaff = lowerStaff << fis1 ces1 \clef "petrucci_c2" r\longa - \set Staff.forceClef = ##t + \set Staff.forceClef = ##t \clef "mensural_c2" r\breve \bar "|" @@ -164,7 +164,7 @@ lowerStaff = \context MensuralStaff = lowerStaff << c8 b, c16 b, c32 b, c64 b, c64 b, d8 e d16 e d32 e d64 e d64 e r\longa - \set Staff.forceClef = ##t + \set Staff.forceClef = ##t \clef "petrucci_f" r\breve \bar "|" @@ -179,7 +179,7 @@ lowerStaff = \context MensuralStaff = lowerStaff << % FIXME: produces warnings about "flag `neo_mensurald4' (or 3) not found". r2 r4 r8 r16 r16 \override Stem #'flag-style = #'mensural - \set Staff.forceClef = ##t + \set Staff.forceClef = ##t \clef "mensural_f" e\breve f g a1 \clef "mensural_g" @@ -191,18 +191,18 @@ lowerStaff = \context MensuralStaff = lowerStaff << % \break % 9 (16*1) bes'!\longa fis'!1 as'!1 ges'!\longa % lig - \set Staff.forceClef = ##t + \set Staff.forceClef = ##t \clef "mensural_g" e'2 d' c' \bar "|" % \break % 11 (16*1) - \set Staff.forceClef = ##t + \set Staff.forceClef = ##t \clef "petrucci_g" c'2 d' e' f' \clef "petrucci_g" g' as'! bes'! cis''! bes'! as'! gis'! fis'! - \set Staff.forceClef = ##t + \set Staff.forceClef = ##t \clef "mensural_g" es'! des'! cis'!1 \bar "||" % \break % 12 (8*1) diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly index 2926cfd851..92e48ddbe1 100644 --- a/input/test/bagpipe.ly +++ b/input/test/bagpipe.ly @@ -19,29 +19,29 @@ Here's an example of bagpipe music. } } -taor = \notes{ \grace { g32[ d g e]}} -grip = \notes{ \grace { g32[ b g ]}} -thrd = \notes{ \grace { g32[ d c] }} -birl = \notes{ \grace { g32[ a g] }} -gstd = \notes{ \grace { g'32[ d g] }} +taor = \notes{ \grace { g32[ d g e]}} +grip = \notes{ \grace { g32[ b g ]}} +thrd = \notes{ \grace { g32[ d c] }} +birl = \notes{ \grace { g32[ a g] }} +gstd = \notes{ \grace { g'32[ d g] }} lgg = \notes{ \grace { g32 }} lag = \notes{ \grace { a32 }} fgg = \notes{ \grace { f32[ g'32] }} -dblb = \notes{ \grace { g'32[ b d] }} -dblc = \notes{ \grace { g'32[ c d] }} -dble = \notes{ \grace { g'32[ e f] }} -dblf = \notes{ \grace { g'32[ f g'] }} -dblg = \notes{ \grace { g'32[ f] }} -dbla = \notes{ \grace { a'32[ g'] }} -cg = \notes{ \grace { c32 }} -eg = \notes{ \grace { e32 }} -gg = \notes{ \grace { g'32 }} -dg = \notes{ \grace { d32 }} -hag = \notes{ \grace { a'32 }} -gefg = \notes{ \grace { g'32[ e f] }} -efg = \notes{ \grace { e32[ f] }} -gdcg = \notes{ \grace { g'32[ d c]}} -gcdg = \notes{ \grace { g'32[ c d]}} +dblb = \notes{ \grace { g'32[ b d] }} +dblc = \notes{ \grace { g'32[ c d] }} +dble = \notes{ \grace { g'32[ e f] }} +dblf = \notes{ \grace { g'32[ f g'] }} +dblg = \notes{ \grace { g'32[ f] }} +dbla = \notes{ \grace { a'32[ g'] }} +cg = \notes{ \grace { c32 }} +eg = \notes{ \grace { e32 }} +gg = \notes{ \grace { g'32 }} +dg = \notes{ \grace { d32 }} +hag = \notes{ \grace { a'32 }} +gefg = \notes{ \grace { g'32[ e f] }} +efg = \notes{ \grace { e32[ f] }} +gdcg = \notes{ \grace { g'32[ d c]}} +gcdg = \notes{ \grace { g'32[ c d]}} diff --git a/input/test/bar-always.ly b/input/test/bar-always.ly index b77a211e1c..cf7bb08b78 100644 --- a/input/test/bar-always.ly +++ b/input/test/bar-always.ly @@ -11,8 +11,8 @@ By setting @code{barAlways} and @code{defaultBarType,} you can automatically ins \score { \notes \relative c''{ - \set Score.barAlways = ##t - \set Score.defaultBarType = ":|:" + \set Score.barAlways = ##t + \set Score.defaultBarType = ":|:" c4 c4 c4 c4 } \paper{raggedright = ##t} } diff --git a/input/test/bar-number-regular-interval.ly b/input/test/bar-number-regular-interval.ly index 64b9d29650..e827cc56c6 100644 --- a/input/test/bar-number-regular-interval.ly +++ b/input/test/bar-number-regular-interval.ly @@ -10,7 +10,7 @@ Bar numbers can also be printed at regular intervals. \score { \context Staff \notes \transpose c c' { \override Score.BarNumber #'break-visibility = #end-of-line-invisible - \set Score.barNumberVisibility = #(every-nth-bar-number-visible 4) + \set Score.barNumberVisibility = #(every-nth-bar-number-visible 4) \override Score.BarNumber #'print-function = #(make-stencil-boxer 0.1 0.25 0.25 Text_item::print) \override Score.BarNumber #'font-size = #2 diff --git a/input/test/beam-auto-override.ly b/input/test/beam-auto-override.ly index 0e1c6676ba..d79b02c3fe 100644 --- a/input/test/beam-auto-override.ly +++ b/input/test/beam-auto-override.ly @@ -39,7 +39,7 @@ The beam will be ended also when now % beamAutoEnd = 0. c8 c c4 r8 c c c % no autobeaming - \set autoBeaming = ##f + \set autoBeaming = ##f c8 c c c } \paper{ diff --git a/input/test/beam-count.ly b/input/test/beam-count.ly index 53dd378395..f2ac4a48a9 100644 --- a/input/test/beam-count.ly +++ b/input/test/beam-count.ly @@ -13,8 +13,8 @@ fragment = \notes { f32 g a b b a g f f32 g a b - \set stemRightBeamCount = #1 b - \set stemLeftBeamCount = #1 a + \set stemRightBeamCount = #1 b + \set stemLeftBeamCount = #1 a g f } diff --git a/input/test/beam-rest.ly b/input/test/beam-rest.ly index 498dd1a3c9..7204087811 100644 --- a/input/test/beam-rest.ly +++ b/input/test/beam-rest.ly @@ -10,7 +10,7 @@ Beams over rests. \notes\relative c''{ r4 r8[ g a] bes8[ r16 f g a] - bes8[ r16 \set stemLeftBeamCount = #1 f g a] + bes8[ r16 \set stemLeftBeamCount = #1 f g a] } \paper{ diff --git a/input/test/blank-notes.ly b/input/test/blank-notes.ly index 733082351d..7fb4ba29f8 100644 --- a/input/test/blank-notes.ly +++ b/input/test/blank-notes.ly @@ -13,7 +13,7 @@ do wierd tricks with LilyPond (especially with slurs, since you can't attach a slur to a rest or spacer rest). " } -blanknotes = { \override NoteHead #'transparent = ##t +blanknotes = { \override NoteHead #'transparent = ##t \override Stem #'transparent = ##t } unblanknotes = { \revert NoteHead #'transparent \revert Stem #'transparent } diff --git a/input/test/caps.ly b/input/test/caps.ly index 16e0e95dd4..b3ed4ff343 100644 --- a/input/test/caps.ly +++ b/input/test/caps.ly @@ -1,11 +1,11 @@ \version "2.1.22" \header { -texidoc = "@cindex Capital Letters +texidoc = "@cindex Capital Letters You can set the font to use small caps. " } -shapeSC = \override LyricText #'font-shape = #'caps +shapeSC = \override LyricText #'font-shape = #'caps shapeNorm = \revert LyricText #'font-shape \score { << diff --git a/input/test/cautionaries.ly b/input/test/cautionaries.ly index 64a9e13581..65932efb3e 100644 --- a/input/test/cautionaries.ly +++ b/input/test/cautionaries.ly @@ -5,7 +5,7 @@ LilyPond can display cautionary accidentals in different ways. " } \score { \notes \context Staff \transpose c c'' { \key d \major -% \set Staff.autoReminders = #'cautionary +% \set Staff.autoReminders = #'cautionary \override Staff.Accidental #'font-size = #0 1 cis?2 d? \override Staff.Accidental #'cautionary-style = #'smaller diff --git a/input/test/chord-names-german.ly b/input/test/chord-names-german.ly index 15bc2c50c1..d084d3aa5c 100644 --- a/input/test/chord-names-german.ly +++ b/input/test/chord-names-german.ly @@ -23,7 +23,7 @@ scm = \chords { \notes << \context ChordNames { \scm } \new ChordNames { - \set instrument = #"german" + \set instrument = #"german" \germanChords \scm } \new ChordNames { \set instrument = #"semi-german" diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly index 5065cd604a..df8715d782 100644 --- a/input/test/chord-names-jazz.ly +++ b/input/test/chord-names-jazz.ly @@ -97,28 +97,28 @@ epartialJazzAlt = #(sequential-music-to-chord-exceptions epartialmusicJazzAlt #f jazzAltProperties = \sequential { - \set majorSevenSymbol = #whiteTriangleMarkup - \set chordNameSeparator = #(make-simple-markup "/") - \set chordNameExceptionsFull = #efullJazzAlt - \set chordNameExceptionsPartial = #epartialJazzAlt - \set chordNameFunction = #jazz-chord-names + \set majorSevenSymbol = #whiteTriangleMarkup + \set chordNameSeparator = #(make-simple-markup "/") + \set chordNameExceptionsFull = #efullJazzAlt + \set chordNameExceptionsPartial = #epartialJazzAlt + \set chordNameFunction = #jazz-chord-names } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% banterProperties = \sequential { - \set chordNameFunction = #banter-chord-names + \set chordNameFunction = #banter-chord-names } \score{ << \new ChordNames { - \set instrument = #"Ignatzek (default)" - \set instr = #"Def" + \set instrument = #"Ignatzek (default)" + \set instr = #"Def" \chs } \new ChordNames { - \set instrument = #"Alternative" - \set instr = #"Alt" + \set instrument = #"Alternative" + \set instr = #"Alt" \jazzAltProperties \chs } diff --git a/input/test/clef-end-of-line.ly b/input/test/clef-end-of-line.ly index 9ae63c2f30..25bc8fe4c0 100644 --- a/input/test/clef-end-of-line.ly +++ b/input/test/clef-end-of-line.ly @@ -9,15 +9,15 @@ Scales, but with clef and key signature at the end of the line. \notes \transpose c c' { \override Staff.Clef #'break-visibility = #end-of-line-visible \override Staff.KeySignature #'break-visibility = #end-of-line-visible - \set Staff.explicitClefVisibility = #end-of-line-visible - \set Staff.explicitKeySignatureVisibility = #end-of-line-visible + \set Staff.explicitClefVisibility = #end-of-line-visible + \set Staff.explicitKeySignatureVisibility = #end-of-line-visible % We want the time sig to take space, otherwise there is not % enough white at the start of the line. % \override Staff.TimeSignature #'transparent = ##t - \set Score.defaultBarType = #"empty" + \set Score.defaultBarType = #"empty" c1 d e f g a b c \key d \major diff --git a/input/test/clef-manual-control.ly b/input/test/clef-manual-control.ly index 34d779f9c5..c9eba28c0b 100644 --- a/input/test/clef-manual-control.ly +++ b/input/test/clef-manual-control.ly @@ -10,18 +10,18 @@ example are central C." } \score { \notes { - \set Staff.clefGlyph = #"clefs-F" - \set Staff.clefPosition = #2 + \set Staff.clefGlyph = #"clefs-F" + \set Staff.clefPosition = #2 c'4 - \set Staff.clefGlyph = #"clefs-G" + \set Staff.clefGlyph = #"clefs-G" c'4 - \set Staff.clefGlyph = #"clefs-C" + \set Staff.clefGlyph = #"clefs-C" c'4 - \set Staff.clefOctavation = #7 + \set Staff.clefOctavation = #7 c'4 - \set Staff.clefOctavation = #0 - \set Staff.clefPosition = #0 + \set Staff.clefOctavation = #0 + \set Staff.clefPosition = #0 c'4 \clef "bass" c'4 diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly index dead04bdde..dfef778b97 100644 --- a/input/test/coriolan-margin.ly +++ b/input/test/coriolan-margin.ly @@ -7,7 +7,7 @@ title = "Ouvertüre\\vrule width0pt height 0pt depth 1ex" subtitle = "\\normalsize Zu Heinrich Joseph v. Collins Trauerspiel\\vrule width0pt height 0pt depth 1ex" subsubtitle = "\\Large\\bf Coriolan" - opus = "Op. 62" + opus = "Op. 62" piece = "\\hspace*{30mm}\\normalfont\\large Allegro con brio" composer = "Ludwig van Beethoven (1770-1827)" @@ -23,8 +23,8 @@ raisedFlat = \markup { \raise #0.4 \smaller \smaller \flat } flauti = \notes \relative c' { - \set Staff.instrument = #"2 Flauti" - \set Staff.instr = #"Fl." + \set Staff.instrument = #"2 Flauti" + \set Staff.instr = #"Fl." \time 4/4 c1 \break c @@ -34,67 +34,67 @@ flauti = \notes \relative c' { } oboi = \notes \relative c' { - \set Staff.instrument = #"2 Oboi" - \set Staff.instr = #"Ob." + \set Staff.instrument = #"2 Oboi" + \set Staff.instr = #"Ob." c1 c } clarinetti = \notes \relative c' { - \set Staff.instrument = \markup { \column < "Clarinetti" { "in B" \raisedFlat } > } - \set Staff.instr = \markup { \smaller { "Cl(B" \raisedFlat ")" } } + \set Staff.instrument = \markup { \column < "Clarinetti" { "in B" \raisedFlat } > } + \set Staff.instr = \markup { \smaller { "Cl(B" \raisedFlat ")" } } c1 c } fagotti = \notes \relative c' { - \set Staff.instrument = #"2 Fagotti" - \set Staff.instr = #"Fg." + \set Staff.instrument = #"2 Fagotti" + \set Staff.instr = #"Fg." c1 c } corni = \notes \relative c' { - \set Staff.instrument = \markup { \column < "Corni" { "in E" \raisedFlat } > } - \set Staff.instr = \markup { \smaller { "Cor(E" \raisedFlat ")" } } + \set Staff.instrument = \markup { \column < "Corni" { "in E" \raisedFlat } > } + \set Staff.instr = \markup { \smaller { "Cor(E" \raisedFlat ")" } } c1 c } trombe = \notes \relative c' { - \set Staff.instrument = \markup \column < "2 Trombe" "(C)" > - \set Staff.instr = \markup \column < "Tbe." "(C)" > + \set Staff.instrument = \markup \column < "2 Trombe" "(C)" > + \set Staff.instr = \markup \column < "Tbe." "(C)" > c1 c } timpani = \notes \relative c' { - \set Staff.instrument = \markup \column < "Timpani" "(C-G)" > - \set Staff.instr = #"Timp." + \set Staff.instrument = \markup \column < "Timpani" "(C-G)" > + \set Staff.instr = #"Timp." c1 c } violinoI = \notes \relative c' { - \set Staff.instrument = #"Violino I " - \set Staff.instr = #"Vl. I " + \set Staff.instrument = #"Violino I " + \set Staff.instr = #"Vl. I " c1 c } violinoII = \notes \relative c' { - \set Staff.instrument = #"Violino II " - \set Staff.instr = #"Vl. II " + \set Staff.instrument = #"Violino II " + \set Staff.instr = #"Vl. II " c1 c } viola = \notes \relative c' { - \set Staff.instrument = #"Viola" - \set Staff.instr = #"Vla." + \set Staff.instrument = #"Viola" + \set Staff.instr = #"Vla." c1 c %c } violoncello = \notes \relative c' { - \set Staff.instrument = \markup \column < "Violoncello" "e" "Contrabasso" > - \set Staff.instr = \markup \column < "Vc." "Cb." > + \set Staff.instrument = \markup \column < "Violoncello" "e" "Contrabasso" > + \set Staff.instr = \markup \column < "Vc." "Cb." > c1 c } diff --git a/input/test/crescendi.ly b/input/test/crescendi.ly index ff08cc8681..efcaf3c724 100644 --- a/input/test/crescendi.ly +++ b/input/test/crescendi.ly @@ -8,8 +8,8 @@ LilyPond can print crescendi in a number of different ways. \notes\relative c''{ a1\fff\> a\pp\! a\< a\! -\set crescendoText = \markup { \italic \bold "cresc." } -\set crescendoSpanner = #'dashed-line +\set crescendoText = \markup { \italic \bold "cresc." } +\set crescendoSpanner = #'dashed-line a\mf\< a a\! a\< a\! } diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly index 7cf233f445..bd7dcbfb7e 100644 --- a/input/test/cue-notes.ly +++ b/input/test/cue-notes.ly @@ -10,8 +10,8 @@ Cue notes should be set in smaller type. " \score { \notes { - \set Staff.instrument = #"Horn in F" - \set Score.skipBars = ##t + \set Staff.instrument = #"Horn in F" + \set Score.skipBars = ##t R1*21 << { @@ -23,7 +23,7 @@ Cue notes should be set in smaller type. " \clef tenor %% this should probably be put into an identifier. - \set Staff.fontSize = #-1 + \set Staff.fontSize = #-1 \override Stem #'length = #5.5 \override Beam #'thickness = #0.384 \override Beam #'space-function = @@ -35,7 +35,7 @@ Cue notes should be set in smaller type. " % this is under debate; I don't think it should. - Graham % if you want to cancel it in the main part, uncomment the following: -% \set Staff.Clef = \turnOff +% \set Staff.Clef = \turnOff \unset Staff.fontSize diff --git a/input/test/divisiones.ly b/input/test/divisiones.ly index b599a92dc5..e84bd408c4 100644 --- a/input/test/divisiones.ly +++ b/input/test/divisiones.ly @@ -14,8 +14,8 @@ Choices are @code{divisioMinima}, @code{divisioMaior} \score { << \context Voice \notes \transpose c c' { - \set Score.timing = ##f - \set Score.barAlways = ##t + \set Score.timing = ##f + \set Score.barAlways = ##t \override TextScript #'padding = #3 \override Staff.BarLine #'transparent = ##t \override Stem #'transparent = ##t diff --git a/input/test/follow-voice.ly b/input/test/follow-voice.ly index b2575aabe0..e1b579c421 100644 --- a/input/test/follow-voice.ly +++ b/input/test/follow-voice.ly @@ -10,7 +10,7 @@ property @code{followVoice}. " } \score { \notes\relative c { \new PianoStaff << - \set PianoStaff.followVoice = ##t + \set PianoStaff.followVoice = ##t \context Staff=one \context Voice { \override VoiceFollower #'style = #'dashed-line c'1 diff --git a/input/test/gregorian-scripts.ly b/input/test/gregorian-scripts.ly index 341ff65b17..b3d2033d01 100644 --- a/input/test/gregorian-scripts.ly +++ b/input/test/gregorian-scripts.ly @@ -1,7 +1,7 @@ \version "2.1.22" \header { title = "Gregorian Scripts" - texidoc = "@cindex Gregorian Scripts + texidoc = "@cindex Gregorian Scripts Gregorian Scripts: diff --git a/input/test/improv.ly b/input/test/improv.ly index 2a725664bd..31249ec3fb 100644 --- a/input/test/improv.ly +++ b/input/test/improv.ly @@ -15,7 +15,7 @@ improvisation is active. improOn = \notes { - \set squashedPosition = #0 + \set squashedPosition = #0 \override NoteHead #'style = #'slash } diff --git a/input/test/incipit.ly b/input/test/incipit.ly index 0da12ebe2a..6b10ab8591 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -7,7 +7,7 @@ The two first bars of Biber's Rosary sonata III. " } -violinincipit = \notes\relative c''{ +violinincipit = \notes\relative c''{ \clef "french" \time 2/2 \override Staff.TimeSignature #'style = #'old @@ -16,14 +16,14 @@ violinincipit = \notes\relative c''{ \override Staff.TimeSignature #'style = #'C } -bcincipit = \notes\relative c{ +bcincipit = \notes\relative c{ \clef bass \override Staff.TimeSignature #'style = #'old b2. cis4 | \override Staff.TimeSignature #'style = #'C } -violin = \notes\relative c''{ +violin = \notes\relative c''{ % Key signatures with different alterations in different octaves % are broken since 1.3.58! % \specialkey \keysignature f' fis'' g' gis'' @@ -36,7 +36,7 @@ violin = \notes\relative c''{ <<{ a d}\\ { es,4}>>| } -BC = \notes\relative c{ +BC = \notes\relative c{ \key d \major \time 2/2 \clef "bass" diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly index 7a018bfc24..25785ee10d 100644 --- a/input/test/instrument-name-grandstaff.ly +++ b/input/test/instrument-name-grandstaff.ly @@ -6,9 +6,9 @@ You can name the whole grandstaff in addition to individual staffs. " } \notes \notes \context GrandStaff << \context Staff = treble { - \set GrandStaff.instrument = "Violini " - \set Staff.instrument = " vn I" { c''4 }} - \context Staff = bass { \set Staff.instrument = " vn II" c''4 }>> + \set GrandStaff.instrument = "Violini " + \set Staff.instrument = " vn I" { c''4 }} + \context Staff = bass { \set Staff.instrument = " vn II" c''4 }>> \paper { diff --git a/input/test/lyric-hyphen-retain.ly b/input/test/lyric-hyphen-retain.ly index 199210d31b..e5dd863945 100644 --- a/input/test/lyric-hyphen-retain.ly +++ b/input/test/lyric-hyphen-retain.ly @@ -37,7 +37,7 @@ c16[ c c c] }>> \paper { indent = 0.0 \cm - linewidth = 3.4 \cm + linewidth = 3.4 \cm \translator { \StaffContext \remove "Time_signature_engraver" diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly index 3dcccbfdbd..3b6df9f8f4 100644 --- a/input/test/mensural-ligatures.ly +++ b/input/test/mensural-ligatures.ly @@ -13,8 +13,8 @@ LilyPond can print mensural ligatures." % This is intended behaviour. voice = \notes \transpose c c' { - \set Score.timing = ##f - \set Score.defaultBarType = "empty" + \set Score.timing = ##f + \set Score.defaultBarType = "empty" g\longa c\breve a\breve f\breve d'\longa^\fermata \bar "|" \[ diff --git a/input/test/move-accidentals.ly b/input/test/move-accidentals.ly index db69407014..e4edc5c120 100644 --- a/input/test/move-accidentals.ly +++ b/input/test/move-accidentals.ly @@ -17,7 +17,7 @@ involves some scheme code. " } \context Voice \notes \relative c'' { c2. << -\set Staff.AccidentalPlacement = \turnOff +\set Staff.AccidentalPlacement = \turnOff \context Staff \applyoutput #(outputproperty-compatibility (make-acc-position-checker 9) 'extra-offset '(-1 . 0)) \context Staff \applyoutput #(outputproperty-compatibility (make-acc-position-checker 5) diff --git a/input/test/music-creation.ly b/input/test/music-creation.ly index 9f1d93fff2..ce5e3f120e 100644 --- a/input/test/music-creation.ly +++ b/input/test/music-creation.ly @@ -22,7 +22,7 @@ mechanism for this is rather clumsy to use, so avoid it if possible. " ml)) -fooMusic = #(seq-music-list +fooMusic = #(seq-music-list (list (make-note (list (make-note-req (ly:make-pitch 1 0 0) (ly:make-duration 2 0)))) (make-note (list (make-note-req (ly:make-pitch 1 1 0) (ly:make-duration 2 0))))) ) diff --git a/input/test/part-combine.ly b/input/test/part-combine.ly index 0897abb7f4..58b278d559 100644 --- a/input/test/part-combine.ly +++ b/input/test/part-combine.ly @@ -15,12 +15,12 @@ voices according to actual rhythm and pitch. User-defined texts such as \relative c'' { c4 d e f | b,4 d c d | r2 e4 f | c4 d e f | c4 r e f | c4 r e f | c4 r a r | a a r a | - a2 \set soloADue = ##f a | + a2 \set soloADue = ##f a | } \relative c'' { g4 b d f | r2 c4 d | a c c d | a4. b8 c4 d c r e r | r2 s2 | a,4 r a r | a r r a | - a2 \set soloADue = ##f a | + a2 \set soloADue = ##f a | } >> \paper{ diff --git a/input/test/polymetric-differing-notes.ly b/input/test/polymetric-differing-notes.ly index 9b1a77df4a..aaebb712e0 100644 --- a/input/test/polymetric-differing-notes.ly +++ b/input/test/polymetric-differing-notes.ly @@ -52,14 +52,14 @@ what happens on the inside: a 3/4 time signature is combined with a } \new Staff { \time 3/4 - \set Staff.timeSignatureFraction = #'(9 . 8) + \set Staff.timeSignatureFraction = #'(9 . 8) \apply #display-music \apply #(scale-music-function '(2 . 3)) \repeat unfold 6 { c8[ c c] } } \new Staff { \time 3/4 - \set Staff.timeSignatureFraction = #'(10 . 8) + \set Staff.timeSignatureFraction = #'(10 . 8) \apply #display-music \apply #(scale-music-function '(3 . 5)) { \repeat unfold 2 { c8[ c c] } \repeat unfold 2 { c8[ c] } diff --git a/input/test/repeat-manual.ly b/input/test/repeat-manual.ly index 56877ffde9..d8d6482cf6 100644 --- a/input/test/repeat-manual.ly +++ b/input/test/repeat-manual.ly @@ -8,16 +8,16 @@ unusual output. " \score { \notes \relative c'' { % First a normal looking repeat: c2 c - \set Score.repeatCommands = #'((volta "1.")) + \set Score.repeatCommands = #'((volta "1.")) c c - \set Score.repeatCommands = #'((volta #f) end-repeat (volta "2.")) + \set Score.repeatCommands = #'((volta #f) end-repeat (volta "2.")) c c - \set Score.repeatCommands = #'((volta #f)) + \set Score.repeatCommands = #'((volta #f)) % Then a more strange one: c c - \set Score.repeatCommands = #'((volta "93") end-repeat) + \set Score.repeatCommands = #'((volta "93") end-repeat) c c - \set Score.repeatCommands = #'((volta #f)) + \set Score.repeatCommands = #'((volta #f)) c c } \paper{raggedright=##t} diff --git a/input/test/repeat-shorter-bracket.ly b/input/test/repeat-shorter-bracket.ly index efd981e415..14aaca8ec7 100644 --- a/input/test/repeat-shorter-bracket.ly +++ b/input/test/repeat-shorter-bracket.ly @@ -17,7 +17,7 @@ can be shortened. \context Staff \notes\relative c''{ c c c c % coda-klugde: let volta span only one bar - \set Staff.voltaSpannerDuration = #(ly:make-moment 1 1) + \set Staff.voltaSpannerDuration = #(ly:make-moment 1 1) \repeat "volta" 5 { d d d d } \alternative { { e e e e f f f f } { g g g g } } diff --git a/input/test/rests.ly b/input/test/rests.ly index e3a51ac9f0..d2601e56e8 100644 --- a/input/test/rests.ly +++ b/input/test/rests.ly @@ -14,7 +14,7 @@ Rests in various styles. \score { \context Staff \notes\relative c { - \set Score.timing = ##f + \set Score.timing = ##f \override Staff.Rest #'style = #'mensural r\maxima^"Rest style = \#'mensural" r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 diff --git a/input/test/script-chart.ly b/input/test/script-chart.ly index 37e9d84820..7e3f5957f6 100644 --- a/input/test/script-chart.ly +++ b/input/test/script-chart.ly @@ -15,8 +15,8 @@ A chart showing all feta scripts. \override Score.LyricText #'font-family = #'typewriter \override Score.LyricText #'font-shape = #'upright \context Staff \notes { - \set Score.timing = ##f - \set Score.barAlways = ##t + \set Score.timing = ##f + \set Score.barAlways = ##t \override Staff.BarLine #'transparent = ##t c''\accent c''\marcato c''\staccatissimo c''\staccato c''\tenuto c''\portato @@ -50,7 +50,7 @@ A chart showing all feta scripts. >> \paper { linewidth = 5.1\in - indent = 0.0\mm + indent = 0.0\mm } } diff --git a/input/test/slur-attachment-override.ly b/input/test/slur-attachment-override.ly index 5cd0a85bfd..99bafeb82b 100644 --- a/input/test/slur-attachment-override.ly +++ b/input/test/slur-attachment-override.ly @@ -12,7 +12,7 @@ In some cases you may want to set slur attachments by hand. " %% fragment = \notes { - \set autoBeaming = ##f + \set autoBeaming = ##f \override Stem #'direction = #1 \override Slur #'direction = #1 d'32( f'4 d8..) diff --git a/input/test/slur-ugly.ly b/input/test/slur-ugly.ly index 430ff5dc7e..0169881d96 100644 --- a/input/test/slur-ugly.ly +++ b/input/test/slur-ugly.ly @@ -26,7 +26,7 @@ baseWalk = \notes \relative c { Slur \override #'direction = #1 Stem \override #'direction = #-1 autoBeamSettings \override #'(end * * * *) - = #(ly:make-moment 1 2) + = #(ly:make-moment 1 2) } \translator { \PianoStaffContext diff --git a/input/test/stem-cross-staff.ly b/input/test/stem-cross-staff.ly index 3f108347ec..9f92e70780 100644 --- a/input/test/stem-cross-staff.ly +++ b/input/test/stem-cross-staff.ly @@ -6,7 +6,7 @@ You can get this result by increasing the length of the stem in the lower stave so it reaches the stem in the upper stave, or vice versa. " } -stemExtend = \once \override Stem #'length = #22 +stemExtend = \once \override Stem #'length = #22 %% following reqs 1.7.1 or better. noFlag = \once \override Stem #'flag-style = #'no-flag diff --git a/input/test/tablature.ly b/input/test/tablature.ly index 7439e403df..a8ef0b9b92 100644 --- a/input/test/tablature.ly +++ b/input/test/tablature.ly @@ -13,7 +13,7 @@ partition = \notes { e8\5 fis\5 gis\5 a\5 b\5 cis'\5 dis'\5 e'\5 e8\4 fis\4 gis\4 a\4 b\4 cis'\4 dis'\4 e'\4 e8 fis gis a b cis' dis' e' - \set Score.minimumFret = #5 + \set Score.minimumFret = #5 e8 fis gis a b cis' dis' e' } diff --git a/input/test/text-rotate.ly b/input/test/text-rotate.ly index 09c16f01b9..40bdc48063 100644 --- a/input/test/text-rotate.ly +++ b/input/test/text-rotate.ly @@ -20,10 +20,10 @@ the lilypond.py script, and a line must be uncommented. \score { \new Staff \notes \relative c'' { - \set Staff.instrument = #"rotatebox{90}{Chor}" + \set Staff.instrument = #"rotatebox{90}{Chor}" %% uncomment this for rotation -% \set Staff.instrument = #"\\rotatebox{90}{Chor}" +% \set Staff.instrument = #"\\rotatebox{90}{Chor}" c4 c4 } diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly index 60bc5ef66d..90dad0a2af 100644 --- a/input/test/text-spanner.ly +++ b/input/test/text-spanner.ly @@ -26,7 +26,7 @@ You can make LilyPond print text spanners. " a \stopTextSpan - \set Staff.centralCPosition = #-13 + \set Staff.centralCPosition = #-13 \override TextSpanner #'dash-period = #10 \override TextSpanner #'dash-fraction = #.5 @@ -34,7 +34,7 @@ You can make LilyPond print text spanners. " a \startTextSpan b c a \stopTextSpan - \set Staff.centralCPosition = #-6 + \set Staff.centralCPosition = #-6 } \paper{ raggedright = ##t} } diff --git a/input/test/tie-sparse.ly b/input/test/tie-sparse.ly index 0445ff0f3e..98c50e81cc 100644 --- a/input/test/tie-sparse.ly +++ b/input/test/tie-sparse.ly @@ -8,7 +8,7 @@ generated per chord pair. " \score { \context Voice \notes\relative c { - \set sparseTies = ##t + \set sparseTies = ##t c'' ~ } \paper { raggedright = ##t } diff --git a/input/test/time.ly b/input/test/time.ly index bf7747a68e..beb7928d77 100644 --- a/input/test/time.ly +++ b/input/test/time.ly @@ -2,7 +2,7 @@ \version "2.1.22" % TODO: This file could be old. Ask about it later. -gp -\header { texidoc = "@cindex Time +\header { texidoc = "@cindex Time Old time signatures. For further information, consult the file. diff --git a/input/test/timing.ly b/input/test/timing.ly index 6840af2eab..22d0fc61a3 100644 --- a/input/test/timing.ly +++ b/input/test/timing.ly @@ -12,18 +12,18 @@ You can alter the length of bars by setting \context Voice \notes\relative c { - % \set Score.measurePosition = #(ly:make-moment -1 4) + % \set Score.measurePosition = #(ly:make-moment -1 4) \partial 4 c''4 c4 c4 c2 c1 \cadenzaOn c8[ d e f] g[ a b c b c b c] \cadenzaOff c4 c4 c4 c4 - \set Score.measureLength = #(ly:make-moment 5 4) + \set Score.measureLength = #(ly:make-moment 5 4) c1 c4 c1 c4 c4 c4 - \set Score.measurePosition = #(ly:make-moment -3 8) + \set Score.measurePosition = #(ly:make-moment -3 8) b8 b b c4 c1 diff --git a/input/test/title.ly b/input/test/title.ly index 2f5809ae40..d460e12f8c 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -1,7 +1,7 @@ \version "2.1.22" % MERGE with lilypond- \header { - filename = "title.ly" + filename = "title.ly" dedication = "dedication" title = "Title" subtitle = "Subtitle" @@ -15,7 +15,7 @@ texttranslator = "Translator" copyright = "public domain" enteredby = "jcn" - source = "urtext" + source = "urtext" texidoc ="This test lilypond titling. process with lilypond, not lilypond-book." } diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 43c2dbb768..7760363b5e 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -10,7 +10,7 @@ Transposition test file." -vOne = \notes \relative c''{ +vOne = \notes \relative c''{ \clef"violin" \key d \major \time 2/4 @@ -21,24 +21,24 @@ vOne = \notes \relative c''{ c4 c | } -vTwo = \notes \transpose c d { \vOne } +vTwo = \notes \transpose c d { \vOne } -vThree = \notes \relative c''{ +vThree = \notes \relative c''{ \clef"violin" % keysignature fis cis - \set Staff.keySignature = #'((0 . 2)(3 . 2)) + \set Staff.keySignature = #'((0 . 2)(3 . 2)) \time 2/4 d4 d | % keysignature bes es fis - \set Staff.keySignature = #'((3 . 2)(2 . -2)(6 . -2)) + \set Staff.keySignature = #'((3 . 2)(2 . -2)(6 . -2)) fis4 fis | % keysignature fis cis gis dis ais eis - \set Staff.keySignature = #'((2 . -2)(5 . -2)(1 . 2)(4 . 2)(0 . 2)(3 . 2)) + \set Staff.keySignature = #'((2 . -2)(5 . -2)(1 . 2)(4 . 2)(0 . 2)(3 . 2)) cis4 ais4 | } -vFour = \notes \transpose c d \vThree +vFour = \notes \transpose c d \vThree \score { \context StaffGroup << diff --git a/input/test/trill.ly b/input/test/trill.ly index 2ad2ec374c..4556708a0f 100644 --- a/input/test/trill.ly +++ b/input/test/trill.ly @@ -23,7 +23,7 @@ The extended trill is a TextSpanner in @code{trill} style. \override TextSpanner #'style = #'trill \override TextSpanner #'edge-height = #'(0 . 0) \override TextSpanner #'edge-text - = #(cons (make-musicglyph-markup "scripts-trill") "") + = #(cons (make-musicglyph-markup "scripts-trill") "") a\startTextSpan b c a\stopTextSpan } \paper { raggedright = ##t} diff --git a/input/test/vertical-extent.ly b/input/test/vertical-extent.ly index b03cb7015f..fe1782ef3c 100644 --- a/input/test/vertical-extent.ly +++ b/input/test/vertical-extent.ly @@ -11,12 +11,12 @@ associated context finishes, so using it in \property works. \score { \notes << \new Staff { - \set Staff.verticalExtent = #'(-15.0 . 0.0) + \set Staff.verticalExtent = #'(-15.0 . 0.0) \clef alto c1 } \new Staff { - \set Staff.verticalExtent = #'(-0.0 . 15.0) + \set Staff.verticalExtent = #'(-0.0 . 15.0) \clef alto g1 } diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index 80c4ea8f60..30900571c0 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -9,7 +9,7 @@ copyright = "public domain" } -melodie = \notes\relative c'' { +melodie = \notes\relative c'' { \clef "violin" \time 2/4 @@ -22,7 +22,7 @@ melodie = \notes\relative c'' { f4 f | e e | d d | c2 \bar "|." } -acc = \chords { +acc = \chords { % why don't \skip, s4 work? c2 c f c f c g:7 c @@ -33,7 +33,7 @@ acc = \chords { f c g:7 c } -text = \lyrics{ +text = \lyrics{ \override LyricText #'font-shape = #'italic Ah!4 vous dir -- ai -- je ma man2 diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index 5805fdb7de..7c62687f6e 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -28,12 +28,12 @@ working with lyric sections) %} break =#(make-event-chord (list (make-penalty-music -10001))) -noBreak = #(make-event-chord (list (make-penalty-music 10001))) +noBreak = #(make-event-chord (list (make-penalty-music 10001))) \include "scale-definitions-init.ly" -melisma = \set Staff.melismaBusy = ##t -melismaEnd = \set Staff.melismaBusy = ##f +melisma = \set Staff.melismaBusy = ##t +melismaEnd = \set Staff.melismaBusy = ##f \include "grace-init.ly" diff --git a/ly/deutsch.ly b/ly/deutsch.ly index d9ab259f5d..96812a38cc 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -7,7 +7,7 @@ % added asas and marked ases as `unusual' -pitchnamesDeutsch = #`( +pitchnamesDeutsch = #`( (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT)) (ces . ,(ly:make-pitch -1 0 FLAT)) (c . ,(ly:make-pitch -1 0 NATURAL)) diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 04c85316b3..dd545ca052 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -127,8 +127,8 @@ \alias "Staff" BarLine \override #'bar-size = #4 - VoltaBracket \override #'minimum-space = #15 - VoltaBracket \override #'padding = #5 + VoltaBracket \override #'minimum-space = #15 + VoltaBracket \override #'padding = #5 StaffSymbol \override #'line-count = #1 Stem \override #'neutral-direction = #1 @@ -520,7 +520,7 @@ AncientRemoveEmptyStaffContext = \translator { %% One may change the strings tuning as following : %% The lenght of the list must be equal to the number of string - stringTunings = #guitar-tunings + stringTunings = #guitar-tunings tablatureFormat = #fret-number-tablature-format %% @@ -604,9 +604,9 @@ EasyNotation = \translator { \remove "New_fingering_engraver" \description "Context for drawing notes in a Tab staff. " - Slur \override #'font-family = #'roman + Slur \override #'font-family = #'roman Slur \override #'print-function = #hammer-print-function - Slur \override #'direction = #-1 + Slur \override #'direction = #-1 % Draws all stems/beams out of the staff (and not in the middle of the staff !) % This feature is now disabled because most of the tab does not use it. @@ -635,7 +635,7 @@ EasyNotation = \translator { \accepts "TabVoice" % 6 strings - StaffSymbol \override #'line-count = #6 + StaffSymbol \override #'line-count = #6 StaffSymbol \override #'staff-space = #1.5 % Don't draw stems over the tablature figures ! diff --git a/ly/nederlands.ly b/ly/nederlands.ly index 65c2f91aee..f14728ad04 100644 --- a/ly/nederlands.ly +++ b/ly/nederlands.ly @@ -3,7 +3,7 @@ common dutch names for notes. es means flat, is means sharp %} -dutchPitchnames = #`( +dutchPitchnames = #`( (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT)) (ceh . ,(ly:make-pitch -1 0 SEMI-FLAT)) diff --git a/ly/property-init.ly b/ly/property-init.ly index 449ba70073..3f1a5e4261 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -6,7 +6,7 @@ stemUp = \override Stem #'direction = #1 stemDown = \override Stem #'direction = #-1 stemBoth= \revert Stem #'direction -slurUp = \override Slur #'direction = #1 +slurUp = \override Slur #'direction = #1 slurDown = \override Slur #'direction = #-1 slurBoth = \revert Slur #'direction @@ -15,14 +15,14 @@ slurDotted = \override Slur #'dashed = #1 slurSolid = \revert Slur #'dashed -phrasingSlurUp = \override PhrasingSlur #'direction = #1 +phrasingSlurUp = \override PhrasingSlur #'direction = #1 phrasingSlurDown = \override PhrasingSlur #'direction = #-1 phrasingSlurBoth = \revert PhrasingSlur #'direction -shiftOn = \override NoteColumn #'horizontal-shift = #1 -shiftOnn = \override NoteColumn #'horizontal-shift = #2 -shiftOnnn = \override NoteColumn #'horizontal-shift = #3 -shiftOff = \revert NoteColumn #'horizontal-shift +shiftOn = \override NoteColumn #'horizontal-shift = #1 +shiftOnn = \override NoteColumn #'horizontal-shift = #2 +shiftOnnn = \override NoteColumn #'horizontal-shift = #3 +shiftOff = \revert NoteColumn #'horizontal-shift tieUp = \override Tie #'direction = #1 tieDown = \override Tie #'direction = #-1 @@ -32,7 +32,7 @@ tieDotted = \override Tie #'dashed = #1 tieSolid = \revert Tie #'dashed -dynamicUp = { +dynamicUp = { \override DynamicText #'direction = #1 \override DynamicLineSpanner #'direction = #1 } @@ -45,7 +45,7 @@ dynamicBoth = { \revert DynamicLineSpanner #'direction } -scriptUp = { +scriptUp = { \override TextScript #'direction = #1 \override Script #'direction = #1 } @@ -62,14 +62,14 @@ dotsUp = \override Dots #'direction = #1 dotsDown = \override Dots #'direction = #-1 dotsBoth = \revert Dots #'direction -tupletUp = \override TupletBracket #'direction = #1 -tupletDown = \override TupletBracket #'direction = #-1 -tupletBoth = \revert TupletBracket #'direction +tupletUp = \override TupletBracket #'direction = #1 +tupletDown = \override TupletBracket #'direction = #-1 +tupletBoth = \revert TupletBracket #'direction -cadenzaOn = \set Timing.timing = ##f +cadenzaOn = \set Timing.timing = ##f cadenzaOff = { - \set Timing.timing = ##t - \set Timing.measurePosition = #(ly:make-moment 0 1) + \set Timing.timing = ##t + \set Timing.measurePosition = #(ly:make-moment 0 1) } newpage = \notes @@ -89,14 +89,14 @@ voiceThree =#(context-spec-music (make-voice-props-set 2) 'Voice) voiceFour = #(context-spec-music (make-voice-props-set 3) 'Voice) -tiny = - \set fontSize = #-2 +tiny = + \set fontSize = #-2 -small = - \set fontSize = #-1 +small = + \set fontSize = #-1 normalsize = { - \set fontSize = #0 + \set fontSize = #0 } @@ -108,28 +108,28 @@ endincipit = \notes \context Staff { \bar "" } -autoBeamOff = \set autoBeaming = ##f -autoBeamOn = \set autoBeaming = ##t +autoBeamOff = \set autoBeaming = ##f +autoBeamOn = \set autoBeaming = ##t fatText = \override TextScript #'no-spacing-rods = ##f -emptyText = \override TextScript #'no-spacing-rods = ##t +emptyText = \override TextScript #'no-spacing-rods = ##t -showStaffSwitch = \set followVoice = ##t -hideStaffSwitch = \set followVoice = ##f +showStaffSwitch = \set followVoice = ##t +hideStaffSwitch = \set followVoice = ##f % accidentals as they were common in the 18th century. defaultAccidentals = { - \set Current.extraNatural = ##t - \set Current.autoAccidentals = #'(Staff (same-octave . 0)) - \set Current.autoCautionaries = #'() + \set Current.extraNatural = ##t + \set Current.autoAccidentals = #'(Staff (same-octave . 0)) + \set Current.autoCautionaries = #'() } % accidentals in voices instead of staves. % Notice that accidentals from one voice do NOT get cancelled in other voices voiceAccidentals = { - \set Current.extraNatural = ##t - \set Current.autoAccidentals = #'(Voice (same-octave . 0)) - \set Current.autoCautionaries = #'() + \set Current.extraNatural = ##t + \set Current.autoAccidentals = #'(Voice (same-octave . 0)) + \set Current.autoCautionaries = #'() } @@ -137,38 +137,38 @@ voiceAccidentals = { % This includes all the default accidentals, but accidentals also needs cancelling % in other octaves and in the next measure. modernAccidentals = { - \set Current.extraNatural = ##f - \set Current.autoAccidentals = #'(Staff (same-octave . 0) (any-octave . 0) (same-octave . 1)) - \set Current.autoCautionaries = #'() + \set Current.extraNatural = ##f + \set Current.autoAccidentals = #'(Staff (same-octave . 0) (any-octave . 0) (same-octave . 1)) + \set Current.autoCautionaries = #'() } % the accidentals that Stone adds to the old standard as cautionaries modernCautionaries = { - \set Current.extraNatural = ##f - \set Current.autoAccidentals = #'(Staff (same-octave . 0)) - \set Current.autoCautionaries = #'(Staff (any-octave . 0) (same-octave . 1)) + \set Current.extraNatural = ##f + \set Current.autoAccidentals = #'(Staff (same-octave . 0)) + \set Current.autoCautionaries = #'(Staff (any-octave . 0) (same-octave . 1)) } % Multivoice accidentals to be read both by musicians playing one voice % and musicians playing all voices. % Accidentals are typeset for each voice, but they ARE cancelled across voices. modernVoiceAccidentals = { - \set Current.extraNatural = ##f - \set Current.autoAccidentals = #'( + \set Current.extraNatural = ##f + \set Current.autoAccidentals = #'( Voice (same-octave . 0) (any-octave . 0) (same-octave . 1) Staff (same-octave . 0) (any-octave . 0) (same-octave . 1) ) - \set Current.autoCautionaries = #'() + \set Current.autoCautionaries = #'() } % same as modernVoiceAccidental eccept that all special accidentals are typeset % as cautionaries modernVoiceCautionaries = { - \set Current.extraNatural = ##f - \set Current.autoAccidentals = #'( + \set Current.extraNatural = ##f + \set Current.autoAccidentals = #'( Voice (same-octave . 0) ) - \set Current.autoCautionaries = #'( + \set Current.autoCautionaries = #'( Voice (any-octave . 0) (same-octave . 1) Staff (same-octave . 0) (any-octave . 0) (same-octave . 1) ) @@ -177,18 +177,18 @@ modernVoiceCautionaries = { % stone's suggestions for accidentals on grand staff. % Accidentals are cancelled across the staves in the same grand staff as well pianoAccidentals = { - \set Current.autoAccidentals = #'( + \set Current.autoAccidentals = #'( Staff (same-octave . 0) (any-octave . 0) (same-octave . 1) GrandStaff (any-octave . 0) (same-octave . 1) ) - \set Current.autoCautionaries = #'() + \set Current.autoCautionaries = #'() } pianoCautionaries = { - \set Current.autoAccidentals = #'( + \set Current.autoAccidentals = #'( Staff (same-octave . 0) ) - \set Current.autoCautionaries = #'( + \set Current.autoCautionaries = #'( Staff (any-octave . 0) (same-octave . 1) GrandStaff (any-octave . 0) (same-octave . 1) ) @@ -199,8 +199,8 @@ pianoCautionaries = { % printed only once and are in effect until overridden, possibly many % measures later. noResetKey = { - \set Current.autoAccidentals = #'(Staff (same-octave . #t)) - \set Current.autoCautionaries = #'() + \set Current.autoAccidentals = #'(Staff (same-octave . #t)) + \set Current.autoCautionaries = #'() } % do not set localKeySignature when a note alterated differently from @@ -209,13 +209,13 @@ noResetKey = { % remembered for the duration of a measure. % accidentals not being remembered, causing accidentals always to be typeset relative to the time signature forgetAccidentals = { - \set Current.autoAccidentals = #'(Staff (same-octave . -1)) - \set Current.autoCautionaries = #'() + \set Current.autoAccidentals = #'(Staff (same-octave . -1)) + \set Current.autoCautionaries = #'() } % To remove a Volta bracket or some other graphical object, -% set it to turnOff. Example: \set Staff.VoltaBracket = \turnOff +% set it to turnOff. Example: \set Staff.VoltaBracket = \turnOff %% %% DO NOT USE THIS. IT CAN LEAD TO CRASHES. @@ -247,7 +247,7 @@ hideNotes =\sequential { } -unHideNotes = \sequential { +unHideNotes = \sequential { \revert Staff.Accidental #'transparent \revert Beam #'transparent \revert Stem #'transparent @@ -256,10 +256,10 @@ unHideNotes = \sequential { } germanChords = { - \set chordRootNamer = #(chord-name->german-markup #t) - \set chordNoteNamer = #note-name->german-markup + \set chordRootNamer = #(chord-name->german-markup #t) + \set chordNoteNamer = #note-name->german-markup } semiGermanChords = { - \set chordRootNamer = #(chord-name->german-markup #f) - \set chordNoteNamer = #note-name->german-markup + \set chordRootNamer = #(chord-name->german-markup #f) + \set chordNoteNamer = #note-name->german-markup } diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly index 464a54689c..143f240592 100644 --- a/ly/spanners-init.ly +++ b/ly/spanners-init.ly @@ -18,8 +18,8 @@ stopTextSpan = #(make-span-event 'TextSpanEvent STOP) cresc = \notes { #(ly:export (make-event-chord (list cr))) - \set crescendoText = \markup { \italic "cresc." } - \set crescendoSpanner = #'dashed-line + \set crescendoText = \markup { \italic "cresc." } + \set crescendoSpanner = #'dashed-line } % ah, this is handy: maybe drop resetting of properties in @@ -33,8 +33,8 @@ endcresc = \notes { dim = \notes { #(ly:export (make-event-chord (list decr))) - \set decrescendoText = \markup { \italic "dim." } - \set decrescendoSpanner = #'dashed-line + \set decrescendoText = \markup { \italic "dim." } + \set decrescendoSpanner = #'dashed-line } enddim = \notes { @@ -60,6 +60,6 @@ treCorde = #(make-span-event 'UnaCordaEvent STOP) sostenutoDown = #(make-span-event 'SostenutoEvent START) sostenutoUp = #(make-span-event 'SostenutoEvent STOP) -%crescpoco = \set crescendoText = "cresc. poco a poco" -%decresc = \set crescendoText = "decr." -%dim = \set crescendoText = "dim." +%crescpoco = \set crescendoText = "cresc. poco a poco" +%decresc = \set crescendoText = "decr." +%dim = \set crescendoText = "dim." diff --git a/ly/svenska.ly b/ly/svenska.ly index b9df19ba0d..9767484c6d 100644 --- a/ly/svenska.ly +++ b/ly/svenska.ly @@ -41,5 +41,5 @@ pitchnamesSvenska = #`( (hississ . ,(ly:make-pitch -1 6 DOUBLE-SHARP)) ) -pitchnames = \pitchnamesSvenska +pitchnames = \pitchnamesSvenska \version "2.1.22" diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 07f0a387b3..b0a4020035 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1846,9 +1846,9 @@ Grob::preset_extent removed. def conv (str): - str = re.sub (r'\\property\s+([^.]+)\s*\.\s*([^\\=]+)\s*\\(set|override)', + str = re.sub (r'\\property\s+([^. ]+)\s*\.\s*([^\\=]+)\s*\\(set|override)', r"\\overrid@ \1.\2 ", str) - str = re.sub (r'\\property\s+([^. ]+)\s*\.\s*([^\\= ]+)\s*=', + str = re.sub (r'\\property\s+([^. ]+)\s*\.\s*([^\\= ]+)\s*=\s*', r'\\s@t \1.\2 = ', str) str = re.sub (r'\\property\s+([^. ]+)\s*\.\s*([^\\= ]+)\s*\\unset', r'\\uns@t \1.\2 ', str)