aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2008-09-05 07:36:53 +0000
committerKenichi Handa2008-09-05 07:36:53 +0000
commite271d38e798f286de8d7cb6a566bcad008052f19 (patch)
tree2a38419eb3de33803b85d1cf7d8c87c68bbc8b0d
parent7042033274974c8494bdd8104e54127fc3a3357b (diff)
downloademacs-e271d38e798f286de8d7cb6a566bcad008052f19.tar.gz
emacs-e271d38e798f286de8d7cb6a566bcad008052f19.zip
(compose-gstring-for-graphic): Fix handling "above" marks.
-rw-r--r--lisp/composite.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/composite.el b/lisp/composite.el
index c47ee190319..a86b3147023 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -599,13 +599,13 @@ All non-spacing characters has this function in
599 (setq xoff (- rbearing lb))) 599 (setq xoff (- rbearing lb)))
600 ((= class 212) 600 ((= class 212)
601 (setq xoff (- lbearing ce) 601 (setq xoff (- lbearing ce)
602 yoff (if (>= de 0) 0 (- ascent de)))) 602 yoff (if (>= de 0) 0 (- ascent (- de)))))
603 ((= class 214) 603 ((= class 214)
604 (setq xoff (- center ce) 604 (setq xoff (- center ce)
605 yoff (if (>= de 0) 0 (- ascent de)))) 605 yoff (if (>= de 0) 0 (- ascent (- de)))))
606 ((= class 216) 606 ((= class 216)
607 (setq xoff (- rbearing ce) 607 (setq xoff (- rbearing ce)
608 yoff (if (>= de 0) 0 (- ascent de)))) 608 yoff (if (>= de 0) 0 (- ascent (- de)))))
609 ((= class 218) 609 ((= class 218)
610 (setq xoff (- lbearing ce) 610 (setq xoff (- lbearing ce)
611 yoff (if (> as 0) 0 (+ descent as gap)))) 611 yoff (if (> as 0) 0 (+ descent as gap))))
@@ -621,13 +621,13 @@ All non-spacing characters has this function in
621 (setq xoff (- rbearing lb))) 621 (setq xoff (- rbearing lb)))
622 ((= class 228) 622 ((= class 228)
623 (setq xoff (- lbearing ce) 623 (setq xoff (- lbearing ce)
624 yoff (if (>= de 0) 0 (- ascent de gap)))) 624 yoff (if (>= de 0) 0 (- ascent (- de) gap))))
625 ((= class 230) 625 ((= class 230)
626 (setq xoff (- center ce) 626 (setq xoff (- center ce)
627 yoff (if (>= de 0) 0 (- ascent de gap)))) 627 yoff (if (>= de 0) 0 (- ascent (- de) gap))))
628 ((= class 232) 628 ((= class 232)
629 (setq xoff (- rbearing ce) 629 (setq xoff (- rbearing ce)
630 yoff (if (>= de 0) 0 (- ascent de gap)))))) 630 yoff (if (>= de 0) 0 (- ascent (- de) gap))))))
631 (lglyph-set-adjustment glyph (- xoff width) yoff)))))) 631 (lglyph-set-adjustment glyph (- xoff width) yoff))))))
632 (let ((i 0)) 632 (let ((i 0))
633 (while (and (< i nglyphs) (setq glyph (lgstring-glyph gstring i))) 633 (while (and (< i nglyphs) (setq glyph (lgstring-glyph gstring i)))