* scm/output-ps.scm (dashed-line): add phase argument to

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

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index 690ed6d2d9b08a07b798a5f8499345535da72214..0f36375f0db97f49dbeabc7f5593e56415f37bcf 100644 (file)
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
@@ -24,7 +24,6 @@
            blank
            circle
            dot
-           beam
            dashed-slur
            named-glyph
            dashed-line
@@ -79,9 +78,6 @@
 (define (embedded-ps string)
   (embedded-ps (list 'embedded-ps string)))
 
-(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))))
 
@@ -102,8 +98,8 @@
          (ly:warning (_ "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)))
+(define (dashed-line thick on off dx dy phase)
+  (embedded-ps (list 'dashed-line  thick on off dx dy phase)))
 
 (define (zigzag-line centre? zzw zzh thick dx dy)
   (embedded-ps (list 'zigzag-line centre? zzw zzh thick dx dy)))
@@ -120,7 +116,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
@@ -151,8 +147,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)))
@@ -177,8 +173,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)