# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1203559030 0
# Node ID a4c135399649cceafa2b860cf3a9a52f672a50eb
# Parent  9728b70117ff3069687fb18714cc6ce6f6f2a30f
(ps-mule-font-info-database-bdf): Use
ethio16f-uni.bdf for Ethiopic.
(ps-mule-plot-string): Ignore glyph-string based compositions.

diff -r 9728b70117ff -r a4c135399649 lisp/ps-mule.el
--- a/lisp/ps-mule.el	Wed Feb 20 23:42:25 2008 +0000
+++ b/lisp/ps-mule.el	Thu Feb 21 01:57:10 2008 +0000
@@ -276,7 +276,7 @@
     (indian-1-column
      (normal bdf ("ind1c24-mule.bdf" "mule-indian-1col-24.bdf")))
     (ethiopic
-     (normal bdf ("ethio24f-uni.bdf" "ethiomx24f-uni.bdf") unicode-bmp))
+     (normal bdf ("ethio16f-uni.bdf" "ethiomx24f-uni.bdf") unicode-bmp))
     (chinese-cns11643-3
      (normal bdf ("cns3-40.bdf" "cns-3-40.bdf")))
     (chinese-cns11643-4
@@ -661,7 +661,10 @@
   (let* ((average-width (ps-avg-char-width 'ps-font-for-text))
 	 (point (point))
 	 (composition (find-composition from to nil t))
-	 (stop (if composition (car composition) to))
+	 (stop (if (and composition
+			(not (vectorp (aref (nth 2 composition) 0))))
+		   (car composition)
+		 to))
 	 (ascii-or-latin-1 "[\000-\377]+")
 	 (run-width 0)
 	 (endpos nil)