From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 17 Dec 2004 14:23:45 +0000 (+0000)
Subject: (string->entities): Update.
X-Git-Tag: release/2.5.14~400
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8a39882a5ce41daa19b9e31e42afe20c9ba0a0f4;p=lilypond.git

(string->entities): Update.
---

diff --git a/ChangeLog b/ChangeLog
index ab8300b3f3..a5ed9deaaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-17  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* scm/output-svg.scm (string->entities): Update.
+
 2004-12-17  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* scm/framework-scm.scm (output-framework): new file.
diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index 5e9483b2dc..46df231a1f 100644
--- a/scm/output-svg.scm
+++ b/scm/output-svg.scm
@@ -97,12 +97,12 @@
 (define (integer->entity integer)
   (format #f "&#x~x;" integer))
 		   
-(define (char->entity font char)
-  (integer->entity (char->unicode-index font char)))
+(define (char->entity char)
+  (integer->entity (char->integer char)))
 		   
-(define (string->entities font string)
+(define (string->entities string)
   (apply string-append
-	 (map (lambda (x) (char->entity font x)) (string->list string))))
+	 (map (lambda (x) (char->entity x)) (string->list string))))
 
 (define (svg-font font)
   (let* ((encoding (ly:font-encoding font))
@@ -172,7 +172,7 @@
 
 (define (char font i)
   (dispatch
-   `(fontify ,font ,(tagify "tspan" (char->entity font (integer->char i))))))
+   `(fontify ,font ,(tagify "tspan" (char->entity (integer->char i))))))
 
 (define (comment s)
   (string-append "<!-- " s " !-->\n"))
@@ -205,7 +205,7 @@
 	  `(ry . ,(number->string (/ blot-diameter 2)))))
 
 (define (text font string)
-  (dispatch `(fontify ,font ,(tagify "tspan" (string->entities font string)))))
+  (dispatch `(fontify ,font ,(tagify "tspan" (string->entities string)))))
 
 ;; WTF is this in every backend?
 (define (horizontal-line x1 x2 th)