From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 16 Jan 2007 11:00:27 +0000 (+0100)
Subject: Fix #235.
X-Git-Tag: release/2.11.12-1~28
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c8e4f244b1240e6a5179fb8f65bd15a85ade83bf;p=lilypond.git

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
index 0000000000..a0a974237c
--- /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 7cb014c942..2e862dc269 100644
--- 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 0364ac96af..ea7d9c5db0 100644
--- 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