From 66aedee32b96d68acc7b854602552c75ef261973 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 2 Sep 2020 03:03:35 +0000 Subject: CTAN sync 202009020303 --- macros/latex/contrib/graphics-def/CONTRIBUTING.md | 96 ----------------------- macros/latex/contrib/graphics-def/README.md | 2 +- macros/latex/contrib/graphics-def/dvipdfmx.def | 12 +-- macros/latex/contrib/graphics-def/dvisvgm.def | 5 +- macros/latex/contrib/graphics-def/luatex.def | 73 +++++++++++++++-- macros/latex/contrib/graphics-def/pdftex.def | 72 +++++++++++++++-- macros/latex/contrib/graphics-def/xetex.def | 10 ++- 7 files changed, 149 insertions(+), 121 deletions(-) delete mode 100644 macros/latex/contrib/graphics-def/CONTRIBUTING.md (limited to 'macros/latex/contrib/graphics-def') diff --git a/macros/latex/contrib/graphics-def/CONTRIBUTING.md b/macros/latex/contrib/graphics-def/CONTRIBUTING.md deleted file mode 100644 index 1d90f1515c..0000000000 --- a/macros/latex/contrib/graphics-def/CONTRIBUTING.md +++ /dev/null @@ -1,96 +0,0 @@ -Thanks for considering contributing to LaTeX2e: feedback, fixes and -ideas are all useful. Here, we ([The LaTeX3 -Project](https://www.latex-project.org)) have collected together a few -pointers to help things along. - -## Bugs - -There are thousands of packages and tools and the LaTeX Project Team -only supports a few dozen core packages beside the kernel code. We -also don't maintain any tools or the TeX-engines themselves! So if a -bug is due to code from a contributed third-party package then the LaTeX -Project Team is not able to help or fix the code as that is maintained -by others. As such, we ask you follow the procedure below as it will -help to weed cases where we cannot help. - -To report a bug it is important to provide a short test file that -exhibits the issue. The [`latexbug`](https://github.com/latex3/latexbug) -package should be loaded at the very top of any such test file used to -report a bug in LaTeX as follows: - -```latex -\RequirePackage{latexbug} % <- first line -\documentclass{article} % or some other class -... % code showing the problem -``` - -If the `latexbug` package is not part of your distribution you can -download it -[GitHub](https://raw.githubusercontent.com/latex3/latexbug/master/latexbug.sty). -In that case simply place it in the directory next to your test file (or -place it into your local `texmf` tree so that it will be always found – -how to do that depends on the installation you use). - -If `latexbug` complains about third-party packages you should first -remove those from your test file. If that is not possible, then the -bug is most likely in one of these packages and you should report the -problem to the maintainers of the package instead of opening an issue -here. However, if you think the bug is in core LaTeX (as maintained -by the LaTeX Team) even though you need the third-party packages to -demonstrate the problem, then please continue and send the bug report -to us but explain this explicitly in your description of the bug. - - -## Font related issues - -Problems that are clearly due to using a specific font setup or a -specific font are normally out of scope as we do not maintain fonts -for LaTeX and can't help with problems in that area. Especially with -XeTeX and LuaTeX people may experience issues due to font usage that -are either due to the font itself or to different versions or -treatment on different platforms. So please use Computer Modern or -Latin Modern fonts in the test files. - - - -## Layout and interface deficiencies - -Upfront we should probably stress that 'deficiencies' in the design of -of the standard document classes (`article`, `report` and `book`) as -well a questionable but long established interface behavior of commands -is something that we will normally not change, even if we can all agree -that a different behavior or a different layout would have been a better -choice. You are, of course, welcome to report issues in these areas, -using the procedure explained below, but in all likelihood such reports -will be marked as 'won't fix'. - -The reason is is that the kernel interfaces and the document classes -have been used for many years in essentially all documents (even -documents using different classes often build them upon the standard -classes in the background) and thus such changes would break or as a -minimum noticeably change nearly all existing documents. See also the -file [LaTeX2e News Issue -07](https://www.latex-project.org/news/latex2e-news/ltnews07.pdf) with -regard to this policy. - -## Code contributions - -If you want to discuss a possible contribution before (or instead of) -making a pull request, drop a line to -[the team](mailto:latex-team@latex-project.org). - -The stability of LaTeX is very important and this means that change in -the kernel is necessarily very conservative. It also means that a lot of -discussion happens before any changes are made. If you do decide to post -a pull request, please bear this in mind: we do appreciate ideas, but -cannot always integrate them into the kernel. - -If you are submitting a pull request, notice that - -- The first line of commit messages should be a short summary (up to about - 50 chars); leave a blank line then give more detail if required -- We use Travis-CI for (light) testing so add `[ci skip]` to documentation-only - commit messages -- We favour a single linear history so will rebase accepted pull requests -- Where a commit fixes or closes an issue, please include this information - in the first line of the commit message [`(fixes #X)` or similar] diff --git a/macros/latex/contrib/graphics-def/README.md b/macros/latex/contrib/graphics-def/README.md index 41849da993..ad57349d94 100644 --- a/macros/latex/contrib/graphics-def/README.md +++ b/macros/latex/contrib/graphics-def/README.md @@ -1,7 +1,7 @@ LaTeX support for color and graphics ==================================== -Release 2020-03-24 +Release 2020-08-26 This bundle contains the 'engine-dependent' part of support for color and graphics in LaTeX2e (the code here will also function diff --git a/macros/latex/contrib/graphics-def/dvipdfmx.def b/macros/latex/contrib/graphics-def/dvipdfmx.def index 361d89aca7..0944ae0d88 100644 --- a/macros/latex/contrib/graphics-def/dvipdfmx.def +++ b/macros/latex/contrib/graphics-def/dvipdfmx.def @@ -1,5 +1,6 @@ -%% dvipdfmx.def Copyright (C) 2005-2017 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata -%% (with contributions from many others) +%% dvipdfmx.def +%% Copyright (C) 2005-2020 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata +%% (with contributions from many others) %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -16,7 +17,7 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{dvipdfmx.def} - [2017/06/24 v5.0g Graphics/color driver for dvipdfmx] + [2020/08/26 v5.0h Graphics/color driver for dvipdfmx] \def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ @@ -83,7 +84,8 @@ background \current@color}} \def\define@color@named#1#2{% \expandafter\let\csname col@#1\endcsname\@nnil} - \def\no@page@color{\special{background \string"newpath clip}} +% white is special cased as "no background color" by dvipdfmx +\def\no@page@color{\special{background gray 1}} \@ifundefined{Gin@decode} {\let\Gin@decode\@empty} {} @@ -333,4 +335,4 @@ \fi } \fi -\fi +\fi diff --git a/macros/latex/contrib/graphics-def/dvisvgm.def b/macros/latex/contrib/graphics-def/dvisvgm.def index 46a3c3859c..052981bbe0 100644 --- a/macros/latex/contrib/graphics-def/dvisvgm.def +++ b/macros/latex/contrib/graphics-def/dvisvgm.def @@ -1,5 +1,6 @@ -% Copyright 2015 by Till Tantau -% Copyright 2016 2018 by Till Tantau and LaTeX3 Project +%% dvisvgm.def +%% Copyright 2015 by Till Tantau +%% Copyright 2016-2020 by Till Tantau and LaTeX3 Project % %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c diff --git a/macros/latex/contrib/graphics-def/luatex.def b/macros/latex/contrib/graphics-def/luatex.def index 84ed1109be..04d3621361 100644 --- a/macros/latex/contrib/graphics-def/luatex.def +++ b/macros/latex/contrib/graphics-def/luatex.def @@ -1,7 +1,9 @@ -%% luatex.def Copyright (C) 2000-2015 David Carlisle, Sebastian Rahtz, -%% Hans Hagen, Heiko Oberdiek and -%% Martin Schr\"oder -%% Copyright (C) 2016-2018 LaTeX3 project and Heiko Oberdiek +%% luatex.def +%% Copyright (C) 2000-2015 David Carlisle, Sebastian Rahtz, +%% Hans Hagen, Heiko Oberdiek and +%% Martin Schr\"oder +%% Copyright (C) 2016-2018 LaTeX3 project and Heiko Oberdiek +%% Copyright (C) 2018-2020 LaTeX3 project %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -18,7 +20,7 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{luatex.def} - [2018/01/08 v1.0l Graphics/color driver for luatex] + [2020/08/26 v1.2 Graphics/color driver for luatex] \def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ @@ -71,7 +73,7 @@ \aftergroup\reset@color} \def\reset@color{\pdfextension colorstack\@pdfcolorstack pop\relax} \newif\ifGPT@pagecolor -\begingroup\expandafter\expandafter\expandafter\endgroup + \def\set@page@color{% \global\GPT@pagecolortrue \global\let\current@page@color\current@color @@ -125,6 +127,32 @@ \def\no@page@color{% \global\GPT@pagecolorfalse } +\def\@tempa{LaTeX2e}% +\ifx\fmtname\@tempa + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi + {% + \@ifl@t@r\fmtversion{2020/10/01} + {% + \def\set@page@color{% + \global\GPT@pagecolortrue + \global\let\current@page@color\current@color + }% + \g@addto@macro\@kernel@before@shipout@background + {% + \ifGPT@pagecolor + \put(-\hoffset,-\pageheight+\voffset)% + {% + \pdfextension colorstack\@pdfcolorstack push{\current@page@color}% + \aftergroup\reset@color + \rule{\pagewidth}{\pageheight}% + }% + \fi + }% + }% + } \AtBeginDocument{% \def\KV@Gin@bbllx{% \PackageError{luatex.def}{% @@ -141,10 +169,41 @@ \let\KV@Gin@natheight\KV@Gin@bbllx \def\KV@Gin@bb{% \PackageInfo{luatex.def}% - {Option `bb' equivalent to `viewport' for luatex driver}% + {Option `bb' equivalent to `viewport' with the luatex driver}% \KV@Gin@viewport }% + \let\Gin@iii\Gin@iii@vp } + +%%% this definition will be added to graphics.sty +\def\Gin@iii@vp[#1,#2][#3,#4]#5{% + \begingroup + \let\Gin@viewport@code\Gin@viewport + \Gin@defaultbp\Gin@vllx{#1}% + \Gin@defaultbp\Gin@vlly{#2}% + \Gin@defaultbp\Gin@vurx{#3}% + \Gin@defaultbp\Gin@vury{#4}% + \Ginclude@graphics{#5}% + \endgroup} + + +%%% this definition needs moving from graphicx.sty to graphics.sty +\def\Gin@viewport{% + \let\Gin@ollx\Gin@llx + \let\Gin@olly\Gin@lly + \let\Gin@ourx\Gin@urx + \let\Gin@oury\Gin@ury + \dimen@\Gin@llx\p@\advance\dimen@ \Gin@vurx\p@ + \edef\Gin@urx{\strip@pt\dimen@}% + \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vury\p@ + \edef\Gin@ury{\strip@pt\dimen@}% + \dimen@\Gin@llx\p@\advance\dimen@ \Gin@vllx\p@ + \edef\Gin@llx{\strip@pt\dimen@}% + \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vlly\p@ + \edef\Gin@lly{\strip@pt\dimen@}} +%%% end of temp addition + + \def\Gread@pdftex#1{% % Use low level test here not \IfFileExists to match \Gread@pdftex in % pdftex.def and \Gread@eps test in graphics. diff --git a/macros/latex/contrib/graphics-def/pdftex.def b/macros/latex/contrib/graphics-def/pdftex.def index 0c9d2da548..ac6ca6fe48 100644 --- a/macros/latex/contrib/graphics-def/pdftex.def +++ b/macros/latex/contrib/graphics-def/pdftex.def @@ -1,7 +1,9 @@ -%% pdftex.def Copyright (C) 2000-2015 David Carlisle, Sebastian Rahtz, -%% Hans Hagen, Heiko Oberdiek and -%% Martin Schr\"oder -%% Copyright (C) 2016-2018 LaTeX3 project and Heiko Oberdiek +%% pdftex.def +%% Copyright (C) 2000-2015 David Carlisle, Sebastian Rahtz, +%% Hans Hagen, Heiko Oberdiek and +%% Martin Schr\"oder +%% Copyright (C) 2016-2018 LaTeX3 project and Heiko Oberdiek +%% Copyright (C) 2018-2020 LaTeX3 project %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -18,7 +20,7 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{pdftex.def} - [2018/01/08 v1.0l Graphics/color driver for pdftex] + [2020/08/26 v1.2 Graphics/color driver for pdftex] \def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ @@ -139,6 +141,33 @@ E \else \def\no@page@color{% \global\GPT@pagecolorfalse } + +\def\@tempa{LaTeX2e}% +\ifx\fmtname\@tempa + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi + {% + \@ifl@t@r\fmtversion{2020/10/01} + {% + \def\set@page@color{% + \global\GPT@pagecolortrue + \global\let\current@page@color\current@color + }% + \g@addto@macro\@kernel@before@shipout@background + {% + \ifGPT@pagecolor + \put(-\hoffset,-\pdfpageheight+\voffset)% + {% + \pdfcolorstack\@pdfcolorstack push{\current@page@color}% + \aftergroup\reset@color + \rule{\pdfpagewidth}{\pdfpageheight}% + }% + \fi + }% + }% + } \AtBeginDocument{% \def\KV@Gin@bbllx{% \PackageError{pdftex.def}{% @@ -155,10 +184,41 @@ E \else \let\KV@Gin@natheight\KV@Gin@bbllx \def\KV@Gin@bb{% \PackageInfo{pdftex.def}% - {Option `bb' equivalent to `viewport' with pdftex driver}% + {Option `bb' equivalent to `viewport' with the pdftex driver}% \KV@Gin@viewport }% + \let\Gin@iii\Gin@iii@vp } + +%%% this definition will be added to graphics.sty +\def\Gin@iii@vp[#1,#2][#3,#4]#5{% + \begingroup + \let\Gin@viewport@code\Gin@viewport + \Gin@defaultbp\Gin@vllx{#1}% + \Gin@defaultbp\Gin@vlly{#2}% + \Gin@defaultbp\Gin@vurx{#3}% + \Gin@defaultbp\Gin@vury{#4}% + \Ginclude@graphics{#5}% + \endgroup} + + +%%% this definition needs moving from graphicx.sty to graphics.sty +\def\Gin@viewport{% + \let\Gin@ollx\Gin@llx + \let\Gin@olly\Gin@lly + \let\Gin@ourx\Gin@urx + \let\Gin@oury\Gin@ury + \dimen@\Gin@llx\p@\advance\dimen@ \Gin@vurx\p@ + \edef\Gin@urx{\strip@pt\dimen@}% + \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vury\p@ + \edef\Gin@ury{\strip@pt\dimen@}% + \dimen@\Gin@llx\p@\advance\dimen@ \Gin@vllx\p@ + \edef\Gin@llx{\strip@pt\dimen@}% + \dimen@\Gin@lly\p@\advance\dimen@ \Gin@vlly\p@ + \edef\Gin@lly{\strip@pt\dimen@}} +%%% end of temp addition + + \def\Gread@pdftex#1{% \expandafter\ifx\expandafter\relax\pdffilesize{#1}\relax \expandafter\@secondoftwo diff --git a/macros/latex/contrib/graphics-def/xetex.def b/macros/latex/contrib/graphics-def/xetex.def index bb2cba80d4..5364b6ccc9 100644 --- a/macros/latex/contrib/graphics-def/xetex.def +++ b/macros/latex/contrib/graphics-def/xetex.def @@ -1,5 +1,6 @@ -%% xetex.def Copyright (C) 2005-2017 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata -%% (with contributions from many others) +%% xetex.def +%% Copyright (C) 2005-2020 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata +%% (with contributions from many others) %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -16,7 +17,7 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{xetex.def} - [2017/06/24 v5.0h Graphics/color driver for xetex] + [2020/08/26 v5.0i Graphics/color driver for xetex] \def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ @@ -83,7 +84,8 @@ background \current@color}} \def\define@color@named#1#2{% \expandafter\let\csname col@#1\endcsname\@nnil} - \def\no@page@color{\special{background \string"newpath clip}} +% white is special cased as "no bacground color" by dvipdfmx +\def\no@page@color{\special{background gray 1}} \@ifundefined{Gin@decode} {\let\Gin@decode\@empty} {} -- cgit v1.2.3