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

Dimitri van Heesch · Dimitri van Heesch · commit 41e71437484a · 2016-01-17T16:49:34.000+01:00
PDF generation stops when image with caption is included in a table.
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

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ static void visitPreStart(FTextStream &t, const bool hasCaption, QCString name,`
`114`	`114`
`115`	`115`	`if (hasCaption)`
`116`	`116`	`{`
`117`		`- t << "\n\\caption{";`
	`117`	`+ t << "\n\\doxyfigcaption{";`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`