CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/07/13 14:40:03
Modified files:
. : ChangeLog
lily : pango-font.cc
scm : define-stencil-commands.scm output-gnome.scm
output-ps.scm output-socket.scm output-svg.scm
Log message:
* 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.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3873&tr2=1.3874&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/pango-font.cc.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-stencil-commands.scm.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-gnome.scm.diff?tr1=1.95&tr2=1.96&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-ps.scm.diff?tr1=1.147&tr2=1.148&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-socket.scm.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-svg.scm.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3873 lilypond/ChangeLog:1.3874
--- lilypond/ChangeLog:1.3873 Wed Jul 13 14:13:23 2005
+++ lilypond/ChangeLog Wed Jul 13 14:40:01 2005
@@ -1,5 +1,7 @@
2005-07-13 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * scm/output-svg.scm (utf-8-string): rename from utf8-string.
+
* scm/output-gnome.scm: remove beam routine.
* scm/output-ps.scm (scm): idem.
Index: lilypond/lily/pango-font.cc
diff -u lilypond/lily/pango-font.cc:1.35 lilypond/lily/pango-font.cc:1.36
--- lilypond/lily/pango-font.cc:1.35 Fri May 20 18:09:02 2005
+++ lilypond/lily/pango-font.cc Wed Jul 13 14:40:02 2005
@@ -241,7 +241,7 @@
*/
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 ()));
Index: lilypond/scm/define-stencil-commands.scm
diff -u lilypond/scm/define-stencil-commands.scm:1.4
lilypond/scm/define-stencil-commands.scm:1.5
--- lilypond/scm/define-stencil-commands.scm:1.4 Mon Jul 11 20:41:03 2005
+++ lilypond/scm/define-stencil-commands.scm Wed Jul 13 14:40:02 2005
@@ -24,7 +24,7 @@
round-filled-box
text
url-link
- utf8-string
+ utf-8-string
white-dot
white-text
embedded-ps
Index: lilypond/scm/output-gnome.scm
diff -u lilypond/scm/output-gnome.scm:1.95 lilypond/scm/output-gnome.scm:1.96
--- lilypond/scm/output-gnome.scm:1.95 Wed Jul 13 14:13:23 2005
+++ lilypond/scm/output-gnome.scm Wed Jul 13 14:40:03 2005
@@ -100,7 +100,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; 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 @@
(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 @@
#: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 @@
#: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
Index: lilypond/scm/output-ps.scm
diff -u lilypond/scm/output-ps.scm:1.147 lilypond/scm/output-ps.scm:1.148
--- lilypond/scm/output-ps.scm:1.147 Wed Jul 13 14:13:23 2005
+++ lilypond/scm/output-ps.scm Wed Jul 13 14:40:03 2005
@@ -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")))
Index: lilypond/scm/output-socket.scm
diff -u lilypond/scm/output-socket.scm:1.3 lilypond/scm/output-socket.scm:1.4
--- lilypond/scm/output-socket.scm:1.3 Wed Jul 13 14:13:23 2005
+++ lilypond/scm/output-socket.scm Wed Jul 13 14:40:03 2005
@@ -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)))
+
Index: lilypond/scm/output-svg.scm
diff -u lilypond/scm/output-svg.scm:1.33 lilypond/scm/output-svg.scm:1.34
--- lilypond/scm/output-svg.scm:1.33 Wed Jul 13 14:13:23 2005
+++ lilypond/scm/output-svg.scm Wed Jul 13 14:40:03 2005
@@ -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))))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
