From e41a16f9d7920a1eb922e6f9a45a2d1868545dba Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 13 Aug 2001 15:56:13 +0200 Subject: [PATCH] patch::: 1.5.5.jcn1 1.5.5.jcn1 ========== * Updated input/bugs. 1.5.5 ===== --- CHANGES | 8 +++++ VERSION | 2 +- input/bugs/1st-note-spacing.ly | 1 + input/bugs/abe.ly | 9 +++--- input/bugs/ac-clash.ly | 1 + input/bugs/accents.ly | 1 + input/bugs/accidental-collision.ly | 5 +-- input/bugs/ancient-font.ly | 2 +- input/bugs/auto-beam-tuplets.ly | 3 +- input/bugs/auto-beam.ly | 3 +- input/bugs/barline.ly | 9 +++--- input/bugs/beam.ly | 1 + input/bugs/beamed-chord.ly | 7 +++-- input/bugs/beaming.ly | 1 + input/bugs/braces.ly | 3 +- input/bugs/broken-tuplet.ly | 7 +++-- input/bugs/context-weirdness.ly | 13 ++++---- input/bugs/denneboom.ly | 49 +++++++++++++++--------------- input/bugs/die-staff.ly | 3 +- input/bugs/different-time.ly | 11 ++++--- input/bugs/dots.ly | 1 + input/bugs/drarn.ly | 11 ++++--- input/bugs/dynamic-switch.ly | 9 +++--- input/bugs/grace-dynamic.ly | 1 + input/bugs/grace-finger.ly | 1 + input/bugs/grace-gets-slur.ly | 1 + input/bugs/grace-staff-length.ly | 3 +- input/bugs/grace-stems.ly | 3 +- input/bugs/hinterfleisch-gone.ly | 5 +-- input/bugs/l.ly | 3 +- input/bugs/lyrics-bar.ly | 15 ++++----- input/bugs/lyrics-spacing.ly | 8 ++--- input/bugs/markup-definition.ly | 1 + input/bugs/markup.ly | 3 +- input/bugs/mmrest-collide.ly | 1 + input/bugs/multiply.ly | 1 + input/bugs/partial-beam.ly | 9 +++--- input/bugs/pc-direction.ly | 27 ++++++++-------- input/bugs/pc-mmrest.ly | 17 ++++++----- input/bugs/pc-rest-collide.ly | 1 + input/bugs/prefatory-spacing.ly | 5 +-- input/bugs/repeat.ly | 1 + input/bugs/rest-melisma.ly | 3 +- input/bugs/slur-attachment.ly | 9 +++--- input/bugs/slur-dots.ly | 3 +- input/bugs/slur-dx.ly | 7 +++-- input/bugs/slur-steep-broken.ly | 5 +-- input/bugs/spacing-very-tight.ly | 5 +-- input/bugs/staff-size.ly | 5 +-- input/bugs/standchen-space.ly | 1 + input/bugs/steep-beam.ly | 3 +- input/bugs/steep.ly | 7 +++-- input/bugs/text-kerning.ly | 5 +-- input/bugs/text-spanner.ly | 3 +- input/bugs/textcresc.ly | 3 +- input/bugs/tie-break-accidental.ly | 7 +++-- input/bugs/ties.ly | 11 ++++--- input/bugs/time.ly | 1 + input/bugs/triplets.ly | 13 ++++---- input/bugs/voice-switch-slur.ly | 7 +++-- 60 files changed, 214 insertions(+), 150 deletions(-) diff --git a/CHANGES b/CHANGES index f596eb2ffb..8bece14e4e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,11 @@ +1.5.5.jcn1 +========== + +* Updated input/bugs. + +1.5.5 +===== + 1.5.4.jcn2 ========== diff --git a/VERSION b/VERSION index 53945ddb6a..70100ec7bf 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=5 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/bugs/1st-note-spacing.ly b/input/bugs/1st-note-spacing.ly index f6170027fd..1760135b6c 100644 --- a/input/bugs/1st-note-spacing.ly +++ b/input/bugs/1st-note-spacing.ly @@ -1,3 +1,4 @@ +\version "1.3.148" \score {\notes \relative c'' < \context Staff = SA { \times 6/7 { [c8 c c c c c c] } } diff --git a/input/bugs/abe.ly b/input/bugs/abe.ly index 69a611427a..74d6625004 100644 --- a/input/bugs/abe.ly +++ b/input/bugs/abe.ly @@ -1,8 +1,9 @@ +\version "1.3.148" -% Generated by mudela-book.py; options are +% Generated by mudela-book.py options are \include "paper16.ly" -\paper { linewidth = 390.000000 \pt; } +\paper { linewidth = 390.000000 \pt } \score { \notes \relative c'' { @@ -12,8 +13,8 @@ \paper { \translator { \StaffContext - \remove "Clef_engraver"; - \remove "Staff_symbol_engraver"; + \remove "Clef_engraver" + \remove "Staff_symbol_engraver" } } } diff --git a/input/bugs/ac-clash.ly b/input/bugs/ac-clash.ly index 0f0d4f482f..7e58fd47c0 100644 --- a/input/bugs/ac-clash.ly +++ b/input/bugs/ac-clash.ly @@ -1,3 +1,4 @@ +\version "1.3.148" % accidentals clash \score { \context Staff \notes\relative c' < diff --git a/input/bugs/accents.ly b/input/bugs/accents.ly index 1712266870..6d26098115 100644 --- a/input/bugs/accents.ly +++ b/input/bugs/accents.ly @@ -1,3 +1,4 @@ +\version "1.3.148" \score { \context Staff \notes\relative c''< \context Voice=one { diff --git a/input/bugs/accidental-collision.ly b/input/bugs/accidental-collision.ly index 76318dc101..503eff45a0 100644 --- a/input/bugs/accidental-collision.ly +++ b/input/bugs/accidental-collision.ly @@ -1,7 +1,8 @@ +\version "1.3.148" -\include "paper16.ly"; +\include "paper16.ly" \score { \notes { \relative c'' \context Voice \sequential { @@ -9,6 +10,6 @@ } } \paper{ - linewidth = 5.0\cm; + linewidth = 5.0\cm } } diff --git a/input/bugs/ancient-font.ly b/input/bugs/ancient-font.ly index 13287d5870..6aef817e6b 100644 --- a/input/bugs/ancient-font.ly +++ b/input/bugs/ancient-font.ly @@ -1,4 +1,4 @@ -\version "1.3.146" +\version "1.3.148" \header { texidoc="setting staff symbol properties the normal way is broken" title = "ancient font test" diff --git a/input/bugs/auto-beam-tuplets.ly b/input/bugs/auto-beam-tuplets.ly index 41f707abfe..9c6a0c4c96 100644 --- a/input/bugs/auto-beam-tuplets.ly +++ b/input/bugs/auto-beam-tuplets.ly @@ -1,6 +1,7 @@ +\version "1.3.148" \header { texidoc = "tuplet-spanner should not put visible brackets on -beams even if they're auto generated."; } +beams even if they're auto generated." } \score { \notes \relative c' { \property Voice.tupletSpannerDuration = #(make-moment 1 4) diff --git a/input/bugs/auto-beam.ly b/input/bugs/auto-beam.ly index 0d6ee48976..b2120ee7bc 100644 --- a/input/bugs/auto-beam.ly +++ b/input/bugs/auto-beam.ly @@ -1,6 +1,7 @@ +\version "1.3.148" \header { -texidoc ="Auto beam can not be put on the final notes of a score "; +texidoc = "Auto beam can not be put on the final notes of a score " } \score { \notes { diff --git a/input/bugs/barline.ly b/input/bugs/barline.ly index aaf7ad5841..73fb3631c0 100644 --- a/input/bugs/barline.ly +++ b/input/bugs/barline.ly @@ -1,17 +1,18 @@ +\version "1.3.148" \header { -texidoc= "Staves that end half way a system should end at the bar line."; +texidoc = "Staves that end half way a system should end at the bar line." } melody = \notes \relative c' { - \partial 8; + \partial 8 g8 | - \bar "|.";\clef bass; + \bar "|."\clef bass } -accompaniment =\chords \sequential { +accompaniment = \chords \sequential { r8 r2 r2 } diff --git a/input/bugs/beam.ly b/input/bugs/beam.ly index 44e7dfee39..a2eb18c82b 100644 --- a/input/bugs/beam.ly +++ b/input/bugs/beam.ly @@ -1,3 +1,4 @@ +\version "1.3.148" \header { texidoc="beam-stem attachment test" } diff --git a/input/bugs/beamed-chord.ly b/input/bugs/beamed-chord.ly index 935174e64f..51b1fbdb93 100644 --- a/input/bugs/beamed-chord.ly +++ b/input/bugs/beamed-chord.ly @@ -1,13 +1,14 @@ +\version "1.3.148" \header{ -texidoc="Beam thinks that first two notes should be stem down. Can be fixed by uncommenting \stemUp"; +texidoc = "Beam thinks that first two notes should be stem down. Can be fixed by uncommenting \stemUp" } \score{ \notes\relative c'{ %\stemUp - \clef alto; - \time 3/4; + \clef alto + \time 3/4 r8 ) bes' d g, c, c,> r | } } diff --git a/input/bugs/beaming.ly b/input/bugs/beaming.ly index ae0ccd55a0..e8e153dc9a 100644 --- a/input/bugs/beaming.ly +++ b/input/bugs/beaming.ly @@ -1,3 +1,4 @@ +\version "1.3.148" \score { \notes { diff --git a/input/bugs/braces.ly b/input/bugs/braces.ly index 04179b0ec3..9340d04aaa 100644 --- a/input/bugs/braces.ly +++ b/input/bugs/braces.ly @@ -1,8 +1,9 @@ +\version "1.3.148" % this bug apparently caused by dvips + mf rounding. \header { -texidoc="Run this through ly2dvi to show differerent brace sizes" +texidoc = "Run this through ly2dvi to show differerent brace sizes" } \include "paper11.ly" diff --git a/input/bugs/broken-tuplet.ly b/input/bugs/broken-tuplet.ly index 9f4cbaff30..5008c4aff2 100644 --- a/input/bugs/broken-tuplet.ly +++ b/input/bugs/broken-tuplet.ly @@ -1,7 +1,8 @@ +\version "1.3.148" \header { -texidoc ="tuplet bracket doesn't behave properly at line break. Not a real problem."; +texidoc = "tuplet bracket doesn't behave properly at line break. Not a real problem." } \score{ @@ -11,7 +12,7 @@ texidoc ="tuplet bracket doesn't behave properly at line break. Not a real probl c4 c c c } > \paper{ - indent = 0.; - linewidth=30.\mm; + indent = 0. + linewidth=30.\mm } } diff --git a/input/bugs/context-weirdness.ly b/input/bugs/context-weirdness.ly index b7f4a6e8eb..1ad6232f85 100644 --- a/input/bugs/context-weirdness.ly +++ b/input/bugs/context-weirdness.ly @@ -1,6 +1,7 @@ +\version "1.3.148" \header { texidoc = "context level weirdness. after some commands, explicit - \context Voice commands must be inserted; otherwise subsequent property + \context Voice commands must be inserted otherwise subsequent property settings fail silently" } @@ -14,31 +15,31 @@ texidoc = "context level weirdness. after some commands, explicit \context Staff=upper \notes\relative c' { \property Score.timing = ##f - \outputproperty #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) + output = property #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) c-"foe" \translator Staff=lower % staff switch moves us % implicitely to staff level: text-checker won't see "foe" - \outputproperty #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) + output = property #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) c-"foe" % get back to Voice level: it works again \context Voice - \outputproperty #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) + output = property #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) c-"foe" \clef treble % clef change moves us % implicitely to staff level: text-checker won't see "foe" - \outputproperty #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) + output = property #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) c-"foe" % get back to Voice level: it works again \context Voice - \outputproperty #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) + output = property #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) c-"foe" } diff --git a/input/bugs/denneboom.ly b/input/bugs/denneboom.ly index 5f368a7d56..9b72cf4fe6 100644 --- a/input/bugs/denneboom.ly +++ b/input/bugs/denneboom.ly @@ -1,7 +1,8 @@ +\version "1.3.148" \header{ -filename = "denneboom.ly"; -enteredby = "jcn"; -copyright = "public domain"; +filename = "denneboom.ly" +enteredby = "jcn" +copyright = "public domain" } %{ file tests silly line shapes %} @@ -9,7 +10,7 @@ copyright = "public domain"; -oden = \lyrics{ +oden = \lyrics{ O | den- ne- boom, o | den- ne- boom Wat | @@ -17,7 +18,7 @@ oden = \lyrics{ won- der- schoon } -ikheb = \lyrics{ +ikheb = \lyrics{ Ik | heb u laatst in_'t | bos zien staan toen | @@ -25,7 +26,7 @@ ikheb = \lyrics{ kaars- jes aan } -ugloeit = \lyrics{ +ugloeit = \lyrics{ U | gloeit in bar- re | win- ter- tijd, als | @@ -33,7 +34,7 @@ ugloeit = \lyrics{ licht ge- spreid } -oboom = \notes\transpose c''{ +oboom = \notes\transpose c''{ g,8 | c8. c16 c4. d8 | e8. e16 e4. e8 | @@ -41,7 +42,7 @@ oboom = \notes\transpose c''{ d8. c16 c4 r8 } -bos = \notes\transpose c''{ +bos = \notes\transpose c''{ g8 | g e a4. g8 | g8. f16 f4 r8 f8 | @@ -50,7 +51,7 @@ bos = \notes\transpose c''{ } -melody = \notes{ +melody = \notes{ \oboom \oboom \bos @@ -58,31 +59,31 @@ melody = \notes{ } -verseOne = \notes{ +verseOne = \notes{ \oden \oden \ikheb \oden } -verseOneStaff = \context Lyrics = one - \$verse_one +verseOneStaff = \context Lyrics = one + \verseOne -verseTwo = \notes{ +verseTwo = \notes{ \oden \oden \ugloeit \oden } -verseTwoStaff = \context Lyrics = two - \$verse_two +verseTwoStaff = \context Lyrics = two + \verseTwo -denneboomShape = \paper{ +denneboomShape = \paper{ \paperTwenty - indent = 20. \mm; + indent = 20. \mm % UGH -- THIS IS HAIRY #'margin-shape = #(map @@ -99,17 +100,17 @@ denneboomShape = \paper{ (65.0 . 30.0)) ) - gourlay_maxmeasures = 30.; - arithmetic_basicspace = 3.8; - arithmetic_multiplier = 8.\pt; + gourlay_maxmeasures = 30. + arithmetic_basicspace = 3.8 + arithmetic_multiplier = 8.\pt } \score{ \addlyrics - \context Staff { \time 3/4; \melody } - \context Lyrics \$verse_one + \context Staff { \time 3/4 \melody } + \context Lyrics \verseOne \paper{ - \$denneboom_shape + \denneboomShape } - \midi{ \tempo 4 = 90; } + \midi{ \tempo 4 = 90 } } diff --git a/input/bugs/die-staff.ly b/input/bugs/die-staff.ly index 294847a1b2..1f3b94174a 100644 --- a/input/bugs/die-staff.ly +++ b/input/bugs/die-staff.ly @@ -1,3 +1,4 @@ +\version "1.3.148" \header { texidoc = "a staff should really die, if no one's referencing it." @@ -15,7 +16,7 @@ texidoc = "a staff should really die, if no one's referencing it." \notes { a' b' c' d' } } \context Staff = ii { - \notes { \clef "bass"; a b c d } + \notes { \clef "bass" a b c d } } > } diff --git a/input/bugs/different-time.ly b/input/bugs/different-time.ly index c7031adcc9..2db2460f2b 100644 --- a/input/bugs/different-time.ly +++ b/input/bugs/different-time.ly @@ -1,7 +1,8 @@ +\version "1.3.148" \header { -texidoc =" Spacing for one staff in polymetric music should -be not hampered by a staff in another time signature."; +texidoc = " Spacing for one staff in polymetric music should +be not hampered by a staff in another time signature." } \score{ @@ -19,14 +20,14 @@ be not hampered by a staff in another time signature."; } > \paper{ - linewidth=-1.0; + linewidth=-1.0 \translator { \ScoreContext - \remove Timing_engraver; + \remove Timing_engraver } \translator { \StaffContext - \consists Timing_engraver; + \consists Timing_engraver } } } diff --git a/input/bugs/dots.ly b/input/bugs/dots.ly index ff1d7f20ff..b279b4c06d 100644 --- a/input/bugs/dots.ly +++ b/input/bugs/dots.ly @@ -1,3 +1,4 @@ +\version "1.3.148" \header { texidoc = "Dots should remain close to the heads they belong to, but should not overlap." diff --git a/input/bugs/drarn.ly b/input/bugs/drarn.ly index c3c131aa08..7fcadb6cc1 100644 --- a/input/bugs/drarn.ly +++ b/input/bugs/drarn.ly @@ -1,14 +1,15 @@ +\version "1.3.148" %% oops, weird small ties \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 \property Voice.Slur \set #'direction = #1 \property Voice.Slur \set #'attachment = #'(head . head) - c8~c()c + c8 c()c } \context Voice=two \relative c'' { \property Voice.Stem \set #'direction = #-1 @@ -17,7 +18,7 @@ \property Voice.Slur \set #'attachment = #'(head . head) a8()a~a } - > - \paper { linewidth = -1.; } -% \paper { linewidth = 40*\staffspace; } + > ~ + \paper { linewidth = -1. } +% \paper { linewidth = 40*\staffspace } } diff --git a/input/bugs/dynamic-switch.ly b/input/bugs/dynamic-switch.ly index c392f4d4cb..a4902efe5e 100644 --- a/input/bugs/dynamic-switch.ly +++ b/input/bugs/dynamic-switch.ly @@ -1,12 +1,13 @@ +\version "1.3.148" % what's the problem? \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 \clef bass; c2 + c2 \clef bass c2 c2 c2 } \context Thread=two \notes\relative c'' { @@ -15,7 +16,7 @@ } > \paper{ - linewidth=140.\mm; + linewidth=140.\mm } } diff --git a/input/bugs/grace-dynamic.ly b/input/bugs/grace-dynamic.ly index 89b002c4cf..68f0c4daf1 100644 --- a/input/bugs/grace-dynamic.ly +++ b/input/bugs/grace-dynamic.ly @@ -1,3 +1,4 @@ +\version "1.3.148" % ? diff --git a/input/bugs/grace-finger.ly b/input/bugs/grace-finger.ly index 077b407038..d5552b1f76 100644 --- a/input/bugs/grace-finger.ly +++ b/input/bugs/grace-finger.ly @@ -1,3 +1,4 @@ +\version "1.3.148" % ? diff --git a/input/bugs/grace-gets-slur.ly b/input/bugs/grace-gets-slur.ly index 8b13789179..91c43c3229 100644 --- a/input/bugs/grace-gets-slur.ly +++ b/input/bugs/grace-gets-slur.ly @@ -1 +1,2 @@ +\version "1.3.148" diff --git a/input/bugs/grace-staff-length.ly b/input/bugs/grace-staff-length.ly index 25b4037616..1b2713f821 100644 --- a/input/bugs/grace-staff-length.ly +++ b/input/bugs/grace-staff-length.ly @@ -1,5 +1,6 @@ +\version "1.3.148" \header{ -texidoc="stripped version of trip.ly. upper staff is too short, lower too long" +texidoc = "stripped version of trip.ly. upper staff is too short, lower too long" } \score{ \context PianoStaff \notes < diff --git a/input/bugs/grace-stems.ly b/input/bugs/grace-stems.ly index 26add43ba8..1b8c6a3c2e 100644 --- a/input/bugs/grace-stems.ly +++ b/input/bugs/grace-stems.ly @@ -1,5 +1,6 @@ +\version "1.3.148" \header{ -texidoc="startGraceMusic should no-stem-extend to true, but there's no effect: +texidoc = "startGraceMusic should no-stem-extend to true, but there's no effect: the two grace beams should be the same here. " } diff --git a/input/bugs/hinterfleisch-gone.ly b/input/bugs/hinterfleisch-gone.ly index 19db673359..d46bae81a5 100644 --- a/input/bugs/hinterfleisch-gone.ly +++ b/input/bugs/hinterfleisch-gone.ly @@ -1,13 +1,14 @@ +\version "1.3.148" % jij had zoon mooi tight spacing example, % kan zo'n harde space ook niet voor en na maatstreep! \score { \notes \relative c'' { - \time 2/4; + \time 2/4 \property Voice.noAutoBeaming=##t a4 a8 a32 a a a } %set bit wide -\paper {linewidth = 100.\mm;} +\paper {linewidth = 100.\mm} } diff --git a/input/bugs/l.ly b/input/bugs/l.ly index 7711233517..3c8902ad23 100644 --- a/input/bugs/l.ly +++ b/input/bugs/l.ly @@ -1,3 +1,4 @@ +\version "1.3.148" -\score { \notes { c^#`(rows ";" (lines "1" (bold "2") "3"))}} +\score { \notes { c^#`(columns "" (lines "1" (bold "2") "3"))}} diff --git a/input/bugs/lyrics-bar.ly b/input/bugs/lyrics-bar.ly index 26a675ce34..3ebafb9b1a 100644 --- a/input/bugs/lyrics-bar.ly +++ b/input/bugs/lyrics-bar.ly @@ -1,3 +1,4 @@ +\version "1.3.148" % % Lyrics with barline colliding is fine now, BUT @@ -5,16 +6,16 @@ % \header{ -texidoc=" +texidoc = " Adding a @code{Bar_engraver} to the LyricsVoice context makes sure that lyrics don't collide with barlines. -"; +" } \score { \context StaffGroup < \notes \context Staff { - b1 \bar "|:"; b1 \bar ":|"; + b1 \bar "|:" b1 \bar ":|" } \lyrics\context Lyrics < \context LyricsVoiceWithBars { @@ -28,15 +29,15 @@ lyrics don't collide with barlines. \notes \context Staff = SB { b1 b1 } > \paper { - linewidth = -1.0\cm; + linewidth = -1.0\cm \translator { \LyricsContext - \accepts "LyricsVoiceWithBars"; + \accepts "LyricsVoiceWithBars" } \translator { \LyricsVoiceContext - \consists "Bar_engraver"; - \name "LyricsVoiceWithBars"; + \consists "Bar_engraver" + \name "LyricsVoiceWithBars" } \translator { \LyricsVoiceContext diff --git a/input/bugs/lyrics-spacing.ly b/input/bugs/lyrics-spacing.ly index bb43fbc2f6..623016d37b 100644 --- a/input/bugs/lyrics-spacing.ly +++ b/input/bugs/lyrics-spacing.ly @@ -2,10 +2,10 @@ \header { texidoc ="``baz'' should be centered on the a (tenor voice), but it is -not."; +not." } -\version "1.3.140"; +\version "1.3.148" sop = \notes \transpose c'' {e2 e fis1 } alt = \notes \relative c' {cis2 e e d } @@ -18,10 +18,10 @@ txt = \lyrics {foo2 bar baz jazz } \context Voice=sopv {\stemUp \sop} \context Voice=altv {\stemDown \alt} > - \context Staff = down \notes < \clef "F"; + \context Staff = down \notes < \clef "F" \context Voice=tenv {\stemUp \ten} > \context Lyrics = la { \txt } > - \paper { linewidth = -1; } + \paper { linewidth = -1 } } diff --git a/input/bugs/markup-definition.ly b/input/bugs/markup-definition.ly index 17d576b7a0..6daf2bd719 100644 --- a/input/bugs/markup-definition.ly +++ b/input/bugs/markup-definition.ly @@ -1,3 +1,4 @@ +\version "1.3.148" %{ The definition of markup is incomplete. diff --git a/input/bugs/markup.ly b/input/bugs/markup.ly index 7711233517..3c8902ad23 100644 --- a/input/bugs/markup.ly +++ b/input/bugs/markup.ly @@ -1,3 +1,4 @@ +\version "1.3.148" -\score { \notes { c^#`(rows ";" (lines "1" (bold "2") "3"))}} +\score { \notes { c^#`(columns "" (lines "1" (bold "2") "3"))}} diff --git a/input/bugs/mmrest-collide.ly b/input/bugs/mmrest-collide.ly index 74578070ec..c2a57ae775 100644 --- a/input/bugs/mmrest-collide.ly +++ b/input/bugs/mmrest-collide.ly @@ -1,3 +1,4 @@ +\version "1.3.148" % % multi-measure-rests should collide with notes, just as normal rests. % diff --git a/input/bugs/multiply.ly b/input/bugs/multiply.ly index 6d611c4882..0c2ba18271 100644 --- a/input/bugs/multiply.ly +++ b/input/bugs/multiply.ly @@ -1,3 +1,4 @@ +\version "1.3.148" diff --git a/input/bugs/partial-beam.ly b/input/bugs/partial-beam.ly index fb881816ad..670780c46b 100644 --- a/input/bugs/partial-beam.ly +++ b/input/bugs/partial-beam.ly @@ -1,10 +1,11 @@ +\version "1.3.148" \include "paper20.ly" Sopnotes = \notes { - \time 4/4; - \key g \major; - \clef treble; - \partial 8 * 3; + \time 4/4 + \key g \major + \clef treble + \partial 8 * 3 e'8 f'8 g'8 | d'8 d'16 d'16 e'8. e'16 g'8 g'8 f'8 f'8 } diff --git a/input/bugs/pc-direction.ly b/input/bugs/pc-direction.ly index aa1327175d..948f43716f 100644 --- a/input/bugs/pc-direction.ly +++ b/input/bugs/pc-direction.ly @@ -1,3 +1,4 @@ +\version "1.3.148" % move to regtest once it works? @@ -5,13 +6,13 @@ % still not workign ? --hwn. \header { -texidoc=" -On their own staff, staffcombined voices should be stemboth (not up/down); -while voicecombined threads should get their direction set (up/down)"; +texidoc = " +On their own staff, staffcombined voices should be stemboth (not up/down) +while voicecombined threads should get their direction set (up/down)" } -End = { \skip 1*8; } +End = { \skip 1*8 } violaI = \notes\relative c'' { c c e4. e8 @@ -31,7 +32,7 @@ contrabasso = \notes\relative c { a1 } -violeStaff = \notes \context Staff = viole < +violeStaff = \notes \context Staff = viole < \context Voice=oneViole < \property Staff.instrument = #"Viola" \property Staff.instr = #"Vla." @@ -69,13 +70,13 @@ staffCombinePianoStaffProperties = { \context PianoStaff = bassi_group \notes < \staffCombinePianoStaffProperties - \context Staff=oneBassi < \clef bass; + \context Staff=oneBassi < \clef bass \property Staff.instrument = #'(lines "Violoncello" " e" "Contrabasso") \property Staff.instr = #"Vc." \End > - \context Staff=twoBassi < \clef bass; + \context Staff=twoBassi < \clef bass \property Staff.instrument = #"Contrabasso" \property Staff.instr = #"Cb." @@ -89,11 +90,11 @@ staffCombinePianoStaffProperties = { > \paper { % \paperSixteen - linewidth = 80 * \staffspace; - textheight = 200 * \staffspace; + linewidth = 80 * \staffspace + textheight = 200 * \staffspace \translator{ \ThreadContext - \consists "Rest_engraver"; + \consists "Rest_engraver" % Set value for engraver at thread level, % to override the default that is set in ScoreContext @@ -102,7 +103,7 @@ staffCombinePianoStaffProperties = { } \translator{ \VoiceContext - \remove "Rest_engraver"; + \remove "Rest_engraver" % The staff combine (bassi part) needs a % thread_devnull_engraver here. @@ -110,11 +111,11 @@ staffCombinePianoStaffProperties = { % we switch add it, but switch it off immideately. % The staff combine parts switch it on. % devNullThread = #'never - \consists "Thread_devnull_engraver"; + \consists "Thread_devnull_engraver" } \translator{ \HaraKiriStaffContext - \consists "Mark_engraver"; + \consists "Mark_engraver" } \translator { \OrchestralScoreContext diff --git a/input/bugs/pc-mmrest.ly b/input/bugs/pc-mmrest.ly index e188fa5098..e3800990ae 100644 --- a/input/bugs/pc-mmrest.ly +++ b/input/bugs/pc-mmrest.ly @@ -1,3 +1,4 @@ +\version "1.3.148" % % mmrests of second voice should not disappear % @@ -17,7 +18,7 @@ one = \notes\relative c'' { d1| d2 d2| d2 d2| - \!f1\ff ~| + \!f1\ff | f1 } @@ -34,23 +35,23 @@ two = \notes \relative c'' { \context Voice=one \partcombine Voice \context Thread=one \one \context Thread=two \two - > + > ~ > \paper { \translator { \ThreadContext - \consists "Rest_engraver"; + \consists "Rest_engraver" } \translator { \VoiceContext - \remove "Rest_engraver"; - \consists Multi_measure_rest_engraver; - \consists Bar_engraver; + \remove "Rest_engraver" + \consists Multi_measure_rest_engraver + \consists Bar_engraver } \translator { \HaraKiriStaffContext - \remove Multi_measure_rest_engraver; - \remove Bar_engraver; + \remove Multi_measure_rest_engraver + \remove Bar_engraver } \translator { \OrchestralScoreContext diff --git a/input/bugs/pc-rest-collide.ly b/input/bugs/pc-rest-collide.ly index 1818d1ac51..2a2778955e 100644 --- a/input/bugs/pc-rest-collide.ly +++ b/input/bugs/pc-rest-collide.ly @@ -1,3 +1,4 @@ +\version "1.3.148" % % when part-combining, rests should collide as in normal case % diff --git a/input/bugs/prefatory-spacing.ly b/input/bugs/prefatory-spacing.ly index ba788f5f1d..06e718bc2a 100644 --- a/input/bugs/prefatory-spacing.ly +++ b/input/bugs/prefatory-spacing.ly @@ -1,11 +1,12 @@ +\version "1.3.148" \header { texidoc= "Spacing after clef/key should be stretched equidistantly for large stretching, but should stay clear of prefatory matter for small stretching. Support in the spacing engine for -separate spring constants for stretching/shrinking is needed"; +separate spring constants for stretching/shrinking is needed" } -foo = \notes\relative c'' { \key as \major; f } +foo = \notes\relative c'' { \key as \major f } \score { diff --git a/input/bugs/repeat.ly b/input/bugs/repeat.ly index 9a9835f806..411ed4211b 100644 --- a/input/bugs/repeat.ly +++ b/input/bugs/repeat.ly @@ -1,3 +1,4 @@ +\version "1.3.148" % should start with |: \score { \context Staff \notes \repeat volta 3 c1 \alternative { d1 e1 }} diff --git a/input/bugs/rest-melisma.ly b/input/bugs/rest-melisma.ly index 9ebb3ef1f6..b8ef6e73e0 100644 --- a/input/bugs/rest-melisma.ly +++ b/input/bugs/rest-melisma.ly @@ -1,5 +1,6 @@ +\version "1.3.148" \header { -texidoc="slur or long note on other staves fool lily into extending melisma" +texidoc = "slur or long note on other staves fool lily into extending melisma" } \score { < diff --git a/input/bugs/slur-attachment.ly b/input/bugs/slur-attachment.ly index c6fabda6a0..2353bbac5a 100644 --- a/input/bugs/slur-attachment.ly +++ b/input/bugs/slur-attachment.ly @@ -1,9 +1,10 @@ +\version "1.3.148" \header{ -texidoc=" +texidoc = " Slurs should be attached to note heads, except when they would collide with beams. Also see: ophee-slurs. -"; +" } \score{ \notes \relative c''{ @@ -14,7 +15,7 @@ with beams. Also see: ophee-slurs. a4() a8 a } \paper{ - indent = 0.0; - linewidth = 100.\mm; + indent = 0.0 + linewidth = 100.\mm } } diff --git a/input/bugs/slur-dots.ly b/input/bugs/slur-dots.ly index 5b52064c6b..34d0ddc42c 100644 --- a/input/bugs/slur-dots.ly +++ b/input/bugs/slur-dots.ly @@ -1,3 +1,4 @@ +\version "1.3.148" % Placement of slur uses x-extent of note-head which includes dots @@ -6,6 +7,6 @@ c4.............()c } \paper { - linewidth = -1.; + linewidth = -1. } } diff --git a/input/bugs/slur-dx.ly b/input/bugs/slur-dx.ly index 745e8ab1a1..cd540082a4 100644 --- a/input/bugs/slur-dx.ly +++ b/input/bugs/slur-dx.ly @@ -1,10 +1,11 @@ +\version "1.3.148" \header{ -texidoc=" +texidoc = " Right ending of slur is too far right. [I did make a better test .ly for this, but can't seem to find it -now.] "; } +now.] " } \score { \notes \relative c'' { @@ -15,6 +16,6 @@ now.] "; } d,32( d'4 )d8.. } \paper { - linewidth = -1.; + linewidth = -1. } } diff --git a/input/bugs/slur-steep-broken.ly b/input/bugs/slur-steep-broken.ly index e98f3473e7..0b63568fae 100644 --- a/input/bugs/slur-steep-broken.ly +++ b/input/bugs/slur-steep-broken.ly @@ -1,10 +1,11 @@ +\version "1.3.148" \score{ \notes\relative c''{ - \time 2/4; + \time 2/4 [f8 e d f, (] | \break [) a'8. gis16 fis8. cis16] | } - \paper{linewidth = 3.0\cm;indent = .0;} + \paper{linewidth = 3.0\cmindent = .0} } diff --git a/input/bugs/spacing-very-tight.ly b/input/bugs/spacing-very-tight.ly index b863ef4841..39b95ca391 100644 --- a/input/bugs/spacing-very-tight.ly +++ b/input/bugs/spacing-very-tight.ly @@ -1,3 +1,4 @@ +\version "1.3.148" % When tightly spaced, hinterfleisch -> 0. % Stems may touch the bar lines, opposite stems may touch eachother. @@ -10,7 +11,7 @@ r1 e4 f, e' f, } \paper { - linewidth = 25.0 \mm; - indent = 0.0\mm; + linewidth = 25.0 \mm + indent = 0.0\mm } } diff --git a/input/bugs/staff-size.ly b/input/bugs/staff-size.ly index 699155acd2..3a6640d6df 100644 --- a/input/bugs/staff-size.ly +++ b/input/bugs/staff-size.ly @@ -1,3 +1,4 @@ +\version "1.3.148" % separate staff-size is clumsy with \override. @@ -8,13 +9,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/bugs/standchen-space.ly b/input/bugs/standchen-space.ly index 7d9e6322ab..2b9ddfa124 100644 --- a/input/bugs/standchen-space.ly +++ b/input/bugs/standchen-space.ly @@ -1,3 +1,4 @@ +\version "1.3.148" \score { \notes \relative c' < diff --git a/input/bugs/steep-beam.ly b/input/bugs/steep-beam.ly index 35b38662de..f07d339017 100644 --- a/input/bugs/steep-beam.ly +++ b/input/bugs/steep-beam.ly @@ -1,6 +1,7 @@ +\version "1.3.148" \header { -texidoc ="1st beam should prob. be horizontal."; +texidoc = "1st beam should prob. be horizontal." } \score { \notes <{ [ r8 g''16 des'] [r8 c16 a] }>} diff --git a/input/bugs/steep.ly b/input/bugs/steep.ly index 474d80ca94..a3fff9c703 100644 --- a/input/bugs/steep.ly +++ b/input/bugs/steep.ly @@ -1,14 +1,15 @@ +\version "1.3.148" \score{ \notes\relative c''{ a'( a a [a8...] b,32\break - c4 \clef bass; c,,, c )c + c4 \clef bass c,,, c )c } \paper{ - indent=0.0\mm; - linewidth=40.0\mm; + indent=0.0\mm + linewidth=40.0\mm } } diff --git a/input/bugs/text-kerning.ly b/input/bugs/text-kerning.ly index ad72afbbfe..4f67222a6b 100644 --- a/input/bugs/text-kerning.ly +++ b/input/bugs/text-kerning.ly @@ -1,7 +1,8 @@ +\version "1.3.148" \header { -texidoc= "LilyPond doesn't kern text, but TeX does, leading to skewed results: the VAVAVAVA takes less space than LilyPond thinks it does."; } +texidoc = "LilyPond doesn't kern text, but TeX does, leading to skewed results: the VAVAVAVA takes less space than LilyPond thinks it does." } \score { \notes \relative c'' < \context Voice { @@ -11,5 +12,5 @@ texidoc= "LilyPond doesn't kern text, but TeX does, leading to skewed results: t \context Lyrics \lyrics { foobar4 -- VAVAVAVAV4 -- foobar4 } > - \paper { linewidth = -10.0\cm; } + \paper { linewidth = -10.0\cm } } diff --git a/input/bugs/text-spanner.ly b/input/bugs/text-spanner.ly index 31a114cf2c..e4b875e923 100644 --- a/input/bugs/text-spanner.ly +++ b/input/bugs/text-spanner.ly @@ -1,3 +1,4 @@ +\version "1.3.148" % text spanners should not repeat start text when broken @@ -9,6 +10,6 @@ c1 \!c \break } \paper { - linewidth = 40*\staffspace; + linewidth = 40*\staffspace } } diff --git a/input/bugs/textcresc.ly b/input/bugs/textcresc.ly index e9f6eac683..91127368f5 100644 --- a/input/bugs/textcresc.ly +++ b/input/bugs/textcresc.ly @@ -1,3 +1,4 @@ +\version "1.3.148" \score { \notes { @@ -7,6 +8,6 @@ c2. r8 c8 \< \break \! c1 } } -\paper { linewidth = 5.\cm;} +\paper { linewidth = 5.\cm} } diff --git a/input/bugs/tie-break-accidental.ly b/input/bugs/tie-break-accidental.ly index 94b7e3d3b6..d17bd8b3c8 100644 --- a/input/bugs/tie-break-accidental.ly +++ b/input/bugs/tie-break-accidental.ly @@ -1,17 +1,18 @@ +\version "1.3.148" \header { texidoc = "First and second bes (tied across line break) -should get an accidental, but others should not"; +should get an accidental, but others should not" } \score { \notes { bes1 ~ | \break bes2 ~ bes4 ~ bes4 ~ | bes1 - \key f\major; + \key f\major bes1 ~|bes2 b ~|b ~ b ~|b1 } \paper { - linewidth = 40*\staffspace; + linewidth = 40*\staffspace } } diff --git a/input/bugs/ties.ly b/input/bugs/ties.ly index 4555481052..3cf5137570 100644 --- a/input/bugs/ties.ly +++ b/input/bugs/ties.ly @@ -1,21 +1,22 @@ +\version "1.3.148" \header { - texidoc="Positioning of last ties is incorrect; ties between 2-1 and 1-1 - durations differ."; + texidoc="Positioning of last ties is incorrect ties between 2-1 and 1-1 + durations differ." } \score { \context Staff < \context Voice = a \notes\relative c'' { \voiceOne - r2 a2~a1~a + r2 a2 a1~a } \context Voice = y \notes\relative c' { \voiceTwo r2 a2~a1~a } - > + > ~ \paper { - linewidth = 100 * \staffspace; + linewidth = 100 * \staffspace } } diff --git a/input/bugs/time.ly b/input/bugs/time.ly index 88e9bf5cf3..400bc6cdec 100644 --- a/input/bugs/time.ly +++ b/input/bugs/time.ly @@ -1,3 +1,4 @@ +\version "1.3.148" % Uses old style diff --git a/input/bugs/triplets.ly b/input/bugs/triplets.ly index 9cc8704429..7546742a80 100644 --- a/input/bugs/triplets.ly +++ b/input/bugs/triplets.ly @@ -1,10 +1,11 @@ +\version "1.3.148" \header { -texidoc="Simple beams. This broke somewhere < 1.3.110 -"; - title = "Gammes Chromatiques"; - composer = ""; - filename = "gammes_chromatiques.ly"; +texidoc = "Simple beams. This broke somewhere < 1.3.110 +" + title = "Gammes Chromatiques" + composer = "" + filename = "gammes_chromatiques.ly" } %{ @@ -12,7 +13,7 @@ texidoc="Simple beams. This broke somewhere < 1.3.110 badly positionned) %} -linebreak = \penalty -1000; +linebreak = \penalty -1000 exI = \notes \relative c' { \repeat "volta" 2 { diff --git a/input/bugs/voice-switch-slur.ly b/input/bugs/voice-switch-slur.ly index 306dc2b0df..33b3b275d6 100644 --- a/input/bugs/voice-switch-slur.ly +++ b/input/bugs/voice-switch-slur.ly @@ -1,10 +1,11 @@ +\version "1.3.148" % docme. \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'' { c4( c b )a @@ -17,7 +18,7 @@ } > \paper{ - linewidth=140.\mm; + linewidth=140.\mm } } -- 2.39.5