summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/xetexdir/XeTeXFontInst_Mac.h
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2013-01-03 09:48:54 +0000
committerKhaled Hosny <khaledhosny@eglug.org>2013-01-03 09:48:54 +0000
commitce108d3fea94e3b9cce73edd5dca42aec928dfc2 (patch)
tree5f90a5e009540b82464314bb0fabc8e2891fd1bc /Build/source/texk/web2c/xetexdir/XeTeXFontInst_Mac.h
parent4ed655f2e4116814f3b386f8861fc1bec1e37d51 (diff)
Merge in new XeTeX stuff
git-svn-id: svn://tug.org/texlive/trunk@28710 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/xetexdir/XeTeXFontInst_Mac.h')
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeXFontInst_Mac.h26
1 files changed, 17 insertions, 9 deletions
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontInst_Mac.h b/Build/source/texk/web2c/xetexdir/XeTeXFontInst_Mac.h
index 5d26d417e35..e3ab7bce439 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXFontInst_Mac.h
+++ b/Build/source/texk/web2c/xetexdir/XeTeXFontInst_Mac.h
@@ -1,9 +1,9 @@
/****************************************************************************\
Part of the XeTeX typesetting system
- copyright (c) 1994-2008 by SIL International
- copyright (c) 2009 by Jonathan Kew
+ Copyright (c) 1994-2008 by SIL International
+ Copyright (c) 2009 by Jonathan Kew
- Written by Jonathan Kew
+ SIL Author(s): Jonathan Kew
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -48,22 +48,30 @@ authorization from the copyright holders.
class XeTeXFontInst_Mac : public XeTeXFontInst
{
protected:
- const void *readTable(LETag tag, le_uint32 *length) const;
+ const void *readTable(OTTag tag, uint32_t *length) const;
ATSFontRef fFontRef;
ATSUStyle fStyle;
+ int fFirstCharCode;
+ int fLastCharCode;
+
public:
- XeTeXFontInst_Mac(ATSFontRef atsFont, float pointSize, LEErrorCode &status);
+ XeTeXFontInst_Mac(ATSFontRef atsFont, float pointSize, int &status);
virtual ~XeTeXFontInst_Mac();
- virtual void initialize(LEErrorCode &status);
+ virtual void initialize(int &status);
- virtual void getGlyphBounds(LEGlyphID gid, GlyphBBox* bbox);
+ virtual void getGlyphBounds(GlyphID gid, GlyphBBox* bbox);
+
+ virtual GlyphID mapCharToGlyph(UChar32 ch) const;
+ virtual GlyphID mapGlyphToIndex(const char* glyphName) const;
+
+ virtual const char* getGlyphName(GlyphID gid, int& nameLen);
- virtual LEGlyphID mapGlyphToIndex(const char* glyphName) const;
- virtual const char* getGlyphName(LEGlyphID gid, int& nameLen);
+ virtual UChar32 getFirstCharCode();
+ virtual UChar32 getLastCharCode();
};
#endif