Index: core/fxge/include/fx_font.h |
diff --git a/core/fxge/include/fx_font.h b/core/fxge/include/fx_font.h |
index 00c9d6f55970cd233461e0a08068a54fe964e7b8..58d12bbb2afc5ebb44b1e7a5cf83db5710b8fed2 100644 |
--- a/core/fxge/include/fx_font.h |
+++ b/core/fxge/include/fx_font.h |
@@ -29,22 +29,12 @@ class SkTypeface; |
using CFX_TypeFace = SkTypeface; |
#endif |
-#define FXFONT_FIXED_PITCH 0x01 |
-#define FXFONT_SERIF 0x02 |
-#define FXFONT_SYMBOLIC 0x04 |
-#define FXFONT_SCRIPT 0x08 |
-#define FXFONT_ITALIC 0x40 |
-#define FXFONT_BOLD 0x40000 |
-#define FXFONT_USEEXTERNATTR 0x80000 |
-#define FXFONT_CIDFONT 0x100000 |
-#ifdef PDF_ENABLE_XFA |
-#define FXFONT_EXACTMATCH 0x80000000 |
-#endif // PDF_ENABLE_XFA |
+/* Character sets for the font */ |
#define FXFONT_ANSI_CHARSET 0 |
#define FXFONT_DEFAULT_CHARSET 1 |
#define FXFONT_SYMBOL_CHARSET 2 |
#define FXFONT_SHIFTJIS_CHARSET 128 |
-#define FXFONT_HANGEUL_CHARSET 129 |
+#define FXFONT_HANGUL_CHARSET 129 |
#define FXFONT_GB2312_CHARSET 134 |
#define FXFONT_CHINESEBIG5_CHARSET 136 |
#define FXFONT_THAI_CHARSET 222 |
@@ -55,12 +45,31 @@ using CFX_TypeFace = SkTypeface; |
#define FXFONT_HEBREW_CHARSET 177 |
#define FXFONT_ARABIC_CHARSET 178 |
#define FXFONT_BALTIC_CHARSET 186 |
+#define FXFONT_JOHAB_CHARSET 130 |
+#define FXFONT_VIETNAMESE_CHARSET 163 |
+ |
+/* Font pitch and family flags */ |
#define FXFONT_FF_FIXEDPITCH 1 |
#define FXFONT_FF_ROMAN (1 << 4) |
#define FXFONT_FF_SCRIPT (4 << 4) |
+ |
+/* Typical weight values */ |
#define FXFONT_FW_NORMAL 400 |
#define FXFONT_FW_BOLD 700 |
+/* Font styles */ |
+#define FXFONT_FIXED_PITCH 0x01 |
+#define FXFONT_SERIF 0x02 |
+#define FXFONT_SYMBOLIC 0x04 |
+#define FXFONT_SCRIPT 0x08 |
+#define FXFONT_ITALIC 0x40 |
+#define FXFONT_BOLD 0x40000 |
+#define FXFONT_USEEXTERNATTR 0x80000 |
+#define FXFONT_CIDFONT 0x100000 |
+#ifdef PDF_ENABLE_XFA |
+#define FXFONT_EXACTMATCH 0x80000000 |
+#endif // PDF_ENABLE_XFA |
+ |
#define CHARSET_FLAG_ANSI 1 |
#define CHARSET_FLAG_SYMBOL 2 |
#define CHARSET_FLAG_SHIFTJIS 4 |