From ba6b0d9a71177f6c82fd81c79c42254dceca27ad Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 9 Apr 2013 16:54:11 +0000 Subject: fnpct (8apr13) git-svn-id: svn://tug.org/texlive/trunk@29795 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/fnpct/README | 4 +- Master/texmf-dist/doc/latex/fnpct/fnpct_en.pdf | Bin 582964 -> 583301 bytes Master/texmf-dist/doc/latex/fnpct/fnpct_en.tex | 94 +++++++++++++++---------- Master/texmf-dist/tex/latex/fnpct/fnpct.sty | 26 +++++-- 4 files changed, 77 insertions(+), 47 deletions(-) diff --git a/Master/texmf-dist/doc/latex/fnpct/README b/Master/texmf-dist/doc/latex/fnpct/README index f41d1f097b0..14da7a6a9e8 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.2j +the FNPCT package v0.2k footnote kerning -2013/02/28 +2013/04/07 -------------------------------------------------------------------------- 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 9569bb95632..056a319a47c 100644 Binary files a/Master/texmf-dist/doc/latex/fnpct/fnpct_en.pdf and b/Master/texmf-dist/doc/latex/fnpct/fnpct_en.pdf differ diff --git a/Master/texmf-dist/doc/latex/fnpct/fnpct_en.tex b/Master/texmf-dist/doc/latex/fnpct/fnpct_en.tex index 0573f464a44..b3c55a192b5 100644 --- a/Master/texmf-dist/doc/latex/fnpct/fnpct_en.tex +++ b/Master/texmf-dist/doc/latex/fnpct/fnpct_en.tex @@ -1,5 +1,4 @@ % arara: pdflatex -% arara: makeindex: { sort: true, style: fnpct_en.ist } % arara: biber % arara: pdflatex % arara: pdflatex @@ -134,113 +133,124 @@ isbn = {978-0-88179-205-5}, publisher = {Hartley \&\ Marks, Canada} } -@software{bigfoot, +@package{bigfoot, title = {bigfoot}, author = {David Kastrup}, date = {2006-07-15}, version = {1.25}, - url = {http://www.ctan.org/pkg/bigfoot} + url = {http://mirror.ctan.org/macros/latex/contrib/bigfoot} } -@software{endnotes, +@package{endnotes, title = {endnotes}, author = {Robin Fairbairns}, authortype = {current maintainer}, date = {2012-01-15}, - url = {http://www.ctan.org/pkg/endnotes} + url = {http://mirror.ctan.org/macros/latex/contrib/endnotes} } -@software{enotez, +@package{enotez, title = {enotez}, author = {Clemens Niederberger}, version = {0.4}, date = {2012-12-30}, - url = {http://www.ctan.org/pkg/enotez} + url = {http://mirror.ctan.org/macros/latex/contrib/enotez} } -@software{fixfoot, +@package{fixfoot, title = {fixfoot}, author = {Robin Fairbairns}, date = {2007-12-12}, version = {0.3a} , - url = {http://www.ctan.org/pkg/fixfoot} + url = {http://mirror.ctan.org/macros/latex/contrib/fixfoot} } -@software{footmisc, +@package{footmisc, title = {footmisc}, author = {Robin Fairbairns}, date = {2011-06-06}, version = {5.5b}, - url = {http://www.ctan.org/pkg/footmisc} + url = {http://mirror.ctan.org/macros/latex/contrib/footmisc} } -@software{footnote, +@package{footnote, title = {footnote}, author = {Mark Wooding}, date = {1997-01-28}, version = {1.13}, - url = {http://www.ctan.org/pkg/footnote} + url = {http://mirror.ctan.org/macros/latex/contrib/footnote} } -@software{manyfoot, +@package{manyfoot, title = {manyfoot}, author = {Alexander I. Rozhenko}, date = {2005-09-11}, version = {1.10}, - url = {http://www.ctan.org/pkg/manyfoot} + url = {http://mirror.ctan.org/macros/latex/contrib/manyfoot} } -@software{parnotes, +@package{parnotes, title = {parnotes}, author = {Micheal Hughes}, date = {2012-03-01}, version = {1}, - url = {http://www.ctan.org/pkg/parnotes} + url = {http://mirror.ctan.org/macros/latex/contrib/parnotes} } -@software{pagenote, +@package{pagenote, title = {pagenote}, author = {Will Robertson}, authortype = {current maintainer}, date = {2009-09-03}, version = {1.1a}, - url = {http://www.ctan.org/pkg/pagenote} + url = {http://mirror.ctan.org/macros/latex/contrib/pagenote} } -@software{sepfootnotes, +@package{sepfootnotes, title = {sepfootnotes}, author = {Eduardo C. Louren\c{c}o de Lima}, date = {2013-01-17}, version = {0.2}, - url = {http://www.ctan.org/pkg/sepfootnotes} + url = {http://mirror.ctan.org/macros/latex/contrib/sepfootnotes} } -@software{sidenotes, +@package{sidenotes, title = {sidenotes}, author = {Andy Thomas}, date = {2011-11-10}, version = {0.80}, - url = {http://www.ctan.org/pkg/sidenotes} + url = {http://mirror.ctan.org/macros/latex/contrib/sidenotes} } -@software{tablefootnote, +@package{snotez, + title = {snotez}, + author = {Clemens Niederberger}, + version = {0.2}, + date = {2013-04-04}, + url = {https://www.bitbucket.org/cgnieder/snotez} +} +@package{tablefootnote, title = {tablefootnote}, author = {H.-Martin M\"{u}nch}, date = {2012-01-14}, version = {1.0g}, - url = {http://www.ctan.org/pkg/tablefootnote} + url = {http://mirror.ctan.org/macros/latex/contrib/tablefootnote} } -@software{yafoot, +@package{yafoot, title = {yafoot}, author = {Hiroshi Nakashima}, date = {1999-07-14}, version = {1.0}, - url = {http://www.ctan.org/pkg/yafoot} + url = {http://mirror.ctan.org/macros/latex/contrib/yafoot} } \end{filecontents} \AdaptNoteOpt\footcite\multfootcite -\begin{filecontents}{\jobname.ist} +\usepackage{imakeidx} +\begin{filecontents*}{\jobname.ist} heading_prefix "{\\bfseries " heading_suffix "\\hfil}\\nopagebreak\n" headings_flag 1 - delim_0 "\\dotfill " - delim_1 "\\dotfill " - delim_2 "\\dotfill " - delim_r "\\textendash" + delim_0 "\\dotfill\\hyperpage{" + delim_1 "\\dotfill\\hyperpage{" + delim_2 "\\dotfill\\hyperpage{" + delim_r "}\\textendash\\hyperpage{" + delim_t "}" suffix_2p "\\nohyperpage{\\,f.}" suffix_3p "\\nohyperpage{\\,ff.}" -\end{filecontents} +\end{filecontents*} +\indexsetup{othercode=\footnotesize} +\makeindex[options={-s \jobname.ist},intoc,columns=3] \newcommand\setapart[1]{% \begin{quote} @@ -264,7 +274,6 @@ provided.}} \newline } -\makeindex \begin{document} \section{License and Requirements} @@ -1062,10 +1071,17 @@ loading \fnpct. \subsection{sidenotes}\secidx[sidenotes]{other packages} The package \paket{sidenotes}~\cite{sidenotes} is supported and its commands -\cmd{sidenote}, \cmd{sidenotemark} and \cmd{sidecite} are treated the same way -as footnotes: they got an optional \code{*} argument and the additional -\cmd{multsidenote} and \cmd{multsidecite} are created. The option \key{multiple} -turns all note commands into their mult-variant. +\cmd{sidenote} and \cmd{sidenotemark} are treated the same way as footnotes: +they got an optional \code{*} argument and the additional \cmd{multsidenote} +is created. The option \key{multiple} turns all note commands into their +mult-variant. + +\subsection{snotez}\secidx[snotez]{other packages} +The package \paket{snotez}~\cite{snotez} is supported and its commands +\cmd{sidenote} and \cmd{sidenotemark} are treated the same way as footnotes: +they got an optional \code{*} argument and the additional \cmd{multsidenote} +is created. The option \key{multiple} turns all note commands into their +mult-variant. \subsection{tablefootnote}\secidx[tablefootnote]{other packages} The package \paket{tablefootnote}~\cite{tablefootnote} is supported and its @@ -1170,7 +1186,7 @@ Remember that the optional arguments then are inside the braces! \secidx*{adapting notes} \appendix -{\EmbracOff\printbibliography} +\printbibliography \setindexpreamble{Section titles are indicated \textbf{bold}, packages \textsf{sans serif}, commands \code{\textbackslash\textcolor{code}{brown}} diff --git a/Master/texmf-dist/tex/latex/fnpct/fnpct.sty b/Master/texmf-dist/tex/latex/fnpct/fnpct.sty index c890dfa879a..deb87fb109e 100644 --- a/Master/texmf-dist/tex/latex/fnpct/fnpct.sty +++ b/Master/texmf-dist/tex/latex/fnpct/fnpct.sty @@ -31,8 +31,8 @@ \RequirePackage { xparse , l3keys2e , scrlfile } \ProvidesExplPackage {fnpct} - {2013/02/28} - {0.2j} + {2013/04/07} + {0.2k} {footnote kerning} % -------------------------------------------------------------------------- @@ -379,16 +379,21 @@ { \tl_use:N \l_fnpct_current_punct_mark_tl \fnpct_no_break: - \prop_get:NVNT \l_fnpct_punctuation_marks_after_prop - \l_fnpct_current_punct_mark_tl \l_fnpct_tmpa_dim + \prop_get:NVNT + \l_fnpct_punctuation_marks_after_prop + \l_fnpct_current_punct_mark_tl + \l_fnpct_tmpa_dim { \skip_horizontal:N \l_fnpct_tmpa_dim } } \fnpct_write_note:Nnnn #1 { #2 } { #3 } { #4 } \fnpct_write_inner:N #1 \fnpct_punct_if_after:T { - \prop_get:NVNT \l_fnpct_punctuation_marks_before_prop - \l_fnpct_current_punct_mark_tl \l_fnpct_tmpa_dim + \fnpct_no_break: + \prop_get:NVNT + \l_fnpct_punctuation_marks_before_prop + \l_fnpct_current_punct_mark_tl + \l_fnpct_tmpa_dim { \skip_horizontal:N \l_fnpct_tmpa_dim } \fnpct_no_break: \tl_use:N \l_fnpct_current_punct_mark_tl @@ -824,6 +829,12 @@ %% the `enotez' package: \fnpct_treatment:nn { enotez } { \AdaptNote \endnote \multendnote } + %% the `snotez' package: + \fnpct_treatment:nn { snotez } + { + \AdaptNoteOpt \sidenote \multsidenote + \AdaptNoteMark \sidenotemark + } %% the `sidenotes' package: \fnpct_treatment:nn { sidenotes } { @@ -1019,6 +1030,9 @@ 2013/01/21 v0.2i - adapted to changes of sepfootnotes, bug fix in reading of multiple notes 2013/02/22 v0.2j - adaption of `enotez' \endnote command +2013/04/07 v0.2k - bug fix: suppress possible break point between footnote + mark and punctuation mark if `punct-after=true' has + been set % -------------------------------------------------------------------------- % NOTES: -- cgit v1.2.3