| blob | 713963a44e3ad1795c32dec1f3d723b780077acd |
1 diff -u xypdf.orig/xypdf-co.tex xypdf/xypdf-co.tex
2 --- xypdf.orig/xypdf-co.tex 2016-11-19 12:24:53.457219331 +0100
3 +++ xypdf/xypdf-co.tex 2016-11-19 12:24:07.314492681 +0100
4 @@ -8,7 +8,7 @@
5 %%
6 %% The xypdf package for TeX and LaTeX
7 %% Copyright (c) 2010 by Daniel Müllner (M\"ullner)
8 -%% <http://math.stanford.edu/~muellner>
9 +%% <http://danifold.net>
10 %% --------------------------------------------------------------------------
11 %%
12 %% This program is free software: you can redistribute it and/or modify it
13 @@ -64,28 +64,75 @@
14 \@ifdefinable\xP@colB\relax
15 \@ifdefinable\xP@colC\relax
16 \@ifdefinable\xP@colD\relax
17 +\@ifdefinable\xP@colE\relax
18 \xP@hook{color}{newxycolor}
19 -\newcommand*\xP@newxycolor[2]{\def\xP@colorname{#1}\xP@parsecolor#2 @}
20 +\newcommand*\xP@newxycolor[2]{\def\xP@colorname{#1}\expandafter\xP@parsecolor\@firstofone#2 @}
21 \xP@color@on
22 +\@ifdefinable\xP@parsetwo\relax
23 +\def\xP@parsetwo#1 #2@{\def\xP@colC{#1}\def\xP@colD{#2}}
24 +\@ifdefinable\xP@parsethree\relax
25 +\def\xP@parsethree#1 #2 #3@{\def\xP@colC{#1}\def\xP@colD{#2}\def\xP@colE{#3}}
26 \@ifdefinable\xP@parsecolor\relax
27 -\def\xP@parsecolor#1 #2 #3@{\def\xP@colA{#1}\def\xP@colB{#2}\ifx\xP@colB\xP@gray
28 +\def\xP@parsecolor#1 #2 #3@{\def\xP@colA{#1}\def\xP@colB{#2}\ifx\xP@colA\xP@cmyk
29 +\xP@parsethree#3@\xP@newcolor\xP@colorname{\xP@colB,\xP@colC,\xP@colD,\xP@colE}\xP@cmyk
30 +\newxycolor
31 +\else
32 +\ifx\xP@colA\xP@CMYK
33 +\xP@parsethree#3@\xP@newcolor\xP@colorname{\xP@colB,\xP@colC,\xP@colD,\xP@colE}\xP@cmyk
34 +\newxycolor
35 +\else
36 +\ifx\xP@colA\xP@rgb
37 +\xP@parsetwo#3@\xP@newcolor\xP@colorname{\xP@colB,\xP@colC,\xP@colD}\xP@rgb\newxycolor
38 +\else
39 +\ifx\xP@colA\xP@RGB
40 +\xP@parsetwo#3@\xP@newcolor\xP@colorname{\xP@colB,\xP@colC,\xP@colD}\xP@rgb
41 +\newxycolor
42 +\else
43 +\ifx\xP@colA\xP@gray
44 +\xP@newcolor\xP@colorname\xP@colB\xP@gray\newxycolor
45 +\else
46 +\ifx\xP@colA\xP@GRAY
47 +\xP@newcolor\xP@colorname\xP@colB\xP@gray\newxycolor
48 +\else
49 +\ifx\xP@colB\xP@gray
50 +\xP@newcolor\xP@colorname\xP@colA\xP@gray\newxycolor
51 +\else
52 +\ifx\xP@colB\xP@GRAY
53 \xP@newcolor\xP@colorname\xP@colA\xP@gray\newxycolor
54 \else
55 \xP@parsecolor@#3 @\fi
56 +\fi
57 +\fi
58 +\fi
59 +\fi
60 +\fi
61 +\fi
62 +\fi
63 }
64 \@ifdefinable\xP@parsecolor@\relax
65 \def\xP@parsecolor@#1 #2 #3 #4@{\def\xP@colC{#1}\def\xP@colD{#2}\ifx\xP@colD\xP@rgb
66 \xP@newcolor\xP@colorname{\xP@colA,\xP@colB,\xP@colC}\xP@rgb\newxycolor
67 \else
68 +\ifx\xP@colD\xP@RGB
69 +\xP@newcolor\xP@colorname{\xP@colA,\xP@colB,\xP@colC}\xP@rgb\newxycolor
70 +\else
71 \def\@tempa{#3}\ifx\@tempa\xP@cmyk
72 -\xP@newcolor\xP@colorname{\xP@colA,\xP@colB,\xP@colC,\xP@colD}{cmyk}\newxycolor
73 +\xP@newcolor\xP@colorname{\xP@colA,\xP@colB,\xP@colC,\xP@colD}\xP@cmyk\newxycolor
74 +\else
75 +\ifx\@tempa\xP@CMYK
76 +\xP@newcolor\xP@colorname{\xP@colA,\xP@colB,\xP@colC,\xP@colD}\xP@cmyk\newxycolor
77 \else
78 \PackageError{xypdf}{Syntax error in \string\newxycolor}{}\fi
79 \fi
80 +\fi
81 +\fi
82 }
83 \newcommand*\xP@gray{gray}
84 \newcommand*\xP@rgb{rgb}
85 \newcommand*\xP@cmyk{cmyk}
86 +\newcommand*\xP@GRAY{GRAY}
87 +\newcommand*\xP@RGB{RGB}
88 +\newcommand*\xP@CMYK{CMYK}
89 \xP@hook{color}{OBJECT@shape}
90 \newcommand*\xP@OBJECT@shape[1]{\DN@{shape [#1]}\expandafter\let\expandafter\nextii@\csname\codeof\next@\endcsname
91 \ifx\nextii@\relax\DN@{style [#1]}\expandafter\let\expandafter\nextii@\csname\codeof\next@\endcsname
92 @@ -120,10 +167,5 @@
93 \xywithoption{crayon}{\xP@installCrayolaColors
94 \renewcommand*\installCrayolaColors@{}}
95 \xyendinput
96 -
97 -
98 -
99 -
100 -
101 %%
102 %% End of file `xypdf-co.tex'.
103 diff -u xypdf.orig/xypdf-cu.tex xypdf/xypdf-cu.tex
104 --- xypdf.orig/xypdf-cu.tex 2016-11-19 12:24:53.457219331 +0100
105 +++ xypdf/xypdf-cu.tex 2016-11-19 12:24:07.314492681 +0100
106 @@ -8,7 +8,7 @@
107 %%
108 %% The xypdf package for TeX and LaTeX
109 %% Copyright (c) 2010 by Daniel Müllner (M\"ullner)
110 -%% <http://math.stanford.edu/~muellner>
111 +%% <http://danifold.net>
112 %% --------------------------------------------------------------------------
113 %%
114 %% This program is free software: you can redistribute it and/or modify it
115 @@ -1178,10 +1178,5 @@
116 \@for\@tempa:={#1}\do{\the\toks@}\xP@stroke{\the\@temptokena}}}
117 \newcommand*\xP@paintbrokensquiggle[5]{\xP@squigglevectors{#1}\xP@append\@temptokena{\xP@coor\xP@posX\xP@posY m \xP@coor{\xP@posX+\Y@max}{\xP@posY+\X@max}}\xP@squigglevectors{#2}\xP@append\@temptokena{\xP@coor{\xP@posX-\D@p-\X@min}{\xP@posY+\R@p-\Y@min}\xP@coor{\xP@posX-\D@p}{\xP@posY+\R@p}c \xP@coor{\xP@posX-\D@p+\X@min}{\xP@posY+\R@p+\Y@min}}\xP@squigglevectors{#3}\xP@append\@temptokena{\xP@coor{\xP@posX-\X@max}{\xP@posY+\Y@max}\xP@coor\xP@posX\xP@posY c \xP@coor{\xP@posX+\X@max}{\xP@posY-\Y@max}}\xP@squigglevectors{#4}\xP@append\@temptokena{\xP@coor{\xP@posX+\D@p-\X@min}{\xP@posY-\R@p-\Y@min}\xP@coor{\xP@posX+\D@p}{\xP@posY-\R@p}c \xP@coor{\xP@posX+\D@p+\X@min}{\xP@posY-\R@p+\Y@min}}\xP@squigglevectors{#5}\xP@append\@temptokena{\xP@coor{\xP@posX-\Y@max}{\xP@posY-\X@max}\xP@coor\xP@posX\xP@posY c }}
118 \xyendinput
119 -
120 -
121 -
122 -
123 -
124 %%
125 %% End of file `xypdf-cu.tex'.
126 diff -u xypdf.orig/xypdf-fr.tex xypdf/xypdf-fr.tex
127 --- xypdf.orig/xypdf-fr.tex 2016-11-19 12:24:53.457219331 +0100
128 +++ xypdf/xypdf-fr.tex 2016-11-19 12:24:07.314492681 +0100
129 @@ -8,7 +8,7 @@
130 %%
131 %% The xypdf package for TeX and LaTeX
132 %% Copyright (c) 2010 by Daniel Müllner (M\"ullner)
133 -%% <http://math.stanford.edu/~muellner>
134 +%% <http://danifold.net>
135 %% --------------------------------------------------------------------------
136 %%
137 %% This program is free software: you can redistribute it and/or modify it
138 @@ -429,10 +429,5 @@
139 0 \xP@dim\B@ c }\@temptokena\expandafter{\@tempa}\xP@mirrorpath
140 \xP@fillorstroke{\the\@temptokena}}
141 \xyendinput
142 -
143 -
144 -
145 -
146 -
147 %%
148 %% End of file `xypdf-fr.tex'.
149 diff -u xypdf.orig/xypdf-li.tex xypdf/xypdf-li.tex
150 --- xypdf.orig/xypdf-li.tex 2016-11-19 12:24:53.457219331 +0100
151 +++ xypdf/xypdf-li.tex 2016-11-19 12:24:07.314492681 +0100
152 @@ -8,7 +8,7 @@
153 %%
154 %% The xypdf package for TeX and LaTeX
155 %% Copyright (c) 2010 by Daniel Müllner (M\"ullner)
156 -%% <http://math.stanford.edu/~muellner>
157 +%% <http://danifold.net>
158 %% --------------------------------------------------------------------------
159 %%
160 %% This program is free software: you can redistribute it and/or modify it
161 @@ -60,10 +60,5 @@
162 \xycatcodes
163 \expandafter\let\csname xypdf-li@loaded\endcsname\@empty
164 \xyendinput
165 -
166 -
167 -
168 -
169 -
170 %%
171 %% End of file `xypdf-li.tex'.
172 diff -u xypdf.orig/xypdf-ro.tex xypdf/xypdf-ro.tex
173 --- xypdf.orig/xypdf-ro.tex 2016-11-19 12:24:53.457219331 +0100
174 +++ xypdf/xypdf-ro.tex 2016-11-19 12:24:07.314492681 +0100
175 @@ -8,7 +8,7 @@
176 %%
177 %% The xypdf package for TeX and LaTeX
178 %% Copyright (c) 2010 by Daniel Müllner (M\"ullner)
179 -%% <http://math.stanford.edu/~muellner>
180 +%% <http://danifold.net>
181 %% --------------------------------------------------------------------------
182 %%
183 %% This program is free software: you can redistribute it and/or modify it
184 @@ -124,10 +124,5 @@
185 }\@tempdimb\dimen@i
186 }
187 \xyendinput
188 -
189 -
190 -
191 -
192 -
193 %%
194 %% End of file `xypdf-ro.tex'.
195 diff -u xypdf.orig/xypdf.tex xypdf/xypdf.tex
196 --- xypdf.orig/xypdf.tex 2016-11-19 12:24:53.457219331 +0100
197 +++ xypdf/xypdf.tex 2016-11-19 12:24:07.314492681 +0100
198 @@ -8,7 +8,7 @@
199 %%
200 %% The xypdf package for TeX and LaTeX
201 %% Copyright (c) 2010 by Daniel Müllner (M\"ullner)
202 -%% <http://math.stanford.edu/~muellner>
203 +%% <http://danifold.net>
204 %% --------------------------------------------------------------------------
205 %%
206 %% This program is free software: you can redistribute it and/or modify it
207 @@ -58,9 +58,9 @@
208 %% (Muellner, M\"ullner).
209 %%
210 \ifx\xyloaded\undefined\input xy \fi
211 -\xyprovide{pdf}{PDF driver}{1.7}{Daniel M\"ullner\newline}{\url{http://math.stanford.edu/~muellner}}{}
212 +\xyprovide{pdf}{PDF driver}{1.9}{Daniel M\"ullner\newline}{\url{http://danifold.net}}{}
213 \ifx\makeatletter\undefined\input miniltx \fi
214 -\newcommand*\xypdfdate{2011/03/20}
215 +\newcommand*\xypdfdate{2016/07/25}
216 \newdriver{\xyaddsupport{pdf}\xP@pdf@on
217 \xyaddsupport{color}\xP@color@on
218 \xyaddsupport{curve}\xP@curve@on
219 @@ -91,7 +91,10 @@
220 \fi
221 \newcommand*\xP@testpdfsave{\ifpdf
222 \ifx\pdfsave\@undefined
223 -\PackageError{xypdf}{pdfTeX version 1.40.0 or higher is needed for the xypdf^^Jpackage with PDF output}{}\fi
224 +\ifx\pdfextension\@undefined
225 +\PackageError{xypdf}{LuaTeX or pdfTeX version 1.40.0
226 +or higher is needed for^^Jthe xypdf package with PDF output}{}\fi
227 +\fi
228 \fi
229 \let\xP@testpdfsave\@undefined
230 }
231 @@ -120,12 +123,24 @@
232 \expandafter\noexpand\csname xP@old@#2\endcsname
233 }}
234 \newcommand*\xP@defpdfliteral{\ifpdf
235 +\ifx\pdfextension\@undefined
236 \newcommand*\xP@literal[1]{\pdfsave\pdfliteral{##1}\pdfrestore}
237 \newcommand*\xP@cm[5]{\pdfsave
238 \pdfsetmatrix{##1 ##2 ##3 ##4}##5\pdfrestore
239 }
240 -\@ifundefined{@pdfcolorstack}{\def\@pdfcolorstack{\z@}}{}\newcommand*\xP@setcolor[3]{\pdfcolorstack\@pdfcolorstack push{##1 ##2 ##1 ##3}}
241 +\else
242 +\newcommand*\xP@literal[1]{\pdfextension save\pdfextension literal{##1}\pdfextension restore\relax
243 +}
244 +\newcommand*\xP@cm[5]{\pdfextension save\pdfextension setmatrix{##1 ##2 ##3 ##4}##5\pdfextension restore\relax
245 +}
246 +\fi
247 +\@ifundefined{@pdfcolorstack}{\def\@pdfcolorstack{\z@}}{}\ifx\pdfextension\@undefined
248 +\newcommand*\xP@setcolor[3]{\pdfcolorstack\@pdfcolorstack push{##1 ##2 ##1 ##3}}
249 \newcommand*\xP@resetcolor{\pdfcolorstack\@pdfcolorstack pop\relax}\else
250 +\newcommand*\xP@setcolor[3]{\pdfextension colorstack\@pdfcolorstack push{##1 ##2 ##1 ##3}}
251 +\newcommand*\xP@resetcolor{\pdfextension colorstack\@pdfcolorstack pop\relax
252 +}\fi
253 +\else
254 \newcommand*\xP@literal{\xP@warning{xypdf}{The produced DVI file is NOT PORTABLE. Convert it with^^Jdvipdfm(x) to the PDF format but do not expect the DVI file itself to be^^Jdisplayed correctly\@gobble}\global\let\xP@literal\xP@literal@
255 \xP@literal
256 }
257 @@ -145,14 +160,20 @@
258 \next@
259 {\RequirePackage{ifpdf}\xP@testpdfsave
260 \xP@defpdfliteral}
261 +\@ifdefinable\xP@digits\relax
262 +\ifx\pdfvariable\@undefined
263 \ifx\pdfdecimaldigits\@undefined
264 \newcommand*\xP@digits{2}
265 \else
266 -\@ifdefinable\xP@digits\relax
267 \xdef\xP@digits{\the\pdfdecimaldigits}
268 -\ifnum\pdfdecimaldigits<2
269 -\xP@warning{xypdf}{The precision in \string\pdfdecimaldigits\space is only \xP@digits\space
270 -decimals.^^JIt is recommended to set \string\pdfdecimaldigits\space to 2 or 3 for best output quality\@gobble}
271 +\ifnum\xP@digits<2
272 +\xP@warning{xypdf}{The precision in \string\pdfdecimaldigits\space is only \xP@digits\space decimals.^^JIt is recommended to set \string\pdfdecimaldigits\space to 2 or 3 for best output quality\@gobble}
273 +\fi
274 +\fi
275 +\else
276 +\xdef\xP@digits{\the\pdfvariable decimaldigits}
277 +\ifnum\xP@digits<2
278 +\xP@warning{xypdf}{The precision in "\string\pdfvariable\space decimaldigits" is only \xP@digits^^Jdecimals. It is recommended to set "decimaldigits" to 2 or 3 for best output^^Jquality\@gobble}
279 \fi
280 \fi
281 \newcommand*\xP@dim[1]{\expandafter\xP@removePT\the\dimexpr(#1)*800/803\relax\space}
282 @@ -329,10 +350,15 @@
283 \fi
284 ]\xP@precdim{\dimexpr\xP@preclw+\@tempdima/2\relax}d}}
285 \newcommand*\xP@abs[1]{\ifdim#1<\z@\multiply#1\m@ne\fi}
286 -\newcommand*\xP@ifabsless[2]{\ifpdfabsdim#1<#2}
287 \ifx\ifpdfabsdim\@undefined
288 -\renewcommand*\xP@ifabsless[2]{\ifdim\ifdim#1<\z@-\fi#1<\ifdim#2<\z@-\fi#2}
289 +\newcommand*\xP@ifabsless[2]{\ifdim\ifdim#1<\z@-\fi#1<\ifdim#2<\z@-\fi#2}
290 \@gobble\fi
291 +\else
292 +\newcommand*\xP@ifabsless[2]{\ifpdfabsdim#1<#2}
293 +\fi
294 +\ifx\ifabsdim\@undefined
295 +\else
296 +\renewcommand*\xP@ifabsless[2]{\ifabsdim#1<#2}
297 \fi
298 \newcommand*\xP@swapdim[2]{\@tempdima#1#1#2#2\@tempdima}
299 \newcommand*\xP@swapnum[2]{\@tempcnta#1#1#2#2\@tempcnta}