diff options
Diffstat (limited to 'input/test')
207 files changed, 1052 insertions, 853 deletions
diff --git a/input/test/Cc-chords.ly b/input/test/Cc-chords.ly new file mode 100644 index 0000000000..b92cb37198 --- /dev/null +++ b/input/test/Cc-chords.ly @@ -0,0 +1,25 @@ +\header { + texidoc="Jazz chord names, but with lower case names for minor chords"; +} + +#(assoc-set! chord::names-alist-jazz + '((0 . 0) (2 . -1)) '("")) + +#(assoc-set! chord::names-alist-jazz + '((0 . 0) (2 . -1) (4 . 0) (6 . -1)) '("7")) + +#(define (pitch->chord-name-text-banter pitch additions) + (let ((name (pitch->text-banter pitch))) + (if (member '(2 . -1) (map pitch->note-name additions)) + (cons (string-append + (string-downcase (substring (car name) 0 1)) + (substring (car name) 1)) + (cdr name)) + name))) + +\score { + < + \property ChordNames.ChordName \set #'style = #'jazz + \context ChordNames \chords { c1 c:m c:m7 } + > +} diff --git a/input/test/absolute-volume.ly b/input/test/absolute-volume.ly index e56c69269e..e9dfd27b88 100644 --- a/input/test/absolute-volume.ly +++ b/input/test/absolute-volume.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ \notes\relative c''{ @@ -15,6 +16,6 @@ a\sf \paper{ } \midi{ -\tempo 1 = 60; +\tempo 1 = 60 } } diff --git a/input/test/ac-extra-voice.ly b/input/test/ac-extra-voice.ly index 07277383f7..1a5c061a2b 100644 --- a/input/test/ac-extra-voice.ly +++ b/input/test/ac-extra-voice.ly @@ -1,13 +1,14 @@ +\version "1.3.146" % % TODO: what's this? % global = \notes { - \key a \minor; - \time 6/4; -% \skip 1.*34; -% \bar ".|"; + \key a \minor + \time 6/4 +% \skip 1.*34 +% \bar ".|" } melody = \notes\relative c''{ @@ -40,14 +41,14 @@ accompany = \notes \relative c{ > \context Staff=down < \global - \clef bass; + \clef bass \autochange Staff \context Voice \accompany > > \paper { - indent = 8.\mm; - textheight = 295.\mm; + indent = 8.\mm + textheight = 295.\mm \translator{ \PianoStaffContext @@ -56,10 +57,10 @@ accompany = \notes \relative c{ \translator{ \StaffContext % don't auto-generate bars: not a good idea: -> no breakpoints - % barAuto = "0"; + % barAuto = "0" % urg defaultBarType = #"" defaultBarType = #"" - \remove "Time_signature_engraver"; + \remove "Time_signature_engraver" Slur \override #'direction = #1 @@ -68,7 +69,7 @@ accompany = \notes \relative c{ } } \midi { - \tempo 4 = 54; + \tempo 4 = 54 } } diff --git a/input/test/accid.ly b/input/test/accid.ly index 884fafd865..9faedd80b3 100644 --- a/input/test/accid.ly +++ b/input/test/accid.ly @@ -1,7 +1,8 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { - \time 3/4; + \time 3/4 cisis'' cisis! cisis? | cis cis! cis? | c c! c? | diff --git a/input/test/accidental-spacing.ly b/input/test/accidental-spacing.ly index 3884b75747..4193ce765a 100644 --- a/input/test/accidental-spacing.ly +++ b/input/test/accidental-spacing.ly @@ -1,11 +1,12 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { - c''4 c4 cis4 cis [c8 c \clef "bass"; f,, f] + c''4 c4 cis4 cis [c8 c \clef "bass" f,, f] } \paper { - linewidth=-1.0; + linewidth=-1.0 } \midi { } } diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly index 43ef4c6845..e3cca2fab9 100644 --- a/input/test/add-text-script.ly +++ b/input/test/add-text-script.ly @@ -1,10 +1,11 @@ +\version "1.3.146" \header { texidoc= "Using make-music, you can add various stuff to notes. Here is an example how to add an extra fingering. In general, first do a display of the music you want ot -create, then write a function that will build the structure for you."; +create, then write a function that will build the structure for you." } #(define (make-script x) diff --git a/input/test/american-chords.ly b/input/test/american-chords.ly index 6adc6167d3..10bc55226e 100644 --- a/input/test/american-chords.ly +++ b/input/test/american-chords.ly @@ -1,3 +1,4 @@ +\version "1.3.146" %{ See scm/chord-names.scm: chord::names-alist-american @@ -8,7 +9,7 @@ #(set! chord::names-alist-american (append '( - ;; any changes here, see scm/chord-name.scm + any changes here, see scm/chord-name.scm ) chord::names-alist-american)) diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index 608810ada4..faa6ce1b70 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -1,6 +1,7 @@ +\version "1.3.146" \header { - title = "ancient font test"; - date = "2000"; + title = "ancient font test" + date = "2000" } @@ -19,36 +20,36 @@ upperVoice = \context Staff = upperVoice < \property Voice.NoteHead \override #'style = #'mensural \property Voice.Stem \override #'stem-centered = ##t \property Staff.Custos \override #'style = #'vaticana - \clef "vaticana_fa2"; + \clef "vaticana_fa2" c2 d e f g % \property Staff.clefGlyph = #"clefs-vaticana_do" % \property Staff.clefPosition = #1 % \property Staff.clefOctavation = #0 - \clef "vaticana_do2"; + \clef "vaticana_do2" a b c' b a g f - \clef "vaticana_fa1"; - e d c1 \bar "|"; + \clef "vaticana_fa1" + e d c1 \bar "|" \property Staff.Custos \override #'style = #'medicaea - \clef "medicaea_fa2"; + \clef "medicaea_fa2" c2 d e f g - \clef "medicaea_do2"; + \clef "medicaea_do2" a b c' b a g f - \clef "medicaea_fa1"; - e d c1 \bar "|"; + \clef "medicaea_fa1" + e d c1 \bar "|" \property Staff.Custos \override #'style = #'hufnagel - \clef "hufnagel_fa2"; + \clef "hufnagel_fa2" c2 d e f g - \clef "hufnagel_do2"; + \clef "hufnagel_do2" a b c' b a g f - \clef "hufnagel_fa1"; - e d c1 \bar "||"; + \clef "hufnagel_fa1" + e d c1 \bar "||" } > @@ -59,52 +60,52 @@ lowerVoice = \context Staff = lowerNotes < \property Voice.NoteHead \override #'style = #'mensural \property Voice.Stem \override #'stem-centered = ##t \property Staff.Custos \override #'style = #'mensural - \clef "mensural1_c2"; + \clef "mensural1_c2" c2 d e f g \property Staff.forceClef = ##t - \clef "mensural1_c2"; + \clef "mensural1_c2" a b c' b a g f - \clef "mensural2_c2"; - e d c1 \bar "|"; + \clef "mensural2_c2" + e d c1 \bar "|" - \clef "mensural2_c2"; + \clef "mensural2_c2" c2 d e f g \property Staff.forceClef = ##t - \clef "mensural3_c2"; + \clef "mensural3_c2" a b c' b a g f - \clef "mensural3_c2"; - e d c1 \bar "|"; + \clef "mensural3_c2" + e d c1 \bar "|" - \clef "mensural1_f"; + \clef "mensural1_f" c2 d e f g \property Staff.forceClef = ##t - \clef "mensural1_f"; + \clef "mensural1_f" a b c' b a g f - \clef "mensural2_f"; - e d c1 \bar "|"; + \clef "mensural2_f" + e d c1 \bar "|" \property Staff.forceClef = ##t - \clef "mensural2_f"; + \clef "mensural2_f" c2 d e f g - \clef "mensural_g"; + \clef "mensural_g" a' b' c'' b' a' g' f' \property Staff.forceClef = ##t - \clef "mensural_g"; - e' d' c'1 \bar "|"; + \clef "mensural_g" + e' d' c'1 \bar "|" \property Staff.forceClef = ##t - \clef "mensural_g"; + \clef "mensural_g" c'2 d' e' f' g' - \clef "hufnagel_do_fa"; + \clef "hufnagel_do_fa" a b c' b a g f \property Staff.forceClef = ##t - \clef "hufnagel_do_fa"; - e d c1 \bar "||"; + \clef "hufnagel_do_fa" + e d c1 \bar "||" } > @@ -115,14 +116,14 @@ lowerVoice = \context Staff = lowerNotes < > \paper { % \paperTwentysix - linewidth = 17.25\cm; - textheight = 26.0\cm; - indent = 0.0; + linewidth = 17.25\cm + textheight = 26.0\cm + indent = 0.0 \translator { \StaffContext - \consists Custos_engraver; -% Custos \override #'style = #'mensural; - \remove Time_signature_engraver; + \consists Custos_engraver +% Custos \override #'style = #'mensural + \remove Time_signature_engraver % StaffSymbol \override #'line-count = #4 } } diff --git a/input/test/as.ly b/input/test/as.ly index 3d45eb331d..39644dc106 100644 --- a/input/test/as.ly +++ b/input/test/as.ly @@ -1,7 +1,8 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { - \time 4/4; + \time 4/4 g''1 a2 b4. c8 } diff --git a/input/test/as1.ly b/input/test/as1.ly index f26aebabb1..6c669f3b5f 100644 --- a/input/test/as1.ly +++ b/input/test/as1.ly @@ -1,7 +1,8 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { - \time 4/4; + \time 4/4 g''1 a2 b4. c8 \repeat "volta" 2 { a4 b c d } \alternative { { c c c c } { d2 d4 [d8 d] } } diff --git a/input/test/as2.ly b/input/test/as2.ly index 71995c12dc..4866362704 100644 --- a/input/test/as2.ly +++ b/input/test/as2.ly @@ -1,3 +1,4 @@ +\version "1.3.146" % test for ascii-art output @@ -5,13 +6,13 @@ \score { \notes\relative c'{ - \time 4/4; + \time 4/4 c8( e g )b d( d d )d - \bar "|."; + \bar "|." } \paper { - linewidth=65.0\char; + linewidth=65.0\char \translator { \StaffContext barSize = #9 } %\translator { \VoiceContext beamHeight = #0 } \translator { \VoiceContext beamHeight = ##f } diff --git a/input/test/auto-beam-4-8.ly b/input/test/auto-beam-4-8.ly index d315c3957f..0bf0d5aa91 100644 --- a/input/test/auto-beam-4-8.ly +++ b/input/test/auto-beam-4-8.ly @@ -1,9 +1,10 @@ +\version "1.3.146" \score{ \notes\relative c''{ - \time 4/8; + \time 4/8 %{ the default for 4/8 (see scm/auto-beam.scm) diff --git a/input/test/auto-beam-override.ly b/input/test/auto-beam-override.ly index c99c614770..89400e23af 100644 --- a/input/test/auto-beam-override.ly +++ b/input/test/auto-beam-override.ly @@ -1,3 +1,4 @@ +\version "1.3.146" @@ -15,7 +16,7 @@ \score{ \notes \relative c''{ - \time 2/4; + \time 2/4 % one beam per measure c8 c c c c16 c c c c c c c diff --git a/input/test/auto-beam-triplet.ly b/input/test/auto-beam-triplet.ly index a8798b0bf3..cfd3cfa462 100644 --- a/input/test/auto-beam-triplet.ly +++ b/input/test/auto-beam-triplet.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ \notes\relative c''{ @@ -8,7 +9,7 @@ % urg, avoid crash \translator{ \VoiceContext - \remove Tuplet_engraver; + \remove Tuplet_engraver } } } diff --git a/input/test/auto-beam.ly b/input/test/auto-beam.ly index d24a1ff20d..e7d5ae9e1c 100644 --- a/input/test/auto-beam.ly +++ b/input/test/auto-beam.ly @@ -1,3 +1,4 @@ +\version "1.3.146" %{ The auto-beam engraver has presets for common time signatures. @@ -6,55 +7,55 @@ \score{ \notes \relative c''{ %{ - % urg: something breaks in grouping ; see input/bugs/time-grouping.ly - \time 1/2; + % urg: something breaks in grouping see input/bugs/time-grouping.ly + \time 1/2 c8 c c c c16 c c c c c c c c32 c c c c c c c c c c c c c c c - \time 1/4; + \time 1/4 c8 c c16 c c c c32 c c c c c c c - \time 1/8; + \time 1/8 c8 c16 c c32 c c c %} - \time 2/2; + \time 2/2 c8 c c c c c c c c16 c c c c c c c c c c c c c c c c32 c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c - \time 2/4; + \time 2/4 c8 c c c c16 c c c c c c c c32 c c c c c c c c c c c c c c c - \time 2/8; + \time 2/8 c8 c c16 c c c c32 c c c c c c c - \time 3/2; + \time 3/2 c8 c c c c c c c c c c c c16 c c c c c c c c c c c c c c c c c c c c c c c - \time 3/4; + \time 3/4 c8 c c c c c c16 c c c c c c c c c c c c32 c c c c c c c c c c c c c c c c c c c c c c c - \time 3/8; + \time 3/8 c8 c c c16 c c c c c c32 c c c c c c c c c c c - \time 4/4; + \time 4/4 c8 c c c c c c c c16 c c c c c c c c c c c c c c c c32 c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c c - \time 4/8; + \time 4/8 c8 c c c c16 c c c c c c c c32 c c c c c c c c c c c c c c c - \time 6/8; + \time 6/8 c8 c c c c c c16 c c c c c c c c c c c - \time 9/8; + \time 9/8 c8 c c c c c c c c c16 c c c c c c c c c c c c c c c c c } diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly index 6bea16c5ce..7ebbad9f0d 100644 --- a/input/test/bagpipe.ly +++ b/input/test/bagpipe.ly @@ -1,14 +1,15 @@ +\version "1.3.146" % bagpipe music. \header { - title="Flower of Scotland"; + title="Flower of Scotland" } \paper { - linewidth = 14.0 \cm; - indent = 0.0 \cm; + linewidth = 14.0 \cm + indent = 0.0 \cm \translator { \GraceContext @@ -71,7 +72,7 @@ gcdg = \notes{ \grace { [g'32 c d]}} % \score { - \notes { \time 6/8; \partial 4; + \notes { \time 6/8 \partial 4 \tieUp \slurUp f4 | @@ -81,16 +82,16 @@ f4 | )e8 d4 \gg d4 e8 | \break -\time 9/8; +\time 9/8 \dblf f2.( )f4 d8 | -\time 6/8; +\time 6/8 \dblg g'4 a'8 \gg a'4. | \thrd d4.( )d4 \eg a8 | -\time 9/8; +\time 9/8 \dble e4 \lag e8 \gg [e16 d8. e8] \gg f4 g'8 | \break -\time 6/8; +\time 6/8 \gg f4 e8 \thrd d4. | \eg a4.( )a4 d8 | \dblg g'4 a'8 \gg a'4. | diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly index 1dcbe9077d..a79f52b0b8 100644 --- a/input/test/banter-chords.ly +++ b/input/test/banter-chords.ly @@ -1,9 +1,10 @@ +\version "1.3.146" \header{ -enteredby = "jcn"; -copyright = "public domain"; -TestedFeatures = "Banter named chords"; +enteredby = "jcn" +copyright = "public domain" +TestedFeatures = "Banter named chords" } % test German (Banter) naming @@ -17,12 +18,12 @@ TestedFeatures = "Banter named chords"; % { -#;(define chord::names-alist-banter '()) +#(define chord::names-alist-banter '()) #(set! chord::names-alist-banter (append '( (((0 . 0) (2 . -1) (4 . -1)) . (("m" ("5-" . (type . "super"))))) - ; Co iso Cm5-7- + Co iso Cm5-7- (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . ("o" (type "super"))) ))) diff --git a/input/test/bar-lines.ly b/input/test/bar-lines.ly index 3c1894780c..013bd21e68 100644 --- a/input/test/bar-lines.ly +++ b/input/test/bar-lines.ly @@ -1,15 +1,16 @@ +\version "1.3.146" \score { \notes \relative c'' { c4 -\bar "|."; c -\bar "|:";c -\bar "||";c -\bar ":|" ; c -\bar ".|"; c -\bar ".|."; c -\bar "|"; c +\bar "|." c +\bar "|:"c +\bar "||"c +\bar ":|" c +\bar ".|" c +\bar ".|." c +\bar "|" c } } diff --git a/input/test/bar-script-visibility.ly b/input/test/bar-script-visibility.ly index 26f96aabec..a59c1c3296 100644 --- a/input/test/bar-script-visibility.ly +++ b/input/test/bar-script-visibility.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { @@ -6,7 +7,7 @@ \translator{ \StaffContext - \consists Bar_number_engraver; + \consists Bar_number_engraver barNumberVisibilityFunction = #end-of-line-invisible } } diff --git a/input/test/beam-abbrev.ly b/input/test/beam-abbrev.ly index bf1d184a4b..4606a7146a 100644 --- a/input/test/beam-abbrev.ly +++ b/input/test/beam-abbrev.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly index ae67cfee1e..2df51c0b50 100644 --- a/input/test/beam-chord.ly +++ b/input/test/beam-chord.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ @@ -13,6 +14,6 @@ } \paper{ - linewidth = 60.0\mm; + linewidth = 60.0\mm } } diff --git a/input/test/beam-control.ly b/input/test/beam-control.ly index 1853cabe8b..ce8f13e055 100644 --- a/input/test/beam-control.ly +++ b/input/test/beam-control.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { diff --git a/input/test/beam-count.ly b/input/test/beam-count.ly index 8258679872..169d98cb79 100644 --- a/input/test/beam-count.ly +++ b/input/test/beam-count.ly @@ -1,3 +1,4 @@ +\version "1.3.146" fragment = \notes { @@ -13,7 +14,7 @@ fragment = \notes { a g f } -\paper { linewidth = -1.; } +\paper { linewidth = -1. } \score { \notes\relative c \fragment diff --git a/input/test/beam-damp.ly b/input/test/beam-damp.ly index 1cd572507f..9c0c67bc66 100644 --- a/input/test/beam-damp.ly +++ b/input/test/beam-damp.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ \notes\relative c''{ % \stemUp @@ -14,7 +15,7 @@ [a b c d] } \paper{ - linewidth=-1.; + linewidth=-1. } } diff --git a/input/test/beam-dir-function.ly b/input/test/beam-dir-function.ly index ef044f8e2f..faed716f6e 100644 --- a/input/test/beam-dir-function.ly +++ b/input/test/beam-dir-function.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \header{ texidoc=" @@ -17,7 +18,7 @@ We should see: up down down up up down -"; +" } \score { @@ -31,7 +32,7 @@ We should see: [d a] \property Voice.Beam \set #'dir-function = #beam-dir-majority - \time 3/8; + \time 3/8 [d8 a a] \property Voice.Beam \set #'dir-function = #beam-dir-mean [d a a] diff --git a/input/test/beam-dir-functions.ly b/input/test/beam-dir-functions.ly index 613eec4d51..5611939a61 100644 --- a/input/test/beam-dir-functions.ly +++ b/input/test/beam-dir-functions.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \header { texidoc = " @@ -16,10 +17,10 @@ examples: These beam direction functions are defined in @file{scm/beam.scm}. If your favourite algorithm isn't one of these, you can hook up your own. -"; +" } -\paper { linewidth = -1.;} +\paper { linewidth = -1.} \score { \notes \relative c { [d''8 a] \property Voice.Beam \set #'dir-function = #beam-dir-mean @@ -28,7 +29,7 @@ your favourite algorithm isn't one of these, you can hook up your own. [d a] }} \score { \notes \relative c { - \time 3/8; + \time 3/8 [d''8 a a] \property Voice.Beam \set #'dir-function = #beam-dir-mean [d a a] diff --git a/input/test/beam-dir.ly b/input/test/beam-dir.ly index 1dd3dc9fb8..be2b33de83 100644 --- a/input/test/beam-dir.ly +++ b/input/test/beam-dir.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index a3a7e4dc1d..f12c3feff4 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -1,10 +1,11 @@ +\version "1.3.146" \score{ \context PianoStaff < \context Staff=one \notes\relative c'{ s1 } \context Staff=two \notes\relative c'{ - \clef bass; + \clef bass % no knee \stemUp [c8 \translator Staff=one \stemDown g'16 f] s8 @@ -12,7 +13,7 @@ } > \paper{ - linewidth=-1.; + linewidth=-1. } } diff --git a/input/test/beam-neutral-direction.ly b/input/test/beam-neutral-direction.ly index 41187d8aa2..2e41028339 100644 --- a/input/test/beam-neutral-direction.ly +++ b/input/test/beam-neutral-direction.ly @@ -1,3 +1,4 @@ +\version "1.3.146" fragment = \notes { @@ -6,7 +7,7 @@ fragment = \notes { [b b] } -\paper { linewidth = -1.; } +\paper { linewidth = -1. } \score { \notes\relative c \fragment diff --git a/input/test/beam-pos.ly b/input/test/beam-pos.ly index 3bb6876830..14b92742d8 100644 --- a/input/test/beam-pos.ly +++ b/input/test/beam-pos.ly @@ -1,11 +1,12 @@ +\version "1.3.146" \header{ -filename = "beam-pos.ly"; -composer = "jcn"; -enteredby = "jcn"; -copyright = "PD"; +filename = "beam-pos.ly" +composer = "jcn" +enteredby = "jcn" +copyright = "PD" -TestedFeatures = "beam quant positions"; +TestedFeatures = "beam quant positions" } \score{ diff --git a/input/test/beam-position.ly b/input/test/beam-position.ly index 19c4922353..33726b736c 100644 --- a/input/test/beam-position.ly +++ b/input/test/beam-position.ly @@ -1,3 +1,4 @@ +\version "1.3.146" fragment = \notes { @@ -6,7 +7,7 @@ fragment = \notes { [c'8 c] } -\paper { linewidth = -1.; } +\paper { linewidth = -1. } \score { \notes\relative c \fragment diff --git a/input/test/beam-quanting.ly b/input/test/beam-quanting.ly index e608a71add..977ed5b283 100644 --- a/input/test/beam-quanting.ly +++ b/input/test/beam-quanting.ly @@ -1,3 +1,4 @@ +\version "1.3.146" %{ Have some fun beam quanting diff --git a/input/test/beam-rest.ly b/input/test/beam-rest.ly index bcdfe5b952..7cf4b81c29 100644 --- a/input/test/beam-rest.ly +++ b/input/test/beam-rest.ly @@ -1,8 +1,9 @@ +\version "1.3.146" \header{ texidoc=" Beams over rests. -"; +" } \score{ @@ -13,6 +14,6 @@ Beams over rests. } \paper{ - linewidth =-1; + linewidth =-1 } } diff --git a/input/test/beam-slope.ly b/input/test/beam-slope.ly index a31582b76a..02a3588463 100644 --- a/input/test/beam-slope.ly +++ b/input/test/beam-slope.ly @@ -1,3 +1,4 @@ +\version "1.3.146" fragment = \notes { @@ -6,7 +7,7 @@ fragment = \notes { [a''8 e' d c] } -\paper { linewidth = -1.; } +\paper { linewidth = -1. } \score { \notes\relative c \fragment diff --git a/input/test/beam-suspect.ly b/input/test/beam-suspect.ly index e29d27780d..c3aecc05a2 100644 --- a/input/test/beam-suspect.ly +++ b/input/test/beam-suspect.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ \notes\relative c'{ @@ -12,6 +13,6 @@ [g16 a b c] } \paper{ - linewidth=-1.; + linewidth=-1. } } diff --git a/input/test/beam-trend.ly b/input/test/beam-trend.ly index 16814d8605..bd3e4624bf 100644 --- a/input/test/beam-trend.ly +++ b/input/test/beam-trend.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ \notes\relative c'{ @@ -5,6 +6,6 @@ [f8 a' g f] } \paper{ - linewidth=-1.; + linewidth=-1. } } diff --git a/input/test/beam-urg.ly b/input/test/beam-urg.ly index 54c1accf07..04944edf28 100644 --- a/input/test/beam-urg.ly +++ b/input/test/beam-urg.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ \notes\relative c''{ @@ -7,6 +8,6 @@ [g16 e f g] } \paper{ - linewidth = -1.; + linewidth = -1. } } diff --git a/input/test/beamed-slur-endings.ly b/input/test/beamed-slur-endings.ly index 1f082c0b5a..368fe3e808 100644 --- a/input/test/beamed-slur-endings.ly +++ b/input/test/beamed-slur-endings.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ \notes \relative c''{ @@ -19,7 +20,7 @@ } \paper{ - indent = 0.0; - linewidth = 60.0\mm; + indent = 0.0 + linewidth = 60.0\mm } } diff --git a/input/test/beams.ly b/input/test/beams.ly index c1172a46c6..0c96547772 100644 --- a/input/test/beams.ly +++ b/input/test/beams.ly @@ -1,10 +1,11 @@ +\version "1.3.146" \header{ -filename = "beams.ly"; -composer = "heu"; -enteredby = "jcn"; -copyright = "PD"; +filename = "beams.ly" +composer = "heu" +enteredby = "jcn" +copyright = "PD" -TestedFeatures = "beams and beamflags"; +TestedFeatures = "beams and beamflags" } @@ -14,7 +15,7 @@ TestedFeatures = "beams and beamflags"; \context GrandStaff < \notes\transpose c' { - \time 8/4; + \time 8/4 \stemUp [c8 c'' a' f'] \stemUp [c16 c'' a' f'] \stemUp [c32 c'' a' f'] @@ -40,7 +41,7 @@ TestedFeatures = "beams and beamflags"; < \notes { \transpose c' { - \time 8/4; + \time 8/4 \stemDown [a'8 a, c e] \stemDown [a'16 a, c e] \stemDown [a'32 a, c e] diff --git a/input/test/boxed-molecule.ly b/input/test/boxed-molecule.ly index 1dc8cb0fd3..e4b660d41d 100644 --- a/input/test/boxed-molecule.ly +++ b/input/test/boxed-molecule.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \header { texidoc = "overriding the molecule callback can also be used to draw a @@ -5,7 +6,7 @@ texidoc = "overriding the molecule callback can also be used to draw a TODO: check whether the corners are really correct. - "; + " } #(define (box-molecule xext yext) (ly-make-molecule diff --git a/input/test/broken-thread-line.ly b/input/test/broken-thread-line.ly index 597e2e6163..348d88e6e8 100644 --- a/input/test/broken-thread-line.ly +++ b/input/test/broken-thread-line.ly @@ -1,3 +1,4 @@ +\version "1.3.146" @@ -12,10 +13,10 @@ a, } - \context Staff=two { \clef bass; \skip 1*2; } + \context Staff=two { \clef bass \skip 1*2 } > \paper{ - linewidth = 70.\mm; + linewidth = 70.\mm \translator { \ScoreContext followVoice = ##t diff --git a/input/test/broken.ly b/input/test/broken.ly index 38387f31fb..fe4c519149 100644 --- a/input/test/broken.ly +++ b/input/test/broken.ly @@ -1,8 +1,9 @@ +\version "1.3.146" \header{ -enteredby = "jcn"; -copyright = "PD"; +enteredby = "jcn" +copyright = "PD" TestedFeatures = "This file tests Feta embedded slurs" + - "(Feta definitively is not an abbreviation of Font-En-TjA)"; + "(Feta definitively is not an abbreviation of Font-En-TjA)" } @@ -35,9 +36,9 @@ broken = \notes\transpose c''{ \broken } \paper{ - indent = 0.0\pt; + indent = 0.0\pt %for broken! - linewidth= 30.\mm; + linewidth= 30.\mm } } diff --git a/input/test/caps.ly b/input/test/caps.ly index fc2ec02d08..81e3caff17 100644 --- a/input/test/caps.ly +++ b/input/test/caps.ly @@ -1,7 +1,8 @@ +\version "1.3.146" \header { texidoc = " Small caps is available as font-shape caps. - "; } + " } shapeSC = \property Lyrics.LyricText \override #'font-shape = #'caps shapeNorm = \property Lyrics.LyricText \revert #'font-shape @@ -9,5 +10,5 @@ shapeSC = \property Lyrics.LyricText \override #'font-shape = #'caps \notes \relative c'' { c4 c4 c8 c8 } \lyrics \context Lyrics { what4 is4 \shapeSC Bud8 -- dha?8 }> -\paper { linewidth = -1.;} +\paper { linewidth = -1.} } diff --git a/input/test/chord-changes.ly b/input/test/chord-changes.ly index f7552843bb..ffa0647b5b 100644 --- a/input/test/chord-changes.ly +++ b/input/test/chord-changes.ly @@ -1,9 +1,10 @@ +\version "1.3.146" \header{ texidoc="property chordChanges: only display chord names when there's a change in the chords scheme, but always display the chord name after a line break. -"; +" } scheme = \chords { @@ -18,7 +19,7 @@ scheme = \chords { \context Staff \transpose c'' \scheme > \paper{ - linewidth = 40 * \staffspace; + linewidth = 40 * \staffspace \translator { \ChordNamesContext chordChanges = ##t diff --git a/input/test/chord-inversion.ly b/input/test/chord-inversion.ly index 4794dc55fd..986d99506a 100644 --- a/input/test/chord-inversion.ly +++ b/input/test/chord-inversion.ly @@ -1,7 +1,8 @@ +\version "1.3.146" \header{ -enteredby = "jcn"; -copyright = "public domain"; -TestedFeatures = "chord inversions"; +enteredby = "jcn" +copyright = "public domain" +TestedFeatures = "chord inversions" } inversions = \notes\transpose c''\chords{ diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly index fdb855e3ce..1eaf987dae 100644 --- a/input/test/chord-table.ly +++ b/input/test/chord-table.ly @@ -1,7 +1,8 @@ +\version "1.3.146" \header{ -filename = "chord-table.ly"; -copyright = "public domain"; -enteredby = "jcn"; +filename = "chord-table.ly" +copyright = "public domain" +enteredby = "jcn" } tab = \notes\transpose c'''\chords{ @@ -36,7 +37,7 @@ tab = \notes\transpose c'''\chords{ \context ChordNames=b \notes\transpose b,\tab > \paper{ - textheight = \vsize - 4.0 * \staffheight; + textheight = \vsize - 4.0 * \staffheight } } diff --git a/input/test/chords.ly b/input/test/chords.ly index 14669e7a00..c78316464e 100644 --- a/input/test/chords.ly +++ b/input/test/chords.ly @@ -1,3 +1,4 @@ +\version "1.3.146" %{ @@ -7,12 +8,12 @@ Would this be acceptable/good enough/convenient for entry? C# cis Cb ces - Cm; Cmin c:3-; c:m; c:min - Caug c:5+; c:aug; - Cdim c:3-.5-; c:dim - Cmaj7 c:7+; c:maj + Cm Cmin c:3- c:m c:min + Caug c:5+ c:aug + Cdim c:3-.5- c:dim + Cmaj7 c:7+ c:maj C7 c:7 - Csus; Csus4 c:4; c:sus + Csus Csus4 c:4 c:sus %} @@ -37,21 +38,21 @@ keys = \notes{ s1 s1 s1 s1 s1 s1 - \key g \major; s1 - \key d \major; s1 - \key a \major; s1 - \key e \major; s1 - \key b \major; s1 - \key fis \major; s1 - \key c \major; s1 - \key f \major; s1 - \key bes \major; s1 - \key es \major; s1 - \key as \major; s1 - \key des \major; s1 - \key ges \major; s1 - \key c \major; s1*2 - \key c \major; s1*6 + \key g \major s1 + \key d \major s1 + \key a \major s1 + \key e \major s1 + \key b \major s1 + \key fis \major s1 + \key c \major s1 + \key f \major s1 + \key bes \major s1 + \key es \major s1 + \key as \major s1 + \key des \major s1 + \key ges \major s1 + \key c \major s1*2 + \key c \major s1*6 } \score{ diff --git a/input/test/clef-8-syntax.ly b/input/test/clef-8-syntax.ly index 7f6af2578c..15a9a75d0f 100644 --- a/input/test/clef-8-syntax.ly +++ b/input/test/clef-8-syntax.ly @@ -1,10 +1,11 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { -\clef "bass_8"; c4 +\clef "bass_8" c4 } \paper { - linewidth=-1.0; + linewidth=-1.0 } \midi { } } diff --git a/input/test/coda-kludge.ly b/input/test/coda-kludge.ly index 9518c931bb..2239acad07 100644 --- a/input/test/coda-kludge.ly +++ b/input/test/coda-kludge.ly @@ -1,3 +1,4 @@ +\version "1.3.146" % The volta texts should read: 1-4 and 5 % Not 1 and 2 % (see 1.2.17) @@ -55,4 +56,4 @@ Hi, } -%; +% diff --git a/input/test/collision-merge-dotted.ly b/input/test/collision-merge-dotted.ly index 2d53c3d00b..6fb616823c 100644 --- a/input/test/collision-merge-dotted.ly +++ b/input/test/collision-merge-dotted.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly index 39bf14ef69..6f5b0e20de 100644 --- a/input/test/coriolan-margin.ly +++ b/input/test/coriolan-margin.ly @@ -1,26 +1,27 @@ +\version "1.3.146" % Ugh, we need to override some LaTeX titling stuff \header { - 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"; - piece = "\\hspace*{30mm}\\normalfont\\large Allegro con brio"; - composer = "Ludwig van Beethoven (1770-1827)"; - enteredby = "JCN"; + 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" + piece = "\\hspace*{30mm}\\normalfont\\large Allegro con brio" + composer = "Ludwig van Beethoven (1770-1827)" + enteredby = "JCN" } #(define raisedflat '((raise . 0.4) (music (named "accidentals--1")))) flauti = \notes \relative c' { \property Staff.instrument = #"2 Flauti" \property Staff.instr = #"Fl." - \time 4/4; + \time 4/4 c1 \break c % \break c % \break c - \bar"|."; + \bar"|." } oboi = \notes \relative c' { @@ -106,7 +107,7 @@ violoncello = \notes \relative c' { \context StaffGroup ="timpani" < \context Staff ="timpani" \timpani { - \skip 1; + \skip 1 % Hmm: this forces a staff-bracket, that's good! % However, I can't find where is decided on staff-bracket yes/no } @@ -122,8 +123,8 @@ violoncello = \notes \relative c' { > \paper { \paperSixteen - indent=100.0\mm; - linewidth=150.0\mm; + indent=100.0\mm + linewidth=150.0\mm \translator { \HaraKiriStaffContext } diff --git a/input/test/crescendi.ly b/input/test/crescendi.ly index ba7238f6e0..846fee7097 100644 --- a/input/test/crescendi.ly +++ b/input/test/crescendi.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ \notes\relative c''{ @@ -11,6 +12,6 @@ a\< \!a \paper{ } \midi{ -\tempo 1 = 60; +\tempo 1 = 60 } } diff --git a/input/test/crescendo-text.ly b/input/test/crescendo-text.ly index fea7996def..9aa29f76ff 100644 --- a/input/test/crescendo-text.ly +++ b/input/test/crescendo-text.ly @@ -1,3 +1,4 @@ +\version "1.3.146" fragment = \notes { @@ -8,7 +9,7 @@ fragment = \notes { } } -\paper { linewidth = -1.; } +\paper { linewidth = -1. } \score { \notes\relative c \fragment diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly index 1694b42c08..d4cf5b5f3d 100644 --- a/input/test/cue-notes.ly +++ b/input/test/cue-notes.ly @@ -1,3 +1,4 @@ +\version "1.3.146" @@ -6,29 +7,29 @@ \paper { CueVoiceContext = \translator { \VoiceContext - \name CueVoice; + \name CueVoice NoteHead \override #'font-relative-size = #-1 Stem \override #'font-relative-size = #-1 Beam \override #'font-relative-size = #-1 TextScript \override #'font-relative-size = #-1 Slur \override #'font-relative-size = #-1 Accidentals \override #'font-relative-size = #-1 - }; + } \translator{ \CueVoiceContext } StaffContext = \translator{\StaffContext - \accepts "CueVoice"; - }; + \accepts "CueVoice" + } } \paper { StaffContext = \translator{ \StaffContext - \remove "Time_signature_engraver"; - }; + \remove "Time_signature_engraver" + } \translator { \StaffContext } \translator{ \VoiceContext - \remove "Auto_beam_engraver"; + \remove "Auto_beam_engraver" } \translator { \ScoreContext diff --git a/input/test/custos.ly b/input/test/custos.ly index 4de138736b..da22f529ce 100644 --- a/input/test/custos.ly +++ b/input/test/custos.ly @@ -1,8 +1,9 @@ +\version "1.3.146" \score { \notes { c'1 \break < d'1 f' a'> } \paper {\translator { \StaffContext -\consists Custos_engraver; +\consists Custos_engraver }} } diff --git a/input/test/default-neutral-dir.ly b/input/test/default-neutral-dir.ly index 5aeb134b12..2bbfff601a 100644 --- a/input/test/default-neutral-dir.ly +++ b/input/test/default-neutral-dir.ly @@ -1,10 +1,11 @@ +\version "1.3.146" \header { texidoc = " The direction of a perfectly centred beams can be controlled through @code{Voice.Beam}'s grob-property @code{default-neutral-direction} -";} +"} -\paper { linewidth = -1.;} +\paper { linewidth = -1.} \score {\notes \relative c { [b''8 b] \property Voice.Beam \set #'default-neutral-direction = #-1 diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly index 9bbc4502f5..b3af46fc60 100644 --- a/input/test/defaultbars.ly +++ b/input/test/defaultbars.ly @@ -1,3 +1,4 @@ +\version "1.3.146" diff --git a/input/test/different-time-signatures.ly b/input/test/different-time-signatures.ly index b4a04ae5e2..f665ead287 100644 --- a/input/test/different-time-signatures.ly +++ b/input/test/different-time-signatures.ly @@ -1,3 +1,4 @@ +\version "1.3.146" % barline spacing disrupts visual rhythm. @@ -22,15 +23,15 @@ > \paper{ - linewidth = -1.0\cm; + linewidth = -1.0\cm \translator{ \ScoreContext BreakAlignment \override #'space-alist = #nbal - \remove Timing_engraver; + \remove Timing_engraver } \translator{ \StaffContext - \consists Timing_engraver; + \consists Timing_engraver } } } diff --git a/input/test/diverse-spacing.ly b/input/test/diverse-spacing.ly index eaed7652f6..070d7aa243 100644 --- a/input/test/diverse-spacing.ly +++ b/input/test/diverse-spacing.ly @@ -1,8 +1,9 @@ +\version "1.3.146" % a few 32nds shouldn't stretch spacing enormously. \score { -\notes { \time 3/4; +\notes { \time 3/4 \relative c'{ g'8. c16 es8. d16 c8. bes32 as g8. c,16 es4 r8 es | @@ -11,5 +12,5 @@ } } -\paper { linewidth = -1.0; } +\paper { linewidth = -1.0 } } diff --git a/input/test/drarn-slurs.ly b/input/test/drarn-slurs.ly index 663856a909..2dfb0c732d 100644 --- a/input/test/drarn-slurs.ly +++ b/input/test/drarn-slurs.ly @@ -1,8 +1,9 @@ +\version "1.3.146" \header{ texidoc=" Slurs can be forced to always attach to note heads. -"; +" } fragment = \notes { @@ -11,7 +12,7 @@ fragment = \notes { g''16()g()g()g()d'()d()d()d } -\paper { linewidth = -1.; } +\paper { linewidth = -1. } \score { \notes\relative c \fragment diff --git a/input/test/drarn.ly b/input/test/drarn.ly index 8d16f8b420..f6ac17c183 100644 --- a/input/test/drarn.ly +++ b/input/test/drarn.ly @@ -1,7 +1,8 @@ +\version "1.3.146" \score { \context Staff \notes < - \time 3/8; + \time 3/8 \context Voice=one \relative c'' { \property Voice.Stem \set #'direction = #1 \property Voice.Tie \set #'direction = #1 @@ -17,5 +18,5 @@ a8()a~a } > - \paper { linewidth = 40*\staffspace; } + \paper { linewidth = 40*\staffspace } } diff --git a/input/test/drums.ly b/input/test/drums.ly index ae4ac81487..4285d18bfb 100644 --- a/input/test/drums.ly +++ b/input/test/drums.ly @@ -2,9 +2,9 @@ % see ly/drumpitch.ly for list of instruments and paper-kits. % scm/midi.scm for list of midi-drumkits. -\include "drumpitch.ly"; +\include "drumpitch.ly" -\version "1.3.142" +\version "1.3.146" drh = \notes { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 } drl = \notes {\repeat "unfold" 3 {bd4 sn8 bd bd4 <bd ss>} bd8 tommh tommh bd toml toml bd tomfh16 tomfh } @@ -14,12 +14,12 @@ timb = \notes \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 < \context TwoLineStaff=timbst \notes < \property Staff.instrument="timbales" - \clef "percussion"; + \clef "percussion" \apply #(drums->paper 'timbales) \timb > \context Staff=drumst \notes < \property Staff.instrument="drums" - \clef "percussion"; + \clef "percussion" \apply #(drums->paper 'drums) < \context Voice=voa {\stemUp \drh } \context Voice=vob {\stemDown \drl } @@ -29,20 +29,20 @@ timb = \notes \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 \paper { \translator { \StaffContext - \consists Instrument_name_engraver; + \consists Instrument_name_engraver Script \override #'padding = #0.5 } \translator { \StaffContext - \name TwoLineStaff; - \alias Staff; - \consists Instrument_name_engraver; - StaffSymbol \override #'line-count = #2; - BarLine \override #'bar-size = #2; + \name TwoLineStaff + \alias Staff + \consists Instrument_name_engraver + StaffSymbol \override #'line-count = #2 + BarLine \override #'bar-size = #2 } \translator { \ScoreContext - \accepts TwoLineStaff; + \accepts TwoLineStaff } } } @@ -54,6 +54,6 @@ timb = \notes \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 \drh \drl > - \midi{ \tempo 4=120; } + \midi{ \tempo 4=120 } } diff --git a/input/test/dynamic-dir.ly b/input/test/dynamic-dir.ly index 8134fb9cbe..c637cb2253 100644 --- a/input/test/dynamic-dir.ly +++ b/input/test/dynamic-dir.ly @@ -1,3 +1,4 @@ +\version "1.3.146" %non of the dynamics properties work anymore diff --git a/input/test/embedded-postscript.ly b/input/test/embedded-postscript.ly index 557c9ba403..fdc58b04c2 100644 --- a/input/test/embedded-postscript.ly +++ b/input/test/embedded-postscript.ly @@ -1,9 +1,10 @@ +\version "1.3.146" \header { texidoc = "By inserting the @TeX{} command \embeddedps, you can insert postscript directly into the output. TODO: make molecule-callback to do this. - "; + " } \score { @@ -14,5 +15,5 @@ TODO: make molecule-callback to do this. s2 a'1 } - \paper { linewidth = 70 * \staffspace; } + \paper { linewidth = 70 * \staffspace } } diff --git a/input/test/embedded-scm.ly b/input/test/embedded-scm.ly index 977b3adfce..58b327d7fc 100644 --- a/input/test/embedded-scm.ly +++ b/input/test/embedded-scm.ly @@ -1,3 +1,4 @@ +\version "1.3.146" #(begin (newline)(display "hello world")(newline))\score{ \notes\relative c'{ c } diff --git a/input/test/embedded-tex.ly b/input/test/embedded-tex.ly index 8a6e0465b6..6acd414dc1 100644 --- a/input/test/embedded-tex.ly +++ b/input/test/embedded-tex.ly @@ -1,10 +1,11 @@ +\version "1.3.146" fragment = \notes { a''^"3 $\\times$ \\`a deux" } -\paper { linewidth = -1.; } +\paper { linewidth = -1. } \score { \notes\relative c \fragment diff --git a/input/test/equaliser.ly b/input/test/equaliser.ly index 68533109b8..6e7657fcba 100644 --- a/input/test/equaliser.ly +++ b/input/test/equaliser.ly @@ -1,3 +1,4 @@ +\version "1.3.146" % % TODO: junkme. % @@ -109,7 +110,7 @@ violoncello = \notes \relative c' { \context StaffGroup ="timpani" < \context Staff ="timpani" \timpani { - \skip 1; + \skip 1 % Hmm: this forces a staff-bracket, that's good! % However, I can't find where is decided on staff-bracket yes/no } @@ -124,24 +125,24 @@ violoncello = \notes \relative c' { > > \header{ - title = "Coriolan"; - subtitle = "Ouverture"; - opus = "Opus 62"; - composer = "Ludwig van Beethoven (1770-1827)"; - enteredby = "JCN"; - copyright = "public domain"; + title = "Coriolan" + subtitle = "Ouverture" + opus = "Opus 62" + composer = "Ludwig van Beethoven (1770-1827)" + enteredby = "JCN" + copyright = "public domain" } \paper { \paperSixteen - indent=100.0\mm; - linewidth=150.0\mm; + indent=100.0\mm + linewidth=150.0\mm \translator { \HaraKiriStaffContext } } \midi { - \tempo 1 = 60; + \tempo 1 = 60 } } diff --git a/input/test/explicit.ly b/input/test/explicit.ly index 7757a93caa..4b42442650 100644 --- a/input/test/explicit.ly +++ b/input/test/explicit.ly @@ -1,6 +1,7 @@ +\version "1.3.146" \header{ -texidoc="Explicit pitches and durations."; +texidoc="Explicit pitches and durations." } \score { \notes { diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index 83d986483c..be86a4b121 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -1,3 +1,4 @@ +\version "1.3.146" %{ (Message vers:9) To: Adrian Mariano <adrian@cam.cornell.edu> @@ -33,7 +34,7 @@ extra-staff.ly: } > \paper { - linewidth = -1.; + linewidth = -1. \translator{ \ScoreContext diff --git a/input/test/fake-grace.ly b/input/test/fake-grace.ly index cebfdf4fb2..de17c2aae1 100644 --- a/input/test/fake-grace.ly +++ b/input/test/fake-grace.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { % to see the magic: uncomment size stuff in init/paper20.ly diff --git a/input/test/figured-bass.ly b/input/test/figured-bass.ly index 0f6368114d..c087742691 100644 --- a/input/test/figured-bass.ly +++ b/input/test/figured-bass.ly @@ -1,3 +1,4 @@ +\version "1.3.146" % Example of figured bass, using text scripts. % (An alternative is to use a lyrics line if you want the figures % aligned vertically.) @@ -14,7 +15,7 @@ \score{ \notes \relative c'{ - \clef bass; + \clef bass c^"5" d^#natural g,^"7 6" [a8 e] | fis4^"7 6" [g8 d] e4^"7 6" [f?8 c] | diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly index 1d949a5146..f76f824279 100644 --- a/input/test/fill-a4.ly +++ b/input/test/fill-a4.ly @@ -1,3 +1,4 @@ +\version "1.3.146" % % test file to get a4 paper really filled, @@ -9,17 +10,17 @@ % at a reasonably (small) value. -- jcn % \header{ -tagline="Ligly"; +tagline="Ligly" } -\include "paper13.ly"; +\include "paper13.ly" \score{ \context Voice \notes\relative c'{ - \clef alto; + \clef alto \repeat "unfold" 36 c1 } \paper{ \paperThirteen - indent = 0.0\mm; + indent = 0.0\mm % URG % Vertical space is rather precious when typesetting % music. But we can only set textheight here, and must @@ -27,9 +28,9 @@ tagline="Ligly"; % footers. If we want a header or footer on some page, % all other pages suffer shortened `textheight'. % Try the maximum for a4, without loosing footers: - textheight = 297.0\mm - 7.0\mm; - papersize = "a4"; - linewidth = 15.0\mm; + textheight = 297.0\mm - 7.0\mm + papersize = "a4" + linewidth = 15.0\mm \translator { \StaffContext MinimumVerticalExtent = #(cons 0 0) diff --git a/input/test/fingering.ly b/input/test/fingering.ly index 38095ef78b..eb238d59a0 100644 --- a/input/test/fingering.ly +++ b/input/test/fingering.ly @@ -1,3 +1,4 @@ +\version "1.3.146" @@ -5,4 +6,4 @@ \notes \context Voice = VA \relative c'' { \grace {[b8^1 c^2]} d4^3 } -\paper {linewidth = -1. ; }} +\paper {linewidth = -1. }} diff --git a/input/test/follow-thread.ly b/input/test/follow-thread.ly index 2771cb871b..aa9de31a8c 100644 --- a/input/test/follow-thread.ly +++ b/input/test/follow-thread.ly @@ -3,10 +3,10 @@ texidoc=" Theads can be traced automagically when they switch staffs by setting property @code{followVoice}. -"; +" } -\version "1.3.139" +\version "1.3.146" % followVoice: connect note heads with line when thread switches staff fragment = \notes { @@ -18,11 +18,11 @@ fragment = \notes { \translator Staff=two b2 a } - \context Staff=two {\clef bass; \skip 1*2;} + \context Staff=two {\clef bass \skip 1*2} > } -\paper { linewidth = -1.; } +\paper { linewidth = -1. } \score { \notes\relative c \fragment diff --git a/input/test/font-body.ly b/input/test/font-body.ly index 157531acba..2907ad66b9 100644 --- a/input/test/font-body.ly +++ b/input/test/font-body.ly @@ -1,17 +1,18 @@ +\version "1.3.146" % body for the font test. Does not work standalone FontBody= \notes\transpose c''{ - \bar "|:"; - \time 4/4; + \bar "|:" + \time 4/4 \context Staff < \context Voice = VB { \stemUp e'\longa a\breve | } \context Voice = VA { \stemDown - c1 \clef "bass"; b,, \clef "violin"; c' a' - c2 \clef "alto"; g c' \clef "violin"; a' + c1 \clef "bass" b,, \clef "violin" c' a' + c2 \clef "alto" g c' \clef "violin" a' } > \stemBoth - c4 g c' a' \bar ":|"; + c4 g c' a' \bar ":|" a\ppp-\upbow a\pp-\downbow a\p^\turn a\mp^\fermata | a\mf_\fermata a\f-\stopped a\ff-\open a\fff^\trill| a\fp-\reverseturn a4.\sf a4.\sfz | a4\fz % a\rf @@ -19,13 +20,13 @@ FontBody= \notes\transpose c''{ [c8-\upprall a'8-\downprall] [a'-\segno c-\coda] | [c \< d e f] [as' ges' f' e'] [cis' dis' c' des'] [cisis' disis' \! ceses' deses'] | - \clef "bass"; + \clef "bass" r\longa * 1/4 r\breve *1/2 r1 r2 r4 r8 r16 r32 r64 r128 r128 | \context Staff < \context Voice = VA { \stemUp r2 c'2 c,,,1 } \context Voice = VB {\stemDown r2 c2 r1 }> \stemBoth - \clef "violin"; + \clef "violin" e8_. g'8-> e16^^ g'16_^ e32 _| g'32^| g''32-\ltoe g''32-\lheel e64-\rtoe g'64-\rheel c4... | @@ -38,7 +39,7 @@ c\longa*1/4 c\breve*1/2 c1 c2 c4 c8 \property Voice . noteHeadStyle = #'harmonic \transpose c'{ - \time 4/4; + \time 4/4 \property Voice . TextScript \override #'font-style = #'Finger \property Voice . noteHeadStyle = #'diamond c1^"1" d2^"2" e4^"3" @@ -52,17 +53,17 @@ c\longa*1/4 c\breve*1/2 c1 c2 c4 c8 a'^\flageolet \property Voice . TextScript \override #'font-style = #'roman - \time 1/2; a2 | - \time 3/2; < a1. + \time 1/2 a2 | + \time 3/2 < a1. { s4 \ppp \< s4 \! s4 \fff s4 \> s4 \! s4\ppp} > | - \time 2/4; a2 | - \time 5/4; a1.. | - \time 6/8; a2. | - \time 7/8; a2.. | - \time 9/8; a1... | - \time 12/8; a1. | - \time 12/4; + \time 2/4 a2 | + \time 5/4 a1.. | + \time 6/8 a2. | + \time 7/8 a2.. | + \time 9/8 a1... | + \time 12/8 a1. | + \time 12/4 r1. r2. r4. r8. r16. r32. r64. r64. | c2\sustainDown c\sustainUp | } diff --git a/input/test/font11.ly b/input/test/font11.ly index c978c0aa99..46a9b27ba3 100644 --- a/input/test/font11.ly +++ b/input/test/font11.ly @@ -1,12 +1,13 @@ +\version "1.3.146" \header{ -title= "The Feta Font"; -subtitle = "proofsheet"; -enteredby = "jcn & hwn"; -copyright = "public domain"; -description = "This file tests the Feta music font, 11pt"; -% "(Feta definitively is not an abbreviation of Font-En-TjA)"; +title= "The Feta Font" +subtitle = "proofsheet" +enteredby = "jcn & hwn" +copyright = "public domain" +description = "This file tests the Feta music font, 11pt" +% "(Feta definitively is not an abbreviation of Font-En-TjA)" } @@ -16,7 +17,7 @@ description = "This file tests the Feta music font, 11pt"; \FontBody \paper{ \paperEleven - linewidth = 17.5 \cm; + linewidth = 17.5 \cm } } diff --git a/input/test/font13.ly b/input/test/font13.ly index 47e38188f7..a01a0a959e 100644 --- a/input/test/font13.ly +++ b/input/test/font13.ly @@ -1,16 +1,17 @@ +\version "1.3.146" \header{ -title= "The Feta Font"; -subtitle = "proofsheet"; -enteredby = "jcn & hwn"; -copyright = "public domain"; -description = "This file tests the Feta music font, 11pt"; -% "(Feta definitively is not an abbreviation of Font-En-TjA)"; +title= "The Feta Font" +subtitle = "proofsheet" +enteredby = "jcn & hwn" +copyright = "public domain" +description = "This file tests the Feta music font, 11pt" +% "(Feta definitively is not an abbreviation of Font-En-TjA)" } \include "paper13.ly" \paper{ -linewidth = 17.5 \cm; +linewidth = 17.5 \cm } \include "font-body.ly" diff --git a/input/test/font16.ly b/input/test/font16.ly index 9ef98f46e4..cf204945e0 100644 --- a/input/test/font16.ly +++ b/input/test/font16.ly @@ -1,10 +1,11 @@ +\version "1.3.146" \header{ -title= "The Feta Font"; -subtitle = "proofsheet"; -enteredby = "jcn & hwn"; -copyright = "public domain"; -description = "This file tests the Feta music font"; -% "(Feta definitively is not an abbreviation of Font-En-TjA)"; +title= "The Feta Font" +subtitle = "proofsheet" +enteredby = "jcn & hwn" +copyright = "public domain" +description = "This file tests the Feta music font" +% "(Feta definitively is not an abbreviation of Font-En-TjA)" } @@ -13,6 +14,6 @@ description = "This file tests the Feta music font"; % don't change this. % otherwise 16pt and 20pt layouts differ. - linewidth = 12.5 \cm;} + linewidth = 12.5 \cm} \include "font-body.ly" diff --git a/input/test/font20.ly b/input/test/font20.ly index 7ee14b33d4..f3a46a2aae 100644 --- a/input/test/font20.ly +++ b/input/test/font20.ly @@ -1,15 +1,16 @@ +\version "1.3.146" \header{ -title= "The Feta font"; -subtitle = "proofsheet"; -enteredby = "jcn"; -copyright = "public domain"; -description = "This file tests the Feta music-font in the 20pt version"; +title= "The Feta font" +subtitle = "proofsheet" +enteredby = "jcn" +copyright = "public domain" +description = "This file tests the Feta music-font in the 20pt version" TestedFeatures = - "(Feta definitively is not an abbreviation of Font-En-TjA)"; + "(Feta definitively is not an abbreviation of Font-En-TjA)" } \paper{ - linewidth = 17.5 \cm; + linewidth = 17.5 \cm } \include "font-body.ly" diff --git a/input/test/font26.ly b/input/test/font26.ly index 69aaede984..783cd2cdad 100644 --- a/input/test/font26.ly +++ b/input/test/font26.ly @@ -1,17 +1,18 @@ +\version "1.3.146" \header{ -title= "The Feta Font"; -subtitle = "proofsheet"; -enteredby = "jcn & hwn"; -copyright = "public domain"; -description = "This file tests the Feta music font"; -% "(Feta definitively is not an abbreviation of Font-En-TjA)"; +title= "The Feta Font" +subtitle = "proofsheet" +enteredby = "jcn & hwn" +copyright = "public domain" +description = "This file tests the Feta music font" +% "(Feta definitively is not an abbreviation of Font-En-TjA)" } \include "paper26.ly" \paper{ - linewidth = 17.5 \cm; + linewidth = 17.5 \cm } diff --git a/input/test/force-hshift.ly b/input/test/force-hshift.ly index a70006b152..8557c48cb5 100644 --- a/input/test/force-hshift.ly +++ b/input/test/force-hshift.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { @@ -18,7 +19,7 @@ > } \paper { - linewidth=-1.0; + linewidth=-1.0 } \midi { } } diff --git a/input/test/gmsusd.ly b/input/test/gmsusd.ly index 06d5039630..a556c11de7 100644 --- a/input/test/gmsusd.ly +++ b/input/test/gmsusd.ly @@ -1,3 +1,4 @@ +\version "1.3.146" % the Gm7sus4/D chord prints as Gm/4/7/D % it took me quite a while by experiment to work out how to enter it -- PC diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index bee50d8103..432a551158 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -1,3 +1,4 @@ +\version "1.3.146" %{ @@ -12,7 +13,7 @@ This is taken from [Gourlay]'s paper on breaking lines \context Voice = VB { \stemDown g4 g g g | \times 2/3 { g2 g2 g2 } | g4. g8 g2 | c1 } > \paper{ - linewidth = 9.\cm; + linewidth = 9.\cm } } diff --git a/input/test/grace-end.ly b/input/test/grace-end.ly index 969e9cfbb6..8b138df062 100644 --- a/input/test/grace-end.ly +++ b/input/test/grace-end.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly index e14a6e3897..f687c765e2 100644 --- a/input/test/hara-kiri-switch.ly +++ b/input/test/hara-kiri-switch.ly @@ -1,3 +1,4 @@ +\version "1.3.146" voiceOne = \notes \relative c'' { @@ -41,11 +42,11 @@ grandstaff = \context GrandStaff = one < \score{ \grandstaff \paper{ - linewidth=80.0\mm; + linewidth=80.0\mm - \translator { \VoiceContext noAutoBeaming = ##t; } + \translator { \VoiceContext noAutoBeaming = ##t } \translator { \HaraKiriStaffContext } - \translator { \OrchestralScoreContext skipBars = 1; } + \translator { \OrchestralScoreContext skipBars = 1 } } } diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index 5799357740..978c98ff00 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -1,6 +1,7 @@ +\version "1.3.146" \header { -texidoc = "Hara kiri staffs disappear when empty "; +texidoc = "Hara kiri staffs disappear when empty " } @@ -40,7 +41,7 @@ toeters = \context Staff = toeters < > zager = \context Staff = zager \notes \relative c'' { - \clef treble; + \clef treble \property Staff.instrument = #"Zager" \property Staff.instr = #"Zag." c4^"zag" d e f @@ -55,18 +56,18 @@ zager = \context Staff = zager \notes \relative c'' { } zoger = \context Staff = zoger \notes \relative c'' { - \clef treble; + \clef treble \property Staff.instrument = #"Zoger" \property Staff.instr = #"Zog." c4^"zog" d e f - \skip 1*2; + \skip 1*2 \translator Staff=zager \stemDown c2 g2 a4 b c d - \skip 1*1; + \skip 1*1 } zagers = \context GrandStaff < @@ -84,7 +85,7 @@ zagers = \context GrandStaff < > > \paper{ - linewidth = 80.0\mm; + linewidth = 80.0\mm \translator { \HaraKiriStaffContext } %uh? \translator { \OrchestralScoreContext } diff --git a/input/test/hshift.ly b/input/test/hshift.ly index 74b47f5439..8bbc1298e4 100644 --- a/input/test/hshift.ly +++ b/input/test/hshift.ly @@ -1,3 +1,4 @@ +\version "1.3.146" diff --git a/input/test/hymn.ly b/input/test/hymn.ly index 5cd0c36757..7b5cd4c216 100644 --- a/input/test/hymn.ly +++ b/input/test/hymn.ly @@ -1,7 +1,8 @@ +\version "1.3.146" \score{ \context Staff < - \time 4/4; + \time 4/4 \context Voice=one \partcombine Voice \context Thread=one \notes\relative c'' { a4 c4.()g8 a4 | @@ -15,7 +16,7 @@ } > \paper{ - linewidth=140.\mm; + linewidth=140.\mm \translator { \VoiceContext soloADue = ##f diff --git a/input/test/improv.ly b/input/test/improv.ly index ff350187ec..a09105069f 100644 --- a/input/test/improv.ly +++ b/input/test/improv.ly @@ -1,8 +1,9 @@ +\version "1.3.146" improOn = \notes {\translator Voice = impro } improOff = \notes {\translator SquashVoice = melo } -global = \notes { s1*3 \bar "|."; } +global = \notes { s1*3 \bar "|." } \score { < @@ -19,28 +20,28 @@ global = \notes { s1*3 \bar "|."; } \paper { \translator { \VoiceContext - \name SquashVoice; - \alias Voice; - \consists Pitch_squash_engraver; - \consists Local_key_engraver; - squashedPosition = 6; + \name SquashVoice + \alias Voice + \consists Pitch_squash_engraver + \consists Local_key_engraver + squashedPosition = 6 NoteHead \override #'style = #'slash Accidentals \override #'transparent = ##t } \translator { \VoiceContext - \alias SquashVoice; - \consists Local_key_engraver; + \alias SquashVoice + \consists Local_key_engraver } \translator { \ScoreContext - \accepts SquashVoice; + \accepts SquashVoice } \translator { \StaffContext - \remove Local_key_engraver; - \accepts SquashVoice; + \remove Local_key_engraver + \accepts SquashVoice } - linewidth = -1; + linewidth = -1 } } diff --git a/input/test/incipit.ly b/input/test/incipit.ly index 61edcd7bfb..08193f588f 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -1,3 +1,4 @@ +\version "1.3.146" %{ Test of how to make an ``incipit'' to indicate scordatora tuning of a violin part, using the clefStyle property. @@ -9,8 +10,8 @@ violinincipit = \notes\relative c''{ - \clef "french"; - \time 2/2; + \clef "french" + \time 2/2 \property Staff.TimeSignature \override #'style = #'old a4. b8 c4 fis | % <b1 fis' b d> @@ -18,7 +19,7 @@ violinincipit = \notes\relative c''{ } bcincipit = \notes\relative c{ - \clef bass; + \clef bass \property Staff.TimeSignature \override #'style = #'old b2. cis4 | \property Staff.TimeSignature \override #'style = #'C @@ -27,21 +28,21 @@ bcincipit = \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''; - \key d \major; - \time 2/2; - \clef treble; +% \specialkey \keysignature f' fis'' g' gis'' + \key d \major + \time 2/2 + \clef treble a4. b8 c4 fis | gis~ gis8 fis16^\trill ()e b8 c \context Staff<{\voiceOne a d}{\voiceTwo es,4}>| } BC = \notes\relative c{ - \key d \major; - \time 2/2; - \clef "bass"; + \key d \major + \time 2/2 + \clef "bass" - \key; + \key \default b2. cis4 | d e fis g | } @@ -50,14 +51,14 @@ BC = \notes\relative c{ < \context Staff = violin {\notes{ \property Staff.Clef \override #'transparent = ##t - \violinincipit \bar ".|"; + \violinincipit \bar ".|" \property Staff.Clef \revert #'transparent \endincipit \violin }} \context Staff = BC{\notes{ \property Staff.Clef \override #'transparent = ##t - \bcincipit \bar ".|"; + \bcincipit \bar ".|" \property Staff.Clef \revert #'transparent \endincipit \BC diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly index b93302b285..3f7fce957f 100644 --- a/input/test/instrument-name-grandstaff.ly +++ b/input/test/instrument-name-grandstaff.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { @@ -10,9 +11,9 @@ \paper { -linewidth=-1.0; +linewidth=-1.0 \translator { \StaffContext - \consists "Instrument_name_engraver"; + \consists "Instrument_name_engraver" } -\translator { \GrandStaffContext \consists "Instrument_name_engraver"; } +\translator { \GrandStaffContext \consists "Instrument_name_engraver" } }} diff --git a/input/test/instrument-name-mmrest.ly b/input/test/instrument-name-mmrest.ly index 4cea19a177..a1c838c488 100644 --- a/input/test/instrument-name-mmrest.ly +++ b/input/test/instrument-name-mmrest.ly @@ -1,3 +1,4 @@ +\version "1.3.146" %{ @@ -15,7 +16,7 @@ interesting bug in 1.3.98) > \paper { \translator { \StaffContext - \consists Instrument_name_engraver; + \consists Instrument_name_engraver } } diff --git a/input/test/instrument-name.ly b/input/test/instrument-name.ly index 35a363d705..cd648112a0 100644 --- a/input/test/instrument-name.ly +++ b/input/test/instrument-name.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { @@ -6,7 +7,7 @@ \property Staff.instrument = "instr " { c''4 }} \paper { -linewidth=-1.0; -\translator { \StaffContext \consists "Instrument_name_engraver"; } +linewidth=-1.0 +\translator { \StaffContext \consists "Instrument_name_engraver" } }} diff --git a/input/test/jazz-chords.ly b/input/test/jazz-chords.ly index 9ff4455d7f..f43805c9a3 100644 --- a/input/test/jazz-chords.ly +++ b/input/test/jazz-chords.ly @@ -1,3 +1,4 @@ +\version "1.3.146" diff --git a/input/test/key-clefs.ly b/input/test/key-clefs.ly index fc216de533..ce7489c1e0 100644 --- a/input/test/key-clefs.ly +++ b/input/test/key-clefs.ly @@ -1,24 +1,25 @@ +\version "1.3.146" \include "paper16.ly" \score { \notes \relative cis' { -% \clef french; % same as octaviated bass -\clef violin; -\key cis \major; cis1 \key ces \major; ces -\clef soprano; -\key cis \major; cis \key ces \major; ces -\clef mezzosoprano; -\key cis \major; cis \key ces \major; ces -\clef alto; -\key cis \major; cis \key ces \major; ces -\clef tenor; -\key cis \major; cis \key ces \major; ces -\clef baritone; -\key cis \major; cis \key ces \major; ces -\clef bass; -\key cis \major; cis \key ces \major; ces +% \clef french % same as octaviated bass +\clef violin +\key cis \major cis1 \key ces \major ces +\clef soprano +\key cis \major cis \key ces \major ces +\clef mezzosoprano +\key cis \major cis \key ces \major ces +\clef alto +\key cis \major cis \key ces \major ces +\clef tenor +\key cis \major cis \key ces \major ces +\clef baritone +\key cis \major cis \key ces \major ces +\clef bass +\key cis \major cis \key ces \major ces } \paper{\paperSixteen} diff --git a/input/test/keys2.ly b/input/test/keys2.ly index b28b04f643..b25cb5f625 100644 --- a/input/test/keys2.ly +++ b/input/test/keys2.ly @@ -1,3 +1,4 @@ +\version "1.3.146" diff --git a/input/test/knee-mult.ly b/input/test/knee-mult.ly index 8c3c320b3a..ed2c402a4a 100644 --- a/input/test/knee-mult.ly +++ b/input/test/knee-mult.ly @@ -1,10 +1,11 @@ +\version "1.3.146" \score{ \context PianoStaff < \context Staff=one \notes\relative c'{ s1 } \context Staff=two \notes\relative c'{ - \clef bass; + \clef bass % no knee \stemUp [c8 \translator Staff=one \stemDown g'16 f] s8 @@ -12,7 +13,7 @@ } > \paper{ - linewidth=-1.; + linewidth=-1. } } diff --git a/input/test/knee.ly b/input/test/knee.ly index 453f005050..8ab530b85d 100644 --- a/input/test/knee.ly +++ b/input/test/knee.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ \notes\relative c'{ diff --git a/input/test/lines.ly b/input/test/lines.ly index 31bead8aed..c621dfbf4e 100644 --- a/input/test/lines.ly +++ b/input/test/lines.ly @@ -1,8 +1,9 @@ +\version "1.3.146" \header { texidoc=" Draw abritrary lines. This brings LilyPond on par with Mup. -"; +" } \score { @@ -17,6 +18,6 @@ Draw abritrary lines. This brings LilyPond on par with Mup. a'1 } \paper { - linewidth = 70.0*\staffspace; + linewidth = 70.0*\staffspace } } diff --git a/input/test/ly2dvi-testpage.ly b/input/test/ly2dvi-testpage.ly index 5efd3b6371..51ae62aa99 100644 --- a/input/test/ly2dvi-testpage.ly +++ b/input/test/ly2dvi-testpage.ly @@ -1,3 +1,4 @@ +\version "1.3.146" %{ @@ -5,16 +6,16 @@ %} \header { -copyright = "copyright"; -title = "title"; -subtitle = "subtitle"; -composer = "composer"; -arranger = "arranger"; -instrument = "instrument"; -metre = "metre"; -opus = "opus"; -piece = "piece"; -poet = "poet"; +copyright = "copyright" +title = "title" +subtitle = "subtitle" +composer = "composer" +arranger = "arranger" +instrument = "instrument" +metre = "metre" +opus = "opus" +piece = "piece" +poet = "poet" } @@ -27,15 +28,15 @@ poet = "poet"; \header { - title = "localtitle"; - subtitle = "localsubtitle"; - composer = "localcomposer"; - arranger = "localarranger"; - instrument = "localinstrument"; - metre = "localmetre"; - opus = "localopus"; - piece = "localpiece"; - poet = "localpoet"; - copyright = "localcopyright"; + title = "localtitle" + subtitle = "localsubtitle" + composer = "localcomposer" + arranger = "localarranger" + instrument = "localinstrument" + metre = "localmetre" + opus = "localopus" + piece = "localpiece" + poet = "localpoet" + copyright = "localcopyright" } } diff --git a/input/test/lyric-extender.ly b/input/test/lyric-extender.ly index 64cfcb97aa..0048f45278 100644 --- a/input/test/lyric-extender.ly +++ b/input/test/lyric-extender.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ < \context Staff \notes { c () c () c c } diff --git a/input/test/lyric-hyphen.ly b/input/test/lyric-hyphen.ly index 91132c11f7..569786f707 100644 --- a/input/test/lyric-hyphen.ly +++ b/input/test/lyric-hyphen.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ < \context Staff \notes { c' () c' () c' c' } diff --git a/input/test/lyric-phrasing.ly b/input/test/lyric-phrasing.ly index a9dbba6b41..4a54d5dfc6 100644 --- a/input/test/lyric-phrasing.ly +++ b/input/test/lyric-phrasing.ly @@ -1,10 +1,11 @@ +\version "1.3.146" \header{ -filename = "twinkle-pop.ly"; -xtitle = "Ah, vous dirais-je, maman "; -description = "twinkle twinkle in pop-song-settings"; -composer = "traditional"; -enteredby = "HWN, chords by Johan Vromans"; -copyright = "public domain"; +filename = "twinkle-pop.ly" +xtitle = "Ah, vous dirais-je, maman " +description = "twinkle twinkle in pop-song-settings" +composer = "traditional" +enteredby = "HWN, chords by Johan Vromans" +copyright = "public domain" } @@ -19,8 +20,8 @@ m = \notes \relative c'' { b c d e } textI = \lyrics { la4 __ la -- la I, la dargh la dargh. } -textII = \lyrics { dar -- dargh __ dargh dargh; dargh la dargh loo. } -textIII = \lyrics { la -- da __ doo dah; dargh la dargh loo. } +textII = \lyrics { dar -- dargh __ dargh dargh dargh la dargh loo. } +textIII = \lyrics { la -- da __ doo dah dargh la dargh loo. } \score { diff --git a/input/test/lyrics.ly b/input/test/lyrics.ly index e19086252c..0129a9411e 100644 --- a/input/test/lyrics.ly +++ b/input/test/lyrics.ly @@ -1,3 +1,4 @@ +\version "1.3.146" somewhatLong = \lyrics{ diff --git a/input/test/manual-clef.ly b/input/test/manual-clef.ly index 994937d6ec..e98494de37 100644 --- a/input/test/manual-clef.ly +++ b/input/test/manual-clef.ly @@ -1,3 +1,4 @@ +\version "1.3.146" %{ @@ -20,7 +21,7 @@ Test clef engraver by setting \property directly. \clef is merely a front-end t \property Staff.clefOctavation = #0 \property Staff.clefPosition = #0 c'4 - \clef "bla"; + \clef "bla" c'4 }} diff --git a/input/test/manual-volta.ly b/input/test/manual-volta.ly index a00d2e2fcf..ecb3ad4186 100644 --- a/input/test/manual-volta.ly +++ b/input/test/manual-volta.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \notes { diff --git a/input/test/mark.ly b/input/test/mark.ly index 27093fb019..b8fc906198 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -1,13 +1,14 @@ +\version "1.3.146" global = \notes { - s1 | \mark "A"; - s1 | \mark ; - s1 | \mark ; - s1 | \mark "12"; - s1 | \mark ; - s1 | \mark "A2"; - s1 | \mark #'(music "scripts-segno") ; + s1 | \mark "A" + s1 | \mark \default + s1 | \mark \default + s1 | \mark "12" + s1 | \mark \default + s1 | \mark "A2" + s1 | \mark #'(music "scripts-segno") s1 } diff --git a/input/test/markup.ly b/input/test/markup.ly index b1436200d8..ab20df7781 100644 --- a/input/test/markup.ly +++ b/input/test/markup.ly @@ -1,3 +1,4 @@ +\version "1.3.146" @@ -27,7 +28,7 @@ e-#'(((baselineskip . 0) (kern . 1.5) lines) "Violoncello" " e" "Contrabasso") } \paper{ - linewidth = -1.\mm; + linewidth = -1.\mm \translator{ \ScoreContext TextScript \override #'font-family = #'roman diff --git a/input/test/maximum-rest-count.ly b/input/test/maximum-rest-count.ly index 0a2b392414..691fa25c09 100644 --- a/input/test/maximum-rest-count.ly +++ b/input/test/maximum-rest-count.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ \context Staff \notes\relative c''< @@ -35,6 +36,6 @@ \paper{ } \midi{ -\tempo 1 = 60; +\tempo 1 = 60 } } diff --git a/input/test/memory.ly b/input/test/memory.ly index 3760d4364e..d288ae6233 100644 --- a/input/test/memory.ly +++ b/input/test/memory.ly @@ -1,3 +1,4 @@ +\version "1.3.146" %{ do a memory stress test. %} @@ -9,7 +10,7 @@ bla = \notes { \score { \context Score < \bla \bla \bla \bla \bla \bla \bla > - \paper { Gourlay_maxmeaures = 2.; } + \paper { Gourlay_maxmeaures = 2. } } diff --git a/input/test/metronome.ly b/input/test/metronome.ly index d712999f77..d20eb577c6 100644 --- a/input/test/metronome.ly +++ b/input/test/metronome.ly @@ -1,3 +1,4 @@ +\version "1.3.146" @@ -21,7 +22,7 @@ a1^#`((rows (font-relative-size . -1)) ,dotted-eight-note " = 64") } \paper { - linewidth = -1.; + linewidth = -1. \translator{ \ScoreContext TextScript \override #'font-shape = #'upright diff --git a/input/test/mmrest-collision.ly b/input/test/mmrest-collision.ly index 0fd96e72e8..395cafadd5 100644 --- a/input/test/mmrest-collision.ly +++ b/input/test/mmrest-collision.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \context Staff \notes < @@ -13,13 +14,13 @@ \paper { \translator { \StaffContext - \remove Multi_measure_rest_engraver; - \remove Bar_engraver; + \remove Multi_measure_rest_engraver + \remove Bar_engraver } \translator { \VoiceContext - \consists Multi_measure_rest_engraver; - \consists Bar_engraver; + \consists Multi_measure_rest_engraver + \consists Bar_engraver } } } diff --git a/input/test/monstrous.ly b/input/test/monstrous.ly index 1257d62b40..91cc1d90ad 100644 --- a/input/test/monstrous.ly +++ b/input/test/monstrous.ly @@ -1,3 +1,4 @@ +\version "1.3.146" %% Chord gurus, is this ok now?? @@ -18,6 +19,6 @@ monstrous= \chords{ \context Staff \monstrous > \paper{ - linelength=-1.0\mm; + linelength=-1.0\mm } } diff --git a/input/test/move-mark.ly b/input/test/move-mark.ly index 695be4a214..ca8ea2f3b9 100644 --- a/input/test/move-mark.ly +++ b/input/test/move-mark.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ \context Staff \notes\relative c''{ @@ -6,16 +7,16 @@ \outputproperty #(make-type-checker 'Mark) #'extra-offset = #'(-1 . 4) } - \mark A; + \mark A d - \mark ; + \mark \default e } \paper{ - linewidth=-1.0; + linewidth=-1.0 \translator { \ScoreContext - \consists "Mark_engraver"; + \consists "Mark_engraver" } } } diff --git a/input/test/move-notehead.ly b/input/test/move-notehead.ly index 87deb18689..74e5cfcdd2 100644 --- a/input/test/move-notehead.ly +++ b/input/test/move-notehead.ly @@ -1,3 +1,4 @@ +\version "1.3.146" fragment = \notes { @@ -6,7 +7,7 @@ fragment = \notes { c''2 c } -\paper { linewidth = -1.; } +\paper { linewidth = -1. } \score { \notes\relative c \fragment diff --git a/input/test/move-specific-text.ly b/input/test/move-specific-text.ly index 2fe4a71523..80b4256bb4 100644 --- a/input/test/move-specific-text.ly +++ b/input/test/move-specific-text.ly @@ -1,3 +1,4 @@ +\version "1.3.146" #(define (make-text-checker text) (lambda (grob) (equal? text (ly-get-grob-property grob 'text)))) @@ -9,5 +10,5 @@ #'extra-offset = #'(-3.5 . -4.5) a^2^"m.d." } - \paper { linewidth = -1.; } + \paper { linewidth = -1. } } diff --git a/input/test/multi-slope.ly b/input/test/multi-slope.ly index ab3dcecb73..d2bab8c80b 100644 --- a/input/test/multi-slope.ly +++ b/input/test/multi-slope.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { diff --git a/input/test/music-creation.ly b/input/test/music-creation.ly index cc58b96b82..51a8717aff 100644 --- a/input/test/music-creation.ly +++ b/input/test/music-creation.ly @@ -1,7 +1,8 @@ +\version "1.3.146" \header { texidoc = "You can create music expressions from Scheme. The - mechanism for this is rather clumsy to use, so avoid if possible."; + mechanism for this is rather clumsy to use, so avoid if possible." } diff --git a/input/test/nested-groups.ly b/input/test/nested-groups.ly index 07858bbbf5..69e289a477 100644 --- a/input/test/nested-groups.ly +++ b/input/test/nested-groups.ly @@ -1,15 +1,15 @@ \header{ texidoc=" In InnerStaffGroup and InnerChoirStaff, the brackets should be shiftet leftwards. -"; -filename = "nested-groups.ly"; -description = "Test of nested staff groups and choirstaffs"; -enteredby = "RZ"; -copyright = "public domain"; -Tested = "Nested StaffGroups"; +" +filename = "nested-groups.ly" +description = "Test of nested staff groups and choirstaffs" +enteredby = "RZ" +copyright = "public domain" +Tested = "Nested StaffGroups" } -\version "1.3.140" % rz1 +\version "1.3.146" % rz1 \score { \notes < @@ -42,5 +42,5 @@ Tested = "Nested StaffGroups"; > - \paper { linewidth = -1; } + \paper { linewidth = -1 } } diff --git a/input/test/no-bar-lines.ly b/input/test/no-bar-lines.ly index 1cd7f3cba5..a35f772700 100644 --- a/input/test/no-bar-lines.ly +++ b/input/test/no-bar-lines.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \notes \relative c'' { @@ -5,11 +6,11 @@ d c b a } \paper { - linewidth = -1.; + linewidth = -1. \translator { \StaffContext whichBar = #"" - \remove "Time_signature_engraver"; + \remove "Time_signature_engraver" } } } diff --git a/input/test/no-staff.ly b/input/test/no-staff.ly index 5385aa24d1..d6a0185b00 100644 --- a/input/test/no-staff.ly +++ b/input/test/no-staff.ly @@ -1,13 +1,14 @@ +\version "1.3.146" \score { \notes { c4 c4 c8 c8 } \paper { - linewidth = -1.; + linewidth = -1. \translator { \StaffContext - \remove Staff_symbol_engraver; - \consists Pitch_squash_engraver; - \remove Clef_engraver; + \remove Staff_symbol_engraver + \consists Pitch_squash_engraver + \remove Clef_engraver } } } diff --git a/input/test/no-stem-extend.ly b/input/test/no-stem-extend.ly index 36966f2d51..51fcba0af3 100644 --- a/input/test/no-stem-extend.ly +++ b/input/test/no-stem-extend.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { diff --git a/input/test/note-chords.ly b/input/test/note-chords.ly index 662c235ced..a19cff09dc 100644 --- a/input/test/note-chords.ly +++ b/input/test/note-chords.ly @@ -1,3 +1,4 @@ +\version "1.3.146" scheme = \notes { <c'1 e' g'> @@ -10,5 +11,5 @@ scheme = \notes { \context ChordNamesVoice \scheme \context Staff \scheme > - \paper { linewidth = -1.; } + \paper { linewidth = -1. } } diff --git a/input/test/note-shift.ly b/input/test/note-shift.ly index 49a0a04db1..a9b2fc9e8d 100644 --- a/input/test/note-shift.ly +++ b/input/test/note-shift.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { @@ -27,7 +28,7 @@ } \paper { - linewidth=-1.0; + linewidth=-1.0 } \midi { } } diff --git a/input/test/notemode-chords.ly b/input/test/notemode-chords.ly index 62136719ca..ee51bc2979 100644 --- a/input/test/notemode-chords.ly +++ b/input/test/notemode-chords.ly @@ -1,9 +1,10 @@ +\version "1.3.146" \score{ \notes \transpose c''{ % 1.1.53: @x@ syntax dropped -% if you want fingering, write chord explicitily; eg < c1-1 e-2 g-3 > +% if you want fingering, write chord explicitily eg < c1-1 e-2 g-3 > % @c1@ @c-7@ @c-7^5@-1-3 \chords { c1 c:7 c:7^5 } } diff --git a/input/test/orchestalpart.ly b/input/test/orchestalpart.ly index 139765cc7e..044d9f7072 100644 --- a/input/test/orchestalpart.ly +++ b/input/test/orchestalpart.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly index 5e372200ae..e4ce479f13 100644 --- a/input/test/orchestscore.ly +++ b/input/test/orchestscore.ly @@ -1,5 +1,6 @@ +\version "1.3.146" \header{ - latexpackages="graphicx"; + latexpackages="graphicx" } @@ -96,9 +97,9 @@ c1 | c2 c | c c | R1*5 > > \paper { -% \paperSixteen; - linewidth = 185.\mm; - textheight = 260.\mm; +% \paperSixteen + linewidth = 185.\mm + textheight = 260.\mm \translator { \OrchestralScoreContext skipBars = ##t diff --git a/input/test/ossia.ly b/input/test/ossia.ly index 2ce3d45a45..4ceec25d70 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,6 +1,7 @@ +\version "1.3.146" \score { -\notes { c1 c1 < {\clef "treble"; c1 c1 } \context Staff=stb{ c1 c1}>} +\notes { c1 c1 < {\clef "treble" c1 c1 } \context Staff=stb{ c1 c1}>} } diff --git a/input/test/ottava.ly b/input/test/ottava.ly index 590bd730a8..f9f14670b8 100644 --- a/input/test/ottava.ly +++ b/input/test/ottava.ly @@ -1,3 +1,4 @@ +\version "1.3.146" fragment = \notes { @@ -9,7 +10,7 @@ fragment = \notes { a\spanrequest \start "text" b c a \spanrequest \stop "text" } -\paper { linewidth = -1.; } +\paper { linewidth = -1. } \score { \notes\relative c \fragment diff --git a/input/test/part-combine-moments.ly b/input/test/part-combine-moments.ly index f4eab06289..d0834790b1 100644 --- a/input/test/part-combine-moments.ly +++ b/input/test/part-combine-moments.ly @@ -1,8 +1,9 @@ +\version "1.3.146" \score{ \context PianoStaff < - \context StaffCombineStaff=one \skip 1*2; - \context StaffCombineStaff=two \skip 1*2; + \context StaffCombineStaff=one \skip 1*2 + \context StaffCombineStaff=two \skip 1*2 \context StaffCombineStaff=one \partcombine StaffCombineStaff \context StaffCombineVoice=one \notes\relative c'' { @@ -17,8 +18,8 @@ > \paper { - textheight = 295.0\mm; - linewidth = 180.0\mm; + textheight = 295.0\mm + linewidth = 180.0\mm \translator{ \HaraKiriStaffContext } % @@ -26,22 +27,22 @@ % \translator{ \ThreadContext - \name "VoiceCombineThread"; - \consists "Rest_engraver"; + \name "VoiceCombineThread" + \consists "Rest_engraver" } \translator{ \VoiceContext - \name "VoiceCombineVoice"; + \name "VoiceCombineVoice" soloText = #"I." soloIIText = #"II." - \remove "Rest_engraver"; - \accepts "VoiceCombineThread"; + \remove "Rest_engraver" + \accepts "VoiceCombineThread" } \translator{ \HaraKiriStaffContext - \consists "Mark_engraver"; - \name "VoiceCombineStaff"; - \accepts "VoiceCombineVoice"; + \consists "Mark_engraver" + \name "VoiceCombineStaff" + \accepts "VoiceCombineVoice" } % @@ -49,18 +50,18 @@ % \translator{ \ThreadContext - \name "StaffCombineThread"; + \name "StaffCombineThread" } \translator{ \VoiceContext - \name "StaffCombineVoice"; - \accepts "StaffCombineThread"; - \consists "Thread_devnull_engraver"; + \name "StaffCombineVoice" + \accepts "StaffCombineThread" + \consists "Thread_devnull_engraver" } \translator { \HaraKiriStaffContext - \name "StaffCombineStaff"; - \accepts "StaffCombineVoice"; + \name "StaffCombineStaff" + \accepts "StaffCombineVoice" soloADue = ##t soloText = #"" @@ -72,15 +73,15 @@ } \translator { \StaffGroupContext - \accepts "VoiceCombineStaff"; - \accepts "StaffCombineStaff"; + \accepts "VoiceCombineStaff" + \accepts "StaffCombineStaff" } \translator{ \HaraKiriStaffContext } \translator { \ScoreContext - \accepts "VoiceCombineStaff"; - \accepts "StaffCombineStaff"; + \accepts "VoiceCombineStaff" + \accepts "StaffCombineStaff" skipBars = ##t barScriptPadding = #2.0 % dimension \pt diff --git a/input/test/part-combine-score.ly b/input/test/part-combine-score.ly index 551357882e..ca51a9ea66 100644 --- a/input/test/part-combine-score.ly +++ b/input/test/part-combine-score.ly @@ -1,14 +1,15 @@ +\version "1.3.146" \header { -texidoc="Template for part-combining orchestral scores"; +texidoc="Template for part-combining orchestral scores" } -\include "paper16.ly"; -% \include "mutopia/Coriolan/coriolan-paper.ly"; +\include "paper16.ly" +% \include "mutopia/Coriolan/coriolan-paper.ly" #(define text-flat '((font-relative-size . -2 ) (music "accidentals--1"))) -End = { \skip 1*9; \bar "|."; } +End = { \skip 1*9 \bar "|." } flautoI = \notes\relative c'' { c4\pp d e f @@ -97,7 +98,7 @@ violinoIStaff = \context Staff = oneViolini < violinoIIStaff = \context Staff = twoViolini < % MIDI hoort geeneens verschil tussen een - % eerste en tweede viool ;-) + % eerste en tweede viool -) \property Staff.midiInstrument = #"violin" \property Staff.instrument = #"Violino II" \property Staff.instr = #"Vl. II" @@ -113,11 +114,11 @@ violeGroup = \notes \context VoiceCombineStaff = oneViole < \property VoiceCombineStaff.midiInstrument = #"viola" \property VoiceCombineStaff.instrument = #"Viola" \property VoiceCombineStaff.instr = #"Vla." - %\clef "alto"; + %\clef "alto" % Ugh, clef broken in 1.3.125 \property VoiceCombineStaff.clefGlyph = #"clefs-C" \property VoiceCombineStaff.clefPosition = #0 - \key f \major; + \key f \major \End \context VoiceCombineVoice=oneViole \partcombine VoiceCombineVoice @@ -152,12 +153,12 @@ bassiGroup = \context PianoStaff = bassi_group \notes < \property StaffCombineStaff.instr = #"Vc." - %\clef "bass"; + %\clef "bass" % Ugh, clef broken in 1.3.125 \property StaffCombineStaff.clefGlyph = #"clefs-F" \property StaffCombineStaff.clefPosition = #2 - \key es \major; + \key es \major \End } \context StaffCombineStaff=twoBassi { @@ -165,12 +166,12 @@ bassiGroup = \context PianoStaff = bassi_group \notes < \property StaffCombineStaff.instrument = #"Contrabasso" \property StaffCombineStaff.instr = #"Cb." - %\clef "bass"; + %\clef "bass" % Ugh, clef broken in 1.3.125 \property StaffCombineStaff.clefGlyph = #"clefs-F" \property StaffCombineStaff.clefPosition = #2 - \key as \major; + \key as \major \End } @@ -200,20 +201,20 @@ archiGroup = \context StaffGroup = archi_group < \archiGroup > \header { - title = "Coriolan"; - subtitle = "Ouverture"; - opus = "Opus 62"; - composer = "Ludwig van Beethoven (1770-1827)"; - enteredby = "JCN"; - copyright = "public domain"; + title = "Coriolan" + subtitle = "Ouverture" + opus = "Opus 62" + composer = "Ludwig van Beethoven (1770-1827)" + enteredby = "JCN" + copyright = "public domain" } \paper{ \paperSixteen - %textheight = 290.0\mm; - %linewidth = 195.0\mm; - textheight = 285.0\mm; - linewidth = 190.0\mm; + %textheight = 290.0\mm + %linewidth = 195.0\mm + textheight = 285.0\mm + linewidth = 190.0\mm \translator{ \HaraKiriStaffContext } % @@ -221,22 +222,22 @@ archiGroup = \context StaffGroup = archi_group < % \translator{ \ThreadContext - \name "VoiceCombineThread"; - \consists "Rest_engraver"; + \name "VoiceCombineThread" + \consists "Rest_engraver" } \translator{ \VoiceContext - \name "VoiceCombineVoice"; + \name "VoiceCombineVoice" soloText = #"I." soloIIText = #"II." - \remove "Rest_engraver"; - \accepts "VoiceCombineThread"; + \remove "Rest_engraver" + \accepts "VoiceCombineThread" } \translator{ \HaraKiriStaffContext - \consists "Mark_engraver"; - \name "VoiceCombineStaff"; - \accepts "VoiceCombineVoice"; + \consists "Mark_engraver" + \name "VoiceCombineStaff" + \accepts "VoiceCombineVoice" } % @@ -244,18 +245,18 @@ archiGroup = \context StaffGroup = archi_group < % \translator{ \ThreadContext - \name "StaffCombineThread"; + \name "StaffCombineThread" } \translator{ \VoiceContext - \name "StaffCombineVoice"; - \accepts "StaffCombineThread"; - \consists "Thread_devnull_engraver"; + \name "StaffCombineVoice" + \accepts "StaffCombineThread" + \consists "Thread_devnull_engraver" } \translator { \HaraKiriStaffContext - \name "StaffCombineStaff"; - \accepts "StaffCombineVoice"; + \name "StaffCombineStaff" + \accepts "StaffCombineVoice" soloADue = ##t soloText = #"" @@ -268,16 +269,16 @@ archiGroup = \context StaffGroup = archi_group < } \translator { \StaffGroupContext - \accepts "VoiceCombineStaff"; - \accepts "StaffCombineStaff"; + \accepts "VoiceCombineStaff" + \accepts "StaffCombineStaff" } \translator{ \HaraKiriStaffContext } \translator { %\ScoreContext \OrchestralScoreContext - \accepts "VoiceCombineStaff"; - \accepts "StaffCombineStaff"; + \accepts "VoiceCombineStaff" + \accepts "StaffCombineStaff" TimeSignature \override #'style = #'C skipBars = ##t BarNumber \override #'padding = #3 diff --git a/input/test/part-combine-staff.ly b/input/test/part-combine-staff.ly index 728df55c17..168d5f0d04 100644 --- a/input/test/part-combine-staff.ly +++ b/input/test/part-combine-staff.ly @@ -1,8 +1,9 @@ +\version "1.3.146" \score{ \context PianoStaff < - \context StaffCombineStaff=one \skip 1*7; - \context StaffCombineStaff=two \skip 1*7; + \context StaffCombineStaff=one \skip 1*7 + \context StaffCombineStaff=two \skip 1*7 \context StaffCombineStaff=one \partcombine StaffCombineStaff \context StaffCombineVoice=one \notes\relative c'' { @@ -27,8 +28,8 @@ > \paper { - textheight = 295.0\mm; - linewidth = 180.0\mm; + textheight = 295.0\mm + linewidth = 180.0\mm \translator{ \HaraKiriStaffContext } % @@ -36,22 +37,22 @@ % \translator{ \ThreadContext - \name "VoiceCombineThread"; - \consists "Rest_engraver"; + \name "VoiceCombineThread" + \consists "Rest_engraver" } \translator{ \VoiceContext - \name "VoiceCombineVoice"; + \name "VoiceCombineVoice" soloText = #"I." soloIIText = #"II." - \remove "Rest_engraver"; - \accepts "VoiceCombineThread"; + \remove "Rest_engraver" + \accepts "VoiceCombineThread" } \translator{ \HaraKiriStaffContext - \consists "Mark_engraver"; - \name "VoiceCombineStaff"; - \accepts "VoiceCombineVoice"; + \consists "Mark_engraver" + \name "VoiceCombineStaff" + \accepts "VoiceCombineVoice" } % @@ -59,18 +60,18 @@ % \translator{ \ThreadContext - \name "StaffCombineThread"; + \name "StaffCombineThread" } \translator{ \VoiceContext - \name "StaffCombineVoice"; - \accepts "StaffCombineThread"; - \consists "Thread_devnull_engraver"; + \name "StaffCombineVoice" + \accepts "StaffCombineThread" + \consists "Thread_devnull_engraver" } \translator { \HaraKiriStaffContext - \name "StaffCombineStaff"; - \accepts "StaffCombineVoice"; + \name "StaffCombineStaff" + \accepts "StaffCombineVoice" soloADue = ##t soloText = #"" @@ -82,15 +83,15 @@ } \translator { \StaffGroupContext - \accepts "VoiceCombineStaff"; - \accepts "StaffCombineStaff"; + \accepts "VoiceCombineStaff" + \accepts "StaffCombineStaff" } \translator{ \HaraKiriStaffContext } \translator { \ScoreContext - \accepts "VoiceCombineStaff"; - \accepts "StaffCombineStaff"; + \accepts "VoiceCombineStaff" + \accepts "StaffCombineStaff" skipBars = ##t barScriptPadding = #2.0 % dimension \pt diff --git a/input/test/part-combine.ly b/input/test/part-combine.ly index 3e04e524b3..98ab7f1221 100644 --- a/input/test/part-combine.ly +++ b/input/test/part-combine.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \header{ texidoc=" @@ -5,12 +6,12 @@ In orchestral scores and hymns, voices are traditionally combined onto one staff. LilyPond has a part combiner, that combines or separates two voices according to actual rhythm and pitch. User-defined texts such as ``solo'' and ``@`a2'' are typeset automagically, as appropriate. -"; +" } \score{ \context Staff = flauti < - \time 4/4; + \time 4/4 \context Voice=one \partcombine Voice \context Thread=one \notes\relative c'' { c4 d e f | b,4 d c d | r2 e4 f | c4 d e f | @@ -24,14 +25,14 @@ voices according to actual rhythm and pitch. User-defined texts such as } > \paper{ - linewidth = 80 * \staffspace; + linewidth = 80 * \staffspace \translator{ \ThreadContext - \consists Rest_engraver; + \consists Rest_engraver } \translator{ \VoiceContext - \remove Rest_engraver; + \remove Rest_engraver } } } diff --git a/input/test/partial-blank.ly b/input/test/partial-blank.ly index 9b15bde29d..f986a9bbd0 100644 --- a/input/test/partial-blank.ly +++ b/input/test/partial-blank.ly @@ -1,3 +1,4 @@ +\version "1.3.146" %{ When entering half music (I.e. for students to complete by hand) you need the spacing to correspond to the timing - all measures same length, etc. @@ -13,7 +14,7 @@ mel = \notes \relative c' {c16 d16 e8 a4 g2 e8 d c2. g'1 e4 d c2} \score { \context PianoStaff \notes < \context Staff = v < - \clef G; + \clef G \context Voice=melo {\mel} \context Voice=invisible { \property Voice.NoteHead \override #'transparent = ##t @@ -22,7 +23,7 @@ mel = \notes \relative c' {c16 d16 e8 a4 g2 e8 d c2. g'1 e4 d c2} \repeat unfold 4 \quickmeasure } > - \context Staff = empty \notes {\clef F; s1*4} + \context Staff = empty \notes {\clef F s1*4} > \paper {} } diff --git a/input/test/pedal.ly b/input/test/pedal.ly index 490ecbfd86..3b21563bbc 100644 --- a/input/test/pedal.ly +++ b/input/test/pedal.ly @@ -1,5 +1,6 @@ +\version "1.3.146" \header{ -texidoc = "Piano pedal symbols merge stop and start. The strings are configurable. "; +texidoc = "Piano pedal symbols merge stop and start. The strings are configurable. " } @@ -17,6 +18,6 @@ c, \sustainUp\sustainDown d e f \paper{ } \midi{ -\tempo 4 = 60; +\tempo 4 = 60 } } diff --git a/input/test/perform-grace.ly b/input/test/perform-grace.ly index 518661f9d1..aa679ad0ee 100644 --- a/input/test/perform-grace.ly +++ b/input/test/perform-grace.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { diff --git a/input/test/perform-tie.ly b/input/test/perform-tie.ly index 4b68eeee6a..be0b5fc672 100644 --- a/input/test/perform-tie.ly +++ b/input/test/perform-tie.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { diff --git a/input/test/repeat.ly b/input/test/repeat.ly index 09ab543a35..40adf5991b 100644 --- a/input/test/repeat.ly +++ b/input/test/repeat.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ < diff --git a/input/test/rests.ly b/input/test/rests.ly index 5eca6dcd59..859a6fd7f8 100644 --- a/input/test/rests.ly +++ b/input/test/rests.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { diff --git a/input/test/reverse-music.ly b/input/test/reverse-music.ly index d93a8ec542..8f40c63a40 100644 --- a/input/test/reverse-music.ly +++ b/input/test/reverse-music.ly @@ -1,8 +1,9 @@ +\version "1.3.146" \header { texidoc=" Simple customised music apply. -"; +" } music = \notes { c'4 d'4( e'4 f'4 } @@ -26,6 +27,6 @@ music = \notes { c'4 d'4( e'4 f'4 } \music \apply #reverse-music \music } - \paper { linewidth = -1.; } + \paper { linewidth = -1. } } diff --git a/input/test/rhythmic-staff.ly b/input/test/rhythmic-staff.ly index 60cd162575..3c3f30fd97 100644 --- a/input/test/rhythmic-staff.ly +++ b/input/test/rhythmic-staff.ly @@ -1,17 +1,18 @@ +\version "1.3.146" \score{ \context RhythmicStaff { \notes\relative c''{ - \clef "percussion"; - \time 4/4; + \clef "percussion" + \time 4/4 r4 r g2 | r4 g r2 | g1:32 | r1 | } } \paper{ \translator{ \RhythmicStaffContext - \consists "Clef_engraver"; + \consists "Clef_engraver" } } } diff --git a/input/test/scales-greek.ly b/input/test/scales-greek.ly index 2eea44d390..76c23eecfb 100644 --- a/input/test/scales-greek.ly +++ b/input/test/scales-greek.ly @@ -1,32 +1,33 @@ +\version "1.3.146" \header { - crossRefNumber = "1"; - tagline = "Lily was here 1.3.98 -- automatically converted from ABC"; - title = "Scales"; + crossRefNumber = "1" + tagline = "Lily was here 1.3.98 -- automatically converted from ABC" + title = "Scales" } voicedefault = \notes { \property Score.defaultBarType="empty" -\key c \major; c'8 -"major" d'8 e'8 f'8 g'8 a'8 b'8 -c''8 \key c \ionian; c'8 -"ionian" d'8 e'8 f'8 g'8 a'8 -b'8 c''8 \key d \dorian; c'8 -"dorian" d'8 e'8 f'8 g'8 -a'8 b'8 c''8 \key e \phrygian; c'8 -"phrygian" d'8 e'8 f'8 - g'8 a'8 b'8 c''8 \key f \lydian; c'8 -"lydian" d'8 e'8 - f'8 g'8 a'8 b'8 c''8 \key g \mixolydian; c'8 -"mixolydian" - d'8 e'8 f'8 g'8 a'8 b'8 c''8 \key a \minor; c'8 --"minor" d'8 e'8 f'8 g'8 a'8 b'8 c''8 \key a \aeolian; +\key c \major c'8 -"major" d'8 e'8 f'8 g'8 a'8 b'8 +c''8 \key c \ionian c'8 -"ionian" d'8 e'8 f'8 g'8 a'8 +b'8 c''8 \key d \dorian c'8 -"dorian" d'8 e'8 f'8 g'8 +a'8 b'8 c''8 \key e \phrygian c'8 -"phrygian" d'8 e'8 f'8 + g'8 a'8 b'8 c''8 \key f \lydian c'8 -"lydian" d'8 e'8 + f'8 g'8 a'8 b'8 c''8 \key g \mixolydian c'8 -"mixolydian" + d'8 e'8 f'8 g'8 a'8 b'8 c''8 \key a \minor c'8 +-"minor" d'8 e'8 f'8 g'8 a'8 b'8 c''8 \key a \aeolian c'8 -"aeolian" d'8 e'8 f'8 g'8 a'8 b'8 c''8 -\key b \locrian; c'8 -"locrian" d'8 e'8 f'8 g'8 a'8 b'8 -c''8 \key f \major; c'8 -"major" d'8 e'8 f'8 g'8 a'8 -bes'8 c''8 \key f \ionian; c'8 -"ionian" d'8 e'8 f'8 g'8 - a'8 bes'8 c''8 \key g \dorian; c'8 -"dorian" d'8 e'8 f'8 - g'8 a'8 bes'8 c''8 \key a \phrygian; c'8 -"phrygian" d'8 -e'8 f'8 g'8 a'8 bes'8 c''8 \key bes \lydian; c'8 +\key b \locrian c'8 -"locrian" d'8 e'8 f'8 g'8 a'8 b'8 +c''8 \key f \major c'8 -"major" d'8 e'8 f'8 g'8 a'8 +bes'8 c''8 \key f \ionian c'8 -"ionian" d'8 e'8 f'8 g'8 + a'8 bes'8 c''8 \key g \dorian c'8 -"dorian" d'8 e'8 f'8 + g'8 a'8 bes'8 c''8 \key a \phrygian c'8 -"phrygian" d'8 +e'8 f'8 g'8 a'8 bes'8 c''8 \key bes \lydian c'8 -"lydian" d'8 e'8 f'8 g'8 a'8 bes'8 c''8 -\key c \mixolydian; c'8 -"mixolydian" d'8 e'8 f'8 g'8 a'8 -bes'8 c''8 \key d \aeolian; c'8 -"aeolian" d'8 e'8 f'8 g'8 - a'8 bes'8 c''8 \key d \minor; c'8 -"minor" d'8 e'8 f'8 - g'8 a'8 bes'8 c''8 \key e \locrian; c'8 -"locrian" d'8 +\key c \mixolydian c'8 -"mixolydian" d'8 e'8 f'8 g'8 a'8 +bes'8 c''8 \key d \aeolian c'8 -"aeolian" d'8 e'8 f'8 g'8 + a'8 bes'8 c''8 \key d \minor c'8 -"minor" d'8 e'8 f'8 + g'8 a'8 bes'8 c''8 \key e \locrian c'8 -"locrian" d'8 e'8 f'8 g'8 a'8 bes'8 c''8 }\score{ \notes < diff --git a/input/test/scales.ly b/input/test/scales.ly index 38f747cbdc..151c9e10ce 100644 --- a/input/test/scales.ly +++ b/input/test/scales.ly @@ -1,106 +1,107 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { % sharp-major % c g d a e b fis cis - \key c \major; + \key c \major c' d e f g a b c - \key g\major; + \key g\major g a b c d e fis g - \key d\major; + \key d\major d, e fis g a b cis d - \key a\major; + \key a\major a b cis d e fis gis a - \key e\major; + \key e\major e, fis gis a b cis dis e - \key b\major; + \key b\major b cis dis e fis gis ais b - \key fis\major; + \key fis\major fis, gis ais b cis dis eis fis - \key cis\major; + \key cis\major cis, dis eis fis gis ais bis cis % sharp-minor % a e b fis cis gis dis ais - \key a\minor; + \key a\minor a b c d e f gis a - \key e\minor; + \key e\minor e, fis g a b c dis e - \key b\minor; + \key b\minor b cis d e fis g ais b - \key fis\minor; + \key fis\minor fis, gis a b cis d eis fis - \key cis\minor; + \key cis\minor cis, dis e fis gis a bis cis - \key gis\minor; + \key gis\minor gis ais b cis dis e fisis gis - \key dis\minor; + \key dis\minor dis, eis fis gis ais b cisis dis - \key ais\minor; + \key ais\minor ais bis cis dis eis fis gisis ais % flat-major % c f bes es as des ges ces - \key f\major; + \key f\major f, g a bes c d e f - \key bes\major; + \key bes\major bes, c d es f g a bes - \key es\major; + \key es\major es,, f g as bes c d es - \key as\major; + \key as\major as, bes c des es f g as - \key des\major; + \key des\major des,, es f ges as bes c des - \key ges\major; + \key ges\major ges, as bes ces des es f ges - \key ces\major; + \key ces\major ces,, des es fes ges as bes ces % flat-minor % a d g c f bes es as - \key d\minor; + \key d\minor d, e f g a bes cis d - \key g\minor; + \key g\minor g, a bes c d es fis g - \key c\minor; + \key c\minor c,, d es f g as b c - \key f\minor; + \key f\minor f, g as bes c des e f - \key bes\minor; + \key bes\minor bes, c des es f ges a bes - \key es\minor; + \key es\minor es,, f ges as bes ces d es - \key as\minor; + \key as\minor as, bes ces des es fes g as} \paper { } diff --git a/input/test/script-horizontal.ly b/input/test/script-horizontal.ly index 551d139a7a..7c0ca4527d 100644 --- a/input/test/script-horizontal.ly +++ b/input/test/script-horizontal.ly @@ -1,3 +1,4 @@ +\version "1.3.146" %{ Please don't use this Scheme hacking unless you have a good reason. @@ -17,13 +18,13 @@ Please don't use this Scheme hacking unless you have a good reason. \paper { \translator { \VoiceContext - \remove Script_engraver; - \remove Text_engraver; + \remove Script_engraver + \remove Text_engraver } \translator { \ThreadContext - \consists Script_engraver; - \consists Text_engraver; + \consists Script_engraver + \consists Text_engraver } } } diff --git a/input/test/scripts.ly b/input/test/scripts.ly index 694e6c8353..4d0b429dcf 100644 --- a/input/test/scripts.ly +++ b/input/test/scripts.ly @@ -1,3 +1,4 @@ +\version "1.3.146" @@ -43,7 +44,7 @@ blah = \notes{ \transpose c'' { \stemUp b,---. c---. d---. e---. f---. g---. a---. b---. c'---. \stemBoth - \time 4/4; + \time 4/4 [c8 \< d e \! f][d' \> e' f' \! g'] [c-> \< d-> e-> \! f->][d'-> \> e'-> f'-> \! g'->] [c-^ \< d-^ e-^ \! f-^][d'-^ \> e'-^ f'-^ \! g'-^] diff --git a/input/test/short-part-combine.ly b/input/test/short-part-combine.ly index 806f1fcdf9..781ceb1893 100644 --- a/input/test/short-part-combine.ly +++ b/input/test/short-part-combine.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ \context Staff < diff --git a/input/test/simple-slur-endings.ly b/input/test/simple-slur-endings.ly index 500008620e..9b6a470d26 100644 --- a/input/test/simple-slur-endings.ly +++ b/input/test/simple-slur-endings.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ \notes \relative c''{ @@ -8,7 +9,7 @@ \slurDown a()c d()g,\break } \paper{ - indent = 0.0; - linewidth = 60.0\mm; + indent = 0.0 + linewidth = 60.0\mm } } diff --git a/input/test/sleur.ly b/input/test/sleur.ly index 16a8a7243d..f85a436550 100644 --- a/input/test/sleur.ly +++ b/input/test/sleur.ly @@ -1,8 +1,9 @@ +\version "1.3.146" \header{ -enteredby = "jcn"; -copyright = "public domain"; +enteredby = "jcn" +copyright = "public domain" TestedFeatures = "This file tests Feta embedded slurs" + - "(Feta definitively is not an abbreviation of Font-En-TjA)"; + "(Feta definitively is not an abbreviation of Font-En-TjA)" } @@ -168,7 +169,7 @@ clipping = \notes\transpose c'{ \score{ \context Staff \notes{ -% \property Voice.pletvisibility = 0; +% \property Voice.pletvisibility = 0 % use blend for fast check \blend % { @@ -187,9 +188,9 @@ clipping = \notes\transpose c'{ %\broken } \paper{ - indent = 0.0\pt; + indent = 0.0\pt %for broken! - % linewidth= 30.\mm; + % linewidth= 30.\mm } } diff --git a/input/test/slur-area.ly b/input/test/slur-area.ly index cbe360f773..9893ad3e44 100644 --- a/input/test/slur-area.ly +++ b/input/test/slur-area.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ \notes\relative c''{ @@ -22,6 +23,6 @@ a8(a a a a a a)a } \paper{ -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 90f91188d1..bf48d0bdaa 100644 --- a/input/test/slur-attachment-override.ly +++ b/input/test/slur-attachment-override.ly @@ -1,8 +1,9 @@ +\version "1.3.146" \header{ texidoc=" In some cases, you may want to set slur attachments by hand. -"; +" } @@ -14,7 +15,7 @@ fragment = \notes { d,32( d'4 )d8.. } -\paper { linewidth = -1.; } +\paper { linewidth = -1. } \score { \notes\relative c \fragment diff --git a/input/test/slur-attachment.ly b/input/test/slur-attachment.ly index 3b1ea943e2..d72892c5c6 100644 --- a/input/test/slur-attachment.ly +++ b/input/test/slur-attachment.ly @@ -1,3 +1,4 @@ +\version "1.3.146" fragment = \notes { @@ -10,7 +11,7 @@ fragment = \notes { g4(g8)g } -\paper { linewidth = -1.; } +\paper { linewidth = -1. } \score { \notes\relative c \fragment diff --git a/input/test/slur-broken-cross-staff.ly b/input/test/slur-broken-cross-staff.ly index 0570ed95a6..528a6da97f 100644 --- a/input/test/slur-broken-cross-staff.ly +++ b/input/test/slur-broken-cross-staff.ly @@ -1,8 +1,9 @@ +\version "1.3.146" \header{ texidoc=" The same goes for slurs. They behave decently when broken across linebreak. -"; +" } @@ -42,11 +43,11 @@ linebreak. %} } \context Staff=two \notes\relative c'{ - \clef bass; + \clef bass s1 s1 %s1 s1 s1 s1 s1 s1 s1 s1 } > - \paper { indent = 0.; linewidth = 40.*\staffspace; } + \paper { indent = 0. linewidth = 40.*\staffspace } } diff --git a/input/test/slur-broken.ly b/input/test/slur-broken.ly index 0d76b37c76..39fc39cc07 100644 --- a/input/test/slur-broken.ly +++ b/input/test/slur-broken.ly @@ -1,7 +1,8 @@ +\version "1.3.146" \score{ \notes\relative c''{ - \time 2/4; + \time 2/4 e2( \break )e4 f,(\break @@ -10,6 +11,6 @@ )e'2 } \paper{ - linewidth = 60.\mm; + linewidth = 60.\mm } } diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly index 511b46a24a..98cde016c8 100644 --- a/input/test/slur-damping.ly +++ b/input/test/slur-damping.ly @@ -1,3 +1,4 @@ +\version "1.3.146" % test damping diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly index aa33b0d44a..66a8890c95 100644 --- a/input/test/slur-dash.ly +++ b/input/test/slur-dash.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ @@ -13,9 +14,9 @@ c( d e )c | } \paper{ - indent = 0.0\pt; + indent = 0.0\pt %for broken! - % linewidth= 30.\mm; + % linewidth= 30.\mm } } diff --git a/input/test/slur-follow-music.ly b/input/test/slur-follow-music.ly index 3f8891d512..c77ce82104 100644 --- a/input/test/slur-follow-music.ly +++ b/input/test/slur-follow-music.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { @@ -19,7 +20,7 @@ } \paper { - linewidth=-1.0; + linewidth=-1.0 } \midi { } } diff --git a/input/test/slur-mininum.ly b/input/test/slur-mininum.ly index 83a153caa5..2fb98a72ce 100644 --- a/input/test/slur-mininum.ly +++ b/input/test/slur-mininum.ly @@ -1,10 +1,11 @@ +\version "1.3.146" \header { -texidoc = "" ; +texidoc = "" } \score{ \notes\relative c''{ - \time 2/4; + \time 2/4 \property Voice.Slur \set #'minimum-length = #40 c()c c~c\break diff --git a/input/test/slur-positions.ly b/input/test/slur-positions.ly index 1ebbf4fce1..1e97d2c445 100644 --- a/input/test/slur-positions.ly +++ b/input/test/slur-positions.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ \notes\relative c''{ @@ -12,7 +13,7 @@ } \paper{ - linewidth=-1.\mm; + linewidth=-1.\mm } } diff --git a/input/test/slur-proof.ly b/input/test/slur-proof.ly index 3629d69138..501315da80 100644 --- a/input/test/slur-proof.ly +++ b/input/test/slur-proof.ly @@ -1,3 +1,4 @@ +\version "1.3.146" x = { @@ -36,8 +37,8 @@ x = { \context Voice=wa { \x d(s4*26)d } > \paper { - indent=0.0\mm; - linewidth=-1.0\mm; + indent=0.0\mm + linewidth=-1.0\mm \translator{ \VoiceContext Slur \override #'direction = #1 diff --git a/input/test/slur-symmetry-2.ly b/input/test/slur-symmetry-2.ly index 1da057b168..cee8911bc0 100644 --- a/input/test/slur-symmetry-2.ly +++ b/input/test/slur-symmetry-2.ly @@ -1,7 +1,8 @@ +\version "1.3.146" \header{ % should look the same -title="symmetry"; +title="symmetry" } \score{ \notes\relative c'{ @@ -12,6 +13,6 @@ title="symmetry"; } \paper{ - linewidth = 50.0\mm; + linewidth = 50.0\mm } } diff --git a/input/test/slur-symmetry-3.ly b/input/test/slur-symmetry-3.ly index 9d345db716..22d944ab6d 100644 --- a/input/test/slur-symmetry-3.ly +++ b/input/test/slur-symmetry-3.ly @@ -1,7 +1,8 @@ +\version "1.3.146" \header{ % should look the same -title="symmetry"; +title="symmetry" } \score{ \notes\relative c'{ @@ -11,6 +12,6 @@ title="symmetry"; } \paper{ - linewidth = 50.0\mm; + linewidth = 50.0\mm } } diff --git a/input/test/slur-ugly.ly b/input/test/slur-ugly.ly index 5e021dd199..307b1d7c14 100644 --- a/input/test/slur-ugly.ly +++ b/input/test/slur-ugly.ly @@ -1,7 +1,8 @@ +\version "1.3.146" \header { texidoc="You can get ugly slurs, if you want. -"; +" } baseWalk = \notes \relative c { @@ -10,15 +11,15 @@ baseWalk = \notes \relative c { \score { \notes \context PianoStaff < - \time 6/4; + \time 6/4 \context Staff=up { s1 * 6/4 } \context Staff=down < - \clef bass; + \clef bass \autochange Staff \context Voice \baseWalk > > \paper { - linewidth = -1.; + linewidth = -1. \translator { \VoiceContext Slur \override #'beautiful = #5.0 diff --git a/input/test/slurs.ly b/input/test/slurs.ly index 06927c256d..dc7a9da722 100644 --- a/input/test/slurs.ly +++ b/input/test/slurs.ly @@ -1,32 +1 @@ - - - -\score{ - \notes\transpose c'{ - - c,4 ~ c, c'' ~ c'' ~ g ~ c ~ - d ~ e ~ f ~ g ~ - a ~ b ~ c, ~ c - - < c e ( > <)d f> - \transpose c'' - < c e ( > <)d f> - \transpose c' - < c e ( > <)d' f'> - < { c ~ d } - { e ~ f } - > -% \context Staff < -% { \stemUp c'8 ~g ~e( ~c~ [c'~ g' e' )c'] c'' ~ c'' c~c } -% { \stemDown c (e g )c'~( [b a g )d] r2 } -% > - - { - - c4()c( c c | - c c c c | - c c c c | - c c c )c | - } - } -} +\version "1.3.146" diff --git a/input/test/smart-transpose.ly b/input/test/smart-transpose.ly index 05170116f2..81e1945cef 100644 --- a/input/test/smart-transpose.ly +++ b/input/test/smart-transpose.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \header { texidoc=" @@ -12,7 +13,7 @@ texidoc=" You mean like this. (Sorry 'bout the nuked indentation.) @end example -"; +" } #(define (unhair-pitch p) @@ -78,6 +79,6 @@ music = \notes \relative c' { c4 d e f g a b c } \apply #(lambda (x) (smart-transpose x (make-pitch 0 5 1))) \music } - \paper { linewidth = -1.; } + \paper { linewidth = -1. } } diff --git a/input/test/solo-a2.ly b/input/test/solo-a2.ly index b886c7a9c4..83c2f70697 100644 --- a/input/test/solo-a2.ly +++ b/input/test/solo-a2.ly @@ -1,8 +1,9 @@ +\version "1.3.146" \score{ \context Staff = one < - \context Voice=one { \skip 1; } - \context Voice=two { \skip 1; } + \context Voice=one { \skip 1 } + \context Voice=two { \skip 1 } \context Voice=one \partcombine Voice \context Thread=one \notes\relative c'' @@ -15,6 +16,6 @@ } > \paper{ - linewidth = 100.\mm; + linewidth = 100.\mm } } diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index f9f03b2173..262282bfd4 100644 --- a/input/test/spacing-2.ly +++ b/input/test/spacing-2.ly @@ -1,7 +1,8 @@ +\version "1.3.146" \header { -opus = "BWV 937 (prelude)"; -composer = "J. S. Bach"; -source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; +opus = "BWV 937 (prelude)" +composer = "J. S. Bach" +source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris." } %{ @@ -18,18 +19,18 @@ source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; e4 dis4 e2 } \context Voice = VB { \stemDown\slurDown\tieDown [cis8 a] [fis b] gis2 } - {\key e \major; } + {\key e \major } > - \context Staff = SB { \clef "bass"; \key e \major; + \context Staff = SB { \clef "bass" \key e \major [a,,16 e dis e] [b'8 b,] [e16 e, gis b] e4 } > \paper { -% linewidth = 5.0 \cm; % ly2dvi barfs on -1 - linewidth = 8.0 \cm; -% linewidth = 12.0 \cm; +% linewidth = 5.0 \cm % ly2dvi barfs on -1 + linewidth = 8.0 \cm +% linewidth = 12.0 \cm } } diff --git a/input/test/spacing.ly b/input/test/spacing.ly index 809dc44a26..f5b5e315d6 100644 --- a/input/test/spacing.ly +++ b/input/test/spacing.ly @@ -1,9 +1,10 @@ +\version "1.3.146" \header{ -title= "Spacing"; -subtitle = "proofsheet"; -enteredby = "jcn"; -copyright = "public domain"; -TestedFeatures = "This file tests various spacings"; +title= "Spacing" +subtitle = "proofsheet" +enteredby = "jcn" +copyright = "public domain" +TestedFeatures = "This file tests various spacings" } @@ -90,7 +91,7 @@ singlepart = \notes{ \multipart } \paper { -% linewidth= 18.\cm; +% linewidth= 18.\cm } } diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly index 1e21d1559e..e4ca8b079f 100644 --- a/input/test/span-bars.ly +++ b/input/test/span-bars.ly @@ -1,3 +1,4 @@ +\version "1.3.146" nt = \notes { c1 \break c1 c1 } diff --git a/input/test/stacked-scripts.ly b/input/test/stacked-scripts.ly index e43495ef1c..c1cde48db9 100644 --- a/input/test/stacked-scripts.ly +++ b/input/test/stacked-scripts.ly @@ -1,8 +1,9 @@ +\version "1.3.146" \score { \notes { c2_"geen gedonder"_"jij gaat onder" c2^^^.^|^"down"^"up" } - \paper { linewidth = -1. ; } + \paper { linewidth = -1. } } diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly index 69bce2efda..4b7b118c65 100644 --- a/input/test/staff-bracket.ly +++ b/input/test/staff-bracket.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { @@ -9,12 +10,12 @@ > \paper { - indent=100.0\mm; - linewidth=150.0\mm; + indent=100.0\mm + linewidth=150.0\mm \translator { \StaffContext - \consists Instrument_name_engraver; + \consists Instrument_name_engraver numberOfStaffLines = #1 } diff --git a/input/test/staff-container.ly b/input/test/staff-container.ly index baa7cd2518..f554745865 100644 --- a/input/test/staff-container.ly +++ b/input/test/staff-container.ly @@ -1,10 +1,11 @@ +\version "1.3.146" \header { texidoc = "By splitting the grouping (Axis_group_engraver) and creation functionality into separate contexts, you can override -interesting things. You can also drop the \consistsend feature."; +interesting things. You can also drop the \consistsend feature." } @@ -20,19 +21,19 @@ interesting things. You can also drop the \consistsend feature."; \paper { \translator { \ScoreContext - \accepts StaffContainer; - \denies Staff; + \accepts StaffContainer + \denies Staff } \translator { - \type Engraver_group_engraver; - \consists "Axis_group_engraver"; - \accepts "Staff"; - \name StaffContainer; + \type Engraver_group_engraver + \consists "Axis_group_engraver" + \accepts "Staff" + \name StaffContainer } \translator { \StaffContext - \remove Axis_group_engraver; + \remove Axis_group_engraver } } } diff --git a/input/test/staff-line-leading.ly b/input/test/staff-line-leading.ly index 972a387e81..a68dd33893 100644 --- a/input/test/staff-line-leading.ly +++ b/input/test/staff-line-leading.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \notes \relative c'' \context GrandStaff < diff --git a/input/test/staff-margin-partial.ly b/input/test/staff-margin-partial.ly index bf67887c5e..935c657c35 100644 --- a/input/test/staff-margin-partial.ly +++ b/input/test/staff-margin-partial.ly @@ -1,10 +1,11 @@ +\version "1.3.146" % test staff margin with partial measure. \score { -\notes { \property Staff.instrument = "foo" \partial 4; c4 c1 } +\notes { \property Staff.instrument = "foo" \partial 4 c4 c1 } \paper { - \translator { \StaffContext \consists Instrument_name_engraver; } + \translator { \StaffContext \consists Instrument_name_engraver } } } diff --git a/input/test/staff-side-slur.ly b/input/test/staff-side-slur.ly index 2958ac03ef..b667e6d7a8 100644 --- a/input/test/staff-side-slur.ly +++ b/input/test/staff-side-slur.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ \context Staff \notes\relative c''{ \property Staff.instrument = "Toeters" @@ -6,13 +7,13 @@ c c c c\break } \paper{ - linewidth=60.0\mm; + linewidth=60.0\mm % \translator { \HaraKiriStaffContext } \translator { \OrchestralScoreContext } \translator { \StaffContext - \consists "Instrument_name_engraver"; - marginHangOnClef = 1; + \consists "Instrument_name_engraver" + marginHangOnClef = 1 } } } diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index 641ad37f3a..854d6cc4ab 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \notes \relative c' < \context Voice { \property Staff.staffSpace = #10 @@ -5,13 +6,13 @@ \property Voice.fontSize = #-1 \property Voice . dynamicDirection = \up \stemDown -%\key gis \major; +%\key gis \major c8 d [e f g a] b c \ff } \context Staff = VB { \property Voice . dynamicDirection = \down c,,4 \ff c c c } > -\paper { linewidth = -1.; } +\paper { linewidth = -1. } } diff --git a/input/test/stem-centered.ly b/input/test/stem-centered.ly index 984eee93a7..65096cc31a 100644 --- a/input/test/stem-centered.ly +++ b/input/test/stem-centered.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { diff --git a/input/test/stem-extend.ly b/input/test/stem-extend.ly index 101e95ecfd..0f34a67e69 100644 --- a/input/test/stem-extend.ly +++ b/input/test/stem-extend.ly @@ -1,10 +1,11 @@ +\version "1.3.146" \header { texidoc = " Conventionally, stems and beams extend to the middle staff line. This extension can be controlled through @code{Voice.Stem}'s grob-property @code{no-stem-extend}: -";} +"} -\paper { linewidth = -1.;} +\paper { linewidth = -1.} \score {\notes \relative c { \grace a'8 a4 \property Voice.Stem \set #'no-stem-extend = ##t diff --git a/input/test/stem-length.ly b/input/test/stem-length.ly index c27c72254d..dc9bb24db0 100644 --- a/input/test/stem-length.ly +++ b/input/test/stem-length.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { diff --git a/input/test/stem.ly b/input/test/stem.ly index 0831f3b074..c42972be24 100644 --- a/input/test/stem.ly +++ b/input/test/stem.ly @@ -1,17 +1,18 @@ +\version "1.3.146" \header{ -title= "Stems and Beams"; -subtitle = "proofsheet"; -enteredby = "jcn"; -copyright = "public domain"; +title= "Stems and Beams" +subtitle = "proofsheet" +enteredby = "jcn" +copyright = "public domain" TestedFeatures = "This file tests the length of stems and placement -of beams"; +of beams" } beamintervals = \notes{ - \time 7/4; + \time 7/4 \stemUp \transpose c'{ [ c8 d ] [ c e ] [ c f ] [ c g ] [ c a ] [ c b ] [ c c' ] | @@ -29,7 +30,7 @@ beamintervals = \notes{ \score{ \notes\transpose c'{ \stemUp - \time 17/4; + \time 17/4 g,4 a, b, c d e f g a b c' d' e' f' g' a' b' | \stemDown b' a' g' f' e' d' c' b a g f e d c b, a, g, | diff --git a/input/test/system-start-brace.ly b/input/test/system-start-brace.ly index a6880cc87d..977a507ed5 100644 --- a/input/test/system-start-brace.ly +++ b/input/test/system-start-brace.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { diff --git a/input/test/system-start-bracket.ly b/input/test/system-start-bracket.ly index 9f4510b99c..cf02f85256 100644 --- a/input/test/system-start-bracket.ly +++ b/input/test/system-start-bracket.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { diff --git a/input/test/tab-staff.ly b/input/test/tab-staff.ly index b440df1c8b..f39ffaff19 100644 --- a/input/test/tab-staff.ly +++ b/input/test/tab-staff.ly @@ -1,3 +1,4 @@ +\version "1.3.146" @@ -19,11 +20,11 @@ bla = \notes \relative c' { <c4 e g> <c4. e g> <c8 f a> <c4 f a> <c1 e g> } \paper { \translator { \StaffContext - \name TabStaff; + \name TabStaff StaffSymbol \override #'line-count = #6 - \remove "Clef_engraver"; - \remove "Time_signature_engraver"; - \consists "Pitch_squash_engraver"; + \remove "Clef_engraver" + \remove "Time_signature_engraver" + \consists "Pitch_squash_engraver" NoteHead \override #'transparent = ##t Stem \override #'transparent = ##t NoteHead \override #'staff-position = #-6 @@ -33,7 +34,7 @@ bla = \notes \relative c' { <c4 e g> <c4. e g> <c8 f a> <c4 f a> <c1 e g> } } \translator { \ScoreContext -\accepts TabStaff; +\accepts TabStaff } } } diff --git a/input/test/tchaikovsky.ly b/input/test/tchaikovsky.ly index 42387d2570..20fcee20bb 100644 --- a/input/test/tchaikovsky.ly +++ b/input/test/tchaikovsky.ly @@ -1,10 +1,11 @@ +\version "1.3.146" \header{ -filename = "tchaikovsky.ly"; -title = "Extracts from 6th symphony"; -subtitle = "Ist movement"; -composer= "Pjotr Iljitsj Tchaikovsky"; -enteredby = "Maarten Storm"; -instrument= "Violoncello"; +filename = "tchaikovsky.ly" +title = "Extracts from 6th symphony" +subtitle = "Ist movement" +composer= "Pjotr Iljitsj Tchaikovsky" +enteredby = "Maarten Storm" +instrument= "Violoncello" } @@ -15,15 +16,15 @@ instrument= "Violoncello"; \score{ \notes \relative c{ - \clef "bass"; - \key d \major; + \clef "bass" + \key d \major <a2\ppp\cr d> <gis\rc\p\decr d'> | <a2\rced d> ~ <a8 d> r8 r4 | a2\ppp\cr a2\rc\p\decr | <a2\rced d> ~ <a8 d> r8 r4 | a2\pppp ~ a8 r8 r4 | a2\ppppp ~ a8 r8 r4 | r4 a8_"pizz" r8 r2^\fermata } \header{ - piece="example 1"; + piece="example 1" } } @@ -31,13 +32,13 @@ instrument= "Violoncello"; \score{ \notes \relative c{ - \clef "bass"; - \key c \major; + \clef "bass" + \key c \major <e1\sff cis'^\downbow> | <cis\sff a'^\downbow> | <d,\ffff\decr g> | ~ <d2 g> ~ <d8\p\rced g> } \header{ - piece="example 2"; + piece="example 2" } } diff --git a/input/test/test-german-chords.ly b/input/test/test-german-chords.ly index 62fba8edb1..3e574ee957 100644 --- a/input/test/test-german-chords.ly +++ b/input/test/test-german-chords.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \include "german-chords.ly" % #(set! german-Bb #t) diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly index 06d4682402..89f0268955 100644 --- a/input/test/text-spanner.ly +++ b/input/test/text-spanner.ly @@ -1,3 +1,4 @@ +\version "1.3.146" diff --git a/input/test/textscript.ly b/input/test/textscript.ly index 92ec7d04f5..24ccd550bc 100644 --- a/input/test/textscript.ly +++ b/input/test/textscript.ly @@ -1,3 +1,4 @@ +\version "1.3.146" % diff --git a/input/test/thumb.ly b/input/test/thumb.ly index 2fa3257022..f3da74aa8d 100644 --- a/input/test/thumb.ly +++ b/input/test/thumb.ly @@ -1,6 +1,7 @@ +\version "1.3.146" \header{ - title="CELLO-THUMBS"; - enteredby="Maarten Storm"; + title="CELLO-THUMBS" + enteredby="Maarten Storm" } @@ -14,7 +15,7 @@ <c_\thumb c'-3(> <)d_\thumb d'-3>] } \paper{ - linewidth = 80.\mm; + linewidth = 80.\mm } } diff --git a/input/test/tie-broken.ly b/input/test/tie-broken.ly index 0235ec5aaf..49a12048ac 100644 --- a/input/test/tie-broken.ly +++ b/input/test/tie-broken.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ \notes \relative c''{ @@ -6,13 +7,13 @@ c c c c c1~\break - \time 8/8; c + \time 8/8 c c4 c c c~\break - \time 4/4; + \time 4/4 c c c c } \paper { - linewidth=40.\mm; - indent=0.; + linewidth=40.\mm + indent=0. } } diff --git a/input/test/tie-sparse.ly b/input/test/tie-sparse.ly index a63b26b9e4..e50139d6d7 100644 --- a/input/test/tie-sparse.ly +++ b/input/test/tie-sparse.ly @@ -1,14 +1,19 @@ +\version "1.3.146" +\header { +texidoc = "setting sparseTies causes only one tie to be +generated per chord pair." + +} + + \score { \context Voice \notes\relative c { - - \context Voice { \property Voice.sparseTies = ##t - c'' <c e g> ~ <c e g> } - + c'' <c e g> ~ <c e g> } \paper { - linewidth=-1.0; + linewidth=-1.0 } \midi { } } diff --git a/input/test/time.ly b/input/test/time.ly index a4f3357f47..8d9dc9b865 100644 --- a/input/test/time.ly +++ b/input/test/time.ly @@ -1,144 +1,145 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { \property Staff.TimeSignature \override #'style = #'C - \time 1/1; + \time 1/1 c''1^"TimeSignature style = \#'C" - \time 2/2; + \time 2/2 c1 - \time 2/4; + \time 2/4 c2 - \time 3/4; + \time 3/4 c2. - \time 4/4; + \time 4/4 c1 - \time 5/4; + \time 5/4 c2. c2 - \time 6/4; + \time 6/4 c1. - \time 3/2; + \time 3/2 c1. - \time 7/4; + \time 7/4 c1 c2. - \time 8/4; + \time 8/4 c\breve - \time 9/4; + \time 9/4 c2. c2. c2. \break \property Staff.TimeSignature \set #'style = #'old - \time 1/1; + \time 1/1 c1^"TimeSignature style = \#'old" - \time 2/2; + \time 2/2 c1 - \time 2/4; + \time 2/4 c2 - \time 3/4; + \time 3/4 c2. - \time 4/4; + \time 4/4 c1 - \time 5/4; + \time 5/4 c2. c2 - \time 6/4; + \time 6/4 c1. - \time 3/2; + \time 3/2 c1. - \time 7/4; + \time 7/4 c1 c2. - \time 8/4; + \time 8/4 c\breve - \time 9/4; + \time 9/4 c2. c2. c2. - \time 6/8; + \time 6/8 c2. - \time 9/8; + \time 9/8 c4. c4. c4. \break % Lilypond doesn't understand 'default => it does what you want \property Staff.TimeSignature \set #'style = #'default - \time 1/1; + \time 1/1 c1^"TimeSignature style = \#'default" - \time 2/2; + \time 2/2 c1 - \time 2/4; + \time 2/4 c2 - \time 3/4; + \time 3/4 c2. - \time 4/4; + \time 4/4 c1 - \time 5/4; + \time 5/4 c2. c2 - \time 6/4; + \time 6/4 c1. - \time 3/2; + \time 3/2 c1. - \time 7/4; + \time 7/4 c1 c2. - \time 8/4; + \time 8/4 c\breve - \time 9/4; + \time 9/4 c2. c2. c2. \break % If the style starts with a '1', you get this style \property Staff.TimeSignature \set #'style = #'1style - \time 1/1; + \time 1/1 c1^"TimeSignature style = \#'1xxx" - \time 2/2; + \time 2/2 c1 - \time 2/4; + \time 2/4 c2 - \time 3/4; + \time 3/4 c2. - \time 4/4; + \time 4/4 c1 - \time 5/4; + \time 5/4 c2. c2 - \time 6/4; + \time 6/4 c1. - \time 3/2; + \time 3/2 c1. - \time 7/4; + \time 7/4 c1 c2. - \time 8/4; + \time 8/4 c\breve - \time 9/4; + \time 9/4 c2. c2. c2. \break \property Staff.TextScript \override #'self-alignment-X = #1 \property Staff.TimeSignature \set #'style = #'old9/8 - \time 1/1; + \time 1/1 c1^"old9/8" \property Staff.TimeSignature \set #'style = #'old6/8 - \time 1/1; + \time 1/1 c1^"old6/8" \property Staff.TimeSignature \set #'style = #'old6/8alt - \time 1/1; + \time 1/1 c1^"old6/8alt" \property Staff.TimeSignature \set #'style = #'old9/4 - \time 1/1; + \time 1/1 c1^"old9/4" \property Staff.TimeSignature \set #'style = #'old6/4 - \time 1/1; + \time 1/1 c1^"old6/4" \property Staff.TimeSignature \set #'style = #'old3/2 - \time 1/1; + \time 1/1 c1^"old3/2" \property Staff.TimeSignature \set #'style = #'old4/4 - \time 1/1; + \time 1/1 c1^"old4/4" \property Staff.TimeSignature \set #'style = #'old2/2 - \time 1/1; + \time 1/1 c1^"old2/2" \property Staff.TimeSignature \set #'style = #'old2/4 - \time 1/1; + \time 1/1 c1^"old2/4" \property Staff.TimeSignature \set #'style = #'old4/8 - \time 1/1; + \time 1/1 c1^"old4/8" \property Staff.TimeSignature \set #'style = #'C4/4 - \time 1/1; + \time 1/1 c1^"C4/4" \property Staff.TimeSignature \set #'style = #'C2/2 - \time 1/1; + \time 1/1 c1^"C2/2" } diff --git a/input/test/timing.ly b/input/test/timing.ly index 86ea3d3985..c24f679c70 100644 --- a/input/test/timing.ly +++ b/input/test/timing.ly @@ -1,10 +1,11 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { % \property Score. measurePosition = #(make-moment -1 4) - \partial 4; + \partial 4 c''4 c4 c4 c2 c1 \cadenzaOn [c8 d e f] [g a b c b c b c] \cadenzaOff diff --git a/input/test/title.ly b/input/test/title.ly index ca66d36e33..10c4939ffe 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -1,13 +1,14 @@ +\version "1.3.146" \header{ -filename = "title.ly"; -title = "Title"; -subtitle = "Subtitle"; -composer= "Composer (xxxx-yyyy)"; -arranger = "Arranger"; -copyright = "public domain"; -enteredby = "jcn"; -source = "urtext"; -instrument= "Instrument"; +filename = "title.ly" +title = "Title" +subtitle = "Subtitle" +composer= "Composer (xxxx-yyyy)" +arranger = "Arranger" +copyright = "public domain" +enteredby = "jcn" +source = "urtext" +instrument= "Instrument" } @@ -19,9 +20,9 @@ instrument= "Instrument"; c d e f f e d c } \header{ - opus = "Opus 0"; - piece = "Piece I"; - override="Overdriven"; + opus = "Opus 0" + piece = "Piece I" + override="Overdriven" } } @@ -33,8 +34,8 @@ instrument= "Instrument"; f e d c c d e f } \header{ - piece = "Piece II"; - opus = "Opus 1"; + piece = "Piece II" + opus = "Opus 1" } } diff --git a/input/test/transposing.ly b/input/test/transposing.ly index 676372b10a..a41d3f0d2b 100644 --- a/input/test/transposing.ly +++ b/input/test/transposing.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { \context Voice \notes\relative c { diff --git a/input/test/transposition.ly b/input/test/transposition.ly index e0948ac178..438c8dcdad 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -1,10 +1,11 @@ +\version "1.3.146" %{ Hi all, I have extend Mats' patches to allow accidental transposition: - \keysignature bes es fis; + \keysignature bes es fis = \transpose d => - \keysignature gis; + \keysignature gis As you can see in output = the example file "test.ly" there are a few problems left: - key undo (already in the Todo) @@ -21,38 +22,38 @@ Eric %} \header{ -title = "Test it"; -description = "Transposition Test file"; -enteredby = "Eric Bullinger"; -copyright = "public domain"; +title = "Test it" +description = "Transposition Test file" +enteredby = "Eric Bullinger" +copyright = "public domain" } vOne = \notes \relative c''{ - \clef"violin"; - \key d \major; - \time 2/4 ; + \clef"violin" + \key d \major + \time 2/4 d4 d | - \key fis \major; + \key fis \major fis4 fis | - \key es \major; + \key es \major c4 c | } vTwo = \notes \transpose d' { \vOne } vThree = \notes \relative c''{ - \clef"violin"; -% \keysignature fis cis; + \clef"violin" +% \keysignature fis cis \property Staff.keySignature = #'((0 . 1)(3 . 1)) - \time 2/4 ; + \time 2/4 d4 d | -% \keysignature bes es fis; +% \keysignature bes es fis \property Staff.keySignature = #'((3 . 1)(2 . -1)(6 . -1)) fis4 fis | -% \keysignature fis cis gis dis ais eis; +% \keysignature fis cis gis dis ais eis \property Staff.keySignature = #'((2 . -1)(5 . -1)(1 . 1)(4 . 1)(0 . 1)(3 . 1)) cis4 ais4 | } @@ -66,7 +67,7 @@ vFour = \notes \transpose d' \vThree \context Staff=vThree \vThree \context Staff=vFour \vFour > - \paper { linewidth= 130.\mm; } + \paper { linewidth= 130.\mm } } diff --git a/input/test/tuplet-rest.ly b/input/test/tuplet-rest.ly index c93911005f..2bfd726ad8 100644 --- a/input/test/tuplet-rest.ly +++ b/input/test/tuplet-rest.ly @@ -1,9 +1,10 @@ +\version "1.3.146" \score { \context Voice \notes \relative c'' { - \time 2/4; + \time 2/4 \times 2/3 { r c,,, c''' } \times 2/3 { r c c } \times 2/3 { r c r} diff --git a/input/test/tuplet-spanner-duration.ly b/input/test/tuplet-spanner-duration.ly index 70f48cc2d5..cf590efaae 100644 --- a/input/test/tuplet-spanner-duration.ly +++ b/input/test/tuplet-spanner-duration.ly @@ -1,9 +1,10 @@ +\version "1.3.146" \score { \context Voice \notes \relative c'' { -\time 2/4; +\time 2/4 \times 2/3 { c8 c c c c c } \property Voice . tupletSpannerDuration = #(make-moment 1 4) \times 2/3 { c8 c c c c c } diff --git a/input/test/tuplet.ly b/input/test/tuplet.ly index 4c56c81228..5191612043 100644 --- a/input/test/tuplet.ly +++ b/input/test/tuplet.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score { diff --git a/input/test/two-key.ly b/input/test/two-key.ly index 4b4f2039c7..ceafc7f051 100644 --- a/input/test/two-key.ly +++ b/input/test/two-key.ly @@ -1,13 +1,14 @@ +\version "1.3.146" \header { texidoc = "If you specify two different key sigs at one point, a - warning is printed."; + warning is printed." } \score { \notes \context Voice < - { \key cis \major; cis4 \key bes \major; bes4 } - { \key cis \major; fis4 \key es \major; g4 } + { \key cis \major cis4 \key bes \major bes4 } + { \key cis \major fis4 \key es \major g4 } > } diff --git a/input/test/two-slurs.ly b/input/test/two-slurs.ly index 2e7e9ed58f..7f1cd516c2 100644 --- a/input/test/two-slurs.ly +++ b/input/test/two-slurs.ly @@ -1,3 +1,4 @@ +\version "1.3.146" % % We'd want to combine the stems, but have two slurs too... @@ -15,6 +16,6 @@ } > \paper{ - linewidth=60.\mm; + linewidth=60.\mm } } diff --git a/input/test/uniform-breaking.ly b/input/test/uniform-breaking.ly index b4eb46fd4c..57022b3fe9 100644 --- a/input/test/uniform-breaking.ly +++ b/input/test/uniform-breaking.ly @@ -1,9 +1,10 @@ +\version "1.3.146" %{ Hmm, ik vraag me af of dit al helemaal koel is. return abs (this_one.force_f_) + abs (prev.force_f_ - this_one.force_f_) - + break_penalties; + + break_penalties Neem als voorbeeld iets dat lijkt op allemande: keuze tussen 2 of drie maten per regel. @@ -105,8 +106,8 @@ Heb niet zomaar beter idee, nog. } \paper { - indent=0.0\mm; - linewidth=90.0\mm; + indent=0.0\mm + linewidth=90.0\mm } } diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly index ff8013c903..4d24750698 100644 --- a/input/test/vertical-align.ly +++ b/input/test/vertical-align.ly @@ -1,3 +1,4 @@ +\version "1.3.146" diff --git a/input/test/vertical-extent.ly b/input/test/vertical-extent.ly index f6bcfa949a..485d7ab092 100644 --- a/input/test/vertical-extent.ly +++ b/input/test/vertical-extent.ly @@ -4,26 +4,26 @@ VerticalExtent, VerticalExtent, VerticalExtent. These are normal property values, and are written itno the grob when the associated context finishes, so using it in \property works. - "; } -\version "1.3.145"; + " } +\version "1.3.146" \score { \notes < \context Staff = upper { \property Staff.VerticalExtent = #'(-15.0 . 0.0) - \clef alto; + \clef alto c1 \break c1 } \context Staff = lower { \property Staff.VerticalExtent = #'(-0.0 . 15.0) - \clef alto; + \clef alto g1 \break g1 } > \paper{ - interscoreline = 13.0\mm; - interscorelinefill = 0; - \translator{\ScoreContext \remove "Bar_number_engraver";} + interscoreline = 13.0\mm + interscorelinefill = 0 + \translator{\ScoreContext \remove "Bar_number_engraver"} \translator{\StaffContext MinimumVerticalExtent = #'(-2.0 . 2.0)} } } diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly index bd091ac8f3..48e18256d0 100644 --- a/input/test/vertical-text.ly +++ b/input/test/vertical-text.ly @@ -1,3 +1,4 @@ +\version "1.3.146" \score{ < \context Staff = o \notes\relative c,,, { diff --git a/input/test/voice-switch.ly b/input/test/voice-switch.ly index 0682bf8029..0d67033b9c 100644 --- a/input/test/voice-switch.ly +++ b/input/test/voice-switch.ly @@ -1,8 +1,9 @@ +\version "1.3.146" \score{ \context Staff < - \context Voice=one\skip 1; - \context Voice=two\skip 1; + \context Voice=one\skip 1 + \context Voice=two\skip 1 \context Voice=one \partcombine Voice \context Thread=one \notes\relative c'' { c2 c2 @@ -15,7 +16,7 @@ } > \paper{ - linewidth=140.\mm; + linewidth=140.\mm } } diff --git a/input/test/volta-start.ly b/input/test/volta-start.ly index 2e01d3c8d6..262c35e10b 100644 --- a/input/test/volta-start.ly +++ b/input/test/volta-start.ly @@ -1,19 +1,20 @@ +\version "1.3.146" \header{ texidoc = " Volta braces are hung on barlines. At the start of the -line, they should always start after the prefatory matter. "; +line, they should always start after the prefatory matter. " } voiceB = \notes { - \clef bass; + \clef bass \property Staff.instrument = "Bass" \property Staff.instr = "B" - \key f \minor; - \time 4/4; + \key f \minor + \time 4/4 f,2 ( ) f,8 r8 f8 e8 \repeat volta 2 { @@ -99,10 +100,10 @@ voiceE = \notes { > \paper { - font_normal = 12.; + font_normal = 12. \translator { \StaffContext - \consists Instrument_name_engraver; + \consists Instrument_name_engraver } } } diff --git a/input/test/volta.ly b/input/test/volta.ly index 5ff5265dd5..e08f25beb2 100644 --- a/input/test/volta.ly +++ b/input/test/volta.ly @@ -1,14 +1,15 @@ +\version "1.3.146" voiceE = \notes { -\clef bass; +\clef bass \property Staff.instrument = "Bass" \property Staff.instr = "B" % \property Staff.VoltaBracket = \turnOff - \time 4/4; f,2 ( ) f,8 r8 f8 e8 + \time 4/4 f,2 ( ) f,8 r8 f8 e8 \repeat volta 2 { d8. d16 e8. f16 f8 c8 c16 c8. @@ -22,8 +23,8 @@ voiceE = \notes { } voicedefault = \notes { - \time 4/4; \key f \major ; - \tempo 4 = 200; + \time 4/4 \key f \major + \tempo 4 = 200 } \score{ \notes < @@ -37,11 +38,11 @@ voicedefault = \notes { > \paper { - font_normal = 12.; + font_normal = 12. \translator { \StaffContext TimeSignature \override #'style = #'C - \consists Instrument_name_engraver; + \consists Instrument_name_engraver } } } diff --git a/input/test/warnings.ly b/input/test/warnings.ly index 34d64ff246..777ab08289 100644 --- a/input/test/warnings.ly +++ b/input/test/warnings.ly @@ -1,10 +1,11 @@ +\version "1.3.146" \header { texidoc="Various warnings -"; +" } -linebreak = \penalty -1000; +linebreak = \penalty #-1000 \score { \notes { |