summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-02-21 23:03:39 +0000
committerKarl Berry <karl@freefriends.org>2015-02-21 23:03:39 +0000
commitce8d92af4260f815abdb49c6dc8736307d50e93e (patch)
tree45875ad89913389dfac4cdd3c4cce4d92248cc61
parenta7c6d5664cf342fd979d4548887cac9e6b09ba38 (diff)
fnpct (21feb15)
git-svn-id: svn://tug.org/texlive/trunk@36346 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.pdfbin594698 -> 594281 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fnpct/fnpct_en.tex6
-rw-r--r--Master/texmf-dist/tex/latex/fnpct/fnpct.sty21
4 files changed, 21 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/fnpct/README b/Master/texmf-dist/doc/latex/fnpct/README
index 5e7d63adba5..9aeb7e6d87e 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.4b
+the FNPCT package v0.4c
footnote kerning
-2014/03/10
+2015/02/20
--------------------------------------------------------------------------
Clemens Niederberger
Web: https://bitbucket.org/cgnieder/fnpct/
E-Mail: contact@mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2012-2014 Clemens Niederberger
+Copyright 2012-2015 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 21ad2a58960..4b0f7d70aa9 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 f1f3226c5f5..b4cf2ffaccb 100644
--- a/Master/texmf-dist/doc/latex/fnpct/fnpct_en.tex
+++ b/Master/texmf-dist/doc/latex/fnpct/fnpct_en.tex
@@ -12,7 +12,7 @@
% Web: https://bitbucket.org/cgnieder/fnpct/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012 Clemens Niederberger
+% Copyright 2012-2015 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -110,8 +110,8 @@
\AdaptNoteOpt\footcite\multfootcite
-\newname\bringhurst{Robert}{Bringhurst}
-\newname\lefloch{Bruno}{Le Floch}
+\newname\bringhurst{Robert Bringhurst}
+\newname\lefloch{Bruno Le Floch}
\begin{document}
diff --git a/Master/texmf-dist/tex/latex/fnpct/fnpct.sty b/Master/texmf-dist/tex/latex/fnpct/fnpct.sty
index 38c84f7f45d..c14fb7d881a 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-2014 Clemens Niederberger
+% Copyright 2012-2015 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}
- {2014/01/10}
- {0.4b}
+ {2015/02/20}
+ {0.4c}
{footnote kerning}
% --------------------------------------------------------------------------
@@ -345,6 +345,7 @@
{
\tl_set:Nn \l__fnpct_multiple_true_tl { #1 }
\tl_set:Nn \l__fnpct_multiple_false_tl { #2 }
+ \bool_gset_false:N \g__fnpct_after_punctuation_bool
\peek_after:Nw \__fnpct_check_multiple:
}
@@ -353,8 +354,7 @@
\prop_map_inline:Nn \g__fnpct_adapted_notes_prop
{
\prop_get:NnN \g__fnpct_adapted_notes_prop { ##1 } \l__fnpct_tmpb_tl
- \exp_after:wN
- \token_if_eq_meaning:NNTF \l__fnpct_tmpb_tl \l_peek_token
+ \token_if_eq_meaning:VNTF \l__fnpct_tmpb_tl \l_peek_token
{
\bool_set_true:N \l__fnpct_multiple_footnotes_bool
\prop_map_break:
@@ -366,6 +366,8 @@
{ \tl_use:N \l__fnpct_multiple_false_tl }
}
+\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 }
{
@@ -457,7 +459,7 @@
#1
\bool_set_false:N \l__fnpct_reverse_switch_bool
}
- \bool_gset_false:N \g__fnpct_after_punctuation_bool
+ % \bool_gset_false:N \g__fnpct_after_punctuation_bool
}
}
@@ -689,6 +691,7 @@
}
\cs_generate_variant:Nn \fnpct_renew_and_mult:NNN { ccc , NcN }
+% \footnote{<text>} like:
\cs_new_protected:Npn \fnpct_renew_and_mult_no_opt:NNN #1#2#3
{
\prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 }
@@ -707,6 +710,7 @@
\cs_generate_variant:Nn \fnpct_renew_and_mult_no_opt:NNN { Nc, ccc }
% renew but don't create mult-variant:
+% \footnote[<mark>]{<text>} like:
\cs_new_protected:Npn \fnpct_renew:NN #1#2
{
\prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 }
@@ -924,6 +928,8 @@
{
\fnpct_renew_and_mult_no_opt:ccc { #2note }
{ fnpct_orig_sep_#2:w } { #2multnote }
+ \fnpct_renew_and_mult_no_opt:ccc { #2quicknote }
+ { fnpct_orig_sep_#2_quick:w } { #2multquicknote }
\fnpct_renew_no_opt:cc { #2notemark } { fnpct_orig_sep_#2_mark:w }
}
\prop_map_inline:Nn \l__fnpct_sepfootnote_end_classes_prop
@@ -1105,6 +1111,9 @@
- bug fix: add missing penalty that caused a footnote
marker to be placed on the following line in some
instances
+2015/02/20 v0.4c - adapt to update to `sepfootnotes' (quicknotes)
+ - bug fix (looking ahead for known note commands works
+ again)
% --------------------------------------------------------------------------
% NOTES: