* input/test/ac-extra-voice.ly (accompany): remove file.

[lilypond.git] / scm / paper.scm

diff --git a/scm/paper.scm b/scm/paper.scm
index 7987d8f0218761af5d60b7a7a63cd2bee3a8021a..bb802bb17bf24799ccc32073d116ef404de38966 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -1,4 +1,4 @@
-; paper.scm - manipulate the paper block.
+                                       ; paper.scm - manipulate the paper block.
 ;
 ; (C) 2004 Han-Wen Nienhuys
 
@@ -18,14 +18,17 @@
     (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))
   ))
 
-(define-public (set-staff-size sz)
+(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))
@@ -50,7 +53,9 @@
 ;; todo: take dimension arguments.
 
 
-(define (set-paper-dimensions m h w)
+(define (set-paper-dimensions m w h)
+  "M is a module (ie. paper->scope_ )"
+  
   (let*
       ( (mm (eval 'mm m)) )
 
@@ -65,7 +70,9 @@
 (define-public (set-paper-size name)
   (let*
       ((entry (assoc name paper-alist))
-       (m (current-module))
+       (pap (eval '$defaultpaper (current-module)))
+       (new-paper (ly:output-def-clone pap))
+       (m  (ly:output-def-scope new-paper))
        (mm (eval 'mm m))
        )
 
@@ -73,6 +80,10 @@
        (begin
          (set! entry (eval  (cdr entry) m))
          (set-paper-dimensions m (car entry) (cdr entry))
+         (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))
        )))