Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
src/html/helpdata.cpp
View File

@@ -22,7 +22,7 @@
#include "wx/defs.h"
#if wxUSE_HTML
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
#include "wx/wx.h"
@@ -148,7 +148,122 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
return TRUE;
}
else { // "PARAM"
if (m_Name == wxEmptyString && tag.GetParam(wxT("NAME")) == wxT("Name")) m_Name = tag.GetParam(wxT("VALUE"));
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", "<EFBFBD>"),
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", "<EFBFBD>"),
ESCSEQ("Acirc", "<EFBFBD>"),
ESCSEQ("Atilde", "<EFBFBD>"),
ESCSEQ("Auml", "<EFBFBD>"),
ESCSEQ("Aring", " "),
ESCSEQ("AElig", " "),
ESCSEQ("Ccedil", "<EFBFBD>"),
ESCSEQ("Egrave", "<EFBFBD>"),
ESCSEQ("Eacute", "<EFBFBD>"),
ESCSEQ("Ecirc", "<EFBFBD>"),
ESCSEQ("Euml", "<EFBFBD>"),
ESCSEQ("Igrave", "<EFBFBD>"),
ESCSEQ("Icirc", "<EFBFBD>"),
ESCSEQ("Iuml", "<EFBFBD>"),
ESCSEQ("Ntilde", "<EFBFBD>"),
ESCSEQ("Ograve", "<EFBFBD>"),
ESCSEQ("Ocirc", "<EFBFBD>"),
ESCSEQ("Otilde", "<EFBFBD>"),
ESCSEQ("Ouml", "<EFBFBD>"),
ESCSEQ("Oslash", " "),
ESCSEQ("Ugrave", "<EFBFBD>"),
ESCSEQ("Ucirc", " "),
ESCSEQ("Uuml", "<EFBFBD>"),
ESCSEQ("szlig", "<EFBFBD>"),
ESCSEQ("agrave;","<EFBFBD>"),
ESCSEQ("aacute", "<EFBFBD>"),
ESCSEQ("acirc", "<EFBFBD>"),
ESCSEQ("atilde", "<EFBFBD>"),
ESCSEQ("auml", "<EFBFBD>"),
ESCSEQ("aring", "a"),
ESCSEQ("aelig", "ae"),
ESCSEQ("ccedil", "<EFBFBD>"),
ESCSEQ("egrave", "<EFBFBD>"),
ESCSEQ("eacute", "<EFBFBD>"),
ESCSEQ("ecirc", "<EFBFBD>"),
ESCSEQ("euml", "<EFBFBD>"),
ESCSEQ("igrave", "<EFBFBD>"),
ESCSEQ("iacute", "<EFBFBD>"),
ESCSEQ("icirc", " "),
ESCSEQ("iuml", "<EFBFBD>"),
ESCSEQ("eth", " "),
ESCSEQ("ntilde", "<EFBFBD>"),
ESCSEQ("ograve", "<EFBFBD>"),
ESCSEQ("oacute", "<EFBFBD>"),
ESCSEQ("ocirc", "<EFBFBD>"),
ESCSEQ("otilde", "<EFBFBD>"),
ESCSEQ("ouml", "<EFBFBD>"),
ESCSEQ("divide", " "),
ESCSEQ("oslash", " "),
ESCSEQ("ugrave", "<EFBFBD>"),
ESCSEQ("uacute", "<EFBFBD>"),
ESCSEQ("ucirc", "<EFBFBD>"),
ESCSEQ("uuml", "<EFBFBD>"),
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);
return FALSE;
@@ -235,7 +350,7 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c
delete[] buf;
}
else
wxLogError(_("Cannot open contents file: %s"), contentsfile.mb_str());
wxLogError(_("Cannot open contents file: %s"), contentsfile.c_str());
f = ( indexfile.IsEmpty() ? (wxFSFile*) NULL : fsys.OpenFile(indexfile) );
if (f) {
@@ -250,7 +365,7 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c
delete[] buf;
}
else if (!indexfile.IsEmpty())
wxLogError(_("Cannot open index file: %s"), indexfile.mb_str());
wxLogError(_("Cannot open index file: %s"), indexfile.c_str());
return TRUE;
}
@@ -538,10 +653,10 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
fi = fsys.OpenFile(bookFull);
if (fi == NULL)
{
wxLogError(_("Cannot open HTML help book: %s"), bookFull.mb_str());
return FALSE;
}
{
wxLogError(_("Cannot open HTML help book: %s"), bookFull.c_str());
return FALSE;
}
fsys.ChangePathTo(bookFull);
s = fi -> GetStream();
sz = s -> GetSize();