From 6e8eb123c6514c1d394bc9a3064da18abc82b9fa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 24 Jan 2018 21:50:28 +0000 Subject: footnotehyper (24jan18) git-svn-id: svn://tug.org/texlive/trunk@46431 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/footnotehyper/README.md | 4 +- .../doc/latex/footnotehyper/footnotehyper.pdf | Bin 54585 -> 57912 bytes .../doc/latex/footnotehyper/footnotehyper.tex | 10 ++-- .../source/latex/footnotehyper/footnotehyper.dtx | 55 ++++++++++++++++----- .../source/latex/footnotehyper/footnotehyper.ins | 10 ++-- .../tex/latex/footnotehyper/footnotehyper.sty | 16 ++++-- 6 files changed, 65 insertions(+), 30 deletions(-) diff --git a/Master/texmf-dist/doc/latex/footnotehyper/README.md b/Master/texmf-dist/doc/latex/footnotehyper/README.md index 79711564465..a9ca08ed8c3 100644 --- a/Master/texmf-dist/doc/latex/footnotehyper/README.md +++ b/Master/texmf-dist/doc/latex/footnotehyper/README.md @@ -1,10 +1,10 @@ - Source: footnotehyper.dtx (v1.0 2017/03/07) + Source: footnotehyper.dtx (v1.1 2018/01/23) Author: Jean-Francois Burnol Info: hyperref aware footnote.sty License: LPPL 1.3c - Copyright (C) 2016-2017 Jean-Francois Burnol . + Copyright (C) 2016-2018 Jean-Francois Burnol . ABSTRACT ======== diff --git a/Master/texmf-dist/doc/latex/footnotehyper/footnotehyper.pdf b/Master/texmf-dist/doc/latex/footnotehyper/footnotehyper.pdf index ff2c80ca3ec..129b44fc1e8 100644 Binary files a/Master/texmf-dist/doc/latex/footnotehyper/footnotehyper.pdf and b/Master/texmf-dist/doc/latex/footnotehyper/footnotehyper.pdf differ diff --git a/Master/texmf-dist/doc/latex/footnotehyper/footnotehyper.tex b/Master/texmf-dist/doc/latex/footnotehyper/footnotehyper.tex index 1fa716ca88d..9ca0b3971ea 100644 --- a/Master/texmf-dist/doc/latex/footnotehyper/footnotehyper.tex +++ b/Master/texmf-dist/doc/latex/footnotehyper/footnotehyper.tex @@ -1,13 +1,13 @@ %% %% Package: footnotehyper -%% Version: 1.0 (2017/03/07) +%% Version: 1.1 (2018/01/23) %% License: LPPL 1.3c -%% Copyright (C) 2016-2017 Jean-Francois Burnol . +%% Copyright (C) 2016-2018 Jean-Francois Burnol . %% \def\pkgname {footnotehyper} -\def\pkgdate {2017/03/07} -\def\docdate {2017/03/07} -\def\pkgversion {v1.0} +\def\pkgdate {2018/01/23} +\def\docdate {2018/01/23} +\def\pkgversion {v1.1} \def\pkgdescription {hyperref aware footnote.sty (JFB)} %% %% run latex twice on this file footnotehyper.tex then dvipdfmx on diff --git a/Master/texmf-dist/source/latex/footnotehyper/footnotehyper.dtx b/Master/texmf-dist/source/latex/footnotehyper/footnotehyper.dtx index 30ef0d93035..5c87bff6201 100644 --- a/Master/texmf-dist/source/latex/footnotehyper/footnotehyper.dtx +++ b/Master/texmf-dist/source/latex/footnotehyper/footnotehyper.dtx @@ -1,20 +1,20 @@ % -*- coding: utf-8; time-stamp-format: "%02d-%02m-%:y at %02H:%02M:%02S %Z" -*- %<*none> -\def\dtxtimestamp {Time-stamp: <07-03-2017 at 11:11:11 CET>} +\def\dtxtimestamp {Time-stamp: <23-01-2018 at 20:31:53 CET>} % %<*!readme> %% %% Package: footnotehyper -%% Version: 1.0 (2017/03/07) +%% Version: 1.1 (2018/01/23) %% License: LPPL 1.3c -%% Copyright (C) 2016-2017 Jean-Francois Burnol . +%% Copyright (C) 2016-2018 Jean-Francois Burnol . %% % %<*insfile|tex> \def\pkgname {footnotehyper} -\def\pkgdate {2017/03/07} -\def\docdate {2017/03/07} -\def\pkgversion {v1.0} +\def\pkgdate {2018/01/23} +\def\docdate {2018/01/23} +\def\pkgversion {v1.1} \def\pkgdescription {hyperref aware footnote.sty (JFB)} % %<*none> @@ -25,9 +25,9 @@ \catcode32=13\catcode`\\=12^^Brelax^^A ^^Bfirstofone{^^Bendgroup^^Bdef^^BpkgLicense^^A {% Package: footnotehyper -% Version: 1.0 (2017/03/07) +% Version: 1.1 (2018/01/23) % License: LPPL 1.3c -% Copyright (C) 2016-2017 Jean-Francois Burnol . +% Copyright (C) 2016-2018 Jean-Francois Burnol . % % This Work may be distributed and/or modified under the conditions % of the LaTeX Project Public License, version 1.3c. This version of @@ -54,11 +54,11 @@ %<*readme> - Source: footnotehyper.dtx (v1.0 2017/03/07) + Source: footnotehyper.dtx (v1.1 2018/01/23) Author: Jean-Francois Burnol Info: hyperref aware footnote.sty License: LPPL 1.3c - Copyright (C) 2016-2017 Jean-Francois Burnol . + Copyright (C) 2016-2018 Jean-Francois Burnol . ABSTRACT @@ -392,6 +392,13 @@ interface. Since |v1.0|, \fnh is usable also in absence of |hyperref| or when the latter was passed |hyperfootnotes=false| option. +Version |v1.1| fixes a bug which arose when |savenotes| environment was used +\emph{inside} a minipage: footnotes were disappearing!% +% +\footnote{Thanks to François Pantigny for reporting the bug.} +% +See related remarks at end of \autoref{sec:notes}. + The package thus provides: \begin{itemize} \item a |savenotes| environment which re-routes footnotes and delivers them at @@ -554,7 +561,7 @@ And a final footnote, done with |\begin{footnote}[57]|% \end{footnote}. There is no problem with the hyperlink, then. -\section{Notes} +\section{Notes}\label{sec:notes} A few items worth of mention: \begin{itemize}[nosep] @@ -591,6 +598,18 @@ A few items worth of mention: \item some environments typeset multiple times their contents, which causes issues; \fnh takes provisions only to handle the |amsmath| measuring step. +\item + \LaTeX2e has some features when using footnotes in |minipage|'s + which are themselves in a |minipage| which may also have footnotes externally + to the internal minipages... try it out with some |\fbox|es around the + sub-|minipages|, to see. + + \fnh behaves like original package |footnote| in such contexts. Only + reasonable usage seems to embed the entire contents of the external minipage + in a |savenotes| environment. But there will anyhow be collisions of the + alphabetic enumerations. These collisions are there with or without \fnh (or + |footnote.sty|.) I did not make any attempt, nor intend to in future, to + address in an automatized manner these problematic contexts. \end{itemize} \StopEventually{\end{document}\endinput} @@ -673,6 +692,7 @@ A few items worth of mention: \let\FNH@latex@footnote \footnote \let\FNH@latex@footnotetext\footnotetext \let\FNH@H@@footnotetext \@footnotetext + \let\FNH@H@@mpfootnotetext \@mpfootnotetext \newenvironment{savenotes} {\FNH@savenotes\ignorespaces}{\FNH@spewnotes\ignorespacesafterend}% \let\spewnotes \FNH@spewnotes @@ -683,6 +703,7 @@ A few items worth of mention: \@ifpackageloaded{hyperref} {\ifHy@hyperfootnotes \let\FNH@H@@footnotetext\H@@footnotetext + \let\FNH@H@@mpfootnotetext\H@@mpfootnotetext \else \let\FNH@hyper@fntext\FNH@nohyp@fntext \fi}% @@ -782,7 +803,7 @@ A few items worth of mention: \FNH@savingnotestrue \let\@footnotetext \FNH@hyper@fntext \let\@mpfootnotetext \FNH@hyper@fntext - \let\H@@mpfootnotetext\FNH@nohyp@fntext % fool hyperref's \@xfootnotetext + \let\H@@mpfootnotetext\FNH@nohyp@fntext % fool hyperref's \@xfootnotenext \FNH@width\columnwidth \let\FNH@colwidth\FNH@width \global\setbox\FNH@notes\box\voidb@x @@ -802,6 +823,10 @@ A few items worth of mention: % This uses \cs{FNH@H@@footnotetext} which is the % \cs{H@@footnotetext} |hyperref|'s preserved original % meaning of \cs{@footnotetext} not creating a link target. +% +% |v1.1| fixes the bug about disappearing footnotes if |savenotes| environment +% is used inside a minipage. I had never really considered such usage, hence +% missed realizing there was a bug. % \begin{macrocode} \def\FNH@spewnotes {% \endgroup @@ -811,7 +836,11 @@ A few items worth of mention: \let\@makefntext\@empty \let\@finalstrut\@gobble \let\rule\@gobbletwo - \FNH@H@@footnotetext{\unvbox\FNH@notes}% + \ifx\@footnotetext\@mpfootnotetext + \expandafter\FNH@H@@mpfootnotetext + \else + \expandafter\FNH@H@@footnotetext + \fi{\unvbox\FNH@notes}% \endgroup \fi \fi diff --git a/Master/texmf-dist/source/latex/footnotehyper/footnotehyper.ins b/Master/texmf-dist/source/latex/footnotehyper/footnotehyper.ins index adab4a64da1..68fa4ca6c24 100644 --- a/Master/texmf-dist/source/latex/footnotehyper/footnotehyper.ins +++ b/Master/texmf-dist/source/latex/footnotehyper/footnotehyper.ins @@ -1,13 +1,13 @@ %% %% Package: footnotehyper -%% Version: 1.0 (2017/03/07) +%% Version: 1.1 (2018/01/23) %% License: LPPL 1.3c -%% Copyright (C) 2016-2017 Jean-Francois Burnol . +%% Copyright (C) 2016-2018 Jean-Francois Burnol . %% \def\pkgname {footnotehyper} -\def\pkgdate {2017/03/07} -\def\docdate {2017/03/07} -\def\pkgversion {v1.0} +\def\pkgdate {2018/01/23} +\def\docdate {2018/01/23} +\def\pkgversion {v1.1} \def\pkgdescription {hyperref aware footnote.sty (JFB)} %% %% Run tex on this file to extract from footnotehyper.dtx: diff --git a/Master/texmf-dist/tex/latex/footnotehyper/footnotehyper.sty b/Master/texmf-dist/tex/latex/footnotehyper/footnotehyper.sty index 5961bfecf9f..2d204d256dd 100644 --- a/Master/texmf-dist/tex/latex/footnotehyper/footnotehyper.sty +++ b/Master/texmf-dist/tex/latex/footnotehyper/footnotehyper.sty @@ -23,12 +23,12 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{footnotehyper}% - [2017/03/07 v1.0 hyperref aware footnote.sty (JFB)] + [2018/01/23 v1.1 hyperref aware footnote.sty (JFB)] %% %% Package: footnotehyper -%% Version: 1.0 (2017/03/07) +%% Version: 1.1 (2018/01/23) %% License: LPPL 1.3c -%% Copyright (C) 2016-2017 Jean-Francois Burnol . +%% Copyright (C) 2016-2018 Jean-Francois Burnol . %% \DeclareOption*% {\PackageWarning{footnotehyper}{Option `\CurrentOption' is unknown}}% @@ -41,6 +41,7 @@ \let\FNH@latex@footnote \footnote \let\FNH@latex@footnotetext\footnotetext \let\FNH@H@@footnotetext \@footnotetext + \let\FNH@H@@mpfootnotetext \@mpfootnotetext \newenvironment{savenotes} {\FNH@savenotes\ignorespaces}{\FNH@spewnotes\ignorespacesafterend}% \let\spewnotes \FNH@spewnotes @@ -51,6 +52,7 @@ \@ifpackageloaded{hyperref} {\ifHy@hyperfootnotes \let\FNH@H@@footnotetext\H@@footnotetext + \let\FNH@H@@mpfootnotetext\H@@mpfootnotetext \else \let\FNH@hyper@fntext\FNH@nohyp@fntext \fi}% @@ -107,7 +109,7 @@ \FNH@savingnotestrue \let\@footnotetext \FNH@hyper@fntext \let\@mpfootnotetext \FNH@hyper@fntext - \let\H@@mpfootnotetext\FNH@nohyp@fntext % fool hyperref's \@xfootnotetext + \let\H@@mpfootnotetext\FNH@nohyp@fntext % fool hyperref's \@xfootnotenext \FNH@width\columnwidth \let\FNH@colwidth\FNH@width \global\setbox\FNH@notes\box\voidb@x @@ -129,7 +131,11 @@ \let\@makefntext\@empty \let\@finalstrut\@gobble \let\rule\@gobbletwo - \FNH@H@@footnotetext{\unvbox\FNH@notes}% + \ifx\@footnotetext\@mpfootnotetext + \expandafter\FNH@H@@mpfootnotetext + \else + \expandafter\FNH@H@@footnotetext + \fi{\unvbox\FNH@notes}% \endgroup \fi \fi -- cgit v1.2.3