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

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=184
This commit is contained in:
Dr. Werner Fink 2015-03-30 11:39:58 +00:00 committed by Git OBS Bridge
parent db336f0128
commit c9648a2a34
30 changed files with 1123 additions and 2056 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

194
biber-av.patch
View File

@ -1,194 +0,0 @@
diff --git a/Build.PL b/Build.PL
index 104d839..ca3e00c 100644
--- a/Build.PL
+++ b/Build.PL
@@ -40,9 +40,9 @@ my $builder = $class->new(
'ExtUtils::LibBuilder' => '0.02'
},
requires => {
+ 'autovivification' => 0,
'Data::Dump' => 0,
'Data::Compare' => 0,
- 'Data::Diver' => 0,
'Date::Simple' => 0,
'File::Slurp' => 0,
'IPC::Cmd' => 0,
diff --git a/lib/Biber/Entry.pm b/lib/Biber/Entry.pm
index 9c6fc4b..385c90e 100644
--- a/lib/Biber/Entry.pm
+++ b/lib/Biber/Entry.pm
@@ -6,7 +6,6 @@ use warnings;
use Biber::Utils;
use Biber::Internals;
use Biber::Constants;
-use Data::Diver qw( Dive );
use Data::Dump qw( pp );
use Digest::MD5 qw( md5_hex );
use Log::Log4perl qw( :no_extra_logdie_message );
@@ -322,6 +321,7 @@ sub set_field {
=cut
sub get_field {
+ no autovivification;
my $self = shift;
my ($key, $form, $lang) = @_;
return undef unless $key;
@@ -332,9 +332,9 @@ sub get_field {
$form = 'original';
$lang = 'default';
}
- return Dive($self, 'datafields', $key, $form, $lang) //
- Dive($self, 'derivedfields', $key, $form, $lang) //
- Dive($self, 'rawfields', $key);
+ return $self->{datafields}{$key}{$form}{$lang} //
+ $self->{derivedfields}{$key}{$form}{$lang} //
+ $self->{rawfields}{$key};
}
@@ -345,11 +345,12 @@ sub get_field {
=cut
sub get_field_forms {
+ no autovivification;
my $self = shift;
my $key = shift;
return undef unless $key;
- return Dive($self, 'datafields', $key) ||
- Dive($self, 'derivedfields', $key);
+ return $self->{datafields}{$key} ||
+ $self->{derivedfields}{$key};
}
=head2 get_field_form_names
@@ -359,11 +360,12 @@ sub get_field_forms {
=cut
sub get_field_form_names {
+ no autovivification;
my $self = shift;
my $key = shift;
return undef unless $key;
- return sort keys %{Dive($self, 'datafields', $key) ||
- Dive($self, 'derivedfields', $key) ||
+ return sort keys %{$self->{datafields}{$key} ||
+ $self->{derivedfields}{$key} ||
{}};
}
@@ -374,12 +376,13 @@ sub get_field_form_names {
=cut
sub get_field_form_lang_names {
+ no autovivification;
my $self = shift;
my ($key, $form) = @_;
return undef unless $key;
return undef unless $form;
- return sort keys %{Dive($self, 'datafields', $key, $form) ||
- Dive($self, 'derivedfields', $key, $form) ||
+ return sort keys %{$self->{datafields}{$key}{$form} ||
+ $self->{derivedfields}{$key}{$form} ||
{}};
}
@@ -432,9 +435,10 @@ sub set_rawfield {
=cut
sub get_rawfield {
+ no autovivification;
my $self = shift;
my $key = shift;
- return Dive($self, 'rawfields', $key);
+ return $self->{rawfields}{$key};
}
@@ -445,11 +449,12 @@ sub get_rawfield {
=cut
sub get_datafield {
+ no autovivification;
my $self = shift;
my ($key, $form, $lang) = @_;
$form = $form || 'original';
$lang = $lang || 'default';
- return Dive($self, 'datafields', $key, $form, $lang);
+ return $self->{datafields}{$key}{$form}{$lang};
}
@@ -489,11 +494,12 @@ sub del_datafield {
=cut
sub field_exists {
+ no autovivification;
my $self = shift;
my $key = shift;
- return (Dive($self, 'datafields', $key) ||
- Dive($self, 'derivedfields', $key) ||
- Dive($self, 'rawfields', $key)) ? 1 : 0;
+ return ($self->{datafields}{$key} ||
+ $self->{derivedfields}{$key} ||
+ $self->{rawfields}{$key}) ? 1 : 0;
}
=head2 field_form_exists
@@ -503,11 +509,12 @@ sub field_exists {
=cut
sub field_form_exists {
+ no autovivification;
my $self = shift;
my ($key, $form) = @_;
$form = $form || 'original';
- return (Dive($self, 'datafields', $key, $form) ||
- Dive($self, 'derivedfields', $key, $form)) ? 1 : 0;
+ return ($self->{datafields}{$key}{$form} ||
+ $self->{derivedfields}{$key}{$form}) ? 1 : 0;
}
@@ -583,11 +590,12 @@ sub count_fields {
=cut
sub has_keyword {
+ no autovivification;
my $self = shift;
my ($keyword, $form, $lang) = @_;
$form = $form || 'original';
$lang = $lang || 'default';
- if (my $keywords = Dive($self, 'datafields', 'keywords', $form, $lang)) {
+ if (my $keywords = $self->{datafields}{keywords}{$form}{$lang}) {
return (first {$_ eq $keyword} @$keywords) ? 1 : 0;
}
else {
diff --git a/lib/Biber/Internals.pm b/lib/Biber/Internals.pm
index 0255ab1..59d7151 100644
--- a/lib/Biber/Internals.pm
+++ b/lib/Biber/Internals.pm
@@ -8,7 +8,6 @@ use Biber::Constants;
use Biber::Utils;
use Biber::DataModel;
use Data::Compare;
-use Data::Diver qw( Dive );
use List::AllUtils qw( :all );
use Log::Log4perl qw(:no_extra_logdie_message);
use Digest::MD5 qw( md5_hex );
@@ -1104,6 +1103,7 @@ sub _sort_labeltitle {
}
sub _sort_labeldate {
+ no autovivification;
my ($self, $citekey, $sortelementattributes, $args) = @_;
my $ldc = $args->[0]; # labeldate component
my $secnum = $self->get_current_section;
@@ -1111,7 +1111,7 @@ sub _sort_labeldate {
my $be = $section->bibentry($citekey);
# re-direct to the right sorting routine for the labeldate component
if (my $ldi = $be->get_labeldate_info) {
- if (my $ldf = Dive($ldi, 'field', $ldc)) {
+ if (my $ldf = $ldi->{field}{$ldc}) {
# Don't process attributes as they will be processed in the real sub
return $self->_dispatch_sorting($ldf, $citekey, $sortelementattributes);
}

224
biber-certs.dif
View File

@ -1,224 +0,0 @@
--- 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;

74
biber-decode.diff
View File

@ -2,41 +2,14 @@
# longer short-circuits if the input is already utf8. Instead,
# it dies with a 'Cannot decode string with wide characters'
# error message.
--- ./lib/Biber/Input/file/bibtex.pm.orig 2014-07-15 16:11:39.039227206 +0000
+++ ./lib/Biber/Input/file/bibtex.pm 2014-07-15 16:15:57.321972318 +0000
@@ -592,7 +592,8 @@ sub _literal {
# URI fields
sub _uri {
my ($bibentry, $entry, $f) = @_;
- my $value = NFC(decode_utf8($entry->get($f)));# Unicode NFC boundary (before hex encoding)
+ my $value = $entry->get($f);
+ $value = NFC(Encode::is_utf8($value) ? $value : decode_utf8($value)); # Unicode NFC boundary (before hex encoding)
my ($field, $form, $lang) = $f =~ m/$fl_re/xms;
---
lib/Biber/Input/file/bibtex.pm | 5 +++--
lib/Biber/Output/bibtex.pm | 3 ++-
lib/Biber/Utils.pm | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
# If there are some escapes in the URI, unescape them
@@ -600,7 +601,7 @@ sub _uri {
$value =~ s/\\%/%/g; # just in case someone BibTeX escaped the "%"
# This is what uri_unescape() does but it's faster
$value =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg;
- $value = NFC(decode_utf8($value));# Unicode NFC boundary (before hex encoding)
+ $value = NFC(Encode::is_utf8($value) ? $value : decode_utf8($value)); # Unicode NFC boundary (before hex encoding)
}
$value = URI->new($value)->as_string;
--- ./lib/Biber/Output/bibtex.pm.orig 2014-07-15 16:14:07.925503890 +0000
+++ ./lib/Biber/Output/bibtex.pm 2014-07-15 16:18:47.922143172 +0000
@@ -100,7 +100,8 @@ sub set_output_entry {
next if first {lc($f) eq $_} ('xdata', 'crossref');
}
# Save post-mapping data for tool mode
- my $value = decode_utf8($be->get_rawfield($f));
+ my $value = $be->get_rawfield($f);
+ $value = decode_utf8($value) unless Encode::is_utf8($value);
$acc .= ' ' x Biber::Config->getoption('tool_indent');
$acc .= $casing->($f);
$acc .= ' ' x ($max_field_len - Unicode::GCString->new($f)->length) if Biber::Config->getoption('tool_align');
--- ./lib/Biber/Utils.pm.orig 2014-07-15 16:12:11.829067919 +0000
+++ ./lib/Biber/Utils.pm 2014-07-15 16:17:57.874386675 +0000
--- lib/Biber/Utils.pm
+++ lib/Biber/Utils.pm 2014-07-15 16:17:58.000000000 +0000
@@ -147,7 +147,7 @@ sub locate_biber_file {
chomp $found;
$found =~ s/\cM\z//xms; # kpsewhich in cygwin sometimes returns ^M at the end
@ -55,3 +28,36 @@
}
=head2 out
--- lib/Biber/Input/file/bibtex.pm
+++ lib/Biber/Input/file/bibtex.pm 2014-07-15 16:15:57.000000000 +0000
@@ -605,7 +605,8 @@ sub _literal {
# URI fields
sub _uri {
my ($bibentry, $entry, $f) = @_;
- my $value = NFC(decode_utf8($entry->get($f)));# Unicode NFC boundary (before hex encoding)
+ my $value = $entry->get($f);
+ $value = NFC(Encode::is_utf8($value) ? $value : decode_utf8($value)); # Unicode NFC boundary (before hex encoding)
my ($field, $form, $lang) = $f =~ m/$fl_re/xms;
# If there are some escapes in the URI, unescape them
@@ -613,7 +614,7 @@ sub _uri {
$value =~ s/\\%/%/g; # just in case someone BibTeX escaped the "%"
# This is what uri_unescape() does but it's faster
$value =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg;
- $value = NFC(decode_utf8($value));# Unicode NFC boundary (before hex encoding)
+ $value = NFC(Encode::is_utf8($value) ? $value : decode_utf8($value)); # Unicode NFC boundary (before hex encoding)
}
$value = URI->new($value)->as_string;
--- lib/Biber/Output/bibtex.pm
+++ lib/Biber/Output/bibtex.pm 2015-03-26 11:32:20.345519079 +0000
@@ -100,7 +100,8 @@ sub set_output_entry {
next if first {lc($f) eq $_} ('xdata', 'crossref');
}
- my $value = decode_utf8($be->get_rawfield($f));
+ my $value = $be->get_rawfield($f);
+ $value = decode_utf8($value) unless Encode::is_utf8($value);
$acc .= ' ' x Biber::Config->getoption('output_indent');
$acc .= $casing->($f);
$acc .= ' ' x ($max_field_len - Unicode::GCString->new($f)->length) if Biber::Config->getoption('output_align');

249
biber-dev.patch
View File

@ -1,249 +0,0 @@
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>

12
biber-noreadonly.diff
View File

@ -3,9 +3,13 @@
# the namespace variable is readoonly as the unregistration attempts to
# modify the value
diff -ru biblatex-biber-1.7.org/lib/Biber/Input/file/biblatexml.pm biblatex-biber-1.7/lib/Biber/Input/file/biblatexml.pm
--- biblatex-biber-1.7.org/lib/Biber/Input/file/biblatexml.pm 2014-01-31 14:22:27.906441935 -0500
+++ biblatex-biber-1.7/lib/Biber/Input/file/biblatexml.pm 2014-01-31 14:25:36.144787433 -0500
@@ -23,7 +23,6 @@
---
lib/Biber/Input/file/biblatexml.pm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- lib/Biber/Input/file/biblatexml.pm
+++ lib/Biber/Input/file/biblatexml.pm 2014-01-31 19:25:36.000000000 +0000
@@ -23,7 +23,6 @@ use Log::Log4perl qw(:no_extra_logdie_me
use List::AllUtils qw( uniq );
use XML::LibXML;
use XML::LibXML::Simple;
@ -13,7 +17,7 @@ diff -ru biblatex-biber-1.7.org/lib/Biber/Input/file/biblatexml.pm biblatex-bibe
use Data::Dump qw(dump);
use Unicode::Normalize;
use Unicode::GCString;
@@ -32,8 +31,8 @@
@@ -32,8 +31,8 @@ use URI;
my $logger = Log::Log4perl::get_logger('main');
my $orig_key_order = {};

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

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

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

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

12
biblatex-encoding.dif
View File

@ -1,5 +1,11 @@
---
lib/Biber/Output/base.pm | 1 +
lib/Biber/Output/bbl.pm | 1 +
lib/Biber/Output/dot.pm | 1 +
3 files changed, 3 insertions(+)
--- lib/Biber/Output/base.pm
+++ lib/Biber/Output/base.pm 2013-08-08 09:42:55.189939067 +0000
+++ lib/Biber/Output/base.pm 2013-08-08 09:42:55.000000000 +0000
@@ -5,6 +5,7 @@ use warnings;
use Biber::Entry;
@ -9,7 +15,7 @@
$Text::Wrap::columns = 80;
use Log::Log4perl qw( :no_extra_logdie_message );
--- lib/Biber/Output/bbl.pm
+++ lib/Biber/Output/bbl.pm 2013-08-08 09:43:01.225438687 +0000
+++ lib/Biber/Output/bbl.pm 2013-08-08 09:43:01.000000000 +0000
@@ -10,6 +10,7 @@ use Biber::Entry;
use Biber::Utils;
use List::AllUtils qw( :all );
@ -19,7 +25,7 @@
use Text::Wrap;
$Text::Wrap::columns = 80;
--- lib/Biber/Output/dot.pm
+++ lib/Biber/Output/dot.pm 2013-08-08 09:43:06.605439073 +0000
+++ lib/Biber/Output/dot.pm 2013-08-08 09:43:07.000000000 +0000
@@ -10,6 +10,7 @@ use Biber::Entry;
use Biber::Utils;
use List::AllUtils qw( :all );

126
source-64.dif
View File

@ -1,6 +1,11 @@
---
configure | 4 ++++
m4/libtool.m4 | 4 ++++
2 files changed, 8 insertions(+)
--- configure
+++ configure 2009-08-28 15:44:29.774401466 +0000
@@ -19120,6 +19120,10 @@ rm -f core conftest.err conftest.$ac_obj
+++ configure 2009-08-28 15:44:30.000000000 +0000
@@ -19830,6 +19830,10 @@ fi
# most powerpc-linux boxes support dynamic linking these days and
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
@ -12,8 +17,8 @@
;;
--- m4/libtool.m4
+++ m4/libtool.m4 2009-08-28 15:46:57.481902434 +0000
@@ -2622,6 +2622,10 @@ linux* | k*bsd*-gnu)
+++ m4/libtool.m4 2009-08-28 15:46:57.000000000 +0000
@@ -2681,6 +2681,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
# most powerpc-linux boxes support dynamic linking these days and
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
@ -24,116 +29,3 @@
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)

6
source-arraysubs.dif
View File

@ -1,5 +1,9 @@
---
texk/web2c/bibtex.web | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- texk/web2c/bibtex.web
+++ texk/web2c/bibtex.web 2009-11-12 11:50:51.699429941 +0000
+++ texk/web2c/bibtex.web 2009-11-12 11:50:52.000000000 +0000
@@ -4315,9 +4315,9 @@ special markers |quote_next_fn| and |end
|wiz_functions| array.

25
source-asymptote.dif
View File

@ -1,25 +0,0 @@
--- utils/asymptote/interact.cc
+++ utils/asymptote/interact.cc 2013-05-03 10:25:51.255472000 +0000
@@ -85,6 +85,7 @@ FILE *fin=NULL;
char *readpipeline(const char *prompt)
{
+#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()

129
source-bnc856363.dif
View File

@ -1,129 +0,0 @@
--- texk/xdvik/CHANGES 2013/04/05 02:34:34 1.103 xdvik_22_86
+++ texk/xdvik/CHANGES 2013/09/01 05:55:44 1.107
@@ -9,6 +9,13 @@
may contain undetected bugs. Such versions shouldn't be used
by distributors.
+ * 22.86.01 CVS2 (2013-08-31):
+ + ft.c: Avoid a compiler warning.
+ + font-open.c: Add support for .runlibfileifexists in gs Fontmap file;
+ tweak some messages.
+ + dvi-draw.c: Fixed bug #388 ("currinf.set_char_p is not a registered
+ routine!")
+
* 22.86 (2013-04-04):
+ 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).
--- texk/xdvik/dvi-draw.c 2013/04/05 00:14:54 1.392 xdvik_22_86
+++ texk/xdvik/dvi-draw.c 2013/09/01 05:55:44 1.393
@@ -2962,6 +2962,10 @@
}
maxchar = currinf.fontp->maxchar;
currinf.set_char_p = currinf.fontp->set_char_p;
+#if FREETYPE
+ if (currinf.set_char_p == set_ft_char)
+ do_load_freetype_font();
+#endif
}
if (currinf.set_char_p == set_char) {
@@ -3087,6 +3091,10 @@
}
maxchar = currinf.fontp->maxchar;
currinf.set_char_p = currinf.fontp->set_char_p;
+#if FREETYPE
+ if (currinf.set_char_p == set_ft_char)
+ do_load_freetype_font();
+#endif
}
if (currinf.set_char_p == set_char) {
--- texk/xdvik/font-open.c 2013/04/04 21:05:48 1.55 xdvik_22_86
+++ texk/xdvik/font-open.c 2013/05/14 05:26:19 1.56
@@ -722,6 +722,7 @@
const char *str1_end, *str2_end;
const char *p1, *p2;
FILE *f;
+ unsigned int namelen;
if (str1 == NULL) {
str1 = str2;
@@ -770,6 +771,11 @@
str1 = p1 + 1;
}
+ /* leave the file name in ffline[] for error message */
+ namelen = strlen(name) + 1;
+ if (namelen > ffline_len) expandline(namelen);
+ memcpy(ffline, name, namelen);
+
return NULL;
}
@@ -1087,6 +1093,7 @@
* Allow entries of the following types:
*
* (string) .runlibfile
+ * (string) .runlibfileifexists
* /identifier (string) ;
* /identifier /alias ;
*/
@@ -1096,6 +1103,7 @@
if (ttype == GS_EOF || ttype == GS_ERR)
break;
if (ttype == LPAREN) {
+ Boolean quiet = False;
FILE *f1;
ttype = get_gs_token(&gsf, pos1, &pos2, "Fontmap");
@@ -1106,7 +1114,10 @@
"unexpected end of Fontmap file; giving up."));
break;
}
- if (ttype != '.' || pos2 - pos1 != 11
+ if (ttype == '.' && pos2 - pos1 == 19
+ && memcmp(ffline + pos1, ".runlibfileifexists", 19) == 0)
+ quiet = True;
+ else if (ttype != '.' || pos2 - pos1 != 11
|| memcmp(ffline + pos1, ".runlibfile", 11) != 0) {
TRACE_FT((stderr, "invalid token following \"(%.*s)\" in Fontmap file; giving up.",
(int) pos1, ffline));
@@ -1125,9 +1136,15 @@
free(q);
}
- if (f1 == NULL)
- TRACE_FT((stderr, "Fontmap .runlibfile: %s: %s",
- ffline, strerror(errno)));
+ if (f1 == NULL) {
+ if (!quiet)
+ XDVI_WARNING((stderr, "Fontmap .runlibfile: %s: %s",
+ ffline, strerror(errno)));
+ else
+ TRACE_FT((stderr,
+ "Fontmap .runlibfileifexists: %s: %s\n",
+ ffline, strerror(errno)));
+ }
else {
--gs_fontmap_number;
process_gs_fontmap(f1);
@@ -1347,7 +1364,7 @@
filename = kpse_find_file(t1p->fontfile, kpse_type1_format, 0);
if (filename == NULL) {
- XDVI_WARNING((stderr, "cannot find Type 1 font file %s "
+ TRACE_FT((stderr, "cannot find Type 1 font file %s "
"(will try PK version instead).",
t1p->fontfile));
return NULL;
--- texk/xdvik/xdvi.c 2013/04/05 00:14:55 1.470 xdvik_22_86
+++ texk/xdvik/xdvi.c 2013/09/01 05:55:44 1.471
@@ -3310,7 +3310,7 @@
G_image->byte_order = *((char *)&endian);
}
- /* Store window id for use by src_client_check(). */
+ /* Store window id for use by get_xdvi_window_id(). */
{
long data = XtWindow(globals.widgets.top_level);

125
source-configure.dif
View File

@ -1,32 +1,17 @@
--- configure
+++ configure 2011-09-13 14:13:35.252427069 +0000
@@ -4688,13 +4688,6 @@ if test "${with_libgs_libdir+set}" = set
fi
-## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
-## configure checks for dvisvgm and libgs
-if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then
- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
-fi
-
-
## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
## configure options and TL libraries required for gsftopk
# Check whether --enable-gsftopk was given.
@@ -20437,9 +20430,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "x$syslib_status" = xno; then
as_fn_error $? "some requested system libraries failed" "$LINENO" 5
fi
-if test "x$syslib_used:$enable_native_texlive_build" = xyes:yes; then
- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
-fi
CPPFLAGS=$kpse_save_CPPFLAGS
LIBS=$kpse_save_LIBS
---
configure | 9 ---------
configure.ac | 3 ---
libs/configure | 6 ------
texk/configure | 6 ------
texk/dvipdfm-x/configure | 2 +-
texk/dvipdfm-x/configure.ac | 2 +-
texk/dvisvgm/ac/libgs.ac | 3 ---
utils/configure | 6 ------
8 files changed, 2 insertions(+), 35 deletions(-)
--- configure.ac
+++ configure.ac 2011-09-13 14:11:39.156427284 +0000
@@ -131,9 +131,6 @@ KPSE_FOR_PKGS([sys_libs], [m4_sinclude([
+++ configure.ac 2011-09-13 14:11:39.000000000 +0000
@@ -126,9 +126,6 @@ KPSE_FOR_PKGS([sys_libs], [m4_sinclude([
if test "x$syslib_status" = xno; then
AC_MSG_ERROR([some requested system libraries failed])
fi
@ -36,9 +21,9 @@
KPSE_RESTORE_FLAGS
AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes])
--- libs/configure
+++ libs/configure 2011-09-13 14:11:51.207926324 +0000
@@ -4021,13 +4021,6 @@ if test "${with_libgs_libdir+set}" = set
--- configure
+++ configure 2015-03-26 09:27:45.318018917 +0000
@@ -5087,12 +5087,6 @@ if test "${with_libgs_libdir+set}" = set
fi
@ -48,13 +33,37 @@
- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
-fi
-
## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
## configure options and TL libraries required for gsftopk
# Check whether --enable-gsftopk was given.
@@ -21190,9 +21184,6 @@ fi
if test "x$syslib_status" = xno; then
as_fn_error $? "some requested system libraries failed" "$LINENO" 5
fi
-if test "x$syslib_used:$enable_native_texlive_build" = xyes:yes; then
- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
-fi
CPPFLAGS=$kpse_save_CPPFLAGS
LIBS=$kpse_save_LIBS
--- libs/configure
+++ libs/configure 2015-03-26 09:28:44.382019625 +0000
@@ -4337,12 +4337,6 @@ if test "${with_libgs_libdir+set}" = set
fi
-## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
-## configure checks for dvisvgm and libgs
-if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then
- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
-fi
-
## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
## configure options and TL libraries required for gsftopk
# Check whether --enable-gsftopk was given.
--- texk/configure
+++ texk/configure 2011-09-13 14:12:16.719926873 +0000
@@ -4041,13 +4041,6 @@ if test "${with_libgs_libdir+set}" = set
+++ texk/configure 2015-03-26 09:37:13.349518912 +0000
@@ -4350,12 +4350,6 @@ if test "${with_libgs_libdir+set}" = set
fi
@ -63,13 +72,34 @@
-if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then
- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
-fi
-
-
## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
## configure options and TL libraries required for gsftopk
# Check whether --enable-gsftopk was given.
--- texk/dvipdfm-x/configure.ac
+++ texk/dvipdfm-x/configure.ac 2015-03-26 09:30:34.909518259 +0000
@@ -6,7 +6,7 @@ dnl This file is free software; the co
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-AC_INIT([dvipdfm-x (TeX Live)], [20140317], [tex-k@tug.org])
+AC_INIT([dvipdfmx (TeX Live)], [20140317], [tex-k@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([agl.c])
AC_CONFIG_AUX_DIR([../../build-aux])
--- texk/dvipdfm-x/configure
+++ texk/dvipdfm-x/configure 2015-03-26 09:36:34.993519313 +0000
@@ -7892,7 +7892,7 @@ fi
# Define the identity of the package.
- PACKAGE='dvipdfm-x--tex-live-'
+ PACKAGE='dvipdfmx'
VERSION='20140317'
--- texk/dvisvgm/ac/libgs.ac
+++ texk/dvisvgm/ac/libgs.ac 2011-09-13 14:12:02.947925410 +0000
+++ texk/dvisvgm/ac/libgs.ac 2011-09-13 14:12:03.000000000 +0000
@@ -4,6 +4,3 @@ dnl Copyright (C) 2009 Peter Breitenlohn
dnl You may freely use, modify and/or distribute this file.
dnl
@ -78,8 +108,8 @@
- AC_MSG_ERROR([you can not use system libraries for a native TeX Live build])
-fi
--- utils/configure
+++ utils/configure 2011-09-13 14:12:29.125501986 +0000
@@ -4018,13 +4018,6 @@ if test "${with_libgs_libdir+set}" = set
+++ utils/configure 2015-03-26 09:37:31.906018530 +0000
@@ -4329,12 +4329,6 @@ if test "${with_libgs_libdir+set}" = set
fi
@ -88,30 +118,7 @@
-if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then
- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
-fi
-
-
## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
## configure options and TL libraries required for gsftopk
# Check whether --enable-gsftopk was given.
--- texk/dvipdfm-x/configure.ac
+++ texk/dvipdfm-x/configure.ac 2014-01-13 11:10:27.000000000 +0000
@@ -6,7 +6,7 @@ dnl This file is free software; the co
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-AC_INIT([dvipdfm-x], [20130405], [tex-k@tug.org])
+AC_INIT([dvipdfmx], [20130405], [tex-k@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([src/dvipdfmx.c])
AC_CONFIG_AUX_DIR([../../build-aux])
--- texk/dvipdfm-x/configure
+++ texk/dvipdfm-x/configure 2014-01-13 11:11:08.000000000 +0000
@@ -7883,7 +7883,7 @@ fi
# Define the identity of the package.
- PACKAGE='dvipdfm-x'
+ PACKAGE='dvipdfmx'
VERSION='20130405'

52
source-dvipdfmx.dif
View File

@ -1,52 +0,0 @@
--- texk/dvipdfm-x/src/dpxcrypt.c
+++ texk/dvipdfm-x/src/dpxcrypt.c 2014-01-13 11:02:13.742235821 +0000
@@ -289,7 +289,7 @@ void MD5_final (unsigned char *outbuf, M
#define X(a) do { *p++ = hd->a; *p++ = hd->a >> 8; \
*p++ = hd->a >> 16; *p++ = hd->a >> 24; } while (0)
#else /* little endian */
-#define X(a) do { *(unsigned long *)p = (*hd).a ; p += 4; } while (0)
+#define X(a) do { *(uint32_t *)p = (*hd).a ; p += sizeof(uint32_t); } while (0)
#endif
X(A);
X(B);
--- texk/dvipdfm-x/src/dpxcrypt.h
+++ texk/dvipdfm-x/src/dpxcrypt.h 2014-01-13 11:02:13.658236115 +0000
@@ -24,10 +24,11 @@
#define _DPXCRYPT_H_
#include <stdio.h>
+#include <stdint.h>
/* libgcrypt md5 */
typedef struct {
- unsigned long A,B,C,D; /* chaining variables */
+ uint32_t A,B,C,D; /* chaining variables */
unsigned long nblocks;
unsigned char buf[64];
int count;
--- texk/dvipdfm-x/xsrc/dpxcrypt.c
+++ texk/dvipdfm-x/xsrc/dpxcrypt.c 2014-01-13 11:02:33.490235748 +0000
@@ -289,7 +289,7 @@ void MD5_final (unsigned char *outbuf, M
#define X(a) do { *p++ = hd->a; *p++ = hd->a >> 8; \
*p++ = hd->a >> 16; *p++ = hd->a >> 24; } while (0)
#else /* little endian */
-#define X(a) do { *(unsigned long *)p = (*hd).a ; p += 4; } while (0)
+#define X(a) do { *(uint32_t *)p = (*hd).a ; p += sizeof(uint32_t); } while (0)
#endif
X(A);
X(B);
--- texk/dvipdfm-x/xsrc/dpxcrypt.h
+++ texk/dvipdfm-x/xsrc/dpxcrypt.h 2014-01-13 11:02:33.406235303 +0000
@@ -24,10 +24,11 @@
#define _DPXCRYPT_H_
#include <stdio.h>
+#include <stdint.h>
/* libgcrypt md5 */
typedef struct {
- unsigned long A,B,C,D; /* chaining variables */
+ uint32_t A,B,C,D; /* chaining variables */
unsigned long nblocks;
unsigned char buf[64];
int count;

235
source-dviutils.dif
View File

@ -1,5 +1,25 @@
---
m4/kpse-kpathsea-flags.m4 | 2 +-
texk/seetexk/a4toa5 | 26 ++++++++++++++++++++++++++
texk/seetexk/configure | 2 +-
texk/seetexk/dvibook.c | 6 +++---
texk/seetexk/dviconcat.c | 6 ++----
texk/seetexk/dviselect.c | 9 ++++-----
texk/seetexk/dvitodvi.c | 40 ++++++++++++++++++++++++++++++++--------
texk/seetexk/error.c | 14 +++++---------
texk/seetexk/gripes.h | 21 +++++++++++----------
texk/seetexk/gripes0.c | 12 +++++-------
texk/seetexk/gripes1.c | 17 +++++++++--------
texk/seetexk/mydvichk | 12 ++++++++++++
texk/seetexk/odd2even | 22 ++++++++++++++++++++++
texk/seetexk/search.c | 5 +----
texk/seetexk/seek.c | 11 +++++------
texk/seetexk/tempfile.c | 5 ++---
texk/seetexk/types.h | 2 +-
17 files changed, 142 insertions(+), 70 deletions(-)
--- m4/kpse-kpathsea-flags.m4
+++ m4/kpse-kpathsea-flags.m4 2010-11-12 11:51:59.947926203 +0000
+++ m4/kpse-kpathsea-flags.m4 2015-03-26 09:47:05.605560584 +0000
@@ -19,7 +19,7 @@
AC_DEFUN([KPSE_KPATHSEA_FLAGS],
[AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
@ -9,29 +29,8 @@
[${top_srcdir}/../kpathsea/*.[ch]],
[${top_builddir}/../kpathsea/paths.h])
m4_if(m4_index([ $1 ], [ no-debug ]), [-1],
--- texk/seetexk/search.c
+++ texk/seetexk/search.c 2009-08-28 14:13:32.877901585 +0000
@@ -19,6 +19,7 @@
* it runs in increasing-key-value sequence).
*/
+#include <stdlib.h>
#include "types.h"
#include "search.h"
@@ -30,10 +31,6 @@
static int DOffset; /* part of alignment code */
-#ifndef KPATHSEA
-char *malloc(), *realloc();
-#endif
-
struct search *
SCreate(unsigned int dsize)
{
--- texk/seetexk/a4toa5
+++ texk/seetexk/a4toa5 2010-11-12 11:50:39.552426619 +0000
+++ texk/seetexk/a4toa5 2010-11-12 11:50:40.000000000 +0000
@@ -0,0 +1,26 @@
+#!/bin/csh -f
+# 1993 (c) Werner Fink <Werner.Fink@itap.physik.uni-stuttgart.de>
@ -60,8 +59,8 @@
+#
+exec dvitodvi -q '2:707@0(-5.5mm,-10mm)+1(190mm,-10mm)' $1 $2
--- texk/seetexk/configure
+++ texk/seetexk/configure 2012-06-12 16:08:20.232473178 +0200
@@ -14258,7 +14258,7 @@ if test "x$with_kpathsea_libdir" != x &&
+++ texk/seetexk/configure 2012-06-12 14:08:20.000000000 +0000
@@ -14570,7 +14570,7 @@ if test "x$with_kpathsea_libdir" != x &&
KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS"
fi
else
@ -71,8 +70,8 @@
KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la'
KPATHSEA_RULE='# Rebuild libkpathsea
--- texk/seetexk/dvibook.c
+++ texk/seetexk/dvibook.c 2009-08-28 14:13:32.721901870 +0000
@@ -27,6 +27,7 @@ extern char *optarg;
+++ texk/seetexk/dvibook.c 2009-08-28 14:13:33.000000000 +0000
@@ -43,6 +43,7 @@ extern char *optarg;
extern int optind;
#endif
@ -80,7 +79,7 @@
#include "types.h"
#include "dviclass.h"
#include "dvicodes.h"
@@ -35,6 +36,8 @@ extern int optind;
@@ -51,6 +52,8 @@ extern int optind;
#include "gripes.h"
#include "search.h"
#include <stdio.h>
@ -89,7 +88,7 @@
#include <ctype.h>
#include "seek.h"
@@ -101,9 +104,6 @@ i32 Count[10]; /* the 10 \count variabl
@@ -117,9 +120,6 @@ i32 Count[10]; /* the 10 \count variabl
/* save some string space: we use this a lot */
char writeerr[] = "error writing DVI file";
@ -100,8 +99,8 @@
* You may get lint warnings about sprintf's return value.
* Older versions of 4BSD have `char *sprintf()'. ANSI and
--- texk/seetexk/dviconcat.c
+++ texk/seetexk/dviconcat.c 2009-08-28 14:31:09.497902049 +0000
@@ -25,6 +25,8 @@ extern char *optarg;
+++ texk/seetexk/dviconcat.c 2015-03-26 09:48:14.217518786 +0000
@@ -40,6 +40,8 @@ extern char *optarg;
extern int optind;
#endif
@ -110,25 +109,20 @@
#include "types.h"
#include "dviclass.h"
#include "dvicodes.h"
@@ -87,15 +89,9 @@ i16 DVIStackSize; /* max of all stack s
char writeerr[] = "error writing DVI file";
@@ -103,10 +105,6 @@ char writeerr[] = "error writing DVI fil
static void HandleDVIFile(void);
-#ifdef _AMIGA
#define bcmp(s1, s2, len) memcmp(s1, s2, len)
#define bzero(s, len) memset(s, '\0', len)
#define index(s, c) strchr(s, c)
-#endif /* _AMIGA */
-
-#ifndef KPATHSEA
-char *malloc(), *realloc();
-#endif
-
/* extern int getopt(int, char **, char*); */
/*
--- texk/seetexk/dviselect.c
+++ texk/seetexk/dviselect.c 2009-08-28 14:32:32.286401443 +0000
@@ -38,7 +38,10 @@ extern int optind;
+++ texk/seetexk/dviselect.c 2015-03-26 09:48:41.726020097 +0000
@@ -54,7 +54,10 @@ extern int optind;
#include "gripes.h"
#include "search.h"
#include <stdio.h>
@ -139,23 +133,18 @@
#define white(x) ((x) == ' ' || (x) == '\t' || (x) == ',')
@@ -148,15 +151,9 @@ static int ParsePages(char *);
static void HandleDVIFile(void);
@@ -166,10 +169,6 @@ static void HandleDVIFile(void);
static void PutFontSelector(i32);
static void WritePreAmble(void);
-#ifdef _AMIGA
#define bcmp(s1, s2, len) memcmp(s1, s2, len)
#define bzero(s, len) memset(s, '\0', len)
#define index(s, c) strchr(s, c)
-#endif /* _AMIGA */
-
-#ifndef KPATHSEA
-char *malloc(), *realloc();
-#endif /* not KPATHSEA */
-
/*
* You may get lint warnings about sprintf's return value.
@@ -550,7 +547,7 @@ Usage: %s [-s] [-i infile] [-o outfile]
* Older versions of 4BSD have `char *sprintf()'. ANSI and
@@ -601,7 +600,7 @@ Usage: %s [-s] [-i infile] [-o outfile]
static struct pagelist *
InstallPL(struct pagesel *ps, int n, int absolute)
{
@ -165,8 +154,8 @@
pl = (struct pagelist *)malloc(sizeof *pl);
if (pl == NULL)
--- texk/seetexk/dvitodvi.c
+++ texk/seetexk/dvitodvi.c 2012-04-13 14:45:18.261443109 +0000
@@ -42,6 +42,7 @@ extern char *optarg;
+++ texk/seetexk/dvitodvi.c 2012-04-13 14:45:18.000000000 +0000
@@ -43,6 +43,7 @@ extern char *optarg;
extern int optind;
#endif
@ -174,7 +163,7 @@
#include "types.h"
#include "dviclass.h"
#include "dvicodes.h"
@@ -50,6 +51,8 @@ extern int optind;
@@ -51,6 +52,8 @@ extern int optind;
#include "gripes.h"
#include "search.h"
#include <stdio.h>
@ -183,7 +172,7 @@
#include <ctype.h>
#define white(x) ((x) == ' ' || (x) == '\t' || (x) == ',')
@@ -86,6 +89,7 @@ struct fontinfo {
@@ -87,6 +90,7 @@ struct fontinfo {
i32 Width; /* width of page */
i32 Height; /* height of page */
i32 Magnification; /* Magnification of pages */
@ -191,7 +180,7 @@
int Modulo; /* page spec modulo */
struct pagespec *PageSpecs; /* page specification list */
@@ -122,9 +126,6 @@ i32 Count[10]; /* the 10 \count variabl
@@ -123,9 +127,6 @@ i32 Count[10]; /* the 10 \count variabl
/* save some string space: we use this a lot */
char writeerr[] = "error writing DVI file";
@ -201,7 +190,7 @@
static void WriteFont(struct fontinfo *fi);
static void PutFontSelector(i32 index);
@@ -185,6 +186,15 @@ scale(i32 whole, int num, int den, i32 s
@@ -186,6 +187,15 @@ scale(i32 whole, int num, int den, i32 s
return (v) ;
}
@ -217,7 +206,7 @@
struct pagespec {
int reversed, pageno, add;
i32 xoff, yoff;
@@ -292,6 +302,8 @@ parsedimen(char **sp)
@@ -293,6 +303,8 @@ parsedimen(char **sp)
fac = Height;
s++;
}
@ -226,7 +215,7 @@
whole = scale(whole, num, den, fac) ;
*sp = s;
return (neg ? -whole : whole);
@@ -492,9 +504,15 @@ HandlePostAmble(void)
@@ -493,9 +505,15 @@ HandlePostAmble(void)
PutLong(outf, Denominator);
PutLong(outf, DVIMag);
c = GetLong(inf);
@ -244,7 +233,7 @@
c = GetWord(inf)+1;
PutWord(outf, c); /* DVI stack size */
PutWord(outf, NumberOfOutputPages);
@@ -587,7 +605,8 @@ HandlePreAmble(void)
@@ -588,7 +606,8 @@ HandlePreAmble(void)
DVIFileName, DVI_VERSION);
Numerator = GetLong(inf);
Denominator = GetLong(inf);
@ -254,7 +243,7 @@
putbyte(outf, DVI_PRE);
putbyte(outf, DVI_VERSION);
PutLong(outf, Numerator);
@@ -614,6 +633,7 @@ main(int argc, char **argv)
@@ -615,6 +634,7 @@ main(int argc, char **argv)
Width = 0;
Height = 0;
Magnification = 1000;
@ -262,7 +251,7 @@
Modulo = 1;
ProgName = *argv;
@@ -710,12 +730,16 @@ Usage: %s [-q] [-i infile] [-o outfile]
@@ -711,12 +731,16 @@ Usage: %s [-q] [-i infile] [-o outfile]
if (fseek(inf, 16L, 1) == -1)
error(1, -1, "can't seek postamble");
if (Height == 0) /* get height from postamble */
@ -282,11 +271,11 @@
HandleDVIFile();
if (WritingPage)
--- texk/seetexk/error.c
+++ texk/seetexk/error.c 2010-11-12 11:52:47.916425348 +0000
@@ -10,7 +10,12 @@
* optionally quit.
*
*/
+++ texk/seetexk/error.c 2015-03-26 09:49:34.658018778 +0000
@@ -29,7 +29,12 @@
#include <config.h>
#endif
+#include <stdarg.h>
#include <stdio.h>
+#include <stdlib.h>
@ -294,9 +283,9 @@
+#include <c-auto.h>
+#include <errno.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -22,20 +27,11 @@
#include "types.h" /* for HAVE_VPRINTF */
#include "error.h"
@@ -37,20 +42,11 @@
extern char *ProgName; /* program name from argv[0] */
@ -318,8 +307,8 @@
static char *
strerror (int errnum)
--- texk/seetexk/gripes.h
+++ texk/seetexk/gripes.h 2010-11-12 11:55:39.148426060 +0000
@@ -13,16 +13,17 @@ extern const char *DVIFileName;
+++ texk/seetexk/gripes.h 2010-11-12 11:55:39.000000000 +0000
@@ -28,16 +28,17 @@ extern const char *DVIFileName;
* Declarations for the various gripes.
*/
@ -348,25 +337,21 @@
+void GripeUndefinedOp(int n) __NR__;
void GripeBadGlyph(i32 c, struct font *f);
--- texk/seetexk/gripes0.c
+++ texk/seetexk/gripes0.c 2009-08-28 14:38:06.501901818 +0000
@@ -10,14 +10,12 @@
*/
#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
#include "types.h"
+++ texk/seetexk/gripes0.c 2015-03-26 09:50:17.725518659 +0000
@@ -28,10 +28,8 @@
#include "error.h"
#include "gripes.h"
#include <stdio.h>
-
-#ifndef WIN32
-extern int errno;
-#endif
-
+#include <stdlib.h>
+#include <errno.h>
/*
* Cannot allocate memory.
*/
@@ -26,7 +24,7 @@ GripeOutOfMemory(int n, const char *why)
@@ -41,7 +39,7 @@ GripeOutOfMemory(int n, const char *why)
{
error(1, -1, "ran out of memory allocating %d bytes for %s", n, why);
@ -375,7 +360,7 @@
}
/*
@@ -71,7 +69,7 @@ WARNING: TeX and I have different checks
@@ -86,7 +84,7 @@ WARNING: TeX and I have different checks
\t\"%s\"\n\
\tPlease notify your TeX maintainer\n\
\t(TFM checksum = 0%lo, my checksum = 0%lo)",
@ -384,7 +369,7 @@
}
/*
@@ -84,5 +82,5 @@ GripeMissingFontsPreventOutput(int n)
@@ -99,5 +97,5 @@ GripeMissingFontsPreventOutput(int n)
error(1, 0, "%d missing font%s prevent%s output (sorry)", n,
n > 1 ? s : &s[1], n == 1 ? s : &s[1]);
@ -392,16 +377,16 @@
+ exit(0); /* NOTREACHED */
}
--- texk/seetexk/gripes1.c
+++ texk/seetexk/gripes1.c 2009-08-28 14:13:32.869901244 +0000
@@ -10,6 +10,7 @@
*/
+++ texk/seetexk/gripes1.c 2015-03-26 09:50:41.873518821 +0000
@@ -29,6 +29,7 @@
#include "font.h"
#include "gripes.h"
#include <stdio.h>
+#include <stdlib.h>
#include "types.h"
#include "error.h"
#include "font.h"
@@ -25,7 +26,7 @@ dfn(void)
static const char *
dfn(void)
@@ -40,7 +41,7 @@ dfn(void)
/*
* Save string space by declaring these here.
*/
@ -410,7 +395,7 @@
static const char dfl[] = "DVI file";
static const char areyousure[] = "(are you sure %s is a %s?)";
#else
@@ -42,7 +43,7 @@ GripeNoSuchFont(i32 n)
@@ -57,7 +58,7 @@ GripeNoSuchFont(i32 n)
error(0, 0, "%s wants font %ld, which it never defined", dfl, (long)n);
error(1, 0, areyousure, dfn(), dfl);
@ -419,7 +404,7 @@
}
/*
@@ -54,7 +55,7 @@ GripeFontAlreadyDefined(i32 n)
@@ -69,7 +70,7 @@ GripeFontAlreadyDefined(i32 n)
error(0, 0, "%s redefines font %ld", dfl, n);
error(1, 0, areyousure, dfn(), dfl);
@ -428,7 +413,7 @@
}
/*
@@ -77,7 +78,7 @@ GripeUnexpectedOp(const char *s)
@@ -92,7 +93,7 @@ GripeUnexpectedOp(const char *s)
error(0, 0, "unexpected %s in %s", s, dfl);
error(1, 0, areyousure, dfn(), dfl);
@ -437,7 +422,7 @@
}
/*
@@ -89,7 +90,7 @@ GripeMissingOp(const char *s)
@@ -104,7 +105,7 @@ GripeMissingOp(const char *s)
error(0, 0, "missing %s in %s", s, dfl);
error(1, 0, areyousure, dfn(), dfl);
@ -446,7 +431,7 @@
}
/*
@@ -101,7 +102,7 @@ GripeCannotFindPostamble(void)
@@ -116,7 +117,7 @@ GripeCannotFindPostamble(void)
error(0, 0, "cannot find postamble");
error(1, 0, areyousure, dfn(), dfl);
@ -455,7 +440,7 @@
}
/*
@@ -113,7 +114,7 @@ GripeMismatchedValue(const char *s)
@@ -128,7 +129,7 @@ GripeMismatchedValue(const char *s)
error(0, 0, "mismatched %s in %s", s, dfl);
error(1, 0, areyousure, dfn(), dfl);
@ -464,7 +449,7 @@
}
/*
@@ -125,7 +126,7 @@ GripeUndefinedOp(int n)
@@ -140,7 +141,7 @@ GripeUndefinedOp(int n)
error(0, 0, "undefined DVI opcode %d", n);
error(1, 0, areyousure, dfn(), dfl);
@ -474,7 +459,7 @@
/*
--- texk/seetexk/mydvichk
+++ texk/seetexk/mydvichk 2010-11-12 11:50:39.783926350 +0000
+++ texk/seetexk/mydvichk 2010-11-12 11:50:40.000000000 +0000
@@ -0,0 +1,12 @@
+#!/bin/csh -f
+# 1993 (c) Werner Fink <Werner.Fink@itap.physik.uni-stuttgart.de>
@ -489,7 +474,7 @@
+
+exit(0)
--- texk/seetexk/odd2even
+++ texk/seetexk/odd2even 2010-11-12 11:50:39.783926350 +0000
+++ texk/seetexk/odd2even 2010-11-12 11:50:40.000000000 +0000
@@ -0,0 +1,22 @@
+#!/bin/csh -f
+# 1993 (c) Werner Fink <Werner.Fink@itap.physik.uni-stuttgart.de>
@ -513,9 +498,30 @@
+endif
+
+exit 0
--- texk/seetexk/search.c
+++ texk/seetexk/search.c 2009-08-28 14:13:33.000000000 +0000
@@ -34,6 +34,7 @@
* it runs in increasing-key-value sequence).
*/
+#include <stdlib.h>
#include "types.h"
#include "search.h"
@@ -45,10 +46,6 @@
static int DOffset; /* part of alignment code */
-#ifndef KPATHSEA
-char *malloc(), *realloc();
-#endif
-
struct search *
SCreate(unsigned int dsize)
{
--- texk/seetexk/seek.c
+++ texk/seetexk/seek.c 2009-08-28 14:13:32.877901585 +0000
@@ -32,6 +32,10 @@
+++ texk/seetexk/seek.c 2009-08-28 14:13:33.000000000 +0000
@@ -43,6 +43,10 @@
#endif
#include <stdio.h>
@ -526,7 +532,7 @@
#include "types.h" /* for BSD_FILE_SYSTEM */
#include "seek.h"
#include "tempfile.h"
@@ -44,12 +48,7 @@
@@ -55,12 +59,7 @@
#endif
#include <sys/stat.h>
@ -541,8 +547,8 @@
/*
* Make and return a version of `f' on which fseek works (unconditionally).
--- texk/seetexk/tempfile.c
+++ texk/seetexk/tempfile.c 2009-08-28 14:13:32.905901116 +0000
@@ -10,6 +10,7 @@
+++ texk/seetexk/tempfile.c 2009-08-28 14:13:33.000000000 +0000
@@ -25,6 +25,7 @@
#endif
#include <stdio.h>
@ -550,7 +556,7 @@
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
@@ -24,9 +25,7 @@
@@ -39,9 +40,7 @@
#include "types.h"
#else
#include <sys/file.h>
@ -562,16 +568,13 @@
#include "tempfile.h"
--- texk/seetexk/types.h
+++ texk/seetexk/types.h 2009-08-28 14:13:32.921901032 +0000
@@ -43,8 +43,9 @@
+++ texk/seetexk/types.h 2015-03-26 09:52:09.921518904 +0000
@@ -58,7 +58,7 @@
*
* (The bcopy provided in lib/bcopy.c does handle overlap.)
*/
-/* #define BLOCK_COPY(from, to, len) memmove(to, from, len) */
-#define BLOCK_COPY(from, to, len) bcopy(from, to, len)
+#include <string.h>
+#define BLOCK_COPY(from, to, len) memmove(to, from, len)
+/* #define BLOCK_COPY(from, to, len) bcopy(from, to, len) */
#define BLOCK_COPY(from, to, len) memmove(to, from, len)
/*
* Define void as int if your compiler does not support void,

6
source-lacheck.dif
View File

@ -1,6 +1,10 @@
---
texk/lacheck/lacheck-1.26/lacheck.l | 1 +
1 file changed, 1 insertion(+)
--- texk/lacheck/lacheck-1.26/lacheck.l
+++ texk/lacheck/lacheck-1.26/lacheck.l 2008-03-05 13:59:37.000000000 +0000
@@ -117,6 +117,7 @@
@@ -119,6 +119,7 @@
#include <stdio.h>
#include <string.h>

51
source-poppler-0.26.patch
View File

@ -1,51 +0,0 @@
diff -ur texlive-20130620-source/texk/web2c/luatexdir/lua/lepdflib.cc texlive-20130620-source.patched/texk/web2c/luatexdir/lua/lepdflib.cc
--- texlive-20130620-source/texk/web2c/luatexdir/lua/lepdflib.cc 2013-04-05 13:37:46.000000000 +0200
+++ texlive-20130620-source.patched/texk/web2c/luatexdir/lua/lepdflib.cc 2014-05-01 16:13:08.955638067 +0200
@@ -23,6 +23,7 @@
"$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/lua/lepdflib.cc $";
#include "image/epdf.h"
+#include <cpp/poppler-version.h>
// define DEBUG
@@ -65,6 +66,7 @@
#define M_PDFRectangle "PDFRectangle"
#define M_Ref "Ref"
#define M_Stream "Stream"
+#define M_StructTreeRoot "StructTreeRoot"
#define M_XRefEntry "XRefEntry"
#define M_XRef "XRef"
@@ -96,6 +98,7 @@
new_poppler_userdata(PDFRectangle);
new_poppler_userdata(Ref);
new_poppler_userdata(Stream);
+new_poppler_userdata(StructTreeRoot);
new_poppler_userdata(XRef);
//**********************************************************************
@@ -573,7 +576,11 @@
m_poppler_get_GOOSTRING(Catalog, getBaseURI);
m_poppler_get_GOOSTRING(Catalog, readMetadata);
+#if ((POPPLER_VERSION_MAJOR > 0) || (POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR > 25) || (POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR == 25 && POPPLER_VERSION_MICRO > 1))
+m_poppler_get_poppler(Catalog, StructTreeRoot, getStructTreeRoot);
+#else
m_poppler_get_poppler(Catalog, Object, getStructTreeRoot);
+#endif
static int m_Catalog_findPage(lua_State * L)
{
@@ -2146,7 +2153,11 @@
static int m_PDFDoc_getStructTreeRoot(lua_State * L)
{
+#if ((POPPLER_VERSION_MAJOR > 0) || (POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR > 25) || (POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR == 25 && POPPLER_VERSION_MICRO > 1))
+ StructTreeRoot *obj;
+#else
Object *obj;
+#endif
udstruct *uin, *uout;
uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
if (uin->pd != NULL && uin->pd->pc != uin->pc)

13
source-poppler.dif
View File

@ -1,6 +1,11 @@
---
texk/web2c/pdftexdir/pdftoepdf.cc | 4 ++++
texk/web2c/pdftexdir/pdftosrc.cc | 4 ++++
2 files changed, 8 insertions(+)
--- texk/web2c/pdftexdir/pdftoepdf.cc
+++ texk/web2c/pdftexdir/pdftoepdf.cc 2012-04-13 16:56:57.780022236 +0200
@@ -30,6 +29,10 @@ with this program. If not, see <http://
+++ texk/web2c/pdftexdir/pdftoepdf.cc 2012-04-13 14:56:58.000000000 +0000
@@ -31,6 +31,10 @@ with this program. If not, see <http://
#include <string.h>
#include <ctype.h>
@ -12,8 +17,8 @@
#include <dirent.h>
#include <poppler-config.h>
--- 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://
+++ texk/web2c/pdftexdir/pdftosrc.cc 2012-04-13 14:59:10.000000000 +0000
@@ -24,6 +24,10 @@ with this program. If not, see <http://
#include <string.h>
#include <ctype.h>

112
source-psutils-flip.dif
View File

@ -1,112 +0,0 @@
Patch for pstops from psutils to allow page flipping (i. e. mirroring).
Useful for creating of print matrices on transparent films.
http://www.penguin.cz/~utx
ftp://ftp.penguin.cz/pub/users/utx/psutils/psutils-flip.diff
--- utils/psutils/psutils-1.17/pstops.c.orig 1997-03-11 23:53:04.000000000 +0100
+++ utils/psutils/psutils-1.17/pstops.c 2002-07-26 19:14:49.000000000 +0200
@@ -35,7 +35,7 @@
{
fprintf(stderr, "%s: page specification error:\n", program);
fprintf(stderr, " <pagespecs> = [modulo:]<spec>\n");
- fprintf(stderr, " <spec> = [-]pageno[@scale][L|R|U][(xoff,yoff)][,spec|+spec]\n");
+ fprintf(stderr, " <spec> = [-]pageno[@scale][L|R|U|H|V][(xoff,yoff)][,spec|+spec]\n");
fprintf(stderr, " modulo>=1, 0<=pageno<modulo\n");
fflush(stderr);
exit(1);
@@ -81,6 +81,14 @@
tail->rotate += 180;
tail->flags |= ROTATE;
break;
+ case 'h': case 'H':
+ tail->hflip += 1;
+ tail->flags |= HFLIP;
+ break;
+ case 'v': case 'V':
+ tail->vflip += 1;
+ tail->flags |= VFLIP;
+ break;
case '(':
tail->xoff += parsedimen(&str, argerror);
if (*str++ != ',') argerror();
--- utils/psutils/psutils-1.17/psspec.h.orig 1997-03-11 23:53:04.000000000 +0100
+++ utils/psutils/psutils-1.17/psspec.h 2002-07-26 17:41:41.000000000 +0200
@@ -8,12 +8,14 @@
/* pagespec flags */
#define ADD_NEXT (0x01)
#define ROTATE (0x02)
-#define SCALE (0x04)
-#define OFFSET (0x08)
-#define GSAVE (ROTATE|SCALE|OFFSET)
+#define HFLIP (0x04)
+#define VFLIP (0x08)
+#define SCALE (0x10)
+#define OFFSET (0x20)
+#define GSAVE (ROTATE|HFLIP|VFLIP|SCALE|OFFSET)
typedef struct pagespec {
- int reversed, pageno, flags, rotate;
+ int reversed, pageno, flags, rotate, hflip, vflip;
double xoff, yoff, scale;
struct pagespec *next;
} PageSpec ;
--- utils/psutils/psutils-1.17/psspec.c.orig 1997-03-11 23:53:04.000000000 +0100
+++ utils/psutils/psutils-1.17/psspec.c 2002-07-26 19:21:10.000000000 +0200
@@ -22,6 +22,8 @@
if (temp == NULL)
message(FATAL, "out of memory\n");
temp->reversed = temp->pageno = temp->flags = temp->rotate = 0;
+ temp->hflip = 0;
+ temp->vflip = 0;
temp->scale = 1;
temp->xoff = temp->yoff = 0;
temp->next = NULL;
@@ -208,6 +210,14 @@
sprintf(buffer, "%d rotate\n", ps->rotate);
writestring(buffer);
}
+ if ((ps->flags & HFLIP) && (ps->hflip%2)) {
+ sprintf(buffer, "[ -1 0 0 1 %f 0 ] concat\n", width*ps->scale);
+ writestring(buffer);
+ }
+ if ((ps->flags & VFLIP) && (ps->vflip%2)) {
+ sprintf(buffer, "[ 1 0 0 -1 0 %f ] concat\n", height*ps->scale);
+ writestring(buffer);
+ }
if (ps->flags & SCALE) {
sprintf(buffer, "%f dup scale\n", ps->scale);
writestring(buffer);
--- utils/psutils/psutils-1.17/pstops.man.orig 1997-03-11 23:53:04.000000000 +0100
+++ utils/psutils/psutils-1.17/pstops.man 2002-07-26 19:25:37.000000000 +0200
@@ -43,7 +43,7 @@
.I = spec[+specs][,specs]
.TP
.I spec
-.I = [-]pageno[L][R][U][@scale][(xoff,yoff)]
+.I = [-]pageno[L][R][U][H][V][@scale][(xoff,yoff)]
.RE
.sp
.I modulo
@@ -74,8 +74,9 @@
or
.B "h"
to specify as a multiple of the width or height.
-The optional parameters \fIL\fR, \fIR\fR, and \fIU\fR rotate the page left,
-right, or upside-down.
+The optional parameters \fIL\fR, \fIR\fR, \fIU\fR, \fIH\fR and \fIV\fR
+rotate the page left, right, or upside-down, and flip (mirror) page
+horizontally or vertically.
The optional
.I scale
parameter scales the page by the fraction specified.
--- utils/psutils/psutils-1.17/README.orig 1997-03-11 23:53:05.000000000 +0100
+++ utils/psutils/psutils-1.17/README 2002-07-26 19:36:58.000000000 +0200
@@ -181,6 +181,7 @@
Mike Coleman
Dale Scheetz dwarf@polaris.net
Yves Arrouye arrouye@marin.fdn.fr
+ Stanislav Brabec utx@penguin.cz
(Apologies to anyone who I have left out, it was not intentional.)

358
source-psutils.dif
View File

@ -1,47 +1,10 @@
--- utils/psutils/psutils-1.17/Makefile.unix
+++ utils/psutils/psutils-1.17/Makefile.unix 2009-08-28 14:44:14.829902235 +0000
@@ -25,10 +25,10 @@ PAPER=a4
---
texk/psutils/psutils-1.23/epsffit.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
OS = UNIX
-BINDIR = /usr/local/bin
+BINDIR = /usr/bin
SCRIPTDIR = $(BINDIR)
-INCLUDEDIR = /usr/local/share/psutils
-PERL = /usr/local/bin/perl
+INCLUDEDIR = /usr/share/psutils
+PERL = /usr/bin/perl
BINMODE = 0755
MANMODE = 0644
@@ -36,10 +36,11 @@ CHMOD = chmod
INSTALL = install -c -m $(BINMODE)
INSTALLMAN = install -c -m $(MANMODE)
MANEXT = 1
-MANDIR = /usr/local/share/man/man$(MANEXT)
+MANDIR = /usr/share/man/man$(MANEXT)
CC = gcc
-CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
+CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX $(RPM_OPT_FLAGS) -pipe -Wall
+CCFLAGS = $(CFLAGS)
BIN = psbook psselect pstops epsffit psnup \
psresize
--- utils/psutils/psutils-1.17/epsffit.c
+++ utils/psutils/psutils-1.17/epsffit.c 2009-08-28 14:47:36.941903881 +0000
@@ -47,8 +47,8 @@ int main(int argc, char **argv)
int furx, fury, fllx, flly;
int showpage = 0, centre = 0, rotate = 0, aspect = 0, maximise = 0;
char buf[BUFSIZ];
- FILE *input;
- FILE *output;
+ FILE *input = stdin;
+ FILE *output = stdout;
program = *argv++; argc--;
@@ -164,9 +164,14 @@ int main(int argc, char **argv)
--- texk/psutils/psutils-1.23/epsffit.c
+++ texk/psutils/psutils-1.23/epsffit.c 2009-08-28 14:47:37.000000000 +0000
@@ -147,9 +147,14 @@ main(int argc, char **argv)
yoffset -= lly * yscale;
}
fputs("%%EndComments\n", output);
@ -59,317 +22,12 @@
fputs("%%BeginProcSet: epsffit 1 0\n", output);
fputs("gsave\n", output);
fprintf(output, "%.3f %.3f translate\n", xoffset, yoffset);
@@ -182,7 +187,7 @@ int main(int argc, char **argv)
@@ -165,7 +170,7 @@ main(int argc, char **argv)
if (bbfound) {
fputs("grestore\n", output);
if (showpage)
- fputs("restore showpage\n", output); /* just in case */
+ fputs("end EpsffitSave restore showpage\n", output); /* just in case */
} else
message(FATAL, "no %%%%BoundingBox:\n");
die("no %%%%BoundingBox:");
--- utils/psutils/psutils-1.17/fixmacps.pl
+++ utils/psutils/psutils-1.17/fixmacps.pl 2009-08-28 14:44:14.833901961 +0000
@@ -7,7 +7,7 @@
use File::Basename;
$line = 0; # keep line count
-$predir = `kpsewhich -progname=dvips -format="other text files" md71_0.ps`;
+$predir = `kpsewhich -progname=dvips/psutils -format="other text files" md71_0.ps`;
$dir=`dirname $predir`;
$prefix = "md";
$default = "md71_0.ps";
--- utils/psutils/psutils-1.17/getafm
+++ utils/psutils/psutils-1.17/getafm 2009-08-28 14:44:14.833901961 +0000
@@ -1,7 +1,7 @@
#!/bin/sh
if [ $# -ne 1 ]; then
- echo "usage: $0 font-name | gsnd - >font-name.afm" >&2
+ echo "usage: $0 font-name | gsnd -q - >font-name.afm" >&2
exit 1
fi
@@ -66,8 +66,9 @@ cat << EOF
(isFixedPitch)(IsFixedPitch) prany
(UnderlinePosition)dup prany
(UnderlineThickness)dup prany
- (Version)(version) prany
+ (version)(Version) prany
(Notice)dup prany
+ (Copyright)dup prany
pop
}
{
--- utils/psutils/psutils-1.17/pserror.c
+++ utils/psutils/psutils-1.17/pserror.c 2009-08-28 14:44:14.833901961 +0000
@@ -17,7 +17,7 @@ extern char *program ; /* Defined by mai
warnings, and errors sent to stderr. If called with the flags MESSAGE_EXIT
set, the routine does not return */
-#define MAX_MESSAGE 256 /* maximum formatted message length */
+#define MAX_MESSAGE 1024 /* maximum formatted message length */
#define MAX_FORMAT 16 /* maximum format length */
#define MAX_COLUMN 78 /* maximum column to print upto */
@@ -27,6 +27,7 @@ void message(int flags, char *format, ..
static int column = 0 ; /* current screen column for message wrap */
char msgbuf[MAX_MESSAGE] ; /* buffer in which to put the message */
char *bufptr = msgbuf ; /* message buffer pointer */
+ char *tail = bufptr + MAX_MESSAGE;
if ( (flags & MESSAGE_NL) && column != 0 ) { /* new line if not already */
putc('\n', stderr) ;
@@ -34,8 +35,11 @@ void message(int flags, char *format, ..
}
if ( flags & MESSAGE_PROGRAM ) {
+ const size_t len = strlen(program);
+ if (len + 2 >= tail - bufptr)
+ goto out;
strcpy(bufptr, program) ;
- bufptr += strlen(program) ;
+ bufptr += len;
*bufptr++ = ':' ;
*bufptr++ = ' ' ;
}
@@ -55,13 +59,15 @@ void message(int flags, char *format, ..
fmtbuf[index] = '\0' ;
switch (c) {
case '%':
+ if (bufptr >= tail)
+ goto out;
*bufptr++ = '%' ;
case '\0':
break ;
case 'e': case 'E': case 'f': case 'g': case 'G':
{
double d = va_arg(args, double) ;
- sprintf(bufptr, fmtbuf, d) ;
+ snprintf(bufptr, tail - bufptr, fmtbuf, d);
bufptr += strlen(bufptr) ;
}
break ;
@@ -69,17 +75,17 @@ void message(int flags, char *format, ..
case 'p': case 'u': case 'x': case 'X':
if ( longform ) {
long l = va_arg(args, long) ;
- sprintf(bufptr, fmtbuf, l) ;
+ snprintf(bufptr, tail - bufptr, fmtbuf, l);
} else {
int i = va_arg(args, int) ;
- sprintf(bufptr, fmtbuf, i) ;
+ snprintf(bufptr, tail - bufptr, fmtbuf, i);
}
bufptr += strlen(bufptr) ;
break ;
case 's':
{
char *s = va_arg(args, char *) ;
- sprintf(bufptr, fmtbuf, s) ;
+ snprintf(bufptr, tail - bufptr, fmtbuf, s);
bufptr += strlen(bufptr) ;
}
break ;
@@ -92,6 +98,8 @@ void message(int flags, char *format, ..
} while ( !done ) ;
} else if ( c == '\n' ) { /* write out message so far and reset column */
int len = bufptr - msgbuf ; /* length of current message */
+ if (bufptr >= tail)
+ goto out;
*bufptr++ = '\n' ;
*bufptr = '\0' ;
if ( column + len > MAX_COLUMN && column > 0 ) {
@@ -100,8 +108,11 @@ void message(int flags, char *format, ..
}
fputs(bufptr = msgbuf, stderr) ;
column = 0 ;
- } else
+ } else {
+ if (bufptr >= tail)
+ goto out;
*bufptr++ = c ;
+ }
}
*bufptr = '\0' ;
{
@@ -117,6 +128,7 @@ void message(int flags, char *format, ..
}
va_end(args) ;
- if ( flags & MESSAGE_EXIT ) /* don't return to program */
+out:
+ if (flags & MESSAGE_EXIT) /* don't return to program */
exit(1) ;
}
--- utils/psutils/psutils-1.17/psmerge.man
+++ utils/psutils/psutils-1.17/psmerge.man 2009-08-28 14:44:14.833901961 +0000
@@ -24,6 +24,26 @@ standard output.
.I Psmerge
will merge multiple files concatenated into a single file as if they
were in separate files.
+.SH BUGS
+.I psmerge
+is for a very specific case; it does not merge files in the general case.
+.br
+For all those cases which can not be handled by
+.I psmerge
+the program
+.I gs
+(known as ghostscript) may help:
+
+.sp 1
+.in +1c
+.nf
+ gs -dNOPAUSE -sDEVICE=pswrite -sOutputFile=out.ps \\
+ file1.ps file2.ps ... -c quit
+.fi
+.in -1c
+.sp 1
+
+This is rather slow and generates bigger output files.
.SH AUTHOR
Copyright (C) Angus J. C. Duggan 1991-1995
.SH "SEE ALSO"
@@ -31,6 +51,3 @@ Copyright (C) Angus J. C. Duggan 1991-19
.SH TRADEMARKS
.B PostScript
is a trademark of Adobe Systems Incorporated.
-.SH BUGS
-.I psmerge
-is for a very specific case; it does not merge files in the general case.
--- utils/psutils/psutils-1.17/psselect.c
+++ utils/psutils/psutils-1.17/psselect.c 2009-08-28 14:44:14.837902516 +0000
@@ -52,6 +52,9 @@ static PageRange *addrange(char *str, Pa
{
int first=0;
int sign;
+
+ if(!str) return NULL;
+
sign = (*str == '_' && ++str) ? -1 : 1;
if (isdigit(*str)) {
first = sign*atoi(str);
--- utils/psutils/psutils-1.17/psspec.c
+++ utils/psutils/psutils-1.17/psspec.c 2009-08-28 14:44:14.837902516 +0000
@@ -12,6 +12,9 @@
#include <string.h>
+/* #define SHOWPAGE_LOAD 1 */
+#undef SHOWPAGE_LOAD
+
double width = -1;
double height = -1;
--- utils/psutils/psutils-1.17/pstops.man
+++ utils/psutils/psutils-1.17/pstops.man 2009-08-28 14:44:14.837902516 +0000
@@ -86,7 +86,7 @@ the document, instead of the start.
If page \fIspec\fRs are separated by
.B \+
the pages will be merged into one page; if they are separated by
-.B \,
+.B ,
they will be on separate pages.
If there is only one page specification, with
.I pageno
--- utils/psutils/psutils-1.17/psutil.c
+++ utils/psutils/psutils-1.17/psutil.c 2009-08-28 14:44:14.837902516 +0000
@@ -44,14 +44,45 @@ static long *pageptr;
/* list of paper sizes supported */
static Paper papersizes[] = {
- { "a3", 842, 1191 }, /* 29.7cm * 42cm */
- { "a4", 595, 842 }, /* 21cm * 29.7cm */
- { "a5", 421, 595 }, /* 14.85cm * 21cm */
- { "b5", 516, 729 }, /* 18.2cm * 25.72cm */
- { "A3", 842, 1191 }, /* 29.7cm * 42cm */
- { "A4", 595, 842 }, /* 21cm * 29.7cm */
- { "A5", 421, 595 }, /* 14.85cm * 21cm */
- { "B5", 516, 729 }, /* 18.2cm * 25.72cm */
+ { "a0", 2384, 3370 },
+ { "a1", 1684, 2384 },
+ { "a2", 1191, 1684 },
+ { "a3", 842, 1191 }, /* 29.7cm * 42cm */
+ { "a4", 595, 842 }, /* 21cm * 29.7cm */
+ { "a5", 421, 595 }, /* 14.85cm * 21cm */
+ { "a6", 297, 420 },
+ { "a7", 210, 297 },
+ { "a8", 148, 210 },
+ { "a9", 105, 148 },
+ { "a10", 73, 105 },
+ { "isob0", 2835, 4008 },
+ { "b0", 2835, 4008 },
+ { "isob1", 2004, 2835 },
+ { "b1", 2004, 2835 },
+ { "isob2", 1417, 2004 },
+ { "b2", 1417, 2004 },
+ { "isob3", 1001, 1417 },
+ { "b3", 1001, 1417 },
+ { "isob4", 709, 1001 },
+ { "b4", 709, 1001 },
+ { "isob5", 499, 709 },
+ { "b5", 499, 709 },
+ { "isob6", 354, 499 },
+ { "b6", 354, 499 },
+ { "jisb0", 2920, 4127 },
+ { "jisb1", 2064, 2920 },
+ { "jisb2", 1460, 2064 },
+ { "jisb3", 1032, 1460 },
+ { "jisb4", 729, 1032 },
+ { "jisb5", 516, 729 },
+ { "jisb6", 363, 516 },
+ { "c0", 2599, 3677 },
+ { "c1", 1837, 2599 },
+ { "c2", 1298, 1837 },
+ { "c3", 918, 1298 },
+ { "c4", 649, 918 },
+ { "c5", 459, 649 },
+ { "c6", 323, 459 },
{ "letter", 612, 792 }, /* 8.5in * 11in */
{ "legal", 612, 1008 }, /* 8.5in * 14in */
{ "ledger", 1224, 792 }, /* 17in * 11in */
@@ -61,6 +92,14 @@ static Paper papersizes[] = {
{ "folio", 612, 936 }, /* 8.5in * 13in */
{ "quarto", 610, 780 }, /* 8.5in * 10.83in */
{ "10x14", 720, 1008 }, /* 10in * 14in */
+ { "archE", 2592, 3456 },
+ { "archD", 1728, 2592 },
+ { "archC", 1296, 1728 },
+ { "archB", 864, 1296 },
+ { "archA", 648, 864 },
+ { "flsa", 612, 936 }, /* U.S. foolscap */
+ { "flse", 612, 936 }, /* European foolscap */
+ { "halfletter", 396, 612 },
{ NULL, 0, 0 }
};
@@ -69,7 +108,7 @@ Paper* findpaper(char *name)
{
Paper *pp;
for (pp = papersizes; PaperName(pp); pp++) {
- if (strcmp(PaperName(pp), name) == 0) {
+ if (strncasecmp(PaperName(pp), name, strlen(PaperName(pp))) == 0) {
return pp;
}
}
@@ -88,16 +127,15 @@ FILE *seekable(FILE *fp)
#if defined(WINNT) || defined(WIN32)
struct _stat fs ;
#else
- long fpos;
+ struct stat fs;
#endif
#if defined(WINNT) || defined(WIN32)
if (_fstat(fileno(fp), &fs) == 0 && (fs.st_mode&_S_IFREG) != 0)
return (fp);
#else
- if ((fpos = ftell(fp)) >= 0)
- if (!fseek(fp, 0L, SEEK_END) && !fseek(fp, fpos, SEEK_SET))
- return (fp);
+ if (fstat(fileno(fp), &fs) == 0 && S_ISREG(fs.st_mode))
+ return (fp);
#endif
#if defined(MSDOS)

4
source-texdoc.dif
View File

@ -1,3 +1,7 @@
---
utils/texdoctk/texdoctk.pl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- utils/texdoctk/texdoctk.pl
+++ utils/texdoctk/texdoctk.pl 2008-09-24 14:56:14.000000000 +0000
@@ -1461,7 +1461,7 @@ sub writerc {

58
source-warns.dif
View File

@ -1,5 +1,19 @@
--- 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
---
libs/icu/icu-53.1/source/i18n/decNumber.h | 22 ++++++++++++---------
libs/icu/icu-53.1/source/tools/pkgdata/pkgdata.cpp | 4 +--
libs/lua52/Makefile.in | 2 -
libs/teckit/TECkit-2.5.3/source/Compiler.cpp | 17 +++++++++-------
texk/chktex/chktex-1.7.2/FindErrs.c | 2 -
texk/makeindexk/genind.h | 16 ++++++++++++++-
texk/makeindexk/mkind.h | 20 ++++++++++++++++---
texk/makeindexk/scanid.h | 16 ++++++++++++++-
texk/makeindexk/scanst.h | 16 ++++++++++++++-
texk/ps2pkm/t1funcs.c | 2 -
texk/ps2pkm/token.c | 2 -
11 files changed, 91 insertions(+), 28 deletions(-)
--- libs/icu/icu-53.1/source/i18n/decNumber.h
+++ libs/icu/icu-53.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,20 +54,31 @@
/* The number of units needed is ceil(DECNUMDIGITS/DECDPUN) */
#define DECNUMUNITS ((DECNUMDIGITS+DECDPUN-1)/DECDPUN)
--- 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
--- libs/icu/icu-53.1/source/tools/pkgdata/pkgdata.cpp
+++ libs/icu/icu-53.1/source/tools/pkgdata/pkgdata.cpp 2012-04-13 15:09:27.000000000 +0000
@@ -2072,9 +2072,9 @@ static void loadLists(UPKGOptions *o, UE
findDirname(progname, cmdBuf, 1024, &status);
if(U_SUCCESS(status)) {
if (cmdBuf[0] != 0) {
- uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024);
+ uprv_strncat(cmdBuf, U_FILE_SEP_STRING, strlen(U_FILE_SEP_STRING));
}
- uprv_strncat(cmdBuf, cmd, 1024);
- uprv_strncat(cmdBuf, cmd, 1023);
+ uprv_strncat(cmdBuf, cmd, strlen(cmd));
if(verbose) {
fprintf(stdout, "# Calling icu-config: %s\n", cmdBuf);
--- libs/lua52/Makefile.in
+++ libs/lua52/Makefile.in 2015-03-26 14:44:10.323096423 +0000
@@ -180,7 +180,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(XCFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
--- libs/teckit/TECkit-2.5.3/source/Compiler.cpp
+++ libs/teckit/TECkit-2.5.3/source/Compiler.cpp 2009-08-28 15:16:33.000000000 +0000
@@ -1451,13 +1451,16 @@ Compiler::Compiler(const char* txt, UInt
@ -80,6 +105,17 @@
}
else
free(dest);
--- texk/chktex/chktex-1.7.2/FindErrs.c
+++ texk/chktex/chktex-1.7.2/FindErrs.c 2015-03-26 14:59:06.597518850 +0000
@@ -1171,7 +1171,7 @@ int CheckSilentRegex(void)
tmp = stpcpy(tmp, SilentCase.Stack.Data[i]);
*tmp++ = '|';
}
- tmp = stpcpy(--tmp, ")");
+ tmp = stpcpy((tmp-1), ")");
SilentRegex = malloc( sizeof(regex_t) );
rc = regcomp(SilentRegex, pattern, REGEX_FLAGS);
--- texk/makeindexk/genind.h
+++ texk/makeindexk/genind.h 2009-08-28 15:18:03.000000000 +0000
@@ -25,6 +25,20 @@
@ -114,7 +150,7 @@
--- texk/makeindexk/mkind.h
+++ texk/makeindexk/mkind.h 2009-08-28 15:20:13.000000000 +0000
@@ -245,6 +245,20 @@ extern int mk_getc (FILE *str);
@@ -244,6 +244,20 @@ extern int mk_getc (FILE *str);
#define STREQ(A, B) (strcmp(A, B) == 0)
#define STRNEQ(A, B) (strcmp(A, B) != 0)
@ -135,7 +171,7 @@
#define MESSAGE(F) { \
if (verbose) \
fprintf(stderr, F); \
@@ -253,8 +267,8 @@ extern int mk_getc (FILE *str);
@@ -252,8 +266,8 @@ extern int mk_getc (FILE *str);
#define MESSAGE1(F, S) { \
if (verbose) \
@ -146,7 +182,7 @@
}
#if USE_KPATHSEA /* kpathsea defines a different FATAL */
@@ -272,7 +286,7 @@ extern int mk_getc (FILE *str);
@@ -271,7 +285,7 @@ extern int mk_getc (FILE *str);
#endif
#define FATAL1(F, S) { \
@ -189,7 +225,7 @@
--- texk/makeindexk/scanst.h
+++ texk/makeindexk/scanst.h 2009-08-28 15:21:39.000000000 +0000
@@ -157,6 +157,20 @@
@@ -158,6 +158,20 @@
put_dot = FALSE; \
}
@ -210,7 +246,7 @@
#define STY_ERROR1(F, D) { \
if (idx_dot) { \
fprintf(ilg_fp, "\n"); \
@@ -164,7 +178,7 @@
@@ -165,7 +179,7 @@
} \
fprintf(ilg_fp, "** Input style error (file = %s, line = %d):\n -- ", \
sty_fn, sty_lc); \

6
source-x11r7.dif
View File

@ -1,6 +1,10 @@
---
texk/xdvik/xdvi.h | 6 ++++++
1 file changed, 6 insertions(+)
--- texk/xdvik/xdvi.h
+++ texk/xdvik/xdvi.h 2008-09-24 15:43:29.000000000 +0000
@@ -202,6 +202,12 @@ typedef unsigned long xuint32;
@@ -196,6 +196,12 @@ extern unsigned long time_start, time_en
#include <inttypes.h>
#endif

20
source-xdvik-events.dif Normal file
View File

@ -0,0 +1,20 @@
--- texk/xdvik/events.c 2014/04/17 07:12:06 1.413
+++ texk/xdvik/events.c 2014/04/27 05:35:02 1.414
@@ -5306,7 +5306,7 @@
}
if (actp->proc == Act_wheel) {
-# if XAW
+# if !MOTIF
if (globals.widgets.y_bar != NULL)
XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc,
cast_int_to_XtPointer(dist));
@@ -5317,7 +5317,7 @@
# endif /* MOTIF */
}
else { /* Act_hwheel */
-# if XAW
+# if !MOTIF
if (globals.widgets.x_bar != NULL)
XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc,
cast_int_to_XtPointer(dist));

6
source-xdvizilla.dif
View File

@ -1,5 +1,9 @@
---
texk/xdvik/xdvizilla | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
--- texk/xdvik/xdvizilla
+++ texk/xdvik/xdvizilla 2008-09-25 10:38:16.072122050 +0000
+++ texk/xdvik/xdvizilla 2008-09-25 10:38:16.000000000 +0000
@@ -89,12 +89,7 @@ trap 'do_cleanup' 1 2 3 7 13 15
### create a temporary directory only read/writable by user
### try mktemp if it's available

475
source.dif
View File

@ -1,14 +1,34 @@
--- libs/icu/icu-49.1/common/Makefile.in
+++ 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)
---
libs/icu/icu-53.1/source/common/Makefile.in | 2
reautoconf | 2
texk/dviljk/dvi2xx.c | 11
texk/kpathsea/c-fopen.h | 6
texk/kpathsea/c-memstr.h | 3
texk/kpathsea/cnf-to-paths.awk | 2
texk/kpathsea/db.c | 13
texk/kpathsea/mktex.opt | 39 +-
texk/kpathsea/mktexlsr | 46 ++
texk/kpathsea/progname.c | 4
texk/kpathsea/texmf.cnf | 173 +++++-----
texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/otftotfm.cc | 3
texk/ps2pkm/pk2bm.c | 34 +
texk/texlive/linked_scripts/musixtex/musixtex.lua | 16
texk/texlive/tl_scripts/fmtutil-sys.sh | 1
texk/texlive/tl_scripts/fmtutil.cnf | 17
texk/texlive/tl_scripts/fmtutil.sh | 16
texk/texlive/tl_scripts/texconfig-dialog.sh | 14
texk/texlive/tl_scripts/texconfig-sys.sh | 1
texk/texlive/tl_scripts/texconfig.sh | 35 --
texk/texlive/tl_scripts/texlinks.sh | 53 ++-
texk/texlive/tl_scripts/updmap-sys.sh | 1
texk/web2c/Makefile.in | 7
texk/web2c/window/regis.c | 8
texk/web2c/window/x11-Xlib.c | 8
texk/web2c/window/x11-Xt.c | 4
texk/xdvik/psgs.c | 22 +
texk/xdvik/xdvi-sh.in | 19 -
28 files changed, 369 insertions(+), 191 deletions(-)
# for plugin configuration
-CPPFLAGS += "-DDEFAULT_ICU_PLUGINS=\"$(libdir)/icu\" "
+CPPFLAGS += "-DDEFAULT_ICU_PLUGINS=\"/usr/lib/icu\" "
# for icu data location
ifeq ($(PKGDATA_MODE),common)
--- reautoconf
+++ reautoconf 2009-09-03 10:53:28.000000000 +0000
@@ -83,7 +83,7 @@ echo "$0: TL_AUTOHEADER, T
@ -20,8 +40,19 @@
AUTOCONF=$TL_AUTOCONF
AUTOHEADER=$TL_AUTOHEADER
--- libs/icu/icu-53.1/source/common/Makefile.in
+++ libs/icu/icu-53.1/source/common/Makefile.in 2011-12-09 11:43:35.000000000 +0000
@@ -67,7 +67,7 @@ DEFS += -DU_COMMON_IMPLEMENTATION
LDFLAGS += $(LDFLAGSICUUC)
# for plugin configuration
-CPPFLAGS += "-DDEFAULT_ICU_PLUGINS=\"$(libdir)/icu\" "
+CPPFLAGS += "-DDEFAULT_ICU_PLUGINS=\"/usr/lib/icu\" "
# for icu data location
ifeq ($(PKGDATA_MODE),common)
--- texk/dviljk/dvi2xx.c
+++ texk/dviljk/dvi2xx.c 2013-06-28 11:26:08.461439414 +0000
+++ texk/dviljk/dvi2xx.c 2013-06-28 11:26:08.000000000 +0000
@@ -168,7 +168,18 @@ main(int argc, char *argv[])
setbuf(ERR_STREAM, NULL);
@ -43,7 +74,7 @@
#else
--- texk/kpathsea/c-fopen.h
+++ texk/kpathsea/c-fopen.h 2010-11-12 17:02:18.000000000 +0000
@@ -34,17 +34,17 @@
@@ -38,17 +38,17 @@
/* How to open a binary file for reading: */
#ifndef FOPEN_RBIN_MODE
@ -65,16 +96,16 @@
/* How to switch an already open file handle to binary mode.
--- texk/kpathsea/c-memstr.h
+++ texk/kpathsea/c-memstr.h 2009-09-02 12:47:26.000000000 +0000
@@ -38,6 +38,7 @@
+++ texk/kpathsea/c-memstr.h 2015-03-26 10:45:40.246018846 +0000
@@ -37,6 +37,7 @@
/* Just to be complete, we make both the system V/ANSI and the BSD
versions of the string functions available. */
/* For ancient systems that lack the system V/ANSI version of the
string functions we express them in terms of the BSD versions. */
+#ifndef __GNUC__
#if !defined(HAVE_STRCHR) && !defined(strchr)
#define strchr index
#endif
@@ -82,4 +83,6 @@ extern char *strstr ();
@@ -60,4 +61,6 @@ extern char *strstr ();
#endif
#endif
@ -82,8 +113,8 @@
+
#endif /* not KPATHSEA_C_MEMSTR_H */
--- texk/kpathsea/cnf-to-paths.awk
+++ texk/kpathsea/cnf-to-paths.awk 2011-09-13 16:11:30.316427108 +0000
@@ -32,7 +32,7 @@
+++ texk/kpathsea/cnf-to-paths.awk 2011-09-13 16:11:30.000000000 +0000
@@ -37,7 +37,7 @@
val = $0;
sub(/^.*=[ \t]*/, "", val);
sub(/[ \t]*$/, "", val);
@ -93,8 +124,8 @@
if (val ~ /\$SELFAUTO/) {
# Replace all semicolons with colons in the SELFAUTO paths we're keeping.
--- texk/kpathsea/db.c
+++ texk/kpathsea/db.c 2012-04-13 17:32:17.831769704 +0200
@@ -89,7 +89,8 @@ db_build (kpathsea kpse, hash_table_type
+++ texk/kpathsea/db.c 2012-04-13 15:32:18.000000000 +0000
@@ -94,7 +94,8 @@ db_build (kpathsea kpse, hash_table_type
unsigned len = strlen (db_filename) - sizeof (DB_NAME) + 1; /* Keep the /. */
string top_dir = (string)xmalloc (len + 1);
string cur_dir = NULL; /* First thing in ls-R might be a filename. */
@ -104,7 +135,7 @@
#if defined(WIN32)
string pp;
#endif
@@ -97,7 +98,15 @@ db_build (kpathsea kpse, hash_table_type
@@ -102,7 +103,15 @@ db_build (kpathsea kpse, hash_table_type
strncpy (top_dir, db_filename, len);
top_dir[len] = 0;
@ -122,7 +153,7 @@
len = strlen (line);
--- texk/kpathsea/mktex.opt
+++ texk/kpathsea/mktex.opt 2012-05-14 13:26:00.034911495 +0200
+++ texk/kpathsea/mktex.opt 2012-05-14 11:26:00.000000000 +0000
@@ -37,10 +37,11 @@ if test "$DOSISH" = "no"; then SEP=':';
# TEMPDIR needs to be unique to each process because of the possibility of two
# people running dvips (or whatever) simultaneously.
@ -200,7 +231,7 @@
# Cache values that may be useful for recursive calls.
export MT_MKTEX_OPT MT_MKTEX_CNF
--- texk/kpathsea/mktexlsr
+++ texk/kpathsea/mktexlsr 2012-04-27 14:06:45.670065918 +0000
+++ texk/kpathsea/mktexlsr 2015-03-26 10:55:12.495280597 +0000
@@ -36,6 +36,9 @@ Kpathsea manual available at http://tug.
Report bugs to tex-k@tug.org.
"
@ -245,7 +276,7 @@
if test ! -f "$db_file"; then
- cp /dev/null "$db_file"
+ # Note: this script has set the noclobber option at line 18
+ # Note: this script has set the noclobber option at line 40
+ > "$db_file" \
+ || { echo "$progname: could not create file '$db_file'. Skipping..." >&2; continue; }
# Use same permissions as parent directory, minus x,s, or t bits.
@ -255,7 +286,7 @@
elif test -s "$db_file" \
&& test "x`sed '1s/ $//;1q' \"$db_file\"`" != "x$ls_R_magic" \
&& test "x`sed '1s/ $//;1q' \"$db_file\"`" != "x$old_ls_R_magic"; then
@@ -179,16 +197,23 @@ for TEXMFLS_R in "$@"; do
@@ -179,8 +197,13 @@ for TEXMFLS_R in "$@"; do
# Skip if we cannot write the file:
kpseaccess -w "$db_file" || { echo "$progname: $db_file: no write permission, skipping..." >&2; continue; }
@ -263,7 +294,7 @@
- (umask 077 && mkdir "$db_dir_tmp" ) \
+ until PERMS=`kpsestat = "$db_file"`; do sleep 1; done
+ if test "$PERMS" = "666" -a ! -k "$db_dir" ; then
+ echo "$progname: '$db_file' world writable but '$db_dir' not sticky. Skipping..." >&2
+ echo "$progname: $db_file: world writable but '$db_dir' not sticky, skipping..." >&2
+ continue
+ fi
+
@ -271,15 +302,14 @@
|| { echo "$progname: $db_dir_tmp: could not create directory, skipping..." >&2; continue; }
db_file_tmp="$db_dir_tmp/lsR$$.tmp"
rm -f "$db_file_tmp"
$verbose && echo "$progname: Updating $db_file... " >&2
@@ -188,7 +211,9 @@ for TEXMFLS_R in "$@"; do
$verbose && echo "$progname: Updating $db_file... "
$dry_run && continue
-
- echo "$ls_R_magic" >"$db_file_tmp"
+
+ # Note: this script has set the noclobber option at line 18
+ # Note: this script has set the noclobber option at line 40
+ echo "$ls_R_magic" >"$db_file_tmp" \
+ || { echo "$progname: could not create file '$db_file_tmp'. Skipping..." >&2; continue; }
+ || { echo "$progname: $db_file_tmp: could not create file, skipping..." >&2; continue; }
# The main task. We put ./: in the output, so top-level files can be
# found via ls-R. Probably irrelevant in practice. The sed command
@ -306,10 +336,10 @@
+ fi
rm -rf "$db_dir_tmp"
done
$verbose && echo "$progname: Done." >&2
--- texk/kpathsea/progname.c
+++ texk/kpathsea/progname.c 2013-06-28 10:56:24.601939619 +0000
@@ -661,9 +661,9 @@ kpathsea_set_program_name (kpathsea kpse
+++ texk/kpathsea/progname.c 2013-06-28 10:56:25.000000000 +0000
@@ -668,9 +668,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));
@ -322,7 +352,7 @@
sdir_greatgrandparent = xdirname (sdir_grandparent);
kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent));
--- texk/kpathsea/texmf.cnf
+++ texk/kpathsea/texmf.cnf 2013-06-28 11:08:21.805439369 +0000
+++ texk/kpathsea/texmf.cnf 2015-03-26 11:08:53.473519865 +0000
@@ -54,32 +54,32 @@
TEXMFROOT = $SELFAUTOPARENT
@ -332,8 +362,7 @@
% We used to have a separate /texmf tree with some core programs and files.
% Keep the variable name.
-TEXMFMAIN = $TEXMFDIST
+TEXMFMAIN = /usr/share/texmf
TEXMFMAIN = $TEXMFDIST
% Local additions to the distribution trees.
-TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local
@ -355,16 +384,16 @@
+TEXMFHOME = $HOME/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2013/texmf-var
-TEXMFVAR = ~/.texlive2014/texmf-var
+TEXMFVAR = ${TEXMFSYSVAR}
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2013/texmf-config
-TEXMFCONFIG = ~/.texlive2014/texmf-config
+TEXMFCONFIG = ${TEXMFSYSCONFIG}
% 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
@@ -91,7 +91,7 @@ TEXMFCONFIG = ~/.texlive2014/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.
@ -378,7 +407,7 @@
% 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,!!$TEXMFLOCAL,!!$TEXMFDIST}
+TEXMFDBS = $TEXMF;$VARTEXFONTS
+TEXMFDBS = $TEXMF;$VARTEXFONTS;$HOMECACHE
% 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
@ -397,16 +426,17 @@
% 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
@@ -127,7 +126,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
@@ -127,7 +126,8 @@ VARTEXFONTS = $TEXMFVAR/fonts
%
% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below
% one of the TEXMF directories (avoids overlapping ls-R files).
-
+VARTEXFONTS = /var/cache/texmf/fonts
+HOMECACHE = ${HOME}/.cache/texmf/fonts
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Usually you will not need to edit any of the following variables.
@@ -135,7 +134,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
@@ -135,7 +135,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
% WEB2C is for Web2C specific files. The current directory may not be
% a good place to look for them.
@ -415,7 +445,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
@@ -176,23 +175,23 @@ TEXINPUTS.elatex = .;$TEXMF/tex/{
@@ -176,18 +176,18 @@ TEXINPUTS.elatex = .;$TEXMF/tex/{
TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}//
% pdfTeX.
@ -442,17 +472,9 @@
+TEXINPUTS.pdfelatex = .;$TEXMF/{pdftex,tex}/{latex,generic,}//
+TEXINPUTS.pdfetex = .;$TEXMF/{pdftex,tex}/{plain,generic,}//
% pdfxTeX.
-TEXINPUTS.pdfxlatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.pdfxlatex = .;$TEXMF/{pdftex,tex}/{latex,generic,}//
+TEXINPUTS.pdfxmex = .;$TEXMF/{pdftex,tex}/{mex,plain,generic,}//
+TEXINPUTS.pdfxtex = .;$TEXMF/{pdftex,tex}/{plain,generic,}//
% LuaTeX.
TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
@@ -234,18 +233,18 @@ BSTINPUTS.pbibtex = .;$TEXMF/{pbib
@@ -230,18 +230,18 @@ BSTINPUTS.pbibtex = .;$TEXMF/{pbib
TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic}//
% jadetex.
@ -477,7 +499,16 @@
% Earlier entries override later ones, so put this generic one last.
TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}//
@@ -264,13 +263,13 @@ MPINPUTS = .;$TEXMF/metapost//
@@ -250,7 +250,7 @@ TEXINPUTS = .;$TEXMF/tex/{
TTF2TFMINPUTS = .;$TEXMF/ttf2pk//
% Metafont, MetaPost inputs.
-MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
+MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/source//
MPINPUTS = .;$TEXMF/metapost//
% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
@@ -260,31 +260,31 @@ 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.
@ -495,7 +526,28 @@
MFPOOL = ${TEXPOOL}
MPPOOL = ${TEXPOOL}
@@ -298,7 +297,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD
% support the original xdvi. Must come before the generic settings.
-PKFONTS.XDvi = .;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}//
+PKFONTS.XDvi = .;$TEXMF/%s;{$HOMECACHE,$VARTEXFONTS}/pk/{%m,modeless}//
VFFONTS.XDvi = .;$TEXMF/%s
PSHEADERS.XDvi = .;$TEXMF/%q{dvips,fonts/type1}//
TEXPICTS.XDvi = .;$TEXMF/%q{dvips,tex}//
% Device-independent font metric files.
VFFONTS = .;$TEXMF/fonts/vf//
-TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm//
+TFMFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/tfm//
% The $MAKETEX_MODE below means the drivers will not use a cx font when
% the mode is ricoh. If no mode is explicitly specified, kpse_prog_init
% sets MAKETEX_MODE to /, so all subdirectories are searched. See the manual.
% The modeless part guarantees that bitmaps for PostScript fonts are found.
-PKFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}//
+PKFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}//
% Similarly for the GF format, which only remains in existence because
% Metafont outputs it (and MF isn't going to change).
@@ -294,7 +294,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD
GLYPHFONTS = .;$TEXMF/fonts
% A place to puth everything that doesn't fit the other font categories.
@ -504,7 +556,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
@@ -380,8 +379,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
@@ -376,8 +376,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.)
@ -515,7 +567,22 @@
% Default settings for the fontconfig library as used by the Windows
% versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems.
@@ -485,33 +484,34 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
@@ -396,10 +396,10 @@ WEBINPUTS = .;$TEXMF/web//
CWEBINPUTS = .;$TEXMF/cweb//
% Omega-related fonts and other files.
-OFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}//
-OPLFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/opl//
-OVFFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ovf,vf}//
-OVPFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp//
+OFMFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/{ofm,tfm}//
+OPLFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/opl//
+OVFFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/{ovf,vf}//
+OVPFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/ovp//
OTPINPUTS = .;$TEXMF/omega/otp//
OCPINPUTS = .;$TEXMF/omega/ocp//
@@ -481,33 +481,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.
%
@ -577,10 +644,10 @@
%
% For reference, here is the old brace-using definition:
%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
@@ -784,3 +784,33 @@ max_cols.gftype = 8191
@@ -780,3 +781,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
guess_input_kanji_encoding = 1
+
+% These are xmltex specific
+main_memory.xmltex = 1500000
@ -611,10 +678,10 @@
+hash_extra.jadetex = 25000
+pool_size.jadetex = 500000
+save_size.jadetex = 15000
--- 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>
--- texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/otftotfm.cc
+++ texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/otftotfm.cc 2015-03-26 10:44:15.243270846 +0000
@@ -67,6 +67,9 @@
# include <io.h>
#endif
+#undef SHAREDIR
@ -624,7 +691,7 @@
#define VERSION_OPT 301
--- texk/ps2pkm/pk2bm.c
+++ texk/ps2pkm/pk2bm.c 2013-06-28 11:14:35.673939645 +0000
+++ texk/ps2pkm/pk2bm.c 2013-06-28 11:14:36.000000000 +0000
@@ -39,7 +39,6 @@
static quarterword lsbf(quarterword u);
@ -705,101 +772,9 @@
- while (*oct != '\0') octal = 8*octal + (*oct++) - '0';
- return octal & 0xff;
-}
--- 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
needsCleanup=true
- (umask 077; mkdir "$tmpdir") \
+ if test "$(id -u 2> /dev/null)" = 0 && getent group mktex > /dev/null 2>&1 ; then
+ mkdir -m 0700 "$tmpdir" && chown nobody:mktex "$tmpdir" && chmod 2770 "$tmpdir" \
+ || abort "could not create directory \`$tmpdir'"
+ return
+ fi
+ mkdir -m 0700 "$tmpdir" \
|| abort "could not create directory \`$tmpdir'"
}
@@ -422,7 +427,7 @@ main()
verboseFlag=true
noAbortFlag=false
# eradicate double slashes to avoid kpathsea expansion.
- tmpdir=`echo ${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ | sed s,//,/,g`
+ tmpdir=`echo ${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$RANDOM | sed s,//,/,g`
# mktexfmtMode: if called as mktexfmt, set to true. Will echo the
# first generated filename after successful generation to stdout then
@@ -744,6 +749,7 @@ run_initex()
*) prgswitch=-progname=$format;;
esac
+ type -p "$engine" &> /dev/null || return
rm -f $fmtfile
# Check for infinite recursion before running the iniTeX:
@@ -757,6 +763,12 @@ run_initex()
mktexfmt_loop=$mktexfmt_loop:$format/$engine
export mktexfmt_loop
+ test "$batchmode" = "yes" && {
+ case "$engine" in
+ tex|ptex)
+ texargs="\\batchmode \\input $texargs"
+ esac
+ }
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
# run in a subshell to get a local effect of TEXPOOL manipulation:
--- 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.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 cslatex.ini
@@ -64,8 +64,8 @@ pdfcsplain pdftex - -etex -enc csplain-u
eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
#
# from jadetex:
-jadetex pdftex language.dat *jadetex.ini
-pdfjadetex pdftex language.dat *pdfjadetex.ini
+jadetex pdftex language.dat -translate-file=cp227.tcx *jadetex.ini
+pdfjadetex pdftex language.dat -translate-file=cp227.tcx *pdfjadetex.ini
#
# from latex-bin:
latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
@@ -123,5 +123,5 @@ xetex xetex language.def -etex xetex.ini
xelatex xetex language.dat -etex xelatex.ini
#
# from xmltex:
-xmltex pdftex language.dat *xmltex.ini
-pdfxmltex pdftex language.dat *pdfxmltex.ini
+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 2013-07-29 15:22:59.000000000 +0000
@@ -70,11 +70,21 @@ if #arg == 0 then
@@ -74,11 +74,21 @@ if #arg == 0 then
os.exit(0)
end
@ -824,6 +799,127 @@
intermediate = 1
passes = 2
--- 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.cnf
+++ texk/texlive/tl_scripts/fmtutil.cnf 2015-03-26 11:13:51.701530846 +0000
@@ -45,10 +45,11 @@ amstex pdftex - -translate-file=cp227.tc
# from context:
cont-en pdftex cont-usr.tex -8bit *cont-en.mkii
cont-en xetex cont-usr.tex -8bit *cont-en.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-fr.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 cslatex.ini
@@ -64,8 +65,8 @@ pdfcsplain luatex - -etex csplain.ini
eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
#
# from jadetex:
-jadetex pdftex language.dat *jadetex.ini
-pdfjadetex pdftex language.dat *pdfjadetex.ini
+jadetex pdftex language.dat -translate-file=cp227.tcx *jadetex.ini
+pdfjadetex pdftex language.dat -translate-file=cp227.tcx *pdfjadetex.ini
#
# from latex-bin:
latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
@@ -132,5 +133,5 @@ xetex xetex language.def -etex xetex.ini
xelatex xetex language.dat -etex xelatex.ini
#
# from xmltex:
-xmltex pdftex language.dat *xmltex.ini
-pdfxmltex pdftex language.dat *pdfxmltex.ini
+xmltex pdftex language.dat -translate-file=cp227.tcx *xmltex.ini
+pdfxmltex pdftex language.dat -translate-file=cp227.tcx *pdfxmltex.ini
--- texk/texlive/tl_scripts/fmtutil.sh
+++ texk/texlive/tl_scripts/fmtutil.sh 2012-06-20 09:56:15.000000000 +0000
@@ -163,7 +163,12 @@ setupTmpDir()
trap 'cleanup 1' 1 2 3 7 13 15
needsCleanup=true
- (umask 077; mkdir "$tmpdir") \
+ if test "$(id -u 2> /dev/null)" = 0 && getent group mktex > /dev/null 2>&1 ; then
+ mkdir -m 0700 "$tmpdir" && chown nobody:mktex "$tmpdir" && chmod 2770 "$tmpdir" \
+ || abort "could not create directory \`$tmpdir'"
+ return
+ fi
+ mkdir -m 0700 "$tmpdir" \
|| abort "could not create directory \`$tmpdir'"
}
@@ -425,7 +430,7 @@ main()
verboseFlag=true
noAbortFlag=false
# eradicate double slashes to avoid kpathsea expansion.
- tmpdir=`echo ${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ | sed s,//,/,g`
+ tmpdir=`echo ${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$RANDOM | sed s,//,/,g`
# mktexfmtMode: if called as mktexfmt, set to true. Will echo the
# first generated filename after successful generation to stdout then
@@ -751,6 +756,7 @@ run_initex()
*) prgswitch=-progname=$format;;
esac
+ type -p "$engine" &> /dev/null || return
rm -f $fmtfile
# Check for infinite recursion before running the iniTeX:
@@ -776,6 +782,12 @@ run_initex()
fi
fi
+ test "$batchmode" = "yes" && {
+ case "$engine" in
+ tex|ptex)
+ texargs="\\batchmode \\input $texargs"
+ esac
+ }
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
# run in a subshell to get a local effect of TEXPOOL manipulation:
--- texk/texlive/tl_scripts/texconfig-dialog.sh
+++ texk/texlive/tl_scripts/texconfig-dialog.sh 2009-09-02 12:47:26.000000000 +0000
@@ -150,7 +150,14 @@ termCtl()
###############################################################################
menuMain()
{
- cat <<-'eof'
+ rows="$(stty size)"
+ columns=${rows##* }
+ rows=${rows%% *}
+ test -n "$rows" || rows=0
+ test -n "$columns" || columns=0
+
+ if test $rows -lt 24 -a $columns -lt 80 ; then
+ cat <<-'eof'
The interactive texconfig utility will be started now. Make sure
your screen has at least 24 rows and 80 columns. If texconfig
crashes now, you can still set up your teTeX system using the
@@ -159,8 +166,9 @@ menuMain()
The interactive mode works best with a real vt100 terminal or
inside an xterm window.
-eof
- termCtl readln
+ eof
+ termCtl readln
+ fi
while :; do
logMessage='view logfile'
--- 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"
@ -897,36 +993,6 @@
;;
#
--- texk/texlive/tl_scripts/texconfig-dialog.sh
+++ texk/texlive/tl_scripts/texconfig-dialog.sh 2009-09-02 12:47:26.000000000 +0000
@@ -150,7 +150,14 @@ termCtl()
###############################################################################
menuMain()
{
- cat <<-'eof'
+ rows="$(stty size)"
+ columns=${rows##* }
+ rows=${rows%% *}
+ test -n "$rows" || rows=0
+ test -n "$columns" || columns=0
+
+ if test $rows -lt 24 -a $columns -lt 80 ; then
+ cat <<-'eof'
The interactive texconfig utility will be started now. Make sure
your screen has at least 24 rows and 80 columns. If texconfig
crashes now, you can still set up your teTeX system using the
@@ -159,8 +166,9 @@ menuMain()
The interactive mode works best with a real vt100 terminal or
inside an xterm window.
-eof
- termCtl readln
+ eof
+ termCtl readln
+ fi
while :; do
logMessage='view logfile'
--- 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()
@ -967,7 +1033,7 @@
}
@@ -210,8 +212,22 @@ search_symlinkdir()
@@ -214,8 +216,22 @@ search_symlinkdir()
upd_symlinkdir()
{
search_symlinkdir || return 0
@ -992,7 +1058,7 @@
done
}
@@ -276,12 +292,12 @@ main()
@@ -280,12 +296,12 @@ main()
test -f "$cnf_file" || abort "config file \`$cnf' not found"
@ -1008,7 +1074,7 @@
if test -z "$dirs"; then
if test $multiplatform = true; then
@@ -302,13 +318,16 @@ main()
@@ -306,13 +322,16 @@ main()
# cnf_file_ln.$$ has lines with "format engine" pairs
set x `cat cnf_file_ln.$$`; shift
while test $# != 0; do
@ -1028,15 +1094,15 @@
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
@@ -27,4 +27,5 @@ test -n "${ZSH_VERSION+set}" && alias -g
# TEXMFCONFIG="$c"
# export TEXMFVAR TEXMFCONFIG
+umask 022
exec updmap ${1+"$@"}
exec updmap --sys ${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
+++ texk/web2c/Makefile.in 2011-12-09 14:00:23.000000000 +0000
@@ -3449,7 +3449,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m
md5main_CPPFLAGS = -I$(srcdir)/libmd5
md5main_SOURCES = libmd5/md5main.c
md5main_LDADD = libmd5.a
@ -1045,7 +1111,7 @@
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
@@ -2493,6 +2493,11 @@ w2c/c-auto.h: w2c/stamp-h1
@@ -3496,6 +3496,11 @@ w2c/c-auto.h: w2c/stamp-h1
w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
@rm -f w2c/stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h
@ -1078,7 +1144,7 @@
left,bottom,ESCAPE);
}
--- texk/web2c/window/x11-Xlib.c
+++ texk/web2c/window/x11-Xlib.c 2009-09-02 12:47:27.000000000 +0000
+++ texk/web2c/window/x11-Xlib.c 2015-03-26 11:10:29.029519103 +0000
@@ -73,6 +73,8 @@ static XWMHints wm_hints = {
#define BORDER_WIDTH 1 /* Should get this from resource. */
#define DEFAULT_X_POSITION 0
@ -1088,7 +1154,7 @@
#include <mfdisplay.h>
@@ -101,11 +103,11 @@ mf_x11_initscreen(void)
@@ -101,12 +103,12 @@ mf_x11_initscreen(void)
sizehints.x = DEFAULT_X_POSITION;
sizehints.y = DEFAULT_Y_POSITION;
@ -1098,8 +1164,9 @@
+ sizehints.height = DEFAULT_DEPTH;
sizehints.flags = PPosition|PSize;
- sprintf (default_geometry, "%ux%u+%u+%u", screenwidth, screendepth,
+ sprintf (default_geometry, "%ux%u+%u+%u", DEFAULT_WIDTH, DEFAULT_DEPTH,
sprintf (default_geometry, "%ux%u+%u+%u",
- (unsigned int) screenwidth, (unsigned int) screendepth,
+ (unsigned int) DEFAULT_WIDTH, (unsigned int) DEFAULT_DEPTH,
DEFAULT_X_POSITION, DEFAULT_Y_POSITION);
/* Look up the geometry for this window. (Section 10.2 Obtaining X
@ -1118,7 +1185,7 @@
static Window mf_window;
--- texk/xdvik/psgs.c
+++ texk/xdvik/psgs.c 2009-09-02 12:47:27.000000000 +0000
@@ -30,6 +30,8 @@ OTHER DEALINGS IN THE SOFTWARE.
@@ -34,6 +34,8 @@ OTHER DEALINGS IN THE SOFTWARE.
#include <sys/time.h> /* for timeval */
#include <signal.h>

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

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

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

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

40
texlive.changes
View File

@ -1,3 +1,43 @@
-------------------------------------------------------------------
Thu Mar 26 14:05:48 UTC 2015 - werner@suse.de
- Update to TeXLive 2014 (timestamp 20140525 revision 34252)
* Support DVIPDFMx
* [fix] avoid luatex crash under math_mode 'decimal'
* luaotfload: Fix incorrect handling of font file formats luaotfload)
* Sync with Context beta as of 2014-04-05
* pdfTeX: sync with Knuth TeX 3.14159265, e-TeX 2.6
* Many more ...
- Update biblatex-biber to 1.8
- Add upstrema patch
source-xdvik-events.dif
to make Xaw3d work
- Remove the now included patches
biber-av.patch
biber-certs.dif
biber-dev.patch
source-asymptote.dif
source-bnc856363.dif
source-dvipdfmx.dif
source-poppler-0.26.patch
source-psutils-flip.dif
- Adapted the following patches
biber-decode.diff
biber-noreadonly.diff
biblatex-encoding.dif
source-64.dif
source-arraysubs.dif
source-configure.dif
source-dviutils.dif
source-lacheck.dif
source-poppler.dif
source-psutils.dif
source-texdoc.dif
source-warns.dif
source-x11r7.dif
source-xdvizilla.dif
source.dif
-------------------------------------------------------------------
Sun Mar 15 17:25:38 UTC 2015 - jengelh@inai.de

545
texlive.spec
View File

File diff suppressed because it is too large Load Diff