diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-17 20:28:49 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-17 20:28:49 (GMT) |
| commit | cb7d4fcf8dff6183581914465dcc9abfb3ed5a31 (patch) | |
| tree | ac7a244d8e3cef00bc1abf606ea89e57deffad44 | |
| parent | a571e7669a835bc998cb96b226537a6e8093bc09 (diff) | |
| parent | 416ee572ba35b4d0cf30ccca66f0691c658f2e53 (diff) | |
| download | Doxygen-cb7d4fcf8dff6183581914465dcc9abfb3ed5a31.zip Doxygen-cb7d4fcf8dff6183581914465dcc9abfb3ed5a31.tar.gz Doxygen-cb7d4fcf8dff6183581914465dcc9abfb3ed5a31.tar.bz2 | |
Merge pull request #7237 from albert-github/feature/bug_table_hr
Problem with `<hr>` in LaTeX multicolumn cell
| -rw-r--r-- | doc/doxygen_manual.tex | 5 | ||||
| -rw-r--r-- | src/latexdocvisitor.cpp | 5 | ||||
| -rw-r--r-- | src/latexgen.cpp | 5 | ||||
| -rw-r--r-- | templates/latex/doxygen.sty | 10 |
4 files changed, 22 insertions, 3 deletions
diff --git a/doc/doxygen_manual.tex b/doc/doxygen_manual.tex index 8ff3c66..e350013 100644 --- a/doc/doxygen_manual.tex +++ b/doc/doxygen_manual.tex @@ -66,6 +66,11 @@ \usepackage{doxygen} \usepackage{manual} %% +%gave problems when in doxygen.sty +\makeatletter +\newcommand\hrulefilll{\leavevmode\leaders\hrule\hskip 0pt plus 1filll\kern\z@} +\makeatother +%% % unfortunately constructs like: % \renewcommand{\doxysection}[1]{\doxysubsection{##1}} % using values from book.cls (see also doxygen.sty) and redefining sections to correct level. diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp index 5fd2e78..de2335b 100644 --- a/src/latexdocvisitor.cpp +++ b/src/latexdocvisitor.cpp @@ -280,7 +280,10 @@ void LatexDocVisitor::visit(DocLineBreak *) void LatexDocVisitor::visit(DocHorRuler *) { if (m_hide) return; - m_t << "\\DoxyHorRuler\n"; + if (insideTable()) + m_t << "\\DoxyHorRuler{1}\n"; + else + m_t << "\\DoxyHorRuler{0}\n"; } void LatexDocVisitor::visit(DocStyleChange *s) diff --git a/src/latexgen.cpp b/src/latexgen.cpp index 094232f..b7eefe3 100644 --- a/src/latexgen.cpp +++ b/src/latexgen.cpp @@ -624,6 +624,11 @@ static void writeDefaultHeaderPart1(FTextStream &t) "}\n" "\\makeatother\n" "\n"; + // + t << "\\makeatletter\n" + "\\newcommand\\hrulefilll{\\leavevmode\\leaders\\hrule\\hskip 0pt plus 1filll\\kern\\z@}\n" + "\\makeatother\n" + "\n"; // Headers & footers QGString genString; diff --git a/templates/latex/doxygen.sty b/templates/latex/doxygen.sty index bf19901..83891a5 100644 --- a/templates/latex/doxygen.sty +++ b/templates/latex/doxygen.sty @@ -35,9 +35,15 @@ \endgroup% } -\newcommand{\DoxyHorRuler}{% +\newcommand{\DoxyHorRuler}[1]{% \setlength{\parskip}{0ex plus 0ex minus 0ex}% - \hrule% + \ifthenelse{#1=0}% + {% + \hrule% + }% + {% + \hrulefilll% + }% } \newcommand{\DoxyLabelFont}{} \newcommand{\entrylabel}[1]{% |