X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fbaerenreiter-sarabande.ly;h=7acd483dfdbb3b5527e1da326b4bdaa5dafbc169;hb=6ce2bcbe780ee19563e10cabfd4f1a9a2b8e882c;hp=450f08d173faad04b50e000c3f1f704e79971bbd;hpb=ce521e79fd7669b45c8c1132e4b5693a03b5d90a;p=lilypond.git diff --git a/input/baerenreiter-sarabande.ly b/input/baerenreiter-sarabande.ly index 450f08d173..7acd483dfd 100644 --- a/input/baerenreiter-sarabande.ly +++ b/input/baerenreiter-sarabande.ly @@ -1,138 +1,173 @@ -% #(set! point-and-click line-column-location) +%% #(set! point-and-click line-column-location) \header { -title = "Solo Cello Suite II" -piece ="Sarabande" -composer = "J.S.Bach" -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 follows the -same beaming as the printed edition. This is done in order to -benchmarkk the quality of the LilyPond output. As of lilypond 1.5.38, -the spacing is almost identical. With a line-break forced before -measure 25, we get back the linebreaking of Baerenreiter. - -This file used to show spacing weaknesses. Now it shows weaknesses in -beam and slur handling. - -Note that the Barenreiter edition contains a mistake. The second line -begins with measure 6, not 5. " - - + title = "Solo Cello Suite II" + piece ="Sarabande" + composer = "J.S.Bach" + 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. + " } -\version "1.3.148" +\version "1.5.49" 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 | - -% check spacing without accs: -% c4.-\trill [bes8 a g] | - - < { d'8. e16 f4.-\trill d16 e | - f4. d8 e f } - \\ - { a2 } > | - %5 - - g8 bes16()a c()bes a()g d'8 f, | - < e4.-\trill - \\ > - [d8 c bes] - %8 - < { f'8 g16()a a4. g16()f | - g8 a16()bes bes4. c16()d } - \\ - { a,4 r8 bes4 } - > | - - % 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 - < bes4.-\trill d, g, > 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 s8 | - r r g, a4 } > - | - d4 d,16 a'( b cis d e f )g | - \break - %25 - < { a16(b c)b c4. b16()a | - b cis d cis d4. e16()f | } - \\ - { f,4 fis4. s8 | - gis4. } > - d16(cis)d f, a,8 e' d' cis | - d4 d,,2 | + \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] | + + %% check spacing without accs: + %% c4.-\trill [bes8 a g] | + + < { d'8. e16 f4.-\trill d16 e | + f4. [d8 e f] } + \\ + { a2 } > | + %%5 + + g8 bes16()a c()bes a()g d'8 f, | + < e4.-\trill + \\ > + [d8 c bes] + %%8 + < { f'8 g16()a a4. g16()f | + g8 a16()bes bes4. c16()d } + \\ + { a,4 r8 bes4 } + > | + + %% 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 + < bes4.-\trill d, g, > [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 s8 | + r r g, a4 } > + | + \stemUp + d4 d,16 a'( b cis d e f )g | + \stemBoth + \break + %%25 + < { a16(b c)b c4. b16()a | + b cis d cis d4. e16()f | } + \\ + { f,4 fis4. s8 | + gis4. } > + \voiceOne + d16(cis)d f, + [a,8 e'] + \oneVoice + [d' cis] | + d4 d,,2 | } sarabande = \context Staff \notes< - \apply #voicify-music \sarabandeA - + \apply #voicify-music \sarabandeA + > -\version "1.3.148" +\version "1.5.49" sarabandeCelloGlobal = \notes{ - \time 3/4 - \key f \major - \clef bass - \repeat "volta" 2 { - s2.*12 - } \repeat "volta" 2 { - s2.*16 - } + \time 3/4 + \key f \major + \clef bass + \repeat "volta" 2 { + s2.*12 + } \repeat "volta" 2 { + s2.*16 + } } sarabandeCelloScripts = \notes{ } sarabandeCelloStaff = \context Staff < - \sarabande - \sarabandeCelloGlobal - \sarabandeCelloScripts + \sarabande + \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 +} + +baerPaper = \paper { + indent = 7. \mm + linewidth =183.5 \mm + interscoreline=4.0\mm + \translator { + \ScoreContext +% System \override #'molecule-callback = #box-grob-molecule + } +} + + \score{ - \sarabandeCelloStaff - \paper{ - indent = 7. \mm - linewidth = 183.5 \mm - \translator { \ScoreContext -% SpacingSpanner \override #'maximum-duration-for-spacing = #(make-moment 1 16) - - -}} - \midi{ \tempo 4 = 40 } - \header{ - opus= "" - piece ="Sarabande" } + \sarabandeCelloStaff + \paper{ + \baerPaper + } + \midi{ \tempo 4 = 40 } + \header{ + opus= "" + piece ="Sarabande" } } +%%% Local variables: +%%% LilyPond-indent-level:2 +%%% End: