mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-23 20:14:05 +00:00
Revert "improve:handle invalid tag soup improvement, related to old issue #271"
This reverts commit 37d22bc412.
This commit is contained in:
xiaoyifang
parent
d12f070ee6
commit
30ce781e6a
9
aard.cc
9
aard.cc
|
|
@ -524,10 +524,11 @@ void AardDictionary::loadArticle( quint32 address,
|
|||
articleText = string( QObject::tr( "Article decoding error" ).toUtf8().constData() );
|
||||
|
||||
// See Issue #271: A mechanism to clean-up invalid HTML cards.
|
||||
// leave the invalid tags at the mercy of modern browsers.(webengine chrome)
|
||||
// https://html.spec.whatwg.org/#an-introduction-to-error-handling-and-strange-cases-in-the-parser
|
||||
// https://en.wikipedia.org/wiki/Tag_soup#HTML5
|
||||
string cleaner = "";
|
||||
string cleaner = "</font>""</font>""</font>""</font>""</font>""</font>"
|
||||
"</font>""</font>""</font>""</font>""</font>""</font>"
|
||||
"</b></b></b></b></b></b></b></b>"
|
||||
"</i></i></i></i></i></i></i></i>"
|
||||
"</a></a></a></a></a></a></a></a>";
|
||||
|
||||
string prefix( "<div class=\"aard\"" );
|
||||
if( isToLanguageRTL() )
|
||||
|
|
|
|||
|
|
@ -47,7 +47,8 @@ std::string ArticleMaker::makeHtmlHeader( QString const & word,
|
|||
bool expandOptionalParts ) const
|
||||
{
|
||||
string result =
|
||||
"<!DOCTYPE html>"
|
||||
"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" "
|
||||
"\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">"
|
||||
"<html><head>"
|
||||
"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">";
|
||||
|
||||
|
|
|
|||
8
bgl.cc
8
bgl.cc
|
|
@ -850,10 +850,10 @@ void BglArticleRequest::run()
|
|||
|
||||
multimap< wstring, pair< string, string > >::const_iterator i;
|
||||
|
||||
// leave the invalid tags at the mercy of modern browsers.(webengine chrome)
|
||||
// https://html.spec.whatwg.org/#an-introduction-to-error-handling-and-strange-cases-in-the-parser
|
||||
// https://en.wikipedia.org/wiki/Tag_soup#HTML5
|
||||
string cleaner = "";
|
||||
string cleaner = "</font>""</font>""</font>""</font>""</font>""</font>"
|
||||
"</font>""</font>""</font>""</font>""</font>""</font>"
|
||||
"</b></b></b></b></b></b></b></b>"
|
||||
"</i></i></i></i></i></i></i></i>";
|
||||
for( i = mainArticles.begin(); i != mainArticles.end(); ++i )
|
||||
{
|
||||
if (dict.isFromLanguageRTL() ) // RTL support
|
||||
|
|
|
|||
9
mdx.cc
9
mdx.cc
|
|
@ -757,10 +757,11 @@ void MdxArticleRequest::run()
|
|||
}
|
||||
|
||||
// See Issue #271: A mechanism to clean-up invalid HTML cards.
|
||||
// leave the invalid tags at the mercy of modern browsers.(webengine chrome)
|
||||
// https://html.spec.whatwg.org/#an-introduction-to-error-handling-and-strange-cases-in-the-parser
|
||||
// https://en.wikipedia.org/wiki/Tag_soup#HTML5
|
||||
string cleaner = "";
|
||||
string cleaner = "</font>""</font>""</font>""</font>""</font>""</font>"
|
||||
"</font>""</font>""</font>""</font>""</font>""</font>"
|
||||
"</b></b></b></b></b></b></b></b>"
|
||||
"</i></i></i></i></i></i></i></i>"
|
||||
"</a></a></a></a></a></a></a></a>";
|
||||
articleText += "<div class=\"mdict\">" + articleBody + cleaner + "</div>\n";
|
||||
}
|
||||
|
||||
|
|
|
|||
9
slob.cc
9
slob.cc
|
|
@ -802,10 +802,11 @@ void SlobDictionary::loadArticle( quint32 address,
|
|||
articleText = string( QObject::tr( "Article decoding error" ).toUtf8().constData() );
|
||||
|
||||
// See Issue #271: A mechanism to clean-up invalid HTML cards.
|
||||
// leave the invalid tags at the mercy of modern browsers.(webengine chrome)
|
||||
// https://html.spec.whatwg.org/#an-introduction-to-error-handling-and-strange-cases-in-the-parser
|
||||
// https://en.wikipedia.org/wiki/Tag_soup#HTML5
|
||||
string cleaner = "";
|
||||
string cleaner = "</font>""</font>""</font>""</font>""</font>""</font>"
|
||||
"</font>""</font>""</font>""</font>""</font>""</font>"
|
||||
"</b></b></b></b></b></b></b></b>"
|
||||
"</i></i></i></i></i></i></i></i>"
|
||||
"</a></a></a></a></a></a></a></a>";
|
||||
|
||||
string prefix( "<div class=\"slobdict\"" );
|
||||
if( isToLanguageRTL() )
|
||||
|
|
|
|||
|
|
@ -1468,10 +1468,11 @@ void StardictArticleRequest::run()
|
|||
|
||||
multimap< wstring, pair< string, string > >::const_iterator i;
|
||||
|
||||
// leave the invalid tags at the mercy of modern browsers.(webengine chrome)
|
||||
// https://html.spec.whatwg.org/#an-introduction-to-error-handling-and-strange-cases-in-the-parser
|
||||
// https://en.wikipedia.org/wiki/Tag_soup#HTML5
|
||||
string cleaner = "";
|
||||
string cleaner = "</font>""</font>""</font>""</font>""</font>""</font>"
|
||||
"</font>""</font>""</font>""</font>""</font>""</font>"
|
||||
"</b></b></b></b></b></b></b></b>"
|
||||
"</i></i></i></i></i></i></i></i>";
|
||||
|
||||
for( i = mainArticles.begin(); i != mainArticles.end(); ++i )
|
||||
{
|
||||
result += dict.isFromLanguageRTL() ? "<h3 class=\"sdct_headwords\" dir=\"rtl\">" : "<h3 class=\"sdct_headwords\">";
|
||||
|
|
|
|||
|
|
@ -264,9 +264,11 @@ void WebSiteArticleRequest::requestFinished( QNetworkReply * r )
|
|||
}
|
||||
|
||||
// See Issue #271: A mechanism to clean-up invalid HTML cards.
|
||||
// leave the invalid tags at the mercy of modern browsers.(webengine chrome)
|
||||
// https://html.spec.whatwg.org/#an-introduction-to-error-handling-and-strange-cases-in-the-parser
|
||||
// https://en.wikipedia.org/wiki/Tag_soup#HTML5
|
||||
articleString += "</font>""</font>""</font>""</font>""</font>""</font>"
|
||||
"</font>""</font>""</font>""</font>""</font>""</font>"
|
||||
"</b></b></b></b></b></b></b></b>"
|
||||
"</i></i></i></i></i></i></i></i>"
|
||||
"</a></a></a></a></a></a></a></a>";
|
||||
|
||||
QByteArray articleBody = articleString.toUtf8();
|
||||
|
||||
|
|
|
|||
8
xdxf.cc
8
xdxf.cc
|
|
@ -586,10 +586,10 @@ void XdxfArticleRequest::run()
|
|||
|
||||
multimap< wstring, pair< string, string > >::const_iterator i;
|
||||
|
||||
// leave the invalid tags at the mercy of modern browsers.(webengine chrome)
|
||||
// https://html.spec.whatwg.org/#an-introduction-to-error-handling-and-strange-cases-in-the-parser
|
||||
// https://en.wikipedia.org/wiki/Tag_soup#HTML5
|
||||
string cleaner = "";
|
||||
string cleaner = "</font>""</font>""</font>""</font>""</font>""</font>"
|
||||
"</font>""</font>""</font>""</font>""</font>""</font>"
|
||||
"</b></b></b></b></b></b></b></b>"
|
||||
"</i></i></i></i></i></i></i></i>";
|
||||
|
||||
for( i = mainArticles.begin(); i != mainArticles.end(); ++i )
|
||||
{
|
||||
|
|
|
|||
10
zim.cc
10
zim.cc
|
|
@ -1284,10 +1284,12 @@ void ZimArticleRequest::run()
|
|||
|
||||
string result;
|
||||
|
||||
// leave the invalid tags at the mercy of modern browsers.(webengine chrome)
|
||||
// https://html.spec.whatwg.org/#an-introduction-to-error-handling-and-strange-cases-in-the-parser
|
||||
// https://en.wikipedia.org/wiki/Tag_soup#HTML5
|
||||
string cleaner = "";
|
||||
// See Issue #271: A mechanism to clean-up invalid HTML cards.
|
||||
string cleaner = "</font>""</font>""</font>""</font>""</font>""</font>"
|
||||
"</font>""</font>""</font>""</font>""</font>""</font>"
|
||||
"</b></b></b></b></b></b></b></b>"
|
||||
"</i></i></i></i></i></i></i></i>"
|
||||
"</a></a></a></a></a></a></a></a>";
|
||||
|
||||
multimap< wstring, pair< string, string > >::const_iterator i;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue