Run `make grand-replace'.

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

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index 7f9b5b432aaff0ca4b19c2883041ab475a82ee06..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--2005 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.
@@ -24,20 +24,15 @@
            blank
            circle
            dot
-           white-dot
-           beam
            dashed-slur
            named-glyph
            dashed-line
-           zigzag-line
            comment
            repeat-slash
            placebox
            bezier-sandwich
-           filledbox
            round-filled-box
            text
-           white-text
            setcolor
            resetcolor
            polygon
@@ -47,7 +42,6 @@
 
 (use-modules (ice-9 regex)
             (ice-9 string-fun)
-            (ice-9 format)
             (guile)
             (srfi srfi-13)
             (scm framework-tex)
@@ -82,12 +76,6 @@
 (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 (dashed-slur thick on off lst)
   (embedded-ps (list 'dashed-slur thick on off `(quote ,lst))))
 
@@ -105,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
@@ -126,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
@@ -135,28 +120,15 @@
 (define (bezier-sandwich lst thick)
   (embedded-ps (list 'bezier-sandwich `(quote ,lst) thick)))
 
-(define (filledbox breapth width depth height)
-  (if (and #f (defined? 'ps-testing))
-      (embedded-ps
-       (string-append (ly:numbers->string (list breapth width depth height))
-                     " draw_box" ))
-      (string-append "\\lyvrule{"
-                    (ly:number->string (- breapth)) "}{"
-                    (ly:number->string (+ breapth width)) "}{"
-                    (ly:number->string depth) "}{"
-                    (ly:number->string height) "}")))
 
 (define (round-filled-box x y width height blotdiam)
   (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)))
 
-(define (white-text scale s)
-  (embedded-ps (list 'white-text scale s)))
-
 (define (setcolor r g b)
   (string-append "\\color[rgb]{"
   (number->string r) ", "
@@ -170,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)))
@@ -180,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))
@@ -196,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)