X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpaper.scm;h=6223e5392ecdb0cfd05b0f1179925650b5dfee05;hb=f0968c08c70e954c1d928feadf94006504ac4de1;hp=d3e299ddd80c4bd4d0646b16101067f9e014620d;hpb=38d7d319eabc906e82fb42002678c6d42a23b6f7;p=lilypond.git

diff --git a/scm/paper.scm b/scm/paper.scm
index d3e299ddd8..6223e5392e 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -1,17 +1,23 @@
-;;;; paper.scm -- manipulate the paper and layout block.
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
-;;;; 
-;;;; (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;;
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-public (set-paper-dimension-variables mod)
   (module-define! mod 'dimension-variables
-		  '(after-title-space
-		    before-title-space
-		    between-system-padding
-		    between-system-space
-		    between-title-space
-		    blot-diameter
+		  '(blot-diameter
 		    bottom-margin
 		    cm
 		    foot-separation
@@ -19,16 +25,21 @@
 		    horizontal-shift
 		    in
 		    indent
+		    inner-margin
+		    inner-margin-default-scaled
 		    ledger-line-thickness
 		    left-margin
+                    left-margin-default-scaled
 		    line-thickness
 		    line-width
 		    mm
-		    page-top-space
+		    outer-margin
+		    outer-margin-default-scaled
 		    paper-height
 		    paper-width
 		    pt
 		    right-margin
+                    right-margin-default-scaled
 		    short-indent
 		    staff-height
 		    staff-space
@@ -39,15 +50,15 @@
 
   ;; !! synchronize with feta-params.mf
   (let*
-    ((x1 (* 4.125 pt))
-     (x0 (* 5 pt))
-     (f1 (* 0.47 pt))
-     (f0 (* 0.50 pt)))
+      ((x1 (* 4.125 pt))
+       (x0 (* 5 pt))
+       (f1 (* 0.47 pt))
+       (f0 (* 0.50 pt)))
 
     (/
      (+
       (* f1 (- staff-space x0))
-	   (* f0 (- x1 staff-space)))
+      (* f0 (- x1 staff-space)))
      (- x1 x0))))
 
 (define-public (layout-set-absolute-staff-size-in-module module staff-height)
@@ -58,8 +69,10 @@
        (setm! (lambda (sym val)
 		(module-define! module sym val))))
 
-    (setm! 'text-font-size (* 12 factor))
-    
+    ;; Synchronized with the `text-font-size'
+    ;; binding in add-pango-fonts (see font.scm).
+    (setm! 'text-font-size (* 11 factor))
+
     (setm! 'output-scale ss)
     (setm! 'fonts (make-century-schoolbook-tree factor))
     (setm! 'staff-height staff-height)
@@ -67,10 +80,10 @@
 
     (setm! 'line-thickness (calc-line-thickness ss pt))
 
-    ;;  sync with feta  
+    ;;  sync with feta
     (setm! 'ledger-line-thickness (+ (* 0.5 pt) (/ ss 10)))
 
-    ;;  sync with feta  
+    ;;  sync with feta
     (setm! 'blot-diameter (* 0.4 pt))
     ))
 
@@ -93,13 +106,13 @@ size. SZ is in points"
 	 (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. 
+	 ;; 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-layout?
 	(ly:warning (_ "set-global-staff-size: not in toplevel scope")))
 
@@ -211,46 +224,89 @@ size. SZ is in points"
     ("pa10" . (cons (* 26 mm) (* 35 mm)))
     ;; F4 used in southeast Asia and Australia
     ("f4" . (cons (* 210 mm) (* 330 mm)))
-   ))
+    ))
 
 ;; todo: take dimension arguments.
 
 (define (set-paper-dimensions m w h)
   "M is a module (i.e. layout->scope_ )"
-  (let* ((mm (eval 'mm m)))
+  (let*
+      ;; page layout - what to do with (printer specific!) margin settings?
+      ((paper-default (eval-carefully
+		       (assoc-get
+		        (ly:get-option 'paper-size)
+			paper-alist
+			#f
+			#t)
+		       m
+		       (cons w h)))
+       ;; Horizontal margins, marked with 'preserve, are stored
+       ;; in renamed variables because they must not be overwritten.
+       ;; Output_def::normalize () needs to know
+       ;; whether the user set the value or not.
+       (scaleable-values `((("left-margin" . ,w) . preserve)
+			   (("right-margin" . ,w) . preserve)
+			   (("inner-margin" . ,w) . preserve)
+			   (("outer-margin" . ,w) . preserve)
+			   (("binding-offset" . ,w) . '())
+			   (("top-margin" . ,h) . '())
+			   (("bottom-margin" . ,h) . '())
+			   (("head-separation" . ,h) . '())
+			   (("foot-separation" . ,h) . '())
+			   (("indent" . ,w) . '())
+			   (("short-indent" . ,w) . '())))
+       (scaled-values
+	(map
+         (lambda (entry)
+           (let ((entry-symbol
+		  (string->symbol
+		   (string-append (caar entry) "-default")))
+		 (orientation (cdar entry)))
+	     (if paper-default
+		 (cons (if (eq? (cdr entry) 'preserve)
+			   (string-append (caar entry) "-default-scaled")
+			   (caar entry))
+		       (round (* orientation
+				 (/ (eval-carefully entry-symbol m 0)
+				    (if (= orientation w)
+					(car paper-default)
+					(cdr paper-default))))))
+		 entry)))
+	 scaleable-values)))
+
     (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))))
+    ;; Sometimes, lilypond-book doesn't estimate a correct line-width.
+    ;; Therefore, we need to unset line-width.
+    (module-remove! m 'line-width)
 
-    (module-define! m 'indent (/ w 14))
-    (module-define! m 'short-indent 0)
-
-    ;; page layout - what to do with (printer specific!) margin settings?
-
-    ))
+    (for-each
+     (lambda (value)
+       (let ((value-symbol (string->symbol (car value)))
+	     (number (cdr value)))
+	 (module-define! m value-symbol number)))
+     scaled-values)))
 
 (define (internal-set-paper-size module name landscape?)
   (define (swap x)
     (cons (cdr x) (car x)))
-  
-  (let* ((entry (assoc name paper-alist))
+
+  (let* ((entry (assoc-get 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)
+     (entry
 
-      (set! entry (eval (cdr entry) module))
+      (set! entry (eval 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 
+      (module-define! module 'landscape
 		      (if landscape? #t #f)))
      (else
       (ly:warning (_ "Unknown paper size: ~a") name)))))
@@ -285,10 +341,10 @@ size. SZ is in points"
 	     (module-define! scope v
 			     (/ val scale))
 
-	     ;; spurious warnings, eg. for paper-width, paper-height. 
+	     ;; spurious warnings, eg. for paper-width, paper-height.
 	     ;; (ly:warning (_ "not a number, ~S = ~S " v  val))
 	     )))
-     
+
      dim-vars)
-    
+
     new-pap))