X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/468ae730db4954d31f5b30d09bd0301333f2f45b..70050c82fe8114fc5d86591035e71751bac21cc6:/src/html/helpdata.cpp?ds=inline

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index e4a0adbdce..76e7264ae8 100644
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -91,12 +91,11 @@ class HP_TagHandler : public wxHtmlTagHandler
         wxHtmlContentsItem *m_Items;
         int m_ItemsCnt;
         wxHtmlBookRecord *m_Book;
-        bool m_firstTime; // For checking if we're adding sections at level zero, so we 'delete' the first one
 
     public:
         HP_TagHandler(wxHtmlBookRecord *b) : wxHtmlTagHandler() 
 	        { m_Book = b; m_Items = NULL; m_ItemsCnt = 0; m_Name = m_Page = wxEmptyString; 
-		      m_Level = 0; m_ID = -1; m_firstTime = TRUE; }
+		      m_Level = 0; m_ID = -1; }
         wxString GetSupportedTags() { return wxT("UL,OBJECT,PARAM"); }
         bool HandleTag(const wxHtmlTag& tag);
         void WriteOut(wxHtmlContentsItem*& array, int& size);
@@ -118,9 +117,8 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
         m_Name = m_Page = wxEmptyString;
         ParseInner(tag);
 
-        if (tag.GetParam("TYPE") == "text/sitemap")
-
-        // if (!m_Page.IsEmpty())
+#if 0
+         if (!m_Page.IsEmpty())
         /* Valid HHW's file may contain only two object tags:
            
            <OBJECT type="text/site properties">
@@ -137,19 +135,14 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
            We're interested in the latter. !m_Page.IsEmpty() is valid
            condition because text/site properties does not contain Local param
         */
+#endif
+        if (tag.GetParam(wxT("TYPE")) == wxT("text/sitemap"))
         {
-            // We're reading in items at level zero, which must mean we want to specify
-            // our own 'books', so chuck out the first (empty) one that AddBook already
-            // created
-            if (m_firstTime && (m_Level == 0) && (m_ItemsCnt > 0))
-            {
-                m_ItemsCnt --;
-            }
-            else
-            {
-                if (m_ItemsCnt % wxHTML_REALLOC_STEP == 0)
-                    m_Items = (wxHtmlContentsItem*) realloc(m_Items, (m_ItemsCnt + wxHTML_REALLOC_STEP) * sizeof(wxHtmlContentsItem));
-            }
+            if (m_ItemsCnt % wxHTML_REALLOC_STEP == 0)
+                m_Items = (wxHtmlContentsItem*) realloc(m_Items, 
+                                       (m_ItemsCnt + wxHTML_REALLOC_STEP) * 
+                                       sizeof(wxHtmlContentsItem));
+
             m_Items[m_ItemsCnt].m_Level = m_Level;
             m_Items[m_ItemsCnt].m_ID = m_ID;
             m_Items[m_ItemsCnt].m_Page = new wxChar[m_Page.Length() + 1];
@@ -158,8 +151,6 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
             wxStrcpy(m_Items[m_ItemsCnt].m_Name, m_Name.c_str());
             m_Items[m_ItemsCnt].m_Book = m_Book;
             m_ItemsCnt++;
-
-            m_firstTime = FALSE;
         }
 
         return TRUE;
@@ -177,6 +168,8 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
                         {
                 ESCSEQ("quot", "\""),
                 ESCSEQ("#34", "\""),
+                ESCSEQ("#8220", "\""),
+                ESCSEQ("#8221", "\""),
                 ESCSEQ("lt", "<"),
                 ESCSEQ("#60", "<"),
                 ESCSEQ("gt", ">"),
@@ -193,6 +186,7 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
     
                 ESCSEQ("trade", "(TM)"),
                 ESCSEQ("#153", "(TM)"),
+                ESCSEQ("#8482", "(TM)"),
 
                 ESCSEQ("yen", "¥"),
                 ESCSEQ("#165", "¥"),
@@ -268,7 +262,7 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
                 ESCSEQ("Uuml", "\334"/* Ü */),
     
                 ESCSEQ("szlig", "\247"/* § */),
-                ESCSEQ("agrave;","à"),
+                ESCSEQ("agrave","\340"/* à */),
                 ESCSEQ("aacute", "\341"/* á */),
                 ESCSEQ("acirc", "\342"/* â */),
                 ESCSEQ("atilde", "\343"/* ã */),