diff options
| author | Martin Smith <martin.smith@nokia.com> | 2011-01-13 12:17:48 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2011-01-13 12:17:48 (GMT) |
| commit | 02d904d5983ff0597f52d8d6ec76439f81da6504 (patch) | |
| tree | a72c17d06fa210d6694f40dbe61cfcccebcfe932 /tools | |
| parent | f803b62b4526f0f81693a59bdf4b07e36f3900c9 (diff) | |
| download | Qt-02d904d5983ff0597f52d8d6ec76439f81da6504.zip Qt-02d904d5983ff0597f52d8d6ec76439f81da6504.tar.gz Qt-02d904d5983ff0597f52d8d6ec76439f81da6504.tar.bz2 | |
qdoc: Added a parameter to \row
And removed some \raw cases. Only 11 raw-html uses remaining.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/doc.cpp | 3 | ||||
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 25 |
2 files changed, 20 insertions, 8 deletions
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp index b7dba8a..7c3d141 100644 --- a/tools/qdoc3/doc.cpp +++ b/tools/qdoc3/doc.cpp @@ -1028,8 +1028,9 @@ void DocParser::parse(const QString& source, break; case CMD_ROW: if (openedCommands.top() == CMD_TABLE) { + x = getArgument(true); leaveTableRow(); - append(Atom::TableRowLeft); + append(Atom::TableRowLeft,x); inTableRow = true; } else { diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 7b6ec16..81bd7a8 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1106,7 +1106,14 @@ int HtmlGenerator::generateAtom(const Atom *atom, } break; case Atom::TableRowLeft: - if (++numTableRows % 2 == 1) + if (!atom->string().isEmpty()) { + out() << "<tr "; + if (atom->string().contains('=')) + out() << " " << atom->string() << ">"; + else + out() << " class=\"" << atom->string() << "\">"; + } + else if (++numTableRows % 2 == 1) out() << "<tr class=\"odd topAlign\">"; else out() << "<tr class=\"even topAlign\">"; @@ -1127,10 +1134,12 @@ int HtmlGenerator::generateAtom(const Atom *atom, out() << " colspan=\"" << spans.at(0) << "\""; if (spans.at(1) != "1") out() << " rowspan=\"" << spans.at(1) << "\""; - if (inTableHeader) - out() << ">"; - else - out() << "><p>"; + if (inTableHeader) + out() << ">"; + else { + out() << ">"; + //out() << "><p>"; + } } if (matchAhead(atom, Atom::ParaLeft)) skipAhead = 1; @@ -1139,8 +1148,10 @@ int HtmlGenerator::generateAtom(const Atom *atom, case Atom::TableItemRight: if (inTableHeader) out() << "</th>"; - else - out() << "</p></td>"; + else { + out() << "</td>"; + //out() << "</p></td>"; + } if (matchAhead(atom, Atom::ParaLeft)) skipAhead = 1; break; |