Remove head- and foot-separation.

diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely
index 773bbf9e48b16cd2f7659547bbb80032ed551232..00afd02373ad1f21ef2dc5708d6b8c8945a25bf0 100644 (file)
--- a/Documentation/notation/spacing.itely
+++ b/Documentation/notation/spacing.itely
@@ -528,8 +528,6 @@ the following values are affected by this scaling:
 @item @var{right-margin}
 @item @var{top-margin}
 @item @var{bottom-margin}
 @item @var{right-margin}
 @item @var{top-margin}
 @item @var{bottom-margin}

-@item @var{head-separation}
-@item @var{foot-separation}

 @item @var{indent}
 @item @var{short-indent}
 @end itemize
 @item @var{indent}
 @item @var{short-indent}
 @end itemize

diff --git a/input/regression/page-layout.ly b/input/regression/page-layout.ly
index 6674e53e432a07112b070c262057b80ee5c8cc18..d7ed6e05d4206ade7f2915392fae91a771520949 100644 (file)
--- a/input/regression/page-layout.ly
+++ b/input/regression/page-layout.ly
@@ -2,7 +2,7 @@
 \version "2.12.0"
 
 
 \version "2.12.0"
 
 

-    
+

 \header {
 
      texidoc = "This shows how different settings on \paper modify the
 \header {
 
      texidoc = "This shows how different settings on \paper modify the


@@ -10,9 +10,9 @@ general page layout. Basically \paper will set the values for the
 whole paper while \layout for each \score block.
 
 This file is best viewed outside the collated files document.
 whole paper while \layout for each \score block.
 
 This file is best viewed outside the collated files document.

-" 
+"
+

 
 

- 

     title = "Title"
     subtitle = "(and (the) subtitle)"
     subsubtitle = "Sub sub title"
     title = "Title"
     subtitle = "(and (the) subtitle)"
     subsubtitle = "Sub sub title"


@@ -29,8 +29,6 @@ This file is best viewed outside the collated files document.
     %paper-height = 2\cm
     top-margin = 2\cm
     bottom-margin = 2\cm
     %paper-height = 2\cm
     top-margin = 2\cm
     bottom-margin = 2\cm

-    %heap-separation = 7\cm
-    %foot-separation = 7\cm

     ragged-bottom = ##t
     ragged-last-bottom = ##t
     left-margin = 3\cm
     ragged-bottom = ##t
     ragged-last-bottom = ##t
     left-margin = 3\cm


@@ -41,7 +39,7 @@ This file is best viewed outside the collated files document.
     annotate-spacing = ##t
 
 
     annotate-spacing = ##t
 
 

-    
+

   }
 
 
   }
 
 

diff --git a/input/regression/paper-default-margins-a6.ly b/input/regression/paper-default-margins-a6.ly
index ae1b8085d4199600199d81a78f405dcbc62c5c05..d813e59de936fc02bc1b2a0f167e09bd7c71947a 100644 (file)
--- a/input/regression/paper-default-margins-a6.ly
+++ b/input/regression/paper-default-margins-a6.ly
@@ -1,10 +1,10 @@
 \version "2.13.7"
 
 \header {
 \version "2.13.7"
 
 \header {

-  texidoc = "Default margin values are accessible in paper-defaults-init.ly
-and apply to the default paper size returned by (ly:get-option
-'paper-size). For other paper sizes, they are scaled linearly.
-This also affects head- and foot-separation as well as indents."
+  texidoc = "Default values for margins, indents, and offsets are
+accessible in paper-defaults-init.ly and apply to the default
+paper size returned by (ly:get-option 'paper-size).  For other
+paper sizes, they are scaled linearly."

 }
 
 someNotes = \repeat unfold 20 { c4 d e f }
 }
 
 someNotes = \repeat unfold 20 { c4 d e f }

diff --git a/input/regression/paper-default-margins-def.ly b/input/regression/paper-default-margins-def.ly
index 8e2222901f8723d77c2d62d4970b46a370b4b84e..55954c79b93c67ef83837c8a022f519718d450b4 100644 (file)
--- a/input/regression/paper-default-margins-def.ly
+++ b/input/regression/paper-default-margins-def.ly
@@ -1,10 +1,10 @@
 \version "2.13.7"
 
 \header {
 \version "2.13.7"
 
 \header {

-  texidoc = "Default margin values are accessible in paper-defaults-init.ly
-and apply to the default paper size returned by (ly:get-option
-'paper-size). For other paper sizes, they are scaled linearly.
-This also affects head- and foot-separation as well as indents."
+  texidoc = "Default values for margins, indents, and offsets are
+accessible in paper-defaults-init.ly and apply to the default
+paper size returned by (ly:get-option 'paper-size).  For other
+paper sizes, they are scaled linearly."

 }
 
 someNotes = \repeat unfold 30 { c4 d e f }
 }
 
 someNotes = \repeat unfold 30 { c4 d e f }

diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
index be908e30fd6d2abf274e2b529735b16d69ee1a14..4f8fed2296bc6b9be0af06bee7a8064a9f83c356 100644 (file)
--- a/ly/paper-defaults-init.ly
+++ b/ly/paper-defaults-init.ly
@@ -115,9 +115,6 @@
   outer-margin-default = 20 \mm
   binding-offset-default = 0 \mm
 
   outer-margin-default = 20 \mm
   binding-offset-default = 0 \mm
 

-  head-separation-default = 4 \mm
-  foot-separation-default = 4 \mm
-

   indent-default = 15 \mm
   short-indent-default = 0 \mm
 
   indent-default = 15 \mm
   short-indent-default = 0 \mm
 

diff --git a/python/convertrules.py b/python/convertrules.py
index d1d393ae5f32013634dc954cf46d4caa3f7bdc2c..3ea4739db0d091dbe138b736d62dc0c6ea692029 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3092,6 +3092,22 @@ def conv(str):
 
     return str
 
 
     return str
 

+@rule ((2, 13, 40),
+    _ ("Remove \\paper variables head-separation and foot-separation."))
+def conv(str):
+    if re.search(r'head-separation', str):
+        stderr_write("\n")
+        stderr_write(NOT_SMART % ("head-separation.\n"))
+        stderr_write(_ ("Adjust settings for top-system-spacing instead.\n"))
+        stderr_write(UPDATE_MANUALLY)
+    if re.search(r'foot-separation', str):
+        stderr_write("\n")
+        stderr_write(NOT_SMART % ("foot-separation.\n"))
+        stderr_write(_ ("Adjust settings for last-bottom-spacing instead.\n"))
+        stderr_write(UPDATE_MANUALLY);
+
+    return str
+

 
 # Guidelines to write rules (please keep this at the end of this file)
 #
 
 # Guidelines to write rules (please keep this at the end of this file)
 #

diff --git a/scm/paper.scm b/scm/paper.scm
index 93566d5e453548c455924a3ead9be7d70c02ba08..2cd6513d1de1474f7bbf54d1c08ee2f1c1bdd1cd 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -20,8 +20,6 @@
                  '(blot-diameter
                    bottom-margin
                    cm
                  '(blot-diameter
                    bottom-margin
                    cm

-                   foot-separation
-                   head-separation

                    horizontal-shift
                    in
                    indent
                    horizontal-shift
                    in
                    indent


@@ -251,8 +249,6 @@ size. SZ is in points"
                           (("binding-offset" . ,w) . '())
                           (("top-margin" . ,h) . '())
                           (("bottom-margin" . ,h) . '())
                           (("binding-offset" . ,w) . '())
                           (("top-margin" . ,h) . '())
                           (("bottom-margin" . ,h) . '())

-                          (("head-separation" . ,h) . '())
-                          (("foot-separation" . ,h) . '())

                           (("indent" . ,w) . '())
                           (("short-indent" . ,w) . '())))
        (scaled-values
                           (("indent" . ,w) . '())
                           (("short-indent" . ,w) . '())))
        (scaled-values


@@ -337,7 +333,7 @@ size. SZ is in points"
      (lambda (v)
        (let* ((var (module-variable old-scope v))
              (val (if (variable? var) (variable-ref var) #f)))
      (lambda (v)
        (let* ((var (module-variable old-scope v))
              (val (if (variable? var) (variable-ref var) #f)))

-        
+

         (if (number? val)
             (module-define! scope v (/ val scale))
             ;; Cannot warn for non-numbers, eg. for paper-width, paper-height.
         (if (number? val)
             (module-define! scope v (/ val scale))
             ;; Cannot warn for non-numbers, eg. for paper-width, paper-height.