X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fmutopia%2FJ.S.Bach%2Fbaerenreiter-sarabande.ly;h=731ceff949a35d09cba4d61a613fdbe7017a6626;hb=5c14a087ca6cbd665fd631452b7b1283ba0387c3;hp=e484d44f748fcb3d148c61f13dda0f357a3ee1db;hpb=060fc41def7a6e4358fa082679e4032d8c5f6373;p=lilypond.git diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly index e484d44f74..731ceff949 100644 --- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly +++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly @@ -1,29 +1,30 @@ +\version "2.11.61" -#(set! point-and-click line-column-location) - -forcedBreak = \notes { } -%%forcedBreak = \notes { \break } -forcedLastBreak = \notes { \break } -%%forcedLastBreak = \notes { } +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 (get-broken-into - (get-original - (get-line smob)))))) + (let ((systems (length (ly:spanner-broken-into + (ly:grob-original + (ly:grob-system smob)))))) (if (not (equal? n systems)) - ;; Can't use error yet, as we know that we're not using 6... - ;;(error - (warn + (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 = "J.S.Bach" + composer = "Johann Sebastian Bach (1685-1750)" editor = "August Wenzinger" source= "B\\\"arenreiter Urtext" @@ -49,102 +50,90 @@ half way in measure 13 has been forgotten. } -\version "1.5.68" +sarabandeA = \context Voice \relative c { + \override Staff.NoteCollision #'merge-differently-dotted = ##t - -sarabandeA = \context Voice \notes \relative c { - \property Staff.NoteCollision \set #'merge-differently-dotted = ##t - < { d8. e16 e4.-\trill d16 e } \\ - { d4 a2 } > - f4. [e8 d c] | - [bes g'] [f e16(f] [g a bes)d,] | - cis4.-\trill [b8 a g] | + + << { 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] | + %% c4.\trill bes8[ a g] | - < { d'8. e16 f4.-\trill d16 e | - f4. [d8 e f] } + << { d'8. e16 e4.\trill d16 e | + f4. d8[ e f] } \\ - { a2 } > | + { 4 a2 4. } >> | %%7 - g8 bes16()a c()bes a()g d'8 f, | - < e4.-\trill - \\ > - [d8 c bes] + 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 } + << { f'8 g16(a) a4. g16(f) | + g8 a16(bes) bes4. c16(d) } \\ - { a,4 r8 bes4 } - > | - \forcedBreak + { a,4 4. r8 bes4 2 } + >> | %% 11 - [e,8 f] [c, g'] [f' e] | + e'8[ f] c,[ g'] f'[ e] | f4 f,2 | - < { a'4 a4.-\trill bes8 + << { a'4 a4.\trill bes8 c bes16 a } \\ - { [f8 es] es4. r8 d4 } > + { f8[ es] es4. r8 d4 } >> - fis8.-\trill es16 d8 c | - [bes g'] - [a, fis'] - [es' d] | - \forcedBreak + fis8.\trill es16 d8 c | + bes[ g'] + a,[ fis'] + es'[ d] | %%16 - < bes4.-\trill d, g, > [a8 g f!] | + < 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 | - \forcedBreak + 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 } \\ + << { 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 s8 | - r r g, a4 } > + g4 4. s8 | + 8 r r g, a4 } >> | \stemUp - d4 d,16 a'( b cis d e f )g | - \stemBoth + 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 | } + << { a16(b c b) c4. b16(a) | + b cis d cis d4. e16(f) | } \\ { f,4 fis4. s8 | - gis4. } > + 4 gis4. } >> \voiceOne - d16(cis)d f, - [a,8 e'] + d'16(cis d) f, + a,8[ e'] \oneVoice - [d' cis] | + d'[ cis] | %% d4 d,,2 | d4 - \property Thread.NoteHead - \override #'after-line-breaking-callback - = #(lambda (smob) (assert-system-count smob 6.1)) +% #(assert-system-count-override 6) d,,2 | } -sarabande = \context Staff \notes< - \apply #voicify-music \sarabandeA - -> - -\version "1.5.68" - -sarabandeCelloGlobal = \notes{ +sarabandeCelloGlobal = { \time 3/4 - \key f \major + \key d \minor \clef bass \repeat "volta" 2 { s2.*12 @@ -153,51 +142,61 @@ sarabandeCelloGlobal = \notes{ } } -sarabandeCelloScripts = \notes{ +sarabandeCelloScripts = { } -sarabandeCelloStaff = \context Staff < - \sarabande +sarabandeCelloStaff = \context Staff << + \sarabandeA \sarabandeCelloGlobal \sarabandeCelloScripts -> - -% size perversions -smallerPaper = \paper { - \translator { \StaffContext - fontSize = #-1 - StaffSymbol \override #'staff-space = #0.8 - } - \translator { \ScoreContext - SpacingSpanner \override #'spacing-increment = #0.96 - } - - indent = 5.6 \mm - linewidth = 146.8 \mm +>> + +%% 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 } -baerPaper = \paper { - indent = 7. \mm - linewidth =183.5 \mm - interscoreline=4.0\mm - \translator { - \ScoreContext -% System \override #'molecule-callback = #box-grob-molecule - } +\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) + } + } + -\score{ - \sarabandeCelloStaff - \paper{ - \baerPaper + \header{ + opus= "" + piece ="Sarabande" } } - \midi{ \tempo 4 = 40 } - \header{ - opus= "" - piece ="Sarabande" } } - %%% Local variables: %%% LilyPond-indent-level:2 %%% End: +