oberdiek update (28jan10)

git-svn-id: svn://tug.org/texlive/trunk@16857 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 44 insertions, 579 deletions

diff --git a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty
index fc08a47147c..fd96bfaaab8 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2006-2009 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%% Copyright (C) 2006-2010 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -31,7 +31,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{grffile}%
-  [2009/09/25 v1.10 Extended file name support for graphics (HO)]%
+  [2010/01/28 v1.11 Extended file name support for graphics (HO)]%
 \edef\grffile@RestoreCatcodes{%
   \catcode`\noexpand\=\the\catcode`\=\relax
   \catcode`\noexpand\:\the\catcode`\:\relax
@@ -191,31 +191,50 @@
   }{%
   }%
 }
-\def\grffile@IfFileExists#1{%
-  \expandafter\expandafter\expandafter
-  \ifx\expandafter\expandafter\expandafter\\\pdf@filesize{#1}\\%
-    \let\reserved@a\@secondoftwo
-    \ifx\input@path\@undefined
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname pdf@filesize\endcsname\relax
+  \begingroup
+    \let\on@line\@empty
+    \PackageInfo{grffile}{%
+      \string\grffile@IfFileExists\space without space support,%
+      \MessageBreak
+      because pdfTeX's \string\pdffilesize\space is not available%
+    }%
+  \endgroup
+  \def\grffile@IfFileExists#1{%
+    \IfFileExists{#1}{%
+      \let\grffile@IFE@next\@firstoftwo
+    }{%
+      \let\grffile@IFE@next\@secondoftwo
+    }%
+    \grffile@IFE@next
+  }%
+\else
+  \def\grffile@IfFileExists#1{%
+    \expandafter\expandafter\expandafter
+    \ifx\expandafter\expandafter\expandafter\\\pdf@filesize{#1}\\%
+      \let\reserved@a\@secondoftwo
+      \ifx\input@path\@undefined
+      \else
+        \expandafter\@tfor\expandafter\reserved@b\expandafter
+            :\expandafter=\input@path\do{%
+          \expandafter\expandafter\expandafter
+          \ifx\expandafter\expandafter\expandafter
+              \\\pdf@filesize{\reserved@b#1}\\%
+          \else
+            \edef\grffile@file@found{\reserved@b#1}%
+            \let\reserved@a\@firstoftwo
+            \@break@tfor
+          \fi
+        }%
+      \fi
+      \expandafter\reserved@a
     \else
-      \expandafter\@tfor\expandafter\reserved@b\expandafter
-          :\expandafter=\input@path\do{%
-        \expandafter\expandafter\expandafter
-        \ifx\expandafter\expandafter\expandafter
-            \\\pdf@filesize{\reserved@b#1}\\%
-        \else
-          \edef\grffile@file@found{\reserved@b#1}%
-          \let\reserved@a\@firstoftwo
-          \@break@tfor
-        \fi
-      }%
+      \edef\grffile@file@found{#1}%
+      \expandafter\@firstoftwo
     \fi
-    \expandafter\reserved@a
-  \else
-    \edef\grffile@file@found{#1}%
-    \expandafter\@firstoftwo
-  \fi
-}
-
+  }%
+\fi
 \def\grffile@Ginclude@graphics#1{%
   \begingroup
     \ifgrffile@space
diff --git a/Master/texmf-dist/tex/latex/oberdiek/pdfrender.sty b/Master/texmf-dist/tex/latex/oberdiek/pdfrender.sty
deleted file mode 100644
index 2b579d1856b..00000000000
--- a/Master/texmf-dist/tex/latex/oberdiek/pdfrender.sty
+++ /dev/null
@@ -1,554 +0,0 @@
-%%
-%% This is file `pdfrender.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% pdfrender.dtx  (with options: `package')
-%% 
-%% This is a generated file.
-%% 
-%% Copyright (C) 2010 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
-%% 
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either
-%% version 1.3c of this license or (at your option) any later
-%% version. This version of this license is in
-%%    http://www.latex-project.org/lppl/lppl-1-3c.txt
-%% and the latest version of this license is in
-%%    http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2005/12/01 or later.
-%% 
-%% This work has the LPPL maintenance status "maintained".
-%% 
-%% This Current Maintainer of this work is Heiko Oberdiek.
-%% 
-%% This work consists of the main source file pdfrender.dtx
-%% and the derived files
-%%    pdfrender.sty, pdfrender.pdf, pdfrender.ins, pdfrender.drv,
-%%    pdfrender-test1.tex, pdfrender-test2.tex.
-%% 
-\begingroup
-  \catcode44 12 % ,
-  \catcode45 12 % -
-  \catcode46 12 % .
-  \catcode58 12 % :
-  \catcode64 11 % @
-  \catcode123 1 % {
-  \catcode125 2 % }
-  \expandafter\let\expandafter\x\csname ver@pdfrender.sty\endcsname
-  \ifx\x\relax % plain-TeX, first loading
-  \else
-    \def\empty{}%
-    \ifx\x\empty % LaTeX, first loading,
-      % variable is initialized, but \ProvidesPackage not yet seen
-    \else
-      \catcode35 6 % #
-      \expandafter\ifx\csname PackageInfo\endcsname\relax
-        \def\x#1#2{%
-          \immediate\write-1{Package #1 Info: #2.}%
-        }%
-      \else
-        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
-      \fi
-      \x{pdfrender}{The package is already loaded}%
-      \aftergroup\endinput
-    \fi
-  \fi
-\endgroup
-\begingroup
-  \catcode35 6 % #
-  \catcode40 12 % (
-  \catcode41 12 % )
-  \catcode44 12 % ,
-  \catcode45 12 % -
-  \catcode46 12 % .
-  \catcode47 12 % /
-  \catcode58 12 % :
-  \catcode64 11 % @
-  \catcode91 12 % [
-  \catcode93 12 % ]
-  \catcode123 1 % {
-  \catcode125 2 % }
-  \expandafter\ifx\csname ProvidesPackage\endcsname\relax
-    \def\x#1#2#3[#4]{\endgroup
-      \immediate\write-1{Package: #3 #4}%
-      \xdef#1{#4}%
-    }%
-  \else
-    \def\x#1#2[#3]{\endgroup
-      #2[{#3}]%
-      \ifx#1\@undefined
-        \xdef#1{#3}%
-      \fi
-      \ifx#1\relax
-        \xdef#1{#3}%
-      \fi
-    }%
-  \fi
-\expandafter\x\csname ver@pdfrender.sty\endcsname
-\ProvidesPackage{pdfrender}%
-  [2010/01/26 v1.0 Access to some PDF graphics parameters (HO)]
-\begingroup
-  \catcode123 1 % {
-  \catcode125 2 % }
-  \def\x{\endgroup
-    \expandafter\edef\csname PdfRender@AtEnd\endcsname{%
-      \catcode35 \the\catcode35\relax
-      \catcode64 \the\catcode64\relax
-      \catcode123 \the\catcode123\relax
-      \catcode125 \the\catcode125\relax
-    }%
-  }%
-\x
-\catcode35 6 % #
-\catcode64 11 % @
-\catcode123 1 % {
-\catcode125 2 % }
-\def\TMP@EnsureCode#1#2{%
-  \edef\PdfRender@AtEnd{%
-    \PdfRender@AtEnd
-    \catcode#1 \the\catcode#1\relax
-  }%
-  \catcode#1 #2\relax
-}
-\TMP@EnsureCode{10}{12}% ^^J
-\TMP@EnsureCode{36}{3}% $
-\TMP@EnsureCode{39}{12}% '
-\TMP@EnsureCode{40}{12}% (
-\TMP@EnsureCode{41}{12}% )
-\TMP@EnsureCode{42}{12}% *
-\TMP@EnsureCode{43}{12}% +
-\TMP@EnsureCode{44}{12}% ,
-\TMP@EnsureCode{45}{12}% -
-\TMP@EnsureCode{46}{12}% .
-\TMP@EnsureCode{47}{12}% /
-\TMP@EnsureCode{58}{12}% :
-\TMP@EnsureCode{59}{12}% ;
-\TMP@EnsureCode{60}{12}% <
-\TMP@EnsureCode{61}{12}% =
-\TMP@EnsureCode{62}{12}% >
-\TMP@EnsureCode{63}{12}% ?
-\TMP@EnsureCode{91}{12}% [
-\TMP@EnsureCode{93}{12}% ]
-\TMP@EnsureCode{94}{7}% ^ (superscript)
-\TMP@EnsureCode{96}{12}% `
-\TMP@EnsureCode{124}{12}% |
-\g@addto@macro\PdfRender@AtEnd{\endinput}
-\newif\ifPdfRender@Stack
-\newif\ifPdfRender@Match
-\RequirePackage{ifpdf}[2009/04/10]
-\RequirePackage{infwarerr}[2007/09/09]
-\RequirePackage{ltxcmds}[2009/12/12]
-\ifpdf
-  \ltx@IfUndefined{pdfcolorstackinit}{%
-    \@PackageWarning{pdfrender}{%
-      Missing \string\pdfcolorstackinit
-    }%
-  }{%
-    \PdfRender@Stacktrue
-  }%
-  \ltx@IfUndefined{pdfmatch}{%
-    \@PackageInfoNoLine{pdfrender}{%
-      \string\pdfmatch\ltx@space not found. %
-      Therefore the values\MessageBreak
-      of some parameters are not validated%
-    }%
-  }{%
-    \PdfRender@Matchtrue
-  }%
-\else
-  \@PackageWarning{pdfrender}{%
-    Missing pdfTeX in PDF mode%
-  }%
-  \newcommand*{\pdfrender}[1]{}%
-  \newcommand{\textpdfrender}[2]{#2}%
-  \expandafter\PdfRender@AtEnd
-\fi
-\RequirePackage{color}
-\RequirePackage{keyval}
-\RequirePackage{kvsetkeys}[2009/07/19]
-\newcommand*{\pdfrender}[1]{%
-  \global\let\PdfRender@FillColor\ltx@empty
-  \global\let\PdfRender@StrokeColor\ltx@empty
-  \setkeys{PDFRENDER}{#1}%
-  \PdfRender@SetColor
-}
-\newcommand{\textpdfrender}[2]{%
-  \begingroup
-    \pdfrender{#1}%
-    #2%
-  \endgroup
-}
-\newif\ifPdfRender@Values
-\def\PdfRender@NewClassValues#1#2#3#4{%
-  \PdfRender@Valuestrue
-  \PdfRender@NewClass{#1}{#2}{#3}{#4}{}%
-}
-\def\PdfRender@NewClass#1#2#3#4#5{%
-  \expandafter\newif\csname ifPdfRender@Active#1\endcsname
-  \expandafter\def\csname PdfRender@Default#1\endcsname{#2}%
-  \expandafter\let\csname PdfRender@Current#1\expandafter\endcsname
-      \csname PdfRender@Default#1\endcsname
-  \ifPdfRender@Stack
-    \expandafter\edef\csname PdfRender@Init#1\endcsname{%
-      \global\chardef
-      \expandafter\noexpand\csname PdfRender@Stack#1\endcsname=%
-          \noexpand\pdfcolorstackinit page direct{%
-            \noexpand#3%
-            \expandafter\noexpand\csname PdfRender@Default#1\endcsname
-          }\relax
-      \noexpand\@PackageInfo{pdfrender}{%
-        New color stack `#1' = \noexpand\number
-        \expandafter\noexpand\csname PdfRender@Stack#1\endcsname
-      }%
-      \gdef\expandafter\noexpand\csname PdfRender@Init#1\endcsname{}%
-    }%
-    \expandafter\edef\csname PdfRender@Set#1\endcsname{%
-      \expandafter\noexpand\csname PdfRender@Init#1\endcsname
-      \noexpand\pdfcolorstack
-      \expandafter\noexpand\csname PdfRender@Stack#1\endcsname
-      push{%
-        #3{\expandafter\noexpand\csname PdfRender@Current#1\endcsname}%
-      }%
-      \noexpand\aftergroup
-      \expandafter\noexpand\csname PdfRender@Reset#1\endcsname
-    }%
-    \expandafter\edef\csname PdfRender@Reset#1\endcsname{%
-      \expandafter\noexpand\csname PdfRender@Init#1\endcsname
-      \noexpand\pdfcolorstack
-      \expandafter\noexpand\csname PdfRender@Stack#1\endcsname
-      pop\relax
-    }%
-  \else
-    \expandafter\edef\csname PdfRender@Set#1\endcsname{%
-      \noexpand\pdfliteral direct{%
-        #3{\expandafter\noexpand\csname PdfRender@Current#1\endcsname}%
-      }%
-      \noexpand\aftergroup
-      \expandafter\noexpand\csname PdfRender@Reset#1\endcsname
-    }%
-    \expandafter\edef\csname PdfRender@Reset#1\endcsname{%
-      \noexpand\pdfliteral direct{%
-        #3{\expandafter\noexpand\csname PdfRender@Current#1\endcsname}%
-      }%
-    }%
-  \fi
-  \expandafter\edef\csname PdfRender@Normal#1\endcsname{%
-    \let
-    \expandafter\noexpand\csname PdfRender@Current#1\endcsname
-    \expandafter\noexpand\csname PdfRender@Default#1\endcsname
-    \noexpand\PdfRender@Set{#1}%
-  }%
-  \expandafter\g@addto@macro\expandafter\normalcolor
-  \expandafter{%
-    \csname PdfRender@Normal#1\endcsname
-  }%
-  \g@addto@macro\color@setgroup{%
-    \PdfRender@Set{#1}%
-  }%
-  \ifPdfRender@Values
-    \kv@parse@normalized{#4}{%
-      \expandafter\let\csname PdfRender@#1@\kv@key\endcsname\kv@key
-      \ifx\kv@value\relax
-      \else
-        \expandafter\let\csname PdfRender@#1@\kv@value\endcsname\kv@key
-      \fi
-      \ltx@gobbletwo
-    }%
-    \define@key{PDFRENDER}{#1}[1]{%
-      \global\csname PdfRender@Active#1true\endcsname
-      \def\PdfRender@Current{##1}%
-      \PdfRender@SetValidateValues{#1}%
-    }%
-    \PdfRender@Valuesfalse
-  \else
-    \define@key{PDFRENDER}{#1}[1]{%
-      \global\csname PdfRender@Active#1true\endcsname
-      \expandafter\def\csname PdfRender@Current#1\endcsname{##1}%
-      \ltx@IfUndefined{PdfRender@PostProcess#1}{%
-      }{%
-        \csname PdfRender@PostProcess#1\endcsname
-      }%
-      \PdfRender@SetValidate{#1}{#4}{#5}%
-    }%
-  \fi
-}%
-\def\PdfRender@Set#1{%
-  \csname ifPdfRender@Active#1\endcsname
-    \csname PdfRender@Set#1\expandafter\endcsname
-  \fi
-}
-\def\PdfRender@Reset#1{%
-  \csname ifPdfRender@Active#1\endcsname
-    \csname PdfRender@Reset#1\expandafter\endcsname
-  \fi
-}
-\def\PdfRender@ErrorInvalidValue#1{%
-  \PackageError{pdfrender}{%
-    Ignoring parameter setting for `#1'\MessageBreak
-    because of invalid value %
-    `\csname PdfRender@Current#1\endcsname'%
-  }\@ehc
-  \expandafter\let\csname PdfRender@Current#1\endcsname\ltx@empty
-}%
-\ifPdfRender@Match
-  \def\PdfRender@SetValidate#1#2#3{%
-    \ifnum\pdfmatch{^(#2)$}{\csname PdfRender@Current#1\endcsname}=1 %
-      \csname PdfRender@Set#1\expandafter\endcsname
-    \else
-      \PdfRender@ErrorInvalidValue{#1}%
-    \fi
-  }%
-\else
-  \def\PdfRender@SetValidate#1#2#3{%
-    \expandafter\let\expandafter\PdfRender@Current
-    \csname PdfRender@Current#1\endcsname
-    #3%
-    \ifx\PdfRender@Current\@empty
-      \PdfRender@ErrorInvalidValue{#1}%
-    \else
-      \csname PdfRender@Set#1\expandafter\endcsname
-    \fi
-  }%
-\fi
-\def\PdfRender@SetValidateValues#1{%
-  \ltx@IfUndefined{PdfRender@#1@\PdfRender@Current}{%
-    \expandafter\let\csname PdfRender@Current#1\endcsname
-                    \PdfRender@Current
-    \PdfRender@ErrorInvalidValue{#1}%
-  }{%
-    \expandafter\edef\csname PdfRender@Current#1\endcsname{%
-      \csname PdfRender@#1@\PdfRender@Current\endcsname
-    }%
-    \csname PdfRender@Set#1\endcsname
-  }%
-}
-\def\PdfRender@OpValue#1#2{#2\ltx@space#1}%
-\def\PdfRender@OpName#1#2{/#2\ltx@space#1}%
-\PdfRender@NewClassValues{TextRenderingMode}%
-                      {0}%
-                      {\PdfRender@OpValue{Tr}}{%
-  0=Fill,%
-  1=Stroke,%
-  2=FillStroke,%
-  3=Invisible,%
-  4=FillClip,%
-  5=StrokeClip,%
-  6=FillStrokeClip,%
-  7=Clip,%
-}%
-\PdfRender@NewClass{LineWidth}{1}{\PdfRender@OpValue{w}}{%
-  [0-9]+\string\.?[0-9]*|\string\.[0-9]+%
-}{}%
-\ltx@IfUndefined{dimexpr}{%
-  \def\PdfRender@dimexpr{}%
-}{%
-  \let\PdfRender@dimexpr\dimexpr
-}
-\def\PdfRender@PostProcessLineWidth{%
-  \begingroup
-  \afterassignment\PdfRender@@PostProcessLineWidth
-  \dimen@=\PdfRender@dimexpr\PdfRender@CurrentLineWidth bp %
-  \PdfRender@let\PdfRender@relax\PdfRender@relax
-}
-\let\PdfRender@let\let
-\let\PdfRender@relax\relax
-\def\PdfRender@@PostProcessLineWidth#1\PdfRender@let{%
-  \ifx\\#1\\%
-    \endgroup
-  \else
-    \dimen@=.996264\dimen@ % 72/72.27
-    \edef\x{\endgroup
-      \def\noexpand\PdfRender@CurrentLineWidth{%
-        \strip@pt\dimen@
-      }%
-    }%
-    \expandafter\x
-  \fi
-}
-\PdfRender@NewClassValues{LineCapStyle}{0}{\PdfRender@OpValue{J}}{%
-  0=Butt,%
-  1=Round,%
-  2=ProjectingSquare,%
-}%
-\PdfRender@NewClassValues{LineJoinStyle}{0}{\PdfRender@OpValue{j}}{%
-  0=Miter,%
-  1=Round,%
-  2=Bevel,%
-}%
-\PdfRender@NewClass{MiterLimit}{10}{\PdfRender@OpValue{M}}{%
-  [0-9]*[1-9][0-9]*\string\.?[0-9]*|%
-  [0-9]*\string\.?[0-9]*[1-9][0-9]*%
-}{}%
-\PdfRender@NewClass{Flatness}{0}{\PdfRender@OpValue{i}}{%
-  100(\string\.0*)?|[0-9][0-9](\string\.[0-9]*)?|\string\.[0-9]+%
-}{}%
-\PdfRender@NewClass{LineDashPattern}{[]0}{\PdfRender@OpValue{d}}{%
-  \string\[%
-  ( ?([0-9]+\string\.?[0-9]*|\string\.[0-9]+) ?)*%
-  \string\] ?%
-  ([0-9]+\string\.?[0-9]*|\string\.[0-9]+)%
-}{}%
-\PdfRender@NewClassValues{RenderingIntent}%
-                      {RelativeColorimetric}%
-                      {\PdfRender@OpName{ri}}{%
-  AbsoluteColorimetric,%
-  RelativeColorimetric,%
-  Saturation,%
-  Perceptual,%
-}%
-\define@key{PDFRENDER}{FillColor}{%
-  \begingroup
-    \def\PdfRender@Color{#1}%
-    \ifx\PdfRender@Color\ltx@empty
-      \global\let\PdfRender@FillColor\ltx@empty
-    \else
-      \sbox0{%
-        \expandafter\PdfRender@TryColor\PdfRender@Color\ltx@empty
-        \PdfRender@GetFillColor
-        \ifx\PdfRender@FillColor\ltx@empty
-          \@PackageWarning{pdfrender}{%
-            Cannot extract fill color\MessageBreak
-            from value `#1'%
-          }%
-        \fi
-      }%
-    \fi
-  \endgroup
-}
-\define@key{PDFRENDER}{StrokeColor}{%
-  \begingroup
-    \def\PdfRender@Color{#1}%
-    \ifx\PdfRender@Color\ltx@empty
-      \global\let\PdfRender@StrokeColor\ltx@empty
-    \else
-      \sbox0{%
-        \expandafter\PdfRender@TryColor\PdfRender@Color\ltx@empty
-        \PdfRender@GetStrokeColor
-        \ifx\PdfRender@StrokeColor\ltx@empty
-          \@PackageWarning{pdfrender}{%
-            Cannot extract stroke color\MessageBreak
-            from value `#1'%
-          }%
-        \fi
-      }%
-    \fi
-  \endgroup
-}
-\def\PdfRender@TryColor{%
-  \@ifnextchar[\color\PdfRender@@TryColor
-}
-\def\PdfRender@@TryColor#1\ltx@empty{%
-  \expandafter\color\expandafter{\PdfRender@Color}%
-}
-\def\PdfRender@SetColor{%
-  \chardef\PdfRender@NeedsCurrentColor=0 %
-  \ifx\PdfRender@FillColor\ltx@empty
-    \ifx\PdfRender@StrokeColor\ltx@empty
-    \else
-      \edef\PdfRender@CurrentColor{%
-        \noexpand\PdfRender@FillColor\ltx@space\PdfRender@StrokeColor
-      }%
-      \chardef\PdfRender@NeedsCurrentColor=1 %
-    \fi
-  \else
-    \ifx\PdfRender@StrokeColor\ltx@empty
-      \edef\PdfRender@CurrentColor{%
-        \PdfRender@FillColor\ltx@space\noexpand\PdfRender@StrokeColor
-      }%
-      \chardef\PdfRender@NeedsCurrentColor=2 %
-    \else
-      \edef\current@color{%
-        \PdfRender@FillColor\ltx@space\PdfRender@StrokeColor
-      }%
-      \set@color
-    \fi
-  \fi
-  \ifnum\PdfRender@NeedsCurrentColor=1 %
-    \PdfRender@GetFillColor
-    \ifx\PdfRender@FillColor\ltx@empty
-      \@PackageWarning{pdfrender}{%
-        Cannot extract current fill color%
-      }%
-    \else
-      \edef\current@color{\PdfRender@CurrentColor}%
-      \set@color
-    \fi
-  \else
-    \ifnum\PdfRender@NeedsCurrentColor=2 %
-      \PdfRender@GetStrokeColor
-      \ifx\PdfRender@StrokeColor\ltx@empty
-        \@PackageWarning{pdfrender}{%
-          Cannot extract current stroke color%
-        }%
-      \else
-        \edef\current@color{\PdfRender@CurrentColor}%
-        \set@color
-      \fi
-    \fi
-  \fi
-}
-\def\PdfRender@GetFillColor{%
-  \global\let\PdfRender@FillColor\ltx@empty
-  \begingroup
-    \ifPdfRender@Match
-      \edef\current@color{\ltx@space\current@color\ltx@space}%
-      \ifnum\pdfmatch{ %
-        (%
-          [0-9\string\.]+ g|%
-          [0-9\string\.]+ [0-9\string\.]+ [0-9\string\.]+ rg|%
-          [0-9\string\.]+ [0-9\string\.]+ %
-          [0-9\string\.]+ [0-9\string\.]+ k%
-        )%
-      }{\current@color}=1 %
-        \xdef\PdfRender@FillColor{%
-          \expandafter\strip@prefix\pdflastmatch 1%
-        }%
-      \fi
-    \else
-      \edef\x{%
-        \lowercase{%
-          \xdef\noexpand\PdfRender@FillColor{%
-            \current@color
-          }%
-        }%
-      }%
-      \x
-    \fi
-  \endgroup
-}
-\def\PdfRender@GetStrokeColor{%
-  \global\let\PdfRender@StrokeColor\ltx@empty
-  \begingroup
-    \ifPdfRender@Match
-      \edef\current@color{\ltx@space\current@color\ltx@space}%
-      \ifnum\pdfmatch{ %
-        (%
-          [0-9\string\.]+ G|%
-          [0-9\string\.]+ [0-9\string\.]+ [0-9\string\.]+ RG|%
-          [0-9\string\.]+ [0-9\string\.]+ %
-          [0-9\string\.]+ [0-9\string\.]+ K%
-        )%
-      }{\current@color}=1 %
-        \xdef\PdfRender@StrokeColor{%
-          \expandafter\strip@prefix\pdflastmatch 1%
-        }%
-      \fi
-    \else
-      \edef\x{%
-        \uppercase{%
-          \xdef\noexpand\PdfRender@StrokeColor{%
-            \current@color
-          }%
-        }%
-      }%
-      \x
-    \fi
-  \endgroup
-}
-\PdfRender@AtEnd
-\endinput
-%%
-%% End of file `pdfrender.sty'.