Merge pull request #441 from albert-github/feature/bug_image_in_table

PDF generation stops when image with caption is included in a table.
doxygen · Jan 17, 2016 · 41e7143 · 41e7143
2 parents 4d91798 + 1d77a4e
commit 41e7143
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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