Fix #235.

Add stanza-number-interface to keepAliveInterfaces.

diff --git a/input/regression/hara-kiri-stanza-number.ly b/input/regression/hara-kiri-stanza-number.ly
new file mode 100644 (file)
index 0000000..a0a9742
--- /dev/null
+++ b/input/regression/hara-kiri-stanza-number.ly
@@ -0,0 +1,24 @@
+
+\header {
+
+  texidoc = "stanza numbers remain, even on otherwise empty lyrics
+lines."
+         
+}
+
+\paper {
+  indent = #0.0
+  ragged-right = ##T
+}
+
+\version "2.10.11"
+
+<<
+  \new Voice = melody \relative c'{
+    r2 r4 r8 e8 |\break
+    e16 e8. 
+  }
+  \lyricsto "melody" \lyrics { 
+    \set stanza = "Verse 2."
+    _ bla bla  }
+>>

diff --git a/lily/stanza-number-align-engraver.cc b/lily/stanza-number-align-engraver.cc
index 7cb014c942b54563816b8a9b609a833a2d6c8228..2e862dc269854da93dcdefc37cb12617b3efc820 100644 (file)
--- a/lily/stanza-number-align-engraver.cc
+++ b/lily/stanza-number-align-engraver.cc
@@ -60,9 +60,10 @@ Stanza_number_align_engraver::stop_translation_timestep ()
 
 ADD_ACKNOWLEDGER (Stanza_number_align_engraver, lyric_syllable);
 ADD_ACKNOWLEDGER (Stanza_number_align_engraver, stanza_number);
+
 ADD_TRANSLATOR (Stanza_number_align_engraver,
                "This engraver ensures that stanza numbers are neatly aligned. ",
                "",
-               " ",
+               "",
                "");
 

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 0364ac96af946130061ee1b9fc77675c42f0ed1e..ea7d9c5db0ff0e239576e2767d2e394ec1cf600f 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -377,6 +377,7 @@ printing of a single line of lyrics.  "
   \consists "Skip_event_swallow_translator"
   \consists "Font_size_engraver"
   \consists "Hara_kiri_engraver"
+
   \override VerticalAxisGroup #'remove-first = ##t
   \override VerticalAxisGroup #'remove-empty = ##t
   \override SeparationItem #'padding = #0.2
@@ -610,6 +611,9 @@ AncientRemoveEmptyStaffContext = \context {
   keepAliveInterfaces = #'(
     rhythmic-grob-interface
     lyric-interface
+
+    ;; need this, as stanza numbers are items, and appear only once. 
+    stanza-number-interface
     percent-repeat-interface)
   quotedEventTypes = #'(
     note-event