texlive[44598] Master/texmf-dist: graphics-def (14jun17)
commits+karl at tug.org
commits+karl at tug.org
Wed Jun 14 23:16:06 CEST 2017
Revision: 44598
http://tug.org/svn/texlive?view=revision&revision=44598
Author: karl
Date: 2017-06-14 23:16:06 +0200 (Wed, 14 Jun 2017)
Log Message:
-----------
graphics-def (14jun17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/graphics-def/README.md
trunk/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def
trunk/Master/texmf-dist/tex/latex/graphics-def/dvips.def
trunk/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
trunk/Master/texmf-dist/tex/latex/graphics-def/xetex.def
Modified: trunk/Master/texmf-dist/doc/latex/graphics-def/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/graphics-def/README.md 2017-06-14 21:15:51 UTC (rev 44597)
+++ trunk/Master/texmf-dist/doc/latex/graphics-def/README.md 2017-06-14 21:16:06 UTC (rev 44598)
@@ -1,7 +1,7 @@
LaTeX support for color and graphics
====================================
-Release 2017-06-12
+Release 2017-06-14
This bundle contains the 'engine-dependent' part of support for
color and graphics in LaTeX2e (the code here will also function
Modified: trunk/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def 2017-06-14 21:15:51 UTC (rev 44597)
+++ trunk/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def 2017-06-14 21:16:06 UTC (rev 44598)
@@ -16,16 +16,16 @@
%% https://github.com/latex3/graphics-def/issues
%%
\ProvidesFile{dvipdfmx.def}
- [2017/06/12 v5.0b Graphics/color driver for dvipdfmx]
+ [2017/06/14 v5.0d Graphics/color driver for dvipdfmx]
\def\c at lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
\ifdim\dimen@>\p@
- \PackageError{color}{Argument `#1' not in range [0,1]}{}%
+ \PackageError{color}{Argument `#1' not in range [0,1]}\@ehd
\fi}
\def\color at gray#1#2{%
\c at lor@arg{#2}%
- \edef#1{[#2]}%
+ \edef#1{gray #2}%
}
\def\color at cmyk#1#2{\c at lor@@cmyk#2\@@#1}
\def\c at lor@@cmyk#1,#2,#3,#4\@@#5{%
@@ -33,7 +33,7 @@
\c at lor@arg{#1}%
\c at lor@arg{#2}%
\c at lor@arg{#3}%
- \edef#5{[#1 #2 #3 #4]}%
+ \edef#5{cmyk #1 #2 #3 #4}%
}
\def\color at rgb#1#2{\c at lor@@rgb#2\@@#1}
\def\c at lor@@rgb#1,#2,#3\@@#4{%
@@ -40,7 +40,7 @@
\c at lor@arg{#1}%
\c at lor@arg{#2}%
\c at lor@arg{#3}%
- \edef#4{[#1 #2 #3]}%
+ \edef#4{rgb #1 #2 #3}%
}
\def\color at RGB#1#2{\c at lor@@RGB#2\@@#1}
\def\c at lor@@RGB#1,#2,#3\@@#4{%
@@ -53,10 +53,17 @@
\dimen@#1\p@
\divide\dimen@\@cclv
\edef#2{\strip at pt\dimen@}}
+\def\color at hsb#1#2{\c at lor@@hsb#2\@@#1}
+\def\c at lor@@hsb#1,#2,#3\@@#4{%
+ \c at lor@arg{#1}%
+ \c at lor@arg{#2}%
+ \c at lor@arg{#3}%
+ \edef#4{hsb #1 #2 #3}%
+ }
\def\color at named#1#2{\c at lor@@named#2,,\@@#1}
\def\c at lor@@named#1,#2,#3\@@#4{%
\@ifundefined{col@#1}%
- {\PackageError{color}{Undefined color `#1'}{}}%
+ {\PackageError{color}{Undefined color `#1'}\@ehd}%
{\edef#4{ #1}}%
}
\def\c at lor@to at ps#1 #2\@@{\csname c at lor@ps@#1\endcsname#2 \@@}
@@ -65,16 +72,17 @@
\def\c at lor@ps at hsb#1\@@{#1 sethsbcolor}
\def\c at lor@ps at cmyk#1\@@{#1 setcmykcolor}
\def\c at lor@ps at gray#1\@@{#1 setgray}
-\def\current at color{[0]}
+\def\current at color{ Black}
\def\set at color{%
- \special{pdf:bcolor \current at color
+ \special{color push \current at color
}\aftergroup\reset at color}
\def\reset at color{\special{%
- pdf:ecolor}}
+ color pop}}
\def\set at page@color{\special{%
- pdf:bgcolor \current at color}}
+ background \current at color}}
\def\define at color@named#1#2{%
\expandafter\let\csname col@#1\endcsname\@nnil}
+ \def\no at page@color{\special{background \string"newpath clip}}
\@ifundefined{Gin at page}
{\let\Gin at page\@empty}
{}
@@ -304,10 +312,11 @@
\ifnum\mag=\@m
\AtBeginDvi{%
\begingroup
-\ifx\stockwidth\@undefined\else
-\paperwidth\stockwidth
-\paperheight\stockheight
-\fi
+ \@ifundefined{stockwidth}{}
+ {%
+ \paperwidth\stockwidth
+ \paperheight\stockheight
+ }%
\ifdim\paperwidth>\z@
\ifdim\paperheight>\z@
\special{pdf:pagesize width \the\paperwidth\space height \the\paperheight}%
Modified: trunk/Master/texmf-dist/tex/latex/graphics-def/dvips.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics-def/dvips.def 2017-06-14 21:15:51 UTC (rev 44597)
+++ trunk/Master/texmf-dist/tex/latex/graphics-def/dvips.def 2017-06-14 21:16:06 UTC (rev 44598)
@@ -17,7 +17,7 @@
%% https://github.com/latex3/graphics-def/issues
%%
\ProvidesFile{dvips.def}
- [2017/06/01 v3.1b Graphics/color driver for dvips]
+ [2017/06/14 v3.1c Graphics/color driver for dvips]
\def\c at lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
@@ -153,10 +153,11 @@
\ifnum\mag=\@m
\AtBeginDvi{%
\begingroup
- \ifx\stockwidth\@undefined\else
- \paperwidth\stockwidth
- \paperheight\stockheight
- \fi
+ \@ifundefined{stockwidth}{}
+ {%
+ \paperwidth\stockwidth
+ \paperheight\stockheight
+ }%
\ifdim\paperwidth>\z@
\ifdim\paperheight>\z@
\special{papersize=\the\paperwidth,\the\paperheight}%
Modified: trunk/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics-def/pdftex.def 2017-06-14 21:15:51 UTC (rev 44597)
+++ trunk/Master/texmf-dist/tex/latex/graphics-def/pdftex.def 2017-06-14 21:16:06 UTC (rev 44598)
@@ -165,6 +165,7 @@
\@ifundefined{Gin at page}
{\let\Gin at page\@empty}
{}
+\def\GPT at page{\Gin at page}
\@ifundefined{Gin at pagebox}
{\def\Gin at pagebox{cropbox}}
{}
Modified: trunk/Master/texmf-dist/tex/latex/graphics-def/xetex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/graphics-def/xetex.def 2017-06-14 21:15:51 UTC (rev 44597)
+++ trunk/Master/texmf-dist/tex/latex/graphics-def/xetex.def 2017-06-14 21:16:06 UTC (rev 44598)
@@ -16,16 +16,16 @@
%% https://github.com/latex3/graphics-def/issues
%%
\ProvidesFile{xetex.def}
- [2017/06/01 v5.0a Graphics/color driver for xetex]
+ [2017/06/14 v5.0c Graphics/color driver for xetex]
\def\c at lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
\ifdim\dimen@>\p@
- \PackageError{color}{Argument `#1' not in range [0,1]}{}%
+ \PackageError{color}{Argument `#1' not in range [0,1]}\@ehd
\fi}
\def\color at gray#1#2{%
\c at lor@arg{#2}%
- \edef#1{[#2]}%
+ \edef#1{gray #2}%
}
\def\color at cmyk#1#2{\c at lor@@cmyk#2\@@#1}
\def\c at lor@@cmyk#1,#2,#3,#4\@@#5{%
@@ -33,7 +33,7 @@
\c at lor@arg{#1}%
\c at lor@arg{#2}%
\c at lor@arg{#3}%
- \edef#5{[#1 #2 #3 #4]}%
+ \edef#5{cmyk #1 #2 #3 #4}%
}
\def\color at rgb#1#2{\c at lor@@rgb#2\@@#1}
\def\c at lor@@rgb#1,#2,#3\@@#4{%
@@ -40,7 +40,7 @@
\c at lor@arg{#1}%
\c at lor@arg{#2}%
\c at lor@arg{#3}%
- \edef#4{[#1 #2 #3]}%
+ \edef#4{rgb #1 #2 #3}%
}
\def\color at RGB#1#2{\c at lor@@RGB#2\@@#1}
\def\c at lor@@RGB#1,#2,#3\@@#4{%
@@ -53,10 +53,17 @@
\dimen@#1\p@
\divide\dimen@\@cclv
\edef#2{\strip at pt\dimen@}}
+\def\color at hsb#1#2{\c at lor@@hsb#2\@@#1}
+\def\c at lor@@hsb#1,#2,#3\@@#4{%
+ \c at lor@arg{#1}%
+ \c at lor@arg{#2}%
+ \c at lor@arg{#3}%
+ \edef#4{hsb #1 #2 #3}%
+ }
\def\color at named#1#2{\c at lor@@named#2,,\@@#1}
\def\c at lor@@named#1,#2,#3\@@#4{%
\@ifundefined{col@#1}%
- {\PackageError{color}{Undefined color `#1'}{}}%
+ {\PackageError{color}{Undefined color `#1'}\@ehd}%
{\edef#4{ #1}}%
}
\def\c at lor@to at ps#1 #2\@@{\csname c at lor@ps@#1\endcsname#2 \@@}
@@ -65,16 +72,18 @@
\def\c at lor@ps at hsb#1\@@{#1 sethsbcolor}
\def\c at lor@ps at cmyk#1\@@{#1 setcmykcolor}
\def\c at lor@ps at gray#1\@@{#1 setgray}
-\def\current at color{[0]}
+\def\current at color{ Black}
\def\set at color{%
- \special{pdf:bcolor \current at color
+ \special{color push \current at color
}\aftergroup\reset at color}
\def\reset at color{\special{%
- pdf:ecolor}}
+ color pop}}
\def\set at page@color{\special{%
- pdf:bgcolor \current at color}}
+ background \current at color}}
\def\define at color@named#1#2{%
\expandafter\let\csname col@#1\endcsname\@nnil}
+ \def\no at page@color{\special{background \string"newpath clip}}
+\def\G at pdf@ext{.pdf}
\@ifundefined{Gin at page}
{\let\Gin at page\@empty}
{}
@@ -397,10 +406,11 @@
\ifnum\mag=\@m
\AtBeginDvi{%
\begingroup
-\ifx\stockwidth\@undefined\else
-\paperwidth\stockwidth
-\paperheight\stockheight
-\fi
+ \@ifundefined{stockwidth}{}
+ {%
+ \paperwidth\stockwidth
+ \paperheight\stockheight
+ }%
\ifdim\paperwidth>\z@
\ifdim\paperheight>\z@
\special{pdf:pagesize width \the\paperwidth\space height \the\paperheight}%
More information about the tex-live-commits
mailing list