From e8d436d68b6a4853060143af7f0e6be917ae9166 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 15 Apr 2016 21:35:32 +0000 Subject: fnpct (15apr16) git-svn-id: svn://tug.org/texlive/trunk@40535 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/fnpct/fnpct.sty | 53 ++++++++++++++--------------- 1 file changed, 25 insertions(+), 28 deletions(-) (limited to 'Master/texmf-dist/tex/latex/fnpct/fnpct.sty') diff --git a/Master/texmf-dist/tex/latex/fnpct/fnpct.sty b/Master/texmf-dist/tex/latex/fnpct/fnpct.sty index c14fb7d881a..a23cc9347b8 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-2015 Clemens Niederberger +% Copyright 2012-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -31,24 +31,10 @@ \RequirePackage { xparse , l3keys2e , scrlfile } \ProvidesExplPackage {fnpct} - {2015/02/20} - {0.4c} + {2016/04/14} + {0.4e} {footnote kerning} -% -------------------------------------------------------------------------- -% check expl3 version: -\@ifpackagelater { expl3 } { 2012/11/21 } - { } - { - \PackageError { fnpct } { Support~package~expl3~too~old } - { - You~need~to~update~your~installation~of~the~bundles~'l3kernel'~and~ - 'l3packages'.\MessageBreak - Loading~fnpct~will~abort! - } - \tex_endinput:D - } - % -------------------------------------------------------------------------- % SETTING THINGS UP: % this is plain's \nobreak: @@ -624,13 +610,15 @@ % -------------------------------------------------------------------------- % MANUAL KERNING: -% TODO: add nobreak and ensure that \l__fnpct_after_comma_dim et.al match the current -% definition \cs_new_protected:Npn \fnpct_kfp: { \fnpct_no_break: - \prop_get:NnN \l__fnpct_punctuation_marks_before_prop { . } \l__fnpct_tmpa_dim - \prop_get:NnN \l__fnpct_punctuation_marks_after_prop { . } \l__fnpct_tmpb_dim + \prop_get:NnNT \l__fnpct_punctuation_marks_before_prop {.} + \l__fnpct_tmpa_tl + { \dim_set:Nn \l__fnpct_tmpa_dim { \l__fnpct_tmpa_tl } } + \prop_get:NnNT \l__fnpct_punctuation_marks_after_prop {.} + \l__fnpct_tmpb_tl + { \dim_set:Nn \l__fnpct_tmpb_dim { \l__fnpct_tmpb_tl } } \bool_if:NTF \l__fnpct_punct_after_bool { \skip_horizontal:N \l__fnpct_tmpa_dim } { \skip_horizontal:N \l__fnpct_tmpb_dim } @@ -639,8 +627,12 @@ \cs_new_protected:Npn \fnpct_kfc: { \fnpct_no_break: - \prop_get:NnN \l__fnpct_punctuation_marks_before_prop { , } \l__fnpct_tmpa_dim - \prop_get:NnN \l__fnpct_punctuation_marks_after_prop { , } \l__fnpct_tmpb_dim + \prop_get:NnNT \l__fnpct_punctuation_marks_before_prop {,} + \l__fnpct_tmpa_tl + { \dim_set:Nn \l__fnpct_tmpa_dim { \l__fnpct_tmpa_tl } } + \prop_get:NnNT \l__fnpct_punctuation_marks_after_prop {,} + \l__fnpct_tmpb_tl + { \dim_set:Nn \l__fnpct_tmpb_dim { \l__fnpct_tmpb_tl } } \bool_if:NTF \l__fnpct_punct_after_bool { \skip_horizontal:N \l__fnpct_tmpa_dim } { \skip_horizontal:N \l__fnpct_tmpb_dim } @@ -1033,11 +1025,14 @@ \ifcurrentbaselanguage{French} { \AfterBeginDocument{ - \let\@footnotemark\@footnotemarkORI - \setfnpct{ - before-footnote-space = - \l__fnpct_french_before_footnote_space_dim - } + \cs_if_exist:NT \@footnotemarkORI + { + \let\@footnotemark\@footnotemarkORI + \setfnpct{ + before-footnote-space = + \l__fnpct_french_before_footnote_space_dim + } + } } }{} } @@ -1114,6 +1109,8 @@ 2015/02/20 v0.4c - adapt to update to `sepfootnotes' (quicknotes) - bug fix (looking ahead for known note commands works again) +2015/04/23 v0.4d - fix for issue #7: polyglossia and french +2016/03/25 v0.4e - fix for issue #9 % -------------------------------------------------------------------------- % NOTES: -- cgit v1.2.3