diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2016-01-17 15:49:34 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2016-01-17 15:49:34 (GMT) |
| commit | 41e71437484aaaece77d155fc2c4fdaf5c72c71f (patch) | |
| tree | 49baf667ad804943baac0e679cb9c1a3812b5b02 | |
| parent | 4d91798400d373448a94bfab15b2481157cdf7a8 (diff) | |
| parent | 1d77a4ed407aaa24eae53f501d1a5ce38b352504 (diff) | |
| download | Doxygen-41e71437484aaaece77d155fc2c4fdaf5c72c71f.zip Doxygen-41e71437484aaaece77d155fc2c4fdaf5c72c71f.tar.gz Doxygen-41e71437484aaaece77d155fc2c4fdaf5c72c71f.tar.bz2 | |
Merge pull request #441 from albert-github/feature/bug_image_in_table
PDF generation stops when image with caption is included in a table.
| -rw-r--r-- | doc/manual.sty | 7 | ||||
| -rw-r--r-- | src/latexdocvisitor.cpp | 2 | ||||
| -rw-r--r-- | templates/latex/doxygen.sty | 7 |
3 files changed, 15 insertions, 1 deletions
diff --git a/doc/manual.sty b/doc/manual.sty index 80fbda6..643bd40 100644 --- a/doc/manual.sty +++ b/doc/manual.sty @@ -31,3 +31,10 @@ \fancyfoot[CO]{\fancyplain{}{}} \fancyfoot[RO]{\fancyplain{}{}} +% Define caption that is also suitable in a table +\makeatletter +\def\doxyfigcaption{% +\refstepcounter{figure}% +\@dblarg{\@caption{figure}}} +\makeatother + diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp index 303c6ba..184511f 100644 --- a/src/latexdocvisitor.cpp +++ b/src/latexdocvisitor.cpp @@ -114,7 +114,7 @@ static void visitPreStart(FTextStream &t, const bool hasCaption, QCString name, if (hasCaption) { - t << "\n\\caption{"; + t << "\n\\doxyfigcaption{"; } } diff --git a/templates/latex/doxygen.sty b/templates/latex/doxygen.sty index 3f21871..687a1af 100644 --- a/templates/latex/doxygen.sty +++ b/templates/latex/doxygen.sty @@ -475,3 +475,10 @@ % Color used for table heading \newcommand{\tableheadbgcolor}{lightgray}% + +% Define caption that is also suitable in a table +\makeatletter +\def\doxyfigcaption{% +\refstepcounter{figure}% +\@dblarg{\@caption{figure}}} +\makeatother |