diff options
Diffstat (limited to 'Build/source/texk/web2c/xetexdir/XeTeXFontMgr.h')
-rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeXFontMgr.h | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.h b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.h index 8dcc2b962d8..358d540ad0b 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.h +++ b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.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 @@ -64,14 +64,14 @@ public: PlatformFontRef findFont(const char* name, char* variant, double ptSize); // 1st arg is name as specified by user (C string, UTF-8) - // 2nd is /B/I/AAT/ICU[/USP]/S=## qualifiers + // 2nd is /B/I/AAT/OTF/ICU[/GR]/S=## qualifiers // 1. try name given as "full name" // 2. if there's a hyphen, split and try "family-style" // 3. try as PostScript name // 4. try name as family with "Regular/Plain/Normal" style // apply style qualifiers and optical sizing if present - // SIDE EFFECT: sets sReqEngine to 'A' or 'I' [or 'U'] if appropriate, + // SIDE EFFECT: sets sReqEngine to 'A' or 'O' [or 'G'] if appropriate, // else clears it to 0 // SIDE EFFECT: updates TeX variables /nameoffile/ and /namelength/, @@ -89,7 +89,10 @@ public: double getDesignSize(XeTeXFont font); - char getReqEngine() const; + char getReqEngine() const { return sReqEngine; }; + + void setReqEngine(char reqEngine) const { sReqEngine = reqEngine; }; + // return the requested rendering technology for the most recent findFont // or 0 if no specific technology was requested @@ -111,11 +114,11 @@ protected: class Family; struct OpSizeRec { - unsigned short designSize; - unsigned short subFamilyID; - unsigned short nameCode; - unsigned short minSize; - unsigned short maxSize; + unsigned int designSize; + unsigned int subFamilyID; + unsigned int nameCode; + unsigned int minSize; + unsigned int maxSize; }; class Font { @@ -189,7 +192,7 @@ protected: void prependToList(std::list<std::string>* list, const char* str); void addToMaps(PlatformFontRef platformFont, const NameCollection* names); - const OpSizeRec* getOpSizePtr(XeTeXFont font); + const OpSizeRec* getOpSize(XeTeXFont font); virtual void getOpSizeRecAndStyleFlags(Font* theFont); virtual void searchForHostPlatformFonts(const std::string& name) = 0; |