summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-09-30 21:50:41 +0000
committerKarl Berry <karl@freefriends.org>2019-09-30 21:50:41 +0000
commit3ca5d05e10661c7ce461195307d43b840ec58855 (patch)
treec1e9ee633ba312c2ea2897823fc71774283d8488
parent4582bdb96cab5cff0dc6641f6be5da636a1b9106 (diff)
fnpct (30sep19)
git-svn-id: svn://tug.org/texlive/trunk@52228 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/fnpct/README4
-rw-r--r--Master/texmf-dist/doc/latex/fnpct/fnpct_en.pdfbin580285 -> 572627 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fnpct/fnpct_en.tex12
-rw-r--r--Master/texmf-dist/tex/latex/fnpct/fnpct.sty32
4 files changed, 20 insertions, 28 deletions
diff --git a/Master/texmf-dist/doc/latex/fnpct/README b/Master/texmf-dist/doc/latex/fnpct/README
index 56c9d810006..0c82d70ad39 100644
--- a/Master/texmf-dist/doc/latex/fnpct/README
+++ b/Master/texmf-dist/doc/latex/fnpct/README
@@ -1,9 +1,9 @@
--------------------------------------------------------------------------
-the FNPCT package v0.4f
+the FNPCT package v0.4g
footnote kerning
-2019/02/17
+2019/09/30
--------------------------------------------------------------------------
Clemens Niederberger
Web: https://bitbucket.org/cgnieder/fnpct/
diff --git a/Master/texmf-dist/doc/latex/fnpct/fnpct_en.pdf b/Master/texmf-dist/doc/latex/fnpct/fnpct_en.pdf
index 9fc0bf7eed9..4eb46d4e930 100644
--- a/Master/texmf-dist/doc/latex/fnpct/fnpct_en.pdf
+++ b/Master/texmf-dist/doc/latex/fnpct/fnpct_en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fnpct/fnpct_en.tex b/Master/texmf-dist/doc/latex/fnpct/fnpct_en.tex
index 244bdc9732d..8eff9ac0287 100644
--- a/Master/texmf-dist/doc/latex/fnpct/fnpct_en.tex
+++ b/Master/texmf-dist/doc/latex/fnpct/fnpct_en.tex
@@ -889,12 +889,12 @@ loading \fnpct.
\end{minipage}
\end{example}
-\subsection{sidenotes}
-The package \pkg{sidenotes}~\cite{pkg:sidenotes} is supported and its commands
-\cs*{sidenote} and \cs*{sidenotemark} are treated the same way as footnotes:
-they got an optional \sarg\ argument and the additional \cs*{multsidenote} is
-created. The option \option{multiple} turns all note commands into their
-mult-variant.
+% \subsection{sidenotes}
+% The package \pkg{sidenotes}~\cite{pkg:sidenotes} is supported and its commands
+% \cs*{sidenote} and \cs*{sidenotemark} are treated the same way as footnotes:
+% they got an optional \sarg\ argument and the additional \cs*{multsidenote} is
+% created. The option \option{multiple} turns all note commands into their
+% mult-variant.
\subsection{snotez}
The package \pkg{snotez}~\cite{pkg:snotez} is supported and its commands
diff --git a/Master/texmf-dist/tex/latex/fnpct/fnpct.sty b/Master/texmf-dist/tex/latex/fnpct/fnpct.sty
index 69b4e08ebea..909a9d88cea 100644
--- a/Master/texmf-dist/tex/latex/fnpct/fnpct.sty
+++ b/Master/texmf-dist/tex/latex/fnpct/fnpct.sty
@@ -31,14 +31,14 @@
\RequirePackage { xparse , l3keys2e , scrlfile }
\ProvidesExplPackage
{fnpct}
- {2019/02/17}
- {0.4f}
+ {2019/09/30}
+ {0.4g}
{footnote kerning}
% --------------------------------------------------------------------------
% SETTING THINGS UP:
% this is plain's \nobreak:
-\cs_new:Npn \fnpct_no_break: { \tex_penalty:D \c_ten_thousand }
+\cs_new:Npn \fnpct_no_break: { \tex_penalty:D 10000 \scan_stop: }
% messages:
\cs_new_protected:Npn \fnpct_dont_mess_around:
@@ -874,11 +874,11 @@
\AdaptNoteMark \sidenotemark
}
%% the `sidenotes' package:
- \fnpct_treatment:nn { sidenotes }
- {
- \AdaptNoteOpt \sidenote \multsidenote
- \AdaptNoteMark \sidenotemark
- }
+ % \fnpct_treatment:nn { sidenotes }
+ % {
+ % \AdaptNoteOpt \sidenote \multsidenote
+ % \AdaptNoteMark \sidenotemark
+ % }
%% the `parnotes' package:
\fnpct_treatment:nn { parnotes }
{ \AdaptNote \parnote \multparnote }
@@ -1043,7 +1043,7 @@
\NewDocumentCommand \setfnpct { m }
{ \keys_set:nn { fnpct } { #1 } }
-\tex_endinput:D
+\file_input_stop:
% --------------------------------------------------------------------------
% HISTORY:
@@ -1113,18 +1113,10 @@
2015/04/23 v0.4d - fix for issue #7: polyglossia and french
2016/03/25 v0.4e - fix for issue #9
2019/02/17 v0.4f - fix for issues #13 and #19
+2019/09/30 v0.4g - update for expl3 deprecations
% --------------------------------------------------------------------------
% NOTES:
-- `footnote' package => not compatible => see todo
+- `footnote' package => not compatible
- `ednotes' package => not tested; who knows?
-
-% --------------------------------------------------------------------------
-% TODO:
-- localization: should there be different defaults for different languages?
- And who might provide enough information about conventions in other
- languages?
-- solve incompatibility with the `footnote' package
-- get this working (??) => http://tex.stackexchange.com/questions/54288/nested-endnotes
-- the `bigfoot' package provides \footnote+ and \footnote- -- let's see if we
- can add those functionalities again
+- `sidenotes' package => mot easily patchable, see pull request #1