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

Added support for more special characters

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-04-23 14:55:37 +00:00
parent eba0e3477b
commit 0bbfe845ed
2 changed files with 193 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

234
src/html/helpdata.cpp
View File

@@ -171,114 +171,150 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
m_Name = tag.GetParam(wxT("VALUE")); m_Name = tag.GetParam(wxT("VALUE"));
if (m_Name.Find(wxT('&')) != -1) if (m_Name.Find(wxT('&')) != -1)
{ {
#define ESCSEQ(escape, subst) \ #define ESCSEQ(escape, subst) \
{ _T("&") _T(escape) _T(";"), _T("&") _T(escape) _T(" "), _T(subst) } { _T("&") _T(escape) _T(";"), _T("&") _T(escape) _T(" "), _T("&") _T(escape), _T(subst) }
static wxChar* substitutions[][3] = static wxChar* substitutions[][4] =
{ {
ESCSEQ("quot", "\""), ESCSEQ("quot", "\""),
ESCSEQ("lt", "<"), ESCSEQ("#34", "\""),
ESCSEQ("gt", ">"), ESCSEQ("lt", "<"),
ESCSEQ("#60", "<"),
ESCSEQ("gt", ">"),
ESCSEQ("#62", ">"),
ESCSEQ("nbsp", " "), ESCSEQ("#94", "^"), /* ^ */
ESCSEQ("iexcl", "!"),
ESCSEQ("cent", "\242"/* <20> */), ESCSEQ("nbsp", " "),
ESCSEQ("#32", " "),
ESCSEQ("iexcl", "!"),
ESCSEQ("#33", "!"),
ESCSEQ("cent", "<EFBFBD>"/* <20> */),
ESCSEQ("#162", "<EFBFBD>"/* <20> */),
ESCSEQ("trade", "(TM)"),
ESCSEQ("#153", "(TM)"),
ESCSEQ("yen", " "), ESCSEQ("yen", "<EFBFBD>"),
ESCSEQ("brkbar", " "), ESCSEQ("#165", "<EFBFBD>"),
ESCSEQ("sect", " "), ESCSEQ("brkbar", "<EFBFBD>"),
ESCSEQ("uml", " "), ESCSEQ("#166", "<EFBFBD>"),
ESCSEQ("sect", "<EFBFBD>"),
ESCSEQ("#167", "<EFBFBD>"),
ESCSEQ("uml", "<EFBFBD>"),
ESCSEQ("#168", "<EFBFBD>"),
ESCSEQ("copy", "<EFBFBD>"), /* <20> */
ESCSEQ("#169", "<EFBFBD>"),
ESCSEQ("ordf", "<EFBFBD>"),
ESCSEQ("#170", "<EFBFBD>"),
ESCSEQ("laquo", "<EFBFBD>"), /* <20> */
ESCSEQ("#171", "<EFBFBD>"),
ESCSEQ("not", "<EFBFBD>"),
ESCSEQ("#172", "<EFBFBD>"),
ESCSEQ("reg", "<EFBFBD>"), /* <20> */
ESCSEQ("#174", "<EFBFBD>"),
ESCSEQ("deg", "<EFBFBD>"), /* <20> */
ESCSEQ("#176", "<EFBFBD>"),
ESCSEQ("plusm", "<EFBFBD>"), /* <20> */
ESCSEQ("#177", "<EFBFBD>"),
ESCSEQ("acute", "<EFBFBD>"),
ESCSEQ("#180", "<EFBFBD>"),
ESCSEQ("macron", "<EFBFBD>"),
ESCSEQ("#175", "<EFBFBD>"),
ESCSEQ("micro", "<EFBFBD>"), /* <20> */
ESCSEQ("#181", "<EFBFBD>"),
ESCSEQ("para", "<EFBFBD>"), /* <20> */
ESCSEQ("#182", "<EFBFBD>"),
ESCSEQ("ordm", "<EFBFBD>"), /* <20> */
ESCSEQ("#186", "<EFBFBD>"),
ESCSEQ("raquo", "<EFBFBD>"), /* <20> */
ESCSEQ("#187", "<EFBFBD>"),
ESCSEQ("iquest", "<EFBFBD>"), /* <20> */
ESCSEQ("#191", "<EFBFBD>"),
ESCSEQ("Agrave", "\300"/* <20> */),
ESCSEQ("#193", "\300"/* <20> */),
ESCSEQ("Acirc", "\302"/* <20> */),
ESCSEQ("Atilde", "\303"/* <20> */),
ESCSEQ("Auml", "\304"/* <20> */),
ESCSEQ("Aring", " "),
ESCSEQ("AElig", " "),
ESCSEQ("Ccedil", "\347"/* <20> */),
ESCSEQ("Egrave", "\310"/* <20> */),
ESCSEQ("Eacute", "\311"/* <20> */),
ESCSEQ("Ecirc", "\312"/* <20> */),
ESCSEQ("Euml", "\313"/* <20> */),
ESCSEQ("Igrave", "\314"/* <20> */),
ESCSEQ("copy", "(c)"), ESCSEQ("Icirc", "\316"/* <20> */),
ESCSEQ("ordf", " "), ESCSEQ("Iuml", "\317"/* <20> */),
ESCSEQ("laquo", " "),
ESCSEQ("not", " "), ESCSEQ("Ntilde", "\321"/* <20> */),
ESCSEQ("Ograve", "\322"/* <20> */),
ESCSEQ("Ocirc", "\324"/* <20> */),
ESCSEQ("Otilde", "\325"/* <20> */),
ESCSEQ("Ouml", "\326"/* <20> */),
ESCSEQ("Oslash", " "),
ESCSEQ("Ugrave", "\331"/* <20> */),
ESCSEQ("Ucirc", " "),
ESCSEQ("Uuml", "\334"/* <20> */),
ESCSEQ("szlig", "\247"/* <20> */),
ESCSEQ("agrave;","<EFBFBD>"),
ESCSEQ("aacute", "\341"/* <20> */),
ESCSEQ("acirc", "\342"/* <20> */),
ESCSEQ("atilde", "\343"/* <20> */),
ESCSEQ("auml", "\344"/* <20> */),
ESCSEQ("aring", "a"),
ESCSEQ("aelig", "ae"),
ESCSEQ("ccedil", "\347"/* <20> */),
ESCSEQ("egrave", "\350"/* <20> */),
ESCSEQ("eacute", "\351"/* <20> */),
ESCSEQ("ecirc", "\352"/* <20> */),
ESCSEQ("euml", "\353"/* <20> */),
ESCSEQ("igrave", "\354"/* <20> */),
ESCSEQ("iacute", "\355"/* <20> */),
ESCSEQ("icirc", " "),
ESCSEQ("iuml", "\357"/* <20> */),
ESCSEQ("eth", " "),
ESCSEQ("ntilde", "\361"/* <20> */),
ESCSEQ("ograve", "\362"/* <20> */),
ESCSEQ("oacute", "\363"/* <20> */),
ESCSEQ("ocirc", "\364"/* <20> */),
ESCSEQ("otilde", "\365"/* <20> */),
ESCSEQ("ouml", "\366"/* <20> */),
ESCSEQ("divide", " "),
ESCSEQ("oslash", " "),
ESCSEQ("ugrave", "\371"/* <20> */),
ESCSEQ("uacute", "\372"/* <20> */),
ESCSEQ("ucirc", "\373"/* <20> */),
ESCSEQ("uuml", "\374"/* <20> */),
ESCSEQ("yuml", ""),
ESCSEQ("reg", "(r)"), ESCSEQ("#60", "<"),
ESCSEQ("#62", ">"),
ESCSEQ("deg", " "), /* this one should ALWAYS stay the last one!!! */
ESCSEQ("plusm", " "), ESCSEQ("amp", "&"),
ESCSEQ("#38", "&"),
ESCSEQ("acute", " "), { NULL, NULL, NULL }
ESCSEQ("micro", " "), };
ESCSEQ("para", " "),
ESCSEQ("ordm", " "), for (int i = 0; substitutions[i][0] != NULL; i++)
ESCSEQ("raquo", " "),
ESCSEQ("iquest", " "),
ESCSEQ("Agrave", "\300"/* <20> */),
ESCSEQ("Acirc", "\302"/* <20> */),
ESCSEQ("Atilde", "\303"/* <20> */),
ESCSEQ("Auml", "\304"/* <20> */),
ESCSEQ("Aring", " "),
ESCSEQ("AElig", " "),
ESCSEQ("Ccedil", "\347"/* <20> */),
ESCSEQ("Egrave", "\310"/* <20> */),
ESCSEQ("Eacute", "\311"/* <20> */),
ESCSEQ("Ecirc", "\312"/* <20> */),
ESCSEQ("Euml", "\313"/* <20> */),
ESCSEQ("Igrave", "\314"/* <20> */),
ESCSEQ("Icirc", "\316"/* <20> */),
ESCSEQ("Iuml", "\317"/* <20> */),
ESCSEQ("Ntilde", "\321"/* <20> */),
ESCSEQ("Ograve", "\322"/* <20> */),
ESCSEQ("Ocirc", "\324"/* <20> */),
ESCSEQ("Otilde", "\325"/* <20> */),
ESCSEQ("Ouml", "\326"/* <20> */),
ESCSEQ("Oslash", " "),
ESCSEQ("Ugrave", "\331"/* <20> */),
ESCSEQ("Ucirc", " "),
ESCSEQ("Uuml", "\334"/* <20> */),
ESCSEQ("szlig", "\247"/* <20> */),
ESCSEQ("agrave;","<EFBFBD>"),
ESCSEQ("aacute", "\341"/* <20> */),
ESCSEQ("acirc", "\342"/* <20> */),
ESCSEQ("atilde", "\343"/* <20> */),
ESCSEQ("auml", "\344"/* <20> */),
ESCSEQ("aring", "a"),
ESCSEQ("aelig", "ae"),
ESCSEQ("ccedil", "\347"/* <20> */),
ESCSEQ("egrave", "\350"/* <20> */),
ESCSEQ("eacute", "\351"/* <20> */),
ESCSEQ("ecirc", "\352"/* <20> */),
ESCSEQ("euml", "\353"/* <20> */),
ESCSEQ("igrave", "\354"/* <20> */),
ESCSEQ("iacute", "\355"/* <20> */),
ESCSEQ("icirc", " "),
ESCSEQ("iuml", "\357"/* <20> */),
ESCSEQ("eth", " "),
ESCSEQ("ntilde", "\361"/* <20> */),
ESCSEQ("ograve", "\362"/* <20> */),
ESCSEQ("oacute", "\363"/* <20> */),
ESCSEQ("ocirc", "\364"/* <20> */),
ESCSEQ("otilde", "\365"/* <20> */),
ESCSEQ("ouml", "\366"/* <20> */),
ESCSEQ("divide", " "),
ESCSEQ("oslash", " "),
ESCSEQ("ugrave", "\371"/* <20> */),
ESCSEQ("uacute", "\372"/* <20> */),
ESCSEQ("ucirc", "\373"/* <20> */),
ESCSEQ("uuml", "\374"/* <20> */),
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][0], substitutions[i][3], TRUE);
m_Name.Replace(substitutions[i][1], substitutions[i][2], TRUE); m_Name.Replace(substitutions[i][1], substitutions[i][3], TRUE);
m_Name.Replace(substitutions[i][2], substitutions[i][3], TRUE);
} }
} }
} }

80
src/html/htmlcell.cpp
View File

@@ -135,41 +135,72 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
if (m_Word.Find(wxT('&')) != -1) if (m_Word.Find(wxT('&')) != -1)
{ {
#define ESCSEQ(escape, subst) \ #define ESCSEQ(escape, subst) \
{ _T("&") _T(escape) _T(";"), _T("&") _T(escape) _T(" "), _T(subst) } { _T("&") _T(escape) _T(";"), _T("&") _T(escape) _T(" "), _T("&") _T(escape), _T(subst) }
static wxChar* substitutions[][3] = static wxChar* substitutions[][4] =
{ {
ESCSEQ("quot", "\""), ESCSEQ("quot", "\""),
ESCSEQ("#34", "\""),
ESCSEQ("lt", "<"), ESCSEQ("lt", "<"),
ESCSEQ("#60", "<"),
ESCSEQ("gt", ">"), ESCSEQ("gt", ">"),
ESCSEQ("#62", ">"),
ESCSEQ("#94", "^"), /* ^ */
ESCSEQ("nbsp", " "), ESCSEQ("nbsp", " "),
ESCSEQ("#32", " "),
ESCSEQ("iexcl", "!"), ESCSEQ("iexcl", "!"),
ESCSEQ("cent", "\242"/* <20> */), ESCSEQ("#33", "!"),
ESCSEQ("cent", "<EFBFBD>"/* <20> */),
ESCSEQ("#162", "<EFBFBD>"/* <20> */),
ESCSEQ("yen", " "), ESCSEQ("trade", "(TM)"),
ESCSEQ("brkbar", " "), ESCSEQ("#153", "(TM)"),
ESCSEQ("sect", " "),
ESCSEQ("uml", " "), ESCSEQ("yen", "<EFBFBD>"),
ESCSEQ("#165", "<EFBFBD>"),
ESCSEQ("brkbar", "<EFBFBD>"),
ESCSEQ("#166", "<EFBFBD>"),
ESCSEQ("sect", "<EFBFBD>"),
ESCSEQ("#167", "<EFBFBD>"),
ESCSEQ("uml", "<EFBFBD>"),
ESCSEQ("#168", "<EFBFBD>"),
ESCSEQ("copy", "(c)"), ESCSEQ("copy", "<EFBFBD>"), /* <20> */
ESCSEQ("ordf", " "), ESCSEQ("#169", "<EFBFBD>"),
ESCSEQ("laquo", " "), ESCSEQ("ordf", "<EFBFBD>"),
ESCSEQ("not", " "), ESCSEQ("#170", "<EFBFBD>"),
ESCSEQ("laquo", "<EFBFBD>"), /* <20> */
ESCSEQ("#171", "<EFBFBD>"),
ESCSEQ("not", "<EFBFBD>"),
ESCSEQ("#172", "<EFBFBD>"),
ESCSEQ("reg", "(r)"), ESCSEQ("reg", "<EFBFBD>"), /* <20> */
ESCSEQ("#174", "<EFBFBD>"),
ESCSEQ("deg", " "), ESCSEQ("deg", "<EFBFBD>"), /* <20> */
ESCSEQ("plusm", " "), ESCSEQ("#176", "<EFBFBD>"),
ESCSEQ("plusm", "<EFBFBD>"), /* <20> */
ESCSEQ("#177", "<EFBFBD>"),
ESCSEQ("acute", " "), ESCSEQ("acute", "<EFBFBD>"),
ESCSEQ("micro", " "), ESCSEQ("#180", "<EFBFBD>"),
ESCSEQ("para", " "), ESCSEQ("macron", "<EFBFBD>"),
ESCSEQ("#175", "<EFBFBD>"),
ESCSEQ("micro", "<EFBFBD>"), /* <20> */
ESCSEQ("#181", "<EFBFBD>"),
ESCSEQ("para", "<EFBFBD>"), /* <20> */
ESCSEQ("#182", "<EFBFBD>"),
ESCSEQ("ordm", " "), ESCSEQ("ordm", "<EFBFBD>"), /* <20> */
ESCSEQ("raquo", " "), ESCSEQ("#186", "<EFBFBD>"),
ESCSEQ("raquo", "<EFBFBD>"), /* <20> */
ESCSEQ("#187", "<EFBFBD>"),
ESCSEQ("iquest", " "), ESCSEQ("iquest", "<EFBFBD>"), /* <20> */
ESCSEQ("#191", "<EFBFBD>"),
ESCSEQ("Agrave", "\300"/* <20> */), ESCSEQ("Agrave", "\300"/* <20> */),
ESCSEQ("#193", "\300"/* <20> */),
ESCSEQ("Acirc", "\302"/* <20> */), ESCSEQ("Acirc", "\302"/* <20> */),
ESCSEQ("Atilde", "\303"/* <20> */), ESCSEQ("Atilde", "\303"/* <20> */),
@@ -232,16 +263,21 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
ESCSEQ("yuml", ""), ESCSEQ("yuml", ""),
ESCSEQ("#60", "<"),
ESCSEQ("#62", ">"),
/* this one should ALWAYS stay the last one!!! */ /* this one should ALWAYS stay the last one!!! */
ESCSEQ("amp", "&"), ESCSEQ("amp", "&"),
ESCSEQ("#38", "&"),
{ NULL, NULL, NULL } { NULL, NULL, NULL }
}; };
for (int i = 0; substitutions[i][0] != NULL; i++) for (int i = 0; substitutions[i][0] != NULL; i++)
{ {
m_Word.Replace(substitutions[i][0], substitutions[i][2], TRUE); m_Word.Replace(substitutions[i][0], substitutions[i][3], TRUE);
m_Word.Replace(substitutions[i][1], substitutions[i][2], TRUE); m_Word.Replace(substitutions[i][1], substitutions[i][3], TRUE);
m_Word.Replace(substitutions[i][2], substitutions[i][3], TRUE);
} }
} }