ICU-491.11.1.tar.gz

[apple/icu.git] / icuSources / layout / CursiveAttachmentSubtables.cpp

diff --git a/icuSources/layout/CursiveAttachmentSubtables.cpp b/icuSources/layout/CursiveAttachmentSubtables.cpp
index 3f4bf76673b20d2707de5641e2880ba35ecfb6e3..9d2144fcefad39321df64fc895b6401e29d1029e 100644 (file)
--- a/icuSources/layout/CursiveAttachmentSubtables.cpp
+++ b/icuSources/layout/CursiveAttachmentSubtables.cpp
@@ -1,18 +1,14 @@
 /*
- * %W% %E%
- *
- * (C) Copyright IBM Corp. 1998, 1999, 2000, 2001, 2002 - All Rights Reserved
+ * (C) Copyright IBM Corp. 1998 - 2007 - All Rights Reserved
  *
  */
 
 #include "LETypes.h"
-#include "LEFontInstance.h"
 #include "OpenTypeTables.h"
 #include "GlyphPositioningTables.h"
 #include "CursiveAttachmentSubtables.h"
 #include "AnchorTables.h"
 #include "GlyphIterator.h"
-#include "GlyphPositionAdjustments.h"
 #include "OpenTypeUtilities.h"
 #include "LESwaps.h"
 
@@ -25,72 +21,30 @@ le_uint32 CursiveAttachmentSubtable::process(GlyphIterator *glyphIterator, const
     le_uint16 eeCount       = SWAPW(entryExitCount);
 
     if (coverageIndex < 0 || coverageIndex >= eeCount) {
-        glyphIterator->resetCursiveLastExitPoint();
+        glyphIterator->setCursiveGlyph();
         return 0;
     }
 
-    LEPoint entryAnchor, exitAnchor, pixels;
-
-    if (glyphIterator->hasCursiveLastExitPoint() && entryExitRecords[coverageIndex].entryAnchor != 0) {
-        Offset entryOffset = SWAPW(entryExitRecords[coverageIndex].entryAnchor);
+    LEPoint entryAnchor, exitAnchor;
+    Offset entryOffset = SWAPW(entryExitRecords[coverageIndex].entryAnchor);
+    Offset exitOffset  = SWAPW(entryExitRecords[coverageIndex].exitAnchor);
 
+    if (entryOffset != 0) {
         const AnchorTable *entryAnchorTable = (const AnchorTable *) ((char *) this + entryOffset);
 
         entryAnchorTable->getAnchor(glyphID, fontInstance, entryAnchor);
-        glyphIterator->getCursiveLastExitPoint(exitAnchor);
-
-        float anchorDiffX        = exitAnchor.fX - entryAnchor.fX;
-        float anchorDiffY        = exitAnchor.fY - entryAnchor.fY;
-        float baselineAdjustment = glyphIterator->getCursiveBaselineAdjustment();
-
-        if (glyphIterator->isRightToLeft()) {
-            LEPoint secondAdvance;
-
-            fontInstance->getGlyphAdvance(glyphID, pixels);
-            fontInstance->pixelsToUnits(pixels, secondAdvance);
-
-            glyphIterator->adjustCurrGlyphPositionAdjustment(0, anchorDiffY + baselineAdjustment, -(anchorDiffX + secondAdvance.fX), 0);
-        } else {
-            LEPoint firstAdvance;
-
-            fontInstance->getGlyphAdvance(glyphIterator->getCursiveLastGlyphID(), pixels);
-            fontInstance->pixelsToUnits(pixels, firstAdvance);
-
-            glyphIterator->adjustCursiveLastGlyphPositionAdjustment(0, 0, anchorDiffX - firstAdvance.fX, 0);
-            glyphIterator->adjustCurrGlyphPositionAdjustment(0, anchorDiffY + baselineAdjustment, 0, 0);
-        }
-
-        glyphIterator->setCursiveBaselineAdjustment(anchorDiffY + baselineAdjustment);
+        glyphIterator->setCursiveEntryPoint(entryAnchor);
+    } else {
+        //glyphIterator->clearCursiveEntryPoint();
     }
 
-    Offset exitOffset = SWAPW(entryExitRecords[coverageIndex].exitAnchor);
-
     if (exitOffset != 0) {
         const AnchorTable *exitAnchorTable = (const AnchorTable *) ((char *) this + exitOffset);
 
         exitAnchorTable->getAnchor(glyphID, fontInstance, exitAnchor);
-
-        if (!glyphIterator->hasCursiveFirstExitPoint()) {
-            glyphIterator->setCursiveFirstExitPoint();
-        }
-
-        glyphIterator->setCursiveLastExitPoint(exitAnchor);
+        glyphIterator->setCursiveExitPoint(exitAnchor);
     } else {
-        /*
-         * We've got a glyph which is covered but doesn't have an
-         * exit point. We call setCursiveLastExitPoint just to set
-         * the position of this glyph, then resetCursiveLastExitPoint
-         * to do any baseline adjustments that are required for the
-         * sequence of attached glyphs.
-         *
-         * NOTE: we don't really care about the value of
-         * extiAnchor, because after we reset the last exit
-         * point, it won't be used. This is a bit of a hack.
-         * There should probably be a setCursiveLastExitPoint
-         * call that doesn't take an anchor...
-         */
-        glyphIterator->setCursiveLastExitPoint(exitAnchor);
-        glyphIterator->resetCursiveLastExitPoint();
+        //glyphIterator->clearCursiveExitPoint();
     }
 
     return 1;