X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93f30ee67a6111aceefdea7bb78b8eb3d26740fd..5adad46628e545a6d4172ecf3a0cb848934f5cd0:/src/html/helpdata.cpp?ds=sidebyside diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp index c0e111ba76..6d5d92ea0a 100644 --- a/src/html/helpdata.cpp +++ b/src/html/helpdata.cpp @@ -117,10 +117,9 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag) m_Name = m_Page = wxEmptyString; ParseInner(tag); - if (!m_Page.IsEmpty()) - /* should be 'if (tag.GetParam("TYPE") == "text/sitemap")' - but this works fine. Valid HHW's file may contain only two - object tags: +#if 0 + if (!m_Page.IsEmpty()) + /* Valid HHW's file may contain only two object tags: @@ -136,9 +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")) { if (m_ItemsCnt % wxHTML_REALLOC_STEP == 0) - m_Items = (wxHtmlContentsItem*) realloc(m_Items, (m_ItemsCnt + wxHTML_REALLOC_STEP) * sizeof(wxHtmlContentsItem)); + 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]; @@ -153,124 +157,12 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag) } else { // "PARAM" - if (m_Name == wxEmptyString && tag.GetParam(wxT("NAME")) == wxT("Name")) - { + if (m_Name == wxEmptyString && tag.GetParam(wxT("NAME")) == wxT("Name")) m_Name = tag.GetParam(wxT("VALUE")); - if (m_Name.Find(wxT('&')) != -1) - { - #define ESCSEQ(escape, subst) \ - { _T("&") _T(escape) _T(";"), _T("&") _T(escape) _T(" "), _T(subst) } - static wxChar* substitutions[][3] = - { - ESCSEQ("quot", "\""), - ESCSEQ("lt", "<"), - ESCSEQ("gt", ">"), - - ESCSEQ("nbsp", " "), - ESCSEQ("iexcl", "!"), - ESCSEQ("cent", "\242"/* ¢ */), - - ESCSEQ("yen", " "), - ESCSEQ("brkbar", " "), - ESCSEQ("sect", " "), - ESCSEQ("uml", " "), - - ESCSEQ("copy", "(c)"), - ESCSEQ("ordf", " "), - ESCSEQ("laquo", " "), - ESCSEQ("not", " "), - - ESCSEQ("reg", "(r)"), - - ESCSEQ("deg", " "), - ESCSEQ("plusm", " "), - - ESCSEQ("acute", " "), - ESCSEQ("micro", " "), - ESCSEQ("para", " "), - - ESCSEQ("ordm", " "), - ESCSEQ("raquo", " "), - - ESCSEQ("iquest", " "), - ESCSEQ("Agrave", "\300"/* À */), - - ESCSEQ("Acirc", "\302"/* Â */), - ESCSEQ("Atilde", "\303"/* Ã */), - ESCSEQ("Auml", "\304"/* Ä */), - ESCSEQ("Aring", " "), - ESCSEQ("AElig", " "), - ESCSEQ("Ccedil", "\347"/* ç */), - ESCSEQ("Egrave", "\310"/* È */), - ESCSEQ("Eacute", "\311"/* É */), - ESCSEQ("Ecirc", "\312"/* Ê */), - ESCSEQ("Euml", "\313"/* Ë */), - ESCSEQ("Igrave", "\314"/* Ì */), - - ESCSEQ("Icirc", "\316"/* Î */), - ESCSEQ("Iuml", "\317"/* Ï */), - - ESCSEQ("Ntilde", "\321"/* Ñ */), - ESCSEQ("Ograve", "\322"/* Ò */), - - ESCSEQ("Ocirc", "\324"/* Ô */), - ESCSEQ("Otilde", "\325"/* Õ */), - ESCSEQ("Ouml", "\326"/* Ö */), - - ESCSEQ("Oslash", " "), - ESCSEQ("Ugrave", "\331"/* Ù */), - - ESCSEQ("Ucirc", " "), - ESCSEQ("Uuml", "\334"/* Ü */), - - ESCSEQ("szlig", "\247"/* § */), - ESCSEQ("agrave;","à"), - ESCSEQ("aacute", "\341"/* á */), - ESCSEQ("acirc", "\342"/* â */), - ESCSEQ("atilde", "\343"/* ã */), - ESCSEQ("auml", "\344"/* ä */), - ESCSEQ("aring", "a"), - ESCSEQ("aelig", "ae"), - ESCSEQ("ccedil", "\347"/* ç */), - ESCSEQ("egrave", "\350"/* è */), - ESCSEQ("eacute", "\351"/* é */), - ESCSEQ("ecirc", "\352"/* ê */), - ESCSEQ("euml", "\353"/* ë */), - ESCSEQ("igrave", "\354"/* ì */), - ESCSEQ("iacute", "\355"/* í */), - ESCSEQ("icirc", " "), - ESCSEQ("iuml", "\357"/* ï */), - ESCSEQ("eth", " "), - ESCSEQ("ntilde", "\361"/* ñ */), - ESCSEQ("ograve", "\362"/* ò */), - ESCSEQ("oacute", "\363"/* ó */), - ESCSEQ("ocirc", "\364"/* ô */), - ESCSEQ("otilde", "\365"/* õ */), - ESCSEQ("ouml", "\366"/* ö */), - ESCSEQ("divide", " "), - ESCSEQ("oslash", " "), - ESCSEQ("ugrave", "\371"/* ù */), - ESCSEQ("uacute", "\372"/* ú */), - ESCSEQ("ucirc", "\373"/* û */), - ESCSEQ("uuml", "\374"/* ü */), - - ESCSEQ("yuml", ""), - - /* this one should ALWAYS stay the last one!!! */ - ESCSEQ("amp", "&"), - - { NULL, NULL, NULL } - }; - - for (int i = 0; substitutions[i][0] != NULL; i++) - { - m_Name.Replace(substitutions[i][0], substitutions[i][2], TRUE); - m_Name.Replace(substitutions[i][1], substitutions[i][2], TRUE); - } - } - } - if (tag.GetParam(wxT("NAME")) == wxT("Local")) m_Page = tag.GetParam(wxT("VALUE")); - if (tag.GetParam(wxT("NAME")) == wxT("ID")) tag.ScanParam(wxT("VALUE"), wxT("%i"), &m_ID); + if (tag.GetParam(wxT("NAME")) == wxT("Local")) + m_Page = tag.GetParam(wxT("VALUE")); + if (tag.GetParam(wxT("NAME")) == wxT("ID")) + tag.GetParamAsInt(wxT("VALUE"), &m_ID); return FALSE; } } @@ -298,6 +190,16 @@ void HP_TagHandler::ReadIn(wxHtmlContentsItem* array, int size) // wxHtmlHelpData //----------------------------------------------------------------------------- +wxString wxHtmlBookRecord::GetFullPath(const wxString &page) const +{ + if (wxIsAbsolutePath(page)) + return page; + else + return m_BasePath + page; +} + + + IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpData, wxObject) wxHtmlHelpData::wxHtmlHelpData() @@ -720,10 +622,10 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x) cnt = m_BookRecords.GetCount(); for (i = 0; i < cnt; i++) { - f = fsys.OpenFile(m_BookRecords[i].GetBasePath() + x); + f = fsys.OpenFile(m_BookRecords[i].GetFullPath(x)); if (f) { - url = m_BookRecords[i].GetBasePath() + x; + url = m_BookRecords[i].GetFullPath(x); delete f; return url; } @@ -736,7 +638,7 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x) { if (m_BookRecords[i].GetTitle() == x) { - url = m_BookRecords[i].GetBasePath() + m_BookRecords[i].GetStart(); + url = m_BookRecords[i].GetFullPath(m_BookRecords[i].GetStart()); return url; } } @@ -748,7 +650,7 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x) { if (wxStrcmp(m_Contents[i].m_Name, x) == 0) { - url = m_Contents[i].m_Book->GetBasePath() + m_Contents[i].m_Page; + url = m_Contents[i].GetFullPath(); return url; } } @@ -761,7 +663,7 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x) { if (wxStrcmp(m_Index[i].m_Name, x) == 0) { - url = m_Index[i].m_Book->GetBasePath() + m_Index[i].m_Page; + url = m_Index[i].GetFullPath(); return url; } } @@ -778,7 +680,7 @@ wxString wxHtmlHelpData::FindPageById(int id) { if (m_Contents[i].m_ID == id) { - url = m_Contents[i].m_Book->GetBasePath() + m_Contents[i].m_Page; + url = m_Contents[i].GetFullPath(); return url; } } @@ -857,10 +759,11 @@ bool wxHtmlSearchStatus::Search() else m_LastPage = thepage; wxFileSystem fsys; - file = fsys.OpenFile(m_Data->m_Contents[i].m_Book->GetBasePath() + thepage); + file = fsys.OpenFile(m_Data->m_Contents[i].m_Book->GetFullPath(thepage)); if (file) { - if (m_Engine.Scan(file->GetStream())) { + if (m_Engine.Scan(file->GetStream())) + { m_Name = m_Data->m_Contents[i].m_Name; m_ContentsItem = m_Data->m_Contents + i; found = TRUE; @@ -946,5 +849,4 @@ bool wxSearchEngine::Scan(wxInputStream *stream) - #endif