From: Graham Percival Date: Sun, 4 Oct 2009 13:38:39 +0000 (+0100) Subject: Remove mutopia. X-Git-Tag: release/2.13.6-1~54 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=11a53dff1e2552e5b9b3ea5629a86f19086098fc;p=lilypond.git Remove mutopia. --- diff --git a/input/GNUmakefile b/input/GNUmakefile index 1d26b07f19..59a151955f 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -1,6 +1,6 @@ depth = .. -SUBDIRS = regression mutopia +SUBDIRS = regression examples = les-nereides wilhelmus proportional bach-schenker cary diff --git a/input/mutopia/E.Satie/GNUmakefile b/input/mutopia/E.Satie/GNUmakefile deleted file mode 100644 index fecc9eade1..0000000000 --- a/input/mutopia/E.Satie/GNUmakefile +++ /dev/null @@ -1,9 +0,0 @@ - -depth = ../../.. - -examples=petite-ouverture-a-danser -LOCALSTEPMAKE_TEMPLATES=ly mutopia - -include $(depth)/make/stepmake.make - - diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly deleted file mode 100644 index 268f413972..0000000000 --- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ /dev/null @@ -1,157 +0,0 @@ -\header { - title = "Petite Ouverture à danser" - subtitle = "4" - source = "" - composer = "Erik Satie (1866-1925)" - enteredby = "jcn" - copyright = "Public Domain" -} - -\version "2.12.0" - -global = { - \key a \minor - \time 2/4 - s2*10 - \bar "||" - s2*11 - \bar "||" - \time 3/4 - s2. - \bar "||" - \time 2/4 - s2*4 - \bar "||" - \time 3/4 - s2.*2 - \bar "||" - \time 2/4 - s2*18 - \bar "|." -} - -i = \context Staff \relative c''\new Voice { - \voiceOne - - c8.( es16 bes4 ~ | bes8) r c8.( bes16 | des4 c8. bes16 | c4 ~ c8) r | - c4( f,8. as16 | bes4 ~ bes8) r | f8.( es16 f4 | es f) | - g8.( es16 f4 ~ | f) f8 r - - % Au mouvement - f4 ( g | a2 ~ | a) | a4-- a-> ~ | a8 r b!8.( a16 | b4) c-- ~ | - c8 r b8.( d16 | a4 ~ a8) r | d4( cis | c! b8. d16 | a4 ~ a8) r - - a8.( g16 a4 ~ a8) r | - - a4-> ~ a8 r | g8.( a16 fis4) | e8.( d16 e4 | fis ~ fis8) r - - d4( d-- ~ d8) r e4( f!2 ~ | - - f4 ~ f8) r | es4( g | as bes ~ | bes) c( | b!2) | c4( d | bes2) | c4~ c8 r | - - % copy from begin: 1-10 - c8.( es16 bes4 ~ | bes8) r c8.( bes16 | des4 c8. bes16 | c4 ~ c8) r | - c4( f,8. as16 | bes4 ~ bes8) r | f8.( es16 f4 | es f) | -% g8.( es16 f4 ~ | f) f8 r ? - g8.( es16 f4 ~ | f) ~ f8 r - -} - -ii = \context Staff \relative c'\new Voice{ - \voiceTwo - - r8 r | r r | r r | - r r | r r | r r | - r r | r bes r | r r | - r r - - % Au movement - r r | r r | r r | - r r | r r | r r | r r | - r r | r r | r r | - r r | - - r r r | - - r r | r r | r r | - r r | - - \change Staff=bass\voiceOne - r r r | r - \change Staff=treble\voiceTwo - r r | - - r r | r r | r r | - r r | r r | r r | - r r | r r | - - - % copy from begin: 1-10 - r8 r | r r | r r | - r r | r r | r r | - r r | r bes r | r r | - r r - -} - -lower = \context Staff \relative c \new Voice{ - - 4 | r | | r | - | r | | - | | r | - - % Au movement - | | r | | - r | | r | r | | - | r | - - r | - - r | | | r | - - r | | - - r | | | | - | | r | r - - % copy from begin: 1-10 - 4 | r | | r | - | r | | - | | r | - -} - -\score { - \context PianoStaff << - \new Staff = "treble" << - \global - \clef violin - \i - \ii - >> - \new Staff = "bass" << - \global - \clef bass - \lower - >> - >> - \layout { - \context { - \Score - \override SpacingSpanner #'spacing-increment = #3 - } - } - - \midi { - \context { - \Score - tempoWholesPerMinute = #(ly:make-moment 60 4) - } - } - - -} - -%% Local Variables: -%% coding: utf-8 -%% End: diff --git a/input/mutopia/F.Schubert/GNUmakefile b/input/mutopia/F.Schubert/GNUmakefile deleted file mode 100644 index e592e2832f..0000000000 --- a/input/mutopia/F.Schubert/GNUmakefile +++ /dev/null @@ -1,8 +0,0 @@ -depth = ../../.. - -examples=morgenlied -LOCALSTEPMAKE_TEMPLATES=ly mutopia - -include $(depth)/make/stepmake.make - - diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly deleted file mode 100644 index b7941a4f55..0000000000 --- a/input/mutopia/F.Schubert/morgenlied.ly +++ /dev/null @@ -1,192 +0,0 @@ -\header { - title = "Sängers Morgenlied" - composer = "Franz Schubert (1797-1828)" - date = "27. Februar 1815" - source = "Edition Peters" - editor = "Paul Losse" - enteredby="Han-Wen Nienhuys" - maintainer="hanwen@xs4all.nl" - - texidoc = "The source is a rather tightly set Peters in Edition is - a heavy font. The Peters edition (4622c) was `herausgegeben' by - Paul Losse, whose name also appears on a 1956 edition of some - other music. Strictly speaking, his edititorial enhancements will - not be in the PD - but I am assuming there are no notable ones in - this small piece. - - The original compresses the entire music onto a single page, in 4 - systems. Lily does so too if you tune down spacing-increment, but - chooses line breaks differently. - - Further manual tweaks: the slur in measure 12 has been flattened -manually. The beam in measure 3, left-hand, technically is wrong, but -has been added following the original. The crescendo in measure 4 has -been lowered - -" - -} - -\version "2.12.0" -manuscriptBreak = { \break } - - - -#(set-global-staff-size (/ (* 5.8 72.27) 25.4)) - -\paper { -%#(set-global-staff-size (* 5.8 mm)) - line-width = #(* mm 160) - indent = 8\mm - interscoreline = 2.\mm - between-system-space = 15\mm - ragged-bottom = ##t - } - -modernAccidentals = { - \set Staff.extraNatural = ##f - \set Staff.autoAccidentals = #'(Staff (same-octave . 1) (any-octave . 0)) - \set Staff.autoCautionaries = #'() -} - - -melody = \relative c'' \repeat volta 2 \new Voice = "singer" { - \time 6/8 - \autoBeamOff - s1*0^\markup { \bold \large\larger\larger { \hspace #-3.0 Lieblich, etwas geschwind } } - R2. - r4 r8 c4 g8 | - e4 c8 - << - \new Voice { \stemUp f8. g16 } - { \stemDown f8.[ g16] } >> \stemNeutral a8 | - fis4 g8 c16[ b a g] f[ e] | - d4 f8 a16[ g fis g] f[ d] | - g4. r8 gis gis | - a4 a16.[ b32] c4 fis,8 | - g4.~ g8-\fermata g8 g | - as4 as8 g4 g8 | - fis4 fis8 r8 g g | - a!4 a8 g4 g8 | - fis4 fis8 d'16[ c b a] g[ f] | - e4 g8 d4 g8 e4 r8 b'16[ c d b] g[ f] | - e4 g8 d4 a'16[ g] | - c,4 r8 r4 r8 | - - % TODO : make \fermata work. - R2.^\fermataMarkup -} - - -ignoreMelisma = \set ignoreMelismata = ##t -ignoreMelismaOff = \unset ignoreMelismata - - -firstVerse = \lyricmode { - \set stanza = "1." - - Sü -- ßes Licht! Aus - \ignoreMelisma - gol -- - \ignoreMelismaOff - - de -- nen Pfor -- ten brichst du __ \manuscriptBreak | - sie -- gend durch __ die Nacht. Schö -- ner Tag, du __ bist er -- wacht. __ Mit ge -- | - \manuscriptBreak - heim -- nis -- vol -- len Wor -- ten, in me -- lo -- di -- schen Ak -- kor -- den, grüß __ ich __ \manuscriptBreak | - dei -- ne Ro -- sen -- pracht, grüß __ ich __ dei -- ne Ro -- sen -- pracht. - } - -secondVerse = \lyricmode { - \set stanza = "2." - Ach, der Lie -- be sanf - -- tes We -- hen schwellt mir | - das be -- weg -- te __ Herz, sanft, wie ein ge -- lieb -- ter Schmerz. __ Dürft ich | - nur auf gold -- nen Hö -- hen mich im Mor -- gen -- duft er -- ge -- hen! Sehn -- sucht | - zieht mich him -- mel -- wärts, Sehn -- sucht zieht mich him -- mel -- wärts. - } - -pianoRH = \relative c''' \repeat volta 2 { - #(set-accidental-style 'modern) - g16(_\p fis a g fis g f e d c b a ) | - 8( ) r8 r | - r8 c'( e,) f r a | - \once \override DynamicLineSpanner #'padding =#3 - r8 << { s8 s8 } << { fis(\> g)\! - } \\ { c,4 } >> >> r8 | - 4. r8 \clef bass | - e,16_" "_\markup { \bold\italic cresc. } g c g e g d gis b gis d gis | - c, e a e c e a,-\f d fis d a d | - b d g d b g r4\fermata \clef treble g''8 | - as4.( g 4.) | fis4. r4 8 ( | - 4.) 4.( ) \sf | - r8 r | - r r | - r r | - c16(_\f b c e g b c b c e g ) | - 8 r r 8 r r\fermata | -} - -pianoLH = \relative c'' \repeat volta 2 { - #(set-accidental-style 'modern) - g16( fis a g fis g f e d c b a) | - \clef bass g4.( c,8) r r - \clef treble r4 8([ )] r | - \clef bass r8 dis( e) r c c | - f,4. r8 g g | - 4. 4. | - a,4. 4. | - g,8 r r g16 r16\fermata r8 g''8 | - as4.( g ) | - fis r4 8( | - 4.) - - \once \override Slur #'height-limit = #1.0 - - 4.( | 4.) | - c,4 r8 g4 r8 | - c4 r8 g4 r8 | - c4 r8 g4 r8 | - 8 | - r r 8 r r\fermata \clef treble - } - -\book { - \score { - << \time 6/8 - \new Staff << - \context Staff #(set-accidental-style 'modern) - \melody >> - \lyricsto "singer" \new Lyrics \firstVerse - \lyricsto "singer" \new Lyrics \secondVerse - \new PianoStaff << - \set PianoStaff.instrumentName = \markup { - \bold - \larger\larger\larger\larger \huge "2. " } - \new Staff \pianoRH - \new Staff \pianoLH - >> - >> - - \layout { - \context { - \Lyrics - \override VerticalAxisGroup #'minimum-Y-extent = #'(-0.5 . 2.5) - \override LyricText #'font-size = #-1 - } - \context { - \Score - \override Beam #'thickness = #0.55 - \override SpacingSpanner #'spacing-increment = #1.0 - \override Slur #'height-limit = #1.5 - } - } - \midi { - \context { - \Score - tempoWholesPerMinute = #(ly:make-moment 70 4) - } - } - } -} - diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly deleted file mode 100644 index 10797cd6d9..0000000000 --- a/input/mutopia/F.Schubert/standchen.ly +++ /dev/null @@ -1,461 +0,0 @@ -#(ly:set-option 'old-relative) - -instrument = "Piano" - -\header { - title = "Ständchen" - subtitle = "(Serenade)" - subsubtitle = "Leise flehen meine Lieder" - opus = "D. 957 No. 4" - date = "August 1828" - composer = "Franz Schubert (1797-1828)" - poet = "Text by Ludwig Rellstab (1799-1860)" - enteredby = "JCN" - copyright = "public domain" - % instrument = \instrument - - % mutopia headers. - mutopiatitle = "Standchen" - mutopiasubtitle = "Leise flehen meine Lieder" - mutopiacomposer = "Franz Schubert (1797-1828)" - mutopiapoet = "Ludwig Rellstab (1799-1860)" - mutopiaopus = "D957.4" - mutopiainstrument = \instrument - date = "1828/08" - style = "Romantic" - source = "Schubert-Lieder Edition Schott No. 608, (Not dated). - Jubilaeums-Ausgabe zum 100. Todestage (~1928)." - - copyright = "Public Domain" - maintainer = "Jan Nieuwenhuizen" - maintainerEmail = "janneke@gnu.org" - lastupdated = "2001/Apr/27" - mutopiapublicdomain = "\\parbox[b]{\\paper-width}{\\thefooter\\quad\\small - \\\\This music is part of the Mutopia project, - \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset - and placed in the public domain by " + \maintainer + - ".\\\\Unrestricted modification and redistribution is permitted - and encouraged---copy this music and share it.}" - tagline = \mutopiapublicdomain - footer = "Mutopia-2001/04/27-xx" -} - -\version "2.12.0" - -#(set-global-staff-size 16) - -vocalVerse = \relative c''{ - \dynamicUp - \times 2/3 { g8[( as)] g } c4. g8 | - \times 2/3 { f8[( g)] f } c'4 f,8 r | - g4.-> f8 \times 2/3 { f[( es)] d } | - es2 r4 | - R2. | - R2. | - \times 2/3 { g8[( as)] g } es'4. g,8 | - \times 2/3 { f8[( g)] f } d'4. c8 | - bes4. as8 \times 2/3 { as[( g)] f } | - g2 r4 | - R2. | - R2. | - g8. b16 es4. d8 | - c8. g16 es4. c8 | - \grace { - \override Stem #'stroke-style = #"grace" - as'32[( bes ] - \revert Stem #'stroke-style } - \times 2/3 { as8[)( g)] as } c4. as8 | - g2. | - \grace { - \override Stem #'stroke-style = #"grace" - f32[( g ] - \revert Stem #'stroke-style } - \times 2/3 { f8[)( e)] f } as4. f8 | - - es!2. | - g8. b16 es4. d8 | - c8. g16 e4. c8 | - \grace { - \override Stem #'stroke-style = #"grace" - a'32[( b ] - \revert Stem #'stroke-style } - \times 2/3 { a!8[)( gis)] a } c4. a8 | - g!2. | - \times 2/3 { d'8[\f( cis)] d } f4. b,8 | - c!2. | -} - -vocalThrough = \relative c{ - \dynamicUp - g''8. g16 b8. b16 d8. d16 | - c4 b r | - g4. b8 d8. c16 | - b2 r4 | - e4. d8 \times 2/3 { d[( c)] b } | - a8. b16 c4-> a8 r | - R2. | - R2. | - \grace { - \override Stem #'stroke-style = #"grace" - a32[( b ] - \revert Stem #'stroke-style } - \times 2/3 { a!8[)( gis)] a } c4. a8 | - g!2. | - \times 2/3 { d'8[\f( cis)] d } f4. b,8 | - c!2. ~ | - % bug: slur on other staff fools lily into extending melisma - c4 r c | - as2. | - g | - e2 r4 | -} - -lyricVerseOne = \lyricmode { - Lei -- se fle -- hen mei -- ne Lie -- der - durch die Nacht zu dir; - in den stil -- len Hain her nie -- der, - Lieb -- chen, komm zu mir! - - Flüs -- ternd schlan -- ke Wip -- fel rau -- schen - in des Mon -- des Licht, - in des Mon -- des Licht; - - des Ver -- rä -- ters feind -- lich Lau -- schen - fürch -- te, Hol -- de, nicht, - fürch -- te, Hol -- de, nicht. -} - -lyricVerseTwo = \lyricmode{ - Hörst die Nach -- ti -- gal -- len schla -- gen? - ach! sie fle -- hen dich, - mit der Tö -- ne sü -- "\ss en" Kla -- gen - fle -- hen sie für mich. - - Sie -- ver -- "steh'n" des Bu -- sens Seh -- nen, - ken -- nen Lieb -- es -- schmerz, - ken -- nen Lieb -- es -- schmerz, - - rüh -- ren mit den Sil -- ber -- tö -- nen - jed -- es wei -- che Herz, - jed -- es wei -- che Herz. -} - -lyricThrough = \lyricmode{ - La\ss auch dir die Brust be -- we -- gen - Lieb -- chen, hö -- re mich! - be -- bend harr' ich dir ent -- ge -- gen! - - komm, be -- glük -- ke mich! - komm, be -- glük -- ke mich, __ - be -- glük -- ke mich! -} - -trebleIntro = \relative c{ - r8^"\bf Mäßig"\pp -. -. -. -. -. | - r8 -. -. -. -. -. | - r8 -. -. -. -. -. | - r8 -. -. -. -. -. | -} - -trebleVerseOne = \relative c{ - %5 - r8 | - r8 | - r8 | - r8 | - 4.( 8) - \times 2/3 { ([ )] } - - %10 - 2. | - r8 | - r8 | - r8 | - r8 - [ - - - ] - ( - 4.() - 8) - - \times 2/3 { ([ )] } - %16 - 2. | - r8 | - r8 | - r8\pp | - %20 - r8 | - \grace { - \override Stem #'stroke-style = #"grace" - as'32[( bes ] - \revert Stem #'stroke-style } - - \times 2/3 { as8[)( g as] } c4.-> as8) | - g2. | - r8 | - r8 | - r8 | - r8 | - \times 2/3 { \f( } - 4.-> 8) | -} - -trebleEentje = \relative c' \context Voice { - \stemNeutral - 2 r4 | - 2\(\mf 8.(-> 16)\) | - % urg: slurs with staccati are ugly - 4. 8-.( -. )-. | - 4. 8-.( -. )-. | - 2 4\pp | - 2\( 8.( 16)\) | - 4.\( 8(-. -. )\)-. | - 4. 8(-. -. )-. | - %60 - 2 r4 | -} - -trebleThrough = \relative c'{ - \stemNeutral - 2. | - %61 - R2. | - 8.[\< 16 8. 16\>\! 8. 16] | - - %% score has double slur on chord. - 4( ) r\! - - 4. 8 8.->[ c16] | - %65 - 2.~(\f - 2) r4 - << - { a'8. b16 c4^> ( a8) r | - a8. b16 c4^> ( a8) r | - }\\{ - 4 2 | - 4 2 | - } >> - - % 4 bars copied from end verse1 - r8 | - %70 - r8 | - \times 2/3 { 8( } - - 4.-> 8) - 2. | - 2. | - \override TextScript #'font-shape = #'italic - 2._"decresc." - \revert TextScript #'font-shape - - %75 - 2. | - 2 4\pp | - - % four copied from begin eentje - 2( 8.-> 16) | - 4. 8(-. -. )-. | - 4. 8(-. -. )-. | - %80 - - \override TextScript #'font-shape = #'italic - 2._"dim." - \revert TextScript #'font-shape - - 2. | - 2.\fermata | -} - -bassIntro = \relative c{ - \dynamicUp -%1 - 2 r4 | - 2 r4 | - 2 r4 | - 2 r4 | -} - -bassVerseOne = \relative c{ -% \clef bass - \dynamicUp -%5 - 2 r4 | - 2 r4 | - 2 r4 | - 2 r4 | - 8 [ ] | -%10 - 8 [ ] | - 2 r4 | - 2 r4 | - 2 r4 | - 2 r4 | -%15 - bes'8 [ ] | - es,8 [ ] | - 2 r4 | - 2 r4 | - 2 r4 | - 2 r4 | - 8 [ ] | - 8 [ ] | - 2 r4 | - 2 r4 | - 2 r4 | - 2 r4 | - 8 [ ] | - c,8 [ ] | -} - -bassEentje = \relative c{ - \dynamicUp - 8 [ ] | - c,8 [ ] | - 8 [ ] | - c,8 [ ] | - 8 [ ] | - c,8 [ ] | - 8 [ ] | - c,8 [ ] | -} - -bassThrough = \relative c{ - \dynamicUp - %61 - 8^"cresc." [ -> ] | - 8 [ -> ] | - % copied - 8 [ -> ] | - 8 [ -> ] | - %65 - 8 [\> \!] | - 8 [ ] | - 8 [ ] | - 8 [ ] | - % 4 bars copied from end verse1 - 2\p r4 | - %70 - 2 r4 | - 8 [ ] | - c,8\> [ < e g c> \! ] | - - 8 [ ] | - 8 [ ] | - %75 - 8 [ ] | - c,8 [ ] | - c,8 [ ] | - c,8 [ ] | - g,8 [ ] | - %80 - c,8 [ ] | - c,8 [ ] | - 2._\fermata | -} - -global = { - \time 3/4 - \key es \major - \skip 1 * 3/4 * 4 - \break - \skip 1 * 3/4 * 25 - \break - \skip 1 * 3/4 * 6 - \break - \skip 1 * 3/4 * 41 - \break - \skip 1 * 3/4 * 6 - \bar "|." -} - -allLyrics = { - % maybe should be bigger by default, in grob-description.scm ? - \lyricsto "leise" \new Lyrics { - \lyricVerseOne - \lyricVerseTwo - \lyricThrough -} } - -vocals = \new Voice = "leise" { - \clef treble - % certainly no auto-beaming for vocals - \autoBeamOff - - \dynamicUp - % duh 1 != 3/4 - R1 * 3/4 * 4 - \vocalVerse - R1 * 3/4 * 8 - \vocalVerse - \vocalThrough - R1 * 3/4 * 6 -} - -trebleStaff = \new Staff = "treble"<< - \set Staff.midiInstrument = "acoustic grand" - \global - { - \clef treble - - \trebleIntro - \trebleVerseOne - \trebleEentje - \trebleVerseOne - \trebleThrough - } ->> - -bassStaff = \new Staff = "bass"<< - \set Staff.midiInstrument = "acoustic grand" - \global - \clef bass - {\bassIntro - \bassVerseOne - \bassEentje - \bassVerseOne - \bassThrough} ->> - - -\score{ - << - \new Staff << - \set Staff.midiInstrument = "synth voice" - %% insert \transpose if necessary, depending on voice range. - \global - \vocals - >> - \allLyrics - \context PianoStaff << - \trebleStaff - \bassStaff - >> - >> - \layout { - % Use - % textheight = 280.\mm - % line-width = 190.\mm - % to get this on 3 pages of a4. - - % Mandatory Mutopia settings yield 4 pages :( - textheight = 270.0\mm - line-width = 180.0\mm - - \context { \RemoveEmptyStaffContext } - } - - \midi { - \context { - \Score - tempoWholesPerMinute = #(ly:make-moment 54 4) - } - } - - -} - diff --git a/input/mutopia/GNUmakefile b/input/mutopia/GNUmakefile deleted file mode 100644 index 5c6839fccb..0000000000 --- a/input/mutopia/GNUmakefile +++ /dev/null @@ -1,9 +0,0 @@ -depth = ../.. - -LOCALSTEPMAKE_TEMPLATES=ly mutopia -EXTRA_DIST_FILES += claop.py -SUBDIRS = J.S.Bach F.Schubert E.Satie W.A.Mozart R.Schumann - -include $(depth)/make/stepmake.make - - diff --git a/input/mutopia/J.S.Bach/GNUmakefile b/input/mutopia/J.S.Bach/GNUmakefile deleted file mode 100644 index e65ceefe04..0000000000 --- a/input/mutopia/J.S.Bach/GNUmakefile +++ /dev/null @@ -1,11 +0,0 @@ -# input/mutopia/J.S.Bach/GNUmakefile - -depth = ../../.. - -EXTRA_DIST_FILES= - -LOCALSTEPMAKE_TEMPLATES=ly mutopia -examples=wtk1-fugue2 baerenreiter-sarabande - -include $(depth)/make/stepmake.make - diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly deleted file mode 100644 index 7012fe762f..0000000000 --- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly +++ /dev/null @@ -1,202 +0,0 @@ -\version "2.12.0" - -forcedLastBreak = { \break } - -%% We want this to perfectly match the Baerenreiter spacing. -%% If we're not using 6 systems, there's definately a problem. -#(define (assert-system-count smob n) - (let ((systems (length (ly:spanner-broken-into - (ly:grob-original - (ly:grob-system smob)))))) - (if (not (equal? n systems)) - (error - ;;(warn - (string-append "Got " (number->string systems) - " systems (expecting " (number->string n)))))) - - -#(define (assert-system-count-override count) - (ly:export #{ \override NoteHead #'after-line-breaking - = #(lambda (smob) (assert-system-count smob $count)) - #})) - - -\header { - title = "Solo Cello Suite II" - piece ="Sarabande" - composer = "Johann Sebastian Bach (1685-1750)" - editor = "August Wenzinger" - source= "B\\\"arenreiter Urtext" - - texidoc = "The B\\\"arenreiter edition of the Cello Suites is the -most beautifully typeset piece of music in our collection of music (we -both own one. It is also lovely on French Horn). This piece does not -include articulation, but it does follows the same beaming and -linebreaking as the printed edition. This is done in order to -benchmark the quality of the LilyPond output. - -As of lilypond 1.5.42, the spacing and beam quanting is almost -identical. - -There are two tweaks in this file: a line-break was forced before -measure 25, we get back the linebreaking of Baerenreiter. The stem -direction is forced in measure 24. The last beam of that measure is up -in Baerenreiter because of context. We don't detect that yet. - -Note that the Barenreiter edition contains a few engraving -mistakes. The second line begins with measure 6 (but prints 5). The |: -half way in measure 13 has been forgotten. - " -} - - -sarabandeA = \context Voice \relative c { - \override Staff.NoteCollision #'merge-differently-dotted = ##t - - - << { d8. e16 e4.\trill d16 e } \\ - { d4 a2 } >> - 4. e'8[ d c] | - bes[ g'] f[ - e16(f] g[ a bes d,)] | - cis4.\trill b8[ a g] | - - %% check spacing without accs: - %% c4.\trill bes8[ a g] | - - << { d'8. e16 e4.\trill d16 e | - f4. d8[ e f] } - \\ - { 4 a2 4. } >> | - - %%7 - g'8 bes16(a) c(bes) a(g) d'8 f, | - << e4.\trill - \\ 4 >> - d'8[ c bes] - - %%9 - << { f'8 g16(a) a4. g16(f) | - g8 a16(bes) bes4. c16(d) } - \\ - { a,4 4. r8 bes4 2 } - >> | - - %% 11 - e'8[ f] c,[ g'] f'[ e] | - f4 f,2 | - << { a'4 a4.\trill bes8 - c bes16 a } \\ - { f8[ es] es4. r8 d4 } >> - - fis8.\trill es16 d8 c | - bes[ g'] - a,[ fis'] - es'[ d] | - - %%16 - < bes d, g, >4.\trill a8[ g f!] | - e bes a f' g a | - d, as g es' f g | - cis,[ bes'] a[ g16 f] e!8[ f16 d] | - cis8 e16 a a,8. g'16 f8(e) | - - %%21 - << { d e16(f) f4. e16(d) | - e8 f16(g) g4. a16(bes) | - a8 cis16 d d,8 e16 f32 g f8\trill e16(d) } \\ - { bes4 g2 | - g4 4. s8 | - 8 r r g, a4 } >> - | - \stemUp - d4 d,16 a'( b cis d e f g) | - \stemNeutral - \forcedLastBreak - %%25 - << { a16(b c b) c4. b16(a) | - b cis d cis d4. e16(f) | } - \\ - { f,4 fis4. s8 | - 4 gis4. } >> - \voiceOne - d'16(cis d) f, - a,8[ e'] - \oneVoice - d'[ cis] | - %% d4 d,,2 | - d4 -% #(assert-system-count-override 6) - d,,2 | -} - - -sarabandeCelloGlobal = { - \time 3/4 - \key d \minor - \clef bass - \repeat "volta" 2 { - s2.*12 - } \repeat "volta" 2 { - s2.*16 - } -} - -sarabandeCelloScripts = { -} - -sarabandeCelloStaff = \context Staff << - \sarabandeA - \sarabandeCelloGlobal - \sarabandeCelloScripts ->> - -%% size perversions -smallerPaper = \layout { - \context { - \Staff - fontSize = #-1 - \override StaffSymbol #'staff-space = #0.8 - } - \context { - \Score - \override SpacingSpanner #'spacing-increment = #0.96 - } - - indent = 5.6 \mm - line-width = 146.8 \mm -} - -\paper { - ragged-bottom = ##t - indent = 7. \mm - line-width =183.5 \mm - between-system-space = 25\mm - between-system-padding = 0\mm - system-count = 6 - -%% annotatespacing = ##t -} - -\book { - \score{ - \sarabandeCelloStaff - \layout { } - - \midi { - \context { - \Score - tempoWholesPerMinute = #(ly:make-moment 40 4) - } - } - - - \header{ - opus= "" - piece ="Sarabande" } - } -} -%%% Local variables: -%%% LilyPond-indent-level:2 -%%% End: - diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly deleted file mode 100644 index 8ba1bb45af..0000000000 --- a/input/mutopia/J.S.Bach/bwv940.ly +++ /dev/null @@ -1,172 +0,0 @@ -#(ly:set-option 'old-relative) -\version "2.12.0" - -%{ - Header for Petites Preludes. - - Six Petits Preludes, - Collection Johann Peter Kellner - ca 1703 - 1707 - - Kellner was a student of Bach's that copied some 90 works of his master. -%} - - - - -\header{ - title = "Praeludium" - composer = "Johann Sebastian Bach (1685-1750)" - enteredby = "JCN,HWN" - opus= "BWV 940" - - - % mutopia headers. - mutopiacomposer = "J.S.Bach (1685-1750)" - mutopiaopus = "BWV940" - - mutopiainstrument = "Harpsichord,Clavichord" - date = "1700s" - source = "Ed. Henry Lemoine Urtext" - style = "Baroque" - copyright = "Public Domain" - maintainer = "Jan Nieuwenhuizen" - maintainerEmail = "janneke@gnu.org" - lastupdated = "2003/Aug/22" - mutopiapublicdomain = "\\parbox{\paper-width}{\\thefooter\\quad\\small - \\\\This music is part of the Mutopia project, - \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset - and placed in the public domain by " + \maintainer + - ".\\\\Unrestricted modification and redistribution is permitted - and encouraged---copy this music and share it.}" - tagline = \mutopiapublicdomain - footer = "Mutopia-2003/08/22-nr" -} - -one = \relative c{ - \skip 1 | - \stemUp - r4 d''2 cis4 | - \stemNeutral - d16 a' g f e f cis d - e8.\mordent f16 d8.\prall cis16 | - \stemUp\tieUp - cis4 ~ cis16 a d8 ~ d4 a | - %5 - b2 ~ b4 a ~ | - a16 a \stemUp g! f g4 ~ g f ~ | - f16 a g f e16 g8. ~ g16 g f e d f8. ~ | - f16 f e d b'4 a g | - - fis4 g r8 g16 bes e4 | - %10 - d1 - \bar "|." -} - -two = \relative c{ - r16 d'' c bes a bes f g - a8.\mordent bes16 g8.\prall f16 | - \stemDown - f2 e2 | - \change Staff=lower \stemUp - r4 a, bes b | - \change Staff=upper \stemDown\tieDown - r16 b' a g f8. f16 e2 ~ | - %5 - e2 ~ e4 ~ e16 e f! d | - s4 e4_\mordent~ e4 d4 ~ | - d4. cis16 d cis4 d ~ | - d8 r r16 e f d r16 e f d r d e cis | - r16 e d c! bes! d8. s4 r16 bes' a g | - %10 - fis1 -} - -three = \relative c{ - \stemUp - f2 e | - \stemNeutral - d16 d' c bes a bes f g - a8.\mordent bes16 - g8.\prall f16 | - f2 g4 gis | - a2 ~ a16 a g f e f c d | - %5 - e8.\mordent f16 d8.\prall c16 \stemNeutral c4. d8 | - \stemDown \tieDown - - e4 ~ e16 f e d cis a b cis d e f d | - \override TextScript #'font-style = #'finger - bes2 a ~ | - a a | - d, cis' | - %10 - a'1 - \bar "|." -} - -four = \relative c{ - \stemDown - d2 cis | - \skip 1*2 | - \skip 4*3 - \change Staff=upper \stemUp - \override NoteColumn #'horizontal-shift = #1 - c''4 | - %5 - a gis ~ gis16 gis fis e - \skip 4*1 - \change Staff=lower \stemDown - \override NoteColumn #'horizontal-shift = #0 - \stemUp\tieUp - b2 a | - g a4. gis16 a | - gis2 < g cis,>8 e4 | - d4. fis16 g r16 bes8. ~ bes4 | - %10 - \stemDown - << d,1 { \textLengthOn s4^\markup { \hspace #20 } - s4^\markup { \hspace #1 } s4 } - >> -} - -global = { - \time 4/4 - \key f \major -} - -\score{ - % Allegretto - \new PianoStaff << - \new Staff = "upper" << - \global - \new Voice = "i"\one - \new Voice = "ii" \two - >> - \new Staff = "lower" << - \global - \clef "bass" - \new Voice = "iii" \three - \new Voice = "iv" \four - >> - >> - \layout{ - line-width = 17.0 \cm - \context { - \Score - \override SpacingSpanner #'spacing-increment = #2.0 - } - } - - \midi { - \context { - \Score - tempoWholesPerMinute = #(ly:make-moment 40 4) - } - } - - -} - - diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly deleted file mode 100644 index 48251ac17d..0000000000 --- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly +++ /dev/null @@ -1,235 +0,0 @@ -\header { - title = "Fuga a 3 voci" - opus = "BWV 847-Fuga" - source = "Henle's Urtext" - composer = "Johann Sebastian Bach (1685-1750)" - enteredby = "hwn, wl, jcn" - - % mutopia headers. - mutopiatitle = "Das Wohltemperierte Clavier I, Fuga II (c-minor)" - mutopiacomposer = "J. S. Bach (1685-1750)" - mutopiainstrument = "Piano" - mutopiaopus = "BWV847" - style = "baroque" - copyright = "Public Domain" - maintainer = "hanwen@cs.uu.nl" - %% TODO: handle \footer, \head[er] properly - footer = "Mutopia-2002/08/19-6" - - tagline = \markup { - \smaller - \column { - \line { \footer } - \line { - "This music is part of the Mutopia project, " - \typewriter { "http://sca.uwaterloo.ca/Mutopia/" } - } - \line { - #(ly:export (string-append - "It has been typeset and placed in the public " - "domain by " maintainer "." )) - } - \justify { - Unrestricted modification and redistribution - is permitted and encouraged. Copy this music - and share it! - } - } - } - lastupdated = "2009/August/08" - } - - - -\version "2.13.4" - - - - -dux = \context Voice = "two" \relative c''{ - \voiceTwo - \clef violin - - r8 c16 b c8 g as c16 b c8 d | - g, c16 b c8 d f,16 g as4 g16 f | - es c' b a g f! es d c8 es' d c | - bes a bes c fis, g a fis | - %%5 - g4 r16 c, d es f g as8~ as16 d, es f | - g a bes8 ~ bes16 es, f g as g f es d8 c'16 b! | - % forced accident! - c4 r4 r8 f es d | - r8 as g f g f16 es f8 d | - g4 r8 b c c16 b c8 g | - %%10 - as4 r8 a bes bes16 a bes8 f | - g4 r8 g as as g - \change Staff = bass \stemUp - f | - r8 - as, bes c r8 as16 g as8 f8 | - bes8 c bes as bes g f es | - f des' c bes c as g f | - %%15 - g8 - \change Staff = treble - \stemDown - - g'16 fis g8 c, - es - g16 fis! g8 a | - d, g16 fis g8 a! c,16 d es4 d16 c | % forced accident! - bes8 r8 r16 d e fis g a bes8 ~ bes16 e, f g | - a bes c8 ~ c16 fis,16 g a bes8 es,!16 d es8 g, | - as f'16 es f8 a,8 bes g'16 f g8 b, | - %%20 - c16 f es d - c - \change Staff = bass - \stemUp - bes! as g - f8 \change Staff = treble - \stemDown - as' g f | - es d es f b, c d b | - c4 r8 e8 f f16 e f8 c | - d4 r8 d8 es8 es16 d es8 bes | - c2 ~ c8 d16 es f es f d | - %%25 - b8 r8 r b c r r es | - d r r f ~ f r r f | - es as g f es d es f | - b, c d b b c r c | - f16 d es c ~ c8 b c4 r8 e | - %%30 - f4 r8 f f es16 d es8 | - r r 2 | -} - - -comes = \context Voice = "one" \relative c'' { - \voiceOne - \override MultiMeasureRest #'staff-position = #6 - R1 | - R1 | - r8 g'16 fis g8 c, es g16 fis g8 a | - d,8 g16 fis g8 a c,16 d es4 d16 c | - %%5 - bes8 es16 d es8 g,8 as f'16 es f8 a, - bes8 g'16 f g8 b, c8 d16 es f4 ~ | - f8 es16 d c16 bes ! as g f8 as' g f - es d es f b, c d b | - c g'16 fis g8 d es4 r8 e8 | - %%10 - f f16 e f8 c8 d4 r8 d | - es8 es16 d es8 bes c es16 d es8 f | - bes, es16 d es8 f as,16 bes c4 bes16 as | - \stemNeutral g16 es f g as bes c d es d c d es f g a | - bes f, g as bes c d e f es d es f g a b | - %%15 - \stemUp c8 b16 a g f! es d c8 es d c | - bes a bes c fis,! g a fis | % forced accident - g8 d'16 c d8 r8 r8 e16 d e8 r8 | - r fis16 e fis8 r r g,16 f g8 r8 | - r8 a16 g a8 r r b16 a b8 r | - %%20 - r8 c16 b c8 g as c16 b c8 d | - g, c16 b c8 d f,16 g as4 g16 f | - es8 c'16 b c8 g as4 r8 a | - bes8 bes16 a bes8 f8 g4 r8 g ~ | - g as16 bes c b c as f2 ~ | - %%25 - f8 d'16 c d8 f, es es'16 d es8 g, | - f f'16 es f8 as, g16 f' es d c b a g | - c8 f es d r as g f | - g f16 es f8 d as' g r a | - b c f,16 es d c c8 c'16 b c8 g | - %%30 - as c16 b c8 g,8 c16 b c8 d | - f,16 g as4 g16 f e2 | -} - -bassdux = \context Voice = "three" \relative c' { - \clef bass - R1 | - R | - R | - R | - %%5 - R | - R1 | - r8 c16 b c8 g as c16 b c8 d | - g, c16 b c8 d f,16 g as4 g16 f | - es c' b a g f es d c d es d c bes! as! g | - % -> \classic_accidentals - %%10 - f bes' as g f es d c bes c d c bes as g f | - es as' g f es des c bes as8 c' bes as | - g8 f g as d, es f d | - es as g f g es d c | - d bes' as g as f es d! | - %%15 - es8 r8 r4 r8 c bes a | - r es' d c d c16 bes c8 d | - g,8 bes'16 a bes8 d, es c'16 bes c8 e, | - f d'16 c d8 fis, g4 r16 g, a b | - c16 d es8~ es16 a, bes c d es f8~ f16 b, c d | - %%20 - es8 r r e \stemNeutral \stemDown f f, es! d \stemNeutral | - r as' g f g f16 es f8 g | - c16 d es d c bes as g f bes' as g f es d c | - bes c d c bes as g f es as' g f es d c bes | - as bes c bes as g f es d g' f es d c b a | - %%25 - g4 r4 r16 g a b c d es f | - g f as g f es d c b8 c16 b c8 g | - as c16 b c8 d g, c16 b c8 d | - f,16 g as4 g16 f es4 r8 es' | - d c g' g, - %%30 - << { c2 ~ | c1 ~ | c1 } \\ - { c,2 ~ | c1 ~ | c1 } - >> -} - - -\book { - \score { - - \context Score \with - { - \override SpacingSpanner #'spacing-increment = #1.0 - \override SpacingSpanner #'shortest-duration-space = #1.9 - } \context PianoStaff << - \override Score.TimeSignature #'style = #'C - \context Staff = "treble" << - \overrideBeamSettings #'Score #'(4 . 4) #'end - #'((* . (1 1 1 1)) - ((1 . 32) . (4 4 4 4 4 4 4 4))) - \key c \minor - \dux - { \comes \bar "|." } - \time 4/4 - >> - \context Staff = "bass" << - \key c \minor - \bassdux - >> - >> - - \header{ - opus = "BWV 847" - } - \layout {} - \midi { - \context { - \Score - tempoWholesPerMinute = #(ly:make-moment 84 4) - } - } - } - \paper { - line-width = 18.0 \cm - ragged-last-bottom = ##f - } -} diff --git a/input/mutopia/R.Schumann/GNUmakefile b/input/mutopia/R.Schumann/GNUmakefile deleted file mode 100644 index 9db7efecb1..0000000000 --- a/input/mutopia/R.Schumann/GNUmakefile +++ /dev/null @@ -1,8 +0,0 @@ -depth = ../../.. - -examples= -LOCALSTEPMAKE_TEMPLATES=ly mutopia - -include $(depth)/make/stepmake.make - - diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly deleted file mode 100644 index a83fb3cec5..0000000000 --- a/input/mutopia/R.Schumann/romanze-op28-2.ly +++ /dev/null @@ -1,298 +0,0 @@ -% NOT FINISHED!!!! - -\include "deutsch.ly" - -#(set-global-staff-size 16) - -\version "2.12.0" - -\header { - title = "Romanzen" - opus = "op. 28/2" - composer = "Robert Schumann (1810-1856)" - enteredby="Rune Zedeler" - maintainer="rune@zedeler.dk" - mutopiatitle = "Romanzen - op. 28/2" - mutopiacomposer = "R. Schumann 1810-1856" - mutopiainstrument = "Piano" - style = "Romantic" - copyright = "Public Domain" -} - -u = { \change Staff = up \stemDown } -m = { \change Staff = mid \stemUp } - -% -% d = .. complains about note names. -% -#(define d #{ \change Staff = down \stemUp #}) - -forcedBreak = \break - -global = { \key fis \major \time 6/8 - \set Score.beatLength = #(ly:make-moment 3 8) - \repeat volta 2 { s2.*8 } s2.*26 \bar "|." -} - -righta = \transpose c cis' { - % \stemUp \slurUp \tieUp - \stemUp - \repeat volta 2 { - \override TextScript #'extra-offset = #'(-8.0 . 2.5) - \m a,16[^\p( \u c^\markup { - \large "Einfach (" - \note #"8" #1 - \large " = 100)" } - a c ] \m g,[ \u c^3 ] \m b,[ \u c^2 b c] \m a,[ \u c^3]) | - \revert TextScript #'extra-offset - \m f,[( \u c f c] \m g,[ \u c^4] \m a,[ \u c^2 a c8 c16)] | - \m c16[( \u f c' f] \m b,[ \u f] \m d[ \u f^3 d' f^2] \m c[ \u f)^4] | - \m f,16[( \u c16^3 f c] \m g,[ \u c^4] \m a,[ \u c^2 a c8 c16)] | - \m a,[( \u c a c] \m c[ \u d c' d] \m b,[ \u d] \m a,[ \u d)^3] | - \m g,[( \u c^2 g c] \m b,[ \u c b c] \m a,[ \u c] \m g,[ \u cis)^3] | - \m f,[( \u d^3 f d] \m g,[ \u d g d] \m g,[ \u c] \m a,[ \u a)] | - \m g,[( \u c g c] \m f,[ \u h,^2 g h,] \m e,[ \u c^2 g c)] | - } - \forcedBreak - \stemUp \slurUp \tieUp - b4^5( 8~ a g^4 | - f4^5 e8^5~e d4)^4 | - as4^4( 8~ g^5 f^4 | - es4^5 d8^5~d c4)^4 | - c^4( es8^5~ d^3 f) | - e4^4( g8^5~ f^3 as) | - g4^4 b8^5~b a c'^5~ | - c' b^4 ges^5 des^3 b,^5 \d ges,16[^4 f,] | - e,^2^\markup { \large "ritard..." } cis,^1 \u r8 r r4 r16 \d gis,^2^"R.H."] | - - - \forcedBreak - \m a,16[^\p( \u c a c] \m g,[ \u c^3] \m b,[ \u c^2 b c] \m a,[ \u c)^3 ]| - \m f,[( \u c f c] \m g,[ \u c^4] \m a,[ \u c^2 a c8 c16)] | - \m c16[( \u f c' f] \m b,[ \u f] \m d[ \u f^3 d' f^2] \m c[ \u f)]^4 | - \m f,[( \u c^3 f c] \m g,[ \u c^4] \m a,[ \u c^2 a c8 cis16)] | - \m a,[( \u d^2 a d] \m c[ \u d c' d] \m b,[ \u d)^3] r8 | - \m c16[( \u f c' f] \m es[ \u f es' f] \m d[ \u f)^3] \m f[( \u as^2] | - f'[ as)] \m f[( \u as f' as)] r8^\fermata r16 e'^2( f' g' | \stemNeutral \tieNeutral - as' des'^1 c'8^\markup { \finger "2-3" } h~h c'16) \clef F e,16[(^2 f, g,] | - \forcedBreak - - as,[^5 h,,^2)] \clef G 8[( 16 c'] 4.~ - 8) s4 s8 r16 h^2( c' d' | - es' ges-1 f-2 a-1 c'-2 f'-4 \stemUp \tieUp e'-5 d' c' b-4 a^\prall^\markup { \finger "2-4-3" } g | - f) f'-5( e'-5 d'-4 c'-3 f')-5 4( 8 | - 4 8 f16^4 d'^5~ d'8.[ c'16^4] | - \forcedBreak - << f8)^3_\pp \new Voice = "another" { \m a,16[ \u c8 c16] } >> \m g,[ \u c_3] \m b,[^\markup { \finger "2-1" } \u c8 c16] \m a,[ \u c]~ | \stemNeutral - c16 c8_4 c c16~c c8_2 c c16~ | - c16 c8 c c16~c c8 c c16~ | - c16 c8 c c16 r4^\fermata r8 | \bar "|." - -} - -rightb = \transpose c cis' { - \relative c { \stemDown \slurDown - \repeat volta 2 { - a4^1( g8^1 b4^1 a8^1 | - f8..^1 f32^1 g8^2 a4.)^1 | - c4^1( b8 d4 c8 | - f,8.. f32^1 g8^2 a4.) | - a4(^1 c8^1_\accent~c b^1 a^1 | - g4) b8^1_\accent(~b a^1 g^1 | - f4)^1 g8_\accent(~g g_. a_. | - g4 f8~f e4) | - } - } - \u \slurUp - g16_4 d b, d g e cis g_4 f_3 d_1 e_2 b, | - d_3 a,_2 f, a, cis_4 a, e, a, d a,8 g,16 | - f_4 c as, c f d h, f_4 es_3 c_1 d_2 as, | - 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 | - \once \override PhrasingSlur #'extra-offset = #'(0 . 3) - 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\! } - - \change Staff=mid - \relative c { \stemDown \slurDown - a4^1( g8^1 b4^1 a8^1 | - f8..^1 f32^1 g8^2 a4.)^1 | - c4^1( b8 d4 c8 | - 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~ | - \override PianoStaff.Arpeggio #'direction = #UP - f f8.. f32^1( as4.)^\fermata\arpeggio ~ | - \revert PianoStaff.Arpeggio #'direction - \stemUp \tieUp as r4 r8 | - } - s2. s - \u s4. \grace { - \override Stem #'stroke-style = #"grace" - f8( - \revert Stem #'stroke-style } - f4) e8 | - f g16_2 b_1 a_2 gis_1 c_2 h, c cis_1 d_2 b,_1 | - \tieDown c4.~16\< \tieNeutral ~ < f^3 h >8[\>\! < e b^2> \!] | - \change Staff=mid - \transpose c' c { - a4^1( g8^1 b4 a8^2 | - f8..^1 f32^1 g8^2 a8..) \slurUp 32( 8 | - 8..) 32( 8 4.\>) ~ | - a~ a\!^\fermata \bar "|." - } -} - -lefta = \transpose c cis { - \stemUp \slurUp \tieUp - \repeat volta 2 { - f4^1( e8^1 g4^1 f8^1 | - d8..^1 d32^2 e8^1 f4.) | - a4^1( g8 b4 a8 | - d8..^1 d32^2 e8^1 f4.) | - fis4^1 a8^1^\accent(~a g^1 f^1 | - e4)^1 g8^1^\accent(~g f^1 e^1 | - d4)^1 f8^1^\accent(~f e^. dis^1^. | - e4^1 d8^1~d c4)^1 | - } - \d \tieNeutral \slurDown - << - \transpose c' c { - g4 a8~a f g | a4 g8~g f e | - d4 g8~g es f | g4 f8~f es d | - c4 r8 f4 as8~ | as g b as4 ces'8~ | - ces' b des' c'4 \new Voice = "another" { \stemUp \tieUp 8~ | - es' des'4^1~ \stemDown des'8.[ c'16] } - } - \transpose c' c, { - g4(-4 a8-3~a f-5 g-4 | a4-3 g8-\markup { \finger "4-3" } ~g f-4 e-5 | - d4)-\markup { \finger "4-5" }( g8-3~g es f-4 | g4-3 f8-4~f es d-4 | - 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'~ | - \override NoteColumn #'horizontal-shift = #-1 des' s - } - >> - \change Staff=down \stemUp \slurUp \tieUp \phrasingSlurUp - f4^1( e8^1 g4^1 f8^1 | - d8..^1 d32^2 e8^1 f4.) | - a4^1( g8 b4 a8 | - d8..^1 d32^2 e8^1 f4.) | - fis4 a8^\accent~a g s | - a4 c'8^\accent(~c' b) d'^\accent~ | - d' d'8..^\accent d'32-1 s4. | - s2.*2 - s8 r16 h\( c' d' es' as g8\arpeggio fis( - ges)\) f16-2( a-1 c'-3 f')-1 \grace { - \override Stem #'stroke-style = #"grace" - \stemDown \slurUp b,[( f] \stemUp - \revert Stem #'stroke-style } - e')-1( d' c' b-1 a-2\prall g - f16)-4 f' d'-1 c'-2 h-1 s4. - s2. - f4^1( e8 g4 f8 | - d8..^1 d32-2 e8^1 f8..) d32^2( e8^1 | - f8..) d32-2( e8^1 f4.)^1 ~ | - f~ f\fermata | -} - -leftb = \transpose c cis { - \stemDown \slurDown \tieDown - \repeat volta 2 { - f16^\p c f, c e c-3 g c-2 f, c f c | - d c f, c-3 e c f c f, c8 c16-3 | - a16 c f, c g c-3 b c f, c a c | - d c f, c-3 e c f c-2 f, c8 c16 | - fis d-2 d, d a[ d] g, d g d f h,-3 | - e c-2 c, c g[ c] f, c f c e a,-3 | - d a, d, a, f[ g,-2] h,, g, e c, dis fis,-5 | - e c g,-4 c d g,-2 c,[ g, c g,] c,8 | - } - - s2.*9 | - - f16^\p c c, c e c-3 g c-2 c, c f c | - d c c, c-3 e c f c f, c8 c16-3 | - a16 c f, c g c-3 b c f, c a c | - d c f, c-3 e c f c-2 f, c8 cis16 | - fis^1 d d, d a[ d_2] g, d g d_3 b,[_5( g_2] | - a) c_3 f, c c'[ f_2] b, f b f_3 d' as | - h, as d' as h, as( f'4.)^\fermata\arpeggio_2 ~ - \d \stemDown f'8. \clef G \stemNeutral \tieNeutral \phrasingSlurDown - \transpose c c' { e16[_4( f g] as[ des_3] c8[_4 )]~ | - } \clef F [( ] 8.) h,16_4\( c d | - \voiceTwo - es as,_3 g,8 fis,~fis, g,_4\arpeggio gis,_5~ | - gis, 16\) r16 r8 r4 cis8( | - d) e( f16_4 d_5 c4.)_ \markup { \finger "4-3" }~ | - \oneVoice - c16( h,_4 c_3 cis_1 d_2 b,_3 a,_4 as,_1 g,8 c,8) | - \change Staff = down \stemDown \tieDown - f16^\pp c f, c e c-3 g c-2 f, c f c | - d c f, c-3 e c f c-2 f, c-3 e c | - f c-2 f, c-3 e c ~ c c8 c c16 ~ | - c c8 c c16 r4_\fermata r8 \bar "|." | -} - - -\paper { - indent = 0.5 \in - % textheight = 29.8 \cm - pagenumber = no - line-width = 17.0 \cm -} - -\score { - \context PianoStaff << - #(set-accidental-style 'piano-cautionary) - \override PianoStaff.NoteCollision #'merge-differently-dotted = ##t - \set PianoStaff.connectArpeggios = ##t - \override PianoStaff.Arpeggio #'stencil = #ly:arpeggio::brew-chord-bracket - - \override PianoStaff.InstrumentName #'font-size = #6 - \override PianoStaff.InstrumentName #'font-shape = #'italic - \override PianoStaff.InstrumentName #'font-magnification = #3 - - \set PianoStaff.instrumentName = " 2." - \new Staff = "up" { - \override Staff.DynamicLineSpanner #'direction = #DOWN - \clef G <<\global \new Voice = "upv" \righta >> - } - \new Staff = "mid" { - \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.instrumentName = "\\begin{turn}{-90}{Rechte Hand}\\end{turn}" - \set Staff.instrumentName = \markup { \column { Rechte Hand } \hspace #2 } - \clef F <<\global \new Voice = "midv" \rightb>> - } - \new Staff = "down" { - \override Staff.DynamicLineSpanner #'direction = #UP - \clef F - << \global \new Voice \lefta \new Voice \leftb >> - } - >> - \layout { - \context { - \RemoveEmptyStaffContext - } - \context { - \Score - \override SpacingSpanner #'common-shortest-duration = #(ly:make-moment 1 8) - } - } - - \midi { - \context { - \Score - tempoWholesPerMinute = #(ly:make-moment 100 8) - } - } - - -} - - diff --git a/input/mutopia/W.A.Mozart/GNUmakefile b/input/mutopia/W.A.Mozart/GNUmakefile deleted file mode 100644 index 5a98a7a49a..0000000000 --- a/input/mutopia/W.A.Mozart/GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ -# - -depth = ../../.. - -examples=mozart-hrn-3 -LOCALSTEPMAKE_TEMPLATES=ly mutopia - -include $(depth)/make/stepmake.make - - diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly deleted file mode 100644 index 4e983cebb5..0000000000 --- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly +++ /dev/null @@ -1,106 +0,0 @@ -\header{ - title = "Konzert Nr. 3 Es dur" - subtitle = "für Horn und Orchester" - composer = "Wolfgang Amadeus Mozart (1756-1791)" - enteredby = "HWN" - opus = "KV 447" - - copyright = "public domain" - instrument = "Horn in F" - editor = "Henri Kling" - mutopiatitle = "Horn Concerto 3" - mutopiacomposer = "W.A.Mozart" - mutopiaopus = "KV447" - style = "classical" - maintainer = "hanwen@xs4all.nl" - maintainerEmail = "hanwen@xs4all.nl" - maintainerWeb = "http://www.xs4all.nl/~hanwen/" - lastupdated = "2002/May/21" - source = "Edition Breitkopf 2563" - footer = "Mutopia-2002/05/21-25" - - tagline = \markup { \smaller - \column { - \fill-line { \footer "" } - \fill-line { { "This music is part of the Mutopia project," - \typewriter { "http://mutopiaproject.org/" } - } } - \fill-line { #(ly:export (string-append "It has been typeset and placed in the public " - "domain by " maintainer ".")) } - \fill-line { #(ly:export (string-append "Unrestricted modification and redistribution" - " is permitted and encouraged---copy this music" - " and share it!")) } - } - } -} -%{ - -This is the Mozart 3 for horn. It's from an Edition Breitkopf EB -2563, edited by Henri Kling. Henri Kling (1842-1918) was a horn -virtuoso that taught in Geneva. - -%} - -\version "2.12.0" - -\include "mozart-hrn3-defs.ily" -\include "mozart-hrn3-allegro.ily" -\include "mozart-hrn3-romanze.ily" -\include "mozart-hrn3-rondo.ily" - -\paper { - between-system-space = 20 \mm -} - - -\book { - \score { - { \transpose c' bes \allegro } - \layout { } - \header { piece = "Allegro" opus = "" } - - \midi { - \context { - \Score - tempoWholesPerMinute = #(ly:make-moment 90 4) - } - } - - - } - - \score { - { \transpose c' bes \romanze } - \header { piece = "Romanze" opus = "" } - - \midi { - \context { - \Score - tempoWholesPerMinute = #(ly:make-moment 70 4) - } - } - - - \layout {} - } - - \score - { - { \transpose c' bes \rondo } - \header { piece = "Rondo" opus = "" } - - \midi { - \context { - \Score - tempoWholesPerMinute = #(ly:make-moment 100 4) - } - } - - - \layout { } - } -} - -%% Local Variables: -%% coding: utf-8 -%% End: diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily deleted file mode 100644 index d788aeecbc..0000000000 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily +++ /dev/null @@ -1,198 +0,0 @@ -\version "2.11.61" -\include "mozart-hrn3-defs.ily" - -allegro = - - \relative c' -{ - \time 4/4 - \key c \major - \partial 4 - r4 - | - R1*4 - c'2^"Tutti" g - c, r - R1*1 - r8 g' g g g g e c - g'4 g, r2 - R1*18 - r2 r4^"Solo" g'4 | - \mark "A" - e'4. ( c8) f[ (d c b) ] - b[( c)] g4 r8 g[ c e] - g2. g16[( f e f)] - dis4 ( e4) r8 c8[-. c-. c-.] - c4.( d16[ e] f4 e) - a,( d g, c) - d-. d-. \grace { - \override Stem #'stroke-style = #"grace" - e16( - \revert Stem #'stroke-style } - d8.[) c16 d8. e16] - c4 r r2 - R1*3 - c,2 ~ c8[ e g c] - c[ b ] b4 r2 - c,8[ ( e) g c] e[( g) e c] - c[( b)] b4 r2 - c4.( g8 e'4. c8) - g'[( d) ] d4 r4 d - d8[ ( c)] c4.( d16[ e] d8[ c)] - c8[(\trill b)] b4 r2 | - d2( ~ d8[ e16 d] c8[ b)] | - b[( a)] a4 r8 a[ a a] - a4( cis e g) - \grace { - \override Stem #'stroke-style = #"grace" - \longgrace g16( \endlonggrace - \revert Stem #'stroke-style } - - fis8[)( e16 d)] d4-. r2 | - \mark "B" - R1*3 - r2 r4 d8[(_\markup { \italic \bold "con espressione" } b) ] - a[( g) d'( b)] a[( g) e'( c) ] - b8[( a)] a4 r4 a8[ a] - a[( \< b c cis\!\> ] d4 c\!) - ais8[( b)] r8 \cresc b b[( c)] r c - cis[ ( d)] r4 r2 - \endcresc g,1\f ~ g2 ~ g8[ a16 b] c[( d) e c] - %% 64 - f4-. d-. b-. g-. - R1 - - c,2\p e4 g c \cresc e g4. e8 | - \endcresc d4.\f e16[ fis] g[ ( fis) e d] c[( b) a g] - - << a1(\trill - { s2 \grace { - \override Stem #'stroke-style = #"grace" - g16[ a] - \revert Stem #'stroke-style } - } >> - \mark "C" - g4) r r2 - R1*15 - \mark "D" - bes2\mf d4 f - g,2~ g8[ g' es c]| - bes4( a4.) c8[( d es)] - cis4( d) r8 bes[ (c d)] - es2 ( d4) r - es2 ( d4) r - c8[( g' es c)] bes4( c) - c4.( cis8 d4) r - R1*2 - es1~es1| - e! - d - c - c, - e' - e, - c'2 b8[( a gis a)] - gis8[ e gis b ] e4 r | - r8 e,[ a c] dis4 r - r8 e,[ gis b ] e4 r - r8 e,[ a c] dis4 r - r8 e,[ g b] e4 r - r8 fis,[ b dis] fis4 r - r8 gis,[ b d] f4 r - r8 g,[ b d_\ritenuto ] f4 r - \mark "E" - R1*8 - r2 r8 g,[ g g] - e'4.( c8) f[( d c b)] - b[( c)] g4 r8 g[ c e] | - g2. g16[( f e f)] - dis4( e) r8 c[-. c-. c-.] - c4.( d16[ e] f4 e) - a, ( d g, c) - d d - \grace { - \override Stem #'stroke-style = #"grace" - e8( - \revert Stem #'stroke-style } - - d8.[) c16 d8. e16] - c4 r r2 - \mark "F" - R1*3 - c,2~ c8[ e g c] - c8[( b)] b4 r2 - c,8[ e g c ] e[ ( g) e c] - c[( b)] b4 r2 - c2 (bes a) a8[(b c cis)] - d2( ~ d8[ e16 d] \grace { - \override Stem #'stroke-style = #"grace" - \longgrace d16( \endlonggrace - \revert Stem #'stroke-style } - -%% todo: should insert grace slur here. - c8[ b16 c)] - \grace { - \override Stem #'stroke-style = #"grace" - \longgrace c16 \endlonggrace - \revert Stem #'stroke-style } - b8[( a16 g)] g4 r2 | - R1*3 - r2 r4 g'8[( e)] - \mark "G" - d[( c) g'( e)] d[( c) a'( f)] - e[( d)] d4 r d8[ d] - d4(~ d16[ e d e)] g8[( f) e d] | - c4 r r2 - R1 - c1 ~ - c | - c8[-. c-.] r c-. cis[( d)] r\cresc d-. | - dis[( e)] r e-. e[( f)] r f-. | - g4-.\f\endcresc e-. c-. bes-. | - g-.\ff e-. c-. r | - a'2 ~ a8[_""_\markup { \bold \italic "sempre " \dynamic "f" } b16 c] d[( e d e)] - - - f4. ( d8) f8[ ( d) f d] - c[ (e] g2) \grace { - \override Stem #'stroke-style = #"grace" - \longgrace f16( \endlonggrace - \revert Stem #'stroke-style } - e8[)( d16 c)] - - << d1\trill _( - { s2 \grace { - \override Stem #'stroke-style = #"grace" - c16[ d] - \revert Stem #'stroke-style } - } >> - - c4) r r2 - R1 | - \mark "H" - \times 2/3 { c8[ b a ] } \times 2/3 { g[ a b] } - \times 2/3 { c[ d e] } \times 2/3 { f[ e d] } | - \times 2/3 { c[ b a ] } \times 2/3 { g[ a b] } - \times 2/3 { c[ d e] } \times 2/3 { f[ e d] }| - c4 \times 2/3 { r8 g'[( e)]} c4 \times 2/3 { r8 e[ ( c)]} | - g4 \times 2/3 { r8 c8[( g)] } \times 2/3 { e[ ( g) e-. ] } \times 2/3 { c[ ( e) c-.] }| - g4 r8 g'\f a[ b c d]| - - << d1_(\trill - { s2 \grace { - \override Stem #'stroke-style = #"grace" - c16[ d] - \revert Stem #'stroke-style } - } >> - c4) r r2 - R1*3 - - c4.^\fermata_"Cadenza ad lib." ( d8) d4.\trill^\fermata ( c16[ d)] - c4 r r2 - R1*8 - r4 c8.[^"tutti"\f c16] c4 c - c c,8.[ c16] c4 c| - c2 r2 \bar "|." - -} - diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily deleted file mode 100644 index c234ffd3d5..0000000000 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily +++ /dev/null @@ -1,51 +0,0 @@ -% - -longgrace = \override Stem #'stroke-style = #'() -endlonggrace = \revert Stem #'stroke-style -ritenuto = \markup { \italic "rit." } - -\version "2.11.61" - -cresc = { - #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) - \set crescendoText = \markup { \italic \bold "cresc." } - \set crescendoSpanner = #'text -} - -\layout { - \context { - \Score - skipBars = ##t - midiInstrument = #"french horn" - %% try to mimic Breitkopf - \override RehearsalMark #'padding = #1 - \override MultiMeasureRest #'padding = #0.5 - restNumberThreshold = #1 - - \override RehearsalMark #'font-series = #'bold - \override RehearsalMark #'font-size = #4.5 - - \override Beam #'thickness = #0.6 - \override Beam #'space-function = #(lambda (beam mult) 0.8) - } - \context { - \Staff - \override VerticalAxisGroup #'minimum-Y-extent = #'(-2.5 . 3.5) - } -} - -\paper{ - - % #(define fonts my-sheet) - - % stress page breaking on a6 paper: - % line-width = 80 \mm - % paper-width = 105 \mm - % paper-height = 149 \mm - - indent = 10. \mm - line-width = 189. \mm - ragged-last-bottom = ##f - -} - diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ily deleted file mode 100644 index cca5e1885c..0000000000 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ily +++ /dev/null @@ -1,88 +0,0 @@ -\version "2.11.61" -\include "mozart-hrn3-defs.ily" - -romanze = \relative c' { - \key f \major - \time 2/2 - \set Score.skipBars = ##t - - c'4.( _\markup { \dynamic "p" \italic { "" con molto espressione } } - f8) a,4 a - bes8[( c d bes] g4) r8 g - a r bes r c r d[( bes)] - a2( g8[) a( bes b)] - c4. ( f8) a,4 a | - % 6 - bes8[ (c d bes)] g4 r8 c, - c8[( e g bes)] a[( c f d)] - c r e r f r r4 - \mark "A" - R1*8 - g4.\mf f8 e[ d c bes] - % 18 - bes[( a d c)] c4 r - R1*2 - g'4. f8 e[ d c bes] - bes[ (a d c)] c4 r - R1 - % 25 - c16[ ( d c d)] e[ ( f e f)] g[( e) c-. c-.] f[( d) b-. b-.] - c16[\p ( d c d)] e[ ( f e f)] g[( e) c-. c-.] f[( d) b-. b-.] - c8[ \< c, c c] c[ c c c\!] - \mark "B" - c1\f - R1*9 - f'4.(\p d8) b4 r8 g - g'4.( e8) c4 r8 cis | - % 39 - d4(~ d16[ e d e)] f8[ ( d) f( d)] - c2( b4) r - R1*4 - e4. ( g8) c,4 ( cis) - d8[( e f d)] b4 r8 g - c[ ( e) g g] g[( f e d)] - c4( - \grace { - \override Stem #'stroke-style = #"grace" - \longgrace e16 \endlonggrace - \revert Stem #'stroke-style } - - d8.[ c16) \< ] c8[ c-.( c-. c)-.]\! - \mark "C" - - %% this is a trick to get the sfp-s to align. - \override Hairpin #'transparent = ##t - des1\sfp \> - g,1\sfp\! \> - c\sfp \! \> - c,\sfp\! - \revert Hairpin #'transparent - R1*3 - r8 c[\p c c] c2~ - c8[ c' c c] c2~ - c8[ \< e( g f] e[ d\!\> c bes] - \mark "D" - a4\!) r r2 - R1*3 - c4.\p ( f8) a,4 a | - bes8[ (c d bes)] g4 r8 c, - c8[( e g bes)] a[( c f d)] - c r e r f4 r4 - R1*3 - r2 r4 r8 c,8 - c8[( e g bes)] a[( c f d)] - c r e r f4 r4 - g,1 - c,2 c4. c8 - c8[( e g bes)] a[( c f d)] - c r e r f4 r4 % -. ? - - R1 - c8-. r e-. r f4 r4 - - % Finish with F if played separately - c8-.( r c,-. r c4) r4| - \bar "|." -} - - diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ily deleted file mode 100644 index 02c0493b0f..0000000000 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ily +++ /dev/null @@ -1,195 +0,0 @@ -\version "2.11.61" - -% \include "mozart-hrn3-defs.ily" - -rondotheme = \relative c' { - c'8[ c c] c[ c c] - c4( cis8 d) r g, - d'8[ d d] d[ d d] - d4( dis8 e) r c | - c[( d) e] f[ g a] - g[ ( e) c] c4 d8 - e4( d8) e4( f8) - e4.( d8) r r | -} - -lipbreaker = \relative c' -{ - r8 g'[-. g-.] c[( e) g,-.] - c[( e) g,-.] c[( e) g,-.] - c[ c, c] c[ c 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 } - -rondo = \relative c' -{ - \partial 8 - \time 6/8 - \key c \major - - g'8\p | - - \rondotheme - - R2.*13 | - r8 r^\fermata d' d[ e f] - g[ ( e) c-.] d[( e) d-.] - c4 c8 d[ e f] - g[( e) c-.] d[( e) d-.] - c4 r8 r4 r8 | - R2.*7 - \mark "A" - c4.\p \grace { - \override Stem #'stroke-style = #"grace" - e16( - \revert Stem #'stroke-style } - d8[) c d] - c4 r8 r4 r8 - e4. \grace { - \override Stem #'stroke-style = #"grace" - g16( - \revert Stem #'stroke-style } - f8[) e f] - e4 r8 r4 r8 - g4. e4 c8 - g2.~ - g8[ a b] c[ d e ] - e4.( d8) r r - R2.*4 - e2.~ | - e8[ d c] c[ b a] - d2.~ - d8[ c b] b[ a g] - g'4( e8) b4( cis8) - \mark "B" - d4 r8 r4 r8 - R2.*3 | - r8 d[-. d-.] d[( g) d-.] - d[( g) d-.] d[ d d] - d[( g)] r r4 r8 - R2.*1 - \lipbreaker - c,,4 r8 c'[ d e] - d4( g8) c,[ d e] - d4 r8 r4 r8 - R2. | - r4 r8 c[-. d-. e-.] - d4( g8) c,[ d e] - d[( g) fis] e[ d c] - b[ ( e) d] c[ b a] - \mark "C" - g4 r8 r4 r8 - R2. | - % - r8 g[\f g] g[( b) b-.] - b[( d) d-.] d[( g) g-.] - g2.~ - g8[ \> a g] f[ e d] - << \rondotheme - { s8\!\p } >> - - R2.*12 - r4 r8 r4 c8 - \mark "D" - c4 f8 c4 a8 - a4.~a4 a8 - bes4 c8 d4 bes8 - g4. ~ g8 r r - R2.*3 - r4 r8 r4 c8 - a4. c - f ~ f8.[ \rightsixteenth e16( \bothsixteenth d c)] - bes4 g8 e4 g8 - c,4. ~ c8 r r - R2.*3| - r4 r8 r4 c'8 - b4( c8) b4( c8) - bes4. ~ bes4 g8 - a4 ( c8) f4 ( b,8) - d4. ( c8) r r - R2.*3| - r4 r8 r4 c8 - b4( c8) b4( c8) - bes4. ~ bes4 g8 - a4 c8 f[ ( d) b!] - d4. ( c8) r r - \mark "E" - R2.*9 | - \lipbreaker - c,8[ c' c] c4.~ - c8[ c d] e[ e fis] - g4 r8 r4 r8 - R2. - r8 g,[ g] g[ g g] | - es'4. ~ es8[ d c] - b4 r8 r4 r8 - R2. | - r8 g[ g] g[ g g] - es'4. ~ es8[ d c] - \cresc b4. c4. d4. e4. - \mark "F" - \endcresc - - f2.\f ~ | - f4 r8 r4 r8 - r8 g,[\> g] g[ g g] - - % Edition breitkopf says a-flat (silly!) - fis[ g gis] - a[ bes b]\! - - %% EB does the slur in the Rondo differently from the 1st adn 2nd time. - %% why. Should check with MS. - << \rondotheme - { s8\p } >> - R2.*7 - \mark "G" - R2.*4 - c,4.\mf c4 c8 - c4. e4 c8 - g'4. g4 g8 - g4. g,4 g8 - c4 r8 r4 r8 - r4 r8 r4 g'8 - c[ ( e) g,-.] c[ ( e) g,-.] - c[ ( e) g,-.] c[ ( e) g,-.] - \mark "H" - \cresc g'2. bes,2. - a4. b16[ c d e f g] - a4. f4 d8 - \endcresc c8[\f g' e] c[ g e] - c[ e' c] g[ e c] - g4 r8 g''8[ e c] - - - << d2._(\trill - { s2 \grace { - \override Stem #'stroke-style = #"grace" - c16[ d] - \revert Stem #'stroke-style } - } >> - - - c4) r8 r4 r8 - R2.*5 - r8 r8^\fermata d8\p d[ e f] - g[ ( e) c] d[( e) d] - \cresc c[ c c] d[ e f] - g[( e) c] d[( e) d] - \endcresc c4\f r8 r4 r8 - R2.*5 - c8[\f c, c] c[ c c] - c4 r8 c4 r8 - - % This is technically incorrect, since we started with an 8th - % note pickup, but both eulenburg and EB do this as well. - c4 r8 r4 r8 \bar "|." -} - diff --git a/input/mutopia/claop.py b/input/mutopia/claop.py deleted file mode 100644 index 92a8f7351d..0000000000 --- a/input/mutopia/claop.py +++ /dev/null @@ -1,308 +0,0 @@ -import sys - - -copyright = """copyright 1992. Peter Wallin. Verbatim redistribution -permitted """ - - - -""" - -This file produces the Score for CLA(O)P II -- a piece by -Peter Wallin (pwallin@post8.tele.dk). - -The score produced by this file is -copyright 1992. Peter -Wallin. Verbatim redistribution permitted - - - - -From: Rune Zedeler -Sender: lilypond-devel-admin@gnu.org -To: LilyPond Devel -Subject: CLA(O)P II -Date: Wed, 12 Jun 2002 02:14:05 +0200 - -The concert went well. -I talked to the composer and he agreed to include the score in lilypond -as long as his name was maintained and as long as he kept the copyrights -- that is people are not allowed to make changes to the score. - -I think including CLA(O)P II is a Good Thing because it stress tests -lilypond very well. This is also why I think that including only an -excerpt from it is stupid. -I am not sure how the inclusion should be. -The raw lilypond file is 750k; gzip'ed 40k. -Alternatively one could include the generating c-file into lilypond. -Or perhaps we should just wait till I manage to redo it in scheme... :-) - --Rune - -""" - - - -#//set to 1, 385 to typeset the whole score -start_measure =1 -no_measures = 385 -voices = 48 - -durs = ["16","8","8.","4"] -grund = [ - "x x x x xx x", - "x x xx xx x xx x", - "xx xx x xx xx x xx xx x ", - - "x x x xx xx ", - "x xx xx x xx xx ", - "x xx x xx xx x xx xx x x", - - "x x xx xx x ", - "xx xx x xx xx x ", - "xx x xx xx x xx xx x xx ", - - "x xx xx x x ", - "x xx x xx xx x x", - "x x xx xx x xx xx x xx x", - - "xx xx x x x ", - "xx x xx xx x xx ", - "x xx xx x xx xx x xx xx ", - - "x xx x x x x", - "x x xx xx x xx x", - "xx xx x xx xx x xx xx x ", - - "xx x x x xx ", - "x xx xx x xx xx ", - "x xx x xx xx x xx xx x x", - - - "x x x x xx x", - "xx xx x xx xx x ", - "xx x xx xx x xx xx x xx ", - - "x x x xx xx ", - "x xx x xx xx x x", - "x x xx xx x xx xx x xx x", - - "x x xx xx x ", - "xx x xx xx x xx ", - "x xx xx x xx xx x xx xx ", - - "x xx xx x x ", - "x x xx xx x xx x", - "xx xx x xx xx x xx xx x ", - - "xx xx x x x ", - "x xx xx x xx xx ", - "x xx x xx xx x xx xx x x", - - "x xx x x x x", - "xx xx x xx xx x ", - "xx x xx xx x xx xx x xx ", - - "xx x x x xx ", - "x xx x xx xx x x", - "x x xx xx x xx xx x xx x", - - "x x x x xx x", - "xx x xx xx x xx ", - "x xx xx x xx xx x xx xx ", - - "x x x xx xx ", - "x x xx xx x xx x", - "xx xx x xx xx x xx xx x " -] - -accents = '' -accstr = '' - - -def stemme(st) : - adr = [0] * (385*16) - pos = st*48+44 - - for i in range(0,100): - adr[384*16-i*28] = ord ('X') - - for k in range(0,48): - if k: - for j in range(0,8): - adr[pos] = 0 - pos += 1 - - for j in range(0,4): - for c in grund[k]: - if c ==' ' : - adr[pos] = 0 - else: - adr[pos] = 3-j+ord ('a') - pos += 1 - - for i in range(0,385*16): - ac = accents[48*4+i-((48+24-st)%48)*4] - if ac: - adr[i]=ac - - return adr - - -def print1(ch) : - accstr="" - if ch >= ord('A') and ch <=ord('D'): - ch += ord('a')-ord('A') - accstr="->" - - namestr = '' - cr = chr (ch) - - if cr=='a': - namestr="a" - elif cr=='b': - namestr="b" - elif cr=='c': - namestr="d'" - elif cr=='d': - namestr="e'" - elif cr=='X': - namestr="\\override Staff.NoteHead #'style = #'cross c'" - accstr="-^ \\revert Staff.NoteHead #'style" - else: - print 'foo', cr, chr(ch), ch == 'd', "A%sA" % cr - raise 'foo' - - return (namestr,accstr) - - -namestr = '' -accstr = '' - -def print4(ptr): - val = reduce (lambda x,y : x|y, ptr) -# sys.stderr.write ('%d ' % val) - if not val: - sys.stdout.write ("r4 ") - else: - dur=-1 - - global namestr - global accstr - if ptr[0]==0: - sys.stdout.write ("~") - (namestr, accstr) = print1(val) - - for c in ptr: - if c==0: - dur += 1 - else: - if dur>=0: - sys.stdout.write( "%s%s%s " % (namestr,durs[dur],accstr)) - (namestr, accstr) = print1(c) - dur=0 - - sys.stdout.write( "%s%s%s "% (namestr,durs[dur],accstr)) - - - -def print8(ptr) : - val = reduce (lambda x,y : x|y, ptr) - if val: - print4(ptr[0:4]) - print4(ptr[4:8]) - else: - sys.stdout.write ("r2 ") - - -def print16(ptr): - val = reduce (lambda x,y : x|y, ptr) - if val: - print8(ptr[0:8]) - print8(ptr[8:16]) - else: - sys.stdout.write("R1 ") - -accents = [0] *(500*16) -for i in range(0,32): - pos=i*12*16+4*48 - accents[pos]=ord('D') - if(i<31) : - if(i>0): - accents[pos+4*12]=ord('A') - accents[pos+4*23]=ord('C') - accents[pos+4*35]=ord('B' ) - - -sys.stdout.write ('%%{\n %s \n %%}' % copyright) -sys.stdout.write (r""" -\version "2.7.29" -#(set-global-staff-size 11) - -\header { - title = "CLA(O)P II" - composer = "Peter Wallin (1992-93)" - copyright = "Copyright (1992-93) Peter Wallin, verbatim redistribution permitted" -} - - -""") - - - - - -for st in range(1,voices+1): - str=stemme(st) - ststr=chr((st-1)/24+ord('A')) + chr ((st-1)%24+ord('A')) - sys.stdout.write(r''' - -stemme%s = { -\clef percussion -\set Staff.instrument = "%d" -\set Staff.instr = "%d" -\set Score.currentBarNumber = #%d -''' - % (ststr,st,st,start_measure)) - - for i in range(start_measure-1, start_measure-1+no_measures): - print16(str[i*16:i*16+16]) - sys.stdout.write (" \n") - - sys.stdout.write ("\\bar\"|.\" }\n") - - -sys.stdout.write (r""" -<< - \override Score.BarNumber #'padding = #2.5 - %#(override-auto-beam-setting '(end * * * *) 1 4) - \set Score.skipBars = ##t - \context StaffGroup << - \override StaffGroup.Stem #'direction = #UP -""") - - -for st in range(1,voices+1): - ststr=chr((st-1)/24+ord('A')) + chr ((st-1)%24+ord('A')) - ststr = 'stemme' + ststr - sys.stdout.write (r"""\context Staff="%s" \%s -""" % (ststr,ststr)) - -sys.stdout.write (r""">> ->> -#(set-default-paper-size "a3") -\paper { - linewidth = 26.0\cm - indent = 0 - textheight = 38.0\cm - %hsize = 30.0 \cm - %vsize = 42.0 \cm -} -\layout { - \context { - \Staff - \override StaffSymbol #'line-count = #3 - minimumVerticalExtent = #'(-3 . 3) - } -} -""")