Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

diff --git a/input/regression/script-stack-horizontal.ly b/input/regression/script-stack-horizontal.ly
index 9cfcd9eb513712dbdc37abe53b5724e2f8a63547..de71c33ec77de3a1936644e64f0a04405984fabe 100644 (file)
--- a/input/regression/script-stack-horizontal.ly
+++ b/input/regression/script-stack-horizontal.ly
@@ -2,7 +2,10 @@
 \header
 {
   texidoc = "horizontal scripts are ordered, so they do not overlap.
-The order may be set with script-priority."
+The order may be set with script-priority.
+
+The scripts should not be folded under the time signature.
+"
   
 }
 \version "2.11.51"

diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm
index 691a565714e526dc9ccfb61424d75a631cbd077b..d5f5d36fcd822eb24591f0d19b8b9e109380e09b 100644 (file)
--- a/scm/define-grob-interfaces.scm
+++ b/scm/define-grob-interfaces.scm
@@ -119,7 +119,7 @@ note)."
 (ly:add-interface
  'percent-repeat-interface
  "Beat, Double and single measure repeats."
- '())
+ '(slope thickness))
 
 (ly:add-interface
  'piano-pedal-interface