* 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.
2005-07-13 Han-Wen Nienhuys <hanwen@xs4all.nl>
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.
* scm/output-gnome.scm: remove beam routine.
* scm/output-ps.scm (scm): idem.
*/
char *descr_string = pango_font_description_to_string (pango_description_);
SCM exp
*/
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 ()));
scm_makfrom0str (descr_string),
scm_makfrom0str (str.to_str0 ()));
round-filled-box
text
url-link
round-filled-box
text
url-link
white-dot
white-text
embedded-ps
white-dot
white-text
embedded-ps
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; helper functions
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; helper functions
(cond
((< i #x80) (list (integer->char i)))
((< i #x800) (map integer->char
(cond
((< i #x80) (list (integer->char i)))
((< i #x800) (map integer->char
(list (+ #xe0 x)
(+ #x80 (quotient y #x40))
(+ #x80 (modulo y #x40))))))
(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))))))
(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)
- (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))))
(define (music-font? font)
(let ((family (car (font-name-style font))))
#:size-points (canvas-font-size font)
#:size-set #t
#:text
#:size-points (canvas-font-size font)
#:size-set #t
#:text
(ly:font-glyph-name-to-charcode font (caddr x))))))
x-y-named-glyphs))
(ly:font-glyph-name-to-charcode font (caddr x))))))
x-y-named-glyphs))
#:size-points (canvas-font-size font)
#:size-set #t
#:text (if (integer? s)
#: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
(make <gnome-canvas-text>
#:parent (canvas-root)
#:x 0.0 #:y 0.0
-(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")))
(grob-bbox grob offset))
)))
(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)))
+
(define (text font string)
(dispatch `(fontify ,font ,(entity 'tspan (string->entities string)))))
(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))))
(dispatch `(fontify ,pango-font-description ,(entity 'tspan string))))