commit e41c790f9156e3b889e4b4f48653380c7a5c737d
Author: Juergen Spitzmueller <[email protected]>
Date:   Fri Apr 17 09:12:51 2020 +0200

    Fix tablefootnote loading order (#11841)
    
    (cherry picked from commit 5bc66b5f4564633d1c87fb6b00e0700d5aa1bca2)
---
 src/LaTeXFeatures.cpp |    4 +++-
 status.23x            |    2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 7af795d..a9ad21c 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 d184ac5..dd7693e 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
 
-- 
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs

Reply via email to