Fix #642.

Add percent-repeat-interface, for non-item repeats.

diff --git a/input/regression/hara-kiri-percent-repeat.ly b/input/regression/hara-kiri-percent-repeat.ly
new file mode 100644 (file)
index 0000000..0beb255
--- /dev/null
+++ b/input/regression/hara-kiri-percent-repeat.ly
@@ -0,0 +1,16 @@
+\header {
+  texidoc = "Staves with percent repeats are not killed."
+}
+
+\version "2.11.53"
+
+<<
+ \new Staff { c''1 c'' \break c'' c'' }
+ \new Staff \repeat percent 4 { c'1 }
+>>                          
+
+\layout {
+ \context {
+   \RemoveEmptyStaffContext
+ }
+}

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 7cc39b06aaba403a7801c421be94104d5b04d265..ffee024a1cf1e5042535f00a92066575fb96dbbf 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -608,10 +608,12 @@ automatically when an output definition (a @code{\score} or
   keepAliveInterfaces = #'(
     rhythmic-grob-interface
     lyric-interface
+    percent-repeat-item-interface
+    percent-repeat-interface
 
     ;; need this, as stanza numbers are items, and appear only once. 
     stanza-number-interface
-    percent-repeat-interface)
+  )
   quotedEventTypes = #'(
     note-event
     rest-event

diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm
index b6b0f3cc2ebfb764994780d8cbb699f9f41edd55..691a565714e526dc9ccfb61424d75a631cbd077b 100644 (file)
--- a/scm/define-grob-interfaces.scm
+++ b/scm/define-grob-interfaces.scm
@@ -116,6 +116,11 @@ note)."
  "Parentheses for other objects."
  '(padding stencils))
 
+(ly:add-interface
+ 'percent-repeat-interface
+ "Beat, Double and single measure repeats."
+ '())
+
 (ly:add-interface
  'piano-pedal-interface
  "A piano pedal sign."

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 07a22448302f54c754f7c97ccc9ce47ebfba42f2..00db81596437c851dcb0d17afd62a014629108b1 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -574,6 +574,7 @@
        (meta . ((class . Item)
                 (interfaces . (font-interface
                                break-aligned-interface
+                               percent-repeat-interface
                                percent-repeat-item-interface))))))
 
     (DoublePercentRepeatCounter
@@ -597,6 +598,7 @@
                 (interfaces . (side-position-interface
                                self-alignment-interface
                                percent-repeat-item-interface
+                               percent-repeat-interface
                                font-interface
                                text-interface))))))
 
@@ -1312,7 +1314,8 @@
        (meta . ((class . Spanner)
                 (interfaces . (multi-measure-rest-interface
                                font-interface
-                               percent-repeat-item-interface))))))
+                               percent-repeat-interface
+                               ))))))
 
     (PercentRepeatCounter
      . (
@@ -1333,7 +1336,7 @@
        (meta . ((class . Spanner)
                 (interfaces . (side-position-interface
                                self-alignment-interface
-                               percent-repeat-item-interface
+                               percent-repeat-interface
                                font-interface
                                text-interface))))))
 
@@ -1389,6 +1392,7 @@
        (slope . 1.7)
        (meta . ((class . Item)
                 (interfaces . (rhythmic-grob-interface
+                               percent-repeat-interface
                                percent-repeat-item-interface))))))
 
     (RepeatTie