lilypond-1.3.73

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 028037df76d5aa48afd3feb016b762a6e23c5909..40eba8acf785a277a13433b993c4c390690c259f 100644 (file)
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -6,7 +6,6 @@
   (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "translator-group.hh"
-#include "axis-group-engraver.hh"
 #include "paper-column.hh"
 #include "align-interface.hh"
 #include "span-bar.hh"
@@ -20,10 +19,8 @@ class Vertical_align_engraver : public Engraver
   bool qualifies_b (Score_element_info) const;  
 public:
   VIRTUAL_COPY_CONS(Translator);
-  
   Vertical_align_engraver();
 protected:
-  
   virtual void acknowledge_element (Score_element_info);
   virtual void do_creation_processing();
   virtual void do_removal_processing();
@@ -44,7 +41,7 @@ Vertical_align_engraver::do_creation_processing()
                               gh_int2scm (DOWN));
   
   valign_p_->set_bound(LEFT,unsmob_element (get_property ("currentCommandColumn")));
-  announce_element (Score_element_info (valign_p_ , 0));
+  announce_element (valign_p_ , 0);
 }
 
 void

diff --git a/ly/engraver.ly b/ly/engraver.ly
index f458dda6c0830af09a437e3607ad5421263c75f4..b9bbb9fb10fda06d00ff5dca7f1db55d836e45a0 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -264,6 +264,7 @@ StaffGroupContext= \translator {
 LyricsVoiceContext= \translator{
        \type "Engraver_group_engraver";
        \consistsend "Axis_group_engraver";
+       LyricVoiceMinimumVerticalExtent = #(cons -2.5 2.5)
 
        \name LyricVoice ;
        \consists "Separating_line_group_engraver";
@@ -405,7 +406,7 @@ ScoreContext = \translator {
                (break-align-symbol . Staff_bar)
                (barsize-procedure . ,Bar::get_staff_bar_size)
                (molecule-callback . ,Bar::brew_molecule)          
-               (visibility-lambda . ,begin-of-line-invisible)
+               (visibility-lambda . ,all-visible)
                (breakable . #t)
                (before-line-breaking-callback . ,Bar::before_line_breaking)
                ;;
@@ -522,7 +523,7 @@ ScoreContext = \translator {
                (molecule-callback . ,Local_key_item::brew_molecule)
                (left-padding . 0.2)
                (right-padding . 0.4)
-               (interfaces . (accidentals-interface ))
+               (interfaces . (accidentals-interface))
        )
        basicLineOfScoreProperties = #`(
                (axes . (0 1))
@@ -605,6 +606,9 @@ ScoreContext = \translator {
        )
        basicSpacingSpannerProperties =#`(
                (spacing-procedure . ,Spacing_spanner::set_springs)
+
+               ;; assume that notes at least this long are present.
+               (maximum-duration-for-spacing . ,(make-moment 1 8))
        )
        basicSpanBarProperties = #`(
                (break-align-symbol . Staff_bar)