From: handa <handa>
Date: Thu, 5 Nov 2009 03:42:19 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: merge-to-XML~44
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d080a4c3479b442c88503c64d783bd17fe3d4bf;p=m17n%2Fm17n-lib.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index d14cb15..a55fd53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-05  Kenichi Handa  <handa@m17n.org>
+
+	* configure.ac: Check if the OTF library has OTF_drive_gpos2 ().
+
 2009-10-05  Kenichi Handa  <handa@m17n.org>
 
 	* configure.ac: Version changed to 1.6.0.
diff --git a/src/ChangeLog b/src/ChangeLog
index d7c848d..e44ae54 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-05  Kenichi Handa  <handa@m17n.org>
+
+	* m17n-flt.c (run_otf): Fix updating of g->lbearing, etc.
+
+	* font-ft.c (ft_drive_otf): Use OTF_drive_gpos2 if possible.
+
 2009-10-28  Kenichi Handa  <handa@m17n.org>
 
 	* fontset.c (mdebug_flag): New variable.
diff --git a/src/m17n-flt.c b/src/m17n-flt.c
index 306233e..2f1c008 100644
--- a/src/m17n-flt.c
+++ b/src/m17n-flt.c
@@ -1840,6 +1840,10 @@ run_otf (int depth,
 
 			g->xoff = a->xoff;
 			g->yoff = a->yoff;
+			g->lbearing += a->xoff;
+			g->rbearing += a->xoff;
+			g->ascent -= a->yoff;
+			g->descent -= a->yoff;
 			while (aa->back > 0)
 			  {
 			    for (j = 0; j < aa->back;