[SCM] Debian packaging of texlive-bin) branch, master, updated. debian/2013.20130529.30792-1-6-g16111ea
The following commit has been merged in the master branch:
commit 79e61c7e8a43368b6b6a66075110404b458a3bbd
Author: Norbert Preining <preining@logic.at>
Date: Mon Jul 22 11:34:18 2013 +0900
Imported Upstream version 2013.20130722.31261
diff --git a/README b/README
index 8631b15..e8885f5 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-$Id: README 30204 2013-05-02 06:25:42Z peter $
+$Id: README 30772 2013-05-28 18:07:34Z karl $
Public domain. Originally written 2005 by Karl Berry.
For a high-level overview of building TeX Live, see
@@ -61,7 +61,7 @@ the other README.* files here.
Build information for some of the platforms.
-i386-linux: gcc 4.6.3, Linux 2.6.18-* (CentOS 5)
+i386-linux: gcc 4.6.3, Linux 2.6.18-* (CentOS 5, tug.org)
~karl/bin/mybuild
x86_64-linux: gcc 4.6.3, libc 2.3.6, Linux 2.6.28.6
@@ -79,16 +79,7 @@ powerpc-linux (Debian Squeeze)
ppc64 Debian GNU/Linux 6.0
(only the kernel is 64bit, the entire userland is 32bit.)
-sparc-solaris
- OS: Sun Solaris 8
- compiler: Sun Studio 11
- bison (GNU Bison) 2.3
- flex version 2.5.4
- GNU m4 1.4.5
- GNU Make 3.81
- Because Solaris 8 does not include fontconfig, we used fontconfig
- package (version 2.3.2) from http://www.blastwave.org/
- (together with its dependencies)
+sparc-solaris: gcc-4.5.0, Solaris 5.10 (Utah).
powerpc-aix
OS: AIX 4.3
diff --git a/libs/README b/libs/README
index 56b7737..d7bddb0 100644
--- a/libs/README
+++ b/libs/README
@@ -1,4 +1,4 @@
-$Id: README 29693 2013-04-06 11:02:44Z peter $
+$Id: README 30927 2013-06-25 11:39:10Z peter $
Public domain. Originally created by Karl Berry, 2005.
Libraries we compile for TeX Live.
@@ -31,7 +31,8 @@ harfbuzz 0.9.15 - checked 5apr13
icu 51.1 (51_r1) - checked 21mar13
http://download.icu-project.org/files/icu4c/
-libpng 1.6.1 - checked 5apr13
+libpng 1.6.2 - checked 3jun13
+ 1.5.16 - downgraded 7jun13
http://www.libpng.org/ - used by many
http://www.libpng.org/pub/png/pngcode.html
diff --git a/texk/README b/texk/README
index c697765..5bbbb51 100644
--- a/texk/README
+++ b/texk/README
@@ -1,4 +1,4 @@
-$Id: README 30608 2013-05-21 13:53:17Z peter $
+$Id: README 30772 2013-05-28 18:07:34Z karl $
Copyright 2006-2012 TeX Users Group.
You may freely use, modify and/or distribute this file.
@@ -73,6 +73,9 @@ lcdf-typetools 2.98 - checked 11apr13
http://www.lcdf.org/type/
http://www.lcdf.org/type/lcdf-typetools-2.98.tar.gz
+luatex - update texmf-dist/doc/luatex/base from
+ https://foundry.supelec.fr/svn/luatex/trunk/manual
+
makeindexk - maintained here, by us
makejvf - ?
diff --git a/texk/texlive/linked_scripts/texlive/tlmgr.pl b/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 578920e..9ad8121 100755
--- a/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,12 +1,12 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 30404 2013-05-11 21:54:20Z karl $
+# $Id: tlmgr.pl 30643 2013-05-22 23:55:59Z preining $
#
# Copyright 2008-2013 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 30404 $';
-my $datrev = '$Date: 2013-05-11 23:54:20 +0200 (Sat, 11 May 2013) $';
+my $svnrev = '$Revision: 30643 $';
+my $datrev = '$Date: 2013-05-23 01:55:59 +0200 (Thu, 23 May 2013) $';
my $tlmgrrevision;
my $prg;
if ($svnrev =~ m/: ([0-9]+) /) {
@@ -1310,6 +1310,47 @@ sub action_info {
print "longdesc: ", $tlp->longdesc, "\n" if ($tlp->longdesc);
print "installed: ", ($installed ? "Yes" : "No"), "\n";
print "revision: ", $tlp->revision, "\n" if ($installed);
+ # print out sizes
+ my $sizestr = "";
+ my $srcsize = $tlp->srcsize * $TeXLive::TLConfig::BlockSize;
+ $sizestr = sprintf("%ssrc: %dk", $sizestr, int($srcsize / 1024) + 1)
+ if ($srcsize > 0);
+ my $docsize = $tlp->docsize * $TeXLive::TLConfig::BlockSize;
+ $sizestr .= sprintf("%sdoc: %dk",
+ ($sizestr ? ", " : ""), int($docsize / 1024) + 1)
+ if ($docsize > 0);
+ my $runsize = $tlp->runsize * $TeXLive::TLConfig::BlockSize;
+ $sizestr .= sprintf("%srun: %dk",
+ ($sizestr ? ", " : ""), int($runsize / 1024) + 1)
+ if ($runsize > 0);
+ # check for .ARCH expansions
+ my $do_archs = 0;
+ for my $d ($tlp->depends) {
+ if ($d =~ m/^(.*)\.ARCH$/) {
+ $do_archs = 1;
+ last;
+ }
+ }
+ if ($do_archs) {
+ my @a = $localtlpdb->available_architectures;
+ my %binsz = %{$tlp->binsize};
+ my $binsize = 0;
+ for my $a (@a) {
+ $binsize += $binsz{$a} if defined($binsz{$a});
+ my $atlp = $tlpdb->get_package($tlp->name . ".$a");
+ if (!$atlp) {
+ tlwarn("$prg: cannot find depending package" . $tlp->name . ".$a\n");
+ next;
+ }
+ my %abinsz = %{$atlp->binsize};
+ $binsize += $abinsz{$a} if defined($abinsz{$a});
+ }
+ $binsize *= $TeXLive::TLConfig::BlockSize;
+ $sizestr .= sprintf("%sbin: %dk",
+ ($sizestr ? ", " : ""), int($binsize / 1024) + 1)
+ if ($binsize > 0);
+ }
+ print "sizes: ", $sizestr, "\n";
print "relocatable: ", ($tlp->relocated ? "Yes" : "No"), "\n";
print "cat-version: ", $tlp->cataloguedata->{'version'}, "\n"
if $tlp->cataloguedata->{'version'};
diff --git a/texk/web2c/luatexdir/ChangeLog b/texk/web2c/luatexdir/ChangeLog
index 0532154..955d886 100644
--- a/texk/web2c/luatexdir/ChangeLog
+++ b/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,11 @@
+2013-06-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Bug fix for LuaTeX crash on 32bit Unix systems from Taco,
+ tlbuild mail 26 Jun 2013 16:10:35,
+ http://tug.org/pipermail/tex-live/2013-June/033782.html
+ * image/writejbig2.w, image/writejp2.w, image/writejpg.w,
+ image/writepng.w: Always first include ptexlib.h.
+
2013-04-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* lua/luainit.w: Handle '--luac' and '--luaconly' (from Akira).
diff --git a/texk/web2c/luatexdir/image/writejbig2.w b/texk/web2c/luatexdir/image/writejbig2.w
index d47fa17..2e84bcd 100644
--- a/texk/web2c/luatexdir/image/writejbig2.w
+++ b/texk/web2c/luatexdir/image/writejbig2.w
@@ -1,8 +1,8 @@
% writejbig2.w
%
% Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
-% Copyright 2006-2012 Taco Hoekwater <taco@@luatex.org>
-% Copyright 2003-2012 Hartmut Henkel <hartmut@@luatex.org>
+% Copyright 2006-2013 Taco Hoekwater <taco@@luatex.org>
+% Copyright 2003-2013 Hartmut Henkel <hartmut@@luatex.org>
%
% This file is part of LuaTeX.
%
@@ -86,13 +86,10 @@ static const char _svn_version[] =
#undef DEBUG
-#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
diff --git a/texk/web2c/luatexdir/image/writejp2.w b/texk/web2c/luatexdir/image/writejp2.w
index 7082335..47424d1 100644
--- a/texk/web2c/luatexdir/image/writejp2.w
+++ b/texk/web2c/luatexdir/image/writejp2.w
@@ -1,7 +1,7 @@
% writejp2.w
%
-% Copyright 2011-2012 Taco Hoekwater <taco@@luatex.org>
-% Copyright 2011-2012 Hartmut Henkel <hartmut@@luatex.org>
+% Copyright 2011-2013 Taco Hoekwater <taco@@luatex.org>
+% Copyright 2011-2013 Hartmut Henkel <hartmut@@luatex.org>
%
% This file is part of LuaTeX.
%
@@ -28,9 +28,9 @@ Information technology --- JPEG~2000 image coding system: Core coding system.
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() */
diff --git a/texk/web2c/luatexdir/image/writejpg.w b/texk/web2c/luatexdir/image/writejpg.w
index 2269ad2..bb1714a 100644
--- a/texk/web2c/luatexdir/image/writejpg.w
+++ b/texk/web2c/luatexdir/image/writejpg.w
@@ -1,7 +1,7 @@
% writejpg.w
%
% Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
-% Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
+% Copyright 2006-2013 Taco Hoekwater <taco@@luatex.org>
%
% This file is part of LuaTeX.
%
@@ -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"
diff --git a/texk/web2c/luatexdir/image/writepng.w b/texk/web2c/luatexdir/image/writepng.w
index 17624b1..57079f5 100644
--- a/texk/web2c/luatexdir/image/writepng.w
+++ b/texk/web2c/luatexdir/image/writepng.w
@@ -1,7 +1,7 @@
% writepng.w
%
% Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
-% Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
+% Copyright 2006-2013 Taco Hoekwater <taco@@luatex.org>
%
% This file is part of LuaTeX.
%
@@ -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"
diff --git a/texk/web2c/luatexdir/lua/liolibext.c b/texk/web2c/luatexdir/lua/liolibext.c
index 08c6f0b..51cbc5b 100644
--- a/texk/web2c/luatexdir/lua/liolibext.c
+++ b/texk/web2c/luatexdir/lua/liolibext.c
@@ -199,7 +199,7 @@ static int io_popen(lua_State * L)
char *cmdname = NULL;
int allow = 0;
const char *filename = luaL_checkstring(L, 1);
- const char *mode = luaL_optstring(L, 2, "rb");
+ const char *mode = luaL_optstring(L, 2, "r");
LStream *p = newprefile(L);
if (shellenabledp <= 0) {
diff --git a/texk/web2c/mplibdir/ChangeLog b/texk/web2c/mplibdir/ChangeLog
index 1672e16..27734b2 100644
--- a/texk/web2c/mplibdir/ChangeLog
+++ b/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-16 Taco Hoekwater <taco@luatex.org>
+
+ Import metapost 1.803 (released version)
+
2013-05-22 Taco Hoekwater <taco@luatex.org>
* svgout.w: fix a problem with overly large characters in
diff --git a/texk/web2c/mplibdir/mp.w b/texk/web2c/mplibdir/mp.w
index 3d64ed4..c35f547 100644
--- a/texk/web2c/mplibdir/mp.w
+++ b/texk/web2c/mplibdir/mp.w
@@ -1,4 +1,4 @@
-% $Id: mp.w 1901 2013-05-22 14:42:19Z taco $
+% $Id: mp.w 1918 2013-06-13 12:47:55Z taco $
%
% This file is part of MetaPost;
% the MetaPost program is in the public domain.
@@ -73,12 +73,12 @@ undergoes any modifications, so that it will be clear which version of
@^extensions to \MP@>
@^system dependencies@>
-@d default_banner "This is MetaPost, Version 1.802" /* printed when \MP\ starts */
+@d default_banner "This is MetaPost, Version 1.803" /* printed when \MP\ starts */
@d true 1
@d false 0
@<Metapost version header@>=
-#define metapost_version "1.802"
+#define metapost_version "1.803"
@ The external library header for \MP\ is |mplib.h|. It contains a
few typedefs and the header defintions for the externally used
@@ -516,8 +516,8 @@ MP mp_initialize (MP_options * opt) {
/* open the terminal for output */
t_open_out();
#if DEBUG
- setlinebuf(stdout);
- setlinebuf(mp->term_out);
+ setvbuf(stdout, (char *) NULL, _IONBF, 0);
+ setvbuf(mp->term_out, (char *) NULL, _IONBF, 0);
#endif
if (opt->math_mode == mp_math_scaled_mode) {
mp->math = mp_initialize_scaled_math(mp);
@@ -8330,8 +8330,8 @@ static void mp_curl_ratio (MP mp, mp_number *ret, mp_number gamma, mp_number a_t
@ @c
void mp_curl_ratio (MP mp, mp_number *ret, mp_number gamma_orig, mp_number a_tension, mp_number b_tension) {
mp_number alpha, beta, gamma, num, denom, ff; /* registers */
- mp_number n1;
- new_number (n1);
+ mp_number arg1;
+ new_number (arg1);
new_fraction (alpha);
new_fraction (beta);
new_fraction (gamma);
@@ -8342,49 +8342,33 @@ void mp_curl_ratio (MP mp, mp_number *ret, mp_number gamma_orig, mp_number a_ten
make_fraction (beta, unity_t, b_tension);
number_clone (gamma, gamma_orig);
if (number_lessequal(alpha, beta)) {
- mp_number arg1;
- new_number (arg1);
make_fraction (ff, alpha, beta);
number_clone (arg1, ff);
take_fraction (ff, arg1, arg1);
number_clone (arg1, gamma);
take_fraction (gamma, arg1, ff);
convert_fraction_to_scaled (beta);
- set_number_from_addition (arg1, alpha, three_t);
- number_substract (arg1, beta);
- take_fraction (denom, gamma, arg1);
- set_number_from_substraction (arg1, fraction_three_t, alpha);
- number_add (arg1, beta);
- take_fraction (num, gamma, arg1);
- free_number (arg1);
+ take_fraction (denom, gamma, alpha);
+ number_add (denom, three_t);
} else {
- mp_number arg1, r1;
- new_number (arg1);
- new_number (r1);
make_fraction (ff, beta, alpha);
number_clone (arg1, ff);
take_fraction (ff, arg1, arg1);
take_fraction (arg1, beta, ff);
convert_fraction_to_scaled (arg1);
- number_clone (beta, arg1);
- take_fraction (arg1, gamma, alpha);
- new_number (denom);
- {
- set_number_from_div (n1, ff, twelvebits_3);
- number_clone (denom, arg1);
- number_add (denom, n1);
- number_substract (denom, beta);
- }
- set_number_from_substraction (arg1, fraction_three_t, alpha);
- take_fraction (num, gamma, arg1);
- number_add (num, beta);
- free_number (arg1);
- free_number (r1);
- }
- number_clone (n1, denom);
- number_double (n1);
- number_double (n1); /* n1 = 4*denom */
- if (number_greaterequal(num, n1)) {
+ number_clone (beta, arg1);
+ take_fraction (denom, gamma, alpha);
+ set_number_from_div (arg1, ff, twelvebits_3);
+ number_add (denom, arg1);
+ }
+ number_substract (denom, beta);
+ set_number_from_substraction (arg1, fraction_three_t, alpha);
+ take_fraction (num, gamma, arg1);
+ number_add (num, beta);
+ number_clone (arg1, denom);
+ number_double (arg1);
+ number_double (arg1); /* arg1 = 4*denom */
+ if (number_greaterequal(num, arg1)) {
number_clone(*ret, fraction_four_t);
} else {
make_fraction (*ret, num, denom);
@@ -8395,7 +8379,7 @@ void mp_curl_ratio (MP mp, mp_number *ret, mp_number gamma_orig, mp_number a_ten
free_number (num);
free_number (denom);
free_number (ff);
- free_number (n1);
+ free_number (arg1);
}
diff --git a/texk/web2c/mplibdir/mpmathdouble.w b/texk/web2c/mplibdir/mpmathdouble.w
index 577c0b7..41e4b7a 100644
--- a/texk/web2c/mplibdir/mpmathdouble.w
+++ b/texk/web2c/mplibdir/mpmathdouble.w
@@ -1,4 +1,4 @@
-% $Id: mpmathdouble.w 1892 2013-03-22 10:21:05Z taco $
+% $Id: mpmathdouble.w 1915 2013-06-13 10:17:31Z taco $
%
% This file is part of MetaPost;
% the MetaPost program is in the public domain.
@@ -17,13 +17,13 @@
@ Introduction.
@c
-#define _ISOC99_SOURCE /* to get the round() prototype */
#include <w2c/config.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
#include "mpmathdouble.h" /* internal header */
+#define ROUND(a) floor((a)+0.5)
@h
@ @c
@@ -402,11 +402,7 @@ void mp_number_fraction_to_scaled (mp_number *A) {
}
void mp_number_angle_to_scaled (mp_number *A) {
A->type = mp_scaled_type;
- if (A->data.dval >= 0) {
- A->data.dval = round(A->data.dval) / angle_multiplier;
- } else {
- A->data.dval = -((-round(A->data.dval))/ angle_multiplier);
- }
+ A->data.dval = ROUND(A->data.dval) / angle_multiplier;
}
void mp_number_scaled_to_fraction (mp_number *A) {
A->type = mp_fraction_type;
@@ -422,7 +418,7 @@ void mp_number_scaled_to_angle (mp_number *A) {
@c
int mp_number_to_scaled(mp_number A) {
- return (int)round(A.data.dval * 65536.0);
+ return (int)ROUND(A.data.dval * 65536.0);
}
int mp_number_to_int(mp_number A) {
return (int)(A.data.dval);
@@ -434,7 +430,7 @@ double mp_number_to_double(mp_number A) {
return A.data.dval;
}
int mp_number_odd(mp_number A) {
- return odd((int)round(A.data.dval * 65536.0));
+ return odd((int)ROUND(A.data.dval * 65536.0));
}
int mp_number_equal(mp_number A, mp_number B) {
return (A.data.dval==B.data.dval);
@@ -962,7 +958,7 @@ and truncation operations.
@ |round_unscaled| rounds a |scaled| and converts it to |int|
@c
int mp_round_unscaled(mp_number x_orig) {
- int x = (int)round(x_orig.data.dval);
+ int x = (int)ROUND(x_orig.data.dval);
return x;
}
diff --git a/texk/web2c/mplibdir/mpost.w b/texk/web2c/mplibdir/mpost.w
index 9d7096c..ae572e8 100644
--- a/texk/web2c/mplibdir/mpost.w
+++ b/texk/web2c/mplibdir/mpost.w
@@ -1,4 +1,4 @@
-% $Id: mpost.w 1895 2013-03-27 11:17:17Z taco $
+% $Id: mpost.w 1916 2013-06-13 10:19:49Z taco $
%
% This file is part of MetaPost;
% the MetaPost program is in the public domain.
@@ -443,7 +443,7 @@ static int mpost_run_make_mpx (MP mp, char *mpname, char *mpxname) {
mpost_xfree(mpversion);
}
}
-
+
mpost_xfree (cnf_cmd);
return (int)(ret == 0);
}
@@ -1290,6 +1290,17 @@ extern __declspec(dllexport) int DLLPROC (int argc, char **argv);
@ Now this is really it: \MP\ starts and ends here.
@c
+static char *cleaned_invocation_name(char *arg)
+{
+ char *ret, *dot;
+ const char *start = xbasename(arg);
+ ret = xstrdup(start);
+ dot = strrchr(ret, '.');
+ if (dot != NULL) {
+ *dot = 0; /* chop */
+ }
+ return ret;
+}
int
#if defined(WIN32) && !defined(__MINGW32__) && defined(DLLPROC)
DLLPROC (int argc, char **argv)
@@ -1306,8 +1317,8 @@ main (int argc, char **argv)
options->ini_version = (int)false;
options->print_found_names = (int)true;
{
- const char *base = xbasename(argv[0]);
- if (!strcmp(base, "dvitomp") || !strcasecmp(base, "dvitomp.exe"))
+ const char *base = cleaned_invocation_name(argv[0]);
+ if (FILESTRCASEEQ(base, "dvitomp"))
dvitomp_only=1;
}
if (dvitomp_only) {
diff --git a/texk/web2c/xetexdir/NEWS b/texk/web2c/xetexdir/NEWS
index 5dacfe3..bf245ac 100644
--- a/texk/web2c/xetexdir/NEWS
+++ b/texk/web2c/xetexdir/NEWS
@@ -1,4 +1,14 @@
==============================================================
+XeTeX 0.9999.3 was released 20130528
+==============================================================
+
+XeTeX:
+* Fix bug with extensible accents resulting in invalid glyph id some times.
+* Fix alternate index in multiple alternates features to be start from zero
+ like pre-0.9999 XeTeX.
+* Document multiple alternates syntax in the reference documentation.
+
+==============================================================
XeTeX 0.9999.2 was released 20130406
==============================================================
--
Debian packaging of texlive-bin)
Reply to: