* lily/figured-bass-engraver.cc (process_music): change calling

[lilypond.git] / scm / paper.scm

diff --git a/scm/paper.scm b/scm/paper.scm
index 2b5e18024f5cdb85fda69c1d39ad9b6b633dbd5c..3cbc1417843b08de766ce3f3c6f14d439a96c682 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -1,76 +1,73 @@
-; paper.scm - manipulate the paper block.
-;
-; (C) 2004 Han-Wen Nienhuys
-
-; the  functions are fairly basic here.
-
+;;;; paper.scm -- manipulate the paper block.
+;;;;
+;;;;  source file of the GNU LilyPond music typesetter
+;;;; 
+;;;; (c)  2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
 (define-public (paper-set-staff-size sz)
   "Function to be called inside a \\paper{} block to set the staff size."
-  (let*
-   ((m (current-module))
-    (ss (/ sz 4))
-    (pt (eval 'pt m)) 
-    (mm (eval 'mm m))  )
+  (let* ((m (current-module))
+        (ss (/ sz 4))
+        (pt (eval 'pt m)) 
+        (mm (eval 'mm m)))
    
     (module-define! m 'fonts (scale-font-list (/  sz (* 20 pt))))
     (module-define! m 'staffheight sz)
     (module-define! m 'staff-space ss)
     (module-define! m 'staffspace ss)
-    (module-define! m 'linethickness (* 0.5 pt))
+
+
+    ;; !! synchronize with feta-params.mf
+    (module-define! m 'linethickness (+ (* 0.3 pt) (* 0.04 ss)))
     (module-define! m 'outputscale ss)
     (module-define! m 'ledgerlinethickness (+ (* 0.5 pt) (/ ss 10)))
     (module-define! m 'blotdiameter (* 0.35 pt))
-    (module-define! m 'interscoreline (* 4 mm))
-  ))
+    (module-define! m 'interscoreline (* 4 mm))))
 
 (define-public (set-global-staff-size sz)
   "Set the default staff size, where SZ is thought to be in PT."
-  (let*
-      ((old-mod (current-module))
-       (pap (eval  '$defaultpaper old-mod))
-       (new-paper (ly:output-def-clone pap))
-       (new-scope  (ly:output-def-scope new-paper))
-       )
+  (let* ((old-mod (current-module))
+        (pap (eval '$defaultpaper old-mod))
+        (new-paper (ly:output-def-clone pap))
+        (new-scope (ly:output-def-scope new-paper)))
     (set-current-module new-scope)
     (paper-set-staff-size (* sz (eval 'pt new-scope)))
     (set-current-module old-mod)
-    (module-define! old-mod '$defaultpaper new-paper)
-  ))
-
+    (module-define! old-mod '$defaultpaper new-paper)))
 
 (define paper-alist
   '(("a4" . (cons (* 210 mm) (* 297.9 mm)))
-    ("a3" . (cons (* 297.9 mm)  (* 420 mm)))
-    ("legal" . (cons (* 8.5 in)  (* 14.0 in)))
+    ("a3" . (cons (* 297.9 mm) (* 420 mm)))
+    ("legal" . (cons (* 8.5 in) (* 14.0 in)))
     ("letter" . (cons (* 8.5 in) (* 11.0 in)))
-    ("tabloid" . (cons (* 11.0 in) (* 17.0 in))))   )
+    ("tabloid" . (cons (* 11.0 in) (* 17.0 in)))))
 
 ;; todo: take dimension arguments.
 
-
 (define (set-paper-dimensions m w h)
-  (let*
-      ( (mm (eval 'mm m)) )
-
+  "M is a module (ie. paper->scope_ )"
+  (let* ((mm (eval 'mm m)))
     (module-define! m 'hsize w)
     (module-define! m 'vsize h)
     (module-define! m 'linewidth (- w (* 20 mm)))
     (module-define! m 'raggedright #f)
     (module-define! m 'packed #f)
-    (module-define! m 'indent (/ w 14)) ))
+    (module-define! m 'indent (/ w 14))
 
+    ;; page layout - what to do with (printer specific!) margin settings?
+    (module-define! m 'top-margin (* 5 mm))
+    (module-define! m 'bottom-margin (* 6 mm))
+    (module-define! m 'head-sep (* 4 mm))
+    (module-define! m 'foot-sep (* 4 mm))))
 
 (define-public (set-paper-size name)
-  (let*
-      ((entry (assoc name paper-alist))
-       (pap (eval '$defaultpaper (current-module)))
-       (new-paper (ly:output-def-clone pap))
-       (m  (ly:output-def-scope new-paper))
-       (mm (eval 'mm m))
-       )
-
+  (let* ((entry (assoc name paper-alist))
+        (pap (eval '$defaultpaper (current-module)))
+        (new-paper (ly:output-def-clone pap))
+        (m (ly:output-def-scope new-paper))
+        (mm (eval 'mm m)))
+    
     (if (pair? entry)
        (begin
          (set! entry (eval  (cdr entry) m))
@@ -78,7 +75,5 @@
          (module-define! m 'papersize name)
          (module-define! m 'papersizename name)
          (set-paper-dimensions m (car entry) (cdr entry))
-         (module-define! (current-module) '$defaultpaper new-paper)
-         )
-       (ly:warning (string-append "Unknown papersize: " name))
-       )))
+         (module-define! (current-module) '$defaultpaper new-paper))
+       (ly:warning (string-append "Unknown papersize: " name)))))