From: Han-Wen Nienhuys Date: Fri, 13 Feb 2004 09:17:11 +0000 (+0000) Subject: release commit X-Git-Tag: release/2.1.23~13 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1fab2edbb360ecbb26b0a379deeca6bc4c37d243;p=lilypond.git release commit --- diff --git a/ChangeLog b/ChangeLog index ff551cb98e..d7469abbd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-02-13 Han-Wen Nienhuys + + * input/GNUmakefile (SUBDIRS): remove ascii-art + 2004-02-13 Jan Nieuwenhuizen * input/: Convert ly files that still had \property. Fixes make diff --git a/input/GNUmakefile b/input/GNUmakefile index c10ea6e64e..a738f04d6a 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -1,6 +1,6 @@ depth = .. -SUBDIRS=test regression tutorial no-notation ascii-art template mutopia +SUBDIRS=test regression tutorial no-notation template mutopia examples= les-nereides puer-fragment diff --git a/input/ascii-art/GNUmakefile b/input/ascii-art/GNUmakefile deleted file mode 100644 index 516974621f..0000000000 --- a/input/ascii-art/GNUmakefile +++ /dev/null @@ -1,5 +0,0 @@ -depth = ../.. - -LOCALSTEPMAKE_TEMPLATES=ly mutopia -include $(depth)/make/stepmake.make - diff --git a/input/ascii-art/as-email.ly b/input/ascii-art/as-email.ly deleted file mode 100644 index e196644c3b..0000000000 --- a/input/ascii-art/as-email.ly +++ /dev/null @@ -1,28 +0,0 @@ -#(ly:set-option 'old-relative) -\version "2.1.22" -% ASCII Art output -% -% Process as: -% -% lilypond -fas foo.ly -% as2text foo.as - -\include "paper-as5.ly" - -\score { - \notes\relative c'' { - \time 3/8 - a8 a a - \time 5/8 - a a a a a - %a16 a a a a a a a a a - } - \paper { - raggedright = ##t - \translator { - \StaffContext - StaffSymbol \override #'print-function = #(lambda (x) '()) - } - } -} - diff --git a/input/ascii-art/as1.ly b/input/ascii-art/as1.ly deleted file mode 100644 index fd48f26c63..0000000000 --- a/input/ascii-art/as1.ly +++ /dev/null @@ -1,14 +0,0 @@ -#(ly:set-option 'old-relative) - -\version "2.1.22" - -\score { - \context Voice \notes\relative c { - \time 4/4 - g''1 a2 b4. c8 - \repeat "volta" 2 { a4 b c d } \alternative { { c c c c } { d2 d4 [d8 d] } } - - } - \paper { } - \midi { } -} diff --git a/input/ascii-art/as2.ly b/input/ascii-art/as2.ly deleted file mode 100644 index 095c68c1d7..0000000000 --- a/input/ascii-art/as2.ly +++ /dev/null @@ -1,23 +0,0 @@ -#(ly:set-option 'old-relative) -\version "2.1.22" - -% test for ascii-art output - -\include "paper-as9.ly" - -\score { - \notes\relative c'{ - \time 4/4 - c8( e g )b - d( d d )d - \bar "|." - } - \paper { - linewidth=65.0\char - \translator { \StaffContext barSize = #9 } - %\translator { \VoiceContext beamHeight = #0 } - \translator { \VoiceContext beamHeight = ##f } - } - -} - diff --git a/input/ascii-art/asciiscript5.ly b/input/ascii-art/asciiscript5.ly deleted file mode 100644 index ba6567cbdb..0000000000 --- a/input/ascii-art/asciiscript5.ly +++ /dev/null @@ -1,26 +0,0 @@ -#(ly:set-option 'old-relative) -\version "2.1.22" -% ASCII Art output -% -% Process as: -% -% lilypond -fas foo.ly -% as2text foo.as - -\include "paper-as5.ly" - -\score { - \notes\relative c'' { - \time 4/4 - g1 a b c - g2 a b c - g4 a b c - } - \paper { - \translator { - \StaffContext - BarLine \override #'bar-size = #5 - } - } -} - diff --git a/input/ascii-art/asciiscript9.ly b/input/ascii-art/asciiscript9.ly deleted file mode 100644 index 27082a35e0..0000000000 --- a/input/ascii-art/asciiscript9.ly +++ /dev/null @@ -1,20 +0,0 @@ -#(ly:set-option 'old-relative) -\version "2.1.22" -% ASCII Art output -% -% Process as: -% -% lilypond -fas foo.ly -% as2text foo.as - -\include "paper-as9.ly" - -\score { - \notes\relative c'' { - \time 4/4 - g1 a b c - g2 a b c - g4 a b c - } -} - diff --git a/input/ascii-art/r-as.ly b/input/ascii-art/r-as.ly deleted file mode 100644 index 0513afff0b..0000000000 --- a/input/ascii-art/r-as.ly +++ /dev/null @@ -1,29 +0,0 @@ -#(ly:set-option 'old-relative) -\version "2.1.22" -% ASCII Art output -% -% Process as: -% -% lilypond -fas foo.ly -% as2text foo.as - -\include "paper-as5.ly" - -\score{ - << - \context Staff \notes\relative c'{ - c d e f - \repeat "volta" 2 { g a b c } - \alternative { { c b a g } { f e d c } } - } - \context Lyrics \lyrics { - De eer- ste << { maat } { moet } >> - \repeat fold 2 { } - \alternative { - { en dan twee keer } - { een koe- plet _ } - } - en dan nog dit er ach- ter aan - } - >> -} diff --git a/input/ascii-art/standchen-as5.ly b/input/ascii-art/standchen-as5.ly deleted file mode 100644 index c590ed6c74..0000000000 --- a/input/ascii-art/standchen-as5.ly +++ /dev/null @@ -1,43 +0,0 @@ -#(ly:set-option 'old-relative) -\version "2.1.22" -% ASCII Art output -% -% Process as: -% -% lilypond -fas foo.ly -% as2text foo.as - - -\include "paper-as5.ly" - -\score { - \context StaffGroup << - \context Staff=upper \notes\relative c{ - \key f \major - \time 3/4 - r8^"Moderato" %\pp - <> <> <> <> <> | - r8 <> <> - } - \context Staff=lower \notes\relative c{ - \key f \major - \time 3/4 - \clef "bass" - <> r4 - <> r4 - } - >> - \paper { - indent=4.0\char - linewidth=78.0\char - \translator { \StaffContext Bar \override #'bar-size = #5 } - \translator { - \VoiceContext - % horizontal beams - Beam \override #'height = #0 - autoBeamSettings \override #'(begin * * * *) = #(ly:make-moment 0 1) - TextScript \set #'no-spacing-rods = ##t - } - } -} - diff --git a/input/ascii-art/standchen-as9.ly b/input/ascii-art/standchen-as9.ly deleted file mode 100644 index bd9305f3fc..0000000000 --- a/input/ascii-art/standchen-as9.ly +++ /dev/null @@ -1,43 +0,0 @@ -#(ly:set-option 'old-relative) -\version "2.1.22" -% ASCII Art output - -% Process as: -% -% lilypond -fas foo.ly -% as2text foo.as - -% FIXME: broken system-start-delimiter.cc:staff_brace lookup - -\include "paper-as9.ly" - -\score { - \context GrandStaff << - \context Staff=upper \notes\relative c{ - \key f \major - \time 3/4 - r8^"Moderato" %\pp - <> <> <> <> <> | - r8 <> <> - } - \context Staff=lower \notes\relative c{ - \key f \major - \time 3/4 - \clef "bass" - <> r4 - <> r4 - } - >> - \paper { - indent=4.0\char - linewidth=78.0\char - \translator { - \VoiceContext - % horizontal beams - Beam \override #'height = #0 - autoBeamSettings \override #'(begin * * * *) = #(ly:make-moment 0 1) - TextScript \set #'no-spacing-rods = ##t - } - } -} - diff --git a/input/ascii-art/twinkle-as5.ly b/input/ascii-art/twinkle-as5.ly deleted file mode 100644 index aaa5925b44..0000000000 --- a/input/ascii-art/twinkle-as5.ly +++ /dev/null @@ -1,77 +0,0 @@ -#(ly:set-option 'old-relative) -\version "2.1.22" -% ASCII Art output -% -% Process as: -% -% lilypond -fas foo.ly -% as2text foo.as - - -\header{ -filename = "twinkle.ly" -title = "Twinkle Twinkle Little Star" -composer = "Traditional" -enteredby = "hwn and jcn" -copyright = "public domain" -} - - - -\include "paper-as5.ly" - -melody = \notes \relative c'' { - \time 2/4 - c4 c | g' g | a a | g g | -%{ - f f | e e | d d8.( e16 | )c2 | - - g'4 g | f f | e e | d d | - g g | f f | e( e8. f16 | e4 )d | - - c c | g' g | a a | g g | - f f | e e | d d8.( e16 | )c2 | -%} -} - -accompany = \notes \relative c { - \clef "bass" - \time 2/4 - c4 c' | e c | f c | e c | -%{ - d b | c a | f g | c,2 | - - e'4 g, | d' g, | c g | b g | - e' g, | d' g, | c c8.( d16 | c4 )b | - - c, c' | e c | f c | e c | - d b | c a | f g | c,2 -%} -} - - -text = \lyrics{ - Twin -- kle, twin -- kle, lit -- tle star, " " -%{ - How I won -- der what you " " are. - Up a -- bove the world so high, " " - Like a dia -- mond in the " " sky. " " - Twin -- kle, twin -- kle, lit -- tle star, " " - How I won -- der what you " " are! -%} -} - -\score{ - \context GrandStaff << - \addlyrics - \context Staff=upper \melody - \context Lyrics=between \text - \context Staff=lower \accompany - >> - \paper{ - \translator { \GrandStaffContext \accepts "Lyrics" } - indent=4.0\char - linewidth=78.0\char - } -} - diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly index 48eac1ba2d..f032de77be 100644 --- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -7,7 +7,7 @@ copyright = "Public Domain" } -\version "2.1.7" +\version "2.1.22" \include "nederlands.ly" diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly index 19a2d926e7..07d58201b2 100644 --- a/input/mutopia/F.Schubert/morgenlied.ly +++ b/input/mutopia/F.Schubert/morgenlied.ly @@ -39,9 +39,9 @@ manuscriptBreak = { \break } } modernAccidentals = { - \set Staff.extraNatural = ##f - \set Staff.autoAccidentals = #'(Staff (same-octave . 1) (any-octave . 0)) - \set Staff.autoCautionaries = #'() + \set Staff.extraNatural = ##f + \set Staff.autoAccidentals = #'(Staff (same-octave . 1) (any-octave . 0)) + \set Staff.autoCautionaries = #'() } @@ -73,12 +73,21 @@ melody = \notes \relative c'' \repeat volta 2 \context Voice = singer { } +<<<<<<< morgenlied.ly +ignoreMelisma = \set ignoreMelismata = ##t +ignoreMelismaOff = \unset ignoreMelismata +======= ignoreMelisma = \set ignoreMelismata = ##t ignoreMelismaOff = \unset ignoreMelismata +>>>>>>> 1.20 firstVerse = \lyrics { +<<<<<<< morgenlied.ly + \set stanza = "1." +======= \set stanza = "1." +>>>>>>> 1.20 Sü -- ßes Licht! Aus \ignoreMelisma @@ -93,7 +102,11 @@ firstVerse = \lyrics { } secondVerse = \lyrics { +<<<<<<< morgenlied.ly + \set stanza = "2." +======= \set stanza = "2." +>>>>>>> 1.20 Ach, der Lie -- be sanf -- tes We -- hen schwellt mir | das be -- weg -- te __ Herz, sanft, wie ein ge -- lieb -- ter Schmerz. __ Dürft ich | @@ -106,7 +119,11 @@ pianoRH = \notes \relative c''' \repeat volta 2 { g16(_\p fis a g fis g f e d c b a ) | 8( ) r8 r | r8 c'( e,) f r a | +<<<<<<< morgenlied.ly + \once \override DynamicLineSpanner #'padding =#3 +======= \once \override DynamicLineSpanner #'padding =#3 +>>>>>>> 1.20 r8_\> << { s8 s8-\! } << { fis( g) } \\ { c,4 } >> >> r8 | 4. r8 \clef bass | @@ -136,7 +153,11 @@ pianoLH = \notes \relative c'' \repeat volta 2 { fis r4 8( | 4.) +<<<<<<< morgenlied.ly + \once \override Slur #'height-limit = #1.0 +======= \once \override Slur #'height-limit = #1.0 +>>>>>>> 1.20 4.( | 4.) | c,4 r8 g4 r8 | @@ -155,7 +176,11 @@ pianoLH = \notes \relative c'' \repeat volta 2 { \lyricsto "singer" \new Lyrics \firstVerse \lyricsto "singer" \new Lyrics \secondVerse \new PianoStaff << +<<<<<<< morgenlied.ly + \set PianoStaff.instrument = \markup { +======= \set PianoStaff.instrument = \markup { +>>>>>>> 1.20 \bold \bigger\bigger\bigger\bigger \huge "2. " } \new Staff \pianoRH diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly index 590fae3b82..600e8fe192 100644 --- a/input/mutopia/F.Schubert/standchen.ly +++ b/input/mutopia/F.Schubert/standchen.ly @@ -44,7 +44,7 @@ instrument = "Piano" \version "2.1.22" -dynamicUp = \override DynamicLineSpanner #'direction = #1 +dynamicUp = \override DynamicLineSpanner #'direction = #1 dynamicRevert = \revert DynamicLineSpanner #'direction #(set-global-staff-size 16) @@ -66,13 +66,21 @@ vocalVerse = \notes\relative c''{ g8. b16 es4. d8 | c8. g16 es4. c8 | \grace { +<<<<<<< standchen.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.31 as'32[( bes ] \revert Stem #'stroke-style } \times 2/3 { as8[)( g)] as } c4. as8 | g2. | \grace { +<<<<<<< standchen.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.31 f32[( g ] \revert Stem #'stroke-style } \times 2/3 { f8[)( e)] f } as4. f8 | @@ -81,7 +89,11 @@ vocalVerse = \notes\relative c''{ g8. b16 es4. d8 | c8. g16 e4. c8 | \grace { +<<<<<<< standchen.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.31 a'32[( b ] \revert Stem #'stroke-style } \times 2/3 { a!8[)( gis)] a } c4. a8 | @@ -101,7 +113,11 @@ vocalThrough = \notes\relative c{ R2. | R2. | \grace { +<<<<<<< standchen.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.31 a32[( b ] \revert Stem #'stroke-style } \times 2/3 { a!8[)( gis)] a } c4. a8 | @@ -193,9 +209,17 @@ trebleVerseOne = \notes\relative c{ r8\pp | %20 r8 | +<<<<<<< standchen.ly + \override Slur #'attachment = #'(stem . stem) +======= \override Slur #'attachment = #'(stem . stem) +>>>>>>> 1.31 \grace { +<<<<<<< standchen.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.31 as'32[( bes ] \revert Stem #'stroke-style } @@ -256,7 +280,11 @@ trebleThrough = \notes \relative c'{ 4.-> 8) 2. | 2. | +<<<<<<< standchen.ly + \override TextScript #'font-shape = #'italic +======= \override TextScript #'font-shape = #'italic +>>>>>>> 1.31 2._"decresc." \revert TextScript #'font-shape @@ -270,7 +298,11 @@ trebleThrough = \notes \relative c'{ 4. 8(-. -. )-. | %80 +<<<<<<< standchen.ly + \override TextScript #'font-shape = #'italic +======= \override TextScript #'font-shape = #'italic +>>>>>>> 1.31 2._"dim." \revert TextScript #'font-shape @@ -403,11 +435,20 @@ vocals = \context Voice = leise \notes { R1 * 3/4 * 6 } +<<<<<<< standchen.ly +trebleStaff = \context Staff = treble<< + \set Staff.midiInstrument = "acoustic grand" +======= trebleStaff = \context Staff = treble<< \set Staff.midiInstrument = "acoustic grand" +>>>>>>> 1.31 \global {\clef treble +<<<<<<< standchen.ly + \override autoBeamSettings #'(begin * * * *) = #(ly:make-moment 0 1) +======= \override autoBeamSettings #'(begin * * * *) = #(ly:make-moment 0 1) +>>>>>>> 1.31 \trebleIntro \trebleVerseOne \trebleEentje @@ -415,8 +456,13 @@ trebleStaff = \context Staff = treble<< \trebleThrough } >> +<<<<<<< standchen.ly +bassStaff = \context Staff = bass<< + \set Staff.midiInstrument = "acoustic grand" +======= bassStaff = \context Staff = bass<< \set Staff.midiInstrument = "acoustic grand" +>>>>>>> 1.31 \global \clef bass {\bassIntro @@ -430,7 +476,11 @@ bassStaff = \context Staff = bass<< \score{ << \new Staff << +<<<<<<< standchen.ly + \set Staff.midiInstrument = "synth voice" +======= \set Staff.midiInstrument = "synth voice" +>>>>>>> 1.31 %% insert \transpose if necessary, depending on voice range. \global \vocals diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly index fd1e032212..c9f299d83e 100644 --- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly +++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly @@ -46,8 +46,8 @@ half way in measure 13 has been forgotten. } -sarabandeA = \context Voice \notes \relative c { - \override Staff.NoteCollision #'merge-differently-dotted = ##t +sarabandeA = \context Voice \notes \relative c { + \override Staff.NoteCollision #'merge-differently-dotted = ##t << { d8. e16 e4.\trill d16 e } \\ @@ -121,9 +121,14 @@ sarabandeA = \context Voice \notes \relative c { d'[ cis] | %% d4 d,,2 | d4 +<<<<<<< baerenreiter-sarabande.ly + \override NoteHead #'after-line-breaking-callback + = #(lambda (smob) (assert-system-count smob 6)) +======= \override NoteHead #'after-line-breaking-callback = #(lambda (smob) (assert-system-count smob 6)) +>>>>>>> 1.30 d,,2 | } diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly index de797eb545..eb4b751d3c 100644 --- a/input/mutopia/J.S.Bach/bwv940.ly +++ b/input/mutopia/J.S.Bach/bwv940.ly @@ -95,7 +95,7 @@ three = \notes\relative c{ \stemDown \tieDown e4 ~ e16 f e d cis a b cis d e f d | - \override TextScript #'font-style = #'finger + \override TextScript #'font-style = #'finger bes2 a ~ | a a | d, cis' | @@ -110,13 +110,17 @@ four = \notes\relative c{ \skip 1*2 | \skip 4*3 \change Staff=upper \stemUp - \override NoteColumn #'horizontal-shift = #1 + \override NoteColumn #'horizontal-shift = #1 c''4 | %5 a gis ~ gis16 gis fis e \skip 4*1 \change Staff=lower \stemDown +<<<<<<< bwv940.ly + \override NoteColumn #'horizontal-shift = #0 +======= \override NoteColumn #'horizontal-shift = #0 +>>>>>>> 1.7 \stemUp\tieUp b2 a | g a4. gis16 a | diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly index be847ef371..8f3c772f86 100644 --- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -105,7 +105,7 @@ dux = \context Voice=two \notes \relative c''{ comes = \context Voice=one \notes \relative c'' { \voiceOne - \override MultiMeasureRest #'staff-position = #6 + \override MultiMeasureRest #'staff-position = #6 R1 | R1 | r8 g'16 fis g8 c, es g16 fis g8 a | @@ -192,7 +192,11 @@ bassdux = \context Voice=three \notes \relative c' { \score { \notes \context PianoStaff << +<<<<<<< wtk1-fugue2.ly + \override Score.TimeSignature #'style = #'C +======= \override Score.TimeSignature #'style = #'C +>>>>>>> 1.15 \context Staff = treble << \key c \minor \dux diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index eec9e00ff2..2205f15ede 100644 --- a/input/mutopia/R.Schumann/romanze-op28-2.ly +++ b/input/mutopia/R.Schumann/romanze-op28-2.ly @@ -26,16 +26,24 @@ d = { \change Staff = down \stemUp } forcedBreak = \break global = \notes { \key fis \major \time 6/8 - \set Score.beatLength = #(ly:make-moment 3 8) + \set Score.beatLength = #(ly:make-moment 3 8) \repeat volta 2 { s2.*8 } s2.*26 \bar "|." } righta = \notes \transpose c cis' { % \stemUp \slurUp \tieUp \stemUp +<<<<<<< romanze-op28-2.ly + \override Slur #'attachment = #'(stem . stem) +======= \override Slur #'attachment = #'(stem . stem) +>>>>>>> 1.32 \repeat volta 2 { +<<<<<<< romanze-op28-2.ly + \override TextScript #'extra-offset = #'(-8.0 . 2.5) +======= \override TextScript #'extra-offset = #'(-8.0 . 2.5) +>>>>>>> 1.32 \m a,16[^\p( \u c^\markup { \large "Einfach (" \note #"8" #1 @@ -107,8 +115,13 @@ rightb = \notes \transpose c cis' { c_3 g,_2 es, g, h,_4 g, d, g, c g,8 f,16 | c g, es, g, es c_3 as, c^2 d^3 c h, c | e des b,\< des g e_3 ces_4 d_2 f^3 d cis d | +<<<<<<< romanze-op28-2.ly + \override PhrasingSlur #'extra-offset = #'(0 . 3) + \override PhrasingSlur #'beautiful = #42 +======= \override PhrasingSlur #'extra-offset = #'(0 . 3) \override PhrasingSlur #'beautiful = #42 +>>>>>>> 1.32 g\( fes des fes b g_3 es_1\! ges_2 a^3 ges f_1 ges_2 | r ges_2 b des_1 ges b,_2 des ges,^1 b, \d des,^1 \stemDown \transpose c' c { b,[_1 as,] | g,8 b,16[ g, e, cis,] d,\)_4 \< f, h, d_3 f_2 r16\! } @@ -123,14 +136,22 @@ rightb = \notes \transpose c cis' { f,8.. f32^1 g8^2 a4.) | a4^1( c8^1_\accent~[c b)] g16^1([ b^2] | c4)^1 es8^1~es d^1 f^1~ | +<<<<<<< romanze-op28-2.ly + \override PianoStaff.Arpeggio #'direction = #1 +======= \override PianoStaff.Arpeggio #'direction = #1 +>>>>>>> 1.32 f f8.. f32^1( as4.)^\fermata\arpeggio ~ | \revert PianoStaff.Arpeggio #'direction \stemUp \tieUp as r4 r8 | } s2. s \u s4. \grace { +<<<<<<< romanze-op28-2.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.32 f8( \revert Stem #'stroke-style } f4) e8 | @@ -172,7 +193,11 @@ lefta = \notes \transpose c cis { c4) r8 f4-4( as8-5~ | as g-4 b)-5 as4-5( ces'8-4~ | ces' b des'-4 c'4)-5( 8 | \stemDown \tieDown des'4.)_5~des'~ | +<<<<<<< romanze-op28-2.ly + \override NoteColumn #'horizontal-shift = #-1 des' s +======= \override NoteColumn #'horizontal-shift = #-1 des' s +>>>>>>> 1.32 } >> \change Staff=down \stemUp \slurUp \tieUp \phrasingSlurUp @@ -186,7 +211,11 @@ lefta = \notes \transpose c cis { s2.*2 s8 r16 h\( c' d' es' as g8\arpeggio fis( ges)\) f16-2( a-1 c'-3 f')-1 \grace { +<<<<<<< romanze-op28-2.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.32 \stemDown \slurUp b,[( f] \stemUp \revert Stem #'stroke-style } e')-1( d' c' b-1 a-2\prall g @@ -239,6 +268,15 @@ leftb = \notes \transpose c cis { \score { \notes \context PianoStaff << \pianoCautionaries +<<<<<<< romanze-op28-2.ly + \override PianoStaff.NoteCollision #'merge-differently-dotted = ##t + \set PianoStaff.connectArpeggios = ##t + \override PianoStaff.Arpeggio #'print-function = \arpeggioBracket + + \override PianoStaff.InstrumentName #'font-size = #6 + \override PianoStaff.InstrumentName #'font-shape = #'italic + \override PianoStaff.InstrumentName #'font-magnification = #3 +======= \override PianoStaff.NoteCollision #'merge-differently-dotted = ##t \set PianoStaff.connectArpeggios = ##t \override PianoStaff.Arpeggio #'print-function = \arpeggioBracket @@ -246,23 +284,41 @@ leftb = \notes \transpose c cis { \override PianoStaff.InstrumentName #'font-size = #6 \override PianoStaff.InstrumentName #'font-shape = #'italic \override PianoStaff.InstrumentName #'font-magnification = #3 +>>>>>>> 1.32 \set PianoStaff.instrument = "2. " \context Staff = up { +<<<<<<< romanze-op28-2.ly + \override Staff.DynamicLineSpanner #'direction = #-1 +======= \override Staff.DynamicLineSpanner #'direction = #-1 +>>>>>>> 1.32 \clef G <<\global \context Voice=upv \righta >> } \context Staff = mid { +<<<<<<< romanze-op28-2.ly + \override Staff.InstrumentName #'font-size = #0 + \override Staff.InstrumentName #'font-shape = #'upright + \override Staff.InstrumentName #'font-magnification = #1 + \override Staff.InstrumentName #'extra-offset = #'(0 . 6) + % \set Staff.instrument = "\\begin{turn}{-90}{Rechte Hand}\\end{turn}" + \set Staff.instrument = \markup { \column < Rechte Hand > } +======= \override Staff.InstrumentName #'font-size = #0 \override Staff.InstrumentName #'font-shape = #'upright \override Staff.InstrumentName #'font-magnification = #1 \override Staff.InstrumentName #'extra-offset = #'(0 . 6) % \set Staff.instrument = "\\begin{turn}{-90}{Rechte Hand}\\end{turn}" \set Staff.instrument = \markup { \column < Rechte Hand > } +>>>>>>> 1.32 \clef F <<\global \context Voice=midv \rightb>> } \context Staff = down { +<<<<<<< romanze-op28-2.ly + \override Staff.DynamicLineSpanner #'direction = #1 +======= \override Staff.DynamicLineSpanner #'direction = #1 +>>>>>>> 1.32 \clef F << \global \context Voice=lva \lefta \context Voice=lvb \leftb >> } diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly index e84625f017..f0eb95dc35 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly @@ -30,7 +30,7 @@ virtuoso that taught in Geneva. %} -\version "2.1.7" +\version "2.1.22" \include "mozart-hrn3-defs.ly" \include "mozart-hrn3-allegro.ly" diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly index f8ea2c4df1..16bf8ebfc0 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly @@ -27,7 +27,7 @@ allegro = c4.( d16[ e] f4 e) a,( d g, c) d-. d-. \grace { - \override Stem #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" e16( \revert Stem #'stroke-style } d8.[) c16 d8. e16] @@ -45,7 +45,7 @@ allegro = b[( a)] a4 r8 a[ a a] a4( cis e g) \grace { - \override Stem #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" \longgrace g16( \endlonggrace \revert Stem #'stroke-style } @@ -68,7 +68,11 @@ allegro = << a1(\trill { s2 \grace { +<<<<<<< mozart-hrn3-allegro.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.16 g16[ a] \revert Stem #'stroke-style } } >> @@ -111,7 +115,11 @@ allegro = a, ( d g, c) d d \grace { +<<<<<<< mozart-hrn3-allegro.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.16 e8( \revert Stem #'stroke-style } @@ -125,12 +133,20 @@ allegro = c[( b)] b4 r2 c2 (bes a) a8[(b c cis)] d2( ~ d8[ e16 d] \grace { +<<<<<<< mozart-hrn3-allegro.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.16 \longgrace d16( \endlonggrace \revert Stem #'stroke-style } c8[) b16 c)] \grace { +<<<<<<< mozart-hrn3-allegro.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.16 \longgrace c16 \endlonggrace \revert Stem #'stroke-style } b8[( a16 g)] g4 r2 | @@ -153,14 +169,22 @@ allegro = f4. ( d8) f8[ ( d) f d] c[ (e] g2) \grace { +<<<<<<< mozart-hrn3-allegro.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.16 \longgrace f16( \endlonggrace \revert Stem #'stroke-style } e8[)( d16 c)] << d1\trill ( { s2 \grace { +<<<<<<< mozart-hrn3-allegro.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.16 c16[ d] \revert Stem #'stroke-style } } >> @@ -178,7 +202,11 @@ allegro = << d1(\trill { s2 \grace { +<<<<<<< mozart-hrn3-allegro.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.16 c16[ d] \revert Stem #'stroke-style } } >> diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly index 00d7157397..d6cf0e8baa 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly @@ -1,6 +1,6 @@ % #(ly:set-point-and-click 'line-column) -longgrace = \override Stem #'stroke-style = #'() +longgrace = \override Stem #'stroke-style = #'() endlonggrace = \revert Stem #'stroke-style ritenuto = \markup { \italic "rit." } @@ -8,8 +8,8 @@ ritenuto = \markup { \italic "rit." } cresc = \notes { #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) - \set crescendoText = \markup { \italic \bold "cresc." } - \set crescendoSpanner = #'dashed-line + \set crescendoText = \markup { \italic \bold "cresc." } + \set crescendoSpanner = #'dashed-line } %% diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly index c7d39cd873..0ddbe7a8fe 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly @@ -6,7 +6,7 @@ romanze = \notes \relative c' { \key f \major \time 2/2 - \set Score.skipBars = ##t + \set Score.skipBars = ##t c'4.( _\markup { \dynamic "p" \italic { "" con molto espressione } } f8) a,4 a @@ -45,7 +45,11 @@ romanze = \notes \relative c' { c[ ( e) g g] g[( f e d)] c4( \grace { +<<<<<<< mozart-hrn3-romanze.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.15 \longgrace e16 \endlonggrace \revert Stem #'stroke-style } @@ -53,7 +57,11 @@ romanze = \notes \relative c' { \mark "C" %% this is a trick to get the sfp-s to align. +<<<<<<< mozart-hrn3-romanze.ly + \override Hairpin #'transparent = ##t +======= \override Hairpin #'transparent = ##t +>>>>>>> 1.15 des1\sfp \> g,1\sfp\! \> c\sfp \! \> diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly index e706c51740..b9447a4d2f 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly @@ -22,12 +22,12 @@ lipbreaker = \notes \relative c' c[ c c] c[ c c] } -rightsixteenth = { \set stemLeftBeamCount = 1 - \set stemRightBeamCount = 2 } -leftsixteenth = { \set stemLeftBeamCount = 2 - \set stemRightBeamCount = 1 } -bothsixteenth = { \set stemLeftBeamCount = 2 - \set stemRightBeamCount = 2 } +rightsixteenth = { \set stemLeftBeamCount = 1 + \set stemRightBeamCount = 2 } +leftsixteenth = { \set stemLeftBeamCount = 2 + \set stemRightBeamCount = 1 } +bothsixteenth = { \set stemLeftBeamCount = 2 + \set stemRightBeamCount = 2 } rondo = \notes \relative c' { @@ -48,13 +48,21 @@ rondo = \notes \relative c' R2.*7 \mark "A" c4.\p \grace { +<<<<<<< mozart-hrn3-rondo.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.15 e16( \revert Stem #'stroke-style } d8[) c d] c4 r8 r4 r8 e4. \grace { +<<<<<<< mozart-hrn3-rondo.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.15 g16( \revert Stem #'stroke-style } f8[) e f] @@ -172,7 +180,11 @@ rondo = \notes \relative c' << d2.(\trill { s2 \grace { +<<<<<<< mozart-hrn3-rondo.ly + \override Stem #'stroke-style = #"grace" +======= \override Stem #'stroke-style = #"grace" +>>>>>>> 1.15 c16[ d] \revert Stem #'stroke-style } } >> diff --git a/input/regression/pedal-ped.ly b/input/regression/pedal-ped.ly index da1a7e60c2..593fca8c13 100644 --- a/input/regression/pedal-ped.ly +++ b/input/regression/pedal-ped.ly @@ -7,10 +7,8 @@ at the end of the melody." } - \score{ \context Staff \notes\relative c'{ - c4 d e f g \sustainDown b c c, d16[ c c c] e[ e \sustainUp \sustainDown e e ] f4 \sustainUp @@ -19,8 +17,5 @@ at the end of the melody." \override Staff.SustainPedal #'padding = #-2 c, \sustainDown d e \sustainUp \sustainDown f \sustainUp g b c - - - } }