[latex3-commits] [latex3/latex2e] develop: Update graphics-def to 2022-09-22 (4be97ea1)

github at latex-project.org github at latex-project.org
Thu Mar 14 12:34:03 CET 2024


Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/4be97ea1f1c2ed1222004eabe3bbf15cb71b4c29

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

commit 4be97ea1f1c2ed1222004eabe3bbf15cb71b4c29
Author: Joseph Wright <joseph at texdev.net>
Date:   Thu Mar 14 11:31:34 2024 +0000

    Update graphics-def to 2022-09-22


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

4be97ea1f1c2ed1222004eabe3bbf15cb71b4c29
 texmf/tex/latex/graphics-def/dvipdfmx.def | 33 +++++++++++++++--------
 texmf/tex/latex/graphics-def/dvips.def    | 35 +++++++++++++++---------
 texmf/tex/latex/graphics-def/dvisvgm.def  |  5 ++--
 texmf/tex/latex/graphics-def/luatex.def   | 26 ++++++++++++++----
 texmf/tex/latex/graphics-def/pdftex.def   | 38 +++++++++++++++-----------
 texmf/tex/latex/graphics-def/xetex.def    | 44 ++++++++++++++++++-------------
 6 files changed, 115 insertions(+), 66 deletions(-)

diff --git a/texmf/tex/latex/graphics-def/dvipdfmx.def b/texmf/tex/latex/graphics-def/dvipdfmx.def
index 1d82661b..ce1f10c3 100644
--- a/texmf/tex/latex/graphics-def/dvipdfmx.def
+++ b/texmf/tex/latex/graphics-def/dvipdfmx.def
@@ -17,7 +17,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{dvipdfmx.def}
-  [2022/04/16 v5.0l Graphics/color driver for dvipdfmx]
+  [2022/09/22 v5.0m Graphics/color driver for dvipdfmx]
 \def\GPT at space{ }
 \def\c at lor@arg#1{%
   \dimen@#1\p@
@@ -306,6 +306,8 @@
 {\expandafter\let\csname ifGin at setpagesize\expandafter\endcsname
 \csname iftrue\endcsname}
 {}
+\@ifundefined{stockwidth}{\newdimen\stockwidth}{}
+\@ifundefined{stockheight}{\newdimen\stockheight}{}
 \ifGin at setpagesize
 \ifx\paperwidth\@undefined\else
 \AtBeginDocument{%
@@ -314,16 +316,25 @@
 \ifnum\mag=\@m
 \AtBeginDvi{%
 \begingroup
-  \@ifundefined{stockwidth}{}
-    {%
-      \paperwidth\stockwidth
-      \paperheight\stockheight
-    }%
-\ifdim\paperwidth>\z@
-\ifdim\paperheight>\z@
-\special{pdf:pagesize width \the\paperwidth\GPT at space height \the\paperheight}%
-\fi
-\fi
+  \ifdim\stockwidth>\z@
+    \ifdim\stockheight>\z@
+      \special{papersize=\the\stockwidth,\the\stockheight}%
+    \else
+      \ifdim\paperwidth>\z@
+        \ifdim\paperheight>\z@
+          \special{papersize=\the\paperwidth,\the\paperheight}%
+        \fi
+      \fi
+    \fi
+  \else
+    \ifdim\stockwidth=\z@
+      \ifdim\paperwidth>\z@
+        \ifdim\paperheight>\z@
+          \special{papersize=\the\paperwidth,\the\paperheight}%
+        \fi
+      \fi
+    \fi
+  \fi
 \endgroup}%
 \fi
 }
diff --git a/texmf/tex/latex/graphics-def/dvips.def b/texmf/tex/latex/graphics-def/dvips.def
index 204ec642..f5ba5bfc 100644
--- a/texmf/tex/latex/graphics-def/dvips.def
+++ b/texmf/tex/latex/graphics-def/dvips.def
@@ -1,6 +1,6 @@
 %% dvips.def Copyright (C) 1994      David Carlisle Sebastian Rahtz
 %%           Copyright (C) 1995-1999 David Carlisle
-%%           Copyright (C) 2000-2017 David Carlisle, LaTeX3 Project
+%%           Copyright (C) 2000-2022 David Carlisle, LaTeX3 Project
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
@@ -17,7 +17,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{dvips.def}
-  [2017/06/20 v3.1d Graphics/color driver for dvips]
+  [2022/09/22 v3.1e Graphics/color driver for dvips]
 \def\GPT at space{ }
 \def\c at lor@arg#1{%
   \dimen@#1\p@
@@ -146,24 +146,35 @@
   {\expandafter\let\csname ifGin at setpagesize\expandafter\endcsname
                     \csname iftrue\endcsname}
   {}
+\@ifundefined{stockwidth}{\newdimen\stockwidth}{}
+\@ifundefined{stockheight}{\newdimen\stockheight}{}
 \ifGin at setpagesize
 \ifx\paperwidth\@undefined\else
   \AtBeginDocument{%
 % If a package has changed \mag, assume it knows what it is doing
 % and leave page size alone
-\ifnum\mag=\@m
+ \ifnum\mag=\@m
   \AtBeginDvi{%
     \begingroup
-      \@ifundefined{stockwidth}{}
-        {%
-          \paperwidth\stockwidth
-          \paperheight\stockheight
-        }%
-    \ifdim\paperwidth>\z@
-      \ifdim\paperheight>\z@
-        \special{papersize=\the\paperwidth,\the\paperheight}%
+      \ifdim\stockwidth>\z@
+        \ifdim\stockheight>\z@
+          \special{papersize=\the\stockwidth,\the\stockheight}%
+        \else
+          \ifdim\paperwidth>\z@
+            \ifdim\paperheight>\z@
+              \special{papersize=\the\paperwidth,\the\paperheight}%
+            \fi
+          \fi
+        \fi
+      \else
+        \ifdim\stockwidth=\z@
+          \ifdim\paperwidth>\z@
+            \ifdim\paperheight>\z@
+              \special{papersize=\the\paperwidth,\the\paperheight}%
+            \fi
+          \fi
+        \fi
       \fi
-    \fi
     \endgroup}%
     \fi
     }
diff --git a/texmf/tex/latex/graphics-def/dvisvgm.def b/texmf/tex/latex/graphics-def/dvisvgm.def
index 8390ee29..c298c4b3 100644
--- a/texmf/tex/latex/graphics-def/dvisvgm.def
+++ b/texmf/tex/latex/graphics-def/dvisvgm.def
@@ -16,7 +16,7 @@
 %%
 %% https://github.com/latex3/graphics-def/issues
 %
-\ProvidesFile{dvisvgm.def}[2022/02/19 v1.5 dvisvgm graphics driver for latex]
+\ProvidesFile{dvisvgm.def}[2022/09/22 v1.6 dvisvgm graphics driver for latex]
 % The following is copied from dvips.def:
 \def\GPT at space{ }
 \def\c at lor@arg#1{%
@@ -78,7 +78,7 @@
 \def\current at color{ Black}
 \def\set at color{\special{color push  \current at color}\aftergroup\reset at color}
 \def\reset at color{\special{color pop}}
-\def\set at page@color{\special{bgcolor \current at color}}
+\def\set at page@color{\special{background  \current at color}}
 \def\define at color@named#1#2{\expandafter\let\csname col@#1\endcsname\@nnil}
 \def\Grot at start{%
   \special{ps: gsave currentpoint currentpoint translate \Grot at angle\GPT at space neg rotate neg exch neg exch translate}%
@@ -254,4 +254,3 @@
 \endinput
 %%
 %% End of file `dvisvgm.def'.
-
diff --git a/texmf/tex/latex/graphics-def/luatex.def b/texmf/tex/latex/graphics-def/luatex.def
index 102e8974..b32506d0 100644
--- a/texmf/tex/latex/graphics-def/luatex.def
+++ b/texmf/tex/latex/graphics-def/luatex.def
@@ -3,7 +3,7 @@
 %%                         Hans Hagen, Heiko Oberdiek and
 %%                         Martin Schr\"oder
 %% Copyright (C) 2016-2018 LaTeX3 project and Heiko Oberdiek
-%% Copyright (C) 2018-2020 LaTeX3 project
+%% Copyright (C) 2018-2022 LaTeX3 project
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
@@ -20,7 +20,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{luatex.def}
-  [2021/06/01 v1.2c Graphics/color driver for luatex]
+  [2022/09/22 v1.2d Graphics/color driver for luatex]
 \def\GPT at space{ }
 \def\c at lor@arg#1{%
   \dimen@#1\p@
@@ -563,10 +563,26 @@
 }{%
   \ifdim\stockwidth>0pt\relax
     \ifdim\stockheight>0pt\relax
-      \pagewidth=\stockwidth
-      \pageheight=\stockheight
+       \setlength{\pagewidth}{\stockwidth}%
+       \setlength{\pageheight}{\stockheight}%
+    \else
+      \ifdim\paperwidth>0pt\relax
+        \ifdim\paperheight>0pt\relax
+          \setlength{\pagewidth}{\paperwidth}%
+          \setlength{\pageheight}{\paperheight}%
+        \fi
+      \fi
     \fi
-  \fi
+   \else
+    \ifdim\stockwidth=0pt\relax
+      \ifdim\paperwidth>0pt\relax
+        \ifdim\paperheight>0pt\relax
+          \setlength{\pagewidth}{\paperwidth}%
+          \setlength{\pageheight}{\paperheight}%
+        \fi
+      \fi
+    \fi
+   \fi
 }%
 \fi
 }
diff --git a/texmf/tex/latex/graphics-def/pdftex.def b/texmf/tex/latex/graphics-def/pdftex.def
index e9fd0183..35eb376c 100644
--- a/texmf/tex/latex/graphics-def/pdftex.def
+++ b/texmf/tex/latex/graphics-def/pdftex.def
@@ -3,7 +3,7 @@
 %%                         Hans Hagen, Heiko Oberdiek and
 %%                         Martin Schr\"oder
 %% Copyright (C) 2016-2018 LaTeX3 project and Heiko Oberdiek
-%% Copyright (C) 2018-2020 LaTeX3 project
+%% Copyright (C) 2018-2022 LaTeX3 project
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
@@ -20,7 +20,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{pdftex.def}
-  [2020/10/05 v1.2a Graphics/color driver for pdftex]
+  [2022/09/22 v1.2b Graphics/color driver for pdftex]
 \def\GPT at space{ }
 \def\c at lor@arg#1{%
   \dimen@#1\p@
@@ -555,30 +555,36 @@ E     \else
   {\expandafter\let\csname ifGin at setpagesize\expandafter\endcsname
                     \csname iftrue\endcsname}
   {}
+\@ifundefined{stockwidth}{\newdimen\stockwidth}{}
+\@ifundefined{stockheight}{\newdimen\stockheight}{}
 \ifGin at setpagesize
 \ifx\paperwidth\@undefined\else
   \AtBeginDocument{%
 % If a package has changed \mag, assume it knows what it is doing
 % and leave page size alone
 \ifnum\mag=\@m
-  \@ifundefined{stockwidth}{%
-  \@ifundefined{paperwidth}{%
-  }{%
-    \ifdim\paperwidth>0pt\relax
-      \ifdim\paperheight>0pt\relax
-        \pdfpagewidth=\paperwidth
-        \pdfpageheight=\paperheight
-      \fi
-    \fi
-  }%
-}{%
   \ifdim\stockwidth>0pt\relax
     \ifdim\stockheight>0pt\relax
-      \pdfpagewidth=\stockwidth
-      \pdfpageheight=\stockheight
+      \setlength{\pdfpagewidth}{\stockwidth}%
+      \setlength{\pdfpageheight}{\stockheight}%
+    \else
+      \ifdim\paperwidth>0pt\relax
+        \ifdim\paperheight>0pt\relax
+          \setlength{\pdfpagewidth}{\paperwidth}%
+          \setlength{\pdfpageheight}{\paperheight}%
+        \fi
+      \fi
+    \fi
+  \else
+    \ifdim\stockwidth=0pt\relax
+      \ifdim\paperwidth>0pt\relax
+        \ifdim\paperheight>0pt\relax
+          \setlength{\pdfpagewidth}{\paperwidth}%
+          \setlength{\pdfpageheight}{\paperheight}%
+        \fi
+      \fi
     \fi
   \fi
-}%
 \fi
 }
 \fi
diff --git a/texmf/tex/latex/graphics-def/xetex.def b/texmf/tex/latex/graphics-def/xetex.def
index 72933793..6f9e00a5 100644
--- a/texmf/tex/latex/graphics-def/xetex.def
+++ b/texmf/tex/latex/graphics-def/xetex.def
@@ -17,7 +17,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{xetex.def}
-  [2022/04/16 v5.0m Graphics/color driver for xetex]
+  [2022/09/22 v5.0n Graphics/color driver for xetex]
 \def\GPT at space{ }
 \def\c at lor@arg#1{%
   \dimen@#1\p@
@@ -400,30 +400,36 @@
 {\expandafter\let\csname ifGin at setpagesize\expandafter\endcsname
 \csname iftrue\endcsname}
 {}
+\@ifundefined{stockwidth}{\newdimen\stockwidth}{}
+\@ifundefined{stockheight}{\newdimen\stockheight}{}
 \ifGin at setpagesize
 \ifx\paperwidth\@undefined\else
 \AtBeginDocument{%
 % If a package has changed \mag, assume it knows what it is doing
 % and leave page size alone
 \ifnum\mag=\@m
-\@ifundefined{stockwidth}{%
-\@ifundefined{paperwidth}{%
-}{%
-\ifdim\paperwidth>0pt\relax
-\ifdim\paperheight>0pt\relax
-\pdfpagewidth=\paperwidth
-\pdfpageheight=\paperheight
-\fi
-\fi
-}%
-}{%
-\ifdim\stockwidth>0pt\relax
-\ifdim\stockheight>0pt\relax
-\pdfpagewidth=\stockwidth
-\pdfpageheight=\stockheight
-\fi
-\fi
-}%
+  \ifdim\stockwidth>0pt\relax
+    \ifdim\stockheight>0pt\relax
+      \setlength{\pdfpagewidth}{\stockwidth}%
+      \setlength{\pdfpageheight}{\stockheight}%
+    \else
+      \ifdim\paperwidth>0pt\relax
+        \ifdim\paperheight>0pt\relax
+           \setlength{\pdfpagewidth}{\paperwidth}%
+           \setlength{\pdfpageheight}{\paperheight}%
+        \fi
+      \fi
+    \fi
+  \else
+    \ifdim\stockwidth=0pt\relax
+      \ifdim\paperwidth>0pt\relax
+        \ifdim\paperheight>0pt\relax
+          \setlength{\pdfpagewidth}{\paperwidth}%
+          \setlength{\pdfpageheight}{\paperheight}%
+        \fi
+      \fi
+    \fi
+  \fi
 \fi
 }
 \fi





More information about the latex3-commits mailing list.