From 46e5ef001a871aefa908d43234fd3b7bb65ae221 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 16 Jan 2007 15:01:56 +0100
Subject: [PATCH] Fix #235.

Add stanza-number-interface to keepAliveInterfaces.

Conflicts:

	ly/engraver-init.ly
---
 input/regression/hara-kiri-stanza-number.ly | 24 +++++++++++++++++++++
 lily/stanza-number-align-engraver.cc        |  3 ++-
 ly/engraver-init.ly                         | 17 +++++++++++++--
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 input/regression/hara-kiri-stanza-number.ly

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 94e726864f..3ca0d4352d 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 e7232f6bfd..27a0437ffa 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -375,6 +375,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
@@ -604,8 +605,20 @@ AncientRemoveEmptyStaffContext = \context {
     (Voice Slur direction ,DOWN)
   )
 
-  keepAliveInterfaces = #'(rhythmic-grob-interface lyric-interface percent-repeat-interface)
-  quotedEventTypes = #'(note-event rest-event time-scaled-music tie-event beam-event)
+  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
+    rest-event
+    tie-event
+    beam-event
+    tuplet-span-event)
+
   instrumentTransposition = #(ly:make-pitch 0 0 0)
 
   verticallySpacedContexts = #'(Staff)
-- 
2.39.5