commit 29355d34d505ee873ca95100b93ffc1bede1573c
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Wed Jul 25 18:01:22 2018 +0200

    Use footnotehyper rather than footnote if hyperref is used
    
    Fixes: #11212
    (cherry picked from commit f8e286b82328b545172f0f9ab6b26530837c06b2)
---
 lib/chkconfig.ltx     |    1 +
 src/LaTeXFeatures.cpp |    8 +++++++-
 status.23x            |    2 ++
 3 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 4adc56a..5e7c86e 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -316,6 +316,7 @@
 \TestPackage{fontspec}
 \TestPackage{footmisc}
 \TestPackage{footnote}
+\TestPackage{footnotehyper}
 \TestPackage{forest}
 \TestPackage{framed}
 \TestPackage{geometry}
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 0291242..6b047bf 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -974,7 +974,6 @@ char const * simplefeatures[] = {
        "todonotes",
        "forest",
        "varwidth",
-       "footnote",
        "tablefootnote",
 };
 
@@ -1098,6 +1097,13 @@ string const LaTeXFeatures::getPackages() const
        // The rest of these packages are somewhat more complicated
        // than those above.
 
+       if (mustProvide("footnote")) {
+               if (isRequired("hyperref"))
+                       packages << "\\usepackage{footnotehyper}\n";
+               else
+                       packages << "\\usepackage{footnote}\n";
+       }
+
        // [pdf]lscape is used to rotate longtables
        if (mustProvide("lscape")) {
                if (runparams_.flavor == OutputParams::LATEX
diff --git a/status.23x b/status.23x
index 6648a1b..65f296e 100644
--- a/status.23x
+++ b/status.23x
@@ -52,6 +52,8 @@ What's new
 
 * DOCUMENT INPUT/OUTPUT
 
+- Fix footnotes in table with hyperref (bug 11212).
+
 - When cloning a buffer, do not start from a parent if it is not the
   current master (e.g., when compiling a child alone).
 

Reply via email to