clang-format all pdfium code.

No behavior change. Generated by: find . -name '*.cpp' -o -name '*.h' | \ grep -E -v 'third_party|thirdparties|lpng_v163' | \ xargs ../../buildtools/mac/clang-format -i See thread "tabs vs spaces" on pdfium@googlegroups.com for discussion. BUG=none R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1265503005 .
author: Nico Weber <thakis@chromium.org> 2015-08-04 12:19:10 -0700
committer: Nico Weber <thakis@chromium.org> 2015-08-04 12:19:10 -0700
commit: b048f791a15f2da781a01eba5b09eb9d389f9c11 (patch)
tree: 6850a73c18bbc41eaf4b1fdc6b3c96646d45587b /core/src/fpdfdoc
parent: c8eeed31f217d99a706b0cbf5e4ce0bcc12beb64 (diff)
download: pdfium-b048f791a15f2da781a01eba5b09eb9d389f9c11.tar.xz
19 files changed, 9011 insertions, 9016 deletions
diff --git a/core/src/fpdfdoc/doc_action.cpp b/core/src/fpdfdoc/doc_action.cpp
index 851b2d6709..f8a11e5682 100644
--- a/core/src/fpdfdoc/doc_action.cpp
+++ b/core/src/fpdfdoc/doc_action.cpp
@@ -5,368 +5,346 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/fpdfdoc/fpdf_doc.h"
-CPDF_Dest CPDF_Action::GetDest(CPDF_Document* pDoc) const
-{
-    if (!m_pDict) {
-        return CPDF_Dest();
-    }
-    CFX_ByteString type = m_pDict->GetString("S");
-    if (type != "GoTo" && type != "GoToR") {
-        return CPDF_Dest();
-    }
-    CPDF_Object* pDest = m_pDict->GetElementValue("D");
-    if (!pDest) {
-        return CPDF_Dest();
-    }
-    if (pDest->GetType() == PDFOBJ_STRING || pDest->GetType() == PDFOBJ_NAME) {
-        CPDF_NameTree name_tree(pDoc, FX_BSTRC("Dests"));
-        CFX_ByteStringC name = pDest->GetString();
-        return CPDF_Dest(name_tree.LookupNamedDest(pDoc, name));
-    }
-    if (pDest->GetType() == PDFOBJ_ARRAY) {
-        return CPDF_Dest((CPDF_Array*)pDest);
-    }
+CPDF_Dest CPDF_Action::GetDest(CPDF_Document* pDoc) const {
+  if (!m_pDict) {
     return CPDF_Dest();
+  }
+  CFX_ByteString type = m_pDict->GetString("S");
+  if (type != "GoTo" && type != "GoToR") {
+    return CPDF_Dest();
+  }
+  CPDF_Object* pDest = m_pDict->GetElementValue("D");
+  if (!pDest) {
+    return CPDF_Dest();
+  }
+  if (pDest->GetType() == PDFOBJ_STRING || pDest->GetType() == PDFOBJ_NAME) {
+    CPDF_NameTree name_tree(pDoc, FX_BSTRC("Dests"));
+    CFX_ByteStringC name = pDest->GetString();
+    return CPDF_Dest(name_tree.LookupNamedDest(pDoc, name));
+  }
+  if (pDest->GetType() == PDFOBJ_ARRAY) {
+    return CPDF_Dest((CPDF_Array*)pDest);
+  }
+  return CPDF_Dest();
 }
-const FX_CHAR* g_sATypes[] = {"Unknown", "GoTo", "GoToR", "GoToE", "Launch", "Thread", "URI", "Sound", "Movie",
-                              "Hide",	"Named", "SubmitForm", "ResetForm", "ImportData", "JavaScript", "SetOCGState",
-                              "Rendition", "Trans", "GoTo3DView", ""
-                             };
-CPDF_Action::ActionType CPDF_Action::GetType() const
-{
-    ActionType eType = Unknown;
-    if (m_pDict != NULL) {
-        CFX_ByteString csType = m_pDict->GetString("S");
-        if (!csType.IsEmpty()) {
-            int i = 0;
-            while (g_sATypes[i][0] != '\0') {
-                if (csType == g_sATypes[i]) {
-                    return (ActionType)i;
-                }
-                i ++;
-            }
+const FX_CHAR* g_sATypes[] = {
+    "Unknown",     "GoTo",       "GoToR",     "GoToE",      "Launch",
+    "Thread",      "URI",        "Sound",     "Movie",      "Hide",
+    "Named",       "SubmitForm", "ResetForm", "ImportData", "JavaScript",
+    "SetOCGState", "Rendition",  "Trans",     "GoTo3DView", ""};
+CPDF_Action::ActionType CPDF_Action::GetType() const {
+  ActionType eType = Unknown;
+  if (m_pDict != NULL) {
+    CFX_ByteString csType = m_pDict->GetString("S");
+    if (!csType.IsEmpty()) {
+      int i = 0;
+      while (g_sATypes[i][0] != '\0') {
+        if (csType == g_sATypes[i]) {
+          return (ActionType)i;
         }
+        i++;
+      }
     }
-    return eType;
+  }
+  return eType;
 }
-CFX_WideString CPDF_Action::GetFilePath() const
-{
-    CFX_ByteString type = m_pDict->GetString("S");
-    if (type != "GoToR" && type != "Launch" &&
-            type != "SubmitForm" && type != "ImportData") {
-        return CFX_WideString();
-    }
-    CPDF_Object* pFile = m_pDict->GetElementValue("F");
-    CFX_WideString path;
-    if (pFile == NULL) {
-        if (type == "Launch") {
-            CPDF_Dictionary* pWinDict = m_pDict->GetDict(FX_BSTRC("Win"));
-            if (pWinDict) {
-                return CFX_WideString::FromLocal(pWinDict->GetString(FX_BSTRC("F")));
-            }
-        }
-        return path;
+CFX_WideString CPDF_Action::GetFilePath() const {
+  CFX_ByteString type = m_pDict->GetString("S");
+  if (type != "GoToR" && type != "Launch" && type != "SubmitForm" &&
+      type != "ImportData") {
+    return CFX_WideString();
+  }
+  CPDF_Object* pFile = m_pDict->GetElementValue("F");
+  CFX_WideString path;
+  if (pFile == NULL) {
+    if (type == "Launch") {
+      CPDF_Dictionary* pWinDict = m_pDict->GetDict(FX_BSTRC("Win"));
+      if (pWinDict) {
+        return CFX_WideString::FromLocal(pWinDict->GetString(FX_BSTRC("F")));
+      }
     }
-    CPDF_FileSpec filespec(pFile);
-    filespec.GetFileName(path);
     return path;
+  }
+  CPDF_FileSpec filespec(pFile);
+  filespec.GetFileName(path);
+  return path;
 }
-CFX_ByteString CPDF_Action::GetURI(CPDF_Document* pDoc) const
-{
-    CFX_ByteString csURI;
-    if (m_pDict == NULL) {
-        return csURI;
-    }
-    if (m_pDict->GetString("S") != "URI") {
-        return csURI;
-    }
-    csURI = m_pDict->GetString("URI");
-    CPDF_Dictionary* pRoot = pDoc->GetRoot();
-    CPDF_Dictionary* pURI = pRoot->GetDict("URI");
-    if (pURI != NULL) {
-        if (csURI.Find(FX_BSTRC(":"), 0) < 1) {
-            csURI = pURI->GetString("Base") + csURI;
-        }
-    }
+CFX_ByteString CPDF_Action::GetURI(CPDF_Document* pDoc) const {
+  CFX_ByteString csURI;
+  if (m_pDict == NULL) {
     return csURI;
+  }
+  if (m_pDict->GetString("S") != "URI") {
+    return csURI;
+  }
+  csURI = m_pDict->GetString("URI");
+  CPDF_Dictionary* pRoot = pDoc->GetRoot();
+  CPDF_Dictionary* pURI = pRoot->GetDict("URI");
+  if (pURI != NULL) {
+    if (csURI.Find(FX_BSTRC(":"), 0) < 1) {
+      csURI = pURI->GetString("Base") + csURI;
+    }
+  }
+  return csURI;
 }
-FX_DWORD CPDF_ActionFields::GetFieldsCount() const
-{
-    if (m_pAction == NULL) {
-        return 0;
-    }
-    CPDF_Dictionary* pDict = m_pAction->GetDict();
-    if (pDict == NULL) {
-        return 0;
-    }
-    CFX_ByteString csType = pDict->GetString("S");
-    CPDF_Object* pFields = NULL;
-    if (csType == "Hide") {
-        pFields = pDict->GetElementValue("T");
-    } else {
-        pFields = pDict->GetArray("Fields");
-    }
-    if (pFields == NULL) {
-        return 0;
-    }
-    int iType = pFields->GetType();
-    if (iType == PDFOBJ_DICTIONARY) {
-        return 1;
-    }
-    if (iType == PDFOBJ_STRING) {
-        return 1;
-    }
-    if (iType == PDFOBJ_ARRAY) {
-        return ((CPDF_Array*)pFields)->GetCount();
-    }
+FX_DWORD CPDF_ActionFields::GetFieldsCount() const {
+  if (m_pAction == NULL) {
+    return 0;
+  }
+  CPDF_Dictionary* pDict = m_pAction->GetDict();
+  if (pDict == NULL) {
+    return 0;
+  }
+  CFX_ByteString csType = pDict->GetString("S");
+  CPDF_Object* pFields = NULL;
+  if (csType == "Hide") {
+    pFields = pDict->GetElementValue("T");
+  } else {
+    pFields = pDict->GetArray("Fields");
+  }
+  if (pFields == NULL) {
     return 0;
+  }
+  int iType = pFields->GetType();
+  if (iType == PDFOBJ_DICTIONARY) {
+    return 1;
+  }
+  if (iType == PDFOBJ_STRING) {
+    return 1;
+  }
+  if (iType == PDFOBJ_ARRAY) {
+    return ((CPDF_Array*)pFields)->GetCount();
+  }
+  return 0;
 }
-void CPDF_ActionFields::GetAllFields(CFX_PtrArray& fieldObjects) const
-{
-    fieldObjects.RemoveAll();
-    if (m_pAction == NULL) {
-        return;
-    }
-    CPDF_Dictionary* pDict = m_pAction->GetDict();
-    if (pDict == NULL) {
-        return;
-    }
-    CFX_ByteString csType = pDict->GetString("S");
-    CPDF_Object* pFields = NULL;
-    if (csType == "Hide") {
-        pFields = pDict->GetElementValue("T");
-    } else {
-        pFields = pDict->GetArray("Fields");
-    }
-    if (pFields == NULL) {
-        return;
-    }
-    int iType = pFields->GetType();
-    if (iType == PDFOBJ_DICTIONARY || iType == PDFOBJ_STRING) {
-        fieldObjects.Add(pFields);
-    } else if (iType == PDFOBJ_ARRAY) {
-        CPDF_Array* pArray = (CPDF_Array*)pFields;
-        FX_DWORD iCount = pArray->GetCount();
-        for (FX_DWORD i = 0; i < iCount; i ++) {
-            CPDF_Object* pObj = pArray->GetElementValue(i);
-            if (pObj != NULL) {
-                fieldObjects.Add(pObj);
-            }
-        }
-    }
+void CPDF_ActionFields::GetAllFields(CFX_PtrArray& fieldObjects) const {
+  fieldObjects.RemoveAll();
+  if (m_pAction == NULL) {
+    return;
+  }
+  CPDF_Dictionary* pDict = m_pAction->GetDict();
+  if (pDict == NULL) {
+    return;
+  }
+  CFX_ByteString csType = pDict->GetString("S");
+  CPDF_Object* pFields = NULL;
+  if (csType == "Hide") {
+    pFields = pDict->GetElementValue("T");
+  } else {
+    pFields = pDict->GetArray("Fields");
+  }
+  if (pFields == NULL) {
+    return;
+  }
+  int iType = pFields->GetType();
+  if (iType == PDFOBJ_DICTIONARY || iType == PDFOBJ_STRING) {
+    fieldObjects.Add(pFields);
+  } else if (iType == PDFOBJ_ARRAY) {
+    CPDF_Array* pArray = (CPDF_Array*)pFields;
+    FX_DWORD iCount = pArray->GetCount();
+    for (FX_DWORD i = 0; i < iCount; i++) {
+      CPDF_Object* pObj = pArray->GetElementValue(i);
+      if (pObj != NULL) {
+        fieldObjects.Add(pObj);
+      }
+    }
+  }
 }
-CPDF_Object* CPDF_ActionFields::GetField(FX_DWORD iIndex) const
-{
-    if (m_pAction == NULL) {
-        return NULL;
-    }
-    CPDF_Dictionary* pDict = m_pAction->GetDict();
-    if (pDict == NULL) {
-        return NULL;
-    }
-    CFX_ByteString csType = pDict->GetString("S");
-    CPDF_Object* pFields = NULL;
-    if (csType == "Hide") {
-        pFields = pDict->GetElementValue("T");
-    } else {
-        pFields = pDict->GetArray("Fields");
-    }
-    if (pFields == NULL) {
-        return NULL;
-    }
-    CPDF_Object* pFindObj = NULL;
-    int iType = pFields->GetType();
-    if (iType == PDFOBJ_DICTIONARY || iType == PDFOBJ_STRING) {
-        if (iIndex == 0) {
-            pFindObj = pFields;
-        }
-    } else if (iType == PDFOBJ_ARRAY) {
-        pFindObj = ((CPDF_Array*)pFields)->GetElementValue(iIndex);
-    }
-    return pFindObj;
+CPDF_Object* CPDF_ActionFields::GetField(FX_DWORD iIndex) const {
+  if (m_pAction == NULL) {
+    return NULL;
+  }
+  CPDF_Dictionary* pDict = m_pAction->GetDict();
+  if (pDict == NULL) {
+    return NULL;
+  }
+  CFX_ByteString csType = pDict->GetString("S");
+  CPDF_Object* pFields = NULL;
+  if (csType == "Hide") {
+    pFields = pDict->GetElementValue("T");
+  } else {
+    pFields = pDict->GetArray("Fields");
+  }
+  if (pFields == NULL) {
+    return NULL;
+  }
+  CPDF_Object* pFindObj = NULL;
+  int iType = pFields->GetType();
+  if (iType == PDFOBJ_DICTIONARY || iType == PDFOBJ_STRING) {
+    if (iIndex == 0) {
+      pFindObj = pFields;
+    }
+  } else if (iType == PDFOBJ_ARRAY) {
+    pFindObj = ((CPDF_Array*)pFields)->GetElementValue(iIndex);
+  }
+  return pFindObj;
 }
-CPDF_LWinParam CPDF_Action::GetWinParam() const
-{
-    if (m_pDict == NULL) {
-        return NULL;
-    }
-    if (m_pDict->GetString("S") != "Launch") {
-        return NULL;
-    }
-    return m_pDict->GetDict("Win");
+CPDF_LWinParam CPDF_Action::GetWinParam() const {
+  if (m_pDict == NULL) {
+    return NULL;
+  }
+  if (m_pDict->GetString("S") != "Launch") {
+    return NULL;
+  }
+  return m_pDict->GetDict("Win");
 }
-CFX_WideString CPDF_Action::GetJavaScript() const
-{
-    CFX_WideString csJS;
-    if (m_pDict == NULL) {
-        return csJS;
-    }
-    CPDF_Object* pJS = m_pDict->GetElementValue("JS");
-    if (pJS != NULL) {
-        return pJS->GetUnicodeText();
-    }
+CFX_WideString CPDF_Action::GetJavaScript() const {
+  CFX_WideString csJS;
+  if (m_pDict == NULL) {
     return csJS;
+  }
+  CPDF_Object* pJS = m_pDict->GetElementValue("JS");
+  if (pJS != NULL) {
+    return pJS->GetUnicodeText();
+  }
+  return csJS;
 }
-CPDF_Dictionary* CPDF_Action::GetAnnot() const
-{
-    if (!m_pDict) {
-        return nullptr;
-    }
-    CFX_ByteString csType = m_pDict->GetString("S");
-    if (csType == FX_BSTRC("Rendition")) {
-        return m_pDict->GetDict("AN");
-    }
-    if (csType == FX_BSTRC("Movie")) {
-        return m_pDict->GetDict("Annotation");
-    }
+CPDF_Dictionary* CPDF_Action::GetAnnot() const {
+  if (!m_pDict) {
     return nullptr;
+  }
+  CFX_ByteString csType = m_pDict->GetString("S");
+  if (csType == FX_BSTRC("Rendition")) {
+    return m_pDict->GetDict("AN");
+  }
+  if (csType == FX_BSTRC("Movie")) {
+    return m_pDict->GetDict("Annotation");
+  }
+  return nullptr;
 }
-int32_t CPDF_Action::GetOperationType() const
-{
-    if (m_pDict == NULL) {
-        return 0;
-    }
-    CFX_ByteString csType = m_pDict->GetString("S");
-    if (csType == FX_BSTRC("Rendition")) {
-        return m_pDict->GetInteger("OP");
-    }
-    if (csType == FX_BSTRC("Movie")) {
-        CFX_ByteString csOP = m_pDict->GetString("Operation");
-        if (csOP == FX_BSTRC("Play")) {
-            return 0;
-        }
-        if (csOP == FX_BSTRC("Stop")) {
-            return 1;
-        }
-        if (csOP == FX_BSTRC("Pause")) {
-            return 2;
-        }
-        if (csOP == FX_BSTRC("Resume")) {
-            return 3;
-        }
-    }
+int32_t CPDF_Action::GetOperationType() const {
+  if (m_pDict == NULL) {
     return 0;
+  }
+  CFX_ByteString csType = m_pDict->GetString("S");
+  if (csType == FX_BSTRC("Rendition")) {
+    return m_pDict->GetInteger("OP");
+  }
+  if (csType == FX_BSTRC("Movie")) {
+    CFX_ByteString csOP = m_pDict->GetString("Operation");
+    if (csOP == FX_BSTRC("Play")) {
+      return 0;
+    }
+    if (csOP == FX_BSTRC("Stop")) {
+      return 1;
+    }
+    if (csOP == FX_BSTRC("Pause")) {
+      return 2;
+    }
+    if (csOP == FX_BSTRC("Resume")) {
+      return 3;
+    }
+  }
+  return 0;
 }
-FX_DWORD CPDF_Action::GetSubActionsCount() const
-{
-    if (m_pDict == NULL || !m_pDict->KeyExist("Next")) {
-        return 0;
-    }
-    CPDF_Object* pNext = m_pDict->GetElementValue("Next");
-    if (!pNext) {
-        return 0;
-    }
-    int iObjType = pNext->GetType();
-    if (iObjType == PDFOBJ_DICTIONARY) {
-        return 1;
-    }
-    if (iObjType == PDFOBJ_ARRAY) {
-        return ((CPDF_Array*)pNext)->GetCount();
-    }
+FX_DWORD CPDF_Action::GetSubActionsCount() const {
+  if (m_pDict == NULL || !m_pDict->KeyExist("Next")) {
     return 0;
+  }
+  CPDF_Object* pNext = m_pDict->GetElementValue("Next");
+  if (!pNext) {
+    return 0;
+  }
+  int iObjType = pNext->GetType();
+  if (iObjType == PDFOBJ_DICTIONARY) {
+    return 1;
+  }
+  if (iObjType == PDFOBJ_ARRAY) {
+    return ((CPDF_Array*)pNext)->GetCount();
+  }
+  return 0;
 }
-CPDF_Action CPDF_Action::GetSubAction(FX_DWORD iIndex) const
-{
-    if (m_pDict == NULL || !m_pDict->KeyExist("Next")) {
-        return CPDF_Action();
-    }
-    CPDF_Object* pNext = m_pDict->GetElementValue("Next");
-    int iObjType = pNext->GetType();
-    if (iObjType == PDFOBJ_DICTIONARY) {
-        CPDF_Dictionary *pDict = static_cast<CPDF_Dictionary*>(pNext);
-        if (iIndex == 0) {
-            return CPDF_Action(pDict);
-        }
-    } else if (iObjType == PDFOBJ_ARRAY) {
-        CPDF_Array* pArray = static_cast<CPDF_Array*>(pNext);
-        return CPDF_Action(pArray->GetDict(iIndex));
-    }
+CPDF_Action CPDF_Action::GetSubAction(FX_DWORD iIndex) const {
+  if (m_pDict == NULL || !m_pDict->KeyExist("Next")) {
     return CPDF_Action();
+  }
+  CPDF_Object* pNext = m_pDict->GetElementValue("Next");
+  int iObjType = pNext->GetType();
+  if (iObjType == PDFOBJ_DICTIONARY) {
+    CPDF_Dictionary* pDict = static_cast<CPDF_Dictionary*>(pNext);
+    if (iIndex == 0) {
+      return CPDF_Action(pDict);
+    }
+  } else if (iObjType == PDFOBJ_ARRAY) {
+    CPDF_Array* pArray = static_cast<CPDF_Array*>(pNext);
+    return CPDF_Action(pArray->GetDict(iIndex));
+  }
+  return CPDF_Action();
 }
-const FX_CHAR* g_sAATypes[] = {"E", "X", "D", "U", "Fo", "Bl", "PO", "PC", "PV", "PI",
-                               "O", "C",
-                               "K", "F", "V", "C",
-                               "WC", "WS", "DS", "WP", "DP",
-                               ""
-                              };
-FX_BOOL CPDF_AAction::ActionExist(AActionType eType) const
-{
-    if (m_pDict == NULL) {
-        return FALSE;
-    }
-    return m_pDict->KeyExist(g_sAATypes[(int)eType]);
+const FX_CHAR* g_sAATypes[] = {"E",  "X",  "D",  "U",  "Fo", "Bl", "PO", "PC",
+                               "PV", "PI", "O",  "C",  "K",  "F",  "V",  "C",
+                               "WC", "WS", "DS", "WP", "DP", ""};
+FX_BOOL CPDF_AAction::ActionExist(AActionType eType) const {
+  if (m_pDict == NULL) {
+    return FALSE;
+  }
+  return m_pDict->KeyExist(g_sAATypes[(int)eType]);
 }
-CPDF_Action CPDF_AAction::GetAction(AActionType eType) const
-{
-    if (!m_pDict) {
-        return CPDF_Action();
-    }
-    return CPDF_Action(m_pDict->GetDict(g_sAATypes[(int)eType]));
+CPDF_Action CPDF_AAction::GetAction(AActionType eType) const {
+  if (!m_pDict) {
+    return CPDF_Action();
+  }
+  return CPDF_Action(m_pDict->GetDict(g_sAATypes[(int)eType]));
 }
-FX_POSITION CPDF_AAction::GetStartPos() const
-{
-    if (m_pDict == NULL) {
-        return NULL;
-    }
-    return m_pDict->GetStartPos();
+FX_POSITION CPDF_AAction::GetStartPos() const {
+  if (m_pDict == NULL) {
+    return NULL;
+  }
+  return m_pDict->GetStartPos();
 }
-CPDF_Action CPDF_AAction::GetNextAction(FX_POSITION& pos, AActionType& eType) const
-{
-    if (m_pDict == NULL) {
-        return CPDF_Action();
-    }
-    CFX_ByteString csKey;
-    CPDF_Object* pObj = m_pDict->GetNextElement(pos, csKey);
-    if (!pObj) {
-        return CPDF_Action();
-    }
-    CPDF_Object* pDirect = pObj->GetDirect();
-    if (!pDirect || pDirect->GetType() != PDFOBJ_DICTIONARY) {
-        return CPDF_Action();
-    }
-    int i = 0;
-    while (g_sAATypes[i][0] != '\0') {
-        if (csKey == g_sAATypes[i]) {
-            break;
-        }
-        i++;
-    }
-    eType = (AActionType)i;
-    return CPDF_Action(static_cast<CPDF_Dictionary*>(pDirect));
+CPDF_Action CPDF_AAction::GetNextAction(FX_POSITION& pos,
+                                        AActionType& eType) const {
+  if (m_pDict == NULL) {
+    return CPDF_Action();
+  }
+  CFX_ByteString csKey;
+  CPDF_Object* pObj = m_pDict->GetNextElement(pos, csKey);
+  if (!pObj) {
+    return CPDF_Action();
+  }
+  CPDF_Object* pDirect = pObj->GetDirect();
+  if (!pDirect || pDirect->GetType() != PDFOBJ_DICTIONARY) {
+    return CPDF_Action();
+  }
+  int i = 0;
+  while (g_sAATypes[i][0] != '\0') {
+    if (csKey == g_sAATypes[i]) {
+      break;
+    }
+    i++;
+  }
+  eType = (AActionType)i;
+  return CPDF_Action(static_cast<CPDF_Dictionary*>(pDirect));
 }
-CPDF_DocJSActions::CPDF_DocJSActions(CPDF_Document* pDoc)
-{
-    m_pDocument = pDoc;
+CPDF_DocJSActions::CPDF_DocJSActions(CPDF_Document* pDoc) {
+  m_pDocument = pDoc;
 }
-int CPDF_DocJSActions::CountJSActions() const
-{
-    ASSERT(m_pDocument != NULL);
-    CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
-    return name_tree.GetCount();
+int CPDF_DocJSActions::CountJSActions() const {
+  ASSERT(m_pDocument != NULL);
+  CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
+  return name_tree.GetCount();
 }
-CPDF_Action CPDF_DocJSActions::GetJSAction(int index, CFX_ByteString& csName) const
-{
-    ASSERT(m_pDocument != NULL);
-    CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
-    CPDF_Object *pAction = name_tree.LookupValue(index, csName);
-    if (pAction == NULL || pAction->GetType() != PDFOBJ_DICTIONARY) {
-        return CPDF_Action();
-    }
-    return CPDF_Action(pAction->GetDict());
+CPDF_Action CPDF_DocJSActions::GetJSAction(int index,
+                                           CFX_ByteString& csName) const {
+  ASSERT(m_pDocument != NULL);
+  CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
+  CPDF_Object* pAction = name_tree.LookupValue(index, csName);
+  if (pAction == NULL || pAction->GetType() != PDFOBJ_DICTIONARY) {
+    return CPDF_Action();
+  }
+  return CPDF_Action(pAction->GetDict());
 }
-CPDF_Action CPDF_DocJSActions::GetJSAction(const CFX_ByteString& csName) const
-{
-    ASSERT(m_pDocument != NULL);
-    CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
-    CPDF_Object *pAction = name_tree.LookupValue(csName);
-    if (pAction == NULL || pAction->GetType() != PDFOBJ_DICTIONARY) {
-        return CPDF_Action();
-    }
-    return CPDF_Action(pAction->GetDict());
+CPDF_Action CPDF_DocJSActions::GetJSAction(const CFX_ByteString& csName) const {
+  ASSERT(m_pDocument != NULL);
+  CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
+  CPDF_Object* pAction = name_tree.LookupValue(csName);
+  if (pAction == NULL || pAction->GetType() != PDFOBJ_DICTIONARY) {
+    return CPDF_Action();
+  }
+  return CPDF_Action(pAction->GetDict());
 }
-int CPDF_DocJSActions::FindJSAction(const CFX_ByteString& csName) const
-{
-    ASSERT(m_pDocument != NULL);
-    CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
-    return name_tree.GetIndex(csName);
+int CPDF_DocJSActions::FindJSAction(const CFX_ByteString& csName) const {
+  ASSERT(m_pDocument != NULL);
+  CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
+  return name_tree.GetIndex(csName);
 }
diff --git a/core/src/fpdfdoc/doc_annot.cpp b/core/src/fpdfdoc/doc_annot.cpp
index 0a746190c0..6f5ff797f2 100644
--- a/core/src/fpdfdoc/doc_annot.cpp
+++ b/core/src/fpdfdoc/doc_annot.cpp
@@ -8,361 +8,376 @@
 #include "../../include/fpdfdoc/fpdf_doc.h"
 #include "../../include/fpdfapi/fpdf_pageobj.h"
 
-CPDF_AnnotList::CPDF_AnnotList(CPDF_Page* pPage)
-{
-    ASSERT(pPage != NULL);
-    m_pPageDict = pPage->m_pFormDict;
-    if (m_pPageDict == NULL) {
-        return;
+CPDF_AnnotList::CPDF_AnnotList(CPDF_Page* pPage) {
+  ASSERT(pPage != NULL);
+  m_pPageDict = pPage->m_pFormDict;
+  if (m_pPageDict == NULL) {
+    return;
+  }
+  m_pDocument = pPage->m_pDocument;
+  CPDF_Array* pAnnots = m_pPageDict->GetArray("Annots");
+  if (pAnnots == NULL) {
+    return;
+  }
+  CPDF_Dictionary* pRoot = m_pDocument->GetRoot();
+  CPDF_Dictionary* pAcroForm = pRoot->GetDict("AcroForm");
+  FX_BOOL bRegenerateAP = pAcroForm && pAcroForm->GetBoolean("NeedAppearances");
+  for (FX_DWORD i = 0; i < pAnnots->GetCount(); ++i) {
+    CPDF_Dictionary* pDict = (CPDF_Dictionary*)pAnnots->GetElementValue(i);
+    if (pDict == NULL || pDict->GetType() != PDFOBJ_DICTIONARY) {
+      continue;
     }
-    m_pDocument = pPage->m_pDocument;
-    CPDF_Array* pAnnots = m_pPageDict->GetArray("Annots");
-    if (pAnnots == NULL) {
-        return;
-    }
-    CPDF_Dictionary* pRoot = m_pDocument->GetRoot();
-    CPDF_Dictionary* pAcroForm = pRoot->GetDict("AcroForm");
-    FX_BOOL bRegenerateAP = pAcroForm && pAcroForm->GetBoolean("NeedAppearances");
-    for (FX_DWORD i = 0; i < pAnnots->GetCount(); ++i) {
-        CPDF_Dictionary* pDict = (CPDF_Dictionary*)pAnnots->GetElementValue(i);
-        if (pDict == NULL || pDict->GetType() != PDFOBJ_DICTIONARY) {
-            continue;
-        }
-        FX_DWORD dwObjNum = pDict->GetObjNum();
-        if (dwObjNum == 0) {
-            dwObjNum = m_pDocument->AddIndirectObject(pDict);
-            CPDF_Reference* pAction = new CPDF_Reference(m_pDocument, dwObjNum);
-            pAnnots->InsertAt(i, pAction);
-            pAnnots->RemoveAt(i + 1);
-            pDict = pAnnots->GetDict(i);
-        }
-        CPDF_Annot* pAnnot = new CPDF_Annot(pDict, this);
-        m_AnnotList.Add(pAnnot);
-        if (bRegenerateAP && pDict->GetConstString(FX_BSTRC("Subtype")) == FX_BSTRC("Widget"))
-            if (CPDF_InterForm::UpdatingAPEnabled()) {
-                FPDF_GenerateAP(m_pDocument, pDict);
-            }
+    FX_DWORD dwObjNum = pDict->GetObjNum();
+    if (dwObjNum == 0) {
+      dwObjNum = m_pDocument->AddIndirectObject(pDict);
+      CPDF_Reference* pAction = new CPDF_Reference(m_pDocument, dwObjNum);
+      pAnnots->InsertAt(i, pAction);
+      pAnnots->RemoveAt(i + 1);
+      pDict = pAnnots->GetDict(i);
     }
+    CPDF_Annot* pAnnot = new CPDF_Annot(pDict, this);
+    m_AnnotList.Add(pAnnot);
+    if (bRegenerateAP &&
+        pDict->GetConstString(FX_BSTRC("Subtype")) == FX_BSTRC("Widget"))
+      if (CPDF_InterForm::UpdatingAPEnabled()) {
+        FPDF_GenerateAP(m_pDocument, pDict);
+      }
+  }
+}
+CPDF_AnnotList::~CPDF_AnnotList() {
+  int i = 0;
+  for (i = 0; i < m_AnnotList.GetSize(); ++i) {
+    delete (CPDF_Annot*)m_AnnotList[i];
+  }
+  for (i = 0; i < m_Borders.GetSize(); ++i) {
+    delete (CPDF_PageObjects*)m_Borders[i];
+  }
 }
-CPDF_AnnotList::~CPDF_AnnotList()
-{
-    int i = 0;
-    for (i = 0; i < m_AnnotList.GetSize(); ++i) {
-        delete (CPDF_Annot*)m_AnnotList[i];
+void CPDF_AnnotList::DisplayPass(const CPDF_Page* pPage,
+                                 CFX_RenderDevice* pDevice,
+                                 CPDF_RenderContext* pContext,
+                                 FX_BOOL bPrinting,
+                                 CFX_AffineMatrix* pMatrix,
+                                 FX_BOOL bWidgetPass,
+                                 CPDF_RenderOptions* pOptions,
+                                 FX_RECT* clip_rect) {
+  for (int i = 0; i < m_AnnotList.GetSize(); ++i) {
+    CPDF_Annot* pAnnot = (CPDF_Annot*)m_AnnotList[i];
+    FX_BOOL bWidget = pAnnot->GetSubType() == "Widget";
+    if ((bWidgetPass && !bWidget) || (!bWidgetPass && bWidget)) {
+      continue;
     }
-    for (i = 0; i < m_Borders.GetSize(); ++i) {
-        delete (CPDF_PageObjects*)m_Borders[i];
+    FX_DWORD annot_flags = pAnnot->GetFlags();
+    if (annot_flags & ANNOTFLAG_HIDDEN) {
+      continue;
     }
-}
-void CPDF_AnnotList::DisplayPass(const CPDF_Page* pPage, CFX_RenderDevice* pDevice,
-                                 CPDF_RenderContext* pContext, FX_BOOL bPrinting, CFX_AffineMatrix* pMatrix,
-                                 FX_BOOL bWidgetPass, CPDF_RenderOptions* pOptions, FX_RECT* clip_rect)
-{
-    for (int i = 0; i < m_AnnotList.GetSize(); ++i) {
-        CPDF_Annot* pAnnot = (CPDF_Annot*)m_AnnotList[i];
-        FX_BOOL bWidget = pAnnot->GetSubType() == "Widget";
-        if ((bWidgetPass && !bWidget) || (!bWidgetPass && bWidget)) {
-            continue;
-        }
-        FX_DWORD annot_flags = pAnnot->GetFlags();
-        if (annot_flags & ANNOTFLAG_HIDDEN) {
-            continue;
-        }
-        if (bPrinting && (annot_flags & ANNOTFLAG_PRINT) == 0) {
-            continue;
-        }
-        if (!bPrinting && (annot_flags & ANNOTFLAG_NOVIEW)) {
-            continue;
-        }
-        if (pOptions != NULL) {
-            IPDF_OCContext* pOCContext = pOptions->m_pOCContext;
-            CPDF_Dictionary* pAnnotDict = pAnnot->GetAnnotDict();
-            if (pOCContext != NULL && pAnnotDict != NULL &&
-                    !pOCContext->CheckOCGVisible(pAnnotDict->GetDict(FX_BSTRC("OC")))) {
-                continue;
-            }
-        }
-        CPDF_Rect annot_rect_f;
-        pAnnot->GetRect(annot_rect_f);
-        CFX_Matrix matrix;
-        matrix = *pMatrix;
-        if (clip_rect) {
-            annot_rect_f.Transform(&matrix);
-            FX_RECT annot_rect = annot_rect_f.GetOutterRect();
-            annot_rect.Intersect(*clip_rect);
-            if (annot_rect.IsEmpty()) {
-                continue;
-            }
-        }
-        if (pContext) {
-            pAnnot->DrawInContext(pPage, pContext, &matrix, CPDF_Annot::Normal);
-        } else if (!pAnnot->DrawAppearance(pPage, pDevice, &matrix, CPDF_Annot::Normal, pOptions)) {
-            pAnnot->DrawBorder(pDevice, &matrix, pOptions);
-        }
+    if (bPrinting && (annot_flags & ANNOTFLAG_PRINT) == 0) {
+      continue;
     }
-}
-void CPDF_AnnotList::DisplayAnnots(const CPDF_Page* pPage, CFX_RenderDevice* pDevice,
-                                   CFX_AffineMatrix* pUser2Device,
-                                   FX_BOOL bShowWidget, CPDF_RenderOptions* pOptions)
-{
-    FX_RECT clip_rect;
-    if (pDevice) {
-        clip_rect = pDevice->GetClipBox();
+    if (!bPrinting && (annot_flags & ANNOTFLAG_NOVIEW)) {
+      continue;
     }
-    FX_BOOL bPrinting = pDevice->GetDeviceClass() == FXDC_PRINTER || (pOptions && (pOptions->m_Flags & RENDER_PRINTPREVIEW));
-    DisplayAnnots(pPage, pDevice, NULL, bPrinting, pUser2Device, bShowWidget ? 3 : 1, pOptions, &clip_rect);
-}
-void CPDF_AnnotList::DisplayAnnots(const CPDF_Page* pPage, CFX_RenderDevice* pDevice, CPDF_RenderContext* pContext,
-                                   FX_BOOL bPrinting, CFX_AffineMatrix* pUser2Device, FX_DWORD dwAnnotFlags,
-                                   CPDF_RenderOptions* pOptions, FX_RECT* pClipRect)
-{
-    if (dwAnnotFlags & 0x01) {
-        DisplayPass(pPage, pDevice, pContext, bPrinting, pUser2Device, FALSE, pOptions, pClipRect);
+    if (pOptions != NULL) {
+      IPDF_OCContext* pOCContext = pOptions->m_pOCContext;
+      CPDF_Dictionary* pAnnotDict = pAnnot->GetAnnotDict();
+      if (pOCContext != NULL && pAnnotDict != NULL &&
+          !pOCContext->CheckOCGVisible(pAnnotDict->GetDict(FX_BSTRC("OC")))) {
+        continue;
+      }
     }
-    if (dwAnnotFlags & 0x02) {
-        DisplayPass(pPage, pDevice, pContext, bPrinting, pUser2Device, TRUE, pOptions, pClipRect);
+    CPDF_Rect annot_rect_f;
+    pAnnot->GetRect(annot_rect_f);
+    CFX_Matrix matrix;
+    matrix = *pMatrix;
+    if (clip_rect) {
+      annot_rect_f.Transform(&matrix);
+      FX_RECT annot_rect = annot_rect_f.GetOutterRect();
+      annot_rect.Intersect(*clip_rect);
+      if (annot_rect.IsEmpty()) {
+        continue;
+      }
+    }
+    if (pContext) {
+      pAnnot->DrawInContext(pPage, pContext, &matrix, CPDF_Annot::Normal);
+    } else if (!pAnnot->DrawAppearance(pPage, pDevice, &matrix,
+                                       CPDF_Annot::Normal, pOptions)) {
+      pAnnot->DrawBorder(pDevice, &matrix, pOptions);
     }
+  }
 }
-int CPDF_AnnotList::GetIndex(CPDF_Annot* pAnnot)
-{
-    for (int i = 0; i < m_AnnotList.GetSize(); ++i)
-        if (m_AnnotList[i] == (void*)pAnnot) {
-            return i;
-        }
-    return -1;
+void CPDF_AnnotList::DisplayAnnots(const CPDF_Page* pPage,
+                                   CFX_RenderDevice* pDevice,
+                                   CFX_AffineMatrix* pUser2Device,
+                                   FX_BOOL bShowWidget,
+                                   CPDF_RenderOptions* pOptions) {
+  FX_RECT clip_rect;
+  if (pDevice) {
+    clip_rect = pDevice->GetClipBox();
+  }
+  FX_BOOL bPrinting = pDevice->GetDeviceClass() == FXDC_PRINTER ||
+                      (pOptions && (pOptions->m_Flags & RENDER_PRINTPREVIEW));
+  DisplayAnnots(pPage, pDevice, NULL, bPrinting, pUser2Device,
+                bShowWidget ? 3 : 1, pOptions, &clip_rect);
+}
+void CPDF_AnnotList::DisplayAnnots(const CPDF_Page* pPage,
+                                   CFX_RenderDevice* pDevice,
+                                   CPDF_RenderContext* pContext,
+                                   FX_BOOL bPrinting,
+                                   CFX_AffineMatrix* pUser2Device,
+                                   FX_DWORD dwAnnotFlags,
+                                   CPDF_RenderOptions* pOptions,
+                                   FX_RECT* pClipRect) {
+  if (dwAnnotFlags & 0x01) {
+    DisplayPass(pPage, pDevice, pContext, bPrinting, pUser2Device, FALSE,
+                pOptions, pClipRect);
+  }
+  if (dwAnnotFlags & 0x02) {
+    DisplayPass(pPage, pDevice, pContext, bPrinting, pUser2Device, TRUE,
+                pOptions, pClipRect);
+  }
+}
+int CPDF_AnnotList::GetIndex(CPDF_Annot* pAnnot) {
+  for (int i = 0; i < m_AnnotList.GetSize(); ++i)
+    if (m_AnnotList[i] == (void*)pAnnot) {
+      return i;
+    }
+  return -1;
 }
 CPDF_Annot::CPDF_Annot(CPDF_Dictionary* pDict, CPDF_AnnotList* pList)
     : m_pAnnotDict(pDict),
       m_pList(pList),
-      m_sSubtype(m_pAnnotDict->GetConstString(FX_BSTRC("Subtype")))
-{
-}
-CPDF_Annot::~CPDF_Annot()
-{
-    ClearCachedAP();
+      m_sSubtype(m_pAnnotDict->GetConstString(FX_BSTRC("Subtype"))) {}
+CPDF_Annot::~CPDF_Annot() {
+  ClearCachedAP();
 }
-void CPDF_Annot::ClearCachedAP()
-{
-    FX_POSITION pos = m_APMap.GetStartPosition();
-    while (pos) {
-        void* pForm;
-        void* pObjects;
-        m_APMap.GetNextAssoc(pos, pForm, pObjects);
-        delete (CPDF_PageObjects*)pObjects;
-    }
-    m_APMap.RemoveAll();
+void CPDF_Annot::ClearCachedAP() {
+  FX_POSITION pos = m_APMap.GetStartPosition();
+  while (pos) {
+    void* pForm;
+    void* pObjects;
+    m_APMap.GetNextAssoc(pos, pForm, pObjects);
+    delete (CPDF_PageObjects*)pObjects;
+  }
+  m_APMap.RemoveAll();
 }
-CFX_ByteString CPDF_Annot::GetSubType() const
-{
-    return m_sSubtype;
+CFX_ByteString CPDF_Annot::GetSubType() const {
+  return m_sSubtype;
 }
 
-void CPDF_Annot::GetRect(CPDF_Rect& rect) const
-{
-    if (m_pAnnotDict == NULL) {
-        return;
-    }
-    rect = m_pAnnotDict->GetRect("Rect");
-    rect.Normalize();
+void CPDF_Annot::GetRect(CPDF_Rect& rect) const {
+  if (m_pAnnotDict == NULL) {
+    return;
+  }
+  rect = m_pAnnotDict->GetRect("Rect");
+  rect.Normalize();
 }
 
-FX_DWORD CPDF_Annot::GetFlags() const
-{
-    return m_pAnnotDict->GetInteger("F");
+FX_DWORD CPDF_Annot::GetFlags() const {
+  return m_pAnnotDict->GetInteger("F");
 }
 
-CPDF_Dictionary* CPDF_Annot::GetAnnotDict()
-{
-    return m_pAnnotDict;
+CPDF_Dictionary* CPDF_Annot::GetAnnotDict() {
+  return m_pAnnotDict;
 }
 
-CPDF_Stream* FPDFDOC_GetAnnotAP(CPDF_Dictionary* pAnnotDict, CPDF_Annot::AppearanceMode mode)
-{
-    CPDF_Dictionary* pAP = pAnnotDict->GetDict("AP");
-    if (pAP == NULL) {
-        return NULL;
-    }
-    const FX_CHAR* ap_entry = "N";
-    if (mode == CPDF_Annot::Down) {
-        ap_entry = "D";
-    } else if (mode == CPDF_Annot::Rollover) {
-        ap_entry = "R";
-    }
-    if (!pAP->KeyExist(ap_entry)) {
-        ap_entry = "N";
-    }
-    CPDF_Object* psub = pAP->GetElementValue(ap_entry);
-    if (psub == NULL) {
-        return NULL;
+CPDF_Stream* FPDFDOC_GetAnnotAP(CPDF_Dictionary* pAnnotDict,
+                                CPDF_Annot::AppearanceMode mode) {
+  CPDF_Dictionary* pAP = pAnnotDict->GetDict("AP");
+  if (pAP == NULL) {
+    return NULL;
+  }
+  const FX_CHAR* ap_entry = "N";
+  if (mode == CPDF_Annot::Down) {
+    ap_entry = "D";
+  } else if (mode == CPDF_Annot::Rollover) {
+    ap_entry = "R";
+  }
+  if (!pAP->KeyExist(ap_entry)) {
+    ap_entry = "N";
+  }
+  CPDF_Object* psub = pAP->GetElementValue(ap_entry);
+  if (psub == NULL) {
+    return NULL;
+  }
+  CPDF_Stream* pStream = NULL;
+  if (psub->GetType() == PDFOBJ_STREAM) {
+    pStream = (CPDF_Stream*)psub;
+  } else if (psub->GetType() == PDFOBJ_DICTIONARY) {
+    CFX_ByteString as = pAnnotDict->GetString("AS");
+    if (as.IsEmpty()) {
+      CFX_ByteString value = pAnnotDict->GetString(FX_BSTRC("V"));
+      if (value.IsEmpty()) {
+        CPDF_Dictionary* pDict = pAnnotDict->GetDict(FX_BSTRC("Parent"));
+        value = pDict ? pDict->GetString(FX_BSTRC("V")) : CFX_ByteString();
+      }
+      if (value.IsEmpty() || !((CPDF_Dictionary*)psub)->KeyExist(value)) {
+        as = FX_BSTRC("Off");
+      } else {
+        as = value;
+      }
     }
-    CPDF_Stream* pStream = NULL;
-    if (psub->GetType() == PDFOBJ_STREAM) {
-        pStream = (CPDF_Stream*)psub;
-    } else if (psub->GetType() == PDFOBJ_DICTIONARY) {
-        CFX_ByteString as = pAnnotDict->GetString("AS");
-        if (as.IsEmpty()) {
-            CFX_ByteString value = pAnnotDict->GetString(FX_BSTRC("V"));
-            if (value.IsEmpty()) {
-                CPDF_Dictionary* pDict = pAnnotDict->GetDict(FX_BSTRC("Parent"));
-                value = pDict ? pDict->GetString(FX_BSTRC("V")) : CFX_ByteString();
-            }
-            if (value.IsEmpty() || !((CPDF_Dictionary*)psub)->KeyExist(value)) {
-                as = FX_BSTRC("Off");
-            } else {
-                as = value;
-            }
-        }
-        pStream = ((CPDF_Dictionary*)psub)->GetStream(as);
-    }
-    return pStream;
+    pStream = ((CPDF_Dictionary*)psub)->GetStream(as);
+  }
+  return pStream;
 }
-CPDF_Form* CPDF_Annot::GetAPForm(const CPDF_Page* pPage, AppearanceMode mode)
-{
-    CPDF_Stream* pStream = FPDFDOC_GetAnnotAP(m_pAnnotDict, mode);
-    if (pStream == NULL) {
-        return NULL;
-    }
-    CPDF_Form* pForm;
-    if (m_APMap.Lookup(pStream, (void*&)pForm)) {
-        return pForm;
-    }
-    pForm = new CPDF_Form(m_pList->m_pDocument, pPage->m_pResources, pStream);
-    pForm->ParseContent(NULL, NULL, NULL, NULL);
-    m_APMap.SetAt(pStream, pForm);
+CPDF_Form* CPDF_Annot::GetAPForm(const CPDF_Page* pPage, AppearanceMode mode) {
+  CPDF_Stream* pStream = FPDFDOC_GetAnnotAP(m_pAnnotDict, mode);
+  if (pStream == NULL) {
+    return NULL;
+  }
+  CPDF_Form* pForm;
+  if (m_APMap.Lookup(pStream, (void*&)pForm)) {
     return pForm;
+  }
+  pForm = new CPDF_Form(m_pList->m_pDocument, pPage->m_pResources, pStream);
+  pForm->ParseContent(NULL, NULL, NULL, NULL);
+  m_APMap.SetAt(pStream, pForm);
+  return pForm;
 }
-static CPDF_Form* FPDFDOC_Annot_GetMatrix(const CPDF_Page* pPage, CPDF_Annot* pAnnot, CPDF_Annot::AppearanceMode mode, const CFX_AffineMatrix* pUser2Device, CFX_Matrix &matrix)
-{
-    CPDF_Form* pForm = pAnnot->GetAPForm(pPage, mode);
-    if (!pForm) {
-        return NULL;
-    }
-    CFX_FloatRect form_bbox = pForm->m_pFormDict->GetRect(FX_BSTRC("BBox"));
-    CFX_Matrix form_matrix = pForm->m_pFormDict->GetMatrix(FX_BSTRC("Matrix"));
-    form_matrix.TransformRect(form_bbox);
-    CPDF_Rect arect;
-    pAnnot->GetRect(arect);
-    matrix.MatchRect(arect, form_bbox);
-    matrix.Concat(*pUser2Device);
-    return pForm;
+static CPDF_Form* FPDFDOC_Annot_GetMatrix(const CPDF_Page* pPage,
+                                          CPDF_Annot* pAnnot,
+                                          CPDF_Annot::AppearanceMode mode,
+                                          const CFX_AffineMatrix* pUser2Device,
+                                          CFX_Matrix& matrix) {
+  CPDF_Form* pForm = pAnnot->GetAPForm(pPage, mode);
+  if (!pForm) {
+    return NULL;
+  }
+  CFX_FloatRect form_bbox = pForm->m_pFormDict->GetRect(FX_BSTRC("BBox"));
+  CFX_Matrix form_matrix = pForm->m_pFormDict->GetMatrix(FX_BSTRC("Matrix"));
+  form_matrix.TransformRect(form_bbox);
+  CPDF_Rect arect;
+  pAnnot->GetRect(arect);
+  matrix.MatchRect(arect, form_bbox);
+  matrix.Concat(*pUser2Device);
+  return pForm;
 }
-FX_BOOL CPDF_Annot::DrawAppearance(const CPDF_Page* pPage, CFX_RenderDevice* pDevice, const CFX_AffineMatrix* pUser2Device,
-                                   AppearanceMode mode, const CPDF_RenderOptions* pOptions)
-{
-    CFX_Matrix matrix;
-    CPDF_Form* pForm = FPDFDOC_Annot_GetMatrix(pPage, this, mode, pUser2Device, matrix);
-    if (!pForm) {
-        return FALSE;
-    }
-    CPDF_RenderContext context;
-    context.Create((CPDF_Page*)pPage);
-    context.DrawObjectList(pDevice, pForm, &matrix, pOptions);
-    return TRUE;
+FX_BOOL CPDF_Annot::DrawAppearance(const CPDF_Page* pPage,
+                                   CFX_RenderDevice* pDevice,
+                                   const CFX_AffineMatrix* pUser2Device,
+                                   AppearanceMode mode,
+                                   const CPDF_RenderOptions* pOptions) {
+  CFX_Matrix matrix;
+  CPDF_Form* pForm =
+      FPDFDOC_Annot_GetMatrix(pPage, this, mode, pUser2Device, matrix);
+  if (!pForm) {
+    return FALSE;
+  }
+  CPDF_RenderContext context;
+  context.Create((CPDF_Page*)pPage);
+  context.DrawObjectList(pDevice, pForm, &matrix, pOptions);
+  return TRUE;
 }
-FX_BOOL CPDF_Annot::DrawInContext(const CPDF_Page* pPage, const CPDF_RenderContext* pContext, const CFX_AffineMatrix* pUser2Device, AppearanceMode mode)
-{
-    CFX_Matrix matrix;
-    CPDF_Form* pForm = FPDFDOC_Annot_GetMatrix(pPage, this, mode, pUser2Device, matrix);
-    if (!pForm) {
-        return FALSE;
-    }
-    ((CPDF_RenderContext*)pContext)->AppendObjectList(pForm, &matrix);
-    return TRUE;
+FX_BOOL CPDF_Annot::DrawInContext(const CPDF_Page* pPage,
+                                  const CPDF_RenderContext* pContext,
+                                  const CFX_AffineMatrix* pUser2Device,
+                                  AppearanceMode mode) {
+  CFX_Matrix matrix;
+  CPDF_Form* pForm =
+      FPDFDOC_Annot_GetMatrix(pPage, this, mode, pUser2Device, matrix);
+  if (!pForm) {
+    return FALSE;
+  }
+  ((CPDF_RenderContext*)pContext)->AppendObjectList(pForm, &matrix);
+  return TRUE;
 }
-void CPDF_Annot::DrawBorder(CFX_RenderDevice* pDevice, const CFX_AffineMatrix* pUser2Device, const CPDF_RenderOptions* pOptions)
-{
-    if (GetSubType() == "Popup") {
-        return;
-    }
-    FX_DWORD annot_flags = GetFlags();
-    if (annot_flags & ANNOTFLAG_HIDDEN) {
-        return;
-    }
-    FX_BOOL bPrinting = pDevice->GetDeviceClass() == FXDC_PRINTER || (pOptions && (pOptions->m_Flags & RENDER_PRINTPREVIEW));
-    if (bPrinting && (annot_flags & ANNOTFLAG_PRINT) == 0) {
-        return;
-    }
-    if (!bPrinting && (annot_flags & ANNOTFLAG_NOVIEW)) {
-        return;
-    }
-    CPDF_Dictionary* pBS = m_pAnnotDict->GetDict("BS");
-    char style_char;
-    FX_FLOAT width;
-    CPDF_Array* pDashArray = NULL;
-    if (pBS == NULL) {
-        CPDF_Array* pBorderArray = m_pAnnotDict->GetArray("Border");
-        style_char = 'S';
-        if (pBorderArray) {
-            width = pBorderArray->GetNumber(2);
-            if (pBorderArray->GetCount() == 4) {
-                pDashArray = pBorderArray->GetArray(3);
-                if (pDashArray == NULL) {
-                    return;
-                }
-                int nLen = pDashArray->GetCount();
-                int i = 0;
-                for (; i < nLen; ++i) {
-                    CPDF_Object*pObj = pDashArray->GetElementValue(i);
-                    if (pObj && pObj->GetInteger()) {
-                        break;
-                    }
-                }
-                if (i == nLen) {
-                    return;
-                }
-                style_char = 'D';
-            }
-        } else {
-            width = 1;
+void CPDF_Annot::DrawBorder(CFX_RenderDevice* pDevice,
+                            const CFX_AffineMatrix* pUser2Device,
+                            const CPDF_RenderOptions* pOptions) {
+  if (GetSubType() == "Popup") {
+    return;
+  }
+  FX_DWORD annot_flags = GetFlags();
+  if (annot_flags & ANNOTFLAG_HIDDEN) {
+    return;
+  }
+  FX_BOOL bPrinting = pDevice->GetDeviceClass() == FXDC_PRINTER ||
+                      (pOptions && (pOptions->m_Flags & RENDER_PRINTPREVIEW));
+  if (bPrinting && (annot_flags & ANNOTFLAG_PRINT) == 0) {
+    return;
+  }
+  if (!bPrinting && (annot_flags & ANNOTFLAG_NOVIEW)) {
+    return;
+  }
+  CPDF_Dictionary* pBS = m_pAnnotDict->GetDict("BS");
+  char style_char;
+  FX_FLOAT width;
+  CPDF_Array* pDashArray = NULL;
+  if (pBS == NULL) {
+    CPDF_Array* pBorderArray = m_pAnnotDict->GetArray("Border");
+    style_char = 'S';
+    if (pBorderArray) {
+      width = pBorderArray->GetNumber(2);
+      if (pBorderArray->GetCount() == 4) {
+        pDashArray = pBorderArray->GetArray(3);
+        if (pDashArray == NULL) {
+          return;
         }
-    } else {
-        CFX_ByteString style = pBS->GetString("S");
-        pDashArray = pBS->GetArray("D");
-        style_char = style[1];
-        width = pBS->GetNumber("W");
-    }
-    if (width <= 0) {
-        return;
-    }
-    CPDF_Array* pColor = m_pAnnotDict->GetArray("C");
-    FX_DWORD argb = 0xff000000;
-    if (pColor != NULL) {
-        int R = (int32_t)(pColor->GetNumber(0) * 255);
-        int G = (int32_t)(pColor->GetNumber(1) * 255);
-        int B = (int32_t)(pColor->GetNumber(2) * 255);
-        argb = ArgbEncode(0xff, R, G, B);
-    }
-    CPDF_GraphStateData graph_state;
-    graph_state.m_LineWidth = width;
-    if (style_char == 'D') {
-        if (pDashArray) {
-            FX_DWORD dash_count = pDashArray->GetCount();
-            if (dash_count % 2) {
-                dash_count++;
-            }
-            graph_state.m_DashArray = FX_Alloc(FX_FLOAT, dash_count);
-            graph_state.m_DashCount = dash_count;
-            FX_DWORD i;
-            for (i = 0; i < pDashArray->GetCount(); ++i) {
-                graph_state.m_DashArray[i] = pDashArray->GetNumber(i);
-            }
-            if (i < dash_count) {
-                graph_state.m_DashArray[i] = graph_state.m_DashArray[i - 1];
-            }
-        } else {
-            graph_state.m_DashArray = FX_Alloc(FX_FLOAT, 2);
-            graph_state.m_DashCount = 2;
-            graph_state.m_DashArray[0] = graph_state.m_DashArray[1] = 3 * 1.0f;
+        int nLen = pDashArray->GetCount();
+        int i = 0;
+        for (; i < nLen; ++i) {
+          CPDF_Object* pObj = pDashArray->GetElementValue(i);
+          if (pObj && pObj->GetInteger()) {
+            break;
+          }
         }
+        if (i == nLen) {
+          return;
+        }
+        style_char = 'D';
+      }
+    } else {
+      width = 1;
     }
-    CFX_FloatRect rect;
-    GetRect(rect);
-    CPDF_PathData path;
-    width /= 2;
-    path.AppendRect(rect.left + width, rect.bottom + width, rect.right - width, rect.top - width);
-    int fill_type = 0;
-    if (pOptions && (pOptions->m_Flags & RENDER_NOPATHSMOOTH)) {
-        fill_type |= FXFILL_NOPATHSMOOTH;
+  } else {
+    CFX_ByteString style = pBS->GetString("S");
+    pDashArray = pBS->GetArray("D");
+    style_char = style[1];
+    width = pBS->GetNumber("W");
+  }
+  if (width <= 0) {
+    return;
+  }
+  CPDF_Array* pColor = m_pAnnotDict->GetArray("C");
+  FX_DWORD argb = 0xff000000;
+  if (pColor != NULL) {
+    int R = (int32_t)(pColor->GetNumber(0) * 255);
+    int G = (int32_t)(pColor->GetNumber(1) * 255);
+    int B = (int32_t)(pColor->GetNumber(2) * 255);
+    argb = ArgbEncode(0xff, R, G, B);
+  }
+  CPDF_GraphStateData graph_state;
+  graph_state.m_LineWidth = width;
+  if (style_char == 'D') {
+    if (pDashArray) {
+      FX_DWORD dash_count = pDashArray->GetCount();
+      if (dash_count % 2) {
+        dash_count++;
+      }
+      graph_state.m_DashArray = FX_Alloc(FX_FLOAT, dash_count);
+      graph_state.m_DashCount = dash_count;
+      FX_DWORD i;
+      for (i = 0; i < pDashArray->GetCount(); ++i) {
+        graph_state.m_DashArray[i] = pDashArray->GetNumber(i);
+      }
+      if (i < dash_count) {
+        graph_state.m_DashArray[i] = graph_state.m_DashArray[i - 1];
+      }
+    } else {
+      graph_state.m_DashArray = FX_Alloc(FX_FLOAT, 2);
+      graph_state.m_DashCount = 2;
+      graph_state.m_DashArray[0] = graph_state.m_DashArray[1] = 3 * 1.0f;
     }
-    pDevice->DrawPath(&path, pUser2Device, &graph_state, argb, argb, fill_type);
+  }
+  CFX_FloatRect rect;
+  GetRect(rect);
+  CPDF_PathData path;
+  width /= 2;
+  path.AppendRect(rect.left + width, rect.bottom + width, rect.right - width,
+                  rect.top - width);
+  int fill_type = 0;
+  if (pOptions && (pOptions->m_Flags & RENDER_NOPATHSMOOTH)) {
+    fill_type |= FXFILL_NOPATHSMOOTH;
+  }
+  pDevice->DrawPath(&path, pUser2Device, &graph_state, argb, argb, fill_type);
 }
diff --git a/core/src/fpdfdoc/doc_ap.cpp b/core/src/fpdfdoc/doc_ap.cpp
index f94a4d60e0..feedb32989 100644
--- a/core/src/fpdfdoc/doc_ap.cpp
+++ b/core/src/fpdfdoc/doc_ap.cpp
@@ -8,803 +8,923 @@
 #include "../../include/fpdfdoc/fpdf_vt.h"
 #include "pdf_vt.h"
 #include "../../include/fpdfdoc/fpdf_ap.h"
-FX_BOOL FPDF_GenerateAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict)
-{
-    if (!pAnnotDict || pAnnotDict->GetConstString("Subtype") != FX_BSTRC("Widget")) {
-        return FALSE;
-    }
-    CFX_ByteString field_type = FPDF_GetFieldAttr(pAnnotDict, "FT")->GetString();
-    FX_DWORD flags = FPDF_GetFieldAttr(pAnnotDict, "Ff")? FPDF_GetFieldAttr(pAnnotDict, "Ff")->GetInteger() : 0;
-    if (field_type == "Tx") {
-        return CPVT_GenerateAP::GenerateTextFieldAP(pDoc, pAnnotDict);
-    }
-    if (field_type == "Ch") {
-        return (flags & (1 << 17)) ?
-                CPVT_GenerateAP::GenerateComboBoxAP(pDoc, pAnnotDict) :
-                CPVT_GenerateAP::GenerateListBoxAP(pDoc, pAnnotDict);
-    }
-    if (field_type == "Btn") {
-        if (!(flags & (1 << 16))) {
-            if (!pAnnotDict->KeyExist("AS")) {
-                if (CPDF_Dictionary* pParentDict = pAnnotDict->GetDict("Parent")) {
-                    if (pParentDict->KeyExist("AS")) {
-                        pAnnotDict->SetAtString("AS", pParentDict->GetString("AS"));
-                    }
-                }
-            }
+FX_BOOL FPDF_GenerateAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict) {
+  if (!pAnnotDict ||
+      pAnnotDict->GetConstString("Subtype") != FX_BSTRC("Widget")) {
+    return FALSE;
+  }
+  CFX_ByteString field_type = FPDF_GetFieldAttr(pAnnotDict, "FT")->GetString();
+  FX_DWORD flags = FPDF_GetFieldAttr(pAnnotDict, "Ff")
+                       ? FPDF_GetFieldAttr(pAnnotDict, "Ff")->GetInteger()
+                       : 0;
+  if (field_type == "Tx") {
+    return CPVT_GenerateAP::GenerateTextFieldAP(pDoc, pAnnotDict);
+  }
+  if (field_type == "Ch") {
+    return (flags & (1 << 17))
+               ? CPVT_GenerateAP::GenerateComboBoxAP(pDoc, pAnnotDict)
+               : CPVT_GenerateAP::GenerateListBoxAP(pDoc, pAnnotDict);
+  }
+  if (field_type == "Btn") {
+    if (!(flags & (1 << 16))) {
+      if (!pAnnotDict->KeyExist("AS")) {
+        if (CPDF_Dictionary* pParentDict = pAnnotDict->GetDict("Parent")) {
+          if (pParentDict->KeyExist("AS")) {
+            pAnnotDict->SetAtString("AS", pParentDict->GetString("AS"));
+          }
         }
+      }
     }
-    return FALSE;
+  }
+  return FALSE;
 }
-class CPVT_FontMap : public IPVT_FontMap
-{
-public:
-    CPVT_FontMap(CPDF_Document * pDoc, CPDF_Dictionary * pResDict, CPDF_Font * pDefFont,
-                 const CFX_ByteString & sDefFontAlias);
-    virtual ~CPVT_FontMap();
-    CPDF_Font*						GetPDFFont(int32_t nFontIndex);
-    CFX_ByteString					GetPDFFontAlias(int32_t nFontIndex);
-    static void						GetAnnotSysPDFFont(CPDF_Document * pDoc, CPDF_Dictionary * pResDict,
-            CPDF_Font * & pSysFont, CFX_ByteString & sSysFontAlias);
-private:
-    CPDF_Document*					m_pDocument;
-    CPDF_Dictionary*				m_pResDict;
-    CPDF_Font*						m_pDefFont;
-    CFX_ByteString					m_sDefFontAlias;
-    CPDF_Font*						m_pSysFont;
-    CFX_ByteString					m_sSysFontAlias;
+class CPVT_FontMap : public IPVT_FontMap {
+ public:
+  CPVT_FontMap(CPDF_Document* pDoc,
+               CPDF_Dictionary* pResDict,
+               CPDF_Font* pDefFont,
+               const CFX_ByteString& sDefFontAlias);
+  virtual ~CPVT_FontMap();
+  CPDF_Font* GetPDFFont(int32_t nFontIndex);
+  CFX_ByteString GetPDFFontAlias(int32_t nFontIndex);
+  static void GetAnnotSysPDFFont(CPDF_Document* pDoc,
+                                 CPDF_Dictionary* pResDict,
+                                 CPDF_Font*& pSysFont,
+                                 CFX_ByteString& sSysFontAlias);
+
+ private:
+  CPDF_Document* m_pDocument;
+  CPDF_Dictionary* m_pResDict;
+  CPDF_Font* m_pDefFont;
+  CFX_ByteString m_sDefFontAlias;
+  CPDF_Font* m_pSysFont;
+  CFX_ByteString m_sSysFontAlias;
 };
-CPVT_FontMap::CPVT_FontMap(CPDF_Document * pDoc, CPDF_Dictionary * pResDict, CPDF_Font * pDefFont,
-                           const CFX_ByteString & sDefFontAlias) :
-    m_pDocument(pDoc),
-    m_pResDict(pResDict),
-    m_pDefFont(pDefFont),
-    m_sDefFontAlias(sDefFontAlias),
-    m_pSysFont(NULL),
-    m_sSysFontAlias()
-{
-}
-CPVT_FontMap::~CPVT_FontMap()
-{
-}
-extern CPDF_Font*		AddNativeInterFormFont(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument, CFX_ByteString& csNameTag);
-void CPVT_FontMap::GetAnnotSysPDFFont(CPDF_Document * pDoc, CPDF_Dictionary * pResDict,
-                                      CPDF_Font * & pSysFont, CFX_ByteString & sSysFontAlias)
-{
-    if (pDoc && pResDict) {
-        CFX_ByteString sFontAlias;
-        CPDF_Dictionary* pFormDict = pDoc->GetRoot()->GetDict("AcroForm");
-        if (CPDF_Font * pPDFFont = AddNativeInterFormFont(pFormDict, pDoc, sSysFontAlias)) {
-            if (CPDF_Dictionary * pFontList = pResDict->GetDict("Font")) {
-                if (!pFontList->KeyExist(sSysFontAlias)) {
-                    pFontList->SetAtReference(sSysFontAlias, pDoc, pPDFFont->GetFontDict());
-                }
-            }
-            pSysFont = pPDFFont;
+CPVT_FontMap::CPVT_FontMap(CPDF_Document* pDoc,
+                           CPDF_Dictionary* pResDict,
+                           CPDF_Font* pDefFont,
+                           const CFX_ByteString& sDefFontAlias)
+    : m_pDocument(pDoc),
+      m_pResDict(pResDict),
+      m_pDefFont(pDefFont),
+      m_sDefFontAlias(sDefFontAlias),
+      m_pSysFont(NULL),
+      m_sSysFontAlias() {}
+CPVT_FontMap::~CPVT_FontMap() {}
+extern CPDF_Font* AddNativeInterFormFont(CPDF_Dictionary*& pFormDict,
+                                         CPDF_Document* pDocument,
+                                         CFX_ByteString& csNameTag);
+void CPVT_FontMap::GetAnnotSysPDFFont(CPDF_Document* pDoc,
+                                      CPDF_Dictionary* pResDict,
+                                      CPDF_Font*& pSysFont,
+                                      CFX_ByteString& sSysFontAlias) {
+  if (pDoc && pResDict) {
+    CFX_ByteString sFontAlias;
+    CPDF_Dictionary* pFormDict = pDoc->GetRoot()->GetDict("AcroForm");
+    if (CPDF_Font* pPDFFont =
+            AddNativeInterFormFont(pFormDict, pDoc, sSysFontAlias)) {
+      if (CPDF_Dictionary* pFontList = pResDict->GetDict("Font")) {
+        if (!pFontList->KeyExist(sSysFontAlias)) {
+          pFontList->SetAtReference(sSysFontAlias, pDoc,
+                                    pPDFFont->GetFontDict());
         }
+      }
+      pSysFont = pPDFFont;
     }
+  }
 }
-CPDF_Font* CPVT_FontMap::GetPDFFont(int32_t nFontIndex)
-{
-    switch (nFontIndex) {
-        case 0:
-            return m_pDefFont;
-        case 1:
-            if (!m_pSysFont) {
-                GetAnnotSysPDFFont(m_pDocument, m_pResDict, m_pSysFont, m_sSysFontAlias);
-            }
-            return m_pSysFont;
-    }
-    return NULL;
+CPDF_Font* CPVT_FontMap::GetPDFFont(int32_t nFontIndex) {
+  switch (nFontIndex) {
+    case 0:
+      return m_pDefFont;
+    case 1:
+      if (!m_pSysFont) {
+        GetAnnotSysPDFFont(m_pDocument, m_pResDict, m_pSysFont,
+                           m_sSysFontAlias);
+      }
+      return m_pSysFont;
+  }
+  return NULL;
 }
-CFX_ByteString CPVT_FontMap::GetPDFFontAlias(int32_t nFontIndex)
-{
-    switch (nFontIndex) {
-        case 0:
-            return m_sDefFontAlias;
-        case 1:
-            if (!m_pSysFont) {
-                GetAnnotSysPDFFont(m_pDocument, m_pResDict, m_pSysFont, m_sSysFontAlias);
-            }
-            return m_sSysFontAlias;
-    }
-    return "";
+CFX_ByteString CPVT_FontMap::GetPDFFontAlias(int32_t nFontIndex) {
+  switch (nFontIndex) {
+    case 0:
+      return m_sDefFontAlias;
+    case 1:
+      if (!m_pSysFont) {
+        GetAnnotSysPDFFont(m_pDocument, m_pResDict, m_pSysFont,
+                           m_sSysFontAlias);
+      }
+      return m_sSysFontAlias;
+  }
+  return "";
 }
-CPVT_Provider::CPVT_Provider(IPVT_FontMap * pFontMap) : m_pFontMap(pFontMap)
-{
-    ASSERT (m_pFontMap != NULL);
+CPVT_Provider::CPVT_Provider(IPVT_FontMap* pFontMap) : m_pFontMap(pFontMap) {
+  ASSERT(m_pFontMap != NULL);
 }
-CPVT_Provider::~CPVT_Provider()
-{
-}
-int32_t CPVT_Provider::GetCharWidth(int32_t nFontIndex, FX_WORD word, int32_t nWordStyle)
-{
-    if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex)) {
-        FX_DWORD charcode = pPDFFont->CharCodeFromUnicode(word);
-        if (charcode != -1) {
-            return pPDFFont->GetCharWidthF(charcode);
-        }
-    }
-    return 0;
+CPVT_Provider::~CPVT_Provider() {}
+int32_t CPVT_Provider::GetCharWidth(int32_t nFontIndex,
+                                    FX_WORD word,
+                                    int32_t nWordStyle) {
+  if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex)) {
+    FX_DWORD charcode = pPDFFont->CharCodeFromUnicode(word);
+    if (charcode != -1) {
+      return pPDFFont->GetCharWidthF(charcode);
+    }
+  }
+  return 0;
 }
-int32_t CPVT_Provider::GetTypeAscent(int32_t nFontIndex)
-{
-    if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex)) {
-        return pPDFFont->GetTypeAscent();
-    }
-    return 0;
+int32_t CPVT_Provider::GetTypeAscent(int32_t nFontIndex) {
+  if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex)) {
+    return pPDFFont->GetTypeAscent();
+  }
+  return 0;
 }
-int32_t CPVT_Provider::GetTypeDescent(int32_t nFontIndex)
-{
-    if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex)) {
-        return pPDFFont->GetTypeDescent();
-    }
-    return 0;
+int32_t CPVT_Provider::GetTypeDescent(int32_t nFontIndex) {
+  if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex)) {
+    return pPDFFont->GetTypeDescent();
+  }
+  return 0;
 }
-int32_t CPVT_Provider::GetWordFontIndex(FX_WORD word, int32_t charset, int32_t nFontIndex)
-{
-    if (CPDF_Font* pDefFont = m_pFontMap->GetPDFFont(0)) {
-        if (pDefFont->CharCodeFromUnicode(word) != -1) {
-            return 0;
-        }
-    }
-    if (CPDF_Font* pSysFont = m_pFontMap->GetPDFFont(1))
-        if (pSysFont->CharCodeFromUnicode(word) != -1) {
-            return 1;
-        }
-    return -1;
+int32_t CPVT_Provider::GetWordFontIndex(FX_WORD word,
+                                        int32_t charset,
+                                        int32_t nFontIndex) {
+  if (CPDF_Font* pDefFont = m_pFontMap->GetPDFFont(0)) {
+    if (pDefFont->CharCodeFromUnicode(word) != -1) {
+      return 0;
+    }
+  }
+  if (CPDF_Font* pSysFont = m_pFontMap->GetPDFFont(1))
+    if (pSysFont->CharCodeFromUnicode(word) != -1) {
+      return 1;
+    }
+  return -1;
 }
-FX_BOOL CPVT_Provider::IsLatinWord(FX_WORD word)
-{
-    if ((word >= 0x61 && word <= 0x7A) || (word >= 0x41 && word <= 0x5A) || word == 0x2D || word == 0x27) {
-        return TRUE;
-    }
-    return FALSE;
+FX_BOOL CPVT_Provider::IsLatinWord(FX_WORD word) {
+  if ((word >= 0x61 && word <= 0x7A) || (word >= 0x41 && word <= 0x5A) ||
+      word == 0x2D || word == 0x27) {
+    return TRUE;
+  }
+  return FALSE;
 }
-int32_t CPVT_Provider::GetDefaultFontIndex()
-{
-    return 0;
+int32_t CPVT_Provider::GetDefaultFontIndex() {
+  return 0;
 }
-static CFX_ByteString GetPDFWordString(IPVT_FontMap * pFontMap, int32_t nFontIndex, FX_WORD Word, FX_WORD SubWord)
-{
-    CFX_ByteString sWord;
-    if (SubWord > 0) {
-        sWord.Format("%c", SubWord);
-    } else {
-        if (pFontMap) {
-            if (CPDF_Font * pPDFFont = pFontMap->GetPDFFont(nFontIndex)) {
-                if (pPDFFont->GetBaseFont().Compare("Symbol") == 0 || pPDFFont->GetBaseFont().Compare("ZapfDingbats") == 0) {
-                    sWord.Format("%c", Word);
-                } else {
-                    FX_DWORD dwCharCode = pPDFFont->CharCodeFromUnicode(Word);
-                    if (dwCharCode != -1) {
-                        pPDFFont->AppendChar(sWord, dwCharCode);
-                    }
-                }
-            }
+static CFX_ByteString GetPDFWordString(IPVT_FontMap* pFontMap,
+                                       int32_t nFontIndex,
+                                       FX_WORD Word,
+                                       FX_WORD SubWord) {
+  CFX_ByteString sWord;
+  if (SubWord > 0) {
+    sWord.Format("%c", SubWord);
+  } else {
+    if (pFontMap) {
+      if (CPDF_Font* pPDFFont = pFontMap->GetPDFFont(nFontIndex)) {
+        if (pPDFFont->GetBaseFont().Compare("Symbol") == 0 ||
+            pPDFFont->GetBaseFont().Compare("ZapfDingbats") == 0) {
+          sWord.Format("%c", Word);
+        } else {
+          FX_DWORD dwCharCode = pPDFFont->CharCodeFromUnicode(Word);
+          if (dwCharCode != -1) {
+            pPDFFont->AppendChar(sWord, dwCharCode);
+          }
         }
+      }
     }
-    return sWord;
+  }
+  return sWord;
 }
-static CFX_ByteString GetWordRenderString(const CFX_ByteString & strWords)
-{
-    if (strWords.GetLength() > 0) {
-        return PDF_EncodeString(strWords) + " Tj\n";
-    }
-    return "";
+static CFX_ByteString GetWordRenderString(const CFX_ByteString& strWords) {
+  if (strWords.GetLength() > 0) {
+    return PDF_EncodeString(strWords) + " Tj\n";
+  }
+  return "";
 }
-static CFX_ByteString GetFontSetString(IPVT_FontMap * pFontMap, int32_t nFontIndex, FX_FLOAT fFontSize)
-{
-    CFX_ByteTextBuf sRet;
-    if (pFontMap) {
-        CFX_ByteString sFontAlias = pFontMap->GetPDFFontAlias(nFontIndex);
-        if (sFontAlias.GetLength() > 0 && fFontSize > 0 ) {
-            sRet << "/" << sFontAlias << " " << fFontSize << " Tf\n";
-        }
-    }
-    return sRet.GetByteString();
+static CFX_ByteString GetFontSetString(IPVT_FontMap* pFontMap,
+                                       int32_t nFontIndex,
+                                       FX_FLOAT fFontSize) {
+  CFX_ByteTextBuf sRet;
+  if (pFontMap) {
+    CFX_ByteString sFontAlias = pFontMap->GetPDFFontAlias(nFontIndex);
+    if (sFontAlias.GetLength() > 0 && fFontSize > 0) {
+      sRet << "/" << sFontAlias << " " << fFontSize << " Tf\n";
+    }
+  }
+  return sRet.GetByteString();
 }
-static CPVT_Color ParseColor(const CFX_ByteString & str)
-{
-    CPDF_SimpleParser syntax(str);
-    syntax.SetPos(0);
-    if (syntax.FindTagParam("g", 1)) {
-        return CPVT_Color(CT_GRAY, FX_atof(syntax.GetWord()));
-    }
-    syntax.SetPos(0);
-    if (syntax.FindTagParam("rg", 3)) {
-        FX_FLOAT f1 = FX_atof(syntax.GetWord());
-        FX_FLOAT f2 = FX_atof(syntax.GetWord());
-        FX_FLOAT f3 = FX_atof(syntax.GetWord());
-        return CPVT_Color(CT_RGB, f1, f2, f3);
-    }
-    syntax.SetPos(0);
-    if (syntax.FindTagParam("k", 4)) {
-        FX_FLOAT f1 = FX_atof(syntax.GetWord());
-        FX_FLOAT f2 = FX_atof(syntax.GetWord());
-        FX_FLOAT f3 = FX_atof(syntax.GetWord());
-        FX_FLOAT f4 = FX_atof(syntax.GetWord());
-        return CPVT_Color(CT_CMYK, f1, f2, f3, f4);
-    }
-    return CPVT_Color(CT_TRANSPARENT);
+static CPVT_Color ParseColor(const CFX_ByteString& str) {
+  CPDF_SimpleParser syntax(str);
+  syntax.SetPos(0);
+  if (syntax.FindTagParam("g", 1)) {
+    return CPVT_Color(CT_GRAY, FX_atof(syntax.GetWord()));
+  }
+  syntax.SetPos(0);
+  if (syntax.FindTagParam("rg", 3)) {
+    FX_FLOAT f1 = FX_atof(syntax.GetWord());
+    FX_FLOAT f2 = FX_atof(syntax.GetWord());
+    FX_FLOAT f3 = FX_atof(syntax.GetWord());
+    return CPVT_Color(CT_RGB, f1, f2, f3);
+  }
+  syntax.SetPos(0);
+  if (syntax.FindTagParam("k", 4)) {
+    FX_FLOAT f1 = FX_atof(syntax.GetWord());
+    FX_FLOAT f2 = FX_atof(syntax.GetWord());
+    FX_FLOAT f3 = FX_atof(syntax.GetWord());
+    FX_FLOAT f4 = FX_atof(syntax.GetWord());
+    return CPVT_Color(CT_CMYK, f1, f2, f3, f4);
+  }
+  return CPVT_Color(CT_TRANSPARENT);
 }
-static CPVT_Color ParseColor(const CPDF_Array & array)
-{
-    CPVT_Color rt;
-    switch (array.GetCount()) {
-        case 1:
-            rt = CPVT_Color(CT_GRAY, array.GetFloat(0));
-            break;
-        case 3:
-            rt = CPVT_Color(CT_RGB, array.GetFloat(0), array.GetFloat(1), array.GetFloat(2));
-            break;
-        case 4:
-            rt = CPVT_Color(CT_CMYK, array.GetFloat(0), array.GetFloat(1), array.GetFloat(2), array.GetFloat(3));
-            break;
-    }
-    return rt;
+static CPVT_Color ParseColor(const CPDF_Array& array) {
+  CPVT_Color rt;
+  switch (array.GetCount()) {
+    case 1:
+      rt = CPVT_Color(CT_GRAY, array.GetFloat(0));
+      break;
+    case 3:
+      rt = CPVT_Color(CT_RGB, array.GetFloat(0), array.GetFloat(1),
+                      array.GetFloat(2));
+      break;
+    case 4:
+      rt = CPVT_Color(CT_CMYK, array.GetFloat(0), array.GetFloat(1),
+                      array.GetFloat(2), array.GetFloat(3));
+      break;
+  }
+  return rt;
 }
-static FX_BOOL GenerateWidgetAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict, const int32_t & nWidgetType)
-{
-    CPDF_Dictionary* pFormDict = NULL;
-    if (CPDF_Dictionary * pRootDict = pDoc->GetRoot()) {
-        pFormDict = pRootDict->GetDict("AcroForm");
-    }
-    if (!pFormDict) {
-        return FALSE;
-    }
-    CFX_ByteString DA;
-    if (CPDF_Object* pDAObj = FPDF_GetFieldAttr(pAnnotDict, "DA")) {
-        DA = pDAObj->GetString();
-    }
-    if (DA.IsEmpty()) {
-        DA = pFormDict->GetString("DA");
-    }
-    if (DA.IsEmpty()) {
-        return FALSE;
-    }
-    CPDF_SimpleParser syntax(DA);
-    syntax.FindTagParam("Tf", 2);
-    CFX_ByteString sFontName = syntax.GetWord();
-    sFontName = PDF_NameDecode(sFontName);
-    if (sFontName.IsEmpty()) {
-        return FALSE;
-    }
-    FX_FLOAT fFontSize = FX_atof(syntax.GetWord());
-    CPVT_Color crText = ParseColor(DA);
-    FX_BOOL bUseFormRes = FALSE;
-    CPDF_Dictionary * pFontDict = NULL;
-    CPDF_Dictionary* pDRDict = pAnnotDict->GetDict(FX_BSTRC("DR"));
-    if (pDRDict == NULL) {
-        pDRDict = pFormDict->GetDict(FX_BSTRC("DR"));
-        bUseFormRes = TRUE;
-    }
-    CPDF_Dictionary * pDRFontDict = NULL;
-    if (pDRDict && (pDRFontDict = pDRDict->GetDict("Font"))) {
+static FX_BOOL GenerateWidgetAP(CPDF_Document* pDoc,
+                                CPDF_Dictionary* pAnnotDict,
+                                const int32_t& nWidgetType) {
+  CPDF_Dictionary* pFormDict = NULL;
+  if (CPDF_Dictionary* pRootDict = pDoc->GetRoot()) {
+    pFormDict = pRootDict->GetDict("AcroForm");
+  }
+  if (!pFormDict) {
+    return FALSE;
+  }
+  CFX_ByteString DA;
+  if (CPDF_Object* pDAObj = FPDF_GetFieldAttr(pAnnotDict, "DA")) {
+    DA = pDAObj->GetString();
+  }
+  if (DA.IsEmpty()) {
+    DA = pFormDict->GetString("DA");
+  }
+  if (DA.IsEmpty()) {
+    return FALSE;
+  }
+  CPDF_SimpleParser syntax(DA);
+  syntax.FindTagParam("Tf", 2);
+  CFX_ByteString sFontName = syntax.GetWord();
+  sFontName = PDF_NameDecode(sFontName);
+  if (sFontName.IsEmpty()) {
+    return FALSE;
+  }
+  FX_FLOAT fFontSize = FX_atof(syntax.GetWord());
+  CPVT_Color crText = ParseColor(DA);
+  FX_BOOL bUseFormRes = FALSE;
+  CPDF_Dictionary* pFontDict = NULL;
+  CPDF_Dictionary* pDRDict = pAnnotDict->GetDict(FX_BSTRC("DR"));
+  if (pDRDict == NULL) {
+    pDRDict = pFormDict->GetDict(FX_BSTRC("DR"));
+    bUseFormRes = TRUE;
+  }
+  CPDF_Dictionary* pDRFontDict = NULL;
+  if (pDRDict && (pDRFontDict = pDRDict->GetDict("Font"))) {
+    pFontDict = pDRFontDict->GetDict(sFontName.Mid(1));
+    if (!pFontDict && !bUseFormRes) {
+      pDRDict = pFormDict->GetDict(FX_BSTRC("DR"));
+      pDRFontDict = pDRDict->GetDict("Font");
+      if (pDRFontDict) {
         pFontDict = pDRFontDict->GetDict(sFontName.Mid(1));
-        if (!pFontDict && !bUseFormRes) {
-            pDRDict = pFormDict->GetDict(FX_BSTRC("DR"));
-            pDRFontDict = pDRDict->GetDict("Font");
-            if (pDRFontDict) {
-                pFontDict = pDRFontDict->GetDict(sFontName.Mid(1));
-            }
-        }
-    }
-    if (!pDRFontDict) {
-        return FALSE;
-    }
-    if (!pFontDict) {
-        pFontDict = CPDF_Dictionary::Create();
-        if (pFontDict == NULL) {
-            return FALSE;
-        }
-        pFontDict->SetAtName(FX_BSTRC("Type"), "Font");
-        pFontDict->SetAtName(FX_BSTRC("Subtype"), "Type1");
-        pFontDict->SetAtName(FX_BSTRC("BaseFont"), "Helvetica");
-        pFontDict->SetAtName(FX_BSTRC("Encoding"), "WinAnsiEncoding");
-        pDoc->AddIndirectObject(pFontDict);
-        pDRFontDict->SetAtReference(sFontName.Mid(1), pDoc, pFontDict);
-    }
-    CPDF_Font* pDefFont = pDoc->LoadFont(pFontDict);
-    if (!pDefFont) {
-        return FALSE;
-    }
-    CPDF_Rect rcAnnot = pAnnotDict->GetRect("Rect");
-    int32_t nRotate = 0;
-    if (CPDF_Dictionary * pMKDict = pAnnotDict->GetDict("MK")) {
-        nRotate = pMKDict->GetInteger("R");
-    }
-    CPDF_Rect rcBBox;
-    CPDF_Matrix matrix;
-    switch (nRotate % 360) {
-        case 0:
-            rcBBox = CPDF_Rect(0, 0, rcAnnot.right - rcAnnot.left, rcAnnot.top - rcAnnot.bottom);
-            break;
-        case 90:
-            matrix = CPDF_Matrix(0, 1, -1, 0, rcAnnot.right - rcAnnot.left, 0);
-            rcBBox = CPDF_Rect(0, 0, rcAnnot.top - rcAnnot.bottom, rcAnnot.right - rcAnnot.left);
-            break;
-        case 180:
-            matrix = CPDF_Matrix(-1, 0, 0, -1, rcAnnot.right - rcAnnot.left, rcAnnot.top - rcAnnot.bottom);
-            rcBBox = CPDF_Rect(0, 0, rcAnnot.right - rcAnnot.left, rcAnnot.top - rcAnnot.bottom);
-            break;
-        case 270:
-            matrix = CPDF_Matrix(0, -1, 1, 0, 0, rcAnnot.top - rcAnnot.bottom);
-            rcBBox = CPDF_Rect(0, 0, rcAnnot.top - rcAnnot.bottom, rcAnnot.right - rcAnnot.left);
-            break;
-    }
-    int32_t nBorderStyle = PBS_SOLID;
-    FX_FLOAT fBorderWidth = 1;
-    CPVT_Dash dsBorder(3, 0, 0);
-    CPVT_Color crLeftTop, crRightBottom;
-    if (CPDF_Dictionary * pBSDict = pAnnotDict->GetDict("BS")) {
-        if (pBSDict->KeyExist("W")) {
-            fBorderWidth = pBSDict->GetNumber("W");
-        }
-        if (CPDF_Array * pArray = pBSDict->GetArray("D")) {
-            dsBorder = CPVT_Dash(pArray->GetInteger(0), pArray->GetInteger(1), pArray->GetInteger(2));
-        }
-        switch (pBSDict->GetString("S").GetAt(0)) {
-            case 'S':
-                nBorderStyle = PBS_SOLID;
-                break;
-            case 'D':
-                nBorderStyle = PBS_DASH;
-                break;
-            case 'B':
-                nBorderStyle = PBS_BEVELED;
-                fBorderWidth *= 2;
-                crLeftTop = CPVT_Color(CT_GRAY, 1);
-                crRightBottom = CPVT_Color(CT_GRAY, 0.5);
-                break;
-            case 'I':
-                nBorderStyle = PBS_INSET;
-                fBorderWidth *= 2;
-                crLeftTop = CPVT_Color(CT_GRAY, 0.5);
-                crRightBottom = CPVT_Color(CT_GRAY, 0.75);
-                break;
-            case 'U':
-                nBorderStyle = PBS_UNDERLINED;
-                break;
-        }
-    }
-    CPVT_Color crBorder, crBG;
-    if (CPDF_Dictionary * pMKDict = pAnnotDict->GetDict("MK")) {
-        if (CPDF_Array * pArray = pMKDict->GetArray("BC")) {
-            crBorder = ParseColor(*pArray);
-        }
-        if (CPDF_Array * pArray = pMKDict->GetArray("BG")) {
-            crBG = ParseColor(*pArray);
-        }
-    }
-    CFX_ByteTextBuf sAppStream;
-    CFX_ByteString sBG = CPVT_GenerateAP::GenerateColorAP(crBG, TRUE);
-    if (sBG.GetLength() > 0) {
-        sAppStream << "q\n" << sBG << rcBBox.left << " " << rcBBox.bottom << " "
-                   << rcBBox.Width() << " " << rcBBox.Height() << " re f\n" << "Q\n";
+      }
     }
-    CFX_ByteString sBorderStream = CPVT_GenerateAP::GenerateBorderAP(rcBBox, fBorderWidth,
-                                   crBorder, crLeftTop, crRightBottom, nBorderStyle, dsBorder);
-    if (sBorderStream.GetLength() > 0) {
-        sAppStream << "q\n" << sBorderStream << "Q\n";
-    }
-    CPDF_Rect rcBody = CPDF_Rect(rcBBox.left + fBorderWidth, rcBBox.bottom + fBorderWidth,
-                                 rcBBox.right - fBorderWidth, rcBBox.top - fBorderWidth);
-    rcBody.Normalize();
-    CPDF_Dictionary* pAPDict = pAnnotDict->GetDict("AP");
+  }
+  if (!pDRFontDict) {
+    return FALSE;
+  }
+  if (!pFontDict) {
+    pFontDict = CPDF_Dictionary::Create();
+    if (pFontDict == NULL) {
+      return FALSE;
+    }
+    pFontDict->SetAtName(FX_BSTRC("Type"), "Font");
+    pFontDict->SetAtName(FX_BSTRC("Subtype"), "Type1");
+    pFontDict->SetAtName(FX_BSTRC("BaseFont"), "Helvetica");
+    pFontDict->SetAtName(FX_BSTRC("Encoding"), "WinAnsiEncoding");
+    pDoc->AddIndirectObject(pFontDict);
+    pDRFontDict->SetAtReference(sFontName.Mid(1), pDoc, pFontDict);
+  }
+  CPDF_Font* pDefFont = pDoc->LoadFont(pFontDict);
+  if (!pDefFont) {
+    return FALSE;
+  }
+  CPDF_Rect rcAnnot = pAnnotDict->GetRect("Rect");
+  int32_t nRotate = 0;
+  if (CPDF_Dictionary* pMKDict = pAnnotDict->GetDict("MK")) {
+    nRotate = pMKDict->GetInteger("R");
+  }
+  CPDF_Rect rcBBox;
+  CPDF_Matrix matrix;
+  switch (nRotate % 360) {
+    case 0:
+      rcBBox = CPDF_Rect(0, 0, rcAnnot.right - rcAnnot.left,
+                         rcAnnot.top - rcAnnot.bottom);
+      break;
+    case 90:
+      matrix = CPDF_Matrix(0, 1, -1, 0, rcAnnot.right - rcAnnot.left, 0);
+      rcBBox = CPDF_Rect(0, 0, rcAnnot.top - rcAnnot.bottom,
+                         rcAnnot.right - rcAnnot.left);
+      break;
+    case 180:
+      matrix = CPDF_Matrix(-1, 0, 0, -1, rcAnnot.right - rcAnnot.left,
+                           rcAnnot.top - rcAnnot.bottom);
+      rcBBox = CPDF_Rect(0, 0, rcAnnot.right - rcAnnot.left,
+                         rcAnnot.top - rcAnnot.bottom);
+      break;
+    case 270:
+      matrix = CPDF_Matrix(0, -1, 1, 0, 0, rcAnnot.top - rcAnnot.bottom);
+      rcBBox = CPDF_Rect(0, 0, rcAnnot.top - rcAnnot.bottom,
+                         rcAnnot.right - rcAnnot.left);
+      break;
+  }
+  int32_t nBorderStyle = PBS_SOLID;
+  FX_FLOAT fBorderWidth = 1;
+  CPVT_Dash dsBorder(3, 0, 0);
+  CPVT_Color crLeftTop, crRightBottom;
+  if (CPDF_Dictionary* pBSDict = pAnnotDict->GetDict("BS")) {
+    if (pBSDict->KeyExist("W")) {
+      fBorderWidth = pBSDict->GetNumber("W");
+    }
+    if (CPDF_Array* pArray = pBSDict->GetArray("D")) {
+      dsBorder = CPVT_Dash(pArray->GetInteger(0), pArray->GetInteger(1),
+                           pArray->GetInteger(2));
+    }
+    switch (pBSDict->GetString("S").GetAt(0)) {
+      case 'S':
+        nBorderStyle = PBS_SOLID;
+        break;
+      case 'D':
+        nBorderStyle = PBS_DASH;
+        break;
+      case 'B':
+        nBorderStyle = PBS_BEVELED;
+        fBorderWidth *= 2;
+        crLeftTop = CPVT_Color(CT_GRAY, 1);
+        crRightBottom = CPVT_Color(CT_GRAY, 0.5);
+        break;
+      case 'I':
+        nBorderStyle = PBS_INSET;
+        fBorderWidth *= 2;
+        crLeftTop = CPVT_Color(CT_GRAY, 0.5);
+        crRightBottom = CPVT_Color(CT_GRAY, 0.75);
+        break;
+      case 'U':
+        nBorderStyle = PBS_UNDERLINED;
+        break;
+    }
+  }
+  CPVT_Color crBorder, crBG;
+  if (CPDF_Dictionary* pMKDict = pAnnotDict->GetDict("MK")) {
+    if (CPDF_Array* pArray = pMKDict->GetArray("BC")) {
+      crBorder = ParseColor(*pArray);
+    }
+    if (CPDF_Array* pArray = pMKDict->GetArray("BG")) {
+      crBG = ParseColor(*pArray);
+    }
+  }
+  CFX_ByteTextBuf sAppStream;
+  CFX_ByteString sBG = CPVT_GenerateAP::GenerateColorAP(crBG, TRUE);
+  if (sBG.GetLength() > 0) {
+    sAppStream << "q\n" << sBG << rcBBox.left << " " << rcBBox.bottom << " "
+               << rcBBox.Width() << " " << rcBBox.Height() << " re f\n"
+               << "Q\n";
+  }
+  CFX_ByteString sBorderStream = CPVT_GenerateAP::GenerateBorderAP(
+      rcBBox, fBorderWidth, crBorder, crLeftTop, crRightBottom, nBorderStyle,
+      dsBorder);
+  if (sBorderStream.GetLength() > 0) {
+    sAppStream << "q\n" << sBorderStream << "Q\n";
+  }
+  CPDF_Rect rcBody =
+      CPDF_Rect(rcBBox.left + fBorderWidth, rcBBox.bottom + fBorderWidth,
+                rcBBox.right - fBorderWidth, rcBBox.top - fBorderWidth);
+  rcBody.Normalize();
+  CPDF_Dictionary* pAPDict = pAnnotDict->GetDict("AP");
+  if (pAPDict == NULL) {
+    pAPDict = CPDF_Dictionary::Create();
     if (pAPDict == NULL) {
-        pAPDict = CPDF_Dictionary::Create();
-        if (pAPDict == NULL) {
-            return FALSE;
-        }
-        pAnnotDict->SetAt("AP", pAPDict);
+      return FALSE;
     }
-    CPDF_Stream* pNormalStream = pAPDict->GetStream("N");
+    pAnnotDict->SetAt("AP", pAPDict);
+  }
+  CPDF_Stream* pNormalStream = pAPDict->GetStream("N");
+  if (pNormalStream == NULL) {
+    pNormalStream = CPDF_Stream::Create(NULL, 0, NULL);
     if (pNormalStream == NULL) {
-        pNormalStream = CPDF_Stream::Create(NULL, 0, NULL);
-        if (pNormalStream == NULL) {
-            return FALSE;
+      return FALSE;
+    }
+    int32_t objnum = pDoc->AddIndirectObject(pNormalStream);
+    pAnnotDict->GetDict("AP")->SetAtReference("N", pDoc, objnum);
+  }
+  CPDF_Dictionary* pStreamDict = pNormalStream->GetDict();
+  if (pStreamDict) {
+    pStreamDict->SetAtMatrix("Matrix", matrix);
+    pStreamDict->SetAtRect("BBox", rcBBox);
+    CPDF_Dictionary* pStreamResList = pStreamDict->GetDict("Resources");
+    if (pStreamResList) {
+      CPDF_Dictionary* pStreamResFontList = pStreamResList->GetDict("Font");
+      if (!pStreamResFontList) {
+        pStreamResFontList = CPDF_Dictionary::Create();
+        if (pStreamResFontList == NULL) {
+          return FALSE;
         }
-        int32_t objnum = pDoc->AddIndirectObject(pNormalStream);
-        pAnnotDict->GetDict("AP")->SetAtReference("N", pDoc, objnum);
-    }
-    CPDF_Dictionary * pStreamDict = pNormalStream->GetDict();
-    if (pStreamDict) {
-        pStreamDict->SetAtMatrix("Matrix", matrix);
-        pStreamDict->SetAtRect("BBox", rcBBox);
-        CPDF_Dictionary* pStreamResList = pStreamDict->GetDict("Resources");
-        if (pStreamResList) {
-            CPDF_Dictionary* pStreamResFontList = pStreamResList->GetDict("Font");
-            if (!pStreamResFontList) {
-                pStreamResFontList = CPDF_Dictionary::Create();
-                if (pStreamResFontList == NULL) {
-                    return FALSE;
-                }
-                pStreamResList->SetAt("Font", pStreamResFontList);
-            }
-            if (!pStreamResFontList->KeyExist(sFontName)) {
-                pStreamResFontList->SetAtReference(sFontName, pDoc, pFontDict);
-            }
-        } else {
-            pStreamDict->SetAt("Resources", pFormDict->GetDict("DR")->Clone());
-            pStreamResList = pStreamDict->GetDict("Resources");
+        pStreamResList->SetAt("Font", pStreamResFontList);
+      }
+      if (!pStreamResFontList->KeyExist(sFontName)) {
+        pStreamResFontList->SetAtReference(sFontName, pDoc, pFontDict);
+      }
+    } else {
+      pStreamDict->SetAt("Resources", pFormDict->GetDict("DR")->Clone());
+      pStreamResList = pStreamDict->GetDict("Resources");
+    }
+  }
+  switch (nWidgetType) {
+    case 0: {
+      CFX_WideString swValue =
+          FPDF_GetFieldAttr(pAnnotDict, "V")
+              ? FPDF_GetFieldAttr(pAnnotDict, "V")->GetUnicodeText()
+              : CFX_WideString();
+      int32_t nAlign = FPDF_GetFieldAttr(pAnnotDict, "Q")
+                           ? FPDF_GetFieldAttr(pAnnotDict, "Q")->GetInteger()
+                           : 0;
+      FX_DWORD dwFlags = FPDF_GetFieldAttr(pAnnotDict, "Ff")
+                             ? FPDF_GetFieldAttr(pAnnotDict, "Ff")->GetInteger()
+                             : 0;
+      FX_DWORD dwMaxLen =
+          FPDF_GetFieldAttr(pAnnotDict, "MaxLen")
+              ? FPDF_GetFieldAttr(pAnnotDict, "MaxLen")->GetInteger()
+              : 0;
+      CPVT_FontMap map(pDoc,
+                       pStreamDict ? pStreamDict->GetDict("Resources") : NULL,
+                       pDefFont, sFontName.Right(sFontName.GetLength() - 1));
+      CPVT_Provider prd(&map);
+      CPDF_VariableText vt;
+      vt.SetProvider(&prd);
+      vt.SetPlateRect(rcBody);
+      vt.SetAlignment(nAlign);
+      if (IsFloatZero(fFontSize)) {
+        vt.SetAutoFontSize(TRUE);
+      } else {
+        vt.SetFontSize(fFontSize);
+      }
+      FX_BOOL bMultiLine = (dwFlags >> 12) & 1;
+      if (bMultiLine) {
+        vt.SetMultiLine(TRUE);
+        vt.SetAutoReturn(TRUE);
+      }
+      FX_WORD subWord = 0;
+      if ((dwFlags >> 13) & 1) {
+        subWord = '*';
+        vt.SetPasswordChar(subWord);
+      }
+      FX_BOOL bCharArray = (dwFlags >> 24) & 1;
+      if (bCharArray) {
+        vt.SetCharArray(dwMaxLen);
+      } else {
+        vt.SetLimitChar(dwMaxLen);
+      }
+      vt.Initialize();
+      vt.SetText(swValue.c_str());
+      vt.RearrangeAll();
+      CPDF_Rect rcContent = vt.GetContentRect();
+      CPDF_Point ptOffset(0.0f, 0.0f);
+      if (!bMultiLine) {
+        ptOffset =
+            CPDF_Point(0.0f, (rcContent.Height() - rcBody.Height()) / 2.0f);
+      }
+      CFX_ByteString sBody = CPVT_GenerateAP::GenerateEditAP(
+          &map, vt.GetIterator(), ptOffset, !bCharArray, subWord);
+      if (sBody.GetLength() > 0) {
+        sAppStream << "/Tx BMC\n"
+                   << "q\n";
+        if (rcContent.Width() > rcBody.Width() ||
+            rcContent.Height() > rcBody.Height()) {
+          sAppStream << rcBody.left << " " << rcBody.bottom << " "
+                     << rcBody.Width() << " " << rcBody.Height()
+                     << " re\nW\nn\n";
         }
-    }
-    switch (nWidgetType) {
-        case 0: {
-                CFX_WideString swValue = FPDF_GetFieldAttr(pAnnotDict, "V")? FPDF_GetFieldAttr(pAnnotDict, "V")->GetUnicodeText() : CFX_WideString();
-                int32_t nAlign = FPDF_GetFieldAttr(pAnnotDict, "Q")? FPDF_GetFieldAttr(pAnnotDict, "Q")->GetInteger() : 0;
-                FX_DWORD dwFlags = FPDF_GetFieldAttr(pAnnotDict, "Ff")? FPDF_GetFieldAttr(pAnnotDict, "Ff")->GetInteger() : 0;
-                FX_DWORD dwMaxLen = FPDF_GetFieldAttr(pAnnotDict, "MaxLen") ? FPDF_GetFieldAttr(pAnnotDict, "MaxLen")->GetInteger() : 0;
-                CPVT_FontMap map(pDoc, pStreamDict ? pStreamDict->GetDict("Resources") : NULL , pDefFont, sFontName.Right(sFontName.GetLength() - 1));
-                CPVT_Provider prd(&map);
-                CPDF_VariableText vt;
-                vt.SetProvider(&prd);
-                vt.SetPlateRect(rcBody);
-                vt.SetAlignment(nAlign);
-                if (IsFloatZero(fFontSize)) {
-                    vt.SetAutoFontSize(TRUE);
-                } else {
-                    vt.SetFontSize(fFontSize);
-                }
-                FX_BOOL bMultiLine = (dwFlags >> 12) & 1;
-                if (bMultiLine) {
-                    vt.SetMultiLine(TRUE);
-                    vt.SetAutoReturn(TRUE);
-                }
-                FX_WORD subWord = 0;
-                if ((dwFlags >> 13) & 1) {
-                    subWord = '*';
-                    vt.SetPasswordChar(subWord);
-                }
-                FX_BOOL bCharArray = (dwFlags >> 24) & 1;
-                if (bCharArray) {
-                    vt.SetCharArray(dwMaxLen);
-                } else {
-                    vt.SetLimitChar(dwMaxLen);
-                }
-                vt.Initialize();
-                vt.SetText(swValue.c_str());
-                vt.RearrangeAll();
-                CPDF_Rect rcContent = vt.GetContentRect();
-                CPDF_Point ptOffset(0.0f, 0.0f);
-                if (!bMultiLine) {
-                    ptOffset = CPDF_Point(0.0f, (rcContent.Height() - rcBody.Height()) / 2.0f);
-                }
-                CFX_ByteString sBody = CPVT_GenerateAP::GenerateEditAP(&map, vt.GetIterator(), ptOffset, !bCharArray, subWord);
-                if (sBody.GetLength() > 0) {
-                    sAppStream << "/Tx BMC\n" << "q\n";
-                    if (rcContent.Width() > rcBody.Width() ||
-                            rcContent.Height() > rcBody.Height()) {
-                        sAppStream << rcBody.left << " " << rcBody.bottom << " "
-                                   << rcBody.Width() << " " << rcBody.Height() << " re\nW\nn\n";
-                    }
-                    sAppStream << "BT\n" << CPVT_GenerateAP::GenerateColorAP(crText, TRUE) << sBody << "ET\n" << "Q\nEMC\n";
-                }
-            }
+        sAppStream << "BT\n" << CPVT_GenerateAP::GenerateColorAP(crText, TRUE)
+                   << sBody << "ET\n"
+                   << "Q\nEMC\n";
+      }
+    } break;
+    case 1: {
+      CFX_WideString swValue =
+          FPDF_GetFieldAttr(pAnnotDict, "V")
+              ? FPDF_GetFieldAttr(pAnnotDict, "V")->GetUnicodeText()
+              : CFX_WideString();
+      CPVT_FontMap map(pDoc,
+                       pStreamDict ? pStreamDict->GetDict("Resources") : NULL,
+                       pDefFont, sFontName.Right(sFontName.GetLength() - 1));
+      CPVT_Provider prd(&map);
+      CPDF_VariableText vt;
+      vt.SetProvider(&prd);
+      CPDF_Rect rcButton = rcBody;
+      rcButton.left = rcButton.right - 13;
+      rcButton.Normalize();
+      CPDF_Rect rcEdit = rcBody;
+      rcEdit.right = rcButton.left;
+      rcEdit.Normalize();
+      vt.SetPlateRect(rcEdit);
+      if (IsFloatZero(fFontSize)) {
+        vt.SetAutoFontSize(TRUE);
+      } else {
+        vt.SetFontSize(fFontSize);
+      }
+      vt.Initialize();
+      vt.SetText(swValue.c_str());
+      vt.RearrangeAll();
+      CPDF_Rect rcContent = vt.GetContentRect();
+      CPDF_Point ptOffset =
+          CPDF_Point(0.0f, (rcContent.Height() - rcEdit.Height()) / 2.0f);
+      CFX_ByteString sEdit = CPVT_GenerateAP::GenerateEditAP(
+          &map, vt.GetIterator(), ptOffset, TRUE, 0);
+      if (sEdit.GetLength() > 0) {
+        sAppStream << "/Tx BMC\n"
+                   << "q\n";
+        sAppStream << rcEdit.left << " " << rcEdit.bottom << " "
+                   << rcEdit.Width() << " " << rcEdit.Height() << " re\nW\nn\n";
+        sAppStream << "BT\n" << CPVT_GenerateAP::GenerateColorAP(crText, TRUE)
+                   << sEdit << "ET\n"
+                   << "Q\nEMC\n";
+      }
+      CFX_ByteString sButton = CPVT_GenerateAP::GenerateColorAP(
+          CPVT_Color(CT_RGB, 220.0f / 255.0f, 220.0f / 255.0f, 220.0f / 255.0f),
+          TRUE);
+      if (sButton.GetLength() > 0 && !rcButton.IsEmpty()) {
+        sAppStream << "q\n" << sButton;
+        sAppStream << rcButton.left << " " << rcButton.bottom << " "
+                   << rcButton.Width() << " " << rcButton.Height() << " re f\n";
+        sAppStream << "Q\n";
+        CFX_ByteString sButtonBorder = CPVT_GenerateAP::GenerateBorderAP(
+            rcButton, 2, CPVT_Color(CT_GRAY, 0), CPVT_Color(CT_GRAY, 1),
+            CPVT_Color(CT_GRAY, 0.5), PBS_BEVELED, CPVT_Dash(3, 0, 0));
+        if (sButtonBorder.GetLength() > 0) {
+          sAppStream << "q\n" << sButtonBorder << "Q\n";
+        }
+        CPDF_Point ptCenter = CPDF_Point((rcButton.left + rcButton.right) / 2,
+                                         (rcButton.top + rcButton.bottom) / 2);
+        if (IsFloatBigger(rcButton.Width(), 6) &&
+            IsFloatBigger(rcButton.Height(), 6)) {
+          sAppStream << "q\n"
+                     << " 0 g\n";
+          sAppStream << ptCenter.x - 3 << " " << ptCenter.y + 1.5f << " m\n";
+          sAppStream << ptCenter.x + 3 << " " << ptCenter.y + 1.5f << " l\n";
+          sAppStream << ptCenter.x << " " << ptCenter.y - 1.5f << " l\n";
+          sAppStream << ptCenter.x - 3 << " " << ptCenter.y + 1.5f << " l f\n";
+          sAppStream << sButton << "Q\n";
+        }
+      }
+    } break;
+    case 2: {
+      CPVT_FontMap map(pDoc,
+                       pStreamDict ? pStreamDict->GetDict("Resources") : NULL,
+                       pDefFont, sFontName.Right(sFontName.GetLength() - 1));
+      CPVT_Provider prd(&map);
+      CPDF_Array* pOpts = FPDF_GetFieldAttr(pAnnotDict, "Opt")
+                              ? FPDF_GetFieldAttr(pAnnotDict, "Opt")->GetArray()
+                              : NULL;
+      CPDF_Array* pSels = FPDF_GetFieldAttr(pAnnotDict, "I")
+                              ? FPDF_GetFieldAttr(pAnnotDict, "I")->GetArray()
+                              : NULL;
+      int32_t nTop = FPDF_GetFieldAttr(pAnnotDict, "TI")
+                         ? FPDF_GetFieldAttr(pAnnotDict, "TI")->GetInteger()
+                         : 0;
+      CFX_ByteTextBuf sBody;
+      if (pOpts) {
+        FX_FLOAT fy = rcBody.top;
+        for (int32_t i = nTop, sz = pOpts->GetCount(); i < sz; i++) {
+          if (IsFloatSmaller(fy, rcBody.bottom)) {
             break;
-        case 1: {
-                CFX_WideString swValue = FPDF_GetFieldAttr(pAnnotDict, "V") ? FPDF_GetFieldAttr(pAnnotDict, "V")->GetUnicodeText() : CFX_WideString();
-                CPVT_FontMap map(pDoc, pStreamDict ? pStreamDict->GetDict("Resources"):NULL, pDefFont, sFontName.Right(sFontName.GetLength() - 1));
-                CPVT_Provider prd(&map);
-                CPDF_VariableText vt;
-                vt.SetProvider(&prd);
-                CPDF_Rect rcButton = rcBody;
-                rcButton.left = rcButton.right - 13;
-                rcButton.Normalize();
-                CPDF_Rect rcEdit = rcBody;
-                rcEdit.right = rcButton.left;
-                rcEdit.Normalize();
-                vt.SetPlateRect(rcEdit);
-                if (IsFloatZero(fFontSize)) {
-                    vt.SetAutoFontSize(TRUE);
-                } else {
-                    vt.SetFontSize(fFontSize);
-                }
-                vt.Initialize();
-                vt.SetText(swValue.c_str());
-                vt.RearrangeAll();
-                CPDF_Rect rcContent = vt.GetContentRect();
-                CPDF_Point ptOffset = CPDF_Point(0.0f, (rcContent.Height() - rcEdit.Height()) / 2.0f);
-                CFX_ByteString sEdit = CPVT_GenerateAP::GenerateEditAP(&map, vt.GetIterator(), ptOffset, TRUE, 0);
-                if (sEdit.GetLength() > 0) {
-                    sAppStream << "/Tx BMC\n" << "q\n";
-                    sAppStream << rcEdit.left << " " << rcEdit.bottom << " "
-                               << rcEdit.Width() << " " << rcEdit.Height() << " re\nW\nn\n";
-                    sAppStream << "BT\n" << CPVT_GenerateAP::GenerateColorAP(crText, TRUE) << sEdit << "ET\n" << "Q\nEMC\n";
-                }
-                CFX_ByteString sButton = CPVT_GenerateAP::GenerateColorAP(CPVT_Color(CT_RGB, 220.0f / 255.0f, 220.0f / 255.0f, 220.0f / 255.0f), TRUE);
-                if (sButton.GetLength() > 0 && !rcButton.IsEmpty()) {
-                    sAppStream << "q\n" << sButton;
-                    sAppStream << rcButton.left << " " << rcButton.bottom << " "
-                               << rcButton.Width() << " " << rcButton.Height() << " re f\n";
-                    sAppStream << "Q\n";
-                    CFX_ByteString sButtonBorder = CPVT_GenerateAP::GenerateBorderAP(rcButton, 2, CPVT_Color(CT_GRAY, 0), CPVT_Color(CT_GRAY, 1), CPVT_Color(CT_GRAY, 0.5), PBS_BEVELED, CPVT_Dash(3, 0, 0));
-                    if (sButtonBorder.GetLength() > 0) {
-                        sAppStream << "q\n" << sButtonBorder << "Q\n";
-                    }
-                    CPDF_Point ptCenter = CPDF_Point((rcButton.left + rcButton.right) / 2, (rcButton.top + rcButton.bottom) / 2);
-                    if (IsFloatBigger(rcButton.Width(), 6) && IsFloatBigger(rcButton.Height(), 6)) {
-                        sAppStream << "q\n" << " 0 g\n";
-                        sAppStream << ptCenter.x - 3 << " " << ptCenter.y + 1.5f << " m\n";
-                        sAppStream << ptCenter.x + 3 << " " << ptCenter.y + 1.5f << " l\n";
-                        sAppStream << ptCenter.x << " " << ptCenter.y - 1.5f << " l\n";
-                        sAppStream << ptCenter.x - 3 << " " << ptCenter.y + 1.5f << " l f\n";
-                        sAppStream << sButton << "Q\n";
-                    }
-                }
+          }
+          if (CPDF_Object* pOpt = pOpts->GetElementValue(i)) {
+            CFX_WideString swItem;
+            if (pOpt->GetType() == PDFOBJ_STRING) {
+              swItem = pOpt->GetUnicodeText();
+            } else if (pOpt->GetType() == PDFOBJ_ARRAY) {
+              swItem =
+                  ((CPDF_Array*)pOpt)->GetElementValue(1)->GetUnicodeText();
             }
-            break;
-        case 2: {
-                CPVT_FontMap map(pDoc, pStreamDict ? pStreamDict->GetDict("Resources"):NULL, pDefFont, sFontName.Right(sFontName.GetLength() - 1));
-                CPVT_Provider prd(&map);
-                CPDF_Array * pOpts = FPDF_GetFieldAttr(pAnnotDict, "Opt") ? FPDF_GetFieldAttr(pAnnotDict, "Opt")->GetArray() : NULL;
-                CPDF_Array * pSels = FPDF_GetFieldAttr(pAnnotDict, "I") ? FPDF_GetFieldAttr(pAnnotDict, "I")->GetArray() : NULL;
-                int32_t nTop = FPDF_GetFieldAttr(pAnnotDict, "TI") ? FPDF_GetFieldAttr(pAnnotDict, "TI")->GetInteger() : 0;
-                CFX_ByteTextBuf sBody;
-                if (pOpts) {
-                    FX_FLOAT fy = rcBody.top;
-                    for (int32_t i = nTop, sz = pOpts->GetCount(); i < sz; i++) {
-                        if (IsFloatSmaller(fy, rcBody.bottom)) {
-                            break;
-                        }
-                        if (CPDF_Object* pOpt = pOpts->GetElementValue(i)) {
-                            CFX_WideString swItem;
-                            if (pOpt->GetType() == PDFOBJ_STRING) {
-                                swItem = pOpt->GetUnicodeText();
-                            } else if (pOpt->GetType() == PDFOBJ_ARRAY) {
-                                swItem = ((CPDF_Array*)pOpt)->GetElementValue(1)->GetUnicodeText();
-                            }
-                            FX_BOOL bSelected = FALSE;
-                            if (pSels) {
-                                for (FX_DWORD s = 0, ssz = pSels->GetCount(); s < ssz; s++) {
-                                    if (i == pSels->GetInteger(s)) {
-                                        bSelected = TRUE;
-                                        break;
-                                    }
-                                }
-                            }
-                            CPDF_VariableText vt;
-                            vt.SetProvider(&prd);
-                            vt.SetPlateRect(CPDF_Rect(rcBody.left, 0.0f, rcBody.right, 0.0f));
-                            if (IsFloatZero(fFontSize)) {
-                                vt.SetFontSize(12.0f);
-                            } else {
-                                vt.SetFontSize(fFontSize);
-                            }
-                            vt.Initialize();
-                            vt.SetText(swItem.c_str());
-                            vt.RearrangeAll();
-                            FX_FLOAT fItemHeight = vt.GetContentRect().Height();
-                            if (bSelected) {
-                                CPDF_Rect rcItem = CPDF_Rect(rcBody.left, fy - fItemHeight, rcBody.right, fy);
-                                sBody << "q\n" << CPVT_GenerateAP::GenerateColorAP(CPVT_Color(CT_RGB, 0, 51.0f / 255.0f, 113.0f / 255.0f), TRUE)
-                                      << rcItem.left << " " << rcItem.bottom << " " << rcItem.Width() << " " << rcItem.Height() << " re f\n" << "Q\n";
-                                sBody << "BT\n" << CPVT_GenerateAP::GenerateColorAP(CPVT_Color(CT_GRAY, 1), TRUE) << CPVT_GenerateAP::GenerateEditAP(&map, vt.GetIterator(), CPDF_Point(0.0f, fy), TRUE, 0) << "ET\n";
-                            } else {
-                                sBody << "BT\n" << CPVT_GenerateAP::GenerateColorAP(crText, TRUE) << CPVT_GenerateAP::GenerateEditAP(&map, vt.GetIterator(), CPDF_Point(0.0f, fy), TRUE, 0) << "ET\n";
-                            }
-                            fy -= fItemHeight;
-                        }
-                    }
-                }
-                if (sBody.GetSize() > 0) {
-                    sAppStream << "/Tx BMC\n" << "q\n";
-                    sAppStream << rcBody.left << " " << rcBody.bottom << " "
-                               << rcBody.Width() << " " << rcBody.Height() << " re\nW\nn\n";
-                    sAppStream << sBody.GetByteString() << "Q\nEMC\n";
+            FX_BOOL bSelected = FALSE;
+            if (pSels) {
+              for (FX_DWORD s = 0, ssz = pSels->GetCount(); s < ssz; s++) {
+                if (i == pSels->GetInteger(s)) {
+                  bSelected = TRUE;
+                  break;
                 }
+              }
             }
-            break;
-    }
-    if (pNormalStream) {
-        pNormalStream->SetData((uint8_t*)sAppStream.GetBuffer(), sAppStream.GetSize(), FALSE, FALSE);
-        pStreamDict = pNormalStream->GetDict();
-        if (pStreamDict) {
-            pStreamDict->SetAtMatrix("Matrix", matrix);
-            pStreamDict->SetAtRect("BBox", rcBBox);
-            CPDF_Dictionary* pStreamResList = pStreamDict->GetDict("Resources");
-            if (pStreamResList) {
-                CPDF_Dictionary* pStreamResFontList = pStreamResList->GetDict("Font");
-                if (!pStreamResFontList) {
-                    pStreamResFontList = CPDF_Dictionary::Create();
-                    if (pStreamResFontList == NULL) {
-                        return FALSE;
-                    }
-                    pStreamResList->SetAt("Font", pStreamResFontList);
-                }
-                if (!pStreamResFontList->KeyExist(sFontName)) {
-                    pStreamResFontList->SetAtReference(sFontName, pDoc, pFontDict);
-                }
+            CPDF_VariableText vt;
+            vt.SetProvider(&prd);
+            vt.SetPlateRect(CPDF_Rect(rcBody.left, 0.0f, rcBody.right, 0.0f));
+            if (IsFloatZero(fFontSize)) {
+              vt.SetFontSize(12.0f);
             } else {
-                pStreamDict->SetAt("Resources", pFormDict->GetDict("DR")->Clone());
-                pStreamResList = pStreamDict->GetDict("Resources");
+              vt.SetFontSize(fFontSize);
             }
+            vt.Initialize();
+            vt.SetText(swItem.c_str());
+            vt.RearrangeAll();
+            FX_FLOAT fItemHeight = vt.GetContentRect().Height();
+            if (bSelected) {
+              CPDF_Rect rcItem =
+                  CPDF_Rect(rcBody.left, fy - fItemHeight, rcBody.right, fy);
+              sBody << "q\n" << CPVT_GenerateAP::GenerateColorAP(
+                                    CPVT_Color(CT_RGB, 0, 51.0f / 255.0f,
+                                               113.0f / 255.0f),
+                                    TRUE)
+                    << rcItem.left << " " << rcItem.bottom << " "
+                    << rcItem.Width() << " " << rcItem.Height() << " re f\n"
+                    << "Q\n";
+              sBody << "BT\n" << CPVT_GenerateAP::GenerateColorAP(
+                                     CPVT_Color(CT_GRAY, 1), TRUE)
+                    << CPVT_GenerateAP::GenerateEditAP(&map, vt.GetIterator(),
+                                                       CPDF_Point(0.0f, fy),
+                                                       TRUE, 0)
+                    << "ET\n";
+            } else {
+              sBody << "BT\n" << CPVT_GenerateAP::GenerateColorAP(crText, TRUE)
+                    << CPVT_GenerateAP::GenerateEditAP(&map, vt.GetIterator(),
+                                                       CPDF_Point(0.0f, fy),
+                                                       TRUE, 0)
+                    << "ET\n";
+            }
+            fy -= fItemHeight;
+          }
+        }
+      }
+      if (sBody.GetSize() > 0) {
+        sAppStream << "/Tx BMC\n"
+                   << "q\n";
+        sAppStream << rcBody.left << " " << rcBody.bottom << " "
+                   << rcBody.Width() << " " << rcBody.Height() << " re\nW\nn\n";
+        sAppStream << sBody.GetByteString() << "Q\nEMC\n";
+      }
+    } break;
+  }
+  if (pNormalStream) {
+    pNormalStream->SetData((uint8_t*)sAppStream.GetBuffer(),
+                           sAppStream.GetSize(), FALSE, FALSE);
+    pStreamDict = pNormalStream->GetDict();
+    if (pStreamDict) {
+      pStreamDict->SetAtMatrix("Matrix", matrix);
+      pStreamDict->SetAtRect("BBox", rcBBox);
+      CPDF_Dictionary* pStreamResList = pStreamDict->GetDict("Resources");
+      if (pStreamResList) {
+        CPDF_Dictionary* pStreamResFontList = pStreamResList->GetDict("Font");
+        if (!pStreamResFontList) {
+          pStreamResFontList = CPDF_Dictionary::Create();
+          if (pStreamResFontList == NULL) {
+            return FALSE;
+          }
+          pStreamResList->SetAt("Font", pStreamResFontList);
+        }
+        if (!pStreamResFontList->KeyExist(sFontName)) {
+          pStreamResFontList->SetAtReference(sFontName, pDoc, pFontDict);
         }
+      } else {
+        pStreamDict->SetAt("Resources", pFormDict->GetDict("DR")->Clone());
+        pStreamResList = pStreamDict->GetDict("Resources");
+      }
     }
-    return TRUE;
+  }
+  return TRUE;
 }
-FX_BOOL CPVT_GenerateAP::GenerateTextFieldAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict)
-{
-    return GenerateWidgetAP(pDoc, pAnnotDict, 0);
+FX_BOOL CPVT_GenerateAP::GenerateTextFieldAP(CPDF_Document* pDoc,
+                                             CPDF_Dictionary* pAnnotDict) {
+  return GenerateWidgetAP(pDoc, pAnnotDict, 0);
 }
-FX_BOOL CPVT_GenerateAP::GenerateComboBoxAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict)
-{
-    return GenerateWidgetAP(pDoc, pAnnotDict, 1);
+FX_BOOL CPVT_GenerateAP::GenerateComboBoxAP(CPDF_Document* pDoc,
+                                            CPDF_Dictionary* pAnnotDict) {
+  return GenerateWidgetAP(pDoc, pAnnotDict, 1);
 }
-FX_BOOL CPVT_GenerateAP::GenerateListBoxAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict)
-{
-    return GenerateWidgetAP(pDoc, pAnnotDict, 2);
+FX_BOOL CPVT_GenerateAP::GenerateListBoxAP(CPDF_Document* pDoc,
+                                           CPDF_Dictionary* pAnnotDict) {
+  return GenerateWidgetAP(pDoc, pAnnotDict, 2);
 }
-CFX_ByteString CPVT_GenerateAP::GenerateEditAP(IPVT_FontMap * pFontMap, IPDF_VariableText_Iterator* pIterator, const CPDF_Point & ptOffset, FX_BOOL bContinuous, FX_WORD SubWord, const CPVT_WordRange * pVisible)
-{
-    CFX_ByteTextBuf sEditStream, sLineStream, sWords;
-    CPDF_Point ptOld(0.0f, 0.0f), ptNew(0.0f, 0.0f);
-    int32_t nCurFontIndex = -1;
-    if (pIterator) {
-        if (pVisible) {
-            pIterator->SetAt(pVisible->BeginPos);
-        } else {
-            pIterator->SetAt(0);
-        }
-        CPVT_WordPlace oldplace;
-        while (pIterator->NextWord()) {
-            CPVT_WordPlace place = pIterator->GetAt();
-            if (pVisible && place.WordCmp(pVisible->EndPos) > 0) {
-                break;
-            }
-            if (bContinuous) {
-                if (place.LineCmp(oldplace) != 0) {
-                    if (sWords.GetSize() > 0) {
-                        sLineStream << GetWordRenderString(sWords.GetByteString());
-                        sEditStream << sLineStream;
-                        sLineStream.Clear();
-                        sWords.Clear();
-                    }
-                    CPVT_Word word;
-                    if (pIterator->GetWord(word)) {
-                        ptNew = CPDF_Point(word.ptWord.x + ptOffset.x, word.ptWord.y + ptOffset.y);
-                    } else {
-                        CPVT_Line line;
-                        pIterator->GetLine(line);
-                        ptNew = CPDF_Point(line.ptLine.x + ptOffset.x, line.ptLine.y + ptOffset.y);
-                    }
-                    if (ptNew.x != ptOld.x || ptNew.y != ptOld.y) {
-                        sLineStream << ptNew.x - ptOld.x << " " << ptNew.y - ptOld.y << " Td\n";
-                        ptOld = ptNew;
-                    }
-                }
-                CPVT_Word word;
-                if (pIterator->GetWord(word)) {
-                    if (word.nFontIndex != nCurFontIndex) {
-                        if (sWords.GetSize() > 0) {
-                            sLineStream << GetWordRenderString(sWords.GetByteString());
-                            sWords.Clear();
-                        }
-                        sLineStream << GetFontSetString(pFontMap, word.nFontIndex, word.fFontSize);
-                        nCurFontIndex = word.nFontIndex;
-                    }
-                    sWords << GetPDFWordString(pFontMap, nCurFontIndex, word.Word, SubWord);
-                }
-                oldplace = place;
-            } else {
-                CPVT_Word word;
-                if (pIterator->GetWord(word)) {
-                    ptNew = CPDF_Point(word.ptWord.x + ptOffset.x, word.ptWord.y + ptOffset.y);
-                    if (ptNew.x != ptOld.x || ptNew.y != ptOld.y) {
-                        sEditStream << ptNew.x - ptOld.x << " " << ptNew.y - ptOld.y << " Td\n";
-                        ptOld = ptNew;
-                    }
-                    if (word.nFontIndex != nCurFontIndex) {
-                        sEditStream << GetFontSetString(pFontMap, word.nFontIndex, word.fFontSize);
-                        nCurFontIndex = word.nFontIndex;
-                    }
-                    sEditStream << GetWordRenderString(GetPDFWordString(pFontMap, nCurFontIndex, word.Word, SubWord));
-                }
-            }
-        }
-        if (sWords.GetSize() > 0) {
+CFX_ByteString CPVT_GenerateAP::GenerateEditAP(
+    IPVT_FontMap* pFontMap,
+    IPDF_VariableText_Iterator* pIterator,
+    const CPDF_Point& ptOffset,
+    FX_BOOL bContinuous,
+    FX_WORD SubWord,
+    const CPVT_WordRange* pVisible) {
+  CFX_ByteTextBuf sEditStream, sLineStream, sWords;
+  CPDF_Point ptOld(0.0f, 0.0f), ptNew(0.0f, 0.0f);
+  int32_t nCurFontIndex = -1;
+  if (pIterator) {
+    if (pVisible) {
+      pIterator->SetAt(pVisible->BeginPos);
+    } else {
+      pIterator->SetAt(0);
+    }
+    CPVT_WordPlace oldplace;
+    while (pIterator->NextWord()) {
+      CPVT_WordPlace place = pIterator->GetAt();
+      if (pVisible && place.WordCmp(pVisible->EndPos) > 0) {
+        break;
+      }
+      if (bContinuous) {
+        if (place.LineCmp(oldplace) != 0) {
+          if (sWords.GetSize() > 0) {
             sLineStream << GetWordRenderString(sWords.GetByteString());
             sEditStream << sLineStream;
+            sLineStream.Clear();
             sWords.Clear();
+          }
+          CPVT_Word word;
+          if (pIterator->GetWord(word)) {
+            ptNew = CPDF_Point(word.ptWord.x + ptOffset.x,
+                               word.ptWord.y + ptOffset.y);
+          } else {
+            CPVT_Line line;
+            pIterator->GetLine(line);
+            ptNew = CPDF_Point(line.ptLine.x + ptOffset.x,
+                               line.ptLine.y + ptOffset.y);
+          }
+          if (ptNew.x != ptOld.x || ptNew.y != ptOld.y) {
+            sLineStream << ptNew.x - ptOld.x << " " << ptNew.y - ptOld.y
+                        << " Td\n";
+            ptOld = ptNew;
+          }
+        }
+        CPVT_Word word;
+        if (pIterator->GetWord(word)) {
+          if (word.nFontIndex != nCurFontIndex) {
+            if (sWords.GetSize() > 0) {
+              sLineStream << GetWordRenderString(sWords.GetByteString());
+              sWords.Clear();
+            }
+            sLineStream << GetFontSetString(pFontMap, word.nFontIndex,
+                                            word.fFontSize);
+            nCurFontIndex = word.nFontIndex;
+          }
+          sWords << GetPDFWordString(pFontMap, nCurFontIndex, word.Word,
+                                     SubWord);
         }
+        oldplace = place;
+      } else {
+        CPVT_Word word;
+        if (pIterator->GetWord(word)) {
+          ptNew = CPDF_Point(word.ptWord.x + ptOffset.x,
+                             word.ptWord.y + ptOffset.y);
+          if (ptNew.x != ptOld.x || ptNew.y != ptOld.y) {
+            sEditStream << ptNew.x - ptOld.x << " " << ptNew.y - ptOld.y
+                        << " Td\n";
+            ptOld = ptNew;
+          }
+          if (word.nFontIndex != nCurFontIndex) {
+            sEditStream << GetFontSetString(pFontMap, word.nFontIndex,
+                                            word.fFontSize);
+            nCurFontIndex = word.nFontIndex;
+          }
+          sEditStream << GetWordRenderString(
+              GetPDFWordString(pFontMap, nCurFontIndex, word.Word, SubWord));
+        }
+      }
+    }
+    if (sWords.GetSize() > 0) {
+      sLineStream << GetWordRenderString(sWords.GetByteString());
+      sEditStream << sLineStream;
+      sWords.Clear();
     }
-    return sEditStream.GetByteString();
+  }
+  return sEditStream.GetByteString();
 }
-CFX_ByteString CPVT_GenerateAP::GenerateBorderAP(const CPDF_Rect & rect, FX_FLOAT fWidth,
-        const CPVT_Color & color, const CPVT_Color & crLeftTop, const CPVT_Color & crRightBottom,
-        int32_t nStyle, const CPVT_Dash & dash)
-{
-    CFX_ByteTextBuf sAppStream;
-    CFX_ByteString sColor;
-    FX_FLOAT fLeft = rect.left;
-    FX_FLOAT fRight = rect.right;
-    FX_FLOAT fTop = rect.top;
-    FX_FLOAT fBottom = rect.bottom;
-    if (fWidth > 0.0f) {
-        FX_FLOAT fHalfWidth = fWidth / 2.0f;
-        switch (nStyle) {
-            default:
-            case PBS_SOLID:
-                sColor = GenerateColorAP(color, TRUE);
-                if (sColor.GetLength() > 0) {
-                    sAppStream << sColor;
-                    sAppStream << fLeft << " " << fBottom << " " << fRight - fLeft << " " << fTop - fBottom << " re\n";
-                    sAppStream << fLeft + fWidth << " " << fBottom + fWidth << " "
-                               << fRight - fLeft - fWidth * 2 << " " << fTop - fBottom - fWidth * 2 << " re\n";
-                    sAppStream << "f*\n";
-                }
-                break;
-            case PBS_DASH:
-                sColor = GenerateColorAP(color, FALSE);
-                if (sColor.GetLength() > 0) {
-                    sAppStream << sColor;
-                    sAppStream << fWidth << " w" << " [" << dash.nDash << " " << dash.nGap << "] " << dash.nPhase << " d\n";
-                    sAppStream << fLeft + fWidth / 2 << " " << fBottom + fWidth / 2 << " m\n";
-                    sAppStream << fLeft + fWidth / 2 << " " << fTop - fWidth / 2 << " l\n";
-                    sAppStream << fRight - fWidth / 2 << " " << fTop - fWidth / 2 << " l\n";
-                    sAppStream << fRight - fWidth / 2 << " " << fBottom + fWidth / 2 << " l\n";
-                    sAppStream << fLeft + fWidth / 2 << " " << fBottom + fWidth / 2 << " l S\n";
-                }
-                break;
-            case PBS_BEVELED:
-            case PBS_INSET:
-                sColor = GenerateColorAP(crLeftTop, TRUE);
-                if (sColor.GetLength() > 0) {
-                    sAppStream << sColor;
-                    sAppStream << fLeft + fHalfWidth << " " << fBottom + fHalfWidth << " m\n";
-                    sAppStream << fLeft + fHalfWidth << " " << fTop - fHalfWidth << " l\n";
-                    sAppStream << fRight - fHalfWidth << " " << fTop - fHalfWidth << " l\n";
-                    sAppStream << fRight - fHalfWidth * 2 << " " << fTop - fHalfWidth * 2 << " l\n";
-                    sAppStream << fLeft + fHalfWidth * 2 << " " << fTop - fHalfWidth * 2 << " l\n";
-                    sAppStream << fLeft + fHalfWidth * 2 << " " << fBottom + fHalfWidth * 2 << " l f\n";
-                }
-                sColor = GenerateColorAP(crRightBottom, TRUE);
-                if (sColor.GetLength() > 0) {
-                    sAppStream << sColor;
-                    sAppStream << fRight - fHalfWidth << " " <<	fTop - fHalfWidth << " m\n";
-                    sAppStream << fRight - fHalfWidth << " " <<	fBottom + fHalfWidth << " l\n";
-                    sAppStream << fLeft + fHalfWidth << " " << 	fBottom + fHalfWidth << " l\n";
-                    sAppStream << fLeft + fHalfWidth * 2 << " " << fBottom + fHalfWidth * 2 << " l\n";
-                    sAppStream << fRight - fHalfWidth * 2 << " " << fBottom + fHalfWidth * 2 << " l\n";
-                    sAppStream << fRight - fHalfWidth * 2 << " " << fTop - fHalfWidth * 2 << " l f\n";
-                }
-                sColor = GenerateColorAP(color, TRUE);
-                if (sColor.GetLength() > 0) {
-                    sAppStream << sColor;
-                    sAppStream << fLeft << " " << fBottom << " " <<	fRight - fLeft << " " << fTop - fBottom << " re\n";
-                    sAppStream << fLeft + fHalfWidth << " " << fBottom + fHalfWidth << " "
-                               << fRight - fLeft - fHalfWidth * 2 << " " << fTop - fBottom - fHalfWidth * 2 << " re f*\n";
-                }
-                break;
-            case PBS_UNDERLINED:
-                sColor = GenerateColorAP(color, FALSE);
-                if (sColor.GetLength() > 0) {
-                    sAppStream << sColor;
-                    sAppStream << fWidth << " w\n";
-                    sAppStream << fLeft << " " << fBottom + fWidth / 2 << " m\n";
-                    sAppStream << fRight << " " << fBottom + fWidth / 2 << " l S\n";
-                }
-                break;
+CFX_ByteString CPVT_GenerateAP::GenerateBorderAP(
+    const CPDF_Rect& rect,
+    FX_FLOAT fWidth,
+    const CPVT_Color& color,
+    const CPVT_Color& crLeftTop,
+    const CPVT_Color& crRightBottom,
+    int32_t nStyle,
+    const CPVT_Dash& dash) {
+  CFX_ByteTextBuf sAppStream;
+  CFX_ByteString sColor;
+  FX_FLOAT fLeft = rect.left;
+  FX_FLOAT fRight = rect.right;
+  FX_FLOAT fTop = rect.top;
+  FX_FLOAT fBottom = rect.bottom;
+  if (fWidth > 0.0f) {
+    FX_FLOAT fHalfWidth = fWidth / 2.0f;
+    switch (nStyle) {
+      default:
+      case PBS_SOLID:
+        sColor = GenerateColorAP(color, TRUE);
+        if (sColor.GetLength() > 0) {
+          sAppStream << sColor;
+          sAppStream << fLeft << " " << fBottom << " " << fRight - fLeft << " "
+                     << fTop - fBottom << " re\n";
+          sAppStream << fLeft + fWidth << " " << fBottom + fWidth << " "
+                     << fRight - fLeft - fWidth * 2 << " "
+                     << fTop - fBottom - fWidth * 2 << " re\n";
+          sAppStream << "f*\n";
+        }
+        break;
+      case PBS_DASH:
+        sColor = GenerateColorAP(color, FALSE);
+        if (sColor.GetLength() > 0) {
+          sAppStream << sColor;
+          sAppStream << fWidth << " w"
+                     << " [" << dash.nDash << " " << dash.nGap << "] "
+                     << dash.nPhase << " d\n";
+          sAppStream << fLeft + fWidth / 2 << " " << fBottom + fWidth / 2
+                     << " m\n";
+          sAppStream << fLeft + fWidth / 2 << " " << fTop - fWidth / 2
+                     << " l\n";
+          sAppStream << fRight - fWidth / 2 << " " << fTop - fWidth / 2
+                     << " l\n";
+          sAppStream << fRight - fWidth / 2 << " " << fBottom + fWidth / 2
+                     << " l\n";
+          sAppStream << fLeft + fWidth / 2 << " " << fBottom + fWidth / 2
+                     << " l S\n";
         }
+        break;
+      case PBS_BEVELED:
+      case PBS_INSET:
+        sColor = GenerateColorAP(crLeftTop, TRUE);
+        if (sColor.GetLength() > 0) {
+          sAppStream << sColor;
+          sAppStream << fLeft + fHalfWidth << " " << fBottom + fHalfWidth
+                     << " m\n";
+          sAppStream << fLeft + fHalfWidth << " " << fTop - fHalfWidth
+                     << " l\n";
+          sAppStream << fRight - fHalfWidth << " " << fTop - fHalfWidth
+                     << " l\n";
+          sAppStream << fRight - fHalfWidth * 2 << " " << fTop - fHalfWidth * 2
+                     << " l\n";
+          sAppStream << fLeft + fHalfWidth * 2 << " " << fTop - fHalfWidth * 2
+                     << " l\n";
+          sAppStream << fLeft + fHalfWidth * 2 << " "
+                     << fBottom + fHalfWidth * 2 << " l f\n";
+        }
+        sColor = GenerateColorAP(crRightBottom, TRUE);
+        if (sColor.GetLength() > 0) {
+          sAppStream << sColor;
+          sAppStream << fRight - fHalfWidth << " " << fTop - fHalfWidth
+                     << " m\n";
+          sAppStream << fRight - fHalfWidth << " " << fBottom + fHalfWidth
+                     << " l\n";
+          sAppStream << fLeft + fHalfWidth << " " << fBottom + fHalfWidth
+                     << " l\n";
+          sAppStream << fLeft + fHalfWidth * 2 << " "
+                     << fBottom + fHalfWidth * 2 << " l\n";
+          sAppStream << fRight - fHalfWidth * 2 << " "
+                     << fBottom + fHalfWidth * 2 << " l\n";
+          sAppStream << fRight - fHalfWidth * 2 << " " << fTop - fHalfWidth * 2
+                     << " l f\n";
+        }
+        sColor = GenerateColorAP(color, TRUE);
+        if (sColor.GetLength() > 0) {
+          sAppStream << sColor;
+          sAppStream << fLeft << " " << fBottom << " " << fRight - fLeft << " "
+                     << fTop - fBottom << " re\n";
+          sAppStream << fLeft + fHalfWidth << " " << fBottom + fHalfWidth << " "
+                     << fRight - fLeft - fHalfWidth * 2 << " "
+                     << fTop - fBottom - fHalfWidth * 2 << " re f*\n";
+        }
+        break;
+      case PBS_UNDERLINED:
+        sColor = GenerateColorAP(color, FALSE);
+        if (sColor.GetLength() > 0) {
+          sAppStream << sColor;
+          sAppStream << fWidth << " w\n";
+          sAppStream << fLeft << " " << fBottom + fWidth / 2 << " m\n";
+          sAppStream << fRight << " " << fBottom + fWidth / 2 << " l S\n";
+        }
+        break;
     }
-    return sAppStream.GetByteString();
+  }
+  return sAppStream.GetByteString();
 }
-CFX_ByteString CPVT_GenerateAP::GenerateColorAP(const CPVT_Color & color, const FX_BOOL & bFillOrStroke)
-{
-    CFX_ByteTextBuf sColorStream;
-    switch (color.nColorType) {
-        case CT_RGB:
-            sColorStream << color.fColor1 << " " << color.fColor2 << " " << color.fColor3 << " "
-                         << (bFillOrStroke ? "rg" : "RG") << "\n";
-            break;
-        case CT_GRAY:
-            sColorStream << color.fColor1 << " " << (bFillOrStroke ? "g" : "G") << "\n";
-            break;
-        case CT_CMYK:
-            sColorStream << color.fColor1 << " " << color.fColor2 << " " << color.fColor3 << " " << color.fColor4 << " "
-                         << (bFillOrStroke ? "k" : "K") << "\n";
-            break;
-    }
-    return sColorStream.GetByteString();
+CFX_ByteString CPVT_GenerateAP::GenerateColorAP(const CPVT_Color& color,
+                                                const FX_BOOL& bFillOrStroke) {
+  CFX_ByteTextBuf sColorStream;
+  switch (color.nColorType) {
+    case CT_RGB:
+      sColorStream << color.fColor1 << " " << color.fColor2 << " "
+                   << color.fColor3 << " " << (bFillOrStroke ? "rg" : "RG")
+                   << "\n";
+      break;
+    case CT_GRAY:
+      sColorStream << color.fColor1 << " " << (bFillOrStroke ? "g" : "G")
+                   << "\n";
+      break;
+    case CT_CMYK:
+      sColorStream << color.fColor1 << " " << color.fColor2 << " "
+                   << color.fColor3 << " " << color.fColor4 << " "
+                   << (bFillOrStroke ? "k" : "K") << "\n";
+      break;
+  }
+  return sColorStream.GetByteString();
 }
diff --git a/core/src/fpdfdoc/doc_basic.cpp b/core/src/fpdfdoc/doc_basic.cpp
index 3ba109b016..39b5788c86 100644
--- a/core/src/fpdfdoc/doc_basic.cpp
+++ b/core/src/fpdfdoc/doc_basic.cpp
@@ -6,566 +6,558 @@
 
 #include "../../include/fpdfdoc/fpdf_doc.h"
 const int nMaxRecursion = 32;
-int CPDF_Dest::GetPageIndex(CPDF_Document* pDoc)
-{
-    if (m_pObj == NULL || m_pObj->GetType() != PDFOBJ_ARRAY) {
-        return 0;
-    }
-    CPDF_Object* pPage = ((CPDF_Array*)m_pObj)->GetElementValue(0);
-    if (pPage == NULL) {
-        return 0;
-    }
-    if (pPage->GetType() == PDFOBJ_NUMBER) {
-        return pPage->GetInteger();
-    }
-    if (pPage->GetType() != PDFOBJ_DICTIONARY) {
-        return 0;
-    }
-    return pDoc->GetPageIndex(pPage->GetObjNum());
+int CPDF_Dest::GetPageIndex(CPDF_Document* pDoc) {
+  if (m_pObj == NULL || m_pObj->GetType() != PDFOBJ_ARRAY) {
+    return 0;
+  }
+  CPDF_Object* pPage = ((CPDF_Array*)m_pObj)->GetElementValue(0);
+  if (pPage == NULL) {
+    return 0;
+  }
+  if (pPage->GetType() == PDFOBJ_NUMBER) {
+    return pPage->GetInteger();
+  }
+  if (pPage->GetType() != PDFOBJ_DICTIONARY) {
+    return 0;
+  }
+  return pDoc->GetPageIndex(pPage->GetObjNum());
 }
-FX_DWORD CPDF_Dest::GetPageObjNum()
-{
-    if (m_pObj == NULL || m_pObj->GetType() != PDFOBJ_ARRAY) {
-        return 0;
-    }
-    CPDF_Object* pPage = ((CPDF_Array*)m_pObj)->GetElementValue(0);
-    if (pPage == NULL) {
-        return 0;
-    }
-    if (pPage->GetType() == PDFOBJ_NUMBER) {
-        return pPage->GetInteger();
-    }
-    if (pPage->GetType() == PDFOBJ_DICTIONARY) {
-        return pPage->GetObjNum();
-    }
+FX_DWORD CPDF_Dest::GetPageObjNum() {
+  if (m_pObj == NULL || m_pObj->GetType() != PDFOBJ_ARRAY) {
+    return 0;
+  }
+  CPDF_Object* pPage = ((CPDF_Array*)m_pObj)->GetElementValue(0);
+  if (pPage == NULL) {
     return 0;
+  }
+  if (pPage->GetType() == PDFOBJ_NUMBER) {
+    return pPage->GetInteger();
+  }
+  if (pPage->GetType() == PDFOBJ_DICTIONARY) {
+    return pPage->GetObjNum();
+  }
+  return 0;
 }
-const FX_CHAR* g_sZoomModes[] = {"XYZ", "Fit", "FitH", "FitV", "FitR", "FitB", "FitBH", "FitBV", ""};
-int CPDF_Dest::GetZoomMode()
-{
-    if (m_pObj == NULL || m_pObj->GetType() != PDFOBJ_ARRAY) {
-        return 0;
-    }
-    CFX_ByteString mode;
-    CPDF_Object* pObj = ((CPDF_Array*)m_pObj)->GetElementValue(1);
-    mode = pObj ? pObj->GetString() : CFX_ByteString();
-    int i = 0;
-    while (g_sZoomModes[i][0] != '\0') {
-        if (mode == g_sZoomModes[i]) {
-            return i + 1;
-        }
-        i ++;
-    }
+const FX_CHAR* g_sZoomModes[] = {"XYZ",  "Fit",   "FitH",  "FitV", "FitR",
+                                 "FitB", "FitBH", "FitBV", ""};
+int CPDF_Dest::GetZoomMode() {
+  if (m_pObj == NULL || m_pObj->GetType() != PDFOBJ_ARRAY) {
     return 0;
+  }
+  CFX_ByteString mode;
+  CPDF_Object* pObj = ((CPDF_Array*)m_pObj)->GetElementValue(1);
+  mode = pObj ? pObj->GetString() : CFX_ByteString();
+  int i = 0;
+  while (g_sZoomModes[i][0] != '\0') {
+    if (mode == g_sZoomModes[i]) {
+      return i + 1;
+    }
+    i++;
+  }
+  return 0;
 }
-FX_FLOAT CPDF_Dest::GetParam(int index)
-{
-    if (m_pObj == NULL || m_pObj->GetType() != PDFOBJ_ARRAY) {
-        return 0;
-    }
-    return ((CPDF_Array*)m_pObj)->GetNumber(2 + index);
+FX_FLOAT CPDF_Dest::GetParam(int index) {
+  if (m_pObj == NULL || m_pObj->GetType() != PDFOBJ_ARRAY) {
+    return 0;
+  }
+  return ((CPDF_Array*)m_pObj)->GetNumber(2 + index);
 }
-CFX_ByteString CPDF_Dest::GetRemoteName()
-{
-    if (m_pObj == NULL) {
-        return CFX_ByteString();
-    }
-    return m_pObj->GetString();
+CFX_ByteString CPDF_Dest::GetRemoteName() {
+  if (m_pObj == NULL) {
+    return CFX_ByteString();
+  }
+  return m_pObj->GetString();
 }
-CPDF_NameTree::CPDF_NameTree(CPDF_Document* pDoc, const CFX_ByteStringC& category)
-{
-    if (pDoc->GetRoot() && pDoc->GetRoot()->GetDict(FX_BSTRC("Names")))
-        m_pRoot = pDoc->GetRoot()->GetDict(FX_BSTRC("Names"))->GetDict(category);
-    else
-        m_pRoot = NULL;
+CPDF_NameTree::CPDF_NameTree(CPDF_Document* pDoc,
+                             const CFX_ByteStringC& category) {
+  if (pDoc->GetRoot() && pDoc->GetRoot()->GetDict(FX_BSTRC("Names")))
+    m_pRoot = pDoc->GetRoot()->GetDict(FX_BSTRC("Names"))->GetDict(category);
+  else
+    m_pRoot = NULL;
 }
-static CPDF_Object* SearchNameNode(CPDF_Dictionary* pNode, const CFX_ByteString& csName,
-                                   int& nIndex, CPDF_Array** ppFind, int nLevel = 0)
-{
-    if (nLevel > nMaxRecursion) {
-        return NULL;
-    }
-    CPDF_Array* pLimits = pNode->GetArray(FX_BSTRC("Limits"));
-    if (pLimits != NULL) {
-        CFX_ByteString csLeft = pLimits->GetString(0);
-        CFX_ByteString csRight = pLimits->GetString(1);
-        if (csLeft.Compare(csRight) > 0) {
-            CFX_ByteString csTmp = csRight;
-            csRight = csLeft;
-            csLeft = csTmp;
-        }
-        if (csName.Compare(csLeft) < 0 || csName.Compare(csRight) > 0) {
-            return NULL;
-        }
-    }
-    CPDF_Array* pNames = pNode->GetArray(FX_BSTRC("Names"));
-    if (pNames) {
-        FX_DWORD dwCount = pNames->GetCount() / 2;
-        for (FX_DWORD i = 0; i < dwCount; i ++) {
-            CFX_ByteString csValue = pNames->GetString(i * 2);
-            int32_t iCompare = csValue.Compare(csName);
-            if (iCompare <= 0) {
-                if (ppFind != NULL) {
-                    *ppFind = pNames;
-                }
-                if (iCompare < 0) {
-                    continue;
-                }
-            } else {
-                break;
-            }
-            nIndex += i;
-            return pNames->GetElementValue(i * 2 + 1);
-        }
-        nIndex += dwCount;
-        return NULL;
-    }
-    CPDF_Array* pKids = pNode->GetArray(FX_BSTRC("Kids"));
-    if (pKids == NULL) {
-        return NULL;
-    }
-    for (FX_DWORD i = 0; i < pKids->GetCount(); i ++) {
-        CPDF_Dictionary* pKid = pKids->GetDict(i);
-        if (pKid == NULL) {
-            continue;
-        }
-        CPDF_Object* pFound = SearchNameNode(pKid, csName, nIndex, ppFind, nLevel + 1);
-        if (pFound) {
-            return pFound;
-        }
-    }
+static CPDF_Object* SearchNameNode(CPDF_Dictionary* pNode,
+                                   const CFX_ByteString& csName,
+                                   int& nIndex,
+                                   CPDF_Array** ppFind,
+                                   int nLevel = 0) {
+  if (nLevel > nMaxRecursion) {
     return NULL;
-}
-static CPDF_Object* SearchNameNode(CPDF_Dictionary* pNode, int nIndex, int& nCurIndex,
-                                   CFX_ByteString& csName, CPDF_Array** ppFind, int nLevel = 0)
-{
-    if (nLevel > nMaxRecursion) {
-        return NULL;
-    }
-    CPDF_Array* pNames = pNode->GetArray(FX_BSTRC("Names"));
-    if (pNames) {
-        int nCount = pNames->GetCount() / 2;
-        if (nIndex >= nCurIndex + nCount) {
-            nCurIndex += nCount;
-            return NULL;
-        }
+  }
+  CPDF_Array* pLimits = pNode->GetArray(FX_BSTRC("Limits"));
+  if (pLimits != NULL) {
+    CFX_ByteString csLeft = pLimits->GetString(0);
+    CFX_ByteString csRight = pLimits->GetString(1);
+    if (csLeft.Compare(csRight) > 0) {
+      CFX_ByteString csTmp = csRight;
+      csRight = csLeft;
+      csLeft = csTmp;
+    }
+    if (csName.Compare(csLeft) < 0 || csName.Compare(csRight) > 0) {
+      return NULL;
+    }
+  }
+  CPDF_Array* pNames = pNode->GetArray(FX_BSTRC("Names"));
+  if (pNames) {
+    FX_DWORD dwCount = pNames->GetCount() / 2;
+    for (FX_DWORD i = 0; i < dwCount; i++) {
+      CFX_ByteString csValue = pNames->GetString(i * 2);
+      int32_t iCompare = csValue.Compare(csName);
+      if (iCompare <= 0) {
         if (ppFind != NULL) {
-            *ppFind = pNames;
+          *ppFind = pNames;
         }
-        csName = pNames->GetString((nIndex - nCurIndex) * 2);
-        return pNames->GetElementValue((nIndex - nCurIndex) * 2 + 1);
-    }
-    CPDF_Array* pKids = pNode->GetArray(FX_BSTRC("Kids"));
-    if (pKids == NULL) {
-        return NULL;
-    }
-    for (FX_DWORD i = 0; i < pKids->GetCount(); i ++) {
-        CPDF_Dictionary* pKid = pKids->GetDict(i);
-        if (pKid == NULL) {
-            continue;
-        }
-        CPDF_Object* pFound = SearchNameNode(pKid, nIndex, nCurIndex, csName, ppFind, nLevel + 1);
-        if (pFound) {
-            return pFound;
+        if (iCompare < 0) {
+          continue;
         }
+      } else {
+        break;
+      }
+      nIndex += i;
+      return pNames->GetElementValue(i * 2 + 1);
     }
+    nIndex += dwCount;
+    return NULL;
+  }
+  CPDF_Array* pKids = pNode->GetArray(FX_BSTRC("Kids"));
+  if (pKids == NULL) {
     return NULL;
+  }
+  for (FX_DWORD i = 0; i < pKids->GetCount(); i++) {
+    CPDF_Dictionary* pKid = pKids->GetDict(i);
+    if (pKid == NULL) {
+      continue;
+    }
+    CPDF_Object* pFound =
+        SearchNameNode(pKid, csName, nIndex, ppFind, nLevel + 1);
+    if (pFound) {
+      return pFound;
+    }
+  }
+  return NULL;
 }
-static int CountNames(CPDF_Dictionary* pNode, int nLevel = 0)
-{
-    if (nLevel > nMaxRecursion) {
-        return 0;
-    }
-    CPDF_Array* pNames = pNode->GetArray(FX_BSTRC("Names"));
-    if (pNames) {
-        return pNames->GetCount() / 2;
-    }
-    CPDF_Array* pKids = pNode->GetArray(FX_BSTRC("Kids"));
-    if (pKids == NULL) {
-        return 0;
-    }
-    int nCount = 0;
-    for (FX_DWORD i = 0; i < pKids->GetCount(); i ++) {
-        CPDF_Dictionary* pKid = pKids->GetDict(i);
-        if (pKid == NULL) {
-            continue;
-        }
-        nCount += CountNames(pKid, nLevel + 1);
-    }
-    return nCount;
+static CPDF_Object* SearchNameNode(CPDF_Dictionary* pNode,
+                                   int nIndex,
+                                   int& nCurIndex,
+                                   CFX_ByteString& csName,
+                                   CPDF_Array** ppFind,
+                                   int nLevel = 0) {
+  if (nLevel > nMaxRecursion) {
+    return NULL;
+  }
+  CPDF_Array* pNames = pNode->GetArray(FX_BSTRC("Names"));
+  if (pNames) {
+    int nCount = pNames->GetCount() / 2;
+    if (nIndex >= nCurIndex + nCount) {
+      nCurIndex += nCount;
+      return NULL;
+    }
+    if (ppFind != NULL) {
+      *ppFind = pNames;
+    }
+    csName = pNames->GetString((nIndex - nCurIndex) * 2);
+    return pNames->GetElementValue((nIndex - nCurIndex) * 2 + 1);
+  }
+  CPDF_Array* pKids = pNode->GetArray(FX_BSTRC("Kids"));
+  if (pKids == NULL) {
+    return NULL;
+  }
+  for (FX_DWORD i = 0; i < pKids->GetCount(); i++) {
+    CPDF_Dictionary* pKid = pKids->GetDict(i);
+    if (pKid == NULL) {
+      continue;
+    }
+    CPDF_Object* pFound =
+        SearchNameNode(pKid, nIndex, nCurIndex, csName, ppFind, nLevel + 1);
+    if (pFound) {
+      return pFound;
+    }
+  }
+  return NULL;
 }
-int CPDF_NameTree::GetCount() const
-{
-    if (m_pRoot == NULL) {
-        return 0;
-    }
-    return ::CountNames(m_pRoot);
+static int CountNames(CPDF_Dictionary* pNode, int nLevel = 0) {
+  if (nLevel > nMaxRecursion) {
+    return 0;
+  }
+  CPDF_Array* pNames = pNode->GetArray(FX_BSTRC("Names"));
+  if (pNames) {
+    return pNames->GetCount() / 2;
+  }
+  CPDF_Array* pKids = pNode->GetArray(FX_BSTRC("Kids"));
+  if (pKids == NULL) {
+    return 0;
+  }
+  int nCount = 0;
+  for (FX_DWORD i = 0; i < pKids->GetCount(); i++) {
+    CPDF_Dictionary* pKid = pKids->GetDict(i);
+    if (pKid == NULL) {
+      continue;
+    }
+    nCount += CountNames(pKid, nLevel + 1);
+  }
+  return nCount;
 }
-int CPDF_NameTree::GetIndex(const CFX_ByteString& csName) const
-{
-    if (m_pRoot == NULL) {
-        return -1;
-    }
-    int nIndex = 0;
-    if (SearchNameNode(m_pRoot, csName, nIndex, NULL) == NULL) {
-        return -1;
-    }
-    return nIndex;
+int CPDF_NameTree::GetCount() const {
+  if (m_pRoot == NULL) {
+    return 0;
+  }
+  return ::CountNames(m_pRoot);
 }
-CPDF_Object* CPDF_NameTree::LookupValue(int nIndex, CFX_ByteString& csName) const
-{
-    if (m_pRoot == NULL) {
-        return NULL;
-    }
-    int nCurIndex = 0;
-    return SearchNameNode(m_pRoot, nIndex, nCurIndex, csName, NULL);
+int CPDF_NameTree::GetIndex(const CFX_ByteString& csName) const {
+  if (m_pRoot == NULL) {
+    return -1;
+  }
+  int nIndex = 0;
+  if (SearchNameNode(m_pRoot, csName, nIndex, NULL) == NULL) {
+    return -1;
+  }
+  return nIndex;
 }
-CPDF_Object* CPDF_NameTree::LookupValue(const CFX_ByteString& csName) const
-{
-    if (m_pRoot == NULL) {
-        return NULL;
-    }
-    int nIndex = 0;
-    return SearchNameNode(m_pRoot, csName, nIndex, NULL);
+CPDF_Object* CPDF_NameTree::LookupValue(int nIndex,
+                                        CFX_ByteString& csName) const {
+  if (m_pRoot == NULL) {
+    return NULL;
+  }
+  int nCurIndex = 0;
+  return SearchNameNode(m_pRoot, nIndex, nCurIndex, csName, NULL);
 }
-CPDF_Array*	CPDF_NameTree::LookupNamedDest(CPDF_Document* pDoc, const CFX_ByteStringC& sName)
-{
-    CPDF_Object* pValue = LookupValue(sName);
-    if (pValue == NULL) {
-        CPDF_Dictionary* pDests = pDoc->GetRoot()->GetDict(FX_BSTRC("Dests"));
-        if (pDests == NULL) {
-            return NULL;
-        }
-        pValue = pDests->GetElementValue(sName);
-    }
-    if (pValue == NULL) {
-        return NULL;
-    }
-    if (pValue->GetType() == PDFOBJ_ARRAY) {
-        return (CPDF_Array*)pValue;
-    }
-    if (pValue->GetType() == PDFOBJ_DICTIONARY) {
-        return ((CPDF_Dictionary*)pValue)->GetArray(FX_BSTRC("D"));
-    }
+CPDF_Object* CPDF_NameTree::LookupValue(const CFX_ByteString& csName) const {
+  if (m_pRoot == NULL) {
     return NULL;
+  }
+  int nIndex = 0;
+  return SearchNameNode(m_pRoot, csName, nIndex, NULL);
 }
-#if _FXM_PLATFORM_  == _FXM_PLATFORM_APPLE_ || _FXM_PLATFORM_  == _FXM_PLATFORM_WINDOWS_
-static CFX_WideString ChangeSlashToPlatform(const FX_WCHAR* str)
-{
-    CFX_WideString result;
-    while (*str) {
-        if (*str == '/') {
-#if _FXM_PLATFORM_  == _FXM_PLATFORM_APPLE_
-            result += ':';
+CPDF_Array* CPDF_NameTree::LookupNamedDest(CPDF_Document* pDoc,
+                                           const CFX_ByteStringC& sName) {
+  CPDF_Object* pValue = LookupValue(sName);
+  if (pValue == NULL) {
+    CPDF_Dictionary* pDests = pDoc->GetRoot()->GetDict(FX_BSTRC("Dests"));
+    if (pDests == NULL) {
+      return NULL;
+    }
+    pValue = pDests->GetElementValue(sName);
+  }
+  if (pValue == NULL) {
+    return NULL;
+  }
+  if (pValue->GetType() == PDFOBJ_ARRAY) {
+    return (CPDF_Array*)pValue;
+  }
+  if (pValue->GetType() == PDFOBJ_DICTIONARY) {
+    return ((CPDF_Dictionary*)pValue)->GetArray(FX_BSTRC("D"));
+  }
+  return NULL;
+}
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || \
+    _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+static CFX_WideString ChangeSlashToPlatform(const FX_WCHAR* str) {
+  CFX_WideString result;
+  while (*str) {
+    if (*str == '/') {
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+      result += ':';
 #else
-            result += '\\';
+      result += '\\';
 #endif
-        } else {
-            result += *str;
-        }
-        str++;
+    } else {
+      result += *str;
     }
-    return result;
+    str++;
+  }
+  return result;
 }
-static CFX_WideString ChangeSlashToPDF(const FX_WCHAR* str)
-{
-    CFX_WideString result;
-    while (*str) {
-        if (*str == '\\' || *str == ':') {
-            result += '/';
-        } else {
-            result += *str;
-        }
-        str++;
+static CFX_WideString ChangeSlashToPDF(const FX_WCHAR* str) {
+  CFX_WideString result;
+  while (*str) {
+    if (*str == '\\' || *str == ':') {
+      result += '/';
+    } else {
+      result += *str;
     }
-    return result;
+    str++;
+  }
+  return result;
 }
 #endif
-static CFX_WideString FILESPEC_DecodeFileName(const CFX_WideStringC& filepath)
-{
-    if (filepath.GetLength() <= 1) {
-        return CFX_WideString();
-    }
-#if _FXM_PLATFORM_  == _FXM_PLATFORM_APPLE_
-    if (filepath.Left(sizeof("/Mac") - 1) == CFX_WideStringC(L"/Mac")) {
-        return ChangeSlashToPlatform(filepath.GetPtr() + 1);
-    }
+static CFX_WideString FILESPEC_DecodeFileName(const CFX_WideStringC& filepath) {
+  if (filepath.GetLength() <= 1) {
+    return CFX_WideString();
+  }
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+  if (filepath.Left(sizeof("/Mac") - 1) == CFX_WideStringC(L"/Mac")) {
+    return ChangeSlashToPlatform(filepath.GetPtr() + 1);
+  }
+  return ChangeSlashToPlatform(filepath.GetPtr());
+#elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+  if (filepath.GetAt(0) != '/') {
     return ChangeSlashToPlatform(filepath.GetPtr());
-#elif _FXM_PLATFORM_  == _FXM_PLATFORM_WINDOWS_
-    if (filepath.GetAt(0) != '/') {
-        return ChangeSlashToPlatform(filepath.GetPtr());
-    }
-    if (filepath.GetAt(1) == '/') {
-        return ChangeSlashToPlatform(filepath.GetPtr() + 1);
-    }
-    if (filepath.GetAt(2) == '/') {
-        CFX_WideString result;
-        result += filepath.GetAt(1);
-        result += ':';
-        result += ChangeSlashToPlatform(filepath.GetPtr() + 2);
-        return result;
-    }
+  }
+  if (filepath.GetAt(1) == '/') {
+    return ChangeSlashToPlatform(filepath.GetPtr() + 1);
+  }
+  if (filepath.GetAt(2) == '/') {
     CFX_WideString result;
-    result += '\\';
-    result += ChangeSlashToPlatform(filepath.GetPtr());
+    result += filepath.GetAt(1);
+    result += ':';
+    result += ChangeSlashToPlatform(filepath.GetPtr() + 2);
     return result;
+  }
+  CFX_WideString result;
+  result += '\\';
+  result += ChangeSlashToPlatform(filepath.GetPtr());
+  return result;
 #else
-    return filepath;
+  return filepath;
 #endif
 }
-FX_BOOL CPDF_FileSpec::GetFileName(CFX_WideString &csFileName) const
-{
-    if (m_pObj == NULL) {
+FX_BOOL CPDF_FileSpec::GetFileName(CFX_WideString& csFileName) const {
+  if (m_pObj == NULL) {
+    return FALSE;
+  }
+  if (m_pObj->GetType() == PDFOBJ_DICTIONARY) {
+    CPDF_Dictionary* pDict = (CPDF_Dictionary*)m_pObj;
+    csFileName = pDict->GetUnicodeText(FX_BSTRC("UF"));
+    if (csFileName.IsEmpty()) {
+      csFileName = CFX_WideString::FromLocal(pDict->GetString(FX_BSTRC("F")));
+    }
+    if (pDict->GetString(FX_BSTRC("FS")) == FX_BSTRC("URL")) {
+      return TRUE;
+    }
+    if (csFileName.IsEmpty()) {
+      if (pDict->KeyExist(FX_BSTRC("DOS"))) {
+        csFileName =
+            CFX_WideString::FromLocal(pDict->GetString(FX_BSTRC("DOS")));
+      } else if (pDict->KeyExist(FX_BSTRC("Mac"))) {
+        csFileName =
+            CFX_WideString::FromLocal(pDict->GetString(FX_BSTRC("Mac")));
+      } else if (pDict->KeyExist(FX_BSTRC("Unix"))) {
+        csFileName =
+            CFX_WideString::FromLocal(pDict->GetString(FX_BSTRC("Unix")));
+      } else {
         return FALSE;
+      }
     }
-    if (m_pObj->GetType() == PDFOBJ_DICTIONARY) {
-        CPDF_Dictionary* pDict = (CPDF_Dictionary*)m_pObj;
-        csFileName = pDict->GetUnicodeText(FX_BSTRC("UF"));
-        if (csFileName.IsEmpty()) {
-            csFileName = CFX_WideString::FromLocal(pDict->GetString(FX_BSTRC("F")));
-        }
-        if (pDict->GetString(FX_BSTRC("FS")) == FX_BSTRC("URL")) {
-            return TRUE;
-        }
-        if (csFileName.IsEmpty()) {
-            if (pDict->KeyExist(FX_BSTRC("DOS"))) {
-                csFileName = CFX_WideString::FromLocal(pDict->GetString(FX_BSTRC("DOS")));
-            } else if (pDict->KeyExist(FX_BSTRC("Mac"))) {
-                csFileName = CFX_WideString::FromLocal(pDict->GetString(FX_BSTRC("Mac")));
-            } else if (pDict->KeyExist(FX_BSTRC("Unix"))) {
-                csFileName = CFX_WideString::FromLocal(pDict->GetString(FX_BSTRC("Unix")));
-            } else {
-                return FALSE;
-            }
-        }
-    } else {
-        csFileName = CFX_WideString::FromLocal(m_pObj->GetString());
-    }
-    csFileName = FILESPEC_DecodeFileName(csFileName);
-    return TRUE;
+  } else {
+    csFileName = CFX_WideString::FromLocal(m_pObj->GetString());
+  }
+  csFileName = FILESPEC_DecodeFileName(csFileName);
+  return TRUE;
 }
-CPDF_FileSpec::CPDF_FileSpec()
-{
-    m_pObj = CPDF_Dictionary::Create();
-    if (m_pObj != NULL) {
-        ((CPDF_Dictionary*)m_pObj)->SetAtName(FX_BSTRC("Type"), FX_BSTRC("Filespec"));
-    }
+CPDF_FileSpec::CPDF_FileSpec() {
+  m_pObj = CPDF_Dictionary::Create();
+  if (m_pObj != NULL) {
+    ((CPDF_Dictionary*)m_pObj)
+        ->SetAtName(FX_BSTRC("Type"), FX_BSTRC("Filespec"));
+  }
 }
-FX_BOOL CPDF_FileSpec::IsURL() const
-{
-    if (m_pObj == NULL) {
-        return FALSE;
-    }
-    if (m_pObj->GetType() != PDFOBJ_DICTIONARY) {
-        return FALSE;
-    }
-    return ((CPDF_Dictionary*)m_pObj)->GetString(FX_BSTRC("FS")) == FX_BSTRC("URL");
+FX_BOOL CPDF_FileSpec::IsURL() const {
+  if (m_pObj == NULL) {
+    return FALSE;
+  }
+  if (m_pObj->GetType() != PDFOBJ_DICTIONARY) {
+    return FALSE;
+  }
+  return ((CPDF_Dictionary*)m_pObj)->GetString(FX_BSTRC("FS")) ==
+         FX_BSTRC("URL");
 }
-CFX_WideString FILESPEC_EncodeFileName(const CFX_WideStringC& filepath)
-{
-    if (filepath.GetLength() <= 1) {
-        return CFX_WideString();
-    }
-#if _FXM_PLATFORM_  == _FXM_PLATFORM_WINDOWS_
-    if (filepath.GetAt(1) == ':') {
-        CFX_WideString result;
-        result = '/';
-        result += filepath.GetAt(0);
-        if (filepath.GetAt(2) != '\\') {
-            result += '/';
-        }
-        result += ChangeSlashToPDF(filepath.GetPtr() + 2);
-        return result;
-    }
-    if (filepath.GetAt(0) == '\\' && filepath.GetAt(1) == '\\') {
-        return ChangeSlashToPDF(filepath.GetPtr() + 1);
-    }
-    if (filepath.GetAt(0) == '\\') {
-        CFX_WideString result;
-        result = '/';
-        result += ChangeSlashToPDF(filepath.GetPtr());
-        return result;
-    }
-    return ChangeSlashToPDF(filepath.GetPtr());
-#elif _FXM_PLATFORM_  == _FXM_PLATFORM_APPLE_
-    if (filepath.Left(sizeof("Mac") - 1) == FX_WSTRC(L"Mac")) {
-        CFX_WideString result;
-        result = '/';
-        result += ChangeSlashToPDF(filepath.GetPtr());
-        return result;
+CFX_WideString FILESPEC_EncodeFileName(const CFX_WideStringC& filepath) {
+  if (filepath.GetLength() <= 1) {
+    return CFX_WideString();
+  }
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+  if (filepath.GetAt(1) == ':') {
+    CFX_WideString result;
+    result = '/';
+    result += filepath.GetAt(0);
+    if (filepath.GetAt(2) != '\\') {
+      result += '/';
     }
-    return ChangeSlashToPDF(filepath.GetPtr());
+    result += ChangeSlashToPDF(filepath.GetPtr() + 2);
+    return result;
+  }
+  if (filepath.GetAt(0) == '\\' && filepath.GetAt(1) == '\\') {
+    return ChangeSlashToPDF(filepath.GetPtr() + 1);
+  }
+  if (filepath.GetAt(0) == '\\') {
+    CFX_WideString result;
+    result = '/';
+    result += ChangeSlashToPDF(filepath.GetPtr());
+    return result;
+  }
+  return ChangeSlashToPDF(filepath.GetPtr());
+#elif _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+  if (filepath.Left(sizeof("Mac") - 1) == FX_WSTRC(L"Mac")) {
+    CFX_WideString result;
+    result = '/';
+    result += ChangeSlashToPDF(filepath.GetPtr());
+    return result;
+  }
+  return ChangeSlashToPDF(filepath.GetPtr());
 #else
-    return filepath;
+  return filepath;
 #endif
 }
-CPDF_Stream* CPDF_FileSpec::GetFileStream() const
-{
-    if (m_pObj == NULL) {
-        return NULL;
-    }
-    int32_t iType = m_pObj->GetType();
-    if (iType == PDFOBJ_STREAM) {
-        return (CPDF_Stream*)m_pObj;
-    } else if (iType == PDFOBJ_DICTIONARY) {
-        CPDF_Dictionary *pEF = ((CPDF_Dictionary*)m_pObj)->GetDict(FX_BSTRC("EF"));
-        if (pEF == NULL) {
-            return NULL;
-        }
-        return pEF->GetStream(FX_BSTRC("F"));
-    }
+CPDF_Stream* CPDF_FileSpec::GetFileStream() const {
+  if (m_pObj == NULL) {
     return NULL;
+  }
+  int32_t iType = m_pObj->GetType();
+  if (iType == PDFOBJ_STREAM) {
+    return (CPDF_Stream*)m_pObj;
+  } else if (iType == PDFOBJ_DICTIONARY) {
+    CPDF_Dictionary* pEF = ((CPDF_Dictionary*)m_pObj)->GetDict(FX_BSTRC("EF"));
+    if (pEF == NULL) {
+      return NULL;
+    }
+    return pEF->GetStream(FX_BSTRC("F"));
+  }
+  return NULL;
 }
-static void FPDFDOC_FILESPEC_SetFileName(CPDF_Object *pObj, const CFX_WideStringC& wsFileName, FX_BOOL bURL)
-{
-    ASSERT(pObj != NULL);
-    CFX_WideString wsStr;
-    if (bURL) {
-        wsStr = wsFileName;
-    } else {
-        wsStr = FILESPEC_EncodeFileName(wsFileName);
-    }
-    int32_t iType = pObj->GetType();
-    if (iType == PDFOBJ_STRING) {
-        pObj->SetString(CFX_ByteString::FromUnicode(wsStr));
-    } else if (iType == PDFOBJ_DICTIONARY) {
-        CPDF_Dictionary* pDict = (CPDF_Dictionary*)pObj;
-        pDict->SetAtString(FX_BSTRC("F"), CFX_ByteString::FromUnicode(wsStr));
-        pDict->SetAtString(FX_BSTRC("UF"), PDF_EncodeText(wsStr));
-    }
+static void FPDFDOC_FILESPEC_SetFileName(CPDF_Object* pObj,
+                                         const CFX_WideStringC& wsFileName,
+                                         FX_BOOL bURL) {
+  ASSERT(pObj != NULL);
+  CFX_WideString wsStr;
+  if (bURL) {
+    wsStr = wsFileName;
+  } else {
+    wsStr = FILESPEC_EncodeFileName(wsFileName);
+  }
+  int32_t iType = pObj->GetType();
+  if (iType == PDFOBJ_STRING) {
+    pObj->SetString(CFX_ByteString::FromUnicode(wsStr));
+  } else if (iType == PDFOBJ_DICTIONARY) {
+    CPDF_Dictionary* pDict = (CPDF_Dictionary*)pObj;
+    pDict->SetAtString(FX_BSTRC("F"), CFX_ByteString::FromUnicode(wsStr));
+    pDict->SetAtString(FX_BSTRC("UF"), PDF_EncodeText(wsStr));
+  }
 }
-void CPDF_FileSpec::SetFileName(const CFX_WideStringC& wsFileName, FX_BOOL bURL)
-{
-    ASSERT(m_pObj != NULL);
-    if (m_pObj->GetType() == PDFOBJ_DICTIONARY && bURL) {
-        ((CPDF_Dictionary*)m_pObj)->SetAtName(FX_BSTRC("FS"), "URL");
-    }
-    FPDFDOC_FILESPEC_SetFileName(m_pObj, wsFileName, bURL);
+void CPDF_FileSpec::SetFileName(const CFX_WideStringC& wsFileName,
+                                FX_BOOL bURL) {
+  ASSERT(m_pObj != NULL);
+  if (m_pObj->GetType() == PDFOBJ_DICTIONARY && bURL) {
+    ((CPDF_Dictionary*)m_pObj)->SetAtName(FX_BSTRC("FS"), "URL");
+  }
+  FPDFDOC_FILESPEC_SetFileName(m_pObj, wsFileName, bURL);
 }
-static CFX_WideString _MakeRoman(int num)
-{
-    const int arabic[] = {
-        1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1
-    };
-    const CFX_WideString roman[] = {
-        L"m", L"cm", L"d", L"cd", L"c", L"xc", L"l", L"xl", L"x", L"ix", L"v", L"iv", L"i"
-    };
-    const int nMaxNum = 1000000;
-    num %= nMaxNum;
-    int i = 0;
-    CFX_WideString wsRomanNumber;
-    while (num > 0) {
-        while (num >= arabic[i]) {
-            num = num - arabic[i];
-            wsRomanNumber += roman[i];
-        }
-        i = i + 1;
-    }
-    return wsRomanNumber;
+static CFX_WideString _MakeRoman(int num) {
+  const int arabic[] = {1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1};
+  const CFX_WideString roman[] = {L"m",  L"cm", L"d",  L"cd", L"c",
+                                  L"xc", L"l",  L"xl", L"x",  L"ix",
+                                  L"v",  L"iv", L"i"};
+  const int nMaxNum = 1000000;
+  num %= nMaxNum;
+  int i = 0;
+  CFX_WideString wsRomanNumber;
+  while (num > 0) {
+    while (num >= arabic[i]) {
+      num = num - arabic[i];
+      wsRomanNumber += roman[i];
+    }
+    i = i + 1;
+  }
+  return wsRomanNumber;
 }
-static CFX_WideString _MakeLetters(int num)
-{
-    if (num == 0) {
-        return CFX_WideString();
-    }
-    CFX_WideString wsLetters;
-    const int nMaxCount = 1000;
-    const int nLetterCount = 26;
-    num -= 1;
-    int count = num / nLetterCount + 1;
-    count %= nMaxCount;
-    FX_WCHAR ch = L'a' + num % nLetterCount;
-    for (int i = 0; i < count; i++) {
-        wsLetters += ch;
-    }
-    return wsLetters;
+static CFX_WideString _MakeLetters(int num) {
+  if (num == 0) {
+    return CFX_WideString();
+  }
+  CFX_WideString wsLetters;
+  const int nMaxCount = 1000;
+  const int nLetterCount = 26;
+  num -= 1;
+  int count = num / nLetterCount + 1;
+  count %= nMaxCount;
+  FX_WCHAR ch = L'a' + num % nLetterCount;
+  for (int i = 0; i < count; i++) {
+    wsLetters += ch;
+  }
+  return wsLetters;
 }
-static CFX_WideString _GetLabelNumPortion(int num, const CFX_ByteString& bsStyle)
-{
-    CFX_WideString wsNumPortion;
-    if		(bsStyle.IsEmpty()) {
-        return wsNumPortion;
-    }
-    if (bsStyle == "D") {
-        wsNumPortion.Format(L"%d", num);
-    } else if (bsStyle == "R") {
-        wsNumPortion = _MakeRoman(num);
-        wsNumPortion.MakeUpper();
-    } else if (bsStyle == "r") {
-        wsNumPortion = _MakeRoman(num);
-    } else if (bsStyle == "A") {
-        wsNumPortion = _MakeLetters(num);
-        wsNumPortion.MakeUpper();
-    } else if (bsStyle == "a") {
-        wsNumPortion = _MakeLetters(num);
-    }
+static CFX_WideString _GetLabelNumPortion(int num,
+                                          const CFX_ByteString& bsStyle) {
+  CFX_WideString wsNumPortion;
+  if (bsStyle.IsEmpty()) {
     return wsNumPortion;
+  }
+  if (bsStyle == "D") {
+    wsNumPortion.Format(L"%d", num);
+  } else if (bsStyle == "R") {
+    wsNumPortion = _MakeRoman(num);
+    wsNumPortion.MakeUpper();
+  } else if (bsStyle == "r") {
+    wsNumPortion = _MakeRoman(num);
+  } else if (bsStyle == "A") {
+    wsNumPortion = _MakeLetters(num);
+    wsNumPortion.MakeUpper();
+  } else if (bsStyle == "a") {
+    wsNumPortion = _MakeLetters(num);
+  }
+  return wsNumPortion;
 }
-CFX_WideString CPDF_PageLabel::GetLabel(int nPage) const
-{
-    CFX_WideString wsLabel;
-    if (m_pDocument == NULL) {
-        return wsLabel;
-    }
-    CPDF_Dictionary* pPDFRoot = m_pDocument->GetRoot();
-    if (pPDFRoot == NULL) {
-        return wsLabel;
-    }
-    CPDF_Dictionary* pLabels = pPDFRoot->GetDict(FX_BSTRC("PageLabels"));
-    CPDF_NumberTree numberTree(pLabels);
-    CPDF_Object* pValue = NULL;
-    int n = nPage;
-    while (n >= 0) {
-        pValue = numberTree.LookupValue(n);
-        if (pValue != NULL) {
-            break;
-        }
-        n--;
-    }
+CFX_WideString CPDF_PageLabel::GetLabel(int nPage) const {
+  CFX_WideString wsLabel;
+  if (m_pDocument == NULL) {
+    return wsLabel;
+  }
+  CPDF_Dictionary* pPDFRoot = m_pDocument->GetRoot();
+  if (pPDFRoot == NULL) {
+    return wsLabel;
+  }
+  CPDF_Dictionary* pLabels = pPDFRoot->GetDict(FX_BSTRC("PageLabels"));
+  CPDF_NumberTree numberTree(pLabels);
+  CPDF_Object* pValue = NULL;
+  int n = nPage;
+  while (n >= 0) {
+    pValue = numberTree.LookupValue(n);
     if (pValue != NULL) {
-        pValue = pValue->GetDirect();
-        if (pValue->GetType() == PDFOBJ_DICTIONARY) {
-            CPDF_Dictionary* pLabel = (CPDF_Dictionary*)pValue;
-            if (pLabel->KeyExist(FX_BSTRC("P"))) {
-                wsLabel += pLabel->GetUnicodeText(FX_BSTRC("P"));
-            }
-            CFX_ByteString bsNumberingStyle = pLabel->GetString(FX_BSTRC("S"), NULL);
-            int nLabelNum = nPage - n + pLabel->GetInteger(FX_BSTRC("St"), 1);
-            CFX_WideString wsNumPortion = _GetLabelNumPortion(nLabelNum, bsNumberingStyle);
-            wsLabel += wsNumPortion;
-            return wsLabel;
-        }
+      break;
     }
-    wsLabel.Format(L"%d", nPage + 1);
-    return wsLabel;
+    n--;
+  }
+  if (pValue != NULL) {
+    pValue = pValue->GetDirect();
+    if (pValue->GetType() == PDFOBJ_DICTIONARY) {
+      CPDF_Dictionary* pLabel = (CPDF_Dictionary*)pValue;
+      if (pLabel->KeyExist(FX_BSTRC("P"))) {
+        wsLabel += pLabel->GetUnicodeText(FX_BSTRC("P"));
+      }
+      CFX_ByteString bsNumberingStyle = pLabel->GetString(FX_BSTRC("S"), NULL);
+      int nLabelNum = nPage - n + pLabel->GetInteger(FX_BSTRC("St"), 1);
+      CFX_WideString wsNumPortion =
+          _GetLabelNumPortion(nLabelNum, bsNumberingStyle);
+      wsLabel += wsNumPortion;
+      return wsLabel;
+    }
+  }
+  wsLabel.Format(L"%d", nPage + 1);
+  return wsLabel;
 }
-int32_t CPDF_PageLabel::GetPageByLabel(const CFX_ByteStringC& bsLabel) const
-{
-    if (m_pDocument == NULL) {
-        return -1;
-    }
-    CPDF_Dictionary* pPDFRoot = m_pDocument->GetRoot();
-    if (pPDFRoot == NULL) {
-        return -1;
-    }
-    int nPages = m_pDocument->GetPageCount();
-    CFX_ByteString bsLbl;
-    CFX_ByteString bsOrig = bsLabel;
-    for (int i = 0; i < nPages; i++) {
-        bsLbl = PDF_EncodeText(GetLabel(i));
-        if (!bsLbl.Compare(bsOrig)) {
-            return i;
-        }
-    }
-    bsLbl = bsOrig;
-    int nPage = FXSYS_atoi(bsLbl);
-    if (nPage > 0 && nPage <= nPages) {
-        return nPage;
-    }
+int32_t CPDF_PageLabel::GetPageByLabel(const CFX_ByteStringC& bsLabel) const {
+  if (m_pDocument == NULL) {
+    return -1;
+  }
+  CPDF_Dictionary* pPDFRoot = m_pDocument->GetRoot();
+  if (pPDFRoot == NULL) {
     return -1;
+  }
+  int nPages = m_pDocument->GetPageCount();
+  CFX_ByteString bsLbl;
+  CFX_ByteString bsOrig = bsLabel;
+  for (int i = 0; i < nPages; i++) {
+    bsLbl = PDF_EncodeText(GetLabel(i));
+    if (!bsLbl.Compare(bsOrig)) {
+      return i;
+    }
+  }
+  bsLbl = bsOrig;
+  int nPage = FXSYS_atoi(bsLbl);
+  if (nPage > 0 && nPage <= nPages) {
+    return nPage;
+  }
+  return -1;
 }
-int32_t CPDF_PageLabel::GetPageByLabel(const CFX_WideStringC& wsLabel) const
-{
-    CFX_ByteString bsLabel = PDF_EncodeText(wsLabel.GetPtr());
-    return GetPageByLabel(bsLabel);
+int32_t CPDF_PageLabel::GetPageByLabel(const CFX_WideStringC& wsLabel) const {
+  CFX_ByteString bsLabel = PDF_EncodeText(wsLabel.GetPtr());
+  return GetPageByLabel(bsLabel);
 }
diff --git a/core/src/fpdfdoc/doc_bookmark.cpp b/core/src/fpdfdoc/doc_bookmark.cpp
index 9f0d586a6c..2fea810ecc 100644
--- a/core/src/fpdfdoc/doc_bookmark.cpp
+++ b/core/src/fpdfdoc/doc_bookmark.cpp
@@ -9,90 +9,85 @@
 #include "../../../third_party/base/nonstd_unique_ptr.h"
 #include "../../include/fpdfdoc/fpdf_doc.h"
 
-CPDF_Bookmark CPDF_BookmarkTree::GetFirstChild(const CPDF_Bookmark& parent) const
-{
-    if (!parent.m_pDict) {
-        CPDF_Dictionary* pRoot = m_pDocument->GetRoot()->GetDict("Outlines");
-        if (!pRoot) {
-            return CPDF_Bookmark();
-        }
-        return CPDF_Bookmark(pRoot->GetDict("First"));
+CPDF_Bookmark CPDF_BookmarkTree::GetFirstChild(
+    const CPDF_Bookmark& parent) const {
+  if (!parent.m_pDict) {
+    CPDF_Dictionary* pRoot = m_pDocument->GetRoot()->GetDict("Outlines");
+    if (!pRoot) {
+      return CPDF_Bookmark();
     }
-    return CPDF_Bookmark(parent.m_pDict->GetDict("First"));
+    return CPDF_Bookmark(pRoot->GetDict("First"));
+  }
+  return CPDF_Bookmark(parent.m_pDict->GetDict("First"));
 }
-CPDF_Bookmark CPDF_BookmarkTree::GetNextSibling(const CPDF_Bookmark& bookmark) const
-{
-    if (!bookmark.m_pDict) {
-        return CPDF_Bookmark();
-    }
-    CPDF_Dictionary *pNext = bookmark.m_pDict->GetDict("Next");
-    return pNext == bookmark.m_pDict ? CPDF_Bookmark() : CPDF_Bookmark(pNext);
+CPDF_Bookmark CPDF_BookmarkTree::GetNextSibling(
+    const CPDF_Bookmark& bookmark) const {
+  if (!bookmark.m_pDict) {
+    return CPDF_Bookmark();
+  }
+  CPDF_Dictionary* pNext = bookmark.m_pDict->GetDict("Next");
+  return pNext == bookmark.m_pDict ? CPDF_Bookmark() : CPDF_Bookmark(pNext);
 }
-FX_DWORD CPDF_Bookmark::GetColorRef() const
-{
-    if (!m_pDict) {
-        return 0;
-    }
-    CPDF_Array* pColor = m_pDict->GetArray("C");
-    if (!pColor) {
-        return FXSYS_RGB(0, 0, 0);
-    }
-    int r = FXSYS_round(pColor->GetNumber(0) * 255);
-    int g = FXSYS_round(pColor->GetNumber(1) * 255);
-    int b = FXSYS_round(pColor->GetNumber(2) * 255);
-    return FXSYS_RGB(r, g, b);
+FX_DWORD CPDF_Bookmark::GetColorRef() const {
+  if (!m_pDict) {
+    return 0;
+  }
+  CPDF_Array* pColor = m_pDict->GetArray("C");
+  if (!pColor) {
+    return FXSYS_RGB(0, 0, 0);
+  }
+  int r = FXSYS_round(pColor->GetNumber(0) * 255);
+  int g = FXSYS_round(pColor->GetNumber(1) * 255);
+  int b = FXSYS_round(pColor->GetNumber(2) * 255);
+  return FXSYS_RGB(r, g, b);
 }
-FX_DWORD CPDF_Bookmark::GetFontStyle() const
-{
-    if (!m_pDict) {
-        return 0;
-    }
-    return m_pDict->GetInteger("F");
+FX_DWORD CPDF_Bookmark::GetFontStyle() const {
+  if (!m_pDict) {
+    return 0;
+  }
+  return m_pDict->GetInteger("F");
 }
-CFX_WideString CPDF_Bookmark::GetTitle() const
-{
-    if (!m_pDict) {
-        return CFX_WideString();
-    }
-    CPDF_String* pString = (CPDF_String*)m_pDict->GetElementValue("Title");
-    if (!pString || pString->GetType() != PDFOBJ_STRING) {
-        return CFX_WideString();
-    }
-    CFX_WideString title = pString->GetUnicodeText();
-    int len = title.GetLength();
-    if (!len) {
-        return CFX_WideString();
-    }
-    nonstd::unique_ptr<FX_WCHAR[]> buf(new FX_WCHAR[len]);
-    for (int i = 0; i < len; i++) {
-        FX_WCHAR w = title[i];
-        buf[i] = w > 0x20 ? w : 0x20;
-    }
-    return CFX_WideString(buf.get(), len);
+CFX_WideString CPDF_Bookmark::GetTitle() const {
+  if (!m_pDict) {
+    return CFX_WideString();
+  }
+  CPDF_String* pString = (CPDF_String*)m_pDict->GetElementValue("Title");
+  if (!pString || pString->GetType() != PDFOBJ_STRING) {
+    return CFX_WideString();
+  }
+  CFX_WideString title = pString->GetUnicodeText();
+  int len = title.GetLength();
+  if (!len) {
+    return CFX_WideString();
+  }
+  nonstd::unique_ptr<FX_WCHAR[]> buf(new FX_WCHAR[len]);
+  for (int i = 0; i < len; i++) {
+    FX_WCHAR w = title[i];
+    buf[i] = w > 0x20 ? w : 0x20;
+  }
+  return CFX_WideString(buf.get(), len);
 }
-CPDF_Dest CPDF_Bookmark::GetDest(CPDF_Document* pDocument) const
-{
-    if (!m_pDict) {
-        return CPDF_Dest();
-    }
-    CPDF_Object* pDest = m_pDict->GetElementValue("Dest");
-    if (!pDest) {
-        return CPDF_Dest();
-    }
-    if (pDest->GetType() == PDFOBJ_STRING || pDest->GetType() == PDFOBJ_NAME) {
-        CPDF_NameTree name_tree(pDocument, FX_BSTRC("Dests"));
-        CFX_ByteStringC name = pDest->GetString();
-        return CPDF_Dest(name_tree.LookupNamedDest(pDocument, name));
-    }
-    if (pDest->GetType() == PDFOBJ_ARRAY) {
-        return CPDF_Dest((CPDF_Array*)pDest);
-    }
+CPDF_Dest CPDF_Bookmark::GetDest(CPDF_Document* pDocument) const {
+  if (!m_pDict) {
+    return CPDF_Dest();
+  }
+  CPDF_Object* pDest = m_pDict->GetElementValue("Dest");
+  if (!pDest) {
     return CPDF_Dest();
+  }
+  if (pDest->GetType() == PDFOBJ_STRING || pDest->GetType() == PDFOBJ_NAME) {
+    CPDF_NameTree name_tree(pDocument, FX_BSTRC("Dests"));
+    CFX_ByteStringC name = pDest->GetString();
+    return CPDF_Dest(name_tree.LookupNamedDest(pDocument, name));
+  }
+  if (pDest->GetType() == PDFOBJ_ARRAY) {
+    return CPDF_Dest((CPDF_Array*)pDest);
+  }
+  return CPDF_Dest();
 }
-CPDF_Action CPDF_Bookmark::GetAction() const
-{
-    if (!m_pDict) {
-        return CPDF_Action();
-    }
-    return CPDF_Action(m_pDict->GetDict("A"));
+CPDF_Action CPDF_Bookmark::GetAction() const {
+  if (!m_pDict) {
+    return CPDF_Action();
+  }
+  return CPDF_Action(m_pDict->GetDict("A"));
 }
diff --git a/core/src/fpdfdoc/doc_form.cpp b/core/src/fpdfdoc/doc_form.cpp
index 735231cc1d..a59f35eeac 100644
--- a/core/src/fpdfdoc/doc_form.cpp
+++ b/core/src/fpdfdoc/doc_form.cpp
@@ -9,1619 +9,1617 @@
 
 const int nMaxRecursion = 32;
 
-class _CFieldNameExtractor
-{
-public:
-    _CFieldNameExtractor(const CFX_WideString& full_name)
-    {
-        m_pStart = full_name.c_str();
-        m_pEnd = m_pStart + full_name.GetLength();
-        m_pCur = m_pStart;
-    }
-    void GetNext(const FX_WCHAR* &pSubName, FX_STRSIZE& size)
-    {
-        pSubName = m_pCur;
-        while (m_pCur < m_pEnd && m_pCur[0] != L'.') {
-            m_pCur++;
-        }
-        size = (FX_STRSIZE)(m_pCur - pSubName);
-        if (m_pCur < m_pEnd && m_pCur[0] == L'.') {
-            m_pCur++;
-        }
-    }
-protected:
-    const FX_WCHAR* m_pStart;
-    const FX_WCHAR* m_pEnd;
-    const FX_WCHAR* m_pCur;
-};
-class CFieldTree
-{
-public:
-    struct _Node  {
-        _Node *parent;
-        CFX_PtrArray children;
-        CFX_WideString short_name;
-        CPDF_FormField *field_ptr;
-        int CountFields(int nLevel = 0)
-        {
-            if (nLevel > nMaxRecursion) {
-                return 0;
-            }
-            if (field_ptr) {
-                return 1;
-            }
-            int count = 0;
-            for (int i = 0; i < children.GetSize(); i ++) {
-                count += ((_Node *)children.GetAt(i))->CountFields(nLevel + 1);
-            }
-            return count;
-        }
-        CPDF_FormField* GetField(int* fields_to_go)
-        {
-            if (field_ptr) {
-                if (*fields_to_go == 0) {
-                    return field_ptr;
-                }
-                --*fields_to_go;
-                return NULL;
-            }
-            for (int i = 0; i < children.GetSize(); i++) {
-                _Node *pNode = (_Node *)children.GetAt(i);
-                CPDF_FormField* pField = pNode->GetField(fields_to_go);
-                if (pField) {
-                    return pField;
-                }
-            }
-            return NULL;
-        }
-        CPDF_FormField* GetField(int index)
-        {
-            int fields_to_go = index;
-            return GetField(&fields_to_go);
-        }
-    };
-    CFieldTree();
-    ~CFieldTree();
-    void SetField(const CFX_WideString &full_name, CPDF_FormField *field_ptr);
-    CPDF_FormField *GetField(const CFX_WideString &full_name);
-    CPDF_FormField *RemoveField(const CFX_WideString &full_name);
-    void RemoveAll();
-    _Node *FindNode(const CFX_WideString &full_name);
-    _Node * AddChild(_Node *pParent, const CFX_WideString &short_name, CPDF_FormField *field_ptr);
-    void RemoveNode(_Node *pNode, int nLevel = 0);
-    _Node *_Lookup(_Node *pParent, const CFX_WideString &short_name);
-    _Node m_Root;
+class _CFieldNameExtractor {
+ public:
+  _CFieldNameExtractor(const CFX_WideString& full_name) {
+    m_pStart = full_name.c_str();
+    m_pEnd = m_pStart + full_name.GetLength();
+    m_pCur = m_pStart;
+  }
+  void GetNext(const FX_WCHAR*& pSubName, FX_STRSIZE& size) {
+    pSubName = m_pCur;
+    while (m_pCur < m_pEnd && m_pCur[0] != L'.') {
+      m_pCur++;
+    }
+    size = (FX_STRSIZE)(m_pCur - pSubName);
+    if (m_pCur < m_pEnd && m_pCur[0] == L'.') {
+      m_pCur++;
+    }
+  }
+
+ protected:
+  const FX_WCHAR* m_pStart;
+  const FX_WCHAR* m_pEnd;
+  const FX_WCHAR* m_pCur;
 };
-CFieldTree::CFieldTree()
-{
-    m_Root.parent = NULL;
-    m_Root.field_ptr = NULL;
-}
-CFieldTree::~CFieldTree()
-{
-    RemoveAll();
-}
-CFieldTree::_Node *CFieldTree::AddChild(_Node *pParent, const CFX_WideString &short_name, CPDF_FormField *field_ptr)
-{
-    if (pParent == NULL) {
+class CFieldTree {
+ public:
+  struct _Node {
+    _Node* parent;
+    CFX_PtrArray children;
+    CFX_WideString short_name;
+    CPDF_FormField* field_ptr;
+    int CountFields(int nLevel = 0) {
+      if (nLevel > nMaxRecursion) {
+        return 0;
+      }
+      if (field_ptr) {
+        return 1;
+      }
+      int count = 0;
+      for (int i = 0; i < children.GetSize(); i++) {
+        count += ((_Node*)children.GetAt(i))->CountFields(nLevel + 1);
+      }
+      return count;
+    }
+    CPDF_FormField* GetField(int* fields_to_go) {
+      if (field_ptr) {
+        if (*fields_to_go == 0) {
+          return field_ptr;
+        }
+        --*fields_to_go;
         return NULL;
-    }
-    _Node* pNode = new _Node;
-    pNode->parent = pParent;
-    pNode->short_name = short_name;
-    pNode->field_ptr = field_ptr;
-    pParent->children.Add(pNode);
-    return pNode;
+      }
+      for (int i = 0; i < children.GetSize(); i++) {
+        _Node* pNode = (_Node*)children.GetAt(i);
+        CPDF_FormField* pField = pNode->GetField(fields_to_go);
+        if (pField) {
+          return pField;
+        }
+      }
+      return NULL;
+    }
+    CPDF_FormField* GetField(int index) {
+      int fields_to_go = index;
+      return GetField(&fields_to_go);
+    }
+  };
+  CFieldTree();
+  ~CFieldTree();
+  void SetField(const CFX_WideString& full_name, CPDF_FormField* field_ptr);
+  CPDF_FormField* GetField(const CFX_WideString& full_name);
+  CPDF_FormField* RemoveField(const CFX_WideString& full_name);
+  void RemoveAll();
+  _Node* FindNode(const CFX_WideString& full_name);
+  _Node* AddChild(_Node* pParent,
+                  const CFX_WideString& short_name,
+                  CPDF_FormField* field_ptr);
+  void RemoveNode(_Node* pNode, int nLevel = 0);
+  _Node* _Lookup(_Node* pParent, const CFX_WideString& short_name);
+  _Node m_Root;
+};
+CFieldTree::CFieldTree() {
+  m_Root.parent = NULL;
+  m_Root.field_ptr = NULL;
 }
-void CFieldTree::RemoveNode(_Node *pNode, int nLevel)
-{
-    if (pNode == NULL) {
-        return ;
-    }
-    if (nLevel > nMaxRecursion) {
-        delete pNode;
-        return ;
-    }
-    CFX_PtrArray& ptr_array = pNode->children;
-    for (int i = 0; i < ptr_array.GetSize(); i ++) {
-        _Node *pChild = (_Node *)ptr_array[i];
-        RemoveNode(pChild, nLevel + 1);
-    }
-    delete pNode;
+CFieldTree::~CFieldTree() {
+  RemoveAll();
 }
-CFieldTree::_Node *CFieldTree::_Lookup(_Node *pParent, const CFX_WideString &short_name)
-{
-    if (pParent == NULL) {
-        return NULL;
-    }
-    CFX_PtrArray& ptr_array = pParent->children;
-    for (int i = 0; i < ptr_array.GetSize(); i ++) {
-        _Node *pNode = (_Node *)ptr_array[i];
-        if (pNode->short_name.GetLength() == short_name.GetLength() &&
-                FXSYS_memcmp(pNode->short_name.c_str(), short_name.c_str(), short_name.GetLength()*sizeof(FX_WCHAR)) == 0) {
-            return pNode;
-        }
-    }
+CFieldTree::_Node* CFieldTree::AddChild(_Node* pParent,
+                                        const CFX_WideString& short_name,
+                                        CPDF_FormField* field_ptr) {
+  if (pParent == NULL) {
     return NULL;
-}
-void CFieldTree::RemoveAll()
-{
-    CFX_PtrArray& ptr_array = m_Root.children;
-    for (int i = 0; i < ptr_array.GetSize(); i ++) {
-        _Node *pNode = (_Node *)ptr_array[i];
-        RemoveNode(pNode);
-    }
-}
-void CFieldTree::SetField(const CFX_WideString &full_name, CPDF_FormField *field_ptr)
-{
-    if (full_name == L"") {
-        return;
+  }
+  _Node* pNode = new _Node;
+  pNode->parent = pParent;
+  pNode->short_name = short_name;
+  pNode->field_ptr = field_ptr;
+  pParent->children.Add(pNode);
+  return pNode;
+}
+void CFieldTree::RemoveNode(_Node* pNode, int nLevel) {
+  if (pNode == NULL) {
+    return;
+  }
+  if (nLevel > nMaxRecursion) {
+    delete pNode;
+    return;
+  }
+  CFX_PtrArray& ptr_array = pNode->children;
+  for (int i = 0; i < ptr_array.GetSize(); i++) {
+    _Node* pChild = (_Node*)ptr_array[i];
+    RemoveNode(pChild, nLevel + 1);
+  }
+  delete pNode;
+}
+CFieldTree::_Node* CFieldTree::_Lookup(_Node* pParent,
+                                       const CFX_WideString& short_name) {
+  if (pParent == NULL) {
+    return NULL;
+  }
+  CFX_PtrArray& ptr_array = pParent->children;
+  for (int i = 0; i < ptr_array.GetSize(); i++) {
+    _Node* pNode = (_Node*)ptr_array[i];
+    if (pNode->short_name.GetLength() == short_name.GetLength() &&
+        FXSYS_memcmp(pNode->short_name.c_str(), short_name.c_str(),
+                     short_name.GetLength() * sizeof(FX_WCHAR)) == 0) {
+      return pNode;
+    }
+  }
+  return NULL;
+}
+void CFieldTree::RemoveAll() {
+  CFX_PtrArray& ptr_array = m_Root.children;
+  for (int i = 0; i < ptr_array.GetSize(); i++) {
+    _Node* pNode = (_Node*)ptr_array[i];
+    RemoveNode(pNode);
+  }
+}
+void CFieldTree::SetField(const CFX_WideString& full_name,
+                          CPDF_FormField* field_ptr) {
+  if (full_name == L"") {
+    return;
+  }
+  _CFieldNameExtractor name_extractor(full_name);
+  const FX_WCHAR* pName;
+  FX_STRSIZE nLength;
+  name_extractor.GetNext(pName, nLength);
+  _Node *pNode = &m_Root, *pLast = NULL;
+  while (nLength > 0) {
+    pLast = pNode;
+    CFX_WideString name = CFX_WideString(pName, nLength);
+    pNode = _Lookup(pLast, name);
+    if (pNode == NULL) {
+      pNode = AddChild(pLast, name, NULL);
     }
-    _CFieldNameExtractor name_extractor(full_name);
-    const FX_WCHAR* pName;
-    FX_STRSIZE nLength;
     name_extractor.GetNext(pName, nLength);
-    _Node *pNode = &m_Root, *pLast = NULL;
-    while (nLength > 0) {
-        pLast = pNode;
-        CFX_WideString name = CFX_WideString(pName, nLength);
-        pNode = _Lookup(pLast, name);
-        if (pNode == NULL) {
-            pNode = AddChild(pLast, name, NULL);
-        }
-        name_extractor.GetNext(pName, nLength);
-    }
-    if (pNode != &m_Root) {
-        pNode->field_ptr = field_ptr;
-    }
+  }
+  if (pNode != &m_Root) {
+    pNode->field_ptr = field_ptr;
+  }
 }
-CPDF_FormField *CFieldTree::GetField(const CFX_WideString &full_name)
-{
-    if (full_name == L"") {
-        return NULL;
-    }
-    _CFieldNameExtractor name_extractor(full_name);
-    const FX_WCHAR* pName;
-    FX_STRSIZE nLength;
-    name_extractor.GetNext(pName, nLength);
-    _Node *pNode = &m_Root, *pLast = NULL;
-    while (nLength > 0 && pNode) {
-        pLast = pNode;
-        CFX_WideString name = CFX_WideString(pName, nLength);
-        pNode = _Lookup(pLast, name);
-        name_extractor.GetNext(pName, nLength);
-    }
-    return pNode ? pNode->field_ptr : NULL;
-}
-CPDF_FormField *CFieldTree::RemoveField(const CFX_WideString & full_name)
-{
-    if (full_name == L"") {
-        return NULL;
-    }
-    _CFieldNameExtractor name_extractor(full_name);
-    const FX_WCHAR* pName;
-    FX_STRSIZE nLength;
+CPDF_FormField* CFieldTree::GetField(const CFX_WideString& full_name) {
+  if (full_name == L"") {
+    return NULL;
+  }
+  _CFieldNameExtractor name_extractor(full_name);
+  const FX_WCHAR* pName;
+  FX_STRSIZE nLength;
+  name_extractor.GetNext(pName, nLength);
+  _Node *pNode = &m_Root, *pLast = NULL;
+  while (nLength > 0 && pNode) {
+    pLast = pNode;
+    CFX_WideString name = CFX_WideString(pName, nLength);
+    pNode = _Lookup(pLast, name);
     name_extractor.GetNext(pName, nLength);
-    _Node *pNode = &m_Root, *pLast = NULL;
-    while (nLength > 0 && pNode) {
-        pLast = pNode;
-        CFX_WideString name = CFX_WideString(pName, nLength);
-        pNode = _Lookup(pLast, name);
-        name_extractor.GetNext(pName, nLength);
-    }
-    if (pNode && pNode != &m_Root) {
-        CFX_PtrArray& ptr_array = pLast->children;
-        for (int i = 0; i < ptr_array.GetSize(); i ++) {
-            if (pNode == (_Node *)ptr_array[i]) {
-                ptr_array.RemoveAt(i);
-                break;
-            }
-        }
-        CPDF_FormField *pField = pNode->field_ptr;
-        RemoveNode(pNode);
-        return pField;
-    }
+  }
+  return pNode ? pNode->field_ptr : NULL;
+}
+CPDF_FormField* CFieldTree::RemoveField(const CFX_WideString& full_name) {
+  if (full_name == L"") {
     return NULL;
+  }
+  _CFieldNameExtractor name_extractor(full_name);
+  const FX_WCHAR* pName;
+  FX_STRSIZE nLength;
+  name_extractor.GetNext(pName, nLength);
+  _Node *pNode = &m_Root, *pLast = NULL;
+  while (nLength > 0 && pNode) {
+    pLast = pNode;
+    CFX_WideString name = CFX_WideString(pName, nLength);
+    pNode = _Lookup(pLast, name);
+    name_extractor.GetNext(pName, nLength);
+  }
+  if (pNode && pNode != &m_Root) {
+    CFX_PtrArray& ptr_array = pLast->children;
+    for (int i = 0; i < ptr_array.GetSize(); i++) {
+      if (pNode == (_Node*)ptr_array[i]) {
+        ptr_array.RemoveAt(i);
+        break;
+      }
+    }
+    CPDF_FormField* pField = pNode->field_ptr;
+    RemoveNode(pNode);
+    return pField;
+  }
+  return NULL;
 }
-CFieldTree::_Node *CFieldTree::FindNode(const CFX_WideString& full_name)
-{
-    if (full_name == L"") {
-        return NULL;
-    }
-    _CFieldNameExtractor name_extractor(full_name);
-    const FX_WCHAR* pName;
-    FX_STRSIZE nLength;
+CFieldTree::_Node* CFieldTree::FindNode(const CFX_WideString& full_name) {
+  if (full_name == L"") {
+    return NULL;
+  }
+  _CFieldNameExtractor name_extractor(full_name);
+  const FX_WCHAR* pName;
+  FX_STRSIZE nLength;
+  name_extractor.GetNext(pName, nLength);
+  _Node *pNode = &m_Root, *pLast = NULL;
+  while (nLength > 0 && pNode) {
+    pLast = pNode;
+    CFX_WideString name = CFX_WideString(pName, nLength);
+    pNode = _Lookup(pLast, name);
     name_extractor.GetNext(pName, nLength);
-    _Node *pNode = &m_Root, *pLast = NULL;
-    while (nLength > 0 && pNode) {
-        pLast = pNode;
-        CFX_WideString name = CFX_WideString(pName, nLength);
-        pNode = _Lookup(pLast, name);
-        name_extractor.GetNext(pName, nLength);
-    }
-    return pNode;
-}
-CPDF_InterForm::CPDF_InterForm(CPDF_Document* pDocument, FX_BOOL bGenerateAP) : CFX_PrivateData()
-{
-    m_pDocument = pDocument;
-    m_bGenerateAP = bGenerateAP;
-    m_pFormNotify = NULL;
-    m_bUpdated = FALSE;
-    m_pFieldTree = new CFieldTree;
-    CPDF_Dictionary* pRoot = m_pDocument->GetRoot();
-    m_pFormDict = pRoot->GetDict("AcroForm");
-    if (m_pFormDict == NULL) {
-        return;
-    }
-    CPDF_Array* pFields = m_pFormDict->GetArray("Fields");
-    if (pFields == NULL) {
-        return;
-    }
-    int count = pFields->GetCount();
-    for (int i = 0; i < count; i ++) {
-        LoadField(pFields->GetDict(i));
-    }
-}
-CPDF_InterForm::~CPDF_InterForm()
-{
-    FX_POSITION pos = m_ControlMap.GetStartPosition();
-    while (pos) {
-        void* key;
-        void* value;
-        m_ControlMap.GetNextAssoc(pos, key, value);
-        delete (CPDF_FormControl*)value;
-    }
-    if (m_pFieldTree != NULL) {
-        int nCount = m_pFieldTree->m_Root.CountFields();
-        for (int i = 0; i < nCount; i++) {
-            CPDF_FormField *pField = m_pFieldTree->m_Root.GetField(i);
-            delete pField;
-        }
-        delete m_pFieldTree;
-    }
-}
-FX_BOOL	CPDF_InterForm::m_bUpdateAP = TRUE;
-FX_BOOL CPDF_InterForm::UpdatingAPEnabled()
-{
-    return m_bUpdateAP;
-}
-void CPDF_InterForm::EnableUpdateAP(FX_BOOL bUpdateAP)
-{
-    m_bUpdateAP = bUpdateAP;
-}
-CFX_ByteString CPDF_InterForm::GenerateNewResourceName(const CPDF_Dictionary* pResDict, const FX_CHAR* csType, int iMinLen, const FX_CHAR* csPrefix)
-{
-    CFX_ByteString csStr = csPrefix;
-    CFX_ByteString csBType = csType;
-    if (csStr.IsEmpty()) {
-        if (csBType == "ExtGState") {
-            csStr = "GS";
-        } else if (csBType == "ColorSpace") {
-            csStr = "CS";
-        } else if (csBType == "Font") {
-            csStr = "ZiTi";
-        } else {
-            csStr = "Res";
-        }
-    }
-    CFX_ByteString csTmp = csStr;
-    int iCount = csStr.GetLength();
-    int m = 0;
-    if (iMinLen > 0) {
-        csTmp = "";
-        while (m < iMinLen && m < iCount) {
-            csTmp += csStr[m ++];
-        }
-        while (m < iMinLen) {
-            csTmp += '0' + m % 10;
-            m ++;
-        }
+  }
+  return pNode;
+}
+CPDF_InterForm::CPDF_InterForm(CPDF_Document* pDocument, FX_BOOL bGenerateAP)
+    : CFX_PrivateData() {
+  m_pDocument = pDocument;
+  m_bGenerateAP = bGenerateAP;
+  m_pFormNotify = NULL;
+  m_bUpdated = FALSE;
+  m_pFieldTree = new CFieldTree;
+  CPDF_Dictionary* pRoot = m_pDocument->GetRoot();
+  m_pFormDict = pRoot->GetDict("AcroForm");
+  if (m_pFormDict == NULL) {
+    return;
+  }
+  CPDF_Array* pFields = m_pFormDict->GetArray("Fields");
+  if (pFields == NULL) {
+    return;
+  }
+  int count = pFields->GetCount();
+  for (int i = 0; i < count; i++) {
+    LoadField(pFields->GetDict(i));
+  }
+}
+CPDF_InterForm::~CPDF_InterForm() {
+  FX_POSITION pos = m_ControlMap.GetStartPosition();
+  while (pos) {
+    void* key;
+    void* value;
+    m_ControlMap.GetNextAssoc(pos, key, value);
+    delete (CPDF_FormControl*)value;
+  }
+  if (m_pFieldTree != NULL) {
+    int nCount = m_pFieldTree->m_Root.CountFields();
+    for (int i = 0; i < nCount; i++) {
+      CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(i);
+      delete pField;
+    }
+    delete m_pFieldTree;
+  }
+}
+FX_BOOL CPDF_InterForm::m_bUpdateAP = TRUE;
+FX_BOOL CPDF_InterForm::UpdatingAPEnabled() {
+  return m_bUpdateAP;
+}
+void CPDF_InterForm::EnableUpdateAP(FX_BOOL bUpdateAP) {
+  m_bUpdateAP = bUpdateAP;
+}
+CFX_ByteString CPDF_InterForm::GenerateNewResourceName(
+    const CPDF_Dictionary* pResDict,
+    const FX_CHAR* csType,
+    int iMinLen,
+    const FX_CHAR* csPrefix) {
+  CFX_ByteString csStr = csPrefix;
+  CFX_ByteString csBType = csType;
+  if (csStr.IsEmpty()) {
+    if (csBType == "ExtGState") {
+      csStr = "GS";
+    } else if (csBType == "ColorSpace") {
+      csStr = "CS";
+    } else if (csBType == "Font") {
+      csStr = "ZiTi";
     } else {
-        m = iCount;
-    }
-    if (pResDict == NULL) {
-        return csTmp;
-    }
-    CPDF_Dictionary* pDict = pResDict->GetDict(csType);
-    if (pDict == NULL) {
-        return csTmp;
-    }
-    int num = 0;
-    CFX_ByteString bsNum;
-    while (TRUE) {
-        if (!pDict->KeyExist(csTmp + bsNum)) {
-            return csTmp + bsNum;
-        }
-        if (m < iCount) {
-            csTmp += csStr[m ++];
-        } else {
-            bsNum.Format("%d", num++);
-        }
-        m ++;
-    }
+      csStr = "Res";
+    }
+  }
+  CFX_ByteString csTmp = csStr;
+  int iCount = csStr.GetLength();
+  int m = 0;
+  if (iMinLen > 0) {
+    csTmp = "";
+    while (m < iMinLen && m < iCount) {
+      csTmp += csStr[m++];
+    }
+    while (m < iMinLen) {
+      csTmp += '0' + m % 10;
+      m++;
+    }
+  } else {
+    m = iCount;
+  }
+  if (pResDict == NULL) {
     return csTmp;
+  }
+  CPDF_Dictionary* pDict = pResDict->GetDict(csType);
+  if (pDict == NULL) {
+    return csTmp;
+  }
+  int num = 0;
+  CFX_ByteString bsNum;
+  while (TRUE) {
+    if (!pDict->KeyExist(csTmp + bsNum)) {
+      return csTmp + bsNum;
+    }
+    if (m < iCount) {
+      csTmp += csStr[m++];
+    } else {
+      bsNum.Format("%d", num++);
+    }
+    m++;
+  }
+  return csTmp;
 }
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 typedef struct _PDF_FONTDATA {
-    FX_BOOL		bFind;
-    LOGFONTA	lf;
+  FX_BOOL bFind;
+  LOGFONTA lf;
 } PDF_FONTDATA, FAR* LPDF_FONTDATA;
-static int CALLBACK EnumFontFamExProc(	ENUMLOGFONTEXA *lpelfe,
-                                        NEWTEXTMETRICEX *lpntme,
-                                        DWORD FontType,
-                                        LPARAM lParam
-                                     )
-{
-    if (FontType != 0x004 || strchr(lpelfe->elfLogFont.lfFaceName, '@') != NULL) {
-        return 1;
-    }
-    LPDF_FONTDATA pData = (LPDF_FONTDATA)lParam;
-    memcpy(&pData->lf, &lpelfe->elfLogFont, sizeof(LOGFONTA));
-    pData->bFind = TRUE;
-    return 0;
-}
-static FX_BOOL RetrieveSpecificFont(LOGFONTA& lf)
-{
-    PDF_FONTDATA fd;
-    memset(&fd, 0, sizeof(PDF_FONTDATA));
-    HDC hDC = ::GetDC(NULL);
-    EnumFontFamiliesExA(hDC, &lf, (FONTENUMPROCA)EnumFontFamExProc, (LPARAM)&fd, 0);
-    ::ReleaseDC(NULL, hDC);
-    if (fd.bFind) {
-        memcpy(&lf, &fd.lf, sizeof(LOGFONTA));
-    }
-    return fd.bFind;
-}
-static FX_BOOL RetrieveSpecificFont(uint8_t charSet, uint8_t pitchAndFamily, LPCSTR pcsFontName, LOGFONTA& lf)
-{
+static int CALLBACK EnumFontFamExProc(ENUMLOGFONTEXA* lpelfe,
+                                      NEWTEXTMETRICEX* lpntme,
+                                      DWORD FontType,
+                                      LPARAM lParam) {
+  if (FontType != 0x004 || strchr(lpelfe->elfLogFont.lfFaceName, '@') != NULL) {
+    return 1;
+  }
+  LPDF_FONTDATA pData = (LPDF_FONTDATA)lParam;
+  memcpy(&pData->lf, &lpelfe->elfLogFont, sizeof(LOGFONTA));
+  pData->bFind = TRUE;
+  return 0;
+}
+static FX_BOOL RetrieveSpecificFont(LOGFONTA& lf) {
+  PDF_FONTDATA fd;
+  memset(&fd, 0, sizeof(PDF_FONTDATA));
+  HDC hDC = ::GetDC(NULL);
+  EnumFontFamiliesExA(hDC, &lf, (FONTENUMPROCA)EnumFontFamExProc, (LPARAM)&fd,
+                      0);
+  ::ReleaseDC(NULL, hDC);
+  if (fd.bFind) {
+    memcpy(&lf, &fd.lf, sizeof(LOGFONTA));
+  }
+  return fd.bFind;
+}
+static FX_BOOL RetrieveSpecificFont(uint8_t charSet,
+                                    uint8_t pitchAndFamily,
+                                    LPCSTR pcsFontName,
+                                    LOGFONTA& lf) {
+  memset(&lf, 0, sizeof(LOGFONTA));
+  lf.lfCharSet = charSet;
+  lf.lfPitchAndFamily = pitchAndFamily;
+  if (pcsFontName != NULL) {
+    strcpy(lf.lfFaceName, pcsFontName);
+  }
+  return RetrieveSpecificFont(lf);
+}
+static FX_BOOL RetrieveStockFont(int iFontObject,
+                                 uint8_t charSet,
+                                 LOGFONTA& lf) {
+  HFONT hFont = (HFONT)::GetStockObject(iFontObject);
+  if (hFont != NULL) {
     memset(&lf, 0, sizeof(LOGFONTA));
-    lf.lfCharSet = charSet;
-    lf.lfPitchAndFamily = pitchAndFamily;
-    if (pcsFontName != NULL) {
-        strcpy(lf.lfFaceName, pcsFontName);
-    }
-    return RetrieveSpecificFont(lf);
-}
-static FX_BOOL RetrieveStockFont(int iFontObject, uint8_t charSet, LOGFONTA& lf)
-{
-    HFONT hFont = (HFONT)::GetStockObject(iFontObject);
-    if (hFont != NULL) {
-        memset(&lf, 0, sizeof(LOGFONTA));
-        int iRet = ::GetObject(hFont, sizeof(LOGFONTA), &lf);
-        if (iRet > 0 && (lf.lfCharSet == charSet || charSet == 255)) {
-            return RetrieveSpecificFont(lf);
-        }
+    int iRet = ::GetObject(hFont, sizeof(LOGFONTA), &lf);
+    if (iRet > 0 && (lf.lfCharSet == charSet || charSet == 255)) {
+      return RetrieveSpecificFont(lf);
     }
-    return FALSE;
+  }
+  return FALSE;
 }
 #endif
-CPDF_Font* CPDF_InterForm::AddSystemDefaultFont(const CPDF_Document* pDocument)
-{
-    if (pDocument == NULL) {
-        return NULL;
-    }
-    CPDF_Font* pFont = NULL;
+CPDF_Font* CPDF_InterForm::AddSystemDefaultFont(
+    const CPDF_Document* pDocument) {
+  if (pDocument == NULL) {
+    return NULL;
+  }
+  CPDF_Font* pFont = NULL;
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-    LOGFONTA lf;
-    FX_BOOL bRet;
-    bRet = RetrieveStockFont(DEFAULT_GUI_FONT, 255, lf);
-    if (!bRet) {
-        bRet = RetrieveStockFont(SYSTEM_FONT, 255, lf);
-    }
-    if (bRet) {
-        pFont = ((CPDF_Document*)pDocument)->AddWindowsFont(&lf, FALSE, TRUE);
-    }
+  LOGFONTA lf;
+  FX_BOOL bRet;
+  bRet = RetrieveStockFont(DEFAULT_GUI_FONT, 255, lf);
+  if (!bRet) {
+    bRet = RetrieveStockFont(SYSTEM_FONT, 255, lf);
+  }
+  if (bRet) {
+    pFont = ((CPDF_Document*)pDocument)->AddWindowsFont(&lf, FALSE, TRUE);
+  }
 #endif
-    return pFont;
+  return pFont;
 }
-CPDF_Font* CPDF_InterForm::AddSystemFont(const CPDF_Document* pDocument, CFX_ByteString csFontName, uint8_t iCharSet)
-{
-    if (pDocument == NULL || csFontName.IsEmpty()) {
-        return NULL;
-    }
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-    if (iCharSet == 1) {
-        iCharSet = GetNativeCharSet();
-    }
-    HFONT hFont = ::CreateFontA(0, 0, 0, 0, 0, 0, 0, 0, iCharSet, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, csFontName.c_str());
-    if (hFont != NULL) {
-        LOGFONTA lf;
-        memset(&lf, 0, sizeof(LOGFONTA));
-        ::GetObjectA(hFont, sizeof(LOGFONTA), &lf);
-        ::DeleteObject(hFont);
-        if (strlen(lf.lfFaceName) > 0) {
-            return ((CPDF_Document*)pDocument)->AddWindowsFont(&lf, FALSE, TRUE);
-        }
-    }
-#endif
+CPDF_Font* CPDF_InterForm::AddSystemFont(const CPDF_Document* pDocument,
+                                         CFX_ByteString csFontName,
+                                         uint8_t iCharSet) {
+  if (pDocument == NULL || csFontName.IsEmpty()) {
     return NULL;
-}
-CPDF_Font* CPDF_InterForm::AddSystemFont(const CPDF_Document* pDocument, CFX_WideString csFontName, uint8_t iCharSet)
-{
-    if (pDocument == NULL || csFontName.IsEmpty()) {
-        return NULL;
-    }
+  }
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-    if (iCharSet == 1) {
-        iCharSet = GetNativeCharSet();
-    }
-    HFONT hFont = ::CreateFontW(0, 0, 0, 0, 0, 0, 0, 0, iCharSet, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, csFontName.c_str());
-    if (hFont != NULL) {
-        LOGFONTA lf;
-        memset(&lf, 0, sizeof(LOGFONTA));
-        ::GetObject(hFont, sizeof(LOGFONTA), &lf);
-        ::DeleteObject(hFont);
-        if (strlen(lf.lfFaceName) > 0) {
-            return ((CPDF_Document*)pDocument)->AddWindowsFont(&lf, FALSE, TRUE);
-        }
+  if (iCharSet == 1) {
+    iCharSet = GetNativeCharSet();
+  }
+  HFONT hFont = ::CreateFontA(
+      0, 0, 0, 0, 0, 0, 0, 0, iCharSet, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
+      DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, csFontName.c_str());
+  if (hFont != NULL) {
+    LOGFONTA lf;
+    memset(&lf, 0, sizeof(LOGFONTA));
+    ::GetObjectA(hFont, sizeof(LOGFONTA), &lf);
+    ::DeleteObject(hFont);
+    if (strlen(lf.lfFaceName) > 0) {
+      return ((CPDF_Document*)pDocument)->AddWindowsFont(&lf, FALSE, TRUE);
     }
+  }
 #endif
-    return NULL;
+  return NULL;
 }
-CPDF_Font* CPDF_InterForm::AddStandardFont(const CPDF_Document* pDocument, CFX_ByteString csFontName)
-{
-    if (pDocument == NULL || csFontName.IsEmpty()) {
-        return NULL;
-    }
-    CPDF_Font* pFont = NULL;
-    if (csFontName == "ZapfDingbats") {
-        pFont = ((CPDF_Document*)pDocument)->AddStandardFont(csFontName, NULL);
-    } else {
-        CPDF_FontEncoding encoding(PDFFONT_ENCODING_WINANSI);
-        pFont = ((CPDF_Document*)pDocument)->AddStandardFont(csFontName, &encoding);
-    }
-    return pFont;
-}
-CFX_ByteString CPDF_InterForm::GetNativeFont(uint8_t charSet, void* pLogFont)
-{
-    CFX_ByteString csFontName;
+CPDF_Font* CPDF_InterForm::AddSystemFont(const CPDF_Document* pDocument,
+                                         CFX_WideString csFontName,
+                                         uint8_t iCharSet) {
+  if (pDocument == NULL || csFontName.IsEmpty()) {
+    return NULL;
+  }
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+  if (iCharSet == 1) {
+    iCharSet = GetNativeCharSet();
+  }
+  HFONT hFont = ::CreateFontW(
+      0, 0, 0, 0, 0, 0, 0, 0, iCharSet, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
+      DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, csFontName.c_str());
+  if (hFont != NULL) {
     LOGFONTA lf;
-    FX_BOOL bRet;
-    if (charSet == ANSI_CHARSET) {
-        csFontName = "Helvetica";
-        return csFontName;
-    }
-    bRet = FALSE;
-    if (charSet == SHIFTJIS_CHARSET) {
-        bRet = RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE, "MS Mincho", lf);
-    } else if (charSet == GB2312_CHARSET) {
-        bRet = RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE, "SimSun", lf);
-    } else if (charSet == CHINESEBIG5_CHARSET) {
-        bRet = RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE, "MingLiU", lf);
-    }
-    if (!bRet) {
-        bRet = RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE, "Arial Unicode MS", lf);
-    }
-    if (!bRet) {
-        bRet = RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE, "Microsoft Sans Serif", lf);
-    }
-    if (!bRet) {
-        bRet = RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE, NULL, lf);
-    }
-    if (bRet) {
-        if (pLogFont != NULL) {
-            memcpy(pLogFont, &lf, sizeof(LOGFONTA));
-        }
-        csFontName = lf.lfFaceName;
-        return csFontName;
+    memset(&lf, 0, sizeof(LOGFONTA));
+    ::GetObject(hFont, sizeof(LOGFONTA), &lf);
+    ::DeleteObject(hFont);
+    if (strlen(lf.lfFaceName) > 0) {
+      return ((CPDF_Document*)pDocument)->AddWindowsFont(&lf, FALSE, TRUE);
     }
+  }
 #endif
+  return NULL;
+}
+CPDF_Font* CPDF_InterForm::AddStandardFont(const CPDF_Document* pDocument,
+                                           CFX_ByteString csFontName) {
+  if (pDocument == NULL || csFontName.IsEmpty()) {
+    return NULL;
+  }
+  CPDF_Font* pFont = NULL;
+  if (csFontName == "ZapfDingbats") {
+    pFont = ((CPDF_Document*)pDocument)->AddStandardFont(csFontName, NULL);
+  } else {
+    CPDF_FontEncoding encoding(PDFFONT_ENCODING_WINANSI);
+    pFont = ((CPDF_Document*)pDocument)->AddStandardFont(csFontName, &encoding);
+  }
+  return pFont;
+}
+CFX_ByteString CPDF_InterForm::GetNativeFont(uint8_t charSet, void* pLogFont) {
+  CFX_ByteString csFontName;
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+  LOGFONTA lf;
+  FX_BOOL bRet;
+  if (charSet == ANSI_CHARSET) {
+    csFontName = "Helvetica";
     return csFontName;
+  }
+  bRet = FALSE;
+  if (charSet == SHIFTJIS_CHARSET) {
+    bRet = RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE,
+                                "MS Mincho", lf);
+  } else if (charSet == GB2312_CHARSET) {
+    bRet = RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE, "SimSun",
+                                lf);
+  } else if (charSet == CHINESEBIG5_CHARSET) {
+    bRet = RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE, "MingLiU",
+                                lf);
+  }
+  if (!bRet) {
+    bRet = RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE,
+                                "Arial Unicode MS", lf);
+  }
+  if (!bRet) {
+    bRet = RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE,
+                                "Microsoft Sans Serif", lf);
+  }
+  if (!bRet) {
+    bRet = RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE, NULL, lf);
+  }
+  if (bRet) {
+    if (pLogFont != NULL) {
+      memcpy(pLogFont, &lf, sizeof(LOGFONTA));
+    }
+    csFontName = lf.lfFaceName;
+    return csFontName;
+  }
+#endif
+  return csFontName;
 }
-CFX_ByteString CPDF_InterForm::GetNativeFont(void* pLogFont)
-{
+CFX_ByteString CPDF_InterForm::GetNativeFont(void* pLogFont) {
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-    uint8_t charSet = GetNativeCharSet();
-    return GetNativeFont(charSet, pLogFont);
+  uint8_t charSet = GetNativeCharSet();
+  return GetNativeFont(charSet, pLogFont);
 #else
-    return CFX_ByteString();
+  return CFX_ByteString();
 #endif
 }
-uint8_t CPDF_InterForm::GetNativeCharSet()
-{
+uint8_t CPDF_InterForm::GetNativeCharSet() {
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-    uint8_t charSet = ANSI_CHARSET;
-    UINT iCodePage = ::GetACP();
-    switch (iCodePage) {
-        case 932:
-            charSet = SHIFTJIS_CHARSET;
-            break;
-        case 936:
-            charSet = GB2312_CHARSET;
-            break;
-        case 950:
-            charSet = CHINESEBIG5_CHARSET;
-            break;
-        case 1252:
-            charSet = ANSI_CHARSET;
-            break;
-        case 874:
-            charSet = THAI_CHARSET;
-            break;
-        case 949:
-            charSet = HANGUL_CHARSET;
-            break;
-        case 1200:
-            charSet = ANSI_CHARSET;
-            break;
-        case 1250:
-            charSet = EASTEUROPE_CHARSET;
-            break;
-        case 1251:
-            charSet = RUSSIAN_CHARSET;
-            break;
-        case 1253:
-            charSet = GREEK_CHARSET;
-            break;
-        case 1254:
-            charSet = TURKISH_CHARSET;
-            break;
-        case 1255:
-            charSet = HEBREW_CHARSET;
-            break;
-        case 1256:
-            charSet = ARABIC_CHARSET;
-            break;
-        case 1257:
-            charSet = BALTIC_CHARSET;
-            break;
-        case 1258:
-            charSet = VIETNAMESE_CHARSET;
-            break;
-        case 1361:
-            charSet = JOHAB_CHARSET;
-            break;
-    }
-    return charSet;
+  uint8_t charSet = ANSI_CHARSET;
+  UINT iCodePage = ::GetACP();
+  switch (iCodePage) {
+    case 932:
+      charSet = SHIFTJIS_CHARSET;
+      break;
+    case 936:
+      charSet = GB2312_CHARSET;
+      break;
+    case 950:
+      charSet = CHINESEBIG5_CHARSET;
+      break;
+    case 1252:
+      charSet = ANSI_CHARSET;
+      break;
+    case 874:
+      charSet = THAI_CHARSET;
+      break;
+    case 949:
+      charSet = HANGUL_CHARSET;
+      break;
+    case 1200:
+      charSet = ANSI_CHARSET;
+      break;
+    case 1250:
+      charSet = EASTEUROPE_CHARSET;
+      break;
+    case 1251:
+      charSet = RUSSIAN_CHARSET;
+      break;
+    case 1253:
+      charSet = GREEK_CHARSET;
+      break;
+    case 1254:
+      charSet = TURKISH_CHARSET;
+      break;
+    case 1255:
+      charSet = HEBREW_CHARSET;
+      break;
+    case 1256:
+      charSet = ARABIC_CHARSET;
+      break;
+    case 1257:
+      charSet = BALTIC_CHARSET;
+      break;
+    case 1258:
+      charSet = VIETNAMESE_CHARSET;
+      break;
+    case 1361:
+      charSet = JOHAB_CHARSET;
+      break;
+  }
+  return charSet;
 #else
-    return 0;
+  return 0;
 #endif
 }
-CPDF_Font* CPDF_InterForm::AddNativeFont(uint8_t charSet, const CPDF_Document* pDocument)
-{
-    if (pDocument == NULL) {
-        return NULL;
-    }
-    CPDF_Font* pFont = NULL;
+CPDF_Font* CPDF_InterForm::AddNativeFont(uint8_t charSet,
+                                         const CPDF_Document* pDocument) {
+  if (pDocument == NULL) {
+    return NULL;
+  }
+  CPDF_Font* pFont = NULL;
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-    LOGFONTA lf;
-    CFX_ByteString csFontName = GetNativeFont(charSet, &lf);
-    if (!csFontName.IsEmpty()) {
-        if (csFontName == "Helvetica") {
-            pFont = AddStandardFont(pDocument, csFontName);
-        } else {
-            pFont = ((CPDF_Document*)pDocument)->AddWindowsFont(&lf, FALSE, TRUE);
-        }
+  LOGFONTA lf;
+  CFX_ByteString csFontName = GetNativeFont(charSet, &lf);
+  if (!csFontName.IsEmpty()) {
+    if (csFontName == "Helvetica") {
+      pFont = AddStandardFont(pDocument, csFontName);
+    } else {
+      pFont = ((CPDF_Document*)pDocument)->AddWindowsFont(&lf, FALSE, TRUE);
     }
+  }
 #endif
-    return pFont;
-}
-CPDF_Font* CPDF_InterForm::AddNativeFont(const CPDF_Document* pDocument)
-{
-    if (pDocument == NULL) {
-        return NULL;
-    }
-    CPDF_Font* pFont = NULL;
-    uint8_t charSet = GetNativeCharSet();
-    pFont = AddNativeFont(charSet, pDocument);
-    return pFont;
+  return pFont;
 }
-FX_BOOL CPDF_InterForm::ValidateFieldName(CFX_WideString& csNewFieldName, int iType, const CPDF_FormField* pExcludedField, const CPDF_FormControl* pExcludedControl)
-{
-    if (csNewFieldName.IsEmpty()) {
-        return FALSE;
-    }
-    int iPos = 0;
-    int iLength = csNewFieldName.GetLength();
-    CFX_WideString csSub;
-    while (TRUE) {
-        while (iPos < iLength && (csNewFieldName[iPos] == L'.' || csNewFieldName[iPos] == L' ')) {
-            iPos ++;
-        }
-        if (iPos < iLength && !csSub.IsEmpty()) {
-            csSub += L'.';
-        }
-        while (iPos < iLength && csNewFieldName[iPos] != L'.') {
-            csSub += csNewFieldName[iPos ++];
+CPDF_Font* CPDF_InterForm::AddNativeFont(const CPDF_Document* pDocument) {
+  if (pDocument == NULL) {
+    return NULL;
+  }
+  CPDF_Font* pFont = NULL;
+  uint8_t charSet = GetNativeCharSet();
+  pFont = AddNativeFont(charSet, pDocument);
+  return pFont;
+}
+FX_BOOL CPDF_InterForm::ValidateFieldName(
+    CFX_WideString& csNewFieldName,
+    int iType,
+    const CPDF_FormField* pExcludedField,
+    const CPDF_FormControl* pExcludedControl) {
+  if (csNewFieldName.IsEmpty()) {
+    return FALSE;
+  }
+  int iPos = 0;
+  int iLength = csNewFieldName.GetLength();
+  CFX_WideString csSub;
+  while (TRUE) {
+    while (iPos < iLength &&
+           (csNewFieldName[iPos] == L'.' || csNewFieldName[iPos] == L' ')) {
+      iPos++;
+    }
+    if (iPos < iLength && !csSub.IsEmpty()) {
+      csSub += L'.';
+    }
+    while (iPos < iLength && csNewFieldName[iPos] != L'.') {
+      csSub += csNewFieldName[iPos++];
+    }
+    for (int i = csSub.GetLength() - 1; i > -1; i--) {
+      if (csSub[i] == L' ' || csSub[i] == L'.') {
+        csSub.SetAt(i, L'\0');
+      } else {
+        break;
+      }
+    }
+    FX_DWORD dwCount = m_pFieldTree->m_Root.CountFields();
+    for (FX_DWORD m = 0; m < dwCount; m++) {
+      CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(m);
+      if (pField == NULL) {
+        continue;
+      }
+      if (pField == pExcludedField) {
+        if (pExcludedControl != NULL) {
+          if (pField->CountControls() < 2) {
+            continue;
+          }
+        } else {
+          continue;
         }
-        for (int i = csSub.GetLength() - 1; i > -1; i --) {
-            if (csSub[i] == L' ' || csSub[i] == L'.') {
-                csSub.SetAt(i, L'\0');
-            } else {
-                break;
-            }
+      }
+      CFX_WideString csFullName = pField->GetFullName();
+      int iRet = CompareFieldName(csSub, csFullName);
+      if (iRet == 1) {
+        if (pField->GetFieldType() != iType) {
+          return FALSE;
         }
-        FX_DWORD dwCount = m_pFieldTree->m_Root.CountFields();
-        for (FX_DWORD m = 0; m < dwCount; m ++) {
-            CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(m);
-            if (pField == NULL) {
-                continue;
-            }
-            if (pField == pExcludedField) {
-                if (pExcludedControl != NULL) {
-                    if (pField->CountControls() < 2) {
-                        continue;
-                    }
-                } else {
-                    continue;
-                }
-            }
-            CFX_WideString csFullName = pField->GetFullName();
-            int iRet = CompareFieldName(csSub, csFullName);
-            if (iRet == 1) {
-                if (pField->GetFieldType() != iType) {
-                    return FALSE;
-                }
-            } else if (iRet == 2 && csSub == csNewFieldName) {
-                if (csFullName[iPos] == L'.') {
-                    return FALSE;
-                }
-            } else if (iRet == 3 && csSub == csNewFieldName) {
-                if (csNewFieldName[csFullName.GetLength()] == L'.') {
-                    return FALSE;
-                }
-            }
+      } else if (iRet == 2 && csSub == csNewFieldName) {
+        if (csFullName[iPos] == L'.') {
+          return FALSE;
         }
-        if (iPos >= iLength) {
-            break;
+      } else if (iRet == 3 && csSub == csNewFieldName) {
+        if (csNewFieldName[csFullName.GetLength()] == L'.') {
+          return FALSE;
         }
+      }
     }
-    if (csSub.IsEmpty()) {
-        return FALSE;
+    if (iPos >= iLength) {
+      break;
     }
-    csNewFieldName = csSub;
-    return TRUE;
-}
-FX_BOOL CPDF_InterForm::ValidateFieldName(CFX_WideString& csNewFieldName, int iType)
-{
-    return ValidateFieldName(csNewFieldName, iType, NULL, NULL);
-}
-FX_BOOL CPDF_InterForm::ValidateFieldName(const CPDF_FormField* pField, CFX_WideString& csNewFieldName)
-{
-    if (pField == NULL || csNewFieldName.IsEmpty()) {
-        return FALSE;
-    }
-    return ValidateFieldName(csNewFieldName, ((CPDF_FormField*)pField)->GetFieldType(), pField, NULL);
+  }
+  if (csSub.IsEmpty()) {
+    return FALSE;
+  }
+  csNewFieldName = csSub;
+  return TRUE;
 }
-FX_BOOL CPDF_InterForm::ValidateFieldName(const CPDF_FormControl* pControl, CFX_WideString& csNewFieldName)
-{
-    if (pControl == NULL || csNewFieldName.IsEmpty()) {
-        return FALSE;
-    }
-    CPDF_FormField* pField = ((CPDF_FormControl*)pControl)->GetField();
-    return ValidateFieldName(csNewFieldName, pField->GetFieldType(), pField, pControl);
+FX_BOOL CPDF_InterForm::ValidateFieldName(CFX_WideString& csNewFieldName,
+                                          int iType) {
+  return ValidateFieldName(csNewFieldName, iType, NULL, NULL);
 }
-int CPDF_InterForm::CompareFieldName(const CFX_ByteString& name1, const CFX_ByteString& name2)
-{
-    const FX_CHAR* ptr1 = name1;
-    const FX_CHAR* ptr2 = name2;
-    if (name1.GetLength() == name2.GetLength()) {
-        return name1 == name2 ? 1 : 0;
-    }
-    int i = 0;
-    while (ptr1[i] == ptr2[i]) {
-        i ++;
-    }
-    if (i == name1.GetLength()) {
-        return 2;
-    }
-    if (i == name2.GetLength()) {
-        return 3;
-    }
-    return 0;
+FX_BOOL CPDF_InterForm::ValidateFieldName(const CPDF_FormField* pField,
+                                          CFX_WideString& csNewFieldName) {
+  if (pField == NULL || csNewFieldName.IsEmpty()) {
+    return FALSE;
+  }
+  return ValidateFieldName(
+      csNewFieldName, ((CPDF_FormField*)pField)->GetFieldType(), pField, NULL);
 }
-int CPDF_InterForm::CompareFieldName(const CFX_WideString& name1, const CFX_WideString& name2)
-{
-    const FX_WCHAR* ptr1 = name1.c_str();
-    const FX_WCHAR* ptr2 = name2.c_str();
-    if (name1.GetLength() == name2.GetLength()) {
-        return name1 == name2 ? 1 : 0;
-    }
-    int i = 0;
-    while (ptr1[i] == ptr2[i]) {
-        i ++;
-    }
-    if (i == name1.GetLength()) {
-        return 2;
-    }
-    if (i == name2.GetLength()) {
-        return 3;
-    }
+FX_BOOL CPDF_InterForm::ValidateFieldName(const CPDF_FormControl* pControl,
+                                          CFX_WideString& csNewFieldName) {
+  if (pControl == NULL || csNewFieldName.IsEmpty()) {
+    return FALSE;
+  }
+  CPDF_FormField* pField = ((CPDF_FormControl*)pControl)->GetField();
+  return ValidateFieldName(csNewFieldName, pField->GetFieldType(), pField,
+                           pControl);
+}
+int CPDF_InterForm::CompareFieldName(const CFX_ByteString& name1,
+                                     const CFX_ByteString& name2) {
+  const FX_CHAR* ptr1 = name1;
+  const FX_CHAR* ptr2 = name2;
+  if (name1.GetLength() == name2.GetLength()) {
+    return name1 == name2 ? 1 : 0;
+  }
+  int i = 0;
+  while (ptr1[i] == ptr2[i]) {
+    i++;
+  }
+  if (i == name1.GetLength()) {
+    return 2;
+  }
+  if (i == name2.GetLength()) {
+    return 3;
+  }
+  return 0;
+}
+int CPDF_InterForm::CompareFieldName(const CFX_WideString& name1,
+                                     const CFX_WideString& name2) {
+  const FX_WCHAR* ptr1 = name1.c_str();
+  const FX_WCHAR* ptr2 = name2.c_str();
+  if (name1.GetLength() == name2.GetLength()) {
+    return name1 == name2 ? 1 : 0;
+  }
+  int i = 0;
+  while (ptr1[i] == ptr2[i]) {
+    i++;
+  }
+  if (i == name1.GetLength()) {
+    return 2;
+  }
+  if (i == name2.GetLength()) {
+    return 3;
+  }
+  return 0;
+}
+FX_DWORD CPDF_InterForm::CountFields(const CFX_WideString& csFieldName) {
+  if (csFieldName.IsEmpty()) {
+    return (FX_DWORD)m_pFieldTree->m_Root.CountFields();
+  }
+  CFieldTree::_Node* pNode = m_pFieldTree->FindNode(csFieldName);
+  if (pNode == NULL) {
     return 0;
-}
-FX_DWORD CPDF_InterForm::CountFields(const CFX_WideString &csFieldName)
-{
-    if (csFieldName.IsEmpty()) {
-        return (FX_DWORD)m_pFieldTree->m_Root.CountFields();
-    }
-    CFieldTree::_Node *pNode = m_pFieldTree->FindNode(csFieldName);
-    if (pNode == NULL) {
-        return 0;
-    }
-    return pNode->CountFields();
-}
-CPDF_FormField* CPDF_InterForm::GetField(FX_DWORD index, const CFX_WideString &csFieldName)
-{
-    if (csFieldName == L"") {
-        return m_pFieldTree->m_Root.GetField(index);
-    }
-    CFieldTree::_Node *pNode = m_pFieldTree->FindNode(csFieldName);
-    if (pNode == NULL) {
-        return NULL;
-    }
-    return pNode->GetField(index);
-}
-void CPDF_InterForm::GetAllFieldNames(CFX_WideStringArray& allFieldNames)
-{
-    allFieldNames.RemoveAll();
-    int nCount = m_pFieldTree->m_Root.CountFields();
-    for (int i = 0; i < nCount; i ++) {
-        CPDF_FormField *pField = m_pFieldTree->m_Root.GetField(i);
-        if (pField) {
-            CFX_WideString full_name = GetFullName(pField->GetFieldDict());
-            allFieldNames.Add(full_name);
-        }
-    }
-}
-FX_BOOL CPDF_InterForm::IsValidFormField(const void* pField)
-{
-    if (pField == NULL) {
-        return FALSE;
-    }
-    int nCount = m_pFieldTree->m_Root.CountFields();
-    for (int i = 0; i < nCount; i++) {
-        CPDF_FormField *pFormField = m_pFieldTree->m_Root.GetField(i);
-        if (pField == pFormField) {
-            return TRUE;
-        }
-    }
+  }
+  return pNode->CountFields();
+}
+CPDF_FormField* CPDF_InterForm::GetField(FX_DWORD index,
+                                         const CFX_WideString& csFieldName) {
+  if (csFieldName == L"") {
+    return m_pFieldTree->m_Root.GetField(index);
+  }
+  CFieldTree::_Node* pNode = m_pFieldTree->FindNode(csFieldName);
+  if (pNode == NULL) {
+    return NULL;
+  }
+  return pNode->GetField(index);
+}
+void CPDF_InterForm::GetAllFieldNames(CFX_WideStringArray& allFieldNames) {
+  allFieldNames.RemoveAll();
+  int nCount = m_pFieldTree->m_Root.CountFields();
+  for (int i = 0; i < nCount; i++) {
+    CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(i);
+    if (pField) {
+      CFX_WideString full_name = GetFullName(pField->GetFieldDict());
+      allFieldNames.Add(full_name);
+    }
+  }
+}
+FX_BOOL CPDF_InterForm::IsValidFormField(const void* pField) {
+  if (pField == NULL) {
     return FALSE;
-}
-CPDF_FormField* CPDF_InterForm::GetFieldByDict(CPDF_Dictionary* pFieldDict) const
-{
-    if (pFieldDict == NULL) {
-        return NULL;
-    }
-    CFX_WideString csWName = GetFullName(pFieldDict);
-    return m_pFieldTree->GetField(csWName);
-}
-FX_DWORD CPDF_InterForm::CountControls(CFX_WideString csFieldName)
-{
-    if (csFieldName.IsEmpty()) {
-        return (FX_DWORD)m_ControlMap.GetCount();
-    }
-    CPDF_FormField *pField = m_pFieldTree->GetField(csFieldName);
-    if (pField == NULL) {
-        return 0;
-    }
-    return pField->m_ControlList.GetSize();
-}
-CPDF_FormControl* CPDF_InterForm::GetControl(FX_DWORD index, CFX_WideString csFieldName)
-{
-    CPDF_FormField *pField = m_pFieldTree->GetField(csFieldName);
-    if (pField == NULL) {
-        return NULL;
-    }
-    if (index < (FX_DWORD)pField->m_ControlList.GetSize()) {
-        return (CPDF_FormControl *)pField->m_ControlList.GetAt(index);
-    }
+  }
+  int nCount = m_pFieldTree->m_Root.CountFields();
+  for (int i = 0; i < nCount; i++) {
+    CPDF_FormField* pFormField = m_pFieldTree->m_Root.GetField(i);
+    if (pField == pFormField) {
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+CPDF_FormField* CPDF_InterForm::GetFieldByDict(
+    CPDF_Dictionary* pFieldDict) const {
+  if (pFieldDict == NULL) {
     return NULL;
+  }
+  CFX_WideString csWName = GetFullName(pFieldDict);
+  return m_pFieldTree->GetField(csWName);
+}
+FX_DWORD CPDF_InterForm::CountControls(CFX_WideString csFieldName) {
+  if (csFieldName.IsEmpty()) {
+    return (FX_DWORD)m_ControlMap.GetCount();
+  }
+  CPDF_FormField* pField = m_pFieldTree->GetField(csFieldName);
+  if (pField == NULL) {
+    return 0;
+  }
+  return pField->m_ControlList.GetSize();
 }
-FX_BOOL CPDF_InterForm::IsValidFormControl(const void* pControl)
-{
-    if (pControl == NULL) {
-        return FALSE;
-    }
-    FX_POSITION pos = m_ControlMap.GetStartPosition();
-    while (pos) {
-        CPDF_Dictionary* pWidgetDict = NULL;
-        void* pFormControl = NULL;
-        m_ControlMap.GetNextAssoc(pos, (void*&)pWidgetDict, pFormControl);
-        if (pControl == pFormControl) {
-            return TRUE;
-        }
-    }
+CPDF_FormControl* CPDF_InterForm::GetControl(FX_DWORD index,
+                                             CFX_WideString csFieldName) {
+  CPDF_FormField* pField = m_pFieldTree->GetField(csFieldName);
+  if (pField == NULL) {
+    return NULL;
+  }
+  if (index < (FX_DWORD)pField->m_ControlList.GetSize()) {
+    return (CPDF_FormControl*)pField->m_ControlList.GetAt(index);
+  }
+  return NULL;
+}
+FX_BOOL CPDF_InterForm::IsValidFormControl(const void* pControl) {
+  if (pControl == NULL) {
     return FALSE;
-}
-int CPDF_InterForm::CountPageControls(CPDF_Page* pPage) const
-{
-    CPDF_Array* pAnnotList = pPage->m_pFormDict->GetArray("Annots");
-    if (pAnnotList == NULL) {
-        return 0;
-    }
-    int count = 0;
-    for (FX_DWORD i = 0; i < pAnnotList->GetCount(); i ++) {
-        CPDF_Dictionary* pAnnot = pAnnotList->GetDict(i);
-        if (pAnnot == NULL) {
-            continue;
-        }
-        CPDF_FormControl* pControl;
-        if (!m_ControlMap.Lookup(pAnnot, (void*&)pControl)) {
-            continue;
-        }
-        count ++;
-    }
-    return count;
-}
-CPDF_FormControl* CPDF_InterForm::GetPageControl(CPDF_Page* pPage, int index) const
-{
-    CPDF_Array* pAnnotList = pPage->m_pFormDict->GetArray("Annots");
-    if (pAnnotList == NULL) {
-        return NULL;
-    }
-    int count = 0;
-    for (FX_DWORD i = 0; i < pAnnotList->GetCount(); i ++) {
-        CPDF_Dictionary* pAnnot = pAnnotList->GetDict(i);
-        if (pAnnot == NULL) {
-            continue;
-        }
-        CPDF_FormControl* pControl;
-        if (!m_ControlMap.Lookup(pAnnot, (void*&)pControl)) {
-            continue;
-        }
-        if (index == count) {
-            return pControl;
-        }
-        count ++;
-    }
+  }
+  FX_POSITION pos = m_ControlMap.GetStartPosition();
+  while (pos) {
+    CPDF_Dictionary* pWidgetDict = NULL;
+    void* pFormControl = NULL;
+    m_ControlMap.GetNextAssoc(pos, (void*&)pWidgetDict, pFormControl);
+    if (pControl == pFormControl) {
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+int CPDF_InterForm::CountPageControls(CPDF_Page* pPage) const {
+  CPDF_Array* pAnnotList = pPage->m_pFormDict->GetArray("Annots");
+  if (pAnnotList == NULL) {
+    return 0;
+  }
+  int count = 0;
+  for (FX_DWORD i = 0; i < pAnnotList->GetCount(); i++) {
+    CPDF_Dictionary* pAnnot = pAnnotList->GetDict(i);
+    if (pAnnot == NULL) {
+      continue;
+    }
+    CPDF_FormControl* pControl;
+    if (!m_ControlMap.Lookup(pAnnot, (void*&)pControl)) {
+      continue;
+    }
+    count++;
+  }
+  return count;
+}
+CPDF_FormControl* CPDF_InterForm::GetPageControl(CPDF_Page* pPage,
+                                                 int index) const {
+  CPDF_Array* pAnnotList = pPage->m_pFormDict->GetArray("Annots");
+  if (pAnnotList == NULL) {
     return NULL;
-}
-CPDF_FormControl* CPDF_InterForm::GetControlAtPoint(CPDF_Page* pPage, FX_FLOAT pdf_x, FX_FLOAT pdf_y) const
-{
-    CPDF_Array* pAnnotList = pPage->m_pFormDict->GetArray("Annots");
-    if (pAnnotList == NULL) {
-        return NULL;
-    }
-    for (FX_DWORD i = pAnnotList->GetCount(); i > 0; i --) {
-        CPDF_Dictionary* pAnnot = pAnnotList->GetDict(i - 1);
-        if (pAnnot == NULL) {
-            continue;
-        }
-        CPDF_FormControl* pControl;
-        if (!m_ControlMap.Lookup(pAnnot, (void*&)pControl)) {
-            continue;
-        }
-        CFX_FloatRect rect = pControl->GetRect();
-        if (rect.Contains(pdf_x, pdf_y)) {
-            return pControl;
-        }
-    }
+  }
+  int count = 0;
+  for (FX_DWORD i = 0; i < pAnnotList->GetCount(); i++) {
+    CPDF_Dictionary* pAnnot = pAnnotList->GetDict(i);
+    if (pAnnot == NULL) {
+      continue;
+    }
+    CPDF_FormControl* pControl;
+    if (!m_ControlMap.Lookup(pAnnot, (void*&)pControl)) {
+      continue;
+    }
+    if (index == count) {
+      return pControl;
+    }
+    count++;
+  }
+  return NULL;
+}
+CPDF_FormControl* CPDF_InterForm::GetControlAtPoint(CPDF_Page* pPage,
+                                                    FX_FLOAT pdf_x,
+                                                    FX_FLOAT pdf_y) const {
+  CPDF_Array* pAnnotList = pPage->m_pFormDict->GetArray("Annots");
+  if (pAnnotList == NULL) {
     return NULL;
-}
-CPDF_FormControl* CPDF_InterForm::GetControlByDict(CPDF_Dictionary* pWidgetDict) const
-{
-    CPDF_FormControl* pControl = NULL;
-    m_ControlMap.Lookup(pWidgetDict, (void*&)pControl);
-    return pControl;
-}
-FX_DWORD CPDF_InterForm::CountInternalFields(const CFX_WideString& csFieldName) const
-{
-    if (!m_pFormDict) {
-        return 0;
-    }
-    CPDF_Array* pArray = m_pFormDict->GetArray("Fields");
-    if (!pArray) {
-        return 0;
-    }
-    if (csFieldName.IsEmpty()) {
-        return pArray->GetCount();
-    }
-    int iLength = csFieldName.GetLength();
-    int iPos = 0;
-    CPDF_Dictionary* pDict = NULL;
-    while (pArray != NULL) {
-        CFX_WideString csSub;
-        if (iPos < iLength && csFieldName[iPos] == L'.') {
-            iPos ++;
-        }
-        while (iPos < iLength && csFieldName[iPos] != L'.') {
-            csSub += csFieldName[iPos ++];
-        }
-        int iCount = pArray->GetCount();
-        FX_BOOL bFind = FALSE;
-        for (int i = 0; i < iCount; i ++) {
-            pDict = pArray->GetDict(i);
-            if (pDict == NULL) {
-                continue;
-            }
-            CFX_WideString csT = pDict->GetUnicodeText("T");
-            if (csT == csSub) {
-                bFind = TRUE;
-                break;
-            }
-        }
-        if (!bFind) {
-            return 0;
-        }
-        if (iPos >= iLength) {
-            break;
-        }
-        pArray = pDict->GetArray("Kids");
-    }
-    if (!pDict) {
-        return 0;
+  }
+  for (FX_DWORD i = pAnnotList->GetCount(); i > 0; i--) {
+    CPDF_Dictionary* pAnnot = pAnnotList->GetDict(i - 1);
+    if (pAnnot == NULL) {
+      continue;
+    }
+    CPDF_FormControl* pControl;
+    if (!m_ControlMap.Lookup(pAnnot, (void*&)pControl)) {
+      continue;
+    }
+    CFX_FloatRect rect = pControl->GetRect();
+    if (rect.Contains(pdf_x, pdf_y)) {
+      return pControl;
+    }
+  }
+  return NULL;
+}
+CPDF_FormControl* CPDF_InterForm::GetControlByDict(
+    CPDF_Dictionary* pWidgetDict) const {
+  CPDF_FormControl* pControl = NULL;
+  m_ControlMap.Lookup(pWidgetDict, (void*&)pControl);
+  return pControl;
+}
+FX_DWORD CPDF_InterForm::CountInternalFields(
+    const CFX_WideString& csFieldName) const {
+  if (!m_pFormDict) {
+    return 0;
+  }
+  CPDF_Array* pArray = m_pFormDict->GetArray("Fields");
+  if (!pArray) {
+    return 0;
+  }
+  if (csFieldName.IsEmpty()) {
+    return pArray->GetCount();
+  }
+  int iLength = csFieldName.GetLength();
+  int iPos = 0;
+  CPDF_Dictionary* pDict = NULL;
+  while (pArray != NULL) {
+    CFX_WideString csSub;
+    if (iPos < iLength && csFieldName[iPos] == L'.') {
+      iPos++;
+    }
+    while (iPos < iLength && csFieldName[iPos] != L'.') {
+      csSub += csFieldName[iPos++];
+    }
+    int iCount = pArray->GetCount();
+    FX_BOOL bFind = FALSE;
+    for (int i = 0; i < iCount; i++) {
+      pDict = pArray->GetDict(i);
+      if (pDict == NULL) {
+        continue;
+      }
+      CFX_WideString csT = pDict->GetUnicodeText("T");
+      if (csT == csSub) {
+        bFind = TRUE;
+        break;
+      }
+    }
+    if (!bFind) {
+      return 0;
+    }
+    if (iPos >= iLength) {
+      break;
     }
     pArray = pDict->GetArray("Kids");
-    return pArray ? pArray->GetCount() : 1;
+  }
+  if (!pDict) {
+    return 0;
+  }
+  pArray = pDict->GetArray("Kids");
+  return pArray ? pArray->GetCount() : 1;
 }
 
-CPDF_Dictionary* CPDF_InterForm::GetInternalField(FX_DWORD index, const CFX_WideString& csFieldName) const
-{
-    if (!m_pFormDict) {
-        return nullptr;
-    }
-    CPDF_Array* pArray = m_pFormDict->GetArray("Fields");
-    if (!pArray) {
-        return nullptr;
-    }
-    if (csFieldName.IsEmpty()) {
-        return pArray->GetDict(index);
-    }
-    int iLength = csFieldName.GetLength();
-    int iPos = 0;
-    CPDF_Dictionary* pDict = NULL;
-    while (pArray != NULL) {
-        CFX_WideString csSub;
-        if (iPos < iLength && csFieldName[iPos] == L'.') {
-            iPos ++;
-        }
-        while (iPos < iLength && csFieldName[iPos] != L'.') {
-            csSub += csFieldName[iPos ++];
-        }
-        int iCount = pArray->GetCount();
-        FX_BOOL bFind = FALSE;
-        for (int i = 0; i < iCount; i ++) {
-            pDict = pArray->GetDict(i);
-            if (pDict == NULL) {
-                continue;
-            }
-            CFX_WideString csT = pDict->GetUnicodeText("T");
-            if (csT == csSub) {
-                bFind = TRUE;
-                break;
-            }
-        }
-        if (!bFind) {
-            return NULL;
-        }
-        if (iPos >= iLength) {
-            break;
-        }
-        pArray = pDict->GetArray("Kids");
-    }
-    if (!pDict) {
-        return nullptr;
+CPDF_Dictionary* CPDF_InterForm::GetInternalField(
+    FX_DWORD index,
+    const CFX_WideString& csFieldName) const {
+  if (!m_pFormDict) {
+    return nullptr;
+  }
+  CPDF_Array* pArray = m_pFormDict->GetArray("Fields");
+  if (!pArray) {
+    return nullptr;
+  }
+  if (csFieldName.IsEmpty()) {
+    return pArray->GetDict(index);
+  }
+  int iLength = csFieldName.GetLength();
+  int iPos = 0;
+  CPDF_Dictionary* pDict = NULL;
+  while (pArray != NULL) {
+    CFX_WideString csSub;
+    if (iPos < iLength && csFieldName[iPos] == L'.') {
+      iPos++;
+    }
+    while (iPos < iLength && csFieldName[iPos] != L'.') {
+      csSub += csFieldName[iPos++];
+    }
+    int iCount = pArray->GetCount();
+    FX_BOOL bFind = FALSE;
+    for (int i = 0; i < iCount; i++) {
+      pDict = pArray->GetDict(i);
+      if (pDict == NULL) {
+        continue;
+      }
+      CFX_WideString csT = pDict->GetUnicodeText("T");
+      if (csT == csSub) {
+        bFind = TRUE;
+        break;
+      }
+    }
+    if (!bFind) {
+      return NULL;
+    }
+    if (iPos >= iLength) {
+      break;
     }
     pArray = pDict->GetArray("Kids");
-    return pArray ? pArray->GetDict(index) : pDict;
-}
-FX_BOOL CPDF_InterForm::NeedConstructAP()
-{
-    if (m_pFormDict == NULL) {
-        return FALSE;
-    }
-    return m_pFormDict->GetBoolean("NeedAppearances");
-}
-void CPDF_InterForm::NeedConstructAP(FX_BOOL bNeedAP)
-{
-    if (m_pFormDict == NULL) {
-        InitInterFormDict(m_pFormDict, m_pDocument);
-    }
-    m_pFormDict->SetAtBoolean("NeedAppearances", bNeedAP);
-    m_bGenerateAP = bNeedAP;
-}
-int CPDF_InterForm::CountFieldsInCalculationOrder()
-{
-    if (m_pFormDict == NULL) {
-        return 0;
-    }
-    CPDF_Array* pArray = m_pFormDict->GetArray("CO");
-    if (pArray == NULL) {
-        return 0;
-    }
-    return pArray->GetCount();
+  }
+  if (!pDict) {
+    return nullptr;
+  }
+  pArray = pDict->GetArray("Kids");
+  return pArray ? pArray->GetDict(index) : pDict;
+}
+FX_BOOL CPDF_InterForm::NeedConstructAP() {
+  if (m_pFormDict == NULL) {
+    return FALSE;
+  }
+  return m_pFormDict->GetBoolean("NeedAppearances");
+}
+void CPDF_InterForm::NeedConstructAP(FX_BOOL bNeedAP) {
+  if (m_pFormDict == NULL) {
+    InitInterFormDict(m_pFormDict, m_pDocument);
+  }
+  m_pFormDict->SetAtBoolean("NeedAppearances", bNeedAP);
+  m_bGenerateAP = bNeedAP;
+}
+int CPDF_InterForm::CountFieldsInCalculationOrder() {
+  if (m_pFormDict == NULL) {
+    return 0;
+  }
+  CPDF_Array* pArray = m_pFormDict->GetArray("CO");
+  if (pArray == NULL) {
+    return 0;
+  }
+  return pArray->GetCount();
 }
-CPDF_FormField* CPDF_InterForm::GetFieldInCalculationOrder(int index)
-{
-    if (m_pFormDict == NULL || index < 0) {
-        return NULL;
-    }
-    CPDF_Array* pArray = m_pFormDict->GetArray("CO");
-    if (pArray == NULL) {
-        return NULL;
-    }
-    CPDF_Object* pElement = pArray->GetElementValue(index);
-    if (pElement != NULL && pElement->GetType() == PDFOBJ_DICTIONARY) {
-        return GetFieldByDict((CPDF_Dictionary*)pElement);
-    }
+CPDF_FormField* CPDF_InterForm::GetFieldInCalculationOrder(int index) {
+  if (m_pFormDict == NULL || index < 0) {
     return NULL;
-}
-int CPDF_InterForm::FindFieldInCalculationOrder(const CPDF_FormField* pField)
-{
-    if (m_pFormDict == NULL || pField == NULL) {
-        return -1;
-    }
-    CPDF_Array* pArray = m_pFormDict->GetArray("CO");
-    if (pArray == NULL) {
-        return -1;
-    }
-    for (FX_DWORD i = 0; i < pArray->GetCount(); i ++) {
-        CPDF_Object* pElement = pArray->GetElementValue(i);
-        if (pElement == pField->m_pDict) {
-            return i;
-        }
-    }
+  }
+  CPDF_Array* pArray = m_pFormDict->GetArray("CO");
+  if (pArray == NULL) {
+    return NULL;
+  }
+  CPDF_Object* pElement = pArray->GetElementValue(index);
+  if (pElement != NULL && pElement->GetType() == PDFOBJ_DICTIONARY) {
+    return GetFieldByDict((CPDF_Dictionary*)pElement);
+  }
+  return NULL;
+}
+int CPDF_InterForm::FindFieldInCalculationOrder(const CPDF_FormField* pField) {
+  if (m_pFormDict == NULL || pField == NULL) {
     return -1;
-}
-FX_DWORD CPDF_InterForm::CountFormFonts()
-{
-    return CountInterFormFonts(m_pFormDict);
-}
-CPDF_Font* CPDF_InterForm::GetFormFont(FX_DWORD index, CFX_ByteString& csNameTag)
-{
-    return GetInterFormFont(m_pFormDict, m_pDocument, index, csNameTag);
-}
-CPDF_Font* CPDF_InterForm::GetFormFont(CFX_ByteString csNameTag)
-{
-    return GetInterFormFont(m_pFormDict, m_pDocument, csNameTag);
-}
-CPDF_Font* CPDF_InterForm::GetFormFont(CFX_ByteString csFontName, CFX_ByteString& csNameTag)
-{
-    return GetInterFormFont(m_pFormDict, m_pDocument, csFontName, csNameTag);
-}
-CPDF_Font* CPDF_InterForm::GetNativeFormFont(uint8_t charSet, CFX_ByteString& csNameTag)
-{
-    return GetNativeInterFormFont(m_pFormDict, m_pDocument, charSet, csNameTag);
-}
-CPDF_Font* CPDF_InterForm::GetNativeFormFont(CFX_ByteString& csNameTag)
-{
-    return GetNativeInterFormFont(m_pFormDict, m_pDocument, csNameTag);
-}
-FX_BOOL CPDF_InterForm::FindFormFont(const CPDF_Font* pFont, CFX_ByteString& csNameTag)
-{
-    return FindInterFormFont(m_pFormDict, pFont, csNameTag);
-}
-FX_BOOL CPDF_InterForm::FindFormFont(CFX_ByteString csFontName, CPDF_Font*& pFont, CFX_ByteString& csNameTag)
-{
-    return FindInterFormFont(m_pFormDict, m_pDocument, csFontName, pFont, csNameTag);
-}
-void CPDF_InterForm::AddFormFont(const CPDF_Font* pFont, CFX_ByteString& csNameTag)
-{
-    AddInterFormFont(m_pFormDict, m_pDocument, pFont, csNameTag);
-    m_bUpdated = TRUE;
-}
-CPDF_Font* CPDF_InterForm::AddNativeFormFont(uint8_t charSet, CFX_ByteString& csNameTag)
-{
-    m_bUpdated = TRUE;
-    return AddNativeInterFormFont(m_pFormDict, m_pDocument, charSet, csNameTag);
-}
-CPDF_Font* CPDF_InterForm::AddNativeFormFont(CFX_ByteString& csNameTag)
-{
-    m_bUpdated = TRUE;
-    return AddNativeInterFormFont(m_pFormDict, m_pDocument, csNameTag);
-}
-void CPDF_InterForm::RemoveFormFont(const CPDF_Font* pFont)
-{
-    m_bUpdated = TRUE;
-    RemoveInterFormFont(m_pFormDict, pFont);
-}
-void CPDF_InterForm::RemoveFormFont(CFX_ByteString csNameTag)
-{
-    m_bUpdated = TRUE;
-    RemoveInterFormFont(m_pFormDict, csNameTag);
-}
-CPDF_DefaultAppearance CPDF_InterForm::GetDefaultAppearance()
-{
-    CFX_ByteString csDA;
-    if (m_pFormDict == NULL) {
-        return csDA;
-    }
-    csDA = m_pFormDict->GetString("DA");
+  }
+  CPDF_Array* pArray = m_pFormDict->GetArray("CO");
+  if (pArray == NULL) {
+    return -1;
+  }
+  for (FX_DWORD i = 0; i < pArray->GetCount(); i++) {
+    CPDF_Object* pElement = pArray->GetElementValue(i);
+    if (pElement == pField->m_pDict) {
+      return i;
+    }
+  }
+  return -1;
+}
+FX_DWORD CPDF_InterForm::CountFormFonts() {
+  return CountInterFormFonts(m_pFormDict);
+}
+CPDF_Font* CPDF_InterForm::GetFormFont(FX_DWORD index,
+                                       CFX_ByteString& csNameTag) {
+  return GetInterFormFont(m_pFormDict, m_pDocument, index, csNameTag);
+}
+CPDF_Font* CPDF_InterForm::GetFormFont(CFX_ByteString csNameTag) {
+  return GetInterFormFont(m_pFormDict, m_pDocument, csNameTag);
+}
+CPDF_Font* CPDF_InterForm::GetFormFont(CFX_ByteString csFontName,
+                                       CFX_ByteString& csNameTag) {
+  return GetInterFormFont(m_pFormDict, m_pDocument, csFontName, csNameTag);
+}
+CPDF_Font* CPDF_InterForm::GetNativeFormFont(uint8_t charSet,
+                                             CFX_ByteString& csNameTag) {
+  return GetNativeInterFormFont(m_pFormDict, m_pDocument, charSet, csNameTag);
+}
+CPDF_Font* CPDF_InterForm::GetNativeFormFont(CFX_ByteString& csNameTag) {
+  return GetNativeInterFormFont(m_pFormDict, m_pDocument, csNameTag);
+}
+FX_BOOL CPDF_InterForm::FindFormFont(const CPDF_Font* pFont,
+                                     CFX_ByteString& csNameTag) {
+  return FindInterFormFont(m_pFormDict, pFont, csNameTag);
+}
+FX_BOOL CPDF_InterForm::FindFormFont(CFX_ByteString csFontName,
+                                     CPDF_Font*& pFont,
+                                     CFX_ByteString& csNameTag) {
+  return FindInterFormFont(m_pFormDict, m_pDocument, csFontName, pFont,
+                           csNameTag);
+}
+void CPDF_InterForm::AddFormFont(const CPDF_Font* pFont,
+                                 CFX_ByteString& csNameTag) {
+  AddInterFormFont(m_pFormDict, m_pDocument, pFont, csNameTag);
+  m_bUpdated = TRUE;
+}
+CPDF_Font* CPDF_InterForm::AddNativeFormFont(uint8_t charSet,
+                                             CFX_ByteString& csNameTag) {
+  m_bUpdated = TRUE;
+  return AddNativeInterFormFont(m_pFormDict, m_pDocument, charSet, csNameTag);
+}
+CPDF_Font* CPDF_InterForm::AddNativeFormFont(CFX_ByteString& csNameTag) {
+  m_bUpdated = TRUE;
+  return AddNativeInterFormFont(m_pFormDict, m_pDocument, csNameTag);
+}
+void CPDF_InterForm::RemoveFormFont(const CPDF_Font* pFont) {
+  m_bUpdated = TRUE;
+  RemoveInterFormFont(m_pFormDict, pFont);
+}
+void CPDF_InterForm::RemoveFormFont(CFX_ByteString csNameTag) {
+  m_bUpdated = TRUE;
+  RemoveInterFormFont(m_pFormDict, csNameTag);
+}
+CPDF_DefaultAppearance CPDF_InterForm::GetDefaultAppearance() {
+  CFX_ByteString csDA;
+  if (m_pFormDict == NULL) {
     return csDA;
+  }
+  csDA = m_pFormDict->GetString("DA");
+  return csDA;
 }
-CPDF_Font* CPDF_InterForm::GetDefaultFormFont()
-{
-    return GetDefaultInterFormFont(m_pFormDict, m_pDocument);
+CPDF_Font* CPDF_InterForm::GetDefaultFormFont() {
+  return GetDefaultInterFormFont(m_pFormDict, m_pDocument);
 }
-int CPDF_InterForm::GetFormAlignment()
-{
-    if (m_pFormDict == NULL) {
-        return 0;
-    }
-    return m_pFormDict->GetInteger("Q", 0);
-}
-FX_BOOL CPDF_InterForm::ResetForm(const CFX_PtrArray& fields, FX_BOOL bIncludeOrExclude, FX_BOOL bNotify)
-{
-    if (bNotify && m_pFormNotify != NULL) {
-        int iRet = m_pFormNotify->BeforeFormReset(this);
-        if (iRet < 0) {
-            return FALSE;
-        }
-    }
-    int nCount = m_pFieldTree->m_Root.CountFields();
-    for (int i = 0; i < nCount; i++) {
-        CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(i);
-        if (pField == NULL) {
-            continue;
-        }
-        FX_BOOL bFind = FALSE;
-        int iCount = fields.GetSize();
-        for (int i = 0; i < iCount; i ++) {
-            if (pField == (CPDF_FormField*)fields[i]) {
-                bFind = TRUE;
-                break;
-            }
-        }
-        if ((bIncludeOrExclude && bFind) || (!bIncludeOrExclude && !bFind)) {
-            pField->ResetField(bNotify);
-        }
-    }
-    if (bNotify && m_pFormNotify != NULL) {
-        m_pFormNotify->AfterFormReset(this);
+int CPDF_InterForm::GetFormAlignment() {
+  if (m_pFormDict == NULL) {
+    return 0;
+  }
+  return m_pFormDict->GetInteger("Q", 0);
+}
+FX_BOOL CPDF_InterForm::ResetForm(const CFX_PtrArray& fields,
+                                  FX_BOOL bIncludeOrExclude,
+                                  FX_BOOL bNotify) {
+  if (bNotify && m_pFormNotify != NULL) {
+    int iRet = m_pFormNotify->BeforeFormReset(this);
+    if (iRet < 0) {
+      return FALSE;
+    }
+  }
+  int nCount = m_pFieldTree->m_Root.CountFields();
+  for (int i = 0; i < nCount; i++) {
+    CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(i);
+    if (pField == NULL) {
+      continue;
+    }
+    FX_BOOL bFind = FALSE;
+    int iCount = fields.GetSize();
+    for (int i = 0; i < iCount; i++) {
+      if (pField == (CPDF_FormField*)fields[i]) {
+        bFind = TRUE;
+        break;
+      }
+    }
+    if ((bIncludeOrExclude && bFind) || (!bIncludeOrExclude && !bFind)) {
+      pField->ResetField(bNotify);
+    }
+  }
+  if (bNotify && m_pFormNotify != NULL) {
+    m_pFormNotify->AfterFormReset(this);
+  }
+  return TRUE;
+}
+FX_BOOL CPDF_InterForm::ResetForm(FX_BOOL bNotify) {
+  if (bNotify && m_pFormNotify != NULL) {
+    int iRet = m_pFormNotify->BeforeFormReset(this);
+    if (iRet < 0) {
+      return FALSE;
+    }
+  }
+  int nCount = m_pFieldTree->m_Root.CountFields();
+  for (int i = 0; i < nCount; i++) {
+    CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(i);
+    if (pField == NULL) {
+      continue;
+    }
+    pField->ResetField(bNotify);
+  }
+  if (bNotify && m_pFormNotify != NULL) {
+    m_pFormNotify->AfterFormReset(this);
+  }
+  return TRUE;
+}
+void CPDF_InterForm::ReloadForm() {
+  FX_POSITION pos = m_ControlMap.GetStartPosition();
+  while (pos) {
+    CPDF_Dictionary* pWidgetDict;
+    CPDF_FormControl* pControl;
+    m_ControlMap.GetNextAssoc(pos, (void*&)pWidgetDict, (void*&)pControl);
+    delete pControl;
+  }
+  m_ControlMap.RemoveAll();
+  int nCount = m_pFieldTree->m_Root.CountFields();
+  for (int k = 0; k < nCount; k++) {
+    CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(k);
+    delete pField;
+  }
+  m_pFieldTree->RemoveAll();
+  if (m_pFormDict == NULL) {
+    return;
+  }
+  CPDF_Array* pFields = m_pFormDict->GetArray("Fields");
+  if (pFields == NULL) {
+    return;
+  }
+  int iCount = pFields->GetCount();
+  for (int i = 0; i < iCount; i++) {
+    LoadField(pFields->GetDict(i));
+  }
+}
+void CPDF_InterForm::LoadField(CPDF_Dictionary* pFieldDict, int nLevel) {
+  if (nLevel > nMaxRecursion) {
+    return;
+  }
+  if (pFieldDict == NULL) {
+    return;
+  }
+  FX_DWORD dwParentObjNum = pFieldDict->GetObjNum();
+  CPDF_Array* pKids = pFieldDict->GetArray("Kids");
+  if (!pKids) {
+    AddTerminalField(pFieldDict);
+    return;
+  }
+  CPDF_Dictionary* pFirstKid = pKids->GetDict(0);
+  if (pFirstKid == NULL) {
+    return;
+  }
+  if (pFirstKid->KeyExist("T") || pFirstKid->KeyExist("Kids")) {
+    for (FX_DWORD i = 0; i < pKids->GetCount(); i++) {
+      CPDF_Dictionary* pChildDict = pKids->GetDict(i);
+      if (pChildDict) {
+        if (pChildDict->GetObjNum() != dwParentObjNum) {
+          LoadField(pChildDict, nLevel + 1);
+        }
+      }
+    }
+  } else {
+    AddTerminalField(pFieldDict);
+  }
+}
+FX_BOOL CPDF_InterForm::HasXFAForm() const {
+  return m_pFormDict && m_pFormDict->GetArray(FX_BSTRC("XFA")) != NULL;
+}
+void CPDF_InterForm::FixPageFields(const CPDF_Page* pPage) {
+  ASSERT(pPage != NULL);
+  CPDF_Dictionary* pPageDict = pPage->m_pFormDict;
+  if (pPageDict == NULL) {
+    return;
+  }
+  CPDF_Array* pAnnots = pPageDict->GetArray(FX_BSTRC("Annots"));
+  if (pAnnots == NULL) {
+    return;
+  }
+  int iAnnotCount = pAnnots->GetCount();
+  for (int i = 0; i < iAnnotCount; i++) {
+    CPDF_Dictionary* pAnnot = pAnnots->GetDict(i);
+    if (pAnnot != NULL && pAnnot->GetString(FX_BSTRC("Subtype")) == "Widget") {
+      LoadField(pAnnot);
+    }
+  }
+}
+CPDF_FormField* CPDF_InterForm::AddTerminalField(
+    const CPDF_Dictionary* pFieldDict) {
+  if (!pFieldDict->KeyExist(FX_BSTRC("T"))) {
+    return NULL;
+  }
+  CPDF_Dictionary* pDict = (CPDF_Dictionary*)pFieldDict;
+  CFX_WideString csWName = GetFullName(pDict);
+  if (csWName.IsEmpty()) {
+    return NULL;
+  }
+  CPDF_FormField* pField = NULL;
+  pField = m_pFieldTree->GetField(csWName);
+  if (pField == NULL) {
+    CPDF_Dictionary* pParent = (CPDF_Dictionary*)pFieldDict;
+    if (!pFieldDict->KeyExist(FX_BSTRC("T")) &&
+        pFieldDict->GetString(FX_BSTRC("Subtype")) == FX_BSTRC("Widget")) {
+      pParent = pFieldDict->GetDict(FX_BSTRC("Parent"));
+      if (!pParent) {
+        pParent = (CPDF_Dictionary*)pFieldDict;
+      }
+    }
+    if (pParent && pParent != pFieldDict &&
+        !pParent->KeyExist(FX_BSTRC("FT"))) {
+      if (pFieldDict->KeyExist(FX_BSTRC("FT"))) {
+        CPDF_Object* pFTValue = pFieldDict->GetElementValue(FX_BSTRC("FT"));
+        if (pFTValue) {
+          pParent->SetAt(FX_BSTRC("FT"), pFTValue->Clone());
+        }
+      }
+      if (pFieldDict->KeyExist(FX_BSTRC("Ff"))) {
+        CPDF_Object* pFfValue = pFieldDict->GetElementValue(FX_BSTRC("Ff"));
+        if (pFfValue) {
+          pParent->SetAt(FX_BSTRC("Ff"), pFfValue->Clone());
+        }
+      }
+    }
+    pField = new CPDF_FormField(this, pParent);
+    CPDF_Object* pTObj = pDict->GetElement("T");
+    if (pTObj && pTObj->GetType() == PDFOBJ_REFERENCE) {
+      CPDF_Object* pClone = pTObj->Clone(TRUE);
+      if (pClone) {
+        pDict->SetAt("T", pClone);
+      } else {
+        pDict->SetAtName("T", "");
+      }
+    }
+    m_pFieldTree->SetField(csWName, pField);
+  }
+  CPDF_Array* pKids = pFieldDict->GetArray("Kids");
+  if (pKids == NULL) {
+    if (pFieldDict->GetString("Subtype") == "Widget") {
+      AddControl(pField, pFieldDict);
+    }
+  } else {
+    for (FX_DWORD i = 0; i < pKids->GetCount(); i++) {
+      CPDF_Dictionary* pKid = pKids->GetDict(i);
+      if (pKid == NULL) {
+        continue;
+      }
+      if (pKid->GetString("Subtype") != "Widget") {
+        continue;
+      }
+      AddControl(pField, pKid);
+    }
+  }
+  return pField;
+}
+CPDF_FormControl* CPDF_InterForm::AddControl(
+    const CPDF_FormField* pField,
+    const CPDF_Dictionary* pWidgetDict) {
+  void* rValue = NULL;
+  if (m_ControlMap.Lookup((CPDF_Dictionary*)pWidgetDict, rValue)) {
+    return (CPDF_FormControl*)rValue;
+  }
+  CPDF_FormControl* pControl = new CPDF_FormControl(
+      (CPDF_FormField*)pField, (CPDF_Dictionary*)pWidgetDict);
+  m_ControlMap.SetAt((CPDF_Dictionary*)pWidgetDict, pControl);
+  ((CPDF_FormField*)pField)->m_ControlList.Add(pControl);
+  return pControl;
+}
+CPDF_FormField* CPDF_InterForm::CheckRequiredFields(
+    const CFX_PtrArray* fields,
+    FX_BOOL bIncludeOrExclude) const {
+  int nCount = m_pFieldTree->m_Root.CountFields();
+  for (int i = 0; i < nCount; i++) {
+    CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(i);
+    if (pField == NULL) {
+      continue;
     }
-    return TRUE;
-}
-FX_BOOL CPDF_InterForm::ResetForm(FX_BOOL bNotify)
-{
-    if (bNotify && m_pFormNotify != NULL) {
-        int iRet = m_pFormNotify->BeforeFormReset(this);
-        if (iRet < 0) {
-            return FALSE;
-        }
+    int32_t iType = pField->GetType();
+    if (iType == CPDF_FormField::PushButton ||
+        iType == CPDF_FormField::CheckBox || iType == CPDF_FormField::ListBox) {
+      continue;
     }
-    int nCount = m_pFieldTree->m_Root.CountFields();
-    for (int i = 0; i < nCount; i++) {
-        CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(i);
-        if (pField == NULL) {
-            continue;
-        }
-        pField->ResetField(bNotify);
+    FX_DWORD dwFlags = pField->GetFieldFlags();
+    if (dwFlags & 0x04) {
+      continue;
     }
-    if (bNotify && m_pFormNotify != NULL) {
-        m_pFormNotify->AfterFormReset(this);
+    FX_BOOL bFind = TRUE;
+    if (fields != NULL) {
+      bFind = fields->Find(pField, 0) >= 0;
     }
-    return TRUE;
-}
-void CPDF_InterForm::ReloadForm()
-{
-    FX_POSITION pos = m_ControlMap.GetStartPosition();
-    while (pos) {
-        CPDF_Dictionary* pWidgetDict;
-        CPDF_FormControl* pControl;
-        m_ControlMap.GetNextAssoc(pos, (void*&)pWidgetDict, (void*&)pControl);
-        delete pControl;
-    }
-    m_ControlMap.RemoveAll();
-    int nCount = m_pFieldTree->m_Root.CountFields();
-    for (int k = 0; k < nCount; k ++) {
-        CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(k);
-        delete pField;
-    }
-    m_pFieldTree->RemoveAll();
-    if (m_pFormDict == NULL) {
-        return;
-    }
-    CPDF_Array* pFields = m_pFormDict->GetArray("Fields");
-    if (pFields == NULL) {
-        return;
-    }
-    int iCount = pFields->GetCount();
-    for (int i = 0; i < iCount; i ++) {
-        LoadField(pFields->GetDict(i));
-    }
-}
-void CPDF_InterForm::LoadField(CPDF_Dictionary* pFieldDict, int nLevel)
-{
-    if (nLevel > nMaxRecursion) {
-        return;
-    }
-    if (pFieldDict == NULL) {
-        return;
-    }
-    FX_DWORD dwParentObjNum = pFieldDict->GetObjNum();
-    CPDF_Array* pKids = pFieldDict->GetArray("Kids");
-    if (!pKids) {
-        AddTerminalField(pFieldDict);
-        return;
-    }
-    CPDF_Dictionary* pFirstKid = pKids->GetDict(0);
-    if (pFirstKid == NULL) {
-        return;
-    }
-    if (pFirstKid->KeyExist("T") || pFirstKid->KeyExist("Kids")) {
-        for (FX_DWORD i = 0; i < pKids->GetCount(); i ++) {
-            CPDF_Dictionary * pChildDict = pKids->GetDict(i);
-            if (pChildDict) {
-                if (pChildDict->GetObjNum() != dwParentObjNum) {
-                    LoadField(pChildDict, nLevel + 1);
-                }
-            }
-        }
-    } else {
-        AddTerminalField(pFieldDict);
+    if ((bIncludeOrExclude && bFind) || (!bIncludeOrExclude && !bFind)) {
+      CPDF_Dictionary* pFieldDict = pField->m_pDict;
+      if ((dwFlags & 0x02) != 0 && pFieldDict->GetString("V").IsEmpty()) {
+        return pField;
+      }
     }
+  }
+  return NULL;
 }
-FX_BOOL CPDF_InterForm::HasXFAForm() const
-{
-    return m_pFormDict && m_pFormDict->GetArray(FX_BSTRC("XFA")) != NULL;
-}
-void CPDF_InterForm::FixPageFields(const CPDF_Page* pPage)
-{
-    ASSERT(pPage != NULL);
-    CPDF_Dictionary* pPageDict = pPage->m_pFormDict;
-    if (pPageDict == NULL) {
-        return;
-    }
-    CPDF_Array* pAnnots = pPageDict->GetArray(FX_BSTRC("Annots"));
-    if (pAnnots == NULL) {
-        return;
-    }
-    int iAnnotCount = pAnnots->GetCount();
-    for (int i = 0; i < iAnnotCount; i++) {
-        CPDF_Dictionary* pAnnot = pAnnots->GetDict(i);
-        if (pAnnot != NULL && pAnnot->GetString(FX_BSTRC("Subtype")) == "Widget") {
-            LoadField(pAnnot);
-        }
-    }
+CFDF_Document* CPDF_InterForm::ExportToFDF(const CFX_WideStringC& pdf_path,
+                                           FX_BOOL bSimpleFileSpec) const {
+  CFX_PtrArray fields;
+  int nCount = m_pFieldTree->m_Root.CountFields();
+  for (int i = 0; i < nCount; i++) {
+    CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(i);
+    fields.Add(pField);
+  }
+  return ExportToFDF(pdf_path, fields, TRUE, bSimpleFileSpec);
 }
-CPDF_FormField* CPDF_InterForm::AddTerminalField(const CPDF_Dictionary* pFieldDict)
-{
-    if (!pFieldDict->KeyExist(FX_BSTRC("T"))) {
-        return NULL;
-    }
-    CPDF_Dictionary* pDict = (CPDF_Dictionary*)pFieldDict;
-    CFX_WideString csWName = GetFullName(pDict);
-    if (csWName.IsEmpty()) {
-        return NULL;
-    }
-    CPDF_FormField* pField = NULL;
-    pField = m_pFieldTree->GetField(csWName);
-    if (pField == NULL) {
-        CPDF_Dictionary *pParent = (CPDF_Dictionary*)pFieldDict;
-        if (!pFieldDict->KeyExist(FX_BSTRC("T")) &&
-            pFieldDict->GetString(FX_BSTRC("Subtype")) == FX_BSTRC("Widget")) {
-            pParent = pFieldDict->GetDict(FX_BSTRC("Parent"));
-            if (!pParent) {
-                pParent = (CPDF_Dictionary*)pFieldDict;
-            }
-        }
-        if (pParent && pParent != pFieldDict && !pParent->KeyExist(FX_BSTRC("FT"))) {
-            if (pFieldDict->KeyExist(FX_BSTRC("FT"))) {
-                CPDF_Object *pFTValue = pFieldDict->GetElementValue(FX_BSTRC("FT"));
-                if (pFTValue) {
-                    pParent->SetAt(FX_BSTRC("FT"), pFTValue->Clone());
-                }
-            }
-            if (pFieldDict->KeyExist(FX_BSTRC("Ff"))) {
-                CPDF_Object *pFfValue = pFieldDict->GetElementValue(FX_BSTRC("Ff"));
-                if (pFfValue) {
-                    pParent->SetAt(FX_BSTRC("Ff"), pFfValue->Clone());
-                }
-            }
-        }
-        pField = new CPDF_FormField(this, pParent);
-        CPDF_Object* pTObj = pDict->GetElement("T");
-        if (pTObj && pTObj->GetType() == PDFOBJ_REFERENCE) {
-            CPDF_Object* pClone = pTObj->Clone(TRUE);
-            if (pClone) {
-                pDict->SetAt("T", pClone);
-            } else {
-                pDict->SetAtName("T", "");
-            }
-        }
-        m_pFieldTree->SetField(csWName, pField);
-    }
-    CPDF_Array* pKids = pFieldDict->GetArray("Kids");
-    if (pKids == NULL) {
-        if (pFieldDict->GetString("Subtype") == "Widget") {
-            AddControl(pField, pFieldDict);
-        }
+CFX_WideString FILESPEC_EncodeFileName(const CFX_WideStringC& filepath);
+CFDF_Document* CPDF_InterForm::ExportToFDF(const CFX_WideStringC& pdf_path,
+                                           CFX_PtrArray& fields,
+                                           FX_BOOL bIncludeOrExclude,
+                                           FX_BOOL bSimpleFileSpec) const {
+  CFDF_Document* pDoc = CFDF_Document::CreateNewDoc();
+  if (pDoc == NULL) {
+    return NULL;
+  }
+  CPDF_Dictionary* pMainDict = pDoc->GetRoot()->GetDict("FDF");
+  if (!pdf_path.IsEmpty()) {
+    if (bSimpleFileSpec) {
+      CFX_WideString wsFilePath = FILESPEC_EncodeFileName(pdf_path);
+      pMainDict->SetAtString(FX_BSTRC("F"),
+                             CFX_ByteString::FromUnicode(wsFilePath));
+      pMainDict->SetAtString(FX_BSTRC("UF"), PDF_EncodeText(wsFilePath));
     } else {
-        for (FX_DWORD i = 0; i < pKids->GetCount(); i ++) {
-            CPDF_Dictionary* pKid = pKids->GetDict(i);
-            if (pKid == NULL) {
-                continue;
-            }
-            if (pKid->GetString("Subtype") != "Widget") {
-                continue;
-            }
-            AddControl(pField, pKid);
-        }
-    }
-    return pField;
-}
-CPDF_FormControl* CPDF_InterForm::AddControl(const CPDF_FormField* pField, const CPDF_Dictionary* pWidgetDict)
-{
-    void *rValue = NULL;
-    if (m_ControlMap.Lookup((CPDF_Dictionary*)pWidgetDict, rValue)) {
-        return (CPDF_FormControl*)rValue;
-    }
-    CPDF_FormControl* pControl = new CPDF_FormControl((CPDF_FormField*)pField, (CPDF_Dictionary*)pWidgetDict);
-    m_ControlMap.SetAt((CPDF_Dictionary*)pWidgetDict, pControl);
-    ((CPDF_FormField*)pField)->m_ControlList.Add(pControl);
-    return pControl;
-}
-CPDF_FormField* CPDF_InterForm::CheckRequiredFields(const CFX_PtrArray *fields, FX_BOOL bIncludeOrExclude) const
-{
-    int nCount = m_pFieldTree->m_Root.CountFields();
-    for (int i = 0; i < nCount; i++) {
-        CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(i);
-        if (pField == NULL) {
-            continue;
-        }
-        int32_t iType = pField->GetType();
-        if (iType == CPDF_FormField::PushButton || iType == CPDF_FormField::CheckBox || iType == CPDF_FormField::ListBox) {
-            continue;
-        }
-        FX_DWORD dwFlags = pField->GetFieldFlags();
-        if (dwFlags & 0x04) {
-            continue;
-        }
-        FX_BOOL bFind = TRUE;
-        if (fields != NULL) {
-            bFind = fields->Find(pField, 0) >= 0;
-        }
-        if ((bIncludeOrExclude && bFind) || (!bIncludeOrExclude && !bFind)) {
-            CPDF_Dictionary *pFieldDict = pField->m_pDict;
-            if ((dwFlags & 0x02) != 0 && pFieldDict->GetString("V").IsEmpty()) {
-                return pField;
-            }
-        }
+      CPDF_FileSpec filespec;
+      filespec.SetFileName(pdf_path);
+      pMainDict->SetAt("F", (CPDF_Object*)filespec);
     }
+  }
+  CPDF_Array* pFields = CPDF_Array::Create();
+  if (pFields == NULL) {
     return NULL;
-}
-CFDF_Document* CPDF_InterForm::ExportToFDF(const CFX_WideStringC& pdf_path, FX_BOOL bSimpleFileSpec) const
-{
-    CFX_PtrArray fields;
-    int nCount = m_pFieldTree->m_Root.CountFields();
-    for (int i = 0; i < nCount; i ++) {
-        CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(i);
-        fields.Add(pField);
-    }
-    return ExportToFDF(pdf_path, fields, TRUE, bSimpleFileSpec);
-}
-CFX_WideString FILESPEC_EncodeFileName(const CFX_WideStringC& filepath);
-CFDF_Document* CPDF_InterForm::ExportToFDF(const CFX_WideStringC& pdf_path, CFX_PtrArray& fields, FX_BOOL bIncludeOrExclude, FX_BOOL bSimpleFileSpec) const
-{
-    CFDF_Document* pDoc = CFDF_Document::CreateNewDoc();
-    if (pDoc == NULL) {
+  }
+  pMainDict->SetAt("Fields", pFields);
+  int nCount = m_pFieldTree->m_Root.CountFields();
+  for (int i = 0; i < nCount; i++) {
+    CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(i);
+    if (pField == NULL || pField->GetType() == CPDF_FormField::PushButton) {
+      continue;
+    }
+    FX_DWORD dwFlags = pField->GetFieldFlags();
+    if (dwFlags & 0x04) {
+      continue;
+    }
+    FX_BOOL bFind = fields.Find(pField, 0) >= 0;
+    if ((bIncludeOrExclude && bFind) || (!bIncludeOrExclude && !bFind)) {
+      if ((dwFlags & 0x02) != 0 && pField->m_pDict->GetString("V").IsEmpty()) {
+        continue;
+      }
+      CFX_WideString fullname = GetFullName(pField->GetFieldDict());
+      CPDF_Dictionary* pFieldDict = CPDF_Dictionary::Create();
+      if (pFieldDict == NULL) {
         return NULL;
-    }
-    CPDF_Dictionary* pMainDict = pDoc->GetRoot()->GetDict("FDF");
-    if (!pdf_path.IsEmpty()) {
-        if (bSimpleFileSpec) {
-            CFX_WideString wsFilePath = FILESPEC_EncodeFileName(pdf_path);
-            pMainDict->SetAtString(FX_BSTRC("F"), CFX_ByteString::FromUnicode(wsFilePath));
-            pMainDict->SetAtString(FX_BSTRC("UF"), PDF_EncodeText(wsFilePath));
-        } else {
-            CPDF_FileSpec filespec;
-            filespec.SetFileName(pdf_path);
-            pMainDict->SetAt("F", (CPDF_Object*)filespec);
-        }
-    }
-    CPDF_Array* pFields = CPDF_Array::Create();
-    if (pFields == NULL) {
+      }
+      CPDF_String* pString = CPDF_String::Create(fullname);
+      if (pString == NULL) {
+        pFieldDict->Release();
         return NULL;
-    }
-    pMainDict->SetAt("Fields", pFields);
-    int nCount = m_pFieldTree->m_Root.CountFields();
-    for (int i = 0; i < nCount; i ++) {
-        CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(i);
-        if (pField == NULL || pField->GetType() == CPDF_FormField::PushButton) {
-            continue;
-        }
-        FX_DWORD dwFlags = pField->GetFieldFlags();
-        if (dwFlags & 0x04) {
-            continue;
+      }
+      pFieldDict->SetAt("T", pString);
+      if (pField->GetType() == CPDF_FormField::CheckBox ||
+          pField->GetType() == CPDF_FormField::RadioButton) {
+        CFX_WideString csExport = pField->GetCheckValue(FALSE);
+        CFX_ByteString csBExport = PDF_EncodeText(csExport);
+        CPDF_Object* pOpt = FPDF_GetFieldAttr(pField->m_pDict, "Opt");
+        if (pOpt == NULL) {
+          pFieldDict->SetAtName("V", csBExport);
+        } else {
+          pFieldDict->SetAtString("V", csBExport);
         }
-        FX_BOOL bFind = fields.Find(pField, 0) >= 0;
-        if ((bIncludeOrExclude && bFind) || (!bIncludeOrExclude && !bFind)) {
-            if ((dwFlags & 0x02) != 0 && pField->m_pDict->GetString("V").IsEmpty()) {
-                continue;
-            }
-            CFX_WideString fullname = GetFullName(pField->GetFieldDict());
-            CPDF_Dictionary* pFieldDict = CPDF_Dictionary::Create();
-            if (pFieldDict == NULL) {
-                return NULL;
-            }
-            CPDF_String* pString = CPDF_String::Create(fullname);
-            if (pString == NULL) {
-                pFieldDict->Release();
-                return NULL;
-            }
-            pFieldDict->SetAt("T", pString);
-            if (pField->GetType() == CPDF_FormField::CheckBox || pField->GetType() == CPDF_FormField::RadioButton) {
-                CFX_WideString csExport = pField->GetCheckValue(FALSE);
-                CFX_ByteString csBExport = PDF_EncodeText(csExport);
-                CPDF_Object* pOpt = FPDF_GetFieldAttr(pField->m_pDict, "Opt");
-                if (pOpt == NULL) {
-                    pFieldDict->SetAtName("V", csBExport);
-                } else {
-                    pFieldDict->SetAtString("V", csBExport);
-                }
-            } else {
-                CPDF_Object* pV = FPDF_GetFieldAttr(pField->m_pDict, "V");
-                if (pV != NULL) {
-                    pFieldDict->SetAt("V", pV->Clone(TRUE));
-                }
-            }
-            pFields->Add(pFieldDict);
+      } else {
+        CPDF_Object* pV = FPDF_GetFieldAttr(pField->m_pDict, "V");
+        if (pV != NULL) {
+          pFieldDict->SetAt("V", pV->Clone(TRUE));
         }
+      }
+      pFields->Add(pFieldDict);
     }
-    return pDoc;
+  }
+  return pDoc;
 }
 const struct _SupportFieldEncoding {
-    const FX_CHAR* m_name;
-    int32_t m_codePage;
+  const FX_CHAR* m_name;
+  int32_t m_codePage;
 } g_fieldEncoding[] = {
-    { "BigFive", 950 },
-    { "GBK", 936 },
-    { "Shift-JIS", 932 },
-    { "UHC", 949 },
+    {"BigFive", 950},
+    {"GBK", 936},
+    {"Shift-JIS", 932},
+    {"UHC", 949},
 };
-static void FPDFDOC_FDF_GetFieldValue(CPDF_Dictionary *pFieldDict, CFX_WideString &csValue, CFX_ByteString &bsEncoding)
-{
-    ASSERT(pFieldDict != NULL);
-    CFX_ByteString csBValue = pFieldDict->GetString("V");
-    int32_t iCount = sizeof(g_fieldEncoding) / sizeof(g_fieldEncoding[0]);
-    int32_t i = 0;
-    for (; i < iCount; ++i)
-        if (bsEncoding == g_fieldEncoding[i].m_name) {
-            break;
-        }
-    if (i < iCount) {
-        CFX_CharMap *pCharMap = CFX_CharMap::GetDefaultMapper(g_fieldEncoding[i].m_codePage);
-        FXSYS_assert(pCharMap != NULL);
-        csValue.ConvertFrom(csBValue, pCharMap);
-        return;
-    }
-    CFX_ByteString csTemp = csBValue.Left(2);
-    if (csTemp == "\xFF\xFE" || csTemp == "\xFE\xFF") {
-        csValue = PDF_DecodeText(csBValue);
-    } else {
-        csValue = CFX_WideString::FromLocal(csBValue);
-    }
-}
-void CPDF_InterForm::FDF_ImportField(CPDF_Dictionary* pFieldDict, const CFX_WideString& parent_name, FX_BOOL bNotify, int nLevel)
-{
-    CFX_WideString name;
-    if (!parent_name.IsEmpty()) {
-        name = parent_name + L".";
-    }
-    name += pFieldDict->GetUnicodeText("T");
-    CPDF_Array* pKids = pFieldDict->GetArray("Kids");
-    if (pKids) {
-        for (FX_DWORD i = 0; i < pKids->GetCount(); i ++) {
-            CPDF_Dictionary* pKid = pKids->GetDict(i);
-            if (pKid == NULL) {
-                continue;
-            }
-            if (nLevel <= nMaxRecursion) {
-                FDF_ImportField(pKid, name, bNotify, nLevel + 1);
-            }
-        }
-        return;
-    }
-    if (!pFieldDict->KeyExist("V")) {
-        return;
-    }
-    CPDF_FormField* pField = m_pFieldTree->GetField(name);
-    if (pField == NULL) {
-        return;
-    }
-    CFX_WideString csWValue;
-    FPDFDOC_FDF_GetFieldValue(pFieldDict, csWValue, m_bsEncoding);
-    int iType = pField->GetFieldType();
-    if (bNotify && m_pFormNotify != NULL) {
-        int iRet = 0;
-        if (iType == FIELDTYPE_LISTBOX) {
-            iRet = m_pFormNotify->BeforeSelectionChange(pField, csWValue);
-        } else if (iType == FIELDTYPE_COMBOBOX || iType == FIELDTYPE_TEXTFIELD) {
-            iRet = m_pFormNotify->BeforeValueChange(pField, csWValue);
-        }
-        if (iRet < 0) {
-            return;
-        }
-    }
-    CFX_ByteArray statusArray;
+static void FPDFDOC_FDF_GetFieldValue(CPDF_Dictionary* pFieldDict,
+                                      CFX_WideString& csValue,
+                                      CFX_ByteString& bsEncoding) {
+  ASSERT(pFieldDict != NULL);
+  CFX_ByteString csBValue = pFieldDict->GetString("V");
+  int32_t iCount = sizeof(g_fieldEncoding) / sizeof(g_fieldEncoding[0]);
+  int32_t i = 0;
+  for (; i < iCount; ++i)
+    if (bsEncoding == g_fieldEncoding[i].m_name) {
+      break;
+    }
+  if (i < iCount) {
+    CFX_CharMap* pCharMap =
+        CFX_CharMap::GetDefaultMapper(g_fieldEncoding[i].m_codePage);
+    FXSYS_assert(pCharMap != NULL);
+    csValue.ConvertFrom(csBValue, pCharMap);
+    return;
+  }
+  CFX_ByteString csTemp = csBValue.Left(2);
+  if (csTemp == "\xFF\xFE" || csTemp == "\xFE\xFF") {
+    csValue = PDF_DecodeText(csBValue);
+  } else {
+    csValue = CFX_WideString::FromLocal(csBValue);
+  }
+}
+void CPDF_InterForm::FDF_ImportField(CPDF_Dictionary* pFieldDict,
+                                     const CFX_WideString& parent_name,
+                                     FX_BOOL bNotify,
+                                     int nLevel) {
+  CFX_WideString name;
+  if (!parent_name.IsEmpty()) {
+    name = parent_name + L".";
+  }
+  name += pFieldDict->GetUnicodeText("T");
+  CPDF_Array* pKids = pFieldDict->GetArray("Kids");
+  if (pKids) {
+    for (FX_DWORD i = 0; i < pKids->GetCount(); i++) {
+      CPDF_Dictionary* pKid = pKids->GetDict(i);
+      if (pKid == NULL) {
+        continue;
+      }
+      if (nLevel <= nMaxRecursion) {
+        FDF_ImportField(pKid, name, bNotify, nLevel + 1);
+      }
+    }
+    return;
+  }
+  if (!pFieldDict->KeyExist("V")) {
+    return;
+  }
+  CPDF_FormField* pField = m_pFieldTree->GetField(name);
+  if (pField == NULL) {
+    return;
+  }
+  CFX_WideString csWValue;
+  FPDFDOC_FDF_GetFieldValue(pFieldDict, csWValue, m_bsEncoding);
+  int iType = pField->GetFieldType();
+  if (bNotify && m_pFormNotify != NULL) {
+    int iRet = 0;
+    if (iType == FIELDTYPE_LISTBOX) {
+      iRet = m_pFormNotify->BeforeSelectionChange(pField, csWValue);
+    } else if (iType == FIELDTYPE_COMBOBOX || iType == FIELDTYPE_TEXTFIELD) {
+      iRet = m_pFormNotify->BeforeValueChange(pField, csWValue);
+    }
+    if (iRet < 0) {
+      return;
+    }
+  }
+  CFX_ByteArray statusArray;
+  if (iType == FIELDTYPE_CHECKBOX || iType == FIELDTYPE_RADIOBUTTON) {
+    SaveCheckedFieldStatus(pField, statusArray);
+  }
+  pField->SetValue(csWValue);
+  CPDF_FormField::Type eType = pField->GetType();
+  if ((eType == CPDF_FormField::ListBox || eType == CPDF_FormField::ComboBox) &&
+      pFieldDict->KeyExist("Opt")) {
+    pField->m_pDict->SetAt("Opt",
+                           pFieldDict->GetElementValue("Opt")->Clone(TRUE));
+  }
+  if (bNotify && m_pFormNotify != NULL) {
     if (iType == FIELDTYPE_CHECKBOX || iType == FIELDTYPE_RADIOBUTTON) {
-        SaveCheckedFieldStatus(pField, statusArray);
-    }
-    pField->SetValue(csWValue);
-    CPDF_FormField::Type eType = pField->GetType();
-    if ((eType == CPDF_FormField::ListBox || eType == CPDF_FormField::ComboBox) && pFieldDict->KeyExist("Opt")) {
-        pField->m_pDict->SetAt("Opt", pFieldDict->GetElementValue("Opt")->Clone(TRUE));
-    }
-    if (bNotify && m_pFormNotify != NULL) {
-        if (iType == FIELDTYPE_CHECKBOX || iType == FIELDTYPE_RADIOBUTTON) {
-            m_pFormNotify->AfterCheckedStatusChange(pField, statusArray);
-        } else if (iType == FIELDTYPE_LISTBOX) {
-            m_pFormNotify->AfterSelectionChange(pField);
-        } else if (iType == FIELDTYPE_COMBOBOX || iType == FIELDTYPE_TEXTFIELD) {
-            m_pFormNotify->AfterValueChange(pField);
-        }
-    }
-    if (CPDF_InterForm::m_bUpdateAP) {
-        pField->UpdateAP(NULL);
+      m_pFormNotify->AfterCheckedStatusChange(pField, statusArray);
+    } else if (iType == FIELDTYPE_LISTBOX) {
+      m_pFormNotify->AfterSelectionChange(pField);
+    } else if (iType == FIELDTYPE_COMBOBOX || iType == FIELDTYPE_TEXTFIELD) {
+      m_pFormNotify->AfterValueChange(pField);
+    }
+  }
+  if (CPDF_InterForm::m_bUpdateAP) {
+    pField->UpdateAP(NULL);
+  }
+}
+FX_BOOL CPDF_InterForm::ImportFromFDF(const CFDF_Document* pFDF,
+                                      FX_BOOL bNotify) {
+  if (pFDF == NULL) {
+    return FALSE;
+  }
+  CPDF_Dictionary* pMainDict = pFDF->GetRoot()->GetDict("FDF");
+  if (pMainDict == NULL) {
+    return FALSE;
+  }
+  CPDF_Array* pFields = pMainDict->GetArray("Fields");
+  if (pFields == NULL) {
+    return FALSE;
+  }
+  m_bsEncoding = pMainDict->GetString(FX_BSTRC("Encoding"));
+  if (bNotify && m_pFormNotify != NULL) {
+    int iRet = m_pFormNotify->BeforeFormImportData(this);
+    if (iRet < 0) {
+      return FALSE;
+    }
+  }
+  for (FX_DWORD i = 0; i < pFields->GetCount(); i++) {
+    CPDF_Dictionary* pField = pFields->GetDict(i);
+    if (pField == NULL) {
+      continue;
     }
+    FDF_ImportField(pField, L"", bNotify);
+  }
+  if (bNotify && m_pFormNotify != NULL) {
+    m_pFormNotify->AfterFormImportData(this);
+  }
+  return TRUE;
 }
-FX_BOOL CPDF_InterForm::ImportFromFDF(const CFDF_Document* pFDF, FX_BOOL bNotify)
-{
-    if (pFDF == NULL) {
-        return FALSE;
-    }
-    CPDF_Dictionary* pMainDict = pFDF->GetRoot()->GetDict("FDF");
-    if (pMainDict == NULL) {
-        return FALSE;
-    }
-    CPDF_Array* pFields = pMainDict->GetArray("Fields");
-    if (pFields == NULL) {
-        return FALSE;
-    }
-    m_bsEncoding = pMainDict->GetString(FX_BSTRC("Encoding"));
-    if (bNotify && m_pFormNotify != NULL) {
-        int iRet = m_pFormNotify->BeforeFormImportData(this);
-        if (iRet < 0) {
-            return FALSE;
-        }
-    }
-    for (FX_DWORD i = 0; i < pFields->GetCount(); i ++) {
-        CPDF_Dictionary* pField = pFields->GetDict(i);
-        if (pField == NULL) {
-            continue;
-        }
-        FDF_ImportField(pField, L"", bNotify);
+void CPDF_InterForm::SetFormNotify(const CPDF_FormNotify* pNotify) {
+  m_pFormNotify = (CPDF_FormNotify*)pNotify;
+}
+int CPDF_InterForm::GetPageWithWidget(int iCurPage, FX_BOOL bNext) {
+  if (iCurPage < 0) {
+    return -1;
+  }
+  int iPageCount = m_pDocument->GetPageCount();
+  if (iCurPage >= iPageCount) {
+    return -1;
+  }
+  int iNewPage = iCurPage;
+  do {
+    iNewPage += bNext ? 1 : -1;
+    if (iNewPage >= iPageCount) {
+      iNewPage = 0;
     }
-    if (bNotify && m_pFormNotify != NULL) {
-        m_pFormNotify->AfterFormImportData(this);
+    if (iNewPage < 0) {
+      iNewPage = iPageCount - 1;
     }
-    return TRUE;
-}
-void CPDF_InterForm::SetFormNotify(const CPDF_FormNotify* pNotify)
-{
-    m_pFormNotify = (CPDF_FormNotify*)pNotify;
-}
-int CPDF_InterForm::GetPageWithWidget(int iCurPage, FX_BOOL bNext)
-{
-    if (iCurPage < 0) {
-        return -1;
+    if (iNewPage == iCurPage) {
+      break;
     }
-    int iPageCount = m_pDocument->GetPageCount();
-    if (iCurPage >= iPageCount) {
-        return -1;
+    CPDF_Dictionary* pPageDict = m_pDocument->GetPage(iNewPage);
+    if (pPageDict == NULL) {
+      continue;
     }
-    int iNewPage = iCurPage;
-    do {
-        iNewPage += bNext ? 1 : -1;
-        if (iNewPage >= iPageCount) {
-            iNewPage = 0;
-        }
-        if (iNewPage < 0) {
-            iNewPage = iPageCount - 1;
-        }
-        if (iNewPage == iCurPage) {
-            break;
-        }
-        CPDF_Dictionary* pPageDict = m_pDocument->GetPage(iNewPage);
-        if (pPageDict == NULL) {
-            continue;
-        }
-        CPDF_Array* pAnnots = pPageDict->GetArray("Annots");
-        if (pAnnots == NULL) {
-            continue;
-        }
-        FX_DWORD dwCount = pAnnots->GetCount();
-        for (FX_DWORD i = 0; i < dwCount; i ++) {
-            CPDF_Object* pAnnotDict = pAnnots->GetElementValue(i);
-            if (pAnnotDict == NULL) {
-                continue;
-            }
-            CPDF_FormControl* pControl = NULL;
-            if (m_ControlMap.Lookup(pAnnotDict, (void*&)pControl)) {
-                return iNewPage;
-            }
-        }
-    } while (TRUE);
-    return -1;
+    CPDF_Array* pAnnots = pPageDict->GetArray("Annots");
+    if (pAnnots == NULL) {
+      continue;
+    }
+    FX_DWORD dwCount = pAnnots->GetCount();
+    for (FX_DWORD i = 0; i < dwCount; i++) {
+      CPDF_Object* pAnnotDict = pAnnots->GetElementValue(i);
+      if (pAnnotDict == NULL) {
+        continue;
+      }
+      CPDF_FormControl* pControl = NULL;
+      if (m_ControlMap.Lookup(pAnnotDict, (void*&)pControl)) {
+        return iNewPage;
+      }
+    }
+  } while (TRUE);
+  return -1;
 }
diff --git a/core/src/fpdfdoc/doc_formcontrol.cpp b/core/src/fpdfdoc/doc_formcontrol.cpp
index 87eee92c2e..db7cf37fdb 100644
--- a/core/src/fpdfdoc/doc_formcontrol.cpp
+++ b/core/src/fpdfdoc/doc_formcontrol.cpp
@@ -5,460 +5,444 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/fpdfdoc/fpdf_doc.h"
-CPDF_FormControl::CPDF_FormControl(CPDF_FormField* pField, CPDF_Dictionary* pWidgetDict)
-{
-    m_pField = pField;
-    m_pWidgetDict = pWidgetDict;
-    m_pForm = m_pField->m_pForm;
-}
-CFX_FloatRect CPDF_FormControl::GetRect()
-{
-    return m_pWidgetDict->GetRect("Rect");
-}
-CFX_ByteString CPDF_FormControl::GetOnStateName()
-{
-    ASSERT(GetType() == CPDF_FormField::CheckBox || GetType() == CPDF_FormField::RadioButton);
-    CFX_ByteString csOn;
-    CPDF_Dictionary* pAP = m_pWidgetDict->GetDict("AP");
-    if (pAP == NULL) {
-        return csOn;
-    }
-    CPDF_Dictionary* pN = pAP->GetDict("N");
-    if (pN == NULL) {
-        return csOn;
-    }
-    FX_POSITION pos = pN->GetStartPos();
-    while (pos) {
-        pN->GetNextElement(pos, csOn);
-        if (csOn != "Off") {
-            return csOn;
-        }
-    }
-    return CFX_ByteString();
-}
-void CPDF_FormControl::SetOnStateName(const CFX_ByteString& csOn)
-{
-    ASSERT(GetType() == CPDF_FormField::CheckBox || GetType() == CPDF_FormField::RadioButton);
-    CFX_ByteString csValue = csOn;
-    if (csValue.IsEmpty()) {
-        csValue = "Yes";
-    }
-    if (csValue == "Off") {
-        csValue = "Yes";
-    }
-    CFX_ByteString csAS = m_pWidgetDict->GetString("AS", "Off");
-    if (csAS != "Off") {
-        m_pWidgetDict->SetAtName("AS", csValue);
-    }
-    CPDF_Dictionary* pAP = m_pWidgetDict->GetDict("AP");
-    if (pAP == NULL) {
-        return;
-    }
-    FX_POSITION pos1 = pAP->GetStartPos();
-    while (pos1) {
-        CFX_ByteString csKey1;
-        CPDF_Object* pObj1 = pAP->GetNextElement(pos1, csKey1);
-        if (pObj1 == NULL) {
-            continue;
-        }
-        CPDF_Object* pObjDirect1 = pObj1->GetDirect();
-        if (pObjDirect1->GetType() != PDFOBJ_DICTIONARY) {
-            continue;
-        }
-        CPDF_Dictionary* pSubDict = (CPDF_Dictionary*)pObjDirect1;
-        FX_POSITION pos2 = pSubDict->GetStartPos();
-        while (pos2) {
-            CFX_ByteString csKey2;
-            CPDF_Object* pObj2 = pSubDict->GetNextElement(pos2, csKey2);
-            if (pObj2 == NULL) {
-                continue;
-            }
-            if (csKey2 != "Off") {
-                pSubDict->ReplaceKey(csKey2, csValue);
-                break;
-            }
-        }
-    }
-}
-CFX_ByteString CPDF_FormControl::GetCheckedAPState()
-{
-    ASSERT(GetType() == CPDF_FormField::CheckBox || GetType() == CPDF_FormField::RadioButton);
-    CFX_ByteString csOn = GetOnStateName();
-    if (GetType() == CPDF_FormField::RadioButton || GetType() == CPDF_FormField::CheckBox) {
-        CPDF_Object* pOpt = FPDF_GetFieldAttr(m_pField->m_pDict, "Opt");
-        if (pOpt != NULL && pOpt->GetType() == PDFOBJ_ARRAY) {
-            int iIndex = m_pField->GetControlIndex(this);
-            csOn.Format("%d", iIndex);
-        }
-    }
-    if (csOn.IsEmpty()) {
-        csOn = "Yes";
-    }
+CPDF_FormControl::CPDF_FormControl(CPDF_FormField* pField,
+                                   CPDF_Dictionary* pWidgetDict) {
+  m_pField = pField;
+  m_pWidgetDict = pWidgetDict;
+  m_pForm = m_pField->m_pForm;
+}
+CFX_FloatRect CPDF_FormControl::GetRect() {
+  return m_pWidgetDict->GetRect("Rect");
+}
+CFX_ByteString CPDF_FormControl::GetOnStateName() {
+  ASSERT(GetType() == CPDF_FormField::CheckBox ||
+         GetType() == CPDF_FormField::RadioButton);
+  CFX_ByteString csOn;
+  CPDF_Dictionary* pAP = m_pWidgetDict->GetDict("AP");
+  if (pAP == NULL) {
     return csOn;
-}
-CFX_WideString CPDF_FormControl::GetExportValue()
-{
-    ASSERT(GetType() == CPDF_FormField::CheckBox || GetType() == CPDF_FormField::RadioButton);
-    CFX_ByteString csOn = GetOnStateName();
-    if (GetType() == CPDF_FormField::RadioButton || GetType() == CPDF_FormField::CheckBox) {
-        CPDF_Object* pOpt = FPDF_GetFieldAttr(m_pField->m_pDict, "Opt");
-        if (pOpt != NULL && pOpt->GetType() == PDFOBJ_ARRAY) {
-            int iIndex = m_pField->GetControlIndex(this);
-            csOn = ((CPDF_Array*)pOpt)->GetString(iIndex);
-        }
-    }
-    if (csOn.IsEmpty()) {
-        csOn = "Yes";
-    }
-    CFX_WideString csWOn = PDF_DecodeText(csOn);
-    return csWOn;
-}
-FX_BOOL CPDF_FormControl::IsChecked()
-{
-    ASSERT(GetType() == CPDF_FormField::CheckBox || GetType() == CPDF_FormField::RadioButton);
-    CFX_ByteString csOn = GetOnStateName();
-    CFX_ByteString csAS = m_pWidgetDict->GetString("AS");
-    return csAS == csOn;
-}
-FX_BOOL CPDF_FormControl::IsDefaultChecked()
-{
-    ASSERT(GetType() == CPDF_FormField::CheckBox || GetType() == CPDF_FormField::RadioButton);
-    CPDF_Object* pDV = FPDF_GetFieldAttr(m_pField->m_pDict, "DV");
-    if (pDV == NULL) {
-        return FALSE;
-    }
-    CFX_ByteString csDV = pDV->GetString();
-    CFX_ByteString csOn = GetOnStateName();
-    return (csDV == csOn);
-}
-void CPDF_FormControl::CheckControl(FX_BOOL bChecked)
-{
-    ASSERT(GetType() == CPDF_FormField::CheckBox || GetType() == CPDF_FormField::RadioButton);
-    CFX_ByteString csOn = GetOnStateName();
-    CFX_ByteString csOldAS = m_pWidgetDict->GetString("AS", "Off");
-    CFX_ByteString csAS = "Off";
-    if (bChecked) {
-        csAS = csOn;
-    }
-    if (csOldAS == csAS) {
-        return;
-    }
-    m_pWidgetDict->SetAtName("AS", csAS);
-    m_pForm->m_bUpdated = TRUE;
-}
-CPDF_Stream* FPDFDOC_GetAnnotAP(CPDF_Dictionary* pAnnotDict, CPDF_Annot::AppearanceMode mode);
-void CPDF_FormControl::DrawControl(CFX_RenderDevice* pDevice, CFX_AffineMatrix* pMatrix, CPDF_Page* pPage,
-                                   CPDF_Annot::AppearanceMode mode, const CPDF_RenderOptions* pOptions)
-{
-    if (m_pWidgetDict->GetInteger("F") & ANNOTFLAG_HIDDEN) {
-        return;
-    }
-    CPDF_Stream* pStream = FPDFDOC_GetAnnotAP(m_pWidgetDict, mode);
-    if (pStream == NULL) {
-        return;
-    }
-    CFX_FloatRect form_bbox = pStream->GetDict()->GetRect("BBox");
-    CFX_AffineMatrix form_matrix = pStream->GetDict()->GetMatrix("Matrix");
-    form_matrix.TransformRect(form_bbox);
-    CFX_FloatRect arect = m_pWidgetDict->GetRect("Rect");
-    CFX_AffineMatrix matrix;
-    matrix.MatchRect(arect, form_bbox);
-    matrix.Concat(*pMatrix);
-    CPDF_Form form(m_pField->m_pForm->m_pDocument, m_pField->m_pForm->m_pFormDict->GetDict("DR"), pStream);
-    form.ParseContent(NULL, NULL, NULL, NULL);
-    CPDF_RenderContext context;
-    context.Create(pPage);
-    context.DrawObjectList(pDevice, &form, &matrix, pOptions);
+  }
+  CPDF_Dictionary* pN = pAP->GetDict("N");
+  if (pN == NULL) {
+    return csOn;
+  }
+  FX_POSITION pos = pN->GetStartPos();
+  while (pos) {
+    pN->GetNextElement(pos, csOn);
+    if (csOn != "Off") {
+      return csOn;
+    }
+  }
+  return CFX_ByteString();
+}
+void CPDF_FormControl::SetOnStateName(const CFX_ByteString& csOn) {
+  ASSERT(GetType() == CPDF_FormField::CheckBox ||
+         GetType() == CPDF_FormField::RadioButton);
+  CFX_ByteString csValue = csOn;
+  if (csValue.IsEmpty()) {
+    csValue = "Yes";
+  }
+  if (csValue == "Off") {
+    csValue = "Yes";
+  }
+  CFX_ByteString csAS = m_pWidgetDict->GetString("AS", "Off");
+  if (csAS != "Off") {
+    m_pWidgetDict->SetAtName("AS", csValue);
+  }
+  CPDF_Dictionary* pAP = m_pWidgetDict->GetDict("AP");
+  if (pAP == NULL) {
+    return;
+  }
+  FX_POSITION pos1 = pAP->GetStartPos();
+  while (pos1) {
+    CFX_ByteString csKey1;
+    CPDF_Object* pObj1 = pAP->GetNextElement(pos1, csKey1);
+    if (pObj1 == NULL) {
+      continue;
+    }
+    CPDF_Object* pObjDirect1 = pObj1->GetDirect();
+    if (pObjDirect1->GetType() != PDFOBJ_DICTIONARY) {
+      continue;
+    }
+    CPDF_Dictionary* pSubDict = (CPDF_Dictionary*)pObjDirect1;
+    FX_POSITION pos2 = pSubDict->GetStartPos();
+    while (pos2) {
+      CFX_ByteString csKey2;
+      CPDF_Object* pObj2 = pSubDict->GetNextElement(pos2, csKey2);
+      if (pObj2 == NULL) {
+        continue;
+      }
+      if (csKey2 != "Off") {
+        pSubDict->ReplaceKey(csKey2, csValue);
+        break;
+      }
+    }
+  }
+}
+CFX_ByteString CPDF_FormControl::GetCheckedAPState() {
+  ASSERT(GetType() == CPDF_FormField::CheckBox ||
+         GetType() == CPDF_FormField::RadioButton);
+  CFX_ByteString csOn = GetOnStateName();
+  if (GetType() == CPDF_FormField::RadioButton ||
+      GetType() == CPDF_FormField::CheckBox) {
+    CPDF_Object* pOpt = FPDF_GetFieldAttr(m_pField->m_pDict, "Opt");
+    if (pOpt != NULL && pOpt->GetType() == PDFOBJ_ARRAY) {
+      int iIndex = m_pField->GetControlIndex(this);
+      csOn.Format("%d", iIndex);
+    }
+  }
+  if (csOn.IsEmpty()) {
+    csOn = "Yes";
+  }
+  return csOn;
+}
+CFX_WideString CPDF_FormControl::GetExportValue() {
+  ASSERT(GetType() == CPDF_FormField::CheckBox ||
+         GetType() == CPDF_FormField::RadioButton);
+  CFX_ByteString csOn = GetOnStateName();
+  if (GetType() == CPDF_FormField::RadioButton ||
+      GetType() == CPDF_FormField::CheckBox) {
+    CPDF_Object* pOpt = FPDF_GetFieldAttr(m_pField->m_pDict, "Opt");
+    if (pOpt != NULL && pOpt->GetType() == PDFOBJ_ARRAY) {
+      int iIndex = m_pField->GetControlIndex(this);
+      csOn = ((CPDF_Array*)pOpt)->GetString(iIndex);
+    }
+  }
+  if (csOn.IsEmpty()) {
+    csOn = "Yes";
+  }
+  CFX_WideString csWOn = PDF_DecodeText(csOn);
+  return csWOn;
+}
+FX_BOOL CPDF_FormControl::IsChecked() {
+  ASSERT(GetType() == CPDF_FormField::CheckBox ||
+         GetType() == CPDF_FormField::RadioButton);
+  CFX_ByteString csOn = GetOnStateName();
+  CFX_ByteString csAS = m_pWidgetDict->GetString("AS");
+  return csAS == csOn;
+}
+FX_BOOL CPDF_FormControl::IsDefaultChecked() {
+  ASSERT(GetType() == CPDF_FormField::CheckBox ||
+         GetType() == CPDF_FormField::RadioButton);
+  CPDF_Object* pDV = FPDF_GetFieldAttr(m_pField->m_pDict, "DV");
+  if (pDV == NULL) {
+    return FALSE;
+  }
+  CFX_ByteString csDV = pDV->GetString();
+  CFX_ByteString csOn = GetOnStateName();
+  return (csDV == csOn);
+}
+void CPDF_FormControl::CheckControl(FX_BOOL bChecked) {
+  ASSERT(GetType() == CPDF_FormField::CheckBox ||
+         GetType() == CPDF_FormField::RadioButton);
+  CFX_ByteString csOn = GetOnStateName();
+  CFX_ByteString csOldAS = m_pWidgetDict->GetString("AS", "Off");
+  CFX_ByteString csAS = "Off";
+  if (bChecked) {
+    csAS = csOn;
+  }
+  if (csOldAS == csAS) {
+    return;
+  }
+  m_pWidgetDict->SetAtName("AS", csAS);
+  m_pForm->m_bUpdated = TRUE;
+}
+CPDF_Stream* FPDFDOC_GetAnnotAP(CPDF_Dictionary* pAnnotDict,
+                                CPDF_Annot::AppearanceMode mode);
+void CPDF_FormControl::DrawControl(CFX_RenderDevice* pDevice,
+                                   CFX_AffineMatrix* pMatrix,
+                                   CPDF_Page* pPage,
+                                   CPDF_Annot::AppearanceMode mode,
+                                   const CPDF_RenderOptions* pOptions) {
+  if (m_pWidgetDict->GetInteger("F") & ANNOTFLAG_HIDDEN) {
+    return;
+  }
+  CPDF_Stream* pStream = FPDFDOC_GetAnnotAP(m_pWidgetDict, mode);
+  if (pStream == NULL) {
+    return;
+  }
+  CFX_FloatRect form_bbox = pStream->GetDict()->GetRect("BBox");
+  CFX_AffineMatrix form_matrix = pStream->GetDict()->GetMatrix("Matrix");
+  form_matrix.TransformRect(form_bbox);
+  CFX_FloatRect arect = m_pWidgetDict->GetRect("Rect");
+  CFX_AffineMatrix matrix;
+  matrix.MatchRect(arect, form_bbox);
+  matrix.Concat(*pMatrix);
+  CPDF_Form form(m_pField->m_pForm->m_pDocument,
+                 m_pField->m_pForm->m_pFormDict->GetDict("DR"), pStream);
+  form.ParseContent(NULL, NULL, NULL, NULL);
+  CPDF_RenderContext context;
+  context.Create(pPage);
+  context.DrawObjectList(pDevice, &form, &matrix, pOptions);
 }
 const FX_CHAR* g_sHighlightingMode[] = {"N", "I", "O", "P", "T", ""};
-CPDF_FormControl::HighlightingMode CPDF_FormControl::GetHighlightingMode()
-{
-    if (m_pWidgetDict == NULL) {
-        return Invert;
-    }
-    CFX_ByteString csH = m_pWidgetDict->GetString("H", "I");
-    int i = 0;
-    while (g_sHighlightingMode[i][0] != '\0') {
-        if (csH.Equal(g_sHighlightingMode[i])) {
-            return (HighlightingMode)i;
-        }
-        i ++;
-    }
+CPDF_FormControl::HighlightingMode CPDF_FormControl::GetHighlightingMode() {
+  if (m_pWidgetDict == NULL) {
     return Invert;
-}
-CPDF_ApSettings CPDF_FormControl::GetMK(FX_BOOL bCreate)
-{
-    if (!m_pWidgetDict) {
-        return NULL;
-    }
-    CPDF_ApSettings mk = m_pWidgetDict->GetDict(FX_BSTRC("MK"));
-    if (!mk && bCreate) {
-        mk = CPDF_Dictionary::Create();
-        if (mk == NULL) {
-            return NULL;
-        }
-        m_pWidgetDict->SetAt(FX_BSTRC("MK"), mk);
-    }
-    return mk;
-}
-FX_BOOL CPDF_FormControl::HasMKEntry(CFX_ByteString csEntry)
-{
-    CPDF_ApSettings mk = GetMK(FALSE);
-    return mk.HasMKEntry(csEntry);
-}
-int CPDF_FormControl::GetRotation()
-{
-    CPDF_ApSettings mk = GetMK(FALSE);
-    return mk.GetRotation();
-}
-FX_ARGB CPDF_FormControl::GetColor(int& iColorType, CFX_ByteString csEntry)
-{
-    CPDF_ApSettings mk = GetMK(FALSE);
-    return mk.GetColor(iColorType, csEntry);
-}
-FX_FLOAT CPDF_FormControl::GetOriginalColor(int index, CFX_ByteString csEntry)
-{
-    CPDF_ApSettings mk = GetMK(FALSE);
-    return mk.GetOriginalColor(index, csEntry);
-}
-void CPDF_FormControl::GetOriginalColor(int& iColorType, FX_FLOAT fc[4], CFX_ByteString csEntry)
-{
-    CPDF_ApSettings mk = GetMK(FALSE);
-    mk.GetOriginalColor(iColorType, fc, csEntry);
-}
-CFX_WideString CPDF_FormControl::GetCaption(CFX_ByteString csEntry)
-{
-    CPDF_ApSettings mk = GetMK(FALSE);
-    return mk.GetCaption(csEntry);
-}
-CPDF_Stream* CPDF_FormControl::GetIcon(CFX_ByteString csEntry)
-{
-    CPDF_ApSettings mk = GetMK(FALSE);
-    return mk.GetIcon(csEntry);
-}
-CPDF_IconFit CPDF_FormControl::GetIconFit()
-{
-    CPDF_ApSettings mk = GetMK(FALSE);
-    return mk.GetIconFit();
-}
-int CPDF_FormControl::GetTextPosition()
-{
-    CPDF_ApSettings mk = GetMK(FALSE);
-    return mk.GetTextPosition();
-}
-CPDF_Action CPDF_FormControl::GetAction()
-{
-    if (!m_pWidgetDict) {
-        return CPDF_Action();
-    }
-    if (m_pWidgetDict->KeyExist("A")) {
-        return CPDF_Action(m_pWidgetDict->GetDict("A"));
-    }
-    CPDF_Object* pObj = FPDF_GetFieldAttr(m_pField->m_pDict, "A");
-    if (!pObj) {
-        return CPDF_Action();
-    }
-    return CPDF_Action(pObj->GetDict());
-}
-CPDF_AAction CPDF_FormControl::GetAdditionalAction()
-{
-    if (!m_pWidgetDict) {
-        return nullptr;
-    }
-    if (m_pWidgetDict->KeyExist("AA")) {
-        return m_pWidgetDict->GetDict("AA");
-    }
-    return m_pField->GetAdditionalAction();
-}
-CPDF_DefaultAppearance CPDF_FormControl::GetDefaultAppearance()
-{
-    if (!m_pWidgetDict) {
-        return CFX_ByteString();
-    }
-    if (m_pWidgetDict->KeyExist("DA")) {
-        return m_pWidgetDict->GetString("DA");
-    }
-    CPDF_Object* pObj = FPDF_GetFieldAttr(m_pField->m_pDict, "DA");
-    if (!pObj) {
-        return m_pField->m_pForm->GetDefaultAppearance();
-    }
-    return pObj->GetString();
+  }
+  CFX_ByteString csH = m_pWidgetDict->GetString("H", "I");
+  int i = 0;
+  while (g_sHighlightingMode[i][0] != '\0') {
+    if (csH.Equal(g_sHighlightingMode[i])) {
+      return (HighlightingMode)i;
+    }
+    i++;
+  }
+  return Invert;
+}
+CPDF_ApSettings CPDF_FormControl::GetMK(FX_BOOL bCreate) {
+  if (!m_pWidgetDict) {
+    return NULL;
+  }
+  CPDF_ApSettings mk = m_pWidgetDict->GetDict(FX_BSTRC("MK"));
+  if (!mk && bCreate) {
+    mk = CPDF_Dictionary::Create();
+    if (mk == NULL) {
+      return NULL;
+    }
+    m_pWidgetDict->SetAt(FX_BSTRC("MK"), mk);
+  }
+  return mk;
+}
+FX_BOOL CPDF_FormControl::HasMKEntry(CFX_ByteString csEntry) {
+  CPDF_ApSettings mk = GetMK(FALSE);
+  return mk.HasMKEntry(csEntry);
+}
+int CPDF_FormControl::GetRotation() {
+  CPDF_ApSettings mk = GetMK(FALSE);
+  return mk.GetRotation();
+}
+FX_ARGB CPDF_FormControl::GetColor(int& iColorType, CFX_ByteString csEntry) {
+  CPDF_ApSettings mk = GetMK(FALSE);
+  return mk.GetColor(iColorType, csEntry);
+}
+FX_FLOAT CPDF_FormControl::GetOriginalColor(int index, CFX_ByteString csEntry) {
+  CPDF_ApSettings mk = GetMK(FALSE);
+  return mk.GetOriginalColor(index, csEntry);
+}
+void CPDF_FormControl::GetOriginalColor(int& iColorType,
+                                        FX_FLOAT fc[4],
+                                        CFX_ByteString csEntry) {
+  CPDF_ApSettings mk = GetMK(FALSE);
+  mk.GetOriginalColor(iColorType, fc, csEntry);
+}
+CFX_WideString CPDF_FormControl::GetCaption(CFX_ByteString csEntry) {
+  CPDF_ApSettings mk = GetMK(FALSE);
+  return mk.GetCaption(csEntry);
+}
+CPDF_Stream* CPDF_FormControl::GetIcon(CFX_ByteString csEntry) {
+  CPDF_ApSettings mk = GetMK(FALSE);
+  return mk.GetIcon(csEntry);
+}
+CPDF_IconFit CPDF_FormControl::GetIconFit() {
+  CPDF_ApSettings mk = GetMK(FALSE);
+  return mk.GetIconFit();
+}
+int CPDF_FormControl::GetTextPosition() {
+  CPDF_ApSettings mk = GetMK(FALSE);
+  return mk.GetTextPosition();
+}
+CPDF_Action CPDF_FormControl::GetAction() {
+  if (!m_pWidgetDict) {
+    return CPDF_Action();
+  }
+  if (m_pWidgetDict->KeyExist("A")) {
+    return CPDF_Action(m_pWidgetDict->GetDict("A"));
+  }
+  CPDF_Object* pObj = FPDF_GetFieldAttr(m_pField->m_pDict, "A");
+  if (!pObj) {
+    return CPDF_Action();
+  }
+  return CPDF_Action(pObj->GetDict());
+}
+CPDF_AAction CPDF_FormControl::GetAdditionalAction() {
+  if (!m_pWidgetDict) {
+    return nullptr;
+  }
+  if (m_pWidgetDict->KeyExist("AA")) {
+    return m_pWidgetDict->GetDict("AA");
+  }
+  return m_pField->GetAdditionalAction();
+}
+CPDF_DefaultAppearance CPDF_FormControl::GetDefaultAppearance() {
+  if (!m_pWidgetDict) {
+    return CFX_ByteString();
+  }
+  if (m_pWidgetDict->KeyExist("DA")) {
+    return m_pWidgetDict->GetString("DA");
+  }
+  CPDF_Object* pObj = FPDF_GetFieldAttr(m_pField->m_pDict, "DA");
+  if (!pObj) {
+    return m_pField->m_pForm->GetDefaultAppearance();
+  }
+  return pObj->GetString();
 }
 
-CPDF_Font* CPDF_FormControl::GetDefaultControlFont()
-{
-    CPDF_DefaultAppearance cDA = GetDefaultAppearance();
-    CFX_ByteString csFontNameTag;
-    FX_FLOAT fFontSize;
-    cDA.GetFont(csFontNameTag, fFontSize);
-    if (csFontNameTag.IsEmpty())
-        return nullptr;
+CPDF_Font* CPDF_FormControl::GetDefaultControlFont() {
+  CPDF_DefaultAppearance cDA = GetDefaultAppearance();
+  CFX_ByteString csFontNameTag;
+  FX_FLOAT fFontSize;
+  cDA.GetFont(csFontNameTag, fFontSize);
+  if (csFontNameTag.IsEmpty())
+    return nullptr;
 
-    CPDF_Object* pObj = FPDF_GetFieldAttr(m_pWidgetDict, "DR");
-    if (pObj && pObj->GetType() == PDFOBJ_DICTIONARY) {
-        CPDF_Dictionary* pFonts = ((CPDF_Dictionary*)pObj)->GetDict("Font");
-        if (pFonts) {
-            CPDF_Dictionary* pElement = pFonts->GetDict(csFontNameTag);
-            if (pElement) {
-                CPDF_Font* pFont =
-                    m_pField->m_pForm->m_pDocument->LoadFont(pElement);
-                if (pFont) {
-                    return pFont;
-                }
-            }
+  CPDF_Object* pObj = FPDF_GetFieldAttr(m_pWidgetDict, "DR");
+  if (pObj && pObj->GetType() == PDFOBJ_DICTIONARY) {
+    CPDF_Dictionary* pFonts = ((CPDF_Dictionary*)pObj)->GetDict("Font");
+    if (pFonts) {
+      CPDF_Dictionary* pElement = pFonts->GetDict(csFontNameTag);
+      if (pElement) {
+        CPDF_Font* pFont = m_pField->m_pForm->m_pDocument->LoadFont(pElement);
+        if (pFont) {
+          return pFont;
         }
+      }
     }
-    if (CPDF_Font* pFormFont = m_pField->m_pForm->GetFormFont(csFontNameTag))
-      return pFormFont;
+  }
+  if (CPDF_Font* pFormFont = m_pField->m_pForm->GetFormFont(csFontNameTag))
+    return pFormFont;
 
-    CPDF_Dictionary *pPageDict = m_pWidgetDict->GetDict("P");
-    pObj = FPDF_GetFieldAttr(pPageDict, "Resources");
-    if (pObj && pObj->GetType() == PDFOBJ_DICTIONARY) {
-        CPDF_Dictionary* pFonts = ((CPDF_Dictionary*)pObj)->GetDict("Font");
-        if (pFonts) {
-            CPDF_Dictionary* pElement = pFonts->GetDict(csFontNameTag);
-            if (pElement) {
-                CPDF_Font* pFont =
-                    m_pField->m_pForm->m_pDocument->LoadFont(pElement);
-                if (pFont) {
-                    return pFont;
-                }
-            }
+  CPDF_Dictionary* pPageDict = m_pWidgetDict->GetDict("P");
+  pObj = FPDF_GetFieldAttr(pPageDict, "Resources");
+  if (pObj && pObj->GetType() == PDFOBJ_DICTIONARY) {
+    CPDF_Dictionary* pFonts = ((CPDF_Dictionary*)pObj)->GetDict("Font");
+    if (pFonts) {
+      CPDF_Dictionary* pElement = pFonts->GetDict(csFontNameTag);
+      if (pElement) {
+        CPDF_Font* pFont = m_pField->m_pForm->m_pDocument->LoadFont(pElement);
+        if (pFont) {
+          return pFont;
         }
+      }
     }
-    return nullptr;
+  }
+  return nullptr;
 }
 
-int CPDF_FormControl::GetControlAlignment()
-{
-    if (!m_pWidgetDict) {
-        return 0;
-    }
-    if (m_pWidgetDict->KeyExist("Q")) {
-        return m_pWidgetDict->GetInteger("Q", 0);
-    }
-    CPDF_Object* pObj = FPDF_GetFieldAttr(m_pField->m_pDict, "Q");
-    if (pObj == NULL) {
-        return m_pField->m_pForm->GetFormAlignment();
-    }
-    return pObj->GetInteger();
-}
-FX_BOOL CPDF_ApSettings::HasMKEntry(const CFX_ByteStringC& csEntry)
-{
-    if (m_pDict == NULL) {
-        return FALSE;
-    }
-    return m_pDict->KeyExist(csEntry);
-}
-int CPDF_ApSettings::GetRotation()
-{
-    if (m_pDict == NULL) {
-        return 0;
-    }
-    return m_pDict->GetInteger(FX_BSTRC("R"));
+int CPDF_FormControl::GetControlAlignment() {
+  if (!m_pWidgetDict) {
+    return 0;
+  }
+  if (m_pWidgetDict->KeyExist("Q")) {
+    return m_pWidgetDict->GetInteger("Q", 0);
+  }
+  CPDF_Object* pObj = FPDF_GetFieldAttr(m_pField->m_pDict, "Q");
+  if (pObj == NULL) {
+    return m_pField->m_pForm->GetFormAlignment();
+  }
+  return pObj->GetInteger();
+}
+FX_BOOL CPDF_ApSettings::HasMKEntry(const CFX_ByteStringC& csEntry) {
+  if (m_pDict == NULL) {
+    return FALSE;
+  }
+  return m_pDict->KeyExist(csEntry);
+}
+int CPDF_ApSettings::GetRotation() {
+  if (m_pDict == NULL) {
+    return 0;
+  }
+  return m_pDict->GetInteger(FX_BSTRC("R"));
 }
-FX_ARGB CPDF_ApSettings::GetColor(int& iColorType, const CFX_ByteStringC& csEntry)
-{
-    iColorType = COLORTYPE_TRANSPARENT;
-    if (m_pDict == NULL) {
-        return 0;
-    }
-    FX_ARGB color = 0;
-    CPDF_Array* pEntry = m_pDict->GetArray(csEntry);
-    if (pEntry == NULL) {
-        return color;
-    }
-    FX_DWORD dwCount = pEntry->GetCount();
-    if (dwCount == 1) {
-        iColorType = COLORTYPE_GRAY;
-        FX_FLOAT g = pEntry->GetNumber(0) * 255;
-        color = ArgbEncode(255, (int)g, (int)g, (int)g);
-    } else if (dwCount == 3) {
-        iColorType = COLORTYPE_RGB;
-        FX_FLOAT r = pEntry->GetNumber(0) * 255;
-        FX_FLOAT g = pEntry->GetNumber(1) * 255;
-        FX_FLOAT b = pEntry->GetNumber(2) * 255;
-        color = ArgbEncode(255, (int)r, (int)g, (int)b);
-    } else if (dwCount == 4) {
-        iColorType = COLORTYPE_CMYK;
-        FX_FLOAT c = pEntry->GetNumber(0);
-        FX_FLOAT m = pEntry->GetNumber(1);
-        FX_FLOAT y = pEntry->GetNumber(2);
-        FX_FLOAT k = pEntry->GetNumber(3);
-        FX_FLOAT r = 1.0f - FX_MIN(1.0f, c + k);
-        FX_FLOAT g = 1.0f - FX_MIN(1.0f, m + k);
-        FX_FLOAT b = 1.0f - FX_MIN(1.0f, y + k);
-        color = ArgbEncode(255, (int)(r * 255), (int)(g * 255), (int)(b * 255));
-    }
+FX_ARGB CPDF_ApSettings::GetColor(int& iColorType,
+                                  const CFX_ByteStringC& csEntry) {
+  iColorType = COLORTYPE_TRANSPARENT;
+  if (m_pDict == NULL) {
+    return 0;
+  }
+  FX_ARGB color = 0;
+  CPDF_Array* pEntry = m_pDict->GetArray(csEntry);
+  if (pEntry == NULL) {
     return color;
-}
-FX_FLOAT CPDF_ApSettings::GetOriginalColor(int index, const CFX_ByteStringC& csEntry)
-{
-    if (m_pDict == NULL) {
-        return 0;
-    }
-    CPDF_Array* pEntry = m_pDict->GetArray(csEntry);
-    if (pEntry != NULL) {
-        return pEntry->GetNumber(index);
-    }
+  }
+  FX_DWORD dwCount = pEntry->GetCount();
+  if (dwCount == 1) {
+    iColorType = COLORTYPE_GRAY;
+    FX_FLOAT g = pEntry->GetNumber(0) * 255;
+    color = ArgbEncode(255, (int)g, (int)g, (int)g);
+  } else if (dwCount == 3) {
+    iColorType = COLORTYPE_RGB;
+    FX_FLOAT r = pEntry->GetNumber(0) * 255;
+    FX_FLOAT g = pEntry->GetNumber(1) * 255;
+    FX_FLOAT b = pEntry->GetNumber(2) * 255;
+    color = ArgbEncode(255, (int)r, (int)g, (int)b);
+  } else if (dwCount == 4) {
+    iColorType = COLORTYPE_CMYK;
+    FX_FLOAT c = pEntry->GetNumber(0);
+    FX_FLOAT m = pEntry->GetNumber(1);
+    FX_FLOAT y = pEntry->GetNumber(2);
+    FX_FLOAT k = pEntry->GetNumber(3);
+    FX_FLOAT r = 1.0f - FX_MIN(1.0f, c + k);
+    FX_FLOAT g = 1.0f - FX_MIN(1.0f, m + k);
+    FX_FLOAT b = 1.0f - FX_MIN(1.0f, y + k);
+    color = ArgbEncode(255, (int)(r * 255), (int)(g * 255), (int)(b * 255));
+  }
+  return color;
+}
+FX_FLOAT CPDF_ApSettings::GetOriginalColor(int index,
+                                           const CFX_ByteStringC& csEntry) {
+  if (m_pDict == NULL) {
     return 0;
-}
-void CPDF_ApSettings::GetOriginalColor(int& iColorType, FX_FLOAT fc[4], const CFX_ByteStringC& csEntry)
-{
-    iColorType = COLORTYPE_TRANSPARENT;
-    for (int i = 0; i < 4; i ++) {
-        fc[i] = 0;
-    }
-    if (m_pDict == NULL) {
-        return;
-    }
-    CPDF_Array* pEntry = m_pDict->GetArray(csEntry);
-    if (pEntry == NULL) {
-        return;
-    }
-    FX_DWORD dwCount = pEntry->GetCount();
-    if (dwCount == 1) {
-        iColorType = COLORTYPE_GRAY;
-        fc[0] = pEntry->GetNumber(0);
-    } else if (dwCount == 3) {
-        iColorType = COLORTYPE_RGB;
-        fc[0] = pEntry->GetNumber(0);
-        fc[1] = pEntry->GetNumber(1);
-        fc[2] = pEntry->GetNumber(2);
-    } else if (dwCount == 4) {
-        iColorType = COLORTYPE_CMYK;
-        fc[0] = pEntry->GetNumber(0);
-        fc[1] = pEntry->GetNumber(1);
-        fc[2] = pEntry->GetNumber(2);
-        fc[3] = pEntry->GetNumber(3);
-    }
-}
-CFX_WideString CPDF_ApSettings::GetCaption(const CFX_ByteStringC& csEntry)
-{
-    CFX_WideString csCaption;
-    if (m_pDict == NULL) {
-        return csCaption;
-    }
-    return m_pDict->GetUnicodeText(csEntry);
-}
-CPDF_Stream* CPDF_ApSettings::GetIcon(const CFX_ByteStringC& csEntry)
-{
-    if (m_pDict == NULL) {
-        return NULL;
-    }
-    return m_pDict->GetStream(csEntry);
-}
-CPDF_IconFit CPDF_ApSettings::GetIconFit()
-{
-    if (m_pDict == NULL) {
-        return NULL;
-    }
-    return m_pDict->GetDict(FX_BSTRC("IF"));
-}
-int CPDF_ApSettings::GetTextPosition()
-{
-    if (m_pDict == NULL) {
-        return TEXTPOS_CAPTION;
-    }
-    return m_pDict->GetInteger(FX_BSTRC("TP"), TEXTPOS_CAPTION);
+  }
+  CPDF_Array* pEntry = m_pDict->GetArray(csEntry);
+  if (pEntry != NULL) {
+    return pEntry->GetNumber(index);
+  }
+  return 0;
+}
+void CPDF_ApSettings::GetOriginalColor(int& iColorType,
+                                       FX_FLOAT fc[4],
+                                       const CFX_ByteStringC& csEntry) {
+  iColorType = COLORTYPE_TRANSPARENT;
+  for (int i = 0; i < 4; i++) {
+    fc[i] = 0;
+  }
+  if (m_pDict == NULL) {
+    return;
+  }
+  CPDF_Array* pEntry = m_pDict->GetArray(csEntry);
+  if (pEntry == NULL) {
+    return;
+  }
+  FX_DWORD dwCount = pEntry->GetCount();
+  if (dwCount == 1) {
+    iColorType = COLORTYPE_GRAY;
+    fc[0] = pEntry->GetNumber(0);
+  } else if (dwCount == 3) {
+    iColorType = COLORTYPE_RGB;
+    fc[0] = pEntry->GetNumber(0);
+    fc[1] = pEntry->GetNumber(1);
+    fc[2] = pEntry->GetNumber(2);
+  } else if (dwCount == 4) {
+    iColorType = COLORTYPE_CMYK;
+    fc[0] = pEntry->GetNumber(0);
+    fc[1] = pEntry->GetNumber(1);
+    fc[2] = pEntry->GetNumber(2);
+    fc[3] = pEntry->GetNumber(3);
+  }
+}
+CFX_WideString CPDF_ApSettings::GetCaption(const CFX_ByteStringC& csEntry) {
+  CFX_WideString csCaption;
+  if (m_pDict == NULL) {
+    return csCaption;
+  }
+  return m_pDict->GetUnicodeText(csEntry);
+}
+CPDF_Stream* CPDF_ApSettings::GetIcon(const CFX_ByteStringC& csEntry) {
+  if (m_pDict == NULL) {
+    return NULL;
+  }
+  return m_pDict->GetStream(csEntry);
+}
+CPDF_IconFit CPDF_ApSettings::GetIconFit() {
+  if (m_pDict == NULL) {
+    return NULL;
+  }
+  return m_pDict->GetDict(FX_BSTRC("IF"));
+}
+int CPDF_ApSettings::GetTextPosition() {
+  if (m_pDict == NULL) {
+    return TEXTPOS_CAPTION;
+  }
+  return m_pDict->GetInteger(FX_BSTRC("TP"), TEXTPOS_CAPTION);
 }
diff --git a/core/src/fpdfdoc/doc_formfield.cpp b/core/src/fpdfdoc/doc_formfield.cpp
index 087eba8aa4..8541d9c144 100644
--- a/core/src/fpdfdoc/doc_formfield.cpp
+++ b/core/src/fpdfdoc/doc_formfield.cpp
@@ -7,1100 +7,1068 @@
 #include "../../include/fpdfdoc/fpdf_doc.h"
 #include "doc_utils.h"
 
-FX_BOOL PDF_FormField_IsUnison(CPDF_FormField *pField)
-{
-    FX_BOOL bUnison = FALSE;
-    if (pField->GetType() == CPDF_FormField::CheckBox) {
-        bUnison = TRUE;
+FX_BOOL PDF_FormField_IsUnison(CPDF_FormField* pField) {
+  FX_BOOL bUnison = FALSE;
+  if (pField->GetType() == CPDF_FormField::CheckBox) {
+    bUnison = TRUE;
+  } else {
+    FX_DWORD dwFlags = pField->GetFieldFlags();
+    bUnison = ((dwFlags & 0x2000000) != 0);
+  }
+  return bUnison;
+}
+CPDF_FormField::CPDF_FormField(CPDF_InterForm* pForm, CPDF_Dictionary* pDict) {
+  m_pDict = pDict;
+  m_Type = Unknown;
+  m_pForm = pForm;
+  m_pFont = NULL;
+  m_FontSize = 0;
+  SyncFieldFlags();
+}
+CPDF_FormField::~CPDF_FormField() {}
+void CPDF_FormField::SyncFieldFlags() {
+  CFX_ByteString type_name = FPDF_GetFieldAttr(m_pDict, "FT")
+                                 ? FPDF_GetFieldAttr(m_pDict, "FT")->GetString()
+                                 : CFX_ByteString();
+  FX_DWORD flags = FPDF_GetFieldAttr(m_pDict, "Ff")
+                       ? FPDF_GetFieldAttr(m_pDict, "Ff")->GetInteger()
+                       : 0;
+  m_Flags = 0;
+  if (flags & 1) {
+    m_Flags |= FORMFIELD_READONLY;
+  }
+  if (flags & 2) {
+    m_Flags |= FORMFIELD_REQUIRED;
+  }
+  if (flags & 4) {
+    m_Flags |= FORMFIELD_NOEXPORT;
+  }
+  if (type_name == "Btn") {
+    if (flags & 0x8000) {
+      m_Type = RadioButton;
+      if (flags & 0x4000) {
+        m_Flags |= FORMRADIO_NOTOGGLEOFF;
+      }
+      if (flags & 0x2000000) {
+        m_Flags |= FORMRADIO_UNISON;
+      }
+    } else if (flags & 0x10000) {
+      m_Type = PushButton;
     } else {
-        FX_DWORD dwFlags = pField->GetFieldFlags();
-        bUnison = ((dwFlags & 0x2000000) != 0);
+      m_Type = CheckBox;
     }
-    return bUnison;
-}
-CPDF_FormField::CPDF_FormField(CPDF_InterForm* pForm, CPDF_Dictionary* pDict)
-{
-    m_pDict = pDict;
-    m_Type = Unknown;
-    m_pForm = pForm;
-    m_pFont = NULL;
-    m_FontSize = 0;
-    SyncFieldFlags();
+  } else if (type_name == "Tx") {
+    if (flags & 0x100000) {
+      m_Type = File;
+    } else if (flags & 0x2000000) {
+      m_Type = RichText;
+    } else {
+      m_Type = Text;
+      if (flags & 0x1000) {
+        m_Flags |= FORMTEXT_MULTILINE;
+      }
+      if (flags & 0x2000) {
+        m_Flags |= FORMTEXT_PASSWORD;
+      }
+      if (flags & 0x800000) {
+        m_Flags |= FORMTEXT_NOSCROLL;
+      }
+      if (flags & 0x100000) {
+        m_Flags |= FORMTEXT_COMB;
+      }
+    }
+    LoadDA();
+  } else if (type_name == "Ch") {
+    if (flags & 0x20000) {
+      m_Type = ComboBox;
+      if (flags & 0x40000) {
+        m_Flags |= FORMCOMBO_EDIT;
+      }
+    } else {
+      m_Type = ListBox;
+      if (flags & 0x200000) {
+        m_Flags |= FORMLIST_MULTISELECT;
+      }
+    }
+    LoadDA();
+  } else if (type_name == "Sig") {
+    m_Type = Sign;
+  }
 }
-CPDF_FormField::~CPDF_FormField()
-{
+CFX_WideString CPDF_FormField::GetFullName() {
+  return ::GetFullName(m_pDict);
 }
-void CPDF_FormField::SyncFieldFlags()
-{
-    CFX_ByteString type_name = FPDF_GetFieldAttr(m_pDict, "FT") ? FPDF_GetFieldAttr(m_pDict, "FT")->GetString() : CFX_ByteString();
-    FX_DWORD flags = FPDF_GetFieldAttr(m_pDict, "Ff")? FPDF_GetFieldAttr(m_pDict, "Ff")->GetInteger() : 0;
-    m_Flags = 0;
-    if (flags & 1) {
-        m_Flags |= FORMFIELD_READONLY;
-    }
-    if (flags & 2) {
-        m_Flags |= FORMFIELD_REQUIRED;
-    }
-    if (flags & 4) {
-        m_Flags |= FORMFIELD_NOEXPORT;
-    }
-    if (type_name == "Btn") {
-        if (flags & 0x8000) {
-            m_Type = RadioButton;
-            if (flags & 0x4000) {
-                m_Flags |= FORMRADIO_NOTOGGLEOFF;
-            }
-            if (flags & 0x2000000) {
-                m_Flags |= FORMRADIO_UNISON;
-            }
-        } else if (flags & 0x10000) {
-            m_Type = PushButton;
+FX_BOOL CPDF_FormField::ResetField(FX_BOOL bNotify) {
+  switch (m_Type) {
+    case CPDF_FormField::CheckBox:
+    case CPDF_FormField::RadioButton: {
+      CFX_ByteArray statusArray;
+      if (bNotify && m_pForm->m_pFormNotify != NULL) {
+        SaveCheckedFieldStatus(this, statusArray);
+      }
+      int iCount = CountControls();
+      if (iCount) {
+        if (PDF_FormField_IsUnison(this)) {
+          for (int i = 0; i < iCount; i++) {
+            CheckControl(i, GetControl(i)->IsDefaultChecked(), FALSE);
+          }
         } else {
-            m_Type = CheckBox;
+          for (int i = 0; i < iCount; i++) {
+            CPDF_FormControl* pControl = GetControl(i);
+            FX_BOOL bChecked = pControl->IsDefaultChecked();
+            CheckControl(i, bChecked, FALSE);
+          }
         }
-    } else if (type_name == "Tx") {
-        if (flags & 0x100000) {
-            m_Type = File;
-        } else if (flags & 0x2000000) {
-            m_Type = RichText;
-        } else {
-            m_Type = Text;
-            if (flags & 0x1000) {
-                m_Flags |= FORMTEXT_MULTILINE;
-            }
-            if (flags & 0x2000) {
-                m_Flags |= FORMTEXT_PASSWORD;
-            }
-            if (flags & 0x800000) {
-                m_Flags |= FORMTEXT_NOSCROLL;
-            }
-            if (flags & 0x100000) {
-                m_Flags |= FORMTEXT_COMB;
-            }
+      }
+      if (bNotify && m_pForm->m_pFormNotify != NULL) {
+        m_pForm->m_pFormNotify->AfterCheckedStatusChange(this, statusArray);
+      }
+    } break;
+    case CPDF_FormField::ComboBox: {
+      CFX_WideString csValue;
+      ClearSelection();
+      int iIndex = GetDefaultSelectedItem();
+      if (iIndex >= 0) {
+        csValue = GetOptionLabel(iIndex);
+      }
+      if (bNotify && m_pForm->m_pFormNotify != NULL) {
+        int iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
+        if (iRet < 0) {
+          return FALSE;
         }
-        LoadDA();
-    } else if (type_name == "Ch") {
-        if (flags & 0x20000) {
-            m_Type = ComboBox;
-            if (flags & 0x40000) {
-                m_Flags |= FORMCOMBO_EDIT;
-            }
-        } else {
-            m_Type = ListBox;
-            if (flags & 0x200000) {
-                m_Flags |= FORMLIST_MULTISELECT;
-            }
+      }
+      SetItemSelection(iIndex, TRUE);
+      if (bNotify && m_pForm->m_pFormNotify != NULL) {
+        m_pForm->m_pFormNotify->AfterValueChange(this);
+      }
+    } break;
+    case CPDF_FormField::ListBox: {
+      CFX_WideString csValue;
+      ClearSelection();
+      int iIndex = GetDefaultSelectedItem();
+      if (iIndex >= 0) {
+        csValue = GetOptionLabel(iIndex);
+      }
+      if (bNotify && m_pForm->m_pFormNotify != NULL) {
+        int iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
+        if (iRet < 0) {
+          return FALSE;
         }
-        LoadDA();
-    } else if (type_name == "Sig") {
-        m_Type = Sign;
-    }
-}
-CFX_WideString CPDF_FormField::GetFullName()
-{
-    return ::GetFullName(m_pDict);
-}
-FX_BOOL CPDF_FormField::ResetField(FX_BOOL bNotify)
-{
-    switch (m_Type) {
-        case CPDF_FormField::CheckBox:
-        case CPDF_FormField::RadioButton: {
-                CFX_ByteArray statusArray;
-                if (bNotify && m_pForm->m_pFormNotify != NULL) {
-                    SaveCheckedFieldStatus(this, statusArray);
-                }
-                int iCount = CountControls();
-                if (iCount) {
-                    if (PDF_FormField_IsUnison(this)) {
-                        for(int i = 0; i < iCount; i++) {
-                            CheckControl(i, GetControl(i)->IsDefaultChecked(), FALSE);
-                        }
-                    } else {
-                        for (int i = 0; i < iCount; i ++) {
-                            CPDF_FormControl* pControl = GetControl(i);
-                            FX_BOOL bChecked = pControl->IsDefaultChecked();
-                            CheckControl(i, bChecked, FALSE);
-                        }
-                    }
-                }
-                if (bNotify && m_pForm->m_pFormNotify != NULL) {
-                    m_pForm->m_pFormNotify->AfterCheckedStatusChange(this, statusArray);
-                }
-            }
-            break;
-        case CPDF_FormField::ComboBox: {
-                CFX_WideString csValue;
-                ClearSelection();
-                int iIndex = GetDefaultSelectedItem();
-                if (iIndex >= 0) {
-                    csValue = GetOptionLabel(iIndex);
-                }
-                if (bNotify && m_pForm->m_pFormNotify != NULL) {
-                    int iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
-                    if (iRet < 0) {
-                        return FALSE;
-                    }
-                }
-                SetItemSelection(iIndex, TRUE);
-                if (bNotify && m_pForm->m_pFormNotify != NULL) {
-                    m_pForm->m_pFormNotify->AfterValueChange(this);
-                }
-            }
-            break;
-        case CPDF_FormField::ListBox: {
-                CFX_WideString csValue;
-                ClearSelection();
-                int iIndex = GetDefaultSelectedItem();
-                if (iIndex >= 0) {
-                    csValue = GetOptionLabel(iIndex);
-                }
-                if (bNotify && m_pForm->m_pFormNotify != NULL) {
-                    int iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
-                    if (iRet < 0) {
-                        return FALSE;
-                    }
-                }
-                SetItemSelection(iIndex, TRUE);
-                if (bNotify && m_pForm->m_pFormNotify != NULL) {
-                    m_pForm->m_pFormNotify->AfterSelectionChange(this);
-                }
-            }
-            break;
-        case CPDF_FormField::Text:
-        case CPDF_FormField::RichText:
-        case CPDF_FormField::File:
-        default: {
-                CPDF_Object* pDV = FPDF_GetFieldAttr(m_pDict, "DV");
-                CFX_WideString csDValue;
-                if (pDV != NULL) {
-                    csDValue = pDV->GetUnicodeText();
-                }
-                CPDF_Object* pV = FPDF_GetFieldAttr(m_pDict, "V");
-                CFX_WideString csValue;
-                if (pV != NULL) {
-                    csValue = pV->GetUnicodeText();
-                }
-                CPDF_Object* pRV = FPDF_GetFieldAttr(m_pDict, "RV");
-                if (!pRV && (csDValue == csValue)) {
-                    return FALSE;
-                }
-                if (bNotify && m_pForm->m_pFormNotify != NULL) {
-                    int iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csDValue);
-                    if (iRet < 0) {
-                        return FALSE;
-                    }
-                }
-                if (pDV == NULL) {
-                    m_pDict->RemoveAt("V");
-                    m_pDict->RemoveAt("RV");
-                } else {
-                    CPDF_Object* pClone = pDV->Clone();
-                    if (pClone == NULL) {
-                        return FALSE;
-                    }
-                    m_pDict->SetAt("V", pClone);
-                    if(pRV) {
-                        CPDF_Object* pCloneR = pDV->Clone();
-                        m_pDict->SetAt("RV", pCloneR);
-                    }
-                }
-                if (bNotify && m_pForm->m_pFormNotify != NULL) {
-                    m_pForm->m_pFormNotify->AfterValueChange(this);
-                }
-                m_pForm->m_bUpdated = TRUE;
-            }
-            break;
-    }
-    return TRUE;
-}
-int CPDF_FormField::GetControlIndex(const CPDF_FormControl* pControl)
-{
-    if (pControl == NULL) {
-        return -1;
-    }
-    int iCount = m_ControlList.GetSize();
-    for (int i = 0; i < iCount; i ++) {
-        CPDF_FormControl* pFind = (CPDF_FormControl*)m_ControlList.GetAt(i);
-        if (pFind == pControl) {
-            return i;
+      }
+      SetItemSelection(iIndex, TRUE);
+      if (bNotify && m_pForm->m_pFormNotify != NULL) {
+        m_pForm->m_pFormNotify->AfterSelectionChange(this);
+      }
+    } break;
+    case CPDF_FormField::Text:
+    case CPDF_FormField::RichText:
+    case CPDF_FormField::File:
+    default: {
+      CPDF_Object* pDV = FPDF_GetFieldAttr(m_pDict, "DV");
+      CFX_WideString csDValue;
+      if (pDV != NULL) {
+        csDValue = pDV->GetUnicodeText();
+      }
+      CPDF_Object* pV = FPDF_GetFieldAttr(m_pDict, "V");
+      CFX_WideString csValue;
+      if (pV != NULL) {
+        csValue = pV->GetUnicodeText();
+      }
+      CPDF_Object* pRV = FPDF_GetFieldAttr(m_pDict, "RV");
+      if (!pRV && (csDValue == csValue)) {
+        return FALSE;
+      }
+      if (bNotify && m_pForm->m_pFormNotify != NULL) {
+        int iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csDValue);
+        if (iRet < 0) {
+          return FALSE;
         }
-    }
+      }
+      if (pDV == NULL) {
+        m_pDict->RemoveAt("V");
+        m_pDict->RemoveAt("RV");
+      } else {
+        CPDF_Object* pClone = pDV->Clone();
+        if (pClone == NULL) {
+          return FALSE;
+        }
+        m_pDict->SetAt("V", pClone);
+        if (pRV) {
+          CPDF_Object* pCloneR = pDV->Clone();
+          m_pDict->SetAt("RV", pCloneR);
+        }
+      }
+      if (bNotify && m_pForm->m_pFormNotify != NULL) {
+        m_pForm->m_pFormNotify->AfterValueChange(this);
+      }
+      m_pForm->m_bUpdated = TRUE;
+    } break;
+  }
+  return TRUE;
+}
+int CPDF_FormField::GetControlIndex(const CPDF_FormControl* pControl) {
+  if (pControl == NULL) {
     return -1;
+  }
+  int iCount = m_ControlList.GetSize();
+  for (int i = 0; i < iCount; i++) {
+    CPDF_FormControl* pFind = (CPDF_FormControl*)m_ControlList.GetAt(i);
+    if (pFind == pControl) {
+      return i;
+    }
+  }
+  return -1;
 }
-int CPDF_FormField::GetFieldType()
-{
-    switch (m_Type) {
-        case PushButton:
-            return FIELDTYPE_PUSHBUTTON;
-        case CheckBox:
-            return FIELDTYPE_CHECKBOX;
-        case RadioButton:
-            return FIELDTYPE_RADIOBUTTON;
-        case ComboBox:
-            return FIELDTYPE_COMBOBOX;
-        case ListBox:
-            return FIELDTYPE_LISTBOX;
-        case Text:
-        case RichText:
-        case File:
-            return FIELDTYPE_TEXTFIELD;
-        case Sign:
-            return FIELDTYPE_SIGNATURE;
-        default:
-            break;
-    }
-    return FIELDTYPE_UNKNOWN;
+int CPDF_FormField::GetFieldType() {
+  switch (m_Type) {
+    case PushButton:
+      return FIELDTYPE_PUSHBUTTON;
+    case CheckBox:
+      return FIELDTYPE_CHECKBOX;
+    case RadioButton:
+      return FIELDTYPE_RADIOBUTTON;
+    case ComboBox:
+      return FIELDTYPE_COMBOBOX;
+    case ListBox:
+      return FIELDTYPE_LISTBOX;
+    case Text:
+    case RichText:
+    case File:
+      return FIELDTYPE_TEXTFIELD;
+    case Sign:
+      return FIELDTYPE_SIGNATURE;
+    default:
+      break;
+  }
+  return FIELDTYPE_UNKNOWN;
 }
-CPDF_AAction CPDF_FormField::GetAdditionalAction()
-{
-    CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "AA");
-    if (pObj == NULL) {
-        return NULL;
-    }
-    return pObj->GetDict();
+CPDF_AAction CPDF_FormField::GetAdditionalAction() {
+  CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "AA");
+  if (pObj == NULL) {
+    return NULL;
+  }
+  return pObj->GetDict();
 }
-CFX_WideString CPDF_FormField::GetAlternateName()
-{
-    CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "TU");
-    if (pObj == NULL) {
-        return L"";
-    }
-    return pObj->GetUnicodeText();
+CFX_WideString CPDF_FormField::GetAlternateName() {
+  CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "TU");
+  if (pObj == NULL) {
+    return L"";
+  }
+  return pObj->GetUnicodeText();
 }
-CFX_WideString CPDF_FormField::GetMappingName()
-{
-    CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "TM");
-    if (pObj == NULL) {
-        return L"";
-    }
-    return pObj->GetUnicodeText();
+CFX_WideString CPDF_FormField::GetMappingName() {
+  CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "TM");
+  if (pObj == NULL) {
+    return L"";
+  }
+  return pObj->GetUnicodeText();
 }
-FX_DWORD CPDF_FormField::GetFieldFlags()
-{
-    CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "Ff");
-    if (pObj == NULL) {
-        return 0;
-    }
-    return pObj->GetInteger();
+FX_DWORD CPDF_FormField::GetFieldFlags() {
+  CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "Ff");
+  if (pObj == NULL) {
+    return 0;
+  }
+  return pObj->GetInteger();
 }
-CFX_ByteString CPDF_FormField::GetDefaultStyle()
-{
-    CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "DS");
-    if (pObj == NULL) {
-        return "";
-    }
-    return pObj->GetString();
+CFX_ByteString CPDF_FormField::GetDefaultStyle() {
+  CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "DS");
+  if (pObj == NULL) {
+    return "";
+  }
+  return pObj->GetString();
 }
-CFX_WideString CPDF_FormField::GetRichTextString()
-{
-    CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "RV");
-    if (pObj == NULL) {
-        return L"";
-    }
-    return pObj->GetUnicodeText();
+CFX_WideString CPDF_FormField::GetRichTextString() {
+  CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "RV");
+  if (pObj == NULL) {
+    return L"";
+  }
+  return pObj->GetUnicodeText();
 }
-CFX_WideString CPDF_FormField::GetValue(FX_BOOL bDefault)
-{
-    if (GetType() == CheckBox || GetType() == RadioButton) {
-        return GetCheckValue(bDefault);
+CFX_WideString CPDF_FormField::GetValue(FX_BOOL bDefault) {
+  if (GetType() == CheckBox || GetType() == RadioButton) {
+    return GetCheckValue(bDefault);
+  }
+  CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, bDefault ? "DV" : "V");
+  if (pValue == NULL) {
+    if (!bDefault) {
+      if (m_Type == RichText) {
+        pValue = FPDF_GetFieldAttr(m_pDict, "V");
+      }
+      if (pValue == NULL && m_Type != Text) {
+        pValue = FPDF_GetFieldAttr(m_pDict, "DV");
+      }
     }
-    CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, bDefault ? "DV" : "V");
     if (pValue == NULL) {
-        if (!bDefault) {
-            if (m_Type == RichText) {
-                pValue = FPDF_GetFieldAttr(m_pDict, "V");
-            }
-            if (pValue == NULL && m_Type != Text) {
-                pValue = FPDF_GetFieldAttr(m_pDict, "DV");
-            }
-        }
-        if (pValue == NULL) {
-            return CFX_WideString();
-        }
-    }
-    switch (pValue->GetType()) {
-        case PDFOBJ_STRING:
-        case PDFOBJ_STREAM:
-            return pValue->GetUnicodeText();
-        case PDFOBJ_ARRAY:
-            pValue = ((CPDF_Array*)pValue)->GetElementValue(0);
-            if (pValue) {
-                return pValue->GetUnicodeText();
-            }
-            break;
-    }
-    return CFX_WideString();
+      return CFX_WideString();
+    }
+  }
+  switch (pValue->GetType()) {
+    case PDFOBJ_STRING:
+    case PDFOBJ_STREAM:
+      return pValue->GetUnicodeText();
+    case PDFOBJ_ARRAY:
+      pValue = ((CPDF_Array*)pValue)->GetElementValue(0);
+      if (pValue) {
+        return pValue->GetUnicodeText();
+      }
+      break;
+  }
+  return CFX_WideString();
 }
-CFX_WideString CPDF_FormField::GetValue()
-{
-    return GetValue(FALSE);
+CFX_WideString CPDF_FormField::GetValue() {
+  return GetValue(FALSE);
 }
-CFX_WideString CPDF_FormField::GetDefaultValue()
-{
-    return GetValue(TRUE);
+CFX_WideString CPDF_FormField::GetDefaultValue() {
+  return GetValue(TRUE);
 }
-FX_BOOL CPDF_FormField::SetValue(const CFX_WideString& value, FX_BOOL bDefault, FX_BOOL bNotify)
-{
-    switch (m_Type) {
-        case CheckBox:
-        case RadioButton: {
-                SetCheckValue(value, bDefault, bNotify);
-                return TRUE;
-            }
-        case File:
-        case RichText:
-        case Text:
-        case ComboBox: {
-                CFX_WideString csValue = value;
-                if (bNotify && m_pForm->m_pFormNotify != NULL) {
-                    int iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
-                    if (iRet < 0) {
-                        return FALSE;
-                    }
-                }
-                int iIndex = FindOptionValue(csValue);
-                if (iIndex < 0) {
-                    CFX_ByteString bsEncodeText = PDF_EncodeText(csValue);
-                    m_pDict->SetAtString(bDefault ? "DV" : "V", bsEncodeText);
-                    if (m_Type == RichText && !bDefault) {
-                        m_pDict->SetAtString("RV", bsEncodeText);
-                    }
-                    m_pDict->RemoveAt("I");
-                } else {
-                    m_pDict->SetAtString(bDefault ? "DV" : "V", PDF_EncodeText(csValue));
-                    if (bDefault) {
-                    } else {
-                        ClearSelection();
-                        SetItemSelection(iIndex, TRUE);
-                    }
-                }
-                if (bNotify && m_pForm->m_pFormNotify != NULL) {
-                    m_pForm->m_pFormNotify->AfterValueChange(this);
-                }
-                m_pForm->m_bUpdated = TRUE;
-            }
-            break;
-        case ListBox: {
-                int iIndex = FindOptionValue(value);
-                if (iIndex < 0) {
-                    return FALSE;
-                }
-                if (bDefault && iIndex == GetDefaultSelectedItem()) {
-                    return FALSE;
-                }
-                if (bNotify && m_pForm->m_pFormNotify != NULL) {
-                    CFX_WideString csValue = value;
-                    int iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
-                    if (iRet < 0) {
-                        return FALSE;
-                    }
-                }
-                if (bDefault) {
-                } else {
-                    ClearSelection();
-                    SetItemSelection(iIndex, TRUE);
-                }
-                if (bNotify && m_pForm->m_pFormNotify != NULL) {
-                    m_pForm->m_pFormNotify->AfterSelectionChange(this);
-                }
-                m_pForm->m_bUpdated = TRUE;
-                break;
-            }
-        default:
-            break;
-    }
-    if (CPDF_InterForm::m_bUpdateAP) {
-        UpdateAP(NULL);
-    }
-    return TRUE;
-}
-FX_BOOL CPDF_FormField::SetValue(const CFX_WideString& value, FX_BOOL bNotify)
-{
-    return SetValue(value, FALSE, bNotify);
-}
-int CPDF_FormField::GetMaxLen()
-{
-    CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "MaxLen");
-    if (pObj == NULL) {
-        int iCount = m_ControlList.GetSize();
-        for (int i = 0; i < iCount; i ++) {
-            CPDF_FormControl* pControl = (CPDF_FormControl*)m_ControlList.GetAt(i);
-            if (pControl == NULL) {
-                continue;
-            }
-            CPDF_Dictionary* pWidgetDict = pControl->m_pWidgetDict;
-            if (pWidgetDict->KeyExist("MaxLen")) {
-                return pWidgetDict->GetInteger("MaxLen");
-            }
+FX_BOOL CPDF_FormField::SetValue(const CFX_WideString& value,
+                                 FX_BOOL bDefault,
+                                 FX_BOOL bNotify) {
+  switch (m_Type) {
+    case CheckBox:
+    case RadioButton: {
+      SetCheckValue(value, bDefault, bNotify);
+      return TRUE;
+    }
+    case File:
+    case RichText:
+    case Text:
+    case ComboBox: {
+      CFX_WideString csValue = value;
+      if (bNotify && m_pForm->m_pFormNotify != NULL) {
+        int iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
+        if (iRet < 0) {
+          return FALSE;
         }
-        return 0;
-    }
-    return pObj->GetInteger();
-}
-int CPDF_FormField::CountSelectedItems()
-{
-    CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
-    if (pValue == NULL) {
-        pValue = FPDF_GetFieldAttr(m_pDict, "I");
-        if (pValue == NULL) {
-            return 0;
+      }
+      int iIndex = FindOptionValue(csValue);
+      if (iIndex < 0) {
+        CFX_ByteString bsEncodeText = PDF_EncodeText(csValue);
+        m_pDict->SetAtString(bDefault ? "DV" : "V", bsEncodeText);
+        if (m_Type == RichText && !bDefault) {
+          m_pDict->SetAtString("RV", bsEncodeText);
         }
-    }
-    if (pValue->GetType() == PDFOBJ_STRING) {
-        if (pValue->GetString().IsEmpty()) {
-            return 0;
+        m_pDict->RemoveAt("I");
+      } else {
+        m_pDict->SetAtString(bDefault ? "DV" : "V", PDF_EncodeText(csValue));
+        if (bDefault) {
+        } else {
+          ClearSelection();
+          SetItemSelection(iIndex, TRUE);
         }
-        return 1;
-    }
-    if (pValue->GetType() == PDFOBJ_NUMBER) {
-        if (pValue->GetString().IsEmpty()) {
-            return 0;
+      }
+      if (bNotify && m_pForm->m_pFormNotify != NULL) {
+        m_pForm->m_pFormNotify->AfterValueChange(this);
+      }
+      m_pForm->m_bUpdated = TRUE;
+    } break;
+    case ListBox: {
+      int iIndex = FindOptionValue(value);
+      if (iIndex < 0) {
+        return FALSE;
+      }
+      if (bDefault && iIndex == GetDefaultSelectedItem()) {
+        return FALSE;
+      }
+      if (bNotify && m_pForm->m_pFormNotify != NULL) {
+        CFX_WideString csValue = value;
+        int iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
+        if (iRet < 0) {
+          return FALSE;
         }
-        return 1;
-    }
-    if (pValue->GetType() != PDFOBJ_ARRAY) {
-        return 0;
-    }
-    return ((CPDF_Array*)pValue)->GetCount();
+      }
+      if (bDefault) {
+      } else {
+        ClearSelection();
+        SetItemSelection(iIndex, TRUE);
+      }
+      if (bNotify && m_pForm->m_pFormNotify != NULL) {
+        m_pForm->m_pFormNotify->AfterSelectionChange(this);
+      }
+      m_pForm->m_bUpdated = TRUE;
+      break;
+    }
+    default:
+      break;
+  }
+  if (CPDF_InterForm::m_bUpdateAP) {
+    UpdateAP(NULL);
+  }
+  return TRUE;
 }
-int CPDF_FormField::GetSelectedIndex(int index)
-{
-    CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
+FX_BOOL CPDF_FormField::SetValue(const CFX_WideString& value, FX_BOOL bNotify) {
+  return SetValue(value, FALSE, bNotify);
+}
+int CPDF_FormField::GetMaxLen() {
+  CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "MaxLen");
+  if (pObj == NULL) {
+    int iCount = m_ControlList.GetSize();
+    for (int i = 0; i < iCount; i++) {
+      CPDF_FormControl* pControl = (CPDF_FormControl*)m_ControlList.GetAt(i);
+      if (pControl == NULL) {
+        continue;
+      }
+      CPDF_Dictionary* pWidgetDict = pControl->m_pWidgetDict;
+      if (pWidgetDict->KeyExist("MaxLen")) {
+        return pWidgetDict->GetInteger("MaxLen");
+      }
+    }
+    return 0;
+  }
+  return pObj->GetInteger();
+}
+int CPDF_FormField::CountSelectedItems() {
+  CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
+  if (pValue == NULL) {
+    pValue = FPDF_GetFieldAttr(m_pDict, "I");
     if (pValue == NULL) {
-        pValue = FPDF_GetFieldAttr(m_pDict, "I");
-        if (pValue == NULL) {
-            return -1;
-        }
-    }
-    if (pValue->GetType() == PDFOBJ_NUMBER) {
-        return pValue->GetInteger();
-    }
-    CFX_WideString sel_value;
-    if (pValue->GetType() == PDFOBJ_STRING) {
-        if (index != 0) {
-            return -1;
-        }
-        sel_value = pValue->GetUnicodeText();
-    } else {
-        if (pValue->GetType() != PDFOBJ_ARRAY) {
-            return -1;
-        }
-        if (index < 0) {
-            return -1;
-        }
-        CPDF_Object* elementValue = ((CPDF_Array*)pValue)->GetElementValue(index);
-        sel_value = elementValue ? elementValue->GetUnicodeText() : CFX_WideString();
-    }
-    if (index < CountSelectedOptions()) {
-        int iOptIndex = GetSelectedOptionIndex(index);
-        CFX_WideString csOpt = GetOptionValue(iOptIndex);
-        if (csOpt == sel_value) {
-            return iOptIndex;
-        }
-    }
-    int nOpts = CountOptions();
-    for (int i = 0; i < nOpts; i ++) {
-        if (sel_value == GetOptionValue(i)) {
-            return i;
-        }
-    }
-    return -1;
+      return 0;
+    }
+  }
+  if (pValue->GetType() == PDFOBJ_STRING) {
+    if (pValue->GetString().IsEmpty()) {
+      return 0;
+    }
+    return 1;
+  }
+  if (pValue->GetType() == PDFOBJ_NUMBER) {
+    if (pValue->GetString().IsEmpty()) {
+      return 0;
+    }
+    return 1;
+  }
+  if (pValue->GetType() != PDFOBJ_ARRAY) {
+    return 0;
+  }
+  return ((CPDF_Array*)pValue)->GetCount();
 }
-FX_BOOL CPDF_FormField::ClearSelection(FX_BOOL bNotify)
-{
-    if (bNotify && m_pForm->m_pFormNotify != NULL) {
-        int iRet = 0;
-        CFX_WideString csValue;
-        int iIndex = GetSelectedIndex(0);
-        if (iIndex >= 0) {
-            csValue = GetOptionLabel(iIndex);
-        }
-        if (GetType() == ListBox) {
-            iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
-        }
-        if (GetType() == ComboBox) {
-            iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
-        }
-        if (iRet < 0) {
-            return FALSE;
-        }
-    }
-    m_pDict->RemoveAt("V");
-    m_pDict->RemoveAt("I");
-    if (bNotify && m_pForm->m_pFormNotify != NULL) {
-        if (GetType() == ListBox) {
-            m_pForm->m_pFormNotify->AfterSelectionChange(this);
-        }
-        if (GetType() == ComboBox) {
-            m_pForm->m_pFormNotify->AfterValueChange(this);
-        }
-    }
-    if (CPDF_InterForm::m_bUpdateAP) {
-        UpdateAP(NULL);
-    }
-    m_pForm->m_bUpdated = TRUE;
-    return TRUE;
+int CPDF_FormField::GetSelectedIndex(int index) {
+  CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
+  if (pValue == NULL) {
+    pValue = FPDF_GetFieldAttr(m_pDict, "I");
+    if (pValue == NULL) {
+      return -1;
+    }
+  }
+  if (pValue->GetType() == PDFOBJ_NUMBER) {
+    return pValue->GetInteger();
+  }
+  CFX_WideString sel_value;
+  if (pValue->GetType() == PDFOBJ_STRING) {
+    if (index != 0) {
+      return -1;
+    }
+    sel_value = pValue->GetUnicodeText();
+  } else {
+    if (pValue->GetType() != PDFOBJ_ARRAY) {
+      return -1;
+    }
+    if (index < 0) {
+      return -1;
+    }
+    CPDF_Object* elementValue = ((CPDF_Array*)pValue)->GetElementValue(index);
+    sel_value =
+        elementValue ? elementValue->GetUnicodeText() : CFX_WideString();
+  }
+  if (index < CountSelectedOptions()) {
+    int iOptIndex = GetSelectedOptionIndex(index);
+    CFX_WideString csOpt = GetOptionValue(iOptIndex);
+    if (csOpt == sel_value) {
+      return iOptIndex;
+    }
+  }
+  int nOpts = CountOptions();
+  for (int i = 0; i < nOpts; i++) {
+    if (sel_value == GetOptionValue(i)) {
+      return i;
+    }
+  }
+  return -1;
 }
-FX_BOOL CPDF_FormField::IsItemSelected(int index)
-{
-    ASSERT(GetType() == ComboBox || GetType() == ListBox);
-    if (index < 0 || index >= CountOptions()) {
-        return FALSE;
-    }
-    if (IsOptionSelected(index)) {
-        return TRUE;
-    }
-    CFX_WideString opt_value = GetOptionValue(index);
-    CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
+FX_BOOL CPDF_FormField::ClearSelection(FX_BOOL bNotify) {
+  if (bNotify && m_pForm->m_pFormNotify != NULL) {
+    int iRet = 0;
+    CFX_WideString csValue;
+    int iIndex = GetSelectedIndex(0);
+    if (iIndex >= 0) {
+      csValue = GetOptionLabel(iIndex);
+    }
+    if (GetType() == ListBox) {
+      iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
+    }
+    if (GetType() == ComboBox) {
+      iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
+    }
+    if (iRet < 0) {
+      return FALSE;
+    }
+  }
+  m_pDict->RemoveAt("V");
+  m_pDict->RemoveAt("I");
+  if (bNotify && m_pForm->m_pFormNotify != NULL) {
+    if (GetType() == ListBox) {
+      m_pForm->m_pFormNotify->AfterSelectionChange(this);
+    }
+    if (GetType() == ComboBox) {
+      m_pForm->m_pFormNotify->AfterValueChange(this);
+    }
+  }
+  if (CPDF_InterForm::m_bUpdateAP) {
+    UpdateAP(NULL);
+  }
+  m_pForm->m_bUpdated = TRUE;
+  return TRUE;
+}
+FX_BOOL CPDF_FormField::IsItemSelected(int index) {
+  ASSERT(GetType() == ComboBox || GetType() == ListBox);
+  if (index < 0 || index >= CountOptions()) {
+    return FALSE;
+  }
+  if (IsOptionSelected(index)) {
+    return TRUE;
+  }
+  CFX_WideString opt_value = GetOptionValue(index);
+  CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
+  if (pValue == NULL) {
+    pValue = FPDF_GetFieldAttr(m_pDict, "I");
     if (pValue == NULL) {
-        pValue = FPDF_GetFieldAttr(m_pDict, "I");
-        if (pValue == NULL) {
-            return FALSE;
-        }
-    }
-    if (pValue->GetType() == PDFOBJ_STRING) {
-        if (pValue->GetUnicodeText() == opt_value) {
-            return TRUE;
-        }
-        return FALSE;
+      return FALSE;
     }
-    if (pValue->GetType() == PDFOBJ_NUMBER) {
-        if (pValue->GetString().IsEmpty()) {
-            return FALSE;
-        }
-        if (pValue->GetInteger() == index) {
-            return TRUE;
-        }
-        return FALSE;
+  }
+  if (pValue->GetType() == PDFOBJ_STRING) {
+    if (pValue->GetUnicodeText() == opt_value) {
+      return TRUE;
     }
-    if (pValue->GetType() != PDFOBJ_ARRAY) {
-        return FALSE;
+    return FALSE;
+  }
+  if (pValue->GetType() == PDFOBJ_NUMBER) {
+    if (pValue->GetString().IsEmpty()) {
+      return FALSE;
     }
-    CPDF_Array* pArray = (CPDF_Array*)pValue;
-    int iPos = -1;
-    for (int j = 0; j < CountSelectedOptions(); j ++) {
-        if (GetSelectedOptionIndex(j) == index) {
-            iPos = j;
-            break;
-        }
+    if (pValue->GetInteger() == index) {
+      return TRUE;
     }
-    for (FX_DWORD i = 0; i < pArray->GetCount(); i ++)
-        if (pArray->GetElementValue(i)->GetUnicodeText() == opt_value && (int)i == iPos) {
-            return TRUE;
-        }
     return FALSE;
+  }
+  if (pValue->GetType() != PDFOBJ_ARRAY) {
+    return FALSE;
+  }
+  CPDF_Array* pArray = (CPDF_Array*)pValue;
+  int iPos = -1;
+  for (int j = 0; j < CountSelectedOptions(); j++) {
+    if (GetSelectedOptionIndex(j) == index) {
+      iPos = j;
+      break;
+    }
+  }
+  for (FX_DWORD i = 0; i < pArray->GetCount(); i++)
+    if (pArray->GetElementValue(i)->GetUnicodeText() == opt_value &&
+        (int)i == iPos) {
+      return TRUE;
+    }
+  return FALSE;
 }
-FX_BOOL CPDF_FormField::SetItemSelection(int index, FX_BOOL bSelected, FX_BOOL bNotify)
-{
-    ASSERT(GetType() == ComboBox || GetType() == ListBox);
-    if (index < 0 || index >= CountOptions()) {
-        return FALSE;
+FX_BOOL CPDF_FormField::SetItemSelection(int index,
+                                         FX_BOOL bSelected,
+                                         FX_BOOL bNotify) {
+  ASSERT(GetType() == ComboBox || GetType() == ListBox);
+  if (index < 0 || index >= CountOptions()) {
+    return FALSE;
+  }
+  CFX_WideString opt_value = GetOptionValue(index);
+  if (bNotify && m_pForm->m_pFormNotify != NULL) {
+    int iRet = 0;
+    if (GetType() == ListBox) {
+      iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, opt_value);
     }
-    CFX_WideString opt_value = GetOptionValue(index);
-    if (bNotify && m_pForm->m_pFormNotify != NULL) {
-        int iRet = 0;
-        if (GetType() == ListBox) {
-            iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, opt_value);
-        }
-        if (GetType() == ComboBox) {
-            iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, opt_value);
-        }
-        if (iRet < 0) {
-            return FALSE;
-        }
+    if (GetType() == ComboBox) {
+      iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, opt_value);
     }
-    if (!bSelected) {
-        CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
-        if (pValue != NULL) {
-            if (m_Type == ListBox) {
-                SelectOption(index, FALSE);
-                if (pValue->GetType() == PDFOBJ_STRING) {
-                    if (pValue->GetUnicodeText() == opt_value) {
-                        m_pDict->RemoveAt("V");
-                    }
-                } else if (pValue->GetType() == PDFOBJ_ARRAY) {
-                    CPDF_Array* pArray = CPDF_Array::Create();
-                    if (pArray == NULL) {
-                        return FALSE;
-                    }
-                    int iCount = CountOptions();
-                    for (int i = 0; i < iCount; i ++) {
-                        if (i != index) {
-                            if (IsItemSelected(i)) {
-                                opt_value = GetOptionValue(i);
-                                pArray->AddString(PDF_EncodeText(opt_value));
-                            }
-                        }
-                    }
-                    if (pArray->GetCount() < 1) {
-                        pArray->Release();
-                    } else {
-                        m_pDict->SetAt("V", pArray);
-                    }
-                }
-            } else if (m_Type == ComboBox) {
-                m_pDict->RemoveAt("V");
-                m_pDict->RemoveAt("I");
-            }
-        }
-    } else {
-        if (m_Type == ListBox) {
-            SelectOption(index, TRUE);
-            if (!(m_Flags & FORMLIST_MULTISELECT)) {
-                m_pDict->SetAtString("V", PDF_EncodeText(opt_value));
-            } else {
-                CPDF_Array* pArray = CPDF_Array::Create();
-                if (pArray == NULL) {
-                    return FALSE;
-                }
-                FX_BOOL bSelected;
-                int iCount = CountOptions();
-                for (int i = 0; i < iCount; i ++) {
-                    if (i != index) {
-                        bSelected = IsItemSelected(i);
-                    } else {
-                        bSelected = TRUE;
-                    }
-                    if (bSelected) {
-                        opt_value = GetOptionValue(i);
-                        pArray->AddString(PDF_EncodeText(opt_value));
-                    }
-                }
-                m_pDict->SetAt("V", pArray);
-            }
-        } else if (m_Type == ComboBox) {
-            m_pDict->SetAtString("V", PDF_EncodeText(opt_value));
-            CPDF_Array* pI = CPDF_Array::Create();
-            if (pI == NULL) {
-                return FALSE;
+    if (iRet < 0) {
+      return FALSE;
+    }
+  }
+  if (!bSelected) {
+    CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
+    if (pValue != NULL) {
+      if (m_Type == ListBox) {
+        SelectOption(index, FALSE);
+        if (pValue->GetType() == PDFOBJ_STRING) {
+          if (pValue->GetUnicodeText() == opt_value) {
+            m_pDict->RemoveAt("V");
+          }
+        } else if (pValue->GetType() == PDFOBJ_ARRAY) {
+          CPDF_Array* pArray = CPDF_Array::Create();
+          if (pArray == NULL) {
+            return FALSE;
+          }
+          int iCount = CountOptions();
+          for (int i = 0; i < iCount; i++) {
+            if (i != index) {
+              if (IsItemSelected(i)) {
+                opt_value = GetOptionValue(i);
+                pArray->AddString(PDF_EncodeText(opt_value));
+              }
             }
-            pI->AddInteger(index);
-            m_pDict->SetAt("I", pI);
+          }
+          if (pArray->GetCount() < 1) {
+            pArray->Release();
+          } else {
+            m_pDict->SetAt("V", pArray);
+          }
         }
-    }
-    if (bNotify && m_pForm->m_pFormNotify != NULL) {
-        if (GetType() == ListBox) {
-            m_pForm->m_pFormNotify->AfterSelectionChange(this);
+      } else if (m_Type == ComboBox) {
+        m_pDict->RemoveAt("V");
+        m_pDict->RemoveAt("I");
+      }
+    }
+  } else {
+    if (m_Type == ListBox) {
+      SelectOption(index, TRUE);
+      if (!(m_Flags & FORMLIST_MULTISELECT)) {
+        m_pDict->SetAtString("V", PDF_EncodeText(opt_value));
+      } else {
+        CPDF_Array* pArray = CPDF_Array::Create();
+        if (pArray == NULL) {
+          return FALSE;
         }
-        if (GetType() == ComboBox) {
-            m_pForm->m_pFormNotify->AfterValueChange(this);
+        FX_BOOL bSelected;
+        int iCount = CountOptions();
+        for (int i = 0; i < iCount; i++) {
+          if (i != index) {
+            bSelected = IsItemSelected(i);
+          } else {
+            bSelected = TRUE;
+          }
+          if (bSelected) {
+            opt_value = GetOptionValue(i);
+            pArray->AddString(PDF_EncodeText(opt_value));
+          }
         }
-    }
-    if (CPDF_InterForm::m_bUpdateAP) {
-        UpdateAP(NULL);
-    }
-    m_pForm->m_bUpdated = TRUE;
-    return TRUE;
-}
-FX_BOOL CPDF_FormField::IsItemDefaultSelected(int index)
-{
-    ASSERT(GetType() == ComboBox || GetType() == ListBox);
-    if (index < 0 || index >= CountOptions()) {
+        m_pDict->SetAt("V", pArray);
+      }
+    } else if (m_Type == ComboBox) {
+      m_pDict->SetAtString("V", PDF_EncodeText(opt_value));
+      CPDF_Array* pI = CPDF_Array::Create();
+      if (pI == NULL) {
         return FALSE;
-    }
-    int iDVIndex = GetDefaultSelectedItem();
-    if (iDVIndex < 0) {
-        return FALSE;
-    }
-    return (iDVIndex == index);
+      }
+      pI->AddInteger(index);
+      m_pDict->SetAt("I", pI);
+    }
+  }
+  if (bNotify && m_pForm->m_pFormNotify != NULL) {
+    if (GetType() == ListBox) {
+      m_pForm->m_pFormNotify->AfterSelectionChange(this);
+    }
+    if (GetType() == ComboBox) {
+      m_pForm->m_pFormNotify->AfterValueChange(this);
+    }
+  }
+  if (CPDF_InterForm::m_bUpdateAP) {
+    UpdateAP(NULL);
+  }
+  m_pForm->m_bUpdated = TRUE;
+  return TRUE;
 }
-int CPDF_FormField::GetDefaultSelectedItem()
-{
-    ASSERT(GetType() == ComboBox || GetType() == ListBox);
-    CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "DV");
-    if (pValue == NULL) {
-        return -1;
-    }
-    CFX_WideString csDV = pValue->GetUnicodeText();
-    if (csDV.IsEmpty()) {
-        return -1;
-    }
-    int iCount = CountOptions();
-    for (int i = 0; i < iCount; i ++) {
-        if (csDV == GetOptionValue(i)) {
-            return i;
-        }
-    }
+FX_BOOL CPDF_FormField::IsItemDefaultSelected(int index) {
+  ASSERT(GetType() == ComboBox || GetType() == ListBox);
+  if (index < 0 || index >= CountOptions()) {
+    return FALSE;
+  }
+  int iDVIndex = GetDefaultSelectedItem();
+  if (iDVIndex < 0) {
+    return FALSE;
+  }
+  return (iDVIndex == index);
+}
+int CPDF_FormField::GetDefaultSelectedItem() {
+  ASSERT(GetType() == ComboBox || GetType() == ListBox);
+  CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "DV");
+  if (pValue == NULL) {
+    return -1;
+  }
+  CFX_WideString csDV = pValue->GetUnicodeText();
+  if (csDV.IsEmpty()) {
     return -1;
+  }
+  int iCount = CountOptions();
+  for (int i = 0; i < iCount; i++) {
+    if (csDV == GetOptionValue(i)) {
+      return i;
+    }
+  }
+  return -1;
 }
-void CPDF_FormField::UpdateAP(CPDF_FormControl* pControl)
-{
-    if (m_Type == PushButton) {
-        return;
-    }
-    if (m_Type == RadioButton || m_Type == CheckBox) {
-        return;
-    }
-    if (!m_pForm->m_bGenerateAP) {
-        return;
-    }
-    for (int i = 0; i < CountControls(); i ++) {
-        CPDF_FormControl* pControl = GetControl(i);
-        FPDF_GenerateAP(m_pForm->m_pDocument, pControl->m_pWidgetDict);
-    }
+void CPDF_FormField::UpdateAP(CPDF_FormControl* pControl) {
+  if (m_Type == PushButton) {
+    return;
+  }
+  if (m_Type == RadioButton || m_Type == CheckBox) {
+    return;
+  }
+  if (!m_pForm->m_bGenerateAP) {
+    return;
+  }
+  for (int i = 0; i < CountControls(); i++) {
+    CPDF_FormControl* pControl = GetControl(i);
+    FPDF_GenerateAP(m_pForm->m_pDocument, pControl->m_pWidgetDict);
+  }
 }
-int CPDF_FormField::CountOptions()
-{
-    CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "Opt");
-    if (pValue == NULL || pValue->GetType() != PDFOBJ_ARRAY) {
-        return 0;
-    }
-    return ((CPDF_Array*)pValue)->GetCount();
+int CPDF_FormField::CountOptions() {
+  CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "Opt");
+  if (pValue == NULL || pValue->GetType() != PDFOBJ_ARRAY) {
+    return 0;
+  }
+  return ((CPDF_Array*)pValue)->GetCount();
 }
-CFX_WideString CPDF_FormField::GetOptionText(int index, int sub_index)
-{
-    CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "Opt");
-    if (pValue == NULL || pValue->GetType() != PDFOBJ_ARRAY) {
-        return CFX_WideString();
-    }
-    CPDF_Object* pOption = ((CPDF_Array*)pValue)->GetElementValue(index);
-    if (pOption == NULL) {
-        return CFX_WideString();
-    }
-    if (pOption->GetType() == PDFOBJ_ARRAY) {
-        pOption = ((CPDF_Array*)pOption)->GetElementValue(sub_index);
-    }
-    if (pOption == NULL || pOption->GetType() != PDFOBJ_STRING) {
-        return CFX_WideString();
-    }
-    return ((CPDF_String*)pOption)->GetUnicodeText();
-}
-CFX_WideString CPDF_FormField::GetOptionLabel(int index)
-{
-    return GetOptionText(index, 1);
+CFX_WideString CPDF_FormField::GetOptionText(int index, int sub_index) {
+  CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "Opt");
+  if (pValue == NULL || pValue->GetType() != PDFOBJ_ARRAY) {
+    return CFX_WideString();
+  }
+  CPDF_Object* pOption = ((CPDF_Array*)pValue)->GetElementValue(index);
+  if (pOption == NULL) {
+    return CFX_WideString();
+  }
+  if (pOption->GetType() == PDFOBJ_ARRAY) {
+    pOption = ((CPDF_Array*)pOption)->GetElementValue(sub_index);
+  }
+  if (pOption == NULL || pOption->GetType() != PDFOBJ_STRING) {
+    return CFX_WideString();
+  }
+  return ((CPDF_String*)pOption)->GetUnicodeText();
 }
-CFX_WideString CPDF_FormField::GetOptionValue(int index)
-{
-    return GetOptionText(index, 0);
+CFX_WideString CPDF_FormField::GetOptionLabel(int index) {
+  return GetOptionText(index, 1);
 }
-int CPDF_FormField::FindOption(CFX_WideString csOptLabel)
-{
-    int iCount = CountOptions();
-    for (int i = 0; i < iCount; i ++) {
-        CFX_WideString csValue = GetOptionValue(i);
-        if (csValue == csOptLabel) {
-            return i;
-        }
-    }
-    return -1;
+CFX_WideString CPDF_FormField::GetOptionValue(int index) {
+  return GetOptionText(index, 0);
 }
-int CPDF_FormField::FindOptionValue(const CFX_WideString& csOptValue, int iStartIndex)
-{
-    if (iStartIndex < 0) {
-        iStartIndex = 0;
-    }
-    int iCount = CountOptions();
-    for (; iStartIndex < iCount; iStartIndex ++) {
-        CFX_WideString csValue = GetOptionValue(iStartIndex);
-        if (csValue == csOptValue) {
-            return iStartIndex;
-        }
-    }
-    return -1;
+int CPDF_FormField::FindOption(CFX_WideString csOptLabel) {
+  int iCount = CountOptions();
+  for (int i = 0; i < iCount; i++) {
+    CFX_WideString csValue = GetOptionValue(i);
+    if (csValue == csOptLabel) {
+      return i;
+    }
+  }
+  return -1;
 }
-FX_BOOL CPDF_FormField::CheckControl(int iControlIndex, FX_BOOL bChecked, FX_BOOL bNotify)
-{
-    ASSERT(GetType() == CheckBox || GetType() == RadioButton);
-    CPDF_FormControl* pControl = GetControl(iControlIndex);
-    if (pControl == NULL) {
-        return FALSE;
-    }
-    if (!bChecked && pControl->IsChecked() == bChecked) {
-        return FALSE;
-    }
-    CFX_ByteArray statusArray;
-    if (bNotify && m_pForm->m_pFormNotify != NULL) {
-        SaveCheckedFieldStatus(this, statusArray);
-    }
-    CFX_WideString csWExport = pControl->GetExportValue();
-    CFX_ByteString csBExport = PDF_EncodeText(csWExport);
-    int iCount = CountControls();
-    FX_BOOL bUnison = PDF_FormField_IsUnison(this);
-    for (int i = 0; i < iCount; i ++) {
-        CPDF_FormControl* pCtrl = GetControl(i);
-        if (bUnison) {
-            CFX_WideString csEValue = pCtrl->GetExportValue();
-            if (csEValue == csWExport) {
-                if (pCtrl->GetOnStateName() == pControl->GetOnStateName()) {
-                    pCtrl->CheckControl(bChecked);
-                } else if (bChecked) {
-                    pCtrl->CheckControl(FALSE);
-                }
-            } else if (bChecked) {
-                pCtrl->CheckControl(FALSE);
-            }
-        } else {
-            if (i == iControlIndex) {
-                pCtrl->CheckControl(bChecked);
-            } else if (bChecked) {
-                pCtrl->CheckControl(FALSE);
-            }
-        }
-    }
-    CPDF_Object* pOpt = FPDF_GetFieldAttr(m_pDict, "Opt");
-    if (pOpt == NULL || pOpt->GetType() != PDFOBJ_ARRAY) {
-        if (bChecked) {
-            m_pDict->SetAtName("V", csBExport);
-        } else {
-            CFX_ByteString csV;
-            CPDF_Object* pV = FPDF_GetFieldAttr(m_pDict, "V");
-            if (pV != NULL) {
-                csV = pV->GetString();
-            }
-            if (csV == csBExport) {
-                m_pDict->SetAtName("V", "Off");
-            }
-        }
-    } else if (bChecked) {
-        CFX_ByteString csIndex;
-        csIndex.Format("%d", iControlIndex);
-        m_pDict->SetAtName("V", csIndex);
-    }
-    if (bNotify && m_pForm->m_pFormNotify != NULL) {
-        m_pForm->m_pFormNotify->AfterCheckedStatusChange(this, statusArray);
-    }
-    m_pForm->m_bUpdated = TRUE;
-    return TRUE;
+int CPDF_FormField::FindOptionValue(const CFX_WideString& csOptValue,
+                                    int iStartIndex) {
+  if (iStartIndex < 0) {
+    iStartIndex = 0;
+  }
+  int iCount = CountOptions();
+  for (; iStartIndex < iCount; iStartIndex++) {
+    CFX_WideString csValue = GetOptionValue(iStartIndex);
+    if (csValue == csOptValue) {
+      return iStartIndex;
+    }
+  }
+  return -1;
 }
-CFX_WideString CPDF_FormField::GetCheckValue(FX_BOOL bDefault)
-{
-    ASSERT(GetType() == CheckBox || GetType() == RadioButton);
-    CFX_WideString csExport = L"Off";
-    FX_BOOL bChecked;
-    int iCount = CountControls();
-    for (int i = 0; i < iCount; i ++) {
-        CPDF_FormControl* pControl = GetControl(i);
-        if (bDefault) {
-            bChecked = pControl->IsDefaultChecked();
-        } else {
-            bChecked = pControl->IsChecked();
-        }
-        if (bChecked) {
-            csExport = pControl->GetExportValue();
-            break;
+FX_BOOL CPDF_FormField::CheckControl(int iControlIndex,
+                                     FX_BOOL bChecked,
+                                     FX_BOOL bNotify) {
+  ASSERT(GetType() == CheckBox || GetType() == RadioButton);
+  CPDF_FormControl* pControl = GetControl(iControlIndex);
+  if (pControl == NULL) {
+    return FALSE;
+  }
+  if (!bChecked && pControl->IsChecked() == bChecked) {
+    return FALSE;
+  }
+  CFX_ByteArray statusArray;
+  if (bNotify && m_pForm->m_pFormNotify != NULL) {
+    SaveCheckedFieldStatus(this, statusArray);
+  }
+  CFX_WideString csWExport = pControl->GetExportValue();
+  CFX_ByteString csBExport = PDF_EncodeText(csWExport);
+  int iCount = CountControls();
+  FX_BOOL bUnison = PDF_FormField_IsUnison(this);
+  for (int i = 0; i < iCount; i++) {
+    CPDF_FormControl* pCtrl = GetControl(i);
+    if (bUnison) {
+      CFX_WideString csEValue = pCtrl->GetExportValue();
+      if (csEValue == csWExport) {
+        if (pCtrl->GetOnStateName() == pControl->GetOnStateName()) {
+          pCtrl->CheckControl(bChecked);
+        } else if (bChecked) {
+          pCtrl->CheckControl(FALSE);
         }
-    }
-    return csExport;
+      } else if (bChecked) {
+        pCtrl->CheckControl(FALSE);
+      }
+    } else {
+      if (i == iControlIndex) {
+        pCtrl->CheckControl(bChecked);
+      } else if (bChecked) {
+        pCtrl->CheckControl(FALSE);
+      }
+    }
+  }
+  CPDF_Object* pOpt = FPDF_GetFieldAttr(m_pDict, "Opt");
+  if (pOpt == NULL || pOpt->GetType() != PDFOBJ_ARRAY) {
+    if (bChecked) {
+      m_pDict->SetAtName("V", csBExport);
+    } else {
+      CFX_ByteString csV;
+      CPDF_Object* pV = FPDF_GetFieldAttr(m_pDict, "V");
+      if (pV != NULL) {
+        csV = pV->GetString();
+      }
+      if (csV == csBExport) {
+        m_pDict->SetAtName("V", "Off");
+      }
+    }
+  } else if (bChecked) {
+    CFX_ByteString csIndex;
+    csIndex.Format("%d", iControlIndex);
+    m_pDict->SetAtName("V", csIndex);
+  }
+  if (bNotify && m_pForm->m_pFormNotify != NULL) {
+    m_pForm->m_pFormNotify->AfterCheckedStatusChange(this, statusArray);
+  }
+  m_pForm->m_bUpdated = TRUE;
+  return TRUE;
 }
-FX_BOOL CPDF_FormField::SetCheckValue(const CFX_WideString& value, FX_BOOL bDefault, FX_BOOL bNotify)
-{
-    ASSERT(GetType() == CheckBox || GetType() == RadioButton);
-    CFX_ByteArray statusArray;
-    if (bNotify && m_pForm->m_pFormNotify != NULL) {
-        SaveCheckedFieldStatus(this, statusArray);
-    }
-    int iCount = CountControls();
-    for (int i = 0; i < iCount; i ++) {
-        CPDF_FormControl* pControl = GetControl(i);
-        CFX_WideString csExport = pControl->GetExportValue();
-        if (csExport == value) {
-            if (bDefault) {
-            } else {
-                CheckControl(GetControlIndex(pControl), TRUE);
-            }
-            break;
-        } else {
-            if (bDefault) {
-            } else {
-                CheckControl(GetControlIndex(pControl), FALSE);
-            }
-        }
+CFX_WideString CPDF_FormField::GetCheckValue(FX_BOOL bDefault) {
+  ASSERT(GetType() == CheckBox || GetType() == RadioButton);
+  CFX_WideString csExport = L"Off";
+  FX_BOOL bChecked;
+  int iCount = CountControls();
+  for (int i = 0; i < iCount; i++) {
+    CPDF_FormControl* pControl = GetControl(i);
+    if (bDefault) {
+      bChecked = pControl->IsDefaultChecked();
+    } else {
+      bChecked = pControl->IsChecked();
     }
-    if (bNotify && m_pForm->m_pFormNotify != NULL) {
-        m_pForm->m_pFormNotify->AfterCheckedStatusChange(this, statusArray);
+    if (bChecked) {
+      csExport = pControl->GetExportValue();
+      break;
     }
-    m_pForm->m_bUpdated = TRUE;
-    return TRUE;
+  }
+  return csExport;
 }
-int CPDF_FormField::GetTopVisibleIndex()
-{
-    CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "TI");
-    if (pObj == NULL) {
-        return 0;
-    }
-    return pObj->GetInteger();
+FX_BOOL CPDF_FormField::SetCheckValue(const CFX_WideString& value,
+                                      FX_BOOL bDefault,
+                                      FX_BOOL bNotify) {
+  ASSERT(GetType() == CheckBox || GetType() == RadioButton);
+  CFX_ByteArray statusArray;
+  if (bNotify && m_pForm->m_pFormNotify != NULL) {
+    SaveCheckedFieldStatus(this, statusArray);
+  }
+  int iCount = CountControls();
+  for (int i = 0; i < iCount; i++) {
+    CPDF_FormControl* pControl = GetControl(i);
+    CFX_WideString csExport = pControl->GetExportValue();
+    if (csExport == value) {
+      if (bDefault) {
+      } else {
+        CheckControl(GetControlIndex(pControl), TRUE);
+      }
+      break;
+    } else {
+      if (bDefault) {
+      } else {
+        CheckControl(GetControlIndex(pControl), FALSE);
+      }
+    }
+  }
+  if (bNotify && m_pForm->m_pFormNotify != NULL) {
+    m_pForm->m_pFormNotify->AfterCheckedStatusChange(this, statusArray);
+  }
+  m_pForm->m_bUpdated = TRUE;
+  return TRUE;
 }
-int CPDF_FormField::CountSelectedOptions()
-{
-    CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "I");
-    if (pObj == NULL) {
-        return 0;
-    }
-    CPDF_Array* pArray = pObj->GetArray();
-    if (pArray == NULL) {
-        return 0;
-    }
-    return (int)pArray->GetCount();
+int CPDF_FormField::GetTopVisibleIndex() {
+  CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "TI");
+  if (pObj == NULL) {
+    return 0;
+  }
+  return pObj->GetInteger();
 }
-int CPDF_FormField::GetSelectedOptionIndex(int index)
-{
-    CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "I");
-    if (pObj == NULL) {
-        return -1;
-    }
-    CPDF_Array* pArray = pObj->GetArray();
-    if (pArray == NULL) {
-        return -1;
-    }
-    int iCount = (int)pArray->GetCount();
-    if (iCount > 0 && index < iCount) {
-        return pArray->GetInteger(index);
-    }
+int CPDF_FormField::CountSelectedOptions() {
+  CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "I");
+  if (pObj == NULL) {
+    return 0;
+  }
+  CPDF_Array* pArray = pObj->GetArray();
+  if (pArray == NULL) {
+    return 0;
+  }
+  return (int)pArray->GetCount();
+}
+int CPDF_FormField::GetSelectedOptionIndex(int index) {
+  CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "I");
+  if (pObj == NULL) {
+    return -1;
+  }
+  CPDF_Array* pArray = pObj->GetArray();
+  if (pArray == NULL) {
     return -1;
+  }
+  int iCount = (int)pArray->GetCount();
+  if (iCount > 0 && index < iCount) {
+    return pArray->GetInteger(index);
+  }
+  return -1;
 }
-FX_BOOL CPDF_FormField::IsOptionSelected(int iOptIndex)
-{
-    CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "I");
-    if (pObj == NULL) {
-        return FALSE;
-    }
-    CPDF_Array* pArray = pObj->GetArray();
-    if (pArray == NULL) {
-        return FALSE;
-    }
-    int iCount = (int)pArray->GetCount();
-    for (int i = 0; i < iCount; i ++) {
-        if (pArray->GetInteger(i) == iOptIndex) {
-            return TRUE;
-        }
-    }
+FX_BOOL CPDF_FormField::IsOptionSelected(int iOptIndex) {
+  CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "I");
+  if (pObj == NULL) {
     return FALSE;
+  }
+  CPDF_Array* pArray = pObj->GetArray();
+  if (pArray == NULL) {
+    return FALSE;
+  }
+  int iCount = (int)pArray->GetCount();
+  for (int i = 0; i < iCount; i++) {
+    if (pArray->GetInteger(i) == iOptIndex) {
+      return TRUE;
+    }
+  }
+  return FALSE;
 }
-FX_BOOL CPDF_FormField::SelectOption(int iOptIndex, FX_BOOL bSelected, FX_BOOL bNotify)
-{
-    CPDF_Array* pArray = m_pDict->GetArray("I");
-    if (pArray == NULL) {
-        if (!bSelected) {
-            return TRUE;
-        }
-        pArray = CPDF_Array::Create();
-        if (pArray == NULL) {
-            return FALSE;
-        }
-        m_pDict->SetAt("I", pArray);
-    }
-    FX_BOOL bReturn = FALSE;
-    for (int i = 0; i < (int)pArray->GetCount(); i ++) {
-        int iFind = pArray->GetInteger(i);
-        if (iFind == iOptIndex) {
-            if (bSelected) {
-                return TRUE;
-            }
-            if (bNotify && m_pForm->m_pFormNotify != NULL) {
-                int iRet = 0;
-                CFX_WideString csValue = GetOptionLabel(iOptIndex);
-                if (GetType() == ListBox) {
-                    iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
-                }
-                if (GetType() == ComboBox) {
-                    iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
-                }
-                if (iRet < 0) {
-                    return FALSE;
-                }
-            }
-            pArray->RemoveAt(i);
-            bReturn = TRUE;
-            break;
-        } else if (iFind > iOptIndex) {
-            if (!bSelected) {
-                continue;
-            }
-            if (bNotify && m_pForm->m_pFormNotify != NULL) {
-                int iRet = 0;
-                CFX_WideString csValue = GetOptionLabel(iOptIndex);
-                if (GetType() == ListBox) {
-                    iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
-                }
-                if (GetType() == ComboBox) {
-                    iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
-                }
-                if (iRet < 0) {
-                    return FALSE;
-                }
-            }
-            CPDF_Number* pNum = CPDF_Number::Create(iOptIndex);
-            if (pNum == NULL) {
-                return FALSE;
-            }
-            pArray->InsertAt(i, pNum);
-            bReturn = TRUE;
-            break;
-        }
-    }
-    if (!bReturn) {
-        if (bSelected) {
-            pArray->AddInteger(iOptIndex);
-        }
-        if (pArray->GetCount() == 0) {
-            m_pDict->RemoveAt("I");
-        }
-    }
-    if (bNotify && m_pForm->m_pFormNotify != NULL) {
-        if (GetType() == ListBox) {
-            m_pForm->m_pFormNotify->AfterSelectionChange(this);
-        }
-        if (GetType() == ComboBox) {
-            m_pForm->m_pFormNotify->AfterValueChange(this);
-        }
+FX_BOOL CPDF_FormField::SelectOption(int iOptIndex,
+                                     FX_BOOL bSelected,
+                                     FX_BOOL bNotify) {
+  CPDF_Array* pArray = m_pDict->GetArray("I");
+  if (pArray == NULL) {
+    if (!bSelected) {
+      return TRUE;
     }
-    m_pForm->m_bUpdated = TRUE;
-    return TRUE;
-}
-FX_BOOL CPDF_FormField::ClearSelectedOptions(FX_BOOL bNotify)
-{
-    if (bNotify && m_pForm->m_pFormNotify != NULL) {
+    pArray = CPDF_Array::Create();
+    if (pArray == NULL) {
+      return FALSE;
+    }
+    m_pDict->SetAt("I", pArray);
+  }
+  FX_BOOL bReturn = FALSE;
+  for (int i = 0; i < (int)pArray->GetCount(); i++) {
+    int iFind = pArray->GetInteger(i);
+    if (iFind == iOptIndex) {
+      if (bSelected) {
+        return TRUE;
+      }
+      if (bNotify && m_pForm->m_pFormNotify != NULL) {
         int iRet = 0;
-        CFX_WideString csValue;
-        int iIndex = GetSelectedIndex(0);
-        if (iIndex >= 0) {
-            csValue = GetOptionLabel(iIndex);
-        }
+        CFX_WideString csValue = GetOptionLabel(iOptIndex);
         if (GetType() == ListBox) {
-            iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
+          iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
         }
         if (GetType() == ComboBox) {
-            iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
+          iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
         }
         if (iRet < 0) {
-            return FALSE;
+          return FALSE;
         }
-    }
-    m_pDict->RemoveAt("I");
-    if (bNotify && m_pForm->m_pFormNotify != NULL) {
+      }
+      pArray->RemoveAt(i);
+      bReturn = TRUE;
+      break;
+    } else if (iFind > iOptIndex) {
+      if (!bSelected) {
+        continue;
+      }
+      if (bNotify && m_pForm->m_pFormNotify != NULL) {
+        int iRet = 0;
+        CFX_WideString csValue = GetOptionLabel(iOptIndex);
         if (GetType() == ListBox) {
-            m_pForm->m_pFormNotify->AfterSelectionChange(this);
+          iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
         }
         if (GetType() == ComboBox) {
-            m_pForm->m_pFormNotify->AfterValueChange(this);
+          iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
         }
-    }
-    m_pForm->m_bUpdated = TRUE;
-    return TRUE;
+        if (iRet < 0) {
+          return FALSE;
+        }
+      }
+      CPDF_Number* pNum = CPDF_Number::Create(iOptIndex);
+      if (pNum == NULL) {
+        return FALSE;
+      }
+      pArray->InsertAt(i, pNum);
+      bReturn = TRUE;
+      break;
+    }
+  }
+  if (!bReturn) {
+    if (bSelected) {
+      pArray->AddInteger(iOptIndex);
+    }
+    if (pArray->GetCount() == 0) {
+      m_pDict->RemoveAt("I");
+    }
+  }
+  if (bNotify && m_pForm->m_pFormNotify != NULL) {
+    if (GetType() == ListBox) {
+      m_pForm->m_pFormNotify->AfterSelectionChange(this);
+    }
+    if (GetType() == ComboBox) {
+      m_pForm->m_pFormNotify->AfterValueChange(this);
+    }
+  }
+  m_pForm->m_bUpdated = TRUE;
+  return TRUE;
 }
-void CPDF_FormField::LoadDA()
-{
-    CFX_ByteString DA;
-    if (CPDF_Object* pObj_t = FPDF_GetFieldAttr(m_pDict, "DA")) {
-        DA = pObj_t->GetString();
-    }
-    if (DA.IsEmpty() && m_pForm->m_pFormDict) {
-        DA = m_pForm->m_pFormDict->GetString("DA");
-    }
-    if (DA.IsEmpty()) {
-        return;
-    }
-    CPDF_SimpleParser syntax(DA);
-    syntax.FindTagParam("Tf", 2);
-    CFX_ByteString font_name = syntax.GetWord();
-    CPDF_Dictionary* pFontDict = NULL;
-    if (m_pForm->m_pFormDict && m_pForm->m_pFormDict->GetDict("DR") &&
-        m_pForm->m_pFormDict->GetDict("DR")->GetDict("Font") )
-    pFontDict = m_pForm->m_pFormDict->GetDict("DR")->GetDict("Font")->GetDict(font_name);
+FX_BOOL CPDF_FormField::ClearSelectedOptions(FX_BOOL bNotify) {
+  if (bNotify && m_pForm->m_pFormNotify != NULL) {
+    int iRet = 0;
+    CFX_WideString csValue;
+    int iIndex = GetSelectedIndex(0);
+    if (iIndex >= 0) {
+      csValue = GetOptionLabel(iIndex);
+    }
+    if (GetType() == ListBox) {
+      iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
+    }
+    if (GetType() == ComboBox) {
+      iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
+    }
+    if (iRet < 0) {
+      return FALSE;
+    }
+  }
+  m_pDict->RemoveAt("I");
+  if (bNotify && m_pForm->m_pFormNotify != NULL) {
+    if (GetType() == ListBox) {
+      m_pForm->m_pFormNotify->AfterSelectionChange(this);
+    }
+    if (GetType() == ComboBox) {
+      m_pForm->m_pFormNotify->AfterValueChange(this);
+    }
+  }
+  m_pForm->m_bUpdated = TRUE;
+  return TRUE;
+}
+void CPDF_FormField::LoadDA() {
+  CFX_ByteString DA;
+  if (CPDF_Object* pObj_t = FPDF_GetFieldAttr(m_pDict, "DA")) {
+    DA = pObj_t->GetString();
+  }
+  if (DA.IsEmpty() && m_pForm->m_pFormDict) {
+    DA = m_pForm->m_pFormDict->GetString("DA");
+  }
+  if (DA.IsEmpty()) {
+    return;
+  }
+  CPDF_SimpleParser syntax(DA);
+  syntax.FindTagParam("Tf", 2);
+  CFX_ByteString font_name = syntax.GetWord();
+  CPDF_Dictionary* pFontDict = NULL;
+  if (m_pForm->m_pFormDict && m_pForm->m_pFormDict->GetDict("DR") &&
+      m_pForm->m_pFormDict->GetDict("DR")->GetDict("Font"))
+    pFontDict = m_pForm->m_pFormDict->GetDict("DR")->GetDict("Font")->GetDict(
+        font_name);
 
-    if (pFontDict == NULL) {
-        return;
-    }
-    m_pFont = m_pForm->m_pDocument->LoadFont(pFontDict);
-    m_FontSize = FX_atof(syntax.GetWord());
+  if (pFontDict == NULL) {
+    return;
+  }
+  m_pFont = m_pForm->m_pDocument->LoadFont(pFontDict);
+  m_FontSize = FX_atof(syntax.GetWord());
 }
diff --git a/core/src/fpdfdoc/doc_link.cpp b/core/src/fpdfdoc/doc_link.cpp
index fdae96ac2e..15bd14c31e 100644
--- a/core/src/fpdfdoc/doc_link.cpp
+++ b/core/src/fpdfdoc/doc_link.cpp
@@ -6,100 +6,93 @@
 
 #include "../../include/fpdfdoc/fpdf_doc.h"
 
-CPDF_LinkList::~CPDF_LinkList()
-{
-    FX_POSITION pos = m_PageMap.GetStartPosition();
-    while (pos) {
-        void* key;
-        void* value;
-        m_PageMap.GetNextAssoc(pos, key, value);
-        delete (CFX_PtrArray*)value;
-    }
+CPDF_LinkList::~CPDF_LinkList() {
+  FX_POSITION pos = m_PageMap.GetStartPosition();
+  while (pos) {
+    void* key;
+    void* value;
+    m_PageMap.GetNextAssoc(pos, key, value);
+    delete (CFX_PtrArray*)value;
+  }
 }
-CFX_PtrArray* CPDF_LinkList::GetPageLinks(CPDF_Page* pPage)
-{
-    FX_DWORD objnum = pPage->m_pFormDict->GetObjNum();
-    if (objnum == 0) {
-        return NULL;
-    }
-    CFX_PtrArray* pPageLinkList = NULL;
-    if (!m_PageMap.Lookup((void*)(uintptr_t)objnum, (void*&)pPageLinkList)) {
-        pPageLinkList = new CFX_PtrArray;
-        m_PageMap.SetAt((void*)(uintptr_t)objnum, pPageLinkList);
-        LoadPageLinks(pPage, pPageLinkList);
-    }
-    return pPageLinkList;
+CFX_PtrArray* CPDF_LinkList::GetPageLinks(CPDF_Page* pPage) {
+  FX_DWORD objnum = pPage->m_pFormDict->GetObjNum();
+  if (objnum == 0) {
+    return NULL;
+  }
+  CFX_PtrArray* pPageLinkList = NULL;
+  if (!m_PageMap.Lookup((void*)(uintptr_t)objnum, (void*&)pPageLinkList)) {
+    pPageLinkList = new CFX_PtrArray;
+    m_PageMap.SetAt((void*)(uintptr_t)objnum, pPageLinkList);
+    LoadPageLinks(pPage, pPageLinkList);
+  }
+  return pPageLinkList;
 }
-int CPDF_LinkList::CountLinks(CPDF_Page* pPage)
-{
-    CFX_PtrArray* pPageLinkList = GetPageLinks(pPage);
-    if (pPageLinkList == NULL) {
-        return 0;
-    }
-    return pPageLinkList->GetSize();
+int CPDF_LinkList::CountLinks(CPDF_Page* pPage) {
+  CFX_PtrArray* pPageLinkList = GetPageLinks(pPage);
+  if (pPageLinkList == NULL) {
+    return 0;
+  }
+  return pPageLinkList->GetSize();
 }
-CPDF_Link CPDF_LinkList::GetLink(CPDF_Page* pPage, int index)
-{
-    CFX_PtrArray* pPageLinkList = GetPageLinks(pPage);
-    if (!pPageLinkList) {
-        return CPDF_Link();
-    }
-    return CPDF_Link((CPDF_Dictionary*)pPageLinkList->GetAt(index));
+CPDF_Link CPDF_LinkList::GetLink(CPDF_Page* pPage, int index) {
+  CFX_PtrArray* pPageLinkList = GetPageLinks(pPage);
+  if (!pPageLinkList) {
+    return CPDF_Link();
+  }
+  return CPDF_Link((CPDF_Dictionary*)pPageLinkList->GetAt(index));
 }
-CPDF_Link CPDF_LinkList::GetLinkAtPoint(CPDF_Page* pPage, FX_FLOAT pdf_x, FX_FLOAT pdf_y)
-{
-    CFX_PtrArray* pPageLinkList = GetPageLinks(pPage);
-    if (!pPageLinkList) {
-        return CPDF_Link();
-    }
-    int size = pPageLinkList->GetSize();
-    for (int i = size - 1; i >= 0; --i) {
-        CPDF_Link link((CPDF_Dictionary*)pPageLinkList->GetAt(i));
-        CPDF_Rect rect = link.GetRect();
-        if (rect.Contains(pdf_x, pdf_y)) {
-            return link;
-        }
-    }
+CPDF_Link CPDF_LinkList::GetLinkAtPoint(CPDF_Page* pPage,
+                                        FX_FLOAT pdf_x,
+                                        FX_FLOAT pdf_y) {
+  CFX_PtrArray* pPageLinkList = GetPageLinks(pPage);
+  if (!pPageLinkList) {
     return CPDF_Link();
+  }
+  int size = pPageLinkList->GetSize();
+  for (int i = size - 1; i >= 0; --i) {
+    CPDF_Link link((CPDF_Dictionary*)pPageLinkList->GetAt(i));
+    CPDF_Rect rect = link.GetRect();
+    if (rect.Contains(pdf_x, pdf_y)) {
+      return link;
+    }
+  }
+  return CPDF_Link();
 }
-void CPDF_LinkList::LoadPageLinks(CPDF_Page* pPage, CFX_PtrArray* pList)
-{
-    CPDF_Array* pAnnotList = pPage->m_pFormDict->GetArray("Annots");
-    if (pAnnotList == NULL) {
-        return;
+void CPDF_LinkList::LoadPageLinks(CPDF_Page* pPage, CFX_PtrArray* pList) {
+  CPDF_Array* pAnnotList = pPage->m_pFormDict->GetArray("Annots");
+  if (pAnnotList == NULL) {
+    return;
+  }
+  for (FX_DWORD i = 0; i < pAnnotList->GetCount(); i++) {
+    CPDF_Dictionary* pAnnot = pAnnotList->GetDict(i);
+    if (pAnnot == NULL) {
+      continue;
     }
-    for (FX_DWORD i = 0; i < pAnnotList->GetCount(); i ++) {
-        CPDF_Dictionary* pAnnot = pAnnotList->GetDict(i);
-        if (pAnnot == NULL) {
-            continue;
-        }
-        if (pAnnot->GetString("Subtype") != "Link") {
-            continue;
-        }
-        pList->Add(pAnnot);
+    if (pAnnot->GetString("Subtype") != "Link") {
+      continue;
     }
+    pList->Add(pAnnot);
+  }
 }
-CPDF_Rect CPDF_Link::GetRect()
-{
-    return m_pDict->GetRect("Rect");
+CPDF_Rect CPDF_Link::GetRect() {
+  return m_pDict->GetRect("Rect");
 }
-CPDF_Dest CPDF_Link::GetDest(CPDF_Document* pDoc)
-{
-    CPDF_Object* pDest = m_pDict->GetElementValue("Dest");
-    if (pDest == NULL) {
-        return CPDF_Dest();
-    }
-    if (pDest->GetType() == PDFOBJ_STRING || pDest->GetType() == PDFOBJ_NAME) {
-        CPDF_NameTree name_tree(pDoc, FX_BSTRC("Dests"));
-        CFX_ByteStringC name = pDest->GetString();
-        return CPDF_Dest(name_tree.LookupNamedDest(pDoc, name));
-    }
-    if (pDest->GetType() == PDFOBJ_ARRAY) {
-        return CPDF_Dest((CPDF_Array*)pDest);
-    }
+CPDF_Dest CPDF_Link::GetDest(CPDF_Document* pDoc) {
+  CPDF_Object* pDest = m_pDict->GetElementValue("Dest");
+  if (pDest == NULL) {
     return CPDF_Dest();
+  }
+  if (pDest->GetType() == PDFOBJ_STRING || pDest->GetType() == PDFOBJ_NAME) {
+    CPDF_NameTree name_tree(pDoc, FX_BSTRC("Dests"));
+    CFX_ByteStringC name = pDest->GetString();
+    return CPDF_Dest(name_tree.LookupNamedDest(pDoc, name));
+  }
+  if (pDest->GetType() == PDFOBJ_ARRAY) {
+    return CPDF_Dest((CPDF_Array*)pDest);
+  }
+  return CPDF_Dest();
 }
-CPDF_Action CPDF_Link::GetAction()
-{
-    return CPDF_Action(m_pDict->GetDict("A"));
+CPDF_Action CPDF_Link::GetAction() {
+  return CPDF_Action(m_pDict->GetDict("A"));
 }
diff --git a/core/src/fpdfdoc/doc_metadata.cpp b/core/src/fpdfdoc/doc_metadata.cpp
index aeeb1d1f60..b617eecf87 100644
--- a/core/src/fpdfdoc/doc_metadata.cpp
+++ b/core/src/fpdfdoc/doc_metadata.cpp
@@ -7,142 +7,133 @@
 #include "../../include/fpdfdoc/fpdf_doc.h"
 #include "../../include/fxcrt/fx_xml.h"
 typedef struct _PDFDOC_METADATA {
-    CPDF_Document *m_pDoc;
-    CXML_Element *m_pXmlElmnt;
-    CXML_Element *m_pElmntRdf;
-    CFX_CMapByteStringToPtr *m_pStringMap;
-} PDFDOC_METADATA, * PDFDOC_LPMETADATA;
-typedef PDFDOC_METADATA const * PDFDOC_LPCMETADATA;
+  CPDF_Document* m_pDoc;
+  CXML_Element* m_pXmlElmnt;
+  CXML_Element* m_pElmntRdf;
+  CFX_CMapByteStringToPtr* m_pStringMap;
+} PDFDOC_METADATA, *PDFDOC_LPMETADATA;
+typedef PDFDOC_METADATA const* PDFDOC_LPCMETADATA;
 const FX_CHAR* const gs_FPDFDOC_Metadata_Titles[] = {
-    "Title", "title",
-    "Subject", "description",
-    "Author", "creator",
-    "Keywords", "Keywords",
-    "Producer", "Producer",
-    "Creator", "CreatorTool",
-    "CreationDate", "CreateDate",
-    "ModDate", "ModifyDate",
-    "MetadataDate", "MetadataDate"
-};
-CPDF_Metadata::CPDF_Metadata()
-{
-    m_pData = FX_Alloc(PDFDOC_METADATA, 1);
-    CFX_CMapByteStringToPtr *&pStringMap = ((PDFDOC_LPMETADATA)m_pData)->m_pStringMap;
-    pStringMap = new CFX_CMapByteStringToPtr;
-    CFX_ByteString bstr;
-    for (int i = 0; i < 18; i += 2) {
-        bstr = gs_FPDFDOC_Metadata_Titles[i];
-        pStringMap->AddValue(bstr, (void*)gs_FPDFDOC_Metadata_Titles[i + 1]);
-    }
-
+    "Title",      "title",        "Subject",      "description", "Author",
+    "creator",    "Keywords",     "Keywords",     "Producer",    "Producer",
+    "Creator",    "CreatorTool",  "CreationDate", "CreateDate",  "ModDate",
+    "ModifyDate", "MetadataDate", "MetadataDate"};
+CPDF_Metadata::CPDF_Metadata() {
+  m_pData = FX_Alloc(PDFDOC_METADATA, 1);
+  CFX_CMapByteStringToPtr*& pStringMap =
+      ((PDFDOC_LPMETADATA)m_pData)->m_pStringMap;
+  pStringMap = new CFX_CMapByteStringToPtr;
+  CFX_ByteString bstr;
+  for (int i = 0; i < 18; i += 2) {
+    bstr = gs_FPDFDOC_Metadata_Titles[i];
+    pStringMap->AddValue(bstr, (void*)gs_FPDFDOC_Metadata_Titles[i + 1]);
+  }
 }
-CPDF_Metadata::~CPDF_Metadata()
-{
-    FXSYS_assert(m_pData != NULL);
-    CXML_Element *&p = ((PDFDOC_LPMETADATA)m_pData)->m_pXmlElmnt;
-    delete p;
-    CFX_CMapByteStringToPtr *pStringMap = ((PDFDOC_LPMETADATA)m_pData)->m_pStringMap;
-    if (pStringMap) {
-        pStringMap->RemoveAll();
-        delete pStringMap;
-    }
-    FX_Free(m_pData);
+CPDF_Metadata::~CPDF_Metadata() {
+  FXSYS_assert(m_pData != NULL);
+  CXML_Element*& p = ((PDFDOC_LPMETADATA)m_pData)->m_pXmlElmnt;
+  delete p;
+  CFX_CMapByteStringToPtr* pStringMap =
+      ((PDFDOC_LPMETADATA)m_pData)->m_pStringMap;
+  if (pStringMap) {
+    pStringMap->RemoveAll();
+    delete pStringMap;
+  }
+  FX_Free(m_pData);
 }
-void CPDF_Metadata::LoadDoc(CPDF_Document *pDoc)
-{
-    FXSYS_assert(pDoc != NULL);
-    ((PDFDOC_LPMETADATA)m_pData)->m_pDoc = pDoc;
-    CPDF_Dictionary *pRoot = pDoc->GetRoot();
-    CPDF_Stream *pStream = pRoot->GetStream(FX_BSTRC("Metadata"));
-    if (!pStream) {
-        return;
-    }
-    CPDF_StreamAcc acc;
-    acc.LoadAllData(pStream, FALSE);
-    int size = acc.GetSize();
-    const uint8_t* pBuf = acc.GetData();
-    CXML_Element *&pXmlElmnt = ((PDFDOC_LPMETADATA)m_pData)->m_pXmlElmnt;
-    pXmlElmnt = CXML_Element::Parse(pBuf, size);
-    if (!pXmlElmnt) {
-        return;
-    }
-    CXML_Element *&pElmntRdf = ((PDFDOC_LPMETADATA)m_pData)->m_pElmntRdf;
-    if (pXmlElmnt->GetTagName() == FX_BSTRC("RDF")) {
-        pElmntRdf = pXmlElmnt;
-    } else {
-        pElmntRdf = pXmlElmnt->GetElement(NULL, FX_BSTRC("RDF"));
-    }
+void CPDF_Metadata::LoadDoc(CPDF_Document* pDoc) {
+  FXSYS_assert(pDoc != NULL);
+  ((PDFDOC_LPMETADATA)m_pData)->m_pDoc = pDoc;
+  CPDF_Dictionary* pRoot = pDoc->GetRoot();
+  CPDF_Stream* pStream = pRoot->GetStream(FX_BSTRC("Metadata"));
+  if (!pStream) {
+    return;
+  }
+  CPDF_StreamAcc acc;
+  acc.LoadAllData(pStream, FALSE);
+  int size = acc.GetSize();
+  const uint8_t* pBuf = acc.GetData();
+  CXML_Element*& pXmlElmnt = ((PDFDOC_LPMETADATA)m_pData)->m_pXmlElmnt;
+  pXmlElmnt = CXML_Element::Parse(pBuf, size);
+  if (!pXmlElmnt) {
+    return;
+  }
+  CXML_Element*& pElmntRdf = ((PDFDOC_LPMETADATA)m_pData)->m_pElmntRdf;
+  if (pXmlElmnt->GetTagName() == FX_BSTRC("RDF")) {
+    pElmntRdf = pXmlElmnt;
+  } else {
+    pElmntRdf = pXmlElmnt->GetElement(NULL, FX_BSTRC("RDF"));
+  }
 }
-int32_t CPDF_Metadata::GetString(const CFX_ByteStringC& bsItem, CFX_WideString &wsStr)
-{
-    if (!((PDFDOC_LPMETADATA)m_pData)->m_pXmlElmnt) {
-        return -1;
-    }
-    if (!((PDFDOC_LPMETADATA)m_pData)->m_pStringMap) {
-        return -1;
+int32_t CPDF_Metadata::GetString(const CFX_ByteStringC& bsItem,
+                                 CFX_WideString& wsStr) {
+  if (!((PDFDOC_LPMETADATA)m_pData)->m_pXmlElmnt) {
+    return -1;
+  }
+  if (!((PDFDOC_LPMETADATA)m_pData)->m_pStringMap) {
+    return -1;
+  }
+  void* szTag;
+  if (!((PDFDOC_LPMETADATA)m_pData)->m_pStringMap->Lookup(bsItem, szTag)) {
+    return -1;
+  }
+  CFX_ByteString bsTag = (const FX_CHAR*)szTag;
+  wsStr = L"";
+  CXML_Element* pElmntRdf = ((PDFDOC_LPMETADATA)m_pData)->m_pElmntRdf;
+  if (!pElmntRdf) {
+    return -1;
+  }
+  int nChild = pElmntRdf->CountChildren();
+  for (int i = 0; i < nChild; i++) {
+    CXML_Element* pTag =
+        pElmntRdf->GetElement(NULL, FX_BSTRC("Description"), i);
+    if (!pTag) {
+      continue;
     }
-    void *szTag;
-    if (!((PDFDOC_LPMETADATA)m_pData)->m_pStringMap->Lookup(bsItem, szTag)) {
-        return -1;
+    if (bsItem == FX_BSTRC("Title") || bsItem == FX_BSTRC("Subject")) {
+      CXML_Element* pElmnt = pTag->GetElement(NULL, bsTag);
+      if (!pElmnt) {
+        continue;
+      }
+      pElmnt = pElmnt->GetElement(NULL, FX_BSTRC("Alt"));
+      if (!pElmnt) {
+        continue;
+      }
+      pElmnt = pElmnt->GetElement(NULL, FX_BSTRC("li"));
+      if (!pElmnt) {
+        continue;
+      }
+      wsStr = pElmnt->GetContent(0);
+      return wsStr.GetLength();
     }
-    CFX_ByteString bsTag = (const FX_CHAR*)szTag;
-    wsStr = L"";
-    CXML_Element *pElmntRdf = ((PDFDOC_LPMETADATA)m_pData)->m_pElmntRdf;
-    if (!pElmntRdf) {
-        return -1;
+    if (bsItem == FX_BSTRC("Author")) {
+      CXML_Element* pElmnt = pTag->GetElement(NULL, bsTag);
+      if (!pElmnt) {
+        continue;
+      }
+      pElmnt = pElmnt->GetElement(NULL, FX_BSTRC("Seq"));
+      if (!pElmnt) {
+        continue;
+      }
+      pElmnt = pElmnt->GetElement(NULL, FX_BSTRC("li"));
+      if (!pElmnt) {
+        continue;
+      }
+      wsStr = pElmnt->GetContent(0);
+      return wsStr.GetLength();
     }
-    int nChild = pElmntRdf->CountChildren();
-    for (int i = 0; i < nChild; i++) {
-        CXML_Element *pTag = pElmntRdf->GetElement(NULL, FX_BSTRC("Description"), i);
-        if (!pTag) {
-            continue;
-        }
-        if (bsItem == FX_BSTRC("Title") || bsItem == FX_BSTRC("Subject")) {
-            CXML_Element *pElmnt = pTag->GetElement(NULL, bsTag);
-            if (!pElmnt) {
-                continue;
-            }
-            pElmnt = pElmnt->GetElement(NULL, FX_BSTRC("Alt"));
-            if (!pElmnt) {
-                continue;
-            }
-            pElmnt = pElmnt->GetElement(NULL, FX_BSTRC("li"));
-            if (!pElmnt) {
-                continue;
-            }
-            wsStr = pElmnt->GetContent(0);
-            return wsStr.GetLength();
-        }
-        if (bsItem == FX_BSTRC("Author")) {
-            CXML_Element *pElmnt = pTag->GetElement(NULL, bsTag);
-            if (!pElmnt) {
-                continue;
-            }
-            pElmnt = pElmnt->GetElement(NULL, FX_BSTRC("Seq"));
-            if (!pElmnt) {
-                continue;
-            }
-            pElmnt = pElmnt->GetElement(NULL, FX_BSTRC("li"));
-            if (!pElmnt) {
-                continue;
-            }
-            wsStr = pElmnt->GetContent(0);
-            return wsStr.GetLength();
-        }
-        CXML_Element *pElmnt = pTag->GetElement(NULL, bsTag);
-        if (!pElmnt) {
-            continue;
-        }
-        wsStr = pElmnt->GetContent(0);
-        return wsStr.GetLength();
+    CXML_Element* pElmnt = pTag->GetElement(NULL, bsTag);
+    if (!pElmnt) {
+      continue;
     }
-    return -1;
+    wsStr = pElmnt->GetContent(0);
+    return wsStr.GetLength();
+  }
+  return -1;
 }
-CXML_Element* CPDF_Metadata::GetRoot() const
-{
-    return ((PDFDOC_LPMETADATA)m_pData)->m_pXmlElmnt;
+CXML_Element* CPDF_Metadata::GetRoot() const {
+  return ((PDFDOC_LPMETADATA)m_pData)->m_pXmlElmnt;
 }
-CXML_Element* CPDF_Metadata::GetRDF() const
-{
-    return ((PDFDOC_LPMETADATA)m_pData)->m_pElmntRdf;
+CXML_Element* CPDF_Metadata::GetRDF() const {
+  return ((PDFDOC_LPMETADATA)m_pData)->m_pElmntRdf;
 }
diff --git a/core/src/fpdfdoc/doc_ocg.cpp b/core/src/fpdfdoc/doc_ocg.cpp
index d525227219..70ad9c710d 100644
--- a/core/src/fpdfdoc/doc_ocg.cpp
+++ b/core/src/fpdfdoc/doc_ocg.cpp
@@ -5,297 +5,303 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/fpdfdoc/fpdf_doc.h"
-static int32_t FPDFDOC_OCG_FindGroup(const CPDF_Object *pObject, const CPDF_Dictionary *pGroupDict)
-{
-    if (pObject == NULL || pGroupDict == NULL) {
-        return -1;
-    }
-    int32_t iType = pObject->GetType();
-    if (iType == PDFOBJ_ARRAY) {
-        FX_DWORD dwCount = ((CPDF_Array*)pObject)->GetCount();
-        for (FX_DWORD i = 0; i < dwCount; i++) {
-            if (((CPDF_Array*)pObject)->GetDict(i) == pGroupDict) {
-                return i;
-            }
-        }
-        return -1;
-    }
-    if (pObject->GetDict() == pGroupDict) {
-        return 0;
+static int32_t FPDFDOC_OCG_FindGroup(const CPDF_Object* pObject,
+                                     const CPDF_Dictionary* pGroupDict) {
+  if (pObject == NULL || pGroupDict == NULL) {
+    return -1;
+  }
+  int32_t iType = pObject->GetType();
+  if (iType == PDFOBJ_ARRAY) {
+    FX_DWORD dwCount = ((CPDF_Array*)pObject)->GetCount();
+    for (FX_DWORD i = 0; i < dwCount; i++) {
+      if (((CPDF_Array*)pObject)->GetDict(i) == pGroupDict) {
+        return i;
+      }
     }
     return -1;
+  }
+  if (pObject->GetDict() == pGroupDict) {
+    return 0;
+  }
+  return -1;
 }
-static FX_BOOL FPDFDOC_OCG_HasIntent(const CPDF_Dictionary *pDict, const CFX_ByteStringC& csElement, const CFX_ByteStringC& csDef = FX_BSTRC(""))
-{
-    FXSYS_assert(pDict != NULL);
-    CPDF_Object *pIntent = pDict->GetElementValue(FX_BSTRC("Intent"));
-    if (pIntent == NULL) {
-        return csElement == csDef;
-    }
-    CFX_ByteString bsIntent;
-    if (pIntent->GetType() == PDFOBJ_ARRAY) {
-        FX_DWORD dwCount = ((CPDF_Array*)pIntent)->GetCount();
-        for (FX_DWORD i = 0; i < dwCount; i++) {
-            bsIntent = ((CPDF_Array*)pIntent)->GetString(i);
-            if (bsIntent == FX_BSTRC("All") || bsIntent == csElement) {
-                return TRUE;
-            }
-        }
-        return FALSE;
+static FX_BOOL FPDFDOC_OCG_HasIntent(
+    const CPDF_Dictionary* pDict,
+    const CFX_ByteStringC& csElement,
+    const CFX_ByteStringC& csDef = FX_BSTRC("")) {
+  FXSYS_assert(pDict != NULL);
+  CPDF_Object* pIntent = pDict->GetElementValue(FX_BSTRC("Intent"));
+  if (pIntent == NULL) {
+    return csElement == csDef;
+  }
+  CFX_ByteString bsIntent;
+  if (pIntent->GetType() == PDFOBJ_ARRAY) {
+    FX_DWORD dwCount = ((CPDF_Array*)pIntent)->GetCount();
+    for (FX_DWORD i = 0; i < dwCount; i++) {
+      bsIntent = ((CPDF_Array*)pIntent)->GetString(i);
+      if (bsIntent == FX_BSTRC("All") || bsIntent == csElement) {
+        return TRUE;
+      }
     }
-    bsIntent = pIntent->GetString();
-    return bsIntent == FX_BSTRC("All") || bsIntent == csElement;
+    return FALSE;
+  }
+  bsIntent = pIntent->GetString();
+  return bsIntent == FX_BSTRC("All") || bsIntent == csElement;
 }
-static CPDF_Dictionary* FPDFDOC_OCG_GetConfig(CPDF_Document *pDoc, const CPDF_Dictionary *pOCGDict, const CFX_ByteStringC& bsState)
-{
-    FXSYS_assert(pDoc && pOCGDict);
-    CPDF_Dictionary *pOCProperties = pDoc->GetRoot()->GetDict(FX_BSTRC("OCProperties"));
-    if (!pOCProperties) {
-        return NULL;
-    }
-    CPDF_Array *pOCGs = pOCProperties->GetArray(FX_BSTRC("OCGs"));
-    if (!pOCGs) {
-        return NULL;
-    }
-    if (FPDFDOC_OCG_FindGroup(pOCGs, pOCGDict) < 0) {
-        return NULL;
-    }
-    CPDF_Dictionary *pConfig = pOCProperties->GetDict(FX_BSTRC("D"));
-    CPDF_Array *pConfigs = pOCProperties->GetArray(FX_BSTRC("Configs"));
-    if (pConfigs) {
-        CPDF_Dictionary *pFind;
-        int32_t iCount = pConfigs->GetCount();
-        for (int32_t i = 0; i < iCount; i ++) {
-            pFind = pConfigs->GetDict(i);
-            if (!pFind) {
-                continue;
-            }
-            if (!FPDFDOC_OCG_HasIntent(pFind, FX_BSTRC("View"), FX_BSTRC("View"))) {
-                continue;
-            }
-            pConfig = pFind;
-            break;
-        }
+static CPDF_Dictionary* FPDFDOC_OCG_GetConfig(CPDF_Document* pDoc,
+                                              const CPDF_Dictionary* pOCGDict,
+                                              const CFX_ByteStringC& bsState) {
+  FXSYS_assert(pDoc && pOCGDict);
+  CPDF_Dictionary* pOCProperties =
+      pDoc->GetRoot()->GetDict(FX_BSTRC("OCProperties"));
+  if (!pOCProperties) {
+    return NULL;
+  }
+  CPDF_Array* pOCGs = pOCProperties->GetArray(FX_BSTRC("OCGs"));
+  if (!pOCGs) {
+    return NULL;
+  }
+  if (FPDFDOC_OCG_FindGroup(pOCGs, pOCGDict) < 0) {
+    return NULL;
+  }
+  CPDF_Dictionary* pConfig = pOCProperties->GetDict(FX_BSTRC("D"));
+  CPDF_Array* pConfigs = pOCProperties->GetArray(FX_BSTRC("Configs"));
+  if (pConfigs) {
+    CPDF_Dictionary* pFind;
+    int32_t iCount = pConfigs->GetCount();
+    for (int32_t i = 0; i < iCount; i++) {
+      pFind = pConfigs->GetDict(i);
+      if (!pFind) {
+        continue;
+      }
+      if (!FPDFDOC_OCG_HasIntent(pFind, FX_BSTRC("View"), FX_BSTRC("View"))) {
+        continue;
+      }
+      pConfig = pFind;
+      break;
     }
-    return pConfig;
+  }
+  return pConfig;
 }
-static CFX_ByteString FPDFDOC_OCG_GetUsageTypeString(CPDF_OCContext::UsageType eType)
-{
-    CFX_ByteString csState = FX_BSTRC("View");
-    if (eType == CPDF_OCContext::Design) {
-        csState = FX_BSTRC("Design");
-    } else if (eType == CPDF_OCContext::Print) {
-        csState = FX_BSTRC("Print");
-    } else if (eType == CPDF_OCContext::Export) {
-        csState = FX_BSTRC("Export");
-    }
-    return csState;
+static CFX_ByteString FPDFDOC_OCG_GetUsageTypeString(
+    CPDF_OCContext::UsageType eType) {
+  CFX_ByteString csState = FX_BSTRC("View");
+  if (eType == CPDF_OCContext::Design) {
+    csState = FX_BSTRC("Design");
+  } else if (eType == CPDF_OCContext::Print) {
+    csState = FX_BSTRC("Print");
+  } else if (eType == CPDF_OCContext::Export) {
+    csState = FX_BSTRC("Export");
+  }
+  return csState;
 }
-CPDF_OCContext::CPDF_OCContext(CPDF_Document *pDoc, UsageType eUsageType)
-{
-    FXSYS_assert(pDoc != NULL);
-    m_pDocument = pDoc;
-    m_eUsageType = eUsageType;
+CPDF_OCContext::CPDF_OCContext(CPDF_Document* pDoc, UsageType eUsageType) {
+  FXSYS_assert(pDoc != NULL);
+  m_pDocument = pDoc;
+  m_eUsageType = eUsageType;
 }
-CPDF_OCContext::~CPDF_OCContext()
-{
-    m_OCGStates.clear();
+CPDF_OCContext::~CPDF_OCContext() {
+  m_OCGStates.clear();
 }
-FX_BOOL CPDF_OCContext::LoadOCGStateFromConfig(const CFX_ByteStringC& csConfig, const CPDF_Dictionary *pOCGDict, FX_BOOL &bValidConfig) const
-{
-    CPDF_Dictionary *pConfig = FPDFDOC_OCG_GetConfig(m_pDocument, pOCGDict, csConfig);
-    if (!pConfig) {
-        return TRUE;
+FX_BOOL CPDF_OCContext::LoadOCGStateFromConfig(const CFX_ByteStringC& csConfig,
+                                               const CPDF_Dictionary* pOCGDict,
+                                               FX_BOOL& bValidConfig) const {
+  CPDF_Dictionary* pConfig =
+      FPDFDOC_OCG_GetConfig(m_pDocument, pOCGDict, csConfig);
+  if (!pConfig) {
+    return TRUE;
+  }
+  bValidConfig = TRUE;
+  FX_BOOL bState = pConfig->GetString(FX_BSTRC("BaseState"), FX_BSTRC("ON")) !=
+                   FX_BSTRC("OFF");
+  CPDF_Array* pArray = pConfig->GetArray(FX_BSTRC("ON"));
+  if (pArray) {
+    if (FPDFDOC_OCG_FindGroup(pArray, pOCGDict) >= 0) {
+      bState = TRUE;
     }
-    bValidConfig = TRUE;
-    FX_BOOL bState = pConfig->GetString(FX_BSTRC("BaseState"), FX_BSTRC("ON")) != FX_BSTRC("OFF");
-    CPDF_Array *pArray = pConfig->GetArray(FX_BSTRC("ON"));
-    if (pArray) {
-        if (FPDFDOC_OCG_FindGroup(pArray, pOCGDict) >= 0) {
-            bState = TRUE;
-        }
+  }
+  pArray = pConfig->GetArray(FX_BSTRC("OFF"));
+  if (pArray) {
+    if (FPDFDOC_OCG_FindGroup(pArray, pOCGDict) >= 0) {
+      bState = FALSE;
     }
-    pArray = pConfig->GetArray(FX_BSTRC("OFF"));
-    if (pArray) {
-        if (FPDFDOC_OCG_FindGroup(pArray, pOCGDict) >= 0) {
-            bState = FALSE;
-        }
+  }
+  pArray = pConfig->GetArray(FX_BSTRC("AS"));
+  if (pArray) {
+    CFX_ByteString csFind = csConfig + FX_BSTRC("State");
+    int32_t iCount = pArray->GetCount();
+    for (int32_t i = 0; i < iCount; i++) {
+      CPDF_Dictionary* pUsage = pArray->GetDict(i);
+      if (!pUsage) {
+        continue;
+      }
+      if (pUsage->GetString(FX_BSTRC("Event"), FX_BSTRC("View")) != csConfig) {
+        continue;
+      }
+      CPDF_Array* pOCGs = pUsage->GetArray(FX_BSTRC("OCGs"));
+      if (!pOCGs) {
+        continue;
+      }
+      if (FPDFDOC_OCG_FindGroup(pOCGs, pOCGDict) < 0) {
+        continue;
+      }
+      CPDF_Dictionary* pState = pUsage->GetDict(csConfig);
+      if (!pState) {
+        continue;
+      }
+      bState = pState->GetString(csFind) != FX_BSTRC("OFF");
     }
-    pArray = pConfig->GetArray(FX_BSTRC("AS"));
-    if (pArray) {
-        CFX_ByteString csFind = csConfig + FX_BSTRC("State");
-        int32_t iCount = pArray->GetCount();
-        for (int32_t i = 0; i < iCount; i ++) {
-            CPDF_Dictionary *pUsage = pArray->GetDict(i);
-            if (!pUsage) {
-                continue;
-            }
-            if (pUsage->GetString(FX_BSTRC("Event"), FX_BSTRC("View")) != csConfig) {
-                continue;
-            }
-            CPDF_Array *pOCGs = pUsage->GetArray(FX_BSTRC("OCGs"));
-            if (!pOCGs) {
-                continue;
-            }
-            if (FPDFDOC_OCG_FindGroup(pOCGs, pOCGDict) < 0) {
-                continue;
-            }
-            CPDF_Dictionary *pState = pUsage->GetDict(csConfig);
-            if (!pState) {
-                continue;
-            }
-            bState = pState->GetString(csFind) != FX_BSTRC("OFF");
-        }
-    }
-    return bState;
+  }
+  return bState;
 }
-FX_BOOL CPDF_OCContext::LoadOCGState(const CPDF_Dictionary *pOCGDict) const
-{
-    if (!FPDFDOC_OCG_HasIntent(pOCGDict, FX_BSTRC("View"), FX_BSTRC("View"))) {
-        return TRUE;
+FX_BOOL CPDF_OCContext::LoadOCGState(const CPDF_Dictionary* pOCGDict) const {
+  if (!FPDFDOC_OCG_HasIntent(pOCGDict, FX_BSTRC("View"), FX_BSTRC("View"))) {
+    return TRUE;
+  }
+  CFX_ByteString csState = FPDFDOC_OCG_GetUsageTypeString(m_eUsageType);
+  CPDF_Dictionary* pUsage = pOCGDict->GetDict(FX_BSTRC("Usage"));
+  if (pUsage) {
+    CPDF_Dictionary* pState = pUsage->GetDict(csState);
+    if (pState) {
+      CFX_ByteString csFind = csState + FX_BSTRC("State");
+      if (pState->KeyExist(csFind)) {
+        return pState->GetString(csFind) != FX_BSTRC("OFF");
+      }
     }
-    CFX_ByteString csState = FPDFDOC_OCG_GetUsageTypeString(m_eUsageType);
-    CPDF_Dictionary *pUsage = pOCGDict->GetDict(FX_BSTRC("Usage"));
-    if (pUsage) {
-        CPDF_Dictionary *pState = pUsage->GetDict(csState);
-        if (pState) {
-            CFX_ByteString csFind = csState + FX_BSTRC("State");
-            if (pState->KeyExist(csFind)) {
-                return pState->GetString(csFind) != FX_BSTRC("OFF");
-            }
-        }
-        if (csState != FX_BSTRC("View")) {
-            pState = pUsage->GetDict(FX_BSTRC("View"));
-            if (pState && pState->KeyExist(FX_BSTRC("ViewState"))) {
-                return pState->GetString(FX_BSTRC("ViewState")) != FX_BSTRC("OFF");
-            }
-        }
+    if (csState != FX_BSTRC("View")) {
+      pState = pUsage->GetDict(FX_BSTRC("View"));
+      if (pState && pState->KeyExist(FX_BSTRC("ViewState"))) {
+        return pState->GetString(FX_BSTRC("ViewState")) != FX_BSTRC("OFF");
+      }
     }
-    FX_BOOL bDefValid = FALSE;
-    return LoadOCGStateFromConfig(csState, pOCGDict, bDefValid);
+  }
+  FX_BOOL bDefValid = FALSE;
+  return LoadOCGStateFromConfig(csState, pOCGDict, bDefValid);
 }
 
-FX_BOOL CPDF_OCContext::GetOCGVisible(const CPDF_Dictionary* pOCGDict)
-{
-    if (!pOCGDict)
-        return FALSE;
+FX_BOOL CPDF_OCContext::GetOCGVisible(const CPDF_Dictionary* pOCGDict) {
+  if (!pOCGDict)
+    return FALSE;
 
-    const auto it = m_OCGStates.find(pOCGDict);
-    if (it != m_OCGStates.end())
-        return it->second;
+  const auto it = m_OCGStates.find(pOCGDict);
+  if (it != m_OCGStates.end())
+    return it->second;
 
-    FX_BOOL bState = LoadOCGState(pOCGDict);
-    m_OCGStates[pOCGDict] = bState;
-    return bState;
+  FX_BOOL bState = LoadOCGState(pOCGDict);
+  m_OCGStates[pOCGDict] = bState;
+  return bState;
 }
 
-FX_BOOL CPDF_OCContext::GetOCGVE(CPDF_Array *pExpression, FX_BOOL bFromConfig, int nLevel)
-{
-    if (nLevel > 32) {
-        return FALSE;
+FX_BOOL CPDF_OCContext::GetOCGVE(CPDF_Array* pExpression,
+                                 FX_BOOL bFromConfig,
+                                 int nLevel) {
+  if (nLevel > 32) {
+    return FALSE;
+  }
+  if (pExpression == NULL) {
+    return FALSE;
+  }
+  int32_t iCount = pExpression->GetCount();
+  CPDF_Object* pOCGObj;
+  CFX_ByteString csOperator = pExpression->GetString(0);
+  if (csOperator == FX_BSTRC("Not")) {
+    pOCGObj = pExpression->GetElementValue(1);
+    if (pOCGObj == NULL) {
+      return FALSE;
     }
-    if (pExpression == NULL) {
-        return FALSE;
+    if (pOCGObj->GetType() == PDFOBJ_DICTIONARY) {
+      return !(bFromConfig ? LoadOCGState((CPDF_Dictionary*)pOCGObj)
+                           : GetOCGVisible((CPDF_Dictionary*)pOCGObj));
     }
-    int32_t iCount = pExpression->GetCount();
-    CPDF_Object *pOCGObj;
-    CFX_ByteString csOperator = pExpression->GetString(0);
-    if (csOperator == FX_BSTRC("Not")) {
-        pOCGObj = pExpression->GetElementValue(1);
-        if (pOCGObj == NULL) {
-            return FALSE;
-        }
-        if (pOCGObj->GetType() == PDFOBJ_DICTIONARY) {
-            return !(bFromConfig ? LoadOCGState((CPDF_Dictionary*)pOCGObj) : GetOCGVisible((CPDF_Dictionary*)pOCGObj));
-        }
-        if (pOCGObj->GetType() == PDFOBJ_ARRAY) {
-            return !GetOCGVE((CPDF_Array*)pOCGObj, bFromConfig, nLevel + 1);
-        }
-        return FALSE;
+    if (pOCGObj->GetType() == PDFOBJ_ARRAY) {
+      return !GetOCGVE((CPDF_Array*)pOCGObj, bFromConfig, nLevel + 1);
     }
-    if (csOperator == FX_BSTRC("Or") || csOperator == FX_BSTRC("And")) {
-        FX_BOOL bValue = FALSE;
-        for (int32_t i = 1; i < iCount; i ++) {
-            pOCGObj = pExpression->GetElementValue(1);
-            if (pOCGObj == NULL) {
-                continue;
-            }
-            FX_BOOL bItem = FALSE;
-            if (pOCGObj->GetType() == PDFOBJ_DICTIONARY) {
-                bItem = bFromConfig ? LoadOCGState((CPDF_Dictionary*)pOCGObj) : GetOCGVisible((CPDF_Dictionary*)pOCGObj);
-            } else if (pOCGObj->GetType() == PDFOBJ_ARRAY) {
-                bItem = GetOCGVE((CPDF_Array*)pOCGObj, bFromConfig, nLevel + 1);
-            }
-            if (i == 1) {
-                bValue = bItem;
-            } else {
-                if (csOperator == FX_BSTRC("Or")) {
-                    bValue = bValue || bItem;
-                } else {
-                    bValue = bValue && bItem;
-                }
-            }
+    return FALSE;
+  }
+  if (csOperator == FX_BSTRC("Or") || csOperator == FX_BSTRC("And")) {
+    FX_BOOL bValue = FALSE;
+    for (int32_t i = 1; i < iCount; i++) {
+      pOCGObj = pExpression->GetElementValue(1);
+      if (pOCGObj == NULL) {
+        continue;
+      }
+      FX_BOOL bItem = FALSE;
+      if (pOCGObj->GetType() == PDFOBJ_DICTIONARY) {
+        bItem = bFromConfig ? LoadOCGState((CPDF_Dictionary*)pOCGObj)
+                            : GetOCGVisible((CPDF_Dictionary*)pOCGObj);
+      } else if (pOCGObj->GetType() == PDFOBJ_ARRAY) {
+        bItem = GetOCGVE((CPDF_Array*)pOCGObj, bFromConfig, nLevel + 1);
+      }
+      if (i == 1) {
+        bValue = bItem;
+      } else {
+        if (csOperator == FX_BSTRC("Or")) {
+          bValue = bValue || bItem;
+        } else {
+          bValue = bValue && bItem;
         }
-        return bValue;
+      }
     }
-    return FALSE;
+    return bValue;
+  }
+  return FALSE;
 }
-FX_BOOL CPDF_OCContext::LoadOCMDState(const CPDF_Dictionary *pOCMDDict, FX_BOOL bFromConfig)
-{
-    FXSYS_assert(pOCMDDict != NULL);
-    CPDF_Array *pVE = pOCMDDict->GetArray(FX_BSTRC("VE"));
-    if (pVE != NULL) {
-        return GetOCGVE(pVE, bFromConfig);
-    }
-    CFX_ByteString csP = pOCMDDict->GetString(FX_BSTRC("P"), FX_BSTRC("AnyOn"));
-    CPDF_Object *pOCGObj = pOCMDDict->GetElementValue(FX_BSTRC("OCGs"));
-    if (pOCGObj == NULL) {
-        return TRUE;
+FX_BOOL CPDF_OCContext::LoadOCMDState(const CPDF_Dictionary* pOCMDDict,
+                                      FX_BOOL bFromConfig) {
+  FXSYS_assert(pOCMDDict != NULL);
+  CPDF_Array* pVE = pOCMDDict->GetArray(FX_BSTRC("VE"));
+  if (pVE != NULL) {
+    return GetOCGVE(pVE, bFromConfig);
+  }
+  CFX_ByteString csP = pOCMDDict->GetString(FX_BSTRC("P"), FX_BSTRC("AnyOn"));
+  CPDF_Object* pOCGObj = pOCMDDict->GetElementValue(FX_BSTRC("OCGs"));
+  if (pOCGObj == NULL) {
+    return TRUE;
+  }
+  if (pOCGObj->GetType() == PDFOBJ_DICTIONARY) {
+    return bFromConfig ? LoadOCGState((CPDF_Dictionary*)pOCGObj)
+                       : GetOCGVisible((CPDF_Dictionary*)pOCGObj);
+  }
+  if (pOCGObj->GetType() != PDFOBJ_ARRAY) {
+    return TRUE;
+  }
+  FX_BOOL bState = FALSE;
+  if (csP == FX_BSTRC("AllOn") || csP == FX_BSTRC("AllOff")) {
+    bState = TRUE;
+  }
+  int32_t iCount = ((CPDF_Array*)pOCGObj)->GetCount();
+  for (int32_t i = 0; i < iCount; i++) {
+    FX_BOOL bItem = TRUE;
+    CPDF_Dictionary* pItemDict = ((CPDF_Array*)pOCGObj)->GetDict(i);
+    if (pItemDict) {
+      bItem = bFromConfig ? LoadOCGState(pItemDict) : GetOCGVisible(pItemDict);
     }
-    if (pOCGObj->GetType() == PDFOBJ_DICTIONARY) {
-        return bFromConfig ? LoadOCGState((CPDF_Dictionary*)pOCGObj) : GetOCGVisible((CPDF_Dictionary*)pOCGObj);
+    if (csP == FX_BSTRC("AnyOn") && bItem) {
+      return TRUE;
     }
-    if (pOCGObj->GetType() != PDFOBJ_ARRAY) {
-        return TRUE;
+    if (csP == FX_BSTRC("AnyOff") && !bItem) {
+      return TRUE;
     }
-    FX_BOOL bState = FALSE;
-    if (csP == FX_BSTRC("AllOn") || csP == FX_BSTRC("AllOff")) {
-        bState = TRUE;
+    if (csP == FX_BSTRC("AllOn") && !bItem) {
+      return FALSE;
     }
-    int32_t iCount = ((CPDF_Array*)pOCGObj)->GetCount();
-    for (int32_t i = 0; i < iCount; i ++) {
-        FX_BOOL bItem = TRUE;
-        CPDF_Dictionary* pItemDict = ((CPDF_Array*)pOCGObj)->GetDict(i);
-        if (pItemDict) {
-            bItem = bFromConfig ? LoadOCGState(pItemDict) : GetOCGVisible(pItemDict);
-        }
-        if (csP == FX_BSTRC("AnyOn") && bItem) {
-            return TRUE;
-        }
-        if (csP == FX_BSTRC("AnyOff") && !bItem) {
-            return TRUE;
-        }
-        if (csP == FX_BSTRC("AllOn") && !bItem) {
-            return FALSE;
-        }
-        if (csP == FX_BSTRC("AllOff") && bItem) {
-            return FALSE;
-        }
+    if (csP == FX_BSTRC("AllOff") && bItem) {
+      return FALSE;
     }
-    return bState;
+  }
+  return bState;
 }
-FX_BOOL CPDF_OCContext::CheckOCGVisible(const CPDF_Dictionary *pOCGDict)
-{
-    if (!pOCGDict) {
-        return TRUE;
-    }
-    CFX_ByteString csType = pOCGDict->GetString(FX_BSTRC("Type"), FX_BSTRC("OCG"));
-    if (csType == FX_BSTRC("OCG")) {
-        return GetOCGVisible(pOCGDict);
-    }
-    return LoadOCMDState(pOCGDict, FALSE);
+FX_BOOL CPDF_OCContext::CheckOCGVisible(const CPDF_Dictionary* pOCGDict) {
+  if (!pOCGDict) {
+    return TRUE;
+  }
+  CFX_ByteString csType =
+      pOCGDict->GetString(FX_BSTRC("Type"), FX_BSTRC("OCG"));
+  if (csType == FX_BSTRC("OCG")) {
+    return GetOCGVisible(pOCGDict);
+  }
+  return LoadOCMDState(pOCGDict, FALSE);
 }
-void CPDF_OCContext::ResetOCContext()
-{
-    m_OCGStates.clear();
+void CPDF_OCContext::ResetOCContext() {
+  m_OCGStates.clear();
 }
diff --git a/core/src/fpdfdoc/doc_tagged.cpp b/core/src/fpdfdoc/doc_tagged.cpp
index e9f0c55e2b..facad46886 100644
--- a/core/src/fpdfdoc/doc_tagged.cpp
+++ b/core/src/fpdfdoc/doc_tagged.cpp
@@ -9,430 +9,451 @@
 #include "../../include/fpdfdoc/fpdf_tagged.h"
 #include "tagged_int.h"
 const int nMaxRecursion = 32;
-static FX_BOOL IsTagged(const CPDF_Document* pDoc)
-{
-    CPDF_Dictionary* pCatalog = pDoc->GetRoot();
-    CPDF_Dictionary* pMarkInfo = pCatalog->GetDict(FX_BSTRC("MarkInfo"));
-    return pMarkInfo != NULL && pMarkInfo->GetInteger(FX_BSTRC("Marked"));
+static FX_BOOL IsTagged(const CPDF_Document* pDoc) {
+  CPDF_Dictionary* pCatalog = pDoc->GetRoot();
+  CPDF_Dictionary* pMarkInfo = pCatalog->GetDict(FX_BSTRC("MarkInfo"));
+  return pMarkInfo != NULL && pMarkInfo->GetInteger(FX_BSTRC("Marked"));
 }
-CPDF_StructTree* CPDF_StructTree::LoadPage(const CPDF_Document* pDoc, const CPDF_Dictionary* pPageDict)
-{
-    if (!IsTagged(pDoc)) {
-        return NULL;
-    }
-    CPDF_StructTreeImpl* pTree = new CPDF_StructTreeImpl(pDoc);
-    pTree->LoadPageTree(pPageDict);
-    return pTree;
+CPDF_StructTree* CPDF_StructTree::LoadPage(const CPDF_Document* pDoc,
+                                           const CPDF_Dictionary* pPageDict) {
+  if (!IsTagged(pDoc)) {
+    return NULL;
+  }
+  CPDF_StructTreeImpl* pTree = new CPDF_StructTreeImpl(pDoc);
+  pTree->LoadPageTree(pPageDict);
+  return pTree;
 }
-CPDF_StructTree* CPDF_StructTree::LoadDoc(const CPDF_Document* pDoc)
-{
-    if (!IsTagged(pDoc)) {
-        return NULL;
-    }
-    CPDF_StructTreeImpl* pTree = new CPDF_StructTreeImpl(pDoc);
-    pTree->LoadDocTree();
-    return pTree;
+CPDF_StructTree* CPDF_StructTree::LoadDoc(const CPDF_Document* pDoc) {
+  if (!IsTagged(pDoc)) {
+    return NULL;
+  }
+  CPDF_StructTreeImpl* pTree = new CPDF_StructTreeImpl(pDoc);
+  pTree->LoadDocTree();
+  return pTree;
 }
-CPDF_StructTreeImpl::CPDF_StructTreeImpl(const CPDF_Document* pDoc)
-{
-    CPDF_Dictionary* pCatalog = pDoc->GetRoot();
-    m_pTreeRoot = pCatalog->GetDict(FX_BSTRC("StructTreeRoot"));
-    if (m_pTreeRoot == NULL) {
-        return;
+CPDF_StructTreeImpl::CPDF_StructTreeImpl(const CPDF_Document* pDoc) {
+  CPDF_Dictionary* pCatalog = pDoc->GetRoot();
+  m_pTreeRoot = pCatalog->GetDict(FX_BSTRC("StructTreeRoot"));
+  if (m_pTreeRoot == NULL) {
+    return;
+  }
+  m_pRoleMap = m_pTreeRoot->GetDict(FX_BSTRC("RoleMap"));
+}
+CPDF_StructTreeImpl::~CPDF_StructTreeImpl() {
+  for (int i = 0; i < m_Kids.GetSize(); i++)
+    if (m_Kids[i]) {
+      m_Kids[i]->Release();
     }
-    m_pRoleMap = m_pTreeRoot->GetDict(FX_BSTRC("RoleMap"));
 }
-CPDF_StructTreeImpl::~CPDF_StructTreeImpl()
-{
-    for (int i = 0; i < m_Kids.GetSize(); i ++)
-        if (m_Kids[i]) {
-            m_Kids[i]->Release();
-        }
+void CPDF_StructTreeImpl::LoadDocTree() {
+  m_pPage = NULL;
+  if (m_pTreeRoot == NULL) {
+    return;
+  }
+  CPDF_Object* pKids = m_pTreeRoot->GetElementValue(FX_BSTRC("K"));
+  if (pKids == NULL) {
+    return;
+  }
+  if (pKids->GetType() == PDFOBJ_DICTIONARY) {
+    CPDF_StructElementImpl* pStructElementImpl =
+        new CPDF_StructElementImpl(this, NULL, (CPDF_Dictionary*)pKids);
+    m_Kids.Add(pStructElementImpl);
+    return;
+  }
+  if (pKids->GetType() != PDFOBJ_ARRAY) {
+    return;
+  }
+  CPDF_Array* pArray = (CPDF_Array*)pKids;
+  for (FX_DWORD i = 0; i < pArray->GetCount(); i++) {
+    CPDF_Dictionary* pKid = pArray->GetDict(i);
+    CPDF_StructElementImpl* pStructElementImpl =
+        new CPDF_StructElementImpl(this, NULL, pKid);
+    m_Kids.Add(pStructElementImpl);
+  }
 }
-void CPDF_StructTreeImpl::LoadDocTree()
-{
-    m_pPage = NULL;
-    if (m_pTreeRoot == NULL) {
-        return;
-    }
-    CPDF_Object* pKids = m_pTreeRoot->GetElementValue(FX_BSTRC("K"));
-    if (pKids == NULL) {
-        return;
-    }
-    if (pKids->GetType() == PDFOBJ_DICTIONARY) {
-        CPDF_StructElementImpl* pStructElementImpl = new CPDF_StructElementImpl(this, NULL, (CPDF_Dictionary*)pKids);
-        m_Kids.Add(pStructElementImpl);
-        return;
-    }
-    if (pKids->GetType() != PDFOBJ_ARRAY) {
-        return;
-    }
-    CPDF_Array* pArray = (CPDF_Array*)pKids;
-    for (FX_DWORD i = 0; i < pArray->GetCount(); i ++) {
-        CPDF_Dictionary* pKid = pArray->GetDict(i);
-        CPDF_StructElementImpl* pStructElementImpl = new CPDF_StructElementImpl(this, NULL, pKid);
-        m_Kids.Add(pStructElementImpl);
-    }
+void CPDF_StructTreeImpl::LoadPageTree(const CPDF_Dictionary* pPageDict) {
+  m_pPage = pPageDict;
+  if (m_pTreeRoot == NULL) {
+    return;
+  }
+  CPDF_Object* pKids = m_pTreeRoot->GetElementValue(FX_BSTRC("K"));
+  if (pKids == NULL) {
+    return;
+  }
+  FX_DWORD dwKids = 0;
+  if (pKids->GetType() == PDFOBJ_DICTIONARY) {
+    dwKids = 1;
+  } else if (pKids->GetType() == PDFOBJ_ARRAY) {
+    dwKids = ((CPDF_Array*)pKids)->GetCount();
+  } else {
+    return;
+  }
+  FX_DWORD i;
+  m_Kids.SetSize(dwKids);
+  for (i = 0; i < dwKids; i++) {
+    m_Kids[i] = NULL;
+  }
+  CFX_MapPtrToPtr element_map;
+  CPDF_Dictionary* pParentTree = m_pTreeRoot->GetDict(FX_BSTRC("ParentTree"));
+  if (pParentTree == NULL) {
+    return;
+  }
+  CPDF_NumberTree parent_tree(pParentTree);
+  int parents_id = pPageDict->GetInteger(FX_BSTRC("StructParents"), -1);
+  if (parents_id >= 0) {
+    CPDF_Object* pParents = parent_tree.LookupValue(parents_id);
+    if (pParents == NULL || pParents->GetType() != PDFOBJ_ARRAY) {
+      return;
+    }
+    CPDF_Array* pParentArray = (CPDF_Array*)pParents;
+    for (i = 0; i < pParentArray->GetCount(); i++) {
+      CPDF_Dictionary* pParent = pParentArray->GetDict(i);
+      if (pParent == NULL) {
+        continue;
+      }
+      AddPageNode(pParent, element_map);
+    }
+  }
 }
-void CPDF_StructTreeImpl::LoadPageTree(const CPDF_Dictionary* pPageDict)
-{
-    m_pPage = pPageDict;
-    if (m_pTreeRoot == NULL) {
-        return;
-    }
-    CPDF_Object* pKids = m_pTreeRoot->GetElementValue(FX_BSTRC("K"));
-    if (pKids == NULL) {
-        return;
-    }
-    FX_DWORD dwKids = 0;
-    if (pKids->GetType() == PDFOBJ_DICTIONARY) {
-        dwKids = 1;
-    } else if (pKids->GetType() == PDFOBJ_ARRAY) {
-        dwKids = ((CPDF_Array*)pKids)->GetCount();
-    } else {
-        return;
-    }
-    FX_DWORD i;
-    m_Kids.SetSize(dwKids);
-    for (i = 0; i < dwKids; i ++) {
-        m_Kids[i] = NULL;
-    }
-    CFX_MapPtrToPtr element_map;
-    CPDF_Dictionary* pParentTree = m_pTreeRoot->GetDict(FX_BSTRC("ParentTree"));
-    if (pParentTree == NULL) {
-        return;
-    }
-    CPDF_NumberTree parent_tree(pParentTree);
-    int parents_id = pPageDict->GetInteger(FX_BSTRC("StructParents"), -1);
-    if (parents_id >= 0) {
-        CPDF_Object* pParents = parent_tree.LookupValue(parents_id);
-        if (pParents == NULL || pParents->GetType() != PDFOBJ_ARRAY) {
-            return;
-        }
-        CPDF_Array* pParentArray = (CPDF_Array*)pParents;
-        for (i = 0; i < pParentArray->GetCount(); i ++) {
-            CPDF_Dictionary* pParent = pParentArray->GetDict(i);
-            if (pParent == NULL) {
-                continue;
-            }
-            AddPageNode(pParent, element_map);
-        }
-    }
+CPDF_StructElementImpl* CPDF_StructTreeImpl::AddPageNode(CPDF_Dictionary* pDict,
+                                                         CFX_MapPtrToPtr& map,
+                                                         int nLevel) {
+  if (nLevel > nMaxRecursion) {
+    return NULL;
+  }
+  CPDF_StructElementImpl* pElement = NULL;
+  if (map.Lookup(pDict, (void*&)pElement)) {
+    return pElement;
+  }
+  pElement = new CPDF_StructElementImpl(this, NULL, pDict);
+  map.SetAt(pDict, pElement);
+  CPDF_Dictionary* pParent = pDict->GetDict(FX_BSTRC("P"));
+  if (pParent == NULL ||
+      pParent->GetString(FX_BSTRC("Type")) == FX_BSTRC("StructTreeRoot")) {
+    if (!AddTopLevelNode(pDict, pElement)) {
+      pElement->Release();
+      map.RemoveKey(pDict);
+    }
+  } else {
+    CPDF_StructElementImpl* pParentElement =
+        AddPageNode(pParent, map, nLevel + 1);
+    FX_BOOL bSave = FALSE;
+    for (int i = 0; i < pParentElement->m_Kids.GetSize(); i++) {
+      if (pParentElement->m_Kids[i].m_Type != CPDF_StructKid::Element) {
+        continue;
+      }
+      if (pParentElement->m_Kids[i].m_Element.m_pDict != pDict) {
+        continue;
+      }
+      pParentElement->m_Kids[i].m_Element.m_pElement = pElement->Retain();
+      bSave = TRUE;
+    }
+    if (!bSave) {
+      pElement->Release();
+      map.RemoveKey(pDict);
+    }
+  }
+  return pElement;
 }
-CPDF_StructElementImpl* CPDF_StructTreeImpl::AddPageNode(CPDF_Dictionary* pDict, CFX_MapPtrToPtr& map, int nLevel)
-{
-    if (nLevel > nMaxRecursion) {
-        return NULL;
-    }
-    CPDF_StructElementImpl* pElement = NULL;
-    if (map.Lookup(pDict, (void*&)pElement)) {
-        return pElement;
-    }
-    pElement = new CPDF_StructElementImpl(this, NULL, pDict);
-    map.SetAt(pDict, pElement);
-    CPDF_Dictionary* pParent = pDict->GetDict(FX_BSTRC("P"));
-    if (pParent == NULL || pParent->GetString(FX_BSTRC("Type")) == FX_BSTRC("StructTreeRoot")) {
-        if (!AddTopLevelNode(pDict, pElement)) {
-            pElement->Release();
-            map.RemoveKey(pDict);
-        }
+FX_BOOL CPDF_StructTreeImpl::AddTopLevelNode(CPDF_Dictionary* pDict,
+                                             CPDF_StructElementImpl* pElement) {
+  CPDF_Object* pObj = m_pTreeRoot->GetElementValue(FX_BSTRC("K"));
+  if (!pObj) {
+    return FALSE;
+  }
+  if (pObj->GetType() == PDFOBJ_DICTIONARY) {
+    if (pObj->GetObjNum() == pDict->GetObjNum()) {
+      if (m_Kids[0]) {
+        m_Kids[0]->Release();
+      }
+      m_Kids[0] = pElement->Retain();
     } else {
-        CPDF_StructElementImpl* pParentElement = AddPageNode(pParent, map, nLevel + 1);
-        FX_BOOL bSave = FALSE;
-        for (int i = 0; i < pParentElement->m_Kids.GetSize(); i ++) {
-            if (pParentElement->m_Kids[i].m_Type != CPDF_StructKid::Element) {
-                continue;
-            }
-            if (pParentElement->m_Kids[i].m_Element.m_pDict != pDict) {
-                continue;
-            }
-            pParentElement->m_Kids[i].m_Element.m_pElement = pElement->Retain();
-            bSave = TRUE;
-        }
-        if (!bSave) {
-            pElement->Release();
-            map.RemoveKey(pDict);
-        }
+      return FALSE;
     }
-    return pElement;
+  }
+  if (pObj->GetType() == PDFOBJ_ARRAY) {
+    CPDF_Array* pTopKids = (CPDF_Array*)pObj;
+    FX_DWORD i;
+    FX_BOOL bSave = FALSE;
+    for (i = 0; i < pTopKids->GetCount(); i++) {
+      CPDF_Object* pKidRef = pTopKids->GetElement(i);
+      if (pKidRef == NULL || pKidRef->GetType() != PDFOBJ_REFERENCE) {
+        continue;
+      }
+      if (((CPDF_Reference*)pKidRef)->GetRefObjNum() != pDict->GetObjNum()) {
+        continue;
+      }
+      if (m_Kids[i]) {
+        m_Kids[i]->Release();
+      }
+      m_Kids[i] = pElement->Retain();
+      bSave = TRUE;
+    }
+    if (!bSave) {
+      return FALSE;
+    }
+  }
+  return TRUE;
 }
-FX_BOOL CPDF_StructTreeImpl::AddTopLevelNode(CPDF_Dictionary* pDict, CPDF_StructElementImpl* pElement)
-{
-    CPDF_Object *pObj = m_pTreeRoot->GetElementValue(FX_BSTRC("K"));
-    if (!pObj) {
-        return FALSE;
-    }
-    if (pObj->GetType() == PDFOBJ_DICTIONARY) {
-        if (pObj->GetObjNum() == pDict->GetObjNum()) {
-            if (m_Kids[0]) {
-                m_Kids[0]->Release();
-            }
-            m_Kids[0] = pElement->Retain();
-        } else {
-            return FALSE;
-        }
-    }
-    if (pObj->GetType() == PDFOBJ_ARRAY) {
-        CPDF_Array* pTopKids = (CPDF_Array*)pObj;
-        FX_DWORD i;
-        FX_BOOL bSave = FALSE;
-        for (i = 0; i < pTopKids->GetCount(); i ++) {
-            CPDF_Object* pKidRef = pTopKids->GetElement(i);
-            if (pKidRef == NULL || pKidRef->GetType() != PDFOBJ_REFERENCE) {
-                continue;
-            }
-            if (((CPDF_Reference*) pKidRef)->GetRefObjNum() != pDict->GetObjNum()) {
-                continue;
-            }
-            if (m_Kids[i]) {
-                m_Kids[i]->Release();
-            }
-            m_Kids[i] = pElement->Retain();
-            bSave = TRUE;
-        }
-        if (!bSave) {
-            return FALSE;
-        }
-    }
-    return TRUE;
+CPDF_StructElementImpl::CPDF_StructElementImpl(CPDF_StructTreeImpl* pTree,
+                                               CPDF_StructElementImpl* pParent,
+                                               CPDF_Dictionary* pDict)
+    : m_RefCount(0) {
+  m_pTree = pTree;
+  m_pDict = pDict;
+  m_Type = pDict->GetString(FX_BSTRC("S"));
+  if (pTree->m_pRoleMap) {
+    CFX_ByteString mapped = pTree->m_pRoleMap->GetString(m_Type);
+    if (!mapped.IsEmpty()) {
+      m_Type = mapped;
+    }
+  }
+  m_pParent = pParent;
+  LoadKids(pDict);
 }
-CPDF_StructElementImpl::CPDF_StructElementImpl(CPDF_StructTreeImpl* pTree, CPDF_StructElementImpl* pParent, CPDF_Dictionary* pDict)
-    : m_RefCount(0)
-{
-    m_pTree = pTree;
-    m_pDict = pDict;
-    m_Type = pDict->GetString(FX_BSTRC("S"));
-    if (pTree->m_pRoleMap) {
-        CFX_ByteString mapped = pTree->m_pRoleMap->GetString(m_Type);
-        if (!mapped.IsEmpty()) {
-            m_Type = mapped;
-        }
+CPDF_StructElementImpl::~CPDF_StructElementImpl() {
+  for (int i = 0; i < m_Kids.GetSize(); i++) {
+    if (m_Kids[i].m_Type == CPDF_StructKid::Element &&
+        m_Kids[i].m_Element.m_pElement) {
+      ((CPDF_StructElementImpl*)m_Kids[i].m_Element.m_pElement)->Release();
     }
-    m_pParent = pParent;
-    LoadKids(pDict);
+  }
 }
-CPDF_StructElementImpl::~CPDF_StructElementImpl()
-{
-    for (int i = 0; i < m_Kids.GetSize(); i ++) {
-        if (m_Kids[i].m_Type == CPDF_StructKid::Element && m_Kids[i].m_Element.m_pElement) {
-            ((CPDF_StructElementImpl*)m_Kids[i].m_Element.m_pElement)->Release();
-        }
-    }
+CPDF_StructElementImpl* CPDF_StructElementImpl::Retain() {
+  m_RefCount++;
+  return this;
 }
-CPDF_StructElementImpl* CPDF_StructElementImpl::Retain()
-{
-    m_RefCount++;
-    return this;
+void CPDF_StructElementImpl::Release() {
+  if (--m_RefCount < 1) {
+    delete this;
+  }
 }
-void CPDF_StructElementImpl::Release()
-{
-    if(--m_RefCount < 1) {
-        delete this;
-    }
+void CPDF_StructElementImpl::LoadKids(CPDF_Dictionary* pDict) {
+  CPDF_Object* pObj = pDict->GetElement(FX_BSTRC("Pg"));
+  FX_DWORD PageObjNum = 0;
+  if (pObj && pObj->GetType() == PDFOBJ_REFERENCE) {
+    PageObjNum = ((CPDF_Reference*)pObj)->GetRefObjNum();
+  }
+  CPDF_Object* pKids = pDict->GetElementValue(FX_BSTRC("K"));
+  if (pKids == NULL) {
+    return;
+  }
+  if (pKids->GetType() == PDFOBJ_ARRAY) {
+    CPDF_Array* pArray = (CPDF_Array*)pKids;
+    m_Kids.SetSize(pArray->GetCount());
+    for (FX_DWORD i = 0; i < pArray->GetCount(); i++) {
+      CPDF_Object* pKid = pArray->GetElementValue(i);
+      LoadKid(PageObjNum, pKid, &m_Kids[i]);
+    }
+  } else {
+    m_Kids.SetSize(1);
+    LoadKid(PageObjNum, pKids, &m_Kids[0]);
+  }
 }
-void CPDF_StructElementImpl::LoadKids(CPDF_Dictionary* pDict)
-{
-    CPDF_Object* pObj = pDict->GetElement(FX_BSTRC("Pg"));
-    FX_DWORD PageObjNum = 0;
-    if (pObj && pObj->GetType() == PDFOBJ_REFERENCE) {
-        PageObjNum = ((CPDF_Reference*)pObj)->GetRefObjNum();
-    }
-    CPDF_Object* pKids = pDict->GetElementValue(FX_BSTRC("K"));
-    if (pKids == NULL) {
-        return;
-    }
-    if (pKids->GetType() == PDFOBJ_ARRAY) {
-        CPDF_Array* pArray = (CPDF_Array*)pKids;
-        m_Kids.SetSize(pArray->GetCount());
-        for (FX_DWORD i = 0; i < pArray->GetCount(); i ++) {
-            CPDF_Object* pKid = pArray->GetElementValue(i);
-            LoadKid(PageObjNum, pKid, &m_Kids[i]);
-        }
+void CPDF_StructElementImpl::LoadKid(FX_DWORD PageObjNum,
+                                     CPDF_Object* pKidObj,
+                                     CPDF_StructKid* pKid) {
+  pKid->m_Type = CPDF_StructKid::Invalid;
+  if (pKidObj == NULL) {
+    return;
+  }
+  if (pKidObj->GetType() == PDFOBJ_NUMBER) {
+    if (m_pTree->m_pPage && m_pTree->m_pPage->GetObjNum() != PageObjNum) {
+      return;
+    }
+    pKid->m_Type = CPDF_StructKid::PageContent;
+    pKid->m_PageContent.m_ContentId = pKidObj->GetInteger();
+    pKid->m_PageContent.m_PageObjNum = PageObjNum;
+    return;
+  }
+  if (pKidObj->GetType() != PDFOBJ_DICTIONARY) {
+    return;
+  }
+  CPDF_Dictionary* pKidDict = (CPDF_Dictionary*)pKidObj;
+  CPDF_Object* pPageObj = pKidDict->GetElement(FX_BSTRC("Pg"));
+  if (pPageObj && pPageObj->GetType() == PDFOBJ_REFERENCE) {
+    PageObjNum = ((CPDF_Reference*)pPageObj)->GetRefObjNum();
+  }
+  CFX_ByteString type = pKidDict->GetString(FX_BSTRC("Type"));
+  if (type == FX_BSTRC("MCR")) {
+    if (m_pTree->m_pPage && m_pTree->m_pPage->GetObjNum() != PageObjNum) {
+      return;
+    }
+    pKid->m_Type = CPDF_StructKid::StreamContent;
+    CPDF_Object* pStreamObj = pKidDict->GetElement(FX_BSTRC("Stm"));
+    if (pStreamObj && pStreamObj->GetType() == PDFOBJ_REFERENCE) {
+      pKid->m_StreamContent.m_RefObjNum =
+          ((CPDF_Reference*)pStreamObj)->GetRefObjNum();
     } else {
-        m_Kids.SetSize(1);
-        LoadKid(PageObjNum, pKids, &m_Kids[0]);
-    }
-}
-void CPDF_StructElementImpl::LoadKid(FX_DWORD PageObjNum, CPDF_Object* pKidObj, CPDF_StructKid* pKid)
-{
-    pKid->m_Type = CPDF_StructKid::Invalid;
-    if (pKidObj == NULL) {
-        return;
+      pKid->m_StreamContent.m_RefObjNum = 0;
     }
-    if (pKidObj->GetType() == PDFOBJ_NUMBER) {
-        if (m_pTree->m_pPage && m_pTree->m_pPage->GetObjNum() != PageObjNum) {
-            return;
-        }
-        pKid->m_Type = CPDF_StructKid::PageContent;
-        pKid->m_PageContent.m_ContentId = pKidObj->GetInteger();
-        pKid->m_PageContent.m_PageObjNum = PageObjNum;
-        return;
+    pKid->m_StreamContent.m_PageObjNum = PageObjNum;
+    pKid->m_StreamContent.m_ContentId = pKidDict->GetInteger(FX_BSTRC("MCID"));
+  } else if (type == FX_BSTRC("OBJR")) {
+    if (m_pTree->m_pPage && m_pTree->m_pPage->GetObjNum() != PageObjNum) {
+      return;
     }
-    if (pKidObj->GetType() != PDFOBJ_DICTIONARY) {
-        return;
-    }
-    CPDF_Dictionary* pKidDict = (CPDF_Dictionary*)pKidObj;
-    CPDF_Object* pPageObj = pKidDict->GetElement(FX_BSTRC("Pg"));
-    if (pPageObj && pPageObj->GetType() == PDFOBJ_REFERENCE) {
-        PageObjNum = ((CPDF_Reference*)pPageObj)->GetRefObjNum();
-    }
-    CFX_ByteString type = pKidDict->GetString(FX_BSTRC("Type"));
-    if (type == FX_BSTRC("MCR")) {
-        if (m_pTree->m_pPage && m_pTree->m_pPage->GetObjNum() != PageObjNum) {
-            return;
-        }
-        pKid->m_Type = CPDF_StructKid::StreamContent;
-        CPDF_Object* pStreamObj = pKidDict->GetElement(FX_BSTRC("Stm"));
-        if (pStreamObj && pStreamObj->GetType() == PDFOBJ_REFERENCE) {
-            pKid->m_StreamContent.m_RefObjNum = ((CPDF_Reference*)pStreamObj)->GetRefObjNum();
-        } else {
-            pKid->m_StreamContent.m_RefObjNum = 0;
-        }
-        pKid->m_StreamContent.m_PageObjNum = PageObjNum;
-        pKid->m_StreamContent.m_ContentId = pKidDict->GetInteger(FX_BSTRC("MCID"));
-    } else if (type == FX_BSTRC("OBJR")) {
-        if (m_pTree->m_pPage && m_pTree->m_pPage->GetObjNum() != PageObjNum) {
-            return;
-        }
-        pKid->m_Type = CPDF_StructKid::Object;
-        CPDF_Object* pObj = pKidDict->GetElement(FX_BSTRC("Obj"));
-        if (pObj && pObj->GetType() == PDFOBJ_REFERENCE) {
-            pKid->m_Object.m_RefObjNum = ((CPDF_Reference*)pObj)->GetRefObjNum();
-        } else {
-            pKid->m_Object.m_RefObjNum = 0;
-        }
-        pKid->m_Object.m_PageObjNum = PageObjNum;
+    pKid->m_Type = CPDF_StructKid::Object;
+    CPDF_Object* pObj = pKidDict->GetElement(FX_BSTRC("Obj"));
+    if (pObj && pObj->GetType() == PDFOBJ_REFERENCE) {
+      pKid->m_Object.m_RefObjNum = ((CPDF_Reference*)pObj)->GetRefObjNum();
+    } else {
+      pKid->m_Object.m_RefObjNum = 0;
+    }
+    pKid->m_Object.m_PageObjNum = PageObjNum;
+  } else {
+    pKid->m_Type = CPDF_StructKid::Element;
+    pKid->m_Element.m_pDict = pKidDict;
+    if (m_pTree->m_pPage == NULL) {
+      pKid->m_Element.m_pElement =
+          new CPDF_StructElementImpl(m_pTree, this, pKidDict);
     } else {
-        pKid->m_Type = CPDF_StructKid::Element;
-        pKid->m_Element.m_pDict = pKidDict;
-        if (m_pTree->m_pPage == NULL) {
-            pKid->m_Element.m_pElement = new CPDF_StructElementImpl(m_pTree, this, pKidDict);
-        } else {
-            pKid->m_Element.m_pElement = NULL;
-        }
+      pKid->m_Element.m_pElement = NULL;
     }
+  }
 }
-static CPDF_Dictionary* FindAttrDict(CPDF_Object* pAttrs, const CFX_ByteStringC& owner, FX_FLOAT nLevel = 0.0F)
-{
-    if (nLevel > nMaxRecursion) {
-        return NULL;
-    }
-    if (pAttrs == NULL) {
-        return NULL;
-    }
-    CPDF_Dictionary* pDict = NULL;
-    if (pAttrs->GetType() == PDFOBJ_DICTIONARY) {
-        pDict = (CPDF_Dictionary*)pAttrs;
-    } else if (pAttrs->GetType() == PDFOBJ_STREAM) {
-        pDict = ((CPDF_Stream*)pAttrs)->GetDict();
-    } else if (pAttrs->GetType() == PDFOBJ_ARRAY) {
-        CPDF_Array* pArray = (CPDF_Array*)pAttrs;
-        for (FX_DWORD i = 0; i < pArray->GetCount(); i ++) {
-            CPDF_Object* pElement = pArray->GetElementValue(i);
-            pDict = FindAttrDict(pElement, owner, nLevel + 1);
-            if (pDict) {
-                return pDict;
-            }
-        }
-    }
-    if (pDict && pDict->GetString(FX_BSTRC("O")) == owner) {
+static CPDF_Dictionary* FindAttrDict(CPDF_Object* pAttrs,
+                                     const CFX_ByteStringC& owner,
+                                     FX_FLOAT nLevel = 0.0F) {
+  if (nLevel > nMaxRecursion) {
+    return NULL;
+  }
+  if (pAttrs == NULL) {
+    return NULL;
+  }
+  CPDF_Dictionary* pDict = NULL;
+  if (pAttrs->GetType() == PDFOBJ_DICTIONARY) {
+    pDict = (CPDF_Dictionary*)pAttrs;
+  } else if (pAttrs->GetType() == PDFOBJ_STREAM) {
+    pDict = ((CPDF_Stream*)pAttrs)->GetDict();
+  } else if (pAttrs->GetType() == PDFOBJ_ARRAY) {
+    CPDF_Array* pArray = (CPDF_Array*)pAttrs;
+    for (FX_DWORD i = 0; i < pArray->GetCount(); i++) {
+      CPDF_Object* pElement = pArray->GetElementValue(i);
+      pDict = FindAttrDict(pElement, owner, nLevel + 1);
+      if (pDict) {
         return pDict;
+      }
     }
-    return NULL;
+  }
+  if (pDict && pDict->GetString(FX_BSTRC("O")) == owner) {
+    return pDict;
+  }
+  return NULL;
 }
-CPDF_Object* CPDF_StructElementImpl::GetAttr(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_BOOL bInheritable, FX_FLOAT fLevel)
-{
-    if (fLevel > nMaxRecursion) {
-        return NULL;
-    }
-    if (bInheritable) {
-        CPDF_Object* pAttr = GetAttr(owner, name, FALSE);
-        if (pAttr) {
-            return pAttr;
-        }
-        if (m_pParent == NULL) {
-            return NULL;
-        }
-        return m_pParent->GetAttr(owner, name, TRUE, fLevel + 1);
-    }
-    CPDF_Object* pA = m_pDict->GetElementValue(FX_BSTRC("A"));
-    if (pA) {
-        CPDF_Dictionary* pAttrDict = FindAttrDict(pA, owner);
-        if (pAttrDict) {
-            CPDF_Object* pAttr = pAttrDict->GetElementValue(name);
-            if (pAttr) {
-                return pAttr;
-            }
-        }
-    }
-    CPDF_Object* pC = m_pDict->GetElementValue(FX_BSTRC("C"));
-    if (pC == NULL) {
-        return NULL;
-    }
-    CPDF_Dictionary* pClassMap = m_pTree->m_pTreeRoot->GetDict(FX_BSTRC("ClassMap"));
-    if (pClassMap == NULL) {
-        return NULL;
-    }
-    if (pC->GetType() == PDFOBJ_ARRAY) {
-        CPDF_Array* pArray = (CPDF_Array*)pC;
-        for (FX_DWORD i = 0; i < pArray->GetCount(); i ++) {
-            CFX_ByteString class_name = pArray->GetString(i);
-            CPDF_Dictionary* pClassDict = pClassMap->GetDict(class_name);
-            if (pClassDict && pClassDict->GetString(FX_BSTRC("O")) == owner) {
-                return pClassDict->GetElementValue(name);
-            }
-        }
-        return NULL;
+CPDF_Object* CPDF_StructElementImpl::GetAttr(const CFX_ByteStringC& owner,
+                                             const CFX_ByteStringC& name,
+                                             FX_BOOL bInheritable,
+                                             FX_FLOAT fLevel) {
+  if (fLevel > nMaxRecursion) {
+    return NULL;
+  }
+  if (bInheritable) {
+    CPDF_Object* pAttr = GetAttr(owner, name, FALSE);
+    if (pAttr) {
+      return pAttr;
+    }
+    if (m_pParent == NULL) {
+      return NULL;
+    }
+    return m_pParent->GetAttr(owner, name, TRUE, fLevel + 1);
+  }
+  CPDF_Object* pA = m_pDict->GetElementValue(FX_BSTRC("A"));
+  if (pA) {
+    CPDF_Dictionary* pAttrDict = FindAttrDict(pA, owner);
+    if (pAttrDict) {
+      CPDF_Object* pAttr = pAttrDict->GetElementValue(name);
+      if (pAttr) {
+        return pAttr;
+      }
     }
-    CFX_ByteString class_name = pC->GetString();
-    CPDF_Dictionary* pClassDict = pClassMap->GetDict(class_name);
-    if (pClassDict && pClassDict->GetString(FX_BSTRC("O")) == owner) {
+  }
+  CPDF_Object* pC = m_pDict->GetElementValue(FX_BSTRC("C"));
+  if (pC == NULL) {
+    return NULL;
+  }
+  CPDF_Dictionary* pClassMap =
+      m_pTree->m_pTreeRoot->GetDict(FX_BSTRC("ClassMap"));
+  if (pClassMap == NULL) {
+    return NULL;
+  }
+  if (pC->GetType() == PDFOBJ_ARRAY) {
+    CPDF_Array* pArray = (CPDF_Array*)pC;
+    for (FX_DWORD i = 0; i < pArray->GetCount(); i++) {
+      CFX_ByteString class_name = pArray->GetString(i);
+      CPDF_Dictionary* pClassDict = pClassMap->GetDict(class_name);
+      if (pClassDict && pClassDict->GetString(FX_BSTRC("O")) == owner) {
         return pClassDict->GetElementValue(name);
+      }
     }
     return NULL;
+  }
+  CFX_ByteString class_name = pC->GetString();
+  CPDF_Dictionary* pClassDict = pClassMap->GetDict(class_name);
+  if (pClassDict && pClassDict->GetString(FX_BSTRC("O")) == owner) {
+    return pClassDict->GetElementValue(name);
+  }
+  return NULL;
 }
-CPDF_Object* CPDF_StructElementImpl::GetAttr(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_BOOL bInheritable, int subindex)
-{
-    CPDF_Object* pAttr = GetAttr(owner, name, bInheritable);
-    if (pAttr == NULL || subindex == -1 || pAttr->GetType() != PDFOBJ_ARRAY) {
-        return pAttr;
-    }
-    CPDF_Array* pArray = (CPDF_Array*)pAttr;
-    if (subindex >= (int)pArray->GetCount()) {
-        return pAttr;
-    }
-    return pArray->GetElementValue(subindex);
+CPDF_Object* CPDF_StructElementImpl::GetAttr(const CFX_ByteStringC& owner,
+                                             const CFX_ByteStringC& name,
+                                             FX_BOOL bInheritable,
+                                             int subindex) {
+  CPDF_Object* pAttr = GetAttr(owner, name, bInheritable);
+  if (pAttr == NULL || subindex == -1 || pAttr->GetType() != PDFOBJ_ARRAY) {
+    return pAttr;
+  }
+  CPDF_Array* pArray = (CPDF_Array*)pAttr;
+  if (subindex >= (int)pArray->GetCount()) {
+    return pAttr;
+  }
+  return pArray->GetElementValue(subindex);
 }
-CFX_ByteString CPDF_StructElementImpl::GetName(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, const CFX_ByteStringC& default_value, FX_BOOL bInheritable, int subindex)
-{
-    CPDF_Object* pAttr = GetAttr(owner, name, bInheritable, subindex);
-    if (pAttr == NULL || pAttr->GetType() != PDFOBJ_NAME) {
-        return default_value;
-    }
-    return pAttr->GetString();
+CFX_ByteString CPDF_StructElementImpl::GetName(
+    const CFX_ByteStringC& owner,
+    const CFX_ByteStringC& name,
+    const CFX_ByteStringC& default_value,
+    FX_BOOL bInheritable,
+    int subindex) {
+  CPDF_Object* pAttr = GetAttr(owner, name, bInheritable, subindex);
+  if (pAttr == NULL || pAttr->GetType() != PDFOBJ_NAME) {
+    return default_value;
+  }
+  return pAttr->GetString();
 }
-FX_ARGB	CPDF_StructElementImpl::GetColor(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_ARGB default_value, FX_BOOL bInheritable, int subindex)
-{
-    CPDF_Object* pAttr = GetAttr(owner, name, bInheritable, subindex);
-    if (pAttr == NULL || pAttr->GetType() != PDFOBJ_ARRAY) {
-        return default_value;
-    }
-    CPDF_Array* pArray = (CPDF_Array*)pAttr;
-    return 0xff000000 | ((int)(pArray->GetNumber(0) * 255) << 16) | ((int)(pArray->GetNumber(1) * 255) << 8) | (int)(pArray->GetNumber(2) * 255);
+FX_ARGB CPDF_StructElementImpl::GetColor(const CFX_ByteStringC& owner,
+                                         const CFX_ByteStringC& name,
+                                         FX_ARGB default_value,
+                                         FX_BOOL bInheritable,
+                                         int subindex) {
+  CPDF_Object* pAttr = GetAttr(owner, name, bInheritable, subindex);
+  if (pAttr == NULL || pAttr->GetType() != PDFOBJ_ARRAY) {
+    return default_value;
+  }
+  CPDF_Array* pArray = (CPDF_Array*)pAttr;
+  return 0xff000000 | ((int)(pArray->GetNumber(0) * 255) << 16) |
+         ((int)(pArray->GetNumber(1) * 255) << 8) |
+         (int)(pArray->GetNumber(2) * 255);
 }
-FX_FLOAT CPDF_StructElementImpl::GetNumber(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_FLOAT default_value, FX_BOOL bInheritable, int subindex)
-{
-    CPDF_Object* pAttr = GetAttr(owner, name, bInheritable, subindex);
-    if (pAttr == NULL || pAttr->GetType() != PDFOBJ_NUMBER) {
-        return default_value;
-    }
-    return pAttr->GetNumber();
+FX_FLOAT CPDF_StructElementImpl::GetNumber(const CFX_ByteStringC& owner,
+                                           const CFX_ByteStringC& name,
+                                           FX_FLOAT default_value,
+                                           FX_BOOL bInheritable,
+                                           int subindex) {
+  CPDF_Object* pAttr = GetAttr(owner, name, bInheritable, subindex);
+  if (pAttr == NULL || pAttr->GetType() != PDFOBJ_NUMBER) {
+    return default_value;
+  }
+  return pAttr->GetNumber();
 }
-int	CPDF_StructElementImpl::GetInteger(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, int default_value, FX_BOOL bInheritable, int subindex)
-{
-    CPDF_Object* pAttr = GetAttr(owner, name, bInheritable, subindex);
-    if (pAttr == NULL || pAttr->GetType() != PDFOBJ_NUMBER) {
-        return default_value;
-    }
-    return pAttr->GetInteger();
+int CPDF_StructElementImpl::GetInteger(const CFX_ByteStringC& owner,
+                                       const CFX_ByteStringC& name,
+                                       int default_value,
+                                       FX_BOOL bInheritable,
+                                       int subindex) {
+  CPDF_Object* pAttr = GetAttr(owner, name, bInheritable, subindex);
+  if (pAttr == NULL || pAttr->GetType() != PDFOBJ_NUMBER) {
+    return default_value;
+  }
+  return pAttr->GetInteger();
 }
diff --git a/core/src/fpdfdoc/doc_utils.cpp b/core/src/fpdfdoc/doc_utils.cpp
index 96d2ccf689..1ed0017078 100644
--- a/core/src/fpdfdoc/doc_utils.cpp
+++ b/core/src/fpdfdoc/doc_utils.cpp
@@ -9,724 +9,732 @@
 
 static const int FPDFDOC_UTILS_MAXRECURSION = 32;
 
-CFX_WideString GetFullName(CPDF_Dictionary* pFieldDict)
-{
-    CFX_WideString full_name;
-    CPDF_Dictionary* pLevel = pFieldDict;
-    while (pLevel) {
-        CFX_WideString short_name = pLevel->GetUnicodeText("T");
-        if (short_name != L"") {
-            if (full_name == L"") {
-                full_name = short_name;
-            } else {
-                full_name = short_name + L"." + full_name;
-            }
-        }
-        pLevel = pLevel->GetDict("Parent");
-    }
-    return full_name;
-}
-FX_BOOL CPDF_DefaultAppearance::HasFont()
-{
-    if (m_csDA.IsEmpty()) {
-        return FALSE;
-    }
-    CPDF_SimpleParser syntax(m_csDA);
-    return syntax.FindTagParam("Tf", 2);
+CFX_WideString GetFullName(CPDF_Dictionary* pFieldDict) {
+  CFX_WideString full_name;
+  CPDF_Dictionary* pLevel = pFieldDict;
+  while (pLevel) {
+    CFX_WideString short_name = pLevel->GetUnicodeText("T");
+    if (short_name != L"") {
+      if (full_name == L"") {
+        full_name = short_name;
+      } else {
+        full_name = short_name + L"." + full_name;
+      }
+    }
+    pLevel = pLevel->GetDict("Parent");
+  }
+  return full_name;
+}
+FX_BOOL CPDF_DefaultAppearance::HasFont() {
+  if (m_csDA.IsEmpty()) {
+    return FALSE;
+  }
+  CPDF_SimpleParser syntax(m_csDA);
+  return syntax.FindTagParam("Tf", 2);
 }
-CFX_ByteString CPDF_DefaultAppearance::GetFontString()
-{
-    CFX_ByteString csFont;
-    if (m_csDA.IsEmpty()) {
-        return csFont;
-    }
-    CPDF_SimpleParser syntax(m_csDA);
-    if (syntax.FindTagParam("Tf", 2)) {
-        csFont += (CFX_ByteString)syntax.GetWord();
-        csFont += " ";
-        csFont += (CFX_ByteString)syntax.GetWord();
-        csFont += " ";
-        csFont += (CFX_ByteString)syntax.GetWord();
-    }
+CFX_ByteString CPDF_DefaultAppearance::GetFontString() {
+  CFX_ByteString csFont;
+  if (m_csDA.IsEmpty()) {
     return csFont;
-}
-void CPDF_DefaultAppearance::GetFont(CFX_ByteString& csFontNameTag, FX_FLOAT& fFontSize)
-{
-    csFontNameTag = "";
-    fFontSize = 0;
-    if (m_csDA.IsEmpty()) {
-        return;
-    }
-    CPDF_SimpleParser syntax(m_csDA);
-    if (syntax.FindTagParam("Tf", 2)) {
-        csFontNameTag = (CFX_ByteString)syntax.GetWord();
-        csFontNameTag.Delete(0, 1);
-        fFontSize = FX_atof((CFX_ByteString)syntax.GetWord());
-    }
-    csFontNameTag = PDF_NameDecode(csFontNameTag);
-}
-FX_BOOL CPDF_DefaultAppearance::HasColor(FX_BOOL bStrokingOperation)
-{
-    if (m_csDA.IsEmpty()) {
-        return FALSE;
-    }
-    CPDF_SimpleParser syntax(m_csDA);
-    if (syntax.FindTagParam(bStrokingOperation ? "G" : "g", 1)) {
-        return TRUE;
-    }
-    syntax.SetPos(0);
-    if (syntax.FindTagParam(bStrokingOperation ? "RG" : "rg", 3)) {
-        return TRUE;
-    }
-    syntax.SetPos(0);
-    return syntax.FindTagParam(bStrokingOperation ? "K" : "k", 4);
-}
-CFX_ByteString CPDF_DefaultAppearance::GetColorString(FX_BOOL bStrokingOperation)
-{
-    CFX_ByteString csColor;
-    if (m_csDA.IsEmpty()) {
-        return csColor;
-    }
-    CPDF_SimpleParser syntax(m_csDA);
-    if (syntax.FindTagParam(bStrokingOperation ? "G" : "g", 1)) {
-        csColor += (CFX_ByteString)syntax.GetWord();
-        csColor += " ";
-        csColor += (CFX_ByteString)syntax.GetWord();
-        return csColor;
-    }
-    syntax.SetPos(0);
-    if (syntax.FindTagParam(bStrokingOperation ? "RG" : "rg", 3)) {
-        csColor += (CFX_ByteString)syntax.GetWord();
-        csColor += " ";
-        csColor += (CFX_ByteString)syntax.GetWord();
-        csColor += " ";
-        csColor += (CFX_ByteString)syntax.GetWord();
-        csColor += " ";
-        csColor += (CFX_ByteString)syntax.GetWord();
-        return csColor;
-    }
-    syntax.SetPos(0);
-    if (syntax.FindTagParam(bStrokingOperation ? "K" : "k", 4)) {
-        csColor += (CFX_ByteString)syntax.GetWord();
-        csColor += " ";
-        csColor += (CFX_ByteString)syntax.GetWord();
-        csColor += " ";
-        csColor += (CFX_ByteString)syntax.GetWord();
-        csColor += " ";
-        csColor += (CFX_ByteString)syntax.GetWord();
-        csColor += " ";
-        csColor += (CFX_ByteString)syntax.GetWord();
-    }
+  }
+  CPDF_SimpleParser syntax(m_csDA);
+  if (syntax.FindTagParam("Tf", 2)) {
+    csFont += (CFX_ByteString)syntax.GetWord();
+    csFont += " ";
+    csFont += (CFX_ByteString)syntax.GetWord();
+    csFont += " ";
+    csFont += (CFX_ByteString)syntax.GetWord();
+  }
+  return csFont;
+}
+void CPDF_DefaultAppearance::GetFont(CFX_ByteString& csFontNameTag,
+                                     FX_FLOAT& fFontSize) {
+  csFontNameTag = "";
+  fFontSize = 0;
+  if (m_csDA.IsEmpty()) {
+    return;
+  }
+  CPDF_SimpleParser syntax(m_csDA);
+  if (syntax.FindTagParam("Tf", 2)) {
+    csFontNameTag = (CFX_ByteString)syntax.GetWord();
+    csFontNameTag.Delete(0, 1);
+    fFontSize = FX_atof((CFX_ByteString)syntax.GetWord());
+  }
+  csFontNameTag = PDF_NameDecode(csFontNameTag);
+}
+FX_BOOL CPDF_DefaultAppearance::HasColor(FX_BOOL bStrokingOperation) {
+  if (m_csDA.IsEmpty()) {
+    return FALSE;
+  }
+  CPDF_SimpleParser syntax(m_csDA);
+  if (syntax.FindTagParam(bStrokingOperation ? "G" : "g", 1)) {
+    return TRUE;
+  }
+  syntax.SetPos(0);
+  if (syntax.FindTagParam(bStrokingOperation ? "RG" : "rg", 3)) {
+    return TRUE;
+  }
+  syntax.SetPos(0);
+  return syntax.FindTagParam(bStrokingOperation ? "K" : "k", 4);
+}
+CFX_ByteString CPDF_DefaultAppearance::GetColorString(
+    FX_BOOL bStrokingOperation) {
+  CFX_ByteString csColor;
+  if (m_csDA.IsEmpty()) {
+    return csColor;
+  }
+  CPDF_SimpleParser syntax(m_csDA);
+  if (syntax.FindTagParam(bStrokingOperation ? "G" : "g", 1)) {
+    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += " ";
+    csColor += (CFX_ByteString)syntax.GetWord();
     return csColor;
+  }
+  syntax.SetPos(0);
+  if (syntax.FindTagParam(bStrokingOperation ? "RG" : "rg", 3)) {
+    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += " ";
+    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += " ";
+    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += " ";
+    csColor += (CFX_ByteString)syntax.GetWord();
+    return csColor;
+  }
+  syntax.SetPos(0);
+  if (syntax.FindTagParam(bStrokingOperation ? "K" : "k", 4)) {
+    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += " ";
+    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += " ";
+    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += " ";
+    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += " ";
+    csColor += (CFX_ByteString)syntax.GetWord();
+  }
+  return csColor;
+}
+void CPDF_DefaultAppearance::GetColor(int& iColorType,
+                                      FX_FLOAT fc[4],
+                                      FX_BOOL bStrokingOperation) {
+  iColorType = COLORTYPE_TRANSPARENT;
+  for (int c = 0; c < 4; c++) {
+    fc[c] = 0;
+  }
+  if (m_csDA.IsEmpty()) {
+    return;
+  }
+  CPDF_SimpleParser syntax(m_csDA);
+  if (syntax.FindTagParam(bStrokingOperation ? "G" : "g", 1)) {
+    iColorType = COLORTYPE_GRAY;
+    fc[0] = FX_atof((CFX_ByteString)syntax.GetWord());
+    return;
+  }
+  syntax.SetPos(0);
+  if (syntax.FindTagParam(bStrokingOperation ? "RG" : "rg", 3)) {
+    iColorType = COLORTYPE_RGB;
+    fc[0] = FX_atof((CFX_ByteString)syntax.GetWord());
+    fc[1] = FX_atof((CFX_ByteString)syntax.GetWord());
+    fc[2] = FX_atof((CFX_ByteString)syntax.GetWord());
+    return;
+  }
+  syntax.SetPos(0);
+  if (syntax.FindTagParam(bStrokingOperation ? "K" : "k", 4)) {
+    iColorType = COLORTYPE_CMYK;
+    fc[0] = FX_atof((CFX_ByteString)syntax.GetWord());
+    fc[1] = FX_atof((CFX_ByteString)syntax.GetWord());
+    fc[2] = FX_atof((CFX_ByteString)syntax.GetWord());
+    fc[3] = FX_atof((CFX_ByteString)syntax.GetWord());
+  }
+}
+void CPDF_DefaultAppearance::GetColor(FX_ARGB& color,
+                                      int& iColorType,
+                                      FX_BOOL bStrokingOperation) {
+  color = 0;
+  iColorType = COLORTYPE_TRANSPARENT;
+  if (m_csDA.IsEmpty()) {
+    return;
+  }
+  CPDF_SimpleParser syntax(m_csDA);
+  if (syntax.FindTagParam(bStrokingOperation ? "G" : "g", 1)) {
+    iColorType = COLORTYPE_GRAY;
+    FX_FLOAT g = FX_atof((CFX_ByteString)syntax.GetWord()) * 255 + 0.5f;
+    color = ArgbEncode(255, (int)g, (int)g, (int)g);
+    return;
+  }
+  syntax.SetPos(0);
+  if (syntax.FindTagParam(bStrokingOperation ? "RG" : "rg", 3)) {
+    iColorType = COLORTYPE_RGB;
+    FX_FLOAT r = FX_atof((CFX_ByteString)syntax.GetWord()) * 255 + 0.5f;
+    FX_FLOAT g = FX_atof((CFX_ByteString)syntax.GetWord()) * 255 + 0.5f;
+    FX_FLOAT b = FX_atof((CFX_ByteString)syntax.GetWord()) * 255 + 0.5f;
+    color = ArgbEncode(255, (int)r, (int)g, (int)b);
+    return;
+  }
+  syntax.SetPos(0);
+  if (syntax.FindTagParam(bStrokingOperation ? "K" : "k", 4)) {
+    iColorType = COLORTYPE_CMYK;
+    FX_FLOAT c = FX_atof((CFX_ByteString)syntax.GetWord());
+    FX_FLOAT m = FX_atof((CFX_ByteString)syntax.GetWord());
+    FX_FLOAT y = FX_atof((CFX_ByteString)syntax.GetWord());
+    FX_FLOAT k = FX_atof((CFX_ByteString)syntax.GetWord());
+    FX_FLOAT r = 1.0f - FX_MIN(1.0f, c + k);
+    FX_FLOAT g = 1.0f - FX_MIN(1.0f, m + k);
+    FX_FLOAT b = 1.0f - FX_MIN(1.0f, y + k);
+    color = ArgbEncode(255, (int)(r * 255 + 0.5f), (int)(g * 255 + 0.5f),
+                       (int)(b * 255 + 0.5f));
+  }
+}
+FX_BOOL CPDF_DefaultAppearance::HasTextMatrix() {
+  if (m_csDA.IsEmpty()) {
+    return FALSE;
+  }
+  CPDF_SimpleParser syntax(m_csDA);
+  return syntax.FindTagParam("Tm", 6);
 }
-void CPDF_DefaultAppearance::GetColor(int& iColorType, FX_FLOAT fc[4], FX_BOOL bStrokingOperation)
-{
-    iColorType = COLORTYPE_TRANSPARENT;
-    for (int c = 0; c < 4; c ++) {
-        fc[c] = 0;
-    }
-    if (m_csDA.IsEmpty()) {
-        return;
-    }
-    CPDF_SimpleParser syntax(m_csDA);
-    if (syntax.FindTagParam(bStrokingOperation ? "G" : "g", 1)) {
-        iColorType = COLORTYPE_GRAY;
-        fc[0] = FX_atof((CFX_ByteString)syntax.GetWord());
-        return;
-    }
-    syntax.SetPos(0);
-    if (syntax.FindTagParam(bStrokingOperation ? "RG" : "rg", 3)) {
-        iColorType = COLORTYPE_RGB;
-        fc[0] = FX_atof((CFX_ByteString)syntax.GetWord());
-        fc[1] = FX_atof((CFX_ByteString)syntax.GetWord());
-        fc[2] = FX_atof((CFX_ByteString)syntax.GetWord());
-        return;
-    }
-    syntax.SetPos(0);
-    if (syntax.FindTagParam(bStrokingOperation ? "K" : "k", 4)) {
-        iColorType = COLORTYPE_CMYK;
-        fc[0] = FX_atof((CFX_ByteString)syntax.GetWord());
-        fc[1] = FX_atof((CFX_ByteString)syntax.GetWord());
-        fc[2] = FX_atof((CFX_ByteString)syntax.GetWord());
-        fc[3] = FX_atof((CFX_ByteString)syntax.GetWord());
-    }
-}
-void CPDF_DefaultAppearance::GetColor(FX_ARGB& color, int& iColorType, FX_BOOL bStrokingOperation)
-{
-    color = 0;
-    iColorType = COLORTYPE_TRANSPARENT;
-    if (m_csDA.IsEmpty()) {
-        return;
-    }
-    CPDF_SimpleParser syntax(m_csDA);
-    if (syntax.FindTagParam(bStrokingOperation ? "G" : "g", 1)) {
-        iColorType = COLORTYPE_GRAY;
-        FX_FLOAT g = FX_atof((CFX_ByteString)syntax.GetWord()) * 255 + 0.5f;
-        color = ArgbEncode(255, (int)g, (int)g, (int)g);
-        return;
-    }
-    syntax.SetPos(0);
-    if (syntax.FindTagParam(bStrokingOperation ? "RG" : "rg", 3)) {
-        iColorType = COLORTYPE_RGB;
-        FX_FLOAT r = FX_atof((CFX_ByteString)syntax.GetWord()) * 255 + 0.5f;
-        FX_FLOAT g = FX_atof((CFX_ByteString)syntax.GetWord()) * 255 + 0.5f;
-        FX_FLOAT b = FX_atof((CFX_ByteString)syntax.GetWord()) * 255 + 0.5f;
-        color = ArgbEncode(255, (int)r, (int)g, (int)b);
-        return;
-    }
-    syntax.SetPos(0);
-    if (syntax.FindTagParam(bStrokingOperation ? "K" : "k", 4)) {
-        iColorType = COLORTYPE_CMYK;
-        FX_FLOAT c = FX_atof((CFX_ByteString)syntax.GetWord());
-        FX_FLOAT m = FX_atof((CFX_ByteString)syntax.GetWord());
-        FX_FLOAT y = FX_atof((CFX_ByteString)syntax.GetWord());
-        FX_FLOAT k = FX_atof((CFX_ByteString)syntax.GetWord());
-        FX_FLOAT r = 1.0f - FX_MIN(1.0f, c + k);
-        FX_FLOAT g = 1.0f - FX_MIN(1.0f, m + k);
-        FX_FLOAT b = 1.0f - FX_MIN(1.0f, y + k);
-        color = ArgbEncode(255, (int)(r * 255 + 0.5f), (int)(g * 255 + 0.5f), (int)(b * 255 + 0.5f));
-    }
-}
-FX_BOOL CPDF_DefaultAppearance::HasTextMatrix()
-{
-    if (m_csDA.IsEmpty()) {
-        return FALSE;
-    }
-    CPDF_SimpleParser syntax(m_csDA);
-    return syntax.FindTagParam("Tm", 6);
-}
-CFX_ByteString CPDF_DefaultAppearance::GetTextMatrixString()
-{
-    CFX_ByteString csTM;
-    if (m_csDA.IsEmpty()) {
-        return csTM;
-    }
-    CPDF_SimpleParser syntax(m_csDA);
-    if (syntax.FindTagParam("Tm", 6)) {
-        for (int i = 0; i < 6; i ++) {
-            csTM += (CFX_ByteString)syntax.GetWord();
-            csTM += " ";
-        }
-        csTM += (CFX_ByteString)syntax.GetWord();
-    }
+CFX_ByteString CPDF_DefaultAppearance::GetTextMatrixString() {
+  CFX_ByteString csTM;
+  if (m_csDA.IsEmpty()) {
     return csTM;
-}
-CFX_AffineMatrix CPDF_DefaultAppearance::GetTextMatrix()
-{
-    CFX_AffineMatrix tm;
-    if (m_csDA.IsEmpty()) {
-        return tm;
-    }
-    CPDF_SimpleParser syntax(m_csDA);
-    if (syntax.FindTagParam("Tm", 6)) {
-        FX_FLOAT f[6];
-        for (int i = 0; i < 6; i ++) {
-            f[i] = FX_atof((CFX_ByteString)syntax.GetWord());
-        }
-        tm.Set(f[0], f[1], f[2], f[3], f[4], f[5]);
-    }
+  }
+  CPDF_SimpleParser syntax(m_csDA);
+  if (syntax.FindTagParam("Tm", 6)) {
+    for (int i = 0; i < 6; i++) {
+      csTM += (CFX_ByteString)syntax.GetWord();
+      csTM += " ";
+    }
+    csTM += (CFX_ByteString)syntax.GetWord();
+  }
+  return csTM;
+}
+CFX_AffineMatrix CPDF_DefaultAppearance::GetTextMatrix() {
+  CFX_AffineMatrix tm;
+  if (m_csDA.IsEmpty()) {
     return tm;
-}
-void InitInterFormDict(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument)
-{
-    if (pDocument == NULL) {
-        return;
-    }
+  }
+  CPDF_SimpleParser syntax(m_csDA);
+  if (syntax.FindTagParam("Tm", 6)) {
+    FX_FLOAT f[6];
+    for (int i = 0; i < 6; i++) {
+      f[i] = FX_atof((CFX_ByteString)syntax.GetWord());
+    }
+    tm.Set(f[0], f[1], f[2], f[3], f[4], f[5]);
+  }
+  return tm;
+}
+void InitInterFormDict(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument) {
+  if (pDocument == NULL) {
+    return;
+  }
+  if (pFormDict == NULL) {
+    pFormDict = CPDF_Dictionary::Create();
     if (pFormDict == NULL) {
-        pFormDict = CPDF_Dictionary::Create();
-        if (pFormDict == NULL) {
-            return;
-        }
-        FX_DWORD dwObjNum = pDocument->AddIndirectObject(pFormDict);
-        CPDF_Dictionary* pRoot = pDocument->GetRoot();
-        pRoot->SetAtReference("AcroForm", pDocument, dwObjNum);
-    }
-    CFX_ByteString csDA;
-    if (!pFormDict->KeyExist("DR")) {
-        CPDF_Font* pFont = NULL;
-        CFX_ByteString csBaseName, csDefault;
-        uint8_t charSet = CPDF_InterForm::GetNativeCharSet();
-        pFont = CPDF_InterForm::AddStandardFont(pDocument, "Helvetica");
-        if (pFont != NULL) {
-            AddInterFormFont(pFormDict, pDocument, pFont, csBaseName);
-            csDefault = csBaseName;
-        }
-        if (charSet != 0) {
-            CFX_ByteString csFontName = CPDF_InterForm::GetNativeFont(charSet, NULL);
-            if (pFont == NULL || csFontName != "Helvetica") {
-                pFont = CPDF_InterForm::AddNativeFont(pDocument);
-                if (pFont != NULL) {
-                    csBaseName = "";
-                    AddInterFormFont(pFormDict, pDocument, pFont, csBaseName);
-                    csDefault = csBaseName;
-                }
-            }
-        }
-        if (pFont != NULL) {
-            csDA = "/" + PDF_NameEncode(csDefault) + " 0 Tf";
-        }
-    }
-    if (!csDA.IsEmpty()) {
-        csDA += " ";
-    }
-    csDA += "0 g";
-    if (!pFormDict->KeyExist("DA")) {
-        pFormDict->SetAtString("DA", csDA);
-    }
-}
-FX_DWORD CountInterFormFonts(CPDF_Dictionary* pFormDict)
-{
-    if (pFormDict == NULL) {
-        return 0;
-    }
-    CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
-    if (pDR == NULL) {
-        return 0;
-    }
-    CPDF_Dictionary* pFonts = pDR->GetDict("Font");
-    if (pFonts == NULL) {
-        return 0;
-    }
-    FX_DWORD dwCount = 0;
-    FX_POSITION pos = pFonts->GetStartPos();
-    while (pos) {
-        CPDF_Object* pObj = NULL;
-        CFX_ByteString csKey;
-        pObj = pFonts->GetNextElement(pos, csKey);
-        if (pObj == NULL) {
-            continue;
-        }
-        CPDF_Object* pDirect = pObj->GetDirect();
-        if (pDirect != NULL && pDirect->GetType() == PDFOBJ_DICTIONARY) {
-            if (((CPDF_Dictionary*)pDirect)->GetString("Type") == "Font") {
-                dwCount ++;
-            }
-        }
-    }
-    return dwCount;
-}
-CPDF_Font* GetInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument, FX_DWORD index, CFX_ByteString& csNameTag)
-{
-    if (pFormDict == NULL) {
-        return NULL;
+      return;
+    }
+    FX_DWORD dwObjNum = pDocument->AddIndirectObject(pFormDict);
+    CPDF_Dictionary* pRoot = pDocument->GetRoot();
+    pRoot->SetAtReference("AcroForm", pDocument, dwObjNum);
+  }
+  CFX_ByteString csDA;
+  if (!pFormDict->KeyExist("DR")) {
+    CPDF_Font* pFont = NULL;
+    CFX_ByteString csBaseName, csDefault;
+    uint8_t charSet = CPDF_InterForm::GetNativeCharSet();
+    pFont = CPDF_InterForm::AddStandardFont(pDocument, "Helvetica");
+    if (pFont != NULL) {
+      AddInterFormFont(pFormDict, pDocument, pFont, csBaseName);
+      csDefault = csBaseName;
     }
-    CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
-    if (pDR == NULL) {
-        return NULL;
-    }
-    CPDF_Dictionary* pFonts = pDR->GetDict("Font");
-    if (pFonts == NULL) {
-        return NULL;
-    }
-    FX_DWORD dwCount = 0;
-    FX_POSITION pos = pFonts->GetStartPos();
-    while (pos) {
-        CPDF_Object* pObj = NULL;
-        CFX_ByteString csKey;
-        pObj = pFonts->GetNextElement(pos, csKey);
-        if (pObj == NULL) {
-            continue;
-        }
-        CPDF_Object* pDirect = pObj->GetDirect();
-        if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) {
-            continue;
-        }
-        CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect;
-        if (pElement->GetString("Type") != "Font") {
-            continue;
-        }
-        if (dwCount == index) {
-            csNameTag = csKey;
-            return pDocument->LoadFont(pElement);
+    if (charSet != 0) {
+      CFX_ByteString csFontName = CPDF_InterForm::GetNativeFont(charSet, NULL);
+      if (pFont == NULL || csFontName != "Helvetica") {
+        pFont = CPDF_InterForm::AddNativeFont(pDocument);
+        if (pFont != NULL) {
+          csBaseName = "";
+          AddInterFormFont(pFormDict, pDocument, pFont, csBaseName);
+          csDefault = csBaseName;
         }
-        dwCount ++;
+      }
     }
+    if (pFont != NULL) {
+      csDA = "/" + PDF_NameEncode(csDefault) + " 0 Tf";
+    }
+  }
+  if (!csDA.IsEmpty()) {
+    csDA += " ";
+  }
+  csDA += "0 g";
+  if (!pFormDict->KeyExist("DA")) {
+    pFormDict->SetAtString("DA", csDA);
+  }
+}
+FX_DWORD CountInterFormFonts(CPDF_Dictionary* pFormDict) {
+  if (pFormDict == NULL) {
+    return 0;
+  }
+  CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
+  if (pDR == NULL) {
+    return 0;
+  }
+  CPDF_Dictionary* pFonts = pDR->GetDict("Font");
+  if (pFonts == NULL) {
+    return 0;
+  }
+  FX_DWORD dwCount = 0;
+  FX_POSITION pos = pFonts->GetStartPos();
+  while (pos) {
+    CPDF_Object* pObj = NULL;
+    CFX_ByteString csKey;
+    pObj = pFonts->GetNextElement(pos, csKey);
+    if (pObj == NULL) {
+      continue;
+    }
+    CPDF_Object* pDirect = pObj->GetDirect();
+    if (pDirect != NULL && pDirect->GetType() == PDFOBJ_DICTIONARY) {
+      if (((CPDF_Dictionary*)pDirect)->GetString("Type") == "Font") {
+        dwCount++;
+      }
+    }
+  }
+  return dwCount;
+}
+CPDF_Font* GetInterFormFont(CPDF_Dictionary* pFormDict,
+                            CPDF_Document* pDocument,
+                            FX_DWORD index,
+                            CFX_ByteString& csNameTag) {
+  if (pFormDict == NULL) {
     return NULL;
-}
-CPDF_Font* GetInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument, CFX_ByteString csNameTag)
-{
-    CFX_ByteString csAlias = PDF_NameDecode(csNameTag);
-    if (pFormDict == NULL || csAlias.IsEmpty()) {
-        return NULL;
-    }
-    CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
-    if (pDR == NULL) {
-        return NULL;
-    }
-    CPDF_Dictionary* pFonts = pDR->GetDict("Font");
-    if (pFonts == NULL) {
-        return NULL;
-    }
-    CPDF_Dictionary* pElement = pFonts->GetDict(csAlias);
-    if (pElement == NULL) {
-        return NULL;
-    }
-    if (pElement->GetString("Type") == "Font") {
-        return pDocument->LoadFont(pElement);
-    }
+  }
+  CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
+  if (pDR == NULL) {
     return NULL;
-}
-CPDF_Font* GetInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument, CFX_ByteString csFontName, CFX_ByteString& csNameTag)
-{
-    if (pFormDict == NULL || csFontName.IsEmpty()) {
-        return NULL;
-    }
-    CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
-    if (pDR == NULL) {
-        return NULL;
-    }
-    CPDF_Dictionary* pFonts = pDR->GetDict("Font");
-    if (pFonts == NULL) {
-        return NULL;
-    }
-    FX_POSITION pos = pFonts->GetStartPos();
-    while (pos) {
-        CPDF_Object* pObj = NULL;
-        CFX_ByteString csKey;
-        pObj = pFonts->GetNextElement(pos, csKey);
-        if (pObj == NULL) {
-            continue;
-        }
-        CPDF_Object* pDirect = pObj->GetDirect();
-        if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) {
-            continue;
-        }
-        CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect;
-        if (pElement->GetString("Type") != "Font") {
-            continue;
-        }
-        CPDF_Font* pFind = pDocument->LoadFont(pElement);
-        if (pFind == NULL) {
-            continue;
-        }
-        CFX_ByteString csBaseFont;
-        csBaseFont = pFind->GetBaseFont();
-        csBaseFont.Remove(' ');
-        if (csBaseFont == csFontName) {
-            csNameTag = csKey;
-            return pFind;
-        }
-    }
+  }
+  CPDF_Dictionary* pFonts = pDR->GetDict("Font");
+  if (pFonts == NULL) {
     return NULL;
-}
-CPDF_Font* GetNativeInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument, uint8_t charSet, CFX_ByteString& csNameTag)
-{
-    if (pFormDict == NULL) {
-        return NULL;
-    }
-    CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
-    if (pDR == NULL) {
-        return NULL;
-    }
-    CPDF_Dictionary* pFonts = pDR->GetDict("Font");
-    if (pFonts == NULL) {
-        return NULL;
-    }
-    FX_POSITION pos = pFonts->GetStartPos();
-    while (pos) {
-        CPDF_Object* pObj = NULL;
-        CFX_ByteString csKey;
-        pObj = pFonts->GetNextElement(pos, csKey);
-        if (pObj == NULL) {
-            continue;
-        }
-        CPDF_Object* pDirect = pObj->GetDirect();
-        if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) {
-            continue;
-        }
-        CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect;
-        if (pElement->GetString("Type") != "Font") {
-            continue;
-        }
-        CPDF_Font* pFind = pDocument->LoadFont(pElement);
-        if (pFind == NULL) {
-            continue;
-        }
-        CFX_SubstFont* pSubst = (CFX_SubstFont*)pFind->GetSubstFont();
-        if (pSubst == NULL) {
-            continue;
-        }
-        if (pSubst->m_Charset == (int)charSet) {
-            csNameTag = csKey;
-            return pFind;
-        }
-    }
+  }
+  FX_DWORD dwCount = 0;
+  FX_POSITION pos = pFonts->GetStartPos();
+  while (pos) {
+    CPDF_Object* pObj = NULL;
+    CFX_ByteString csKey;
+    pObj = pFonts->GetNextElement(pos, csKey);
+    if (pObj == NULL) {
+      continue;
+    }
+    CPDF_Object* pDirect = pObj->GetDirect();
+    if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) {
+      continue;
+    }
+    CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect;
+    if (pElement->GetString("Type") != "Font") {
+      continue;
+    }
+    if (dwCount == index) {
+      csNameTag = csKey;
+      return pDocument->LoadFont(pElement);
+    }
+    dwCount++;
+  }
+  return NULL;
+}
+CPDF_Font* GetInterFormFont(CPDF_Dictionary* pFormDict,
+                            CPDF_Document* pDocument,
+                            CFX_ByteString csNameTag) {
+  CFX_ByteString csAlias = PDF_NameDecode(csNameTag);
+  if (pFormDict == NULL || csAlias.IsEmpty()) {
     return NULL;
-}
-CPDF_Font* GetNativeInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument, CFX_ByteString& csNameTag)
-{
-    csNameTag = "";
-    uint8_t charSet = CPDF_InterForm::GetNativeCharSet();
-    CFX_SubstFont* pSubst;
-    CPDF_Font* pFont = GetDefaultInterFormFont(pFormDict, pDocument);
-    if (pFont != NULL) {
-        pSubst = (CFX_SubstFont*)pFont->GetSubstFont();
-        if (pSubst != NULL && pSubst->m_Charset == (int)charSet) {
-            FindInterFormFont(pFormDict, pFont, csNameTag);
-            return pFont;
-        }
-    }
-    return GetNativeInterFormFont(pFormDict, pDocument, charSet, csNameTag);
-}
-FX_BOOL FindInterFormFont(CPDF_Dictionary* pFormDict, const CPDF_Font* pFont, CFX_ByteString& csNameTag)
-{
-    if (pFormDict == NULL || pFont == NULL) {
-        return FALSE;
-    }
-    CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
-    if (pDR == NULL) {
-        return FALSE;
-    }
-    CPDF_Dictionary* pFonts = pDR->GetDict("Font");
-    if (pFonts == NULL) {
-        return FALSE;
-    }
-    FX_POSITION pos = pFonts->GetStartPos();
-    while (pos) {
-        CPDF_Object* pObj = NULL;
-        CFX_ByteString csKey;
-        pObj = pFonts->GetNextElement(pos, csKey);
-        if (pObj == NULL) {
-            continue;
-        }
-        CPDF_Object* pDirect = pObj->GetDirect();
-        if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) {
-            continue;
-        }
-        CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect;
-        if (pElement->GetString("Type") != "Font") {
-            continue;
-        }
-        if (pFont->GetFontDict() == pElement) {
-            csNameTag = csKey;
-            return TRUE;
-        }
-    }
+  }
+  CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
+  if (pDR == NULL) {
+    return NULL;
+  }
+  CPDF_Dictionary* pFonts = pDR->GetDict("Font");
+  if (pFonts == NULL) {
+    return NULL;
+  }
+  CPDF_Dictionary* pElement = pFonts->GetDict(csAlias);
+  if (pElement == NULL) {
+    return NULL;
+  }
+  if (pElement->GetString("Type") == "Font") {
+    return pDocument->LoadFont(pElement);
+  }
+  return NULL;
+}
+CPDF_Font* GetInterFormFont(CPDF_Dictionary* pFormDict,
+                            CPDF_Document* pDocument,
+                            CFX_ByteString csFontName,
+                            CFX_ByteString& csNameTag) {
+  if (pFormDict == NULL || csFontName.IsEmpty()) {
+    return NULL;
+  }
+  CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
+  if (pDR == NULL) {
+    return NULL;
+  }
+  CPDF_Dictionary* pFonts = pDR->GetDict("Font");
+  if (pFonts == NULL) {
+    return NULL;
+  }
+  FX_POSITION pos = pFonts->GetStartPos();
+  while (pos) {
+    CPDF_Object* pObj = NULL;
+    CFX_ByteString csKey;
+    pObj = pFonts->GetNextElement(pos, csKey);
+    if (pObj == NULL) {
+      continue;
+    }
+    CPDF_Object* pDirect = pObj->GetDirect();
+    if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) {
+      continue;
+    }
+    CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect;
+    if (pElement->GetString("Type") != "Font") {
+      continue;
+    }
+    CPDF_Font* pFind = pDocument->LoadFont(pElement);
+    if (pFind == NULL) {
+      continue;
+    }
+    CFX_ByteString csBaseFont;
+    csBaseFont = pFind->GetBaseFont();
+    csBaseFont.Remove(' ');
+    if (csBaseFont == csFontName) {
+      csNameTag = csKey;
+      return pFind;
+    }
+  }
+  return NULL;
+}
+CPDF_Font* GetNativeInterFormFont(CPDF_Dictionary* pFormDict,
+                                  CPDF_Document* pDocument,
+                                  uint8_t charSet,
+                                  CFX_ByteString& csNameTag) {
+  if (pFormDict == NULL) {
+    return NULL;
+  }
+  CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
+  if (pDR == NULL) {
+    return NULL;
+  }
+  CPDF_Dictionary* pFonts = pDR->GetDict("Font");
+  if (pFonts == NULL) {
+    return NULL;
+  }
+  FX_POSITION pos = pFonts->GetStartPos();
+  while (pos) {
+    CPDF_Object* pObj = NULL;
+    CFX_ByteString csKey;
+    pObj = pFonts->GetNextElement(pos, csKey);
+    if (pObj == NULL) {
+      continue;
+    }
+    CPDF_Object* pDirect = pObj->GetDirect();
+    if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) {
+      continue;
+    }
+    CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect;
+    if (pElement->GetString("Type") != "Font") {
+      continue;
+    }
+    CPDF_Font* pFind = pDocument->LoadFont(pElement);
+    if (pFind == NULL) {
+      continue;
+    }
+    CFX_SubstFont* pSubst = (CFX_SubstFont*)pFind->GetSubstFont();
+    if (pSubst == NULL) {
+      continue;
+    }
+    if (pSubst->m_Charset == (int)charSet) {
+      csNameTag = csKey;
+      return pFind;
+    }
+  }
+  return NULL;
+}
+CPDF_Font* GetNativeInterFormFont(CPDF_Dictionary* pFormDict,
+                                  CPDF_Document* pDocument,
+                                  CFX_ByteString& csNameTag) {
+  csNameTag = "";
+  uint8_t charSet = CPDF_InterForm::GetNativeCharSet();
+  CFX_SubstFont* pSubst;
+  CPDF_Font* pFont = GetDefaultInterFormFont(pFormDict, pDocument);
+  if (pFont != NULL) {
+    pSubst = (CFX_SubstFont*)pFont->GetSubstFont();
+    if (pSubst != NULL && pSubst->m_Charset == (int)charSet) {
+      FindInterFormFont(pFormDict, pFont, csNameTag);
+      return pFont;
+    }
+  }
+  return GetNativeInterFormFont(pFormDict, pDocument, charSet, csNameTag);
+}
+FX_BOOL FindInterFormFont(CPDF_Dictionary* pFormDict,
+                          const CPDF_Font* pFont,
+                          CFX_ByteString& csNameTag) {
+  if (pFormDict == NULL || pFont == NULL) {
     return FALSE;
-}
-FX_BOOL FindInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument, CFX_ByteString csFontName, CPDF_Font*& pFont, CFX_ByteString& csNameTag)
-{
-    if (pFormDict == NULL) {
-        return FALSE;
-    }
-    CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
-    if (pDR == NULL) {
-        return FALSE;
-    }
-    CPDF_Dictionary* pFonts = pDR->GetDict("Font");
-    if (pFonts == NULL) {
-        return FALSE;
-    }
-    if (csFontName.GetLength() > 0) {
-        csFontName.Remove(' ');
-    }
-    FX_POSITION pos = pFonts->GetStartPos();
-    while (pos) {
-        CPDF_Object* pObj = NULL;
-        CFX_ByteString csKey, csTmp;
-        pObj = pFonts->GetNextElement(pos, csKey);
-        if (pObj == NULL) {
-            continue;
-        }
-        CPDF_Object* pDirect = pObj->GetDirect();
-        if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) {
-            continue;
-        }
-        CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect;
-        if (pElement->GetString("Type") != "Font") {
-            continue;
-        }
-        pFont = pDocument->LoadFont(pElement);
-        if (pFont == NULL) {
-            continue;
-        }
-        CFX_ByteString csBaseFont;
-        csBaseFont = pFont->GetBaseFont();
-        csBaseFont.Remove(' ');
-        if (csBaseFont == csFontName) {
-            csNameTag = csKey;
-            return TRUE;
-        }
-    }
+  }
+  CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
+  if (pDR == NULL) {
     return FALSE;
-}
-void AddInterFormFont(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument, const CPDF_Font* pFont, CFX_ByteString& csNameTag)
-{
+  }
+  CPDF_Dictionary* pFonts = pDR->GetDict("Font");
+  if (pFonts == NULL) {
+    return FALSE;
+  }
+  FX_POSITION pos = pFonts->GetStartPos();
+  while (pos) {
+    CPDF_Object* pObj = NULL;
+    CFX_ByteString csKey;
+    pObj = pFonts->GetNextElement(pos, csKey);
+    if (pObj == NULL) {
+      continue;
+    }
+    CPDF_Object* pDirect = pObj->GetDirect();
+    if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) {
+      continue;
+    }
+    CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect;
+    if (pElement->GetString("Type") != "Font") {
+      continue;
+    }
+    if (pFont->GetFontDict() == pElement) {
+      csNameTag = csKey;
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+FX_BOOL FindInterFormFont(CPDF_Dictionary* pFormDict,
+                          CPDF_Document* pDocument,
+                          CFX_ByteString csFontName,
+                          CPDF_Font*& pFont,
+                          CFX_ByteString& csNameTag) {
+  if (pFormDict == NULL) {
+    return FALSE;
+  }
+  CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
+  if (pDR == NULL) {
+    return FALSE;
+  }
+  CPDF_Dictionary* pFonts = pDR->GetDict("Font");
+  if (pFonts == NULL) {
+    return FALSE;
+  }
+  if (csFontName.GetLength() > 0) {
+    csFontName.Remove(' ');
+  }
+  FX_POSITION pos = pFonts->GetStartPos();
+  while (pos) {
+    CPDF_Object* pObj = NULL;
+    CFX_ByteString csKey, csTmp;
+    pObj = pFonts->GetNextElement(pos, csKey);
+    if (pObj == NULL) {
+      continue;
+    }
+    CPDF_Object* pDirect = pObj->GetDirect();
+    if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) {
+      continue;
+    }
+    CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect;
+    if (pElement->GetString("Type") != "Font") {
+      continue;
+    }
+    pFont = pDocument->LoadFont(pElement);
     if (pFont == NULL) {
-        return;
-    }
-    if (pFormDict == NULL) {
-        InitInterFormDict(pFormDict, pDocument);
-    }
-    CFX_ByteString csTag;
-    if (FindInterFormFont(pFormDict, pFont, csTag)) {
-        csNameTag = csTag;
-        return;
-    }
-    if (pFormDict == NULL) {
-        InitInterFormDict(pFormDict, pDocument);
-    }
-    CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
+      continue;
+    }
+    CFX_ByteString csBaseFont;
+    csBaseFont = pFont->GetBaseFont();
+    csBaseFont.Remove(' ');
+    if (csBaseFont == csFontName) {
+      csNameTag = csKey;
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+void AddInterFormFont(CPDF_Dictionary*& pFormDict,
+                      CPDF_Document* pDocument,
+                      const CPDF_Font* pFont,
+                      CFX_ByteString& csNameTag) {
+  if (pFont == NULL) {
+    return;
+  }
+  if (pFormDict == NULL) {
+    InitInterFormDict(pFormDict, pDocument);
+  }
+  CFX_ByteString csTag;
+  if (FindInterFormFont(pFormDict, pFont, csTag)) {
+    csNameTag = csTag;
+    return;
+  }
+  if (pFormDict == NULL) {
+    InitInterFormDict(pFormDict, pDocument);
+  }
+  CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
+  if (pDR == NULL) {
+    pDR = CPDF_Dictionary::Create();
     if (pDR == NULL) {
-        pDR = CPDF_Dictionary::Create();
-        if (pDR == NULL) {
-            return;
-        }
-        pFormDict->SetAt("DR", pDR);
-    }
-    CPDF_Dictionary* pFonts = pDR->GetDict("Font");
-    if (pFonts == NULL) {
-        pFonts = CPDF_Dictionary::Create();
-        pDR->SetAt("Font", pFonts);
-    }
-    if (csNameTag.IsEmpty()) {
-        csNameTag = pFont->GetBaseFont();
-    }
-    csNameTag.Remove(' ');
-    csNameTag = CPDF_InterForm::GenerateNewResourceName(pDR, "Font", 4, csNameTag);
-    pFonts->SetAtReference(csNameTag, pDocument, pFont->GetFontDict());
-}
-CPDF_Font* AddNativeInterFormFont(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument, uint8_t charSet, CFX_ByteString& csNameTag)
-{
-    if (pFormDict == NULL) {
-        InitInterFormDict(pFormDict, pDocument);
-    }
-    CFX_ByteString csTemp;
-    CPDF_Font* pFont = GetNativeInterFormFont(pFormDict, pDocument, charSet, csTemp);
-    if (pFont != NULL) {
-        csNameTag = csTemp;
-        return pFont;
-    }
-    CFX_ByteString csFontName = CPDF_InterForm::GetNativeFont(charSet);
-    if (!csFontName.IsEmpty()) {
-        if (FindInterFormFont(pFormDict, pDocument, csFontName, pFont, csNameTag)) {
-            return pFont;
-        }
-    }
-    pFont = CPDF_InterForm::AddNativeFont(charSet, pDocument);
-    if (pFont != NULL) {
-        AddInterFormFont(pFormDict, pDocument, pFont, csNameTag);
-    }
+      return;
+    }
+    pFormDict->SetAt("DR", pDR);
+  }
+  CPDF_Dictionary* pFonts = pDR->GetDict("Font");
+  if (pFonts == NULL) {
+    pFonts = CPDF_Dictionary::Create();
+    pDR->SetAt("Font", pFonts);
+  }
+  if (csNameTag.IsEmpty()) {
+    csNameTag = pFont->GetBaseFont();
+  }
+  csNameTag.Remove(' ');
+  csNameTag =
+      CPDF_InterForm::GenerateNewResourceName(pDR, "Font", 4, csNameTag);
+  pFonts->SetAtReference(csNameTag, pDocument, pFont->GetFontDict());
+}
+CPDF_Font* AddNativeInterFormFont(CPDF_Dictionary*& pFormDict,
+                                  CPDF_Document* pDocument,
+                                  uint8_t charSet,
+                                  CFX_ByteString& csNameTag) {
+  if (pFormDict == NULL) {
+    InitInterFormDict(pFormDict, pDocument);
+  }
+  CFX_ByteString csTemp;
+  CPDF_Font* pFont =
+      GetNativeInterFormFont(pFormDict, pDocument, charSet, csTemp);
+  if (pFont != NULL) {
+    csNameTag = csTemp;
     return pFont;
-}
-CPDF_Font* AddNativeInterFormFont(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument, CFX_ByteString& csNameTag)
-{
-    uint8_t charSet = CPDF_InterForm::GetNativeCharSet();
-    return AddNativeInterFormFont(pFormDict, pDocument, charSet, csNameTag);
-}
-void RemoveInterFormFont(CPDF_Dictionary* pFormDict, const CPDF_Font* pFont)
-{
-    if (pFormDict == NULL || pFont == NULL) {
-        return;
-    }
-    CFX_ByteString csTag;
-    if (!FindInterFormFont(pFormDict, pFont, csTag)) {
-        return;
-    }
-    CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
-    CPDF_Dictionary* pFonts = pDR->GetDict("Font");
-    pFonts->RemoveAt(csTag);
-}
-void RemoveInterFormFont(CPDF_Dictionary* pFormDict, CFX_ByteString csNameTag)
-{
-    if (pFormDict == NULL || csNameTag.IsEmpty()) {
-        return;
-    }
-    CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
-    if (pDR == NULL) {
-        return;
-    }
-    CPDF_Dictionary* pFonts = pDR->GetDict("Font");
-    if (pFonts == NULL) {
-        return;
-    }
-    pFonts->RemoveAt(csNameTag);
-}
-CPDF_Font* GetDefaultInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument)
-{
-    if (pFormDict == NULL) {
-        return NULL;
-    }
-    CPDF_DefaultAppearance cDA = pFormDict->GetString("DA");
-    CFX_ByteString csFontNameTag;
-    FX_FLOAT fFontSize;
-    cDA.GetFont(csFontNameTag, fFontSize);
-    return GetInterFormFont(pFormDict, pDocument, csFontNameTag);
-}
-CPDF_IconFit::ScaleMethod CPDF_IconFit::GetScaleMethod()
-{
-    if (!m_pDict) {
-        return Always;
-    }
-    CFX_ByteString csSW = m_pDict->GetString("SW", "A");
-    if (csSW == "B") {
-        return Bigger;
-    }
-    if (csSW == "S") {
-        return Smaller;
-    }
-    if (csSW == "N") {
-        return Never;
-    }
+  }
+  CFX_ByteString csFontName = CPDF_InterForm::GetNativeFont(charSet);
+  if (!csFontName.IsEmpty()) {
+    if (FindInterFormFont(pFormDict, pDocument, csFontName, pFont, csNameTag)) {
+      return pFont;
+    }
+  }
+  pFont = CPDF_InterForm::AddNativeFont(charSet, pDocument);
+  if (pFont != NULL) {
+    AddInterFormFont(pFormDict, pDocument, pFont, csNameTag);
+  }
+  return pFont;
+}
+CPDF_Font* AddNativeInterFormFont(CPDF_Dictionary*& pFormDict,
+                                  CPDF_Document* pDocument,
+                                  CFX_ByteString& csNameTag) {
+  uint8_t charSet = CPDF_InterForm::GetNativeCharSet();
+  return AddNativeInterFormFont(pFormDict, pDocument, charSet, csNameTag);
+}
+void RemoveInterFormFont(CPDF_Dictionary* pFormDict, const CPDF_Font* pFont) {
+  if (pFormDict == NULL || pFont == NULL) {
+    return;
+  }
+  CFX_ByteString csTag;
+  if (!FindInterFormFont(pFormDict, pFont, csTag)) {
+    return;
+  }
+  CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
+  CPDF_Dictionary* pFonts = pDR->GetDict("Font");
+  pFonts->RemoveAt(csTag);
+}
+void RemoveInterFormFont(CPDF_Dictionary* pFormDict, CFX_ByteString csNameTag) {
+  if (pFormDict == NULL || csNameTag.IsEmpty()) {
+    return;
+  }
+  CPDF_Dictionary* pDR = pFormDict->GetDict("DR");
+  if (pDR == NULL) {
+    return;
+  }
+  CPDF_Dictionary* pFonts = pDR->GetDict("Font");
+  if (pFonts == NULL) {
+    return;
+  }
+  pFonts->RemoveAt(csNameTag);
+}
+CPDF_Font* GetDefaultInterFormFont(CPDF_Dictionary* pFormDict,
+                                   CPDF_Document* pDocument) {
+  if (pFormDict == NULL) {
+    return NULL;
+  }
+  CPDF_DefaultAppearance cDA = pFormDict->GetString("DA");
+  CFX_ByteString csFontNameTag;
+  FX_FLOAT fFontSize;
+  cDA.GetFont(csFontNameTag, fFontSize);
+  return GetInterFormFont(pFormDict, pDocument, csFontNameTag);
+}
+CPDF_IconFit::ScaleMethod CPDF_IconFit::GetScaleMethod() {
+  if (!m_pDict) {
     return Always;
-}
-FX_BOOL CPDF_IconFit::IsProportionalScale()
-{
-    if (m_pDict == NULL) {
-        return TRUE;
-    }
-    return m_pDict->GetString("S", "P") != "A";
-}
-void CPDF_IconFit::GetIconPosition(FX_FLOAT& fLeft, FX_FLOAT& fBottom)
-{
-    fLeft = fBottom = 0.5;
-    if (m_pDict == NULL) {
-        return;
-    }
-    CPDF_Array* pA = m_pDict->GetArray("A");
-    if (pA != NULL) {
-        FX_DWORD dwCount = pA->GetCount();
-        if (dwCount > 0) {
-            fLeft = pA->GetNumber(0);
-        }
-        if (dwCount > 1) {
-            fBottom = pA->GetNumber(1);
-        }
-    }
-}
-FX_BOOL CPDF_IconFit::GetFittingBounds()
-{
-    if (m_pDict == NULL) {
-        return FALSE;
-    }
-    return m_pDict->GetBoolean("FB");
-}
-void SaveCheckedFieldStatus(CPDF_FormField* pField, CFX_ByteArray& statusArray)
-{
-    int iCount = pField->CountControls();
-    for (int i = 0; i < iCount; i ++) {
-        CPDF_FormControl* pControl = pField->GetControl(i);
-        if (pControl == NULL) {
-            continue;
-        }
-        statusArray.Add(pControl->IsChecked() ? 1 : 0);
-    }
-}
-CPDF_Object* FPDF_GetFieldAttr(CPDF_Dictionary* pFieldDict, const FX_CHAR* name, int nLevel)
-{
-    if (nLevel > FPDFDOC_UTILS_MAXRECURSION) {
-        return NULL;
-    }
-    if (pFieldDict == NULL) {
-        return NULL;
-    }
-    CPDF_Object* pAttr = pFieldDict->GetElementValue(name);
-    if (pAttr) {
-        return pAttr;
-    }
-    CPDF_Dictionary* pParent = pFieldDict->GetDict("Parent");
-    if (pParent == NULL) {
-        return NULL;
-    }
-    return FPDF_GetFieldAttr(pParent, name, nLevel + 1);
+  }
+  CFX_ByteString csSW = m_pDict->GetString("SW", "A");
+  if (csSW == "B") {
+    return Bigger;
+  }
+  if (csSW == "S") {
+    return Smaller;
+  }
+  if (csSW == "N") {
+    return Never;
+  }
+  return Always;
+}
+FX_BOOL CPDF_IconFit::IsProportionalScale() {
+  if (m_pDict == NULL) {
+    return TRUE;
+  }
+  return m_pDict->GetString("S", "P") != "A";
+}
+void CPDF_IconFit::GetIconPosition(FX_FLOAT& fLeft, FX_FLOAT& fBottom) {
+  fLeft = fBottom = 0.5;
+  if (m_pDict == NULL) {
+    return;
+  }
+  CPDF_Array* pA = m_pDict->GetArray("A");
+  if (pA != NULL) {
+    FX_DWORD dwCount = pA->GetCount();
+    if (dwCount > 0) {
+      fLeft = pA->GetNumber(0);
+    }
+    if (dwCount > 1) {
+      fBottom = pA->GetNumber(1);
+    }
+  }
+}
+FX_BOOL CPDF_IconFit::GetFittingBounds() {
+  if (m_pDict == NULL) {
+    return FALSE;
+  }
+  return m_pDict->GetBoolean("FB");
+}
+void SaveCheckedFieldStatus(CPDF_FormField* pField,
+                            CFX_ByteArray& statusArray) {
+  int iCount = pField->CountControls();
+  for (int i = 0; i < iCount; i++) {
+    CPDF_FormControl* pControl = pField->GetControl(i);
+    if (pControl == NULL) {
+      continue;
+    }
+    statusArray.Add(pControl->IsChecked() ? 1 : 0);
+  }
+}
+CPDF_Object* FPDF_GetFieldAttr(CPDF_Dictionary* pFieldDict,
+                               const FX_CHAR* name,
+                               int nLevel) {
+  if (nLevel > FPDFDOC_UTILS_MAXRECURSION) {
+    return NULL;
+  }
+  if (pFieldDict == NULL) {
+    return NULL;
+  }
+  CPDF_Object* pAttr = pFieldDict->GetElementValue(name);
+  if (pAttr) {
+    return pAttr;
+  }
+  CPDF_Dictionary* pParent = pFieldDict->GetDict("Parent");
+  if (pParent == NULL) {
+    return NULL;
+  }
+  return FPDF_GetFieldAttr(pParent, name, nLevel + 1);
 }
diff --git a/core/src/fpdfdoc/doc_utils.h b/core/src/fpdfdoc/doc_utils.h
index 6bb1d30dbb..4a6652f9c6 100644
--- a/core/src/fpdfdoc/doc_utils.h
+++ b/core/src/fpdfdoc/doc_utils.h
@@ -7,27 +7,57 @@
 #ifndef CORE_SRC_FPDFDOC_DOC_UTILS_H_
 #define CORE_SRC_FPDFDOC_DOC_UTILS_H_
 
-CFX_WideString	GetFullName(CPDF_Dictionary* pFieldDict);
-void			InitInterFormDict(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument);
-FX_DWORD		CountInterFormFonts(CPDF_Dictionary* pFormDict);
-CPDF_Font*		GetInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument, FX_DWORD index, CFX_ByteString& csNameTag);
-CPDF_Font*		GetInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument, CFX_ByteString csNameTag);
-CPDF_Font*		GetInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument, CFX_ByteString csFontName, CFX_ByteString& csNameTag);
-CPDF_Font*		GetNativeInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument, uint8_t charSet, CFX_ByteString& csNameTag);
-CPDF_Font*		GetNativeInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument, CFX_ByteString& csNameTag);
-FX_BOOL			FindInterFormFont(CPDF_Dictionary* pFormDict, const CPDF_Font* pFont, CFX_ByteString& csNameTag);
-FX_BOOL			FindInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument, CFX_ByteString csFontName, CPDF_Font*& pFont, CFX_ByteString& csNameTag);
-void			AddInterFormFont(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument, const CPDF_Font* pFont, CFX_ByteString& csNameTag);
-CPDF_Font*		AddNativeInterFormFont(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument, uint8_t charSet, CFX_ByteString& csNameTag);
-CPDF_Font*		AddNativeInterFormFont(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument, CFX_ByteString& csNameTag);
-void			RemoveInterFormFont(CPDF_Dictionary* pFormDict, const CPDF_Font* pFont);
-void			RemoveInterFormFont(CPDF_Dictionary* pFormDict, CFX_ByteString csNameTag);
-CPDF_Font*		GetDefaultInterFormFont(CPDF_Dictionary* pFormDict, CPDF_Document* pDocument);
-void			SetDefaultInterFormFont(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument, const CPDF_Font* pFont);
-void			SaveCheckedFieldStatus(CPDF_FormField* pField, CFX_ByteArray& statusArray);
-FX_BOOL			NeedPDFEncodeForFieldFullName(const CFX_WideString& csFieldName);
-FX_BOOL			NeedPDFEncodeForFieldTree(CPDF_Dictionary* pFieldDict, int nLevel = 0);
-void			EncodeFieldName(const CFX_WideString& csName, CFX_ByteString& csT);
-void			UpdateEncodeFieldName(CPDF_Dictionary* pFieldDict, int nLevel = 0);
+CFX_WideString GetFullName(CPDF_Dictionary* pFieldDict);
+void InitInterFormDict(CPDF_Dictionary*& pFormDict, CPDF_Document* pDocument);
+FX_DWORD CountInterFormFonts(CPDF_Dictionary* pFormDict);
+CPDF_Font* GetInterFormFont(CPDF_Dictionary* pFormDict,
+                            CPDF_Document* pDocument,
+                            FX_DWORD index,
+                            CFX_ByteString& csNameTag);
+CPDF_Font* GetInterFormFont(CPDF_Dictionary* pFormDict,
+                            CPDF_Document* pDocument,
+                            CFX_ByteString csNameTag);
+CPDF_Font* GetInterFormFont(CPDF_Dictionary* pFormDict,
+                            CPDF_Document* pDocument,
+                            CFX_ByteString csFontName,
+                            CFX_ByteString& csNameTag);
+CPDF_Font* GetNativeInterFormFont(CPDF_Dictionary* pFormDict,
+                                  CPDF_Document* pDocument,
+                                  uint8_t charSet,
+                                  CFX_ByteString& csNameTag);
+CPDF_Font* GetNativeInterFormFont(CPDF_Dictionary* pFormDict,
+                                  CPDF_Document* pDocument,
+                                  CFX_ByteString& csNameTag);
+FX_BOOL FindInterFormFont(CPDF_Dictionary* pFormDict,
+                          const CPDF_Font* pFont,
+                          CFX_ByteString& csNameTag);
+FX_BOOL FindInterFormFont(CPDF_Dictionary* pFormDict,
+                          CPDF_Document* pDocument,
+                          CFX_ByteString csFontName,
+                          CPDF_Font*& pFont,
+                          CFX_ByteString& csNameTag);
+void AddInterFormFont(CPDF_Dictionary*& pFormDict,
+                      CPDF_Document* pDocument,
+                      const CPDF_Font* pFont,
+                      CFX_ByteString& csNameTag);
+CPDF_Font* AddNativeInterFormFont(CPDF_Dictionary*& pFormDict,
+                                  CPDF_Document* pDocument,
+                                  uint8_t charSet,
+                                  CFX_ByteString& csNameTag);
+CPDF_Font* AddNativeInterFormFont(CPDF_Dictionary*& pFormDict,
+                                  CPDF_Document* pDocument,
+                                  CFX_ByteString& csNameTag);
+void RemoveInterFormFont(CPDF_Dictionary* pFormDict, const CPDF_Font* pFont);
+void RemoveInterFormFont(CPDF_Dictionary* pFormDict, CFX_ByteString csNameTag);
+CPDF_Font* GetDefaultInterFormFont(CPDF_Dictionary* pFormDict,
+                                   CPDF_Document* pDocument);
+void SetDefaultInterFormFont(CPDF_Dictionary*& pFormDict,
+                             CPDF_Document* pDocument,
+                             const CPDF_Font* pFont);
+void SaveCheckedFieldStatus(CPDF_FormField* pField, CFX_ByteArray& statusArray);
+FX_BOOL NeedPDFEncodeForFieldFullName(const CFX_WideString& csFieldName);
+FX_BOOL NeedPDFEncodeForFieldTree(CPDF_Dictionary* pFieldDict, int nLevel = 0);
+void EncodeFieldName(const CFX_WideString& csName, CFX_ByteString& csT);
+void UpdateEncodeFieldName(CPDF_Dictionary* pFieldDict, int nLevel = 0);
 
 #endif  // CORE_SRC_FPDFDOC_DOC_UTILS_H_
diff --git a/core/src/fpdfdoc/doc_viewerPreferences.cpp b/core/src/fpdfdoc/doc_viewerPreferences.cpp
index eb824eb5a4..50962b7d47 100644
--- a/core/src/fpdfdoc/doc_viewerPreferences.cpp
+++ b/core/src/fpdfdoc/doc_viewerPreferences.cpp
@@ -5,56 +5,48 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/fpdfdoc/fpdf_doc.h"
-CPDF_ViewerPreferences::CPDF_ViewerPreferences(CPDF_Document *pDoc): m_pDoc(pDoc)
-{
+CPDF_ViewerPreferences::CPDF_ViewerPreferences(CPDF_Document* pDoc)
+    : m_pDoc(pDoc) {}
+CPDF_ViewerPreferences::~CPDF_ViewerPreferences() {}
+FX_BOOL CPDF_ViewerPreferences::IsDirectionR2L() const {
+  CPDF_Dictionary* pDict = m_pDoc->GetRoot();
+  pDict = pDict->GetDict(FX_BSTRC("ViewerPreferences"));
+  if (!pDict) {
+    return FALSE;
+  }
+  return FX_BSTRC("R2L") == pDict->GetString(FX_BSTRC("Direction"));
 }
-CPDF_ViewerPreferences::~CPDF_ViewerPreferences()
-{
+FX_BOOL CPDF_ViewerPreferences::PrintScaling() const {
+  CPDF_Dictionary* pDict = m_pDoc->GetRoot();
+  pDict = pDict->GetDict(FX_BSTRC("ViewerPreferences"));
+  if (!pDict) {
+    return TRUE;
+  }
+  return FX_BSTRC("None") != pDict->GetString(FX_BSTRC("PrintScaling"));
 }
-FX_BOOL CPDF_ViewerPreferences::IsDirectionR2L() const
-{
-    CPDF_Dictionary *pDict = m_pDoc->GetRoot();
-    pDict = pDict->GetDict(FX_BSTRC("ViewerPreferences"));
-    if (!pDict)	{
-        return FALSE;
-    }
-    return FX_BSTRC("R2L") == pDict->GetString(FX_BSTRC("Direction"));
+int32_t CPDF_ViewerPreferences::NumCopies() const {
+  CPDF_Dictionary* pDict = m_pDoc->GetRoot();
+  pDict = pDict->GetDict(FX_BSTRC("ViewerPreferences"));
+  if (!pDict) {
+    return 1;
+  }
+  return pDict->GetInteger(FX_BSTRC("NumCopies"));
 }
-FX_BOOL CPDF_ViewerPreferences::PrintScaling() const
-{
-    CPDF_Dictionary *pDict = m_pDoc->GetRoot();
-    pDict = pDict->GetDict(FX_BSTRC("ViewerPreferences"));
-    if (!pDict)	{
-        return TRUE;
-    }
-    return FX_BSTRC("None") != pDict->GetString(FX_BSTRC("PrintScaling"));
-}
-int32_t CPDF_ViewerPreferences::NumCopies() const
-{
-    CPDF_Dictionary *pDict = m_pDoc->GetRoot();
-    pDict = pDict->GetDict(FX_BSTRC("ViewerPreferences"));
-    if (!pDict) {
-        return 1;
-    }
-    return pDict->GetInteger(FX_BSTRC("NumCopies"));
-}
-CPDF_Array* CPDF_ViewerPreferences::PrintPageRange() const
-{
-    CPDF_Dictionary *pDict = m_pDoc->GetRoot();
-    CPDF_Array *pRange = NULL;
-    pDict = pDict->GetDict(FX_BSTRC("ViewerPreferences"));
-    if (!pDict) {
-        return pRange;
-    }
-    pRange = pDict->GetArray(FX_BSTRC("PrintPageRange"));
+CPDF_Array* CPDF_ViewerPreferences::PrintPageRange() const {
+  CPDF_Dictionary* pDict = m_pDoc->GetRoot();
+  CPDF_Array* pRange = NULL;
+  pDict = pDict->GetDict(FX_BSTRC("ViewerPreferences"));
+  if (!pDict) {
     return pRange;
+  }
+  pRange = pDict->GetArray(FX_BSTRC("PrintPageRange"));
+  return pRange;
 }
-CFX_ByteString CPDF_ViewerPreferences::Duplex() const
-{
-    CPDF_Dictionary *pDict = m_pDoc->GetRoot();
-    pDict = pDict->GetDict(FX_BSTRC("ViewerPreferences"));
-    if (!pDict) {
-        return FX_BSTRC("None");
-    }
-    return pDict->GetString(FX_BSTRC("Duplex"));
+CFX_ByteString CPDF_ViewerPreferences::Duplex() const {
+  CPDF_Dictionary* pDict = m_pDoc->GetRoot();
+  pDict = pDict->GetDict(FX_BSTRC("ViewerPreferences"));
+  if (!pDict) {
+    return FX_BSTRC("None");
+  }
+  return pDict->GetString(FX_BSTRC("Duplex"));
 }
diff --git a/core/src/fpdfdoc/doc_vt.cpp b/core/src/fpdfdoc/doc_vt.cpp
index 230ba764e4..b7c8ed80f6 100644
--- a/core/src/fpdfdoc/doc_vt.cpp
+++ b/core/src/fpdfdoc/doc_vt.cpp
@@ -7,1833 +7,1823 @@
 #include "../../include/fpdfdoc/fpdf_doc.h"
 #include "../../include/fpdfdoc/fpdf_vt.h"
 #include "pdf_vt.h"
-const uint8_t gFontSizeSteps[] = {	4, 6, 8, 9, 10,	12, 14, 18, 20, 25,	30, 35, 40, 45, 50,	55, 60, 70, 80, 90,	100, 110, 120, 130, 144};
-#define PVT_RETURN_LENGTH					1
-#define PVT_DEFAULT_FONTSIZE				18.0f
-#define PVTWORD_SCRIPT_NORMAL				0
-#define PVTWORD_SCRIPT_SUPER				1
-#define PVTWORD_SCRIPT_SUB					2
-#define	PVT_FONTSCALE						0.001f
-#define PVT_PERCENT							0.01f
-#define PVT_HALF							0.5f
-CLine::CLine()
-{
-}
-CLine::~CLine()
-{
-}
-CPVT_WordPlace CLine::GetBeginWordPlace() const
-{
-    return CPVT_WordPlace(LinePlace.nSecIndex, LinePlace.nLineIndex, -1);
-}
-CPVT_WordPlace CLine::GetEndWordPlace() const
-{
-    return CPVT_WordPlace(LinePlace.nSecIndex, LinePlace.nLineIndex, m_LineInfo.nEndWordIndex);
-}
-CPVT_WordPlace CLine::GetPrevWordPlace(const CPVT_WordPlace & place) const
-{
-    if (place.nWordIndex > m_LineInfo.nEndWordIndex) {
-        return CPVT_WordPlace(place.nSecIndex, place.nLineIndex, m_LineInfo.nEndWordIndex);
-    }
-    return CPVT_WordPlace(place.nSecIndex, place.nLineIndex, place.nWordIndex - 1);
-}
-CPVT_WordPlace CLine::GetNextWordPlace(const CPVT_WordPlace & place) const
-{
-    if (place.nWordIndex < m_LineInfo.nBeginWordIndex) {
-        return CPVT_WordPlace(place.nSecIndex, place.nLineIndex, m_LineInfo.nBeginWordIndex);
-    }
-    return CPVT_WordPlace(place.nSecIndex, place.nLineIndex, place.nWordIndex + 1);
-}
-CSection::CSection(CPDF_VariableText * pVT) : m_pVT(pVT)
-{
-}
-CSection::~CSection()
-{
-    ResetAll();
-}
-void CSection::ResetAll()
-{
-    ResetWordArray();
-    ResetLineArray();
-}
-void CSection::ResetLineArray()
-{
-    m_LineArray.RemoveAll();
-}
-void CSection::ResetWordArray()
-{
-    for (int32_t i = 0, sz = m_WordArray.GetSize(); i < sz; i++) {
-        delete m_WordArray.GetAt(i);
-    }
-    m_WordArray.RemoveAll();
-}
-void CSection::ResetLinePlace()
-{
-    for (int32_t i = 0, sz = m_LineArray.GetSize(); i < sz; i++) {
-        if (CLine * pLine = m_LineArray.GetAt(i)) {
-            pLine->LinePlace = CPVT_WordPlace(SecPlace.nSecIndex, i, -1);
-        }
-    }
-}
-CPVT_WordPlace CSection::AddWord(const CPVT_WordPlace & place, const CPVT_WordInfo & wordinfo)
-{
-    CPVT_WordInfo * pWord = new CPVT_WordInfo(wordinfo);
-    int32_t nWordIndex = FPDF_MAX(FPDF_MIN(place.nWordIndex, m_WordArray.GetSize()), 0);
-    if (nWordIndex == m_WordArray.GetSize()) {
-        m_WordArray.Add(pWord);
+const uint8_t gFontSizeSteps[] = {4,  6,  8,   9,   10,  12,  14, 18, 20,
+                                  25, 30, 35,  40,  45,  50,  55, 60, 70,
+                                  80, 90, 100, 110, 120, 130, 144};
+#define PVT_RETURN_LENGTH 1
+#define PVT_DEFAULT_FONTSIZE 18.0f
+#define PVTWORD_SCRIPT_NORMAL 0
+#define PVTWORD_SCRIPT_SUPER 1
+#define PVTWORD_SCRIPT_SUB 2
+#define PVT_FONTSCALE 0.001f
+#define PVT_PERCENT 0.01f
+#define PVT_HALF 0.5f
+CLine::CLine() {}
+CLine::~CLine() {}
+CPVT_WordPlace CLine::GetBeginWordPlace() const {
+  return CPVT_WordPlace(LinePlace.nSecIndex, LinePlace.nLineIndex, -1);
+}
+CPVT_WordPlace CLine::GetEndWordPlace() const {
+  return CPVT_WordPlace(LinePlace.nSecIndex, LinePlace.nLineIndex,
+                        m_LineInfo.nEndWordIndex);
+}
+CPVT_WordPlace CLine::GetPrevWordPlace(const CPVT_WordPlace& place) const {
+  if (place.nWordIndex > m_LineInfo.nEndWordIndex) {
+    return CPVT_WordPlace(place.nSecIndex, place.nLineIndex,
+                          m_LineInfo.nEndWordIndex);
+  }
+  return CPVT_WordPlace(place.nSecIndex, place.nLineIndex,
+                        place.nWordIndex - 1);
+}
+CPVT_WordPlace CLine::GetNextWordPlace(const CPVT_WordPlace& place) const {
+  if (place.nWordIndex < m_LineInfo.nBeginWordIndex) {
+    return CPVT_WordPlace(place.nSecIndex, place.nLineIndex,
+                          m_LineInfo.nBeginWordIndex);
+  }
+  return CPVT_WordPlace(place.nSecIndex, place.nLineIndex,
+                        place.nWordIndex + 1);
+}
+CSection::CSection(CPDF_VariableText* pVT) : m_pVT(pVT) {}
+CSection::~CSection() {
+  ResetAll();
+}
+void CSection::ResetAll() {
+  ResetWordArray();
+  ResetLineArray();
+}
+void CSection::ResetLineArray() {
+  m_LineArray.RemoveAll();
+}
+void CSection::ResetWordArray() {
+  for (int32_t i = 0, sz = m_WordArray.GetSize(); i < sz; i++) {
+    delete m_WordArray.GetAt(i);
+  }
+  m_WordArray.RemoveAll();
+}
+void CSection::ResetLinePlace() {
+  for (int32_t i = 0, sz = m_LineArray.GetSize(); i < sz; i++) {
+    if (CLine* pLine = m_LineArray.GetAt(i)) {
+      pLine->LinePlace = CPVT_WordPlace(SecPlace.nSecIndex, i, -1);
+    }
+  }
+}
+CPVT_WordPlace CSection::AddWord(const CPVT_WordPlace& place,
+                                 const CPVT_WordInfo& wordinfo) {
+  CPVT_WordInfo* pWord = new CPVT_WordInfo(wordinfo);
+  int32_t nWordIndex =
+      FPDF_MAX(FPDF_MIN(place.nWordIndex, m_WordArray.GetSize()), 0);
+  if (nWordIndex == m_WordArray.GetSize()) {
+    m_WordArray.Add(pWord);
+  } else {
+    m_WordArray.InsertAt(nWordIndex, pWord);
+  }
+  return place;
+}
+CPVT_WordPlace CSection::AddLine(const CPVT_LineInfo& lineinfo) {
+  return CPVT_WordPlace(SecPlace.nSecIndex, m_LineArray.Add(lineinfo), -1);
+}
+CPVT_FloatRect CSection::Rearrange() {
+  ASSERT(m_pVT != NULL);
+  if (m_pVT->m_nCharArray > 0) {
+    return CTypeset(this).CharArray();
+  }
+  return CTypeset(this).Typeset();
+}
+CPVT_Size CSection::GetSectionSize(FX_FLOAT fFontSize) {
+  return CTypeset(this).GetEditSize(fFontSize);
+}
+CPVT_WordPlace CSection::GetBeginWordPlace() const {
+  if (CLine* pLine = m_LineArray.GetAt(0)) {
+    return pLine->GetBeginWordPlace();
+  }
+  return SecPlace;
+}
+CPVT_WordPlace CSection::GetEndWordPlace() const {
+  if (CLine* pLine = m_LineArray.GetAt(m_LineArray.GetSize() - 1)) {
+    return pLine->GetEndWordPlace();
+  }
+  return SecPlace;
+}
+CPVT_WordPlace CSection::GetPrevWordPlace(const CPVT_WordPlace& place) const {
+  if (place.nLineIndex < 0) {
+    return GetBeginWordPlace();
+  }
+  if (place.nLineIndex >= m_LineArray.GetSize()) {
+    return GetEndWordPlace();
+  }
+  if (CLine* pLine = m_LineArray.GetAt(place.nLineIndex)) {
+    if (place.nWordIndex == pLine->m_LineInfo.nBeginWordIndex) {
+      return CPVT_WordPlace(place.nSecIndex, place.nLineIndex, -1);
+    }
+    if (place.nWordIndex < pLine->m_LineInfo.nBeginWordIndex) {
+      if (CLine* pPrevLine = m_LineArray.GetAt(place.nLineIndex - 1)) {
+        return pPrevLine->GetEndWordPlace();
+      }
     } else {
-        m_WordArray.InsertAt(nWordIndex, pWord);
-    }
-    return place;
-}
-CPVT_WordPlace CSection::AddLine(const CPVT_LineInfo & lineinfo)
-{
-    return CPVT_WordPlace(SecPlace.nSecIndex, m_LineArray.Add(lineinfo), -1);
-}
-CPVT_FloatRect CSection::Rearrange()
-{
-    ASSERT(m_pVT != NULL);
-    if (m_pVT->m_nCharArray > 0) {
-        return CTypeset(this).CharArray();
-    }
-    return CTypeset(this).Typeset();
-}
-CPVT_Size CSection::GetSectionSize(FX_FLOAT fFontSize)
-{
-    return CTypeset(this).GetEditSize(fFontSize);
-}
-CPVT_WordPlace CSection::GetBeginWordPlace() const
-{
-    if (CLine * pLine = m_LineArray.GetAt(0)) {
-        return pLine->GetBeginWordPlace();
-    }
-    return SecPlace;
-}
-CPVT_WordPlace CSection::GetEndWordPlace() const
-{
-    if (CLine * pLine = m_LineArray.GetAt(m_LineArray.GetSize() - 1)) {
-        return pLine->GetEndWordPlace();
-    }
-    return SecPlace;
-}
-CPVT_WordPlace CSection::GetPrevWordPlace(const CPVT_WordPlace & place) const
-{
-    if (place.nLineIndex < 0) {
-        return GetBeginWordPlace();
-    }
-    if (place.nLineIndex >= m_LineArray.GetSize()) {
-        return GetEndWordPlace();
-    }
-    if (CLine * pLine = m_LineArray.GetAt(place.nLineIndex)) {
-        if (place.nWordIndex == pLine->m_LineInfo.nBeginWordIndex) {
-            return CPVT_WordPlace(place.nSecIndex, place.nLineIndex, -1);
-        }
-        if (place.nWordIndex < pLine->m_LineInfo.nBeginWordIndex) {
-            if (CLine * pPrevLine = m_LineArray.GetAt(place.nLineIndex - 1)) {
-                return pPrevLine->GetEndWordPlace();
-            }
-        } else {
-            return pLine->GetPrevWordPlace(place);
-        }
+      return pLine->GetPrevWordPlace(place);
     }
-    return place;
-}
-CPVT_WordPlace CSection::GetNextWordPlace(const CPVT_WordPlace & place) const
-{
-    if (place.nLineIndex < 0) {
-        return GetBeginWordPlace();
-    }
-    if (place.nLineIndex >= m_LineArray.GetSize()) {
-        return GetEndWordPlace();
-    }
-    if (CLine * pLine = m_LineArray.GetAt(place.nLineIndex)) {
-        if (place.nWordIndex >= pLine->m_LineInfo.nEndWordIndex) {
-            if (CLine * pNextLine = m_LineArray.GetAt(place.nLineIndex + 1)) {
-                return pNextLine->GetBeginWordPlace();
-            }
-        } else {
-            return pLine->GetNextWordPlace(place);
-        }
-    }
-    return place;
-}
-void CSection::UpdateWordPlace(CPVT_WordPlace & place) const
-{
-    int32_t nLeft = 0;
-    int32_t nRight = m_LineArray.GetSize() - 1;
-    int32_t nMid = (nLeft + nRight) / 2;
-    while (nLeft <= nRight) {
-        if (CLine * pLine = m_LineArray.GetAt(nMid)) {
-            if (place.nWordIndex < pLine->m_LineInfo.nBeginWordIndex) {
-                nRight = nMid - 1;
-                nMid = (nLeft + nRight) / 2;
-            } else if (place.nWordIndex > pLine->m_LineInfo.nEndWordIndex) {
-                nLeft = nMid + 1;
-                nMid = (nLeft + nRight) / 2;
-            } else {
-                place.nLineIndex = nMid;
-                return;
-            }
-        } else {
-            break;
-        }
-    }
-}
-CPVT_WordPlace CSection::SearchWordPlace(const CPDF_Point & point) const
-{
-    ASSERT(m_pVT != NULL);
-    CPVT_WordPlace place = GetBeginWordPlace();
-    FX_BOOL bUp = TRUE;
-    FX_BOOL bDown = TRUE;
-    int32_t nLeft = 0;
-    int32_t nRight = m_LineArray.GetSize() - 1;
-    int32_t nMid = m_LineArray.GetSize() / 2;
-    FX_FLOAT fTop = 0;
-    FX_FLOAT fBottom = 0;
-    while (nLeft <= nRight) {
-        if (CLine * pLine = m_LineArray.GetAt(nMid)) {
-            fTop = pLine->m_LineInfo.fLineY - pLine->m_LineInfo.fLineAscent - m_pVT->GetLineLeading(m_SecInfo);
-            fBottom = pLine->m_LineInfo.fLineY - pLine->m_LineInfo.fLineDescent;
-            if (IsFloatBigger(point.y, fTop)) {
-                bUp = FALSE;
-            }
-            if (IsFloatSmaller(point.y, fBottom)) {
-                bDown = FALSE;
-            }
-            if (IsFloatSmaller(point.y, fTop)) {
-                nRight = nMid - 1;
-                nMid = (nLeft + nRight) / 2;
-                continue;
-            } else if (IsFloatBigger(point.y, fBottom)) {
-                nLeft = nMid + 1;
-                nMid = (nLeft + nRight) / 2;
-                continue;
-            } else {
-                place = SearchWordPlace(point.x,
-                                        CPVT_WordRange(pLine->GetNextWordPlace(pLine->GetBeginWordPlace()), pLine->GetEndWordPlace())
-                                       );
-                place.nLineIndex = nMid;
-                return place;
-            }
-        }
-    }
-    if (bUp) {
-        place = GetBeginWordPlace();
-    }
-    if (bDown) {
-        place = GetEndWordPlace();
-    }
-    return place;
+  }
+  return place;
 }
-CPVT_WordPlace CSection::SearchWordPlace(FX_FLOAT fx, const CPVT_WordPlace & lineplace) const
-{
-    if (CLine * pLine = m_LineArray.GetAt(lineplace.nLineIndex)) {
-        return SearchWordPlace(fx - m_SecInfo.rcSection.left,
-                               CPVT_WordRange(pLine->GetNextWordPlace(pLine->GetBeginWordPlace()), pLine->GetEndWordPlace()));
-    }
+CPVT_WordPlace CSection::GetNextWordPlace(const CPVT_WordPlace& place) const {
+  if (place.nLineIndex < 0) {
     return GetBeginWordPlace();
-}
-CPVT_WordPlace CSection::SearchWordPlace(FX_FLOAT fx, const CPVT_WordRange & range) const
-{
-    CPVT_WordPlace wordplace = range.BeginPos;
-    wordplace.nWordIndex = -1;
-    if (!m_pVT)	{
-        return wordplace;
-    }
-    int32_t nLeft = range.BeginPos.nWordIndex;
-    int32_t nRight = range.EndPos.nWordIndex + 1;
-    int32_t nMid = (nLeft + nRight) / 2;
-    while (nLeft < nRight) {
-        if (nMid == nLeft) {
-            break;
-        }
-        if (nMid == nRight) {
-            nMid--;
-            break;
-        }
-        if (CPVT_WordInfo * pWord = m_WordArray.GetAt(nMid)) {
-            if (fx > pWord->fWordX + m_pVT->GetWordWidth(*pWord) * PVT_HALF) {
-                nLeft = nMid;
-                nMid = (nLeft + nRight) / 2;
-                continue;
-            } else {
-                nRight = nMid;
-                nMid = (nLeft + nRight) / 2;
-                continue;
-            }
-        } else {
-            break;
-        }
-    }
-    if (CPVT_WordInfo * pWord = m_WordArray.GetAt(nMid)) {
-        if (fx > pWord->fWordX + m_pVT->GetWordWidth(*pWord) * PVT_HALF) {
-            wordplace.nWordIndex = nMid;
-        }
-    }
+  }
+  if (place.nLineIndex >= m_LineArray.GetSize()) {
+    return GetEndWordPlace();
+  }
+  if (CLine* pLine = m_LineArray.GetAt(place.nLineIndex)) {
+    if (place.nWordIndex >= pLine->m_LineInfo.nEndWordIndex) {
+      if (CLine* pNextLine = m_LineArray.GetAt(place.nLineIndex + 1)) {
+        return pNextLine->GetBeginWordPlace();
+      }
+    } else {
+      return pLine->GetNextWordPlace(place);
+    }
+  }
+  return place;
+}
+void CSection::UpdateWordPlace(CPVT_WordPlace& place) const {
+  int32_t nLeft = 0;
+  int32_t nRight = m_LineArray.GetSize() - 1;
+  int32_t nMid = (nLeft + nRight) / 2;
+  while (nLeft <= nRight) {
+    if (CLine* pLine = m_LineArray.GetAt(nMid)) {
+      if (place.nWordIndex < pLine->m_LineInfo.nBeginWordIndex) {
+        nRight = nMid - 1;
+        nMid = (nLeft + nRight) / 2;
+      } else if (place.nWordIndex > pLine->m_LineInfo.nEndWordIndex) {
+        nLeft = nMid + 1;
+        nMid = (nLeft + nRight) / 2;
+      } else {
+        place.nLineIndex = nMid;
+        return;
+      }
+    } else {
+      break;
+    }
+  }
+}
+CPVT_WordPlace CSection::SearchWordPlace(const CPDF_Point& point) const {
+  ASSERT(m_pVT != NULL);
+  CPVT_WordPlace place = GetBeginWordPlace();
+  FX_BOOL bUp = TRUE;
+  FX_BOOL bDown = TRUE;
+  int32_t nLeft = 0;
+  int32_t nRight = m_LineArray.GetSize() - 1;
+  int32_t nMid = m_LineArray.GetSize() / 2;
+  FX_FLOAT fTop = 0;
+  FX_FLOAT fBottom = 0;
+  while (nLeft <= nRight) {
+    if (CLine* pLine = m_LineArray.GetAt(nMid)) {
+      fTop = pLine->m_LineInfo.fLineY - pLine->m_LineInfo.fLineAscent -
+             m_pVT->GetLineLeading(m_SecInfo);
+      fBottom = pLine->m_LineInfo.fLineY - pLine->m_LineInfo.fLineDescent;
+      if (IsFloatBigger(point.y, fTop)) {
+        bUp = FALSE;
+      }
+      if (IsFloatSmaller(point.y, fBottom)) {
+        bDown = FALSE;
+      }
+      if (IsFloatSmaller(point.y, fTop)) {
+        nRight = nMid - 1;
+        nMid = (nLeft + nRight) / 2;
+        continue;
+      } else if (IsFloatBigger(point.y, fBottom)) {
+        nLeft = nMid + 1;
+        nMid = (nLeft + nRight) / 2;
+        continue;
+      } else {
+        place = SearchWordPlace(
+            point.x,
+            CPVT_WordRange(pLine->GetNextWordPlace(pLine->GetBeginWordPlace()),
+                           pLine->GetEndWordPlace()));
+        place.nLineIndex = nMid;
+        return place;
+      }
+    }
+  }
+  if (bUp) {
+    place = GetBeginWordPlace();
+  }
+  if (bDown) {
+    place = GetEndWordPlace();
+  }
+  return place;
+}
+CPVT_WordPlace CSection::SearchWordPlace(
+    FX_FLOAT fx,
+    const CPVT_WordPlace& lineplace) const {
+  if (CLine* pLine = m_LineArray.GetAt(lineplace.nLineIndex)) {
+    return SearchWordPlace(
+        fx - m_SecInfo.rcSection.left,
+        CPVT_WordRange(pLine->GetNextWordPlace(pLine->GetBeginWordPlace()),
+                       pLine->GetEndWordPlace()));
+  }
+  return GetBeginWordPlace();
+}
+CPVT_WordPlace CSection::SearchWordPlace(FX_FLOAT fx,
+                                         const CPVT_WordRange& range) const {
+  CPVT_WordPlace wordplace = range.BeginPos;
+  wordplace.nWordIndex = -1;
+  if (!m_pVT) {
     return wordplace;
-}
-void CSection::ClearLeftWords(int32_t nWordIndex)
-{
-    for (int32_t i = nWordIndex; i >= 0; i--) {
-        delete m_WordArray.GetAt(i);
-        m_WordArray.RemoveAt(i);
-    }
-}
-void CSection::ClearRightWords(int32_t nWordIndex)
-{
-    for (int32_t i = m_WordArray.GetSize() - 1; i > nWordIndex; i--) {
-        delete m_WordArray.GetAt(i);
-        m_WordArray.RemoveAt(i);
-    }
-}
-void CSection::ClearMidWords(int32_t nBeginIndex, int32_t nEndIndex)
-{
-    for (int32_t i = nEndIndex; i > nBeginIndex; i--) {
-        delete m_WordArray.GetAt(i);
-        m_WordArray.RemoveAt(i);
-    }
-}
-void CSection::ClearWords(const CPVT_WordRange & PlaceRange)
-{
-    CPVT_WordPlace SecBeginPos = GetBeginWordPlace();
-    CPVT_WordPlace SecEndPos = GetEndWordPlace();
-    if (PlaceRange.BeginPos.WordCmp(SecBeginPos) >= 0) {
-        if (PlaceRange.EndPos.WordCmp(SecEndPos) <= 0) {
-            ClearMidWords(PlaceRange.BeginPos.nWordIndex, PlaceRange.EndPos.nWordIndex);
-        } else {
-            ClearRightWords(PlaceRange.BeginPos.nWordIndex);
-        }
-    } else if (PlaceRange.EndPos.WordCmp(SecEndPos) <= 0) {
-        ClearLeftWords(PlaceRange.EndPos.nWordIndex);
+  }
+  int32_t nLeft = range.BeginPos.nWordIndex;
+  int32_t nRight = range.EndPos.nWordIndex + 1;
+  int32_t nMid = (nLeft + nRight) / 2;
+  while (nLeft < nRight) {
+    if (nMid == nLeft) {
+      break;
+    }
+    if (nMid == nRight) {
+      nMid--;
+      break;
+    }
+    if (CPVT_WordInfo* pWord = m_WordArray.GetAt(nMid)) {
+      if (fx > pWord->fWordX + m_pVT->GetWordWidth(*pWord) * PVT_HALF) {
+        nLeft = nMid;
+        nMid = (nLeft + nRight) / 2;
+        continue;
+      } else {
+        nRight = nMid;
+        nMid = (nLeft + nRight) / 2;
+        continue;
+      }
     } else {
-        ResetWordArray();
-    }
-}
-void CSection::ClearWord(const CPVT_WordPlace & place)
-{
-    delete m_WordArray.GetAt(place.nWordIndex);
-    m_WordArray.RemoveAt(place.nWordIndex);
-}
-CTypeset::CTypeset(CSection * pSection) : m_rcRet(0.0f, 0.0f, 0.0f, 0.0f), m_pVT(pSection->m_pVT), m_pSection(pSection)
-{
-}
-CTypeset::~CTypeset()
-{
-}
-CPVT_FloatRect CTypeset::CharArray()
-{
-    ASSERT(m_pSection != NULL);
-    ASSERT(m_pVT != NULL);
-    FX_FLOAT fLineAscent = m_pVT->GetFontAscent(m_pVT->GetDefaultFontIndex(), m_pVT->GetFontSize());
-    FX_FLOAT fLineDescent = m_pVT->GetFontDescent(m_pVT->GetDefaultFontIndex(), m_pVT->GetFontSize());
-    m_rcRet.Default();
-    FX_FLOAT x = 0.0f, y = 0.0f;
-    FX_FLOAT fNextWidth;
-    int32_t nStart = 0;
-    FX_FLOAT fNodeWidth = m_pVT->GetPlateWidth() / (m_pVT->m_nCharArray <= 0 ? 1 : m_pVT->m_nCharArray);
-    if (CLine * pLine = m_pSection->m_LineArray.GetAt(0)) {
-        x = 0.0f;
-        y +=  m_pVT->GetLineLeading(m_pSection->m_SecInfo);
-        y += fLineAscent;
-        nStart = 0;
-        switch (m_pVT->GetAlignment(m_pSection->m_SecInfo)) {
-            case 0:
-                pLine->m_LineInfo.fLineX = fNodeWidth * PVT_HALF;
-                break;
-            case 1:
-                nStart = (m_pVT->m_nCharArray - m_pSection->m_WordArray.GetSize()) / 2;
-                pLine->m_LineInfo.fLineX = fNodeWidth * nStart - fNodeWidth * PVT_HALF;
-                break;
-            case 2:
-                nStart = m_pVT->m_nCharArray - m_pSection->m_WordArray.GetSize();
-                pLine->m_LineInfo.fLineX = fNodeWidth * nStart - fNodeWidth * PVT_HALF;
-                break;
-        }
-        for (int32_t w = 0, sz = m_pSection->m_WordArray.GetSize(); w < sz; w++) {
-            if (w >= m_pVT->m_nCharArray) {
-                break;
-            }
-            fNextWidth = 0;
-            if (CPVT_WordInfo * pNextWord = (CPVT_WordInfo *)m_pSection->m_WordArray.GetAt(w + 1)) {
-                pNextWord->fWordTail = 0;
-                fNextWidth = m_pVT->GetWordWidth(*pNextWord);
-            }
-            if (CPVT_WordInfo * pWord = (CPVT_WordInfo *)m_pSection->m_WordArray.GetAt(w)) {
-                pWord->fWordTail = 0;
-                FX_FLOAT fWordWidth = m_pVT->GetWordWidth(*pWord);
-                FX_FLOAT fWordAscent = m_pVT->GetWordAscent(*pWord);
-                FX_FLOAT fWordDescent = m_pVT->GetWordDescent(*pWord);
-                x = (FX_FLOAT)(fNodeWidth * (w + nStart + 0.5) - fWordWidth * PVT_HALF);
-                pWord->fWordX = x;
-                pWord->fWordY = y;
-                if (w == 0) {
-                    pLine->m_LineInfo.fLineX = x;
-                }
-                if (w != m_pSection->m_WordArray.GetSize() - 1)
-                    pWord->fWordTail = (fNodeWidth - (fWordWidth + fNextWidth) * PVT_HALF > 0 ?
-                                        fNodeWidth - (fWordWidth + fNextWidth) * PVT_HALF : 0);
-                else {
-                    pWord->fWordTail = 0;
-                }
-                x += fWordWidth;
-                fLineAscent = FPDF_MAX(fLineAscent, fWordAscent);
-                fLineDescent = FPDF_MIN(fLineDescent, fWordDescent);
-            }
-        }
-        pLine->m_LineInfo.nBeginWordIndex = 0;
-        pLine->m_LineInfo.nEndWordIndex = m_pSection->m_WordArray.GetSize() - 1;
-        pLine->m_LineInfo.fLineY = y;
-        pLine->m_LineInfo.fLineWidth = 	x - pLine->m_LineInfo.fLineX;
-        pLine->m_LineInfo.fLineAscent = fLineAscent;
-        pLine->m_LineInfo.fLineDescent = fLineDescent;
-        y += (-fLineDescent);
-    }
-    return m_rcRet = CPVT_FloatRect(0, 0, x, y);
-}
-CPVT_Size CTypeset::GetEditSize(FX_FLOAT fFontSize)
-{
-    ASSERT(m_pSection != NULL);
-    ASSERT(m_pVT != NULL);
-    SplitLines(FALSE, fFontSize);
-    return CPVT_Size(m_rcRet.Width(), m_rcRet.Height());
-}
-CPVT_FloatRect CTypeset::Typeset()
-{
-    ASSERT(m_pSection != NULL);
-    ASSERT(m_pVT != NULL);
-    m_pSection->m_LineArray.Empty();
-    SplitLines(TRUE, 0.0f);
-    m_pSection->m_LineArray.Clear();
-    OutputLines();
-    return m_rcRet;
+      break;
+    }
+  }
+  if (CPVT_WordInfo* pWord = m_WordArray.GetAt(nMid)) {
+    if (fx > pWord->fWordX + m_pVT->GetWordWidth(*pWord) * PVT_HALF) {
+      wordplace.nWordIndex = nMid;
+    }
+  }
+  return wordplace;
+}
+void CSection::ClearLeftWords(int32_t nWordIndex) {
+  for (int32_t i = nWordIndex; i >= 0; i--) {
+    delete m_WordArray.GetAt(i);
+    m_WordArray.RemoveAt(i);
+  }
+}
+void CSection::ClearRightWords(int32_t nWordIndex) {
+  for (int32_t i = m_WordArray.GetSize() - 1; i > nWordIndex; i--) {
+    delete m_WordArray.GetAt(i);
+    m_WordArray.RemoveAt(i);
+  }
+}
+void CSection::ClearMidWords(int32_t nBeginIndex, int32_t nEndIndex) {
+  for (int32_t i = nEndIndex; i > nBeginIndex; i--) {
+    delete m_WordArray.GetAt(i);
+    m_WordArray.RemoveAt(i);
+  }
+}
+void CSection::ClearWords(const CPVT_WordRange& PlaceRange) {
+  CPVT_WordPlace SecBeginPos = GetBeginWordPlace();
+  CPVT_WordPlace SecEndPos = GetEndWordPlace();
+  if (PlaceRange.BeginPos.WordCmp(SecBeginPos) >= 0) {
+    if (PlaceRange.EndPos.WordCmp(SecEndPos) <= 0) {
+      ClearMidWords(PlaceRange.BeginPos.nWordIndex,
+                    PlaceRange.EndPos.nWordIndex);
+    } else {
+      ClearRightWords(PlaceRange.BeginPos.nWordIndex);
+    }
+  } else if (PlaceRange.EndPos.WordCmp(SecEndPos) <= 0) {
+    ClearLeftWords(PlaceRange.EndPos.nWordIndex);
+  } else {
+    ResetWordArray();
+  }
+}
+void CSection::ClearWord(const CPVT_WordPlace& place) {
+  delete m_WordArray.GetAt(place.nWordIndex);
+  m_WordArray.RemoveAt(place.nWordIndex);
+}
+CTypeset::CTypeset(CSection* pSection)
+    : m_rcRet(0.0f, 0.0f, 0.0f, 0.0f),
+      m_pVT(pSection->m_pVT),
+      m_pSection(pSection) {}
+CTypeset::~CTypeset() {}
+CPVT_FloatRect CTypeset::CharArray() {
+  ASSERT(m_pSection != NULL);
+  ASSERT(m_pVT != NULL);
+  FX_FLOAT fLineAscent =
+      m_pVT->GetFontAscent(m_pVT->GetDefaultFontIndex(), m_pVT->GetFontSize());
+  FX_FLOAT fLineDescent =
+      m_pVT->GetFontDescent(m_pVT->GetDefaultFontIndex(), m_pVT->GetFontSize());
+  m_rcRet.Default();
+  FX_FLOAT x = 0.0f, y = 0.0f;
+  FX_FLOAT fNextWidth;
+  int32_t nStart = 0;
+  FX_FLOAT fNodeWidth = m_pVT->GetPlateWidth() /
+                        (m_pVT->m_nCharArray <= 0 ? 1 : m_pVT->m_nCharArray);
+  if (CLine* pLine = m_pSection->m_LineArray.GetAt(0)) {
+    x = 0.0f;
+    y += m_pVT->GetLineLeading(m_pSection->m_SecInfo);
+    y += fLineAscent;
+    nStart = 0;
+    switch (m_pVT->GetAlignment(m_pSection->m_SecInfo)) {
+      case 0:
+        pLine->m_LineInfo.fLineX = fNodeWidth * PVT_HALF;
+        break;
+      case 1:
+        nStart = (m_pVT->m_nCharArray - m_pSection->m_WordArray.GetSize()) / 2;
+        pLine->m_LineInfo.fLineX = fNodeWidth * nStart - fNodeWidth * PVT_HALF;
+        break;
+      case 2:
+        nStart = m_pVT->m_nCharArray - m_pSection->m_WordArray.GetSize();
+        pLine->m_LineInfo.fLineX = fNodeWidth * nStart - fNodeWidth * PVT_HALF;
+        break;
+    }
+    for (int32_t w = 0, sz = m_pSection->m_WordArray.GetSize(); w < sz; w++) {
+      if (w >= m_pVT->m_nCharArray) {
+        break;
+      }
+      fNextWidth = 0;
+      if (CPVT_WordInfo* pNextWord =
+              (CPVT_WordInfo*)m_pSection->m_WordArray.GetAt(w + 1)) {
+        pNextWord->fWordTail = 0;
+        fNextWidth = m_pVT->GetWordWidth(*pNextWord);
+      }
+      if (CPVT_WordInfo* pWord =
+              (CPVT_WordInfo*)m_pSection->m_WordArray.GetAt(w)) {
+        pWord->fWordTail = 0;
+        FX_FLOAT fWordWidth = m_pVT->GetWordWidth(*pWord);
+        FX_FLOAT fWordAscent = m_pVT->GetWordAscent(*pWord);
+        FX_FLOAT fWordDescent = m_pVT->GetWordDescent(*pWord);
+        x = (FX_FLOAT)(fNodeWidth * (w + nStart + 0.5) - fWordWidth * PVT_HALF);
+        pWord->fWordX = x;
+        pWord->fWordY = y;
+        if (w == 0) {
+          pLine->m_LineInfo.fLineX = x;
+        }
+        if (w != m_pSection->m_WordArray.GetSize() - 1)
+          pWord->fWordTail =
+              (fNodeWidth - (fWordWidth + fNextWidth) * PVT_HALF > 0
+                   ? fNodeWidth - (fWordWidth + fNextWidth) * PVT_HALF
+                   : 0);
+        else {
+          pWord->fWordTail = 0;
+        }
+        x += fWordWidth;
+        fLineAscent = FPDF_MAX(fLineAscent, fWordAscent);
+        fLineDescent = FPDF_MIN(fLineDescent, fWordDescent);
+      }
+    }
+    pLine->m_LineInfo.nBeginWordIndex = 0;
+    pLine->m_LineInfo.nEndWordIndex = m_pSection->m_WordArray.GetSize() - 1;
+    pLine->m_LineInfo.fLineY = y;
+    pLine->m_LineInfo.fLineWidth = x - pLine->m_LineInfo.fLineX;
+    pLine->m_LineInfo.fLineAscent = fLineAscent;
+    pLine->m_LineInfo.fLineDescent = fLineDescent;
+    y += (-fLineDescent);
+  }
+  return m_rcRet = CPVT_FloatRect(0, 0, x, y);
+}
+CPVT_Size CTypeset::GetEditSize(FX_FLOAT fFontSize) {
+  ASSERT(m_pSection != NULL);
+  ASSERT(m_pVT != NULL);
+  SplitLines(FALSE, fFontSize);
+  return CPVT_Size(m_rcRet.Width(), m_rcRet.Height());
+}
+CPVT_FloatRect CTypeset::Typeset() {
+  ASSERT(m_pSection != NULL);
+  ASSERT(m_pVT != NULL);
+  m_pSection->m_LineArray.Empty();
+  SplitLines(TRUE, 0.0f);
+  m_pSection->m_LineArray.Clear();
+  OutputLines();
+  return m_rcRet;
 }
 static int special_chars[128] = {
-    0x0000, 0x000C, 0x0008, 0x000C, 0x0008, 0x0000, 0x0020, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0008, 0x0008, 0x0000, 0x0010, 0x0000, 0x0000, 0x0028,
-    0x000C, 0x0008, 0x0000, 0x0000, 0x0028, 0x0028, 0x0028, 0x0028,
-    0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002,
-    0x0002, 0x0002, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0008,
-    0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
-    0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
-    0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
-    0x0001, 0x0001, 0x0001, 0x000C, 0x0000, 0x0008, 0x0000, 0x0000,
-    0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
-    0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
-    0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
-    0x0001, 0x0001, 0x0001, 0x000C, 0x0000, 0x0008, 0x0000, 0x0000,
+    0x0000, 0x000C, 0x0008, 0x000C, 0x0008, 0x0000, 0x0020, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0008, 0x0008, 0x0000,
+    0x0010, 0x0000, 0x0000, 0x0028, 0x000C, 0x0008, 0x0000, 0x0000, 0x0028,
+    0x0028, 0x0028, 0x0028, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002,
+    0x0002, 0x0002, 0x0002, 0x0002, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000,
+    0x0008, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
+    0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
+    0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
+    0x0001, 0x000C, 0x0000, 0x0008, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001,
+    0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
+    0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
+    0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x000C, 0x0000, 0x0008,
+    0x0000, 0x0000,
 };
-static FX_BOOL IsLatin(FX_WORD word)
-{
-    if (word <= 0x007F) {
-        if (special_chars[word] & 0x0001) {
-            return TRUE;
-        }
-    }
-    if ((word >= 0x00C0 && word <= 0x00FF) ||
-            (word >= 0x0100 && word <= 0x024F) ||
-            (word >= 0x1E00 && word <= 0x1EFF) ||
-            (word >= 0x2C60 && word <= 0x2C7F) ||
-            (word >= 0xA720 && word <= 0xA7FF) ||
-            (word >= 0xFF21 && word <= 0xFF3A) ||
-            (word >= 0xFF41 && word <= 0xFF5A)) {
-        return TRUE;
-    }
-    return FALSE;
-}
-static FX_BOOL IsDigit(FX_DWORD word)
-{
-    return (word >= 0x0030 && word <= 0x0039) ? TRUE : FALSE;
-}
-static FX_BOOL IsCJK(FX_DWORD word)
-{
-    if ((word >= 0x1100 && word <= 0x11FF) ||
-            (word >= 0x2E80 && word <= 0x2FFF) ||
-            (word >= 0x3040 && word <= 0x9FBF) ||
-            (word >= 0xAC00 && word <= 0xD7AF) ||
-            (word >= 0xF900 && word <= 0xFAFF) ||
-            (word >= 0xFE30 && word <= 0xFE4F) ||
-            (word >= 0x20000 && word <= 0x2A6DF) ||
-            (word >= 0x2F800 && word <= 0x2FA1F)) {
-        return TRUE;
-    }
-    if (word >= 0x3000 && word <= 0x303F) {
-        if (word == 0x3005 || word == 0x3006 || word == 0x3021 || word == 0x3022 ||
-                word == 0x3023 || word == 0x3024 || word == 0x3025 || word == 0x3026 ||
-                word == 0x3027 || word == 0x3028 || word == 0x3029 || word == 0x3031 ||
-                word == 0x3032 || word == 0x3033 || word == 0x3034 || word == 0x3035) {
-            return TRUE;
-        }
-        return FALSE;
-    }
-    if (word >= 0xFF66 && word <= 0xFF9D) {
-        return TRUE;
+static FX_BOOL IsLatin(FX_WORD word) {
+  if (word <= 0x007F) {
+    if (special_chars[word] & 0x0001) {
+      return TRUE;
+    }
+  }
+  if ((word >= 0x00C0 && word <= 0x00FF) ||
+      (word >= 0x0100 && word <= 0x024F) ||
+      (word >= 0x1E00 && word <= 0x1EFF) ||
+      (word >= 0x2C60 && word <= 0x2C7F) ||
+      (word >= 0xA720 && word <= 0xA7FF) ||
+      (word >= 0xFF21 && word <= 0xFF3A) ||
+      (word >= 0xFF41 && word <= 0xFF5A)) {
+    return TRUE;
+  }
+  return FALSE;
+}
+static FX_BOOL IsDigit(FX_DWORD word) {
+  return (word >= 0x0030 && word <= 0x0039) ? TRUE : FALSE;
+}
+static FX_BOOL IsCJK(FX_DWORD word) {
+  if ((word >= 0x1100 && word <= 0x11FF) ||
+      (word >= 0x2E80 && word <= 0x2FFF) ||
+      (word >= 0x3040 && word <= 0x9FBF) ||
+      (word >= 0xAC00 && word <= 0xD7AF) ||
+      (word >= 0xF900 && word <= 0xFAFF) ||
+      (word >= 0xFE30 && word <= 0xFE4F) ||
+      (word >= 0x20000 && word <= 0x2A6DF) ||
+      (word >= 0x2F800 && word <= 0x2FA1F)) {
+    return TRUE;
+  }
+  if (word >= 0x3000 && word <= 0x303F) {
+    if (word == 0x3005 || word == 0x3006 || word == 0x3021 || word == 0x3022 ||
+        word == 0x3023 || word == 0x3024 || word == 0x3025 || word == 0x3026 ||
+        word == 0x3027 || word == 0x3028 || word == 0x3029 || word == 0x3031 ||
+        word == 0x3032 || word == 0x3033 || word == 0x3034 || word == 0x3035) {
+      return TRUE;
     }
     return FALSE;
+  }
+  if (word >= 0xFF66 && word <= 0xFF9D) {
+    return TRUE;
+  }
+  return FALSE;
+}
+static FX_BOOL IsPunctuation(FX_DWORD word) {
+  if (word <= 0x007F) {
+    if ((special_chars[word] >> 3) & 1) {
+      return TRUE;
+    }
+  } else if (word >= 0x0080 && word <= 0x00FF) {
+    if (word == 0x0082 || word == 0x0084 || word == 0x0085 || word == 0x0091 ||
+        word == 0x0092 || word == 0x0093 || word <= 0x0094 || word == 0x0096 ||
+        word == 0x00B4 || word == 0x00B8) {
+      return TRUE;
+    }
+  } else if (word >= 0x2000 && word <= 0x206F) {
+    if (word == 0x2010 || word == 0x2011 || word == 0x2012 || word == 0x2013 ||
+        word == 0x2018 || word == 0x2019 || word == 0x201A || word == 0x201B ||
+        word == 0x201C || word == 0x201D || word == 0x201E || word == 0x201F ||
+        word == 0x2032 || word == 0x2033 || word == 0x2034 || word == 0x2035 ||
+        word == 0x2036 || word == 0x2037 || word == 0x203C || word == 0x203D ||
+        word == 0x203E || word == 0x2044) {
+      return TRUE;
+    }
+  } else if (word >= 0x3000 && word <= 0x303F) {
+    if (word == 0x3001 || word == 0x3002 || word == 0x3003 || word == 0x3005 ||
+        word == 0x3009 || word == 0x300A || word == 0x300B || word == 0x300C ||
+        word == 0x300D || word == 0x300F || word == 0x300E || word == 0x3010 ||
+        word == 0x3011 || word == 0x3014 || word == 0x3015 || word == 0x3016 ||
+        word == 0x3017 || word == 0x3018 || word == 0x3019 || word == 0x301A ||
+        word == 0x301B || word == 0x301D || word == 0x301E || word == 0x301F) {
+      return TRUE;
+    }
+  } else if (word >= 0xFE50 && word <= 0xFE6F) {
+    if ((word >= 0xFE50 && word <= 0xFE5E) || word == 0xFE63) {
+      return TRUE;
+    }
+  } else if (word >= 0xFF00 && word <= 0xFFEF) {
+    if (word == 0xFF01 || word == 0xFF02 || word == 0xFF07 || word == 0xFF08 ||
+        word == 0xFF09 || word == 0xFF0C || word == 0xFF0E || word == 0xFF0F ||
+        word == 0xFF1A || word == 0xFF1B || word == 0xFF1F || word == 0xFF3B ||
+        word == 0xFF3D || word == 0xFF40 || word == 0xFF5B || word == 0xFF5C ||
+        word == 0xFF5D || word == 0xFF61 || word == 0xFF62 || word == 0xFF63 ||
+        word == 0xFF64 || word == 0xFF65 || word == 0xFF9E || word == 0xFF9F) {
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+static FX_BOOL IsConnectiveSymbol(FX_DWORD word) {
+  if (word <= 0x007F) {
+    if ((special_chars[word] >> 5) & 1) {
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+static FX_BOOL IsOpenStylePunctuation(FX_DWORD word) {
+  if (word <= 0x007F) {
+    if ((special_chars[word] >> 2) & 1) {
+      return TRUE;
+    }
+  } else if (word == 0x300A || word == 0x300C || word == 0x300E ||
+             word == 0x3010 || word == 0x3014 || word == 0x3016 ||
+             word == 0x3018 || word == 0x301A || word == 0xFF08 ||
+             word == 0xFF3B || word == 0xFF5B || word == 0xFF62) {
+    return TRUE;
+  }
+  return FALSE;
+}
+static FX_BOOL IsCurrencySymbol(FX_WORD word) {
+  if (word == 0x0024 || word == 0x0080 || word == 0x00A2 || word == 0x00A3 ||
+      word == 0x00A4 || word == 0x00A5 || (word >= 0x20A0 && word <= 0x20CF) ||
+      word == 0xFE69 || word == 0xFF04 || word == 0xFFE0 || word == 0xFFE1 ||
+      word == 0xFFE5 || word == 0xFFE6) {
+    return TRUE;
+  }
+  return FALSE;
 }
-static FX_BOOL IsPunctuation(FX_DWORD word)
-{
-    if (word <= 0x007F) {
-        if ((special_chars[word] >> 3) & 1) {
-            return TRUE;
-        }
-    } else if (word >= 0x0080 && word <= 0x00FF) {
-        if (word == 0x0082 || word == 0x0084 || word == 0x0085 || word == 0x0091 ||
-                word == 0x0092 || word == 0x0093 || word <= 0x0094 || word == 0x0096 ||
-                word == 0x00B4 || word == 0x00B8) {
-            return TRUE;
-        }
-    } else if (word >= 0x2000 && word <= 0x206F) {
-        if (word == 0x2010 || word == 0x2011 || word == 0x2012 || word == 0x2013 ||
-                word == 0x2018 || word == 0x2019 || word == 0x201A || word == 0x201B ||
-                word == 0x201C || word == 0x201D || word == 0x201E || word == 0x201F ||
-                word == 0x2032 || word == 0x2033 || word == 0x2034 || word == 0x2035 ||
-                word == 0x2036 || word == 0x2037 || word == 0x203C || word == 0x203D ||
-                word == 0x203E || word == 0x2044) {
-            return TRUE;
-        }
-    } else if (word >= 0x3000 && word <= 0x303F) {
-        if (word == 0x3001 || word == 0x3002 || word == 0x3003 || word == 0x3005 ||
-                word == 0x3009 || word == 0x300A || word == 0x300B || word == 0x300C ||
-                word == 0x300D || word == 0x300F || word == 0x300E || word == 0x3010 ||
-                word == 0x3011 || word == 0x3014 || word == 0x3015 || word == 0x3016 ||
-                word == 0x3017 || word == 0x3018 || word == 0x3019 || word == 0x301A ||
-                word == 0x301B || word == 0x301D || word == 0x301E || word == 0x301F) {
-            return TRUE;
-        }
-    } else if (word >= 0xFE50 && word <= 0xFE6F) {
-        if ((word >= 0xFE50 && word <= 0xFE5E) || word == 0xFE63) {
-            return TRUE;
-        }
-    } else if (word >= 0xFF00 && word <= 0xFFEF) {
-        if (word == 0xFF01 || word == 0xFF02 || word == 0xFF07 || word == 0xFF08 ||
-                word == 0xFF09 || word == 0xFF0C || word == 0xFF0E || word == 0xFF0F ||
-                word == 0xFF1A || word == 0xFF1B || word == 0xFF1F || word == 0xFF3B ||
-                word == 0xFF3D || word == 0xFF40 || word == 0xFF5B || word == 0xFF5C ||
-                word == 0xFF5D || word == 0xFF61 || word == 0xFF62 || word == 0xFF63 ||
-                word == 0xFF64 || word == 0xFF65 || word == 0xFF9E || word == 0xFF9F) {
-            return TRUE;
-        }
-    }
-    return FALSE;
+static FX_BOOL IsPrefixSymbol(FX_WORD word) {
+  if (IsCurrencySymbol(word)) {
+    return TRUE;
+  }
+  if (word == 0x2116) {
+    return TRUE;
+  }
+  return FALSE;
 }
-static FX_BOOL IsConnectiveSymbol(FX_DWORD word)
-{
-    if (word <= 0x007F) {
-        if ((special_chars[word] >> 5) & 1) {
-            return TRUE;
-        }
-    }
-    return FALSE;
+static FX_BOOL IsSpace(FX_WORD word) {
+  return (word == 0x0020 || word == 0x3000) ? TRUE : FALSE;
 }
-static FX_BOOL IsOpenStylePunctuation(FX_DWORD word)
-{
-    if (word <= 0x007F) {
-        if ((special_chars[word] >> 2) & 1) {
-            return TRUE;
-        }
-    } else if (word == 0x300A || word == 0x300C || word == 0x300E || word == 0x3010 ||
-               word == 0x3014 || word == 0x3016 || word == 0x3018 || word == 0x301A ||
-               word == 0xFF08 || word == 0xFF3B || word == 0xFF5B || word == 0xFF62) {
-        return TRUE;
-    }
+static FX_BOOL NeedDivision(FX_WORD prevWord, FX_WORD curWord) {
+  if ((IsLatin(prevWord) || IsDigit(prevWord)) &&
+      (IsLatin(curWord) || IsDigit(curWord))) {
     return FALSE;
-}
-static FX_BOOL IsCurrencySymbol(FX_WORD word)
-{
-    if (word == 0x0024 || word == 0x0080 || word == 0x00A2 || word == 0x00A3 ||
-            word == 0x00A4 || word == 0x00A5 || (word >= 0x20A0 && word <= 0x20CF) ||
-            word == 0xFE69 || word == 0xFF04 || word == 0xFFE0 || word == 0xFFE1 ||
-            word == 0xFFE5 || word == 0xFFE6) {
-        return TRUE;
-    }
+  }
+  if (IsSpace(curWord) || IsPunctuation(curWord)) {
     return FALSE;
-}
-static FX_BOOL IsPrefixSymbol(FX_WORD word)
-{
-    if (IsCurrencySymbol(word)) {
-        return TRUE;
-    }
-    if (word == 0x2116) {
-        return TRUE;
-    }
+  }
+  if (IsConnectiveSymbol(prevWord) || IsConnectiveSymbol(curWord)) {
     return FALSE;
-}
-static FX_BOOL IsSpace(FX_WORD word)
-{
-    return (word == 0x0020 || word == 0x3000) ? TRUE : FALSE;
-}
-static FX_BOOL NeedDivision(FX_WORD prevWord, FX_WORD curWord)
-{
-    if ((IsLatin(prevWord) || IsDigit(prevWord)) && (IsLatin(curWord) || IsDigit(curWord))) {
-        return FALSE;
-    }
-    if (IsSpace(curWord) || IsPunctuation(curWord)) {
-        return FALSE;
-    }
-    if (IsConnectiveSymbol(prevWord) || IsConnectiveSymbol(curWord)) {
-        return FALSE;
-    }
-    if (IsSpace(prevWord) || IsPunctuation(prevWord)) {
-        return TRUE;
-    }
-    if (IsPrefixSymbol(prevWord)) {
-        return FALSE;
-    }
-    if (IsPrefixSymbol(curWord) || IsCJK(curWord)) {
-        return TRUE;
-    }
-    if (IsCJK(prevWord)) {
-        return TRUE;
-    }
+  }
+  if (IsSpace(prevWord) || IsPunctuation(prevWord)) {
+    return TRUE;
+  }
+  if (IsPrefixSymbol(prevWord)) {
     return FALSE;
-}
-void CTypeset::SplitLines(FX_BOOL bTypeset, FX_FLOAT fFontSize)
-{
-    ASSERT(m_pVT != NULL);
-    ASSERT(m_pSection != NULL);
-    int32_t nLineHead = 0;
-    int32_t nLineTail = 0;
-    FX_FLOAT fMaxX = 0.0f, fMaxY = 0.0f;
-    FX_FLOAT fLineWidth = 0.0f, fBackupLineWidth = 0.0f;
-    FX_FLOAT fLineAscent = 0.0f, fBackupLineAscent = 0.0f;
-    FX_FLOAT fLineDescent = 0.0f, fBackupLineDescent = 0.0f;
-    int32_t nWordStartPos = 0;
-    FX_BOOL bFullWord = FALSE;
-    int32_t nLineFullWordIndex = 0;
-    int32_t nCharIndex = 0;
-    CPVT_LineInfo line;
-    FX_FLOAT fWordWidth = 0;
-    FX_FLOAT fTypesetWidth = FPDF_MAX(m_pVT->GetPlateWidth() - m_pVT->GetLineIndent(m_pSection->m_SecInfo), 0.0f);
-    int32_t nTotalWords = m_pSection->m_WordArray.GetSize();
-    FX_BOOL bOpened = FALSE;
-    if (nTotalWords > 0) {
-        int32_t i = 0;
-        while (i < nTotalWords) {
-            CPVT_WordInfo * pWord = m_pSection->m_WordArray.GetAt(i);
-            CPVT_WordInfo* pOldWord = pWord;
-            if (i > 0) {
-                pOldWord = m_pSection->m_WordArray.GetAt(i - 1);
-            }
-            if (pWord) {
-                if (bTypeset) {
-                    fLineAscent = FPDF_MAX(fLineAscent, m_pVT->GetWordAscent(*pWord, TRUE));
-                    fLineDescent = FPDF_MIN(fLineDescent, m_pVT->GetWordDescent(*pWord, TRUE));
-                    fWordWidth = m_pVT->GetWordWidth(*pWord);
-                } else {
-                    fLineAscent = FPDF_MAX(fLineAscent, m_pVT->GetWordAscent(*pWord, fFontSize));
-                    fLineDescent = FPDF_MIN(fLineDescent, m_pVT->GetWordDescent(*pWord, fFontSize));
-                    fWordWidth = m_pVT->GetWordWidth(pWord->nFontIndex,
-                                                     pWord->Word,
-                                                     m_pVT->m_wSubWord,
-                                                     m_pVT->m_fCharSpace,
-                                                     m_pVT->m_nHorzScale,
-                                                     fFontSize,
-                                                     pWord->fWordTail,
-                                                     0);
-                }
-                if (!bOpened) {
-                    if (IsOpenStylePunctuation(pWord->Word)) {
-                        bOpened = TRUE;
-                        bFullWord = TRUE;
-                    } else if (pOldWord != NULL) {
-                        if (NeedDivision(pOldWord->Word, pWord->Word)) {
-                            bFullWord = TRUE;
-                        }
-                    }
-                } else {
-                    if (!IsSpace(pWord->Word) && !IsOpenStylePunctuation(pWord->Word)) {
-                        bOpened = FALSE;
-                    }
-                }
-                if (bFullWord) {
-                    bFullWord = FALSE;
-                    if (nCharIndex > 0) {
-                        nLineFullWordIndex ++;
-                    }
-                    nWordStartPos = i;
-                    fBackupLineWidth = fLineWidth;
-                    fBackupLineAscent = fLineAscent;
-                    fBackupLineDescent = fLineDescent;
-                }
-                nCharIndex++;
-            }
-            if (m_pVT->m_bLimitWidth && fTypesetWidth > 0 &&
-                    fLineWidth + fWordWidth > fTypesetWidth) {
-                if (nLineFullWordIndex > 0) {
-                    i = nWordStartPos;
-                    fLineWidth = fBackupLineWidth;
-                    fLineAscent = fBackupLineAscent;
-                    fLineDescent = fBackupLineDescent;
-                }
-                if (nCharIndex == 1) {
-                    fLineWidth =  fWordWidth;
-                    i++;
-                }
-                nLineTail = i - 1;
-                if (bTypeset) {
-                    line.nBeginWordIndex = nLineHead;
-                    line.nEndWordIndex = nLineTail;
-                    line.nTotalWord = nLineTail - nLineHead + 1;
-                    line.fLineWidth = fLineWidth;
-                    line.fLineAscent = fLineAscent;
-                    line.fLineDescent = fLineDescent;
-                    m_pSection->AddLine(line);
-                }
-                fMaxY += (fLineAscent + m_pVT->GetLineLeading(m_pSection->m_SecInfo));
-                fMaxY += (-fLineDescent);
-                fMaxX = FPDF_MAX(fLineWidth, fMaxX);
-                nLineHead = i;
-                fLineWidth = 0.0f;
-                fLineAscent = 0.0f;
-                fLineDescent = 0.0f;
-                nCharIndex = 0;
-                nLineFullWordIndex = 0;
-                bFullWord = FALSE;
-            } else {
-                fLineWidth += fWordWidth;
-                i++;
-            }
-        }
-        if (nLineHead <= nTotalWords - 1) {
-            nLineTail = nTotalWords - 1;
-            if (bTypeset) {
-                line.nBeginWordIndex = nLineHead;
-                line.nEndWordIndex = nLineTail;
-                line.nTotalWord = nLineTail - nLineHead + 1;
-                line.fLineWidth = fLineWidth;
-                line.fLineAscent = fLineAscent;
-                line.fLineDescent = fLineDescent;
-                m_pSection->AddLine(line);
-            }
-            fMaxY += (fLineAscent + m_pVT->GetLineLeading(m_pSection->m_SecInfo));
-            fMaxY += (-fLineDescent);
-            fMaxX = FPDF_MAX(fLineWidth, fMaxX);
-        }
-    } else {
+  }
+  if (IsPrefixSymbol(curWord) || IsCJK(curWord)) {
+    return TRUE;
+  }
+  if (IsCJK(prevWord)) {
+    return TRUE;
+  }
+  return FALSE;
+}
+void CTypeset::SplitLines(FX_BOOL bTypeset, FX_FLOAT fFontSize) {
+  ASSERT(m_pVT != NULL);
+  ASSERT(m_pSection != NULL);
+  int32_t nLineHead = 0;
+  int32_t nLineTail = 0;
+  FX_FLOAT fMaxX = 0.0f, fMaxY = 0.0f;
+  FX_FLOAT fLineWidth = 0.0f, fBackupLineWidth = 0.0f;
+  FX_FLOAT fLineAscent = 0.0f, fBackupLineAscent = 0.0f;
+  FX_FLOAT fLineDescent = 0.0f, fBackupLineDescent = 0.0f;
+  int32_t nWordStartPos = 0;
+  FX_BOOL bFullWord = FALSE;
+  int32_t nLineFullWordIndex = 0;
+  int32_t nCharIndex = 0;
+  CPVT_LineInfo line;
+  FX_FLOAT fWordWidth = 0;
+  FX_FLOAT fTypesetWidth = FPDF_MAX(
+      m_pVT->GetPlateWidth() - m_pVT->GetLineIndent(m_pSection->m_SecInfo),
+      0.0f);
+  int32_t nTotalWords = m_pSection->m_WordArray.GetSize();
+  FX_BOOL bOpened = FALSE;
+  if (nTotalWords > 0) {
+    int32_t i = 0;
+    while (i < nTotalWords) {
+      CPVT_WordInfo* pWord = m_pSection->m_WordArray.GetAt(i);
+      CPVT_WordInfo* pOldWord = pWord;
+      if (i > 0) {
+        pOldWord = m_pSection->m_WordArray.GetAt(i - 1);
+      }
+      if (pWord) {
         if (bTypeset) {
-            fLineAscent = m_pVT->GetLineAscent(m_pSection->m_SecInfo);
-            fLineDescent = m_pVT->GetLineDescent(m_pSection->m_SecInfo);
+          fLineAscent =
+              FPDF_MAX(fLineAscent, m_pVT->GetWordAscent(*pWord, TRUE));
+          fLineDescent =
+              FPDF_MIN(fLineDescent, m_pVT->GetWordDescent(*pWord, TRUE));
+          fWordWidth = m_pVT->GetWordWidth(*pWord);
         } else {
-            fLineAscent = m_pVT->GetFontAscent(m_pVT->GetDefaultFontIndex(), fFontSize);
-            fLineDescent = m_pVT->GetFontDescent(m_pVT->GetDefaultFontIndex(), fFontSize);
-        }
+          fLineAscent =
+              FPDF_MAX(fLineAscent, m_pVT->GetWordAscent(*pWord, fFontSize));
+          fLineDescent =
+              FPDF_MIN(fLineDescent, m_pVT->GetWordDescent(*pWord, fFontSize));
+          fWordWidth = m_pVT->GetWordWidth(
+              pWord->nFontIndex, pWord->Word, m_pVT->m_wSubWord,
+              m_pVT->m_fCharSpace, m_pVT->m_nHorzScale, fFontSize,
+              pWord->fWordTail, 0);
+        }
+        if (!bOpened) {
+          if (IsOpenStylePunctuation(pWord->Word)) {
+            bOpened = TRUE;
+            bFullWord = TRUE;
+          } else if (pOldWord != NULL) {
+            if (NeedDivision(pOldWord->Word, pWord->Word)) {
+              bFullWord = TRUE;
+            }
+          }
+        } else {
+          if (!IsSpace(pWord->Word) && !IsOpenStylePunctuation(pWord->Word)) {
+            bOpened = FALSE;
+          }
+        }
+        if (bFullWord) {
+          bFullWord = FALSE;
+          if (nCharIndex > 0) {
+            nLineFullWordIndex++;
+          }
+          nWordStartPos = i;
+          fBackupLineWidth = fLineWidth;
+          fBackupLineAscent = fLineAscent;
+          fBackupLineDescent = fLineDescent;
+        }
+        nCharIndex++;
+      }
+      if (m_pVT->m_bLimitWidth && fTypesetWidth > 0 &&
+          fLineWidth + fWordWidth > fTypesetWidth) {
+        if (nLineFullWordIndex > 0) {
+          i = nWordStartPos;
+          fLineWidth = fBackupLineWidth;
+          fLineAscent = fBackupLineAscent;
+          fLineDescent = fBackupLineDescent;
+        }
+        if (nCharIndex == 1) {
+          fLineWidth = fWordWidth;
+          i++;
+        }
+        nLineTail = i - 1;
         if (bTypeset) {
-            line.nBeginWordIndex = -1;
-            line.nEndWordIndex = -1;
-            line.nTotalWord = 0;
-            line.fLineWidth = 0;
-            line.fLineAscent = fLineAscent;
-            line.fLineDescent = fLineDescent;
-            m_pSection->AddLine(line);
-        }
-        fMaxY += (m_pVT->GetLineLeading(m_pSection->m_SecInfo) + fLineAscent + (-fLineDescent));
-    }
-    m_rcRet = CPVT_FloatRect(0, 0, fMaxX, fMaxY);
-}
-void CTypeset::OutputLines()
-{
-    ASSERT(m_pVT != NULL);
-    ASSERT(m_pSection != NULL);
-    FX_FLOAT fMinX = 0.0f, fMinY = 0.0f, fMaxX = 0.0f, fMaxY = 0.0f;
-    FX_FLOAT fPosX = 0.0f, fPosY = 0.0f;
-    FX_FLOAT fLineIndent = m_pVT->GetLineIndent(m_pSection->m_SecInfo);
-    FX_FLOAT fTypesetWidth = FPDF_MAX(m_pVT->GetPlateWidth() - fLineIndent, 0.0f);
-    switch (m_pVT->GetAlignment(m_pSection->m_SecInfo)) {
-        default:
-        case 0:
-            fMinX = 0.0f;
+          line.nBeginWordIndex = nLineHead;
+          line.nEndWordIndex = nLineTail;
+          line.nTotalWord = nLineTail - nLineHead + 1;
+          line.fLineWidth = fLineWidth;
+          line.fLineAscent = fLineAscent;
+          line.fLineDescent = fLineDescent;
+          m_pSection->AddLine(line);
+        }
+        fMaxY += (fLineAscent + m_pVT->GetLineLeading(m_pSection->m_SecInfo));
+        fMaxY += (-fLineDescent);
+        fMaxX = FPDF_MAX(fLineWidth, fMaxX);
+        nLineHead = i;
+        fLineWidth = 0.0f;
+        fLineAscent = 0.0f;
+        fLineDescent = 0.0f;
+        nCharIndex = 0;
+        nLineFullWordIndex = 0;
+        bFullWord = FALSE;
+      } else {
+        fLineWidth += fWordWidth;
+        i++;
+      }
+    }
+    if (nLineHead <= nTotalWords - 1) {
+      nLineTail = nTotalWords - 1;
+      if (bTypeset) {
+        line.nBeginWordIndex = nLineHead;
+        line.nEndWordIndex = nLineTail;
+        line.nTotalWord = nLineTail - nLineHead + 1;
+        line.fLineWidth = fLineWidth;
+        line.fLineAscent = fLineAscent;
+        line.fLineDescent = fLineDescent;
+        m_pSection->AddLine(line);
+      }
+      fMaxY += (fLineAscent + m_pVT->GetLineLeading(m_pSection->m_SecInfo));
+      fMaxY += (-fLineDescent);
+      fMaxX = FPDF_MAX(fLineWidth, fMaxX);
+    }
+  } else {
+    if (bTypeset) {
+      fLineAscent = m_pVT->GetLineAscent(m_pSection->m_SecInfo);
+      fLineDescent = m_pVT->GetLineDescent(m_pSection->m_SecInfo);
+    } else {
+      fLineAscent =
+          m_pVT->GetFontAscent(m_pVT->GetDefaultFontIndex(), fFontSize);
+      fLineDescent =
+          m_pVT->GetFontDescent(m_pVT->GetDefaultFontIndex(), fFontSize);
+    }
+    if (bTypeset) {
+      line.nBeginWordIndex = -1;
+      line.nEndWordIndex = -1;
+      line.nTotalWord = 0;
+      line.fLineWidth = 0;
+      line.fLineAscent = fLineAscent;
+      line.fLineDescent = fLineDescent;
+      m_pSection->AddLine(line);
+    }
+    fMaxY += (m_pVT->GetLineLeading(m_pSection->m_SecInfo) + fLineAscent +
+              (-fLineDescent));
+  }
+  m_rcRet = CPVT_FloatRect(0, 0, fMaxX, fMaxY);
+}
+void CTypeset::OutputLines() {
+  ASSERT(m_pVT != NULL);
+  ASSERT(m_pSection != NULL);
+  FX_FLOAT fMinX = 0.0f, fMinY = 0.0f, fMaxX = 0.0f, fMaxY = 0.0f;
+  FX_FLOAT fPosX = 0.0f, fPosY = 0.0f;
+  FX_FLOAT fLineIndent = m_pVT->GetLineIndent(m_pSection->m_SecInfo);
+  FX_FLOAT fTypesetWidth = FPDF_MAX(m_pVT->GetPlateWidth() - fLineIndent, 0.0f);
+  switch (m_pVT->GetAlignment(m_pSection->m_SecInfo)) {
+    default:
+    case 0:
+      fMinX = 0.0f;
+      break;
+    case 1:
+      fMinX = (fTypesetWidth - m_rcRet.Width()) * PVT_HALF;
+      break;
+    case 2:
+      fMinX = fTypesetWidth - m_rcRet.Width();
+      break;
+  }
+  fMaxX = fMinX + m_rcRet.Width();
+  fMinY = 0.0f;
+  fMaxY = m_rcRet.Height();
+  int32_t nTotalLines = m_pSection->m_LineArray.GetSize();
+  if (nTotalLines > 0) {
+    m_pSection->m_SecInfo.nTotalLine = nTotalLines;
+    for (int32_t l = 0; l < nTotalLines; l++) {
+      if (CLine* pLine = m_pSection->m_LineArray.GetAt(l)) {
+        switch (m_pVT->GetAlignment(m_pSection->m_SecInfo)) {
+          default:
+          case 0:
+            fPosX = 0;
             break;
-        case 1:
-            fMinX = (fTypesetWidth - m_rcRet.Width())  * PVT_HALF;
+          case 1:
+            fPosX = (fTypesetWidth - pLine->m_LineInfo.fLineWidth) * PVT_HALF;
             break;
-        case 2:
-            fMinX = fTypesetWidth - m_rcRet.Width();
+          case 2:
+            fPosX = fTypesetWidth - pLine->m_LineInfo.fLineWidth;
             break;
-    }
-    fMaxX = fMinX + m_rcRet.Width();
-    fMinY = 0.0f;
-    fMaxY = m_rcRet.Height();
-    int32_t nTotalLines = m_pSection->m_LineArray.GetSize();
-    if (nTotalLines > 0) {
-        m_pSection->m_SecInfo.nTotalLine = nTotalLines;
-        for (int32_t l = 0; l < nTotalLines; l++) {
-            if (CLine * pLine = m_pSection->m_LineArray.GetAt(l)) {
-                switch (m_pVT->GetAlignment(m_pSection->m_SecInfo)) {
-                    default:
-                    case 0:
-                        fPosX = 0;
-                        break;
-                    case 1:
-                        fPosX = (fTypesetWidth - pLine->m_LineInfo.fLineWidth) * PVT_HALF;
-                        break;
-                    case 2:
-                        fPosX = fTypesetWidth - pLine->m_LineInfo.fLineWidth;
-                        break;
-                }
-                fPosX += fLineIndent;
-                fPosY += m_pVT->GetLineLeading(m_pSection->m_SecInfo);
-                fPosY += pLine->m_LineInfo.fLineAscent;
-                pLine->m_LineInfo.fLineX = fPosX - fMinX;
-                pLine->m_LineInfo.fLineY = fPosY - fMinY;
-                for (int32_t w = pLine->m_LineInfo.nBeginWordIndex; w <= pLine->m_LineInfo.nEndWordIndex; w++) {
-                    if (CPVT_WordInfo * pWord = m_pSection->m_WordArray.GetAt(w)) {
-                        pWord->fWordX = fPosX - fMinX;
-                        if (pWord->pWordProps) {
-                            switch (pWord->pWordProps->nScriptType) {
-                                default:
-                                case PVTWORD_SCRIPT_NORMAL:
-                                    pWord->fWordY = fPosY - fMinY;
-                                    break;
-                                case PVTWORD_SCRIPT_SUPER:
-                                    pWord->fWordY = fPosY - m_pVT->GetWordAscent(*pWord) - fMinY;
-                                    break;
-                                case PVTWORD_SCRIPT_SUB:
-                                    pWord->fWordY = fPosY - m_pVT->GetWordDescent(*pWord) - fMinY;
-                                    break;
-                            }
-                        } else {
-                            pWord->fWordY = fPosY - fMinY;
-                        }
-                        fPosX += m_pVT->GetWordWidth(*pWord);
-                    }
-                }
-                fPosY += (-pLine->m_LineInfo.fLineDescent);
-            }
         }
-    }
-    m_rcRet = CPVT_FloatRect(fMinX, fMinY, fMaxX, fMaxY);
-}
-CPDF_VariableText::CPDF_VariableText() :
-    m_nLimitChar(0),
-    m_nCharArray(0),
-    m_bMultiLine(FALSE),
-    m_bLimitWidth(FALSE),
-    m_bAutoFontSize(FALSE),
-    m_nAlignment(0),
-    m_fLineLeading(0.0f),
-    m_fCharSpace(0.0f),
-    m_nHorzScale(100),
-    m_wSubWord(0),
-    m_fFontSize(0.0f),
-    m_bInitial(FALSE),
-    m_bRichText(FALSE),
-    m_pVTProvider(NULL),
-    m_pVTIterator(NULL)
-{
-}
-CPDF_VariableText::~CPDF_VariableText()
-{
-    delete m_pVTIterator;
-    m_pVTIterator = NULL;
-    ResetAll();
-}
-void CPDF_VariableText::Initialize()
-{
-    if (!m_bInitial) {
-        CPVT_SectionInfo secinfo;
-        if (m_bRichText) {
-            secinfo.pSecProps = new CPVT_SecProps(0.0f, 0.0f, 0);
-            secinfo.pWordProps = new CPVT_WordProps(GetDefaultFontIndex(), PVT_DEFAULT_FONTSIZE, 0, 0, 0);
-        }
-        CPVT_WordPlace place;
-        place.nSecIndex = 0;
-        AddSection(place, secinfo);
-        CPVT_LineInfo lineinfo;
-        lineinfo.fLineAscent = GetFontAscent(GetDefaultFontIndex(), GetFontSize());
-        lineinfo.fLineDescent = GetFontDescent(GetDefaultFontIndex(), GetFontSize());
-        AddLine(place, lineinfo);
-        if (CSection * pSection = m_SectionArray.GetAt(0)) {
-            pSection->ResetLinePlace();
-        }
-        m_bInitial = TRUE;
-    }
-}
-void CPDF_VariableText::ResetAll()
-{
-    m_bInitial = FALSE;
-    ResetSectionArray();
-}
-CPVT_WordPlace CPDF_VariableText::InsertWord(const CPVT_WordPlace & place, FX_WORD word, int32_t charset,
-        const CPVT_WordProps * pWordProps)
-{
-    int32_t nTotlaWords = GetTotalWords();
-    if (m_nLimitChar > 0 && nTotlaWords >= m_nLimitChar) {
-        return place;
-    }
-    if (m_nCharArray > 0 && nTotlaWords >= m_nCharArray) {
-        return place;
-    }
-    CPVT_WordPlace newplace = place;
-    newplace.nWordIndex ++;
-    if (m_bRichText) {
-        CPVT_WordProps * pNewProps = pWordProps ? new CPVT_WordProps(*pWordProps) : new CPVT_WordProps();
-        pNewProps->nFontIndex = GetWordFontIndex(word, charset, pWordProps->nFontIndex);
-        return AddWord(newplace, CPVT_WordInfo(word, charset, -1, pNewProps));
-    }
-    int32_t nFontIndex = GetSubWord() > 0 ? GetDefaultFontIndex() : GetWordFontIndex(word, charset, GetDefaultFontIndex());
-    return AddWord(newplace, CPVT_WordInfo(word, charset, nFontIndex, NULL));
-}
-CPVT_WordPlace CPDF_VariableText::InsertSection(const CPVT_WordPlace & place, const CPVT_SecProps * pSecProps,
-        const CPVT_WordProps * pWordProps)
-{
-    int32_t nTotlaWords = GetTotalWords();
-    if (m_nLimitChar > 0 && nTotlaWords >= m_nLimitChar) {
-        return place;
-    }
-    if (m_nCharArray > 0 && nTotlaWords >= m_nCharArray) {
-        return place;
-    }
-    if (!m_bMultiLine) {
-        return place;
-    }
-    CPVT_WordPlace wordplace = place;
-    UpdateWordPlace(wordplace);
-    CPVT_WordPlace newplace = place;
-    if (CSection * pSection = m_SectionArray.GetAt(wordplace.nSecIndex)) {
-        CPVT_WordPlace NewPlace(wordplace.nSecIndex + 1, 0, -1);
-        CPVT_SectionInfo secinfo;
-        if (m_bRichText) {
-            if (pSecProps) {
-                secinfo.pSecProps = new CPVT_SecProps(*pSecProps);
-            }
-            if (pWordProps) {
-                secinfo.pWordProps = new CPVT_WordProps(*pWordProps);
-            }
-        }
-        AddSection(NewPlace, secinfo);
-        newplace = NewPlace;
-        if (CSection * pNewSection = m_SectionArray.GetAt(NewPlace.nSecIndex)) {
-            for (int32_t w = wordplace.nWordIndex + 1, sz = pSection->m_WordArray.GetSize(); w < sz; w++) {
-                if (CPVT_WordInfo * pWord = pSection->m_WordArray.GetAt(w)) {
-                    NewPlace.nWordIndex++;
-                    pNewSection->AddWord(NewPlace, *pWord);
-                }
+        fPosX += fLineIndent;
+        fPosY += m_pVT->GetLineLeading(m_pSection->m_SecInfo);
+        fPosY += pLine->m_LineInfo.fLineAscent;
+        pLine->m_LineInfo.fLineX = fPosX - fMinX;
+        pLine->m_LineInfo.fLineY = fPosY - fMinY;
+        for (int32_t w = pLine->m_LineInfo.nBeginWordIndex;
+             w <= pLine->m_LineInfo.nEndWordIndex; w++) {
+          if (CPVT_WordInfo* pWord = m_pSection->m_WordArray.GetAt(w)) {
+            pWord->fWordX = fPosX - fMinX;
+            if (pWord->pWordProps) {
+              switch (pWord->pWordProps->nScriptType) {
+                default:
+                case PVTWORD_SCRIPT_NORMAL:
+                  pWord->fWordY = fPosY - fMinY;
+                  break;
+                case PVTWORD_SCRIPT_SUPER:
+                  pWord->fWordY = fPosY - m_pVT->GetWordAscent(*pWord) - fMinY;
+                  break;
+                case PVTWORD_SCRIPT_SUB:
+                  pWord->fWordY = fPosY - m_pVT->GetWordDescent(*pWord) - fMinY;
+                  break;
+              }
+            } else {
+              pWord->fWordY = fPosY - fMinY;
             }
-        }
-        ClearSectionRightWords(wordplace);
-    }
-    return newplace;
-}
-CPVT_WordPlace CPDF_VariableText::InsertText(const CPVT_WordPlace & place, const FX_WCHAR* text, int32_t charset,
-        const CPVT_SecProps * pSecProps, const CPVT_WordProps * pProps)
-{
-    CFX_WideString swText = text;
-    CPVT_WordPlace wp = place;
-    for (int32_t i = 0, sz = swText.GetLength(); i < sz; i++) {
-        CPVT_WordPlace oldwp = wp;
-        FX_WORD word = swText.GetAt(i);
-        switch (word) {
-            case 0x0D:
-                if (m_bMultiLine) {
-                    if (swText.GetAt(i + 1) == 0x0A) {
-                        i += 1;
-                    }
-                    wp = InsertSection(wp, pSecProps, pProps);
-                }
-                break;
-            case 0x0A:
-                if (m_bMultiLine) {
-                    if (swText.GetAt(i + 1) == 0x0D) {
-                        i += 1;
-                    }
-                    wp = InsertSection(wp, pSecProps, pProps);
-                }
-                break;
-            case 0x09:
-                word = 0x20;
-            default:
-                wp = InsertWord(wp, word, charset, pProps);
-                break;
-        }
-        if (wp == oldwp) {
-            break;
-        }
-    }
-    return wp;
-}
-CPVT_WordPlace CPDF_VariableText::DeleteWords(const CPVT_WordRange & PlaceRange)
-{
-    FX_BOOL bLastSecPos = FALSE;
-    if (CSection * pSection = m_SectionArray.GetAt(PlaceRange.EndPos.nSecIndex)) {
-        bLastSecPos = (PlaceRange.EndPos == pSection->GetEndWordPlace());
-    }
-    ClearWords(PlaceRange);
-    if (PlaceRange.BeginPos.nSecIndex != PlaceRange.EndPos.nSecIndex) {
-        ClearEmptySections(PlaceRange);
-        if (!bLastSecPos) {
-            LinkLatterSection(PlaceRange.BeginPos);
-        }
-    }
-    return PlaceRange.BeginPos;
-}
-CPVT_WordPlace CPDF_VariableText::DeleteWord(const CPVT_WordPlace & place)
-{
-    return ClearRightWord(AjustLineHeader(place, TRUE));
-}
-CPVT_WordPlace CPDF_VariableText::BackSpaceWord(const CPVT_WordPlace & place)
-{
-    return ClearLeftWord(AjustLineHeader(place, TRUE));
-}
-void CPDF_VariableText::SetText(const FX_WCHAR* text, int32_t charset, const CPVT_SecProps * pSecProps,
-                                const CPVT_WordProps * pWordProps)
-{
-    DeleteWords(CPVT_WordRange(GetBeginWordPlace(), GetEndWordPlace()));
-    CFX_WideString swText = text;
-    CPVT_WordPlace	wp(0, 0, -1);
+            fPosX += m_pVT->GetWordWidth(*pWord);
+          }
+        }
+        fPosY += (-pLine->m_LineInfo.fLineDescent);
+      }
+    }
+  }
+  m_rcRet = CPVT_FloatRect(fMinX, fMinY, fMaxX, fMaxY);
+}
+CPDF_VariableText::CPDF_VariableText()
+    : m_nLimitChar(0),
+      m_nCharArray(0),
+      m_bMultiLine(FALSE),
+      m_bLimitWidth(FALSE),
+      m_bAutoFontSize(FALSE),
+      m_nAlignment(0),
+      m_fLineLeading(0.0f),
+      m_fCharSpace(0.0f),
+      m_nHorzScale(100),
+      m_wSubWord(0),
+      m_fFontSize(0.0f),
+      m_bInitial(FALSE),
+      m_bRichText(FALSE),
+      m_pVTProvider(NULL),
+      m_pVTIterator(NULL) {}
+CPDF_VariableText::~CPDF_VariableText() {
+  delete m_pVTIterator;
+  m_pVTIterator = NULL;
+  ResetAll();
+}
+void CPDF_VariableText::Initialize() {
+  if (!m_bInitial) {
     CPVT_SectionInfo secinfo;
     if (m_bRichText) {
-        if (pSecProps) {
-            secinfo.pSecProps = new CPVT_SecProps(*pSecProps);
-        }
-        if (pWordProps) {
-            secinfo.pWordProps = new CPVT_WordProps(*pWordProps);
-        }
-    }
-    if (CSection * pSection = m_SectionArray.GetAt(0)) {
-        pSection->m_SecInfo = secinfo;
-    }
-    int32_t nCharCount = 0;
-    for (int32_t i = 0, sz = swText.GetLength(); i < sz; i++) {
-        if (m_nLimitChar > 0 && nCharCount >= m_nLimitChar) {
-            break;
-        }
-        if (m_nCharArray > 0 && nCharCount >= m_nCharArray) {
-            break;
-        }
-        FX_WORD word = swText.GetAt(i);
-        switch (word) {
-            case 0x0D:
-                if (m_bMultiLine) {
-                    if (swText.GetAt(i + 1) == 0x0A) {
-                        i += 1;
-                    }
-                    wp.nSecIndex ++;
-                    wp.nLineIndex = 0;
-                    wp.nWordIndex = -1;
-                    AddSection(wp, secinfo);
-                }
-                break;
-            case 0x0A:
-                if (m_bMultiLine) {
-                    if (swText.GetAt(i + 1) == 0x0D) {
-                        i += 1;
-                    }
-                    wp.nSecIndex ++;
-                    wp.nLineIndex = 0;
-                    wp.nWordIndex = -1;
-                    AddSection(wp, secinfo);
-                }
-                break;
-            case 0x09:
-                word = 0x20;
-            default:
-                wp = InsertWord(wp, word, charset, pWordProps);
-                break;
-        }
-        nCharCount++;
-    }
-}
-void CPDF_VariableText::UpdateWordPlace(CPVT_WordPlace & place) const
-{
-    if (place.nSecIndex < 0) {
-        place = GetBeginWordPlace();
-    }
-    if (place.nSecIndex >= m_SectionArray.GetSize()) {
-        place = GetEndWordPlace();
-    }
-    place = AjustLineHeader(place, TRUE);
-    if (CSection * pSection = m_SectionArray.GetAt(place.nSecIndex)) {
-        pSection->UpdateWordPlace(place);
-    }
-}
-int32_t CPDF_VariableText::WordPlaceToWordIndex(const CPVT_WordPlace & place) const
-{
-    CPVT_WordPlace newplace = place;
-    UpdateWordPlace(newplace);
-    int32_t nIndex = 0;
-    int32_t i = 0;
-    int32_t sz = 0;
-    for (i = 0, sz = m_SectionArray.GetSize(); i < sz && i < newplace.nSecIndex; i++) {
-        if (CSection * pSection = m_SectionArray.GetAt(i)) {
-            nIndex += pSection->m_WordArray.GetSize();
-            if (i != m_SectionArray.GetSize() - 1) {
-                nIndex += PVT_RETURN_LENGTH;
-            }
-        }
-    }
-    if (i >= 0 && i < m_SectionArray.GetSize()) {
-        nIndex += newplace.nWordIndex + PVT_RETURN_LENGTH;
-    }
-    return nIndex;
-}
-CPVT_WordPlace CPDF_VariableText::WordIndexToWordPlace(int32_t index) const
-{
-    CPVT_WordPlace place = GetBeginWordPlace();
-    int32_t nOldIndex = 0 , nIndex = 0;
-    FX_BOOL bFind = FALSE;
-    for (int32_t i = 0, sz = m_SectionArray.GetSize(); i < sz; i++) {
-        if (CSection * pSection = m_SectionArray.GetAt(i)) {
-            nIndex += pSection->m_WordArray.GetSize();
-            if (nIndex == index) {
-                place = pSection->GetEndWordPlace();
-                bFind = TRUE;
-                break;
-            } else if (nIndex > index) {
-                place.nSecIndex = i;
-                place.nWordIndex = index - nOldIndex - 1;
-                pSection->UpdateWordPlace(place);
-                bFind = TRUE;
-                break;
-            }
-            if (i != m_SectionArray.GetSize() - 1) {
-                nIndex += PVT_RETURN_LENGTH;
-            }
-            nOldIndex = nIndex;
-        }
-    }
-    if (!bFind) {
-        place = GetEndWordPlace();
+      secinfo.pSecProps = new CPVT_SecProps(0.0f, 0.0f, 0);
+      secinfo.pWordProps = new CPVT_WordProps(GetDefaultFontIndex(),
+                                              PVT_DEFAULT_FONTSIZE, 0, 0, 0);
     }
+    CPVT_WordPlace place;
+    place.nSecIndex = 0;
+    AddSection(place, secinfo);
+    CPVT_LineInfo lineinfo;
+    lineinfo.fLineAscent = GetFontAscent(GetDefaultFontIndex(), GetFontSize());
+    lineinfo.fLineDescent =
+        GetFontDescent(GetDefaultFontIndex(), GetFontSize());
+    AddLine(place, lineinfo);
+    if (CSection* pSection = m_SectionArray.GetAt(0)) {
+      pSection->ResetLinePlace();
+    }
+    m_bInitial = TRUE;
+  }
+}
+void CPDF_VariableText::ResetAll() {
+  m_bInitial = FALSE;
+  ResetSectionArray();
+}
+CPVT_WordPlace CPDF_VariableText::InsertWord(const CPVT_WordPlace& place,
+                                             FX_WORD word,
+                                             int32_t charset,
+                                             const CPVT_WordProps* pWordProps) {
+  int32_t nTotlaWords = GetTotalWords();
+  if (m_nLimitChar > 0 && nTotlaWords >= m_nLimitChar) {
     return place;
-}
-CPVT_WordPlace CPDF_VariableText::GetBeginWordPlace() const
-{
-    return m_bInitial ? CPVT_WordPlace(0, 0, -1) : CPVT_WordPlace();
-}
-CPVT_WordPlace CPDF_VariableText::GetEndWordPlace() const
-{
-    if (CSection * pSection = m_SectionArray.GetAt(m_SectionArray.GetSize() - 1)) {
-        return pSection->GetEndWordPlace();
-    }
-    return CPVT_WordPlace();
-}
-CPVT_WordPlace CPDF_VariableText::GetPrevWordPlace(const CPVT_WordPlace & place) const
-{
-    if( place.nSecIndex < 0) {
-        return GetBeginWordPlace();
-    }
-    if (place.nSecIndex >= m_SectionArray.GetSize()) {
-        return GetEndWordPlace();
-    }
-    if (CSection * pSection = m_SectionArray.GetAt(place.nSecIndex)) {
-        if (place.WordCmp(pSection->GetBeginWordPlace()) <= 0) {
-            if (CSection * pPrevSection = m_SectionArray.GetAt(place.nSecIndex - 1)) {
-                return pPrevSection->GetEndWordPlace();
-            }
-            return GetBeginWordPlace();
-        }
-        return pSection->GetPrevWordPlace(place);
-    }
+  }
+  if (m_nCharArray > 0 && nTotlaWords >= m_nCharArray) {
     return place;
-}
-CPVT_WordPlace CPDF_VariableText::GetNextWordPlace(const CPVT_WordPlace & place) const
-{
-    if (place.nSecIndex < 0) {
-        return GetBeginWordPlace();
-    }
-    if (place.nSecIndex >= m_SectionArray.GetSize()) {
-        return GetEndWordPlace();
-    }
-    if (CSection * pSection = m_SectionArray.GetAt(place.nSecIndex)) {
-        if (place.WordCmp(pSection->GetEndWordPlace()) >= 0) {
-            if (CSection * pNextSection = m_SectionArray.GetAt(place.nSecIndex + 1)) {
-                return pNextSection->GetBeginWordPlace();
-            }
-            return GetEndWordPlace();
-        }
-        return pSection->GetNextWordPlace(place);
-    }
+  }
+  CPVT_WordPlace newplace = place;
+  newplace.nWordIndex++;
+  if (m_bRichText) {
+    CPVT_WordProps* pNewProps =
+        pWordProps ? new CPVT_WordProps(*pWordProps) : new CPVT_WordProps();
+    pNewProps->nFontIndex =
+        GetWordFontIndex(word, charset, pWordProps->nFontIndex);
+    return AddWord(newplace, CPVT_WordInfo(word, charset, -1, pNewProps));
+  }
+  int32_t nFontIndex =
+      GetSubWord() > 0 ? GetDefaultFontIndex()
+                       : GetWordFontIndex(word, charset, GetDefaultFontIndex());
+  return AddWord(newplace, CPVT_WordInfo(word, charset, nFontIndex, NULL));
+}
+CPVT_WordPlace CPDF_VariableText::InsertSection(
+    const CPVT_WordPlace& place,
+    const CPVT_SecProps* pSecProps,
+    const CPVT_WordProps* pWordProps) {
+  int32_t nTotlaWords = GetTotalWords();
+  if (m_nLimitChar > 0 && nTotlaWords >= m_nLimitChar) {
     return place;
-}
-CPVT_WordPlace CPDF_VariableText::SearchWordPlace(const CPDF_Point & point) const
-{
-    CPDF_Point pt = OutToIn(point);
-    CPVT_WordPlace place = GetBeginWordPlace();
-    int32_t nLeft = 0;
-    int32_t nRight = m_SectionArray.GetSize() - 1;
-    int32_t nMid = m_SectionArray.GetSize() / 2;
-    FX_BOOL bUp = TRUE;
-    FX_BOOL bDown = TRUE;
-    while (nLeft <= nRight) {
-        if (CSection * pSection = m_SectionArray.GetAt(nMid)) {
-            if (IsFloatBigger(pt.y, pSection->m_SecInfo.rcSection.top)) {
-                bUp = FALSE;
-            }
-            if (IsFloatBigger(pSection->m_SecInfo.rcSection.bottom, pt.y)) {
-                bDown = FALSE;
-            }
-            if (IsFloatSmaller(pt.y, pSection->m_SecInfo.rcSection.top)) {
-                nRight = nMid - 1;
-                nMid = (nLeft + nRight) / 2;
-                continue;
-            } else if (IsFloatBigger(pt.y, pSection->m_SecInfo.rcSection.bottom)) {
-                nLeft = nMid + 1;
-                nMid = (nLeft + nRight) / 2;
-                continue;
-            } else {
-                place = pSection->SearchWordPlace(
-                            CPDF_Point(pt.x - pSection->m_SecInfo.rcSection.left, pt.y - pSection->m_SecInfo.rcSection.top)
-                        );
-                place.nSecIndex = nMid;
-                return place;
-            }
-        } else {
-            break;
-        }
-    }
-    if (bUp) {
-        place = GetBeginWordPlace();
-    }
-    if (bDown) {
-        place = GetEndWordPlace();
-    }
+  }
+  if (m_nCharArray > 0 && nTotlaWords >= m_nCharArray) {
     return place;
-}
-CPVT_WordPlace CPDF_VariableText::GetUpWordPlace(const CPVT_WordPlace & place, const CPDF_Point & point) const
-{
-    if (CSection * pSection = m_SectionArray.GetAt(place.nSecIndex)) {
-        CPVT_WordPlace temp =  place;
-        CPDF_Point pt = OutToIn(point);
-        if (temp.nLineIndex-- > 0) {
-            return pSection->SearchWordPlace(pt.x - pSection->m_SecInfo.rcSection.left, temp);
-        }
-        if (temp.nSecIndex-- > 0) {
-            if (CSection * pLastSection = m_SectionArray.GetAt(temp.nSecIndex)) {
-                temp.nLineIndex = pLastSection->m_LineArray.GetSize() - 1;
-                return pLastSection->SearchWordPlace(pt.x - pLastSection->m_SecInfo.rcSection.left, temp);
-            }
-        }
-    }
+  }
+  if (!m_bMultiLine) {
     return place;
-}
-CPVT_WordPlace CPDF_VariableText::GetDownWordPlace(const CPVT_WordPlace & place, const CPDF_Point & point) const
-{
-    if (CSection * pSection = m_SectionArray.GetAt(place.nSecIndex)) {
-        CPVT_WordPlace temp =  place;
-        CPDF_Point pt = OutToIn(point);
-        if (temp.nLineIndex++ < pSection->m_LineArray.GetSize() - 1) {
-            return pSection->SearchWordPlace(pt.x - pSection->m_SecInfo.rcSection.left, temp);
-        }
-        if (temp.nSecIndex++ < m_SectionArray.GetSize() - 1) {
-            if (CSection * pNextSection = m_SectionArray.GetAt(temp.nSecIndex)) {
-                temp.nLineIndex = 0;
-                return pNextSection->SearchWordPlace(pt.x - pSection->m_SecInfo.rcSection.left, temp);
-            }
-        }
-    }
-    return place;
-}
-CPVT_WordPlace CPDF_VariableText::GetLineBeginPlace(const CPVT_WordPlace & place) const
-{
-    return CPVT_WordPlace(place.nSecIndex, place.nLineIndex, -1);
-}
-CPVT_WordPlace CPDF_VariableText::GetLineEndPlace(const CPVT_WordPlace & place) const
-{
-    if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
-        if (CLine* pLine = pSection->m_LineArray.GetAt(place.nLineIndex))
-            return pLine->GetEndWordPlace();
-    }
-    return place;
-}
-CPVT_WordPlace CPDF_VariableText::GetSectionBeginPlace(const CPVT_WordPlace & place) const
-{
-    return CPVT_WordPlace(place.nSecIndex, 0, -1);
-}
-CPVT_WordPlace CPDF_VariableText::GetSectionEndPlace(const CPVT_WordPlace & place) const
-{
-    if (CSection * pSection = m_SectionArray.GetAt(place.nSecIndex)) {
-        return pSection->GetEndWordPlace();
-    }
-    return place;
-}
-int32_t CPDF_VariableText::GetTotalWords() const
-{
-    int32_t nTotal = 0;
-    for (int32_t i = 0, sz = m_SectionArray.GetSize(); i < sz; i++)
-        if (CSection * pSection = m_SectionArray.GetAt(i)) {
-            nTotal += (pSection->m_WordArray.GetSize() + PVT_RETURN_LENGTH);
-        }
-    return nTotal - PVT_RETURN_LENGTH;
-}
-void CPDF_VariableText::ResetSectionArray()
-{
-    for (int32_t s = 0, sz = m_SectionArray.GetSize(); s < sz; s++) {
-        delete m_SectionArray.GetAt(s);
-    }
-    m_SectionArray.RemoveAll();
-}
-CPVT_WordPlace CPDF_VariableText::AddSection(const CPVT_WordPlace & place, const CPVT_SectionInfo & secinfo)
-{
-    if (IsValid() && !m_bMultiLine) {
-        return place;
-    }
-    int32_t nSecIndex = FPDF_MAX(FPDF_MIN(place.nSecIndex, m_SectionArray.GetSize()), 0);
-    CSection * pSection = new CSection(this);
+  }
+  CPVT_WordPlace wordplace = place;
+  UpdateWordPlace(wordplace);
+  CPVT_WordPlace newplace = place;
+  if (CSection* pSection = m_SectionArray.GetAt(wordplace.nSecIndex)) {
+    CPVT_WordPlace NewPlace(wordplace.nSecIndex + 1, 0, -1);
+    CPVT_SectionInfo secinfo;
+    if (m_bRichText) {
+      if (pSecProps) {
+        secinfo.pSecProps = new CPVT_SecProps(*pSecProps);
+      }
+      if (pWordProps) {
+        secinfo.pWordProps = new CPVT_WordProps(*pWordProps);
+      }
+    }
+    AddSection(NewPlace, secinfo);
+    newplace = NewPlace;
+    if (CSection* pNewSection = m_SectionArray.GetAt(NewPlace.nSecIndex)) {
+      for (int32_t w = wordplace.nWordIndex + 1,
+                   sz = pSection->m_WordArray.GetSize();
+           w < sz; w++) {
+        if (CPVT_WordInfo* pWord = pSection->m_WordArray.GetAt(w)) {
+          NewPlace.nWordIndex++;
+          pNewSection->AddWord(NewPlace, *pWord);
+        }
+      }
+    }
+    ClearSectionRightWords(wordplace);
+  }
+  return newplace;
+}
+CPVT_WordPlace CPDF_VariableText::InsertText(const CPVT_WordPlace& place,
+                                             const FX_WCHAR* text,
+                                             int32_t charset,
+                                             const CPVT_SecProps* pSecProps,
+                                             const CPVT_WordProps* pProps) {
+  CFX_WideString swText = text;
+  CPVT_WordPlace wp = place;
+  for (int32_t i = 0, sz = swText.GetLength(); i < sz; i++) {
+    CPVT_WordPlace oldwp = wp;
+    FX_WORD word = swText.GetAt(i);
+    switch (word) {
+      case 0x0D:
+        if (m_bMultiLine) {
+          if (swText.GetAt(i + 1) == 0x0A) {
+            i += 1;
+          }
+          wp = InsertSection(wp, pSecProps, pProps);
+        }
+        break;
+      case 0x0A:
+        if (m_bMultiLine) {
+          if (swText.GetAt(i + 1) == 0x0D) {
+            i += 1;
+          }
+          wp = InsertSection(wp, pSecProps, pProps);
+        }
+        break;
+      case 0x09:
+        word = 0x20;
+      default:
+        wp = InsertWord(wp, word, charset, pProps);
+        break;
+    }
+    if (wp == oldwp) {
+      break;
+    }
+  }
+  return wp;
+}
+CPVT_WordPlace CPDF_VariableText::DeleteWords(
+    const CPVT_WordRange& PlaceRange) {
+  FX_BOOL bLastSecPos = FALSE;
+  if (CSection* pSection = m_SectionArray.GetAt(PlaceRange.EndPos.nSecIndex)) {
+    bLastSecPos = (PlaceRange.EndPos == pSection->GetEndWordPlace());
+  }
+  ClearWords(PlaceRange);
+  if (PlaceRange.BeginPos.nSecIndex != PlaceRange.EndPos.nSecIndex) {
+    ClearEmptySections(PlaceRange);
+    if (!bLastSecPos) {
+      LinkLatterSection(PlaceRange.BeginPos);
+    }
+  }
+  return PlaceRange.BeginPos;
+}
+CPVT_WordPlace CPDF_VariableText::DeleteWord(const CPVT_WordPlace& place) {
+  return ClearRightWord(AjustLineHeader(place, TRUE));
+}
+CPVT_WordPlace CPDF_VariableText::BackSpaceWord(const CPVT_WordPlace& place) {
+  return ClearLeftWord(AjustLineHeader(place, TRUE));
+}
+void CPDF_VariableText::SetText(const FX_WCHAR* text,
+                                int32_t charset,
+                                const CPVT_SecProps* pSecProps,
+                                const CPVT_WordProps* pWordProps) {
+  DeleteWords(CPVT_WordRange(GetBeginWordPlace(), GetEndWordPlace()));
+  CFX_WideString swText = text;
+  CPVT_WordPlace wp(0, 0, -1);
+  CPVT_SectionInfo secinfo;
+  if (m_bRichText) {
+    if (pSecProps) {
+      secinfo.pSecProps = new CPVT_SecProps(*pSecProps);
+    }
+    if (pWordProps) {
+      secinfo.pWordProps = new CPVT_WordProps(*pWordProps);
+    }
+  }
+  if (CSection* pSection = m_SectionArray.GetAt(0)) {
     pSection->m_SecInfo = secinfo;
-    pSection->SecPlace.nSecIndex = nSecIndex;
-    if (nSecIndex == m_SectionArray.GetSize()) {
-        m_SectionArray.Add(pSection);
+  }
+  int32_t nCharCount = 0;
+  for (int32_t i = 0, sz = swText.GetLength(); i < sz; i++) {
+    if (m_nLimitChar > 0 && nCharCount >= m_nLimitChar) {
+      break;
+    }
+    if (m_nCharArray > 0 && nCharCount >= m_nCharArray) {
+      break;
+    }
+    FX_WORD word = swText.GetAt(i);
+    switch (word) {
+      case 0x0D:
+        if (m_bMultiLine) {
+          if (swText.GetAt(i + 1) == 0x0A) {
+            i += 1;
+          }
+          wp.nSecIndex++;
+          wp.nLineIndex = 0;
+          wp.nWordIndex = -1;
+          AddSection(wp, secinfo);
+        }
+        break;
+      case 0x0A:
+        if (m_bMultiLine) {
+          if (swText.GetAt(i + 1) == 0x0D) {
+            i += 1;
+          }
+          wp.nSecIndex++;
+          wp.nLineIndex = 0;
+          wp.nWordIndex = -1;
+          AddSection(wp, secinfo);
+        }
+        break;
+      case 0x09:
+        word = 0x20;
+      default:
+        wp = InsertWord(wp, word, charset, pWordProps);
+        break;
+    }
+    nCharCount++;
+  }
+}
+void CPDF_VariableText::UpdateWordPlace(CPVT_WordPlace& place) const {
+  if (place.nSecIndex < 0) {
+    place = GetBeginWordPlace();
+  }
+  if (place.nSecIndex >= m_SectionArray.GetSize()) {
+    place = GetEndWordPlace();
+  }
+  place = AjustLineHeader(place, TRUE);
+  if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
+    pSection->UpdateWordPlace(place);
+  }
+}
+int32_t CPDF_VariableText::WordPlaceToWordIndex(
+    const CPVT_WordPlace& place) const {
+  CPVT_WordPlace newplace = place;
+  UpdateWordPlace(newplace);
+  int32_t nIndex = 0;
+  int32_t i = 0;
+  int32_t sz = 0;
+  for (i = 0, sz = m_SectionArray.GetSize(); i < sz && i < newplace.nSecIndex;
+       i++) {
+    if (CSection* pSection = m_SectionArray.GetAt(i)) {
+      nIndex += pSection->m_WordArray.GetSize();
+      if (i != m_SectionArray.GetSize() - 1) {
+        nIndex += PVT_RETURN_LENGTH;
+      }
+    }
+  }
+  if (i >= 0 && i < m_SectionArray.GetSize()) {
+    nIndex += newplace.nWordIndex + PVT_RETURN_LENGTH;
+  }
+  return nIndex;
+}
+CPVT_WordPlace CPDF_VariableText::WordIndexToWordPlace(int32_t index) const {
+  CPVT_WordPlace place = GetBeginWordPlace();
+  int32_t nOldIndex = 0, nIndex = 0;
+  FX_BOOL bFind = FALSE;
+  for (int32_t i = 0, sz = m_SectionArray.GetSize(); i < sz; i++) {
+    if (CSection* pSection = m_SectionArray.GetAt(i)) {
+      nIndex += pSection->m_WordArray.GetSize();
+      if (nIndex == index) {
+        place = pSection->GetEndWordPlace();
+        bFind = TRUE;
+        break;
+      } else if (nIndex > index) {
+        place.nSecIndex = i;
+        place.nWordIndex = index - nOldIndex - 1;
+        pSection->UpdateWordPlace(place);
+        bFind = TRUE;
+        break;
+      }
+      if (i != m_SectionArray.GetSize() - 1) {
+        nIndex += PVT_RETURN_LENGTH;
+      }
+      nOldIndex = nIndex;
+    }
+  }
+  if (!bFind) {
+    place = GetEndWordPlace();
+  }
+  return place;
+}
+CPVT_WordPlace CPDF_VariableText::GetBeginWordPlace() const {
+  return m_bInitial ? CPVT_WordPlace(0, 0, -1) : CPVT_WordPlace();
+}
+CPVT_WordPlace CPDF_VariableText::GetEndWordPlace() const {
+  if (CSection* pSection = m_SectionArray.GetAt(m_SectionArray.GetSize() - 1)) {
+    return pSection->GetEndWordPlace();
+  }
+  return CPVT_WordPlace();
+}
+CPVT_WordPlace CPDF_VariableText::GetPrevWordPlace(
+    const CPVT_WordPlace& place) const {
+  if (place.nSecIndex < 0) {
+    return GetBeginWordPlace();
+  }
+  if (place.nSecIndex >= m_SectionArray.GetSize()) {
+    return GetEndWordPlace();
+  }
+  if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
+    if (place.WordCmp(pSection->GetBeginWordPlace()) <= 0) {
+      if (CSection* pPrevSection = m_SectionArray.GetAt(place.nSecIndex - 1)) {
+        return pPrevSection->GetEndWordPlace();
+      }
+      return GetBeginWordPlace();
+    }
+    return pSection->GetPrevWordPlace(place);
+  }
+  return place;
+}
+CPVT_WordPlace CPDF_VariableText::GetNextWordPlace(
+    const CPVT_WordPlace& place) const {
+  if (place.nSecIndex < 0) {
+    return GetBeginWordPlace();
+  }
+  if (place.nSecIndex >= m_SectionArray.GetSize()) {
+    return GetEndWordPlace();
+  }
+  if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
+    if (place.WordCmp(pSection->GetEndWordPlace()) >= 0) {
+      if (CSection* pNextSection = m_SectionArray.GetAt(place.nSecIndex + 1)) {
+        return pNextSection->GetBeginWordPlace();
+      }
+      return GetEndWordPlace();
+    }
+    return pSection->GetNextWordPlace(place);
+  }
+  return place;
+}
+CPVT_WordPlace CPDF_VariableText::SearchWordPlace(
+    const CPDF_Point& point) const {
+  CPDF_Point pt = OutToIn(point);
+  CPVT_WordPlace place = GetBeginWordPlace();
+  int32_t nLeft = 0;
+  int32_t nRight = m_SectionArray.GetSize() - 1;
+  int32_t nMid = m_SectionArray.GetSize() / 2;
+  FX_BOOL bUp = TRUE;
+  FX_BOOL bDown = TRUE;
+  while (nLeft <= nRight) {
+    if (CSection* pSection = m_SectionArray.GetAt(nMid)) {
+      if (IsFloatBigger(pt.y, pSection->m_SecInfo.rcSection.top)) {
+        bUp = FALSE;
+      }
+      if (IsFloatBigger(pSection->m_SecInfo.rcSection.bottom, pt.y)) {
+        bDown = FALSE;
+      }
+      if (IsFloatSmaller(pt.y, pSection->m_SecInfo.rcSection.top)) {
+        nRight = nMid - 1;
+        nMid = (nLeft + nRight) / 2;
+        continue;
+      } else if (IsFloatBigger(pt.y, pSection->m_SecInfo.rcSection.bottom)) {
+        nLeft = nMid + 1;
+        nMid = (nLeft + nRight) / 2;
+        continue;
+      } else {
+        place = pSection->SearchWordPlace(
+            CPDF_Point(pt.x - pSection->m_SecInfo.rcSection.left,
+                       pt.y - pSection->m_SecInfo.rcSection.top));
+        place.nSecIndex = nMid;
+        return place;
+      }
     } else {
-        m_SectionArray.InsertAt(nSecIndex, pSection);
-    }
+      break;
+    }
+  }
+  if (bUp) {
+    place = GetBeginWordPlace();
+  }
+  if (bDown) {
+    place = GetEndWordPlace();
+  }
+  return place;
+}
+CPVT_WordPlace CPDF_VariableText::GetUpWordPlace(
+    const CPVT_WordPlace& place,
+    const CPDF_Point& point) const {
+  if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
+    CPVT_WordPlace temp = place;
+    CPDF_Point pt = OutToIn(point);
+    if (temp.nLineIndex-- > 0) {
+      return pSection->SearchWordPlace(
+          pt.x - pSection->m_SecInfo.rcSection.left, temp);
+    }
+    if (temp.nSecIndex-- > 0) {
+      if (CSection* pLastSection = m_SectionArray.GetAt(temp.nSecIndex)) {
+        temp.nLineIndex = pLastSection->m_LineArray.GetSize() - 1;
+        return pLastSection->SearchWordPlace(
+            pt.x - pLastSection->m_SecInfo.rcSection.left, temp);
+      }
+    }
+  }
+  return place;
+}
+CPVT_WordPlace CPDF_VariableText::GetDownWordPlace(
+    const CPVT_WordPlace& place,
+    const CPDF_Point& point) const {
+  if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
+    CPVT_WordPlace temp = place;
+    CPDF_Point pt = OutToIn(point);
+    if (temp.nLineIndex++ < pSection->m_LineArray.GetSize() - 1) {
+      return pSection->SearchWordPlace(
+          pt.x - pSection->m_SecInfo.rcSection.left, temp);
+    }
+    if (temp.nSecIndex++ < m_SectionArray.GetSize() - 1) {
+      if (CSection* pNextSection = m_SectionArray.GetAt(temp.nSecIndex)) {
+        temp.nLineIndex = 0;
+        return pNextSection->SearchWordPlace(
+            pt.x - pSection->m_SecInfo.rcSection.left, temp);
+      }
+    }
+  }
+  return place;
+}
+CPVT_WordPlace CPDF_VariableText::GetLineBeginPlace(
+    const CPVT_WordPlace& place) const {
+  return CPVT_WordPlace(place.nSecIndex, place.nLineIndex, -1);
+}
+CPVT_WordPlace CPDF_VariableText::GetLineEndPlace(
+    const CPVT_WordPlace& place) const {
+  if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
+    if (CLine* pLine = pSection->m_LineArray.GetAt(place.nLineIndex))
+      return pLine->GetEndWordPlace();
+  }
+  return place;
+}
+CPVT_WordPlace CPDF_VariableText::GetSectionBeginPlace(
+    const CPVT_WordPlace& place) const {
+  return CPVT_WordPlace(place.nSecIndex, 0, -1);
+}
+CPVT_WordPlace CPDF_VariableText::GetSectionEndPlace(
+    const CPVT_WordPlace& place) const {
+  if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
+    return pSection->GetEndWordPlace();
+  }
+  return place;
+}
+int32_t CPDF_VariableText::GetTotalWords() const {
+  int32_t nTotal = 0;
+  for (int32_t i = 0, sz = m_SectionArray.GetSize(); i < sz; i++)
+    if (CSection* pSection = m_SectionArray.GetAt(i)) {
+      nTotal += (pSection->m_WordArray.GetSize() + PVT_RETURN_LENGTH);
+    }
+  return nTotal - PVT_RETURN_LENGTH;
+}
+void CPDF_VariableText::ResetSectionArray() {
+  for (int32_t s = 0, sz = m_SectionArray.GetSize(); s < sz; s++) {
+    delete m_SectionArray.GetAt(s);
+  }
+  m_SectionArray.RemoveAll();
+}
+CPVT_WordPlace CPDF_VariableText::AddSection(const CPVT_WordPlace& place,
+                                             const CPVT_SectionInfo& secinfo) {
+  if (IsValid() && !m_bMultiLine) {
     return place;
-}
-CPVT_WordPlace CPDF_VariableText::AddLine(const CPVT_WordPlace & place, const CPVT_LineInfo & lineinfo)
-{
-    if (m_SectionArray.IsEmpty()) {
-        return place;
-    }
-    if (CSection * pSection = m_SectionArray.GetAt(place.nSecIndex)) {
-        return pSection->AddLine(lineinfo);
-    }
+  }
+  int32_t nSecIndex =
+      FPDF_MAX(FPDF_MIN(place.nSecIndex, m_SectionArray.GetSize()), 0);
+  CSection* pSection = new CSection(this);
+  pSection->m_SecInfo = secinfo;
+  pSection->SecPlace.nSecIndex = nSecIndex;
+  if (nSecIndex == m_SectionArray.GetSize()) {
+    m_SectionArray.Add(pSection);
+  } else {
+    m_SectionArray.InsertAt(nSecIndex, pSection);
+  }
+  return place;
+}
+CPVT_WordPlace CPDF_VariableText::AddLine(const CPVT_WordPlace& place,
+                                          const CPVT_LineInfo& lineinfo) {
+  if (m_SectionArray.IsEmpty()) {
     return place;
-}
-CPVT_WordPlace CPDF_VariableText::AddWord(const CPVT_WordPlace & place, const CPVT_WordInfo & wordinfo)
-{
-    if (m_SectionArray.GetSize() <= 0) {
-        return place;
-    }
-    CPVT_WordPlace newplace = place;
-    newplace.nSecIndex = FPDF_MAX(FPDF_MIN(newplace.nSecIndex, m_SectionArray.GetSize() - 1), 0);
-    if (CSection * pSection = m_SectionArray.GetAt(newplace.nSecIndex)) {
-        return pSection->AddWord(newplace, wordinfo);
-    }
+  }
+  if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
+    return pSection->AddLine(lineinfo);
+  }
+  return place;
+}
+CPVT_WordPlace CPDF_VariableText::AddWord(const CPVT_WordPlace& place,
+                                          const CPVT_WordInfo& wordinfo) {
+  if (m_SectionArray.GetSize() <= 0) {
     return place;
-}
-FX_BOOL CPDF_VariableText::GetWordInfo(const CPVT_WordPlace & place, CPVT_WordInfo & wordinfo)
-{
-    if (CSection * pSection = m_SectionArray.GetAt(place.nSecIndex)) {
-        if (CPVT_WordInfo * pWord = pSection->m_WordArray.GetAt(place.nWordIndex)) {
-            wordinfo = *pWord;
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-FX_BOOL CPDF_VariableText::SetWordInfo(const CPVT_WordPlace & place, const CPVT_WordInfo & wordinfo)
-{
-    if (CSection * pSection = m_SectionArray.GetAt(place.nSecIndex)) {
-        if (CPVT_WordInfo * pWord = pSection->m_WordArray.GetAt(place.nWordIndex)) {
-            *pWord = wordinfo;
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-FX_BOOL CPDF_VariableText::GetLineInfo(const CPVT_WordPlace & place, CPVT_LineInfo & lineinfo)
-{
-    if (CSection * pSection = m_SectionArray.GetAt(place.nSecIndex)) {
-        if (CLine * pLine = pSection->m_LineArray.GetAt(place.nLineIndex)) {
-            lineinfo = pLine->m_LineInfo;
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-FX_BOOL CPDF_VariableText::GetSectionInfo(const CPVT_WordPlace & place, CPVT_SectionInfo & secinfo)
-{
-    if (CSection * pSection = m_SectionArray.GetAt(place.nSecIndex)) {
-        secinfo = pSection->m_SecInfo;
-        return TRUE;
-    }
+  }
+  CPVT_WordPlace newplace = place;
+  newplace.nSecIndex =
+      FPDF_MAX(FPDF_MIN(newplace.nSecIndex, m_SectionArray.GetSize() - 1), 0);
+  if (CSection* pSection = m_SectionArray.GetAt(newplace.nSecIndex)) {
+    return pSection->AddWord(newplace, wordinfo);
+  }
+  return place;
+}
+FX_BOOL CPDF_VariableText::GetWordInfo(const CPVT_WordPlace& place,
+                                       CPVT_WordInfo& wordinfo) {
+  if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
+    if (CPVT_WordInfo* pWord = pSection->m_WordArray.GetAt(place.nWordIndex)) {
+      wordinfo = *pWord;
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+FX_BOOL CPDF_VariableText::SetWordInfo(const CPVT_WordPlace& place,
+                                       const CPVT_WordInfo& wordinfo) {
+  if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
+    if (CPVT_WordInfo* pWord = pSection->m_WordArray.GetAt(place.nWordIndex)) {
+      *pWord = wordinfo;
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+FX_BOOL CPDF_VariableText::GetLineInfo(const CPVT_WordPlace& place,
+                                       CPVT_LineInfo& lineinfo) {
+  if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
+    if (CLine* pLine = pSection->m_LineArray.GetAt(place.nLineIndex)) {
+      lineinfo = pLine->m_LineInfo;
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+FX_BOOL CPDF_VariableText::GetSectionInfo(const CPVT_WordPlace& place,
+                                          CPVT_SectionInfo& secinfo) {
+  if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
+    secinfo = pSection->m_SecInfo;
+    return TRUE;
+  }
+  return FALSE;
+}
+CPDF_Rect CPDF_VariableText::GetContentRect() const {
+  return InToOut(CPDF_EditContainer::GetContentRect());
+}
+FX_FLOAT CPDF_VariableText::GetWordFontSize(const CPVT_WordInfo& WordInfo,
+                                            FX_BOOL bFactFontSize) {
+  return m_bRichText && WordInfo.pWordProps
+             ? (WordInfo.pWordProps->nScriptType == PVTWORD_SCRIPT_NORMAL ||
+                        bFactFontSize
+                    ? WordInfo.pWordProps->fFontSize
+                    : WordInfo.pWordProps->fFontSize * PVT_HALF)
+             : GetFontSize();
+}
+int32_t CPDF_VariableText::GetWordFontIndex(const CPVT_WordInfo& WordInfo) {
+  return m_bRichText && WordInfo.pWordProps ? WordInfo.pWordProps->nFontIndex
+                                            : WordInfo.nFontIndex;
+}
+FX_FLOAT CPDF_VariableText::GetWordWidth(int32_t nFontIndex,
+                                         FX_WORD Word,
+                                         FX_WORD SubWord,
+                                         FX_FLOAT fCharSpace,
+                                         int32_t nHorzScale,
+                                         FX_FLOAT fFontSize,
+                                         FX_FLOAT fWordTail,
+                                         int32_t nWordStyle) {
+  return (GetCharWidth(nFontIndex, Word, SubWord, nWordStyle) * fFontSize *
+              PVT_FONTSCALE +
+          fCharSpace) *
+             nHorzScale * PVT_PERCENT +
+         fWordTail;
+}
+FX_FLOAT CPDF_VariableText::GetWordWidth(const CPVT_WordInfo& WordInfo) {
+  return GetWordWidth(
+      GetWordFontIndex(WordInfo), WordInfo.Word, GetSubWord(),
+      GetCharSpace(WordInfo), GetHorzScale(WordInfo), GetWordFontSize(WordInfo),
+      WordInfo.fWordTail,
+      WordInfo.pWordProps ? WordInfo.pWordProps->nWordStyle : 0);
+}
+FX_FLOAT CPDF_VariableText::GetLineAscent(const CPVT_SectionInfo& SecInfo) {
+  return m_bRichText && SecInfo.pWordProps
+             ? GetFontAscent(SecInfo.pWordProps->nFontIndex,
+                             SecInfo.pWordProps->fFontSize)
+             : GetFontAscent(GetDefaultFontIndex(), GetFontSize());
+}
+FX_FLOAT CPDF_VariableText::GetLineDescent(const CPVT_SectionInfo& SecInfo) {
+  return m_bRichText && SecInfo.pWordProps
+             ? GetFontDescent(SecInfo.pWordProps->nFontIndex,
+                              SecInfo.pWordProps->fFontSize)
+             : GetFontDescent(GetDefaultFontIndex(), GetFontSize());
+}
+FX_FLOAT CPDF_VariableText::GetFontAscent(int32_t nFontIndex,
+                                          FX_FLOAT fFontSize) {
+  return (FX_FLOAT)GetTypeAscent(nFontIndex) * fFontSize * PVT_FONTSCALE;
+}
+FX_FLOAT CPDF_VariableText::GetFontDescent(int32_t nFontIndex,
+                                           FX_FLOAT fFontSize) {
+  return (FX_FLOAT)GetTypeDescent(nFontIndex) * fFontSize * PVT_FONTSCALE;
+}
+FX_FLOAT CPDF_VariableText::GetWordAscent(const CPVT_WordInfo& WordInfo,
+                                          FX_FLOAT fFontSize) {
+  return GetFontAscent(GetWordFontIndex(WordInfo), fFontSize);
+}
+FX_FLOAT CPDF_VariableText::GetWordDescent(const CPVT_WordInfo& WordInfo,
+                                           FX_FLOAT fFontSize) {
+  return GetFontDescent(GetWordFontIndex(WordInfo), fFontSize);
+}
+FX_FLOAT CPDF_VariableText::GetWordAscent(const CPVT_WordInfo& WordInfo,
+                                          FX_BOOL bFactFontSize) {
+  return GetFontAscent(GetWordFontIndex(WordInfo),
+                       GetWordFontSize(WordInfo, bFactFontSize));
+}
+FX_FLOAT CPDF_VariableText::GetWordDescent(const CPVT_WordInfo& WordInfo,
+                                           FX_BOOL bFactFontSize) {
+  return GetFontDescent(GetWordFontIndex(WordInfo),
+                        GetWordFontSize(WordInfo, bFactFontSize));
+}
+FX_FLOAT CPDF_VariableText::GetLineLeading(const CPVT_SectionInfo& SecInfo) {
+  return m_bRichText && SecInfo.pSecProps ? SecInfo.pSecProps->fLineLeading
+                                          : m_fLineLeading;
+}
+FX_FLOAT CPDF_VariableText::GetLineIndent(const CPVT_SectionInfo& SecInfo) {
+  return m_bRichText && SecInfo.pSecProps ? SecInfo.pSecProps->fLineIndent
+                                          : 0.0f;
+}
+int32_t CPDF_VariableText::GetAlignment(const CPVT_SectionInfo& SecInfo) {
+  return m_bRichText && SecInfo.pSecProps ? SecInfo.pSecProps->nAlignment
+                                          : m_nAlignment;
+}
+FX_FLOAT CPDF_VariableText::GetCharSpace(const CPVT_WordInfo& WordInfo) {
+  return m_bRichText && WordInfo.pWordProps ? WordInfo.pWordProps->fCharSpace
+                                            : m_fCharSpace;
+}
+int32_t CPDF_VariableText::GetHorzScale(const CPVT_WordInfo& WordInfo) {
+  return m_bRichText && WordInfo.pWordProps ? WordInfo.pWordProps->nHorzScale
+                                            : m_nHorzScale;
+}
+void CPDF_VariableText::ClearSectionRightWords(const CPVT_WordPlace& place) {
+  CPVT_WordPlace wordplace = AjustLineHeader(place, TRUE);
+  if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
+    for (int32_t w = pSection->m_WordArray.GetSize() - 1;
+         w > wordplace.nWordIndex; w--) {
+      delete pSection->m_WordArray.GetAt(w);
+      pSection->m_WordArray.RemoveAt(w);
+    }
+  }
+}
+CPVT_WordPlace CPDF_VariableText::AjustLineHeader(const CPVT_WordPlace& place,
+                                                  FX_BOOL bPrevOrNext) const {
+  if (place.nWordIndex < 0 && place.nLineIndex > 0) {
+    return bPrevOrNext ? GetPrevWordPlace(place) : GetNextWordPlace(place);
+  }
+  return place;
+}
+FX_BOOL CPDF_VariableText::ClearEmptySection(const CPVT_WordPlace& place) {
+  if (place.nSecIndex == 0 && m_SectionArray.GetSize() == 1) {
     return FALSE;
-}
-CPDF_Rect CPDF_VariableText::GetContentRect() const
-{
-    return InToOut(CPDF_EditContainer::GetContentRect());
-}
-FX_FLOAT CPDF_VariableText::GetWordFontSize(const CPVT_WordInfo & WordInfo, FX_BOOL bFactFontSize)
-{
-    return m_bRichText && WordInfo.pWordProps ? (WordInfo.pWordProps->nScriptType == PVTWORD_SCRIPT_NORMAL || bFactFontSize ? WordInfo.pWordProps->fFontSize : WordInfo.pWordProps->fFontSize * PVT_HALF) : GetFontSize();
-}
-int32_t CPDF_VariableText::GetWordFontIndex(const CPVT_WordInfo & WordInfo)
-{
-    return m_bRichText && WordInfo.pWordProps ? WordInfo.pWordProps->nFontIndex : WordInfo.nFontIndex;
-}
-FX_FLOAT CPDF_VariableText::GetWordWidth(int32_t nFontIndex, FX_WORD Word, FX_WORD SubWord,
-        FX_FLOAT fCharSpace, int32_t nHorzScale,
-        FX_FLOAT fFontSize, FX_FLOAT fWordTail, int32_t nWordStyle)
-{
-    return (GetCharWidth(nFontIndex, Word, SubWord, nWordStyle) * fFontSize * PVT_FONTSCALE + fCharSpace) * nHorzScale * PVT_PERCENT + fWordTail;
-}
-FX_FLOAT CPDF_VariableText::GetWordWidth(const CPVT_WordInfo & WordInfo)
-{
-    return GetWordWidth(GetWordFontIndex(WordInfo), WordInfo.Word, GetSubWord(), GetCharSpace(WordInfo), GetHorzScale(WordInfo),
-                        GetWordFontSize(WordInfo), WordInfo.fWordTail,
-                        WordInfo.pWordProps ? WordInfo.pWordProps->nWordStyle : 0);
-}
-FX_FLOAT CPDF_VariableText::GetLineAscent(const CPVT_SectionInfo & SecInfo)
-{
-    return m_bRichText && SecInfo.pWordProps ? GetFontAscent(SecInfo.pWordProps->nFontIndex, SecInfo.pWordProps->fFontSize) :
-           GetFontAscent(GetDefaultFontIndex(), GetFontSize());
-}
-FX_FLOAT CPDF_VariableText::GetLineDescent(const CPVT_SectionInfo & SecInfo)
-{
-    return m_bRichText && SecInfo.pWordProps ? GetFontDescent(SecInfo.pWordProps->nFontIndex, SecInfo.pWordProps->fFontSize) :
-           GetFontDescent(GetDefaultFontIndex(), GetFontSize());
-}
-FX_FLOAT CPDF_VariableText::GetFontAscent(int32_t nFontIndex, FX_FLOAT fFontSize)
-{
-    return (FX_FLOAT)GetTypeAscent(nFontIndex) * fFontSize * PVT_FONTSCALE;
-}
-FX_FLOAT CPDF_VariableText::GetFontDescent(int32_t nFontIndex, FX_FLOAT fFontSize)
-{
-    return (FX_FLOAT)GetTypeDescent(nFontIndex) * fFontSize * PVT_FONTSCALE;
-}
-FX_FLOAT CPDF_VariableText::GetWordAscent(const CPVT_WordInfo & WordInfo, FX_FLOAT fFontSize)
-{
-    return GetFontAscent(GetWordFontIndex(WordInfo), fFontSize);
-}
-FX_FLOAT CPDF_VariableText::GetWordDescent(const CPVT_WordInfo & WordInfo, FX_FLOAT fFontSize)
-{
-    return GetFontDescent(GetWordFontIndex(WordInfo), fFontSize);
-}
-FX_FLOAT CPDF_VariableText::GetWordAscent(const CPVT_WordInfo & WordInfo, FX_BOOL bFactFontSize)
-{
-    return GetFontAscent(GetWordFontIndex(WordInfo), GetWordFontSize(WordInfo, bFactFontSize));
-}
-FX_FLOAT CPDF_VariableText::GetWordDescent(const CPVT_WordInfo & WordInfo, FX_BOOL bFactFontSize)
-{
-    return GetFontDescent(GetWordFontIndex(WordInfo), GetWordFontSize(WordInfo, bFactFontSize));
-}
-FX_FLOAT CPDF_VariableText::GetLineLeading(const CPVT_SectionInfo & SecInfo)
-{
-    return m_bRichText && SecInfo.pSecProps ? SecInfo.pSecProps->fLineLeading : m_fLineLeading;
-}
-FX_FLOAT CPDF_VariableText::GetLineIndent(const CPVT_SectionInfo & SecInfo)
-{
-    return m_bRichText && SecInfo.pSecProps ? SecInfo.pSecProps->fLineIndent : 0.0f;
-}
-int32_t CPDF_VariableText::GetAlignment(const CPVT_SectionInfo& SecInfo)
-{
-    return m_bRichText && SecInfo.pSecProps ? SecInfo.pSecProps->nAlignment : m_nAlignment;
-}
-FX_FLOAT CPDF_VariableText::GetCharSpace(const CPVT_WordInfo & WordInfo)
-{
-    return m_bRichText && WordInfo.pWordProps ? WordInfo.pWordProps->fCharSpace : m_fCharSpace;
-}
-int32_t CPDF_VariableText::GetHorzScale(const CPVT_WordInfo & WordInfo)
-{
-    return m_bRichText && WordInfo.pWordProps ? WordInfo.pWordProps->nHorzScale : m_nHorzScale;
-}
-void CPDF_VariableText::ClearSectionRightWords(const CPVT_WordPlace & place)
-{
-    CPVT_WordPlace wordplace = AjustLineHeader(place, TRUE);
-    if (CSection * pSection = m_SectionArray.GetAt(place.nSecIndex)) {
-        for (int32_t w = pSection->m_WordArray.GetSize() - 1; w > wordplace.nWordIndex; w--) {
-            delete pSection->m_WordArray.GetAt(w);
-            pSection->m_WordArray.RemoveAt(w);
-        }
-    }
-}
-CPVT_WordPlace CPDF_VariableText::AjustLineHeader(const CPVT_WordPlace & place, FX_BOOL bPrevOrNext) const
-{
-    if (place.nWordIndex < 0 && place.nLineIndex > 0) {
-        return bPrevOrNext ? GetPrevWordPlace(place) : GetNextWordPlace(place);
-    }
-    return place;
-}
-FX_BOOL CPDF_VariableText::ClearEmptySection(const CPVT_WordPlace & place)
-{
-    if (place.nSecIndex == 0 && m_SectionArray.GetSize() == 1) {
-        return FALSE;
-    }
-    if (CSection * pSection = m_SectionArray.GetAt(place.nSecIndex)) {
+  }
+  if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
+    if (pSection->m_WordArray.GetSize() == 0) {
+      delete pSection;
+      m_SectionArray.RemoveAt(place.nSecIndex);
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+void CPDF_VariableText::ClearEmptySections(const CPVT_WordRange& PlaceRange) {
+  CPVT_WordPlace wordplace;
+  for (int32_t s = PlaceRange.EndPos.nSecIndex;
+       s > PlaceRange.BeginPos.nSecIndex; s--) {
+    wordplace.nSecIndex = s;
+    ClearEmptySection(wordplace);
+  }
+}
+void CPDF_VariableText::LinkLatterSection(const CPVT_WordPlace& place) {
+  CPVT_WordPlace oldplace = AjustLineHeader(place, TRUE);
+  if (CSection* pNextSection = m_SectionArray.GetAt(place.nSecIndex + 1)) {
+    if (CSection* pSection = m_SectionArray.GetAt(oldplace.nSecIndex)) {
+      for (int32_t w = 0, sz = pNextSection->m_WordArray.GetSize(); w < sz;
+           w++) {
+        if (CPVT_WordInfo* pWord = pNextSection->m_WordArray.GetAt(w)) {
+          oldplace.nWordIndex++;
+          pSection->AddWord(oldplace, *pWord);
+        }
+      }
+    }
+    delete pNextSection;
+    m_SectionArray.RemoveAt(place.nSecIndex + 1);
+  }
+}
+void CPDF_VariableText::ClearWords(const CPVT_WordRange& PlaceRange) {
+  CPVT_WordRange NewRange;
+  NewRange.BeginPos = AjustLineHeader(PlaceRange.BeginPos, TRUE);
+  NewRange.EndPos = AjustLineHeader(PlaceRange.EndPos, TRUE);
+  for (int32_t s = NewRange.EndPos.nSecIndex; s >= NewRange.BeginPos.nSecIndex;
+       s--) {
+    if (CSection* pSection = m_SectionArray.GetAt(s)) {
+      pSection->ClearWords(NewRange);
+    }
+  }
+}
+CPVT_WordPlace CPDF_VariableText::ClearLeftWord(const CPVT_WordPlace& place) {
+  if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
+    CPVT_WordPlace leftplace = GetPrevWordPlace(place);
+    if (leftplace != place) {
+      if (leftplace.nSecIndex != place.nSecIndex) {
         if (pSection->m_WordArray.GetSize() == 0) {
-            delete pSection;
-            m_SectionArray.RemoveAt(place.nSecIndex);
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-void CPDF_VariableText::ClearEmptySections(const CPVT_WordRange & PlaceRange)
-{
-    CPVT_WordPlace wordplace;
-    for (int32_t s = PlaceRange.EndPos.nSecIndex; s > PlaceRange.BeginPos.nSecIndex; s--) {
-        wordplace.nSecIndex = s;
-        ClearEmptySection(wordplace);
-    }
-}
-void CPDF_VariableText::LinkLatterSection(const CPVT_WordPlace & place)
-{
-    CPVT_WordPlace oldplace = AjustLineHeader(place, TRUE);
-    if (CSection * pNextSection = m_SectionArray.GetAt(place.nSecIndex + 1)) {
-        if (CSection * pSection = m_SectionArray.GetAt(oldplace.nSecIndex)) {
-            for (int32_t w = 0, sz = pNextSection->m_WordArray.GetSize(); w < sz; w++) {
-                if (CPVT_WordInfo * pWord = pNextSection->m_WordArray.GetAt(w)) {
-                    oldplace.nWordIndex ++;
-                    pSection->AddWord(oldplace, *pWord);
-                }
-            }
-        }
-        delete pNextSection;
-        m_SectionArray.RemoveAt(place.nSecIndex + 1);
-    }
-}
-void CPDF_VariableText::ClearWords(const CPVT_WordRange & PlaceRange)
-{
-    CPVT_WordRange NewRange;
-    NewRange.BeginPos = AjustLineHeader(PlaceRange.BeginPos, TRUE);
-    NewRange.EndPos = AjustLineHeader(PlaceRange.EndPos, TRUE);
-    for (int32_t s = NewRange.EndPos.nSecIndex; s >= NewRange.BeginPos.nSecIndex; s--) {
-        if (CSection * pSection = m_SectionArray.GetAt(s)) {
-            pSection->ClearWords(NewRange);
-        }
-    }
-}
-CPVT_WordPlace CPDF_VariableText::ClearLeftWord(const CPVT_WordPlace & place)
-{
-    if (CSection * pSection = m_SectionArray.GetAt(place.nSecIndex)) {
-        CPVT_WordPlace leftplace = GetPrevWordPlace(place);
-        if (leftplace != place) {
-            if (leftplace.nSecIndex != place.nSecIndex) {
-                if (pSection->m_WordArray.GetSize() == 0) {
-                    ClearEmptySection(place);
-                } else {
-                    LinkLatterSection(leftplace);
-                }
-            } else {
-                pSection->ClearWord(place);
-            }
-        }
-        return leftplace;
-    }
-    return place;
-}
-CPVT_WordPlace CPDF_VariableText::ClearRightWord(const CPVT_WordPlace & place)
-{
-    if (CSection * pSection = m_SectionArray.GetAt(place.nSecIndex)) {
-        CPVT_WordPlace rightplace = AjustLineHeader(GetNextWordPlace(place), FALSE);
-        if (rightplace != place) {
-            if(rightplace.nSecIndex != place.nSecIndex) {
-                LinkLatterSection(place);
-            } else {
-                pSection->ClearWord(rightplace);
-            }
-        }
-    }
-    return place;
-}
-void CPDF_VariableText::RearrangeAll()
-{
-    Rearrange(CPVT_WordRange(GetBeginWordPlace(), GetEndWordPlace()));
-}
-void CPDF_VariableText::RearrangePart(const CPVT_WordRange & PlaceRange)
-{
-    Rearrange(PlaceRange);
-}
-CPVT_FloatRect CPDF_VariableText::Rearrange(const CPVT_WordRange & PlaceRange)
-{
-    CPVT_FloatRect rcRet;
-    if (IsValid()) {
-        if (m_bAutoFontSize) {
-            SetFontSize(GetAutoFontSize());
-            rcRet = RearrangeSections(CPVT_WordRange(GetBeginWordPlace(), GetEndWordPlace()));
+          ClearEmptySection(place);
         } else {
-            rcRet = RearrangeSections(PlaceRange);
-        }
-    }
-    SetContentRect(rcRet);
-    return rcRet;
-}
-FX_FLOAT CPDF_VariableText::GetAutoFontSize()
-{
-    int32_t nTotal = sizeof(gFontSizeSteps) / sizeof(uint8_t);
-    if (IsMultiLine()) {
-        nTotal /= 4;
-    }
-    if (nTotal <= 0) {
-        return 0;
-    }
-    if (GetPlateWidth() <= 0) {
-        return 0;
-    }
-    int32_t nLeft = 0;
-    int32_t nRight = nTotal - 1;
-    int32_t nMid = nTotal / 2;
-    while (nLeft <= nRight) {
-        if (IsBigger(gFontSizeSteps[nMid])) {
-            nRight = nMid - 1;
-            nMid = (nLeft + nRight) / 2;
-            continue;
+          LinkLatterSection(leftplace);
+        }
+      } else {
+        pSection->ClearWord(place);
+      }
+    }
+    return leftplace;
+  }
+  return place;
+}
+CPVT_WordPlace CPDF_VariableText::ClearRightWord(const CPVT_WordPlace& place) {
+  if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
+    CPVT_WordPlace rightplace = AjustLineHeader(GetNextWordPlace(place), FALSE);
+    if (rightplace != place) {
+      if (rightplace.nSecIndex != place.nSecIndex) {
+        LinkLatterSection(place);
+      } else {
+        pSection->ClearWord(rightplace);
+      }
+    }
+  }
+  return place;
+}
+void CPDF_VariableText::RearrangeAll() {
+  Rearrange(CPVT_WordRange(GetBeginWordPlace(), GetEndWordPlace()));
+}
+void CPDF_VariableText::RearrangePart(const CPVT_WordRange& PlaceRange) {
+  Rearrange(PlaceRange);
+}
+CPVT_FloatRect CPDF_VariableText::Rearrange(const CPVT_WordRange& PlaceRange) {
+  CPVT_FloatRect rcRet;
+  if (IsValid()) {
+    if (m_bAutoFontSize) {
+      SetFontSize(GetAutoFontSize());
+      rcRet = RearrangeSections(
+          CPVT_WordRange(GetBeginWordPlace(), GetEndWordPlace()));
+    } else {
+      rcRet = RearrangeSections(PlaceRange);
+    }
+  }
+  SetContentRect(rcRet);
+  return rcRet;
+}
+FX_FLOAT CPDF_VariableText::GetAutoFontSize() {
+  int32_t nTotal = sizeof(gFontSizeSteps) / sizeof(uint8_t);
+  if (IsMultiLine()) {
+    nTotal /= 4;
+  }
+  if (nTotal <= 0) {
+    return 0;
+  }
+  if (GetPlateWidth() <= 0) {
+    return 0;
+  }
+  int32_t nLeft = 0;
+  int32_t nRight = nTotal - 1;
+  int32_t nMid = nTotal / 2;
+  while (nLeft <= nRight) {
+    if (IsBigger(gFontSizeSteps[nMid])) {
+      nRight = nMid - 1;
+      nMid = (nLeft + nRight) / 2;
+      continue;
+    } else {
+      nLeft = nMid + 1;
+      nMid = (nLeft + nRight) / 2;
+      continue;
+    }
+  }
+  return (FX_FLOAT)gFontSizeSteps[nMid];
+}
+FX_BOOL CPDF_VariableText::IsBigger(FX_FLOAT fFontSize) {
+  FX_BOOL bBigger = FALSE;
+  CPVT_Size szTotal;
+  for (int32_t s = 0, sz = m_SectionArray.GetSize(); s < sz; s++) {
+    if (CSection* pSection = m_SectionArray.GetAt(s)) {
+      CPVT_Size size = pSection->GetSectionSize(fFontSize);
+      szTotal.x = FPDF_MAX(size.x, szTotal.x);
+      szTotal.y += size.y;
+      if (IsFloatBigger(szTotal.x, GetPlateWidth()) ||
+          IsFloatBigger(szTotal.y, GetPlateHeight())) {
+        bBigger = TRUE;
+        break;
+      }
+    }
+  }
+  return bBigger;
+}
+CPVT_FloatRect CPDF_VariableText::RearrangeSections(
+    const CPVT_WordRange& PlaceRange) {
+  CPVT_WordPlace place;
+  FX_FLOAT fPosY = 0;
+  FX_FLOAT fOldHeight;
+  int32_t nSSecIndex = PlaceRange.BeginPos.nSecIndex;
+  int32_t nESecIndex = PlaceRange.EndPos.nSecIndex;
+  CPVT_FloatRect rcRet;
+  for (int32_t s = 0, sz = m_SectionArray.GetSize(); s < sz; s++) {
+    place.nSecIndex = s;
+    if (CSection* pSection = m_SectionArray.GetAt(s)) {
+      pSection->SecPlace = place;
+      CPVT_FloatRect rcSec = pSection->m_SecInfo.rcSection;
+      if (s >= nSSecIndex) {
+        if (s <= nESecIndex) {
+          rcSec = pSection->Rearrange();
+          rcSec.top += fPosY;
+          rcSec.bottom += fPosY;
         } else {
-            nLeft = nMid + 1;
-            nMid = (nLeft + nRight) / 2;
-            continue;
-        }
-    }
-    return (FX_FLOAT)gFontSizeSteps[nMid];
-}
-FX_BOOL	CPDF_VariableText::IsBigger(FX_FLOAT fFontSize)
-{
-    FX_BOOL bBigger =  FALSE;
-    CPVT_Size szTotal;
-    for (int32_t s = 0, sz = m_SectionArray.GetSize(); s < sz; s++) {
-        if (CSection * pSection = m_SectionArray.GetAt(s)) {
-            CPVT_Size size = pSection->GetSectionSize(fFontSize);
-            szTotal.x = FPDF_MAX(size.x, szTotal.x);
-            szTotal.y += size.y;
-            if (IsFloatBigger(szTotal.x, GetPlateWidth())
-                    || IsFloatBigger(szTotal.y, GetPlateHeight())
-               ) {
-                bBigger = TRUE;
-                break;
-            }
-        }
-    }
-    return bBigger;
-}
-CPVT_FloatRect CPDF_VariableText::RearrangeSections(const CPVT_WordRange & PlaceRange)
-{
-    CPVT_WordPlace place;
-    FX_FLOAT fPosY = 0;
-    FX_FLOAT fOldHeight;
-    int32_t nSSecIndex = PlaceRange.BeginPos.nSecIndex;
-    int32_t nESecIndex = PlaceRange.EndPos.nSecIndex;
-    CPVT_FloatRect rcRet;
-    for (int32_t s = 0, sz = m_SectionArray.GetSize(); s < sz; s++) {
-        place.nSecIndex = s;
-        if (CSection * pSection = m_SectionArray.GetAt(s)) {
-            pSection->SecPlace = place;
-            CPVT_FloatRect rcSec = pSection->m_SecInfo.rcSection;
-            if (s >= nSSecIndex) {
-                if (s <= nESecIndex) {
-                    rcSec = pSection->Rearrange();
-                    rcSec.top += fPosY;
-                    rcSec.bottom += fPosY;
-                } else {
-                    fOldHeight = pSection->m_SecInfo.rcSection.bottom - pSection->m_SecInfo.rcSection.top;
-                    rcSec.top = fPosY;
-                    rcSec.bottom = fPosY + fOldHeight;
-                }
-                pSection->m_SecInfo.rcSection = rcSec;
-                pSection->ResetLinePlace();
-            }
-            if (s == 0) {
-                rcRet = rcSec;
-            } else {
-                rcRet.left = FPDF_MIN(rcSec.left, rcRet.left);
-                rcRet.top = FPDF_MIN(rcSec.top, rcRet.top);
-                rcRet.right = FPDF_MAX(rcSec.right, rcRet.right);
-                rcRet.bottom = FPDF_MAX(rcSec.bottom, rcRet.bottom);
-            }
-            fPosY += rcSec.Height();
-        }
-    }
-    return rcRet;
-}
-int32_t CPDF_VariableText::GetCharWidth(int32_t nFontIndex, FX_WORD Word, FX_WORD SubWord, int32_t nWordStyle)
-{
-    if (!m_pVTProvider) {
-        return 0;
-    }
-    if (SubWord > 0) {
-        return m_pVTProvider->GetCharWidth(nFontIndex, SubWord, nWordStyle);
-    }
-    return m_pVTProvider->GetCharWidth(nFontIndex, Word, nWordStyle);
-}
-int32_t CPDF_VariableText::GetTypeAscent(int32_t nFontIndex)
-{
-    return m_pVTProvider ? m_pVTProvider->GetTypeAscent(nFontIndex) : 0;
-}
-int32_t CPDF_VariableText::GetTypeDescent(int32_t nFontIndex)
-{
-    return m_pVTProvider ? m_pVTProvider->GetTypeDescent(nFontIndex) : 0;
-}
-int32_t CPDF_VariableText::GetWordFontIndex(FX_WORD word, int32_t charset, int32_t nFontIndex)
-{
-    return m_pVTProvider ? m_pVTProvider->GetWordFontIndex(word, charset, nFontIndex) : -1;
-}
-int32_t CPDF_VariableText::GetDefaultFontIndex()
-{
-    return m_pVTProvider ? m_pVTProvider->GetDefaultFontIndex() : -1;
-}
-FX_BOOL	CPDF_VariableText::IsLatinWord(FX_WORD word)
-{
-    return m_pVTProvider ? m_pVTProvider->IsLatinWord(word) : FALSE;
-}
-IPDF_VariableText_Iterator * CPDF_VariableText::GetIterator()
-{
-    if (!m_pVTIterator) {
-        m_pVTIterator = new CPDF_VariableText_Iterator(this);
-    }
-    return m_pVTIterator;
-}
-IPDF_VariableText_Provider*	CPDF_VariableText::SetProvider(IPDF_VariableText_Provider * pProvider)
-{
-    IPDF_VariableText_Provider* pOld = m_pVTProvider;
-    m_pVTProvider = pProvider;
-    return pOld;
-}
-CPDF_VariableText_Iterator::CPDF_VariableText_Iterator(CPDF_VariableText * pVT):
-    m_CurPos(-1, -1, -1),
-    m_pVT(pVT)
-{
-}
-CPDF_VariableText_Iterator::~CPDF_VariableText_Iterator()
-{
-}
-void CPDF_VariableText_Iterator::SetAt(int32_t nWordIndex)
-{
-    ASSERT(m_pVT != NULL);
-    m_CurPos = m_pVT->WordIndexToWordPlace(nWordIndex);
-}
-void CPDF_VariableText_Iterator::SetAt(const CPVT_WordPlace & place)
-{
-    ASSERT(m_pVT != NULL);
-    m_CurPos = place;
-}
-FX_BOOL	CPDF_VariableText_Iterator::NextWord()
-{
-    if (m_CurPos == m_pVT->GetEndWordPlace()) {
-        return FALSE;
-    }
-    m_CurPos = m_pVT->GetNextWordPlace(m_CurPos);
-    return TRUE;
-}
-FX_BOOL	CPDF_VariableText_Iterator::PrevWord()
-{
-    if (m_CurPos == m_pVT->GetBeginWordPlace()) {
-        return FALSE;
-    }
-    m_CurPos = m_pVT->GetPrevWordPlace(m_CurPos);
-    return TRUE;
-}
-FX_BOOL	CPDF_VariableText_Iterator::NextLine()
-{
-    if (CSection * pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
-        if (m_CurPos.nLineIndex < pSection->m_LineArray.GetSize() - 1) {
-            m_CurPos = CPVT_WordPlace(m_CurPos.nSecIndex, m_CurPos.nLineIndex + 1, -1);
-            return TRUE;
-        }
-        if (m_CurPos.nSecIndex < m_pVT->m_SectionArray.GetSize() - 1) {
-            m_CurPos = CPVT_WordPlace(m_CurPos.nSecIndex + 1, 0, -1);
-            return TRUE;
-        }
-    }
+          fOldHeight = pSection->m_SecInfo.rcSection.bottom -
+                       pSection->m_SecInfo.rcSection.top;
+          rcSec.top = fPosY;
+          rcSec.bottom = fPosY + fOldHeight;
+        }
+        pSection->m_SecInfo.rcSection = rcSec;
+        pSection->ResetLinePlace();
+      }
+      if (s == 0) {
+        rcRet = rcSec;
+      } else {
+        rcRet.left = FPDF_MIN(rcSec.left, rcRet.left);
+        rcRet.top = FPDF_MIN(rcSec.top, rcRet.top);
+        rcRet.right = FPDF_MAX(rcSec.right, rcRet.right);
+        rcRet.bottom = FPDF_MAX(rcSec.bottom, rcRet.bottom);
+      }
+      fPosY += rcSec.Height();
+    }
+  }
+  return rcRet;
+}
+int32_t CPDF_VariableText::GetCharWidth(int32_t nFontIndex,
+                                        FX_WORD Word,
+                                        FX_WORD SubWord,
+                                        int32_t nWordStyle) {
+  if (!m_pVTProvider) {
+    return 0;
+  }
+  if (SubWord > 0) {
+    return m_pVTProvider->GetCharWidth(nFontIndex, SubWord, nWordStyle);
+  }
+  return m_pVTProvider->GetCharWidth(nFontIndex, Word, nWordStyle);
+}
+int32_t CPDF_VariableText::GetTypeAscent(int32_t nFontIndex) {
+  return m_pVTProvider ? m_pVTProvider->GetTypeAscent(nFontIndex) : 0;
+}
+int32_t CPDF_VariableText::GetTypeDescent(int32_t nFontIndex) {
+  return m_pVTProvider ? m_pVTProvider->GetTypeDescent(nFontIndex) : 0;
+}
+int32_t CPDF_VariableText::GetWordFontIndex(FX_WORD word,
+                                            int32_t charset,
+                                            int32_t nFontIndex) {
+  return m_pVTProvider
+             ? m_pVTProvider->GetWordFontIndex(word, charset, nFontIndex)
+             : -1;
+}
+int32_t CPDF_VariableText::GetDefaultFontIndex() {
+  return m_pVTProvider ? m_pVTProvider->GetDefaultFontIndex() : -1;
+}
+FX_BOOL CPDF_VariableText::IsLatinWord(FX_WORD word) {
+  return m_pVTProvider ? m_pVTProvider->IsLatinWord(word) : FALSE;
+}
+IPDF_VariableText_Iterator* CPDF_VariableText::GetIterator() {
+  if (!m_pVTIterator) {
+    m_pVTIterator = new CPDF_VariableText_Iterator(this);
+  }
+  return m_pVTIterator;
+}
+IPDF_VariableText_Provider* CPDF_VariableText::SetProvider(
+    IPDF_VariableText_Provider* pProvider) {
+  IPDF_VariableText_Provider* pOld = m_pVTProvider;
+  m_pVTProvider = pProvider;
+  return pOld;
+}
+CPDF_VariableText_Iterator::CPDF_VariableText_Iterator(CPDF_VariableText* pVT)
+    : m_CurPos(-1, -1, -1), m_pVT(pVT) {}
+CPDF_VariableText_Iterator::~CPDF_VariableText_Iterator() {}
+void CPDF_VariableText_Iterator::SetAt(int32_t nWordIndex) {
+  ASSERT(m_pVT != NULL);
+  m_CurPos = m_pVT->WordIndexToWordPlace(nWordIndex);
+}
+void CPDF_VariableText_Iterator::SetAt(const CPVT_WordPlace& place) {
+  ASSERT(m_pVT != NULL);
+  m_CurPos = place;
+}
+FX_BOOL CPDF_VariableText_Iterator::NextWord() {
+  if (m_CurPos == m_pVT->GetEndWordPlace()) {
     return FALSE;
+  }
+  m_CurPos = m_pVT->GetNextWordPlace(m_CurPos);
+  return TRUE;
 }
-FX_BOOL	CPDF_VariableText_Iterator::PrevLine()
-{
-    if (m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
-        if (m_CurPos.nLineIndex > 0) {
-            m_CurPos = CPVT_WordPlace(m_CurPos.nSecIndex, m_CurPos.nLineIndex - 1, -1);
-            return TRUE;
-        }
-        if (m_CurPos.nSecIndex > 0) {
-            if (CSection * pLastSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex - 1)) {
-                m_CurPos = CPVT_WordPlace(m_CurPos.nSecIndex - 1, pLastSection->m_LineArray.GetSize() - 1, -1);
-                return TRUE;
-            }
-        }
-    }
+FX_BOOL CPDF_VariableText_Iterator::PrevWord() {
+  if (m_CurPos == m_pVT->GetBeginWordPlace()) {
     return FALSE;
+  }
+  m_CurPos = m_pVT->GetPrevWordPlace(m_CurPos);
+  return TRUE;
 }
-FX_BOOL	CPDF_VariableText_Iterator::NextSection()
-{
+FX_BOOL CPDF_VariableText_Iterator::NextLine() {
+  if (CSection* pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
+    if (m_CurPos.nLineIndex < pSection->m_LineArray.GetSize() - 1) {
+      m_CurPos =
+          CPVT_WordPlace(m_CurPos.nSecIndex, m_CurPos.nLineIndex + 1, -1);
+      return TRUE;
+    }
     if (m_CurPos.nSecIndex < m_pVT->m_SectionArray.GetSize() - 1) {
-        m_CurPos = CPVT_WordPlace(m_CurPos.nSecIndex + 1, 0, -1);
-        return TRUE;
+      m_CurPos = CPVT_WordPlace(m_CurPos.nSecIndex + 1, 0, -1);
+      return TRUE;
     }
-    return FALSE;
+  }
+  return FALSE;
 }
-FX_BOOL	CPDF_VariableText_Iterator::PrevSection()
-{
-    ASSERT(m_pVT != NULL);
+FX_BOOL CPDF_VariableText_Iterator::PrevLine() {
+  if (m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
+    if (m_CurPos.nLineIndex > 0) {
+      m_CurPos =
+          CPVT_WordPlace(m_CurPos.nSecIndex, m_CurPos.nLineIndex - 1, -1);
+      return TRUE;
+    }
     if (m_CurPos.nSecIndex > 0) {
-        m_CurPos = CPVT_WordPlace(m_CurPos.nSecIndex - 1, 0, -1);
+      if (CSection* pLastSection =
+              m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex - 1)) {
+        m_CurPos = CPVT_WordPlace(m_CurPos.nSecIndex - 1,
+                                  pLastSection->m_LineArray.GetSize() - 1, -1);
         return TRUE;
+      }
     }
-    return FALSE;
+  }
+  return FALSE;
 }
-FX_BOOL	CPDF_VariableText_Iterator::GetWord(CPVT_Word & word) const
-{
-    ASSERT(m_pVT != NULL);
-    word.WordPlace = m_CurPos;
-    if (CSection * pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
-        if (pSection->m_LineArray.GetAt(m_CurPos.nLineIndex)) {
-            if (CPVT_WordInfo * pWord = pSection->m_WordArray.GetAt(m_CurPos.nWordIndex)) {
-                word.Word = pWord->Word;
-                word.nCharset = pWord->nCharset;
-                word.fWidth = m_pVT->GetWordWidth(*pWord);
-                word.ptWord = m_pVT->InToOut(
-                                  CPDF_Point(pWord->fWordX + pSection->m_SecInfo.rcSection.left,
-                                             pWord->fWordY + pSection->m_SecInfo.rcSection.top) );
-                word.fAscent = m_pVT->GetWordAscent(*pWord);
-                word.fDescent = m_pVT->GetWordDescent(*pWord);
-                if (pWord->pWordProps) {
-                    word.WordProps = *pWord->pWordProps;
-                }
-                word.nFontIndex = m_pVT->GetWordFontIndex(*pWord);
-                word.fFontSize = m_pVT->GetWordFontSize(*pWord);
-                return TRUE;
-            }
-        }
-    }
-    return FALSE;
-}
-FX_BOOL	CPDF_VariableText_Iterator::SetWord(const CPVT_Word & word)
-{
-    ASSERT(m_pVT != NULL);
-    if (CSection * pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
-        if (CPVT_WordInfo * pWord = pSection->m_WordArray.GetAt(m_CurPos.nWordIndex)) {
-            if (pWord->pWordProps) {
-                *pWord->pWordProps = word.WordProps;
-            }
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-FX_BOOL	CPDF_VariableText_Iterator::GetLine(CPVT_Line & line) const
-{
-    ASSERT(m_pVT != NULL);
-    line.lineplace = CPVT_WordPlace(m_CurPos.nSecIndex, m_CurPos.nLineIndex, -1);
-    if (CSection * pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
-        if (CLine * pLine = pSection->m_LineArray.GetAt(m_CurPos.nLineIndex)) {
-            line.ptLine = m_pVT->InToOut(
-                              CPDF_Point(pLine->m_LineInfo.fLineX + pSection->m_SecInfo.rcSection.left,
-                                         pLine->m_LineInfo.fLineY + pSection->m_SecInfo.rcSection.top) );
-            line.fLineWidth = pLine->m_LineInfo.fLineWidth;
-            line.fLineAscent = pLine->m_LineInfo.fLineAscent;
-            line.fLineDescent = pLine->m_LineInfo.fLineDescent;
-            line.lineEnd = pLine->GetEndWordPlace();
-            return TRUE;
-        }
-    }
-    return FALSE;
+FX_BOOL CPDF_VariableText_Iterator::NextSection() {
+  if (m_CurPos.nSecIndex < m_pVT->m_SectionArray.GetSize() - 1) {
+    m_CurPos = CPVT_WordPlace(m_CurPos.nSecIndex + 1, 0, -1);
+    return TRUE;
+  }
+  return FALSE;
 }
-FX_BOOL	CPDF_VariableText_Iterator::GetSection(CPVT_Section & section) const
-{
-    ASSERT(m_pVT != NULL);
-    section.secplace = CPVT_WordPlace(m_CurPos.nSecIndex, 0, -1);
-    if (CSection * pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
-        section.rcSection = m_pVT->InToOut(pSection->m_SecInfo.rcSection);
-        if (pSection->m_SecInfo.pSecProps) {
-            section.SecProps = *pSection->m_SecInfo.pSecProps;
-        }
-        if (pSection->m_SecInfo.pWordProps) {
-            section.WordProps = *pSection->m_SecInfo.pWordProps;
-        }
+FX_BOOL CPDF_VariableText_Iterator::PrevSection() {
+  ASSERT(m_pVT != NULL);
+  if (m_CurPos.nSecIndex > 0) {
+    m_CurPos = CPVT_WordPlace(m_CurPos.nSecIndex - 1, 0, -1);
+    return TRUE;
+  }
+  return FALSE;
+}
+FX_BOOL CPDF_VariableText_Iterator::GetWord(CPVT_Word& word) const {
+  ASSERT(m_pVT != NULL);
+  word.WordPlace = m_CurPos;
+  if (CSection* pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
+    if (pSection->m_LineArray.GetAt(m_CurPos.nLineIndex)) {
+      if (CPVT_WordInfo* pWord =
+              pSection->m_WordArray.GetAt(m_CurPos.nWordIndex)) {
+        word.Word = pWord->Word;
+        word.nCharset = pWord->nCharset;
+        word.fWidth = m_pVT->GetWordWidth(*pWord);
+        word.ptWord = m_pVT->InToOut(
+            CPDF_Point(pWord->fWordX + pSection->m_SecInfo.rcSection.left,
+                       pWord->fWordY + pSection->m_SecInfo.rcSection.top));
+        word.fAscent = m_pVT->GetWordAscent(*pWord);
+        word.fDescent = m_pVT->GetWordDescent(*pWord);
+        if (pWord->pWordProps) {
+          word.WordProps = *pWord->pWordProps;
+        }
+        word.nFontIndex = m_pVT->GetWordFontIndex(*pWord);
+        word.fFontSize = m_pVT->GetWordFontSize(*pWord);
         return TRUE;
+      }
+    }
+  }
+  return FALSE;
+}
+FX_BOOL CPDF_VariableText_Iterator::SetWord(const CPVT_Word& word) {
+  ASSERT(m_pVT != NULL);
+  if (CSection* pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
+    if (CPVT_WordInfo* pWord =
+            pSection->m_WordArray.GetAt(m_CurPos.nWordIndex)) {
+      if (pWord->pWordProps) {
+        *pWord->pWordProps = word.WordProps;
+      }
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+FX_BOOL CPDF_VariableText_Iterator::GetLine(CPVT_Line& line) const {
+  ASSERT(m_pVT != NULL);
+  line.lineplace = CPVT_WordPlace(m_CurPos.nSecIndex, m_CurPos.nLineIndex, -1);
+  if (CSection* pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
+    if (CLine* pLine = pSection->m_LineArray.GetAt(m_CurPos.nLineIndex)) {
+      line.ptLine = m_pVT->InToOut(CPDF_Point(
+          pLine->m_LineInfo.fLineX + pSection->m_SecInfo.rcSection.left,
+          pLine->m_LineInfo.fLineY + pSection->m_SecInfo.rcSection.top));
+      line.fLineWidth = pLine->m_LineInfo.fLineWidth;
+      line.fLineAscent = pLine->m_LineInfo.fLineAscent;
+      line.fLineDescent = pLine->m_LineInfo.fLineDescent;
+      line.lineEnd = pLine->GetEndWordPlace();
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+FX_BOOL CPDF_VariableText_Iterator::GetSection(CPVT_Section& section) const {
+  ASSERT(m_pVT != NULL);
+  section.secplace = CPVT_WordPlace(m_CurPos.nSecIndex, 0, -1);
+  if (CSection* pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
+    section.rcSection = m_pVT->InToOut(pSection->m_SecInfo.rcSection);
+    if (pSection->m_SecInfo.pSecProps) {
+      section.SecProps = *pSection->m_SecInfo.pSecProps;
+    }
+    if (pSection->m_SecInfo.pWordProps) {
+      section.WordProps = *pSection->m_SecInfo.pWordProps;
     }
-    return FALSE;
+    return TRUE;
+  }
+  return FALSE;
 }
-FX_BOOL	CPDF_VariableText_Iterator::SetSection(const CPVT_Section & section)
-{
-    ASSERT(m_pVT != NULL);
-    if (CSection * pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
-        if (pSection->m_SecInfo.pSecProps) {
-            *pSection->m_SecInfo.pSecProps = section.SecProps;
-        }
-        if (pSection->m_SecInfo.pWordProps) {
-            *pSection->m_SecInfo.pWordProps = section.WordProps;
-        }
-        return TRUE;
+FX_BOOL CPDF_VariableText_Iterator::SetSection(const CPVT_Section& section) {
+  ASSERT(m_pVT != NULL);
+  if (CSection* pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
+    if (pSection->m_SecInfo.pSecProps) {
+      *pSection->m_SecInfo.pSecProps = section.SecProps;
     }
-    return FALSE;
+    if (pSection->m_SecInfo.pWordProps) {
+      *pSection->m_SecInfo.pWordProps = section.WordProps;
+    }
+    return TRUE;
+  }
+  return FALSE;
 }
diff --git a/core/src/fpdfdoc/doc_vtmodule.cpp b/core/src/fpdfdoc/doc_vtmodule.cpp
index 39a89b5ac7..834d459de3 100644
--- a/core/src/fpdfdoc/doc_vtmodule.cpp
+++ b/core/src/fpdfdoc/doc_vtmodule.cpp
@@ -7,11 +7,9 @@
 #include "../../include/fpdfdoc/fpdf_doc.h"
 #include "../../include/fpdfdoc/fpdf_vt.h"
 #include "pdf_vt.h"
-IPDF_VariableText* IPDF_VariableText::NewVariableText()
-{
-    return new CPDF_VariableText();
+IPDF_VariableText* IPDF_VariableText::NewVariableText() {
+  return new CPDF_VariableText();
 }
-void IPDF_VariableText::DelVariableText(IPDF_VariableText* pVT)
-{
-    delete (CPDF_VariableText*)pVT;
+void IPDF_VariableText::DelVariableText(IPDF_VariableText* pVT) {
+  delete (CPDF_VariableText*)pVT;
 }
diff --git a/core/src/fpdfdoc/pdf_vt.h b/core/src/fpdfdoc/pdf_vt.h
index a75490fcd5..d3010da73b 100644
--- a/core/src/fpdfdoc/pdf_vt.h
+++ b/core/src/fpdfdoc/pdf_vt.h
@@ -19,614 +19,526 @@ class CTypeset;
 class CPDF_EditContainer;
 class CPDF_VariableText;
 class CPDF_VariableText_Iterator;
-#define IsFloatZero(f)						((f) < 0.0001 && (f) > -0.0001)
-#define IsFloatBigger(fa,fb)				((fa) > (fb) && !IsFloatZero((fa) - (fb)))
-#define IsFloatSmaller(fa,fb)				((fa) < (fb) && !IsFloatZero((fa) - (fb)))
-template<class T> T FPDF_MIN (const T & i, const T & j)
-{
-    return ((i < j) ? i : j);
+#define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001)
+#define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb)))
+#define IsFloatSmaller(fa, fb) ((fa) < (fb) && !IsFloatZero((fa) - (fb)))
+template <class T>
+T FPDF_MIN(const T& i, const T& j) {
+  return ((i < j) ? i : j);
 }
-template<class T> T FPDF_MAX (const T & i, const T & j)
-{
-    return ((i > j) ? i : j);
+template <class T>
+T FPDF_MAX(const T& i, const T& j) {
+  return ((i > j) ? i : j);
 }
-class CPVT_Size
-{
-public:
-    CPVT_Size() : x(0.0f), y(0.0f)
-    {
-    }
-    CPVT_Size(FX_FLOAT other_x, FX_FLOAT other_y)
-    {
-        x = other_x;
-        y = other_y;
-    }
-    FX_FLOAT x, y;
+class CPVT_Size {
+ public:
+  CPVT_Size() : x(0.0f), y(0.0f) {}
+  CPVT_Size(FX_FLOAT other_x, FX_FLOAT other_y) {
+    x = other_x;
+    y = other_y;
+  }
+  FX_FLOAT x, y;
 };
-class CPVT_FloatRect : public CFX_FloatRect
-{
-public:
-    CPVT_FloatRect()
-    {
-        left = top = right = bottom = 0.0f;
-    }
-    CPVT_FloatRect(FX_FLOAT other_left,
-                   FX_FLOAT other_top,
-                   FX_FLOAT other_right,
-                   FX_FLOAT other_bottom)
-    {
-        left = other_left;
-        top = other_top;
-        right = other_right;
-        bottom = other_bottom;
-    }
-    CPVT_FloatRect(const CPDF_Rect & rect)
-    {
-        left = rect.left;
-        top = rect.top;
-        right = rect.right;
-        bottom = rect.bottom;
-    }
-    void Default()
-    {
-        left = top = right = bottom = 0.0f;
-    }
-    FX_FLOAT Height() const
-    {
-        if (top > bottom)
-            return top - bottom;
-        return bottom - top;
-    }
+class CPVT_FloatRect : public CFX_FloatRect {
+ public:
+  CPVT_FloatRect() { left = top = right = bottom = 0.0f; }
+  CPVT_FloatRect(FX_FLOAT other_left,
+                 FX_FLOAT other_top,
+                 FX_FLOAT other_right,
+                 FX_FLOAT other_bottom) {
+    left = other_left;
+    top = other_top;
+    right = other_right;
+    bottom = other_bottom;
+  }
+  CPVT_FloatRect(const CPDF_Rect& rect) {
+    left = rect.left;
+    top = rect.top;
+    right = rect.right;
+    bottom = rect.bottom;
+  }
+  void Default() { left = top = right = bottom = 0.0f; }
+  FX_FLOAT Height() const {
+    if (top > bottom)
+      return top - bottom;
+    return bottom - top;
+  }
 };
 struct CPVT_SectionInfo {
-    CPVT_SectionInfo() : rcSection(), nTotalLine(0), pSecProps(NULL), pWordProps(NULL)
-    {
-    }
-    virtual ~CPVT_SectionInfo()
-    {
-        delete pSecProps;
-        delete pWordProps;
-    }
-    CPVT_SectionInfo(const CPVT_SectionInfo & other): rcSection(), nTotalLine(0), pSecProps(NULL), pWordProps(NULL)
-    {
-        operator = (other);
-    }
-    void operator = (const CPVT_SectionInfo & other)
-    {
-        if (this == &other) {
-            return;
-        }
-        rcSection = other.rcSection;
-        nTotalLine = other.nTotalLine;
-        if (other.pSecProps) {
-            if (pSecProps) {
-                *pSecProps = *other.pSecProps;
-            } else {
-                pSecProps = new CPVT_SecProps(*other.pSecProps);
-            }
-        }
-        if (other.pWordProps) {
-            if (pWordProps) {
-                *pWordProps = *other.pWordProps;
-            } else {
-                pWordProps = new CPVT_WordProps(*other.pWordProps);
-            }
-        }
-    }
-    CPVT_FloatRect				rcSection;
-    int32_t					nTotalLine;
-    CPVT_SecProps*				pSecProps;
-    CPVT_WordProps*				pWordProps;
+  CPVT_SectionInfo()
+      : rcSection(), nTotalLine(0), pSecProps(NULL), pWordProps(NULL) {}
+  virtual ~CPVT_SectionInfo() {
+    delete pSecProps;
+    delete pWordProps;
+  }
+  CPVT_SectionInfo(const CPVT_SectionInfo& other)
+      : rcSection(), nTotalLine(0), pSecProps(NULL), pWordProps(NULL) {
+    operator=(other);
+  }
+  void operator=(const CPVT_SectionInfo& other) {
+    if (this == &other) {
+      return;
+    }
+    rcSection = other.rcSection;
+    nTotalLine = other.nTotalLine;
+    if (other.pSecProps) {
+      if (pSecProps) {
+        *pSecProps = *other.pSecProps;
+      } else {
+        pSecProps = new CPVT_SecProps(*other.pSecProps);
+      }
+    }
+    if (other.pWordProps) {
+      if (pWordProps) {
+        *pWordProps = *other.pWordProps;
+      } else {
+        pWordProps = new CPVT_WordProps(*other.pWordProps);
+      }
+    }
+  }
+  CPVT_FloatRect rcSection;
+  int32_t nTotalLine;
+  CPVT_SecProps* pSecProps;
+  CPVT_WordProps* pWordProps;
 };
 struct CPVT_LineInfo {
-    CPVT_LineInfo() : nTotalWord(0), nBeginWordIndex(-1), nEndWordIndex(-1),
-        fLineX(0.0f), fLineY(0.0f), fLineWidth(0.0f), fLineAscent(0.0f), fLineDescent(0.0f)
-    {
-    }
-    int32_t					nTotalWord;
-    int32_t					nBeginWordIndex;
-    int32_t					nEndWordIndex;
-    FX_FLOAT					fLineX;
-    FX_FLOAT					fLineY;
-    FX_FLOAT					fLineWidth;
-    FX_FLOAT					fLineAscent;
-    FX_FLOAT					fLineDescent;
+  CPVT_LineInfo()
+      : nTotalWord(0),
+        nBeginWordIndex(-1),
+        nEndWordIndex(-1),
+        fLineX(0.0f),
+        fLineY(0.0f),
+        fLineWidth(0.0f),
+        fLineAscent(0.0f),
+        fLineDescent(0.0f) {}
+  int32_t nTotalWord;
+  int32_t nBeginWordIndex;
+  int32_t nEndWordIndex;
+  FX_FLOAT fLineX;
+  FX_FLOAT fLineY;
+  FX_FLOAT fLineWidth;
+  FX_FLOAT fLineAscent;
+  FX_FLOAT fLineDescent;
 };
-struct CPVT_WordInfo  {
-    CPVT_WordInfo() : Word(0), nCharset(0),
-        fWordX(0.0f), fWordY(0.0f), fWordTail(0.0f), nFontIndex(-1), pWordProps(NULL)
-    {
-    }
-    CPVT_WordInfo(FX_WORD word, int32_t charset, int32_t fontIndex, CPVT_WordProps * pProps):
-        Word(word), nCharset(charset), fWordX(0.0f), fWordY(0.0f), fWordTail(0.0f),
-        nFontIndex(fontIndex), pWordProps(pProps)
-    {
-    }
-    virtual ~CPVT_WordInfo()
-    {
-        delete pWordProps;
-    }
-    CPVT_WordInfo(const CPVT_WordInfo & word): Word(0), nCharset(0),
-        fWordX(0.0f), fWordY(0.0f), fWordTail(0.0f), nFontIndex(-1), pWordProps(NULL)
-    {
-        operator = (word);
-    }
-    void operator = (const CPVT_WordInfo & word)
-    {
-        if (this == &word) {
-            return;
-        }
-        Word = word.Word;
-        nCharset = word.nCharset;
-        nFontIndex = word.nFontIndex;
-        if (word.pWordProps) {
-            if (pWordProps) {
-                *pWordProps = *word.pWordProps;
-            } else {
-                pWordProps = new CPVT_WordProps(*word.pWordProps);
-            }
-        }
-    }
-    FX_WORD						Word;
-    int32_t					nCharset;
-    FX_FLOAT					fWordX;
-    FX_FLOAT					fWordY;
-    FX_FLOAT					fWordTail;
-    int32_t					nFontIndex;
-    CPVT_WordProps*				pWordProps;
+struct CPVT_WordInfo {
+  CPVT_WordInfo()
+      : Word(0),
+        nCharset(0),
+        fWordX(0.0f),
+        fWordY(0.0f),
+        fWordTail(0.0f),
+        nFontIndex(-1),
+        pWordProps(NULL) {}
+  CPVT_WordInfo(FX_WORD word,
+                int32_t charset,
+                int32_t fontIndex,
+                CPVT_WordProps* pProps)
+      : Word(word),
+        nCharset(charset),
+        fWordX(0.0f),
+        fWordY(0.0f),
+        fWordTail(0.0f),
+        nFontIndex(fontIndex),
+        pWordProps(pProps) {}
+  virtual ~CPVT_WordInfo() { delete pWordProps; }
+  CPVT_WordInfo(const CPVT_WordInfo& word)
+      : Word(0),
+        nCharset(0),
+        fWordX(0.0f),
+        fWordY(0.0f),
+        fWordTail(0.0f),
+        nFontIndex(-1),
+        pWordProps(NULL) {
+    operator=(word);
+  }
+  void operator=(const CPVT_WordInfo& word) {
+    if (this == &word) {
+      return;
+    }
+    Word = word.Word;
+    nCharset = word.nCharset;
+    nFontIndex = word.nFontIndex;
+    if (word.pWordProps) {
+      if (pWordProps) {
+        *pWordProps = *word.pWordProps;
+      } else {
+        pWordProps = new CPVT_WordProps(*word.pWordProps);
+      }
+    }
+  }
+  FX_WORD Word;
+  int32_t nCharset;
+  FX_FLOAT fWordX;
+  FX_FLOAT fWordY;
+  FX_FLOAT fWordTail;
+  int32_t nFontIndex;
+  CPVT_WordProps* pWordProps;
 };
 struct CPVT_FloatRange {
-    CPVT_FloatRange() : fMin(0.0f), fMax(0.0f)
-    {
-    }
-    CPVT_FloatRange(FX_FLOAT min, FX_FLOAT max) : fMin(min), fMax(max)
-    {
-    }
-    FX_FLOAT Range() const
-    {
-        return fMax - fMin;
-    }
-    FX_FLOAT fMin, fMax;
+  CPVT_FloatRange() : fMin(0.0f), fMax(0.0f) {}
+  CPVT_FloatRange(FX_FLOAT min, FX_FLOAT max) : fMin(min), fMax(max) {}
+  FX_FLOAT Range() const { return fMax - fMin; }
+  FX_FLOAT fMin, fMax;
 };
-template<class TYPE> class CPVT_ArrayTemplate : public CFX_ArrayTemplate<TYPE>
-{
-public:
-    FX_BOOL IsEmpty()
-    {
-        return CFX_ArrayTemplate<TYPE>::GetSize() <= 0;
-    }
-    TYPE GetAt(int nIndex) const
-    {
-        if (nIndex >= 0 && nIndex < CFX_ArrayTemplate<TYPE>::GetSize()) {
-            return CFX_ArrayTemplate<TYPE>::GetAt(nIndex);
-        }
-        return NULL;
-    }
-    void RemoveAt(int nIndex)
-    {
-        if (nIndex >= 0 && nIndex < CFX_ArrayTemplate<TYPE>::GetSize()) {
-            CFX_ArrayTemplate<TYPE>::RemoveAt(nIndex);
-        }
-    }
+template <class TYPE>
+class CPVT_ArrayTemplate : public CFX_ArrayTemplate<TYPE> {
+ public:
+  FX_BOOL IsEmpty() { return CFX_ArrayTemplate<TYPE>::GetSize() <= 0; }
+  TYPE GetAt(int nIndex) const {
+    if (nIndex >= 0 && nIndex < CFX_ArrayTemplate<TYPE>::GetSize()) {
+      return CFX_ArrayTemplate<TYPE>::GetAt(nIndex);
+    }
+    return NULL;
+  }
+  void RemoveAt(int nIndex) {
+    if (nIndex >= 0 && nIndex < CFX_ArrayTemplate<TYPE>::GetSize()) {
+      CFX_ArrayTemplate<TYPE>::RemoveAt(nIndex);
+    }
+  }
 };
-class CLine
-{
-public:
-    CLine();
-    virtual ~CLine();
-    CPVT_WordPlace							GetBeginWordPlace() const;
-    CPVT_WordPlace							GetEndWordPlace() const;
-    CPVT_WordPlace							GetPrevWordPlace(const CPVT_WordPlace & place) const;
-    CPVT_WordPlace							GetNextWordPlace(const CPVT_WordPlace & place) const;
-    CPVT_WordPlace							LinePlace;
-    CPVT_LineInfo							m_LineInfo;
+class CLine {
+ public:
+  CLine();
+  virtual ~CLine();
+  CPVT_WordPlace GetBeginWordPlace() const;
+  CPVT_WordPlace GetEndWordPlace() const;
+  CPVT_WordPlace GetPrevWordPlace(const CPVT_WordPlace& place) const;
+  CPVT_WordPlace GetNextWordPlace(const CPVT_WordPlace& place) const;
+  CPVT_WordPlace LinePlace;
+  CPVT_LineInfo m_LineInfo;
 };
-class CLines
-{
-public:
-    CLines() : m_nTotal(0) {}
-    virtual ~CLines()
-    {
-        RemoveAll();
-    }
-    int32_t								GetSize() const
-    {
-        return m_Lines.GetSize();
-    }
-    CLine *									GetAt(int32_t nIndex) const
-    {
-        return m_Lines.GetAt(nIndex);
-    }
-    void									Empty()
-    {
-        m_nTotal = 0;
-    }
-    void									RemoveAll()
-    {
-        for (int32_t i = 0, sz = GetSize(); i < sz; i++) {
-            delete GetAt(i);
-        }
-        m_Lines.RemoveAll();
-        m_nTotal = 0;
-    }
-    int32_t								Add(const CPVT_LineInfo & lineinfo)
-    {
-        if (m_nTotal >= GetSize()) {
-            CLine* pLine = new CLine;
-            pLine->m_LineInfo = lineinfo;
-            m_Lines.Add(pLine);
-        } else if (CLine* pLine = GetAt(m_nTotal)) {
-            pLine->m_LineInfo = lineinfo;
-        }
-        return m_nTotal++;
-    }
-    void									Clear()
-    {
-        for (int32_t i = GetSize() - 1; i >= m_nTotal; i--) {
-            delete GetAt(i);
-            m_Lines.RemoveAt(i);
-        }
-    }
-private:
-    CPVT_ArrayTemplate<CLine*>				m_Lines;
-    int32_t								m_nTotal;
+class CLines {
+ public:
+  CLines() : m_nTotal(0) {}
+  virtual ~CLines() { RemoveAll(); }
+  int32_t GetSize() const { return m_Lines.GetSize(); }
+  CLine* GetAt(int32_t nIndex) const { return m_Lines.GetAt(nIndex); }
+  void Empty() { m_nTotal = 0; }
+  void RemoveAll() {
+    for (int32_t i = 0, sz = GetSize(); i < sz; i++) {
+      delete GetAt(i);
+    }
+    m_Lines.RemoveAll();
+    m_nTotal = 0;
+  }
+  int32_t Add(const CPVT_LineInfo& lineinfo) {
+    if (m_nTotal >= GetSize()) {
+      CLine* pLine = new CLine;
+      pLine->m_LineInfo = lineinfo;
+      m_Lines.Add(pLine);
+    } else if (CLine* pLine = GetAt(m_nTotal)) {
+      pLine->m_LineInfo = lineinfo;
+    }
+    return m_nTotal++;
+  }
+  void Clear() {
+    for (int32_t i = GetSize() - 1; i >= m_nTotal; i--) {
+      delete GetAt(i);
+      m_Lines.RemoveAt(i);
+    }
+  }
+
+ private:
+  CPVT_ArrayTemplate<CLine*> m_Lines;
+  int32_t m_nTotal;
 };
-class CSection
-{
-    friend class CTypeset;
-public:
-    CSection(CPDF_VariableText * pVT);
-    virtual ~CSection();
-    void									ResetAll();
-    void									ResetLineArray();
-    void									ResetWordArray();
-    void									ResetLinePlace();
-    CPVT_WordPlace							AddWord(const CPVT_WordPlace & place, const CPVT_WordInfo & wordinfo);
-    CPVT_WordPlace							AddLine(const CPVT_LineInfo & lineinfo);
-    void									ClearWords(const CPVT_WordRange & PlaceRange);
-    void									ClearWord(const CPVT_WordPlace & place);
-    CPVT_FloatRect							Rearrange();
-    CPVT_Size								GetSectionSize(FX_FLOAT fFontSize);
-    CPVT_WordPlace							GetBeginWordPlace() const;
-    CPVT_WordPlace							GetEndWordPlace() const;
-    CPVT_WordPlace							GetPrevWordPlace(const CPVT_WordPlace & place) const;
-    CPVT_WordPlace							GetNextWordPlace(const CPVT_WordPlace & place) const;
-    void									UpdateWordPlace(CPVT_WordPlace & place) const;
-    CPVT_WordPlace							SearchWordPlace(const CPDF_Point & point) const;
-    CPVT_WordPlace							SearchWordPlace(FX_FLOAT fx, const CPVT_WordPlace & lineplace) const;
-    CPVT_WordPlace							SearchWordPlace(FX_FLOAT fx, const CPVT_WordRange & range) const;
-public:
-    CPVT_WordPlace							SecPlace;
-    CPVT_SectionInfo						m_SecInfo;
-    CLines									m_LineArray;
-    CPVT_ArrayTemplate<CPVT_WordInfo*>		m_WordArray;
-private:
-    void									ClearLeftWords(int32_t nWordIndex);
-    void									ClearRightWords(int32_t nWordIndex);
-    void									ClearMidWords(int32_t nBeginIndex, int32_t nEndIndex);
+class CSection {
+  friend class CTypeset;
+
+ public:
+  CSection(CPDF_VariableText* pVT);
+  virtual ~CSection();
+  void ResetAll();
+  void ResetLineArray();
+  void ResetWordArray();
+  void ResetLinePlace();
+  CPVT_WordPlace AddWord(const CPVT_WordPlace& place,
+                         const CPVT_WordInfo& wordinfo);
+  CPVT_WordPlace AddLine(const CPVT_LineInfo& lineinfo);
+  void ClearWords(const CPVT_WordRange& PlaceRange);
+  void ClearWord(const CPVT_WordPlace& place);
+  CPVT_FloatRect Rearrange();
+  CPVT_Size GetSectionSize(FX_FLOAT fFontSize);
+  CPVT_WordPlace GetBeginWordPlace() const;
+  CPVT_WordPlace GetEndWordPlace() const;
+  CPVT_WordPlace GetPrevWordPlace(const CPVT_WordPlace& place) const;
+  CPVT_WordPlace GetNextWordPlace(const CPVT_WordPlace& place) const;
+  void UpdateWordPlace(CPVT_WordPlace& place) const;
+  CPVT_WordPlace SearchWordPlace(const CPDF_Point& point) const;
+  CPVT_WordPlace SearchWordPlace(FX_FLOAT fx,
+                                 const CPVT_WordPlace& lineplace) const;
+  CPVT_WordPlace SearchWordPlace(FX_FLOAT fx,
+                                 const CPVT_WordRange& range) const;
+
+ public:
+  CPVT_WordPlace SecPlace;
+  CPVT_SectionInfo m_SecInfo;
+  CLines m_LineArray;
+  CPVT_ArrayTemplate<CPVT_WordInfo*> m_WordArray;
 
-    CPDF_VariableText						*m_pVT;
+ private:
+  void ClearLeftWords(int32_t nWordIndex);
+  void ClearRightWords(int32_t nWordIndex);
+  void ClearMidWords(int32_t nBeginIndex, int32_t nEndIndex);
+
+  CPDF_VariableText* m_pVT;
 };
-class CTypeset
-{
-public:
-    CTypeset(CSection * pSection);
-    virtual ~CTypeset();
-    CPVT_Size								GetEditSize(FX_FLOAT fFontSize);
-    CPVT_FloatRect							Typeset();
-    CPVT_FloatRect							CharArray();
-private:
-    void									SplitLines(FX_BOOL bTypeset, FX_FLOAT fFontSize);
-    void									OutputLines();
+class CTypeset {
+ public:
+  CTypeset(CSection* pSection);
+  virtual ~CTypeset();
+  CPVT_Size GetEditSize(FX_FLOAT fFontSize);
+  CPVT_FloatRect Typeset();
+  CPVT_FloatRect CharArray();
+
+ private:
+  void SplitLines(FX_BOOL bTypeset, FX_FLOAT fFontSize);
+  void OutputLines();
 
-    CPVT_FloatRect							m_rcRet;
-    CPDF_VariableText						* m_pVT;
-    CSection								* m_pSection;
+  CPVT_FloatRect m_rcRet;
+  CPDF_VariableText* m_pVT;
+  CSection* m_pSection;
 };
-class CPDF_EditContainer
-{
-public:
-    CPDF_EditContainer(): m_rcPlate(0, 0, 0, 0), m_rcContent(0, 0, 0, 0) {};
-    virtual ~CPDF_EditContainer() {};
-    virtual void							SetPlateRect(const CPDF_Rect & rect)
-    {
-        m_rcPlate = rect;
-    };
-    virtual const CPDF_Rect &				GetPlateRect() const
-    {
-        return m_rcPlate;
-    };
-    virtual void							SetContentRect(const CPVT_FloatRect & rect)
-    {
-        m_rcContent = rect;
-    };
-    virtual CPDF_Rect 						GetContentRect() const
-    {
-        return m_rcContent;
-    };
-    FX_FLOAT								GetPlateWidth() const
-    {
-        return m_rcPlate.right - m_rcPlate.left;
-    };
-    FX_FLOAT								GetPlateHeight() const
-    {
-        return m_rcPlate.top - m_rcPlate.bottom;
-    };
-    CPVT_Size								GetPlateSize() const
-    {
-        return CPVT_Size(GetPlateWidth(), GetPlateHeight());
-    };
-    CPDF_Point								GetBTPoint() const
-    {
-        return CPDF_Point(m_rcPlate.left, m_rcPlate.top);
-    };
-    CPDF_Point								GetETPoint() const
-    {
-        return CPDF_Point(m_rcPlate.right, m_rcPlate.bottom);
-    };
-    inline CPDF_Point						InToOut(const CPDF_Point & point) const
-    {
-        return CPDF_Point(point.x + GetBTPoint().x, GetBTPoint().y - point.y);
-    };
-    inline CPDF_Point						OutToIn(const CPDF_Point & point) const
-    {
-        return CPDF_Point(point.x - GetBTPoint().x, GetBTPoint().y - point.y);
-    };
-    inline CPDF_Rect						InToOut(const CPVT_FloatRect & rect) const
-    {
-        CPDF_Point ptLeftTop = InToOut(CPDF_Point(rect.left, rect.top));
-        CPDF_Point ptRightBottom = InToOut(CPDF_Point(rect.right, rect.bottom));
-        return CPDF_Rect(ptLeftTop.x, ptRightBottom.y, ptRightBottom.x, ptLeftTop.y);
-    };
-    inline CPVT_FloatRect					OutToIn(const CPDF_Rect & rect) const
-    {
-        CPDF_Point ptLeftTop = OutToIn(CPDF_Point(rect.left, rect.top));
-        CPDF_Point ptRightBottom = OutToIn(CPDF_Point(rect.right, rect.bottom));
-        return CPVT_FloatRect(ptLeftTop.x, ptLeftTop.y, ptRightBottom.x, ptRightBottom.y);
-    };
+class CPDF_EditContainer {
+ public:
+  CPDF_EditContainer() : m_rcPlate(0, 0, 0, 0), m_rcContent(0, 0, 0, 0){};
+  virtual ~CPDF_EditContainer(){};
+  virtual void SetPlateRect(const CPDF_Rect& rect) { m_rcPlate = rect; };
+  virtual const CPDF_Rect& GetPlateRect() const { return m_rcPlate; };
+  virtual void SetContentRect(const CPVT_FloatRect& rect) {
+    m_rcContent = rect;
+  };
+  virtual CPDF_Rect GetContentRect() const { return m_rcContent; };
+  FX_FLOAT GetPlateWidth() const { return m_rcPlate.right - m_rcPlate.left; };
+  FX_FLOAT GetPlateHeight() const { return m_rcPlate.top - m_rcPlate.bottom; };
+  CPVT_Size GetPlateSize() const {
+    return CPVT_Size(GetPlateWidth(), GetPlateHeight());
+  };
+  CPDF_Point GetBTPoint() const {
+    return CPDF_Point(m_rcPlate.left, m_rcPlate.top);
+  };
+  CPDF_Point GetETPoint() const {
+    return CPDF_Point(m_rcPlate.right, m_rcPlate.bottom);
+  };
+  inline CPDF_Point InToOut(const CPDF_Point& point) const {
+    return CPDF_Point(point.x + GetBTPoint().x, GetBTPoint().y - point.y);
+  };
+  inline CPDF_Point OutToIn(const CPDF_Point& point) const {
+    return CPDF_Point(point.x - GetBTPoint().x, GetBTPoint().y - point.y);
+  };
+  inline CPDF_Rect InToOut(const CPVT_FloatRect& rect) const {
+    CPDF_Point ptLeftTop = InToOut(CPDF_Point(rect.left, rect.top));
+    CPDF_Point ptRightBottom = InToOut(CPDF_Point(rect.right, rect.bottom));
+    return CPDF_Rect(ptLeftTop.x, ptRightBottom.y, ptRightBottom.x,
+                     ptLeftTop.y);
+  };
+  inline CPVT_FloatRect OutToIn(const CPDF_Rect& rect) const {
+    CPDF_Point ptLeftTop = OutToIn(CPDF_Point(rect.left, rect.top));
+    CPDF_Point ptRightBottom = OutToIn(CPDF_Point(rect.right, rect.bottom));
+    return CPVT_FloatRect(ptLeftTop.x, ptLeftTop.y, ptRightBottom.x,
+                          ptRightBottom.y);
+  };
 
-private:
-    CPDF_Rect								m_rcPlate;
-    CPVT_FloatRect							m_rcContent;
+ private:
+  CPDF_Rect m_rcPlate;
+  CPVT_FloatRect m_rcContent;
 };
-class CPDF_VariableText : public IPDF_VariableText, private CPDF_EditContainer
-{
-    friend class CTypeset;
-    friend class CSection;
-    friend class CPDF_VariableText_Iterator;
-public:
-    CPDF_VariableText();
-    virtual ~CPDF_VariableText();
-    IPDF_VariableText_Provider*				SetProvider(IPDF_VariableText_Provider * pProvider);
-    IPDF_VariableText_Iterator*				GetIterator();
-    void									SetPlateRect(const CPDF_Rect & rect)
-    {
-        CPDF_EditContainer::SetPlateRect(rect);
-    }
-    void									SetAlignment(int32_t nFormat = 0)
-    {
-        m_nAlignment = nFormat;
-    }
-    void									SetPasswordChar(FX_WORD wSubWord = '*')
-    {
-        m_wSubWord = wSubWord;
-    }
-    void									SetLimitChar(int32_t nLimitChar = 0)
-    {
-        m_nLimitChar = nLimitChar;
-    }
-    void									SetCharSpace(FX_FLOAT fCharSpace = 0.0f)
-    {
-        m_fCharSpace = fCharSpace;
-    }
-    void									SetHorzScale(int32_t nHorzScale = 100)
-    {
-        m_nHorzScale = nHorzScale;
-    }
-    void									SetMultiLine(FX_BOOL bMultiLine = TRUE)
-    {
-        m_bMultiLine = bMultiLine;
-    }
-    void									SetAutoReturn(FX_BOOL bAuto = TRUE)
-    {
-        m_bLimitWidth = bAuto;
-    }
-    void									SetFontSize(FX_FLOAT fFontSize)
-    {
-        m_fFontSize = fFontSize;
-    }
-    void									SetCharArray(int32_t nCharArray = 0)
-    {
-        m_nCharArray = nCharArray;
-    }
-    void									SetAutoFontSize(FX_BOOL bAuto = TRUE)
-    {
-        m_bAutoFontSize = bAuto;
-    }
-    void									SetRichText(FX_BOOL bRichText)
-    {
-        m_bRichText = bRichText;
-    }
-    void									SetLineLeading(FX_FLOAT fLineLeading)
-    {
-        m_fLineLeading = fLineLeading;
-    }
-    void									Initialize();
-    FX_BOOL									IsValid() const
-    {
-        return m_bInitial;
-    }
-    FX_BOOL									IsRichText() const
-    {
-        return m_bRichText;
-    }
-    void									RearrangeAll();
-    void									RearrangePart(const CPVT_WordRange & PlaceRange);
-    void									ResetAll();
-    void									SetText(const FX_WCHAR* text, int32_t charset = 1, const CPVT_SecProps * pSecProps = NULL,
-            const CPVT_WordProps * pWordProps = NULL);
-    CPVT_WordPlace							InsertWord(const CPVT_WordPlace & place, FX_WORD word, int32_t charset = 1,
-            const CPVT_WordProps * pWordProps = NULL);
-    CPVT_WordPlace							InsertSection(const CPVT_WordPlace & place, const CPVT_SecProps * pSecProps = NULL,
-            const CPVT_WordProps * pWordProps = NULL);
-    CPVT_WordPlace							InsertText(const CPVT_WordPlace & place, const FX_WCHAR* text, int32_t charset = 1,
-            const CPVT_SecProps * pSecProps = NULL,	const CPVT_WordProps * pWordProps = NULL);
-    CPVT_WordPlace							DeleteWords(const CPVT_WordRange & PlaceRange);
-    CPVT_WordPlace							DeleteWord(const CPVT_WordPlace & place);
-    CPVT_WordPlace							BackSpaceWord(const CPVT_WordPlace & place);
-    const CPDF_Rect &						GetPlateRect() const
-    {
-        return CPDF_EditContainer::GetPlateRect();
-    }
-    CPDF_Rect								GetContentRect() const;
-    int32_t								GetTotalWords() const;
-    FX_FLOAT								GetFontSize() const
-    {
-        return m_fFontSize;
-    }
-    int32_t								GetAlignment() const
-    {
-        return m_nAlignment;
-    }
-    int32_t								GetCharArray() const
-    {
-        return m_nCharArray;
-    }
-    int32_t								GetLimitChar() const
-    {
-        return m_nLimitChar;
-    }
-    FX_BOOL									IsMultiLine() const
-    {
-        return m_bMultiLine;
-    }
-    int32_t								GetHorzScale() const
-    {
-        return m_nHorzScale;
-    }
-    FX_FLOAT								GetCharSpace() const
-    {
-        return m_fCharSpace;
-    }
+class CPDF_VariableText : public IPDF_VariableText, private CPDF_EditContainer {
+  friend class CTypeset;
+  friend class CSection;
+  friend class CPDF_VariableText_Iterator;
 
-    CPVT_WordPlace							GetBeginWordPlace() const;
-    CPVT_WordPlace							GetEndWordPlace() const;
-    CPVT_WordPlace							GetPrevWordPlace(const CPVT_WordPlace & place) const;
-    CPVT_WordPlace							GetNextWordPlace(const CPVT_WordPlace & place) const;
-    CPVT_WordPlace							SearchWordPlace(const CPDF_Point & point) const;
-    CPVT_WordPlace							GetUpWordPlace(const CPVT_WordPlace & place, const CPDF_Point & point) const;
-    CPVT_WordPlace							GetDownWordPlace(const CPVT_WordPlace & place, const CPDF_Point & point) const;
-    CPVT_WordPlace							GetLineBeginPlace(const CPVT_WordPlace & place) const;
-    CPVT_WordPlace							GetLineEndPlace(const CPVT_WordPlace & place) const;
-    CPVT_WordPlace							GetSectionBeginPlace(const CPVT_WordPlace & place) const;
-    CPVT_WordPlace							GetSectionEndPlace(const CPVT_WordPlace & place) const;
-    void									UpdateWordPlace(CPVT_WordPlace & place) const;
-    int32_t								WordPlaceToWordIndex(const CPVT_WordPlace & place) const;
-    CPVT_WordPlace							WordIndexToWordPlace(int32_t index) const;
-    FX_WORD									GetPasswordChar() const
-    {
-        return GetSubWord();
-    }
-    FX_WORD									GetSubWord() const
-    {
-        return m_wSubWord;
-    }
-private:
-    int32_t								GetCharWidth(int32_t nFontIndex, FX_WORD Word, FX_WORD SubWord, int32_t nWordStyle);
-    int32_t								GetTypeAscent(int32_t nFontIndex);
-    int32_t								GetTypeDescent(int32_t nFontIndex);
-    int32_t								GetWordFontIndex(FX_WORD word, int32_t charset, int32_t nFontIndex);
-    int32_t								GetDefaultFontIndex();
-    FX_BOOL									IsLatinWord(FX_WORD word);
-private:
+ public:
+  CPDF_VariableText();
+  virtual ~CPDF_VariableText();
+  IPDF_VariableText_Provider* SetProvider(
+      IPDF_VariableText_Provider* pProvider);
+  IPDF_VariableText_Iterator* GetIterator();
+  void SetPlateRect(const CPDF_Rect& rect) {
+    CPDF_EditContainer::SetPlateRect(rect);
+  }
+  void SetAlignment(int32_t nFormat = 0) { m_nAlignment = nFormat; }
+  void SetPasswordChar(FX_WORD wSubWord = '*') { m_wSubWord = wSubWord; }
+  void SetLimitChar(int32_t nLimitChar = 0) { m_nLimitChar = nLimitChar; }
+  void SetCharSpace(FX_FLOAT fCharSpace = 0.0f) { m_fCharSpace = fCharSpace; }
+  void SetHorzScale(int32_t nHorzScale = 100) { m_nHorzScale = nHorzScale; }
+  void SetMultiLine(FX_BOOL bMultiLine = TRUE) { m_bMultiLine = bMultiLine; }
+  void SetAutoReturn(FX_BOOL bAuto = TRUE) { m_bLimitWidth = bAuto; }
+  void SetFontSize(FX_FLOAT fFontSize) { m_fFontSize = fFontSize; }
+  void SetCharArray(int32_t nCharArray = 0) { m_nCharArray = nCharArray; }
+  void SetAutoFontSize(FX_BOOL bAuto = TRUE) { m_bAutoFontSize = bAuto; }
+  void SetRichText(FX_BOOL bRichText) { m_bRichText = bRichText; }
+  void SetLineLeading(FX_FLOAT fLineLeading) { m_fLineLeading = fLineLeading; }
+  void Initialize();
+  FX_BOOL IsValid() const { return m_bInitial; }
+  FX_BOOL IsRichText() const { return m_bRichText; }
+  void RearrangeAll();
+  void RearrangePart(const CPVT_WordRange& PlaceRange);
+  void ResetAll();
+  void SetText(const FX_WCHAR* text,
+               int32_t charset = 1,
+               const CPVT_SecProps* pSecProps = NULL,
+               const CPVT_WordProps* pWordProps = NULL);
+  CPVT_WordPlace InsertWord(const CPVT_WordPlace& place,
+                            FX_WORD word,
+                            int32_t charset = 1,
+                            const CPVT_WordProps* pWordProps = NULL);
+  CPVT_WordPlace InsertSection(const CPVT_WordPlace& place,
+                               const CPVT_SecProps* pSecProps = NULL,
+                               const CPVT_WordProps* pWordProps = NULL);
+  CPVT_WordPlace InsertText(const CPVT_WordPlace& place,
+                            const FX_WCHAR* text,
+                            int32_t charset = 1,
+                            const CPVT_SecProps* pSecProps = NULL,
+                            const CPVT_WordProps* pWordProps = NULL);
+  CPVT_WordPlace DeleteWords(const CPVT_WordRange& PlaceRange);
+  CPVT_WordPlace DeleteWord(const CPVT_WordPlace& place);
+  CPVT_WordPlace BackSpaceWord(const CPVT_WordPlace& place);
+  const CPDF_Rect& GetPlateRect() const {
+    return CPDF_EditContainer::GetPlateRect();
+  }
+  CPDF_Rect GetContentRect() const;
+  int32_t GetTotalWords() const;
+  FX_FLOAT GetFontSize() const { return m_fFontSize; }
+  int32_t GetAlignment() const { return m_nAlignment; }
+  int32_t GetCharArray() const { return m_nCharArray; }
+  int32_t GetLimitChar() const { return m_nLimitChar; }
+  FX_BOOL IsMultiLine() const { return m_bMultiLine; }
+  int32_t GetHorzScale() const { return m_nHorzScale; }
+  FX_FLOAT GetCharSpace() const { return m_fCharSpace; }
+
+  CPVT_WordPlace GetBeginWordPlace() const;
+  CPVT_WordPlace GetEndWordPlace() const;
+  CPVT_WordPlace GetPrevWordPlace(const CPVT_WordPlace& place) const;
+  CPVT_WordPlace GetNextWordPlace(const CPVT_WordPlace& place) const;
+  CPVT_WordPlace SearchWordPlace(const CPDF_Point& point) const;
+  CPVT_WordPlace GetUpWordPlace(const CPVT_WordPlace& place,
+                                const CPDF_Point& point) const;
+  CPVT_WordPlace GetDownWordPlace(const CPVT_WordPlace& place,
+                                  const CPDF_Point& point) const;
+  CPVT_WordPlace GetLineBeginPlace(const CPVT_WordPlace& place) const;
+  CPVT_WordPlace GetLineEndPlace(const CPVT_WordPlace& place) const;
+  CPVT_WordPlace GetSectionBeginPlace(const CPVT_WordPlace& place) const;
+  CPVT_WordPlace GetSectionEndPlace(const CPVT_WordPlace& place) const;
+  void UpdateWordPlace(CPVT_WordPlace& place) const;
+  int32_t WordPlaceToWordIndex(const CPVT_WordPlace& place) const;
+  CPVT_WordPlace WordIndexToWordPlace(int32_t index) const;
+  FX_WORD GetPasswordChar() const { return GetSubWord(); }
+  FX_WORD GetSubWord() const { return m_wSubWord; }
+
+ private:
+  int32_t GetCharWidth(int32_t nFontIndex,
+                       FX_WORD Word,
+                       FX_WORD SubWord,
+                       int32_t nWordStyle);
+  int32_t GetTypeAscent(int32_t nFontIndex);
+  int32_t GetTypeDescent(int32_t nFontIndex);
+  int32_t GetWordFontIndex(FX_WORD word, int32_t charset, int32_t nFontIndex);
+  int32_t GetDefaultFontIndex();
+  FX_BOOL IsLatinWord(FX_WORD word);
 
-    CPVT_WordPlace							AddSection(const CPVT_WordPlace & place, const CPVT_SectionInfo & secinfo);
-    CPVT_WordPlace							AddLine(const CPVT_WordPlace & place, const CPVT_LineInfo & lineinfo);
-    CPVT_WordPlace							AddWord(const CPVT_WordPlace & place, const CPVT_WordInfo & wordinfo);
-    FX_BOOL									GetWordInfo(const CPVT_WordPlace & place, CPVT_WordInfo & wordinfo);
-    FX_BOOL									SetWordInfo(const CPVT_WordPlace & place, const CPVT_WordInfo & wordinfo);
-    FX_BOOL									GetLineInfo(const CPVT_WordPlace & place, CPVT_LineInfo & lineinfo);
-    FX_BOOL									GetSectionInfo(const CPVT_WordPlace & place, CPVT_SectionInfo & secinfo);
-    FX_FLOAT								GetWordFontSize(const CPVT_WordInfo & WordInfo, FX_BOOL bFactFontSize = FALSE);
-    FX_FLOAT								GetWordWidth(int32_t nFontIndex, FX_WORD Word, FX_WORD SubWord,
-            FX_FLOAT fCharSpace, int32_t nHorzScale,
-            FX_FLOAT fFontSize, FX_FLOAT fWordTail, int32_t nWordStyle);
-    FX_FLOAT								GetWordWidth(const CPVT_WordInfo & WordInfo);
-    FX_FLOAT								GetWordAscent(const CPVT_WordInfo & WordInfo, FX_FLOAT fFontSize);
-    FX_FLOAT								GetWordDescent(const CPVT_WordInfo & WordInfo, FX_FLOAT fFontSize);
-    FX_FLOAT								GetWordAscent(const CPVT_WordInfo & WordInfo, FX_BOOL bFactFontSize = FALSE);
-    FX_FLOAT								GetWordDescent(const CPVT_WordInfo & WordInfo, FX_BOOL bFactFontSize = FALSE);
-    FX_FLOAT								GetLineAscent(const CPVT_SectionInfo & SecInfo);
-    FX_FLOAT								GetLineDescent(const CPVT_SectionInfo & SecInfo);
-    FX_FLOAT								GetFontAscent(int32_t nFontIndex, FX_FLOAT fFontSize);
-    FX_FLOAT								GetFontDescent(int32_t nFontIndex, FX_FLOAT fFontSize);
-    int32_t								GetWordFontIndex(const CPVT_WordInfo & WordInfo);
-    FX_FLOAT								GetCharSpace(const CPVT_WordInfo & WordInfo);
-    int32_t								GetHorzScale(const CPVT_WordInfo & WordInfo);
-    FX_FLOAT								GetLineLeading(const CPVT_SectionInfo & SecInfo);
-    FX_FLOAT								GetLineIndent(const CPVT_SectionInfo & SecInfo);
-    int32_t								GetAlignment(const CPVT_SectionInfo& SecInfo);
+ private:
+  CPVT_WordPlace AddSection(const CPVT_WordPlace& place,
+                            const CPVT_SectionInfo& secinfo);
+  CPVT_WordPlace AddLine(const CPVT_WordPlace& place,
+                         const CPVT_LineInfo& lineinfo);
+  CPVT_WordPlace AddWord(const CPVT_WordPlace& place,
+                         const CPVT_WordInfo& wordinfo);
+  FX_BOOL GetWordInfo(const CPVT_WordPlace& place, CPVT_WordInfo& wordinfo);
+  FX_BOOL SetWordInfo(const CPVT_WordPlace& place,
+                      const CPVT_WordInfo& wordinfo);
+  FX_BOOL GetLineInfo(const CPVT_WordPlace& place, CPVT_LineInfo& lineinfo);
+  FX_BOOL GetSectionInfo(const CPVT_WordPlace& place,
+                         CPVT_SectionInfo& secinfo);
+  FX_FLOAT GetWordFontSize(const CPVT_WordInfo& WordInfo,
+                           FX_BOOL bFactFontSize = FALSE);
+  FX_FLOAT GetWordWidth(int32_t nFontIndex,
+                        FX_WORD Word,
+                        FX_WORD SubWord,
+                        FX_FLOAT fCharSpace,
+                        int32_t nHorzScale,
+                        FX_FLOAT fFontSize,
+                        FX_FLOAT fWordTail,
+                        int32_t nWordStyle);
+  FX_FLOAT GetWordWidth(const CPVT_WordInfo& WordInfo);
+  FX_FLOAT GetWordAscent(const CPVT_WordInfo& WordInfo, FX_FLOAT fFontSize);
+  FX_FLOAT GetWordDescent(const CPVT_WordInfo& WordInfo, FX_FLOAT fFontSize);
+  FX_FLOAT GetWordAscent(const CPVT_WordInfo& WordInfo,
+                         FX_BOOL bFactFontSize = FALSE);
+  FX_FLOAT GetWordDescent(const CPVT_WordInfo& WordInfo,
+                          FX_BOOL bFactFontSize = FALSE);
+  FX_FLOAT GetLineAscent(const CPVT_SectionInfo& SecInfo);
+  FX_FLOAT GetLineDescent(const CPVT_SectionInfo& SecInfo);
+  FX_FLOAT GetFontAscent(int32_t nFontIndex, FX_FLOAT fFontSize);
+  FX_FLOAT GetFontDescent(int32_t nFontIndex, FX_FLOAT fFontSize);
+  int32_t GetWordFontIndex(const CPVT_WordInfo& WordInfo);
+  FX_FLOAT GetCharSpace(const CPVT_WordInfo& WordInfo);
+  int32_t GetHorzScale(const CPVT_WordInfo& WordInfo);
+  FX_FLOAT GetLineLeading(const CPVT_SectionInfo& SecInfo);
+  FX_FLOAT GetLineIndent(const CPVT_SectionInfo& SecInfo);
+  int32_t GetAlignment(const CPVT_SectionInfo& SecInfo);
 
-    void									ClearSectionRightWords(const CPVT_WordPlace & place);
-    CPVT_WordPlace							AjustLineHeader(const CPVT_WordPlace & place, FX_BOOL bPrevOrNext) const;
-    FX_BOOL									ClearEmptySection(const CPVT_WordPlace & place);
-    void									ClearEmptySections(const CPVT_WordRange & PlaceRange);
-    void									LinkLatterSection(const CPVT_WordPlace & place);
-    void									ClearWords(const CPVT_WordRange & PlaceRange);
-    CPVT_WordPlace							ClearLeftWord(const CPVT_WordPlace & place);
-    CPVT_WordPlace							ClearRightWord(const CPVT_WordPlace & place);
-private:
-    CPVT_FloatRect							Rearrange(const CPVT_WordRange & PlaceRange);
-    FX_FLOAT								GetAutoFontSize();
-    FX_BOOL									IsBigger(FX_FLOAT fFontSize);
-    CPVT_FloatRect							RearrangeSections(const CPVT_WordRange & PlaceRange);
-private:
-    void									ResetSectionArray();
-private:
-    CPVT_ArrayTemplate<CSection*>			m_SectionArray;
-    int32_t								m_nLimitChar;
-    int32_t								m_nCharArray;
-    FX_BOOL									m_bMultiLine;
-    FX_BOOL									m_bLimitWidth;
-    FX_BOOL									m_bAutoFontSize;
-    int32_t								m_nAlignment;
-    FX_FLOAT								m_fLineLeading;
-    FX_FLOAT								m_fCharSpace;
-    int32_t								m_nHorzScale;
-    FX_WORD									m_wSubWord;
-    FX_FLOAT								m_fFontSize;
+  void ClearSectionRightWords(const CPVT_WordPlace& place);
+  CPVT_WordPlace AjustLineHeader(const CPVT_WordPlace& place,
+                                 FX_BOOL bPrevOrNext) const;
+  FX_BOOL ClearEmptySection(const CPVT_WordPlace& place);
+  void ClearEmptySections(const CPVT_WordRange& PlaceRange);
+  void LinkLatterSection(const CPVT_WordPlace& place);
+  void ClearWords(const CPVT_WordRange& PlaceRange);
+  CPVT_WordPlace ClearLeftWord(const CPVT_WordPlace& place);
+  CPVT_WordPlace ClearRightWord(const CPVT_WordPlace& place);
 
-private:
-    FX_BOOL									m_bInitial;
-    FX_BOOL									m_bRichText;
-    IPDF_VariableText_Provider *			m_pVTProvider;
-    CPDF_VariableText_Iterator *			m_pVTIterator;
+ private:
+  CPVT_FloatRect Rearrange(const CPVT_WordRange& PlaceRange);
+  FX_FLOAT GetAutoFontSize();
+  FX_BOOL IsBigger(FX_FLOAT fFontSize);
+  CPVT_FloatRect RearrangeSections(const CPVT_WordRange& PlaceRange);
+
+ private:
+  void ResetSectionArray();
+
+ private:
+  CPVT_ArrayTemplate<CSection*> m_SectionArray;
+  int32_t m_nLimitChar;
+  int32_t m_nCharArray;
+  FX_BOOL m_bMultiLine;
+  FX_BOOL m_bLimitWidth;
+  FX_BOOL m_bAutoFontSize;
+  int32_t m_nAlignment;
+  FX_FLOAT m_fLineLeading;
+  FX_FLOAT m_fCharSpace;
+  int32_t m_nHorzScale;
+  FX_WORD m_wSubWord;
+  FX_FLOAT m_fFontSize;
+
+ private:
+  FX_BOOL m_bInitial;
+  FX_BOOL m_bRichText;
+  IPDF_VariableText_Provider* m_pVTProvider;
+  CPDF_VariableText_Iterator* m_pVTIterator;
 };
-class CPDF_VariableText_Iterator : public IPDF_VariableText_Iterator
-{
-public:
-    CPDF_VariableText_Iterator(CPDF_VariableText * pVT);
-    virtual ~CPDF_VariableText_Iterator();
-    FX_BOOL									NextWord();
-    FX_BOOL									PrevWord();
-    FX_BOOL									NextLine();
-    FX_BOOL									PrevLine();
-    FX_BOOL									NextSection();
-    FX_BOOL									PrevSection();
-    FX_BOOL									SetWord(const CPVT_Word & word);
-    FX_BOOL									GetWord(CPVT_Word & word) const;
-    FX_BOOL									GetLine(CPVT_Line & line) const;
-    FX_BOOL									GetSection(CPVT_Section & section) const;
-    FX_BOOL									SetSection(const CPVT_Section & section);
-    void									SetAt(int32_t nWordIndex);
-    void									SetAt(const CPVT_WordPlace & place);
-    const CPVT_WordPlace &					GetAt() const
-    {
-        return m_CurPos;
-    };
-private:
-    CPVT_WordPlace							m_CurPos;
-    CPDF_VariableText *						m_pVT;
+class CPDF_VariableText_Iterator : public IPDF_VariableText_Iterator {
+ public:
+  CPDF_VariableText_Iterator(CPDF_VariableText* pVT);
+  virtual ~CPDF_VariableText_Iterator();
+  FX_BOOL NextWord();
+  FX_BOOL PrevWord();
+  FX_BOOL NextLine();
+  FX_BOOL PrevLine();
+  FX_BOOL NextSection();
+  FX_BOOL PrevSection();
+  FX_BOOL SetWord(const CPVT_Word& word);
+  FX_BOOL GetWord(CPVT_Word& word) const;
+  FX_BOOL GetLine(CPVT_Line& line) const;
+  FX_BOOL GetSection(CPVT_Section& section) const;
+  FX_BOOL SetSection(const CPVT_Section& section);
+  void SetAt(int32_t nWordIndex);
+  void SetAt(const CPVT_WordPlace& place);
+  const CPVT_WordPlace& GetAt() const { return m_CurPos; };
+
+ private:
+  CPVT_WordPlace m_CurPos;
+  CPDF_VariableText* m_pVT;
 };
 
 #endif  // CORE_SRC_FPDFDOC_PDF_VT_H_
diff --git a/core/src/fpdfdoc/tagged_int.h b/core/src/fpdfdoc/tagged_int.h
index 9c643a6d6b..7cf368083c 100644
--- a/core/src/fpdfdoc/tagged_int.h
+++ b/core/src/fpdfdoc/tagged_int.h
@@ -10,86 +10,90 @@
 #include "../../include/fpdfdoc/fpdf_tagged.h"
 
 class CPDF_StructElementImpl;
-class CPDF_StructTreeImpl : public CPDF_StructTree
-{
-public:
-    CPDF_StructTreeImpl(const CPDF_Document* pDoc);
-    ~CPDF_StructTreeImpl();
-    int			CountTopElements() const
-    {
-        return m_Kids.GetSize();
-    }
-    CPDF_StructElement*	GetTopElement(int i) const
-    {
-        return (CPDF_StructElement*)m_Kids.GetAt(i);
-    }
-    void		LoadDocTree();
-    void		LoadPageTree(const CPDF_Dictionary* pPageDict);
-    CPDF_StructElementImpl* AddPageNode(CPDF_Dictionary* pElement, CFX_MapPtrToPtr& map, int nLevel = 0);
-    FX_BOOL		AddTopLevelNode(CPDF_Dictionary* pDict, CPDF_StructElementImpl* pElement);
-protected:
-    const CPDF_Dictionary*	m_pTreeRoot;
-    const CPDF_Dictionary*	m_pRoleMap;
-    const CPDF_Dictionary*	m_pPage;
-    CFX_ArrayTemplate<CPDF_StructElementImpl*>	m_Kids;
-    friend class CPDF_StructElementImpl;
+class CPDF_StructTreeImpl : public CPDF_StructTree {
+ public:
+  CPDF_StructTreeImpl(const CPDF_Document* pDoc);
+  ~CPDF_StructTreeImpl();
+  int CountTopElements() const { return m_Kids.GetSize(); }
+  CPDF_StructElement* GetTopElement(int i) const {
+    return (CPDF_StructElement*)m_Kids.GetAt(i);
+  }
+  void LoadDocTree();
+  void LoadPageTree(const CPDF_Dictionary* pPageDict);
+  CPDF_StructElementImpl* AddPageNode(CPDF_Dictionary* pElement,
+                                      CFX_MapPtrToPtr& map,
+                                      int nLevel = 0);
+  FX_BOOL AddTopLevelNode(CPDF_Dictionary* pDict,
+                          CPDF_StructElementImpl* pElement);
+
+ protected:
+  const CPDF_Dictionary* m_pTreeRoot;
+  const CPDF_Dictionary* m_pRoleMap;
+  const CPDF_Dictionary* m_pPage;
+  CFX_ArrayTemplate<CPDF_StructElementImpl*> m_Kids;
+  friend class CPDF_StructElementImpl;
 };
-class CPDF_StructElementImpl final : public CPDF_StructElement
-{
-public:
-    CPDF_StructElementImpl(CPDF_StructTreeImpl* pTree, CPDF_StructElementImpl* pParent, CPDF_Dictionary* pDict);
-    CPDF_StructTree*		GetTree() const
-    {
-        return m_pTree;
-    }
-    const CFX_ByteString&	GetType() const
-    {
-        return m_Type;
-    }
-    CPDF_StructElement*		GetParent() const
-    {
-        return m_pParent;
-    }
-    CPDF_Dictionary *		GetDict() const
-    {
-        return m_pDict;
-    }
-    int						CountKids() const
-    {
-        return m_Kids.GetSize();
-    }
-    const CPDF_StructKid&	GetKid(int index) const
-    {
-        return m_Kids.GetData()[index];
-    }
-    CFX_PtrArray*			GetObjectArray()
-    {
-        return &m_ObjectArray;
-    }
+class CPDF_StructElementImpl final : public CPDF_StructElement {
+ public:
+  CPDF_StructElementImpl(CPDF_StructTreeImpl* pTree,
+                         CPDF_StructElementImpl* pParent,
+                         CPDF_Dictionary* pDict);
+  CPDF_StructTree* GetTree() const { return m_pTree; }
+  const CFX_ByteString& GetType() const { return m_Type; }
+  CPDF_StructElement* GetParent() const { return m_pParent; }
+  CPDF_Dictionary* GetDict() const { return m_pDict; }
+  int CountKids() const { return m_Kids.GetSize(); }
+  const CPDF_StructKid& GetKid(int index) const {
+    return m_Kids.GetData()[index];
+  }
+  CFX_PtrArray* GetObjectArray() { return &m_ObjectArray; }
+
+  CPDF_Object* GetAttr(const CFX_ByteStringC& owner,
+                       const CFX_ByteStringC& name,
+                       FX_BOOL bInheritable = FALSE,
+                       FX_FLOAT fLevel = 0.0F);
 
-    CPDF_Object*			GetAttr(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_BOOL bInheritable = FALSE, FX_FLOAT fLevel = 0.0F);
+  CFX_ByteString GetName(const CFX_ByteStringC& owner,
+                         const CFX_ByteStringC& name,
+                         const CFX_ByteStringC& default_value,
+                         FX_BOOL bInheritable = FALSE,
+                         int subindex = -1);
+  FX_ARGB GetColor(const CFX_ByteStringC& owner,
+                   const CFX_ByteStringC& name,
+                   FX_ARGB default_value,
+                   FX_BOOL bInheritable = FALSE,
+                   int subindex = -1);
+  FX_FLOAT GetNumber(const CFX_ByteStringC& owner,
+                     const CFX_ByteStringC& name,
+                     FX_FLOAT default_value,
+                     FX_BOOL bInheritable = FALSE,
+                     int subindex = -1);
+  int GetInteger(const CFX_ByteStringC& owner,
+                 const CFX_ByteStringC& name,
+                 int default_value,
+                 FX_BOOL bInheritable = FALSE,
+                 int subindex = -1);
+  CFX_PtrArray m_ObjectArray;
+  void LoadKids(CPDF_Dictionary* pDict);
+  void LoadKid(FX_DWORD PageObjNum, CPDF_Object* pObj, CPDF_StructKid* pKid);
+  CPDF_Object* GetAttr(const CFX_ByteStringC& owner,
+                       const CFX_ByteStringC& name,
+                       FX_BOOL bInheritable,
+                       int subindex);
+  CPDF_StructElementImpl* Retain();
+  void Release();
 
-    CFX_ByteString			GetName(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, const CFX_ByteStringC& default_value, FX_BOOL bInheritable = FALSE, int subindex = -1);
-    FX_ARGB					GetColor(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_ARGB default_value, FX_BOOL bInheritable = FALSE, int subindex = -1);
-    FX_FLOAT				GetNumber(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_FLOAT default_value, FX_BOOL bInheritable = FALSE, int subindex = -1);
-    int						GetInteger(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, int default_value, FX_BOOL bInheritable = FALSE, int subindex = -1);
-    CFX_PtrArray			m_ObjectArray;
-    void					LoadKids(CPDF_Dictionary* pDict);
-    void					LoadKid(FX_DWORD PageObjNum, CPDF_Object* pObj, CPDF_StructKid* pKid);
-    CPDF_Object*			GetAttr(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_BOOL bInheritable, int subindex);
-    CPDF_StructElementImpl*	Retain();
-    void					Release();
-protected:
-    ~CPDF_StructElementImpl();
+ protected:
+  ~CPDF_StructElementImpl();
 
-    CPDF_StructTreeImpl*	m_pTree;
-    CFX_ByteString			m_Type;
-    CPDF_StructElementImpl*	m_pParent;
-    CPDF_Dictionary*		m_pDict;
-    CFX_ArrayTemplate<CPDF_StructKid>	m_Kids;
-    int			m_RefCount;
+  CPDF_StructTreeImpl* m_pTree;
+  CFX_ByteString m_Type;
+  CPDF_StructElementImpl* m_pParent;
+  CPDF_Dictionary* m_pDict;
+  CFX_ArrayTemplate<CPDF_StructKid> m_Kids;
+  int m_RefCount;
 
-    friend class CPDF_StructTreeImpl;
+  friend class CPDF_StructTreeImpl;
 };
 
 #endif  // CORE_SRC_FPDFDOC_TAGGED_INT_H_
author	Nico Weber <thakis@chromium.org>	2015-08-04 12:19:10 -0700
committer	Nico Weber <thakis@chromium.org>	2015-08-04 12:19:10 -0700
commit	b048f791a15f2da781a01eba5b09eb9d389f9c11 (patch)
tree	6850a73c18bbc41eaf4b1fdc6b3c96646d45587b /core/src/fpdfdoc
parent	c8eeed31f217d99a706b0cbf5e4ce0bcc12beb64 (diff)
download	pdfium-b048f791a15f2da781a01eba5b09eb9d389f9c11.tar.xz