* scm/output-tex.scm (ps-output-expression): Eval embedded-ps

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

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index ff3ecebcea42d75514eecefa8c95a98c6662fadf..41d48ef03bcdfbe6ccd9f08c009a67918638098c 100644 (file)
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -1,24 +1,36 @@
-;;; tex.scm -- implement Scheme output routines for TeX
-;;;
-;;;  source file of the GNU LilyPond music typesetter
-;;; 
-;;; (c)  1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
-;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
-
-(define-module (scm output-tex) )
-; (debug-enable 'backtrace)
-(use-modules (scm output-ps)
-            (ice-9 regex)
+;;;; tex.scm -- implement Scheme output routines for TeX
+;;;;
+;;;;  source file of the GNU LilyPond music typesetter
+;;;; 
+;;;; (c)  1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;                  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+
+;; (debug-enable 'backtrace)
+(define-module (scm output-tex))
+(use-modules (ice-9 regex)
             (ice-9 string-fun)
             (ice-9 format)
             (guile)
             (srfi srfi-13)
-            (lily)
-            )
+            (lily))
 
 (define this-module (current-module))
 
+;; dumper-compatibility
+(define output-ps #f)
+(define (ps-output-expression expr port)
+  (if (not output-ps)
+      (let ((ps-module (resolve-module '(scm output-ps))))
+       (eval '(use-modules (guile) (ice-9 regex) (srfi srfi-13) (lily))
+             ps-module)
+       (set! output-ps ps-module)))
+  (display (eval expr output-ps) port))
+
+;;; Output interface entry
+(define-public (tex-output-expression expr port)
+  (display (eval expr this-module) port ))
+
 ;;;;;;;;
 ;;;;;;;; DOCUMENT ME!
 ;;;;;;;;
@@ -46,11 +58,11 @@
                (font-load-command (car x) (cdr x)))
              (map cdr font-name-alist))))
 
-
-
+;;
 ;; urg, how can exp be #unspecified?  -- in sketch output
 ;;
 ;; set! returns #<unspecified>  --hwn
+;;
 (define (fontify name-mag-pair exp)
   (string-append (select-font name-mag-pair)
                 exp))
@@ -92,16 +104,17 @@
       
     (ly:output-def-scope pd))))
 
-(define (output-scopes scopes fields basename)
+(define (output-scopes paper scopes fields basename)
   (define (output-scope scope)
     (apply
      string-append
      (module-map
      (lambda (sym var)
        (let ((val (variable-ref var))
+            ;;(val (if (variable-bound? var) (variable-ref var) '""))
             (tex-key (symbol->string sym)))
         
-        (if (memq sym fields)
+        (if (and (memq sym fields) (string? val))
             (header-to-file basename sym val))
 
         (cond
@@ -119,41 +132,13 @@
         (map output-scope scopes)))
 
 (define (select-font name-mag-pair)
-  (let*
-      (
-       (c (assoc name-mag-pair font-name-alist))
-       )
-
-    (if (eq? c #f)
+  (let ((c (assoc name-mag-pair font-name-alist)))
+    (if c
+       (string-append "\\" (cddr c))
        (begin
-         (ly:warn (string-append
-                   "Programming error: No such font known "
-                   (car name-mag-pair) " "
-                   (ly:number->string (cdr name-mag-pair))))
-         
-         (display "FAILED\n" (current-error-port))
-         (if #f ;(pair? name-mag-pair))
-             (display (object-type (car name-mag-pair)) (current-error-port))
-             (write name-mag-pair (current-error-port)))
-         (if #f ;  (pair? font-name-alist)
-             (display
-              (object-type (caaar font-name-alist)) (current-error-port))
-             (write font-name-alist (current-error-port)))
-
-         ;; (format #f "\n%FAILED: (select-font ~S)\n" name-mag-pair))
-         "")
-       
-       (string-append "\\" (cddr c)))))
-
-;; top-of-file, wtf?  ugh: tagline?
-(define (top-of-file)
-  (string-append
-   "% generated by LilyPond "
-    (lilypond-version) " (http://lilypond.org).\n"
-    "\\def\\lilypondtagline{Engraved by LilyPond (version "
-    (lilypond-version)
-    ")}\n"
-    ))
+         (ly:warn
+          (format "Programming error: No such font: ~S" name-mag-pair))
+         ""))))
 
 (define (blank)
   "")
@@ -223,12 +208,12 @@
 
 (define (end-output) 
   (begin
-                                       ; uncomment for some stats about lily memory      
-                                       ;               (display (gc-stats))
+    ;; uncomment for some stats about lily memory        
+    ;; (display (gc-stats))
     (string-append
      "\\lilypondend\n"
-                                       ; Put GC stats here.
-                  )))
+     ;; Put GC stats here.
+     )))
 
 (define (experimental-on)
   "")
@@ -253,20 +238,21 @@
    "\\lilypondspecial\n"
    "\\lilypondpostscript\n"))
 
-;; Note: this string must match the string in lilypond.py!!!
-(define (header creator generate) 
+(define (header creator time-stamp page-count)
   (string-append
-   "% Generated automatically by: " creator generate "\n"))
+   "% Generated by " creator "\n"
+   "% at " time-stamp "\n"
+   ;; FIXME: duplicated in every backend
+   "\\def\\lilypondtagline{Engraved by LilyPond (version "
+   (lilypond-version)")}\n"))
 
 (define (invoke-char s i)
   (string-append 
    "\n\\" s "{" (inexact->string i 10) "}" ))
 
-;;
-;; need to do something to make this really safe.
-;;
+;; FIXME: explain ploblem: need to do something to make this really safe.  
 (define-public (output-tex-string s)
-  (if security-paranoia
+  (if safe-mode?
       (regexp-substitute/global #f "\\\\" s 'pre "$\\backslash$" 'post)
       s))
 
@@ -353,7 +339,10 @@
 ;; no-origin not yet supported by Xdvi
 (define (no-origin) "")
 
-(define-public (tex-output-expression expr port)
-  (display (eval expr this-module) port ))
-
+(define (start-page)
+  "\n%\\vbox{\n")
 
+(define (stop-page last?)
+  (if last?
+      "\n%}\n"
+      "\n%}\n\\newpage\n"))