yafoot (3sep18)

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

7 files changed, 67 insertions, 30 deletions

diff --git a/Master/texmf-dist/doc/latex/yafoot/README b/Master/texmf-dist/doc/latex/yafoot/README
index ca8147bfdd1..e98bc2b7490 100644
--- a/Master/texmf-dist/doc/latex/yafoot/README
+++ b/Master/texmf-dist/doc/latex/yafoot/README
@@ -1,4 +1,4 @@
-yafoot (v1.0): The package for footnotes containing three style files;
+yafoot (v1.1): The package for footnotes containing three style files;
     pfnote:	To enclose footnote numbers within a page
     fnopos:	To control vertical position of footnotes
     dblfnote:	To make footnotes double-columned
@@ -32,4 +32,4 @@ yafoot (v1.0): The package for footnotes containing three style files;
 
 Enjoy!
 
-Hiroshi Nakashima <nakasima@tutics.tut.ac.jp>
+Hiroshi Nakashima <h.nakashima@DOMAIN;  DOMAIN=media.kyoto-u.ac.jp>
diff --git a/Master/texmf-dist/doc/latex/yafoot/yafoot-man.pdf b/Master/texmf-dist/doc/latex/yafoot/yafoot-man.pdf
index 185e25438e9..8725fe4b767 100644
--- a/Master/texmf-dist/doc/latex/yafoot/yafoot-man.pdf
+++ b/Master/texmf-dist/doc/latex/yafoot/yafoot-man.pdf
diff --git a/Master/texmf-dist/doc/latex/yafoot/yafoot-man.tex b/Master/texmf-dist/doc/latex/yafoot/yafoot-man.tex
index fc4438693a9..06d7fb0f57e 100644
--- a/Master/texmf-dist/doc/latex/yafoot/yafoot-man.tex
+++ b/Master/texmf-dist/doc/latex/yafoot/yafoot-man.tex
@@ -20,8 +20,9 @@
 %% original source files, as listed above, are part of the
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
-%% Copyright (C) 1999  Hiroshi Nakashima <nakasima@tutics.tut.ac.jp>
-%%        (Toyohashi Univ. of Tech.)
+%% Copyright (C) 1999-2018
+%%   Hiroshi Nakashima <h.nakashima@DOMAIN;  DOMAIN=media.kyoto-u.ac.jp>
+%%   (Kyoto University)
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License distributed from CTAN
@@ -46,7 +47,7 @@
 %%
 %%
 \ProvidesFile{yafoot-man.tex}
-[1999/07/14 v1.0 ]
+[2018/09/03 v1.1 ]
 \documentclass{ltxdoc}
 \usepackage{pfnote}
 \usepackage{fnpos}
diff --git a/Master/texmf-dist/source/latex/yafoot/yafoot.dtx b/Master/texmf-dist/source/latex/yafoot/yafoot.dtx
index afcc4fdedfc..6c0d1bda17e 100644
--- a/Master/texmf-dist/source/latex/yafoot/yafoot.dtx
+++ b/Master/texmf-dist/source/latex/yafoot/yafoot.dtx
@@ -2,8 +2,9 @@
 %<pfnote>%% Style file `pfnote'.
 %<fnpos>%% Style file `fnpos'.
 %<dblfnote>%% Style file `dblfnote'.
-%% Copyright (C) 1999  Hiroshi Nakashima <nakasima@tutics.tut.ac.jp>
-%%		       (Toyohashi Univ. of Tech.)
+%% Copyright (C) 1999-2018
+%%   Hiroshi Nakashima <h.nakashima@DOMAIN;  DOMAIN=media.kyoto-u.ac.jp>
+%%   (Kyoto University)
 %% 
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License distributed from CTAN
@@ -46,7 +47,7 @@
 %<driver>\ProvidesFile{yafoot-man.tex}
 % \fi
 % \ProvidesFile{yafoot.dtx}
-[1999/07/14 v1.0 ]
+[2018/09/03 v1.1 ]
 % \iffalse
 %<*driver>
 \documentclass{ltxdoc}
@@ -68,6 +69,32 @@
 \end{document}
 %</driver>
 % \fi
+% 
+% \makeatletter
+% 
+% \newcount\ChangeCount \ChangeCount10000
+% \def\changes@#1#2#3{%
+%   \global\advance\ChangeCount\@ne
+%   \protected@edef\@tempa{\noexpand\glossary{#1\levelchar
+%                                  \number\ChangeCount
+%                                  \actualchar
+%                                  \ifx\saved@macroname\@empty
+%                                    \generalname
+%                                  \else
+%                                    \string\verb\quotechar*

+%                                    \verbatimchar\saved@macroname
+%                                    \verbatimchar
+%                                  \fi
+%                                  :\levelchar #3}}%
+%   \@tempa\endgroup\@esphack}
+% 
+% \def\theglossary{\onecolumn \glossary@prologue
+%	\GlossaryParms \let\item\@idxitem
+%       \rightskip 1em plus 1fil
+%       \parfillskip-1em
+%       \ignorespaces}
+% \def\endtheglossary{\relax}
+% 
 % \changes{v0.1}{1991/10/29}
 %	{The style pfnote is born.}
 % \changes{v0.2}{1993/05/20}
@@ -79,6 +106,8 @@
 %	{First version of dblfnote is posted to comp.text.tex.}
 % \changes{v1.0}{1999/07/14}
 %	{Three styles are merged into yafoot.dtx and rewritten.}
+% \changes{v1.1-1}{2018/09/03}
+%	{Fix a footnote coloring problem in \string\textsf{fnpos}. (2018/09/03)}
 %
 % \errorcontextlines10000
 % \GetFileInfo{yafoot.dtx}
@@ -195,7 +224,7 @@
 % \title{\textsf{pfnote}, \textsf{fnpos} and \textsf{dblfnote}\\
 %	Packages for Footnotes\thanks{

 %	This file has version number \fileversion, last revised \filedate.}}
-% \author{Hiroshi Nakashima\\(Toyohashi Univ. of Tech.)}
+% \author{Hiroshi Nakashima\\(Kyoto University)}
 % \date{\filedate}
 % \maketitle
 % 
@@ -270,7 +299,7 @@
 % makes footnotes double-columned.  It also provides a few commands to
 % control column breaking.  The first version of the style file is created
 % for Tim Armstrong's post to |comp.text.tex|.  Since this document uses
-% \textsf{fnpos}, you will find that the footnotes\footnote{

+% \textsf{dblfnote}, you will find that the footnotes\footnote{

 %
.
 % This document has many footnotes, some of which are just to show how our
 % footnote mechanisms work.}
@@ -354,7 +383,7 @@
 %
 % \item[\cs{makeFNabove}]
 % \DescribeMacro{\maekFNabove}
-% cancels the effect of |\makeFNabove| to place footnotes {\em above} bottom 
+% cancels the effect of |\makeFNbelow| to place footnotes {\em above} bottom 
 % floats as standard \LaTeX{} does.
 % \end{description}
 %

@@ -506,9 +535,11 @@
 %
 % The author thanks to Martin Boyer and Nobuaki Minematsu whose posts to
 % news groups triggered writing very first version of macros in
-% \textsf{fnpos}.  He also thanks to Tim Armstrong whose post to
-% \texttt{comp.text.tex} encouraged him to make the first version of
-% \textsf{dblfnote} that requires considerable hack.
+% \textsf{fnpos}, and to Tim Armstrong whose post to \texttt{comp.text.tex}
+% encouraged him to make the first version of \textsf{dblfnote} that
+% requires considerable hack.  He also thanks to Hironobu Yamashita who
+% found a bug, hidden in \textsf{fnpos} for 19 years (!!), by which
+% footnotes were colored inappropriately. 
 %
 % For the implementation of three style files, the author refers the base
 % implementations of the macros for \cs{footnote} and for \cs{output}
@@ -564,7 +595,7 @@
 % whose name is ``|\pfn@fn|\meta{$i$}'' and body is \meta{$p_i$}.
 %
 % Then, when we process the footnote $f_i$, we can have $p_i$ by evaluating
-% |\pfn@fn|\meta{$i$} and compare it with $p_{i-1}$.  If $p_i=p_{i-1}$,
+% |\pfn@fn|\meta{$i$} and compare it with $p_{i-1}$.  If $p_i\neq p_{i-1}$,
 % $f_i$ is the first footnote in page $p_i$ and thus its number should be
 % one.  Otherwise, the number of $f_i$ should be that of $f_{i-1}$ plus one.
 %
@@ -715,6 +746,8 @@
 %    \end{macrocode}
 %
 % \begin{macro}{\@makecol}
+% \changes{v1.1-1}{2018/09/03}
+%	{Remove inappropriate spaces preceeding three \cs{endcsname}.}
 % \begin{macro}{\fnp@textbottom}
 % The essential part of \textsf{fnpos} is a modified version of |\@makecol|.
 % If |\iffnp@below| is true, we reverse the order of |\@combinefloats| and
@@ -752,10 +785,10 @@
                         \unvbox\@outputbox
                         \iffnp@bottom \@textbottom \fi
                         \vskip\skip\footins
-                        \csname color@begingroup \endcsname
-                        \csname normalcolor \endcsname
+                        \csname color@begingroup\endcsname
+                        \csname normalcolor\endcsname
                         \footnoterule \unvbox\footins
-                        \csname color@endgroup \endcsname}%
+                        \csname color@endgroup\endcsname}%
                 \iffnp@bottom \let\@textbottom\relax \fi \fi
         \iffnp@below\else \@combinefloats \fi
         \ifvbox\@kludgeins \@makespecialcolbox
diff --git a/Master/texmf-dist/tex/latex/yafoot/dblfnote.sty b/Master/texmf-dist/tex/latex/yafoot/dblfnote.sty
index 4ac9f72abc2..876050175d9 100644
--- a/Master/texmf-dist/tex/latex/yafoot/dblfnote.sty
+++ b/Master/texmf-dist/tex/latex/yafoot/dblfnote.sty
@@ -21,8 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% Style file `dblfnote'.
-%% Copyright (C) 1999  Hiroshi Nakashima <nakasima@tutics.tut.ac.jp>
-%%        (Toyohashi Univ. of Tech.)
+%% Copyright (C) 1999-2018
+%%   Hiroshi Nakashima <h.nakashima@DOMAIN;  DOMAIN=media.kyoto-u.ac.jp>
+%%   (Kyoto University)
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License distributed from CTAN
@@ -53,7 +54,7 @@
 \ProvidesPackage{dblfnote}}
 \else\def\next[#1]{}\fi
 \next
-[1999/07/14 v1.0 ]
+[2018/09/03 v1.1 ]
 
 %% Register Declaration
 
diff --git a/Master/texmf-dist/tex/latex/yafoot/fnpos.sty b/Master/texmf-dist/tex/latex/yafoot/fnpos.sty
index dd38703dea2..ff90e13f16c 100644
--- a/Master/texmf-dist/tex/latex/yafoot/fnpos.sty
+++ b/Master/texmf-dist/tex/latex/yafoot/fnpos.sty
@@ -21,8 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% Style file `fnpos'.
-%% Copyright (C) 1999  Hiroshi Nakashima <nakasima@tutics.tut.ac.jp>
-%%        (Toyohashi Univ. of Tech.)
+%% Copyright (C) 1999-2018
+%%   Hiroshi Nakashima <h.nakashima@DOMAIN;  DOMAIN=media.kyoto-u.ac.jp>
+%%   (Kyoto University)
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License distributed from CTAN
@@ -53,7 +54,7 @@
 \ProvidesPackage{fnpos}}
 \else\def\next[#1]{}\fi
 \next
-[1999/07/14 v1.0 ]
+[2018/09/03 v1.1 ]
 
 \newif\iffnp@bottom \fnp@bottomtrue
 \newif\iffnp@below \fnp@belowtrue
@@ -72,10 +73,10 @@
                         \unvbox\@outputbox
                         \iffnp@bottom \@textbottom \fi
                         \vskip\skip\footins
-                        \csname color@begingroup \endcsname
-                        \csname normalcolor \endcsname
+                        \csname color@begingroup\endcsname
+                        \csname normalcolor\endcsname
                         \footnoterule \unvbox\footins
-                        \csname color@endgroup \endcsname}%
+                        \csname color@endgroup\endcsname}%
                 \iffnp@bottom \let\@textbottom\relax \fi \fi
         \iffnp@below\else \@combinefloats \fi
         \ifvbox\@kludgeins \@makespecialcolbox
diff --git a/Master/texmf-dist/tex/latex/yafoot/pfnote.sty b/Master/texmf-dist/tex/latex/yafoot/pfnote.sty
index 436423530cc..326c41af570 100644
--- a/Master/texmf-dist/tex/latex/yafoot/pfnote.sty
+++ b/Master/texmf-dist/tex/latex/yafoot/pfnote.sty
@@ -21,8 +21,9 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% Style file `pfnote'.
-%% Copyright (C) 1999  Hiroshi Nakashima <nakasima@tutics.tut.ac.jp>
-%%        (Toyohashi Univ. of Tech.)
+%% Copyright (C) 1999-2018
+%%   Hiroshi Nakashima <h.nakashima@DOMAIN;  DOMAIN=media.kyoto-u.ac.jp>
+%%   (Kyoto University)
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License distributed from CTAN
@@ -53,7 +54,7 @@
 \ProvidesPackage{pfnote}}
 \else\def\next[#1]{}\fi
 \next
-[1999/07/14 v1.0 ]
+[2018/09/03 v1.1 ]
 
 \newcount\pfn@fnotectr \pfn@fnotectr\z@
 \newcount\pfn@page \pfn@page\@ne