Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / scm / paper.scm

diff --git a/scm/paper.scm b/scm/paper.scm
index 1eb3b59a1a2ee57983af29ff46eb25eb4c9f381a..117bbb0fffb0bcbfd2048b4e9584a54f088b23bd 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -1,8 +1,19 @@
-;;;; 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
+;;;; Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
-;;;; (c) 2004--2009 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
@@ -14,17 +25,21 @@
                    horizontal-shift
                    in
                    indent
+                   inner-margin
+                   inner-margin-default-scaled
                    ledger-line-thickness
                    left-margin
-                    left-margin-default
+                    left-margin-default-scaled
                    line-thickness
                    line-width
                    mm
+                   outer-margin
+                   outer-margin-default-scaled
                    paper-height
                    paper-width
                    pt
                    right-margin
-                    right-margin-default
+                    right-margin-default-scaled
                    short-indent
                    staff-height
                    staff-space
@@ -35,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)
@@ -89,9 +104,9 @@ 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)))
@@ -207,19 +222,68 @@ 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.
+;; todo: take dimension arguments.
 
 (define (set-paper-dimensions m w h)
   "M is a module (i.e. layout->scope_ )"
-  (begin
-    ;; page layout - what to do with (printer specific!) margin settings?
+  (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 'indent (/ w 14))
-    (module-define! m 'short-indent 0))
-    (module-remove! m 'line-width))
+    ;; Sometimes, lilypond-book doesn't estimate a correct line-width.
+    ;; Therefore, we need to unset line-width.
+    (module-remove! m 'line-width)
+
+    (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)