Run `make grand-replace'.

[lilypond.git] / scm / paper.scm

diff --git a/scm/paper.scm b/scm/paper.scm
index 04784c11f11ae97fdc68fc9b697a959e19e85bd2..1879732834490180c566ae9bf4e89439c1cd2609 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -2,16 +2,37 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-public (set-paper-dimension-variables mod)
   (module-define! mod 'dimension-variables
-                 '(pt mm cm in staff-height staff-space
-                      page-top-space
-                      between-system-space between-system-padding
-                      line-width indent short-indent paper-width paper-height horizontal-shift
-                      staff-space line-thickness ledgerline-thickness
-                      blot-diameter left-margin right-margin)))
+                 '(after-title-space
+                   before-title-space
+                   between-system-padding
+                   between-system-space
+                   between-title-space
+                   blot-diameter
+                   bottom-margin
+                   cm
+                   foot-separation
+                   head-separation
+                   horizontal-shift
+                   in
+                   indent
+                   ledger-line-thickness
+                   left-margin
+                   line-thickness
+                   line-width
+                   mm
+                   page-top-space
+                   paper-height
+                   paper-width
+                   pt
+                   right-margin
+                   short-indent
+                   staff-height
+                   staff-space
+                   top-margin)))
 
 (define (calc-line-thickness staff-space pt)
   ;; linear interpolation.
@@ -50,7 +71,7 @@
     (setm! 'line-thickness (calc-line-thickness ss pt))
 
     ;;  sync with feta  
-    (setm! 'ledgerline-thickness (+ (* 0.5 pt) (/ ss 10)))
+    (setm! 'ledger-line-thickness (+ (* 0.5 pt) (/ ss 10)))
 
     ;;  sync with feta  
     (setm! 'blot-diameter (* 0.4 pt))
@@ -160,6 +181,7 @@ size. SZ is in points"
     ("statement" . (cons (* 5.5 in) (* 8.5 in)))
     ("half letter" . (cons (* 5.5 in) (* 8.5 in)))
     ("quarto" . (cons (* 8.0 in) (* 10.0 in)))
+    ("octavo" . (cons (* 6.75 in) (* 10.5 in)))
     ("executive" . (cons (* 7.25 in) (* 10.5 in)))
     ("monarch" . (cons (* 7.25 in) (* 10.5 in)))
     ("foolscap" . (cons (* 8.27 in) (* 13.0 in)))
@@ -206,7 +228,7 @@ size. SZ is in points"
                                     (ly:modules-lookup (list m) 'right-margin (* 10 mm))))
 
     (module-define! m 'indent (/ w 14))
-    (module-define! m 'short-indent (* 5 mm))
+    (module-define! m 'short-indent 0)
 
     ;; page layout - what to do with (printer specific!) margin settings?
 
@@ -222,7 +244,7 @@ size. SZ is in points"
     
     (cond
      ((not is-paper?)
-      (ly:warning (_ "This is not a \\layout {} object, ~S" module)))
+      (ly:warning (_ "This is not a \\layout {} object, ~S") module))
      ((pair? entry)
 
       (set! entry (eval (cdr entry) module))
@@ -234,7 +256,7 @@ size. SZ is in points"
       (module-define! module 'landscape 
                      (if landscape? #t #f)))
      (else
-      (ly:warning (_ "Unknown papersize: ~a" name))))))
+      (ly:warning (_ "Unknown paper size: ~a") name)))))
 
 (define-safe-public (set-default-paper-size name . rest)
   (internal-set-paper-size