texlive[63508] trunk: pax (7jun22)

commits+karl at tug.org commits+karl at tug.org
Tue Jun 7 22:32:23 CEST 2022


Revision: 63508
          http://tug.org/svn/texlive?view=revision&revision=63508
Author:   karl
Date:     2022-06-07 22:32:22 +0200 (Tue, 07 Jun 2022)
Log Message:
-----------
pax (7jun22)

Modified Paths:
--------------
    trunk/Build/source/texk/texlive/linked_scripts/pax/pdfannotextractor.pl
    trunk/Master/texmf-dist/doc/latex/pax/README
    trunk/Master/texmf-dist/scripts/pax/pax.jar
    trunk/Master/texmf-dist/scripts/pax/pdfannotextractor.pl
    trunk/Master/texmf-dist/source/latex/pax/build.xml
    trunk/Master/texmf-dist/source/latex/pax/src/PDFAnnotExtractor.java
    trunk/Master/texmf-dist/source/latex/pax/src/StringVisitor.java
    trunk/Master/texmf-dist/tex/latex/pax/pax.sty
    trunk/Master/tlpkg/libexec/ctan2tds

Added Paths:
-----------
    trunk/Master/texmf-dist/source/latex/pax/Makefile
    trunk/Master/texmf-dist/source/latex/pax/lib/
    trunk/Master/texmf-dist/source/latex/pax/lib/commons-logging.jar
    trunk/Master/texmf-dist/source/latex/pax/lib/pdfbox.jar

Modified: trunk/Build/source/texk/texlive/linked_scripts/pax/pdfannotextractor.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/pax/pdfannotextractor.pl	2022-06-07 20:26:08 UTC (rev 63507)
+++ trunk/Build/source/texk/texlive/linked_scripts/pax/pdfannotextractor.pl	2022-06-07 20:32:22 UTC (rev 63508)
@@ -39,18 +39,15 @@
 Options:
   --help      print usage
   --version   print version number
-  --install   try installing PDFBox library
   --debug     debug informations
 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,
   'version!' => \$opt_version,
 ) or die $usage;
@@ -59,24 +56,13 @@
   print "$name $date v$version\n";
   exit(0);
 }
-!$install and (@ARGV >= 1 or die $usage);
+(@ARGV >= 1 or die $usage);
 
 print $title;
 
 my $error = '!!! Error:';
-my $url_pdfbox = 'http://prdownloads.sourceforge.net/pdfbox/PDFBox-0.7.3.zip?download';
-my $size_pdfbox_zip = 22769102;
-my $size_pdfbox_jar = 3321771;
-my $name_pdfbox_jar = 'PDFBox-0.7.3.jar';
-my $entry_pdfbox    = "PDFBox-0.7.3/lib/$name_pdfbox_jar";
 my $pdfbox = 'PDFBox';
-
 my $prg_kpsewhich = 'kpsewhich';
-my $prg_wget      = 'wget';
-my $prg_curl      = 'curl';
-my $prg_unzip     = 'unzip';
-my $prg_texhash   = 'texhash';
-my $prg_mktexlsr  = 'mktexlsr';
 my $prg_java      = 'java';
 my %prg;
 
@@ -175,34 +161,13 @@
     }
 }
 
-sub find_jar_pdfbox () {
-    return if $path_jar_pdfbox;
-    foreach my $dir (@dir_jar) {
-        foreach my $jar (@jar_pdfbox) {
-            my $path = "$dir/$jar";
-            if (-f $path) {
-                $path_jar_pdfbox = $path;
-                debug $jar_pdfbox, $path_jar_pdfbox;
-                return;
-            }
-        }
-    }
-    foreach my $jar_pdfbox (@jar_pdfbox) {
-        $path_jar_pdfbox = find_jar $jar_pdfbox;
-        last if $path_jar_pdfbox;
-    }
-}
 
 sub launch_pax () {
     check_prg $prg_java, 1;
     my @cmd = ($prg_java);
-    my $sep = $is_win ? ';' : ':';
-    my $cp = "$path_jar_pax";
-    $cp .= "$sep$path_jar_pdfbox" if $path_jar_pdfbox;
-    $cp .= "$sep$classpath" if $classpath;
     push @cmd, '-cp';
-    push @cmd, $cp;
-    push @cmd, $main_class;
+    push @cmd, $path_jar_pax;
+    push @cmd, 'pax.PDFAnnotExtractor';
     push @cmd, @ARGV;
     debug 'System', "@cmd";
     system @cmd;
@@ -222,212 +187,10 @@
     return $exit_code;
 }
 
-# install part
-
-sub expand_var ($) {
-    my $var = shift;
-    check_prg $prg_kpsewhich, 1;
-    my $cmd = $prg_kpsewhich
-              . " --progname $program"
-              . ' --expand-var';
-    $cmd .= $is_win ? " \$$var" : " \\\$$var";
-    debug 'Backticks', $cmd;
-    my $path = `$cmd`;
-    if ($? == 0) {
-        chomp $path;
-        debug 'Exit code', '0/success';
-        debug "\$$var", $path;
-        return $path;
-    }
-    if ($? == -1) {
-        die "!!! Error: Cannot execute `$prg_kpsewhich' ($!)!\n";
-    }
-    if ($? & 127) {
-        die "!!! Error: `$prg_kpsewhich' died with signal " . ($? & 127)
-            . (($? & 128) ? ' with coredump' : '') . "!\n";
-    }
-    debug 'Exit code', ($? >> 8);
-    return '';
-}
-
-sub ensure_dir ($) {
-    my $dir = shift;
-    return if -d $dir;
-    mkdir $dir or die "$error Cannot create directory `$dir'!\n";
-    debug 'mkdir', $dir;
-}
-
-sub file_size ($) {
-    my $file = shift;
-    return -1 unless -f $file;
-    return (stat $file)[7];
-}
-
-if ($install) {
-    # Can PDFBox already be found?
-    find_jar_pdfbox;
-    if ($path_jar_pdfbox) {
-        print "* Nothing to do, because $pdfbox is already found:\n"
-              . "  $path_jar_pdfbox\n";
-        exit(0);
-    }
-
-    # Find TEXMFVAR
-    my $tds_root;
-    foreach my $var ('TEXMFVAR', 'VARTEXMF') {
-        $tds_root = expand_var $var;
-        last if $tds_root;
-    }
-    $tds_root or die "$error Cannot find settings for `TEXMFVAR' or `VARTEXMF'!\n";
-
-    # Create directories
-    ensure_dir $tds_root;
-    my $tds_pax = $tds_root;
-    $tds_pax =~ s/(\/*)$/\/scripts/;
-    ensure_dir $tds_pax;
-    $tds_pax .= '/pax';
-    ensure_dir $tds_pax;
-    my $tds_pax_lib = "$tds_pax/lib";
-    ensure_dir $tds_pax_lib;
-
-    # Download
-    my $dest_file = "$tds_pax/PDFBox-0.7.3.zip";
-    if (file_size $dest_file == $size_pdfbox_zip) {
-        debug "$pdfbox archive found", $dest_file;
-    }
-    else {
-        my @cmd;
-        my $prg_download;
-        check_prg $prg_wget, 0;
-        if ($prg{$prg_wget}) {
-            $prg_download = $prg_wget;
-            push @cmd, $prg_wget;
-            push @cmd, '-O';
-        }
-        else {
-            check_prg $prg_curl, 0;
-            $prg{$prg_curl} or die "$error Cannot find programs `wget' or `curl'"
-                                   . " for downloading!\n";
-            $prg_download = $prg_curl;
-            push @cmd, $prg_curl;
-            push @cmd, '-L';
-            push @cmd, '-o';
-        }
-        push @cmd, $dest_file;
-        push @cmd, $url_pdfbox;
-        debug 'System', "@cmd";
-        system @cmd;
-        if ($? == 0) {
-            debug 'Result', 'ok';
-        }
-        elsif ($? == -1) {
-            die "$error Cannot execute `$prg_download' ($!)!\n";
-        }
-        elsif ($? & 127) {
-            die "$error `$prg_download' died with signal " . ($? & 127)
-                . (($? & 128) ? ' with coredump' : '') . "!\n";
-        }
-        else {
-            my $exit_code = $? >> 8;
-            die "$error `$prg_download' returns error code `$exit_code'!\n";
-        }
-        -f $dest_file or die "$error Download failed!\n";
-        my $size = file_size $dest_file;
-        $size == $size_pdfbox_zip
-                or die "$error File size of $dest_file is $size,\n"
-                . "but expected size is $size_pdfbox_zip!\n";
-    }
-    print "* Downloaded: $dest_file\n";
-
-    # Unpack jar file
-    check_prg $prg_unzip, 0;
-    if ($prg{$prg_unzip}) {
-        my @cmd = (
-            $prg_unzip,
-            '-j',
-            '-d',
-            $tds_pax_lib,
-            $dest_file,
-            $entry_pdfbox
-        );
-        debug 'System', "@cmd";
-        system @cmd;
-        if ($? == 0) {
-            debug 'Result', 'ok';
-        }
-        elsif ($? == -1) {
-            die "$error Cannot execute `$prg_unzip' ($!)!\n";
-        }
-        elsif ($? & 127) {
-            die "$error `$prg_unzip' died with signal " . ($? & 127)
-                . (($? & 128) ? ' with coredump' : '') . "!\n";
-        }
-        else {
-            my $exit_code = $? >> 8;
-            die "$error `$prg_unzip' returns error code `$exit_code'!\n";
-        }
-    }
-    else {
-        die "$error `$prg_unzip' not found!\n";
-    }
-    my $dest_jar = "$tds_pax_lib/$name_pdfbox_jar";
-    -f $dest_jar or die "$error Unpacking failed!\n";
-    my $size = file_size $dest_jar;
-    $size == $size_pdfbox_jar
-            or die "$error File size of $dest_jar is $size,\n"
-            . "but expected size is $size_pdfbox_jar!\n";
-
-    print "* Unpacked: $dest_jar\n";
-
-    # Update TDS data base
-    my $prg_tds_update;
-    check_prg $prg_texhash, 0;
-    if ($prg{$prg_texhash}) {
-       $prg_tds_update = $prg_texhash;
-    }
-    else {
-        check_prg $prg_mktexlsr, 0;
-        $prg{$prg_mktexlsr} or die "$error Neither `$prg_texhash' nor `$prg_mktexlsr' found!\n";
-        $prg_tds_update = $prg_mktexlsr;
-    }
-    my @cmd = ($prg_tds_update, $tds_root);
-    debug 'System', "@cmd";
-    system @cmd;
-    if ($? == 0) {
-        debug 'Result', 'ok';
-    }
-    elsif ($? == -1) {
-        die "$error Cannot execute `$prg_tds_update' ($!)!\n";
-    }
-    elsif ($? & 127) {
-        die "$error `$prg_tds_update' died with signal " . ($? & 127)
-            . (($? & 128) ? ' with coredump' : '') . "!\n";
-    }
-    else {
-        my $exit_code = $? >> 8;
-        die "$error `$prg_tds_update' returns error code `$exit_code'!\n";
-    }
-
-    # Check installation result
-    find_jar_pdfbox;
-    if ($path_jar_pdfbox) {
-        exit(0);
-    }
-    die "$error Installation failed, because $pdfbox library cannot be found!\n";
-}
-
 # main program
 
 my $ret = 0;
 find_jar_pax;
-if ($pdfbox_in_classpath) {
-    debug 'PDFBox in CLASSPATH', 'yes';
-}
-else {
-    find_jar_pdfbox;
-    $path_jar_pdfbox or die "$error Cannot find $pdfbox library!\n"
-            . "See README and option `--install'.\n";
-}
 exit launch_pax;
 
 __END__

Modified: trunk/Master/texmf-dist/doc/latex/pax/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pax/README	2022-06-07 20:26:08 UTC (rev 63507)
+++ trunk/Master/texmf-dist/doc/latex/pax/README	2022-06-07 20:32:22 UTC (rev 63508)
@@ -1,6 +1,5 @@
-README for project pax (PDFAnnotExtractor), 2012/04/23 v0.1l
+README for project pax (PDFAnnotExtractor)
 
-
 TABLE OF CONTENTS
 =================
 
@@ -245,3 +244,6 @@
     problems with incompatible `xkeyval'.
 2012/04/18 v0.1l
   * Option --version added to pdfannotextractor.pl.
+2022/06/07 v2022/06/07
+  * Port to recent pdfanotator
+  * New developper Bastien Roucariès <rouca !at! debian.org>

Modified: trunk/Master/texmf-dist/scripts/pax/pax.jar
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/scripts/pax/pdfannotextractor.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/pax/pdfannotextractor.pl	2022-06-07 20:26:08 UTC (rev 63507)
+++ trunk/Master/texmf-dist/scripts/pax/pdfannotextractor.pl	2022-06-07 20:32:22 UTC (rev 63508)
@@ -39,18 +39,15 @@
 Options:
   --help      print usage
   --version   print version number
-  --install   try installing PDFBox library
   --debug     debug informations
 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,
   'version!' => \$opt_version,
 ) or die $usage;
@@ -59,24 +56,13 @@
   print "$name $date v$version\n";
   exit(0);
 }
-!$install and (@ARGV >= 1 or die $usage);
+(@ARGV >= 1 or die $usage);
 
 print $title;
 
 my $error = '!!! Error:';
-my $url_pdfbox = 'http://prdownloads.sourceforge.net/pdfbox/PDFBox-0.7.3.zip?download';
-my $size_pdfbox_zip = 22769102;
-my $size_pdfbox_jar = 3321771;
-my $name_pdfbox_jar = 'PDFBox-0.7.3.jar';
-my $entry_pdfbox    = "PDFBox-0.7.3/lib/$name_pdfbox_jar";
 my $pdfbox = 'PDFBox';
-
 my $prg_kpsewhich = 'kpsewhich';
-my $prg_wget      = 'wget';
-my $prg_curl      = 'curl';
-my $prg_unzip     = 'unzip';
-my $prg_texhash   = 'texhash';
-my $prg_mktexlsr  = 'mktexlsr';
 my $prg_java      = 'java';
 my %prg;
 
@@ -175,34 +161,13 @@
     }
 }
 
-sub find_jar_pdfbox () {
-    return if $path_jar_pdfbox;
-    foreach my $dir (@dir_jar) {
-        foreach my $jar (@jar_pdfbox) {
-            my $path = "$dir/$jar";
-            if (-f $path) {
-                $path_jar_pdfbox = $path;
-                debug $jar_pdfbox, $path_jar_pdfbox;
-                return;
-            }
-        }
-    }
-    foreach my $jar_pdfbox (@jar_pdfbox) {
-        $path_jar_pdfbox = find_jar $jar_pdfbox;
-        last if $path_jar_pdfbox;
-    }
-}
 
 sub launch_pax () {
     check_prg $prg_java, 1;
     my @cmd = ($prg_java);
-    my $sep = $is_win ? ';' : ':';
-    my $cp = "$path_jar_pax";
-    $cp .= "$sep$path_jar_pdfbox" if $path_jar_pdfbox;
-    $cp .= "$sep$classpath" if $classpath;
     push @cmd, '-cp';
-    push @cmd, $cp;
-    push @cmd, $main_class;
+    push @cmd, $path_jar_pax;
+    push @cmd, 'pax.PDFAnnotExtractor';
     push @cmd, @ARGV;
     debug 'System', "@cmd";
     system @cmd;
@@ -222,212 +187,10 @@
     return $exit_code;
 }
 
-# install part
-
-sub expand_var ($) {
-    my $var = shift;
-    check_prg $prg_kpsewhich, 1;
-    my $cmd = $prg_kpsewhich
-              . " --progname $program"
-              . ' --expand-var';
-    $cmd .= $is_win ? " \$$var" : " \\\$$var";
-    debug 'Backticks', $cmd;
-    my $path = `$cmd`;
-    if ($? == 0) {
-        chomp $path;
-        debug 'Exit code', '0/success';
-        debug "\$$var", $path;
-        return $path;
-    }
-    if ($? == -1) {
-        die "!!! Error: Cannot execute `$prg_kpsewhich' ($!)!\n";
-    }
-    if ($? & 127) {
-        die "!!! Error: `$prg_kpsewhich' died with signal " . ($? & 127)
-            . (($? & 128) ? ' with coredump' : '') . "!\n";
-    }
-    debug 'Exit code', ($? >> 8);
-    return '';
-}
-
-sub ensure_dir ($) {
-    my $dir = shift;
-    return if -d $dir;
-    mkdir $dir or die "$error Cannot create directory `$dir'!\n";
-    debug 'mkdir', $dir;
-}
-
-sub file_size ($) {
-    my $file = shift;
-    return -1 unless -f $file;
-    return (stat $file)[7];
-}
-
-if ($install) {
-    # Can PDFBox already be found?
-    find_jar_pdfbox;
-    if ($path_jar_pdfbox) {
-        print "* Nothing to do, because $pdfbox is already found:\n"
-              . "  $path_jar_pdfbox\n";
-        exit(0);
-    }
-
-    # Find TEXMFVAR
-    my $tds_root;
-    foreach my $var ('TEXMFVAR', 'VARTEXMF') {
-        $tds_root = expand_var $var;
-        last if $tds_root;
-    }
-    $tds_root or die "$error Cannot find settings for `TEXMFVAR' or `VARTEXMF'!\n";
-
-    # Create directories
-    ensure_dir $tds_root;
-    my $tds_pax = $tds_root;
-    $tds_pax =~ s/(\/*)$/\/scripts/;
-    ensure_dir $tds_pax;
-    $tds_pax .= '/pax';
-    ensure_dir $tds_pax;
-    my $tds_pax_lib = "$tds_pax/lib";
-    ensure_dir $tds_pax_lib;
-
-    # Download
-    my $dest_file = "$tds_pax/PDFBox-0.7.3.zip";
-    if (file_size $dest_file == $size_pdfbox_zip) {
-        debug "$pdfbox archive found", $dest_file;
-    }
-    else {
-        my @cmd;
-        my $prg_download;
-        check_prg $prg_wget, 0;
-        if ($prg{$prg_wget}) {
-            $prg_download = $prg_wget;
-            push @cmd, $prg_wget;
-            push @cmd, '-O';
-        }
-        else {
-            check_prg $prg_curl, 0;
-            $prg{$prg_curl} or die "$error Cannot find programs `wget' or `curl'"
-                                   . " for downloading!\n";
-            $prg_download = $prg_curl;
-            push @cmd, $prg_curl;
-            push @cmd, '-L';
-            push @cmd, '-o';
-        }
-        push @cmd, $dest_file;
-        push @cmd, $url_pdfbox;
-        debug 'System', "@cmd";
-        system @cmd;
-        if ($? == 0) {
-            debug 'Result', 'ok';
-        }
-        elsif ($? == -1) {
-            die "$error Cannot execute `$prg_download' ($!)!\n";
-        }
-        elsif ($? & 127) {
-            die "$error `$prg_download' died with signal " . ($? & 127)
-                . (($? & 128) ? ' with coredump' : '') . "!\n";
-        }
-        else {
-            my $exit_code = $? >> 8;
-            die "$error `$prg_download' returns error code `$exit_code'!\n";
-        }
-        -f $dest_file or die "$error Download failed!\n";
-        my $size = file_size $dest_file;
-        $size == $size_pdfbox_zip
-                or die "$error File size of $dest_file is $size,\n"
-                . "but expected size is $size_pdfbox_zip!\n";
-    }
-    print "* Downloaded: $dest_file\n";
-
-    # Unpack jar file
-    check_prg $prg_unzip, 0;
-    if ($prg{$prg_unzip}) {
-        my @cmd = (
-            $prg_unzip,
-            '-j',
-            '-d',
-            $tds_pax_lib,
-            $dest_file,
-            $entry_pdfbox
-        );
-        debug 'System', "@cmd";
-        system @cmd;
-        if ($? == 0) {
-            debug 'Result', 'ok';
-        }
-        elsif ($? == -1) {
-            die "$error Cannot execute `$prg_unzip' ($!)!\n";
-        }
-        elsif ($? & 127) {
-            die "$error `$prg_unzip' died with signal " . ($? & 127)
-                . (($? & 128) ? ' with coredump' : '') . "!\n";
-        }
-        else {
-            my $exit_code = $? >> 8;
-            die "$error `$prg_unzip' returns error code `$exit_code'!\n";
-        }
-    }
-    else {
-        die "$error `$prg_unzip' not found!\n";
-    }
-    my $dest_jar = "$tds_pax_lib/$name_pdfbox_jar";
-    -f $dest_jar or die "$error Unpacking failed!\n";
-    my $size = file_size $dest_jar;
-    $size == $size_pdfbox_jar
-            or die "$error File size of $dest_jar is $size,\n"
-            . "but expected size is $size_pdfbox_jar!\n";
-
-    print "* Unpacked: $dest_jar\n";
-
-    # Update TDS data base
-    my $prg_tds_update;
-    check_prg $prg_texhash, 0;
-    if ($prg{$prg_texhash}) {
-       $prg_tds_update = $prg_texhash;
-    }
-    else {
-        check_prg $prg_mktexlsr, 0;
-        $prg{$prg_mktexlsr} or die "$error Neither `$prg_texhash' nor `$prg_mktexlsr' found!\n";
-        $prg_tds_update = $prg_mktexlsr;
-    }
-    my @cmd = ($prg_tds_update, $tds_root);
-    debug 'System', "@cmd";
-    system @cmd;
-    if ($? == 0) {
-        debug 'Result', 'ok';
-    }
-    elsif ($? == -1) {
-        die "$error Cannot execute `$prg_tds_update' ($!)!\n";
-    }
-    elsif ($? & 127) {
-        die "$error `$prg_tds_update' died with signal " . ($? & 127)
-            . (($? & 128) ? ' with coredump' : '') . "!\n";
-    }
-    else {
-        my $exit_code = $? >> 8;
-        die "$error `$prg_tds_update' returns error code `$exit_code'!\n";
-    }
-
-    # Check installation result
-    find_jar_pdfbox;
-    if ($path_jar_pdfbox) {
-        exit(0);
-    }
-    die "$error Installation failed, because $pdfbox library cannot be found!\n";
-}
-
 # main program
 
 my $ret = 0;
 find_jar_pax;
-if ($pdfbox_in_classpath) {
-    debug 'PDFBox in CLASSPATH', 'yes';
-}
-else {
-    find_jar_pdfbox;
-    $path_jar_pdfbox or die "$error Cannot find $pdfbox library!\n"
-            . "See README and option `--install'.\n";
-}
 exit launch_pax;
 
 __END__

Added: trunk/Master/texmf-dist/source/latex/pax/Makefile
===================================================================
--- trunk/Master/texmf-dist/source/latex/pax/Makefile	                        (rev 0)
+++ trunk/Master/texmf-dist/source/latex/pax/Makefile	2022-06-07 20:32:22 UTC (rev 63508)
@@ -0,0 +1,10 @@
+distctan:
+	cd .. && mkdir pax
+	cd .. && rsync -rL `pwd`/* --exclude '.git/' --exclude 'build/' --exclude '*.zip' -L pax/
+	cd ../pax/source && ant distctan
+	rm -rf ../pax/source/build
+	rm -rf ../pax/pax
+	cd .. && zip -r pax-`date +"%Y%m%d"`.zip pax/
+	
+clean:
+	cd .. && rm -rf pax


Property changes on: trunk/Master/texmf-dist/source/latex/pax/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/source/latex/pax/build.xml
===================================================================
--- trunk/Master/texmf-dist/source/latex/pax/build.xml	2022-06-07 20:26:08 UTC (rev 63507)
+++ trunk/Master/texmf-dist/source/latex/pax/build.xml	2022-06-07 20:32:22 UTC (rev 63508)
@@ -6,9 +6,8 @@
 
   <property name="src"   location="src"/>
   <property name="build" location="build"/>
-  <property name="dist"  location="."/>
+  <property name="dist"  location="../scripts/"/>
   <property name="pdfbox.home" location="${basedir}"/> <!-- or somewhere else -->
-  <property name="pdfbox.name" value="PDFBox-0.7.2.jar"/>
 
   <target name="init">
     <mkdir dir="${build}"/>
@@ -15,35 +14,74 @@
   </target>
 
   <target name="compile"
-          depends="init"
-          description="compile the source"
-  >
-    <javac srcdir="${src}" destdir="${build}" target="1.4" source="1.4">
+	  depends="init"
+	  description="compile the source"
+	  >
+    <javac srcdir="${src}" destdir="${build}">
       <classpath>
-        <!-- try with and without subdirectory `lib' -->
-        <pathelement location="${pdfbox.home}/lib/${pdfbox.name}"/>
-        <pathelement location="${pdfbox.home}/${pdfbox.name}"/>
+	<pathelement location="${basedir}/lib/pdfbox.jar"/>
+	<pathelement location="${basedir}/lib/commons-logging.jar"/>
       </classpath>
     </javac>
   </target>
 
+  <path id="build.classpath">
+    <fileset dir="${basedir}">
+      <include name="lib/*.jar"/>
+    </fileset>
+  </path>
+
+  <pathconvert property="manifest.classpath" pathsep=" ">
+    <path refid="build.classpath"/>
+    <mapper>
+      <chainedmapper>
+	<flattenmapper/>
+	<globmapper from="*.jar" to="lib/*.jar"/>
+      </chainedmapper>
+    </mapper>
+  </pathconvert>
+
+  <target name="distctan"
+	  depends="compile"
+	  description="generate the distribution ctan"
+	  >
+    <mkdir dir="${dist}"/>
+    <jar jarfile="${dist}/${ant.project.name}.jar"
+	 manifest="${src}/MANIFEST.MF"
+	 basedir="${build}"
+	 includes="pax/**" >
+    <zipgroupfileset dir="lib" includes="*.jar"/>
+    </jar>
+  </target>
+  
   <target name="dist"
-          depends="compile"
-          description="generate the distribution"
-  >
+	  depends="compile"
+	  description="generate the distribution"
+	  >
     <mkdir dir="${dist}"/>
+    <mkdir dir="${dist}/lib"/>
+    <copy todir="${dist}/lib" flatten="true">
+      <fileset dir="lib">
+	<include name="*.jar" />
+      </fileset>
+    </copy>
     <jar jarfile="${dist}/${ant.project.name}.jar"
-         manifest="${src}/MANIFEST.MF"
-         basedir="${build}"
-         includes="pax/**"
-    />
+	 manifest="${src}/MANIFEST.MF"
+	 basedir="${build}"
+	 includes="pax/**" >
+      <manifest>
+	<attribute name="Class-Path" value="${manifest.classpath}" />
+      </manifest>
+    </jar>
   </target>
 
+
   <target name="clean"
-          description="clean up"
-  >
+	  description="clean up"
+	  >
     <delete dir="${build}"/>
-    <delete file="${dist}/${ant.project.name}.jar"/>
+    <delete dir="${dist}/lib"/>
+    <delete file="${dist}/pax.jar" />
   </target>
 
 </project>

Added: trunk/Master/texmf-dist/source/latex/pax/lib/commons-logging.jar
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/source/latex/pax/lib/commons-logging.jar
===================================================================
--- trunk/Master/texmf-dist/source/latex/pax/lib/commons-logging.jar	2022-06-07 20:26:08 UTC (rev 63507)
+++ trunk/Master/texmf-dist/source/latex/pax/lib/commons-logging.jar	2022-06-07 20:32:22 UTC (rev 63508)

Property changes on: trunk/Master/texmf-dist/source/latex/pax/lib/commons-logging.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/source/latex/pax/lib/pdfbox.jar
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/source/latex/pax/lib/pdfbox.jar
===================================================================
--- trunk/Master/texmf-dist/source/latex/pax/lib/pdfbox.jar	2022-06-07 20:26:08 UTC (rev 63507)
+++ trunk/Master/texmf-dist/source/latex/pax/lib/pdfbox.jar	2022-06-07 20:32:22 UTC (rev 63508)

Property changes on: trunk/Master/texmf-dist/source/latex/pax/lib/pdfbox.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/Master/texmf-dist/source/latex/pax/src/PDFAnnotExtractor.java
===================================================================
--- trunk/Master/texmf-dist/source/latex/pax/src/PDFAnnotExtractor.java	2022-06-07 20:26:08 UTC (rev 63507)
+++ trunk/Master/texmf-dist/source/latex/pax/src/PDFAnnotExtractor.java	2022-06-07 20:32:22 UTC (rev 63508)
@@ -24,14 +24,14 @@
 import java.text.*;
 import java.util.*;
 
-import org.pdfbox.cos.*;
-import org.pdfbox.pdfparser.*;
-import org.pdfbox.pdmodel.*;
-import org.pdfbox.pdmodel.common.*;
-import org.pdfbox.pdmodel.interactive.action.*;
-import org.pdfbox.pdmodel.interactive.action.type.*;
-import org.pdfbox.pdmodel.interactive.annotation.*;
-import org.pdfbox.pdmodel.interactive.documentnavigation.destination.*;
+import org.apache.pdfbox.cos.*;
+import org.apache.pdfbox.pdfparser.*;
+import org.apache.pdfbox.pdmodel.*;
+import org.apache.pdfbox.pdmodel.common.*;
+import org.apache.pdfbox.pdmodel.interactive.action.*;
+import org.apache.pdfbox.pdmodel.interactive.action.type.*;
+import org.apache.pdfbox.pdmodel.interactive.annotation.*;
+import org.apache.pdfbox.pdmodel.interactive.documentnavigation.destination.*;
 
 public class PDFAnnotExtractor implements Constants {
 

Modified: trunk/Master/texmf-dist/source/latex/pax/src/StringVisitor.java
===================================================================
--- trunk/Master/texmf-dist/source/latex/pax/src/StringVisitor.java	2022-06-07 20:26:08 UTC (rev 63507)
+++ trunk/Master/texmf-dist/source/latex/pax/src/StringVisitor.java	2022-06-07 20:32:22 UTC (rev 63508)
@@ -22,8 +22,8 @@
 
 import java.io.*;
 import java.util.*;
-import org.pdfbox.cos.*;
-import org.pdfbox.exceptions.*;
+import org.apache.pdfbox.cos.*;
+import org.apache.pdfbox.exceptions.*;
 
 public class StringVisitor implements ICOSVisitor {
 

Modified: trunk/Master/texmf-dist/tex/latex/pax/pax.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pax/pax.sty	2022-06-07 20:26:08 UTC (rev 63507)
+++ trunk/Master/texmf-dist/tex/latex/pax/pax.sty	2022-06-07 20:32:22 UTC (rev 63508)
@@ -1,5 +1,6 @@
 %% pax.sty
 %% Copyright 2006-2008, 2011, 2012 Heiko Oberdiek
+%% Copyright 2020 Bastien Roucariès
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -11,7 +12,7 @@
 %
 % This work has the LPPL maintenance status `maintained'.
 %
-% The Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainer of this work is Bastien Roucariès
 %
 % This work consists of the file pax.sty.
 % See README for more details and documentation.
@@ -18,7 +19,7 @@
 %
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pax}%
-  [2012/04/18 v0.1l Annotation support for PDF graphics (HO)]%
+  [2020/04/06 v0.2 Annotation support for PDF graphics (HO)]%
 
 \RequirePackage{ifpdf}
 \ifpdf
@@ -106,7 +107,7 @@
   \PAX at defaultbp\PAX at vury{#4}%
   \edef\PAX at page@llx{\dimexpr\PAX at page@llx+\PAX at vllx\relax}%
   \edef\PAX at page@lly{\dimexpr\PAX at page@lly+\PAX at vlly\relax}%
-  \edef\PAX at page@urx{\dimexpr\PAX at page@llx+\PAX at vlly\relax}%
+  \edef\PAX at page@urx{\dimexpr\PAX at page@llx+\PAX at vurx\relax}%
   \edef\PAX at page@ury{\dimexpr\PAX at page@lly+\PAX at vury\relax}%
 }
 \def\PAX at trim#1 #2 #3 #4\\{%

Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds	2022-06-07 20:26:08 UTC (rev 63507)
+++ trunk/Master/tlpkg/libexec/ctan2tds	2022-06-07 20:32:22 UTC (rev 63508)
@@ -1584,6 +1584,7 @@
  'pictex'               => '&PREHOOK_pictex',
  'pkuthss'              => '&PREHOOK_flatten1',
  'plex-otf'             => '&PREHOOK_flatten1',
+ 'pax'			=> '&PREHOOK_flatten1',
  'pmx'			=> '&PREHOOK_pmx',
  'prosper'              => '&PREHOOK_prosper',
  'skb'                  => '&PREHOOK_flatten1',
@@ -2880,6 +2881,7 @@
  'optexcount',		'\.(py|sh)$|' . $standardsource,
  'ot2cyr',              '\.afm|\.etx|' . $standardsource,
  'patch',               '\.doc',
+ 'pax',			'build.xml|lib|license|src|' . $standardsource,
  'pdfx',                'rvdtx\.sty|' . $standardsource,
  'poetrytex',           'Makefile|' . $standardsource,
  'pseudo',		'NULL',	# keep together
@@ -3442,8 +3444,9 @@
  'luasseq'              => '\.lua$',
  'lyluatex'		=> '\.lua$',
  'make4ht'		=> '(extensions|filters|formats|\.lua)$',
- 'mycv'                 => 'mycv_split_contents\.pl',
+ 'mycv'                 => 'mycv_split_contents\.pl$',
  'pgfmolbio'		=> '\.lua$',
+ 'pax'			=> 'pax.jar$',
  'placeat'              => '\.lua$',
  'pst-pdf'		=> '\.bat(.w95)?$',
  'puyotikz'		=> '\.py$',
@@ -3536,6 +3539,7 @@
  'mkpic'	        => '^mkpic$',
  'musixtex'             => '\.lua$',
  'optexcount'           => 'optexcount$',
+ 'pax'			=> 'pdfannotextractor.pl$',
  'pdfbook2'             => 'pdfbook2$',
  'pdfcrop'              => '\.pl$',             # doscripts() does r*
  'pdfjam'               => 'pdfjam$',



More information about the tex-live-commits mailing list.