geometry.width into glyph-string too.
+2005-11-27 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ * lily/pango-font.cc (pango_item_string_stencil): put
+ geometry.width into glyph-string too.
+
2005-11-26 Nicolas Sceaux <nicolas.sceaux@free.fr>
* scm/define-music-display-methods.scm (RevertProperty):
else
char_id = scm_makfrom0str (glyph_name);
- *tail = scm_cons (scm_list_3 (scm_from_double (ggeo.x_offset * scale_),
+ *tail = scm_cons (scm_list_4 (scm_from_double (ggeo.width * scale_),
+ scm_from_double (ggeo.x_offset * scale_),
scm_from_double (ggeo.y_offset * scale_),
+
char_id),
SCM_EOL);
tail = SCM_CDRLOC (*tail);
;; FIXME: the framework-gnome backend needs to see every item that
;; gets created. All items created here must should be put in a group
;; that gets returned.
-(define (glyph-string font postscript-font-name x-y-named-glyphs)
+(define (glyph-string font postscript-font-name w-x-y-named-glyphs)
(for-each
(lambda (x)
;; UGR, glyph names not found
(stderr "GLYPH:~S\n" (caddr x))
(stderr "ID:~S\n" (ly:font-glyph-name-to-charcode font (caddr x)))
- (placebox (car x) (cadr x)
+ (placebox (cadr x) (caddr x)
(make <gnome-canvas-text>
#:parent (canvas-root)
;;#:x 0.0 #:y (if (music-font? font) 0.15 0.69)
#:size-set #t
#:text
(integer->utf-8-string
- (ly:font-glyph-name-to-charcode font (caddr x))))))
- x-y-named-glyphs))
+ (ly:font-glyph-name-to-charcode font (cadddr x))))))
+ w-x-y-named-glyphs))
(define (grob-cause offset grob)
grob)
(define (glyph-string
postscript-font-name
size cid?
- x-y-named-glyphs)
+ w-x-y-named-glyphs)
(format #f "gsave 1 output-scale div 1 output-scale div scale
/~a ~a ~a scalefont setfont\n~a grestore"
string-append
(map (lambda (item)
(let*
- ((x (car item))
- (y (cadr item))
- (g (caddr item))
+ ((w (car item))
+ (x (cadr item))
+ (y (caddr item))
+ (g (cadddr item))
(prefix (if (string? g) "/" "")))
(if (and (= 0.0 x)
(= 0.0 y))
- (format #f " ~a~a glyphshow\n" prefix g)
+; (format #f " ~a~a glyphshow\n" prefix g)
+ (format #f " gsave ~a~a glyphshow grestore ~a 0 rmoveto \n" prefix g w)
(format #f " ~a ~a rmoveto ~a~a glyphshow\n"
x y
prefix
g))))
- x-y-named-glyphs))))
+ w-x-y-named-glyphs))))
(define (grob-cause offset grob)
(let* ((cause (ly:grob-property grob 'cause))