diff options
author | Jonathan Kew <jfkthame@googlemail.com> | 2006-12-07 15:27:30 +0000 |
---|---|---|
committer | Jonathan Kew <jfkthame@googlemail.com> | 2006-12-07 15:27:30 +0000 |
commit | 45d904fd3b3bd4be3646271b5294010c37ae8223 (patch) | |
tree | ed8bcc8099b58284985bfc0fc2e84f6547201b1e /Build/source | |
parent | 53e3fa47b557118c2af7b5c3f8d150b91723bb6f (diff) |
update to xdv2pdf (for xetex, macosx only)
git-svn-id: svn://tug.org/texlive/trunk@2609 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rwxr-xr-x | Build/source/texk/xdv2pdf/xdv2pdf.cpp | 5 | ||||
-rwxr-xr-x | Build/source/texk/xdv2pdf/xdv2pdf_mergemarks | 205 |
2 files changed, 3 insertions, 207 deletions
diff --git a/Build/source/texk/xdv2pdf/xdv2pdf.cpp b/Build/source/texk/xdv2pdf/xdv2pdf.cpp index 49f2ef3906f..cae51b2c25d 100755 --- a/Build/source/texk/xdv2pdf/xdv2pdf.cpp +++ b/Build/source/texk/xdv2pdf/xdv2pdf.cpp @@ -2330,8 +2330,9 @@ xdv2pdf(int argc, char** argv) fprintf(stderr, "*** failed to run xdv2pdf_mergemarks: status = %d\n", status); #else if (gotPath) { - char* mergeMarks = "xdv2pdf_mergemarks"; - char cmd[_POSIX_PATH_MAX*2 + 100]; + char* mergeMarks = "`kpsewhich -progname=xetex -format=texmfscripts xdv2pdf_mergemarks" + " || echo echo '# ERROR: need xdv2pdf_mergemarks script to process:'`"; + char cmd[_POSIX_PATH_MAX*2 + 150]; // enough for the mergeMarks command above, plus some sprintf(cmd, "%s \"%s\" \"%s\"", mergeMarks, pdfPath, gPdfMarkPath); status = system(cmd); } diff --git a/Build/source/texk/xdv2pdf/xdv2pdf_mergemarks b/Build/source/texk/xdv2pdf/xdv2pdf_mergemarks deleted file mode 100755 index ce36f1e8116..00000000000 --- a/Build/source/texk/xdv2pdf/xdv2pdf_mergemarks +++ /dev/null @@ -1,205 +0,0 @@ -#!/usr/bin/perl - -# /****************************************************************************\ -# Part of the XeTeX typesetting system -# copyright (c) 1994-2005 by SIL International -# written by Jonathan Kew -# -# This software is distributed under the terms of the Common Public License, -# version 1.0. -# For details, see <http://www.opensource.org/licenses/cpl1.0.php> or the file -# cpl1.0.txt included with the software. -# \****************************************************************************/ - -BEGIN { - # try to locate our private Perl module directory - my $p = `kpsewhich -progname=xetex -format=texmfscripts Reuse.pm`; - chomp $p; - if ($p eq '') { - # try a known location - $p = '/usr/local/teTeX/share/texmf.local/scripts/xetex/perl/lib/PDF/Reuse.pm'; - die "can't find Reuse.pm!" unless -e $p; - } - $p =~ s!/PDF/Reuse.pm!!; - die "perl/lib directory $p not found!" unless -d $p; - unshift @INC, $p; -}; - -use strict; -use PDF::Reuse; - -die "usage: $0 <pdf-file> <mark-file>\n" unless $#ARGV == 1; - -my $infile = $ARGV[0]; -my $markfile = $ARGV[1]; -my $outfile = "$ARGV[0].tmp"; - -my $newlink = undef; -my $seenbox = 0; -my %dest; -my @links; -my @bookmarks; - -sub toUtf16 -{ - my $txt = shift; - $txt =~ s/\\([\\\(\)])/$1/g; - $txt = pack('n*', 0xfeff, unpack('U*', $txt)); - $txt =~ s/\\/\\\\/g; - $txt =~ s/\(/\\(/g; - $txt =~ s/\)/\\)/g; - return $txt; -} - -open FH, "<:utf8", "$markfile" or die "failed to read mark-file $markfile\n"; -while (<FH>) { - chomp; - my ($page, $xpos, $ypos, $txt) = split(/\t/, $_, 4); - if ($txt =~ /^\s*dest/o) { - $txt =~ /^\s*dest\s+\(([^\)]+)\)\s*(\[.+\])/o; - my $destname = $1; - $dest{$destname} = $2; - my $zp = $page - 1; - $dest{$destname} =~ s/\/View\s\[(.+)\]/$1/; - $dest{$destname} =~ s/\@thispage/$zp/; - $dest{$destname} =~ s/\@xpos/$xpos/; - $dest{$destname} =~ s/\@ypos/$ypos/; - } - - elsif ($txt =~ /^\s*bann/o) { - if ($txt =~ m!<+\s*/Type\s*/Annot\s*/Subtype\s*/Link\s*.*/A\s*<+([^>]+)>>\s*>>!o) { - $newlink = { page => $page, x => $xpos, y => $ypos, action => $1 }; - if ($txt =~ m!/Border\s*(\[[^]]+\])!o) { - $newlink->{border} = $1; - } - if ($txt =~ m!/C\s*(\[[^]]+\])!o) { - $newlink->{color} = $1; - } - } - $seenbox = 0; - } - - elsif ($txt =~ /^\s*ABOX/o) { - if (defined $newlink) { - $txt =~ m/\[\s*(-?\d+(?:\.\d+)?)\s+(-?\d+(?:\.\d+)?)\s+(-?\d+(?:\.\d+)?)\s+(-?\d+(?:\.\d+)?)\s*\]/o; - my $boxlink = { page => $newlink->{page}, action => $newlink->{action} }; - $boxlink->{border} = $newlink->{border} if exists $newlink->{border}; - $boxlink->{color} = $newlink->{color} if exists $newlink->{color}; - $boxlink->{x} = $1 < $3 ? $1 : $3; - $boxlink->{y} = $2 < $4 ? $2 : $4; - $boxlink->{width} = abs($1 - $3); - $boxlink->{height} = abs($2 - $4); - push @links, $boxlink; - $seenbox = 1; - } - } - - elsif ($txt =~ /^\s*eann/o) { - if ((defined $newlink) && ($seenbox == 0)) { - $newlink->{width} = $xpos - $newlink->{x}; - if ($newlink->{width} < 0) { - $newlink->{width} = -$newlink->{width}; - $newlink->{x} = $xpos; - } - $newlink->{height} = $ypos - $newlink->{y}; - if ($newlink->{height} < 0) { - $newlink->{height} = -$newlink->{height}; - $newlink->{y} = $ypos; - } - push @links, $newlink; - undef $newlink; - } - } - - elsif ($txt =~ /^\s*ann/o) { - $txt =~ m!width\s+(\d+(?:\.\d*)?)pt\s+height\s+(\d+(?:\.\d*)?)pt\s+.*/A\s*<+([^>]+)>>!o; - if (defined $1) { - $newlink = { page => $page, x => $xpos, y => $ypos, width => $1, height => $2, action => $3 }; - if ($txt =~ m!/Border\s*(\[[^]]+\])!o) { - $newlink->{border} = $1; - } - if ($txt =~ m!/C\s*(\[[^]]+\])!o) { - $newlink->{color} = $1; - } - push @links, $newlink; - undef $newlink; - } - } - - elsif ($txt =~ /^\s*outline/o) { - $txt =~ m!outline\s+(-?\d+)\s*<+\s*/Title\s*\(((?:[^\)]|\\\))+)\)\s*/A\s*<+([^>]+)>>\s*>>!o; - my ($level, $title, $action) = ($1, $2, $3); - my $bm = { 'text' => &toUtf16($title), 'pdfact' => $action, '_lvl' => $level }; - if ((scalar @bookmarks == 0) || ($level <= $bookmarks[$#bookmarks]->{'_lvl'})) { - push @bookmarks, $bm; - } - else { - my $parent = $bookmarks[$#bookmarks]; - my $plevel = $parent->{'_lvl'}; - while ($plevel + 1 < $level) { - if (exists $parent->{'kids'}) { - $parent = $parent->{'kids'}[$#{$parent->{'kids'}}]; - $plevel = $parent->{'_lvl'}; - } - else { - last; - } - } - push @{$parent->{'kids'}}, $bm; - } - } - -} -close FH; - -fixActions(\@bookmarks); - -prFile("$outfile"); - -prBookmark(\@bookmarks); - -foreach (@links) { - my $action = $_->{action}; - if ($action =~ m!/S\s/GoTo\s/D\s\(([^\)]+)\)!o) { - my $destname = $1; - my $explicit = $dest{$destname}; - $action =~ s/\(.+\)/$explicit/; - $_->{action} = $action; - } - prLink($_); -} - -prDoc($infile); - -prEnd(); - -unlink($markfile); - -unlink($infile); -rename($outfile, $infile); - -exit(0); - -sub fixActions -{ - my $bookmarks = shift; - foreach (@$bookmarks) { - $_->{'pdfact'} = fixAct($_->{'pdfact'}); - if (exists $_->{'kids'}) { - fixActions($_->{'kids'}); - } - } -} - -sub fixAct -{ - my $action = shift; - if ($action =~ m!/S\s*/GoTo\s*/D\s*\(([^\)]+)\)!o) { - my $destname = $1; - if (exists $dest{$destname}) { - $action = "/Type /Action /S /GoTo /D $dest{$destname}"; - } - } - return $action; -} - |