From 0acb7478bee5acb822df0646c8b4820843dbd0a1 Mon Sep 17 00:00:00 2001
From: Andrew Dunning <adunning@users.noreply.github.com>
Date: Sat, 19 Jan 2019 20:21:40 -0500
Subject: [PATCH 1/3] LaTeX template: Use `footnotehyper` if available

Use the [`footnotehyper`](https://ctan.org/pkg/footnotehyper/) package if available, a rewrite of `footnote` that is compatible with `hyperref` and `babel-frenchb`. This also addresses the incompatibility with `xcolor` noted in #4861, but the new package has only been available since 2016, so this template still loads `xcolor` earlier for compatibility with older distributions. Note that the `footnote` package is part of `collection-latexrecommended` in TeX Live, so there shouldn't be any situations where it isn't available.
---
 data/templates/default.latex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/templates/default.latex b/data/templates/default.latex
index b9dbbb774304..c4c9bb4e42ae 100644
--- a/data/templates/default.latex
+++ b/data/templates/default.latex
@@ -247,8 +247,8 @@ $if(beamer)$
 \def\fnum@table{\tablename~\thetable}
 \makeatother
 $else$
-% Fix footnotes in tables (requires footnote package)
-\IfFileExists{footnote.sty}{\usepackage{footnote}\makesavenoteenv{longtable}}{}
+% Allow footnotes in tables
+\IfFileExists{footnotehyper.sty}{\usepackage{footnotehyper}}{\usepackage{footnote}}\makesavenoteenv{longtable}
 $endif$
 $endif$
 $if(graphics)$

From f46ac4a21f3c6d52382635aa71e39faaf52d27b2 Mon Sep 17 00:00:00 2001
From: Andrew Dunning <adunning@users.noreply.github.com>
Date: Sat, 19 Jan 2019 20:33:57 -0500
Subject: [PATCH 2/3] Update LaTeX package list

---
 MANUAL.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/MANUAL.txt b/MANUAL.txt
index 8954957d2b6a..3326606f93a1 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -145,11 +145,11 @@ When using LaTeX, the following packages need to be available
 [`ifxetex`], [`ifluatex`], [`listings`] (if the
 `--listings` option is used), [`fancyvrb`], [`longtable`],
 [`booktabs`], [`graphicx`] and [`grffile`] (if the document
-contains images), [`hyperref`], [`xcolor`] (with `colorlinks`),
+contains images), [`hyperref`], [`xcolor`],
 [`ulem`], [`geometry`] (with the `geometry` variable set),
 [`setspace`] (with `linestretch`), and
 [`babel`] (with `lang`).  The use of `xelatex` or `lualatex` as
-the LaTeX engine requires [`fontspec`].  `xelatex` uses
+the PDF engine requires [`fontspec`].  `xelatex` uses
 [`polyglossia`] (with `lang`), [`xecjk`], and [`bidi`] (with the
 `dir` variable set). If the `mathspec` variable is set,
 `xelatex` will use [`mathspec`] instead of [`unicode-math`].
@@ -166,7 +166,7 @@ pandoc does not require them to be present:
 [`parskip`] (for better inter-paragraph spaces),
 [`xurl`] (for better line breaks in URLs),
 [`bookmark`] (for better PDF bookmarks),
-and [`footnote`] (to fix footnotes in tables).
+and [`footnotehyper`] or [`footnote`] (to allow footnotes in tables).
 
 [TeX Live]: http://www.tug.org/texlive/
 [`amsfonts`]: https://ctan.org/pkg/amsfonts
@@ -182,6 +182,7 @@ and [`footnote`] (to fix footnotes in tables).
 [`fancyvrb`]: https://ctan.org/pkg/fancyvrb
 [`fontspec`]: https://ctan.org/pkg/fontspec
 [`footnote`]: https://ctan.org/pkg/footnote
+[`footnotehyper`]: https://ctan.org/pkg/footnotehyper
 [`geometry`]: https://ctan.org/pkg/geometry
 [`graphicx`]: https://ctan.org/pkg/graphicx
 [`grffile`]: https://ctan.org/pkg/grffile
@@ -203,6 +204,7 @@ and [`footnote`] (to fix footnotes in tables).
 [`upquote`]: https://ctan.org/pkg/upquote
 [`weasyprint`]: http://weasyprint.org
 [`wkhtmltopdf`]: https://wkhtmltopdf.org
+[`xcolor`]: https://ctan.org/pkg/xcolor
 [`xecjk`]: https://ctan.org/pkg/xecjk
 [`xurl`]: https://ctan.org/pkg/xurl
 
@@ -1606,7 +1608,6 @@ LaTeX variables are used when [creating a PDF].
 [`book`]: https://ctan.org/pkg/book
 [KOMA-Script]: https://ctan.org/pkg/koma-script
 [`memoir`]: https://ctan.org/pkg/memoir
-[`xcolor`]: https://ctan.org/pkg/xcolor
 [LaTeX Font Catalogue]: http://www.tug.dk/FontCatalogue/
 [`mathpazo`]: https://ctan.org/pkg/mathpazo
 [LaTeX font encodings]: https://ctan.org/pkg/encguide

From a703a00e7a0683379c1640e237263f063a95258f Mon Sep 17 00:00:00 2001
From: Andrew Dunning <adunning@users.noreply.github.com>
Date: Tue, 22 Jan 2019 07:44:34 -0500
Subject: [PATCH 3/3] LaTeX template: Clarify footnote table patch

---
 data/templates/default.latex | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/templates/default.latex b/data/templates/default.latex
index c4c9bb4e42ae..a25a0e52cd98 100644
--- a/data/templates/default.latex
+++ b/data/templates/default.latex
@@ -247,8 +247,9 @@ $if(beamer)$
 \def\fnum@table{\tablename~\thetable}
 \makeatother
 $else$
-% Allow footnotes in tables
-\IfFileExists{footnotehyper.sty}{\usepackage{footnotehyper}}{\usepackage{footnote}}\makesavenoteenv{longtable}
+% Allow footnotes in longtable head/foot
+\IfFileExists{footnotehyper.sty}{\usepackage{footnotehyper}}{\usepackage{footnote}}
+\makesavenoteenv{longtable}
 $endif$
 $endif$
 $if(graphics)$