pool/texlive
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to TeXLive 2013

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=135
This commit is contained in:
Dr. Werner Fink 2013-07-31 13:21:21 +00:00 committed by Git OBS Bridge
parent 0a4c6a0812
commit 266bd1e572
17 changed files with 1213 additions and 1422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

224
biber-certs.dif Normal file
View File

@ -0,0 +1,224 @@
--- Build.PL
+++ Build.PL 2013-07-30 11:55:12.321939296 +0000
@@ -66,7 +66,6 @@ my $builder = $class->new(
'Business::ISBN' => 0,
'Business::ISSN' => 0,
'Business::ISMN' => 0,
- 'Mozilla::CA' => '20130114',
'perl' => '5.16.0'
},
recommends => {
--- META.json
+++ META.json 2013-07-30 11:30:42.721439449 +0000
@@ -48,7 +48,6 @@
"List::AllUtils" : "0",
"List::MoreUtils" : "0",
"Log::Log4perl" : "0",
- "Mozilla::CA" : "20130114",
"Regexp::Common" : "0",
"Text::BibTeX" : "0.66",
"URI" : "0",
--- META.yml
+++ META.yml 2013-07-30 11:30:35.853439347 +0000
@@ -88,7 +88,6 @@ requires:
List::AllUtils: 0
List::MoreUtils: 0
Log::Log4perl: 0
- Mozilla::CA: 20130114
Regexp::Common: 0
Text::BibTeX: 0.66
URI: 0
--- bin/biber
+++ bin/biber 2013-07-30 11:58:02.261439590 +0000
@@ -606,9 +606,8 @@ this and this option is ignored (default
=item B<--ssl-nointernalca>
-Don't try to use the default Mozilla CA certificates when using HTTPS to fetch remote data.
-This assumes that the user will set one of the perl LWP::UserAgent module environment variables
-to find the CA certs.
+This option has no effects as this biber version is dumped without internal Mozilla CA certificates.
+Instead the system CA certificates will be used by perl LWP::UserAgent module.
=item B<--ssl-noverify-host>
--- lib/Biber/Input/file/biblatexml.pm
+++ lib/Biber/Input/file/biblatexml.pm 2013-07-30 11:54:22.741480026 +0000
@@ -95,13 +95,26 @@ sub extract_entries {
# use IO::Socket::SSL qw(debug4); # useful for debugging SSL issues
# We have to explicitly set the cert path because otherwise the https module
# can't find the .pem when PAR::Packer'ed
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
- not defined(Biber::Config->getoption('ssl-nointernalca'))) {
- require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
+ unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+ foreach my $ca_bundle (qw{
+ /etc/ssl/certs/ca-certificates.crt
+ /etc/pki/tls/certs/ca-bundle.crt
+ /etc/ssl/ca-bundle.pem
+ }) {
+ next if ! -e $ca_bundle;
+ $ENV{PERL_LWP_SSL_CA_FILE} = $ca_bundle;
+ break;
+ }
+ }
+ unless (exists($ENV{PERL_LWP_SSL_CA_PATH})) {
+ foreach my $ca_path (qw{
+ /etc/ssl/certs/
+ /etc/pki/tls/
+ }) {
+ next if ! -d $ca_path;
+ $ENV{PERL_LWP_SSL_CA_PATH} = $ca_path;
+ break;
+ }
}
if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
--- lib/Biber/Input/file/bibtex.pm
+++ lib/Biber/Input/file/bibtex.pm 2013-07-30 11:54:56.009439347 +0000
@@ -136,13 +136,26 @@ sub extract_entries {
# use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues
# We have to explicitly set the cert path because otherwise the https module
# can't find the .pem when PAR::Packer'ed
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
- not defined(Biber::Config->getoption('ssl-nointernalca'))) {
- require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
+ unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+ foreach my $ca_bundle (qw{
+ /etc/ssl/certs/ca-certificates.crt
+ /etc/pki/tls/certs/ca-bundle.crt
+ /etc/ssl/ca-bundle.pem
+ }) {
+ next if ! -e $ca_bundle;
+ $ENV{PERL_LWP_SSL_CA_FILE} = $ca_bundle;
+ break;
+ }
+ }
+ unless (exists($ENV{PERL_LWP_SSL_CA_PATH})) {
+ foreach my $ca_path (qw{
+ /etc/ssl/certs/
+ /etc/pki/tls/
+ }) {
+ next if ! -d $ca_path;
+ $ENV{PERL_LWP_SSL_CA_PATH} = $ca_path;
+ break;
+ }
}
if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
--- lib/Biber/Input/file/endnotexml.pm
+++ lib/Biber/Input/file/endnotexml.pm 2013-07-30 11:52:55.597939238 +0000
@@ -114,13 +114,26 @@ sub extract_entries {
# use IO::Socket::SSL qw(debug4); # useful for debugging SSL issues
# We have to explicitly set the cert path because otherwise the https module
# can't find the .pem when PAR::Packer'ed
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
- not defined(Biber::Config->getoption('ssl-nointernalca'))) {
- require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
+ unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+ foreach my $ca_bundle (qw{
+ /etc/ssl/certs/ca-certificates.crt
+ /etc/pki/tls/certs/ca-bundle.crt
+ /etc/ssl/ca-bundle.pem
+ }) {
+ next if ! -e $ca_bundle;
+ $ENV{PERL_LWP_SSL_CA_FILE} = $ca_bundle;
+ break;
+ }
+ }
+ unless (exists($ENV{PERL_LWP_SSL_CA_PATH})) {
+ foreach my $ca_path (qw{
+ /etc/ssl/certs/
+ /etc/pki/tls/
+ }) {
+ next if ! -d $ca_path;
+ $ENV{PERL_LWP_SSL_CA_PATH} = $ca_path;
+ break;
+ }
}
if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
--- lib/Biber/Input/file/ris.pm
+++ lib/Biber/Input/file/ris.pm 2013-07-30 11:51:46.481960038 +0000
@@ -109,13 +109,26 @@ sub extract_entries {
# use IO::Socket::SSL qw(debug4); # useful for debugging SSL issues
# We have to explicitly set the cert path because otherwise the https module
# can't find the .pem when PAR::Packer'ed
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
- not defined(Biber::Config->getoption('ssl-nointernalca'))) {
- require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
+ unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+ foreach my $ca_bundle (qw{
+ /etc/ssl/certs/ca-certificates.crt
+ /etc/pki/tls/certs/ca-bundle.crt
+ /etc/ssl/ca-bundle.pem
+ }) {
+ next if ! -e $ca_bundle;
+ $ENV{PERL_LWP_SSL_CA_FILE} = $ca_bundle;
+ break;
+ }
+ }
+ unless (exists($ENV{PERL_LWP_SSL_CA_PATH})) {
+ foreach my $ca_path (qw{
+ /etc/ssl/certs/
+ /etc/pki/tls/
+ }) {
+ next if ! -d $ca_path;
+ $ENV{PERL_LWP_SSL_CA_PATH} = $ca_path;
+ break;
+ }
}
if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
--- lib/Biber/Input/file/zoterordfxml.pm
+++ lib/Biber/Input/file/zoterordfxml.pm 2013-07-30 11:53:38.269439442 +0000
@@ -125,13 +125,26 @@ sub extract_entries {
# use IO::Socket::SSL qw(debug4); # useful for debugging SSL issues
# We have to explicitly set the cert path because otherwise the https module
# can't find the .pem when PAR::Packer'ed
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
- not defined(Biber::Config->getoption('ssl-nointernalca'))) {
- require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
+ unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+ foreach my $ca_bundle (qw{
+ /etc/ssl/certs/ca-certificates.crt
+ /etc/pki/tls/certs/ca-bundle.crt
+ /etc/ssl/ca-bundle.pem
+ }) {
+ next if ! -e $ca_bundle;
+ $ENV{PERL_LWP_SSL_CA_FILE} = $ca_bundle;
+ break;
+ }
+ }
+ unless (exists($ENV{PERL_LWP_SSL_CA_PATH})) {
+ foreach my $ca_path (qw{
+ /etc/ssl/certs/
+ /etc/pki/tls/
+ }) {
+ next if ! -d $ca_path;
+ $ENV{PERL_LWP_SSL_CA_PATH} = $ca_path;
+ break;
+ }
}
if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;

249
biber-dev.patch Normal file
View File

@ -0,0 +1,249 @@
diff --git lib/Biber/Entry.pm lib/Biber/Entry.pm
index adec127..9c6fc4b 100644
--- lib/Biber/Entry.pm
+++ lib/Biber/Entry.pm
@@ -362,9 +362,9 @@ sub get_field_form_names {
my $self = shift;
my $key = shift;
return undef unless $key;
- return keys %{Dive($self, 'datafields', $key) ||
- Dive($self, 'derivedfields', $key) ||
- {}};
+ return sort keys %{Dive($self, 'datafields', $key) ||
+ Dive($self, 'derivedfields', $key) ||
+ {}};
}
=head2 get_field_form_lang_names
@@ -378,9 +378,9 @@ sub get_field_form_lang_names {
my ($key, $form) = @_;
return undef unless $key;
return undef unless $form;
- return keys %{Dive($self, 'datafields', $key, $form) ||
- Dive($self, 'derivedfields', $key, $form) ||
- {}};
+ return sort keys %{Dive($self, 'datafields', $key, $form) ||
+ Dive($self, 'derivedfields', $key, $form) ||
+ {}};
}
=head2 set_datafield
diff --git lib/Biber/LaTeX/Recode.pm lib/Biber/LaTeX/Recode.pm
index ed87c2c..534f0c6 100644
--- lib/Biber/LaTeX/Recode.pm
+++ lib/Biber/LaTeX/Recode.pm
@@ -130,21 +130,21 @@ sub init_schemes {
# Now populate the regexps
if ($type eq 'accents') {
- $remaps->{$set}{$type}{re} = '[' . join('', keys %{$remaps->{$set}{$type}{map}}) . ']';
+ $remaps->{$set}{$type}{re} = '[' . join('', sort keys %{$remaps->{$set}{$type}{map}}) . ']';
$remaps->{$set}{$type}{re} = qr/$remaps->{$set}{$type}{re}/;
- $r_remaps->{$set}{$type}{re} = '[' . join('', keys %{$r_remaps->{$set}{$type}{map}}) . ']';
+ $r_remaps->{$set}{$type}{re} = '[' . join('', sort keys %{$r_remaps->{$set}{$type}{map}}) . ']';
$r_remaps->{$set}{$type}{re} = qr/$r_remaps->{$set}{$type}{re}/;
}
elsif ($type eq 'superscripts') {
- $remaps->{$set}{$type}{re} = join('|', map { /[\+\-\)\(]/ ? '\\' . $_ : $_ } keys %{$remaps->{$set}{$type}{map}});
+ $remaps->{$set}{$type}{re} = join('|', map { /[\+\-\)\(]/ ? '\\' . $_ : $_ } sort keys %{$remaps->{$set}{$type}{map}});
$remaps->{$set}{$type}{re} = qr|$remaps->{$set}{$type}{re}|;
- $r_remaps->{$set}{$type}{re} = join('|', map { /[\+\-\)\(]/ ? '\\' . $_ : $_ } keys %{$r_remaps->{$set}{$type}{map}});
+ $r_remaps->{$set}{$type}{re} = join('|', map { /[\+\-\)\(]/ ? '\\' . $_ : $_ } sort keys %{$r_remaps->{$set}{$type}{map}});
$r_remaps->{$set}{$type}{re} = qr|$r_remaps->{$set}{$type}{re}|;
}
else {
- $remaps->{$set}{$type}{re} = join('|', keys %{$remaps->{$set}{$type}{map}});
+ $remaps->{$set}{$type}{re} = join('|', sort keys %{$remaps->{$set}{$type}{map}});
$remaps->{$set}{$type}{re} = qr|$remaps->{$set}{$type}{re}|;
- $r_remaps->{$set}{$type}{re} = join('|', keys %{$r_remaps->{$set}{$type}{map}});
+ $r_remaps->{$set}{$type}{re} = join('|', sort keys %{$r_remaps->{$set}{$type}{map}});
$r_remaps->{$set}{$type}{re} = qr|$r_remaps->{$set}{$type}{re}|;
}
}
@@ -192,7 +192,7 @@ sub latex_decode {
my $mainmap;
- foreach my $type (keys %{$remaps->{$scheme_d}}) {
+ foreach my $type (sort keys %{$remaps->{$scheme_d}}) {
my $map = $remaps->{$scheme_d}{$type}{map};
my $re = $remaps->{$scheme_d}{$type}{re};
if ($type eq 'negatedsymbols') {
@@ -217,7 +217,7 @@ sub latex_decode {
# special cases such as '\={\i}' -> '\={i}' -> "i\x{304}"
$text =~ s/(\\(?:$d_re|$a_re)){\\i}/$1\{i\}/g;
- foreach my $type (keys %{$remaps->{$scheme_d}}) {
+ foreach my $type (sort keys %{$remaps->{$scheme_d}}) {
my $map = $remaps->{$scheme_d}{$type}{map};
my $re = $remaps->{$scheme_d}{$type}{re};
next unless $re;
@@ -269,7 +269,7 @@ Converts UTF-8 to LaTeX
sub latex_encode {
my $text = shift;
- foreach my $type (keys %{$r_remaps->{$scheme_e}}) {
+ foreach my $type (sort keys %{$r_remaps->{$scheme_e}}) {
my $map = $r_remaps->{$scheme_e}{$type}{map};
my $re = $r_remaps->{$scheme_e}{$type}{re};
if ($type eq 'negatedsymbols') {
@@ -286,7 +286,7 @@ sub latex_encode {
}
}
- foreach my $type (keys %{$r_remaps->{$scheme_e}}) {
+ foreach my $type (sort keys %{$r_remaps->{$scheme_e}}) {
my $map = $r_remaps->{$scheme_e}{$type}{map};
my $re = $r_remaps->{$scheme_e}{$type}{re};
if ($type eq 'accents') {
@@ -318,7 +318,7 @@ sub latex_encode {
}
}
- foreach my $type (keys %{$r_remaps->{$scheme_e}}) {
+ foreach my $type (sort keys %{$r_remaps->{$scheme_e}}) {
my $map = $r_remaps->{$scheme_e}{$type}{map};
my $re = $r_remaps->{$scheme_e}{$type}{re};
if ($type eq 'wordmacros') {
diff --git t/full.t t/full.t
index 8df93c0..e278738 100755
--- t/full.t
+++ t/full.t
@@ -4,13 +4,22 @@ use warnings;
use utf8;
no warnings 'utf8';
-use Test::More tests => 5;
+use Test::More;
+
+if ($ENV{BIBER_DEV_TESTS}) {
+ plan tests => 5;
+}
+else {
+ plan skip_all => 'BIBER_DEV_TESTS not set';
+}
+
use IPC::Run3;
use IPC::Cmd qw( can_run );
use File::Temp;
use File::Compare;
use File::Which;
+
my $perl = which('perl');
my $tmpfile = File::Temp->new();
@@ -26,4 +35,3 @@ ok(compare($bbl, 't/tdata/full1.bbl') == 0, 'Testing lossort case and sortinit f
like($stdout, qr|WARN - Duplicate entry key: 'F1' in file 't/tdata/full\.bib', skipping \.\.\.|ms, 'Testing duplicate/case key warnings - 1');
like($stdout, qr|WARN - Possible typo \(case mismatch\) between datasource keys: 'f1' and 'F1' in file 't/tdata/full\.bib'|ms, 'Testing duplicate/case key warnings - 2');
like($stdout, qr|WARN - Possible typo \(case mismatch\) between citation and datasource keys: 'C1' and 'c1' in file 't/tdata/full\.bib'|ms, 'Testing duplicate/case key warnings - 3');
-
diff --git t/remote-files.t t/remote-files.t
index 61ab57f..8aab056 100755
--- t/remote-files.t
+++ t/remote-files.t
@@ -4,16 +4,20 @@ use warnings;
use utf8;
no warnings 'utf8' ;
-use Test::More tests => 3;
+use Test::More;
+
+if ($ENV{BIBER_DEV_TESTS}) {
+ plan tests => 3;
+}
+else {
+ plan skip_all => 'BIBER_DEV_TESTS not set';
+}
use Biber;
use Biber::Output::bbl;
use Log::Log4perl;
chdir("t/tdata") ;
-SKIP: {
- skip "BIBER_SKIP_DEV_TESTS env var is set, skipping remote tests", 3 if $ENV{BIBER_SKIP_DEV_TESTS};
-
# Set up Biber object
my $biber = Biber->new(noconf => 1);
my $LEVEL = 'ERROR';
@@ -140,5 +144,3 @@ my $ssl = q| \entry{jung_alchemical_????}{book}{}
is( $out->get_output_entry('citeulike:8283461', $main), $cu1, 'Fetch from citeulike') ;
is( $out->get_output_entry('AbdelbarH98', $main), $dl1, 'Fetch from plain bib download') ;
is( $out->get_output_entry('jung_alchemical_????', $main), $ssl, 'HTTPS test') ;
-
-}
diff --git t/tool-bltxml.t t/tool-bltxml.t
index ebd602a..72c30b1 100644
--- t/tool-bltxml.t
+++ t/tool-bltxml.t
@@ -57,57 +57,57 @@ my $bltxml1 = q|<?xml version="1.0" encoding="UTF-8"?>
<bltx:entries xmlns:bltx="http://biblatex-biber.sourceforge.net/biblatexml">
<bltx:entry id="i3Š" entrytype="unpublished">
- <bltx:author form="uniform" lang="lang">
+ <bltx:author>
<bltx:person>
<bltx:last>
- <bltx:namepart initial="a">aaa</bltx:namepart>
+ <bltx:namepart initial="A">AAA</bltx:namepart>
</bltx:last>
</bltx:person>
<bltx:person>
<bltx:last>
- <bltx:namepart initial="b">bbb</bltx:namepart>
+ <bltx:namepart initial="B">BBB</bltx:namepart>
</bltx:last>
</bltx:person>
<bltx:person>
<bltx:last>
- <bltx:namepart initial="c">ccc</bltx:namepart>
+ <bltx:namepart initial="C">CCC</bltx:namepart>
</bltx:last>
</bltx:person>
<bltx:person>
<bltx:last>
- <bltx:namepart initial="d">ddd</bltx:namepart>
+ <bltx:namepart initial="D">DDD</bltx:namepart>
</bltx:last>
</bltx:person>
<bltx:person>
<bltx:last>
- <bltx:namepart initial="e">eee</bltx:namepart>
+ <bltx:namepart initial="E">EEE</bltx:namepart>
</bltx:last>
</bltx:person>
</bltx:author>
- <bltx:author>
+ <bltx:author form="uniform" lang="lang">
<bltx:person>
<bltx:last>
- <bltx:namepart initial="A">AAA</bltx:namepart>
+ <bltx:namepart initial="a">aaa</bltx:namepart>
</bltx:last>
</bltx:person>
<bltx:person>
<bltx:last>
- <bltx:namepart initial="B">BBB</bltx:namepart>
+ <bltx:namepart initial="b">bbb</bltx:namepart>
</bltx:last>
</bltx:person>
<bltx:person>
<bltx:last>
- <bltx:namepart initial="C">CCC</bltx:namepart>
+ <bltx:namepart initial="c">ccc</bltx:namepart>
</bltx:last>
</bltx:person>
<bltx:person>
<bltx:last>
- <bltx:namepart initial="D">DDD</bltx:namepart>
+ <bltx:namepart initial="d">ddd</bltx:namepart>
</bltx:last>
</bltx:person>
<bltx:person>
<bltx:last>
- <bltx:namepart initial="E">EEE</bltx:namepart>
+ <bltx:namepart initial="e">eee</bltx:namepart>
</bltx:last>
</bltx:person>
</bltx:author>

3
biblatex-biber-1.7.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:32a3867e232575d44af6bb533c3f1a75d1132bdab58563fa4a88d255ea817134
size 970816

3
biblatex-biber-v0.9.9.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:72f2b52596a4eb4e656a6bf71ae8a18e4b61754fff966d8a0ec295c8eadd1c91
size 915220

9
public.8
View File

@ -30,7 +30,7 @@ drops its privileges if called by the user
by switching over to the user
.I nobdy
in a clean environment. For all users the group
.I public
.I mktex
is used.
Currently the following programs are supported:
.IP \fBtexhash\fP
@ -39,12 +39,13 @@ Currently the following programs are supported:
\- create ls-R databases
.IP \fBmktexmf\fP
\- create a Metafont source file
.IP \fBfmktexpk\fP
.IP \fBmktexpk\fP
\- create a PK file for a font
.IP \fBfmktextfm\fP
.IP \fBmktextfm\fP
\- create a TFM file for a font
.SH NOTES
The umask changed to allow members of the group public
The umask changed to allow members of the group
.I mktex
to read and write files.
.SH AUTHOR
2012 Werner Fink

113
source-64.dif
View File

@ -24,3 +24,116 @@
dynamic_linker='GNU/Linux ld.so'
;;
--- texk/web2c/luatexdir/font/mapfile.w
+++ texk/web2c/luatexdir/font/mapfile.w 2013-06-28 09:55:26.505439260 +0000
@@ -23,8 +23,8 @@ static const char _svn_version[] =
"$Id: mapfile.w 4442 2012-05-25 22:40:34Z hhenkel $"
"$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/font/mapfile.w $";
-#include <math.h>
#include "ptexlib.h"
+#include <math.h>
#include <kpathsea/c-auto.h>
#include <kpathsea/c-memstr.h>
#include <string.h>
--- texk/web2c/luatexdir/font/sfnt.w
+++ texk/web2c/luatexdir/font/sfnt.w 2013-06-28 09:57:18.877439867 +0000
@@ -28,10 +28,9 @@ static const char _svn_version[] =
#if HAVE_CONFIG_H
# include <w2c/config.h>
#endif /* |HAVE_CONFIG_H_| */
+#include "ptexlib.h"
#include <string.h>
-
-# include "ptexlib.h"
#include "font/sfnt.h"
@ type:
--- texk/web2c/luatexdir/font/tt_table.w
+++ texk/web2c/luatexdir/font/tt_table.w 2013-06-28 09:57:42.537938970 +0000
@@ -24,8 +24,8 @@ static const char _svn_version[] =
"$Id: tt_table.w 4442 2012-05-25 22:40:34Z hhenkel $"
"$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/font/tt_table.w $";
-#include <stdio.h>
#include "ptexlib.h"
+#include <stdio.h>
#include "font/sfnt.h"
#include "font/tt_table.h"
--- texk/web2c/luatexdir/image/writejbig2.w
+++ texk/web2c/luatexdir/image/writejbig2.w 2013-06-28 09:58:16.518102785 +0000
@@ -89,10 +89,10 @@ static const char _svn_version[] =
#ifdef HAVE_CONFIG_H
#include <w2c/config.h>
#endif
+#include "ptexlib.h"
#include <stdlib.h>
#include <stdio.h>
#include <assert.h>
-#include "ptexlib.h"
#include "image/image.h"
@ @c
--- texk/web2c/luatexdir/image/writejp2.w
+++ texk/web2c/luatexdir/image/writejp2.w 2013-06-28 09:58:29.725989863 +0000
@@ -28,9 +28,9 @@ Information technology --- JPEG~2000 ima
ISO/IEC 15444-1, Second edition, 2004-09-15, file |15444-1annexi.pdf|.
@c
+#include "ptexlib.h"
#include <math.h>
#include <assert.h>
-#include "ptexlib.h"
#include "image/image.h"
#include "image/writejp2.h"
#include "image/writejbig2.h" /* read2bytes(), read4bytes() */
--- texk/web2c/luatexdir/image/writejpg.w
+++ texk/web2c/luatexdir/image/writejpg.w 2013-06-28 12:46:45.321439150 +0000
@@ -23,8 +23,8 @@ static const char _svn_version[] =
"$Id: writejpg.w 4442 2012-05-25 22:40:34Z hhenkel $"
"$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/image/writejpg.w $";
-#include <assert.h>
#include "ptexlib.h"
+#include <assert.h>
#include "image/image.h"
#include "image/writejpg.h"
--- texk/web2c/luatexdir/image/writepng.w
+++ texk/web2c/luatexdir/image/writepng.w 2013-06-28 09:58:59.837438998 +0000
@@ -23,8 +23,8 @@ static const char _svn_version[] =
"$Id: writepng.w 4442 2012-05-25 22:40:34Z hhenkel $"
"$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/image/writepng.w $";
-#include <assert.h>
#include "ptexlib.h"
+#include <assert.h>
#include "image/image.h"
#include "image/writepng.h"
--- texk/web2c/luatexdir/tex/texfileio.w
+++ texk/web2c/luatexdir/tex/texfileio.w 2013-06-28 10:00:24.621439403 +0000
@@ -22,8 +22,8 @@ static const char _svn_version[] =
"$Id: texfileio.w 4521 2012-12-14 13:54:54Z taco $"
"$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/tex/texfileio.w $";
-#include <string.h>
#include "ptexlib.h"
+#include <string.h>
#include <kpathsea/absolute.h>
@ @c
--- texk/web2c/luatexdir/utils/unistring.w
+++ texk/web2c/luatexdir/utils/unistring.w 2013-06-28 10:00:55.485439104 +0000
@@ -23,8 +23,8 @@ static const char _svn_version[] =
"$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/utils/unistring.w $";
@ @c
-#include <string.h>
#include "ptexlib.h"
+#include <string.h>
@ @c
static void utf_error(void)

30
source-asymptote.dif
View File

@ -1,21 +1,25 @@
--- utils/asymptote/interact.cc
+++ utils/asymptote/interact.cc 2013-05-03 10:25:51.255472000 +0000
@@ -85,14 +85,10 @@ FILE *fin=NULL;
@@ -85,6 +85,7 @@ FILE *fin=NULL;
char *readpipeline(const char *prompt)
{
- const int max_size=256;
- static char buf[max_size];
- ostringstream s;
- do {
- if(fgets(buf,max_size-1,fin) == NULL) break;
- s << buf;
- } while(buf[strlen(buf)-1] != '\n');
- return StrdupMalloc(s.str());
+ char *line=NULL;
+ size_t n;
+ getline(&line,&n,fin);
+ return line;
+#if 0
const int max_size=256;
static char buf[max_size];
ostringstream s;
@@ -94,11 +95,14 @@ char *readpipeline(const char *prompt)
} while(buf[strlen(buf)-1] != '\n');
return StrdupMalloc(s.str());
/* Simpler version (requires POSIX 2008; temporarily removed for TeXLive 2013):
+#endif
char *line=NULL;
size_t n;
n=getline(&line,&n,fin);
return line;
+#if 0
*/
+#endif
}
void pre_readline()

58
source-binary-open.dif
View File

@ -1,58 +0,0 @@
Index: texk/web2c/lib/texmfmp.c
===================================================================
--- texk/web2c/lib/texmfmp.c (revision 26897)
+++ texk/web2c/lib/texmfmp.c (working copy)
@@ -533,7 +533,11 @@
char *cmdname = NULL;
int allow;
+ string realmode = xmalloc(strlen(mode)+2);
+ strcpy(realmode, mode);
#ifdef WIN32
+ strcat(realmode, "b");
+
char *pp;
for (pp = cmd; *pp; pp++) {
@@ -548,9 +552,9 @@
allow = shell_cmd_is_allowed (cmd, &safecmd, &cmdname);
if (allow == 1)
- f = popen (cmd, mode);
+ f = popen (cmd, realmode);
else if (allow == 2)
- f = popen (safecmd, mode);
+ f = popen (safecmd, realmode);
else if (allow == -1)
fprintf (stderr, "\nrunpopen quotation error in command line: %s\n",
cmd);
@@ -561,6 +565,7 @@
free (safecmd);
if (cmdname)
free (cmdname);
+ free (realmode);
return f;
}
#endif /* ENABLE_PIPES */
@@ -1853,7 +1858,7 @@
fname = xmalloc(strlen((const_string)(nameoffile+1))+1);
strcpy(fname,(const_string)(nameoffile+1));
recorder_record_input (fname + 1);
- *f_ptr = runpopen(fname+1,"rb");
+ *f_ptr = runpopen(fname+1,"r");
free(fname);
for (i=0; i<NUM_PIPES; i++) {
if (pipes[i]==NULL) {
@@ -1895,10 +1900,10 @@
is better to be prepared */
if (STREQ((fname+strlen(fname)-4),".tex"))
*(fname+strlen(fname)-4) = 0;
- *f_ptr = runpopen(fname+1,"wb");
+ *f_ptr = runpopen(fname+1,"w");
*(fname+strlen(fname)) = '.';
} else {
- *f_ptr = runpopen(fname+1,"wb");
+ *f_ptr = runpopen(fname+1,"w");
}
recorder_record_output (fname + 1);
free(fname);

209
source-poppler.dif
View File

@ -1,104 +1,5 @@
--- texk/web2c/xetexdir/pdfimage.cpp
+++ texk/web2c/xetexdir/pdfimage.cpp 2012-04-13 16:52:54.939126587 +0200
@@ -38,9 +38,18 @@ authorization from the copyright holders
#include <goo/gmem.h>
#include <goo/gfile.h>
-#include "PDFDoc.h"
-#include "Catalog.h"
-#include "Page.h"
+#include <Object.h>
+#include <Stream.h>
+#include <Array.h>
+#include <Dict.h>
+#include <XRef.h>
+#include <Link.h>
+#include <Catalog.h>
+#include <Page.h>
+#include <GfxFont.h>
+#include <PDFDoc.h>
+#include <GlobalParams.h>
+#include <Error.h>
#include "XeTeX_ext.h"
--- texk/web2c/xetexdir/xetexextra.h
+++ texk/web2c/xetexdir/xetexextra.h 2011-09-13 14:45:00.256426839 +0000
@@ -56,7 +56,11 @@ Foundation, Inc., 675 Mass Ave, Cambridg
#include <xetexdir/etex_version.h> /* for ETEX_VERSION */
#include <xetexdir/xetex_version.h> /* for XETEX_VERSION */
-#define BANNER "This is XeTeX, Version 3.1415926-" ETEX_VERSION "-" XETEX_VERSION
+#ifdef POPPLER_VERSION
+# define BANNER "This is XeTeX using libpoppler, Version 3.1415926-" ETEX_VERSION "-" XETEX_VERSION
+#else
+# define BANNER "This is XeTeX, Version 3.1415926-" ETEX_VERSION "-" XETEX_VERSION
+#endif
#define COPYRIGHT_HOLDER "SIL International and Jonathan Kew"
#define AUTHOR "Jonathan Kew"
#define PROGRAM_HELP XETEXHELP
--- texk/web2c/luatexdir/image/epdf.h
+++ texk/web2c/luatexdir/image/epdf.h 2011-09-13 14:49:39.051927771 +0000
@@ -40,20 +40,20 @@
# include <goo/GooString.h>
# include <goo/gmem.h>
# include <goo/gfile.h>
-# include "Object.h"
-# include "Stream.h"
-# include "Gfx.h"
-# include "Annot.h"
-# include "Array.h"
-# include "Dict.h"
-# include "XRef.h"
-# include "Catalog.h"
-# include "Link.h"
-# include "Page.h"
-# include "GfxFont.h"
-# include "PDFDoc.h"
-# include "GlobalParams.h"
-# include "Error.h"
+# include <Object.h>
+# include <Stream.h>
+# include <Gfx.h>
+# include <Annot.h>
+# include <Array.h>
+# include <Dict.h>
+# include <XRef.h>
+# include <Catalog.h>
+# include <Link.h>
+# include <Page.h>
+# include <GfxFont.h>
+# include <PDFDoc.h>
+# include <GlobalParams.h>
+# include <Error.h>
extern "C" {
--- texk/web2c/pdftexdir/pdftexextra.h
+++ texk/web2c/pdftexdir/pdftexextra.h 2011-09-13 14:46:22.147926062 +0000
@@ -25,7 +25,11 @@ with this program. If not, see <http://
#include <pdftexdir/pdftex_version.h> /* for PDFTEX_VERSION */
#include <pdftexdir/etex_version.h> /* for ETEX_VERSION */
-#define BANNER "This is pdfTeX, Version 3.1415926-" ETEX_VERSION "-" PDFTEX_VERSION
+#ifdef POPPLER_VERSION
+# define BANNER "This is pdfTeX using libpoppler, Version 3.1415926-" ETEX_VERSION "-" PDFTEX_VERSION
+#else
+# define BANNER "This is pdfTeX, Version 3.1415926-" ETEX_VERSION "-" PDFTEX_VERSION
+#endif
#define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)"
#define AUTHOR NULL
#define PROGRAM_HELP PDFTEXHELP
--- texk/web2c/pdftexdir/pdftoepdf.cc
+++ texk/web2c/pdftexdir/pdftoepdf.cc 2012-04-13 16:56:57.780022236 +0200
@@ -21,7 +21,6 @@ with this program. If not, see <http://
conflicting with the definition for Pascal's boolean as 'int'
in <kpathsea/types.h>.
*/
-#define boolean MINGW32_boolean
#include <stdlib.h>
#include <math.h>
@@ -30,6 +29,10 @@ with this program. If not, see <http://
#include <string.h>
#include <ctype.h>
@ -110,40 +11,6 @@
#ifdef POPPLER_VERSION
#include <dirent.h>
#include <poppler-config.h>
@@ -44,21 +47,18 @@ with this program. If not, see <http://
#include <gfile.h>
#endif
#include <assert.h>
-
-#include "Object.h"
-#include "Stream.h"
-#include "Array.h"
-#include "Dict.h"
-#include "XRef.h"
-#include "Catalog.h"
-#include "Link.h"
-#include "Page.h"
-#include "GfxFont.h"
-#include "PDFDoc.h"
-#include "GlobalParams.h"
-#include "Error.h"
-
-#undef boolean
+#include <Object.h>
+#include <Stream.h>
+#include <Array.h>
+#include <Dict.h>
+#include <XRef.h>
+#include <Catalog.h>
+#include <Link.h>
+#include <Page.h>
+#include <GfxFont.h>
+#include <PDFDoc.h>
+#include <GlobalParams.h>
+#include <Error.h>
// This file is mostly C and not very much C++; it's just used to interface
// the functions of xpdf, which happens to be written in C++.
--- texk/web2c/pdftexdir/pdftosrc.cc
+++ texk/web2c/pdftexdir/pdftosrc.cc 2012-04-13 16:59:10.136510522 +0200
@@ -23,6 +23,10 @@ with this program. If not, see <http://
@ -157,79 +24,3 @@
#ifdef POPPLER_VERSION
#define GString GooString
#define xpdfVersion POPPLER_VERSION
@@ -37,20 +41,20 @@ with this program. If not, see <http://
#include <gfile.h>
#endif
#include <assert.h>
-
-#include "Object.h"
-#include "Stream.h"
-#include "Lexer.h"
-#include "Parser.h"
-#include "Array.h"
-#include "Dict.h"
-#include "XRef.h"
-#include "Catalog.h"
-#include "Page.h"
-#include "GfxFont.h"
-#include "PDFDoc.h"
-#include "GlobalParams.h"
-#include "Error.h"
+#include <Object.h>
+#include <Stream.h>
+#include <Lexer.h>
+#include <Parser.h>
+#include <Array.h>
+#include <Dict.h>
+#include <XRef.h>
+#include <Link.h>
+#include <Catalog.h>
+#include <Page.h>
+#include <GfxFont.h>
+#include <PDFDoc.h>
+#include <GlobalParams.h>
+#include <Error.h>
static XRef *xref = 0;
@@ -134,7 +138,7 @@ int main(int argc, char *argv[])
exit(1);
}
if (extract_xref_table) {
- int size = xref->getSize();
+ int size = xref->getNumObjects();
int i;
for (i = 0; i < size; i++) {
if (xref->getEntry(i)->offset == 0xffffffff)
--- texk/web2c/pdftexdir/utils.c
+++ texk/web2c/pdftexdir/utils.c 2009-09-04 08:38:04.000000000 +0000
@@ -42,12 +42,12 @@ with this program. If not, see <http://
#include "ptexlib.h"
#include "png.h"
#ifdef POPPLER_VERSION
-#include "poppler-config.h"
-#define xpdfVersion POPPLER_VERSION
-#define xpdfString "poppler"
+# include <poppler-config.h>
+# define xpdfVersion POPPLER_VERSION
+# define xpdfString "poppler"
#else
-#include "xpdf/config.h" /* just to get the xpdf version */
-#define xpdfString "xpdf"
+# include "xpdf/config.h" /* just to get the xpdf version */
+# define xpdfString "xpdf"
#endif
#define check_nprintf(size_get, size_want) \
--- texk/web2c/pdftexdir/writefont.c
+++ texk/web2c/pdftexdir/writefont.c 2009-09-04 08:39:19.000000000 +0000
@@ -17,6 +17,9 @@ You should have received a copy of the G
with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifdef POPPLER_VERSION
+# include <goo/gmem.h>
+#endif
#include "ptexlib.h"
/**********************************************************************/

8
source-texdoc.dif
View File

@ -1,6 +1,6 @@
--- texk/texlive/linked_scripts/tetex/texdoctk.pl
+++ texk/texlive/linked_scripts/tetex/texdoctk.pl 2008-09-24 14:56:14.000000000 +0000
@@ -1458,7 +1458,7 @@ sub writerc {
--- utils/texdoctk/texdoctk.pl
+++ utils/texdoctk/texdoctk.pl 2008-09-24 14:56:14.000000000 +0000
@@ -1461,7 +1461,7 @@ sub writerc {
mv $myrc,"$myrc.save" if (-e $myrc);
open(MYRC,">$myrc");
print MYRC "# user's .texdocrc, generated by program\n
@ -9,7 +9,7 @@
# can be left empty if \$TEXMFHOME is undefined
HOMEDOCPATH=$homedocpath_tmp
# general viewer behaviour (y or yes to make active)
@@ -1621,9 +1621,9 @@ sub readrc {
@@ -1624,9 +1624,9 @@ sub readrc {
$localdocpath="$texmflocal/$localdocpath";
}
}

32
source-warns.dif
View File

@ -1,5 +1,5 @@
--- libs/icu/icu-49.1/i18n/decNumber.h
+++ libs/icu/icu-49.1/i18n/decNumber.h 2010-11-16 10:35:02.000000000 +0000
--- libs/icu/icu-51.1/source/i18n/decNumber.h
+++ libs/icu/icu-51.1/source/i18n/decNumber.h 2010-11-16 10:35:02.000000000 +0000
@@ -54,26 +54,30 @@
/* For ICU, use one digit per byte, to make it easier to emulate the
* old DigitList interface on top of a decNumber
@ -40,8 +40,8 @@
/* The number of units needed is ceil(DECNUMDIGITS/DECDPUN) */
#define DECNUMUNITS ((DECNUMDIGITS+DECDPUN-1)/DECDPUN)
--- libs/icu/icu-49.1/tools/pkgdata/pkgdata.cpp
+++ libs/icu/icu-49.1/tools/pkgdata/pkgdata.cpp 2012-04-13 17:09:26.690772599 +0200
--- libs/icu/icu-51.1/source/tools/pkgdata/pkgdata.cpp
+++ libs/icu/icu-51.1/source/pkgdata/pkgdata.cpp 2012-04-13 17:09:26.690772599 +0200
@@ -1917,9 +1917,9 @@ static void loadLists(UPKGOptions *o, UE
findDirname(progname, cmdBuf, 1024, &status);
if(U_SUCCESS(status)) {
@ -241,27 +241,3 @@
}
else {
power = 10.0;
--- texk/web2c/luatexdir/pdf/pdfcolorstack.w
+++ texk/web2c/luatexdir/pdf/pdfcolorstack.w 2012-04-24 08:05:42.714565533 +0000
@@ -204,9 +204,7 @@ static int colorstackpush(int colstack_n
if (global_shipping_mode == SHIPPING_PAGE) {
if (colstack->page_used == colstack->page_size) {
colstack->page_size += STACK_INCREMENT;
- colstack->page_stack = xretalloc(colstack->page_stack,
- (unsigned) colstack->page_size,
- char *);
+ xretalloc(colstack->page_stack, (unsigned) colstack->page_size, char *);
}
colstack->page_stack[colstack->page_used++] = colstack->page_current;
str = makecstring(s);
@@ -219,9 +217,7 @@ static int colorstackpush(int colstack_n
} else {
if (colstack->form_used == colstack->form_size) {
colstack->form_size += STACK_INCREMENT;
- colstack->form_stack = xretalloc(colstack->form_stack,
- (unsigned) colstack->form_size,
- char *);
+ xretalloc(colstack->form_stack, (unsigned) colstack->form_size, char *);
}
colstack->form_stack[colstack->form_used++] = colstack->form_current;
str = makecstring(s);

828
source-xdvi-xkbbell.dif
View File

@ -1,828 +0,0 @@
---
texk/xdvik/CHANGES | 10 ++
texk/xdvik/c-auto.in | 8 -
texk/xdvik/configure.ac | 1
texk/xdvik/dvi-init.c | 4
texk/xdvik/events.c | 13 ++
texk/xdvik/gui/Panner.c | 18 ++-
texk/xdvik/gui/help-window.c | 10 +-
texk/xdvik/gui/mag.c | 12 ++
texk/xdvik/gui/pagesel.c | 4
texk/xdvik/gui/print-dialog.c | 5 +
texk/xdvik/gui/search-dialog.c | 2
texk/xdvik/gui/sfSelFile.c | 18 ++-
texk/xdvik/gui/xm_filesel.c | 10 +-
texk/xdvik/m4/xdvi-func-xkbbell.m4 | 29 +++++
texk/xdvik/util.c | 4
texk/xdvik/x_util.c | 179 ++++++++++++++-----------------------
texk/xdvik/x_util.h | 3
texk/xdvik/xdvi.c | 10 --
texk/xdvik/xdvi.h | 8 -
19 files changed, 197 insertions(+), 151 deletions(-)
Index: texlive-bin-2012.20120623/texk/xdvik/CHANGES
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/CHANGES 2012-04-02 17:27:30.000000000 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/CHANGES 2012-06-23 19:18:45.461791034 +0900
@@ -9,6 +9,16 @@
may contain undetected bugs. Such versions shouldn't be used
by distributors.
+ * 22.85.01-CVS4 (2012-04-23):
+ + xdvi.h, xdvi.c, x_util.h, x_util.c, dvi-init.c: Fixed bugs in
+ property handling on 64-bit systems (related to source specials).
+ + m4/xdvi-check-iconv.m4, m4/xdvi-check-langinfo.m4,
+ m4/xdvi-func-working-vsnprintf.m4: fixed copyright notices;
+ configure.ac: removed some obsolete lines.
+ + Added support for XkbBell, to make the console bell work again.
+ + Fixed #3514485 (mksedscript improperly handles macro values in
+ c-auto.in that contain spaces) (fix from TeX Live).
+
* 22.85 (2012-04-01):
+ configure.ac: check for ulltostr is no longer used
+ hypertex.c, gui/xm_toolbar.c: avoid compiler warnings about mixed
Index: texlive-bin-2012.20120623/texk/xdvik/c-auto.in
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/c-auto.in 2012-04-25 23:45:36.000000000 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/c-auto.in 2012-06-23 19:18:45.469791040 +0900
@@ -305,6 +305,9 @@
/* Define if you have the <X11/xpm.h> header file. */
#undef HAVE_X11_XPM_H
+/* Define if your system has XkbBell(). */
+#undef HAVE_XKB_BELL_EXT
+
/* Define to 1 if you have the <Xm/XpmP.h> header file. */
#undef HAVE_XM_XPMP_H
@@ -405,11 +408,6 @@
/* Define to 1 if the X Window System is missing or not being used. */
#undef X_DISPLAY_MISSING
-/* Enable large inode numbers on Mac OS X 10.5. */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS
Index: texlive-bin-2012.20120623/texk/xdvik/configure.ac
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/configure.ac 2012-04-18 18:29:09.000000000 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/configure.ac 2012-06-23 19:20:03.533794644 +0900
@@ -87,6 +87,7 @@
XDVI_SYS_STREAMS
XDVI_SYS_OLD_LINUX
XDVI_FUNC_POLL
+XDVI_FUNC_XKB_BELL
dnl #######
Index: texlive-bin-2012.20120623/texk/xdvik/dvi-init.c
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/dvi-init.c 2012-06-23 19:14:31.957783059 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/dvi-init.c 2012-06-23 19:18:45.513791036 +0900
@@ -1642,8 +1642,8 @@
dvi_property_length = strlen(globals.dvi_name) + 1; /* also copy the terminating 0 */
dvi_property = xmalloc(dvi_property_length);
- /* NOTE: we don't use dvi_inode like non-k xdvi, since dvi_name is
- always fully expanded with xdvik. */
+ /* NOTE: we don't use dvi_inode like non-k xdvi, since xdvik keeps closer
+ track of when the path points to a different inode. */
strcpy(dvi_property, globals.dvi_name);
}
Index: texlive-bin-2012.20120623/texk/xdvik/events.c
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/events.c 2012-06-23 19:14:31.957783059 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/events.c 2012-06-23 19:18:45.513791036 +0900
@@ -103,6 +103,14 @@
extern int errno;
#endif /* X_NOT_STDC_ENV */
+#if HAVE_XKB_BELL_EXT
+# include <X11/XKBlib.h>
+# define XdviBell(display, window, percent) \
+ XkbBell(display, window, percent, (Atom) None)
+#else
+# define XdviBell(display, window, percent) XBell(display, percent)
+#endif
+
/* Linux prefers O_ASYNC over FASYNC; SGI IRIX does the opposite. */
#if !defined(FASYNC) && defined(O_ASYNC)
# define FASYNC O_ASYNC
@@ -1296,7 +1304,7 @@
if (event->type != ButtonPress || mouse_release != null_mouse
|| MAGNIFIER_ACTIVE || mane.shrinkfactor == 1 || *num_params != 1) {
- XBell(DISP, 0);
+ XdviBell(DISP, event->xany.window, 0);
if (mane.shrinkfactor == 1) {
statusline_info(STATUS_SHORT,
"No magnification available at shrink factor 1");
@@ -5284,7 +5292,8 @@
that window.
*/
if (have_src_specials && do_update_property
- && globals.win_expose.min_x != 1 && globals.win_expose.max_y - globals.win_expose.min_y != 1
+ && globals.win_expose.min_x != 1
+ && globals.win_expose.max_y - globals.win_expose.min_y != 1
&& currwin.base_x == 0 && currwin.base_y == 0) {
update_window_property(XtWindow(globals.widgets.top_level), True);
}
Index: texlive-bin-2012.20120623/texk/xdvik/gui/Panner.c
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/gui/Panner.c 2008-07-02 00:42:36.000000000 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/gui/Panner.c 2012-06-23 19:18:45.521791036 +0900
@@ -48,6 +48,14 @@
extern Bool XmuDistinguishablePixels(); /* not defined in any Xmu headers */
+#if HAVE_XKB_BELL_EXT
+# include <X11/XKBlib.h>
+# define panBell(display, window, percent) \
+ XkbBell(display, window, percent, (Atom) None)
+#else
+# define panBell(display, window, percent) XBell(display, percent)
+#endif
+
/*
======================================================================
begin copy from Simple.c
@@ -1020,7 +1028,7 @@
UNUSED(num_params);
if (!get_event_xy (pw, event, &x, &y)) {
- XBell (XtDisplay(gw), 0); /* should do error message */
+ panBell(XtDisplay(gw), XtWindow(gw), 0); /* should do error message */
return;
}
@@ -1085,7 +1093,7 @@
if (!pw->panner.tmp.doing) return;
if (!get_event_xy (pw, event, &x, &y)) {
- XBell (XtDisplay(gw), 0); /* should do error message */
+ panBell(XtDisplay(gw), XtWindow(gw), 0); /* should do error message */
return;
}
@@ -1116,7 +1124,7 @@
UNUSED(num_params);
if (*num_params != 2) {
- XBell (XtDisplay(gw), 0);
+ panBell (XtDisplay(gw), XtWindow(gw), 0);
return;
}
@@ -1205,7 +1213,7 @@
if (*num_params < 2 ||
XmuCompareISOLatin1 (params[0], "rubberband") != 0) {
- XBell (XtDisplay(gw), 0);
+ panBell (XtDisplay(gw), XtWindow(gw), 0);
return;
}
@@ -1216,7 +1224,7 @@
} else if (XmuCompareISOLatin1 (params[1], "toggle") == 0) {
rb = !pw->panner.rubber_band;
} else {
- XBell (XtDisplay(gw), 0);
+ panBell (XtDisplay(gw), XtWindow(gw), 0);
return;
}
Index: texlive-bin-2012.20120623/texk/xdvik/gui/help-window.c
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/gui/help-window.c 2009-06-29 08:47:26.000000000 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/gui/help-window.c 2012-06-23 19:18:45.521791036 +0900
@@ -56,6 +56,14 @@
#include "topic-window.h"
#include "help-window.h"
+#if HAVE_XKB_BELL_EXT
+# include <X11/XKBlib.h>
+# define XdviBell(display, window, percent) \
+ XkbBell(display, window, percent, (Atom) None)
+#else
+# define XdviBell(display, window, percent) XBell(display, percent)
+#endif
+
/* missing features that will be listed in the help window */
#if !XDVI_XT_TIMER_HACK
#define HAVE_MISSING_FEATURES 1
@@ -1087,7 +1095,7 @@
}
}
if (!matched) {
- XBell(DISP, 0);
+ XdviBell(DISP, XtWindow(help_shell), 0);
popup_message(help_shell,
MSG_WARN,
NULL,
Index: texlive-bin-2012.20120623/texk/xdvik/gui/mag.c
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/gui/mag.c 2008-07-02 00:42:36.000000000 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/gui/mag.c 2012-06-23 19:18:45.521791036 +0900
@@ -52,6 +52,14 @@
#include "util.h"
#include "pagesel.h"
+#if HAVE_XKB_BELL_EXT
+# include <X11/XKBlib.h>
+# define XdviBell(display, window, percent) \
+ XkbBell(display, window, percent, (Atom) None)
+#else
+# define XdviBell(display, window, percent) XBell(display, percent)
+#endif
+
/* to measure distance of pointer from ruler in ruler mode */
static int g_ruler_pos_x = 0, g_ruler_pos_y = 0;
@@ -627,7 +635,7 @@
int n = atoi(p + 1) - 1;
if (n < 0 || n >= (int)get_magglass_items() || get_magglass_width(n) <= 0) {
- XBell(DISP, 0);
+ XdviBell(DISP, event->xany.window, 0);
return;
}
magnifier.width = get_magglass_width(n);
@@ -642,7 +650,7 @@
magnifier.width = 0;
}
if (magnifier.width == 0) {
- XBell(DISP, 0);
+ XdviBell(DISP, event->xany.window, 0);
return;
}
}
Index: texlive-bin-2012.20120623/texk/xdvik/gui/pagesel.c
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/gui/pagesel.c 2008-07-02 00:42:36.000000000 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/gui/pagesel.c 2012-06-23 19:18:45.521791036 +0900
@@ -728,7 +728,7 @@
int pageno = current_page;
if (button == 5) {
if (current_page >= total_pages - 1) {
- XBell(DISP, 0);
+ xdvi_bell();
/* statusline_info(STATUS_SHORT, "Last page of DVI file"); */
return;
}
@@ -736,7 +736,7 @@
}
else {
if (current_page == 0) {
- XBell(DISP, 0);
+ xdvi_bell();
/* statusline_info(STATUS_SHORT, "First page of DVI file"); */
return;
}
Index: texlive-bin-2012.20120623/texk/xdvik/gui/print-dialog.c
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/gui/print-dialog.c 2009-03-31 23:59:37.000000000 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/gui/print-dialog.c 2012-06-23 19:18:45.521791036 +0900
@@ -91,6 +91,11 @@
#define XTranslations XtNtranslations
#endif /* MOTIF */
+#if HAVE_XKB_BELL_EXT
+# include <X11/XKBlib.h>
+# define XBell(dpy, percent) XkbBell(dpy, mane.win, percent, (Atom) None)
+#endif
+
struct output_format_mapping {
const char *fmt_string;
outputFormatT fmt;
Index: texlive-bin-2012.20120623/texk/xdvik/gui/search-dialog.c
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/gui/search-dialog.c 2009-03-31 23:59:37.000000000 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/gui/search-dialog.c 2012-06-23 19:18:45.533791040 +0900
@@ -339,7 +339,7 @@
return;
}
- XBell(DISP, 0);
+ xdvi_bell();
popup_message(get_matching_parent(w, globals.widgets.top_level, "find_popup", NULL),
MSG_ERR,
NULL,
Index: texlive-bin-2012.20120623/texk/xdvik/gui/sfSelFile.c
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/gui/sfSelFile.c 2009-11-10 19:28:49.000000000 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/gui/sfSelFile.c 2012-06-23 19:18:45.533791040 +0900
@@ -54,6 +54,14 @@
extern int errno;
#endif
+#if HAVE_XKB_BELL_EXT
+# include <X11/XKBlib.h>
+# define sfBell(display, window, percent) \
+ XkbBell(display, window, percent, (Atom) None)
+#else
+# define sfBell(display, window, percent) XBell(display, percent)
+#endif
+
#define SEL_FILE_CANCEL -1
#define SEL_FILE_OK 0
#define SEL_FILE_NULL 1
@@ -147,7 +155,7 @@
raise_file_selector(void)
{
if (selFile != NULL && XtIsManaged(selFile)) {
- XBell(DISP, 10);
+ sfBell(DISP, XtWindow(selFile), 10);
XRaiseWindow(DISP, XtWindow(selFile));
return;
}
@@ -795,7 +803,9 @@
SFchdir(SFstartDir);
errno = 0;
if (!name || *name == 0 || (fp = XFOPEN(name, mode)) == NULL) {
- XBell(DISP, 0);
+ sfBell(DISP,
+ (selFile != NULL && XtIsManaged(selFile))
+ ? XtWindow(selFile) : (Window) NULL, 0);
return NULL;
}
return fp;
@@ -854,7 +864,7 @@
XEvent event;
if (XtIsManaged(callback->shell)) {
- XBell(DISP, 10);
+ sfBell(DISP, XtWindow(callback->shell), 10);
XRaiseWindow(DISP, XtWindow(callback->shell));
return;
}
@@ -966,7 +976,7 @@
w = XtParent(w);
}
if (w == NULL || w == globals.widgets.top_level) {
- XBell(DISP, 0);
+ sfBell(DISP, event.xany.window, 0);
continue;
}
break;
Index: texlive-bin-2012.20120623/texk/xdvik/gui/xm_filesel.c
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/gui/xm_filesel.c 2009-11-10 19:28:49.000000000 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/gui/xm_filesel.c 2012-06-23 19:18:45.533791040 +0900
@@ -43,6 +43,14 @@
#include <Xm/Form.h>
#include <Xm/ToggleBG.h>
+#if HAVE_XKB_BELL_EXT
+# include <X11/XKBlib.h>
+# define XdviBell(display, window, percent) \
+ XkbBell(display, window, percent, (Atom) None)
+#else
+# define XdviBell(display, window, percent) XBell(display, percent)
+#endif
+
/* static Widget dialog = NULL; */
/* static char *browse_fname = NULL; */
@@ -156,7 +164,7 @@
XsraSelFilePopup(struct filesel_callback *callback)
{
if (XtIsManaged(callback->shell)) {
- XBell(DISP, 10);
+ XdviBell(DISP, XtWindow(callback->shell), 10);
XRaiseWindow(DISP, XtWindow(callback->shell));
return;
}
Index: texlive-bin-2012.20120623/texk/xdvik/util.c
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/util.c 2012-04-02 17:27:30.000000000 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/util.c 2012-06-23 19:18:45.537791036 +0900
@@ -83,6 +83,10 @@
extern void *realloc();
#endif
+#if HAVE_XKB_BELL_EXT
+# include <X11/XKBlib.h>
+# define XBell(dpy, percent) XkbBell(dpy, mane.win, percent, (Atom) None)
+#endif
/* if POSIX O_NONBLOCK is not available, use O_NDELAY */
#if !defined O_NONBLOCK && defined O_NDELAY
Index: texlive-bin-2012.20120623/texk/xdvik/x_util.c
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/x_util.c 2012-06-23 19:14:31.957783059 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/x_util.c 2012-06-23 19:18:45.537791036 +0900
@@ -196,35 +196,24 @@
};
static Atom atoms[XtNumber(atom_names)];
-Window
-get_window_id(char *window_p)
-{
- Window w;
- unsigned char *tmp;
- tmp = (unsigned char *)window_p;
-
-#if !(defined(WORD64) || defined(LONG64))
- w = (*((xuint32 *) window_p));
+/*
+ * On 64-bit platforms, XGetWindowProperty and related functions convert
+ * properties with format=32 to arrays of longs. This function keeps that
+ * convention.
+ * The return value is the total number of bytes in the buffer.
+ */
+
+#if defined(WORD64) || defined(LONG64)
+# define LONG_CONV_64(bytes, format) ((bytes) << ((format) >> 5))
#else
-# if WORDS_BIGENDIAN
- w = ((unsigned long)tmp[0] << 24) |
- ((unsigned long)tmp[1] << 16) |
- ((unsigned long)tmp[2] << 8) |
- (unsigned long)tmp[3];
-# else
- w = ((unsigned long)tmp[3] << 24) |
- ((unsigned long)tmp[2] << 16) |
- ((unsigned long)tmp[1] << 8) |
- (unsigned long)tmp[0];
-# endif
+# define LONG_CONV_64(bytes, format) (bytes)
#endif
- return w;
-}
size_t
property_get_data(Window w, Atom a, char **ret_buf,
int (*x_get_property)(Display *, Window, Atom, long,
- long, Bool, Atom, Atom *, int *, unsigned long *,
+ long, Bool, Atom,
+ Atom *, int *, unsigned long *,
unsigned long *, unsigned char **))
{
/* all of these are in 8-bit units */
@@ -253,13 +242,17 @@
nitems_ret *= (format_ret / 8); /* convert to bytes */
- while ((byte_offset + nitems_ret) >= buffer_len) {
- buffer_len += 256;
- buffer = xrealloc(buffer, buffer_len);
+ if (LONG_CONV_64(byte_offset + nitems_ret, format_ret) >= buffer_len) {
+ buffer_len += 256
+ * ((LONG_CONV_64(byte_offset + nitems_ret, format_ret)
+ - buffer_len) / 256 + 1);
+ buffer = (buffer == NULL ? xmalloc(buffer_len)
+ : xrealloc(buffer, buffer_len));
}
/* the +1 captures the extra '\0' that Xlib puts after the end. */
- memcpy(buffer + byte_offset, prop_ret, nitems_ret + 1);
+ memcpy(buffer + LONG_CONV_64(byte_offset, format_ret), prop_ret,
+ LONG_CONV_64(nitems_ret, format_ret) + 1);
byte_offset += nitems_ret;
XFree(prop_ret);
@@ -273,42 +266,28 @@
XFree(prop_ret);
*ret_buf = (char *)buffer;
- return byte_offset;
+ return LONG_CONV_64(byte_offset, format_ret);
}
-size_t
-property_get_window_list(char **window_list)
+static size_t
+property_get_window_list(long **window_list)
{
size_t len = property_get_data(DefaultRootWindow(DISP),
- atom_xdvi_windows(), window_list,
+ atom_xdvi_windows(), (char **) window_list,
XGetWindowProperty);
if (len == 0) {
TRACE_CLIENT((stderr, "No \"xdvi windows\" property found"));
return 0;
}
- if (len % 4 != 0) {
- TRACE_CLIENT((stderr, "\"XDVI_WINDOWS\" property had incorrect size; deleting it."));
+ if (len % sizeof(long) != 0) {
+ TRACE_CLIENT((stderr,
+ "\"XDVI_WINDOWS\" property had incorrect size; deleting it."));
XDeleteProperty(DISP, DefaultRootWindow(DISP), atom_xdvi_windows());
return 0;
}
- return len;
-}
-void
-set_window_id(Window w, unsigned char *data)
-{
-#if WORDS_BIGENDIAN
- data[0] = (unsigned int)w >> 24;
- data[1] = (unsigned int)w >> 16;
- data[2] = (unsigned int)w >> 8;
- data[3] = (unsigned int)w;
-#else
- data[0] = (unsigned int)w;
- data[1] = (unsigned int)w >> 8;
- data[2] = (unsigned int)w >> 16;
- data[3] = (unsigned int)w >> 24;
-#endif
+ return len / sizeof (long);
}
/**
@@ -325,16 +304,16 @@
/*
- * Delete all occurences of window w from the window list property. Then,
- * if `prepend' is true, prepend the window ID to the existing list.
+ * Delete all occurrences of window w from the window list property.
+ * Then, if `prepend' is true, prepend the window ID to the existing list.
*/
void
update_window_property(Window w, Boolean prepend)
{
- char *wlist;
+ long *wlist;
size_t wlist_len;
- char *wlist_end;
- char *wp;
+ long *wlist_end;
+ long *wp;
#if 0
int i;
#endif /* 0 */
@@ -347,33 +326,27 @@
wlist_end = wlist + wlist_len;
#if 0
- for (i = 0, wp = wlist; wp < wlist_end; wp += 4, i++) {
- fprintf(stderr, "WIN %d: %08lx; len: %d\n", i, get_window_id(wp), wlist_len);
+ for (i = 0, wp = wlist; wp < wlist_end; ++wp, ++i) {
+ fprintf(stderr, "WIN %d: %08lx; len: %d\n", i, *wp, wlist_len);
}
#endif /* 0 */
- for (wp = wlist; wp < wlist_end; wp += 4) {
- if (get_window_id(wp) == w) { /* match, remove our ID */
- wlist_len -= 4;
- wlist_end -= 4;
- memmove(wp, wp + 4, wlist_end - wp);
- wp -= 4; /* new item is now at wp; don't skip it in next iteration */
+ for (wp = wlist; wp < wlist_end; ++wp) {
+ if (*wp == w) { /* match, remove our ID */
+ --wlist_len;
+ --wlist_end;
+ memmove(wp, wp + 1, (wlist_end - wp) * sizeof (long));
+ --wp; /* new item is now at wp; don't skip it in next iteration */
}
}
if (prepend) { /* add our ID again to front */
-#if (defined(WORD64) || defined(LONG64))
- unsigned char data[4];
- set_window_id(w, data);
-#else
- xuint32 data = w;
-#endif
/* Note: no need to realloc wlist, since the original length
was sufficient for all elements.
*/
- memmove(wlist + 4, wlist, wlist_len);
- wlist_len += 4;
- memcpy(wlist, &data, 4);
+ memmove(wlist + 1, wlist, wlist_len * sizeof (long));
+ ++wlist_len;
+ *wlist = w;
}
if (wlist_len == 0)
@@ -382,8 +355,7 @@
else
XChangeProperty(DISP, DefaultRootWindow(DISP),
atom_xdvi_windows(), atom_xdvi_windows(), 32,
- PropModeReplace, (unsigned char *)wlist,
- wlist_len / 4);
+ PropModeReplace, (unsigned char *)wlist, wlist_len);
XFlush(DISP);
}
@@ -1102,30 +1074,32 @@
}
/*
- * Check for another running copy of xdvi. If same_file is true, return
- * the window ID of that other instance only if it has currently loaded the
- * same file; else, return 0.
+ * Check for another running copy of xdvi.
+ * If same_file is true, return the window ID of an instance that has
+ * currently loaded the same file, or 0 if none exists.
* If same_file is false, return the first valid xdvi window ID.
*/
+
Window
get_xdvi_window_id(Boolean same_file, property_cbT callback)
{
- char *window_list;
+ long *window_list;
size_t window_list_len;
- char *window_list_end;
- char *wp;
- char *p;
+ long *window_list_end;
+ long *wp;
+ long *p;
Boolean need_rewrite = False;
Window ret_window = 0;
/*
- * Get window list. Copy it over (we'll be calling property_get_data() again).
+ * Get window list.
+ * Copy it over (we'll be calling property_get_data() again).
*/
if ((window_list_len = property_get_window_list(&p)) == 0)
return 0;
- window_list = xmalloc(window_list_len);
- memcpy(window_list, p, window_list_len);
+ window_list = xmalloc(window_list_len * sizeof (long));
+ memcpy(window_list, p, window_list_len * sizeof (long));
XdviOldErrorHandler = XSetErrorHandler(XdviErrorHandler);
@@ -1134,16 +1108,13 @@
window_list_end = window_list + window_list_len;
TRACE_CLIENT((stderr, "My property: `%s'", dvi_property));
- for (wp = window_list; wp < window_list_end; wp += 4) {
- Window w;
+ for (wp = window_list; wp < window_list_end; ++wp) {
char *buf_ret;
size_t len;
- w = get_window_id(wp);
-
- TRACE_CLIENT((stderr, "Checking window %08lx", w));
+ TRACE_CLIENT((stderr, "Checking window %08lx", *wp));
- len = property_get_data(w, atom_dvi_file(), &buf_ret,
+ len = property_get_data((Window) *wp, atom_dvi_file(), &buf_ret,
XdviGetWindowProperty);
if (len == 0) {
@@ -1151,39 +1122,33 @@
that the application the window had belonged to had
been killed with signal 9
*/
- TRACE_CLIENT((stderr, "Window %08lx: doesn't exist any more, deleting", w));
- window_list_len -= 4;
- window_list_end -= 4;
- memmove(wp, wp + 4, window_list_end - wp);
- wp -= 4; /* new item is now at wp; don't skip it in next iteration */
+ TRACE_CLIENT((stderr,
+ "Window %08lx: doesn't exist any more, deleting", *wp));
+ --window_list_len;
+ --window_list_end;
+ memmove(wp, wp + 1, (window_list_end - wp) * sizeof (long));
+ --wp; /* new item is now at wp; don't skip it in next iteration */
need_rewrite = True;
continue;
}
else { /* window still alive */
if (globals.debug & DBG_CLIENT) {
-#if 0
- unsigned long ino;
- int i;
-
- ino = 0;
- for (i = 7; i >= 0; --i)
- ino = (ino << 8) | (unsigned char)(buf_ret[i]);
-#endif
- TRACE_CLIENT((stderr, "Window %08lx: property: `%s'", w, buf_ret));
+ TRACE_CLIENT((stderr,
+ "Window %08lx: property: `%s'", *wp, buf_ret));
}
/* invoke callback if given */
if (callback != NULL) {
- callback(w);
+ callback((Window) *wp);
}
if (!same_file && ret_window == 0) {
- ret_window = w;
+ ret_window = *wp;
if (callback == 0) /* can return early */
break;
}
else if (strcmp(buf_ret, dvi_property) == 0 && ret_window == 0) { /* match */
- ret_window = w;
+ ret_window = *wp;
if (callback == 0) /* can return early */
break;
}
@@ -1196,7 +1161,7 @@
XChangeProperty(DISP, DefaultRootWindow(DISP),
atom_xdvi_windows(), atom_xdvi_windows(), 32,
PropModeReplace, (unsigned char *)window_list,
- window_list_len / 4);
+ window_list_len);
return ret_window;
}
Index: texlive-bin-2012.20120623/texk/xdvik/x_util.h
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/x_util.h 2012-06-23 19:14:31.957783059 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/x_util.h 2012-06-23 19:18:45.537791036 +0900
@@ -50,10 +50,7 @@
long, Bool, Atom, Atom *, int *, unsigned long *,
unsigned long *, unsigned char **));
-extern size_t property_get_window_list(char **window_list);
extern void set_dvi_property(void);
-extern void set_window_id(Window w, unsigned char *data);
-extern Window get_window_id(char *window_p);
extern void update_window_property(Window w, Boolean prepend);
extern void update_dvi_property(void);
extern void property_initialize(void);
Index: texlive-bin-2012.20120623/texk/xdvik/xdvi.c
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/xdvi.c 2012-06-23 19:14:31.957783059 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/xdvi.c 2012-06-23 19:18:45.537791036 +0900
@@ -3300,14 +3300,8 @@
/* Store window id for use by src_client_check(). */
{
- /* was xuint32, but need 8-byte alignment on some 64-bit systems. */
- long data;
-#if !(defined(WORD64) || defined(LONG64))
- data = XtWindow(globals.widgets.top_level);
-#else
- set_window_id(XtWindow(globals.widgets.top_level),
- (unsigned char *)&data);
-#endif
+ long data = XtWindow(globals.widgets.top_level);
+
XChangeProperty(DISP, DefaultRootWindow(DISP),
atom_xdvi_windows(), atom_xdvi_windows(), 32,
PropModePrepend, (unsigned char *)&data, 1);
Index: texlive-bin-2012.20120623/texk/xdvik/xdvi.h
===================================================================
--- texlive-bin-2012.20120623.orig/texk/xdvik/xdvi.h 2012-06-23 19:14:31.957783059 +0900
+++ texlive-bin-2012.20120623/texk/xdvik/xdvi.h 2012-06-23 19:18:45.545791044 +0900
@@ -188,14 +188,6 @@
#include <X11/Xmd.h> /* get WORD64 and LONG64 */
-#ifndef WORD64
-# ifdef LONG64
-typedef unsigned int xuint32;
-# else
-typedef unsigned long xuint32;
-# endif
-#endif
-
#if defined(HAVE_STDINT_H)
#include <stdint.h>
#elif defined(HAVE_INTTYPES_H)
Index: texlive-bin-2012.20120623/texk/xdvik/m4/xdvi-func-xkbbell.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ texlive-bin-2012.20120623/texk/xdvik/m4/xdvi-func-xkbbell.m4 2012-06-24 14:41:38.141798287 +0900
@@ -0,0 +1,29 @@
+# Autoconf macros for xdvik.
+# Copyright (C) 2012 Paul Vojta <xdvi-core@lists.sourceforge.net>
+# Adapted from xterm, Copyright 1997-2010,2011 by Thomas E. Dickey
+#
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# XDVI_FUNC_XKB_BELL
+# -------------------------
+# Check for whether the XkbBell() extension is present in the X libraries.
+
+dnl ### Check for XkbBell() functionality. Adapted from xterm's version.
+AC_DEFUN([XDVI_FUNC_XKB_BELL],[
+AC_CACHE_CHECK([for XKB Bell extension], xdvi_cv_func_xkb_bell,
+[xdvi_save_LIBS=$LIBS
+LIBS="$X_PRE_LIBS"$1" $LIBS $X_LIBS -lX11"
+AC_TRY_LINK([
+#include <X11/X.h>
+#include <X11/XKBlib.h> /* has the prototype */
+],[
+ Atom y;
+ XkbBell((Display *)0, (Window)0, 0, y);
+],[xdvi_cv_func_xkb_bell=yes],[xdvi_cv_func_xkb_bell=no])
+LIBS=$xdvi_save_LIBS])
+if test "$xdvi_cv_func_xkb_bell" = yes; then
+ X_PRE_LIBS="$X_PRE_LIBS"$1
+ AC_DEFINE([HAVE_XKB_BELL_EXT], 1, [Define if your system has XkbBell().])
+fi])

295
source.dif
View File

@ -1,5 +1,5 @@
--- libs/icu/icu-49.1/common/Makefile.in
+++ libs/icu/icu-49.1/common/Makefile.in 2011-12-09 11:43:35.443147133 +0000
+++ libs/icu/icu-51.1/source/common/Makefile.in 2011-12-09 11:43:35.443147133 +0000
@@ -66,7 +66,7 @@ DEFS += -DU_COMMON_IMPLEMENTATION @DEFS@
LDFLAGS += $(LDFLAGSICUUC)
@ -21,10 +21,10 @@
AUTOCONF=$TL_AUTOCONF
AUTOHEADER=$TL_AUTOHEADER
--- texk/dviljk/dvi2xx.c
+++ texk/dviljk/dvi2xx.c 2009-09-02 12:47:26.000000000 +0000
@@ -169,7 +169,18 @@ main(int argc, char *argv[])
+++ texk/dviljk/dvi2xx.c 2013-06-28 11:26:08.461439414 +0000
@@ -168,7 +168,18 @@ main(int argc, char *argv[])
setbuf(ERR_STREAM, NULL);
G_progname = argv[0];
#ifdef KPATHSEA
+# if defined(LJ)
kpse_set_program_name(argv[0], "dvilj");
@ -39,8 +39,8 @@
+ kpse_set_program_name(argv[0], "dvilj4l");
+# endif
kpse_set_program_enabled (kpse_pk_format, MAKE_TEX_PK_BY_DEFAULT, kpse_src_compile);
#endif
DecodeArgs(argc, argv);
G_progname = kpse_program_name;
#else
--- texk/kpathsea/c-fopen.h
+++ texk/kpathsea/c-fopen.h 2010-11-12 17:02:18.000000000 +0000
@@ -34,17 +34,17 @@
@ -308,8 +308,8 @@
done
$verbose && echo "$progname: Done." >&2
--- texk/kpathsea/progname.c
+++ texk/kpathsea/progname.c 2012-04-13 17:34:49.108319823 +0200
@@ -665,9 +665,9 @@ kpathsea_set_program_name (kpathsea kpse
+++ texk/kpathsea/progname.c 2013-06-28 10:56:24.601939619 +0000
@@ -661,9 +661,9 @@ kpathsea_set_program_name (kpathsea kpse
/* SELFAUTODIR is actually the parent of the invocation directory,
and SELFAUTOPARENT the grandparent. This is how teTeX did it. */
kpathsea_xputenv (kpse, "SELFAUTOLOC", fix_selfdir (sdir));
@ -319,26 +319,24 @@
- sdir_grandparent = xdirname (sdir_parent);
+ sdir_grandparent = xdirname ("/usr/lib/texmf");
kpathsea_xputenv (kpse, "SELFAUTOPARENT", fix_selfdir (sdir_grandparent));
#if defined(WIN32) || defined(__CYGWIN__)
sdir_greatgrandparent = xdirname (sdir_grandparent);
kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent));
--- texk/kpathsea/texmf.cnf
+++ texk/kpathsea/texmf.cnf 2012-06-12 16:27:01.749111534 +0200
@@ -55,31 +55,34 @@ TEXMFROOT = $SELFAUTOPARENT
+++ texk/kpathsea/texmf.cnf 2013-06-28 11:08:21.805439369 +0000
@@ -54,32 +54,32 @@
TEXMFROOT = $SELFAUTOPARENT
% The tree containing runtime files related to the specific
% distribution and version.
-TEXMFMAIN = $TEXMFROOT/texmf
+TEXMFMAIN = /usr/lib/texmf
% The main tree of packages, distribution-agnostic:
% The main tree of distributed packages and programs:
-TEXMFDIST = $TEXMFROOT/texmf-dist
+TEXMFDIST = /usr/share/texmf
+
+% Our documentation-only tree, arranged by language:
+TEXMFDOC = ${TEXMFDIST}/doc;${TEXMFMAIN}/doc
% We used to have a separate /texmf tree with some core programs and files.
% Keep the variable name.
-TEXMFMAIN = $TEXMFDIST
+TEXMFMAIN = /usr/lib/texmf
% Local additions to the distribution trees.
-TEXMFLOCAL = $TEXMFROOT/../texmf-local
-TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local
+TEXMFLOCAL = /usr/local/share/texmf
% TEXMFSYSVAR, where *-sys store cached runtime data.
@ -357,38 +355,41 @@
+TEXMFHOME = $HOME/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2012/texmf-var
-TEXMFVAR = ~/.texlive2013/texmf-var
+TEXMFVAR = ${TEXMFSYSVAR}
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2012/texmf-config
-TEXMFCONFIG = ~/.texlive2013/texmf-config
+TEXMFCONFIG = ${TEXMFSYSCONFIG}
% List all the texmf trees.
%
@@ -94,7 +97,7 @@ TEXMFCONFIG = ~/.texlive2012/texmf-confi
% versions should take precedence over those -- although it is generally
% a source of confusion to have different versions of a package
% installed, whatever the trees, so try to avoid it.
-TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
% List all the texmf trees. For an explanation of what they are, see the
% TeX Live manual.
@@ -91,7 +91,7 @@ TEXMFCONFIG = ~/.texlive2013/texmf-confi
% should take precedence over distribution files -- although it is
% generally a source of confusion to have different versions of a
% package installed, whatever the trees, so try to avoid it.
-TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST}
+TEXMF = {$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
% Where to look for ls-R files. There need not be an ls-R in the
% directories in this path, but if there is one, Kpathsea will use it.
@@ -102,18 +105,17 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHO
@@ -99,13 +99,13 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHO
% does not create ls-R files in the non-!! elements -- because if an
% ls-R is present, it will be used, and the disk will not be searched.
% This is arguably a bug in kpathsea.
-TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST}
+TEXMFDBS = $TEXMF;$VARTEXFONTS
% The system trees. These are the trees that are shared by all users.
% If a tree appears in this list, the mktex* scripts will use
% VARTEXFONTS for generated files, if the original tree isn't writable;
% otherwise the current working directory is used.
-SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST
-SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFDIST
+SYSTEXMF = $TEXMFSYSCONFIG;$TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST
% First writable tree here is used by Lua(La)TeX for the font cache.
% LuaLaTeX uses the value here, while ConTeXt uses the same variable but
@@ -116,7 +116,6 @@ TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR
% Where generated fonts may be written. This tree is used when the sources
% were found in a system tree and either that tree wasn't writable, or the
% varfonts feature was enabled in MT_FEATURES in mktex.cnf.
@ -396,7 +397,7 @@
% On some systems, there will be a system tree which contains all the font
% files that may be created as well as the formats. For example
@@ -124,7 +126,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
@@ -127,7 +126,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
%
% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below
% one of the TEXMF directories (avoids overlapping ls-R files).
@ -405,7 +406,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Usually you will not need to edit any of the following variables.
@@ -132,7 +134,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
@@ -135,7 +134,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
% WEB2C is for Web2C specific files. The current directory may not be
% a good place to look for them.
@ -414,7 +415,7 @@
% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
% or \openin, including .sty, .eps, etc. We specify paths for all known
@@ -173,23 +175,23 @@ TEXINPUTS.elatex = .;$TEXMF/tex/{
@@ -176,23 +175,23 @@ TEXINPUTS.elatex = .;$TEXMF/tex/{
TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}//
% pdfTeX.
@ -451,7 +452,7 @@
% LuaTeX.
TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
@@ -231,18 +233,18 @@ BSTINPUTS.pbibtex = .;$TEXMF/{pbib
@@ -234,18 +233,18 @@ BSTINPUTS.pbibtex = .;$TEXMF/{pbib
TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic}//
% jadetex.
@ -476,7 +477,7 @@
% Earlier entries override later ones, so put this generic one last.
TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}//
@@ -261,13 +263,13 @@ MPINPUTS = .;$TEXMF/metapost//
@@ -264,13 +263,13 @@ MPINPUTS = .;$TEXMF/metapost//
% We repeat the same definition three times because of the way fmtutil
% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats
% will not be found.
@ -494,7 +495,7 @@
MFPOOL = ${TEXPOOL}
MPPOOL = ${TEXPOOL}
@@ -295,7 +297,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD
@@ -298,7 +297,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD
GLYPHFONTS = .;$TEXMF/fonts
% A place to puth everything that doesn't fit the other font categories.
@ -503,7 +504,7 @@
% font name map files. This isn't just fonts/map// because ConTeXt
% wants support for having files with the same name in the different
@@ -377,8 +379,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
@@ -380,8 +379,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
% For xdvi to find mime.types and .mailcap, if they do not exist in
% ~. These are single directories, not paths.
% (But the default mime.types, at least, may well suffice.)
@ -513,58 +514,73 @@
+MAILCAPLIBDIR = /etc
% Default settings for the fontconfig library as used by the Windows
% versions of xetex/xdvipdfmx. On Unixish systems, fontconfig ignores
@@ -481,19 +483,20 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
% explicitly list every directory. Arguably more understandable this
% way anyway.
% versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems.
@@ -485,33 +484,34 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
% since we don't want to scatter ../'s throughout the value. Hence we
% explicitly list every directory. Arguably more understandable anyway.
%
-TEXMFCNF = {\
-$SELFAUTOLOC,\
-$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\
-$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\
-$SELFAUTOLOC/share/texmf-local/web2c,\
-$SELFAUTOLOC/share/texmf-dist/web2c,\
-$SELFAUTOLOC/share/texmf/web2c,\
-$SELFAUTOLOC/texmf-local/web2c,\
-$SELFAUTOLOC/texmf-dist/web2c,\
-$SELFAUTOLOC/texmf/web2c,\
-\
-$SELFAUTODIR,\
-$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\
-$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf/web2c,\
-$SELFAUTOPARENT/../texmf-local/web2c,\
-$SELFAUTODIR/share/texmf-local/web2c,\
-$SELFAUTODIR/share/texmf-dist/web2c,\
-$SELFAUTODIR/share/texmf/web2c,\
-$SELFAUTODIR/texmf-local/web2c,\
-$SELFAUTODIR/texmf-dist/web2c,\
-$SELFAUTODIR/texmf/web2c,\
-\
-$SELFAUTOGRANDPARENT/texmf-local/web2c,\
-$SELFAUTOPARENT,\
-$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\
-$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/web2c\
-\
-$SELFAUTOPARENT/share/texmf-local/web2c,\
-$SELFAUTOPARENT/share/texmf-dist/web2c,\
-$SELFAUTOPARENT/share/texmf/web2c,\
-$SELFAUTOPARENT/texmf-local/web2c,\
-$SELFAUTOPARENT/texmf-dist/web2c,\
-$SELFAUTOPARENT/texmf/web2c\
-}
-%
+TEXMFCNF = /etc/texmf;/etc/texmf/web2c;/var/lib/texmf/web2c;$TEXMF/web2c
+
+% For reference, here is the upstream definition:
+%TEXMFCNF = {\
+%$SELFAUTOLOC,\
+%$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\
+%$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\
+%$SELFAUTOLOC/share/texmf-local/web2c,\
+%$SELFAUTOLOC/share/texmf-dist/web2c,\
+%$SELFAUTOLOC/share/texmf/web2c,\
+%$SELFAUTOLOC/texmf-local/web2c,\
+%$SELFAUTOLOC/texmf-dist/web2c,\
+%$SELFAUTOLOC/texmf/web2c,\
+%\
+%$SELFAUTODIR,\
+%$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\
+%$SELFAUTOPARENT/../texmf-local/web2c,\
+%$SELFAUTODIR/share/texmf-local/web2c,\
+%$SELFAUTODIR/share/texmf-dist/web2c,\
+%$SELFAUTODIR/share/texmf/web2c,\
+%$SELFAUTODIR/texmf-local/web2c,\
+%$SELFAUTODIR/texmf-dist/web2c,\
+%$SELFAUTODIR/texmf/web2c,\
+%\
+%$SELFAUTOGRANDPARENT/texmf-local/web2c,\
+%$SELFAUTOPARENT,\
+%$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\
+%$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/web2c\
+%\
+%$SELFAUTOPARENT/share/texmf-local/web2c,\
+%$SELFAUTOPARENT/share/texmf-dist/web2c,\
+%$SELFAUTOPARENT/share/texmf/web2c,\
+%$SELFAUTOPARENT/texmf-local/web2c,\
+%$SELFAUTOPARENT/texmf-dist/web2c,\
+%$SELFAUTOPARENT/texmf/web2c\
+%}
%
% For reference, here is the old brace-using definition:
%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
@@ -675,9 +678,9 @@ BIBTEX_CSFILE = 88591lat.csf
% For some xy-pic samples, you may need as much as 700000 words of memory.
% For the vast majority of documents, 60000 or less will do.
%
-main_memory = 3000000 % words of inimemory available; also applies to inimf&mp
-extra_mem_top = 0 % extra high memory for chars, tokens, etc.
-extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc.
+main_memory = 3500000 % words of inimemory available; also applies to inimf&mp
+extra_mem_top = 0 % extra high memory for chars, tokens, etc. (has to be 0 for omega)
+extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc. (has to be 0 for omega)
% ConTeXt needs lots of memory.
extra_mem_top.context = 2000000
@@ -761,3 +764,33 @@ max_strings.pbibtex = 35307
line_length.gftype = 500
max_rows.gftype = 8191
max_cols.gftype = 8191
@@ -784,3 +784,33 @@ max_cols.gftype = 8191
% Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends?
% Default is 0, to not guess.
guess_input_kanji_encoding = 0
+
+% These are xmltex specific
+main_memory.xmltex = 1500000
@ -595,8 +611,8 @@
+hash_extra.jadetex = 25000
+pool_size.jadetex = 500000
+save_size.jadetex = 15000
--- texk/lcdf-typetools/otftotfm/otftotfm.cc
+++ texk/lcdf-typetools/otftotfm/otftotfm.cc 2011-12-19 12:58:13.735646589 +0100
--- texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/otftotfm.cc
+++ texk/lcdf-typetools/lcdf-typetools-2.98/otftotfm/otftotfm.cc 2011-12-19 12:58:13.735646589 +0100
@@ -60,6 +60,9 @@
# include <fcntl.h>
#endif
@ -608,18 +624,25 @@
#define VERSION_OPT 301
--- texk/ps2pkm/pk2bm.c
+++ texk/ps2pkm/pk2bm.c 2009-09-02 12:47:26.000000000 +0000
@@ -41,8 +41,7 @@ int main(int argc, char *argv[])
quarterword lsbf();
void dots();
+++ texk/ps2pkm/pk2bm.c 2013-06-28 11:14:35.673939645 +0000
@@ -39,7 +39,6 @@
static quarterword lsbf(quarterword u);
static void dots(quarterword u, int n);
-static int atoo(char *oct);
int main(int argc, char *argv[])
{
@@ -48,7 +47,7 @@ int main(int argc, char *argv[])
halfword *word;
chardesc cd;
- char *myname = "pk2bm", *pkname;
- int atoo(char *);
+ char *myname = "pk2bm", *pkname, *endptr;
const char *myname = "pk2bm";
- char *pkname;
+ char *pkname, *endptr;
while (--argc > 0 && (*++argv)[0] == '-') {
done=0;
@@ -50,26 +49,36 @@ int main(int argc, char *argv[])
@@ -56,26 +55,36 @@ int main(int argc, char *argv[])
switch (c) {
case 'c':
if (*++argv[0] == '\0') {
@ -662,7 +685,7 @@
}
w = atoi(argv[0]);
done=1;
@@ -86,7 +95,7 @@ int main(int argc, char *argv[])
@@ -92,7 +101,7 @@ int main(int argc, char *argv[])
}
}
@ -671,17 +694,27 @@
printf("Usage: %s [-bh] {-c char|-o octchar} [-W width -H height] pkfile\n", myname);
exit(1);
}
@@ -199,8 +208,3 @@ quarterword u; int n;
@@ -210,10 +219,3 @@ dots(quarterword u, int n)
}
}
-int atoo(char *oct)
-{ int octal = 0;
-static int
-atoo(char *oct)
-{
- int octal = 0;
- while (*oct != '\0') octal = 8*octal + (*oct++) - '0';
- return octal & 0xff;
-}
--- texk/tetex/fmtutil
+++ texk/tetex/fmtutil 2012-06-20 09:56:15.000000000 +0000
--- texk/texlive/tl_scripts/fmtutil-sys.sh
+++ texk/texlive/tl_scripts/fmtutil-sys.sh 2013-07-31 13:01:24.000000000 +0000
@@ -26,4 +26,5 @@ TEXMFVAR="$v"
TEXMFCONFIG="$c"
export TEXMFVAR TEXMFCONFIG
+umask 022
exec fmtutil ${1+"$@"}
--- texk/texlive/tl_scripts/fmtutil.sh
+++ texk/texlive/tl_scripts/fmtutil.sh 2012-06-20 09:56:15.000000000 +0000
@@ -160,7 +160,12 @@ setupTmpDir()
trap 'cleanup 1' 1 2 3 7 13 15
@ -726,26 +759,26 @@
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
# run in a subshell to get a local effect of TEXPOOL manipulation:
--- texk/tetex/fmtutil.cnf
+++ texk/tetex/fmtutil.cnf 2011-09-14 10:45:24.500873881 +0000
@@ -45,11 +45,11 @@ amstex pdftex - -translate-file=cp227.tc
--- texk/texlive/tl_scripts/fmtutil.cnf
+++ texk/texlive/tl_scripts/fmtutil.cnf 2013-06-28 11:29:31.937439149 +0000
@@ -44,11 +44,11 @@ amstex pdftex - -translate-file=cp227.tc
# from context:
cont-en pdftex cont-usr.tex -8bit *cont-en.ini
cont-en xetex cont-usr.tex -8bit *cont-en.ini
-#! cont-de pdftex cont-usr.tex -8bit *cont-de.ini
-#! cont-fr pdftex cont-usr.tex -8bit *cont-fr.ini
-#! cont-it pdftex cont-usr.tex -8bit *cont-it.ini
-#! cont-nl pdftex cont-usr.tex -8bit *cont-nl.ini
-#! cont-ro pdftex cont-usr.tex -8bit *cont-ro.ini
+cont-de pdftex cont-usr.tex -8bit *cont-de.ini
+cont-fr pdftex cont-usr.tex -8bit *cont-fr.ini
+cont-it pdftex cont-usr.tex -8bit *cont-it.ini
+cont-nl pdftex cont-usr.tex -8bit *cont-nl.ini
+cont-ro pdftex cont-usr.tex -8bit *cont-ro.ini
cont-en pdftex cont-usr.tex -8bit *cont-en.mkii
cont-en xetex cont-usr.tex -8bit *cont-en.mkii
-#! cont-de pdftex cont-usr.tex -8bit *cont-de.mkii
-#! cont-fr pdftex cont-usr.tex -8bit *cont-fr.mkii
-#! cont-it pdftex cont-usr.tex -8bit *cont-it.mkii
-#! cont-nl pdftex cont-usr.tex -8bit *cont-nl.mkii
-#! cont-ro pdftex cont-usr.tex -8bit *cont-ro.mkii
+cont-de pdftex cont-usr.tex -8bit *cont-de.mkii
+cont-fr pdftex cont-usr.tex -8bit *cont-fr.mkii
+cont-it pdftex cont-usr.tex -8bit *cont-it.mkii
+cont-nl pdftex cont-usr.tex -8bit *cont-nl.mkii
+cont-ro pdftex cont-usr.tex -8bit *cont-ro.mkii
#
# from cslatex:
cslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini
@@ -63,8 +63,8 @@ pdfcsplain pdftex - -etex -translate-fil
cslatex pdftex - -etex cslatex.ini
@@ -64,8 +64,8 @@ pdfcsplain pdftex - -etex -enc csplain-u
eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
#
# from jadetex:
@ -756,7 +789,7 @@
#
# from latex-bin:
latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
@@ -117,5 +117,5 @@ xetex xetex language.def -etex xetex.ini
@@ -123,5 +123,5 @@ xetex xetex language.def -etex xetex.ini
xelatex xetex language.dat -etex xelatex.ini
#
# from xmltex:
@ -765,8 +798,8 @@
+xmltex pdftex language.dat -translate-file=cp227.tcx *xmltex.ini
+pdfxmltex pdftex language.dat -translate-file=cp227.tcx *pdfxmltex.ini
--- texk/texlive/linked_scripts/musixtex/musixtex.lua
+++ texk/texlive/linked_scripts/musixtex/musixtex.lua 2011-12-14 11:04:34.139646956 +0000
@@ -67,6 +67,11 @@ tex = "etex"
+++ texk/texlive/linked_scripts/musixtex/musixtex.lua 2013-06-28 11:32:20.681770281 +0000
@@ -75,6 +75,11 @@ tex = "etex"
musixflx = "musixflx"
dvi = "dvips"
ps2pdf = "ps2pdf"
@ -775,11 +808,19 @@
+ dvi = ""
+ ps2pdf = ""
+end
intermediate = 1
passes = 2
exit_code = 0
narg = 1
--- texk/tetex/texconfig
+++ texk/tetex/texconfig 2009-09-02 12:47:26.000000000 +0000
--- texk/texlive/tl_scripts/texconfig-sys.sh
+++ texk/texlive/tl_scripts/texconfig-sys.sh 2013-07-31 13:02:15.000000000 +0000
@@ -28,4 +28,5 @@ TEXMFVAR="$v"
TEXMFCONFIG="$c"
export TEXMFVAR TEXMFCONFIG
+umask 022
exec texconfig ${1+"$@"}
--- texk/texlive/tl_scripts/texconfig.sh
+++ texk/texlive/tl_scripts/texconfig.sh 2009-09-02 12:47:26.000000000 +0000
@@ -37,7 +37,7 @@ envVars="
TEXMFDBS TEXMFINI TEXMFSCRIPTS TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS
TEXSOURCES TFMFONTS TRFONTS TTFONTS VFFONTS WEB2C WEBINPUTS
@ -843,8 +884,8 @@
;;
#
--- texk/tetex/texconfig-dialog
+++ texk/tetex/texconfig-dialog 2009-09-02 12:47:26.000000000 +0000
--- texk/texlive/tl_scripts/texconfig-dialog.sh
+++ texk/texlive/tl_scripts/texconfig-dialog.sh 2009-09-02 12:47:26.000000000 +0000
@@ -159,7 +159,14 @@ termCtl()
###############################################################################
menuMain()
@ -873,8 +914,8 @@
while :; do
logMessage='view logfile'
--- texk/tetex/texlinks
+++ texk/tetex/texlinks 2009-09-02 12:47:26.000000000 +0000
--- texk/texlive/tl_scripts/texlinks.sh
+++ texk/texlive/tl_scripts/texlinks.sh 2009-09-02 12:47:26.000000000 +0000
@@ -106,7 +106,7 @@ setupTmpDir()
trap 'cleanup 1' 1 2 3 7 13 15
@ -972,6 +1013,14 @@
test "x$fmt" = "x$engine" && continue
if test -f "$d/$engine$exeext"; then
case $unlink in
--- texk/texlive/tl_scripts/updmap-sys.sh
+++ texk/texlive/tl_scripts/updmap-sys.sh 2013-07-31 13:02:45.000000000 +0000
@@ -27,4 +27,5 @@ TEXMFVAR="$v"
TEXMFCONFIG="$c"
export TEXMFVAR TEXMFCONFIG
+umask 022
exec updmap ${1+"$@"}
--- texk/web2c/Makefile.in
+++ texk/web2c/Makefile.in 2011-12-09 14:00:22.711147221 +0000
@@ -2445,7 +2445,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m

3
texlive-20120611-source.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d36a0c5910e08cb24c0ca87214e23cd6df5519dc9ce32afac8b71296a25a909a
size 78033316

3
texlive-20130620-source.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7e255171866fc0412d3315c86f8aea12128589774d7de156fd38718c6f87fe31
size 106893260

41
texlive.changes
View File

@ -1,15 +1,36 @@
-------------------------------------------------------------------
Wed Jul 17 08:54:11 UTC 2013 - werner@suse.de
Tue Jul 30 16:14:46 UTC 2013 - werner@suse.de
- Use PreReq for own packages instead of Requires(pre)
-------------------------------------------------------------------
Tue Jul 16 12:36:45 UTC 2013 - werner@suse.de
- Let texlive-biber require perl(LWP::UserAgent) to be able to
read system based certificates
- New rpm had removed "prereq" flag from installation script bits
that is that `Requires(prereq)' is not valid anymore :(((
- Update to TeXLive 2013 (timestamp 20130620)
+ Distribution layout: the top-level texmf/ directory has been
merged into texmf-dist/, for simplicity. Both the TEXMFMAIN
and TEXMFDIST Kpathsea variables now point to texmf-dist.
+ Many small language collections have been merged together,
to simplify installation.
+ MetaPost: native support for PNG output and floating-point
(IEEE double) has been added.
+ LuaTEX: updated to Lua 5.2, and includes a new library
(pdfscanner) to process external PDF page content, among
much else (see its web pages).
+ XeTEX (also see its web pages for more):
The HarfBuzz library now used for font layout instead of ICU.
Graphite2 and HarfBuzz are used instead of SilGraphite for Graphite layout.
On Macs, Core Text is used instead of the (deprecated) ATSUI.
Prefer TrueType/OpenType fonts to Type1 when the names are the same.
Fix occasional mismatch in font finding between XeTEX and xdvipdfmx.
Support OpenType math cut-ins.
+ xdvi: now uses FreeType instead of t1lib for rendering.
+ microtype.sty: some support for XeTEX (protrusion) and LuaTEX
(protrusion, font expansion, tracking), among other enhancements.
- Update biblatex-biber to 1.7
- Udpate biblatex of TeXLive 2013 to 2.7a
- Remove source-binary-open.dif as now upstream
- Remove source-xdvi-xkbbell.dif as now upstream
- Add biber-certs.dif to use system certificates instead of Mozilla CA
- Add biber-dev.patch to make biblatex-biber work with perl 5.18.0
- Modify source-64.dif, source-asymptote.dif, source-poppler.dif,
source-texdoc.dif, source-warns.dif, and source.dif to make it
compile.
-------------------------------------------------------------------
Thu May 16 09:35:39 CEST 2013 - mhrusecky@suse.cz

527
texlive.spec
View File

File diff suppressed because it is too large Load Diff