footnotehyper (7nov19)

git-svn-id: svn://tug.org/texlive/trunk@52676 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 96 insertions, 145 deletions

diff --git a/Master/texmf-dist/doc/latex/footnotehyper/README.md b/Master/texmf-dist/doc/latex/footnotehyper/README.md
index a9ca08ed8c3..8dc69945efd 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.1 2018/01/23)
+    Source:  footnotehyper.dtx (v1.1a 2019/11/07)
     Author:  Jean-Francois Burnol
     Info:    hyperref aware footnote.sty
     License: LPPL 1.3c
-    Copyright (C) 2016-2018 Jean-Francois Burnol <jfbu at free dot fr>.
+    Copyright (C) 2016-2019 Jean-Francois Burnol <jfbu at free dot fr>.
 
 ABSTRACT
 ========
@@ -34,22 +34,31 @@ loaded with its `hyperfootnotes=false` option. The order of loading of
 INSTALLATION
 ============
 
-To extract the package (.sty) and driver (.tex) files from
-footnotehyper.dtx:
+The recommended way is to first extract the package (.sty)
+and driver (.tex) files from footnotehyper.dtx via
 
-- if footnotehyper.ins is present:   etex footnotehyper.ins
-- without footnotehyper.ins:         etex footnotehyper.dtx
-- or run latex or pdflatex directly on footnotehyper.dtx
+    tex footnotehyper.dtx
 
-At least three ways to produce footnotehyper.pdf (method (1) is
-preferred):
+and then produce the documentation via
 
-1. latex footnotehyper.tex (twice), then dvipdfmx
-2. pdflatex footnotehyper.dtx (twice)
-3. latex footnotehyper.dtx (twice), then dvips, then ps2pdf
+    latex footnotehyper.tex (twice)
+    dvipdfmx footnotehyper.dvi
 
-Method (1) produces the smallest pdf files.
-Options can be set in footnotehyper.tex:
+It is also possible to produce simultaneously the package
+and the documentation via one of these two routes:
+
+    pdflatex footnotehyper.dtx (twice)
+
+or
+
+    latex footnotehyper.dtx (twice)
+    dvips
+    ps2pdf
+
+The method using the extracted file footnotehyper.tex produces
+the smallest pdf file and is the officially preferred one as
+it allows to set options in footnotehyper.tex to customize the
+footnotehyper.pdf file:
 
 - scrdoc class options (paper size, font size, ...)
 - with or without source code,
@@ -84,6 +93,6 @@ The Author of this Work is:
 
 - Jean-Francois Burnol `<jfbu at free dot fr>`
 
-This Work consists of the main source file footnotehyper.dtx and the
-derived files footnotehyper.sty, footnotehyper.ins, footnotehyper.tex,
+This Work consists of the main source file footnotehyper.dtx
+and the derived files footnotehyper.sty, footnotehyper.tex,
 footnotehyper.pdf, footnotehyper.dvi.
diff --git a/Master/texmf-dist/doc/latex/footnotehyper/footnotehyper.pdf b/Master/texmf-dist/doc/latex/footnotehyper/footnotehyper.pdf
index 129b44fc1e8..13b98643f05 100644
--- a/Master/texmf-dist/doc/latex/footnotehyper/footnotehyper.pdf
+++ b/Master/texmf-dist/doc/latex/footnotehyper/footnotehyper.pdf
diff --git a/Master/texmf-dist/doc/latex/footnotehyper/footnotehyper.tex b/Master/texmf-dist/doc/latex/footnotehyper/footnotehyper.tex
index 9ca0b3971ea..731bfedcc76 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.1 (2018/01/23)
+%% Version: 1.1a (2019/11/07)
 %% License: LPPL 1.3c
-%% Copyright (C) 2016-2018 Jean-Francois Burnol <jfbu at free dot fr>.
+%% Copyright (C) 2016-2019 Jean-Francois Burnol <jfbu at free dot fr>.
 %%
 \def\pkgname        {footnotehyper}
-\def\pkgdate        {2018/01/23}
-\def\docdate        {2018/01/23}
-\def\pkgversion     {v1.1}
+\def\pkgdate        {2019/11/07}
+\def\docdate        {2019/11/07}
+\def\pkgversion     {v1.1a}
 \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 5c87bff6201..204c40a2bcd 100644
--- a/Master/texmf-dist/source/latex/footnotehyper/footnotehyper.dtx
+++ b/Master/texmf-dist/source/latex/footnotehyper/footnotehyper.dtx
@@ -1,22 +1,22 @@
 % -*- coding: utf-8; time-stamp-format: "%02d-%02m-%:y at %02H:%02M:%02S %Z" -*-
 %<*none>
-\def\dtxtimestamp {Time-stamp: <23-01-2018 at 20:31:53 CET>}
+\def\dtxtimestamp {Time-stamp: <07-11-2019 at 17:09:56 CET>}
 %</none>
 %<*!readme>
 %%
 %% Package: footnotehyper
-%% Version: 1.1 (2018/01/23)
+%% Version: 1.1a (2019/11/07)
 %% License: LPPL 1.3c
-%% Copyright (C) 2016-2018 Jean-Francois Burnol <jfbu at free dot fr>.
+%% Copyright (C) 2016-2019 Jean-Francois Burnol <jfbu at free dot fr>.
 %%
 %</!readme>
-%<*insfile|tex>
+%<*tex>
 \def\pkgname        {footnotehyper}
-\def\pkgdate        {2018/01/23}
-\def\docdate        {2018/01/23}
-\def\pkgversion     {v1.1}
+\def\pkgdate        {2019/11/07}
+\def\docdate        {2019/11/07}
+\def\pkgversion     {v1.1a}
 \def\pkgdescription {hyperref aware footnote.sty (JFB)}
-%</insfile|tex>
+%</tex>
 %<*none>
 % Definition of \pkgLicense
 \begingroup% cette méthode ne marcherait pas avec caractères en dehors de 32-127
@@ -25,9 +25,9 @@
     \catcode32=13\catcode`\\=12^^Brelax^^A
 ^^Bfirstofone{^^Bendgroup^^Bdef^^BpkgLicense^^A
 {% Package: footnotehyper
-% Version: 1.1 (2018/01/23)
+% Version: 1.1a (2019/11/07)
 % License: LPPL 1.3c
-% Copyright (C) 2016-2018 Jean-Francois Burnol <jfbu at free dot fr>.
+% Copyright (C) 2016-2019 Jean-Francois Burnol <jfbu at free dot fr>.
 %
 % 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.1 2018/01/23)
+    Source:  footnotehyper.dtx (v1.1a 2019/11/07)
     Author:  Jean-Francois Burnol
     Info:    hyperref aware footnote.sty
     License: LPPL 1.3c
-    Copyright (C) 2016-2018 Jean-Francois Burnol <jfbu at free dot fr>.
+    Copyright (C) 2016-2019 Jean-Francois Burnol <jfbu at free dot fr>.
 
 
 ABSTRACT
@@ -89,22 +89,31 @@ loaded with its `hyperfootnotes=false` option. The order of loading of
 INSTALLATION
 ============
 
-To extract the package (.sty) and driver (.tex) files from
-footnotehyper.dtx:
+The recommended way is to first extract the package (.sty)
+and driver (.tex) files from footnotehyper.dtx via
 
-- if footnotehyper.ins is present:   etex footnotehyper.ins
-- without footnotehyper.ins:         etex footnotehyper.dtx
-- or run latex or pdflatex directly on footnotehyper.dtx
+    tex footnotehyper.dtx
 
-At least three ways to produce footnotehyper.pdf (method (1) is
-preferred):
+and then produce the documentation via
 
-1. latex footnotehyper.tex (twice), then dvipdfmx
-2. pdflatex footnotehyper.dtx (twice)
-3. latex footnotehyper.dtx (twice), then dvips, then ps2pdf
+    latex footnotehyper.tex (twice)
+    dvipdfmx footnotehyper.dvi
 
-Method (1) produces the smallest pdf files.
-Options can be set in footnotehyper.tex:
+It is also possible to produce simultaneously the package
+and the documentation via one of these two routes:
+
+    pdflatex footnotehyper.dtx (twice)
+
+or
+
+    latex footnotehyper.dtx (twice)
+    dvips
+    ps2pdf
+
+The method using the extracted file footnotehyper.tex produces
+the smallest pdf file and is the officially preferred one as
+it allows to set options in footnotehyper.tex to customize the
+footnotehyper.pdf file:
 
 - scrdoc class options (paper size, font size, ...)
 - with or without source code,
@@ -140,8 +149,8 @@ The Author of this Work is:
 
 - Jean-Francois Burnol `<jfbu at free dot fr>`
 
-This Work consists of the main source file footnotehyper.dtx and the
-derived files footnotehyper.sty, footnotehyper.ins, footnotehyper.tex,
+This Work consists of the main source file footnotehyper.dtx
+and the derived files footnotehyper.sty, footnotehyper.tex,
 footnotehyper.pdf, footnotehyper.dvi.
 %</readme>
 %<*tex>-------------------------------------------------------------------------
@@ -161,42 +170,6 @@ footnotehyper.pdf, footnotehyper.dvi.
 %%% mode: latex
 %%% End:
 %</tex>-------------------------------------------------------------------------
-%<*insfile>---------------------------------------------------------------------
-%%
-%% Run tex on this file to extract from footnotehyper.dtx:
-%%        footnotehyper.sty, footnotehyper.tex, and README.md
-%%
-%% Refer to README.md for installation instructions, if needed.
-%%
-\input docstrip.tex
-\askforoverwritefalse
-\def\pkgpreamble{\defaultpreamble^^J\MetaPrefix^^J%
-\string\NeedsTeXFormat{LaTeX2e}^^J%
-\string\ProvidesPackage{\pkgname}\perCent^^J%
-\space[\pkgdate\space\pkgversion\space\pkgdescription]}%
-\generate{\nopreamble\nopostamble
-\file{README.md}{\from{\pkgname.dtx}{readme}}%
-\usepostamble\defaultpostamble
-\file{\pkgname.tex}{\from{\pkgname.dtx}{tex}}%
-\usepreamble\pkgpreamble
-\file{\pkgname.sty}{\from{\pkgname.dtx}{package}}}%
-\catcode32=13\relax% active space
-\let =\space%
-\Msg{************************************************************************}
-\Msg{*}
-\Msg{* To finish the installation you have to move the following}
-\Msg{* file into a directory searched by TeX:}
-\Msg{*}
-\Msg{*     \pkgname.sty}
-\Msg{*}
-\Msg{* To produce the documentation run latex twice on file \pkgname.tex}
-\Msg{* and then run dvipdfmx on file \pkgname.dvi.}
-\Msg{*}
-\Msg{* Happy TeXing!}
-\Msg{*}
-\Msg{************************************************************************}
-\endbatchfile
-%</insfile>---------------------------------------------------------------------
 %<*none>------------------------------------------------------------------------
 ^^Afi^^Aendgroup
 %
@@ -248,7 +221,6 @@ footnotehyper.pdf, footnotehyper.dvi.
     \generate{\nopreamble\nopostamble
     \file{README.md}{\from{\pkgname.dtx}{readme}}%
     \usepostamble\defaultpostamble
-    \file{\pkgname.ins}{\from{\pkgname.dtx}{insfile}}%
     \file{\pkgname.tex}{\from{\pkgname.dtx}{tex}}%
     \usepreamble\pkgpreamble
     \file{\pkgname.sty}{\from{\pkgname.dtx}{package}}}%
@@ -395,7 +367,9 @@ 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.}
+\footnote{Thanks to François Pantigny for reporting the bug.
+  A later suggestion of the same is to let the package do nothing under
+  Beamer class, and this is what |v1.1a 2019/11/07| does.}
 %
 See related remarks at end of \autoref{sec:notes}.
 
@@ -599,14 +573,15 @@ A few items worth of mention:
   which causes issues; \fnh takes provisions only to handle the
   |amsmath| measuring step.
 \item
-  \LaTeX2e has some features when using footnotes in |minipage|'s
+  \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
+  \fnh behaves like original package |footnote| when the |savenotes|
+  environment is used \emph{inside} a minipage. Only reasonable usage in case
+  of nested minipages seems to use only a single top level (i.e. external)
+  |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.
@@ -665,6 +640,14 @@ A few items worth of mention:
 \ProcessOptions\relax
 %    \end{macrocode}
 % \end{macro}
+% |v1.1a| lets the package abort under Beamer class and warn user.
+%    \begin{macrocode}
+\@ifclassloaded{beamer}
+    {\PackageWarningNoLine{footnotehyper}{This package is
+        incompatible with the beamer class. Aborting input..}%
+     \endinput}
+    {}%
+%    \end{macrocode}
 % Versions up to |v0.9f| loaded |footnote.sty|, with lots of patching
 % afterwards. Starting with |v0.99|, \fnh does everything by itself with |FNH@|
 % prefix. Brief overview of some of the fixed issues:
@@ -791,7 +774,7 @@ A few items worth of mention:
 % \end{macro}
 % \begin{macro}{\FNH@savenotes}
 % Same as original apart from using |hyperref|-aware \cs{FNH@hyper@fntext},
-% and taking into account |hyperref|'s custom \cs{@xfootnotetext}. This was
+% and taking into account |hyperref|'s custom \cs{@xfootnotenext}. This was
 % missed by |v0.9f| hence |\footnotetext[N]{..}| did not work
 % inside |savenotes| environment. Fixed for |v0.99|.
 % 
@@ -996,8 +979,9 @@ A few items worth of mention:
 \def\FNH@bad@makefntext@alert{%
     \PackageWarningNoLine{footnotehyper}%
       {^^J The footnote environment will not be fully functional, sorry.^^J
-       You may try to email the author with the following information:}%
-    \typeout{\meaning\@makefntext}%
+       You may try to email the author this meaning of \string\@makefntext:^^J
+       \meaning\@makefntext^^J
+       together with the used preamble}%
     \let\FNH@prefntext\@empty\let\FNH@postfntext\@empty
 }%
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/footnotehyper/footnotehyper.ins b/Master/texmf-dist/source/latex/footnotehyper/footnotehyper.ins
deleted file mode 100644
index 68fa4ca6c24..00000000000
--- a/Master/texmf-dist/source/latex/footnotehyper/footnotehyper.ins
+++ /dev/null
@@ -1,48 +0,0 @@
-%%
-%% Package: footnotehyper
-%% Version: 1.1 (2018/01/23)
-%% License: LPPL 1.3c
-%% Copyright (C) 2016-2018 Jean-Francois Burnol <jfbu at free dot fr>.
-%%
-\def\pkgname        {footnotehyper}
-\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:
-%%        footnotehyper.sty, footnotehyper.tex, and README.md
-%%
-%% Refer to README.md for installation instructions, if needed.
-%%
-\input docstrip.tex
-\askforoverwritefalse
-\def\pkgpreamble{\defaultpreamble^^J\MetaPrefix^^J%
-\string\NeedsTeXFormat{LaTeX2e}^^J%
-\string\ProvidesPackage{\pkgname}\perCent^^J%
-\space[\pkgdate\space\pkgversion\space\pkgdescription]}%
-\generate{\nopreamble\nopostamble
-\file{README.md}{\from{\pkgname.dtx}{readme}}%
-\usepostamble\defaultpostamble
-\file{\pkgname.tex}{\from{\pkgname.dtx}{tex}}%
-\usepreamble\pkgpreamble
-\file{\pkgname.sty}{\from{\pkgname.dtx}{package}}}%
-\catcode32=13\relax% active space
-\let =\space%
-\Msg{************************************************************************}
-\Msg{*}
-\Msg{* To finish the installation you have to move the following}
-\Msg{* file into a directory searched by TeX:}
-\Msg{*}
-\Msg{*     \pkgname.sty}
-\Msg{*}
-\Msg{* To produce the documentation run latex twice on file \pkgname.tex}
-\Msg{* and then run dvipdfmx on file \pkgname.dvi.}
-\Msg{*}
-\Msg{* Happy TeXing!}
-\Msg{*}
-\Msg{************************************************************************}
-\endbatchfile
-\endinput
-%%
-%% End of file `footnotehyper.ins'.
diff --git a/Master/texmf-dist/tex/latex/footnotehyper/footnotehyper.sty b/Master/texmf-dist/tex/latex/footnotehyper/footnotehyper.sty
index 2d204d256dd..568e688e040 100644
--- a/Master/texmf-dist/tex/latex/footnotehyper/footnotehyper.sty
+++ b/Master/texmf-dist/tex/latex/footnotehyper/footnotehyper.sty
@@ -23,16 +23,21 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{footnotehyper}%
- [2018/01/23 v1.1 hyperref aware footnote.sty (JFB)]
+ [2019/11/07 v1.1a hyperref aware footnote.sty (JFB)]
 %%
 %% Package: footnotehyper
-%% Version: 1.1 (2018/01/23)
+%% Version: 1.1a (2019/11/07)
 %% License: LPPL 1.3c
-%% Copyright (C) 2016-2018 Jean-Francois Burnol <jfbu at free dot fr>.
+%% Copyright (C) 2016-2019 Jean-Francois Burnol <jfbu at free dot fr>.
 %%
 \DeclareOption*%
     {\PackageWarning{footnotehyper}{Option `\CurrentOption' is unknown}}%
 \ProcessOptions\relax
+\@ifclassloaded{beamer}
+    {\PackageWarningNoLine{footnotehyper}{This package is
+        incompatible with the beamer class. Aborting input..}%
+     \endinput}
+    {}%
 \newbox\FNH@notes
 \newdimen\FNH@width
 \let\FNH@colwidth\columnwidth
@@ -233,8 +238,9 @@
 \def\FNH@bad@makefntext@alert{%
     \PackageWarningNoLine{footnotehyper}%
       {^^J The footnote environment will not be fully functional, sorry.^^J
-       You may try to email the author with the following information:}%
-    \typeout{\meaning\@makefntext}%
+       You may try to email the author this meaning of \string\@makefntext:^^J
+       \meaning\@makefntext^^J
+       together with the used preamble}%
     \let\FNH@prefntext\@empty\let\FNH@postfntext\@empty
 }%
 \def\makesavenoteenv{\@ifnextchar[\FNH@msne@ii\FNH@msne@i}%]