obediek update (1nov07)

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

3 files changed, 196 insertions, 3 deletions

diff --git a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty
index e0bb55bdef6..1027a683717 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty
@@ -31,8 +31,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{dtx-attach}
-  [2007/10/28 v2.0 Embed \string\jobname.dtx (HO)]%
-\RequirePackage{embedfile}[2007/10/28]
+  [2007/10/29 v2.1 Embed \string\jobname.dtx (HO)]%
+\RequirePackage{embedfile}[2007/10/29]
 \embedfile[%
   stringmethod=escape,%
   mimetype=plain/text,%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty b/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty
index 4a9d4a72c6d..833c0c2215f 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty
@@ -81,7 +81,7 @@
   \fi
 \expandafter\x\csname ver@embedfile.sty\endcsname
 \ProvidesPackage{embedfile}%
-  [2007/10/28 v2.0 embed files into PDF (HO)]
+  [2007/10/29 v2.1 embed files into PDF (HO)]
 \expandafter\edef\csname EmFi@AtEnd\endcsname{%
   \catcode64 \the\catcode64\relax
 }
@@ -166,6 +166,7 @@
 \newif\ifEmFi@edit
 \newif\ifEmFi@item
 \newif\ifEmFi@finished
+\newif\ifEmFi@id
 \expandafter\ifx\csname define@key\endcsname\relax
   \chardef\EmFi@plain=\z@
   \def\EmFi@temp#1{%
@@ -271,6 +272,37 @@
     \fi
   \fi
 }
+\define@key{EmFi}{id}{%
+  \def\EmFi@id{#1}%
+  \EmFi@idtrue
+}
+\def\EmFi@defobj#1{%
+  \ifEmFi@id
+    \expandafter\xdef\csname EmFi@#1@\EmFi@id\endcsname{%
+      \the\pdflastobj\space 0 R%
+    }%
+  \fi
+}
+\def\embedfileifobjectexists#1#2{%
+  \expandafter\ifx\csname EmFi@#2@#1\endcsname\relax
+    \expandafter\@secondoftwo
+  \else
+    \expandafter\@firstoftwo
+  \fi
+}
+\expandafter\ifx\csname @firstoftwo\endcsname\relax
+  \long\def\@firstoftwo#1#2{#1}%
+\fi
+\expandafter\ifx\csname @secondoftwo\endcsname\relax
+  \long\def\@secondoftwo#1#2{#2}%
+\fi
+\def\embedfilegetobject#1#2{%
+  \embedfileifobjectexists{#1}{#2}{%
+    \csname EmFi@#2@#1\endcsname
+  }{%
+    0 0 R%
+  }%
+}
 \define@key{EmFi}{view}[]{%
   \EdefSanitize\EmFi@temp{#1}%
   \def\EmFi@next{%
@@ -546,6 +578,7 @@
             /CheckSum<\pdfmdfivesum file{\EmFi@file}>%
           >>%
         }file{\EmFi@file}\relax
+        \EmFi@defobj{EmbeddedFile}%
         \immediate\pdfobj{%
           <<%
             /Type/Filespec%
@@ -566,6 +599,7 @@
             \fi
           >>%
         }%
+        \EmFi@defobj{Filespec}%
         \EmFi@add{%
           \EmFi@@filespec
         }{\the\pdflastobj\space 0 R}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypgotoe.sty b/Master/texmf-dist/tex/latex/oberdiek/hypgotoe.sty
new file mode 100644
index 00000000000..1ff10b43460
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/oberdiek/hypgotoe.sty
@@ -0,0 +1,159 @@
+%%
+%% This is file `hypgotoe.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% hypgotoe.dtx  (with options: `package')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 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
+%% version 1.3 of this license or (at your option) any later
+%% version. 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 hypgotoe.dtx
+%% and the derived files
+%%    hypgotoe.sty, hypgotoe.pdf, hypgotoe.ins, hypgotoe.drv,
+%%    hypgotoe-example.tex.
+%% 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{hypgotoe}%
+  [2007/10/30 v0.1 Experimental links to embedded files (HO)]%
+\RequirePackage{ifpdf}[2007/09/09]
+\ifpdf
+\else
+  \PackageError{hypgotoe}{%
+    Other drivers than pdfTeX in PDF mode are not supported.%
+    \MessageBreak
+    Package loading is aborted%
+  }\@ehc
+  \expandafter\endinput
+\fi
+\RequirePackage{pdfescape}[2007/10/27]
+\RequirePackage{hyperref}[2007/10/30]
+\define@key{Hyp}{gotoebordercolor}{%
+  \HyColor@HyperrefBordercolor{#1}%
+  \@gotoebordercolor{hyperref}{gotoebordercolor}%
+}
+\providecommand*{\@gotoecolor}{\@filecolor}
+\providecommand*{\@gotoebordercolor}{\@filebordercolor}
+\def\@hyper@readexternallink#1#2#3#4:#5:#6\\#7{%
+  \ifx\\#6\\%
+    \expandafter\@hyper@linkfile file:#7\\{#3}{#2}%
+  \else
+    \ifx\\#4\\%
+      \expandafter\@hyper@linkfile file:#7\\{#3}{#2}%
+    \else
+      \def\@pdftempa{#4}%
+      \ifx\@pdftempa\@pdftempwordfile
+        \expandafter\@hyper@linkfile#7\\{#3}{#2}%
+      \else
+        \ifx\@pdftempa\@pdftempwordrun
+          \expandafter\@hyper@launch#7\\{#3}{#2}%
+        \else
+          \ifx\@pdftempa\@pdftempwordgotoe
+            \hyper@linkgotoe{#3}{#5}%
+          \else
+            \hyper@linkurl{#3}{#7\ifx\\#2\\\else\hyper@hash#2\fi}%
+          \fi
+        \fi
+      \fi
+    \fi
+  \fi
+}
+\def\@pdftempwordgotoe{gotoe}
+\def\hyper@linkgotoe#1#2{%
+  \begingroup
+    \let\HyGoToE@Root\@empty
+    \let\HyGoToE@Dest\@empty
+    \let\HyGoToE@TBegin\@empty
+    \let\HyGoToE@TEnd\@empty
+    \setkeys{HyGoToE}{#2}%
+    \leavevmode
+    \pdfstartlink
+      attr{%
+        \Hy@setpdfborder
+        \ifx\@pdfhightlight\@empty
+        \else
+          /H\@pdfhighlight
+        \fi
+        \ifx\@urlbordercolor\relax
+        \else
+          /C[\@urlbordercolor]%
+        \fi
+      }%
+      user{%
+       /Subtype/Link%
+       /A<<%
+         /Type/Action%
+         /S/GoToE%
+         \Hy@SetNewWindow
+         \HyGoToE@Root
+         \HyGoToE@Dest
+         \HyGoToE@TBegin
+         \HyGoToE@TEnd
+       >>%
+      }%
+      \relax
+    \Hy@colorlink\@gotoecolor#1%
+    \close@pdflink
+  \endgroup
+}
+\define@key{HyGoToE}{root}{%
+  \EdefEscapeString\HyGoToE@temp{#1}%
+  \edef\HyGoToE@Root{%
+    /F<<%
+      /Type/Filespec%
+      /F(\HyGoToE@temp)%
+    >>%
+  }%
+}
+\define@key{HyGoToE}{dest}{%
+  \EdefEscapeString\HyGoToE@temp{#1}%
+  \edef\HyGoToE@Dest{%
+    /D(\HyGoToE@temp)%
+  }%
+}
+\define@key{HyGoToE}{parent}[]{%
+  \def\HyGoToE@temp{#1}%
+  \ifx\HyGoToE@temp\@empty
+  \else
+    \PackageWarning{hypgotoe}{Ignore value for `parent'}%
+  \fi
+  \edef\HyGoToE@TBegin{%
+    \HyGoToE@TBegin
+    /T<<%
+    /R/P%
+  }%
+  \edef\HyGoToE@TEnd{%
+    \HyGoToE@TEnd
+    >>%
+  }%
+}
+\define@key{HyGoToE}{embedded}{%
+  \EdefEscapeString\HyGoToE@temp{#1}%
+  \edef\HyGoToE@TBegin{%
+    \HyGoToE@TBegin
+    /T<<%
+    /R/C%
+    /N(\HyGoToE@temp)%
+  }%
+  \edef\HyGoToE@TEnd{%
+    \HyGoToE@TEnd
+    >>%
+  }%
+}
+\endinput
+%%
+%% End of file `hypgotoe.sty'.