From: Neil Puttock <n.puttock@gmail.com>
Date: Thu, 13 Nov 2008 20:45:34 +0000 (+0000)
Subject: Rename systemSeparatorMarkup -> system-separator-markup.
X-Git-Tag: release/2.11.64-1~30
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2734734ab89b8b4ce1aa2a0afca41a624b0fd2da;p=lilypond.git

Rename systemSeparatorMarkup -> system-separator-markup.
---

diff --git a/Documentation/es/user/spacing.itely b/Documentation/es/user/spacing.itely
index 3cb339cfb1..07cf5d49eb 100644
--- 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 e6b2866b5d..6de795eb34 100644
--- 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 c4e303010e..9ade001b4e 100644
--- 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 d33a619bfc..d7c58f197f 100644
--- 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 e94bf30e76..842d6fb8bd 100644
--- 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 3e25bdaaee..f83fd18d31 100644
--- 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)