diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-02-09 18:48:34 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-09 18:48:34 (GMT) |
commit | 78b7975759f891fcbf8445e498c3fc9afcb61d19 (patch) | |
tree | 53dc789b325ec0c8c1278544b3a39287bd216742 | |
parent | 6c0e38a675393c5053c09d51b4ff49e15e8ba300 (diff) | |
parent | 3e74470aace3c7a53d02bdfe9590a379c9269b45 (diff) | |
download | Doxygen-78b7975759f891fcbf8445e498c3fc9afcb61d19.zip Doxygen-78b7975759f891fcbf8445e498c3fc9afcb61d19.tar.gz Doxygen-78b7975759f891fcbf8445e498c3fc9afcb61d19.tar.bz2 |
Merge pull request #6811 from albert-github/feature/bug_141919
Bug 141919 - Wrong param and exception style in RTF output
-rw-r--r-- | src/docbookvisitor.cpp | 10 | ||||
-rw-r--r-- | src/rtfdocvisitor.cpp | 4 | ||||
-rw-r--r-- | templates/html/doxygen.css | 2 | ||||
-rw-r--r-- | templates/latex/doxygen.sty | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/src/docbookvisitor.cpp b/src/docbookvisitor.cpp index 3988390..c36bb00 100644 --- a/src/docbookvisitor.cpp +++ b/src/docbookvisitor.cpp @@ -767,15 +767,13 @@ DB_VIS_C } break; case DocSimpleSect::User: + case DocSimpleSect::Rcs: + case DocSimpleSect::Unknown: if (s->hasTitle()) m_t << "<formalpara>" << endl; else m_t << "<para>" << endl; break; - case DocSimpleSect::Rcs: - case DocSimpleSect::Unknown: - m_t << "<para>" << endl; - break; } } @@ -785,11 +783,9 @@ DB_VIS_C if (m_hide) return; switch(s->type()) { + case DocSimpleSect::User: case DocSimpleSect::Rcs: case DocSimpleSect::Unknown: - m_t << "</para>" << endl; - break; - case DocSimpleSect::User: if (s->hasTitle()) m_t << "</formalpara>" << endl; else diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp index 1e2bb89..f44da77 100644 --- a/src/rtfdocvisitor.cpp +++ b/src/rtfdocvisitor.cpp @@ -771,16 +771,18 @@ void RTFDocVisitor::visitPre(DocSimpleSect *s) m_t << "}"; // end bold incIndentLevel(); m_t << rtf_Style_Reset << getStyle("DescContinue"); + m_t << "{\\s17 \\sa60 \\sb30\n"; } m_lastIsPara=FALSE; } -void RTFDocVisitor::visitPost(DocSimpleSect *) +void RTFDocVisitor::visitPost(DocSimpleSect *s) { if (m_hide) return; DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocSimpleSect)}\n"); if (!m_lastIsPara) m_t << "\\par" << endl; decIndentLevel(); + if (s->type()!=DocSimpleSect::User && s->type()!=DocSimpleSect::Rcs) m_t << "}"; m_t << "}"; // end desc m_lastIsPara=TRUE; } diff --git a/templates/html/doxygen.css b/templates/html/doxygen.css index 83e29e5..92a662a 100644 --- a/templates/html/doxygen.css +++ b/templates/html/doxygen.css @@ -701,7 +701,7 @@ dl.reflist dd { padding-left: 0px; } -.params .paramname, .retval .paramname, .tparams .paramname { +.params .paramname, .retval .paramname, .tparams .paramname, .exception .paramname { font-weight: bold; vertical-align: top; } diff --git a/templates/latex/doxygen.sty b/templates/latex/doxygen.sty index e696837..de16c7d 100644 --- a/templates/latex/doxygen.sty +++ b/templates/latex/doxygen.sty @@ -53,7 +53,7 @@ \ensurespace{4\baselineskip}% \begin{list}{}{% \settowidth{\labelwidth}{20pt}% - \setlength{\parsep}{0pt}% + %\setlength{\parsep}{0pt}% \setlength{\itemsep}{0pt}% \setlength{\leftmargin}{\labelwidth+\labelsep}% \renewcommand{\makelabel}{\entrylabel}% |