X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Foutput-tex.scm;h=0943751436fd0d2a1927ef68c09ac95c3ea44416;hb=4c0e2c1923d9f736025ef264e125626900f24da8;hp=f86cc536997c76802b980b07ec0580c1c96d11e5;hpb=6f28237e24268c76147ba3e9d8619316a4b4b4fb;p=lilypond.git

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index f86cc53699..0943751436 100644
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -6,137 +6,57 @@
 ;;;;                  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
-(define-module (scm output-tex) )
-; (debug-enable 'backtrace)
-(use-modules (scm output-ps)
-	     (ice-9 regex)
+;; (debug-enable 'backtrace)
+
+;; the public interface is tight.
+;; It has to be, because user-code is evalled with this module.
+
+(define-module (scm output-tex)
+  #:re-export (quote)
+  #:export (unknown
+	     blank
+	     dot
+	     beam
+	     bracket
+	     dashed-slur
+	     char
+	     dashed-line
+	     zigzag-line
+	     symmetric-x-triangle
+	     ez-ball
+	     comment
+	     repeat-slash
+	     placebox
+	     bezier-sandwich
+	     horizontal-line
+	     filledbox
+	     round-filled-box
+	     text
+	     tuplet
+	     polygon
+	     draw-line
+	     define-origin
+	     no-origin
+	     ))
+
+(use-modules (ice-9 regex)
 	     (ice-9 string-fun)
 	     (ice-9 format)
 	     (guile)
 	     (srfi srfi-13)
-	     (lily)
-	     )
-
-(define this-module (current-module))
-
-;; dumper-compatibility
-
-(define (ps-output-expression expr port)
-  (let ((output-ps (resolve-module '(scm output-ps))))
-    (display (eval expr output-ps) port)))
-
-;;; Output interface entry
-(define-public (tex-output-expression expr port)
-  (display (eval expr this-module) port ))
+	     (scm framework-tex)
+	     (lily))
 
 ;;;;;;;;
 ;;;;;;;; DOCUMENT ME!
 ;;;;;;;;
 
-(define font-name-alist  '())
-
-(define (tex-encoded-fontswitch name-mag)
-  (let* ((iname-mag (car name-mag))
-	 (ename-mag (cdr name-mag)))
-
-    (cons iname-mag
-	  (cons ename-mag
-		(string-append  "magfont"
-			  (string-encode-integer
-			   (hashq (car ename-mag) 1000000))
-			  "m"
-			  (string-encode-integer
-			   (inexact->exact (round (* 1000 (cdr ename-mag))))))))))
-
-(define (define-fonts internal-external-name-mag-pairs)
-  (set! font-name-alist (map tex-encoded-fontswitch
-			     internal-external-name-mag-pairs))
-  (apply string-append
-	 (map (lambda (x)
-		(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))
 
 
 (define (unknown) 
   "%\n\\unknown\n")
 
-(define (symbol->tex-key sym)
-  (regexp-substitute/global
-   #f "_" (output-tex-string (symbol->string sym)) 'pre "X" 'post) )
-
-(define (tex-string-def prefix key str)
-  (if (equal? "" (sans-surrounding-whitespace (output-tex-string str)))
-      (string-append "\\let\\" prefix (symbol->tex-key key) "\\undefined%\n")
-      (string-append "\\def\\" prefix (symbol->tex-key key) "{"  (output-tex-string str) "}%\n")
-      ))
-
-(define (tex-number-def prefix key number)
-  (string-append "\\def\\" prefix (symbol->tex-key key) "{" 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-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 (and (memq sym fields) (string? val))
-	     (header-to-file basename sym val))
-
-	 (cond
-	  ((string? val)
-	   (tex-string-def "lilypond" sym val))
-	  ((number? val)
-	   (tex-number-def "lilypond" sym
-			   (if (integer? val)
-			       (number->string val)
-			       (number->string (exact->inexact val)))))
-	  (else ""))))
-     scope)))
-  
-  (apply string-append
-	 (map output-scope scopes)))
-
-(define (select-font name-mag-pair)
-  (let ((c (assoc name-mag-pair font-name-alist)))
-    (if c
-	(string-append "\\" (cddr c))
-	(begin
-	  (ly:warn
-	   (format "Programming error: No such font: ~S" name-mag-pair))
-	  ""))))
+
 
 (define (blank)
   "")
@@ -153,8 +73,9 @@
 (define (dashed-slur thick dash l)
   (embedded-ps (list 'dashed-slur thick dash `(quote ,l))))
 
-(define (char i)
-  (string-append "\\char" (inexact->string i 10) " "))
+(define (char font i)
+  (string-append "\\" (tex-font-command font)
+		 "\\char" (ly:inexact->string i 10) " "))
 
 (define (dashed-line thick on off dx dy)
   (embedded-ps (list 'dashed-line  thick on off dx dy)))
@@ -165,35 +86,11 @@
 (define (symmetric-x-triangle t w h)
   (embedded-ps (list 'symmetric-x-triangle t w h)))
 
-(define (font-load-command name-mag command)
-  (string-append
-   "\\font\\" command "="
-   (car name-mag)
-   " scaled "
-   (ly:number->string (inexact->exact (round (* 1000  (cdr name-mag)))))
-   "\n"))
 
 (define (ez-ball c l b)
   (embedded-ps (list 'ez-ball  c  l b)))
 
-(define (header-to-file fn key val)
-  (set! key (symbol->string key))
-  (if (not (equal? "-" fn))
-      (set! fn (string-append fn "." key))
-      )
-  (display
-   (format "writing header field `~a' to `~a'..."
-	   key
-	   (if (equal? "-" fn) "<stdout>" fn)
-	   )
-   (current-error-port))
-  (if (equal? fn "-")
-      (display val)
-      (display val (open-file fn "w"))
-  )
-  (display "\n" (current-error-port))
-  ""
-  )
+
 
 (define (embedded-ps expr)
   (let ((ps-string
@@ -201,68 +98,11 @@
 	   (lambda () (ps-output-expression expr (current-output-port))))))
     (string-append "\\embeddedps{" ps-string "}")))
   
-(define (comment s)
-  (string-append "% " s "\n"))
-
-(define (end-output) 
-  (begin
-    ;; uncomment for some stats about lily memory	  
-    ;; (display (gc-stats))
-    (string-append
-     "\\lilypondend\n"
-     ;; Put GC stats here.
-     )))
-
-(define (experimental-on)
-  "")
 
 (define (repeat-slash w a t)
   (embedded-ps (list 'repeat-slash  w a t)))
 
-(define (header-end)
-  (string-append
-   "\\def\\scaletounit{ "
-   (number->string (cond
-		     ((equal? (ly:unit) "mm") (/ 72.0  25.4))
-		     ((equal? (ly:unit) "pt") (/ 72.0  72.27))
-		     (else (error "unknown unit" (ly:unit)))
-		     ))
-   " mul }%\n"
-   "\\ifx\\lilypondstart\\undefined\n"
-   "  \\input lilyponddefs\n"
-   "\\fi\n"
-   "\\outputscale = \\lilypondpaperoutputscale\\lilypondpaperunit\n"
-   "\\lilypondstart\n"
-   "\\lilypondspecial\n"
-   "\\lilypondpostscript\n"))
-
-(define (header creator time-stamp page-count)
-  (string-append
-   "% 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) "}" ))
-
-;; FIXME: explain ploblem: need to do something to make this really safe.  
-(define-public (output-tex-string s)
-  (if safe-mode?
-      (regexp-substitute/global #f "\\\\" s 'pre "$\\backslash$" 'post)
-      s))
-
-(define (lily-def key val)
-  (let ((tex-key
-	 (regexp-substitute/global
-	      #f "_" (output-tex-string key) 'pre "X" 'post))
-	 
-	(tex-val (output-tex-string val)))
-    (if (equal? (sans-surrounding-whitespace tex-val) "")
-	(string-append "\\let\\" tex-key "\\undefined\n")
-	(string-append "\\def\\" tex-key "{" tex-val "}%\n"))))
+
 
 (define (number->dim x)
   (string-append
@@ -270,36 +110,20 @@
    (ly:number->string x) " \\outputscale "))
 
 (define (placebox x y s) 
-  (string-append "\\lyitem{"
-		 (ly:number->string y) "}{"
-		 (ly:number->string x) "}{"
-		 s "}%\n"))
+  (string-append
+   "\\lyitem{" (ly:number->string x) "}{" (ly:number->string y) "}{" s "}%\n"))
 
 (define (bezier-sandwich l thick)
   (embedded-ps (list 'bezier-sandwich  `(quote ,l) thick)))
 
-(define (start-system wd ht)
-  (string-append "\\leavevmode\n"
-		 "\\scoreshift = " (number->dim (* ht 0.5)) "\n"
-		 "\\lilypondifundefined{lilypondscoreshift}%\n"
-		 "  {}%\n"
-		 "  {\\advance\\scoreshift by -\\lilypondscoreshift}%\n"
-		 "\\lybox{"
-		 (ly:number->string wd) "}{"
-		 (ly:number->string ht) "}{%\n"))
-
-(define (stop-system) 
-  "}%\n%\n\\interscoreline\n%\n")
-(define (stop-last-system)
-  "}%\n")
-
+;; WTF is this in every backend?
 (define (horizontal-line x1 x2 th)
-  (filledbox (- x1)  (- x2 x1) (* .5 th)  (* .5 th )))
+  (filledbox (- x1) (- x2 x1) (* .5 th) (* .5 th)))
 
 (define (filledbox breapth width depth height)
   (if (and #f (defined? 'ps-testing))
       (embedded-ps
-       (string-append (numbers->string (list breapth width depth height))
+       (string-append (ly:numbers->string (list breapth width depth height))
 		      " draw_box" ))
       (string-append "\\lyvrule{"
 		     (ly:number->string (- breapth)) "}{"
@@ -310,8 +134,28 @@
 (define (round-filled-box x y width height blotdiam)
   (embedded-ps (list 'round-filled-box  x y width height blotdiam)))
 
-(define (text s)
-  (string-append "\\hbox{" (output-tex-string s) "}"))
+(define (text font s)
+  (let*
+      ((mapping #f)       ;; (assoc-get  'char-mapping (ly:font-encoding-alist font))))
+
+
+       ;; TODO: we'd better do this for PS only
+       ;; LaTeX gets in the way, and we need to remap
+       ;; nonprintable chars.
+       
+       (input-enc-name #f) ;; (assoc-get 'input-name (ly:font-encoding-alist font) ))
+       )
+
+    (string-append "\\hbox{\\" (tex-font-command font)
+		   (if (string? input-enc-name)
+		       (string-append "\\inputencoding{" input-enc-name "}")
+		       "{}")
+		   (sanitize-tex-string
+		    (if (vector? mapping)
+			(reencode-string mapping s)
+			s))
+		   "}")))
+
 
 (define (tuplet ht gapx dx dy thick dir)
   (embedded-ps (list 'tuplet  ht gapx dx dy thick dir)))
@@ -322,25 +166,13 @@
 (define (draw-line thick fx fy tx ty)
   (embedded-ps (list 'draw-line thick fx fy tx ty)))
 
-;; TODO: this should be a default, which is overriden in PS
-(define (between-system-string string)
-  string
-  )
 (define (define-origin file line col)
   (if (procedure? point-and-click)
       (string-append "\\special{src:" ;;; \\string ? 
 		     (point-and-click line col file)
 		     "}" )
-      "")
-  )
+      ""))
 
 ;; no-origin not yet supported by Xdvi
 (define (no-origin) "")
 
-(define (start-page)
-  "\n%\\vbox{\n")
-
-(define (stop-page last?)
-  (if last?
-      "\n%}\n"
-      "\n%}\n\\newpage\n"))