From 4d7f73583c188585623322d63b169c8afd4c2799 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:09:15 +0000 Subject: [PATCH] lilypond-0.1.54 --- Documentation/index.pod | 4 +- lily/axis-group-item.cc | 2 +- mutopia/gallina.ly | 165 ++++++++++++++++++++++------------------ 3 files changed, 94 insertions(+), 77 deletions(-) diff --git a/Documentation/index.pod b/Documentation/index.pod index 2115ce220a..3470425b5b 100644 --- a/Documentation/index.pod +++ b/Documentation/index.pod @@ -61,7 +61,7 @@ top_of_NEWS =item * -The announce of 0.1 +The announcement of 0.1 @@ -258,7 +258,7 @@ B LilyPond and other interesting links =item * -Stats on this page. +Stats on this page. [temporarily out of order] diff --git a/lily/axis-group-item.cc b/lily/axis-group-item.cc index 8419f85ad5..5362516f02 100644 --- a/lily/axis-group-item.cc +++ b/lily/axis-group-item.cc @@ -24,7 +24,7 @@ Axis_group_item::OK() const void Axis_group_item::do_breakable_col_processing() { - if (!breakable_b_) + if (!breakable_b_ || !column_l ()->breakable_b_) // ugh should merge with Item code return; OK(); diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly index d936c18b37..78586dc6a3 100644 --- a/mutopia/gallina.ly +++ b/mutopia/gallina.ly @@ -36,6 +36,11 @@ Tested Features: Note placement, multipart score, figured base, \breve note: the sharp signs hoovering over the bass part are no mistake, but part of the basso continuo --HWN +Note also: The original score was printed without any beams, +they were added in this edition to increase the readability. +If you want the original beam-less layout, redefine the +Voice engraver by uncommenting the lines in the paper +definition below. --MB %} \version "0.1.9"; @@ -44,65 +49,67 @@ vi1=\melodic{ \meter 4/4; \octave c''; - d8 d d d d4 A16 B c A | - B8 G G G16 A B8 G G G16 A | - B8 G G A16 B c4 B | - A8 D G2 Fis4 | + [d8 d d d] d4 [A16 B c A] | + [B8 G ][ G G16 A][ B8 G ][ G G16 A] | + [B8 G ][ G A16 B] c4 B | + [A8 D] G2 Fis4 | G2 r2 | r1 | - d8 d d d d4 A16 B c A | - B8 G G G16 A B8 G G G16 A | - B8 G G A16 B c8 e d c | - B G c2 B4 | + [d8 d d d] d4 [A16 B c A] | + [B8 G ][ G G16 A][ B8 G ][ G G16 A] | + [B8 G ][ G A16 B][ c8 e d c] | + [B G] c2 B4 | c2 r | r1 | - g8 g g g g4 d16 e f d | - e8 c c c16 d e8 c c c16 d | - e8 c c d16 e f4 e | - d8 G c2 B4 | - c8 G G G16 A B4 G | - r8 G G G16 A B4 G | - r8 E16 Fis G8 G Fis! G G Fis! | + [g8 g g g] g4 [d16 e f d] | + [e8 c ][ c c16 d][ e8 c ][ c c16 d] | + [e8 c ][ c d16 e] f4 e | + [d8 G] c2 B4 | + [c8 G ][ G G16 A] B4 G | + r8 G [G G16 A] B4 G | + r8 [E16 Fis ][ G8 G] [ Fis! G G Fis!] | G2 r | r1 | - r16 d c B A G Fis E D8 d d d16 c | - B8 d d d16 c B8 d d d16 e | + r16 [d c B ][ A G Fis E] [D8 d ][ d d16 c] | + [B8 d ][ d d16 c][ B8 d ][ d d16 e] | fis4 g2 fis!4 | - r16 g f e d c B A G8 g g g16 f | - e8 g g g16 f e8 g g g16 a | + r16 [g f e ][ d c B A][ G8 g ][ g g16 f] | + [e8 g ][ g g16 f][ e8 g ][ g g16 a] | b4 c'2 b4 | - c'8 g g g16 f e4 d | - r8 g g g16 f e4 d | - r8 d16 A B8 B16 c A2 | + [c'8 g ][ g g16 f] e4 d | + r8 g [g g16 f] e4 d | + r8 [d16 A ][ B8 B16 c] A2 | B1 | \meter 3/2; + \tempo 2=140; r4 d d d d d | e1. | r4 c c c c c | d1. | - r4 d8 c B4 c8 d G4 A8 B | + r4 [d8 c] B4 [c8 d] G4 [A8 B] | E1. | - r4 e8 d cis4 d8 e A4 B8 cis! | + r4 [e8 d] cis4 [d8 e] A4[ B8 cis!] | Fis1. | r4 d d d d d | - e e8 d c4 d8 e A4 B8 c | - Fis4 fis8 e d4 e8 fis! B4 c8 d | + e [e8 d] c4 [d8 e] A4 [B8 c] | + Fis4 [fis8 e] d4 [e8 fis!] B4 [c8 d] | G4 g g g g g | - a4 c'8 b a4 b8 c' f4 g8 a | + a4 [c'8 b] a4 [b8 c'] f4 [g8 a] | d4 g g g g g | - a d8 c B4 c8 d A2 | + a [d8 c] B4 [c8 d] A2 | \meter 4/4; + \tempo 4=80; B1 | - d8 d d d d4 A16 B c A | - B8 G G G16 A B8 G G G16 A | - B8 G c2 B4 | + [d8 d d d] d4 [A16 B ][ c A] | + [B8 G ][ G G16 A] [B8 G ][ G G16 A] | + [B8 G] c2 B4 | c2 r | - g8 g g g g4 d16 e f d | - e8 G G G16 A B8 d d d16 e | + [g8 g g g] g4 [d16 e f d] | + [e8 G ][ G G16 A] [B8 d ][ d d16 e] | fis4 g2 fis!4 | - r16 g f e d c B A G8 g g g16 f | - e2 r8 d d d16 e | - fis a g fis e d c B A8 d d d16 e | + r16 [g f e ][ d c B A] [G8 g ][ g g16 f] | + e2 r8 d [d d16 e] | + [fis a g fis ][ e d c B] [A8 d ][ d d16 e] | fis4 g2 fis!4 | \cadenza 1; g\breve @@ -114,62 +121,62 @@ vi2=\melodic{ \octave c''; r1 | r | r | - d8 d d d d4 A16 B c A | - B8 G G G16 A B8 G G G16 A | - B8 G G A16 B c4 B | - A8 D G2 Fis4 | + [d8 d d d] d4 [A16 B c A] | + [B8 G ][ G G16 A] [B8 G ][ G G16 A] | + [B8 G ][ G A16 B] c4 B | + [A8 D] G2 Fis4 | G2 r2 | r1 | - g8 g g g g4 d16 e f d | - e8 c c c16 d e8 c c c16 d | - e8 c c d16 e f4 e | - d8 G c2 B4 | + [g8 g g g] g4 [d16 e f d] | + [e8 c ][ c c16 d] [e8 c ][ c c16 d] | + [e8 c ][ c d16 e] f4 e | + [d8 G] c2 B4 | c2 r | r1 | - g8 g g g g4 d16 e f d | - e2 r8 G G G16 A | - B4 G r8 G G A16 B + [g8 g g g] g4 [d16 e f d] | + e2 r8 G [G G16 A] | + B4 G r8 G [G A16 B] | c4 B A2 | - G r16 d c B A G Fis E | - D8 d d d16 c B8 d d d16 e | + G r16 [d c B ][ A G Fis E] | + [D8 d ][ d d16 c] [B8 d ][ d d16 e] | fis4 g g4. fis!8 | g2 r | - r16 d c B A G Fis E D8 d d d16 c | + r16 [d c B ][ A G Fis E] [D8 d ][ d d16 c] | B4 c2 B4 | c d G2 | - r16 g f e d c B A G8 g g g16 f | - e4 d r8 g g g16 f | - e4 d r8 c16 G B8 B16 c | + r16 [g f e ][ d c B A] [G8 g ][ g g16 f] | + e4 d r8 g [g g16 f] | + e4 d r8 [c16 G ][ B8 B16 c] | A4 G2 Fis4 | G1 | \meter 3/2; r1. | - r4 g8 f e4 f8 g c4 d8 e | + r4 [g8 f] e4 [f8 g] c4 [d8 e] | A1. | - r4 a8 g fis4 g8 a d4 e8 fis! | + r4 [a8 g] fis4 [g8 a] d4 [e8 fis!] | B1. | r4 g g g g g | a1. | r4 a a a a a | - b d8 c B4 c8 d G4 A8 B | - E4 g8 f e4 f8 g c4 d8 e | - A4 a8 g fis4 g8 a d4 e8 fis! | - B4 b8 a g4 a8 b e4 fis8 g | + b [d8 c] B4 [c8 d] G4 [A8 B] | + E4 [g8 f] e4 [f8 g] c4 [d8 e] | + A4 [a8 g] fis4 [g8 a] d4 [e8 fis!] | + B4 [b8 a] g4 [a8 b] e4 [fis8 g] | c4 A A A A A | - B d8 c B4 c8 d D4 E | + B [d8 c] B4 [c8 d] D4 E | Fis2 G Fis! | \meter 4/4; G1 | r1 | r1 | - g8 g g g g4 d16 e f d | - e8 c c c16 d e8 G G G16 A | - B8 G c2 B4 | + [g8 g g g] g4 [d16 e f d] | + [e8 c ][ c c16 d] [e8 G ][ G G16 A] | + [B8 G] c2 B4 | c2 r | - r16 d c B A G Fis E D8 d d d16 c | + r16 [d c B ][ A G Fis E] [D8 d ][ d d16 c] | B4 c2 B4 | - c8 G G G16 A B d c B A G Fis E | - D8 d d d16 e fis16 a g fis e d c B | - A d c B A G Fis E D4 d | + [c8 G ][ G G16 A] [B d c B ][ A G Fis E] | + [D8 d ][ d d16 e] [fis16 a g fis ][ e d c B] | + [A d c B ][ A G Fis E] D4 d | \cadenza 1; B\breve \bar "|."; @@ -198,7 +205,6 @@ bc=\melodic{ G1 | \meter 3/2; g1. | c | - % 30 f | d^"\\textsharp" | g | c | A | d^"\\textsharp" | @@ -229,13 +235,24 @@ bc=\melodic{ %linewidth=18.\cm; %\output "gallina.out"; gourlay_maxmeasures=7.; +%%%% Uncomment to get the original layout without beams. +%%%% Compare to the definition in init/engraver.ly. +% Voice = \translator { +% \type "Engraver_group_engraver"; +% \consists "Dynamic_engraver"; +% \consists "Rest_engraver"; +% \consists "Stem_engraver"; +% \consists "Plet_engraver"; +% % \consists "Beam_engraver"; +% \consists "Beam_req_swallow_translator"; +% \consists "Abbreviation_beam_engraver"; +% \consists "Script_engraver"; +% \consists "Rhythmic_column_engraver"; +% \consists "Slur_engraver"; +% \accepts "Thread"; +% } } \midi{ - \tempo 4=90; + \tempo 4=80; } } - - - - - -- 2.39.5