X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-tex.scm;h=af663cbf0e71f0fb348f4d19894b092d3969286b;hb=d515a6a8687635bcb78dad2cc361426b96f20d17;hp=c9697f5f12a718ea005926bf510a87178f5073f9;hpb=b6a8afbd0a9a0b36b07c114503d81a7c420e09e7;p=lilypond.git diff --git a/scm/output-tex.scm b/scm/output-tex.scm index c9697f5f12..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--2006 Jan Nieuwenhuizen -;;;; Han-Wen Nienhuys +;;;; (c) 1998--2007 Jan Nieuwenhuizen +;;;; Han-Wen Nienhuys ;; 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))