X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpaper.scm;h=8c2b5dc71025a7e18fe5deef9dd5c866e8ff560a;hb=5a462e8c890f6ea8c7e027fa899f583c34b76d61;hp=3a9c908a8e63f544e1a75b22381386abb2451de0;hpb=12186b6828aee7aa298076d684835d629b757f2a;p=lilypond.git

diff --git a/scm/paper.scm b/scm/paper.scm
index 3a9c908a8e..8c2b5dc710 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -1,83 +1,184 @@
-;;;; paper.scm -- manipulate the paper block.
+;;;; paper.scm -- manipulate the paper and layout block.
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2007 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)))
 
-(define-public (paper-set-staff-size sz)
-  "Function to be called inside a \\paper{} block to set the staff size."
+(define (calc-line-thickness staff-space pt)
+  ;; linear interpolation.
+
+  ;; !! synchronize with feta-params.mf
+  (let*
+    ((x1 (* 4.125 pt))
+     (x0 (* 5 pt))
+     (f1 (* 0.47 pt))
+     (f0 (* 0.50 pt)))
+
+    (/
+     (+
+      (* f1 (- staff-space x0))
+	   (* f0 (- x1 staff-space)))
+     (- x1 x0))))
+
+(define-public (layout-set-absolute-staff-size-in-module module staff-height)
   (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)
-
-
-    ;; !! 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))
-    ;; REMOVEME
-    (module-define! m 'lineheight (* 14 ss))))
-
-(define-public (set-global-staff-size sz)
+      ((pt (eval 'pt module))
+       (ss (/ staff-height 4))
+       (factor (/ staff-height (* 20 pt)))
+       (setm! (lambda (sym val)
+		(module-define! module sym val))))
+
+    (setm! 'text-font-size (* 12 factor))
+    
+    (setm! 'output-scale ss)
+    (setm! 'fonts
+		    (if tex-backend?
+			(make-cmr-tree factor)
+			(make-century-schoolbook-tree factor)))
+    (setm! 'staff-height staff-height)
+    (setm! 'staff-space ss)
+
+    (setm! 'line-thickness (calc-line-thickness ss pt))
+
+    ;;  sync with feta  
+    (setm! 'ledgerline-thickness (+ (* 0.5 pt) (/ ss 10)))
+
+    ;;  sync with feta  
+    (setm! 'blot-diameter (* 0.4 pt))
+    ))
+
+(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"
+  (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"
+
+  (layout-set-absolute-staff-size (* (eval 'pt (current-module)) sz)))
+
+(define-safe-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))
+  (let* ((current-mod (current-module))
+	 (pap (eval '$defaultpaper current-mod))
+	 (in-layout? (or (module-defined? current-mod 'is-paper)
+			 (module-defined? current-mod 'is-layout)))
+
+	 ; 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)))
-    (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)))
-
-(define paper-alist
-  '(("a4" . (cons (* 210 mm) (* 297.9 mm)))
-    ("a3" . (cons (* 297.9 mm) (* 420 mm)))
+    
+    (if in-layout?
+	(ly:warning (_ "set-global-staff-size: not in toplevel scope")))
+
+    (layout-set-absolute-staff-size-in-module new-scope
+					      (* sz (eval 'pt new-scope)))
+    (module-define! current-mod '$defaultpaper new-paper)))
+
+(define-public paper-alist
+
+  ;; don't use decimals.
+  ;; ISO 216 has a tolerance of +- 2mm
+  
+  '(("a7" . (cons (* 74 mm) (* 105 mm)))
+    ("a6" . (cons (* 105 mm) (* 148 mm)))
+    ("a5" . (cons (* 148 mm) (* 210 mm)))
+    ("a4" . (cons (* 210 mm) (* 297 mm)))
+    ("a3" . (cons (* 297 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)))))
+    ("11x17" . (cons (* 11.0 in) (* 17.0 in)))
+    ))
 
 ;; todo: take dimension arguments.
 
-
 (define (set-paper-dimensions m w h)
-  "M is a module (ie. paper->scope_ )"
-  
+  "M is a module (i.e. layout->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 'paper-width w)
+    (module-define! m 'paper-height h)
+    (module-define! m 'line-width (- w
+				     (ly:modules-lookup (list m) 'left-margin (* 10 mm))
+				     (ly:modules-lookup (list m) 'right-margin (* 10 mm))))
 
+    (module-define! m 'indent (/ w 14))
+    (module-define! m 'short-indent (* 5 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))
-       )
-
-    (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))
-	)))
\ No newline at end of file
+    ;; page layout - what to do with (printer specific!) margin settings?
+
+    ))
+
+(define (internal-set-paper-size module name landscape?)
+  (define (swap x)
+    (cons (cdr x) (car x)))
+  
+  (let* ((entry (assoc name paper-alist))
+	 (is-paper? (module-defined? module 'is-paper))
+	 (mm (eval 'mm module)))
+    
+    (cond
+     ((not is-paper?)
+      (ly:warning (_ "This is not a \\layout {} object, ~S" module)))
+     ((pair? entry)
+
+      (set! entry (eval (cdr entry) module))
+      (if landscape?
+	  (set! entry (swap entry)))
+      (set-paper-dimensions module (car entry) (cdr entry))
+
+      (module-define! module 'papersizename name)
+      (module-define! module 'landscape 
+		      (if landscape? #t #f)))
+     (else
+      (ly:warning (_ "Unknown papersize: ~a" name))))))
+
+(define-safe-public (set-default-paper-size name . rest)
+  (internal-set-paper-size
+   (ly:output-def-scope (eval '$defaultpaper (current-module)))
+   name
+   (memq 'landscape rest)))
+
+(define-public (set-paper-size name . rest)
+  (if (module-defined? (current-module) 'is-paper)
+      (internal-set-paper-size (current-module) name
+			       (memq 'landscape rest))
+
+      ;;; TODO: should raise (generic) exception with throw, and catch
+      ;;; that in parse-scm.cc
+      (ly:warning (_ "Must use #(set-paper-size .. ) within \\paper { ... }"))))
+
+(define-public (scale-layout pap scale)
+  (let* ((new-pap (ly:output-def-clone pap))
+	 (dim-vars (ly:output-def-lookup pap 'dimension-variables))
+	 (old-scope (ly:output-def-scope pap))
+	 (scope (ly:output-def-scope new-pap)))
+
+    (for-each
+     (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))
+
+	     ;; spurious warnings, eg. for paper-width, paper-height. 
+	     ;; (ly:warning (_ "not a number, ~S = ~S " v  val))
+	     )))
+     
+     dim-vars)
+    
+    new-pap))