X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpaper.scm;h=d1233f3e5b274301fbe282cff0502d3af5b6e846;hb=6d392601d61689d2ec81a852046d35e855ac0a68;hp=c4a1471b62d68a5c0acb6ed85793d35071579183;hpb=31d5a3e78382c87d02a88a6ab12d35d2dff179f9;p=lilypond.git

diff --git a/scm/paper.scm b/scm/paper.scm
index c4a1471b62..d1233f3e5b 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -1,50 +1,67 @@
-;;;; 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 (set-paper-dimension-variables mod)
+  (module-define! mod 'dimension-variables
+		  '(pt mm cm in staffheight staff-space
+		       betweensystemspace betweensystempadding
+		       linewidth indent hsize vsize
+		       staffspace linethickness ledgerlinethickness
+		       blotdiameter interscoreline leftmargin rightmargin)))
 
-(define-public (paper-set-staff-size sz)
-  "Function to be called inside a \\paper{} block to set the staff size."
+(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 '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 '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 'dimension-variables
-		    '(pt mm cm in staffheight staff-space
-			 linewidth
-			 staffspace linethickness ledgerlinethickness
-			 blotdiameter interscoreline))
-    ))
+    (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))
-	 (is-paper? (module-defined? old-mod '$defaultpaper))
-	
+	 (in-layout? (or (module-defined? old-mod 'is-paper)
+			 (module-defined? old-mod 'is-layout)))
 
-	 ;; Huh? Why is it necessary to clone object? 
+	 ; 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 (not is-paper?)
+    
+    (if in-layout?
 	(ly:warn "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 '$defaultpaper new-paper)))
 
@@ -60,7 +77,7 @@
 ;; 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)
@@ -68,58 +85,84 @@
     (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 (internal-set-paper-size module name)
+    (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 'firstpagenumber 1)
+    (module-define! m 'printfirstpagenumber #f)
+    (module-define! m 'rightmargin (* 10 mm))))
+
+(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))
+	 (is-paper? (module-defined? module 'is-paper))
 	 (mm (eval 'mm module)))
     
     (cond
      ((not is-paper?)
-      (ly:warning "This is not a \\paper {} object:")
-      (display module))
+      (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))
 
-(define-public (set-default-paper-size name)
-  (internal-set-paper-size (ly:output-def-scope (eval '$defaultpaper (current-module)))
-			   name))
+      
+      (module-define! module 'papersize name)
+      
+      ;; FIXME: if this name-play is on purpose, please document.  Why
+      ;; is it not used troughout?  Should this be removed, or
+      ;; should 'papersize be removed?
 
-(define-public (set-paper-size name)
-  (if (module-defined? (current-module) '$is-paper)
-      (internal-set-paper-size (current-module) name)
+      ;; setting \paper{ papersize = "a6" } gives funny results.
+      
+      (module-define! module 'papersizename name)
+
+      (if landscape?
+	  (module-define! module 'landscape #t)))
+     (else
+      (ly:warn (string-append "Unknown papersize: " name))))))
+
+(define-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:warn "Must use #(set-paper-size .. ) within \\paper { ... }")))
 
-(define-public (scale-paper pap bookpap)
-  (let*
-      ((scale (ly:bookpaper-outputscale bookpap))
-       (new-pap (ly:output-def-clone pap))
-       (dim-vars (ly:paper-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)
-       (module-define! scope v
-		       (/ (ly:paper-lookup pap v) scale)))
+       (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 hsize, vsize. 
+	     ;; (ly:warn "not a number, ~S = ~S " v  val)
+	     )))
      
      dim-vars)
-
-    new-pap
-  ))
+    
+    new-pap))