From 52cd63f1578cc8a3f810574d0602b98b5a0c5459 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 3 Aug 2019 21:57:36 +0000 Subject: ncctools (3aug19) git-svn-id: svn://tug.org/texlive/trunk@51810 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/ncctools/changes.txt | 8 +++++++- Master/texmf-dist/doc/latex/ncctools/manyfoot.pdf | Bin 193816 -> 296617 bytes .../texmf-dist/source/latex/ncctools/manyfoot.dtx | 10 +++++++--- Master/texmf-dist/tex/latex/ncctools/manyfoot.sty | 6 +++--- 4 files changed, 17 insertions(+), 7 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/ncctools/changes.txt b/Master/texmf-dist/doc/latex/ncctools/changes.txt index 117cffee695..025e210c275 100644 --- a/Master/texmf-dist/doc/latex/ncctools/changes.txt +++ b/Master/texmf-dist/doc/latex/ncctools/changes.txt @@ -2,12 +2,18 @@ This file lists changes to the LaTeX2e files of `ncctools' bundle in reverse chronological order. +======================================================================= + +August 3, 2019 (Release 3.5.3) + + manyfoot: Fix multicol compatibility issues. + + ======================================================================= June 24, 2018 (Release 3.5.2) extdash: Add more em-dash configuring options. - ======================================================================= Jan 20, 2006 diff --git a/Master/texmf-dist/doc/latex/ncctools/manyfoot.pdf b/Master/texmf-dist/doc/latex/ncctools/manyfoot.pdf index 0e576530a52..477fec1800f 100644 Binary files a/Master/texmf-dist/doc/latex/ncctools/manyfoot.pdf and b/Master/texmf-dist/doc/latex/ncctools/manyfoot.pdf differ diff --git a/Master/texmf-dist/source/latex/ncctools/manyfoot.dtx b/Master/texmf-dist/source/latex/ncctools/manyfoot.dtx index 42abc84677c..d66cc54e1db 100644 --- a/Master/texmf-dist/source/latex/ncctools/manyfoot.dtx +++ b/Master/texmf-dist/source/latex/ncctools/manyfoot.dtx @@ -4,7 +4,7 @@ %% %\NeedsTeXFormat{LaTeX2e}[1993/12/01] %\ProvidesPackage{manyfoot} -% [2005/09/11 v1.10 Many Footnote Levels Package (NCC)] +% [2019/08/03 v1.11 Many Footnote Levels Package (NCC)] % % \changes{v1.0}{1998/11/09}{Initial version} % \changes{v1.1}{1998/11/13}{Compatibility problems solved} @@ -28,6 +28,7 @@ % \changes{v1.9}{2005/02/10}{|\NCC@makemark| replaced with |\NCC@makefnmark|} % \changes{v1.9}{2005/05/11}{Introduce the |\SetFootnoteHook| command} % \changes{v1.10}{2005/09/11}{Remove overflow in calculation the fudge factor} +% \changes{v1.11}{2019/08/03}{Fix compatibility issues with multicol} % %<*driver> \let\makeindex\relax @@ -1283,12 +1284,15 @@ % \end{macrocode} % and finally we join it with |\footins| insert and decrease the % current priority to |-1|. +% \textit{Change request from Fank Mittelbach (version 1.11):} +% The |\footins| insert should be set globally +% for compatibility with the last version of multicol. % \begin{macrocode} \ifvoid\footins \let\footnoterule\MFL@currule - \setbox\footins\vbox{#3\unvbox#5}% + \global\setbox\footins\vbox{#3\unvbox#5}% \else - \setbox\footins\vbox{% + \global\setbox\footins\vbox{% \unvbox\footins\MFL@skip\MFL@currule#3\unvbox#5% }% \fi diff --git a/Master/texmf-dist/tex/latex/ncctools/manyfoot.sty b/Master/texmf-dist/tex/latex/ncctools/manyfoot.sty index f11b03f1123..372e0fb4ad9 100644 --- a/Master/texmf-dist/tex/latex/ncctools/manyfoot.sty +++ b/Master/texmf-dist/tex/latex/ncctools/manyfoot.sty @@ -24,7 +24,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1993/12/01] \ProvidesPackage{manyfoot} - [2005/09/11 v1.10 Many Footnote Levels Package (NCC)] + [2019/08/03 v1.11 Many Footnote Levels Package (NCC)] \RequirePackage{nccfoots} \newcommand{\extrafootnoterule}{} \DeclareOption{ruled}{\def\extrafootnoterule{\defaultfootnoterule}} @@ -312,9 +312,9 @@ \csname MFL@process#4\endcsname #5% \ifvoid\footins \let\footnoterule\MFL@currule - \setbox\footins\vbox{#3\unvbox#5}% + \global\setbox\footins\vbox{#3\unvbox#5}% \else - \setbox\footins\vbox{% + \global\setbox\footins\vbox{% \unvbox\footins\MFL@skip\MFL@currule#3\unvbox#5% }% \fi -- cgit v1.2.3