X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpaper.scm;h=3208f4b82a90654b9fc5e1a55d0df0366303aa0a;hb=b551257a9d5d4bd1b57d32ac0cea4684260dfd83;hp=93566d5e453548c455924a3ead9be7d70c02ba08;hpb=abf0f7e73103716d60c235fa61d938754d9f3a06;p=lilypond.git

diff --git a/scm/paper.scm b/scm/paper.scm
index 93566d5e45..3208f4b82a 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -20,8 +20,8 @@
 		  '(blot-diameter
 		    bottom-margin
 		    cm
-		    foot-separation
-		    head-separation
+		    footnote-footer-padding
+		    footnote-padding
 		    horizontal-shift
 		    in
 		    indent
@@ -88,13 +88,13 @@
     ))
 
 (define-public (layout-set-absolute-staff-size sz)
-  "Function to be called inside a \\layout{} block to set the staff
-size. SZ is in points"
+  "Set the absolute staff size inside of a @code{\\layout@{@}} block.
+@var{sz} is in points."
   (layout-set-absolute-staff-size-in-module (current-module) sz))
 
 (define-public (layout-set-staff-size sz)
-  "Function to be called inside a \\layout{} block to set the staff
-size. SZ is in points"
+  "Set the staff size inside of a @code{\\layout@{@}} block.
+@var{sz} is in points."
 
   (layout-set-absolute-staff-size (* (eval 'pt (current-module)) sz)))
 
@@ -224,6 +224,9 @@ size. SZ is in points"
     ("pa10" . (cons (* 26 mm) (* 35 mm)))
     ;; F4 used in southeast Asia and Australia
     ("f4" . (cons (* 210 mm) (* 330 mm)))
+    ;; Used for very small @lilypond examples in the Documentation
+    ;; based on a8 size but landscape not portrait
+    ("a8landscape" . (cons (* 74 mm) (* 52 mm)))
     ))
 
 ;; todo: take dimension arguments.
@@ -251,8 +254,6 @@ size. SZ is in points"
 			   (("binding-offset" . ,w) . '())
 			   (("top-margin" . ,h) . '())
 			   (("bottom-margin" . ,h) . '())
-			   (("head-separation" . ,h) . '())
-			   (("foot-separation" . ,h) . '())
 			   (("indent" . ,w) . '())
 			   (("short-indent" . ,w) . '())))
        (scaled-values
@@ -337,7 +338,7 @@ size. SZ is in points"
      (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.