lilypond-1.1.20

diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly
index d9c5e8dbd8216257cf8999dcf9e87af83a74e65c..93495cf1798cbf5f926364b5c3eb2bd7484531bb 100644 (file)
--- a/input/praeludium-fuga-E.ly
+++ b/input/praeludium-fuga-E.ly
@@ -127,13 +127,13 @@ fugaII_right = \notes   \relative c''   {
    > |
   %16
   \type Staff <
-    { \stemup dis2 dis4 |
+    \type VoiceOne {  dis2 dis4 |
       cis2 cis4 |
       b4. [cis8 dis e] }
-    { \stemup \shifton [b8 fis] b2 ~ |
+    \type VoiceThree {  \stemup \shifton [b8 fis] b2 ~ |
       [b8 a!16 gis] a2 ~ |
       a4 gis2 }
-    { \stemdown fis2. ~ |
+    \type VoiceTwo {  \stemdown fis2. ~ |
       fis ~ |
       fis4 e2 }
   > |
@@ -146,9 +146,9 @@ fugaII_left = \notes {
 
   %15
   \type Staff < 
-    { \stemdown b2 \stemup ais4 |
+    \type VoiceTwo { \stemdown b2 \stemup ais4 |
       b2 b4 }
-    { \stemdown s2 e4 |
+    \type VoiceTwo { \stemdown s2 e4 |
       fis2 fis4 }
   >
   \stemdown cis2 e4 |
@@ -188,10 +188,6 @@ breakmusic = \notes {
   >
 
   \paper {
-    \translator {
-    \VoiceContext
-    \name "BLA";
-    }
     \translator {
     \VoiceContext
     \name "VoiceOne";

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 7353da47f8738ce684fef026628b0307646a2520..3165cf66607c863992c029adb4a2182d3526ae41 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -63,6 +63,20 @@ Beam_engraver::do_process_requests ()
       if (prop.isnum_b ()) 
        beam_p_->quantisation_ = (Beam::Quantisation)(int)prop;
  
+      // silly try at interstaff beam
+      // must set minVerticalAlign == maxVerticalAlign to get sane results
+      // see input/test/beam-interstaff.ly
+      prop = get_property ("minVerticalAlign", 0);
+      if (prop.isnum_b ())
+       beam_p_->vertical_align_f_ = prop;
+
+      prop = get_property ("maxVerticalAlign", 0);
+      if (prop.isnum_b ())
+       {
+         beam_p_->vertical_align_f_ += (Real)prop;
+         beam_p_->vertical_align_f_ /= (Real)2;
+       }
+
       announce_element (Score_element_info (beam_p_, reqs_drul_[START]));
     }
 }
@@ -132,6 +146,7 @@ Beam_engraver::acknowledge_element (Score_element_info info)
        if (rhythmic_req->duration_.durlog_i_<= 2)
          {
            rhythmic_req->warning (_ ("stem doesn't fit in beam"));
+           reqs_drul_[LEFT]->warning (_("beam was started here"));
            return;
          }