From bf7407684cdb422ba5d51055fb6fda9ff24bd5c5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 14 Jun 2017 21:16:06 +0000 Subject: graphics-def (14jun17) git-svn-id: svn://tug.org/texlive/trunk@44598 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/graphics-def/dvipdfmx.def | 37 +++++++++++++-------- Master/texmf-dist/tex/latex/graphics-def/dvips.def | 11 ++++--- .../texmf-dist/tex/latex/graphics-def/pdftex.def | 1 + Master/texmf-dist/tex/latex/graphics-def/xetex.def | 38 ++++++++++++++-------- 4 files changed, 54 insertions(+), 33 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def b/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def index 7f8fa3709b4..44601598cce 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def @@ -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@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@gray#1#2{% \c@lor@arg{#2}% - \edef#1{[#2]}% + \edef#1{gray #2}% } \def\color@cmyk#1#2{\c@lor@@cmyk#2\@@#1} \def\c@lor@@cmyk#1,#2,#3,#4\@@#5{% @@ -33,14 +33,14 @@ \c@lor@arg{#1}% \c@lor@arg{#2}% \c@lor@arg{#3}% - \edef#5{[#1 #2 #3 #4]}% + \edef#5{cmyk #1 #2 #3 #4}% } \def\color@rgb#1#2{\c@lor@@rgb#2\@@#1} \def\c@lor@@rgb#1,#2,#3\@@#4{% \c@lor@arg{#1}% \c@lor@arg{#2}% \c@lor@arg{#3}% - \edef#4{[#1 #2 #3]}% + \edef#4{rgb #1 #2 #3}% } \def\color@RGB#1#2{\c@lor@@RGB#2\@@#1} \def\c@lor@@RGB#1,#2,#3\@@#4{% @@ -53,10 +53,17 @@ \dimen@#1\p@ \divide\dimen@\@cclv \edef#2{\strip@pt\dimen@}} +\def\color@hsb#1#2{\c@lor@@hsb#2\@@#1} +\def\c@lor@@hsb#1,#2,#3\@@#4{% + \c@lor@arg{#1}% + \c@lor@arg{#2}% + \c@lor@arg{#3}% + \edef#4{hsb #1 #2 #3}% + } \def\color@named#1#2{\c@lor@@named#2,,\@@#1} \def\c@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@lor@to@ps#1 #2\@@{\csname c@lor@ps@#1\endcsname#2 \@@} @@ -65,16 +72,17 @@ \def\c@lor@ps@hsb#1\@@{#1 sethsbcolor} \def\c@lor@ps@cmyk#1\@@{#1 setcmykcolor} \def\c@lor@ps@gray#1\@@{#1 setgray} -\def\current@color{[0]} +\def\current@color{ Black} \def\set@color{% - \special{pdf:bcolor \current@color + \special{color push \current@color }\aftergroup\reset@color} \def\reset@color{\special{% - pdf:ecolor}} + color pop}} \def\set@page@color{\special{% - pdf:bgcolor \current@color}} + 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}} \@ifundefined{Gin@page} {\let\Gin@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}% diff --git a/Master/texmf-dist/tex/latex/graphics-def/dvips.def b/Master/texmf-dist/tex/latex/graphics-def/dvips.def index c999ac054e6..3af9c8ea3b1 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/dvips.def +++ b/Master/texmf-dist/tex/latex/graphics-def/dvips.def @@ -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@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}% diff --git a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def index bdb0dece8cd..c5589bb53d2 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def +++ b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def @@ -165,6 +165,7 @@ E \else \@ifundefined{Gin@page} {\let\Gin@page\@empty} {} +\def\GPT@page{\Gin@page} \@ifundefined{Gin@pagebox} {\def\Gin@pagebox{cropbox}} {} diff --git a/Master/texmf-dist/tex/latex/graphics-def/xetex.def b/Master/texmf-dist/tex/latex/graphics-def/xetex.def index e3f72cd0f8b..3db4fb07f67 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/xetex.def +++ b/Master/texmf-dist/tex/latex/graphics-def/xetex.def @@ -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@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@gray#1#2{% \c@lor@arg{#2}% - \edef#1{[#2]}% + \edef#1{gray #2}% } \def\color@cmyk#1#2{\c@lor@@cmyk#2\@@#1} \def\c@lor@@cmyk#1,#2,#3,#4\@@#5{% @@ -33,14 +33,14 @@ \c@lor@arg{#1}% \c@lor@arg{#2}% \c@lor@arg{#3}% - \edef#5{[#1 #2 #3 #4]}% + \edef#5{cmyk #1 #2 #3 #4}% } \def\color@rgb#1#2{\c@lor@@rgb#2\@@#1} \def\c@lor@@rgb#1,#2,#3\@@#4{% \c@lor@arg{#1}% \c@lor@arg{#2}% \c@lor@arg{#3}% - \edef#4{[#1 #2 #3]}% + \edef#4{rgb #1 #2 #3}% } \def\color@RGB#1#2{\c@lor@@RGB#2\@@#1} \def\c@lor@@RGB#1,#2,#3\@@#4{% @@ -53,10 +53,17 @@ \dimen@#1\p@ \divide\dimen@\@cclv \edef#2{\strip@pt\dimen@}} +\def\color@hsb#1#2{\c@lor@@hsb#2\@@#1} +\def\c@lor@@hsb#1,#2,#3\@@#4{% + \c@lor@arg{#1}% + \c@lor@arg{#2}% + \c@lor@arg{#3}% + \edef#4{hsb #1 #2 #3}% + } \def\color@named#1#2{\c@lor@@named#2,,\@@#1} \def\c@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@lor@to@ps#1 #2\@@{\csname c@lor@ps@#1\endcsname#2 \@@} @@ -65,16 +72,18 @@ \def\c@lor@ps@hsb#1\@@{#1 sethsbcolor} \def\c@lor@ps@cmyk#1\@@{#1 setcmykcolor} \def\c@lor@ps@gray#1\@@{#1 setgray} -\def\current@color{[0]} +\def\current@color{ Black} \def\set@color{% - \special{pdf:bcolor \current@color + \special{color push \current@color }\aftergroup\reset@color} \def\reset@color{\special{% - pdf:ecolor}} + color pop}} \def\set@page@color{\special{% - pdf:bgcolor \current@color}} + 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}} +\def\G@pdf@ext{.pdf} \@ifundefined{Gin@page} {\let\Gin@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}% -- cgit v1.2.3