modify google bug 61311 for messageBox;

61750 for dateField input "aaa" not dislpay;
update font map;

6 files changed, 203 insertions, 172 deletions

diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h
index a3c3a73e68..53c26166b4 100644
--- a/xfa/include/fxfa/fxfa.h
+++ b/xfa/include/fxfa/fxfa.h
@@ -144,6 +144,7 @@ typedef struct _XFA_HWIDGET {
 #define XFA_IDS_ValidateNullError				96

 #define XFA_IDS_ValidateWarning					97

 #define XFA_IDS_ValidateError					98

+#define XFA_IDS_ValidateNumberError				99

 class IXFA_AppProvider

 {

 public:

diff --git a/xfa/src/fgas/src/localization/fx_locale.cpp b/xfa/src/fgas/src/localization/fx_locale.cpp
index a932a6c1a3..f086cbd9ca 100644
--- a/xfa/src/fgas/src/localization/fx_locale.cpp
+++ b/xfa/src/fgas/src/localization/fx_locale.cpp
@@ -2505,6 +2505,9 @@ static FX_BOOL FX_ParseLocaleDate(const CFX_WideString& wsDate, const CFX_WideSt
             cc += 2;

         }

     }

+    if (cc < len) {

+        return FALSE;

+    }

     CFX_Unitime ut;

     ut.Set(year, month, day);

     datetime = datetime + ut;

diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
index a046f25611..b2e5299478 100644
--- a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
@@ -179,8 +179,27 @@ FX_BOOL	CXFA_FFTextEdit::CommitData()
         m_pDataAcc->UpdateUIDisplay(this);

         return TRUE;

     }

+    ValidateNumberField(wsText);

     return FALSE;

 }

+void CXFA_FFTextEdit::ValidateNumberField(const CFX_WideString& wsText)

+{

+    CXFA_WidgetAcc* pAcc = this->GetDataAcc();

+    if (pAcc && pAcc->GetUIType() == XFA_ELEMENT_NumericEdit) {

+        IXFA_AppProvider* pAppProvider = GetApp()->GetAppProvider();

+        if (pAppProvider) {

+            CFX_WideString wsTitle;

+            pAppProvider->LoadString(XFA_IDS_AppName, wsTitle);

+            CFX_WideString wsMessage;

+            CFX_WideString wsError;

+            pAppProvider->LoadString(XFA_IDS_ValidateNumberError, wsError);

+            CFX_WideString wsSomField;

+            pAcc->GetNode()->GetSOMExpression(wsSomField);

+            wsMessage.Format(wsError, (FX_LPCWSTR)wsText, (FX_LPCWSTR)wsSomField);

+            pAppProvider->MsgBox(wsMessage, wsTitle, XFA_MBICON_Error, XFA_MB_OK);

+        }

+    }

+}

 FX_BOOL CXFA_FFTextEdit::IsDataChanged()

 {

     return (m_dwStatus & XFA_WIDGETSTATUS_TextEditValueChanged) != 0;

diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.h b/xfa/src/fxfa/src/app/xfa_fftextedit.h
index a6c2b507c9..ecfe3bda83 100644
--- a/xfa/src/fxfa/src/app/xfa_fftextedit.h
+++ b/xfa/src/fxfa/src/app/xfa_fftextedit.h
@@ -39,6 +39,7 @@ protected:
     virtual FX_BOOL	CommitData();

     virtual FX_BOOL	UpdateFWLData();

     virtual FX_BOOL IsDataChanged();

+    void			ValidateNumberField(const CFX_WideString& wsText);

     IFWL_WidgetDelegate*	m_pOldDelegate;

 public:

     void	OnTextChanged(IFWL_Widget *pWidget, const CFX_WideString &wsChanged, const CFX_WideString &wsPrevText);

diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
index f3e4fff810..f1e0a8afba 100644
--- a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
@@ -248,242 +248,242 @@ static const XFA_FONTINFO g_XFAFontsMap[] = {
 };

 #elif _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_

 static const XFA_FONTINFO g_XFAFontsMap[] = {

-    {0x01d5d33e,	(FX_LPCWSTR)L"SimSun",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,AR PL UMing CN,AR PL UMing HK,AR PL UMing TW,AR PL UMing TW MBE,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	936},

-    {0x01e4f102,	(FX_LPCWSTR)L"YouYuan",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,AR PL UMing CN,AR PL UMing HK,AR PL UMing TW,AR PL UMing TW MBE,WenQuanYi Zen Hei Sharp,WenQuanYi Zen Hei,WenQuanYi Micro Hei",	1,	936},

+    {0x01d5d33e,	(FX_LPCWSTR)L"SimSun",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,AR PL UMing CN,AR PL UMing HK,AR PL UMing TW,AR PL UMing TW MBE",	0,	936},

+    {0x01e4f102,	(FX_LPCWSTR)L"YouYuan",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,AR PL UMing CN,AR PL UMing HK,AR PL UMing TW,AR PL UMing TW MBE",	1,	936},

     {0x030549dc,	(FX_LPCWSTR)L"LiSu",	(FX_LPCWSTR)L"WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Zen Hei Mono,WenQuanYi Micro Hei",	1,	936},

     {0x032edd44,	(FX_LPCWSTR)L"Simhei",	(FX_LPCWSTR)L"WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Zen Hei Mono,WenQuanYi Micro Hei",	1,	936},

-    {0x03eac6fc,	(FX_LPCWSTR)L"PoorRichard-Regular",	(FX_LPCWSTR)L"FreeSerif",	2,	1252},

+    {0x03eac6fc,	(FX_LPCWSTR)L"PoorRichard-Regular",	(FX_LPCWSTR)L"Droid Sans Japanese,FreeSerif",	2,	1252},

     {0x03ed90e6,	(FX_LPCWSTR)L"Nina",	(FX_LPCWSTR)L"FreeSerif",	0,	1252},

-    {0x077b56b3,	(FX_LPCWSTR)L"KingsoftPhoneticPlain",	(FX_LPCWSTR)L"utkal,Kedage,Mallige,Kedage,AR PL UKai CN,AR PL UKai HK",	0,	1252},

-    {0x078ed524,	(FX_LPCWSTR)L"MicrosoftSansSerif",	(FX_LPCWSTR)L"FreeSerif,WenQuanYi Micro Hei",	0,	1252},

-    {0x089b18a9,	(FX_LPCWSTR)L"Arial",	(FX_LPCWSTR)L"DejaVu Sans Condensed,FreeSerif,WenQuanYi Micro Hei",	0,	1252},

-    {0x0b2cad72,	(FX_LPCWSTR)L"MonotypeCorsiva",	(FX_LPCWSTR)L"FreeSerif",	8,	1252},

-    {0x0bb003e7,	(FX_LPCWSTR)L"Kartika",	(FX_LPCWSTR)L"FreeSans,Liberation Sans,Nimbus Sans L,Garuda,FreeSerif,WenQuanYi Micro Hei",	2,	1252},

-    {0x0bb469df,	(FX_LPCWSTR)L"VinerHandITC",	(FX_LPCWSTR)L"Ubuntu,Liberation Sans,Liberation Serif",	8,	1252},

-    {0x0bc1a851,	(FX_LPCWSTR)L"SegoeUI",	(FX_LPCWSTR)L"DejaVu Sans",	0,	1252},

+    {0x077b56b3,	(FX_LPCWSTR)L"KingsoftPhoneticPlain",	(FX_LPCWSTR)L"Tibetan Machine Uni,LKLUG,Samyak Gujarati,Droid Sans Thai,Droid Sans Armenian,Untitled1,utkal,Lohit Oriya",	0,	1252},

+    {0x078ed524,	(FX_LPCWSTR)L"MicrosoftSansSerif",	(FX_LPCWSTR)L"Droid Sans Japanese,FreeSerif,WenQuanYi Micro Hei",	0,	1252},

+    {0x089b18a9,	(FX_LPCWSTR)L"Arial",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Sans Condensed,FreeSerif,WenQuanYi Micro Hei",	0,	1252},

+    {0x0b2cad72,	(FX_LPCWSTR)L"MonotypeCorsiva",	(FX_LPCWSTR)L"Droid Sans Japanese,FreeSerif",	8,	1252},

+    {0x0bb003e7,	(FX_LPCWSTR)L"Kartika",	(FX_LPCWSTR)L"FreeSans,Liberation Sans,Liberation Sans Narrow,Nimbus Sans L,Garuda,FreeSerif,WenQuanYi Micro Hei",	2,	1252},

+    {0x0bb469df,	(FX_LPCWSTR)L"VinerHandITC",	(FX_LPCWSTR)L"Droid Sans Japanese,Ubuntu,Liberation Sans,Liberation Serif",	8,	1252},

+    {0x0bc1a851,	(FX_LPCWSTR)L"SegoeUI",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Sans",	0,	1252},

     {0x0c112ebd,	(FX_LPCWSTR)L"KozukaGothicPro-VIM",	(FX_LPCWSTR)L"FreeSerif",	0,	1252},

-    {0x0cfcb9c1,	(FX_LPCWSTR)L"AdobeThai",	(FX_LPCWSTR)L" Waree",	0,	847},

-    {0x0e7de0f9,	(FX_LPCWSTR)L"Playbill",	(FX_LPCWSTR)L"FreeSerif",	0,	1252},

+    {0x0cfcb9c1,	(FX_LPCWSTR)L"AdobeThai",	(FX_LPCWSTR)L"Droid Sans Japanese,Waree",	0,	847},

+    {0x0e7de0f9,	(FX_LPCWSTR)L"Playbill",	(FX_LPCWSTR)L"KacstQurn,Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,Droid Sans Ethiopic,Droid Sans Japanese,FreeSerif",	0,	1252},

     {0x0eff47c3,	(FX_LPCWSTR)L"STHupo",	(FX_LPCWSTR)L"AR PL UKai HK,AR PL UMing HK,AR PL UKai CN",	0,	936},

-    {0x107ad374,	(FX_LPCWSTR)L"Constantia",	(FX_LPCWSTR)L"FreeSerif,WenQuanYi Micro Hei,Ubuntu",	2,	1252},

-    {0x12194c2d,	(FX_LPCWSTR)L"KunstlerScript",	(FX_LPCWSTR)L"Liberation Serif",	8,	1252},

+    {0x107ad374,	(FX_LPCWSTR)L"Constantia",	(FX_LPCWSTR)L"Droid Sans Japanese,FreeSerif,WenQuanYi Micro Hei,Ubuntu",	2,	1252},

+    {0x12194c2d,	(FX_LPCWSTR)L"KunstlerScript",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Serif",	8,	1252},

     {0x135ef6a1,	(FX_LPCWSTR)L"MinionProSmBd",	(FX_LPCWSTR)L"Liberation Serif",	0,	1252},

-    {0x158c4049,	(FX_LPCWSTR)L"Garamond",	(FX_LPCWSTR)L"Liberation Serif,Ubuntu,FreeSerif",	2,	1252},

+    {0x158c4049,	(FX_LPCWSTR)L"Garamond",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Serif,Ubuntu,FreeSerif",	2,	1252},

     {0x160ecb24,	(FX_LPCWSTR)L"STZhongsong",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	936},

-    {0x161ed07e,	(FX_LPCWSTR)L"MSGothic",	(FX_LPCWSTR)L"WenQuanYi Micro Hei Mono,WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp",	1,	1252},

-    {0x171d1ed1,	(FX_LPCWSTR)L"SnapITC-Regular",	(FX_LPCWSTR)L"Nimbus Sans L,DejaVu Sans",	0,	1252},

-    {0x18d1188f,	(FX_LPCWSTR)L"Cambria",	(FX_LPCWSTR)L"FreeSerif,FreeMono",	2,	1252},

+    {0x161ed07e,	(FX_LPCWSTR)L"MSGothic",	(FX_LPCWSTR)L"WenQuanYi Micro Hei Mono,WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,AR PL UMing CN,AR PL UMing HK,AR PL UMing TW",	1,	1252},

+    {0x171d1ed1,	(FX_LPCWSTR)L"SnapITC-Regular",	(FX_LPCWSTR)L"Liberation Sans Narrow,Ubuntu Condensed,Nimbus Sans L,DejaVu Sans",	0,	1252},

+    {0x18d1188f,	(FX_LPCWSTR)L"Cambria",	(FX_LPCWSTR)L"Droid Sans Japanese,FreeSerif,FreeMono",	2,	1252},

     {0x18eaf350,	(FX_LPCWSTR)L"ArialUnicodeMS",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	936},

     {0x1a92d115,	(FX_LPCWSTR)L"MingLiU",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	1,	1252},

-    {0x1cc217c6,	(FX_LPCWSTR)L"TrebuchetMS",	(FX_LPCWSTR)L"Liberation Serif,FreeSerif,Ubuntu",	0,	1252},

-    {0x1d649596,	(FX_LPCWSTR)L"BasemicTimes",	(FX_LPCWSTR)L"Liberation Serif,FreeSerif,Ubuntu",	0,	1252},

-    {0x1e34ee60,	(FX_LPCWSTR)L"BellMT",	(FX_LPCWSTR)L"Ubuntu,Liberation Serif",	2,	1252},

-    {0x1eb36945,	(FX_LPCWSTR)L"CooperBlack",	(FX_LPCWSTR)L"FreeMono,Liberation Mono, WenQuanYi Micro Hei Mono",	2,	1252},

-    {0x1ef7787d,	(FX_LPCWSTR)L"BatangChe",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	1,	1252},

-    {0x20b3bd3a,	(FX_LPCWSTR)L"BrushScriptMT",	(FX_LPCWSTR)L"URW Chancery L,Liberation Sans",	8,	1252},

-    {0x220877aa,	(FX_LPCWSTR)L"Candara",	(FX_LPCWSTR)L"DejaVu Sans",	0,	1252},

-    {0x22135007,	(FX_LPCWSTR)L"FreestyleScript-Regular",	(FX_LPCWSTR)L"Liberation Sans",	8,	1252},

-    {0x251059c3,	(FX_LPCWSTR)L"Chiller",	(FX_LPCWSTR)L"Liberation Sans",	0,	1252},

-    {0x25bed6dd,	(FX_LPCWSTR)L"MSReferenceSansSerif",	(FX_LPCWSTR)L"DejaVu Sans Condensed,AR PL UKai HK",	0,	1252},

-    {0x28154c81,	(FX_LPCWSTR)L"Parchment-Regular",	(FX_LPCWSTR)L"Liberation Sans",	8,	1252},

+    {0x1cc217c6,	(FX_LPCWSTR)L"TrebuchetMS",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Serif,FreeSerif,Ubuntu",	0,	1252},

+    {0x1d649596,	(FX_LPCWSTR)L"BasemicTimes",	(FX_LPCWSTR)L"Liberation Serif,Times New Roman,Droid Sans Japanese,FreeSerif,Ubuntu",	0,	1252},

+    {0x1e34ee60,	(FX_LPCWSTR)L"BellMT",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,Ubuntu,Liberation Serif",	2,	1252},

+    {0x1eb36945,	(FX_LPCWSTR)L"CooperBlack",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,FreeMono,Liberation Mono, WenQuanYi Micro Hei Mono",	2,	1252},

+    {0x1ef7787d,	(FX_LPCWSTR)L"BatangChe",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,AR PL UMing CN,AR PL UMing HK,AR PL UMing TW,WenQuanYi Zen Hei,WenQuanYi Micro Hei",	1,	1252},

+    {0x20b3bd3a,	(FX_LPCWSTR)L"BrushScriptMT",	(FX_LPCWSTR)L"KacstQurn,Droid Arabic Naskh,Droid Sans Ethiopic,Droid Sans Japanese,URW Chancery L,Liberation Sans",	8,	1252},

+    {0x220877aa,	(FX_LPCWSTR)L"Candara",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Sans",	0,	1252},

+    {0x22135007,	(FX_LPCWSTR)L"FreestyleScript-Regular",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,Liberation Sans",	8,	1252},

+    {0x251059c3,	(FX_LPCWSTR)L"Chiller",	(FX_LPCWSTR)L"KacstQurn,Droid Arabic Naskh,Droid Sans Ethiopic,Droid Sans Japanese,Liberation Sans",	0,	1252},

+    {0x25bed6dd,	(FX_LPCWSTR)L"MSReferenceSansSerif",	(FX_LPCWSTR)L"DejaVu Sans Condensed,Ubuntu Condensed,Droid Sans Japanese,AR PL UKai HK",	0,	1252},

+    {0x28154c81,	(FX_LPCWSTR)L"Parchment-Regular",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Sans",	8,	1252},

     {0x29711eb9,	(FX_LPCWSTR)L"STLiti",	(FX_LPCWSTR)L"AR PL UKai HK",	0,	936},

-    {0x2b1993b4,	(FX_LPCWSTR)L"Basemic",	(FX_LPCWSTR)L"Liberation Sans",	0,	1252},

-    {0x2b316339,	(FX_LPCWSTR)L"NiagaraSolid-Reg",	(FX_LPCWSTR)L"Liberation Sans",	0,	1252},

-    {0x2c147529,	(FX_LPCWSTR)L"FootlightMTLight",	(FX_LPCWSTR)L"Liberation Sans",	0,	1252},

-    {0x2c198928,	(FX_LPCWSTR)L"HarlowSolid",	(FX_LPCWSTR)L"Liberation Sans",	0,	1252},

-    {0x2c6ac6b2,	(FX_LPCWSTR)L"LucidaBright",	(FX_LPCWSTR)L"Liberation Sans",	2,	1252},

+    {0x2b1993b4,	(FX_LPCWSTR)L"Basemic",	(FX_LPCWSTR)L"Liberation Serif,Droid Sans Japanese,Liberation Sans",	0,	1252},

+    {0x2b316339,	(FX_LPCWSTR)L"NiagaraSolid-Reg",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Sans",	0,	1252},

+    {0x2c147529,	(FX_LPCWSTR)L"FootlightMTLight",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,Liberation Sans",	0,	1252},

+    {0x2c198928,	(FX_LPCWSTR)L"HarlowSolid",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,Liberation Sans",	0,	1252},

+    {0x2c6ac6b2,	(FX_LPCWSTR)L"LucidaBright",	(FX_LPCWSTR)L"KacstQurn,Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,Droid Sans Japanese,Liberation Sans",	2,	1252},

     {0x2c9f38e2,	(FX_LPCWSTR)L"KozukaMinchoPro-VIR",	(FX_LPCWSTR)L"DejaVu Sans",	0,	1252},

     {0x2d5a47b0,	(FX_LPCWSTR)L"STCaiyun",	(FX_LPCWSTR)L"AR PL UKai HK",	0,	936},

-    {0x2def26bf,	(FX_LPCWSTR)L"BernardMT-Condensed",	(FX_LPCWSTR)L"DejaVu Serif",	0,	1252},

+    {0x2def26bf,	(FX_LPCWSTR)L"BernardMT-Condensed",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,DejaVu Serif",	0,	1252},

     {0x2fd8930b,	(FX_LPCWSTR)L"KozukaMinchoPr6NR",	(FX_LPCWSTR)L"DejaVu Serif",	0,	1252},

     {0x3115525a,	(FX_LPCWSTR)L"FangSong_GB2312",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	1252},

-    {0x31327817,	(FX_LPCWSTR)L"MyriadPro",	(FX_LPCWSTR)L"FreeSerif",	0,	1252},

-    {0x32244975,    (FX_LPCWSTR)L"Helvetica", (FX_LPCWSTR)L"Ubuntu,DejaVu Sans Condensed,Liberation Sans",	 0,   1252},

+    {0x31327817,	(FX_LPCWSTR)L"MyriadPro",	(FX_LPCWSTR)L"Droid Sans Japanese,FreeSerif",	0,	1252},

+    {0x32244975,    (FX_LPCWSTR)L"Helvetica", (FX_LPCWSTR)L"Ubuntu,DejaVu Sans Condensed,Liberation Sans,Liberation Sans Narrow,Nimbus Sans L",	 0,   1252},

     {0x32ac995c,	(FX_LPCWSTR)L"Terminal",	(FX_LPCWSTR)L"DejaVu Serif",	0,	1252},

-    {0x338d648a,	(FX_LPCWSTR)L"NiagaraEngraved-Reg",	(FX_LPCWSTR)L"DejaVu Serif",	0,	1252},

-    {0x33bb65f2,	(FX_LPCWSTR)L"Sylfaen",	(FX_LPCWSTR)L"DejaVu Sans",	2,	1252},

-    {0x3402c30e,	(FX_LPCWSTR)L"MSPMincho",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	2,	1252},

-    {0x3412bf31,	(FX_LPCWSTR)L"SimSun-PUA",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	936},

-    {0x36eb39b9,	(FX_LPCWSTR)L"BerlinSansFB",	(FX_LPCWSTR)L"Liberation Serif,Ubuntu,FreeSerif",	0,	1252},

+    {0x338d648a,	(FX_LPCWSTR)L"NiagaraEngraved-Reg",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Serif",	0,	1252},

+    {0x33bb65f2,	(FX_LPCWSTR)L"Sylfaen",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Sans",	2,	1252},

+    {0x3402c30e,	(FX_LPCWSTR)L"MSPMincho",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,AR PL UMing CN,AR PL UMing HK,AR PL UMing TW",	2,	1252},

+    {0x3412bf31,	(FX_LPCWSTR)L"SimSun-PUA",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,AR PL UMing CN,AR PL UMing CN,AR PL UMing HK",	0,	936},

+    {0x36eb39b9,	(FX_LPCWSTR)L"BerlinSansFB",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Serif,Ubuntu,FreeSerif",	0,	1252},

     {0x36f42055,	(FX_LPCWSTR)L"UniversATT",	(FX_LPCWSTR)L"Microsoft Sans Serif",	0,	1252},

-    {0x3864c4f6,	(FX_LPCWSTR)L"HighTowerText",	(FX_LPCWSTR)L"DejaVu Serif",	2,	1252},

-    {0x3a257d03,	(FX_LPCWSTR)L"FangSong_GB2312",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	1252},

-    {0x3c7d1d07,	(FX_LPCWSTR)L"Garamond3LTStd",  (FX_LPCWSTR)L"Ubuntu Condensed,DejaVu Sans Condensed,Liberation Serif,Ubuntu,FreeSerif",	2,	1252},

-    {0x3cdae668,	(FX_LPCWSTR)L"FreestyleScript",	(FX_LPCWSTR)L"DejaVu Sans",	8,	1252},

-    {0x3d55aed7,	(FX_LPCWSTR)L"Jokerman",	(FX_LPCWSTR)L"DejaVu Sans",	0,	1252},

+    {0x3864c4f6,	(FX_LPCWSTR)L"HighTowerText",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Serif",	2,	1252},

+    {0x3a257d03,	(FX_LPCWSTR)L"FangSong_GB2312",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei",	0,	1252},

+    {0x3c7d1d07,	(FX_LPCWSTR)L"Garamond3LTStd",  (FX_LPCWSTR)L"Droid Sans Japanese,Ubuntu Condensed,DejaVu Sans Condensed,Liberation Serif,Ubuntu,FreeSerif",	2,	1252},

+    {0x3cdae668,	(FX_LPCWSTR)L"FreestyleScript",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,DejaVu Sans",	8,	1252},

+    {0x3d55aed7,	(FX_LPCWSTR)L"Jokerman",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Sans",	0,	1252},

     {0x3d5b4385,	(FX_LPCWSTR)L"PMingLiU",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	2,	1252},

-    {0x3d9b7669,	(FX_LPCWSTR)L"EstrangeloEdessa",	(FX_LPCWSTR)L"DejaVu Sans",	0,	1252},

-    {0x3e532d74,	(FX_LPCWSTR)L"FranklinGothicMedium",	(FX_LPCWSTR)L"Ubuntu",	0,	1252},

+    {0x3d9b7669,	(FX_LPCWSTR)L"EstrangeloEdessa",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Sans",	0,	1252},

+    {0x3e532d74,	(FX_LPCWSTR)L"FranklinGothicMedium",	(FX_LPCWSTR)L"Droid Sans Japanese,Ubuntu",	0,	1252},

     {0x3e6aa32d,	(FX_LPCWSTR)L"NSimSun",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	1,	936},

-    {0x3f6c36a8,	(FX_LPCWSTR)L"Gautami",	(FX_LPCWSTR)L"FreeSans",	0,	1252},

-    {0x3ff32662,	(FX_LPCWSTR)L"Chiller-Regular",	(FX_LPCWSTR)L"FreeSans",	0,	1252},

-    {0x409de312,	(FX_LPCWSTR)L"ModernNo.20",	(FX_LPCWSTR)L"Nimbus Sans L,Nimbus Sans L,FreeSans",	2,	1252},

-    {0x41443c5e,	(FX_LPCWSTR)L"Georgia",	(FX_LPCWSTR)L"FreeSans",	2,	1252},

+    {0x3f6c36a8,	(FX_LPCWSTR)L"Gautami",	(FX_LPCWSTR)L"Droid Arabic Naskh,Droid Sans Ethiopic, mry_KacstQurn,Droid Sans Japanese,FreeSans",	0,	1252},

+    {0x3ff32662,	(FX_LPCWSTR)L"Chiller-Regular",	(FX_LPCWSTR)L"KacstQurn,Droid Arabic Naskh,Droid Sans Ethiopic,FreeSans",	0,	1252},

+    {0x409de312,	(FX_LPCWSTR)L"ModernNo.20",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,Nimbus Sans L,Nimbus Sans L,FreeSans",	2,	1252},

+    {0x41443c5e,	(FX_LPCWSTR)L"Georgia",	(FX_LPCWSTR)L"Droid Sans Japanese,FreeSans",	2,	1252},

     {0x4160ade5,	(FX_LPCWSTR)L"BellGothicStdBlack",	(FX_LPCWSTR)L"FreeSans",	0,	1252},

     {0x421976c4,	(FX_LPCWSTR)L"Modern-Regular",	(FX_LPCWSTR)L"FreeSans",	2,	1252},

-    {0x422a7252,	(FX_LPCWSTR)L"Stencil",	(FX_LPCWSTR)L"FreeSans,Liberation Sans",	0,	1252},

+    {0x422a7252,	(FX_LPCWSTR)L"Stencil",	(FX_LPCWSTR)L"Droid Sans Japanese,FreeSans,Liberation Sans",	0,	1252},

     {0x42c8554f,	(FX_LPCWSTR)L"Fixedsys",	(FX_LPCWSTR)L"FreeSerif",	0,	1252},

     {0x435cb41d,	(FX_LPCWSTR)L"Roman",	(FX_LPCWSTR)L"FreeSerif",	0,	1252},

     {0x47882383,	(FX_LPCWSTR)L"CourierNew",	(FX_LPCWSTR)L"FreeMono,WenQuanYi Micro Hei Mono,AR PL UKai CN,AR PL UKai HK,AR PL UKai TW,AR PL UKai TW MBE,DejaVu Sans",	1,	1252},

-    {0x480a2338,	(FX_LPCWSTR)L"BerlinSansFBDemi",	(FX_LPCWSTR)L" Liberation Serif",	0,	1252},

+    {0x480a2338,	(FX_LPCWSTR)L"BerlinSansFBDemi",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Serif",	0,	1252},

     {0x480bf7a4,	(FX_LPCWSTR)L"CourierStd",	(FX_LPCWSTR)L"DejaVu Sans",	0,	1252},

-    {0x481ad6ed,	(FX_LPCWSTR)L"VladimirScript",	(FX_LPCWSTR)L"DejaVu Serif",	8,	1252},

-    {0x4911577a,	(FX_LPCWSTR)L"YouYuan",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	1,	936},

+    {0x481ad6ed,	(FX_LPCWSTR)L"VladimirScript",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Serif",	8,	1252},

+    {0x4911577a,	(FX_LPCWSTR)L"YouYuan",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,AR PL UMing CN,AR PL UMing HK,AR PL UMing TW",	1,	936},

     {0x4a788d72,	(FX_LPCWSTR)L"STXingkai",	(FX_LPCWSTR)L"AR PL UKai HK,AR PL UMing HK,AR PL UKai CN",	0,	936},

     {0x4bf88566,	(FX_LPCWSTR)L"SegoeCondensed",	(FX_LPCWSTR)L"FreeSerif",	0,	1252},

-    {0x4ccf51a4,	(FX_LPCWSTR)L"BerlinSansFB-Reg",	(FX_LPCWSTR)L"Liberation Serif",	0,	1252},

-    {0x4ea967ce,	(FX_LPCWSTR)L"GulimChe",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,AR PL UKai CN,AR PL UKai HK,AR PL UKai TW,AR PL UKai TW MBE,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	1,	1252},

-    {0x4f68bd79,	(FX_LPCWSTR)L"LetterGothicStd",	(FX_LPCWSTR)L"FreeMono,Liberation Mono,WenQuanYi Micro Hei Mono,WenQuanYi Zen Hei Mono,AR PL UKai CN,AR PL UKai HK,AR PL UKai TW,AR PL UKai TW MBE",	0,	1252},

+    {0x4ccf51a4,	(FX_LPCWSTR)L"BerlinSansFB-Reg",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Serif",	0,	1252},

+    {0x4ea967ce,	(FX_LPCWSTR)L"GulimChe",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,AR PL UKai CN,AR PL UKai HK,AR PL UKai TW,AR PL UKai TW MBE",	1,	1252},

+    {0x4f68bd79,	(FX_LPCWSTR)L"LetterGothicStd",	(FX_LPCWSTR)L"FreeMono,Liberation Mono,Andale Mono,WenQuanYi Micro Hei Mono",	0,	1252},

     {0x51a0d0e6,	(FX_LPCWSTR)L"KozukaGothicPr6NM",	(FX_LPCWSTR)L"FreeSerif",	0,	1252},

     {0x531b3dea,	(FX_LPCWSTR)L"BasemicSymbol",	(FX_LPCWSTR)L"FreeSerif",	0,	1252},

-    {0x5333fd39,	(FX_LPCWSTR)L"CalifornianFB-Reg",	(FX_LPCWSTR)L"URW Chancery L,FreeSerif",	2,	1252},

+    {0x5333fd39,	(FX_LPCWSTR)L"CalifornianFB-Reg",	(FX_LPCWSTR)L"Droid Sans Japanese,URW Chancery L,FreeSerif",	2,	1252},

     {0x53561a54,	(FX_LPCWSTR)L"FZYTK--GBK1-0",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	936},

-    {0x55e0dde6,	(FX_LPCWSTR)L"LucidaSansTypewriter",	(FX_LPCWSTR)L"DejaVu Sans Mono,Nimbus Mono L,Liberation Mono,Courier 10 Pitch,FreeMono",	0,	1252},

-    {0x574d4d3d,	(FX_LPCWSTR)L"AdobeArabic",	(FX_LPCWSTR)L"DejaVu Sans",	0,	1252},

+    {0x55e0dde6,	(FX_LPCWSTR)L"LucidaSansTypewriter",	(FX_LPCWSTR)L"Ubuntu Mono,DejaVu Sans Mono,Nimbus Mono L,Liberation Mono,Courier 10 Pitch,FreeMono",	0,	1252},

+    {0x574d4d3d,	(FX_LPCWSTR)L"AdobeArabic",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Sans",	0,	1252},

     {0x5792e759,	(FX_LPCWSTR)L"STKaiti",	(FX_LPCWSTR)L"WenQuanYi Micro Hei Mono",	0,	936},

-    {0x5921978e,	(FX_LPCWSTR)L"LucidaSansUnicode",	(FX_LPCWSTR)L"DejaVu Sans",	0,	1252},

-    {0x594e2da4,	(FX_LPCWSTR)L"Vrinda",	(FX_LPCWSTR)L"FreeSans,FreeSerif",	0,	1252},

+    {0x5921978e,	(FX_LPCWSTR)L"LucidaSansUnicode",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Sans",	0,	1252},

+    {0x594e2da4,	(FX_LPCWSTR)L"Vrinda",	(FX_LPCWSTR)L"Droid Arabic Naskh,Droid Sans Ethiopic,Droid Arabic Naskh,mry_KacstQurn,Droid Sans Japanese,FreeSans,FreeSerif",	0,	1252},

     {0x59baa9a2,	(FX_LPCWSTR)L"KaiTi_GB2312",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	1252},

-    {0x5cfedf4f,	(FX_LPCWSTR)L"BaskOldFace",	(FX_LPCWSTR)L"Ubuntu,Liberation Serif",	0,	1252},

+    {0x5cfedf4f,	(FX_LPCWSTR)L"BaskOldFace",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,Ubuntu,Liberation Serif",	0,	1252},

     {0x5e16ac91,    (FX_LPCWSTR)L"TrajanPro",   (FX_LPCWSTR)L"Nimbus Sans L,AR PL UMing HK,AR PL UKai HK,AR PL UMing TW,AR PL UMing TW MBE,DejaVu Sans,DejaVu Serif",  0,  1252},

     {0x5f388196,    (FX_LPCWSTR)L"ITCLegacySansStdMedium",  (FX_LPCWSTR)L"Liberation Serif,FreeSerif,FreeSans,Ubuntu", 0, 1252},

     {0x5f97921c,	(FX_LPCWSTR)L"AdobeMyungjoStdM",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	936},

     {0x5fefbfad,	(FX_LPCWSTR)L"Batang",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	2,	1252},

-    {0x605342b9,	(FX_LPCWSTR)L"DotumChe",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,AR PL UKai CN,AR PL UKai HK,AR PL UKai TW,AR PL UKai TW MBE,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	1,	1252},

+    {0x605342b9,	(FX_LPCWSTR)L"DotumChe",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,AR PL UMing CN,AR PL UMing HK,AR PL UMing TW",	1,	1252},

     {0x608c5f9a,	(FX_LPCWSTR)L"KaiTi_GB2312",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	936},

-    {0x61efd0d1,	(FX_LPCWSTR)L"MaturaMTScriptCapitals",	(FX_LPCWSTR)L"DejaVu Serif,DejaVu Sans",	0,	1252},

-    {0x626608a9,	(FX_LPCWSTR)L"MVBoli",	(FX_LPCWSTR)L"DejaVu Sans",	0,	1252},

+    {0x61efd0d1,	(FX_LPCWSTR)L"MaturaMTScriptCapitals",	(FX_LPCWSTR)L"KacstQurn,Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,Droid Sans Japanese,DejaVu Serif,DejaVu Sans",	0,	1252},

+    {0x626608a9,	(FX_LPCWSTR)L"MVBoli",	(FX_LPCWSTR)L"Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,Droid Sans Ethiopic,Droid Sans Japanese,DejaVu Sans",	0,	1252},

     {0x630501a3,	(FX_LPCWSTR)L"SmallFonts",	(FX_LPCWSTR)L"DejaVu Serif",	0,	1252},

     {0x65d0e2a9,	(FX_LPCWSTR)L"FZYTK--GBK1-0",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	936},

     {0x669f29e1,	(FX_LPCWSTR)L"FZSTK--GBK1-0",	(FX_LPCWSTR)L"AR PL UMing CN,AR PL UKai CN, AR PL UMing HK",	0,	936},

-    {0x673a9e5f,	(FX_LPCWSTR)L"Tunga",	(FX_LPCWSTR)L"DejaVu Serif",	0,	1252},

-    {0x691aa4ce,	(FX_LPCWSTR)L"NiagaraSolid",	(FX_LPCWSTR)L"DejaVu Serif",	0,	1252},

-    {0x696259b7,	(FX_LPCWSTR)L"Corbel",	(FX_LPCWSTR)L"DejaVu Sans",	0,	1252},

+    {0x673a9e5f,	(FX_LPCWSTR)L"Tunga",	(FX_LPCWSTR)L"Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,Droid Sans Japanese,DejaVu Serif",	0,	1252},

+    {0x691aa4ce,	(FX_LPCWSTR)L"NiagaraSolid",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Serif",	0,	1252},

+    {0x696259b7,	(FX_LPCWSTR)L"Corbel",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Sans",	0,	1252},

     {0x696ee9be,	(FX_LPCWSTR)L"STXihei",	(FX_LPCWSTR)L"WenQuanYi Micro Hei Mono",	0,	936},

-    {0x6c59cf69,	(FX_LPCWSTR)L"Dotum",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	1252},

-    {0x707fa561,	(FX_LPCWSTR)L"Gungsuh",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	2,	1252},

-    {0x71416bb2,	(FX_LPCWSTR)L"ZWAdobeF",	(FX_LPCWSTR)L"Dingbats,FreeSerif",	0,	1252},

-    {0x71b41801,	(FX_LPCWSTR)L"Verdana",	(FX_LPCWSTR)L"DejaVu Sans Condensed,DejaVu Sans",	0,	1252},

-    {0x73f25e4c,	(FX_LPCWSTR)L"PalatinoLinotype",	(FX_LPCWSTR)L"FreeSerif",	0,	1252},

-    {0x73f4d19f,	(FX_LPCWSTR)L"NiagaraEngraved",	(FX_LPCWSTR)L"FreeSerif",	0,	1252},

-    {0x74001694,	(FX_LPCWSTR)L"MyriadProBlack",	(FX_LPCWSTR)L"AR PL UKai HK",	0,	1252},

-    {0x74b14d8f,	(FX_LPCWSTR)L"Haettenschweiler",	(FX_LPCWSTR)L"DejaVu Serif",	0,	1252},

-    {0x74cb44ee,	(FX_LPCWSTR)L"NSimSun",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	1,	936},

-    {0x76b4d7ff,	(FX_LPCWSTR)L"Shruti",	(FX_LPCWSTR)L"FreeSans",	0,	1252},

+    {0x6c59cf69,	(FX_LPCWSTR)L"Dotum",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono",	0,	1252},

+    {0x707fa561,	(FX_LPCWSTR)L"Gungsuh",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono",	2,	1252},

+    {0x71416bb2,	(FX_LPCWSTR)L"ZWAdobeF",	(FX_LPCWSTR)L"KacstArt,KacstBookm,KacstDecorative,KacstDigital,KacstFarsi,KacstLetter,KacstOffice,Dingbats,FreeSerif",	0,	1252},

+    {0x71b41801,	(FX_LPCWSTR)L"Verdana",	(FX_LPCWSTR)L"DejaVu Sans Condensed,Ubuntu Condensed,Droid Sans Japanese,DejaVu Sans",	0,	1252},

+    {0x73f25e4c,	(FX_LPCWSTR)L"PalatinoLinotype",	(FX_LPCWSTR)L"Droid Sans Japanese,FreeSerif",	0,	1252},

+    {0x73f4d19f,	(FX_LPCWSTR)L"NiagaraEngraved",	(FX_LPCWSTR)L"Droid Sans Japanese,FreeSerif",	0,	1252},

+    {0x74001694,	(FX_LPCWSTR)L"MyriadProBlack",	(FX_LPCWSTR)L"Droid Sans Japanese,AR PL UKai HK",	0,	1252},

+    {0x74b14d8f,	(FX_LPCWSTR)L"Haettenschweiler",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Serif",	0,	1252},

+    {0x74cb44ee,	(FX_LPCWSTR)L"NSimSun",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono",	1,	936},

+    {0x76b4d7ff,	(FX_LPCWSTR)L"Shruti",	(FX_LPCWSTR)L"Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,Droid Sans Japanese,FreeSans",	0,	1252},

     {0x788b3533,	(FX_LPCWSTR)L"Webdings",	(FX_LPCWSTR)L"FreeSans",	6,	42},

     {0x797dde99,	(FX_LPCWSTR)L"MSSerif",	(FX_LPCWSTR)L"FreeSans",	0,	1252},

-    {0x7a0f9e9e,	(FX_LPCWSTR)L"MSMincho",	(FX_LPCWSTR)L"WenQuanYi Micro Hei Mono",	1,	1252},

-    {0x7b439caf,	(FX_LPCWSTR)L"OldEnglishTextMT",	(FX_LPCWSTR)L"Liberation Sans,Ubuntu",	0,	1252},

-    {0x8213a433,	(FX_LPCWSTR)L"LucidaSans-Typewriter",	(FX_LPCWSTR)L"Liberation Mono",	0,	1252},

+    {0x7a0f9e9e,	(FX_LPCWSTR)L"MSMincho",	(FX_LPCWSTR)L"WenQuanYi Micro Hei Mono,AR PL UMing CN,AR PL UMing HK,AR PL UMing TW",	1,	1252},

+    {0x7b439caf,	(FX_LPCWSTR)L"OldEnglishTextMT",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Sans,Ubuntu",	0,	1252},

+    {0x8213a433,	(FX_LPCWSTR)L"LucidaSans-Typewriter",	(FX_LPCWSTR)L"Ubuntu Mono,Liberation Mono,DejaVu Sans Mono",	0,	1252},

     {0x82fec929,	(FX_LPCWSTR)L"AdobeSongStdL",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	936},

     {0x83581825,	(FX_LPCWSTR)L"Modern",	(FX_LPCWSTR)L"FreeSans",	0,	1252},

-    {0x835a2823,	(FX_LPCWSTR)L"Algerian",	(FX_LPCWSTR)L"FreeSans,Liberation Sans,Ubuntu",	0,	1252},

+    {0x835a2823,	(FX_LPCWSTR)L"Algerian",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,FreeSans,Liberation Sans,Ubuntu",	0,	1252},

     {0x83dab9f5,	(FX_LPCWSTR)L"Script",	(FX_LPCWSTR)L"FreeSans",	0,	1252},

-    {0x847b56da,	(FX_LPCWSTR)L"Tahoma",	(FX_LPCWSTR)L"DejaVu Sans Condensed,FreeSerif",	0,	1252},

+    {0x847b56da,	(FX_LPCWSTR)L"Tahoma",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Sans Condensed,FreeSerif",	0,	1252},

     {0x8a783cb2,	(FX_LPCWSTR)L"SimSun-PUA",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	1252},

-    {0x8b5cac0e,	(FX_LPCWSTR)L"Onyx",	(FX_LPCWSTR)L"Liberation Sans",	0,	1252},

+    {0x8b5cac0e,	(FX_LPCWSTR)L"Onyx",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Sans",	0,	1252},

     {0x8c6a499e,	(FX_LPCWSTR)L"Gulim",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	1252},

-    {0x8e0af790,	(FX_LPCWSTR)L"JuiceITC",	(FX_LPCWSTR)L"Liberation Sans",	0,	1252},

-    {0x8e8d43b2,	(FX_LPCWSTR)L"Centaur",	(FX_LPCWSTR)L"Khmer OS,Khmer OS System",	2,	1252},

+    {0x8e0af790,	(FX_LPCWSTR)L"JuiceITC",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Sans",	0,	1252},

+    {0x8e8d43b2,	(FX_LPCWSTR)L"Centaur",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,Khmer OS,Khmer OS System",	2,	1252},

     {0x8ee4dcca,	(FX_LPCWSTR)L"BookshelfSymbol7",	(FX_LPCWSTR)L"Liberation Sans",	0,	1252},

     {0x90794800,	(FX_LPCWSTR)L"BellGothicStdLight",	(FX_LPCWSTR)L"Liberation Sans",	0,	1252},

-    {0x909b516a,	(FX_LPCWSTR)L"Century",	(FX_LPCWSTR)L"Liberation Sans,Liberation Mono,Liberation Serif",	2,	1252},

+    {0x909b516a,	(FX_LPCWSTR)L"Century",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Sans,Liberation Mono,Liberation Serif",	2,	1252},

     {0x92ae370d,	(FX_LPCWSTR)L"MSOutlook",	(FX_LPCWSTR)L"Liberation Sans",	4,	42},

-    {0x93c9fbf1,	(FX_LPCWSTR)L"LucidaFax",	(FX_LPCWSTR)L"Liberation Sans",	2,	1252},

-    {0x9565085e,	(FX_LPCWSTR)L"BookAntiqua",	(FX_LPCWSTR)L"Liberation Sans,Liberation Serif",	2,	1252},

+    {0x93c9fbf1,	(FX_LPCWSTR)L"LucidaFax",	(FX_LPCWSTR)L"KacstQurn,Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,Liberation Sans",	2,	1252},

+    {0x9565085e,	(FX_LPCWSTR)L"BookAntiqua",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Sans,Liberation Serif",	2,	1252},

     {0x9856d95d,	(FX_LPCWSTR)L"AdobeMingStdL",	(FX_LPCWSTR)L"AR PL UMing HK",	0,	949},

-    {0x9bbadd6b,	(FX_LPCWSTR)L"ColonnaMT",	(FX_LPCWSTR)L"Khmer OS,Khmer OS System",	0,	1252},

-    {0x9cbd16a4,	(FX_LPCWSTR)L"ShowcardGothic-Reg",	(FX_LPCWSTR)L"Liberation Sans,Ubuntu",	0,	1252},

+    {0x9bbadd6b,	(FX_LPCWSTR)L"ColonnaMT",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,Khmer OS,Khmer OS System",	0,	1252},

+    {0x9cbd16a4,	(FX_LPCWSTR)L"ShowcardGothic-Reg",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Sans,Ubuntu",	0,	1252},

     {0x9d73008e,	(FX_LPCWSTR)L"MSSansSerif",	(FX_LPCWSTR)L"FreeSerif",	0,	1252},

     {0xa0607db1,	(FX_LPCWSTR)L"GungsuhChe",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	1,	1252},

     {0xa0bcf6a1,	(FX_LPCWSTR)L"LatinWide",	(FX_LPCWSTR)L"FreeSerif",	2,	1252},

     {0xa1429b36,	(FX_LPCWSTR)L"Symbol",	(FX_LPCWSTR)L"FreeSerif",	6,	42},

     {0xa1fa5abc,	(FX_LPCWSTR)L"Wingdings2",	(FX_LPCWSTR)L"FreeSerif",	6,	42},

     {0xa1fa5abd,	(FX_LPCWSTR)L"Wingdings3",	(FX_LPCWSTR)L"FreeSerif",	6,	42},

-    {0xa427bad4,	(FX_LPCWSTR)L"InformalRoman-Regular",	(FX_LPCWSTR)L"FreeSerif",	8,	1252},

+    {0xa427bad4,	(FX_LPCWSTR)L"InformalRoman-Regular",	(FX_LPCWSTR)L"Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,Droid Sans Japanese,FreeSerif",	8,	1252},

     {0xa8b92ece,	(FX_LPCWSTR)L"FZSTK--GBK1-0",	(FX_LPCWSTR)L"AR PL UMing CN",	0,	936},

-    {0xa8d83ece,	(FX_LPCWSTR)L"CalifornianFB",	(FX_LPCWSTR)L"FreeSerif",	2,	1252},

-    {0xaa3e082c,	(FX_LPCWSTR)L"Kingsoft-Phonetic",	(FX_LPCWSTR)L"utkal,Kedage,Mallige,AR PL UKai CN",	0,	1252},

-    {0xaa6bcabe,	(FX_LPCWSTR)L"HarlowSolidItalic",	(FX_LPCWSTR)L"Liberation Serif",	0,	1252},

+    {0xa8d83ece,	(FX_LPCWSTR)L"CalifornianFB",	(FX_LPCWSTR)L"Droid Sans Japanese,FreeSerif",	2,	1252},

+    {0xaa3e082c,	(FX_LPCWSTR)L"Kingsoft-Phonetic",	(FX_LPCWSTR)L"Tibetan Machine Uni,LKLUG,Samyak Gujarati,Droid Sans Thai,utkal,Kedage,Mallige,AR PL UKai CN",	0,	1252},

+    {0xaa6bcabe,	(FX_LPCWSTR)L"HarlowSolidItalic",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,Liberation Serif",	0,	1252},

     {0xade5337c,	(FX_LPCWSTR)L"MSUIGothic",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	1252},

-    {0xb08dd941,	(FX_LPCWSTR)L"WideLatin",	(FX_LPCWSTR)L"Liberation Serif",	2,	1252},

+    {0xb08dd941,	(FX_LPCWSTR)L"WideLatin",	(FX_LPCWSTR)L"KacstQurn,Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,Droid Sans Japanese,Liberation Serif",	2,	1252},

     {0xb12765e0,    (FX_LPCWSTR)L"ITCLegacySansStdBook",  (FX_LPCWSTR)L"AR PL UMing HK,AR PL UKai HK,FreeSerif,Ubuntu,FreeSans",   0,  1252},

-    {0xb207f05d,	(FX_LPCWSTR)L"PoorRichard",	(FX_LPCWSTR)L"Liberation Serif",	2,	1252},

-    {0xb3bc492f,	(FX_LPCWSTR)L"JuiceITC-Regular",	(FX_LPCWSTR)L"Liberation Serif",	0,	1252},

+    {0xb207f05d,	(FX_LPCWSTR)L"PoorRichard",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Serif",	2,	1252},

+    {0xb3bc492f,	(FX_LPCWSTR)L"JuiceITC-Regular",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Serif",	0,	1252},

     {0xb5545399,	(FX_LPCWSTR)L"Marlett",	(FX_LPCWSTR)L"Liberation Serif",	4,	42},

-    {0xb5dd1ebb,	(FX_LPCWSTR)L"BritannicBold",	(FX_LPCWSTR)L"Liberation Serif",	0,	1252},

-    {0xb699c1c5,	(FX_LPCWSTR)L"LucidaCalligraphy-Italic",	(FX_LPCWSTR)L"DejaVu Serif",	0,	1252},

-    {0xb725d629,	(FX_LPCWSTR)L"TimesNewRoman",	(FX_LPCWSTR)L"Liberation Sans",	2,	1252},

+    {0xb5dd1ebb,	(FX_LPCWSTR)L"BritannicBold",	(FX_LPCWSTR)L"KacstQurn,Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,Liberation Serif",	0,	1252},

+    {0xb699c1c5,	(FX_LPCWSTR)L"LucidaCalligraphy-Italic",	(FX_LPCWSTR)L"KacstQurn,Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,Droid Sans Japanese,DejaVu Serif",	0,	1252},

+    {0xb725d629,	(FX_LPCWSTR)L"TimesNewRoman",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Sans",	2,	1252},

     {0xb7eaebeb,	(FX_LPCWSTR)L"AdobeHeitiStdR",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	936},

-    {0xbd29c486,	(FX_LPCWSTR)L"BerlinSansFBDemi-Bold",	(FX_LPCWSTR)L"DejaVu Serif",	0,	1252},

+    {0xbd29c486,	(FX_LPCWSTR)L"BerlinSansFBDemi-Bold",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Serif",	0,	1252},

     {0xbe8a8db4,	(FX_LPCWSTR)L"BookshelfSymbolSeven",	(FX_LPCWSTR)L"DejaVu Sans",	0,	1252},

-    {0xc16c0118,	(FX_LPCWSTR)L"AdobeHebrew",	(FX_LPCWSTR)L"Ubuntu,Liberation Serif",	0,	1252},

-    {0xc318b0af,	(FX_LPCWSTR)L"MyriadProLight",	(FX_LPCWSTR)L"AR PL UKai HK,AR PL UMing HK,AR PL UKai CN",	0,	1252},

-    {0xc65e5659,	(FX_LPCWSTR)L"CambriaMath",	(FX_LPCWSTR)L"FreeSerif,FreeMono",	2,	1252},

-    {0xc75c8f05,	(FX_LPCWSTR)L"LucidaConsole",	(FX_LPCWSTR)L"DejaVu Sans Mono,FreeMono,Liberation Mono,WenQuanYi Micro Hei Mono",	1,	1252},

-    {0xca7c35d6,	(FX_LPCWSTR)L"Calibri",	(FX_LPCWSTR)L"DejaVu Sans",	0,	1252},

+    {0xc16c0118,	(FX_LPCWSTR)L"AdobeHebrew",	(FX_LPCWSTR)L"Droid Sans Japanese,Ubuntu,Liberation Serif",	0,	1252},

+    {0xc318b0af,	(FX_LPCWSTR)L"MyriadProLight",	(FX_LPCWSTR)L"Droid Sans Japanese,AR PL UKai HK,AR PL UMing HK,AR PL UKai CN",	0,	1252},

+    {0xc65e5659,	(FX_LPCWSTR)L"CambriaMath",	(FX_LPCWSTR)L"Droid Sans Japanese,FreeSerif,FreeMono",	2,	1252},

+    {0xc75c8f05,	(FX_LPCWSTR)L"LucidaConsole",	(FX_LPCWSTR)L"Liberation Mono,DejaVu Sans Mono,FreeMono,WenQuanYi Micro Hei Mono",	1,	1252},

+    {0xca7c35d6,	(FX_LPCWSTR)L"Calibri",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Sans",	0,	1252},

     {0xcb053f53,	(FX_LPCWSTR)L"MicrosoftYaHei",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	936},

-    {0xcb7190f9,	(FX_LPCWSTR)L"Magneto-Bold",	(FX_LPCWSTR)L"DejaVu Serif",	0,	1252},

+    {0xcb7190f9,	(FX_LPCWSTR)L"Magneto-Bold",	(FX_LPCWSTR)L"Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,Droid Sans Japanese,DejaVu Serif",	0,	1252},

     {0xcca00cc5,	(FX_LPCWSTR)L"System",	(FX_LPCWSTR)L"DejaVu Sans",	0,	1252},

-    {0xccad6f76,	(FX_LPCWSTR)L"Jokerman-Regular",	(FX_LPCWSTR)L"DejaVu Sans",	0,	1252},

+    {0xccad6f76,	(FX_LPCWSTR)L"Jokerman-Regular",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Sans",	0,	1252},

     {0xccc5818c,	(FX_LPCWSTR)L"EuroSign",	(FX_LPCWSTR)L"DejaVu Serif",	0,	1252},

-    {0xcf3d7234,	(FX_LPCWSTR)L"LucidaHandwriting-Italic",	(FX_LPCWSTR)L"Nimbus Sans L,DejaVu Serif",	0,	1252},

+    {0xcf3d7234,	(FX_LPCWSTR)L"LucidaHandwriting-Italic",	(FX_LPCWSTR)L"Liberation Sans Narrow,Ubuntu Condensed,Nimbus Sans L,DejaVu Serif",	0,	1252},

     {0xcf7b8fdb,	(FX_LPCWSTR)L"MinionPro",	(FX_LPCWSTR)L"DejaVu Sans",	0,	1252},

     {0xcfe5755f,	(FX_LPCWSTR)L"Simhei",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	1,	936},

-    {0xd011f4ee,	(FX_LPCWSTR)L"MSPGothic",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	1252},

-    {0xd060e7ef,	(FX_LPCWSTR)L"Vivaldi",	(FX_LPCWSTR)L"Liberation Sans,Ubuntu",	8,	1252},

-    {0xd07edec1,	(FX_LPCWSTR)L"FranklinGothic-Medium",	(FX_LPCWSTR)L"Ubuntu",	0,	1252},

-    {0xd107243f,	(FX_LPCWSTR)L"SimSun",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	936},

-    {0xd1881562,	(FX_LPCWSTR)L"ArialNarrow",	(FX_LPCWSTR)L"FreeSerif",	0,	1252},

-    {0xd22b7dce,	(FX_LPCWSTR)L"BodoniMTPosterCompressed",	(FX_LPCWSTR)L"DejaVu Serif",	0,	1252},

-    {0xd22bfa60,	(FX_LPCWSTR)L"ComicSansMS",	(FX_LPCWSTR)L"FreeMono,Liberation Mono",	8,	1252},

-    {0xd3bd0e35,	(FX_LPCWSTR)L"Bauhaus93",	(FX_LPCWSTR)L"Liberation Sans,Ubuntu",	0,	1252},

+    {0xd011f4ee,	(FX_LPCWSTR)L"MSPGothic",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,AR PL UMing CN,AR PL UMing HK,AR PL UMing TW",	0,	1252},

+    {0xd060e7ef,	(FX_LPCWSTR)L"Vivaldi",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,Liberation Sans,Ubuntu",	8,	1252},

+    {0xd07edec1,	(FX_LPCWSTR)L"FranklinGothic-Medium",	(FX_LPCWSTR)L"Droid Sans Japanese,Ubuntu",	0,	1252},

+    {0xd107243f,	(FX_LPCWSTR)L"SimSun",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono",	0,	936},

+    {0xd1881562,	(FX_LPCWSTR)L"ArialNarrow",	(FX_LPCWSTR)L"Liberation Sans Narrow,Droid Sans Japanese,FreeSerif",	0,	1252},

+    {0xd22b7dce,	(FX_LPCWSTR)L"BodoniMTPosterCompressed",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Serif",	0,	1252},

+    {0xd22bfa60,	(FX_LPCWSTR)L"ComicSansMS",	(FX_LPCWSTR)L"Droid Sans Japanese,FreeMono,Liberation Mono",	8,	1252},

+    {0xd3bd0e35,	(FX_LPCWSTR)L"Bauhaus93",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,Liberation Sans,Ubuntu",	0,	1252},

     {0xd429ee7a,	(FX_LPCWSTR)L"STFangsong",	(FX_LPCWSTR)L"WenQuanYi Micro Hei Mono",	0,	936},

-    {0xd6679c12,	(FX_LPCWSTR)L"BernardMTCondensed",	(FX_LPCWSTR)L"Nimbus Sans L,URW Chancery L,KacstOne,Liberation Sans",	0,	1252},

-    {0xd8e8a027,	(FX_LPCWSTR)L"LucidaSans",	(FX_LPCWSTR)L"Nimbus Sans L,DejaVu Serif Condensed,Liberation Mono,Ubuntu",	0,	1252},

-    {0xd9fe7761,	(FX_LPCWSTR)L"HighTowerText-Reg",	(FX_LPCWSTR)L"Ubuntu,Liberation Serif",	2,	1252},

+    {0xd6679c12,	(FX_LPCWSTR)L"BernardMTCondensed",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,Nimbus Sans L,URW Chancery L,KacstOne,Liberation Sans",	0,	1252},

+    {0xd8e8a027,	(FX_LPCWSTR)L"LucidaSans",	(FX_LPCWSTR)L"Liberation Sans Narrow,Nimbus Sans L,KacstQurn,Droid Arabic Naskh,Droid Sans Ethiopic,DejaVu Serif Condensed,Liberation Mono,Ubuntu",	0,	1252},

+    {0xd9fe7761,	(FX_LPCWSTR)L"HighTowerText-Reg",	(FX_LPCWSTR)L"Droid Sans Japanese,Ubuntu,Liberation Serif",	2,	1252},

     {0xda7e551e,	(FX_LPCWSTR)L"STSong",	(FX_LPCWSTR)L"WenQuanYi Micro Hei Mono",	0,	936},

     {0xdaa6842d,	(FX_LPCWSTR)L"STZhongsong",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	936},

     {0xdaaab93f,	(FX_LPCWSTR)L"STFangsong",	(FX_LPCWSTR)L"WenQuanYi Micro Hei Mono,WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp",	0,	936},

     {0xdaeb0713,	(FX_LPCWSTR)L"STSong",	(FX_LPCWSTR)L"WenQuanYi Micro Hei Mono,WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp",	0,	936},

     {0xdafedbef,	(FX_LPCWSTR)L"STCaiyun",	(FX_LPCWSTR)L"AR PL UKai HK,AR PL UMing HK,AR PL UKai CN",	0,	936},

-    {0xdb00a3d9,	(FX_LPCWSTR)L"Broadway",	(FX_LPCWSTR)L"DejaVu Sans,FreeMono,Liberation Mono",	0,	1252},

+    {0xdb00a3d9,	(FX_LPCWSTR)L"Broadway",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,DejaVu Sans,FreeMono,Liberation Mono",	0,	1252},

     {0xdb1f5ad4,	(FX_LPCWSTR)L"STXinwei",	(FX_LPCWSTR)L"AR PL UKai HK,AR PL UMing HK,AR PL UKai CN",	0,	936},

     {0xdb326e7f,	(FX_LPCWSTR)L"STKaiti",	(FX_LPCWSTR)L"WenQuanYi Micro Hei Mono,WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp",	0,	936},

     {0xdb69595a,	(FX_LPCWSTR)L"STHupo",	(FX_LPCWSTR)L"WenQuanYi Micro Hei Mono,WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp",	0,	936},

     {0xdba0082c,	(FX_LPCWSTR)L"STXihei",	(FX_LPCWSTR)L" WenQuanYi Micro Hei Mono,WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp",	0,	936},

     {0xdbd0ab18,	(FX_LPCWSTR)L"STXingkai",	(FX_LPCWSTR)L"AR PL UKai HK,AR PL UMing HK,AR PL UKai CN",	0,	936},

     {0xdc1a7db1,	(FX_LPCWSTR)L"STLiti",	(FX_LPCWSTR)L"AR PL UKai HK,AR PL UMing HK,AR PL UKai CN",	0,	936},

-    {0xdc33075f,	(FX_LPCWSTR)L"KristenITC-Regular",	(FX_LPCWSTR)L"DejaVu Sans Condensed,Ubuntu,Liberation Sans",	8,	1252},

-    {0xdcc7009c,	(FX_LPCWSTR)L"Harrington",	(FX_LPCWSTR)L"Liberation Serif,FreeSerif,Ubuntu",	0,	1252},

-    {0xdd712466,	(FX_LPCWSTR)L"ArialBlack",	(FX_LPCWSTR)L"DejaVu Sans,DejaVu Serif,FreeMono",	0,	1252},

-    {0xdde87b3e,	(FX_LPCWSTR)L"Impact",	(FX_LPCWSTR)L"DejaVu Serif",	0,	1252},

-    {0xdf69fb32,	(FX_LPCWSTR)L"SnapITC",	(FX_LPCWSTR)L"DejaVu Sans,DejaVu Serif,FreeMono",	0,	1252},

-    {0xdf8b25e8,	(FX_LPCWSTR)L"CenturyGothic",	(FX_LPCWSTR)L"Liberation Mono,Liberation Sans,Liberation Serif",	0,	1252},

-    {0xe0f705c0,	(FX_LPCWSTR)L"KristenITC",	(FX_LPCWSTR)L"DejaVu Sans Condensed,Ubuntu,Liberation Sans",	8,	1252},

-    {0xe1427573,	(FX_LPCWSTR)L"Raavi",	(FX_LPCWSTR)L"FreeSerif,Liberation Serif,Khmer OS",	0,	1252},

-    {0xe2cea0cb,	(FX_LPCWSTR)L"Magneto",	(FX_LPCWSTR)L"DejaVu Serif,DejaVu Serif Condensed,DejaVu Sans",	0,	1252},

-    {0xe36a9e17,	(FX_LPCWSTR)L"Ravie",	(FX_LPCWSTR)L"DejaVu Serif,DejaVu Sans,FreeMono",	0,	1252},

-    {0xe433f8e2,	(FX_LPCWSTR)L"Parchment",	(FX_LPCWSTR)L"DejaVu Serif",	8,	1252},

+    {0xdc33075f,	(FX_LPCWSTR)L"KristenITC-Regular",	(FX_LPCWSTR)L"Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,DejaVu Sans Condensed,Ubuntu,Liberation Sans",	8,	1252},

+    {0xdcc7009c,	(FX_LPCWSTR)L"Harrington",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,Liberation Serif,FreeSerif,Ubuntu",	0,	1252},

+    {0xdd712466,	(FX_LPCWSTR)L"ArialBlack",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Sans,DejaVu Serif,FreeMono",	0,	1252},

+    {0xdde87b3e,	(FX_LPCWSTR)L"Impact",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Serif",	0,	1252},

+    {0xdf69fb32,	(FX_LPCWSTR)L"SnapITC",	(FX_LPCWSTR)L"Liberation Sans Narrow,Ubuntu Condensed,DejaVu Sans,DejaVu Serif,FreeMono",	0,	1252},

+    {0xdf8b25e8,	(FX_LPCWSTR)L"CenturyGothic",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Mono,Liberation Sans,Liberation Serif",	0,	1252},

+    {0xe0f705c0,	(FX_LPCWSTR)L"KristenITC",	(FX_LPCWSTR)L"Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,DejaVu Sans Condensed,Ubuntu,Liberation Sans",	8,	1252},

+    {0xe1427573,	(FX_LPCWSTR)L"Raavi",	(FX_LPCWSTR)L"Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,FreeSerif,Liberation Serif,Khmer OS",	0,	1252},

+    {0xe2cea0cb,	(FX_LPCWSTR)L"Magneto",	(FX_LPCWSTR)L"Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,DejaVu Serif,DejaVu Serif Condensed,DejaVu Sans",	0,	1252},

+    {0xe36a9e17,	(FX_LPCWSTR)L"Ravie",	(FX_LPCWSTR)L"Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,DejaVu Serif,DejaVu Sans,FreeMono",	0,	1252},

+    {0xe433f8e2,	(FX_LPCWSTR)L"Parchment",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Serif",	8,	1252},

     {0xe43dff4a,	(FX_LPCWSTR)L"Wingdings",	(FX_LPCWSTR)L"DejaVu Serif",	4,	42},

     {0xe4e2c405,	(FX_LPCWSTR)L"MTExtra",	(FX_LPCWSTR)L"DejaVu Serif",	6,	42},

-    {0xe618cc35,	(FX_LPCWSTR)L"InformalRoman",	(FX_LPCWSTR)L"Nimbus Sans L,DejaVu Sans Condensed,Ubuntu,Liberation Sans",	8,	1252},

-    {0xe6c27ffc,	(FX_LPCWSTR)L"Mistral",	(FX_LPCWSTR)L"DejaVu Serif",	8,	1252},

+    {0xe618cc35,	(FX_LPCWSTR)L"InformalRoman",	(FX_LPCWSTR)L"Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,Droid Sans Japanese,Nimbus Sans L,DejaVu Sans Condensed,Ubuntu,Liberation Sans",	8,	1252},

+    {0xe6c27ffc,	(FX_LPCWSTR)L"Mistral",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Serif",	8,	1252},

     {0xe7ebf4b9,	(FX_LPCWSTR)L"Courier",	(FX_LPCWSTR)L"DejaVu Sans,DejaVu Sans Condensed,FreeSerif",	0,	1252},

     {0xe8bc4a9d,	(FX_LPCWSTR)L"MSReferenceSpecialty",	(FX_LPCWSTR)L"DejaVu Serif",	0,	1252},

-    {0xe90fb013,	(FX_LPCWSTR)L"TempusSansITC",	(FX_LPCWSTR)L"Ubuntu,Liberation Serif,FreeSerif",	0,	1252},

-    {0xec637b42,	(FX_LPCWSTR)L"Consolas",	(FX_LPCWSTR)L"DejaVu Sans Condensed,FreeSerif,FreeSans",	1,	1252},

+    {0xe90fb013,	(FX_LPCWSTR)L"TempusSansITC",	(FX_LPCWSTR)L"Droid Sans Japanese,Ubuntu,Liberation Serif,FreeSerif",	0,	1252},

+    {0xec637b42,	(FX_LPCWSTR)L"Consolas",	(FX_LPCWSTR)L"DejaVu Sans Condensed,AR PL UKai CN,AR PL UKai HK,AR PL UKai TW,FreeSerif,FreeSans",	1,	1252},

     {0xed3a683b,	(FX_LPCWSTR)L"STXinwei",	(FX_LPCWSTR)L"AR PL UKai HK,AR PL UMing HK,AR PL UKai CN",	0,	936},

-    {0xef264cd1,	(FX_LPCWSTR)L"LucidaHandwriting",	(FX_LPCWSTR)L"DejaVu Serif,DejaVu Sans,FreeMono,Liberation Mono",	0,	1252},

-    {0xf086bca2,	(FX_LPCWSTR)L"BaskervilleOldFace",	(FX_LPCWSTR)L"Liberation Serif,Ubuntu,FreeSerif",	0,	1252},

-    {0xf1028030,	(FX_LPCWSTR)L"Mangal",	(FX_LPCWSTR)L"FreeSans,Garuda,Liberation Sans,Nimbus Sans L,FreeSerif,WenQuanYi Micro Hei",	2,	1252},

-    {0xf1da7eb9,	(FX_LPCWSTR)L"ShowcardGothic",	(FX_LPCWSTR)L"DejaVu Serif Condensed,DejaVu Sans Condensed,Liberation Sans,Ubuntu",	0,	1252},

-    {0xf210f06a,	(FX_LPCWSTR)L"ArialMT",	(FX_LPCWSTR)L"Liberation Sans,FreeSans,Nimbus Sans L,Khmer OS System,Khmer OS",	0,	1252},

-    {0xf477f16a,	(FX_LPCWSTR)L"Latha",	(FX_LPCWSTR)L"Nimbus Sans L,FreeSerif,Nimbus Sans L",	0,	1252},

-    {0xf616f3dd,	(FX_LPCWSTR)L"LiSu",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,AR PL UMing CN,AR PL UMing HK,AR PL UMing TW,AR PL UMing TW MBE,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	1,	936},

+    {0xef264cd1,	(FX_LPCWSTR)L"LucidaHandwriting",	(FX_LPCWSTR)L"Liberation Sans Narrow,Ubuntu Condensed,Nimbus Sans L,KacstQurn,Liberation Mono",	0,	1252},

+    {0xf086bca2,	(FX_LPCWSTR)L"BaskervilleOldFace",	(FX_LPCWSTR)L"KacstQurn,Droid Sans Japanese,Liberation Serif,Ubuntu,FreeSerif",	0,	1252},

+    {0xf1028030,	(FX_LPCWSTR)L"Mangal",	(FX_LPCWSTR)L"FreeSans,TSCu_Paranar,Garuda,Liberation Sans,Liberation Sans Narrow,Nimbus Sans L",	2,	1252},

+    {0xf1da7eb9,	(FX_LPCWSTR)L"ShowcardGothic",	(FX_LPCWSTR)L"Droid Sans Japanese,DejaVu Serif Condensed,DejaVu Sans Condensed,Liberation Sans,Ubuntu",	0,	1252},

+    {0xf210f06a,	(FX_LPCWSTR)L"ArialMT",	(FX_LPCWSTR)L"Liberation Sans,Liberation Sans Narrow,FreeSans,Nimbus Sans L,Khmer OS System,Khmer OS",	0,	1252},

+    {0xf477f16a,	(FX_LPCWSTR)L"Latha",	(FX_LPCWSTR)L"Liberation Sans Narrow,Nimbus Sans L,Droid Arabic Naskh,mry_KacstQurn,FreeSerif,Nimbus Sans L",	0,	1252},

+    {0xf616f3dd,	(FX_LPCWSTR)L"LiSu",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,AR PL UMing CN,AR PL UMing HK,AR PL UMing TW,AR PL UMing TW MBE",	1,	936},

     {0xfa479aa6,	(FX_LPCWSTR)L"MicrosoftYaHei",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	936},

-    {0xfcd19697,	(FX_LPCWSTR)L"BookmanOldStyle",	(FX_LPCWSTR)L"Liberation Mono,Liberation Sans,Liberation Serif",	0,	1252},

-    {0xfe209a82,	(FX_LPCWSTR)L"LucidaCalligraphy",	(FX_LPCWSTR)L"DejaVu Serif,DejaVu Sans,FreeMono",	0,	1252},

+    {0xfcd19697,	(FX_LPCWSTR)L"BookmanOldStyle",	(FX_LPCWSTR)L"Droid Sans Japanese,Liberation Mono,Liberation Sans,Liberation Serif",	0,	1252},

+    {0xfe209a82,	(FX_LPCWSTR)L"LucidaCalligraphy",	(FX_LPCWSTR)L"KacstQurn,Droid Arabic Naskh,Droid Sans Ethiopic,mry_KacstQurn,Droid Sans Japanese,DejaVu Serif,DejaVu Sans,FreeMono",	0,	1252},

     {0xfef135f8,	(FX_LPCWSTR)L"AdobeHeitiStd-Regular",	(FX_LPCWSTR)L"WenQuanYi Zen Hei Mono,WenQuanYi Zen Hei,WenQuanYi Zen Hei Sharp,WenQuanYi Micro Hei",	0,	936},

 };

 #elif _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_

@@ -538,7 +538,7 @@ static const XFA_FONTINFO g_XFAFontsMap[] = {
     {0x2fd8930b,	(FX_LPCWSTR)L"KozukaMinchoPr6NR",	(FX_LPCWSTR)L"Microsoft Sans Serif,Apple Symbols",	0,	1252},

     {0x3115525a,	(FX_LPCWSTR)L"FangSong_GB2312",	(FX_LPCWSTR)L"Hiragino Sans GB,STHeiti",	0,	1252},

     {0x31327817,	(FX_LPCWSTR)L"MyriadPro",	(FX_LPCWSTR)L"Microsoft Sans Serif,Apple Symbols",	0,	1252},

-    {0x32244975,    (FX_LPCWSTR)L"Helvetica", (FX_LPCWSTR)L"Arial Narrow,Arial Unicode MS,Damascus,STIXNonUnicode,Liberation Sans,Nimbus Sans L,Avenir Next Medium",	 0,   1252},

+    {0x32244975,    (FX_LPCWSTR)L"Helvetica", (FX_LPCWSTR)L"Arial Narrow,Arial Unicode MS,Damascus,STIXNonUnicode",	 0,   1252},

     {0x32ac995c,	(FX_LPCWSTR)L"Terminal",	(FX_LPCWSTR)L"Microsoft Sans Serif,Apple Symbols",	0,	1252},

     {0x338d648a,	(FX_LPCWSTR)L"NiagaraEngraved-Reg",	(FX_LPCWSTR)L"Microsoft Sans Serif,Apple Symbols",	0,	1252},

     {0x33bb65f2,	(FX_LPCWSTR)L"Sylfaen",	(FX_LPCWSTR)L"Arial Unicode MS,Marion",	2,	1252},

diff --git a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp
index a390d62592..1d7267a571 100644
--- a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp
@@ -3206,10 +3206,13 @@ FX_BOOL CXFA_WidgetData::SetValue(const CFX_WideString& wsValue, XFA_VALUEPICTUR
         SyncValue(wsValue, TRUE);

         return TRUE;

     }

+    this->m_bPreNull = this->m_bIsNull;

+    this->m_bIsNull = FALSE;

     CFX_WideString wsNewText(wsValue);

     CFX_WideString wsPicture;

     GetPictureContent(wsPicture, eValueType);

-    FX_BOOL bNormalizeNum = TRUE;

+    FX_BOOL bValidate = TRUE;

+    FX_BOOL bSyncData = FALSE;

     CXFA_Node* pNode = GetUIChild();

     if (!pNode) {

         return TRUE;

@@ -3219,31 +3222,35 @@ FX_BOOL CXFA_WidgetData::SetValue(const CFX_WideString& wsValue, XFA_VALUEPICTUR
         CXFA_LocaleMgr* pLocalMgr = m_pNode->GetDocument()->GetLocalMgr();

         IFX_Locale* pLocale = GetLocal();

         CXFA_LocaleValue widgetValue = XFA_GetLocaleValue(this);

-        if (!widgetValue.ValidateValue(wsValue, wsPicture, pLocale, &wsPicture)) {

-            return FALSE;

+        bValidate = widgetValue.ValidateValue(wsValue, wsPicture, pLocale, &wsPicture);

+        if (bValidate) {

+            widgetValue = CXFA_LocaleValue(widgetValue.GetType(), wsNewText, wsPicture, pLocale, pLocalMgr);

+            wsNewText = widgetValue.GetValue();

+            if (uiType == XFA_ELEMENT_NumericEdit) {

+                FX_INT32 iLeadDigits = 0;

+                FX_INT32 iFracDigits = 0;

+                GetLeadDigits(iLeadDigits);

+                GetFracDigits(iFracDigits);

+                wsNewText = XFA_NumericLimit(wsNewText, iLeadDigits, iFracDigits);

+            }

+            bSyncData = TRUE;

         }

-        widgetValue = CXFA_LocaleValue(widgetValue.GetType(), wsNewText, wsPicture, pLocale, pLocalMgr);

-        wsNewText = widgetValue.GetValue();

+    } else {

         if (uiType == XFA_ELEMENT_NumericEdit) {

-            FX_INT32 iLeadDigits = 0;

-            FX_INT32 iFracDigits = 0;

-            GetLeadDigits(iLeadDigits);

-            GetFracDigits(iFracDigits);

-            wsNewText = XFA_NumericLimit(wsNewText, iLeadDigits, iFracDigits);

-            bNormalizeNum = FALSE;

+            if (wsNewText != FX_WSTRC(L"0")) {

+                FX_INT32 iLeadDigits = 0;

+                FX_INT32 iFracDigits = 0;

+                GetLeadDigits(iLeadDigits);

+                GetFracDigits(iFracDigits);

+                wsNewText = XFA_NumericLimit(wsNewText, iLeadDigits, iFracDigits);

+            }

+            bSyncData = TRUE;

         }

     }

-    if (uiType == XFA_ELEMENT_NumericEdit && bNormalizeNum) {

-        if (wsNewText != FX_WSTRC(L"0")) {

-            FX_INT32 iLeadDigits = 0;

-            FX_INT32 iFracDigits = 0;

-            GetLeadDigits(iLeadDigits);

-            GetFracDigits(iFracDigits);

-            wsNewText = XFA_NumericLimit(wsNewText, iLeadDigits, iFracDigits);

-        }

+    if (uiType != XFA_ELEMENT_NumericEdit || bSyncData) {

+        SyncValue(wsNewText, TRUE);

     }

-    SyncValue(wsNewText, TRUE);

-    return TRUE;

+    return bValidate;

 }

 FX_BOOL CXFA_WidgetData::GetPictureContent(CFX_WideString &wsPicture, XFA_VALUEPICTURE ePicture)

 {