diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-08-11 09:52:31 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-11 09:52:31 (GMT) |
commit | 09c263e70a2ac9afbe8f7cc7a0a07c5ab069645a (patch) | |
tree | b4fe1b03e49cb7065abd3018b6d526b4c51f023c | |
parent | 41428093841f91d6b67d02d21ad03fc74a7bc069 (diff) | |
parent | 3f553a8e4266b24a67e5c7302ee81e1d5e648748 (diff) | |
download | Doxygen-09c263e70a2ac9afbe8f7cc7a0a07c5ab069645a.zip Doxygen-09c263e70a2ac9afbe8f7cc7a0a07c5ab069645a.tar.gz Doxygen-09c263e70a2ac9afbe8f7cc7a0a07c5ab069645a.tar.bz2 |
Merge pull request #7177 from albert-github/feature/bug_td_nowrap
Problem with '<td nowrap>'
-rw-r--r-- | src/docbookvisitor.cpp | 4 | ||||
-rw-r--r-- | src/doctokenizer.l | 2 | ||||
-rw-r--r-- | src/htmldocvisitor.cpp | 6 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/docbookvisitor.cpp b/src/docbookvisitor.cpp index a42a895..ce3a845 100644 --- a/src/docbookvisitor.cpp +++ b/src/docbookvisitor.cpp @@ -1105,6 +1105,10 @@ DB_VIS_C { // just skip it } + else if (opt->name=="nowrap" && opt->value.isEmpty()) + { + m_t << " " << opt->name << "='nowrap'"; + } else { m_t << " " << opt->name << "='" << opt->value << "'"; diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 194327c..79c7d0e 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -222,7 +222,7 @@ static void handleHtmlTag() } startName=i; // search for end of name - while (i<(int)yyleng && !isspace((uchar)c) && c!='=') { c=tagText.at(++i); } + while (i<(int)yyleng && !isspace((uchar)c) && c!='=' && c!= '>') { c=tagText.at(++i); } endName=i; HtmlAttrib opt; opt.name = tagText.mid(startName,endName-startName).lower(); diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index e1ff3e9..c7fcaf8 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -263,6 +263,12 @@ static QCString htmlAttribsToString(const HtmlAttribList &attribs, QCString *pAl result+="=\""+convertToXML(att->value)+"\""; } } + else if (att->name=="nowrap") // In XHTML, attribute minimization is forbidden, and the nowrap attribute must be defined as <td nowrap="nowrap">. + { + result+=" "; + result+=att->name; + result+="=\"nowrap\""; + } } return result; } |