diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-10 10:27:09 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-10 10:27:09 +0000 |
commit | 5e8e9500102800e68c9e7fcac9e85c1668b71a36 (patch) | |
tree | 81d79ac70ffbb127e8063f18c8f55475ca169ee1 /Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h | |
parent | e6a9c88ada2f11dd61e4c4e39dff84944bed5787 (diff) |
towards TL2010: texk/web2c
git-svn-id: svn://tug.org/texlive/trunk@15964 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h')
-rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h b/Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h index 26c8fde63ad..5af9b4f5948 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h +++ b/Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h @@ -33,11 +33,16 @@ authorization from the copyright holders. #ifndef __XeTeXOTLayoutEngine_h #define __XeTeXOTLayoutEngine_h -#include "OpenTypeLayoutEngine.h" -#include "ArabicLayoutEngine.h" -#include "IndicLayoutEngine.h" -#include "HanLayoutEngine.h" -#include "TibetanLayoutEngine.h" +#include "layout/OpenTypeLayoutEngine.h" + +#include "unicode/uversion.h" +#define U_ICU_VERSION_CODE (U_ICU_VERSION_MAJOR_NUM*10+U_ICU_VERSION_MINOR_NUM) +/* ICU-4.2 added 'success' as last parameter to LayoutEngine constructors. */ +#if U_ICU_VERSION_CODE >= 42 +#define XeTeX_success , success +#else +#define XeTeX_success +#endif #include "XeTeXFontInst.h" @@ -48,7 +53,11 @@ public: const GlyphSubstitutionTableHeader* gsubTable, const GlyphPositioningTableHeader* gposTable, const LETag* addFeatures, const le_int32* addParams, - const LETag* removeFeatures); + const LETag* removeFeatures +#if U_ICU_VERSION_CODE >= 42 + , LEErrorCode &success +#endif + ); virtual ~XeTeXOTLayoutEngine(); @@ -70,20 +79,5 @@ protected: private: }; -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 UClassID getDynamicClassID() const; - static UClassID getStaticClassID(); -}; - #endif |