[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: move viewport code to graphics (80f8787a)
David Carlisle
d.p.carlisle at gmail.com
Mon Aug 10 09:22:08 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/80f8787a4dbb220ac00c394c4937e1d27057b2d2
>---------------------------------------------------------------
commit 80f8787a4dbb220ac00c394c4937e1d27057b2d2
Author: David Carlisle <d.p.carlisle at gmail.com>
Date: Mon Aug 10 08:22:08 2020 +0100
move viewport code to graphics
>---------------------------------------------------------------
80f8787a4dbb220ac00c394c4937e1d27057b2d2
required/graphics/README.md | 2 +-
required/graphics/changes.txt | 4 +++
required/graphics/graphics.dtx | 65 +++++++++++++++++++++++++++++++++++++++++-
required/graphics/graphicx.dtx | 62 +---------------------------------------
4 files changed, 70 insertions(+), 63 deletions(-)
diff --git a/required/graphics/README.md b/required/graphics/README.md
index 08cd8cab..36f5da6e 100644
--- a/required/graphics/README.md
+++ b/required/graphics/README.md
@@ -1,7 +1,7 @@
The LaTeX `graphics` bundle
===========================
-Release 2020-10-01 pre-release 2
+Release 2020-10-01 pre-release 3
Overview
--------
diff --git a/required/graphics/changes.txt b/required/graphics/changes.txt
index bbe1893e..73aaf870 100644
--- a/required/graphics/changes.txt
+++ b/required/graphics/changes.txt
@@ -4,6 +4,10 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
=======================================================================
+2020-08-09 David Carlisle <David.Carlisle at latex-project.org>
+
+ * Move viewport and trim code from graphicx to graphics.
+
2020-05-28 David Carlisle <David.Carlisle at latex-project.org>
* lscape.dtx: delay saving \cs{@makefcolumn} gh340
diff --git a/required/graphics/graphics.dtx b/required/graphics/graphics.dtx
index b88ef1e0..a714ed38 100644
--- a/required/graphics/graphics.dtx
+++ b/required/graphics/graphics.dtx
@@ -25,7 +25,7 @@
%<driver> \ProvidesFile{graphics.drv}
% \fi
% \ProvidesFile{graphics.dtx}
- [2019/11/30 v1.4a Standard LaTeX Graphics (DPC,SPQR)]
+ [2020/08/09 v1.4b Standard LaTeX Graphics (DPC,SPQR)]
%
% \iffalse
%<*driver>
@@ -1574,6 +1574,7 @@
\fi}
% \end{macrocode}
% \end{macro}
+%
% \begin{macro}{\Gread at parse@bb}
% We have |%%BoundingBox| and what follows is not `(atend)' so we
% will parse the rest of the line as a BB with four elements.
@@ -1596,6 +1597,68 @@
% \end{macrocode}
% \end{macro}
%
+% Viewport and trim, originally in |graphicx|.
+%
+% \begin{macro}{\Gin at viewport}
+% \changes{v1.0c}{1996/10/31}{Original bb saved}
+% If a viewport is specified, reset the bounding box coordinates
+% by adding the original origin, |\Gin at llx|, |\Gin at lly| to the new
+% values specified as the viewport. The original Bounding box
+% coordinates are saved in |\Gin at ollx|\ldots\ some drivers
+% might need this information (currently just |tcidvi|).
+% \begin{macrocode}
+\def\Gin at viewport{%
+ \let\Gin at ollx\Gin at llx
+ \let\Gin at olly\Gin at lly
+ \let\Gin at ourx\Gin at urx
+ \let\Gin at oury\Gin at ury
+ \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vurx\p@
+ \edef\Gin at urx{\strip at pt\dimen@}%
+ \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vury\p@
+ \edef\Gin at ury{\strip at pt\dimen@}%
+ \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vllx\p@
+ \edef\Gin at llx{\strip at pt\dimen@}%
+ \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vlly\p@
+ \edef\Gin at lly{\strip at pt\dimen@}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\Gin at trim}
+% \changes{v1.0c}{1996/10/31}{Original bb saved}
+% If a trim is specified, reset the bounding box coordinates
+% by trimming the four specified values off each side of the
+% graphic.
+% \begin{macrocode}
+\def\Gin at trim{%
+ \let\Gin at ollx\Gin at llx
+ \let\Gin at olly\Gin at lly
+ \let\Gin at ourx\Gin at urx
+ \let\Gin at oury\Gin at ury
+ \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vllx\p@
+ \edef\Gin at llx{\strip at pt\dimen@}%
+ \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vlly\p@
+ \edef\Gin at lly{\strip at pt\dimen@}%
+ \dimen@\Gin at urx\p@\advance\dimen@ -\Gin at vurx\p@
+ \edef\Gin at urx{\strip at pt\dimen@}%
+ \dimen@\Gin at ury\p@\advance\dimen@ -\Gin at vury\p@
+ \edef\Gin at ury{\strip at pt\dimen@}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\Gin at vllx}
+% \begin{macro}{\Gin at vlly}
+% \begin{macro}{\Gin at vurx}
+% \begin{macro}{\Gin at vury}
+% Four macros to hold the modifiers for the bounding box for viewport
+% and trim specifications.
+% \begin{macrocode}
+\let\Gin at vllx\Gin at llx\let\Gin at vlly\Gin at llx
+\let\Gin at vurx\Gin at llx\let\Gin at vury\Gin at llx
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \subsection{Rotation}
%
diff --git a/required/graphics/graphicx.dtx b/required/graphics/graphicx.dtx
index 3cf15925..b10c67c7 100644
--- a/required/graphics/graphicx.dtx
+++ b/required/graphics/graphicx.dtx
@@ -17,7 +17,7 @@
%<driver> \ProvidesFile{graphicx.drv}
% \fi
% \ProvidesFile{graphicx.dtx}
- [2019/11/30 v1.2a Enhanced LaTeX Graphics (DPC,SPQR)]
+ [2020/09/09 v1.2b Enhanced LaTeX Graphics (DPC,SPQR)]
%
% \iffalse
%<*driver>
@@ -342,66 +342,6 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\Gin at viewport}
-% \changes{v1.0c}{1996/10/31}{Original bb saved}
-% If a viewport is specified, reset the bounding box coordinates
-% by adding the original origin, |\Gin at llx|, |\Gin at lly| to the new
-% values specified as the viewport. The original Bounding box
-% coordinates are saved in |\Gin at ollx|\ldots\ some drivers
-% might need this information (currently just |tcidvi|).
-% \begin{macrocode}
-\def\Gin at viewport{%
- \let\Gin at ollx\Gin at llx
- \let\Gin at olly\Gin at lly
- \let\Gin at ourx\Gin at urx
- \let\Gin at oury\Gin at ury
- \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vurx\p@
- \edef\Gin at urx{\strip at pt\dimen@}%
- \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vury\p@
- \edef\Gin at ury{\strip at pt\dimen@}%
- \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vllx\p@
- \edef\Gin at llx{\strip at pt\dimen@}%
- \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vlly\p@
- \edef\Gin at lly{\strip at pt\dimen@}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\Gin at trim}
-% \changes{v1.0c}{1996/10/31}{Original bb saved}
-% If a trim is specified, reset the bounding box coordinates
-% by trimming the four specified values off each side of the
-% graphic.
-% \begin{macrocode}
-\def\Gin at trim{%
- \let\Gin at ollx\Gin at llx
- \let\Gin at olly\Gin at lly
- \let\Gin at ourx\Gin at urx
- \let\Gin at oury\Gin at ury
- \dimen@\Gin at llx\p@\advance\dimen@ \Gin at vllx\p@
- \edef\Gin at llx{\strip at pt\dimen@}%
- \dimen@\Gin at lly\p@\advance\dimen@ \Gin at vlly\p@
- \edef\Gin at lly{\strip at pt\dimen@}%
- \dimen@\Gin at urx\p@\advance\dimen@ -\Gin at vurx\p@
- \edef\Gin at urx{\strip at pt\dimen@}%
- \dimen@\Gin at ury\p@\advance\dimen@ -\Gin at vury\p@
- \edef\Gin at ury{\strip at pt\dimen@}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\Gin at vllx}
-% \begin{macro}{\Gin at vlly}
-% \begin{macro}{\Gin at vurx}
-% \begin{macro}{\Gin at vury}
-% Four macros to hold the modifiers for the bounding box for viewport
-% and trim specifications.
-% \begin{macrocode}
-\let\Gin at vllx\Gin at llx\let\Gin at vlly\Gin at llx
-\let\Gin at vurx\Gin at llx\let\Gin at vury\Gin at llx
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
%
% \begin{key}{Gin}{angle}
% Specify a rotation. This is just handled by wrapping the
More information about the latex3-commits
mailing list.