From: Juergen Spitzmueller <spitz@lyx.org>
Date: Fri, 17 Apr 2020 07:12:51 +0000 (+0200)
Subject: Fix tablefootnote loading order (#11841)
X-Git-Tag: 2.3.5~58
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e41c790f9156e3b889e4b4f48653380c7a5c737d;p=features.git

Fix tablefootnote loading order (#11841)

(cherry picked from commit 5bc66b5f4564633d1c87fb6b00e0700d5aa1bca2)
---

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 7af795d54b..a9ad21ca2c 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -1020,7 +1020,6 @@ char const * simplefeatures[] = {
 	"todonotes",
 	"forest",
 	"varwidth",
-	"tablefootnote",
 	"environ"
 };
 
@@ -1250,6 +1249,9 @@ string const LaTeXFeatures::getPackages() const
 		packages << "\\usepackage{rotating}\n";
 	if (mustProvide("rotfloat"))
 		packages << "\\usepackage{rotfloat}\n";
+	// and this must be loaded after rotating
+	if (mustProvide("tablefootnote"))
+		packages << "\\usepackage{tablefootnote}\n";
 
 	// lyxskak.sty --- newer chess support based on skak.sty
 	if (mustProvide("chess"))
diff --git a/status.23x b/status.23x
index d184ac55d0..dd7693e3ef 100644
--- a/status.23x
+++ b/status.23x
@@ -69,6 +69,8 @@ What's new
 
 - Don't open a new instance just because no files are given (bug 11635).
 
+- Fix tablefootnote loading order (bug 11841).
+
 
 * USER INTERFACE