X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-tex.scm;h=af663cbf0e71f0fb348f4d19894b092d3969286b;hb=d515a6a8687635bcb78dad2cc361426b96f20d17;hp=01dfeb40335af6c6057a0c6a32ad631d23d85c1a;hpb=4e34058754b48872b6dc751d833c38da4e6706c6;p=lilypond.git

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index 01dfeb4033..af663cbf0e 100644
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -2,8 +2,8 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
 ;; The public interface is tight.
@@ -27,7 +27,6 @@
 	    dashed-slur
 	    named-glyph
 	    dashed-line
-	    zigzag-line
 	    comment
 	    repeat-slash
 	    placebox
@@ -43,7 +42,6 @@
 
 (use-modules (ice-9 regex)
 	     (ice-9 string-fun)
-	     (ice-9 format)
 	     (guile)
 	     (srfi srfi-13)
 	     (scm framework-tex)
@@ -95,14 +93,11 @@
 		       "\\char" (number->string subidx))
 
 	(begin
-	  (ly:warning (_ "can't find ~a in ~a" name font))
+	  (ly:warning (_ "cannot find ~a in ~a" name font))
 	  ""))))
 
-(define (dashed-line thick on off dx dy)
-  (embedded-ps (list 'dashed-line  thick on off dx dy)))
-
-(define (zigzag-line centre? zzw zzh thick dx dy)
-  (embedded-ps (list 'zigzag-line centre? zzw zzh thick dx dy)))
+(define (dashed-line thick on off dx dy phase)
+  (embedded-ps (list 'dashed-line  thick on off dx dy phase)))
 
 (define (embedded-ps expr)
   (let ((ps-string
@@ -116,7 +111,7 @@
 (define (number->dim x)
   (string-append
    ;;ugh ly:* in backend needs compatibility func for standalone output
-   (ly:number->string x) " \\outputscale "))
+   (ly:number->string x) " \\output-scale "))
 
 (define (placebox x y s) 
   (string-append
@@ -130,7 +125,7 @@
   (embedded-ps (list 'round-filled-box  x y width height blotdiam)))
 
 (define (text font s)
-  (format
+  (format #f
    "\\hbox{\\~a{}~a}" (tex-font-command font)
    (sanitize-tex-string s)))
 
@@ -147,8 +142,8 @@
 (define (resetcolor)
   (string-append "\\color[rgb]{0,0,0}\n"))
 
-(define (polygon points blotdiameter fill)
-  (embedded-ps (list 'polygon `(quote ,points) blotdiameter fill)))
+(define (polygon points blot-diameter fill)
+  (embedded-ps (list 'polygon `(quote ,points) blot-diameter fill)))
 
 (define (draw-line thick fx fy tx ty)
   (embedded-ps (list 'draw-line thick fx fy tx ty)))
@@ -157,8 +152,6 @@
 (define (no-origin) "")
 
 
-
-
 (define-public (line-location  file line col)
   "Print an input location, without column number ."
   (string-append (number->string line) " " file))
@@ -173,8 +166,8 @@
 
   (if (procedure? point-and-click)
       (let* ((cause (ly:grob-property grob 'cause))
-	     (music-origin (if (ly:music? cause)
-			       (ly:music-property cause 'origin)))
+	     (music-origin (if (ly:stream-event? cause)
+			       (ly:event-property cause 'origin)))
 	     (location (if (ly:input-location? music-origin)
 			   (ly:input-file-line-column music-origin))))
 	(if (pair? location)