oberdiek update (15jun07)

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

38 files changed, 136 insertions, 65 deletions

diff --git a/Master/texmf-dist/tex/latex/oberdiek/atfidvips.def b/Master/texmf-dist/tex/latex/oberdiek/atfidvips.def
index f9b80825029..8ac4ea594c9 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/atfidvips.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/atfidvips.def
@@ -433,7 +433,7 @@
       gsave %
         currentpoint translate %
         Resolution 72 div VResolution neg 72 div scale%
-        [#1 /SP pdfmark %
+        [#1 /SP pdfmark % hash-ok
       grestore%
     }%
     \makebox[\atfi@appearancewidth]{}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty b/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty
index c4c6c23f731..3d06c5afb5e 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty
@@ -155,7 +155,7 @@
 \setkeys{AtFi}{icon=PushPin}
 
 \define@key{AtFi}{color}{%
-  \def\atfi@color{/C[#1]}%
+  \def\atfi@color{/C[#1]}% hash-ok
   \def\atfi@color@rgb{#1}%
 }
 \setkeys{AtFi}{color=1 0.9255 0.7765}
@@ -297,13 +297,13 @@
     \raisebox{-1.25bp}{\parbox[b][14bp]{24bp}{}}%
   }%
   \DeclareRobustCommand{\textattachfile}[3][]{%
-    \notextattachfile[#1]{#3}%
+    \notextattachfile[{#1}]{#3}%
   }%
   \DeclareRobustCommand{\noattachfile}[1][]{%
-    \notextattachfile[#1]{\atfi@dummy@pushpin}%
+    \notextattachfile[{#1}]{\atfi@dummy@pushpin}%
   }%
   \DeclareRobustCommand{\attachfile}[2][]{%
-    \noattachfile[#1]%
+    \noattachfile[{#1}]%
   }%
   \expandafter\endinput
 \fi
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def
index 1959a1e0071..9c7793a1de0 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def
@@ -31,7 +31,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-dvipdfm.def}%
-  [2007/04/25 v0.9 bookmark driver for dvipdfm (HO)]%
+  [2007/05/29 v1.0 bookmark driver for dvipdfm (HO)]%
 \newcount\BKM@id
 \BKM@id=\z@
 \def\BKM@0{000}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def
index 897bcd8296c..1b227d22dbd 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def
@@ -31,7 +31,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-dvips.def}%
-  [2007/04/25 v0.9 bookmark driver for dvips (HO)]%
+  [2007/05/29 v1.0 bookmark driver for dvips (HO)]%
 \def\BKM@PSHeaderFile#1{%
   \special{header=#1}%
 }
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def
index 3c545d575df..42ed53f56c9 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def
@@ -31,7 +31,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-dvipsone.def}%
-  [2007/04/25 v0.9 bookmark driver for dvipsone (HO)]%
+  [2007/05/29 v1.0 bookmark driver for dvipsone (HO)]%
 \def\BKM@PSHeaderFile#1{%
   \special{header=#1}%
 }
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def
index ff77c16c1e2..99be709f49f 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def
@@ -31,7 +31,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-pdftex.def}%
-  [2007/04/25 v0.9 bookmark driver for pdfTeX (HO)]%
+  [2007/05/29 v1.0 bookmark driver for pdfTeX (HO)]%
 \def\BKM@DO@entry#1#2{%
   \begingroup
     \setkeys{BKM@DO}{#1}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def
index df3a8f362b2..51a46758fe7 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def
@@ -31,7 +31,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-textures.def}%
-  [2007/04/25 v0.9 bookmark driver for textures (HO)]%
+  [2007/05/29 v1.0 bookmark driver for textures (HO)]%
 \def\BKM@PSHeaderFile#1{%
   \special{prePostScriptfile #1}%
 }
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def
index 6549cc355bb..ee95febb5f4 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def
@@ -31,7 +31,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-vtex.def}%
-  [2007/04/25 v0.9 bookmark driver for VTeX (HO)]%
+  [2007/05/29 v1.0 bookmark driver for VTeX (HO)]%
 \ifvtexpdf
 \else
   \PackageWarningNoLine{bookmark}{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty
index 548f19d6a44..a8f807c2b00 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty
@@ -31,7 +31,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{bookmark}%
-  [2007/04/25 v0.9 PDF bookmarks (HO)]%
+  [2007/05/29 v1.0 PDF bookmarks (HO)]%
 \newif\ifBKM@WithFlags
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname numexpr\endcsname\relax
@@ -351,6 +351,7 @@
   \@onelevel@sanitize\BKM@temp
   \ifx\BKM@param\@empty
     \let\BKM@param\BKM@null
+  \else
     \ifx\BKM@temp\BKM@null
     \else
       \BKM@CalcParam
diff --git a/Master/texmf-dist/tex/latex/oberdiek/centernot.sty b/Master/texmf-dist/tex/latex/oberdiek/centernot.sty
index 850b0ec6823..501c2646ef9 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/centernot.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/centernot.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%% Copyright (C) 2006, 2007 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
@@ -28,7 +28,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{centernot}
-  [2006/12/02 v1.0 Centers the not symbol horizontally (HO)]%
+  [2007/05/31 v1.1 Centers the not symbol horizontally (HO)]%
 \newcommand*{\centernot}{%
   \mathpalette\@centernot
 }
diff --git a/Master/texmf-dist/tex/latex/oberdiek/classlist.sty b/Master/texmf-dist/tex/latex/oberdiek/classlist.sty
index f96fe376054..709a81cc267 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/classlist.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/classlist.sty
@@ -112,7 +112,7 @@
     #1 [\x]%
     \ifx\\#3\\%
     \else
-      \space[#3]%
+      \space[#3]% hash-ok
     \fi
   }%
 }
diff --git a/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty b/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty
index 088013fb043..b571aaa09f6 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty
@@ -56,9 +56,12 @@
   \fi
 \endgroup
 \begingroup
+  \catcode40 12 % (
+  \catcode41 12 % )
   \catcode44 12 % ,
   \catcode45 12 % -
   \catcode46 12 % .
+  \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
index 4e6936468a0..aade325323e 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
@@ -56,9 +56,12 @@
   \fi
 \endgroup
 \begingroup
+  \catcode40 12 % (
+  \catcode41 12 % )
   \catcode44 12 % ,
   \catcode45 12 % -
   \catcode46 12 % .
+  \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty
index 8e600b4ec79..6794480ce2a 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty
@@ -28,7 +28,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{grffile}%
-  [2007/04/11 v1.3 Extended file name support for graphics (HO)]%
+  [2007/06/13 v1.4 Extended file name support for graphics (HO)]%
 \edef\grffile@RestoreCatcodes{%
   \catcode`\noexpand\=\the\catcode`\=\relax
   \catcode`\noexpand\:\the\catcode`\:\relax
@@ -59,6 +59,11 @@
 \DeclareBoolOption[true]{babel}
 \DeclareBoolOption[false]{extendedchars}
 \DeclareBoolOption{space}
+\DeclareVoidOption{encoding}{%
+  \RequirePackage{stringenc}\relax
+}
+\DeclareStringOption{inputencoding}
+\DeclareStringOption{filenameencoding}
 \DeclareDefaultOption{%
   \PassOptionsToPackage\CurrentOption{graphics}%
 }
@@ -80,12 +85,32 @@
   \fi
 \fi
 \ProcessKeyvalOptions*
+\AtBeginDocument{%
+  \DisableKeyvalOption[package=grffile]{Gin}{encoding}%
+}
 \RequirePackage{graphics}
 \newcommand*{\grffilesetup}{%
   \setkeys{Gin}%
 }
 \let\grffile@org@Ginclude@graphics\Ginclude@graphics
 \renewcommand*{\Ginclude@graphics}{%
+  \ifx\grffile@fileencoding\@empty
+  \else
+    \ifx\grffile@inputencoding\@empty
+      \expandafter\ifx\csname inputencodingname\endcsname\relax
+        \expandafter\ifx\csname CurrentInputEncodingOption\endcsname\relax
+        \else
+          \let\grffile@inputencoding\CurrentInputEncodingOption
+        \fi
+      \else
+        \let\grffile@inputencoding\inputencodingname
+      \fi
+    \fi
+    \ifx\grffile@inputencoding\@empty
+    \else
+      \grffile@extendedcharstrue
+    \fi
+  \fi
   \ifnum0\ifgrffile@babel 1\fi\ifgrffile@extendedchars 1\fi>\z@
     \begingroup
       \ifgrffile@babel
@@ -104,8 +129,34 @@
   \fi
 }
 \def\grffile@extchar@Ginclude@graphics#1{%
+  \def\grffile@filename{#1}%
+  \ifx\grffile@inputencoding\@empty
+  \else
+    \ifx\grfile@filenameencoding\@empty
+    \else
+      \ifx\grffile@inputencoding\grffile@filenameencoding
+      \else
+        \expandafter\ifx\csname StringEncodingConvert\endcsname\relax
+          \PackageError{grffile}{%
+            Package `stringenc' is not loaded,\MessageBreak
+            omitting file name conversion%
+          }\@ehc
+        \else
+          \StringEncodingConvert\grffile@temp\grffile@filename
+              \grffile@inputencoding\grffile@filenameencoding
+          \StringEncodingSuccessFailure{%
+            \let\grffile@filename\grffile@temp
+          }{%
+            \PackageError{grffile}{%
+              Filename conversion failed%
+            }\@ehc
+          }%
+        \fi
+      \fi
+    \fi
+  \fi
   \edef\x{\endgroup
-    \noexpand\grffile@Ginclude@graphics{#1}%
+    \noexpand\grffile@Ginclude@graphics{\grffile@filename}%
   }%
   \x
 }
diff --git a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
index b40a108ba63..407c5d19ff2 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
@@ -43,12 +43,12 @@
 \newcommand*{\HistVersion}[1]{%
   \subsection*{%
     \phantomsection
-    \addcontentsline{toc}{subsection}{[#1]}%
-    [#1]%
+    \addcontentsline{toc}{subsection}{[#1]}% hash-ok
+    [#1]% hash-ok
   }%
   \def\HistLabel##1{%
     \begingroup
-      \edef\x{[#1]}%
+      \edef\x{[#1]}% hash-ok
       \let\@currentlabel\x
       \label{##1}%
     \endgroup
diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty b/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty
index f811e6236d6..087a626d97b 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty
@@ -97,7 +97,7 @@
     \ifx\\##1\\%
       #1\relax
     \else
-      #1[##1]%
+      #1[{##1}]%
     \fi
     \capstart
   }{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-uc.def b/Master/texmf-dist/tex/latex/oberdiek/ix-uc.def
index 46fbd78d4b6..8598b5b33e5 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/ix-uc.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/ix-uc.def
@@ -244,7 +244,7 @@
 \InputenxUC{0120}{\.G}{}
 \InputenxUC{0121}{\.g}{}
 \InputenxUC{0122}{\c G}{}
-\InputenxUC{0123}{\c g}{}
+\InputenxUC{0123}{\v g}{}
 \InputenxUC{0124}{\^H}{}
 \InputenxUC{0125}{\^h}{}
 \InputenxUC{0126}{\textmalteseH}{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-utf8enc.dfu b/Master/texmf-dist/tex/latex/oberdiek/ix-utf8enc.dfu
index ceaa233bec5..42f0eb1c8df 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/ix-utf8enc.dfu
+++ b/Master/texmf-dist/tex/latex/oberdiek/ix-utf8enc.dfu
@@ -56,7 +56,7 @@
 \DeclareUnicodeCharacter{0120}{\.G}
 \DeclareUnicodeCharacter{0121}{\.g}
 \DeclareUnicodeCharacter{0122}{\c G}
-\DeclareUnicodeCharacter{0123}{\c g}
+\DeclareUnicodeCharacter{0123}{\v g}
 \DeclareUnicodeCharacter{0124}{\^H}
 \DeclareUnicodeCharacter{0125}{\^h}
 \DeclareUnicodeCharacter{0126}{\textmalteseH}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
index 4b29380e6ac..070ced9c61d 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
@@ -33,7 +33,7 @@
 %% the color of \emph statements.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{kvoptions}
-  [2007/05/06 v2.6 Connects package keyval with LaTeX options (HO)]%
+  [2007/06/11 v2.7 Connects package keyval with LaTeX options (HO)]%
 \RequirePackage{keyval}
 \begingroup
   \edef\x{\endgroup
@@ -706,12 +706,12 @@
         \KVO@temp
       }%
       \def\reserved@a{%
-        \KVO@onefilewithoptions#3[#2][#4]#1%
+        \KVO@onefilewithoptions{#3}[{#2}][{#4}]#1%
         \@documentclasshook
       }%
     \else
       \def\reserved@a{%
-        \KVO@onefilewithoptions#3[#2][#4]#1%
+        \KVO@onefilewithoptions{#3}[{#2}][{#4}]#1%
       }%
     \fi
   \else
@@ -724,7 +724,7 @@
         \else
           \ifx\relax##1\relax
           \else
-            \KVO@onefilewithoptions##1[\KVO@temp][#4]\@pkgextension
+            \KVO@onefilewithoptions{##1}[{\KVO@temp}][{#4}]\@pkgextension
           \fi
           \expandafter\reserved@b
         \fi
diff --git a/Master/texmf-dist/tex/latex/oberdiek/tabularht.sty b/Master/texmf-dist/tex/latex/oberdiek/tabularht.sty
index 402148bf4d8..158d46f25f1 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/tabularht.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/tabularht.sty
@@ -48,7 +48,7 @@
         #2\@sharp###3#4%
       }%
     }%
-  \expandafter\x\@array[#1]{#2}\@nil
+  \expandafter\x\@array[#1]{#2}\@nil % hash-ok
 }
 \edef\tabH@patch@array{\the\toks@}
 \def\tabH@patch@@array{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp1257.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp1257.def
index efe812daa45..1e4597ddbbd 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/x-cp1257.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp1257.def
@@ -195,7 +195,7 @@
 \DeclareInputText{233}{\@tabacckludge'e}
 \DeclareInputText{234}{\@tabacckludge'z}
 \DeclareInputText{235}{\.e}
-\DeclareInputText{236}{\c g}
+\DeclareInputText{236}{\v g}
 \DeclareInputText{237}{\c k}
 \DeclareInputText{238}{\@tabacckludge=\i}
 \DeclareInputText{239}{\c l}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-10.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-10.def
index 7dc9658f7c2..a695506c484 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-10.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-10.def
@@ -70,7 +70,7 @@
 \DeclareInputText{176}{\textdegree}
 \DeclareInputText{177}{\k a}
 \DeclareInputText{178}{\@tabacckludge=e}
-\DeclareInputText{179}{\c g}
+\DeclareInputText{179}{\v g}
 \DeclareInputText{180}{\@tabacckludge=\i}
 \DeclareInputText{181}{\~\i}
 \DeclareInputText{182}{\c k}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-13.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-13.def
index aae40600406..e4805cd0c83 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-13.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-13.def
@@ -160,7 +160,7 @@
 \DeclareInputText{233}{\@tabacckludge'e}
 \DeclareInputText{234}{\@tabacckludge'z}
 \DeclareInputText{235}{\.e}
-\DeclareInputText{236}{\c g}
+\DeclareInputText{236}{\v g}
 \DeclareInputText{237}{\c k}
 \DeclareInputText{238}{\@tabacckludge=\i}
 \DeclareInputText{239}{\c l}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-4.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-4.def
index 8bc79d959d1..4cbef28573e 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-4.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-4.def
@@ -99,7 +99,7 @@
 \DeclareInputText{184}{\c\ }
 \DeclareInputText{185}{\v s}
 \DeclareInputText{186}{\@tabacckludge=e}
-\DeclareInputText{187}{\c g}
+\DeclareInputText{187}{\v g}
 \DeclareInputText{188}{\texttstroke}
 \DeclareInputText{189}{\NG}
 \DeclareInputText{190}{\v z}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-mac-centeuro.def b/Master/texmf-dist/tex/latex/oberdiek/x-mac-centeuro.def
index 65c47d83d96..9c31f88654e 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/x-mac-centeuro.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/x-mac-centeuro.def
@@ -124,7 +124,7 @@
 \DeclareInputText{171}{\k e}
 \DeclareInputText{172}{\textasciidieresis}
 \DeclareInputText{173}{\textnotequal}
-\DeclareInputText{174}{\c g}
+\DeclareInputText{174}{\v g}
 \DeclareInputText{175}{\k I}
 \DeclareInputText{176}{\k i}
 \DeclareInputText{177}{\@tabacckludge=I}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
index cc9f8250e18..4a62fbd80f5 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
@@ -33,8 +33,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-abspage}%
-  [2007/05/06 v2.0 Module abspage for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module abspage for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \RequirePackage{atbegshi}%
 \begingroup
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
index 0619bb02286..fcd68c8ad94 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
@@ -33,7 +33,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-base}%
-  [2007/05/06 v2.0 Module base for zref (HO)]%
+  [2007/05/28 v2.1 Module base for zref (HO)]%
 \def\ZREF@name{zref}
 \def\ZREF@ErrorNoLine#1#2{%
   \begingroup
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
index 34498158e13..98bd706bf3f 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
@@ -33,8 +33,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-counter}%
-  [2007/05/06 v2.0 Module counter for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module counter for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \zref@newprop{counter}{}
 \zref@addprop\ZREF@mainlist{counter}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
index 8a8ff3e05ba..01f64855cc0 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
@@ -33,10 +33,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-dotfill}%
-  [2007/05/06 v2.0 Module dotfill for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module dotfill for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-savepos}[2007/05/06]
+\RequirePackage{zref-savepos}[2007/05/28]
 \zref@require@unique
 \RequirePackage{keyval}
 \define@key{ZREF@DF}{unit}{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
index 6acfa189891..a39f9ddf00b 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
@@ -33,8 +33,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-hyperref}%
-  [2007/05/06 v2.0 Module hyperref for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module hyperref for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \zref@newprop{anchor}[]{%
   \@ifundefined{@currentHref}{}{\@currentHref}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
index abb105a3174..0ac0329e569 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
@@ -33,8 +33,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-lastpage}%
-  [2007/05/06 v2.0 Module lastpage for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module lastpage for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \AtBeginDocument{%
   \AtEndDocument{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
index ff5d698fd13..1b085330105 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
@@ -33,10 +33,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-perpage}%
-  [2007/05/06 v2.0 Module perpage for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module perpage for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-abspage}[2007/05/06]
+\RequirePackage{zref-abspage}[2007/05/28]
 \zref@newprop*{pagevalue}[0]{\number\c@page}
 \zref@newlist{perpage}
 \zref@addprop{perpage}{abspage}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
index 8e646ebcccb..56438d65a42 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
@@ -33,8 +33,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-savepos}%
-  [2007/05/06 v2.0 Module savepos for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module savepos for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \begingroup
   \@ifundefined{pdfsavepos}{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
index 6cc952cb316..d7077402594 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
@@ -33,8 +33,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-titleref}%
-  [2007/05/06 v2.0 Module titleref for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module titleref for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \RequirePackage{keyval}
 \let\zref@titleref@current\@empty
@@ -176,7 +176,7 @@
   \@ifpackageloaded{titlesec}{%
     \ZREF@patch{ttl@sect@i}{%
       \def\ttl@sect@i#1#2[#3]#4{%
-        \zref@titlesec@setcurrent{#4}%
+        \zref@titleref@setcurrent{#4}%
         \ZREF@org@ttl@sect@i{#1}{#2}[{#3}]{#4}%
       }%
     }%
@@ -185,7 +185,20 @@
     \ZREF@patch{LT@c@ption}{%
       \def\LT@c@ption#1[#2]#3{%
         \ZREF@org@LT@c@ption{#1}[{#2}]{#3}%
-        \zref@titlesec@setcurrent{#2}%
+        \zref@titleref@setcurrent{#2}%
+      }%
+    }%
+  }{}%
+  \@ifpackageloaded{listings}{%
+    \ZREF@patch{lst@MakeCaption}{%
+      \def\lst@MakeCaption{%
+        \ifx\lst@label\@empty
+        \else
+          \expandafter\zref@titleref@setcurrent\expandafter{%
+            \lst@@caption
+          }%
+        \fi
+        \ZREF@org@lst@MakeCaption
       }%
     }%
   }{}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
index b2aaf5db138..1a20d224764 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
@@ -33,11 +33,11 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-totpages}%
-  [2007/05/06 v2.0 Module totpages for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module totpages for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-abspage}[2007/05/06]
-\RequirePackage{zref-lastpage}[2007/05/06]
+\RequirePackage{zref-abspage}[2007/05/28]
+\RequirePackage{zref-lastpage}[2007/05/28]
 \newcommand*{\ztotpages}{%
   \zref@extractdefault{LastPage}{abspage}{0}%
 }
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
index 72896ad5cb3..1eec1cbee46 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
@@ -33,8 +33,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-user}%
-  [2007/05/06 v2.0 Module user for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module user for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \newcommand*\zlabel{%
   \ifx\label\@gobble
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
index 71ea7ff559c..89283ef362f 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
@@ -33,8 +33,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-xr}%
-  [2007/05/06 v2.0 Module xr for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module xr for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \RequirePackage{keyval}
 \zref@newprop{url}{}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty
index 5661eaebea9..559c8216b05 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty
@@ -33,13 +33,13 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref}
-  [2007/05/06 v2.0 New reference scheme for LaTeX2e (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 New reference scheme for LaTeX2e (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \def\ZREF@temp#1{%
   \DeclareOption{#1}{%
     \AtEndOfPackage{%
-      \RequirePackage{zref-#1}[2007/05/06]%
+      \RequirePackage{zref-#1}[2007/05/28]%
     }%
   }%
 }