*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index 82d997a..3c9a155 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-05  Kenichi Handa  <handa@m17n.org>
+
+       * font-ft.c (mfont__ft_drive_otf): Fix sign of g->yoff.
+
 2004-08-04  Kenichi Handa  <handa@m17n.org>
 
        * font-ft.c (mfont__ft_drive_otf): Call OTF_drive_gdef.

diff --git a/src/font-ft.c b/src/font-ft.c
index d8713d8..a16914d 100644 (file)
--- a/src/font-ft.c
+++ b/src/font-ft.c
@@ -1058,9 +1058,9 @@ mfont__ft_drive_otf (MGlyphString *gstring, int from, int to,
                if (format & OTF_XPlaDevice)
                  g->xoff += DEVICE_DELTA (otfg->f.f1.value->XPlaDevice, size);
                if (format & OTF_YPlacement)
-                 g->yoff = otfg->f.f1.value->YPlacement * size10 / u / 10;
+                 g->yoff = - (otfg->f.f1.value->YPlacement * size10 / u / 10);
                if (format & OTF_YPlaDevice)
-                 g->yoff += DEVICE_DELTA (otfg->f.f1.value->YPlaDevice, size);
+                 g->yoff -= DEVICE_DELTA (otfg->f.f1.value->YPlaDevice, size);
                if (format & OTF_XAdvance)
                  g->width += otfg->f.f1.value->XAdvance * size10 / u / 10;
                if (format & OTF_XAdvDevice)
@@ -1088,7 +1088,7 @@ mfont__ft_drive_otf (MGlyphString *gstring, int from, int to,
                  adjust_anchor (otfg->f.f4.mark_anchor, ft_info->ft_face,
                                 g->code, size, &mark_x, &mark_y);
                g->xoff = (base_x - prev->width) - mark_x;
-               g->yoff = base_y - mark_y;
+               g->yoff = mark_y - base_y;
                g->combining_code = MAKE_COMBINING_CODE_BY_CLASS (0);
              }
              break;