From 7bfd28ec3876ca0adff5fe9e574ade748a3191af Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 24 Dec 1997 17:36:02 +0100 Subject: [PATCH] patch::: 0.1.38: LilyPond Xmas (tar + patch) --- VERSION | 2 +- init/feta16.ly | 2 +- init/feta20.ly | 2 +- lily/beam.cc | 20 ++++++++++++++++---- tex/feta16.tex | 2 +- tex/feta20.tex | 2 +- 6 files changed, 21 insertions(+), 9 deletions(-) diff --git a/VERSION b/VERSION index 1cd375d593..72f3a04587 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ TOPLEVEL_MAJOR_VERSION = 0 TOPLEVEL_MINOR_VERSION = 1 TOPLEVEL_PATCH_LEVEL = 38 -TOPLEVEL_MY_PATCH_LEVEL = +TOPLEVEL_MY_PATCH_LEVEL = jcn1 # use the above to send patches, always empty for released version: # please don't move these comments up; the patch should fail if diff --git a/init/feta16.ly b/init/feta16.ly index 4555b7c646..bd6b9a8cd5 100644 --- a/init/feta16.ly +++ b/init/feta16.ly @@ -1,5 +1,5 @@ % Creator: mf-to-table.py version 0.4 -% Automatically generated on Wed Dec 24 16:38:34 1997 +% Automatically generated on Wed Dec 24 16:30:21 1997 % Do not edit % input from out/feta16.log % name=\symboltables { diff --git a/init/feta20.ly b/init/feta20.ly index 7df6b77078..a54e367be9 100644 --- a/init/feta20.ly +++ b/init/feta20.ly @@ -1,5 +1,5 @@ % Creator: mf-to-table.py version 0.4 -% Automatically generated on Wed Dec 24 16:38:42 1997 +% Automatically generated on Wed Dec 24 16:30:29 1997 % Do not edit % input from out/feta20.log % name=\symboltables { diff --git a/lily/beam.cc b/lily/beam.cc index bde4ae2711..0f9a981720 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -34,7 +34,14 @@ IMPLEMENT_IS_TYPE_B1 (Beam, Spanner); -const int MINIMUM_STEMLEN = 5; +const int MINIMUM_STEMLEN[6] = { + 0, // just in case + 5, + 4, + 3, + 2, + 2, +}; Beam::Beam () { @@ -377,6 +384,7 @@ Beam::set_stemlens () Real internote_f = interline_f / 2; Real staffline_thickness = paper ()->rule_thickness (); Real beam_thickness = 0.48 * (interline_f - staffline_thickness); + Real interbeam_f = paper ()->interbeam_f (); Real xspan_f = stems.top ()->hpos_f () - stems[0]->hpos_f (); /* ugh, y values are in "internote" dimension @@ -401,7 +409,7 @@ Beam::set_stemlens () left_pos = (Pos) (left_pos | INTER); if (stems[0]->beams_right_i_ > 1) - left_pos = (Pos)(left_pos & (STRADDLE | INTER)); + left_pos = (Pos) (dir_ > 0 ? HANG : SIT); // ugh, rounding problems! const Real EPSILON = interline_f / 10; @@ -417,8 +425,12 @@ Beam::set_stemlens () Real x = s->hpos_f () - x0; s->set_stemend (left_y + slope_f * x); Real y = s->stem_length_f (); - if (y < MINIMUM_STEMLEN) - dy = dy >? (MINIMUM_STEMLEN - y); + int mult = max (stems[j]->beams_left_i_, stems[j]->beams_right_i_); + if (mult > 1) + // dim(y) = internote + y -= (mult - 1) * interbeam_f / internote_f; + if (y < MINIMUM_STEMLEN[mult]) + dy = dy >? (MINIMUM_STEMLEN[mult] - y); } } while (abs (dy) > EPSILON); } diff --git a/tex/feta16.tex b/tex/feta16.tex index 0b1ca72ee4..5f416ef4b2 100644 --- a/tex/feta16.tex +++ b/tex/feta16.tex @@ -1,5 +1,5 @@ % Creator: mf-to-table.py version 0.4 -% Automatically generated on Wed Dec 24 16:38:34 1997 +% Automatically generated on Wed Dec 24 16:30:21 1997 % Do not edit % input from out/feta16.log % name diff --git a/tex/feta20.tex b/tex/feta20.tex index 1c841fa9b1..e97dbdeccc 100644 --- a/tex/feta20.tex +++ b/tex/feta20.tex @@ -1,5 +1,5 @@ % Creator: mf-to-table.py version 0.4 -% Automatically generated on Wed Dec 24 16:38:42 1997 +% Automatically generated on Wed Dec 24 16:30:29 1997 % Do not edit % input from out/feta20.log % name -- 2.39.5