From: Georg Baum <baum@lyx.org>
Date: Sun, 23 Feb 2014 09:55:23 +0000 (+0100)
Subject: Fix bug #8992 without reintroducing #8933
X-Git-Tag: 2.1.0rc1~167
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=418d4c02d2c0e9635920ed95fcdebac17540f35d;p=lyx.git

Fix bug #8992 without reintroducing #8933

At efa0f198 I introduced a more flexible caption handling for long tables.
This was needed to fix tex2lyx bug #7412. Unfortunately this created bug #8933,
since I forgot to output captions to LaTeX which are not in any header or
footer. This was fixed at 2b941da7f, but this introduced bug #8992 (duplicate
caption output).
This commit is hopefully the final fix: Captions which are in header or footer
lines are output with the header or footer line, and captions in standard
lines are output standalone.
---

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 51f579ea39..c7f77fa816 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -2451,10 +2451,12 @@ void Tabular::TeXLongtableHeaderFooter(otexstream & os,
 		return;
 
 	// caption handling
-	// the caption must be output before the headers
+	// output caption which is in no header or footer
 	if (haveLTCaption()) {
 		for (row_type r = 0; r < nrows(); ++r) {
-			if (row_info[r].caption)
+			if (row_info[r].caption &&
+			    !row_info[r].endfirsthead && !row_info[r].endhead &&
+			    !row_info[r].endfoot && !row_info[r].endlastfoot)
 				TeXRow(os, r, runparams);
 		}
 	}