summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-02-17 23:02:03 +0000
committerKarl Berry <karl@freefriends.org>2019-02-17 23:02:03 +0000
commit8c3bfc326ff7064c4b80a6b4c7fc2053aa4672cc (patch)
treeb1c07e9284e3735b0d87289778c6ea78a2402fc1
parentcbd4018bd78f522ae48bf07d66256fcc09fd2436 (diff)
fnpct (17feb19)
git-svn-id: svn://tug.org/texlive/trunk@50046 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/fnpct/README6
-rw-r--r--Master/texmf-dist/doc/latex/fnpct/fnpct_en.pdfbin579369 -> 580285 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fnpct/fnpct_en.tex12
-rw-r--r--Master/texmf-dist/tex/latex/fnpct/fnpct.sty16
4 files changed, 18 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/latex/fnpct/README b/Master/texmf-dist/doc/latex/fnpct/README
index b0ebc5e2de1..56c9d810006 100644
--- a/Master/texmf-dist/doc/latex/fnpct/README
+++ b/Master/texmf-dist/doc/latex/fnpct/README
@@ -1,15 +1,15 @@
--------------------------------------------------------------------------
-the FNPCT package v0.4e
+the FNPCT package v0.4f
footnote kerning
-2016/04/14
+2019/02/17
--------------------------------------------------------------------------
Clemens Niederberger
Web: https://bitbucket.org/cgnieder/fnpct/
E-Mail: contact@mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2012-2016 Clemens Niederberger
+Copyright 2012-2019 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/fnpct/fnpct_en.pdf b/Master/texmf-dist/doc/latex/fnpct/fnpct_en.pdf
index 226b3bf7b76..9fc0bf7eed9 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 d4efac69551..244bdc9732d 100644
--- a/Master/texmf-dist/doc/latex/fnpct/fnpct_en.tex
+++ b/Master/texmf-dist/doc/latex/fnpct/fnpct_en.tex
@@ -1,7 +1,7 @@
-% arara: pdflatex: { shell: on }
-% arara: biber
-% arara: pdflatex
-% arara: pdflatex
+% arara: pdflatex: { shell: on , interaction: nonstopmode }
+% !arara: biber
+% !arara: pdflatex
+% !arara: pdflatex
% --------------------------------------------------------------------------
% the FNPCT package
%
@@ -12,7 +12,7 @@
% Web: https://bitbucket.org/cgnieder/fnpct/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2016 Clemens Niederberger
+% Copyright 2012-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -325,7 +325,7 @@ kerning.
Lets \cs{footnote} be equal to \cs{multfootnote}.
%
\keyval{mult-fn-delim}{delimiter}\Default{;}
- Aets the delimiter for the \cs{multfootnote} command.
+ Sets the delimiter for the \cs{multfootnote} command.
%
\keyval{mult-fn-sep}{separator}\Default{,}
Sets the separator between multiple footnote marks.
diff --git a/Master/texmf-dist/tex/latex/fnpct/fnpct.sty b/Master/texmf-dist/tex/latex/fnpct/fnpct.sty
index a23cc9347b8..69b4e08ebea 100644
--- a/Master/texmf-dist/tex/latex/fnpct/fnpct.sty
+++ b/Master/texmf-dist/tex/latex/fnpct/fnpct.sty
@@ -8,7 +8,7 @@
% Web: https://bitbucket.org/cgnieder/fnpct/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2016 Clemens Niederberger
+% Copyright 2012-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -31,8 +31,8 @@
\RequirePackage { xparse , l3keys2e , scrlfile }
\ProvidesExplPackage
{fnpct}
- {2016/04/14}
- {0.4e}
+ {2019/02/17}
+ {0.4f}
{footnote kerning}
% --------------------------------------------------------------------------
@@ -112,6 +112,7 @@
\bool_new:N \l__fnpct_reverse_switch_bool
\bool_new:N \l__fnpct_bigfoot_default_top_bool
\bool_new:N \l__fnpct_normal_marks_bool
+\bool_new:N \l__fnpct_hyperref_bool
\bool_new:N \g__fnpct_after_punctuation_bool
@@ -293,7 +294,7 @@
\__fnpct_get_head:NN
\l__fnpct_current_punct_mark_tl
\l__fnpct_punctuation_marks_tl
- \peek_meaning_remove:VTF \l__fnpct_current_punct_mark_tl
+ \exp_args:NV \peek_meaning_remove:NTF \l__fnpct_current_punct_mark_tl
{ #2 }
{
\__fnpct_check_punctuation_aux:nnn { #1 }
@@ -316,7 +317,7 @@
{ #3 }
}
\cs_generate_variant:Nn \__fnpct_check_punctuation:nTF { V }
-\cs_generate_variant:Nn \peek_meaning_remove:NTF { V }
+% \cs_generate_variant:Nn \peek_meaning_remove:NTF { V }
\cs_generate_variant:Nn \tl_remove_all:Nn { NV }
\cs_generate_variant:Nn \tl_put_right:Nn { NV }
@@ -340,7 +341,7 @@
\prop_map_inline:Nn \g__fnpct_adapted_notes_prop
{
\prop_get:NnN \g__fnpct_adapted_notes_prop { ##1 } \l__fnpct_tmpb_tl
- \token_if_eq_meaning:VNTF \l__fnpct_tmpb_tl \l_peek_token
+ \exp_args:NV \token_if_eq_meaning:NNTF \l__fnpct_tmpb_tl \l_peek_token
{
\bool_set_true:N \l__fnpct_multiple_footnotes_bool
\prop_map_break:
@@ -352,7 +353,7 @@
{ \tl_use:N \l__fnpct_multiple_false_tl }
}
-\cs_generate_variant:Nn \token_if_eq_meaning:NNTF {V}
+% \cs_generate_variant:Nn \token_if_eq_meaning:NNTF {V}
% check which mode is active:
\prg_new_conditional:Npnn \fnpct_punct_if_after: { T, TF }
@@ -1111,6 +1112,7 @@
again)
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
% --------------------------------------------------------------------------
% NOTES: