Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index d9a97b90934139f5316153473e957dcdc799923d..dc53b5a932bdec8d5074b4a3ff75b312ff0faa04 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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
@@ -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)
@@ -101,9 +99,6 @@
 (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)))
-
 (define (embedded-ps expr)
   (let ((ps-string
         (with-output-to-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)))
 
@@ -180,4 +175,4 @@
            (string-append "\\special{src:"
                           (line-column-location location) "}")
            ""))
-      ""))
\ No newline at end of file
+      ""))