fgruler (22oct20)

git-svn-id: svn://tug.org/texlive/trunk@56731 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 44 insertions, 50 deletions

diff --git a/Master/texmf-dist/doc/latex/fgruler/README b/Master/texmf-dist/doc/latex/fgruler/README
index de388144402..266910338ce 100644
--- a/Master/texmf-dist/doc/latex/fgruler/README
+++ b/Master/texmf-dist/doc/latex/fgruler/README
@@ -1,6 +1,6 @@
 fgruler.sty package
 
-Copyright 2017- by Tibor Tomacs
+Copyright 2017-2020 by Tibor Tomacs
 
 Package for drawing rulers on the foreground or in the text
 
diff --git a/Master/texmf-dist/doc/latex/fgruler/fgruler.pdf b/Master/texmf-dist/doc/latex/fgruler/fgruler.pdf
index 04352acad01..eb3be627b89 100644
--- a/Master/texmf-dist/doc/latex/fgruler/fgruler.pdf
+++ b/Master/texmf-dist/doc/latex/fgruler/fgruler.pdf
diff --git a/Master/texmf-dist/source/latex/fgruler/fgruler.dtx b/Master/texmf-dist/source/latex/fgruler/fgruler.dtx
index 18d16a62602..dd7ec0ba064 100644
--- a/Master/texmf-dist/source/latex/fgruler/fgruler.dtx
+++ b/Master/texmf-dist/source/latex/fgruler/fgruler.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 2017- by Tibor Tomacs
+% Copyright 2017-2020 by Tibor Tomacs
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -20,8 +20,8 @@
 %<*driver>
 \ProvidesFile{fgruler.dtx}
 %</driver>
-%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{fgruler}[2017/01/16 v1.0 Package for drawing rulers on the foreground or in the text]
+%<package>\NeedsTeXFormat{LaTeX2e}[2020/10/01]
+%<package>\ProvidesPackage{fgruler}[2020/10/22 v1.1 Package for drawing rulers on the foreground or in the text]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -60,7 +60,7 @@ keepspaces]}
 %
 % \GetFileInfo{fgruler.sty}
 %
-% \title{The {\bfseries\sffamily fgruler} package\\{\large v1.0 (2017/01/16)}}
+% \title{The {\bfseries\sffamily fgruler} package\\{\large v1.1 (2020/10/22)}}
 % \author{Tibor T\'{o}m\'{a}cs\\{\normalsize\url{tomacs.tibor@uni-eszterhazy.hu}}}
 % \date{}
 % \maketitle
@@ -1053,7 +1053,7 @@ keepspaces]}
 
 \else
 
-\@ifpackageloaded{eso-pic}{}{\RequirePackage{eso-pic}}
+\@ifpackageloaded{eso-pic}{}{\RequirePackage{eso-pic}[2020/10/14]}
 
 \def\fgruler@frame{%
   \begingroup
@@ -1085,30 +1085,27 @@ keepspaces]}
   \endgroup
 }
 
-\let\fgruler@shipout\AtBeginShipoutUpperLeftForeground
 \def\fgruler@output@{}
+
 \ESO@isMEMOIR{%
-\def\AtBeginShipoutUpperLeftForeground#1{%
-    \fgruler@shipout{#1%
-        \put(\fgruler@lentounit{\@tempdima},\fgruler@lentounit{\@tempdimb}){%
-            \iffgruler@showframe\fgruler@frame\fi%
-            \fgruler@output%
-            \fgruler@output@%
-            \global\let\fgruler@output@\@empty%
-            }%
-        }%
+  \AddToHook{shipout/foreground}{%
+    \ESO@MEMOIR@corr
+    \put(\ESO@tempdima,\ESO@tempdimb){%
+      \iffgruler@showframe\fgruler@frame\fi%
+      \fgruler@output%
+      \fgruler@output@%
+      \global\let\fgruler@output@\@empty%
     }%
+  }%
 }{%
-\def\AtBeginShipoutUpperLeftForeground#1{%
-    \fgruler@shipout{#1%
-        \put(0,\fgruler@lentounit{\ESO@yoffsetI}){%
-            \iffgruler@showframe\fgruler@frame\fi%
-            \fgruler@output%
-            \fgruler@output@%
-            \global\let\fgruler@output@\@empty%
-            }%
-        }%
+  \AddToHook{shipout/foreground}{%
+    \put(0,\ESO@yoffsetI){%
+      \iffgruler@showframe\fgruler@frame\fi%
+      \fgruler@output%
+      \fgruler@output@%
+      \global\let\fgruler@output@\@empty%
     }%
+  }%
 }
 
 \fgruler@activate@type
diff --git a/Master/texmf-dist/source/latex/fgruler/fgruler.ins b/Master/texmf-dist/source/latex/fgruler/fgruler.ins
index 13ea6a1a4b0..38cac59ba0a 100644
--- a/Master/texmf-dist/source/latex/fgruler/fgruler.ins
+++ b/Master/texmf-dist/source/latex/fgruler/fgruler.ins
@@ -1,5 +1,5 @@
 
-% Copyright 2017- by Tibor Tomacs
+% Copyright 2017-2020 by Tibor Tomacs
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -19,7 +19,7 @@
 \preamble
 This is a generated file.
 
-Copyright 2017- by Tibor Tomacs
+Copyright 2017-2020 by Tibor Tomacs
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/fgruler/fgruler.sty b/Master/texmf-dist/tex/latex/fgruler/fgruler.sty
index c76775e9dd5..0a397fd46a0 100644
--- a/Master/texmf-dist/tex/latex/fgruler/fgruler.sty
+++ b/Master/texmf-dist/tex/latex/fgruler/fgruler.sty
@@ -7,7 +7,7 @@
 %% ./fgruler.dtx  (with options: `package')
 %% This is a generated file.
 %% 
-%% Copyright 2017- by Tibor Tomacs
+%% Copyright 2017-2020 by Tibor Tomacs
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -21,8 +21,8 @@
 %% 
 %% The Current Maintainer of this work is Tibor Tomacs.
 %% 
-\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{fgruler}[2017/01/16 v1.0 Package for drawing rulers on the foreground or in the text]
+\NeedsTeXFormat{LaTeX2e}[2020/10/01]
+\ProvidesPackage{fgruler}[2020/10/22 v1.1 Package for drawing rulers on the foreground or in the text]
 %%
 \@ifpackageloaded{kvoptions}{}{\RequirePackage{kvoptions}}
 \@ifpackageloaded{etoolbox}{}{\RequirePackage{etoolbox}}
@@ -305,7 +305,7 @@
 
 \else
 
-\@ifpackageloaded{eso-pic}{}{\RequirePackage{eso-pic}}
+\@ifpackageloaded{eso-pic}{}{\RequirePackage{eso-pic}[2020/10/14]}
 
 \def\fgruler@frame{%
   \begingroup
@@ -337,30 +337,27 @@
   \endgroup
 }
 
-\let\fgruler@shipout\AtBeginShipoutUpperLeftForeground
 \def\fgruler@output@{}
+
 \ESO@isMEMOIR{%
-\def\AtBeginShipoutUpperLeftForeground#1{%
-    \fgruler@shipout{#1%
-        \put(\fgruler@lentounit{\@tempdima},\fgruler@lentounit{\@tempdimb}){%
-            \iffgruler@showframe\fgruler@frame\fi%
-            \fgruler@output%
-            \fgruler@output@%
-            \global\let\fgruler@output@\@empty%
-            }%
-        }%
+  \AddToHook{shipout/foreground}{%
+    \ESO@MEMOIR@corr
+    \put(\ESO@tempdima,\ESO@tempdimb){%
+      \iffgruler@showframe\fgruler@frame\fi%
+      \fgruler@output%
+      \fgruler@output@%
+      \global\let\fgruler@output@\@empty%
     }%
+  }%
 }{%
-\def\AtBeginShipoutUpperLeftForeground#1{%
-    \fgruler@shipout{#1%
-        \put(0,\fgruler@lentounit{\ESO@yoffsetI}){%
-            \iffgruler@showframe\fgruler@frame\fi%
-            \fgruler@output%
-            \fgruler@output@%
-            \global\let\fgruler@output@\@empty%
-            }%
-        }%
+  \AddToHook{shipout/foreground}{%
+    \put(0,\ESO@yoffsetI){%
+      \iffgruler@showframe\fgruler@frame\fi%
+      \fgruler@output%
+      \fgruler@output@%
+      \global\let\fgruler@output@\@empty%
     }%
+  }%
 }
 
 \fgruler@activate@type