ICU-551.30.tar.gz

[apple/icu.git] / icuSources / layout / HanLayoutEngine.h

diff --git a/icuSources/layout/HanLayoutEngine.h b/icuSources/layout/HanLayoutEngine.h
index c89c1ae79f181caf6073697d5831ee4743dce22f..3a4f5a600cb8eb89bb25bd083ec2d110debfef9e 100644 (file)
--- a/icuSources/layout/HanLayoutEngine.h
+++ b/icuSources/layout/HanLayoutEngine.h
@@ -2,9 +2,7 @@
 /*
  * HanLayoutEngine.h: OpenType processing for Han fonts.
  *
 /*
  * HanLayoutEngine.h: OpenType processing for Han fonts.
  *

- * (C) Copyright IBM Corp. 1998-2003 - All Rights Reserved.
- *
- * $Source: /cvs/root/ICU/icuSources/layout/HanLayoutEngine.h,v $ $Date: 2003/07/03 18:13:45 $ $Revision: 1.1.1.1 $
+ * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved.

  */
 
 #ifndef __HANLAYOUTENGINE_H
  */
 
 #ifndef __HANLAYOUTENGINE_H


@@ -19,6 +17,8 @@
 
 U_NAMESPACE_BEGIN
 
 
 U_NAMESPACE_BEGIN
 

+class LEGlyphStorage;
+

 /**
  * This class implements OpenType layout for Han fonts. It overrides
  * the characerProcessing method to assign the correct OpenType feature
 /**
  * This class implements OpenType layout for Han fonts. It overrides
  * the characerProcessing method to assign the correct OpenType feature


@@ -39,6 +39,7 @@ public:
      * @param scriptCode - the script
      * @param langaugeCode - the language
      * @param gsubTable - the GSUB table
      * @param scriptCode - the script
      * @param langaugeCode - the language
      * @param gsubTable - the GSUB table

+     * @param success - set to an error code if the operation fails

      *
      * @see LayoutEngine::layoutEngineFactory
      * @see OpenTypeLayoutEngine
      *
      * @see LayoutEngine::layoutEngineFactory
      * @see OpenTypeLayoutEngine


@@ -47,7 +48,7 @@ public:
      * @internal
      */
     HanOpenTypeLayoutEngine(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode,
      * @internal
      */
     HanOpenTypeLayoutEngine(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode,

-                            const GlyphSubstitutionTableHeader *gsubTable);
+                            le_int32 typoFlags, const LEReferenceTo<GlyphSubstitutionTableHeader> &gsubTablem, LEErrorCode &success);

 
 
     /**
 
 
     /**


@@ -60,16 +61,16 @@ public:
     /**
      * ICU "poor man's RTTI", returns a UClassID for the actual class.
      *
     /**
      * ICU "poor man's RTTI", returns a UClassID for the actual class.
      *

-     * @draft ICU 2.2
+     * @deprecated ICU 54. See {@link icu::LayoutEngine}

      */
      */

-    virtual inline UClassID getDynamicClassID() const { return getStaticClassID(); }
+    virtual UClassID getDynamicClassID() const;

 
     /**
      * ICU "poor man's RTTI", returns a UClassID for this class.
      *
 
     /**
      * ICU "poor man's RTTI", returns a UClassID for this class.
      *

-     * @draft ICU 2.2
+     * @deprecated ICU 54. See {@link icu::LayoutEngine}

      */
      */

-    static inline UClassID getStaticClassID() { return (UClassID)&fgClassID; }
+    static UClassID getStaticClassID();

 
 protected:
 
 
 protected:
 


@@ -82,7 +83,8 @@ protected:
      * @param offset - the index of the first character to process
      * @param count - the number of characters to process
      * @param max - the number of characters in the input context
      * @param offset - the index of the first character to process
      * @param count - the number of characters to process
      * @param max - the number of characters in the input context

-     * @param rightToLeft - true if the characters are in a right to left directional run
+     * @param rightToLeft - <code>TRUE</code> if the characters are in a right to left directional run
+     * @param glyphStorage - the object holding the glyph storage. The char index and auxillary data arrays will be set.

      *
      * Output parameters:
      * @param outChars - the output character arrayt
      *
      * Output parameters:
      * @param outChars - the output character arrayt


@@ -95,16 +97,8 @@ protected:
      * @internal
      */
     virtual le_int32 characterProcessing(const LEUnicode chars[], le_int32 offset, le_int32 count, le_int32 max, le_bool rightToLeft,
      * @internal
      */
     virtual le_int32 characterProcessing(const LEUnicode chars[], le_int32 offset, le_int32 count, le_int32 max, le_bool rightToLeft,

-            LEUnicode *&outChars, le_int32 *&charIndices, const LETag **&featureTags, LEErrorCode &success);
-
+            LEUnicode *&outChars, LEGlyphStorage &glyphStorage, LEErrorCode &success);

 
 

-private:
-
-    /**
-     * The address of this static class variable serves as this class's ID
-     * for ICU "poor man's RTTI".
-     */
-    static const char fgClassID;

 };
 
 U_NAMESPACE_END
 };
 
 U_NAMESPACE_END