X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpaper.scm;h=dad869d88079d33cda81d56331bd88f0d17ab5d3;hb=5856b3f565bfa6ef87d53b9fa9db7ec961ecf452;hp=e97e11bfbbddc2f8b9052ab0279b89bacc2288a2;hpb=6a6969bee0b27f71175f2764a03398102fb67a2b;p=lilypond.git

diff --git a/scm/paper.scm b/scm/paper.scm
index e97e11bfbb..dad869d880 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -9,33 +9,61 @@
   "Function to be called inside a \\paper{} block to set the staff size."
   (let* ((m (current-module))
 	 (ss (/ sz 4))
-	 (pt (eval 'pt m)) 
+	 (pt (eval 'pt m))
+
+	 
+	 ;; linear interpolation.
+	 (x1 (* 4.125 pt))
+	 (x0 (* 5 pt))
+	 (f1 (* 0.47 pt))
+	 (f0 (* 0.50 pt))
+	 (lt (/
+	      (+
+	       (* f1 (- ss x0))
+	       (* f0 (- x1 ss)))
+	      (- x1 x0)))
+	 
 	 (mm (eval 'mm m)))
-   
-    (module-define! m 'fonts (make-font-tree (/  sz (* 20 pt))))
-    
+
+    (module-define! m 'outputscale ss)
+    (module-define! m 'fonts (make-cmr-tree (/  sz (* 20 pt))))
     (module-define! m 'staffheight sz)
     (module-define! m 'staff-space ss)
     (module-define! m 'staffspace ss)
 
-
     ;; !! synchronize with feta-params.mf
-    (module-define! m 'linethickness (+ (* 0.3 pt) (* 0.04 ss)))
-    (module-define! m 'outputscale ss)
+    (module-define! m 'linethickness lt)
     (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))
+
+    (module-define! m 'dimension-variables
+		    '(pt mm cm in staffheight staff-space
+			 linewidth indent hsize vsize
+			 staffspace linethickness ledgerlinethickness
+			 blotdiameter interscoreline leftmargin rightmargin))
+    ))
 
 (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))
+	 (pap (eval '$defaultbookpaper old-mod))
+	 (in-paper? (or (module-defined? old-mod 'is-bookpaper)
+			(module-defined? old-mod 'is-paper)))
+
+	 ; maybe not necessary.
+	 ; but let's be paranoid. Maybe someone still refers to the
+	 ; old one. 
 	 (new-paper (ly:output-def-clone pap))
+	 
 	 (new-scope (ly:output-def-scope new-paper)))
+    
+    (if in-paper?
+	(ly:warn "Not in toplevel scope"))
     (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 '$defaultbookpaper new-paper)))
 
 (define paper-alist
   '(("a6" . (cons (* 105 mm) (* 148.95 mm)))
@@ -54,29 +82,66 @@
     (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))
 
     ;; 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))))
+    (module-define! m 'topmargin (* 5 mm))
+    (module-define! m 'bottommargin (* 6 mm))
+    (module-define! m 'headsep (* 4 mm))
+    (module-define! m 'footsep (* 4 mm))
+    (module-define! m 'leftmargin #f)
+    (module-define! m 'rightmargin (* 10 mm))))
 
-(define-public (set-paper-size name)
+(define (internal-set-paper-size module 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)))
+	 (is-bookpaper? (module-defined? module 'is-bookpaper))
+	 (mm (eval 'mm module)))
     
-    (if (pair? entry)
-	(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)))))
+    (cond
+     ((not is-bookpaper?)
+      (ly:warning "This is not a \\paper {} object, ~S"
+		   module))
+     ((pair? entry)
+      (set! entry (eval  (cdr entry) module))
+	  (set-paper-dimensions module (car entry) (cdr entry))
+	  (module-define! module 'papersize name)
+	  (module-define! module 'papersizename name)
+	  (set-paper-dimensions module (car entry) (cdr entry)))
+     (else
+      (ly:warn (string-append "Unknown papersize: " name))))
+
+    ))
+
+(define-public (set-default-paper-size name)
+  (internal-set-paper-size (ly:output-def-scope (eval '$defaultbookpaper (current-module)))
+			   name))
+
+(define-public (set-paper-size name)
+  (if (module-defined? (current-module) 'is-paper)
+      (internal-set-paper-size (current-module) name)
+
+      ;;; TODO: should raise (generic) exception with throw, and catch
+      ;;; that in parse-scm.cc
+      (ly:warn "Must use #(set-paper-size .. ) within \\paper { ... }")))
+
+(define-public (scale-paper pap scale)
+  (let*
+      ((new-pap (ly:output-def-clone pap))
+       (dim-vars (ly:output-def-lookup pap 'dimension-variables))
+       (scope (ly:output-def-scope new-pap)))
+
+    (for-each
+     (lambda (v)
+       (define val (ly:output-def-lookup pap v))
+       (if (number? val)
+	   (module-define! scope v
+			   (/ val scale))
+
+	   ;; spurious warnings, eg. for hsize, vsize. 
+;	   (ly:warn "not a number, ~S = ~S " v  val)
+	   ))
+     
+     dim-vars)
+
+    new-pap
+  ))