summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-01-19 21:02:35 +0000
committerKarl Berry <karl@freefriends.org>2023-01-19 21:02:35 +0000
commitcc3ae740ee23ea2d56455878d1823cc0c8dc7de3 (patch)
tree59e90841a971ce07290efce2a54ccec371ff4f40 /Master/texmf-dist/tex
parent854a532dd2c502a852b3f012ca8d3e5e87a25fa7 (diff)
lineno (19jan23)
git-svn-id: svn://tug.org/texlive/trunk@65586 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/lineno/ednmath0.sty6
-rw-r--r--Master/texmf-dist/tex/latex/lineno/edtable.sty6
-rw-r--r--Master/texmf-dist/tex/latex/lineno/fnlineno.sty6
-rw-r--r--Master/texmf-dist/tex/latex/lineno/lineno.sty135
-rw-r--r--Master/texmf-dist/tex/latex/lineno/vplref.sty3
5 files changed, 84 insertions, 72 deletions
diff --git a/Master/texmf-dist/tex/latex/lineno/ednmath0.sty b/Master/texmf-dist/tex/latex/lineno/ednmath0.sty
index ef9884f30cb..074af801f79 100644
--- a/Master/texmf-dist/tex/latex/lineno/ednmath0.sty
+++ b/Master/texmf-dist/tex/latex/lineno/ednmath0.sty
@@ -1,7 +1,5 @@
%% Macro package `ednmath0.sty' for LaTeX2e,
-%% copyright (C) 2004 Uwe L\"uck,
-%% http://www.contact-ednotes.sty.de.vu
-%% --author-maintained;
+%% copyright (C) 2004 Uwe Lück
%% math support for `lineno.sty' and `ednotes.sty'.
%%
\def\fileversion{v0.2b} \def\filedate{2005/01/10}
@@ -16,7 +14,7 @@
%%
%% Please report bugs, problems, and suggestions via
%%
-%% http://www.contact-ednotes.sty@web.de
+%% https://github.com/latex-lineno/lineno
%
%% * MAIN FEATURE *
%
diff --git a/Master/texmf-dist/tex/latex/lineno/edtable.sty b/Master/texmf-dist/tex/latex/lineno/edtable.sty
index 3d16a9c7220..e7865229b2a 100644
--- a/Master/texmf-dist/tex/latex/lineno/edtable.sty
+++ b/Master/texmf-dist/tex/latex/lineno/edtable.sty
@@ -1,8 +1,8 @@
-%% `edtable.sty'---Uwe L"uck, direction Christian Tapp.
+%% `edtable.sty'---Uwe Lück, direction Christian Tapp.
%% LaTeX package for tables with line numbers and
%% editorial notes.
%%
-%% Copyright (C) 2003-2005 Uwe L"uck--author-maintained.
+%% Copyright (C) 2003-2005 Uwe Lück
%%
\def\fileversion{1.3c} \def\filedate{2005/10/03}
%%
@@ -15,7 +15,7 @@
%%
%% Please send your comments via
%%
-%% http://www.contact-ednotes.sty.de.vu
+%% https://github.com/latex-lineno/lineno
%%
%% * USAGE: *
%
diff --git a/Master/texmf-dist/tex/latex/lineno/fnlineno.sty b/Master/texmf-dist/tex/latex/lineno/fnlineno.sty
index 224f4743dba..fc4dee61524 100644
--- a/Master/texmf-dist/tex/latex/lineno/fnlineno.sty
+++ b/Master/texmf-dist/tex/latex/lineno/fnlineno.sty
@@ -2,9 +2,7 @@
\ProvidesPackage{fnlineno}[2011/01/07 v0.55
numbers to footnote lines (UL)]
-%% Copyright (C) 2010 Uwe Lueck,
-%% http://www.contact-ednotes.sty.de.vu
-%% -- author-maintained in the sense of LPPL below --
+%% Copyright (C) 2010 Uwe Lück
%%
%% This file can be redistributed and/or modified under
%% the terms of the LaTeX Project Public License; either
@@ -15,7 +13,7 @@
%%
%% Please report bugs, problems, and suggestions via
%%
-%% http://www.contact-ednotes.sty.de.vu
+%% https://github.com/latex-lineno/lineno
%%
%% {\it This work has been supported
%% % and is owned %% wrong, owner is RUB -- 2011/02/09
diff --git a/Master/texmf-dist/tex/latex/lineno/lineno.sty b/Master/texmf-dist/tex/latex/lineno/lineno.sty
index 1b688e0f4d5..c879008a20d 100644
--- a/Master/texmf-dist/tex/latex/lineno/lineno.sty
+++ b/Master/texmf-dist/tex/latex/lineno/lineno.sty
@@ -3,12 +3,11 @@
Macro file lineno.sty for LaTeX: attach line numbers, refer to them.
\fi
-\def\fileversion{v5.0} \def\filedate{2022/07/30} %VERSION
+\def\fileversion{v5.1} \def\filedate{2023/01/19} %VERSION
-%%% Copyright 1995--2003 Stephan I. B"ottcher <boettcher@physik.uni-kiel.de>;
-%%% Copyright 2002--2005 Uwe L"uck, http://www.contact-ednotes.sty.de.vu
-%%% for version 4 and code from former Ednotes bundle
-%%% --author-maintained.
+%%% Copyright 1995--2003 Stephan I. Böttcher
+%%% Copyright 2002--2005 Uwe Lück for versions 4.x and code from former Ednotes
+%%% Copyright 2021--2023 Karl Wette for versions 5.x
%%%
%%% This file can be redistributed and/or modified under
%%% the terms of the LaTeX Project Public License; either
@@ -29,11 +28,9 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them.
% \unskip}\author{%
% Stephan I. B\"ottcher
% \\ Uwe L\"uck
+% \\ Karl Wette
% \unskip}\date{%
-% boettcher@physik.uni-kiel.de
-% \\ http://contact-ednotes.sty.de.vu
-%% \\ stephan@nevis.columbia.edu
-%% \\ Stephan.Boettcher@cern.ch
+% \url{https://github.com/latex-lineno/lineno}
% \\}
%
% \documentclass[a4paper,12pt]{article}%D
@@ -138,11 +135,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them.
%
% Since late 2002, Christian Tapp and Uwe L\"uck have employed
% ~lineno.sty~ for their ~ednotes.sty~, a package supporting
-% critical editions---cf.
-% \[\mbox{\tt
-% http://ednotes.sty.de.vu
-% \unskip}\]
-% ---while you find ~ednotes.sty~ and surrounding files in
+% critical editions, while you find ~ednotes.sty~ and surrounding files in
% CTAN folder \path{macros/latex/contrib/ednotes}.
%
% Soon, some weaknesses of ~lineno.sty~ showed up, mainly since
@@ -261,13 +254,13 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them.
% (New v4.00) And we use ~\newcommand*~ for
% controlling length of user macro arguments, which has been
% available since December 1994.
+% (/New v4.00)
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
%% [1994/11/04]
\ProvidesPackage{lineno}
[\filedate\space line numbers on paragraphs \fileversion]
-% (/New v4.00)
%%
%% History of versions:
%% v1.00 1995/03/31 SIB: first release for Petra's interview transcriptions
@@ -393,6 +386,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them.
%% \stepcounter{linenumber} (confusion again).
%% v4.41 2005/11/02 UL: Raised \CheckCommand*.
%% v5.0 2022/07/30 KW: Merge in `linenoamsmath' patches
+%% v5.1 2023/01/19 KW: Patch `amsmath` with \AddToHook if possible.
%%
%% Acknowledgements:
%% v3.06: Donald Arseneau, pointed to mparhack.sty.
@@ -2604,14 +2598,14 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them.
% (/New v4.1)
%
% \section{%
-% Former package extensions
+% Package extensions
% \label{s:Xt}\unskip}
%
-% The extensions in this section were previously supplied
+% Some of the extensions in this section were previously supplied
% in separate ~.sty~ files.
%
% \subsection{%
-% $display math$
+% \texttt{displaymath}
% \unskip}\label{ss:display}
%% (New v4.32)
% (New v4.3) From now on, you no longer need to type
@@ -2888,52 +2882,75 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them.
% (New v5.0) Patches ~amsmath~ to work with ~lineno~. These patches used to be
% supplied by the ~linenoamsmath~ package. See ~linenoamsmathdemo.pdf~ for a
% demonstration.
+% (/New v5.0)
+%
+% (/New v5.1) ~lineno~ tries to use \LaTeX's hook management system to patch
+% ~amsmath~, so that the two packages may be loaded independently. This requires
+% the October 2020 release of \LaTeX. As a fallback for older releases, ~lineno~
+% tests whether ~amsmath~ had already been loaded (by testing for the presence
+% of the ~gather~ command) and if so applies the patches; otherwise if ~amsmath~
+% has not been loaded, no patches are applied, and a warning is issued.
+% (/New v5.1)
%
\RequirePackage{etoolbox}
-\newcommand*\linenoamsmath@patch[1]{%
- \cspreto{#1}{\linenomath}%
- \cspreto{#1*}{\linenomath}%
- \csappto{end#1}{\endlinenomath}%
- \csappto{end#1*}{\endlinenomath}%
-}
-\newcount\linenoamsmath@ams@eqpen
-\cspreto{math@cr@}{\global\@eqpen\numexpr\@eqpen+\linenoamsmath@ams@eqpen\relax}
-\newcommand*\linenoamsmath@patch@ams[1]{%
- \cspreto{#1}{%
- \linenomath%
- \postdisplaypenalty=0%
- \global\linenoamsmath@ams@eqpen\interdisplaylinepenalty%
- }%
- \cspreto{#1*}{%
- \linenomath%
- \postdisplaypenalty=0%
- \global\linenoamsmath@ams@eqpen\interdisplaylinepenalty%
- }%
- \csappto{end#1}{%
- \global\linenoamsmath@ams@eqpen\z@%
- \endlinenomath%
- }%
- \csappto{end#1*}{%
+\ifdefined\AddToHook
+ \def\linenoamsmath@patches#1{\AddToHook{package/amsmath/after}{#1}}
+\else
+ \ifdefined\endgather
+ \def\linenoamsmath@patches#1{#1}
+ \else
+ \PackageWarning{lineno}{%
+ `amsmath' must be loaded before `lineno' for patches to be applied}
+ \def\linenoamsmath@patches#1{\relax}
+ \fi
+\fi
+
+\linenoamsmath@patches{
+ \newcommand*\linenoamsmath@patch[1]{%
+ \cspreto{#1}{\linenomath}%
+ \cspreto{#1*}{\linenomath}%
+ \csappto{end#1}{\endlinenomath}%
+ \csappto{end#1*}{\endlinenomath}%
+ }
+ \newcount\linenoamsmath@ams@eqpen
+ \cspreto{math@cr@}{\global\@eqpen\numexpr\@eqpen+\linenoamsmath@ams@eqpen\relax}
+ \newcommand*\linenoamsmath@patch@ams[1]{%
+ \cspreto{#1}{%
+ \linenomath%
+ \postdisplaypenalty=0%
+ \global\linenoamsmath@ams@eqpen\interdisplaylinepenalty%
+ }%
+ \cspreto{#1*}{%
+ \linenomath%
+ \postdisplaypenalty=0%
+ \global\linenoamsmath@ams@eqpen\interdisplaylinepenalty%
+ }%
+ \csappto{end#1}{%
+ \global\linenoamsmath@ams@eqpen\z@%
+ \endlinenomath%
+ }%
+ \csappto{end#1*}{%
+ \global\linenoamsmath@ams@eqpen\z@%
+ \endlinenomath%
+ }%
+ }
+ \linenoamsmath@patch{equation}
+ \linenoamsmath@patch@ams{multline}
+ \linenoamsmath@patch@ams{gather}
+ \linenoamsmath@patch@ams{align}
+ \linenoamsmath@patch@ams{alignat}
+ \linenoamsmath@patch@ams{flalign}
+ \let\linenoamsmath@ams@mmeasure\mmeasure@
+ \def\mmeasure@#1{%
\global\linenoamsmath@ams@eqpen\z@%
- \endlinenomath%
- }%
-}
-\linenoamsmath@patch{equation}
-\linenoamsmath@patch@ams{multline}
-\linenoamsmath@patch@ams{gather}
-\linenoamsmath@patch@ams{align}
-\linenoamsmath@patch@ams{alignat}
-\linenoamsmath@patch@ams{flalign}
-\let\linenoamsmath@ams@mmeasure\mmeasure@
-\def\mmeasure@#1{%
- \global\linenoamsmath@ams@eqpen\z@%
- \begingroup%
- \interdisplaylinepenalty=0%
- \linenoamsmath@ams@mmeasure{#1\\}%
- \endgroup%
- \global\linenoamsmath@ams@eqpen\interdisplaylinepenalty%
+ \begingroup%
+ \interdisplaylinepenalty=0%
+ \linenoamsmath@ams@mmeasure{#1\\}%
+ \endgroup%
+ \global\linenoamsmath@ams@eqpen\interdisplaylinepenalty%
+ }
}
%
diff --git a/Master/texmf-dist/tex/latex/lineno/vplref.sty b/Master/texmf-dist/tex/latex/lineno/vplref.sty
index bdff9b45b7a..3bb2eed3222 100644
--- a/Master/texmf-dist/tex/latex/lineno/vplref.sty
+++ b/Master/texmf-dist/tex/latex/lineno/vplref.sty
@@ -3,8 +3,7 @@
\def\filedate{2005/04/25} \def\fileversion{0.2a}
-%% Copyright (C) 2004, 2005 Uwe Lueck,
-%% http://contact-ednotes.sty.de.vu --author-maintained
+%% Copyright (C) 2004, 2005 Uwe Lück
%% -- support of lineno.sty for varioref.sty.
%% This file can be redistributed and/or modified under