diff options
author | Norbert Preining <norbert@preining.info> | 2023-05-19 03:01:08 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-05-19 03:01:08 +0000 |
commit | dd54bf2a9c9e985917ceb5ced412213cd44eaeae (patch) | |
tree | 0d0a94b7cad225ba7570c9ae16082392e2c41a2b /macros/latex/contrib/lineno | |
parent | b2f81626104e48abe103ae135fb0d538bb2de3cd (diff) |
CTAN sync 202305190301
Diffstat (limited to 'macros/latex/contrib/lineno')
-rw-r--r-- | macros/latex/contrib/lineno/README.md | 11 | ||||
-rw-r--r-- | macros/latex/contrib/lineno/doc/CHANGEs.txt | 5 | ||||
-rw-r--r-- | macros/latex/contrib/lineno/doc/SRCFILEs.txt | 4 | ||||
-rw-r--r-- | macros/latex/contrib/lineno/doc/fnlineno.pdf | bin | 198683 -> 198521 bytes | |||
-rw-r--r-- | macros/latex/contrib/lineno/doc/lineno.pdf | bin | 369808 -> 371227 bytes | |||
-rw-r--r-- | macros/latex/contrib/lineno/doc/linenoamsmathdemo.pdf | bin | 95668 -> 102915 bytes | |||
-rw-r--r-- | macros/latex/contrib/lineno/doc/lnosuppl.pdf | bin | 161407 -> 161540 bytes | |||
-rw-r--r-- | macros/latex/contrib/lineno/doc/ulineno.pdf | bin | 127130 -> 127130 bytes | |||
-rw-r--r-- | macros/latex/contrib/lineno/source/lineno.tex | 18 | ||||
-rw-r--r-- | macros/latex/contrib/lineno/source/linenoamsmathdemo.tex | 104 | ||||
-rw-r--r-- | macros/latex/contrib/lineno/tex/lineno.sty | 19 |
11 files changed, 150 insertions, 11 deletions
diff --git a/macros/latex/contrib/lineno/README.md b/macros/latex/contrib/lineno/README.md index 3b93f2a019..085d59f247 100644 --- a/macros/latex/contrib/lineno/README.md +++ b/macros/latex/contrib/lineno/README.md @@ -1,6 +1,6 @@ -# lineno.sty v5.1, fnlineno.sty v0.55 +# lineno.sty v5.2, fnlineno.sty v0.55 -2022-11-29 +2023-05-19 The LaTeX package lineno.sty provides line numbers on paragraphs. After TeX has broken a paragraph into lines there will be line numbers attached to them, with @@ -39,7 +39,8 @@ Authors: in v3.04. - `amsmath.sty`: loadable, but not fully supported, with v4.41. Fully supported - with v5.0. + with v5.0. Use LaTeX hooks to allow independent loading of `amsmath` and `lineno` + with v5.1. Support `amsmath` option `\allowdisplaybreaks` with v5.2. ## Installation and usage (UL, v4.1): @@ -55,7 +56,7 @@ Usage always starts with loading lineno.sty by `\usepackage`. The remaining recommend not to load them through [the mandatory argument of] `\usepackage`). For details, see `lineno.tex/pdf` and the `.sty` files mentioned above--search -especially for tabular and math mode. (+ `print' below here). +especially for tabular and math mode. (+ `print` below here). "Visible to (LaTeX)": Some users don't understand this "visibility" for a while, and indeed it may be somewhat non-trivial. These users may find help in @@ -64,7 +65,7 @@ lineno.sty may just put all the .sty files into the folder (at their workplace) where they had placed lineno.sty before. (/UL, /v4.1) To print the documented source: Take the style-file `lineno.sty`, and feed it to -a Un*x shell. (Or download the extracted source documentation `lineno.tex'.) +a Un*x shell. (Or download the extracted source documentation `lineno.tex`.) ``` csh> source ./lineno.sty sh> . ./lineno.sty diff --git a/macros/latex/contrib/lineno/doc/CHANGEs.txt b/macros/latex/contrib/lineno/doc/CHANGEs.txt index 9445d718af..0612c8ffc4 100644 --- a/macros/latex/contrib/lineno/doc/CHANGEs.txt +++ b/macros/latex/contrib/lineno/doc/CHANGEs.txt @@ -1,3 +1,8 @@ +CHANGES for lineno pkg v5.2 2023/05/19: + +1. Support `amsmath` option `\allowdisplaybreaks`. + + CHANGES for lineno pkg v5.1 2023/01/19: 1. Patch `amsmath` with \AddToHook if possible. diff --git a/macros/latex/contrib/lineno/doc/SRCFILEs.txt b/macros/latex/contrib/lineno/doc/SRCFILEs.txt index 7e64111f74..ead01626f4 100644 --- a/macros/latex/contrib/lineno/doc/SRCFILEs.txt +++ b/macros/latex/contrib/lineno/doc/SRCFILEs.txt @@ -1,10 +1,10 @@ ednmath0.sty 2005/01/10 v0.2b math support for lineno/ednotes (ul) edtable.sty 2005/10/03 v1.3c arrays with lineno + ednotes (ul) fnlineno.sty 2011/01/07 v0.55 numbers to footnote lines (UL) -lineno.sty 2023/01/19 line numbers on paragraphs v5.1 +lineno.sty 2023/05/19 line numbers on paragraphs v5.2 vplref.sty 2005/04/25 v0.2a page-line cross-refs fnlineno.tex 2011/02/14 documenting fnlineno.sty (UL) -lineno.tex 2023/01/19 line numbers on paragraphs v5.1 +lineno.tex 2023/05/19 line numbers on paragraphs v5.2 lnosuppl.tex 2011/02/16 documenting supplementary files ulineno.tex 2001/08/03 lineno.sty users manual linenoamsmathdemo.tex 2021/09/30 Make amsmath work with lineno diff --git a/macros/latex/contrib/lineno/doc/fnlineno.pdf b/macros/latex/contrib/lineno/doc/fnlineno.pdf Binary files differindex 5fc04fbe98..0760d0ecc0 100644 --- a/macros/latex/contrib/lineno/doc/fnlineno.pdf +++ b/macros/latex/contrib/lineno/doc/fnlineno.pdf diff --git a/macros/latex/contrib/lineno/doc/lineno.pdf b/macros/latex/contrib/lineno/doc/lineno.pdf Binary files differindex 31aa52c931..7cbf50f5b4 100644 --- a/macros/latex/contrib/lineno/doc/lineno.pdf +++ b/macros/latex/contrib/lineno/doc/lineno.pdf diff --git a/macros/latex/contrib/lineno/doc/linenoamsmathdemo.pdf b/macros/latex/contrib/lineno/doc/linenoamsmathdemo.pdf Binary files differindex 8ec78a498e..68e32b823e 100644 --- a/macros/latex/contrib/lineno/doc/linenoamsmathdemo.pdf +++ b/macros/latex/contrib/lineno/doc/linenoamsmathdemo.pdf diff --git a/macros/latex/contrib/lineno/doc/lnosuppl.pdf b/macros/latex/contrib/lineno/doc/lnosuppl.pdf Binary files differindex cc6aeaf9a2..c2f5c3fd6d 100644 --- a/macros/latex/contrib/lineno/doc/lnosuppl.pdf +++ b/macros/latex/contrib/lineno/doc/lnosuppl.pdf diff --git a/macros/latex/contrib/lineno/doc/ulineno.pdf b/macros/latex/contrib/lineno/doc/ulineno.pdf Binary files differindex e6ba98d6e3..efe87de8ab 100644 --- a/macros/latex/contrib/lineno/doc/ulineno.pdf +++ b/macros/latex/contrib/lineno/doc/ulineno.pdf diff --git a/macros/latex/contrib/lineno/source/lineno.tex b/macros/latex/contrib/lineno/source/lineno.tex index baed81f1b8..1e2457202c 100644 --- a/macros/latex/contrib/lineno/source/lineno.tex +++ b/macros/latex/contrib/lineno/source/lineno.tex @@ -1,4 +1,4 @@ -\def\fileversion{v5.1} \def\filedate{2023/01/19} +\def\fileversion{v5.2} \def\filedate{2023/05/19} \title{\texttt{\itshape lineno.sty \ \fileversion\ \filedate @@ -2718,6 +2718,13 @@ 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) +(/New v5.2) Fix ~lineno~ to work with ~amsmath~'s ~\allowdisplaybreaks~ +option. A side effect is that now ~\\*~ suppresses a line number on that +line. This is because ~\\*~ prohibits a page break after a given line, and +~lineno~ basically works by hijacking page breaks. It's probably not possible +to fix this without losing the behaviour of ~\\*~. +(/New v5.2) + \begin{code}\begin{verbatim} \RequirePackage{etoolbox} @@ -2741,7 +2748,14 @@ has not been loaded, no patches are applied, and a warning is issued. \csappto{end#1*}{\endlinenomath}% } \newcount\linenoamsmath@ams@eqpen - \cspreto{math@cr@}{\global\@eqpen\numexpr\@eqpen+\linenoamsmath@ams@eqpen\relax} + \cspreto{math@cr@}{% + %%% Uncommenting the following 2 lines restores the line number on a line + %%% ended with \\*, by making \\* act just like \\. This is probably + %%% undesirable, however, so these lines are disabled. + % \global\@eqpen% + % \ifnum\dspbrk@lvl <\z@ \interdisplaylinepenalty \else -\@getpen\dspbrk@lvl \fi% + \advance\@eqpen\linenoamsmath@ams@eqpen\relax% + } \newcommand*\linenoamsmath@patch@ams[1]{% \cspreto{#1}{% \linenomath% diff --git a/macros/latex/contrib/lineno/source/linenoamsmathdemo.tex b/macros/latex/contrib/lineno/source/linenoamsmathdemo.tex index 571b8230e8..045e251a62 100644 --- a/macros/latex/contrib/lineno/source/linenoamsmathdemo.tex +++ b/macros/latex/contrib/lineno/source/linenoamsmathdemo.tex @@ -29,6 +29,8 @@ \usepackage{lipsum} \usepackage{hyperref} +\allowdisplaybreaks + \begin{document} \title{Make \textsf{amsmath}\footnote{\url{https://ctan.org/pkg/amsmath}}~ work with \textsf{lineno}} @@ -412,6 +414,108 @@ formatted when using \textsf{amsmath} math environments. \loadorder. \end{linenomath*} \nextlipsum +\subsection*{Long equation with \textbackslash allowdisplaybreaks} + +\nextlipsum +\begin{multline} +0, 1, 2, \\ +3, \\ +4, 5, \\ +6, 7, \\ +8, 9, 10, 11, \\ +12, 13, \\ +14, 15, 16, 17, \\ +18, 19, \\ +20, 21, 22, 23, \\ +24, 25, 26, 27, 28, 29, \\ +30, 31, \\ +32, 33, 34, 35, 36, 37, \\ +38, 39, 40, 41, \\ +42, 43, \\ +44, 45, 46, 47, \\ +48, 49, 50, 51, 52, 53, \\ +54, 55, 56, 57, 58, 59, \\ +60, 61, \\ +62, 63, 64, 65, 66, 67, \\ +68, 69, 70, 71, \\ +72, 73, \\ +74, 75, 76, 77, 78, 79, \\ +80, 81, 82, 83, \\ +84, 85, 86, 87, 88, 89, \\ +90, 91, 92, 93, 94, 95, 96, 97, \\ +98, 99, 100, 101, \\ +102, 103, \\ +104, 105, 106, 107, \\ +108, 109, \\ +110, 111, 112, 113, \\ +114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, \\ +128, 129, 130, 131, \\ +132, 133, 134, 135, 136, 137, \\ +138, 139, \\ +140, 141, 142, 143, 144, 145, 146, 147, 148, 149, \\ +150, 151, \\ +152, 153, 154, 155, 156, 157, \\ +158, 159, 160, 161, 162, 163, \\ +164, 165, 166, 167, \\ +168, 169, 170, 171, 172, 173, \\ +174, 175, 176, 177, 178, 179, \\ +180, 181, \\ +182, 183, 184, 185, 186, 187, 188, 189, 190, 191, \\ +192, 193, \\ +194, 195, 196, 197, \\ +198, 199, \\ +200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, \\ +212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, \\ +224, 225, 226, 227, \\ +228, 229, \\ +230, 231, 232, 233, \\ +234, 235, 236, 237, 238, 239, \\ +240, 241, \\ +242, 243, 244, 245, 246, 247, 248, 249, 250, 251, \\ +252, 253, 254, 255, 256, 257, \\ +258, 259, 260, 261, 262, 263, \\ +264, 265, 266, 267, 268, 269, \\ +270, 271, \\ +272, 273, 274, 275, 276, 277, \\ +278, 279, 280, 281, \\ +282, 283, \\ +284, 285, 286, 287, 288, 289, 290, 291, 292, 293, \\ +294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, \\ +308, 309, 310, 311, \\ +312, 313, \\ +314, 315, 316, 317, \\ +318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, \\ +332, 333, 334, 335, 336, 337, \\ +338, 339, 340, 341, 342, 343, 344, 345, 346, 347, \\ +348, 349, \\ +350, 351, 352, 353, \\ +354, 355, 356, 357, 358, 359, \\ +360, 361, 362, 363, 364, 365, 366, 367, \\ +368, 369, 370, 371, 372, 373, \\ +374, 375, 376, 377, 378, 379, \\ +380, 381, 382, 383, \\ +384, 385, 386, 387, 388, 389, \\ +390, 391, 392, 393, 394, 395, 396, 397, \\ +398, 399, 400, 401, \\ +402, 403, 404, 405, 406, 407, 408, 409, \\ +410, 411, 412, 413, 414, 415, 416, 417, 418, 419, \\ +420, 421, \\ +422, 423, 424, 425, 426, 427, 428, 429, 430, 431, \\ +432, 433, \\ +434, 435, 436, 437, 438, 439, \\ +440, 441, 442, 443, \\ +444, 445, 446, 447, 448, 449, \\ +450, 451, 452, 453, 454, 455, 456, 457, \\ +458, 459, 460, 461, \\ +462, 463, \\ +464, 465, 466, 467, \\ +468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, \\ +480, 481, 482, 483, 484, 485, 486, 487, \\ +488, 489, 490, 491, \\ +492, 493, 494, 495, 496, 497, 498, 499 \,. +\end{multline} +\nextlipsum + \nolinenumbers \end{document} diff --git a/macros/latex/contrib/lineno/tex/lineno.sty b/macros/latex/contrib/lineno/tex/lineno.sty index c879008a20..03958a8589 100644 --- a/macros/latex/contrib/lineno/tex/lineno.sty +++ b/macros/latex/contrib/lineno/tex/lineno.sty @@ -3,7 +3,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. \fi -\def\fileversion{v5.1} \def\filedate{2023/01/19} %VERSION +\def\fileversion{v5.2} \def\filedate{2023/05/19} %VERSION %%% Copyright 1995--2003 Stephan I. Böttcher %%% Copyright 2002--2005 Uwe Lück for versions 4.x and code from former Ednotes @@ -387,6 +387,7 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. %% 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. +%% v5.2 2023/05/19 KW: Support `amsmath` option `\allowdisplaybreaks`. %% %% Acknowledgements: %% v3.06: Donald Arseneau, pointed to mparhack.sty. @@ -2892,6 +2893,13 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. % has not been loaded, no patches are applied, and a warning is issued. % (/New v5.1) % +% (/New v5.2) Fix ~lineno~ to work with ~amsmath~'s ~\allowdisplaybreaks~ +% option. A side effect is that now ~\\*~ suppresses a line number on that +% line. This is because ~\\*~ prohibits a page break after a given line, and +% ~lineno~ basically works by hijacking page breaks. It's probably not possible +% to fix this without losing the behaviour of ~\\*~. +% (/New v5.2) +% \RequirePackage{etoolbox} @@ -2915,7 +2923,14 @@ Macro file lineno.sty for LaTeX: attach line numbers, refer to them. \csappto{end#1*}{\endlinenomath}% } \newcount\linenoamsmath@ams@eqpen - \cspreto{math@cr@}{\global\@eqpen\numexpr\@eqpen+\linenoamsmath@ams@eqpen\relax} + \cspreto{math@cr@}{% + %%% Uncommenting the following 2 lines restores the line number on a line + %%% ended with \\*, by making \\* act just like \\. This is probably + %%% undesirable, however, so these lines are disabled. + % \global\@eqpen% + % \ifnum\dspbrk@lvl <\z@ \interdisplaylinepenalty \else -\@getpen\dspbrk@lvl \fi% + \advance\@eqpen\linenoamsmath@ams@eqpen\relax% + } \newcommand*\linenoamsmath@patch@ams[1]{% \cspreto{#1}{% \linenomath% |