summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/fnpct/README6
-rw-r--r--Master/texmf-dist/doc/latex/fnpct/fnpct_en.pdfbin594281 -> 579369 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fnpct/fnpct_en.tex18
-rw-r--r--Master/texmf-dist/tex/latex/fnpct/fnpct.sty53
4 files changed, 36 insertions, 41 deletions
diff --git a/Master/texmf-dist/doc/latex/fnpct/README b/Master/texmf-dist/doc/latex/fnpct/README
index 9aeb7e6d87e..b0ebc5e2de1 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.4c
+the FNPCT package v0.4e
footnote kerning
-2015/02/20
+2016/04/14
--------------------------------------------------------------------------
Clemens Niederberger
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
diff --git a/Master/texmf-dist/doc/latex/fnpct/fnpct_en.pdf b/Master/texmf-dist/doc/latex/fnpct/fnpct_en.pdf
index 4b0f7d70aa9..226b3bf7b76 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 b4cf2ffaccb..d4efac69551 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-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
@@ -32,10 +32,6 @@
% the package is inspired by the following question on TeX.SE:
% http://tex.stackexchange.com/q/56094/5049
% --------------------------------------------------------------------------
-% if you want to compile this documentation you'll need the document class
-% `cnpkgdoc' which you can get here:
-% https://bitbucket.org/cgnieder/cnpkgdoc/
-% the class is licensed LPPL 1.3 or later
\documentclass[load-preamble+]{cnltx-doc}
\usepackage{sepfootnotes,fnpct}
\setcnltx{
@@ -43,11 +39,13 @@
authors = Clemens Niederberger ,
email = contact@mychemistry.eu ,
url = https://bitbucket.org/cgnieder/fnpct/ ,
- abstract = {The \fnpct\ package basically does two things to footnotes: if
- footnote marks are followed by a punctuation mark the order of footnote
- and punctuation mark is reversed and the kerning gets adjusted. As a side
- effect a new method of creating multiple footnotes and some other features
- are provided.},
+ abstract = {
+ The \fnpct\ package basically does two things to footnotes: if footnote
+ marks are followed by a punctuation mark the order of footnote and
+ punctuation mark is reversed and the kerning gets adjusted. As a side
+ effect a new method of creating multiple footnotes and some other
+ features are provided.%
+ },
add-cmds = {
AdaptNote,
AdaptNoteMark,
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,25 +31,11 @@
\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:
\cs_new:Npn \fnpct_no_break: { \tex_penalty:D \c_ten_thousand }
@@ -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:
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-08 10:27:14 +0000