* lily/program-option.cc (LY_DEFINE): new function ly_add_option.

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

diff --git a/scm/output-texstr.scm b/scm/output-texstr.scm
index b7e0ef4fa0edb2d877fa295068eb80cd3a661f30..767623f96041fee672388db36235ebb0a7e99065 100644 (file)
--- a/scm/output-texstr.scm
+++ b/scm/output-texstr.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 (define-module (scm output-texstr))
 (define this-module (current-module))
@@ -11,6 +11,7 @@
  (guile)
  (ice-9 regex)
  (srfi srfi-13)
+ (scm framework-tex)
  (lily))
 
 (define (dummy . foo) #f)
@@ -25,13 +26,14 @@
   (if (string? what)
       what
       ""))
-
 (define-public (text font str)
   (call-with-output-string
    (lambda (port)
      (display (format "\\lilygetmetrics{~a~a}{~a}{1.0}{~a}\n"
-                   (hash str 10000000)
+                     
+                     (hash str TEX_STRING_HASHLIMIT)
                    (ly:font-file-name font)
                    (ly:font-file-name font)
-                   str) port)
+                   (sanitize-tex-string str))
+             port)
      )))