pax (18apr12)

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

9 files changed, 25 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/pax/README b/Master/texmf-dist/doc/latex/pax/README
index 6b32ea00851..1f7d9e9ee9d 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/07/06 v0.1k
+README for project pax (PDFAnnotExtractor), 2012/04/18 v0.1l
 
 
 TABLE OF CONTENTS
@@ -33,7 +33,7 @@ Project status: experimental
 B. COPYRIGHT, LICENSE
 =====================
 
-Copyright (C) 2006-2008, 2011 Heiko Oberdiek.
+Copyright (C) 2006-2008, 2011, 2012 Heiko Oberdiek.
 
 The project consists of two parts:
 * The Java program pax.jar with sources.
@@ -237,3 +237,5 @@ I. History
 2011/07/06 v0.1k
   * Package `pax' uses package `kvsetkeys' to avoid
     problems with incompatible `xkeyval'.
+2012/04/18 v0.1l
+  * Option --version added to pdfannotextractor.pl.
diff --git a/Master/texmf-dist/scripts/pax/pax.jar b/Master/texmf-dist/scripts/pax/pax.jar
index e6614f8cc6f..36371e27e62 100644
--- a/Master/texmf-dist/scripts/pax/pax.jar
+++ b/Master/texmf-dist/scripts/pax/pax.jar
diff --git a/Master/texmf-dist/scripts/pax/pdfannotextractor.pl b/Master/texmf-dist/scripts/pax/pdfannotextractor.pl
index a26ae11c23c..085dc43c5d3 100755
--- a/Master/texmf-dist/scripts/pax/pdfannotextractor.pl
+++ b/Master/texmf-dist/scripts/pax/pdfannotextractor.pl
@@ -2,7 +2,7 @@
 use strict;
 $^W=1;
 
-# Copyright (C) 2008, 2011 Heiko Oberdiek
+# Copyright (C) 2008, 2011, 2012 Heiko Oberdiek
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,19 +24,21 @@ $^W=1;
 my $name        = 'PDFAnnotExtractor';
 my $program     = "\L$name\E";
 my $file        = "$program.pl";
-my $version     = "0.1k";
-my $date        = "2011/07/06";
+my $version     = "0.1l";
+my $date        = "2012/04/18";
 my $author      = "Heiko Oberdiek";
-my $copyright   = "Copyright (c) 2008, 2011 by $author.";
+my $copyright   = "Copyright (c) 2008, 2011, 2012 by $author.";
 
 # History:
 #  2008/10/01 v0.1i: First version of the wrapper script.
+#  2012/04/18 v0.1l: Option --version added.
 
 my $title = "$name $version, $date - $copyright\n";
 my $usage = <<"END_OF_USAGE";
 ${title}Syntax:   $program [options] <PDF files[.pdf]>
 Options:
   --help      print usage
+  --version   print version number
   --install   try installing PDFBox library
   --debug     debug informations
 END_OF_USAGE
@@ -44,13 +46,19 @@ END_OF_USAGE
 my $help = 0;
 my $debug = 0;
 my $install = 0;
+my $opt_version = 0;
 use Getopt::Long;
 GetOptions(
   'debug!' => \$debug,
   'install!' => \$install,
-  'help!' => \$help
+  'help!' => \$help,
+  'version!' => \$opt_version,
 ) or die $usage;
 !$help or die $usage;
+if ($opt_version) {
+  print "$name $date v$version\n";
+  exit(0);
+}
 !$install and (@ARGV >= 1 or die $usage);
 
 print $title;
diff --git a/Master/texmf-dist/source/latex/pax/src/Constants.java b/Master/texmf-dist/source/latex/pax/src/Constants.java
index 054d06717cc..7fd8a6d0b65 100644
--- a/Master/texmf-dist/source/latex/pax/src/Constants.java
+++ b/Master/texmf-dist/source/latex/pax/src/Constants.java
@@ -1,5 +1,5 @@
 /* Constants.java
-Copyright (C) 2006-2008, 2011 Heiko Oberdiek
+Copyright (C) 2006-2008, 2011, 2012 Heiko Oberdiek
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@ package pax;
 
 public interface Constants {
 
-    public String PAX_VERSION = "0.1k";
+    public String PAX_VERSION = "0.1l";
 
     public String ENTRY_BEG = "\\[";
     public String ENTRY_END = "\\\\\n";
diff --git a/Master/texmf-dist/source/latex/pax/src/Entry.java b/Master/texmf-dist/source/latex/pax/src/Entry.java
index 0f8493831cf..7140750d27a 100644
--- a/Master/texmf-dist/source/latex/pax/src/Entry.java
+++ b/Master/texmf-dist/source/latex/pax/src/Entry.java
@@ -1,5 +1,5 @@
 /* Entry.java
-Copyright (C) 2006-2008, 2011 Heiko Oberdiek
+Copyright (C) 2006-2008, 2011, 2012 Heiko Oberdiek
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/Master/texmf-dist/source/latex/pax/src/EntryWriteException.java b/Master/texmf-dist/source/latex/pax/src/EntryWriteException.java
index 59bef77f9ea..a1010ce121f 100644
--- a/Master/texmf-dist/source/latex/pax/src/EntryWriteException.java
+++ b/Master/texmf-dist/source/latex/pax/src/EntryWriteException.java
@@ -1,5 +1,5 @@
 /* EntryWriteException.java
-Copyright (C) 2006-2008, 2011 Heiko Oberdiek
+Copyright (C) 2006-2008, 2011, 2012 Heiko Oberdiek
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/Master/texmf-dist/source/latex/pax/src/PDFAnnotExtractor.java b/Master/texmf-dist/source/latex/pax/src/PDFAnnotExtractor.java
index 3388269f816..868dadaa80c 100644
--- a/Master/texmf-dist/source/latex/pax/src/PDFAnnotExtractor.java
+++ b/Master/texmf-dist/source/latex/pax/src/PDFAnnotExtractor.java
@@ -1,5 +1,5 @@
 /* PDFAnnotExtractor.java
-Copyright (C) 2006-2008, 2011 Heiko Oberdiek
+Copyright (C) 2006-2008, 2011, 2012 Heiko Oberdiek
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/Master/texmf-dist/source/latex/pax/src/StringVisitor.java b/Master/texmf-dist/source/latex/pax/src/StringVisitor.java
index b56a11cd1b2..485757e36fa 100644
--- a/Master/texmf-dist/source/latex/pax/src/StringVisitor.java
+++ b/Master/texmf-dist/source/latex/pax/src/StringVisitor.java
@@ -1,5 +1,5 @@
 /* StringVisitor.java
-Copyright (C) 2006-2008, 2011 Heiko Oberdiek
+Copyright (C) 2006-2008, 2011, 2012 Heiko Oberdiek
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/Master/texmf-dist/tex/latex/pax/pax.sty b/Master/texmf-dist/tex/latex/pax/pax.sty
index ac4465c879f..5a0b7568bf4 100644
--- a/Master/texmf-dist/tex/latex/pax/pax.sty
+++ b/Master/texmf-dist/tex/latex/pax/pax.sty
@@ -1,5 +1,5 @@
 %% pax.sty
-%% Copyright 2006-2008, 2011 Heiko Oberdiek
+%% Copyright 2006-2008, 2011, 2012 Heiko Oberdiek
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -18,7 +18,7 @@
 %
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pax}%
-  [2011/07/06 v0.1k Annotation support for PDF graphics (HO)]%
+  [2012/04/18 v0.1l Annotation support for PDF graphics (HO)]%
 
 \RequirePackage{ifpdf}
 \ifpdf