Index: src/sfnt/SkIBMFamilyClass.h |
diff --git a/src/sfnt/SkIBMFamilyClass.h b/src/sfnt/SkIBMFamilyClass.h |
index 1572011215836e3643c968058f1314780d81aa44..190952b084310d3b9712017d1bf74dabd6b4e676 100644 |
--- a/src/sfnt/SkIBMFamilyClass.h |
+++ b/src/sfnt/SkIBMFamilyClass.h |
@@ -9,159 +9,147 @@ |
#define SkIBMFamilyClass_DEFINED |
#include "SkOTTableTypes.h" |
-#include "SkTypedEnum.h" |
#pragma pack(push, 1) |
struct SkIBMFamilyClass { |
- SK_TYPED_ENUM(Class, SK_OT_BYTE, |
- ((NoClassification, 0)) |
- ((OldstyleSerifs, 1)) |
- ((TransitionalSerifs, 2)) |
- ((ModernSerifs, 3)) |
- ((ClarendonSerifs, 4)) |
- ((SlabSerifs, 5)) |
+ enum Class : SK_OT_BYTE { |
+ NoClassification = 0, |
+ OldstyleSerifs = 1, |
+ TransitionalSerifs = 2, |
+ ModernSerifs = 3, |
+ ClarendonSerifs = 4, |
+ SlabSerifs = 5, |
//6 reserved for future use |
- ((FreeformSerifs, 7)) |
- ((SansSerif, 8)) |
- ((Ornamentals, 9)) |
- ((Scripts, 10)) |
+ FreeformSerifs = 7, |
+ SansSerif = 8, |
+ Ornamentals = 9, |
+ Scripts = 10, |
//11 reserved for future use |
- ((Symbolic, 12)) |
+ Symbolic = 12, |
//13-15 reserved for future use |
- SK_SEQ_END, |
- (familyClass)SK_SEQ_END) |
+ } familyClass; |
union SubClass { |
struct OldstyleSerifs { |
- SK_TYPED_ENUM(Value, SK_OT_BYTE, |
- ((NoClassification, 0)) |
- ((IBMRoundedLegibility, 1)) |
- ((Garalde, 2)) |
- ((Venetian, 3)) |
- ((ModifiedVenetian, 4)) |
- ((DutchModern, 5)) |
- ((DutchTraditional, 6)) |
- ((Contemporary, 7)) |
- ((Calligraphic, 8)) |
+ enum Value : SK_OT_BYTE { |
+ NoClassification = 0, |
+ IBMRoundedLegibility = 1, |
+ Garalde = 2, |
+ Venetian = 3, |
+ ModifiedVenetian = 4, |
+ DutchModern = 5, |
+ DutchTraditional = 6, |
+ Contemporary = 7, |
+ Calligraphic = 8, |
//9-14 reserved for future use |
- ((Miscellaneous, 15)) |
- SK_SEQ_END, |
- (value)SK_SEQ_END) |
+ Miscellaneous = 15, |
+ } value; |
} oldstyleSerifs; |
struct TransitionalSerifs { |
- SK_TYPED_ENUM(Value, SK_OT_BYTE, |
- ((NoClassification, 0)) |
- ((DirectLine, 1)) |
- ((Script, 2)) |
+ enum Value : SK_OT_BYTE { |
+ NoClassification = 0, |
+ DirectLine = 1, |
+ Script = 2, |
//3-14 reserved for future use |
- ((Miscellaneous, 15)) |
- SK_SEQ_END, |
- (value)SK_SEQ_END) |
+ Miscellaneous = 15, |
+ } value; |
} transitionalSerifs; |
struct ModernSerifs { |
- SK_TYPED_ENUM(Value, SK_OT_BYTE, |
- ((NoClassification, 0)) |
- ((Italian, 1)) |
- ((Script, 2)) |
+ enum Value : SK_OT_BYTE { |
+ NoClassification = 0, |
+ Italian = 1, |
+ Script = 2, |
//3-14 reserved for future use |
- ((Miscellaneous, 15)) |
- SK_SEQ_END, |
- (value)SK_SEQ_END) |
+ Miscellaneous = 15, |
+ } value; |
} modernSerifs; |
struct ClarendonSerifs { |
- SK_TYPED_ENUM(Value, SK_OT_BYTE, |
- ((NoClassification, 0)) |
- ((Clarendon, 1)) |
- ((Modern, 2)) |
- ((Traditional, 3)) |
- ((Newspaper, 4)) |
- ((StubSerif, 5)) |
- ((Monotone, 6)) |
- ((Typewriter, 7)) |
+ enum Value : SK_OT_BYTE { |
+ NoClassification = 0, |
+ Clarendon = 1, |
+ Modern = 2, |
+ Traditional = 3, |
+ Newspaper = 4, |
+ StubSerif = 5, |
+ Monotone = 6, |
+ Typewriter = 7, |
//8-14 reserved for future use |
- ((Miscellaneous, 15)) |
- SK_SEQ_END, |
- (value)SK_SEQ_END) |
+ Miscellaneous = 15, |
+ } value; |
} clarendonSerifs; |
struct SlabSerifs { |
- SK_TYPED_ENUM(Value, SK_OT_BYTE, |
- ((NoClassification, 0)) |
- ((Monotone, 1)) |
- ((Humanist, 2)) |
- ((Geometric, 3)) |
- ((Swiss, 4)) |
- ((Typewriter, 5)) |
+ enum Value : SK_OT_BYTE { |
+ NoClassification = 0, |
+ Monotone = 1, |
+ Humanist = 2, |
+ Geometric = 3, |
+ Swiss = 4, |
+ Typewriter = 5, |
//6-14 reserved for future use |
- ((Miscellaneous, 15)) |
- SK_SEQ_END, |
- (value)SK_SEQ_END) |
+ Miscellaneous = 15, |
+ } value; |
} slabSerifs; |
struct FreeformSerifs { |
- SK_TYPED_ENUM(Value, SK_OT_BYTE, |
- ((NoClassification, 0)) |
- ((Modern, 1)) |
+ enum Value : SK_OT_BYTE { |
+ NoClassification = 0, |
+ Modern = 1, |
//2-14 reserved for future use |
- ((Miscellaneous, 15)) |
- SK_SEQ_END, |
- (value)SK_SEQ_END) |
+ Miscellaneous = 15, |
+ } value; |
} freeformSerifs; |
struct SansSerif { |
- SK_TYPED_ENUM(Value, SK_OT_BYTE, |
- ((NoClassification, 0)) |
- ((IBMNeoGrotesqueGothic, 1)) |
- ((Humanist, 2)) |
- ((LowXRoundGeometric, 3)) |
- ((HighXRoundGeometric, 4)) |
- ((NeoGrotesqueGothic, 5)) |
- ((ModifiedNeoGrotesqueGothic, 6)) |
+ enum Value : SK_OT_BYTE { |
+ NoClassification = 0, |
+ IBMNeoGrotesqueGothic = 1, |
+ Humanist = 2, |
+ LowXRoundGeometric = 3, |
+ HighXRoundGeometric = 4, |
+ NeoGrotesqueGothic = 5, |
+ ModifiedNeoGrotesqueGothic = 6, |
//7-8 reserved for future use |
- ((TypewriterGothic, 9)) |
- ((Matrix, 10)) |
+ TypewriterGothic = 9, |
+ Matrix = 10, |
//11-14 reserved for future use |
- ((Miscellaneous, 15)) |
- SK_SEQ_END, |
- (value)SK_SEQ_END) |
+ Miscellaneous = 15, |
+ } value; |
} sansSerif; |
struct Ornamentals { |
- SK_TYPED_ENUM(Value, SK_OT_BYTE, |
- ((NoClassification, 0)) |
- ((Engraver, 1)) |
- ((BlackLetter, 2)) |
- ((Decorative, 3)) |
- ((ThreeDimensional, 4)) |
+ enum Value : SK_OT_BYTE { |
+ NoClassification = 0, |
+ Engraver = 1, |
+ BlackLetter = 2, |
+ Decorative = 3, |
+ ThreeDimensional = 4, |
//5-14 reserved for future use |
- ((Miscellaneous, 15)) |
- SK_SEQ_END, |
- (value)SK_SEQ_END) |
+ Miscellaneous = 15, |
+ } value; |
} ornamentals; |
struct Scripts { |
- SK_TYPED_ENUM(Value, SK_OT_BYTE, |
- ((NoClassification, 0)) |
- ((Uncial, 1)) |
- ((Brush_Joined, 2)) |
- ((Formal_Joined, 3)) |
- ((Monotone_Joined, 4)) |
- ((Calligraphic, 5)) |
- ((Brush_Unjoined, 6)) |
- ((Formal_Unjoined, 7)) |
- ((Monotone_Unjoined, 8)) |
+ enum Value : SK_OT_BYTE { |
+ NoClassification = 0, |
+ Uncial = 1, |
+ Brush_Joined = 2, |
+ Formal_Joined = 3, |
+ Monotone_Joined = 4, |
+ Calligraphic = 5, |
+ Brush_Unjoined = 6, |
+ Formal_Unjoined = 7, |
+ Monotone_Unjoined = 8, |
//9-14 reserved for future use |
- ((Miscellaneous, 15)) |
- SK_SEQ_END, |
- (value)SK_SEQ_END) |
+ Miscellaneous = 15, |
+ } value; |
} scripts; |
struct Symbolic { |
- SK_TYPED_ENUM(Value, SK_OT_BYTE, |
- ((NoClassification, 0)) |
+ enum Value : SK_OT_BYTE { |
+ NoClassification = 0, |
//1-2 reserved for future use |
- ((MixedSerif, 3)) |
+ MixedSerif = 3, |
//4-5 reserved for future use |
- ((OldstyleSerif, 6)) |
- ((NeoGrotesqueSansSerif, 7)) |
+ OldstyleSerif = 6, |
+ NeoGrotesqueSansSerif = 7, |
//8-14 reserved for future use |
- ((Miscellaneous, 15)) |
- SK_SEQ_END, |
- (value)SK_SEQ_END) |
+ Miscellaneous = 15, |
+ } value; |
} symbolic; |
} familySubClass; |
}; |