(ly_bookpaper_fonts): move from Paperdef

[lilypond.git] / scm / output-tex.scm

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index 4c0800a25b4bc1f65bf3a069fbba8577501790f2..77dd2053b43f457aa10e6c2e57c8383516121771 100644 (file)
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -69,10 +69,17 @@
    (string-encode-integer
     (inexact->exact (round (* 1000 (ly:font-magnification font)))))))
 
-(define (define-fonts paper font-list)
+(define (define-fonts bookpaper)
+  (string-append
+   "\\def\\lilypondpaperunit{mm}" ;; UGH. FIXME. 
+   (tex-number-def "lilypondpaper" 'outputscale
+                  (number->string (exact->inexact
+                                   (ly:bookpaper-outputscale bookpaper))))
   (apply string-append
-        (map (lambda (x) (font-load-command paper x)) font-list)))
-
+        (map (lambda (x) (font-load-command bookpaper x))
+             (ly:bookpaper-fonts bookpaper)
+             )))
+)
 (define (unknown) 
   "%\n\\unknown\n")
 
@@ -99,25 +106,25 @@
   (string-append
    "\\def\\" prefix (symbol->tex-key key) (string->param number) "%\n"))
 
-(define (output-paper-def pd)
-  (apply
-   string-append
-   (module-map
-    (lambda (sym var)
-      (let ((val (variable-ref var))
-           (key (symbol->tex-key sym)))
-
-       (cond
-        ((string? val)
-         (tex-string-def "lilypondpaper" sym val))
-        ((number? val)
-         (tex-number-def "lilypondpaper" sym
-                         (if (integer? val)
-                             (number->string val)
-                             (number->string (exact->inexact val)))))
-        (else ""))))
-      
-    (ly:output-def-scope pd))))
+(define (output-paper-def paper)
+      (apply
+       string-append
+       (module-map
+       (lambda (sym var)
+         (let ((val (variable-ref var))
+               (key (symbol->tex-key sym)))
+
+           (cond
+            ((string? val)
+             (tex-string-def "lilypondpaper" sym val))
+            ((number? val)
+             (tex-number-def "lilypondpaper" sym
+                             (if (integer? val)
+                                 (number->string val)
+                                 (number->string (exact->inexact val)))))
+            (else ""))))
+       
+       (ly:output-def-scope pd))))
 
 (define (output-scopes paper scopes fields basename)
   (define (output-scope scope)
@@ -174,7 +181,7 @@
 (define (symmetric-x-triangle t w h)
   (embedded-ps (list 'symmetric-x-triangle t w h)))
 
-(define (font-load-command paper font)
+(define (font-load-command bookpaper font)
   (string-append
    "\\font\\" (font-command font) "="
    (ly:font-filename font)
@@ -182,7 +189,7 @@
    (ly:number->string (inexact->exact
                       (round (* 1000
                          (ly:font-magnification font)
-                         (ly:paper-lookup paper 'outputscale)))))
+                         (ly:bookpaper-outputscale bookpaper)))))
    "\n"))
 
 (define (ez-ball c l b)
@@ -245,6 +252,7 @@
    "\\lilypondspecial\n"
    "\\lilypondpostscript\n"))
 
+; why paper? 
 (define (header creator time-stamp paper page-count classic?)
   (string-append
    "% Generated by " creator "\n"