-\version "2.3.4"
+\version "2.17.6"
-% #(ly:set-point-and-click 'line-column)
+forcedLastBreak = {} %% { \break } if needed to match original breaks
-forcedLastBreak = { \break }
-
-%% We want this to perfectly match the Baerenreiter spacing.
-%% If we're not using 6 systems, there's definately a problem.
+%% We want this to perfectly match the Bärenreiter spacing.
+%% If we're not using 6 systems, there's definitely a problem.
#(define (assert-system-count smob n)
(let ((systems (length (ly:spanner-broken-into
(ly:grob-original
;;(warn
(string-append "Got " (number->string systems)
" systems (expecting " (number->string n))))))
-
+
+
+#(define (assert-system-count-override count)
+ #{ \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"
+ source= "Bärenreiter Urtext"
- texidoc = "The B\\\"arenreiter edition of the Cello Suites is the
+ texidoc = "The Bärenreiter 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
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
+measure 25, we get back the linebreaking of Bärenreiter. 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.
+in Bärenreiter because of context. We don't detect that yet.
-Note that the Barenreiter edition contains a few engraving
+Note that the Bärenreiter 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
+ \override Staff.NoteCollision.merge-differently-dotted = ##t
+
-
<< { d8. e16 e4.\trill d16 e } \\
{ d4 a2 } >>
<d, a' f'>4. e'8[ d c] |
- bes[ g'] f[ e16(f] g[ a bes d,)] |
+ bes[ g'] f[
+ e16(f] g[ a bes d,)] |
cis4.\trill b8[ a g] |
- %% check spacing without accs:
+ %% check spacing without accs:
%% c4.\trill bes8[ a g] |
-
+
<< { d'8. e16 e4.\trill d16 e |
f4. d8[ e f] }
\\
%% 11
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 } >>
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) |
|
\stemUp
d4 d,16 a'( b cis d e f g) |
- \stemBoth
+ \stemNeutral
\forcedLastBreak
%%25
<< { a16(b c b) c4. b16(a) |
d'[ cis] |
%% d4 d,,2 |
d4
- \override NoteHead
- #'after-line-breaking-callback
- = #(lambda (smob) (assert-system-count smob 6))
+% $(assert-system-count-override 6)
d,,2 |
}
sarabandeCelloGlobal = {
\time 3/4
- \key f \major
+ \key d \minor
\clef bass
\repeat "volta" 2 {
s2.*12
\sarabandeCelloScripts
>>
-% size perversions
-smallerPaper = \paper {
- \context { \Staff
- fontSize = #-1
- \override StaffSymbol #'staff-space = #0.8
- }
- \context { \Score
- \override SpacingSpanner #'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
+ }
-baerPaper = \paper {
- indent = 7. \mm
- linewidth =183.5 \mm
-% interscoreline=4.0\mm
- \context {
- \Score
-% \override System #'print-function = #box-grob-stencil
- }
+ indent = 5.6 \mm
+ line-width = 146.8 \mm
}
-\bookpaper {
- raggedbottom = ##t
+\paper {
+ ragged-bottom = ##t
+ indent = 7. \mm
+ line-width =183.5 \mm
+ system-system-spacing #'basic-distance = 14.22 % 25mm, in staff-spaces
+ system-system-spacing #'padding = #0
+ score-system-spacing #'basic-distance = #0
+ score-system-spacing #'padding = #0
+ system-count = 6
+
+%% annotatespacing = ##t
}
-\score{
- \sarabandeCelloStaff
- \paper{
- \baerPaper
+
+\book {
+ \score{
+ \sarabandeCelloStaff
+ \layout { }
+
+ \midi {
+ \tempo 4 = 40
+ }
+
+
+ \header{
+ opus= ""
+ piece ="Sarabande" }
}
- \midi{ \tempo 4 = 40 }
- \header{
- opus= ""
- piece ="Sarabande" }
}
-
%%% Local variables:
%%% LilyPond-indent-level:2
%%% End:
projects / lilypond.git / blobdiff