diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2012-11-18 21:43:28 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2012-11-18 21:43:28 (GMT) |
commit | fee4053bd3dd075a2dd2cba4da8166ec5307eadd (patch) | |
tree | 94365b932426de715b3a479094b7056e0c4f878b /src/htmldocvisitor.cpp | |
parent | ceb4115c7b941039411e1793e01239610ff112a2 (diff) | |
download | Doxygen-fee4053bd3dd075a2dd2cba4da8166ec5307eadd.zip Doxygen-fee4053bd3dd075a2dd2cba4da8166ec5307eadd.tar.gz Doxygen-fee4053bd3dd075a2dd2cba4da8166ec5307eadd.tar.bz2 |
Release-1.8.2-20121118
Diffstat (limited to 'src/htmldocvisitor.cpp')
-rw-r--r-- | src/htmldocvisitor.cpp | 70 |
1 files changed, 53 insertions, 17 deletions
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index 63cda59..3c06837 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -30,6 +30,8 @@ #include "msc.h" #include "util.h" #include "vhdldocgen.h" +#include "filedef.h" +#include "memberdef.h" static const int NUM_HTML_LIST_TYPES = 4; static const char types[][NUM_HTML_LIST_TYPES] = {"1", "a", "i", "A"}; @@ -325,10 +327,12 @@ void HtmlDocVisitor::visit(DocLineBreak *) m_t << "<br/>\n"; } -void HtmlDocVisitor::visit(DocHorRuler *) +void HtmlDocVisitor::visit(DocHorRuler *hr) { if (m_hide) return; + forceEndParagraph(hr); m_t << "<hr/>\n"; + forceStartParagraph(hr); } void HtmlDocVisitor::visit(DocStyleChange *s) @@ -474,33 +478,34 @@ void HtmlDocVisitor::visit(DocVerbatim *s) if (Config_getBool("DOT_CLEANUP")) file.remove(); } break; - case DocVerbatim::Msc: - { - forceEndParagraph(s); - -#if 0 // TODO: this should get its own command and not hijack the \msc - // command. This should also work for Latex and RTF output (or at - // least produce valid output there. - static bool optimizeForVhdl = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); - if (optimizeForVhdl) - { +#if 0 + case DocVerbatim::Vhdf: if (VhdlDocGen::getFlowMember()) // use VHDL flow chart creator { QCString fname=FlowNode::convertNameToFileName(); - m_t << "<div align=\"left\">" << endl; + // fprintf(stderr,"\n create flow mem %s \n",fname.data()); + //m_t << "<div align=\"left\">" << endl; // TODO: use CSS m_t << "<p>"; - m_t << "flowchart:" ; + m_t << "flowchart: " ; // TODO: translate me m_t << "<a href=\""; m_t << fname.data(); m_t << ".svg\">"; m_t << VhdlDocGen::getFlowMember()->name().data(); - m_t << "</a><br><br>"; - m_t << s->text().data(); + m_t << "</a>"; + if (!s->text().isEmpty()) + { + m_t << "<br/>"; + m_t << s->text().data(); + } m_t << "</p>"; VhdlDocGen::setFlowMember(NULL); } - } + break; #endif + case DocVerbatim::Msc: + { + forceEndParagraph(s); + static int mscindex = 1; QCString baseName(4096); @@ -726,7 +731,7 @@ void HtmlDocVisitor::visit(DocIndexEntry *e) // e->scope() ? e->scope()->name().data() : "<null>", // e->member() ? e->member()->name().data() : "<null>" // ); - Doxygen::indexList.addIndexItem(e->scope(),e->member(),anchor,e->entry()); + Doxygen::indexList->addIndexItem(e->scope(),e->member(),anchor,e->entry()); } void HtmlDocVisitor::visit(DocSimpleSectSep *) @@ -1785,6 +1790,37 @@ void HtmlDocVisitor::visitPost(DocHtmlBlockQuote *b) forceStartParagraph(b); } +void HtmlDocVisitor::visitPre(DocVhdlFlow *vf) +{ + if (m_hide) return; + if (VhdlDocGen::getFlowMember()) // use VHDL flow chart creator + { + forceEndParagraph(vf); + QCString fname=FlowNode::convertNameToFileName(); + m_t << "<p>"; + m_t << "flowchart: " ; // TODO: translate me + m_t << "<a href=\""; + m_t << fname.data(); + m_t << ".svg\">"; + m_t << VhdlDocGen::getFlowMember()->name().data(); + m_t << "</a>"; + if (vf->hasCaption()) + { + m_t << "<br/>"; + } + } +} + +void HtmlDocVisitor::visitPost(DocVhdlFlow *vf) +{ + if (m_hide) return; + if (VhdlDocGen::getFlowMember()) // use VHDL flow chart creator + { + m_t << "</p>"; + forceStartParagraph(vf); + } +} + void HtmlDocVisitor::filter(const char *str) { if (str==0) return; |