* lily/dynamic-engraver.cc (stop_translation_timestep): first set

finished_span_, then call typeset_all(). Fixes spurious "Hairpin
is not fully contained" warnings.

* ChangeLog: more details about contributions.

diff --git a/ChangeLog b/ChangeLog
index 4032a1e3ffc92249a55738cfabbb7138f56b7439..6a9486a3a06da918e4a1e7a9eb80ab008e72f162 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-05-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/dynamic-engraver.cc (stop_translation_timestep): first set
+       finished_span_, then call typeset_all(). Fixes spurious "Hairpin
+       is not fully contained" warnings.
+
        * lily/slur-scoring.cc (get_bound_info): remove warning.
 
        * lily/staff-symbol-engraver.cc (process_music): start initial

diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly
index 29478cf3802a1986d248b6caed97439b1682f453..f1cbdac2784651a28aae3187926812d6805aa6dd 100644 (file)
--- a/input/regression/hairpin-ending.ly
+++ b/input/regression/hairpin-ending.ly
@@ -1,17 +1,22 @@
 
-\version "2.4.0"
+\version "2.5.22"
 
 \header {
 
-texidoc = "Hairpin dynamics start under notes if there are
+  texidoc = "Hairpin dynamics start under notes if there are
 no text-dynamics. If there are text dynamics, the hairpin does not run
 into them."
 
 }
 
+\layout { raggedright = ##t } 
 
-\score {
- \relative c'' { c4 \> c4 c4\! c4_\ff \> c4 c4\!\p }
-\layout { raggedright = ##t} 
+\relative c'' {
+  c4 \> c4 c4\! c4_\ff \> c4 c4\!\p
+  
+  <<
+    { c\< c\! }
+    \lyrics { "a" loooong }
+  >>
 }
 

diff --git a/input/typography-demo.ly b/input/typography-demo.ly
index 462b10b550fb213bf04711c585fa8962649f3852..7d4f07f069b84fef509219f308f013f16f4b037f 100644 (file)
--- a/input/typography-demo.ly
+++ b/input/typography-demo.ly
@@ -1,9 +1,9 @@
 \header {
-    title = "LilyPond demo"
-    enteredby="Han-Wen Nienhuys"
-    maintainer="hanwen@xs4all.nl"
+  title = "LilyPond demo"
+  enteredby="Han-Wen Nienhuys"
+  maintainer="hanwen@xs4all.nl"
 
-    texidoc = "
+  texidoc = "
 heavily mutilated Edition Peters Morgenlied by Schubert"
 
 }
@@ -16,7 +16,7 @@ ignoreMelismaOff = \unset ignoreMelismata
 #(set-global-staff-size 21)
 
 \paper  {
-%#(set-global-staff-size (* 5.8 mm))
+                               %#(set-global-staff-size (* 5.8 mm))
   indent = #(* mm 4)
   linewidth = #(* mm 140)
   interscoreline = 2.\mm
@@ -32,18 +32,18 @@ modernAccidentals = {
 
 
 melody =    \relative c'' \repeat volta 2 \context Voice = "singer" {
-    \time 6/8
-    \autoBeamOff
-    s1*0^\markup {  \bigger { \hspace #-3.0 Lieblich, etwas geschwind } }
+  \time 6/8
+  \autoBeamOff
+  s1*0^\markup {  \bigger { \hspace #-3.0 Lieblich, etwas geschwind } }
   R2.
   r4 r8 c4 g8 |
- \acciaccatura { f16( }  e4) c8
-    <<
-       \new Voice { \stemUp f8. g16 }
-       { \stemDown f8.[ g16] } >> \stemNeutral a8 |
+  \acciaccatura { f16( }  e4) c8
+  <<
+    \new Voice { \stemUp f8. g16 }
+    { \stemDown f8.[ g16] } >> \stemNeutral a8 |
   fis4  g8 c16[ b a g] f[ e] |
   d4 f8
-    \transpose a' e' \relative c'' { a16[ g fis! g] f![ d]  } |
+  \transpose a' e' \relative c'' { a16[ g fis! g] f![ d]  } |
   g4. r8 gis gis |
   a4 a16.[ b32] c8[( a]) fis8 |
   g4.~ g8-\fermata
@@ -51,48 +51,52 @@ melody =    \relative c'' \repeat volta 2 \context Voice = "singer" {
 
 
 firstVerse = \lyricmode {
-    \set stanza = "1."
-    
-    Sü -- ßes Licht! Aus
-    \ignoreMelisma
-    gol --
-    \ignoreMelismaOff
-
-    de -- nen  Pfor -- ten brichst du __ | 
-    sie -- gend durch __ die Nacht. Schö -- ner Tag, du __ bist er -- wacht. __ 
-    }
+  \set stanza = "1."
+  
+  Sü -- ßes Licht! Aus
+  \ignoreMelisma
+  gol --
+  \ignoreMelismaOff
+
+  de -- nen  Pfor -- ten brichst du __ | 
+  sie -- gend durch __ die Nacht. Schö -- ner Tag, du __ bist er -- wacht. __ 
+}
 
 secondVerse = \lyricmode {
-    \set stanza = "2."
+  \set stanza = "2."
   いろはに כיף та та ほへど ちり  ぬるを
-    
+  
   Жъл  дю ля זה
-    
+  
   いろ はに כיף та та ほへ ちり ぬる
-    
+  
   Жъл дю ля __
-    }
 
-pianoRH =  \relative c''' \repeat volta 2\new Voice {
-    #(set-accidental-style 'modern)
-    \voiceOne
-    g16( fis a g fis g f e d c b
-    \oneVoice
-    a ) | 
-    <g e>8( <es fis a> <d e bes'> <c e c'>\arpeggio) r8 r | 
-    r8 c'( e,) f r a |
-    \once \override DynamicLineSpanner   #'padding =#3
-    r8
-       << { fis( g) } \\
-       << { a4 } { s8\> s8\! }    >> >> r8 <e c g>8[  <e c g>] |
-    <d c a>4. r8 \clef bass  <d b f> <d b f> |
-    \setTextCresc
-    e,16_" "\<
-    g c g e g d gis b gis d gis |
-    c, e a e c e a,-\f\! d fis d a d |
-    b d g  d b g e16. r32\fermata
 }
 
+pianoRH =  \relative c''' \repeat volta 2\new Voice {
+  #(set-accidental-style 'modern)
+  \voiceOne
+  g16( fis a g fis g f e d c b
+  \oneVoice
+  a ) | 
+  <g e>8( <es fis a> <d e bes'> <c e c'>\arpeggio) r8 r | 
+  r8 c'( e,) f r a |
+  \once \override DynamicLineSpanner   #'padding =#3
+  r8
+  << { fis( g) } \\
+     << { a4 } { s8\> s8\! } >>
+   >>
+
+  r8 <e c g>8[  <e c g>] |
+  <d c a>4. r8 \clef bass  <d b f> <d b f> |
+               \setTextCresc
+               e,16_" "\<
+               g c g e g d gis b gis d gis |
+               c, e a e c e a,-\f\! d fis d a d |
+               b d g  d b g e16. r32\fermata
+             }
+
 pianoLH =  \relative c'' \repeat volta 2\new Voice {
     #(set-accidental-style 'modern)
     \voiceTwo

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 47c8be351994325a2d9c32da6e163620df7ec04c..5e1cbc9754bf21e32d02a6323a3508712356c4fa 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -264,13 +264,13 @@ Dynamic_engraver::process_music ()
 void
 Dynamic_engraver::stop_translation_timestep ()
 {
-  typeset_all ();
-  if (!current_cresc_ev_)
+  if (!current_cresc_ev_ && line_spanner_)
     {
+      assert (!finished_line_spanner_);
       finished_line_spanner_ = line_spanner_;
       line_spanner_ = 0;
-      typeset_all ();
     }
+  typeset_all ();
 
   if (cresc_ && !cresc_->get_bound (LEFT))
     {