Commit 2a40448c authored by Dimitri van Heesch's avatar Dimitri van Heesch

add space between br and / for better compatibility

parent 1134237a
...@@ -2663,7 +2663,7 @@ class TextGeneratorHtml : public TextGeneratorIntf ...@@ -2663,7 +2663,7 @@ class TextGeneratorHtml : public TextGeneratorIntf
void writeBreak(int indent) const void writeBreak(int indent) const
{ {
m_ts << "<br/>"; m_ts << "<br />";
for (int i=0;i<indent;i++) for (int i=0;i<indent;i++)
{ {
m_ts << "&#160;"; m_ts << "&#160;";
......
...@@ -237,7 +237,7 @@ void HtmlDocVisitor::visit(DocURL *u) ...@@ -237,7 +237,7 @@ void HtmlDocVisitor::visit(DocURL *u)
void HtmlDocVisitor::visit(DocLineBreak *) void HtmlDocVisitor::visit(DocLineBreak *)
{ {
if (m_hide) return; if (m_hide) return;
m_t << "<br/>\n"; m_t << "<br />\n";
} }
void HtmlDocVisitor::visit(DocHorRuler *hr) void HtmlDocVisitor::visit(DocHorRuler *hr)
...@@ -1780,7 +1780,7 @@ void HtmlDocVisitor::visitPre(DocVhdlFlow *vf) ...@@ -1780,7 +1780,7 @@ void HtmlDocVisitor::visitPre(DocVhdlFlow *vf)
m_t << "</a>"; m_t << "</a>";
if (vf->hasCaption()) if (vf->hasCaption())
{ {
m_t << "<br/>"; m_t << "<br />";
} }
} }
} }
......
...@@ -2181,25 +2181,11 @@ void HtmlGenerator::endClassDiagram(const ClassDiagram &d, ...@@ -2181,25 +2181,11 @@ void HtmlGenerator::endClassDiagram(const ClassDiagram &d,
void HtmlGenerator::startMemberList() void HtmlGenerator::startMemberList()
{ {
DBG_HTML(t << "<!-- startMemberList -->" << endl) DBG_HTML(t << "<!-- startMemberList -->" << endl)
//if (Config_getBool("HTML_ALIGN_MEMBERS"))
//{
//}
//else
//{
// t << "<ul>" << endl;
//}
} }
void HtmlGenerator::endMemberList() void HtmlGenerator::endMemberList()
{ {
DBG_HTML(t << "<!-- endMemberList -->" << endl) DBG_HTML(t << "<!-- endMemberList -->" << endl)
//if (Config_getBool("HTML_ALIGN_MEMBERS"))
//{
//}
//else
//{
// t << "</ul>" << endl;
//}
} }
// anonymous type: // anonymous type:
...@@ -2254,18 +2240,13 @@ void HtmlGenerator::endMemberTemplateParams(const char *anchor,const char *inher ...@@ -2254,18 +2240,13 @@ void HtmlGenerator::endMemberTemplateParams(const char *anchor,const char *inher
void HtmlGenerator::insertMemberAlign(bool templ) void HtmlGenerator::insertMemberAlign(bool templ)
{ {
DBG_HTML(t << "<!-- insertMemberAlign -->" << endl) DBG_HTML(t << "<!-- insertMemberAlign -->" << endl)
//if (Config_getBool("HTML_ALIGN_MEMBERS"))
//{
QCString className = templ ? "memTemplItemRight" : "memItemRight"; QCString className = templ ? "memTemplItemRight" : "memItemRight";
t << "&#160;</td><td class=\"" << className << "\" valign=\"bottom\">"; t << "&#160;</td><td class=\"" << className << "\" valign=\"bottom\">";
//}
} }
void HtmlGenerator::startMemberDescription(const char *anchor,const char *inheritId) void HtmlGenerator::startMemberDescription(const char *anchor,const char *inheritId)
{ {
DBG_HTML(t << "<!-- startMemberDescription -->" << endl) DBG_HTML(t << "<!-- startMemberDescription -->" << endl)
//if (Config_getBool("HTML_ALIGN_MEMBERS"))
//{
if (m_emptySection) if (m_emptySection)
{ {
t << "<table class=\"memberdecls\">" << endl; t << "<table class=\"memberdecls\">" << endl;
...@@ -2277,54 +2258,34 @@ void HtmlGenerator::startMemberDescription(const char *anchor,const char *inheri ...@@ -2277,54 +2258,34 @@ void HtmlGenerator::startMemberDescription(const char *anchor,const char *inheri
t << " inherit " << inheritId; t << " inherit " << inheritId;
} }
t << "\"><td class=\"mdescLeft\">&#160;</td><td class=\"mdescRight\">"; t << "\"><td class=\"mdescLeft\">&#160;</td><td class=\"mdescRight\">";
//}
//else
//{
// t << "<dl class=\"el\"><dd class=\"mdescRight\">";
//}
} }
void HtmlGenerator::endMemberDescription() void HtmlGenerator::endMemberDescription()
{ {
DBG_HTML(t << "<!-- endMemberDescription -->" << endl) DBG_HTML(t << "<!-- endMemberDescription -->" << endl)
//if (Config_getBool("HTML_ALIGN_MEMBERS")) t << "<br /></td></tr>" << endl;
//{
t << "<br/></td></tr>" << endl;
//}
//else
//{
// t << "<br/></dl>";
//}
} }
void HtmlGenerator::startMemberSections() void HtmlGenerator::startMemberSections()
{ {
DBG_HTML(t << "<!-- startMemberSections -->" << endl) DBG_HTML(t << "<!-- startMemberSections -->" << endl)
//if (Config_getBool("HTML_ALIGN_MEMBERS"))
//{
m_emptySection=TRUE; // we postpone writing <table> until we actually m_emptySection=TRUE; // we postpone writing <table> until we actually
// write a row to prevent empty tables, which // write a row to prevent empty tables, which
// are not valid XHTML! // are not valid XHTML!
//}
} }
void HtmlGenerator::endMemberSections() void HtmlGenerator::endMemberSections()
{ {
DBG_HTML(t << "<!-- endMemberSections -->" << endl) DBG_HTML(t << "<!-- endMemberSections -->" << endl)
//if (Config_getBool("HTML_ALIGN_MEMBERS"))
//{
if (!m_emptySection) if (!m_emptySection)
{ {
t << "</table>" << endl; t << "</table>" << endl;
} }
//}
} }
void HtmlGenerator::startMemberHeader(const char *anchor) void HtmlGenerator::startMemberHeader(const char *anchor)
{ {
DBG_HTML(t << "<!-- startMemberHeader -->" << endl) DBG_HTML(t << "<!-- startMemberHeader -->" << endl)
//if (Config_getBool("HTML_ALIGN_MEMBERS"))
//{
if (!m_emptySection) if (!m_emptySection)
{ {
t << "</table>"; t << "</table>";
...@@ -2336,11 +2297,6 @@ void HtmlGenerator::startMemberHeader(const char *anchor) ...@@ -2336,11 +2297,6 @@ void HtmlGenerator::startMemberHeader(const char *anchor)
m_emptySection=FALSE; m_emptySection=FALSE;
} }
t << "<tr class=\"heading\"><td colspan=\"2\"><h2 class=\"groupheader\">"; t << "<tr class=\"heading\"><td colspan=\"2\"><h2 class=\"groupheader\">";
//}
//else
//{
// startGroupHeader(FALSE);
//}
if (anchor) if (anchor)
{ {
t << "<a name=\"" << anchor << "\"></a>" << endl; t << "<a name=\"" << anchor << "\"></a>" << endl;
...@@ -2350,27 +2306,18 @@ void HtmlGenerator::startMemberHeader(const char *anchor) ...@@ -2350,27 +2306,18 @@ void HtmlGenerator::startMemberHeader(const char *anchor)
void HtmlGenerator::endMemberHeader() void HtmlGenerator::endMemberHeader()
{ {
DBG_HTML(t << "<!-- endMemberHeader -->" << endl) DBG_HTML(t << "<!-- endMemberHeader -->" << endl)
//if (Config_getBool("HTML_ALIGN_MEMBERS"))
//{
t << "</h2></td></tr>" << endl; t << "</h2></td></tr>" << endl;
//}
//else
//{
// endGroupHeader(FALSE);
//}
} }
void HtmlGenerator::startMemberSubtitle() void HtmlGenerator::startMemberSubtitle()
{ {
DBG_HTML(t << "<!-- startMemberSubtitle -->" << endl) DBG_HTML(t << "<!-- startMemberSubtitle -->" << endl)
//if (Config_getBool("HTML_ALIGN_MEMBERS"))
t << "<tr><td class=\"ititle\" colspan=\"2\">"; t << "<tr><td class=\"ititle\" colspan=\"2\">";
} }
void HtmlGenerator::endMemberSubtitle() void HtmlGenerator::endMemberSubtitle()
{ {
DBG_HTML(t << "<!-- endMemberSubtitle -->" << endl) DBG_HTML(t << "<!-- endMemberSubtitle -->" << endl)
//if (Config_getBool("HTML_ALIGN_MEMBERS"))
t << "</td></tr>" << endl; t << "</td></tr>" << endl;
} }
...@@ -3324,11 +3271,11 @@ void HtmlGenerator::lineBreak(const char *style) ...@@ -3324,11 +3271,11 @@ void HtmlGenerator::lineBreak(const char *style)
{ {
if (style) if (style)
{ {
t << "<br class=\"" << style << "\"/>" << endl; t << "<br class=\"" << style << "\" />" << endl;
} }
else else
{ {
t << "<br/>" << endl; t << "<br />" << endl;
} }
} }
......
...@@ -1573,7 +1573,7 @@ void MemberDef::writeDeclaration(OutputList &ol, ...@@ -1573,7 +1573,7 @@ void MemberDef::writeDeclaration(OutputList &ol,
); );
} }
bool htmlOn = ol.isEnabled(OutputGenerator::Html); bool htmlOn = ol.isEnabled(OutputGenerator::Html);
if (htmlOn && /*Config_getBool("HTML_ALIGN_MEMBERS") &&*/ !ltype.isEmpty()) if (htmlOn && !ltype.isEmpty())
{ {
ol.disable(OutputGenerator::Html); ol.disable(OutputGenerator::Html);
} }
......
...@@ -2222,7 +2222,7 @@ void VhdlDocGen::writeVHDLDeclaration(MemberDef* mdef,OutputList &ol, ...@@ -2222,7 +2222,7 @@ void VhdlDocGen::writeVHDLDeclaration(MemberDef* mdef,OutputList &ol,
} }
bool htmlOn = ol.isEnabled(OutputGenerator::Html); bool htmlOn = ol.isEnabled(OutputGenerator::Html);
if (htmlOn && /*Config_getBool("HTML_ALIGN_MEMBERS") &&*/ !ltype.isEmpty()) if (htmlOn && !ltype.isEmpty())
{ {
ol.disable(OutputGenerator::Html); ol.disable(OutputGenerator::Html);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment