summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/revtex/ltxgrid.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/revtex/ltxgrid.sty')
-rw-r--r--Master/texmf-dist/tex/latex/revtex/ltxgrid.sty106
1 files changed, 69 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/latex/revtex/ltxgrid.sty b/Master/texmf-dist/tex/latex/revtex/ltxgrid.sty
index cefe4dccdbb..a8dcf785a11 100644
--- a/Master/texmf-dist/tex/latex/revtex/ltxgrid.sty
+++ b/Master/texmf-dist/tex/latex/revtex/ltxgrid.sty
@@ -22,11 +22,10 @@
%%
%%% @LaTeX-file{
%%% filename = "ltxgrid.dtx",
-%%% version = "4.2c",
-%%% date = "2019/01/18",
-%%% time = "14:29:48 UT-5",
-%%% checksum = "5462",
+%%% version = "4.2e",
+%%% date = "2020/10/03",
%%% author = "Arthur Ogawa (mailto:arthur_ogawa at sbcglobal.net),
+%%% Phelype Oleinik (mailto:phelype.oleinik at latex-project.org),
%%% commissioned by the American Physical Society.
%%% ",
%%% copyright = "Copyright (C) 1999, 2009 Arthur Ogawa,
@@ -43,14 +42,13 @@
%%% keywords = "latex, page grid, main vertical list",
%%% supported = "yes",
%%% abstract = "package to change page grid, MVL",
-%%% docstring = "The checksum field above generated by ltxdoc",
%%% }
\NeedsTeXFormat{LaTeX2e}[1995/12/01]%
\ProvidesFile{%
ltxgrid%
.sty%
}%
- [2019/01/18/14:29:48 4.2c page grid package (portions licensed from W. E. Baxter web at superscript.com)]% \fileversion
+ [2020/10/03 4.2e page grid package (portions licensed from W. E. Baxter web at superscript.com)]% \fileversion
\def\package@name{ltxgrid}%
\expandafter\PackageInfo\expandafter{\package@name}{%
Page grid for \protect\LaTeXe,
@@ -1875,12 +1873,22 @@ ltxgrid%
\def\recover@column@null#1#2#3#4{%
\unvcopy#1%
}%
-\prepdef\@begindocumenthook{%
- \open@column@one\@ne
- \set@colht
- \@floatplacement
- \@dblfloatplacement
-}%
+\rvtx@ifformat@geq{2020-10-01}%
+ {%
+ \AddToHook{begindocument}{%
+ \open@column@one\@ne
+ \set@colht
+ \@floatplacement
+ \@dblfloatplacement
+ }%
+ }{%
+ \prepdef\@begindocumenthook{%
+ \open@column@one\@ne
+ \set@colht
+ \@floatplacement
+ \@dblfloatplacement
+ }%
+ }
\def\longtable@longtable{%
\par
\ifx\multicols\@undefined\else\ifnum\col@number>\@ne\@twocolumntrue\fi\fi
@@ -2413,38 +2421,41 @@ ltxgrid%
\let\nopagebreak@ltx\nopagebreak
\let\endline@ltx\\
\let\@arrayparboxrestore@ltx\@arrayparboxrestore
-\def\@vspace@org #1{%
+\def\@tempa#1{%
+\def\@vspace@org ##1{%
\ifvmode
- \vskip #1
+ #1% \vskip #1
\vskip\z@skip
\else
\@bsphack
\vadjust{\@restorepar
- \vskip #1
+ #1% \vskip #1
\vskip\z@skip
}%
\@esphack
\fi
}%
-\def\@vspace@ltx#1{%
+\def\@vspace@ltx##1{%
\@ifvmode{%
- \vskip#1\vskip\z@skip
+ #1% \vskip #1
+ \vskip\z@skip
}{%
\@bsphack
\ex@vadjust@ltx{%
\@restorepar
\nobreak
- \vskip#1\vskip\z@skip
+ #1% \vskip #1
+ \vskip\z@skip
}%
\@esphack
}%
}%
-\def\@vspacer@org#1{%
+\def\@vspacer@org##1{%
\ifvmode
\dimen@\prevdepth
\hrule \@height\z@
\nobreak
- \vskip #1
+ #1%\vskip #1
\vskip\z@skip
\prevdepth\dimen@
\else
@@ -2452,17 +2463,18 @@ ltxgrid%
\vadjust{\@restorepar
\hrule \@height\z@
\nobreak
- \vskip #1
+ #1%\vskip #1
\vskip\z@skip}%
\@esphack
\fi
}%
-\def\@vspacer@ltx#1{%
+\def\@vspacer@ltx##1{%
\@ifvmode{%
\dimen@\prevdepth
\hrule\@height\z@
\nobreak
- \vskip#1\vskip\z@skip
+ #1%\vskip#1
+ \vskip\z@skip
\prevdepth\dimen@
}{%
\@bsphack
@@ -2470,11 +2482,16 @@ ltxgrid%
\@restorepar
\hrule\@height\z@
\nobreak
- \vskip#1\vskip\z@skip
+ #1%\vskip#1
+ \vskip\z@skip
}%
\@esphack
}%
}%
+}
+\rvtx@ifformat@geq{2020/10/01}%
+ {\@tempa{\@vspace@calcify{#1}}}%
+ {\@tempa{\vskip #1 }}%
\def\@no@pgbk@org #1[#2]{%
\ifvmode
\penalty #1\@getpen{#2}%
@@ -2495,7 +2512,8 @@ ltxgrid%
\@esphack
}%
}%
-\long\def\end@line@org{%
+\rvtx@ifformat@geq{2020/02/02}%
+{\protected}{\long}\def\end@line@org{%
\let\reserved@e\relax
\let\reserved@f\relax
\@ifstar{%
@@ -2505,7 +2523,8 @@ ltxgrid%
}%
\@xnewline
}%
-\long\def\end@line@ltx{%
+\rvtx@ifformat@geq{2020/02/02}%
+{\protected}{\long}\def\end@line@ltx{%
\let\reserved@e\relax
\let\reserved@f\relax
\@ifstar{%
@@ -2516,20 +2535,30 @@ ltxgrid%
\@xnewline
}%
}%
-\def\@newline@org[#1]{%
- \let\reserved@e\vadjust
- \@gnewline{\vskip#1}%
-}%
-\def\@newline@ltx[#1]{%
- \let\reserved@e\ex@vadjust@ltx
- \@gnewline{\vskip#1}%
-}%
+\def\@tempa#1{%
+ \def\@newline@org[##1]{%
+ \let\reserved@e\vadjust
+ \@gnewline{#1}% \vskip#1
+ }%
+ \def\@newline@ltx[##1]{%
+ \let\reserved@e\ex@vadjust@ltx
+ \@gnewline{#1}% \vskip#1
+ }%
+}
+\rvtx@ifformat@geq{2020/10/01}%
+ {\@tempa{\@vspace@calcify{#1}}}%
+ {\@tempa{\vskip #1}}%
\@ifx{\@vspace\@vspace@org}{%
\@ifx{\@vspacer\@vspacer@org}{%
\@ifx{\@no@pgbk\@no@pgbk@org}{%
\@ifx{\@newline\@newline@org}{%
- \expandafter\@ifx\expandafter{\csname\expandafter\@gobble\string\\ \endcsname\end@line@org}{%
- \true@sw
+ \expandafter\@ifx\expandafter{%
+ \csname\rvtx@ifformat@geq{2020/02/02}%
+ {\expandafter\@gobble\string\\}%
+ {\expandafter\@gobble\string\\ }\endcsname
+ \end@line@org
+ }{%
+ \true@sw
}{\false@sw}%
}{\false@sw}%
}{\false@sw}%
@@ -2538,7 +2567,10 @@ ltxgrid%
{%
\class@info{Overriding \string\@vspace, \string\@vspacer, \string\@no@pgbk, \string\@newline, and \string\\ }%
\let\@normalcr\end@line@ltx
- \expandafter\let\csname\expandafter\@gobble\string\\ \endcsname\@normalcr
+ \expandafter\let
+ \csname\rvtx@ifformat@geq{2020/02/02}%
+ {\expandafter\@gobble\string\\}%
+ {\expandafter\@gobble\string\\ }\endcsname\@normalcr
\let\@newline\@newline@ltx
\let\@vspace\@vspace@ltx
\let\@vspacer\@vspacer@ltx