CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/13 12:09:10
Modified files:
. : ChangeLog
input : typography-demo.ly
input/regression: hairpin-ending.ly
lily : dynamic-engraver.cc
Log message:
* 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.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3606&tr2=1.3607&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/typography-demo.ly.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/hairpin-ending.ly.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/dynamic-engraver.cc.diff?tr1=1.168&tr2=1.169&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3606 lilypond/ChangeLog:1.3607
--- lilypond/ChangeLog:1.3606 Fri May 13 11:55:15 2005
+++ lilypond/ChangeLog Fri May 13 12:09:03 2005
@@ -1,5 +1,9 @@
2005-05-13 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * 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
Index: lilypond/input/regression/hairpin-ending.ly
diff -u lilypond/input/regression/hairpin-ending.ly:1.28
lilypond/input/regression/hairpin-ending.ly:1.29
--- lilypond/input/regression/hairpin-ending.ly:1.28 Sat Oct 30 20:55:15 2004
+++ lilypond/input/regression/hairpin-ending.ly Fri May 13 12:09:03 2005
@@ -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 }
+ >>
}
Index: lilypond/input/typography-demo.ly
diff -u lilypond/input/typography-demo.ly:1.4
lilypond/input/typography-demo.ly:1.5
--- lilypond/input/typography-demo.ly:1.4 Thu Mar 17 23:13:28 2005
+++ lilypond/input/typography-demo.ly Fri May 13 12:09:03 2005
@@ -1,9 +1,9 @@
\header {
- title = "LilyPond demo"
- enteredby="Han-Wen Nienhuys"
- maintainer="[EMAIL PROTECTED]"
+ title = "LilyPond demo"
+ enteredby="Han-Wen Nienhuys"
+ maintainer="[EMAIL PROTECTED]"
- texidoc = "
+ texidoc = "
heavily mutilated Edition Peters Morgenlied by Schubert"
}
@@ -16,7 +16,7 @@
#(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 @@
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 @@
firstVerse = \lyricmode {
- \set stanza = "1."
-
- Sü -- ßes Licht! Aus
- \ignoreMelisma
- gol --
- \ignoreMelismaOff
+ \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.
__
- }
+ 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
Index: lilypond/lily/dynamic-engraver.cc
diff -u lilypond/lily/dynamic-engraver.cc:1.168
lilypond/lily/dynamic-engraver.cc:1.169
--- lilypond/lily/dynamic-engraver.cc:1.168 Fri May 13 11:53:03 2005
+++ lilypond/lily/dynamic-engraver.cc Fri May 13 12:09:04 2005
@@ -264,13 +264,13 @@
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))
{
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
