xmpincl update (2008/05/10)

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

4 files changed, 18 insertions, 5 deletions

diff --git a/Master/texmf-dist/doc/latex/xmpincl/README b/Master/texmf-dist/doc/latex/xmpincl/README
index 250cf578b3d..27a4fa7807d 100644
--- a/Master/texmf-dist/doc/latex/xmpincl/README
+++ b/Master/texmf-dist/doc/latex/xmpincl/README
@@ -31,7 +31,7 @@ though pdflatex.
 
 License:
 
-Copyright (C) 2004 by Maarten Sneep <sneep@nat.vu.nl>
+Copyright (C) 2004 by Maarten Sneep <maarten.tex@xs4all.nl>
 This work is licensed under the CC-GNU GPL, the human readable license
 can be found here, with a link to the full text on this page.
 http://creativecommons.org/licenses/GPL/2.0/
diff --git a/Master/texmf-dist/doc/latex/xmpincl/xmpincl.pdf b/Master/texmf-dist/doc/latex/xmpincl/xmpincl.pdf
index 91cdb4c9342..5afe207bbe8 100644
--- a/Master/texmf-dist/doc/latex/xmpincl/xmpincl.pdf
+++ b/Master/texmf-dist/doc/latex/xmpincl/xmpincl.pdf
diff --git a/Master/texmf-dist/source/latex/xmpincl/xmpincl.dtx b/Master/texmf-dist/source/latex/xmpincl/xmpincl.dtx
index 029c6575e1c..8683edec2d9 100644
--- a/Master/texmf-dist/source/latex/xmpincl/xmpincl.dtx
+++ b/Master/texmf-dist/source/latex/xmpincl/xmpincl.dtx
@@ -20,7 +20,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{xmpincl}
 %<*package>
-    [2005/02/15 v2.1 Include XMP data in pdflatex]
+    [2008/05/10 v2.2 Include XMP data in pdflatex]
 %</package>
 %
 %<*driver>
@@ -43,7 +43,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{117}
+% \CheckSum{121}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -74,6 +74,9 @@
 % \changes{v2.1}{2005/03/24}{Minor update: ifpdf and Memoir no longer bite each 
 %   other. When used with Memoir, version ``2005/03/23 v3.9 Patches for memoir 
 %   class v1.61'' of mempatch.sty is required.}
+% \changes{v2.2}{2008/05/10}{Minor update: made |~| and |&| normal characters 
+%   when writing the xmpi file. I still need to find a way to include |%| 
+%   characters in the xmpi file.}
 %
 % \GetFileInfo{xmpincl.dtx}
 %
@@ -114,6 +117,9 @@
 % |<?xpacket ?>| writing code, and suggesting to test whether they 
 % are already there.
 %
+% Thanks to Martin Szummer for reporting that a |~| in an URL inside the 
+% xmp file will not work.
+%
 % \subsection{Usage}
 % 
 % This package defines a single command, |\includexmp{}|. The |xmp| file
@@ -256,6 +262,11 @@
 %    \begin{macrocode}
 \catcode`\#=12
 %    \end{macrocode}
+% We deactivate |~| and |&| as well. 
+%    \begin{macrocode}
+\catcode`\~=12
+\catcode`\&=12
+%    \end{macrocode}
 % Read the first line of the input file, and compare it to the start tag,
 % and the alternate start tag. If they match, write out the standard start
 % tag (including the |id|). If they don't match, write out the start tag,
@@ -298,7 +309,7 @@
 %    \end{macrocode}
 % Since we skipped any end |<?xpacket ?>| tags, we write it here. After
 % that we close both files and end the current group (restoring the
-% meaning of |#|).
+% meaning of |#|, |&|, and |~|).
 %    \begin{macrocode}
 \immediate\write\xmpinclWrite{\mcs@xmpinclEnd}
 \immediate\closein\xmpinclRead
diff --git a/Master/texmf-dist/tex/latex/xmpincl/xmpincl.sty b/Master/texmf-dist/tex/latex/xmpincl/xmpincl.sty
index f89b7ac263b..eabdc8c7615 100644
--- a/Master/texmf-dist/tex/latex/xmpincl/xmpincl.sty
+++ b/Master/texmf-dist/tex/latex/xmpincl/xmpincl.sty
@@ -16,7 +16,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{xmpincl}
-    [2005/02/15 v2.1 Include XMP data in pdflatex]
+    [2008/05/10 v2.2 Include XMP data in pdflatex]
 \RequirePackage{ifpdf}
 \ifpdf\else
 \PackageWarningNoLine{xmpincl}%
@@ -45,6 +45,8 @@
 \newcommand{\mcs@xmpinclEnd}%
   {<?xpacket end='r'?> }
 \catcode`\#=12
+\catcode`\~=12
+\catcode`\&=12
 \immediate\read\xmpinclRead to\xmpinclReadln%
 \ifthenelse{%
   \equal{\mcs@xmpinclStart}{\xmpinclReadln}%