[latex3-commits] [git/LaTeX3-latex3-latex2e] picture-lengths: fix includeinrelease guards (ff32c9d4)

[David Carlisle]

Repository : https://github.com/latex3/latex2e
On branch  : picture-lengths
Link       : https://github.com/latex3/latex2e/commit/ff32c9d4c7b6181e1defbc801e83a18da47ed0b8

>---------------------------------------------------------------

commit ff32c9d4c7b6181e1defbc801e83a18da47ed0b8
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Sat Aug 15 13:01:46 2020 +0100

    fix includeinrelease guards


>---------------------------------------------------------------

ff32c9d4c7b6181e1defbc801e83a18da47ed0b8
 base/ltpictur.dtx | 105 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 68 insertions(+), 37 deletions(-)

diff --git a/base/ltpictur.dtx b/base/ltpictur.dtx
index 1353304c..81c62cc5 100644
--- a/base/ltpictur.dtx
+++ b/base/ltpictur.dtx
@@ -1379,6 +1379,16 @@
 %    \begin{macrocode}
 \newif\if at ovvline \@ovvlinetrue
 \newif\if at ovhline \@ovhlinetrue
+%    \begin{macrocode}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>                 {\@ovhlinetrue}%
+%<latexrelease>                 {Avoid almost zero length leaders}%
+%<latexrelease>\let\if at ovvline\@undefined
+%<latexrelease>\let\if at ovhline\@undefined
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -1432,7 +1442,7 @@
 %    
 %    \begin{macrocode}
 %<latexrelease>\EndIncludeInRelease
-%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>\IncludeInRelease{2016/03/31}%
 %<latexrelease>                 {\@oval}{default units}%
 %<latexrelease>\def\@oval(#1,#2)[#3]{\begingroup\boxmaxdepth \maxdimen
 %<latexrelease>  \@ovttrue \@ovbtrue \@ovltrue \@ovrtrue
@@ -1458,12 +1468,44 @@
 %<latexrelease>  \@put{-\@ovdx}{-\@ovdy}{\box\@tempboxa}%
 %<latexrelease>  \endgroup}
 %<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%    
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>                 {\@oval}{default units}%
+%<latexrelease>\def\@oval(#1,#2)[#3]{\begingroup\boxmaxdepth \maxdimen
+%<latexrelease>  \@ovttrue \@ovbtrue \@ovltrue \@ovrtrue
+%<latexrelease>  \@tfor\reserved at a :=#3\do
+%<latexrelease>                {\csname @ov\reserved at a false\endcsname}%
+%<latexrelease>  \@ovxx #1\unitlength
+%<latexrelease>  \@ovyy #2\unitlength
+%<latexrelease>  \@tempdimb \ifdim \@ovyy >\@ovxx \@ovxx\else \@ovyy \fi
+%<latexrelease>  \advance \@tempdimb -2\p@
+%<latexrelease>  \@getcirc \@tempdimb
+%<latexrelease>  \@ovro \ht\@tempboxa \@ovri \dp\@tempboxa
+%<latexrelease>  \@ovdx\@ovxx \advance\@ovdx -\@tempdima \divide\@ovdx \tw@
+%<latexrelease>  \@ovdy\@ovyy \advance\@ovdy -\@tempdima \divide\@ovdy \tw@
+%<latexrelease>  \@circlefnt \setbox\@tempboxa
+%<latexrelease>  \hbox{\if at ovr \@ovvert32\kern -\@tempdima \fi
+%<latexrelease>  \if at ovl
+%<latexrelease>   \kern \@ovxx \@ovvert01\kern -\@tempdima \kern -\@ovxx
+%<latexrelease>  \fi
+%<latexrelease>  \if at ovt \@ovhorz \kern -\@ovxx \fi
+%<latexrelease>  \if at ovb \raise \@ovyy \@ovhorz \fi}\advance\@ovdx\@ovro
+%<latexrelease>  \advance\@ovdy\@ovro \ht\@tempboxa\z@ \dp\@tempboxa\z@
+%<latexrelease>  \@put{-\@ovdx}{-\@ovdy}{\box\@tempboxa}%
+%<latexrelease>  \endgroup}
+%<latexrelease>\EndIncludeInRelease
 %<*2ekernel>
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\@ovvert}
 %    \begin{macrocode}
+%</2ekernel>
+%<latexrelease>\IncludeInRelease{2016/03/31}%
+%<latexrelease>                 {\@ovvert}{Avoid almost zero length leaders}%
+%<*2ekernel|latexrelease>
 \def\@ovvert#1#2{\vbox to\@ovyy{%
     \if at ovb \@tempcntb \@tempcnta \advance \@tempcntb #1\relax
       \kern -\@ovro \hbox{\char \@tempcntb}\nointerlineskip
@@ -1479,11 +1521,32 @@
     \if at ovt \@tempcntb \@tempcnta \advance \@tempcntb #2\relax
       \hbox{\char \@tempcntb}%
     \else \kern \@ovdy \kern \@ovro \fi}}
+%</2ekernel|latexrelease>
+%    \end{macrocode}
+%    
+%    \begin{macrocode}
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>                 {\@ovvert}{Avoid almost zero length leaders}%
+%<latexrelease>\def\@ovvert#1#2{\vbox to\@ovyy{%
+%<latexrelease>    \if at ovb \@tempcntb \@tempcnta \advance \@tempcntb #1\relax
+%<latexrelease>      \kern -\@ovro \hbox{\char \@tempcntb}\nointerlineskip
+%<latexrelease>    \else \kern \@ovri \kern \@ovdy \fi
+%<latexrelease>    \leaders\vrule \@width \@wholewidth\vfil \nointerlineskip
+%<latexrelease>    \if at ovt \@tempcntb \@tempcnta \advance \@tempcntb #2\relax
+%<latexrelease>      \hbox{\char \@tempcntb}%
+%<latexrelease>    \else \kern \@ovdy \kern \@ovro \fi}}
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\@ovhorz}
 %    \begin{macrocode}
+%</2ekernel>
+%<latexrelease>\IncludeInRelease{2016/03/31}%
+%<latexrelease>                 {\@ovhorz}{Avoid almost zero length leaders}%
+%<*2ekernel|latexrelease>
 \def\@ovhorz{\hb at xt@\@ovxx{\kern \@ovro
     \if at ovr \else \kern \@ovdx \fi
 %    \end{macrocode}
@@ -1496,47 +1559,13 @@
     \hfil
     \if at ovl \else \kern \@ovdx \fi
     \kern \@ovri}}
+%</2ekernel|latexrelease>
 %    \end{macrocode}
-% \end{macro}
 %    
 %    \begin{macrocode}
-%</2ekernel|latexrelease>
 %<latexrelease>\EndIncludeInRelease
 %<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease>                 {\@ovhlinetrue}%
-%<latexrelease>                 {Avoid almost zero length leaders}%
-%<latexrelease>\let\if at ovvline\@undefined
-%<latexrelease>\let\if at ovhline\@undefined
-%<latexrelease>\def\@oval(#1,#2)[#3]{\begingroup\boxmaxdepth \maxdimen
-%<latexrelease>  \@ovttrue \@ovbtrue \@ovltrue \@ovrtrue
-%<latexrelease>  \@tfor\reserved at a :=#3\do
-%<latexrelease>                {\csname @ov\reserved at a false\endcsname}%
-%<latexrelease>  \@ovxx #1\unitlength
-%<latexrelease>  \@ovyy #2\unitlength
-%<latexrelease>  \@tempdimb \ifdim \@ovyy >\@ovxx \@ovxx\else \@ovyy \fi
-%<latexrelease>  \advance \@tempdimb -2\p@
-%<latexrelease>  \@getcirc \@tempdimb
-%<latexrelease>  \@ovro \ht\@tempboxa \@ovri \dp\@tempboxa
-%<latexrelease>  \@ovdx\@ovxx \advance\@ovdx -\@tempdima \divide\@ovdx \tw@
-%<latexrelease>  \@ovdy\@ovyy \advance\@ovdy -\@tempdima \divide\@ovdy \tw@
-%<latexrelease>  \@circlefnt \setbox\@tempboxa
-%<latexrelease>  \hbox{\if at ovr \@ovvert32\kern -\@tempdima \fi
-%<latexrelease>  \if at ovl
-%<latexrelease>   \kern \@ovxx \@ovvert01\kern -\@tempdima \kern -\@ovxx
-%<latexrelease>  \fi
-%<latexrelease>  \if at ovt \@ovhorz \kern -\@ovxx \fi
-%<latexrelease>  \if at ovb \raise \@ovyy \@ovhorz \fi}\advance\@ovdx\@ovro
-%<latexrelease>  \advance\@ovdy\@ovro \ht\@tempboxa\z@ \dp\@tempboxa\z@
-%<latexrelease>  \@put{-\@ovdx}{-\@ovdy}{\box\@tempboxa}%
-%<latexrelease>  \endgroup}
-%<latexrelease>\def\@ovvert#1#2{\vbox to\@ovyy{%
-%<latexrelease>    \if at ovb \@tempcntb \@tempcnta \advance \@tempcntb #1\relax
-%<latexrelease>      \kern -\@ovro \hbox{\char \@tempcntb}\nointerlineskip
-%<latexrelease>    \else \kern \@ovri \kern \@ovdy \fi
-%<latexrelease>    \leaders\vrule \@width \@wholewidth\vfil \nointerlineskip
-%<latexrelease>    \if at ovt \@tempcntb \@tempcnta \advance \@tempcntb #2\relax
-%<latexrelease>      \hbox{\char \@tempcntb}%
-%<latexrelease>    \else \kern \@ovdy \kern \@ovro \fi}}
+%<latexrelease>                 {\@ovhorz}{Avoid almost zero length leaders}%
 %<latexrelease>\def\@ovhorz{\hb at xt@\@ovxx{\kern \@ovro
 %<latexrelease>    \if at ovr \else \kern \@ovdx \fi
 %<latexrelease>    \leaders \hrule \@height \@wholewidth \hfil
@@ -1545,6 +1574,8 @@
 %<latexrelease>\EndIncludeInRelease
 %<*2ekernel>
 %    \end{macrocode}
+%    \end{macrocode}
+% \end{macro}
 %
 % \begin{macro}{\circle}
 % \changes{LaTeX2.09}{1993/08/05}