diff options
| -rw-r--r-- | doc/install.doc | 3 | ||||
| -rw-r--r-- | src/docbookvisitor.cpp | 10 | ||||
| -rw-r--r-- | src/doxygen.cpp | 2 | ||||
| -rw-r--r-- | src/rtfdocvisitor.cpp | 4 | ||||
| -rw-r--r-- | src/scanner.l | 2 | ||||
| -rw-r--r-- | templates/html/doxygen.css | 2 | ||||
| -rw-r--r-- | templates/latex/doxygen.sty | 2 |
7 files changed, 13 insertions, 12 deletions
diff --git a/doc/install.doc b/doc/install.doc index b2570d1..5996d86 100644 --- a/doc/install.doc +++ b/doc/install.doc @@ -126,13 +126,14 @@ Compilation is now done by performing the following steps: -DLLVM_ENABLE_PIC=OFF \ -DLLVM_BUILD_LLVM_DYLIB=OFF \ -DLLVM_BUILD_LLVM_C_DYLIB=OFF \ + -DLLVM_ENABLE_TERMINFO=OFF \ path_to_llvm_root_source_dir and then build doxygen with these options: cmake -DCMAKE_BUILD_TYPE=Release \ "-DCMAKE_FIND_LIBRARY_SUFFIXES=.a" \ - "-ldl;-lz;-lncurses;-lpthread" \ + "-ldl;-lz;-lpthread" \ -Duse_libclang=YES \ path_to_doxygen_root_source_dir 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/doxygen.cpp b/src/doxygen.cpp index 08d3bc7..da61796 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -10021,7 +10021,7 @@ static void escapeAliases() while ((in=value.find("^^",p))!=-1) { newValue+=value.mid(p,in-p); - newValue+="@_linebr"; + newValue+="\\\\_linebr"; p=in+2; } newValue+=value.mid(p,value.length()-p); 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/src/scanner.l b/src/scanner.l index cad997e..6633098 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -6829,6 +6829,8 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) <SkipComment>[^\*\n]+ <*>"[[" { // C++11 attribute + if (!insideCpp) REJECT; + if (YY_START == CopyGString || YY_START == CopyGString) REJECT; lastC11AttributeContext = YY_START; BEGIN( SkipC11Attribute ); } 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}% |