diff options
Diffstat (limited to 'Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h')
| -rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h b/Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h index 48f48e58abb..2800ab21b76 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h +++ b/Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h @@ -1,6 +1,6 @@ /****************************************************************************\ Part of the XeTeX typesetting system - copyright (c) 1994-2006 by SIL International + copyright (c) 1994-2007 by SIL International written by Jonathan Kew Permission is hereby granted, free of charge, to any person obtaining @@ -43,6 +43,7 @@ class XeTeXOTLayoutEngine : public OpenTypeLayoutEngine public: XeTeXOTLayoutEngine(const LEFontInstance* fontInstance, LETag scriptTag, LETag languageTag, const GlyphSubstitutionTableHeader* gsubTable, + const GlyphPositioningTableHeader* gposTable, const LETag* addFeatures, const le_int32* addParams, const LETag* removeFeatures); @@ -50,8 +51,8 @@ public: virtual void adjustFeatures(const LETag* addTags, const le_int32* addParams, const LETag* removeTags); - virtual inline UClassID getDynamicClassID() const { return getStaticClassID(); } - static inline UClassID getStaticClassID() { return (UClassID)&fgClassID; } + virtual UClassID getDynamicClassID() const; + static UClassID getStaticClassID(); static LayoutEngine* LayoutEngineFactory (const XeTeXFontInst* fontInstance, @@ -61,11 +62,9 @@ public: LEErrorCode &success); protected: - const LETag* fDefaultFeatures; + const FeatureMap* fDefaultFeatureMap; private: - static const char fgClassID; - }; class XeTeXHanLayoutEngine : public XeTeXOTLayoutEngine @@ -73,16 +72,14 @@ class XeTeXHanLayoutEngine : public XeTeXOTLayoutEngine public: XeTeXHanLayoutEngine(const XeTeXFontInst *fontInstance, LETag scriptTag, LETag languageTag, const GlyphSubstitutionTableHeader *gsubTable, + const GlyphPositioningTableHeader* gposTable, const LETag* addFeatures, const le_int32* addParams, const LETag* removeFeatures); virtual ~XeTeXHanLayoutEngine(); - virtual inline UClassID getDynamicClassID() const { return getStaticClassID(); } - static inline UClassID getStaticClassID() { return (UClassID)&fgClassID; } - -private: - static const char fgClassID; + virtual UClassID getDynamicClassID() const; + static UClassID getStaticClassID(); }; #endif |