* scm/output-svg.scm (utf-8-string): rename from utf8-string.

* scm/output-gnome.scm: remove beam routine.

* scm/output-ps.scm (scm): idem.

* scm/output-svg.scm: remove beam.

* ps/music-drawing-routines.ps: remove draw_beam.

* lily/lookup.cc (beam): use round_filled_polygon() for beam.

diff --git a/ChangeLog b/ChangeLog
index 6254b6bf4e188747e79c29f2c0cab0f23aa96a55..b5354cf88667f5d6d7fc4df3fa0d052b3098685b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-07-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scm/output-svg.scm (utf-8-string): rename  from utf8-string.
+
        * scm/output-gnome.scm: remove beam routine.
 
        * scm/output-ps.scm (scm): idem.

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index c0218074672d459ae8fd0731a440d01732a158db..386f7af1729ff626b2f0fa83404403f26a36e2b3 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -241,7 +241,7 @@ Pango_font::text_stencil (String str) const
       */
       char *descr_string = pango_font_description_to_string (pango_description_);
       SCM exp
-       = scm_list_3 (ly_symbol2scm ("utf8-string"),
+       = scm_list_3 (ly_symbol2scm ("utf-8-string"),
                      scm_makfrom0str (descr_string),
                      scm_makfrom0str (str.to_str0 ()));
 

diff --git a/scm/define-stencil-commands.scm b/scm/define-stencil-commands.scm
index 3ebd854a8f8b30d52a2688b6701e335489340f41..090e7362553be1878a7c09670a0149a18dc8c1d8 100644 (file)
--- a/scm/define-stencil-commands.scm
+++ b/scm/define-stencil-commands.scm
@@ -24,7 +24,7 @@
        round-filled-box
        text
        url-link
-       utf8-string
+       utf-8-string
        white-dot
        white-text
        embedded-ps

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index 589cfbf3cbe77f35cbc4105d0dce87e6c190757d..c26e6cb94c5766ab9c3cbabc951f038c2807e284 100644 (file)
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -100,7 +100,7 @@ lilypond -fgnome input/simple-song.ly
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; helper functions
 
-(define (utf8 i)
+(define (utf-8 i)
   (cond
    ((< i #x80) (list (integer->char i)))
    ((< i #x800) (map integer->char
@@ -113,19 +113,19 @@ lilypond -fgnome input/simple-song.ly
           (list (+ #xe0 x)
                 (+ #x80 (quotient y #x40))
                 (+ #x80 (modulo y #x40))))))
-   (else (begin (stderr "programming-error: utf8 too big:~x\n" i)
+   (else (begin (stderr "programming-error: utf-8 too big:~x\n" i)
                (list (integer->char 32))))))
 
-(define (integer->utf8-string integer)
-  (list->string (utf8 integer)))
+(define (integer->utf-8-string integer)
+  (list->string (utf-8 integer)))
 
-(define (char->utf8-string char)
-  (list->string (utf8 (char->integer char))))
+(define (char->utf-8-string char)
+  (list->string (utf-8 (char->integer char))))
 
-(define (string->utf8-string string)
+(define (string->utf-8-string string)
   (apply
    string-append
-   (map (lambda (x) (char->utf8-string x)) (string->list string))))
+   (map (lambda (x) (char->utf-8-string x)) (string->list string))))
 
 (define (music-font? font)
   (let ((family (car (font-name-style font))))
@@ -265,7 +265,7 @@ lilypond -fgnome input/simple-song.ly
                 #:size-points (canvas-font-size font)
                 #:size-set #t
                 #:text
-                (integer->utf8-string
+                (integer->utf-8-string
                  (ly:font-glyph-name-to-charcode font (caddr x))))))
    x-y-named-glyphs))
 
@@ -325,10 +325,10 @@ lilypond -fgnome input/simple-song.ly
     #:size-points (canvas-font-size font)
     #:size-set #t
     #:text (if (integer? s)
-              (integer->utf8-string s)
-              (string->utf8-string s))))
+              (integer->utf-8-string s)
+              (string->utf-8-string s))))
 
-(define (utf8-string pango-font-description string)
+(define (utf-8-string pango-font-description string)
   (make <gnome-canvas-text>
     #:parent (canvas-root)
     #:x 0.0 #:y 0.0

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 681fec17f0cdf63ff35e6fb94a09fc9fac01ccb4..0fe0a1ef14b19b9347ddbcc295021caf6b1a7e66 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -287,8 +287,8 @@
          (cdr y)
          url))
 
-(define (utf8-string pango-font-description string)
-  (ly:warning (_ "utf8-string encountered in PS backend")))
+(define (utf-8-string pango-font-description string)
+  (ly:warning (_ "utf-8-string encountered in PS backend")))
 
 
 

diff --git a/scm/output-socket.scm b/scm/output-socket.scm
index 52f80348ee3bc989f3b190f2fe7d3b88ef5c08b4..f55cf93bf9238500ad8be4ba60e8dc600c20e27c 100644 (file)
--- a/scm/output-socket.scm
+++ b/scm/output-socket.scm
@@ -94,11 +94,13 @@
                   (grob-bbox grob offset))
          )))
 
-(define-public (glyph-string
-        postscript-font-name
-        size cid?
-        x-y-named-glyphs)
+
+(define-public (utf-8-string
+               descr
+               string)
   
-  (format "text \"~a\" ~a ~a " postscript-font-name size
-         (string-join (map (lambda (xyn) (caddr xyn))
-                           x-y-named-glyphs))))
+  (format "utf-8 \"~a\" \"~a\"" descr
+
+         ;; don't want unescaped spaces.
+         (string-regexp-substitute " " "\\040" string)))
+

diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index a1df2f474c0af4348a1ad8f1ff07f8b0fd51a572..cf2e539b85f3a52007583afaecc9170db2a6d4ec 100644 (file)
--- a/scm/output-svg.scm
+++ b/scm/output-svg.scm
@@ -281,7 +281,7 @@
 (define (text font string)
   (dispatch `(fontify ,font ,(entity 'tspan (string->entities string)))))
 
-(define (utf8-string pango-font-description string)
+(define (utf-8-string pango-font-description string)
   (dispatch `(fontify ,pango-font-description ,(entity 'tspan string))))