summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h')
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h36
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