* scm/lily-library.scm (interval-translate): new function

[lilypond.git] / scm / paper.scm

diff --git a/scm/paper.scm b/scm/paper.scm
index 03e3112d95303854ecea9d58689a1de97bd722ea..f2e51647c26fdaa16ab4d30eab43b5644388685d 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -2,13 +2,14 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2005 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
+                      pagetopspace
                       betweensystemspace betweensystempadding
-                      linewidth indent hsize vsize
+                      linewidth indent hsize vsize horizontalshift
                       staffspace linethickness ledgerlinethickness
                       blotdiameter interscoreline leftmargin rightmargin)))
 
@@ -39,7 +40,7 @@
                    (if tex-backend?
                        (make-cmr-tree (/  sz (* 20 pt)))
                        (make-century-schoolbook-tree
-                        (/  sz (* 20 pt)))))
+                        (/ sz (* 20 pt)))))
     (module-define! m 'staffheight sz)
     (module-define! m 'staff-space ss)
     (module-define! m 'staffspace ss)
@@ -47,7 +48,7 @@
     ;; !! synchronize with feta-params.mf
     (module-define! m 'linethickness lt)
     (module-define! m 'ledgerlinethickness (+ (* 0.5 pt) (/ ss 10)))
-    (module-define! m 'blotdiameter (* 0.35 pt))
+    (module-define! m 'blotdiameter (* 0.4 pt))
     (module-define! m 'interscoreline (* 4 mm))))
 
 (define-safe-public (set-global-staff-size sz)
@@ -65,7 +66,7 @@
         (new-scope (ly:output-def-scope new-paper)))
     
     (if in-layout?
-       (ly:warn "Not in toplevel scope"))
+       (ly:warning (_ "Not in toplevel scope")))
     (set-current-module new-scope)
     (layout-set-staff-size (* sz (eval 'pt new-scope)))
     (set-current-module old-mod)
@@ -78,7 +79,8 @@
     ("a3" . (cons (* 297.9 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.
 
@@ -110,8 +112,7 @@
     
     (cond
      ((not is-paper?)
-      (ly:warning "This is not a \\layout {} object, ~S"
-                  module))
+      (ly:warning (_ "This is not a \\layout {} object, ~S" module)))
      ((pair? entry)
 
       (set! entry (eval (cdr entry) module))
@@ -124,7 +125,7 @@
       (if landscape?
          (module-define! module 'landscape #t)))
      (else
-      (ly:warn (string-append "Unknown papersize: " name))))))
+      (ly:warning (_ ("Unknown papersize: ~a" name)))))))
 
 (define-safe-public (set-default-paper-size name . rest)
   (internal-set-paper-size
@@ -139,7 +140,7 @@
 
       ;;; 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-layout pap scale)
   (let* ((new-pap (ly:output-def-clone pap))
@@ -157,7 +158,7 @@
                             (/ val scale))
 
             ;; spurious warnings, eg. for hsize, vsize. 
-            ;; (ly:warn "not a number, ~S = ~S " v  val)
+            ;; (ly:warning (_ "not a number, ~S = ~S " v  val))
             )))
      
      dim-vars)