fixed tests for HTML entities and handling of HTML entities

This commit is contained in:
Marko Klopcic 2013-01-18 22:30:23 +01:00
commit a2b0d42c32
3 changed files with 26 additions and 26 deletions

View file

@ -193,29 +193,29 @@ void JavaDocConverter::fillStaticTables() {
tagHandlers["<var" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<var" );
// HTML entities
tagHandlers["&copy" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&copy");
tagHandlers["&trade"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&trade");
tagHandlers["&reg" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&reg");
tagHandlers["&lt" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&lt");
tagHandlers["&gt" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&gt");
tagHandlers["&amp" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&amp");
tagHandlers["&apos" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&apos");
tagHandlers["&quot" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&quot");
tagHandlers["&lsquo"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&lsquo");
tagHandlers["&rsquo"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&rsquo");
tagHandlers["&ldquo"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&ldquo");
tagHandlers["&rdquo"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&rdquo");
tagHandlers["&ndash"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&ndash");
tagHandlers["&mdash"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&mdash");
tagHandlers["&nbsp" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&nbsp");
tagHandlers["&times"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&times");
tagHandlers["&minus"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&minus");
tagHandlers["&sdot" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&sdot");
tagHandlers["&sim" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&sim");
tagHandlers["&le" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&le");
tagHandlers["&ge" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&ge");
tagHandlers["&larr" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&larr");
tagHandlers["&rarr" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&rarr");
tagHandlers["&copy" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&copy");
tagHandlers["&trade"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&trade");
tagHandlers["&reg" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&reg");
tagHandlers["&lt" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&lt");
tagHandlers["&gt" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&gt");
tagHandlers["&amp" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&amp");
tagHandlers["&apos" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&apos");
tagHandlers["&quot" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&quot");
tagHandlers["&lsquo"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&lsquo");
tagHandlers["&rsquo"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&rsquo");
tagHandlers["&ldquo"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&ldquo");
tagHandlers["&rdquo"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&rdquo");
tagHandlers["&ndash"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&ndash");
tagHandlers["&mdash"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&mdash");
tagHandlers["&nbsp" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&nbsp");
tagHandlers["&times"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&times");
tagHandlers["&minus"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&minus");
tagHandlers["&sdot" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&sdot");
tagHandlers["&sim" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&sim");
tagHandlers["&le" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&le");
tagHandlers["&ge" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&ge");
tagHandlers["&larr" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&larr");
tagHandlers["&rarr" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&rarr");
}
@ -367,7 +367,7 @@ void JavaDocConverter::handleDoxyHtmlTag(DoxygenEntity& tag, std::string& transl
}
void JavaDocConverter::handleHtmlEntity(DoxygenEntity& tag, std::string& translatedComment, std::string &arg) {
void JavaDocConverter::handleHtmlEntity(DoxygenEntity&, std::string& translatedComment, std::string &arg) {
// html entities can be preserved for Java
translatedComment += arg + ';';
}