Rename systemSeparatorMarkup -> system-separator-markup.

diff --git a/Documentation/es/user/spacing.itely b/Documentation/es/user/spacing.itely
index 3cb339cfb1493eb7597d1cb4ff002f7c553dfdf0..07cf5d49ebc5a6d39b69e878e27f4a242032d835 100644 (file)
--- a/Documentation/es/user/spacing.itely
+++ b/Documentation/es/user/spacing.itely
@@ -7,6 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
+@c \version "2.11.64"
 
 @node Spacing issues
 @chapter Spacing issues
@@ -519,8 +520,8 @@ longitud horizontal natural.  Predeterminado: @code{##f}.
 Si la partitura sólo tiene un sistema, el valor predeterminado es
 @code{##t}.
 
-@item systemSeparatorMarkup
-@funindex systemSeparatorMarkup
+@item system-separator-markup
+@funindex system-separator-markup
 
 Objeto de marcado que se inserta entre los sistemas.  Se suele usar
 para partituras orquestales.  Predeterminado: sin establecer.
@@ -535,7 +536,7 @@ valor predeterminado apropiado, por ejemplo
     \relative { c1 \break c1 }
   }
   \paper {
-    systemSeparatorMarkup = \slashSeparator
+    system-separator-markup = \slashSeparator
   }
 }
 @end lilypond

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index e6b2866b5d12500893c406c50242425dfa1a4c08..6de795eb344f71c8fed147fe28a2a0d820cb2b0c 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -224,6 +224,7 @@ scripts.caesura -> scripts.caesura.curved
 \hcenter -> \center-align
 printallheaders -> print-all-headers
 \bigger -> \larger (already existing command)
+systemSeparatorMarkup -> system-separator-markup
 @end example
 
 @noindent

diff --git a/Documentation/user/spacing.itely b/Documentation/user/spacing.itely
index c4e303010e86d4fbbe976b90a19c2b8ea260739e..9ade001b4e56676b2b55b162997c931da5be3164 100644 (file)
--- a/Documentation/user/spacing.itely
+++ b/Documentation/user/spacing.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.61"
+@c \version "2.11.64"
 
 @ignore
 GDP TODO list
@@ -561,8 +561,8 @@ systems end at their natural horizontal length.  Default:
 
 If the score has only one system, the default value is @code{##t}.
 
-@item systemSeparatorMarkup
-@funindex systemSeparatorMarkup
+@item system-separator-markup
+@funindex system-separator-markup
 
 A markup object that is inserted between systems.  This is often
 used for orchestral scores.  Default: unset.
@@ -577,7 +577,7 @@ default,  for example
     \relative { c1 \break c1 }
   }
   \paper {
-    systemSeparatorMarkup = \slashSeparator
+    system-separator-markup = \slashSeparator
   }
 }
 @end lilypond

diff --git a/input/regression/system-separator.ly b/input/regression/system-separator.ly
index d33a619bfcc76150564ab79943746aff99f7877e..d7c58f197f65fc98daec6ab89c8fabd6a5b077e6 100644 (file)
--- a/input/regression/system-separator.ly
+++ b/input/regression/system-separator.ly
@@ -1,24 +1,25 @@
-\version "2.11.51"
+\version "2.11.64"
 
 \header {
-
   texidoc = "System separators may be defined as markups in the
-@code{systemSeparator} field of the paper block.  They are centered
-between the boundary staves of each system."
-
+@code{system-separator-markup} field of the paper block.  They are
+centered between the boundary staves of each system."
 }
 
 \paper {
-  systemSeparatorMarkup = \slashSeparator
+  system-separator-markup = \slashSeparator
+}
 
+foobar = \relative c' {
+  c1 c \break
+  c1 c \break
+  c1 c
 }
-foobar = \relative { c1 c \break c c  \break c c }
-\book
-{
+\book {
   \score {
-     \new GrandStaff <<
-       \new Staff \foobar 
-       \new Staff \foobar 
-     >>
+    \new GrandStaff <<
+      \new Staff \foobar 
+      \new Staff \foobar 
+    >>
   }
 }

diff --git a/python/convertrules.py b/python/convertrules.py
index e94bf30e7625c5c5d6cd0863d46607805d9b13e0..842d6fb8bd4d1e2a8d27b1a879aaf9ac8bbd39b0 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2823,6 +2823,11 @@ def conv (str):
     str = re.sub (r"\\bigger", r"\\larger", str)
     return str
 
+@rule ((2, 11, 64), "systemSeparatorMarkup -> system-separator-markup")
+def conv (str):
+    str = re.sub (r'systemSeparatorMarkup', r'system-separator-markup', str)
+    return str
+
 # Guidelines to write rules (please keep this at the end of this file)
 #
 # - keep at most one rule per version; if several conversions should be done,

diff --git a/scm/page.scm b/scm/page.scm
index 3e25bdaaee3b46059ce22a90eb1578cb8b7b6426..f83fd18d31d93052f068f5ac8b8a2f191d36d5b6 100644 (file)
--- a/scm/page.scm
+++ b/scm/page.scm
@@ -254,7 +254,7 @@
        ;; TODO: naming paper-height/paper-width not analogous to TeX.
        
        (system-xoffset (ly:output-def-lookup layout 'horizontal-shift 0.0))
-       (system-separator-markup (ly:output-def-lookup layout 'systemSeparatorMarkup))
+       (system-separator-markup (ly:output-def-lookup layout 'system-separator-markup))
        (system-separator-stencil (if (markup? system-separator-markup)
                                     (interpret-markup layout
                                                       (layout-extract-page-properties layout)