patch::: 0.1.38: LilyPond Xmas (tar + patch)

diff --git a/VERSION b/VERSION
index 1cd375d59355e0ef21f3cb1e38bc5579792bfe5e..72f3a0458727570d2045be3b35b58a1617bf9a70 100644 (file)
--- 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 4555b7c646163632772557c91b614e371de7334f..bd6b9a8cd565d0d523260ef11dc9679d5b16e330 100644 (file)
--- 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 7df6b77078a67283f1519ff15dfd4cbccfef2d1c..a54e367be951786c3aa2da160c9939f091fcc4ef 100644 (file)
--- 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 bde4ae2711ceded429fd89ffd85b4ea4fe504394..0f9a9817200d3215a6e471bff30af3d1900400fe 100644 (file)
--- 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 0b1ca72ee47b31ff4e3988a5dac43fb712358b7d..5f416ef4b220520f314cd9426d311df5e2056251 100644 (file)
--- 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 1c841fa9b1903b6b85431abe9cabad0065f79283..e97dbdeccc5b7a944d158fa3547def1074364278 100644 (file)
--- 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