X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-tex.scm;h=4ea8fbe77d2419d82e7e156251f7bf411cc99cd8;hb=d4e1cf3b24ad546d05a490ad1b07be45ea230e44;hp=afd15e374f541935fe05f01dd7dfae2ac032f9ca;hpb=aab300b4e582627497ab12f8ea8609f03a3c8d84;p=lilypond.git

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index afd15e374f..4ea8fbe77d 100644
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -1,85 +1,73 @@
-
-;;; tex.scm -- implement Scheme output routines for TeX
-;;;
-;;;  source file of the GNU LilyPond music typesetter
-;;; 
-;;; (c)  1998--2003 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)
+
+;; The public interface is tight.
+;; It has to be, because user-code is evalled with this module.
+
+;; ***It should also be clean, well defined, documented and reviewed***
+
+;; To be reasonably safe, you probably do not want to use the TeX
+;; backend anyway, but rather the PostScript backend.  You may want
+;; to run gs in a uml sandbox too.
+
+
+(define-module (scm output-tex)
+  #:re-export (quote)
+
+  ;; JUNK this -- see lily.scm: ly:all-output-backend-commands
+  #:export (unknown
+	     blank
+	     dot
+	     white-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
+	     white-text
+	     tuplet
+	     polygon
+	     draw-line
+	     no-origin
+	     grob-cause
+	     ))
+
+(use-modules (ice-9 regex)
 	     (ice-9 string-fun)
 	     (ice-9 format)
 	     (guile)
-	     (lily)
-	     )
-
-(define this-module (current-module))
+	     (srfi srfi-13)
+	     (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 (* 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 (select-font name-mag-pair)
-  (let*
-      (
-       (c (assoc name-mag-pair font-name-alist))
-       )
 
-    (if (eq? c #f)
-	(begin
-	  (display "FAILED\n")
-	  (display (object-type (car name-mag-pair)))
-	  (display (object-type (caaar font-name-alist)))
-
-	  (ly:warn (string-append
-		    "Programming error: No such font known "
-		    (car name-mag-pair) " "
-		    (ly:number->string (cdr name-mag-pair))
-		    ))
-	  "") ; issue no command
-	(string-append "\\" (cddr c)))
-    
-    
-    ))
 
 (define (blank)
   "")
@@ -87,8 +75,15 @@
 (define (dot x y radius)
   (embedded-ps (list 'dot x y radius)))
 
-(define (beam width slope thick)
-  (embedded-ps (list 'beam  width slope thick)))
+
+(define (embedded-ps string)
+  (embedded-ps (list 'embedded-ps string)))
+
+(define (white-dot x y radius)
+  (embedded-ps (list 'white-dot x y radius)))
+
+(define (beam width slope thick blot)
+  (embedded-ps (list 'beam  width slope thick blot)))
 
 (define (bracket arch_angle arch_width arch_height height arch_thick thick)
   (embedded-ps (list 'bracket  arch_angle arch_width arch_height height arch_thick thick)))
@@ -96,8 +91,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)))
@@ -108,111 +104,23 @@
 (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 (* 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))
-  ""
-  )
-
-(if (or (equal? (minor-version) "4.1")
-	(equal? (minor-version) "4")
-	(equal? (minor-version) "3.4"))
-    (define (embedded-ps expr)
-      (let ((ps-string
-	     (with-output-to-string
-	       (lambda () (ps-output-expression expr (current-output-port))))))
-	(string-append "\\embeddedps{" ps-string "}")))
-    (define (embedded-ps expr)
-      (let
-	  ((os (open-output-string)))
-	(ps-output-expression expr os)
-	(string-append "\\embeddedps{" (get-output-string os) "}"))))
-
-(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 (embedded-ps expr)
+  (let ((ps-string
+	 (with-output-to-string
+	   (lambda () (ps-output-expression expr (current-output-port))))))
+    (string-append "\\embeddedps{" ps-string "}")))
+  
 
 (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"))
-
-;; Note: this string must match the string in ly2dvi.py!!!
-(define (header creator generate) 
-  (string-append
-   "% Generated automatically by: " creator generate "\n"))
-
-(define (invoke-char s i)
-  (string-append 
-   "\n\\" s "{" (inexact->string i 10) "}" ))
-
-;;
-;; need to do something to make this really safe.
-;;
-(define-public (output-tex-string s)
-  (if security-paranoia
-      (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
@@ -220,36 +128,20 @@
    (ly:number->string x) " \\outputscale "))
 
 (define (placebox x y s) 
-  (string-append "\\lyitem{"
-		 (ly:number->string y) "}{"
-		 (ly:number->string x) "}{"
-		 s "}%\n"))
-
-(define (bezier-bow l thick)
-  (embedded-ps (list 'bezier-bow  `(quote ,l) thick)))
+  (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)))
 
 (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)) "}{"
@@ -257,12 +149,34 @@
 		     (ly:number->string depth) "}{"
 		     (ly:number->string height) "}")))
 
-(define (roundfilledbox x y width height blotdiam)
-  (embedded-ps (list 'roundfilledbox  x y width height blotdiam)))
+(define (round-filled-box x y width height blotdiam)
+  (embedded-ps (list 'round-filled-box  x y width height blotdiam)))
+
+(define (text font s)
+  (let*
+      ((mapping #f)       ;; (assoc-get  'char-mapping (ly:font-encoding-alist font))))
+
 
-(define (text s)
-  (string-append "\\hbox{" (output-tex-string s) "}"))
+       ;; 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 (white-text scale s)
+   (embedded-ps (list 'white-text scale s)))
+   
 (define (tuplet ht gapx dx dy thick dir)
   (embedded-ps (list 'tuplet  ht gapx dx dy thick dir)))
 
@@ -272,22 +186,19 @@
 (define (draw-line thick fx fy tx ty)
   (embedded-ps (list 'draw-line thick fx fy tx ty)))
 
-(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-public (tex-output-expression expr port)
-  (display (eval expr this-module) port )
-  )
-
-
+(define (grob-cause grob)
+  (if (procedure? point-and-click)
+      (let* ((cause (ly:grob-property grob 'cause))
+	     (music-origin (if (ly:music? cause)
+			       (ly:music-property cause 'origin)))
+	     (location (if (ly:input-location? music-origin)
+			   (ly:input-location music-origin))))
+	(if (pair? location)
+	     ;;; \\string ? 
+	    (string-append "\\special{src:"
+			   (apply point-and-click location) "}")
+	    ""))
+      ""))