Run `make grand-replace'.

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

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index 9068f5b9373df6a743c9aa37b707a91223d8c098..dc53b5a932bdec8d5074b4a3ff75b312ff0faa04 100644 (file)
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -2,8 +2,8 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2008 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
@@ -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)))
 
@@ -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)