summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-08-02 00:03:57 +0000
committerKarl Berry <karl@freefriends.org>2011-08-02 00:03:57 +0000
commit9bed658d6e82bcd183d49e4da7e72fd414eea759 (patch)
treef01b591388b1ed59955edad8f3976beb1040dca1
parent9ef2c44b41c76e9d4d9abae54f2caac6877a6911 (diff)
pax 0.1k (6jul11)
git-svn-id: svn://tug.org/texlive/trunk@23306 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/pax/README5
-rw-r--r--Master/texmf-dist/scripts/pax/pax.jarbin11465 -> 11465 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/pax/pdfannotextractor.pl4
-rw-r--r--Master/texmf-dist/source/latex/pax/src/Constants.java2
-rw-r--r--Master/texmf-dist/tex/latex/pax/pax.sty40
5 files changed, 20 insertions, 31 deletions
diff --git a/Master/texmf-dist/doc/latex/pax/README b/Master/texmf-dist/doc/latex/pax/README
index 1069b9723c2..6b32ea00851 100644
--- a/Master/texmf-dist/doc/latex/pax/README
+++ b/Master/texmf-dist/doc/latex/pax/README
@@ -1,4 +1,4 @@
-README for project pax (PDFAnnotExtractor), 2011/04/22 v0.1j
+README for project pax (PDFAnnotExtractor), 2011/07/06 v0.1k
TABLE OF CONTENTS
@@ -234,3 +234,6 @@ I. History
2011/04/22 v0.1j
* Update of email address and updating version dates
for all files.
+2011/07/06 v0.1k
+ * Package `pax' uses package `kvsetkeys' to avoid
+ problems with incompatible `xkeyval'.
diff --git a/Master/texmf-dist/scripts/pax/pax.jar b/Master/texmf-dist/scripts/pax/pax.jar
index 61b7b952ee8..e6614f8cc6f 100644
--- a/Master/texmf-dist/scripts/pax/pax.jar
+++ b/Master/texmf-dist/scripts/pax/pax.jar
Binary files differ
diff --git a/Master/texmf-dist/scripts/pax/pdfannotextractor.pl b/Master/texmf-dist/scripts/pax/pdfannotextractor.pl
index d111a305150..a26ae11c23c 100755
--- a/Master/texmf-dist/scripts/pax/pdfannotextractor.pl
+++ b/Master/texmf-dist/scripts/pax/pdfannotextractor.pl
@@ -24,8 +24,8 @@ $^W=1;
my $name = 'PDFAnnotExtractor';
my $program = "\L$name\E";
my $file = "$program.pl";
-my $version = "0.1j";
-my $date = "2011/04/22";
+my $version = "0.1k";
+my $date = "2011/07/06";
my $author = "Heiko Oberdiek";
my $copyright = "Copyright (c) 2008, 2011 by $author.";
diff --git a/Master/texmf-dist/source/latex/pax/src/Constants.java b/Master/texmf-dist/source/latex/pax/src/Constants.java
index 0181717e09e..054d06717cc 100644
--- a/Master/texmf-dist/source/latex/pax/src/Constants.java
+++ b/Master/texmf-dist/source/latex/pax/src/Constants.java
@@ -22,7 +22,7 @@ package pax;
public interface Constants {
- public String PAX_VERSION = "0.1j";
+ public String PAX_VERSION = "0.1k";
public String ENTRY_BEG = "\\[";
public String ENTRY_END = "\\\\\n";
diff --git a/Master/texmf-dist/tex/latex/pax/pax.sty b/Master/texmf-dist/tex/latex/pax/pax.sty
index eef21dbb927..ac4465c879f 100644
--- a/Master/texmf-dist/tex/latex/pax/pax.sty
+++ b/Master/texmf-dist/tex/latex/pax/pax.sty
@@ -18,7 +18,7 @@
%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pax}%
- [2011/04/22 v0.1i Annotation support for PDF graphics (HO)]%
+ [2011/07/06 v0.1k Annotation support for PDF graphics (HO)]%
\RequirePackage{ifpdf}
\ifpdf
@@ -38,25 +38,11 @@
\fi
\RequirePackage{graphicx}
-\RequirePackage{kvoptions}[2006/08/17]
-\RequirePackage{auxhook}
-\RequirePackage{etexcmds}
-
-% the local variant to LaTeX's \g@addto@macro,
-% see also discussion in de.comp.text.tex.
-\ifetex@unexpanded
- \newcommand{\PAX@l@addto@macro}[2]{%
- \edef#1{%
- \etex@unexpanded\expandafter{#1#2}%
- }%
- }%
-\else
- \newcommand{\PAX@l@addto@macro}[2]{%
- \global\let\PAX@g@temp#1%
- \g@addto@macro\PAX@g@temp{#2}%
- \let#1\PAX@g@temp
- }%
-\fi
+\RequirePackage{ltxcmds}[2011/04/18]
+\RequirePackage{kvsetkeys}[2011/04/07]
+\RequirePackage{kvoptions}[2010/12/23]
+\RequirePackage{auxhook}[2011/03/04]
+\RequirePackage{etexcmds}[2011/02/16]
% Hook into \includegraphics of graphicx with one optional
% star, one optional argument with key value pairs and
@@ -102,12 +88,12 @@
\DeclareStringOption[0]{angle}
\DeclareBoolOption{clip}
\define@key{PAX@Gin}{viewport}{%
- \PAX@l@addto@macro\PAX@Gin@box@opts{%
+ \ltx@LocalAppendToMacro\PAX@Gin@box@opts{%
\PAX@viewport#1\\%
}%
}
\define@key{PAX@Gin}{trim}{%
- \PAX@l@addto@macro\PAX@Gin@box@opts{%
+ \ltx@LocalAppendToMacro\PAX@Gin@box@opts{%
\PAX@trim#1\\%
}%
}
@@ -145,11 +131,11 @@
\fi
}
-\def\PAX@KV@errx#1{}
+% ignore unknown options in family `PAX@Gin'
+\kv@set@family@handler{PAX@Gin}{}
\def\PAX@AddAnnots#1#2{%
- \let\KV@errx\PAX@KV@errx
- \setkeys{PAX@Gin}{#1}%
+ \kvsetkeys{PAX@Gin}{#1}%
\Grot@setangle{\PAX@Gin@angle}%
% a little careful, is type of angle int or real?
\loop
@@ -234,7 +220,7 @@
\PAX@call{link}{#2}{%
\begingroup
\PAX@getrect{annot}#1\@nil
- \setkeys{PAX}{#3}%
+ \kvsetkeys{PAX}{#3}%
}%
\PAX@skip
}
@@ -464,7 +450,7 @@
\begingroup
\let\PAX@key@DestY\PAX@page@ury
\let\PAX@key@DestX\PAX@page@llx
- \setkeys{PAX}{#4}%
+ \kvsetkeys{PAX}{#4}%
\let\PAX@dest@llx\PAX@key@DestX
\let\PAX@dest@urx\PAX@key@DestX
\let\PAX@dest@lly\PAX@key@DestY