X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpaper.scm;h=dae489f9b3511573f4730963e51aeb4c47dffffb;hb=340e93e5fcbbac55903423c6f809ea59eb8438e1;hp=211208ac86bbe041d1efd6723a9c12625b796c69;hpb=79ab1b579a21ed33c3d20222dcfb5d1b2812ed31;p=lilypond.git

diff --git a/scm/paper.scm b/scm/paper.scm
index 211208ac86..dae489f9b3 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -1,42 +1,62 @@
-;;;; 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>
-
-
-(define-public (paper-set-staff-size sz)
-  "Function to be called inside a \\paper{} block to set the staff size."
+;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@cs.uu.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 paper-width paper-height horizontal-shift
+		       staff-space line-thickness ledgerline-thickness
+		       blot-diameter left-margin right-margin)))
+
+(define-public (layout-set-staff-size sz)
+  "Function to be called inside a \\layout{} 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 'outputscale ss)
-    (module-define! m 'fonts (make-cmr-tree (/  sz (* 20 pt))))
-    (module-define! m 'staffheight sz)
+    (module-define! m 'text-font-size (* 12 (/ sz (* 20 pt))))
+    
+    (module-define! m 'output-scale ss)
+    (module-define! m 'fonts
+		    (if tex-backend?
+			(make-cmr-tree (/  sz (* 20 pt)))
+			(make-century-schoolbook-tree
+			 (/ sz (* 20 pt)))))
+    (module-define! m 'staff-height sz)
+    (module-define! m 'staff-space ss)
     (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 'ledgerlinethickness (+ (* 0.5 pt) (/ ss 10)))
-    (module-define! m 'blotdiameter (* 0.35 pt))
-    (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))
+    (module-define! m 'line-thickness lt)
+    (module-define! m 'ledgerline-thickness (+ (* 0.5 pt) (/ ss 10)))
+    (module-define! m 'blot-diameter (* 0.4 pt))
     ))
 
-(define-public (set-global-staff-size 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 '$defaultbookpaper old-mod))
-	 (in-paper? (or (module-defined? old-mod 'is-bookpaper)
-			(module-defined? old-mod 'is-paper)))
+	 (pap (eval '$defaultpaper old-mod))
+	 (in-layout? (or (module-defined? old-mod 'is-paper)
+			 (module-defined? old-mod 'is-layout)))
 
 	 ; maybe not necessary.
 	 ; but let's be paranoid. Maybe someone still refers to the
@@ -45,90 +65,101 @@
 	 
 	 (new-scope (ly:output-def-scope new-paper)))
     
-    (if in-paper?
-	(ly:warn "Not in toplevel scope"))
+    (if in-layout?
+	(ly:warning (_ "Not in toplevel scope")))
     (set-current-module new-scope)
-    (paper-set-staff-size (* sz (eval 'pt new-scope)))
+    (layout-set-staff-size (* sz (eval 'pt new-scope)))
     (set-current-module old-mod)
-    (module-define! old-mod '$defaultbookpaper new-paper)))
-
-(define paper-alist
-  '(("a6" . (cons (* 105 mm) (* 148.95 mm)))
-    ("a5" . (cons (* 148.95 mm) (* 210 mm)))
-    ("a4" . (cons (* 210 mm) (* 297.9 mm)))
-    ("a3" . (cons (* 297.9 mm) (* 420 mm)))
+    (module-define! old-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) (* 149 mm)))
+    ("a5" . (cons (* 149 mm) (* 210 mm)))
+    ("a4" . (cons (* 210 mm) (* 298 mm)))
+    ("a3" . (cons (* 298 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 (i.e. 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 'paper-width w)
+    (module-define! m 'paper-height h)
+    (module-define! m 'line-width (- w (* 20 mm)))
     (module-define! m 'indent (/ w 14))
 
     ;; page layout - what to do with (printer specific!) margin settings?
-    (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 (internal-set-paper-size module name)
+
+    ))
+
+(define (internal-set-paper-size module name landscape?)
+  (define (swap x)
+    (cons (cdr x) (car x)))
+  
   (let* ((entry (assoc name paper-alist))
-	 (is-bookpaper? (module-defined? module 'is-bookpaper))
+	 (is-paper? (module-defined? module 'is-paper))
 	 (mm (eval 'mm module)))
     
     (cond
-     ((not is-bookpaper?)
-      (ly:warning "This is not a \\paper {} object, ~S"
-		   module))
+     ((not is-paper?)
+      (ly:warning (_ "This is not a \\layout {} 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))))
 
-    ))
+      (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)
+
+      (if landscape?
+	  (module-define! module 'landscape #t)))
+     (else
+      (ly:warning (_ ("Unknown papersize: ~a" name)))))))
 
-(define-public (set-default-paper-size name)
-  (internal-set-paper-size (ly:output-def-scope (eval '$defaultbookpaper (current-module)))
-			   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)
+(define-public (set-paper-size name . rest)
   (if (module-defined? (current-module) 'is-paper)
-      (internal-set-paper-size (current-module) name)
+      (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:warn "Must use #(set-paper-size .. ) within \\paper { ... }")))
+      (ly:warning (_ "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)))
+(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)
-       (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)
-	   ))
+       (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
-  ))
+    
+    new-pap))