X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-tex.scm;h=6bc3f50a06783ac2f2f40a040db78c561bba48c2;hb=a5457b887fc91e5a582e6460c9d557a4bb077054;hp=d9c87df9ca3f79c96195624d22cc8e5a8633744c;hpb=e2ee132e3b4c99b62fd5ba2fc5cdf89bae5638da;p=lilypond.git

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index d9c87df9ca..6bc3f50a06 100644
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -3,148 +3,73 @@
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
 ;;;; (c)  1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;                  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;;                 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)
-  #:export (define-fonts
-	     font-command
-	     unknown
-	     output-paper-def
-	     output-scopes
-	     blank
-	     dot
-	     beam
-	     bracket
-	     dashed-slur
-	     char
-	     dashed-line
-	     zigzag-line
-	     symmetric-x-triangle
-	     ez-ball
-	     comment
-	     end-output
-	     experimental-on
-	     repeat-slash
-	     header-end
-	     header
-	     placebox
-	     bezier-sandwich
-	     start-system
-	     stop-system
-	     stop-last-system
-	     horizontal-line
-	     filledbox
-	     round-filled-box
-	     text
-	     tuplet
-	     polygon
-	     draw-line
-	     define-origin
-	     no-origin
-	     start-page
-	     stop-page
-	     ))
+
+  ;; JUNK this -- see lily.scm: ly:all-output-backend-commands
+  #:export (unknown
+	    blank
+	    dot
+	    white-dot
+	    beam
+	    bracket
+	    dashed-slur
+	    named-glyph
+	    dashed-line
+	    zigzag-line
+	    ez-ball
+	    comment
+	    repeat-slash
+	    placebox
+	    bezier-sandwich
+	    horizontal-line
+	    filledbox
+	    round-filled-box
+	    text
+	    white-text
+	    polygon
+	    draw-line
+	    no-origin
+	    grob-cause))
 
 (use-modules (ice-9 regex)
 	     (ice-9 string-fun)
 	     (ice-9 format)
 	     (guile)
 	     (srfi srfi-13)
+	     (scm framework-tex)
 	     (lily))
 
+
+
 ;;;;;;;;
 ;;;;;;;; DOCUMENT ME!
 ;;;;;;;;
 
 
-(define (font-command font)
-  (string-append
-   "magfont"
-   (string-encode-integer
-    (hashq (ly:font-filename font) 1000000))
-   "m"
-   (string-encode-integer
-    (inexact->exact (round (* 1000 (ly:font-magnification font)))))))
-
-(define (define-fonts paper font-list)
-  (apply string-append
-	 (map (lambda (x) (font-load-command paper x)) font-list)))
+(define (char font i)
+  (string-append "\\" (tex-font-command font)
+		 "\\char" (ly:inexact->string i 10) " "))
 
 (define (unknown) 
   "%\n\\unknown\n")
 
-(define (symbol->tex-key sym)
-  (regexp-substitute/global
-   #f "_" (output-tex-string (symbol->string sym)) 'pre "X" 'post) )
-
-(define (string->param string)
-  (string-append "{" string "}"))
-
-(define (number->param number)
-  (string->param (ly:number->string number)))
-
-(define (number-pair->param o)
-  (string-append (number->param (car o)) (number->param (cdr o))))
-
-(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) (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-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 (blank)
   "")
@@ -152,18 +77,38 @@
 (define (dot x y radius)
   (embedded-ps (list 'dot x y radius)))
 
+
+(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)))
 
-(define (dashed-slur thick dash l)
-  (embedded-ps (list 'dashed-slur thick dash `(quote ,l))))
+(define (dashed-slur thick dash lst)
+  (embedded-ps (list 'dashed-slur thick dash `(quote ,lst))))
 
-(define (char font i)
-  (string-append "\\" (font-command font)
-		 "\\char" (ly:inexact->string i 10) " "))
+(define (named-glyph font name)
+  (let* ((info (ly:otf-font-glyph-info font name))
+	 (subfont (assoc-get 'subfont info))
+	 (subidx  (assoc-get 'subfont-index info)))
+    
+    ;;(stderr "INFO: ~S\n" info)
+    ;;(stderr "FONT: ~S\n" font)
+    (if (and subfont subidx)
+	(string-append "\\" (tex-font-command-raw
+			     subfont
+			     (ly:font-magnification font))
+		       "\\char" (number->string subidx))
+
+	(begin
+	  (ly:warn "Can't find ~a in ~a" name font)
+	  ""))))
 
 (define (dashed-line thick on off dx dy)
   (embedded-ps (list 'dashed-line  thick on off dx dy)))
@@ -171,107 +116,18 @@
 (define (zigzag-line centre? zzw zzh thick dx dy)
   (embedded-ps (list 'zigzag-line centre? zzw zzh thick dx dy)))
 
-(define (symmetric-x-triangle t w h)
-  (embedded-ps (list 'symmetric-x-triangle t w h)))
-
-(define (font-load-command paper font)
-  (string-append
-   "\\font\\" (font-command font) "="
-   (ly:font-filename font)
-   " scaled "
-   (ly:number->string (inexact->exact
-		       (round (* 1000
-			  (ly:font-magnification font)
-			  (ly:paper-lookup paper 'outputscale)))))
-   "\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 (ez-ball c lst b)
+  (embedded-ps (list 'ez-ball c lst b)))
 
 (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 (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"))
-
-;; FIXME: explain ploblem: need to do something to make this really safe.  
-(define (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
    ;;ugh ly:* in backend needs compatibility func for standalone output
@@ -279,25 +135,14 @@
 
 (define (placebox x y s) 
   (string-append
-   "\\lyitem" (number->param x) (number->param y) (string->param s) "%\n"))
-
-(define (bezier-sandwich l thick)
-  (embedded-ps (list 'bezier-sandwich  `(quote ,l) thick)))
-
-(define (start-system origin dim)
-  (string-append
-   "\\leavevmode\n"
-   "\\lybox" (number-pair->param origin) (number-pair->param dim)
-  "{%\n"))
+   "\\lyitem{" (ly:number->string x) "}{" (ly:number->string y) "}{" s "}%\n"))
 
-(define (stop-system last?)
-  (if last?
-      "}%\n"
-      ;; FIXME: still used by lilypond.py for --preview
-      "}%\n%\n\\interscoreline\n%\n"))
+(define (bezier-sandwich lst thick)
+  (embedded-ps (list 'bezier-sandwich `(quote ,lst) thick)))
 
+;; 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))
@@ -314,25 +159,12 @@
   (embedded-ps (list 'round-filled-box  x y width height blotdiam)))
 
 (define (text font s)
-  (let*
-      ((mapping #f))
-
-    ;; TODO: we'd better do this for PS only
-    ;; LaTeX gets in the way, and we need to remap
-    ;; nonprintable chars.
-    
-    ;; (assoc-get  'char-mapping (ly:font-encoding-alist font))))
-
-    (string-append "\\hbox{\\" (font-command font) "{}"
-		   (output-tex-string
-		    (if (vector? mapping)
-			(reencode-string mapping s)
-			s))
-		   "}")))
+  (format
+   "\\hbox{\\~a{}~a}" (tex-font-command font)
+   (sanitize-tex-string s)))
 
-
-(define (tuplet ht gapx dx dy thick dir)
-  (embedded-ps (list 'tuplet  ht gapx dx dy thick dir)))
+(define (white-text scale s)
+  (embedded-ps (list 'white-text scale s)))
 
 (define (polygon points blotdiameter)
   (embedded-ps (list 'polygon `(quote ,points) blotdiameter)))
@@ -340,20 +172,19 @@
 (define (draw-line thick fx fy tx ty)
   (embedded-ps (list 'draw-line thick fx fy tx ty)))
 
-(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 to 0pt{\n")
-
-(define (stop-page last?)
-  (if last?
-      "\\vss\n}\n\\vfill\n"
-      "\\vss\n}\n\\vfill\\newpage\n"))
+(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) "}")
+	    ""))
+      ""))