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

Accepting request 504155 from Publishing:TeXLive

Browse Source 
This submition depends on SR#503073, SR#503942, SR#503941. as well as on SR#503940

OBS-URL: https://build.opensuse.org/request/show/504155
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texlive?expand=0&rev=36
This commit is contained in:
Dominique Leuenberger 2017-06-25 17:20:58 +00:00 committed by Git OBS Bridge
commit 20adfb760b
15 changed files with 1255 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
biber-certs.dif
View File

@ -6,38 +6,38 @@
4 files changed, 2 insertions(+), 3 deletions(-) 4 files changed, 2 insertions(+), 3 deletions(-)
--- Build.PL --- Build.PL
+++ Build.PL 2016-06-07 14:11:47.318106451 +0000 +++ Build.PL 2017-05-30 13:22:55.692794072 +0000
@@ -53,7 +53,6 @@ my $builder = $class->new( @@ -54,7 +54,6 @@ my $builder = $class->new(
'List::AllUtils' => 0, 'List::AllUtils' => 0,
'List::MoreUtils' => 0, 'List::MoreUtils' => 0,
'List::MoreUtils::XS' => 0, 'List::MoreUtils::XS' => 0,
- 'Mozilla::CA' => '20141217', - 'Mozilla::CA' => '20160104',
'Regexp::Common' => 0, 'Regexp::Common' => 0,
'Log::Log4perl' => 0, 'Log::Log4perl' => 0,
'Unicode::Collate' => '1.14', 'Unicode::Collate' => '1.18',
--- META.json --- META.json
+++ META.json 2016-06-07 14:12:02.509820834 +0000 +++ META.json 2017-05-30 13:23:19.305046965 +0000
@@ -48,7 +48,6 @@ @@ -49,7 +49,6 @@
"List::MoreUtils" : "0", "List::MoreUtils" : "0",
"List::MoreUtils::XS" : "0", "List::MoreUtils::XS" : "0",
"Log::Log4perl" : "0", "Log::Log4perl" : "0",
- "Mozilla::CA" : "20141217", - "Mozilla::CA" : "20160104",
"Regexp::Common" : "0", "Regexp::Common" : "0",
"Text::BibTeX" : "0.72", "Sort::Key" : "0",
"Text::Roman" : "0", "Text::BibTeX" : "0.76",
--- META.yml --- META.yml
+++ META.yml 2016-06-07 14:12:11.285655839 +0000 +++ META.yml 2017-05-30 13:23:28.101141166 +0000
@@ -93,7 +93,6 @@ requires: @@ -94,7 +94,6 @@ requires:
List::MoreUtils: '0' List::MoreUtils: '0'
List::MoreUtils::XS: '0' List::MoreUtils::XS: '0'
Log::Log4perl: '0' Log::Log4perl: '0'
- Mozilla::CA: '20141217' - Mozilla::CA: '20160104'
Regexp::Common: '0' Regexp::Common: '0'
Text::BibTeX: '0.72' Sort::Key: '0'
Text::Roman: '0' Text::BibTeX: '0.76'
--- bin/biber --- bin/biber
+++ bin/biber 2016-06-07 14:00:30.294825957 +0000 +++ bin/biber 2017-05-30 13:22:13.032337114 +0000
@@ -104,6 +104,8 @@ GetOptions( @@ -112,6 +112,8 @@ GetOptions(
) or pod2usage(-verbose => 0, ) or pod2usage(-verbose => 0,
-exitval => EXIT_ERROR); -exitval => EXIT_ERROR);

53
biber-perl-pre5.22.0.dif
View File

@ -1,53 +0,0 @@
Also fastsort causes trouble.
---
t/sort-order.t | 24 +-----------------------
1 file changed, 1 insertion(+), 23 deletions(-)
--- t/sort-order.t
+++ t/sort-order.t 2016-06-14 14:21:07.085073233 +0000
@@ -4,7 +4,7 @@ use warnings;
use utf8;
no warnings 'utf8';
-use Test::More tests => 15;
+use Test::More tests => 14;
use Biber;
use Biber::Output::bbl;
@@ -32,7 +32,6 @@ $biber->set_output_obj(Biber::Output::bb
# Options - we could set these in the control file but it's nice to see what we're
# relying on here for tests
Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
-Biber::Config->setoption('fastsort', 1);
Biber::Config->setblxoption('labelyear', undef);
Biber::Config->setblxoption('labelalpha', 0);
@@ -482,27 +481,6 @@ $section = $biber->sections->get_section
is_deeply([$main->get_keys], ['L9','L6','L7','L8','L5','L4','L3','L2','L1B','L1A','L1'], 'nty with descending n');
-# testing case sensitive with fastsort
-# In alphabetic, all uppercase comes before lower so the
-# "sortcase => 1" on location means that "edinburgh" sorts at the end after "London"
-# Take this out of the location sorting spec and it fails as it should
-$S = { spec => [
- [
- {sortcase => 1},
- {'location' => {}}
- ]
- ]};
-
-$main->set_sortscheme($S);
-
-$biber->set_output_obj(Biber::Output::bbl->new());
-# Have to set locale to something which understands lexical/case differences for this test
-# otherwise testing on Windows doesn't work ...
-Biber::Config->setoption('sortlocale', 'C.UTF-8');
-$biber->prepare;
-$section = $biber->sections->get_section(0);
-is_deeply([$main->get_keys], ['L1B','L1','L1A','L2','L3','L4','L5','L7','L8','L9','L6'], 'location - sortcase=1');
-
# Test nosort option
$S = { spec => [
[

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

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

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

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

8
biblatex-encoding.dif
View File

@ -5,7 +5,7 @@
3 files changed, 3 insertions(+) 3 files changed, 3 insertions(+)
--- lib/Biber/Output/base.pm --- lib/Biber/Output/base.pm
+++ lib/Biber/Output/base.pm 2016-01-28 14:18:54.154145820 +0000 +++ lib/Biber/Output/base.pm 2017-05-30 13:14:49.503601586 +0000
@@ -7,6 +7,7 @@ use Biber::Entry; @@ -7,6 +7,7 @@ use Biber::Entry;
use Biber::Utils; use Biber::Utils;
use Encode; use Encode;
@ -15,17 +15,17 @@
$Text::Wrap::columns = 80; $Text::Wrap::columns = 80;
use Log::Log4perl qw( :no_extra_logdie_message ); use Log::Log4perl qw( :no_extra_logdie_message );
--- lib/Biber/Output/bbl.pm --- lib/Biber/Output/bbl.pm
+++ lib/Biber/Output/bbl.pm 2016-01-28 14:19:09.785831193 +0000 +++ lib/Biber/Output/bbl.pm 2017-05-30 13:19:08.950366953 +0000
@@ -12,6 +12,7 @@ use Biber::Utils; @@ -12,6 +12,7 @@ use Biber::Utils;
use Encode; use Encode;
use List::AllUtils qw( :all ); use List::AllUtils qw( :all );
use IO::File; use IO::File;
+use PerlIO::encoding; +use PerlIO::encoding;
use Log::Log4perl qw( :no_extra_logdie_message ); use Log::Log4perl qw( :no_extra_logdie_message );
use Scalar::Util qw(looks_like_number);
use Text::Wrap; use Text::Wrap;
use Unicode::Normalize;
--- lib/Biber/Output/dot.pm --- lib/Biber/Output/dot.pm
+++ lib/Biber/Output/dot.pm 2016-01-28 14:19:20.617613177 +0000 +++ lib/Biber/Output/dot.pm 2017-05-30 13:14:50.359610708 +0000
@@ -10,6 +10,7 @@ use Biber::Entry; @@ -10,6 +10,7 @@ use Biber::Entry;
use Biber::Utils; use Biber::Utils;
use List::AllUtils qw( :all ); use List::AllUtils qw( :all );

97
source-configure.dif
View File

@ -1,16 +1,12 @@
--- ---
configure | 9 --------- configure | 3 ---
configure.ac | 3 --- configure.ac | 3 ---
libs/configure | 6 ------
texk/configure | 6 ------
texk/dvipdfm-x/configure | 8 ++++---- texk/dvipdfm-x/configure | 8 ++++----
texk/dvipdfm-x/configure.ac | 2 +- texk/dvipdfm-x/configure.ac | 2 +-
texk/dvisvgm/ac/libgs.ac | 3 --- 4 files changed, 5 insertions(+), 11 deletions(-)
utils/configure | 6 ------
8 files changed, 5 insertions(+), 38 deletions(-)
--- configure.ac --- configure.ac
+++ configure.ac 2016-06-07 12:51:38.568729621 +0000 +++ configure.ac 2017-05-30 12:46:15.933298946 +0000
@@ -126,9 +126,6 @@ KPSE_FOR_PKGS([sys_libs], [m4_sinclude([ @@ -126,9 +126,6 @@ KPSE_FOR_PKGS([sys_libs], [m4_sinclude([
if test "x$syslib_status" = xno; then if test "x$syslib_status" = xno; then
AC_MSG_ERROR([some requested system libraries failed]) AC_MSG_ERROR([some requested system libraries failed])
@ -22,21 +18,8 @@
AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes]) AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes])
--- configure --- configure
+++ configure 2016-06-07 12:54:03.241986672 +0000 +++ configure 2017-05-30 12:46:15.981299457 +0000
@@ -5273,12 +5273,6 @@ if test "${with_libgs_libdir+set}" = set @@ -22124,9 +22124,6 @@ fi
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/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/
## configure options and TL libraries required for gregorio
# Check whether --enable-gregorio was given.
@@ -22181,9 +22175,6 @@ fi
if test "x$syslib_status" = xno; then if test "x$syslib_status" = xno; then
as_fn_error $? "some requested system libraries failed" "$LINENO" 5 as_fn_error $? "some requested system libraries failed" "$LINENO" 5
fi fi
@ -46,49 +29,19 @@
CPPFLAGS=$kpse_save_CPPFLAGS CPPFLAGS=$kpse_save_CPPFLAGS
LIBS=$kpse_save_LIBS LIBS=$kpse_save_LIBS
--- libs/configure
+++ libs/configure 2016-06-07 12:54:22.137628386 +0000
@@ -4471,12 +4471,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/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/
## configure options and TL libraries required for gregorio
# Check whether --enable-gregorio was given.
--- texk/configure
+++ texk/configure 2016-06-07 12:54:40.781274871 +0000
@@ -4483,12 +4483,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/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/
## configure options and TL libraries required for gregorio
# Check whether --enable-gregorio was given.
--- texk/dvipdfm-x/configure.ac --- texk/dvipdfm-x/configure.ac
+++ texk/dvipdfm-x/configure.ac 2016-06-07 12:55:15.332619702 +0000 +++ texk/dvipdfm-x/configure.ac 2017-05-30 12:50:20.711904998 +0000
@@ -7,7 +7,7 @@ dnl This file is free software; the co @@ -7,7 +7,7 @@ dnl This file is free software; the co
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved. dnl with or without modifications, as long as this notice is preserved.
dnl dnl
-AC_INIT([dvipdfm-x (TeX Live)], [20160307], [tex-k@tug.org]) -AC_INIT([dvipdfm-x (TeX Live)], [20170318], [tex-k@tug.org])
+AC_INIT([dvipdfmx (TeX Live)], [20160307], [tex-k@tug.org]) +AC_INIT([dvipdfmx (TeX Live)], [20170318], [tex-k@tug.org])
AC_PREREQ([2.65]) AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([agl.c]) AC_CONFIG_SRCDIR([agl.c])
AC_CONFIG_AUX_DIR([../../build-aux]) AC_CONFIG_AUX_DIR([../../build-aux])
--- texk/dvipdfm-x/configure --- texk/dvipdfm-x/configure
+++ texk/dvipdfm-x/configure 2016-06-07 12:56:53.574756684 +0000 +++ texk/dvipdfm-x/configure 2017-05-30 12:52:21.189194983 +0000
@@ -588,10 +588,10 @@ MFLAGS= @@ -588,10 +588,10 @@ MFLAGS=
MAKEFLAGS= MAKEFLAGS=
@ -97,9 +50,9 @@
-PACKAGE_TARNAME='dvipdfm-x--tex-live-' -PACKAGE_TARNAME='dvipdfm-x--tex-live-'
+PACKAGE_NAME='dvipdfmx (TeX Live)' +PACKAGE_NAME='dvipdfmx (TeX Live)'
+PACKAGE_TARNAME='dvipdfmx' +PACKAGE_TARNAME='dvipdfmx'
PACKAGE_VERSION='20160307' PACKAGE_VERSION='20170318'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20160307' -PACKAGE_STRING='dvipdfm-x (TeX Live) 20170318'
+PACKAGE_STRING='dvipdfmx (TeX Live) 20160307' +PACKAGE_STRING='dvipdfmx (TeX Live) 20170318'
PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL='' PACKAGE_URL=''
@ -109,30 +62,6 @@
# Define the identity of the package. # Define the identity of the package.
- PACKAGE='dvipdfm-x--tex-live-' - PACKAGE='dvipdfm-x--tex-live-'
+ PACKAGE='dvipdfmx' + PACKAGE='dvipdfmx'
VERSION='20160307' VERSION='20170318'
--- texk/dvisvgm/ac/libgs.ac
+++ texk/dvisvgm/ac/libgs.ac 2016-06-07 12:51:38.616728710 +0000
@@ -4,6 +4,3 @@ dnl Copyright (C) 2009 Peter Breitenlohn
dnl You may freely use, modify and/or distribute this file.
dnl
## configure checks for dvisvgm and libgs
-if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then
- AC_MSG_ERROR([you can not use system libraries for a native TeX Live build])
-fi
--- utils/configure
+++ utils/configure 2016-06-07 12:57:20.806240245 +0000
@@ -4464,12 +4464,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/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/
## configure options and TL libraries required for gregorio
# Check whether --enable-gregorio was given.

842
source-luatex.dif Normal file
View File

@ -0,0 +1,842 @@
---
texk/web2c/luatexdir/lua/liolibext.c | 6
texk/web2c/luatexdir/lua/luatex-core.c | 324 ++++++++++++-----------
texk/web2c/luatexdir/lua/luatex-core.lua | 423 +++++++++++++++----------------
texk/web2c/luatexdir/luaffi/ctype.c | 4
texk/web2c/luatexdir/luaffi/ffi.h | 2
texk/web2c/luatexdir/luatex.c | 4
6 files changed, 387 insertions(+), 376 deletions(-)
--- texk/web2c/luatexdir/luaffi/ctype.c
+++ texk/web2c/luatexdir/luaffi/ctype.c 2017-05-31 13:08:25.421741873 +0000
@@ -245,6 +245,10 @@ void* to_cdata(lua_State* L, int idx, st
lua_pop(L, 1); /* mt */
cd = (struct cdata*) lua_touserdata(L, idx);
+ if (!cd) {
+ lua_pushnil(L);
+ return NULL;
+ }
*ct = cd->type;
lua_getuservalue(L, idx);
--- texk/web2c/luatexdir/luaffi/ffi.h
+++ texk/web2c/luatexdir/luaffi/ffi.h 2017-06-01 09:12:45.128442092 +0000
@@ -370,7 +370,7 @@ __declspec(align(16))
#endif
struct cdata {
const struct ctype type
-#ifdef __GNUC__
+#if 0 /* def __GNUC__ */
__attribute__ ((aligned(16)))
#endif
;
--- texk/web2c/luatexdir/lua/liolibext.c 2017/06/13 21:01:34 44589
+++ texk/web2c/luatexdir/lua/liolibext.c 2017/06/13 22:07:40 44590
@@ -365,7 +365,7 @@
lua_pushliteral(L,"all command execution is disabled");
} else if (restrictedshell == 0) {
lua_pushboolean(L,1);
- lua_pushliteral(L,"all commands are permitted");
+ lua_pushstring(L,filename);
} else {
char *safecmd = NULL;
char *cmdname = NULL;
@@ -374,10 +374,6 @@
lua_pushboolean(L,0);
lua_pushliteral(L, "specific command execution disabled");
break;
- case 1:
- lua_pushboolean(L,1);
- lua_pushstring(L,filename);
- break;
case 2:
lua_pushboolean(L,1);
lua_pushstring(L,safecmd);
--- texk/web2c/luatexdir/lua/luatex-core.c 2017/06/13 21:01:34 44589
+++ texk/web2c/luatexdir/lua/luatex-core.c 2017/06/13 22:07:40 44590
@@ -52,7 +52,7 @@
0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x69, 0x6f, 0x5f,
0x70, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x3d, 0x20, 0x69, 0x6f, 0x2e, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x0a, 0x6c, 0x6f, 0x63, 0x61,
- 0x6c, 0x20, 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x6c, 0x20, 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x2e, 0x6c, 0x69, 0x6e, 0x65, 0x73,
0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x61, 0x64,
0x6c, 0x69, 0x6e, 0x65, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x66, 0x69,
@@ -84,169 +84,175 @@
0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20, 0x2d, 0x2d, 0x20,
0x63, 0x61, 0x6e, 0x20, 0x62, 0x65, 0x20, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64,
- 0x0a, 0x69, 0x6f, 0x2e, 0x73, 0x61, 0x76, 0x65, 0x64, 0x5f, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x20,
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f,
- 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x2d, 0x2d, 0x20, 0x63, 0x61, 0x6e, 0x20, 0x62, 0x65, 0x20,
- 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x0a, 0x69, 0x6f, 0x2e, 0x73, 0x61, 0x76,
- 0x65, 0x64, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x2d,
- 0x2d, 0x20, 0x61, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x20, 0x72, 0x65, 0x61, 0x64, 0x6f, 0x6e, 0x6c,
- 0x79, 0x0a, 0x6d, 0x74, 0x2e, 0x73, 0x61, 0x76, 0x65, 0x64, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73,
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6d, 0x74,
- 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x2d, 0x2d, 0x20, 0x61, 0x6c, 0x77, 0x61, 0x79, 0x73,
- 0x20, 0x72, 0x65, 0x61, 0x64, 0x6f, 0x6e, 0x6c, 0x79, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c,
- 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78,
- 0x5f, 0x69, 0x6f, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x68, 0x6f,
- 0x77, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x68, 0x6f,
- 0x77, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68,
- 0x6f, 0x77, 0x20, 0x3d, 0x20, 0x27, 0x72, 0x27, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64,
- 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x20, 0x3d, 0x20, 0x69,
+ 0x0a, 0x2d, 0x2d, 0x20, 0x28, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x20, 0x66, 0x6f, 0x72,
+ 0x20, 0x74, 0x6c, 0x31, 0x37, 0x20, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x29, 0x20, 0x69,
+ 0x6f, 0x2e, 0x73, 0x61, 0x76, 0x65, 0x64, 0x5f, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f, 0x70, 0x6f,
+ 0x70, 0x65, 0x6e, 0x20, 0x2d, 0x2d, 0x20, 0x63, 0x61, 0x6e, 0x20, 0x62, 0x65, 0x20, 0x70, 0x72,
+ 0x6f, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x0a, 0x69, 0x6f, 0x2e, 0x73, 0x61, 0x76, 0x65, 0x64,
+ 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x2d, 0x2d, 0x20,
+ 0x61, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x20, 0x72, 0x65, 0x61, 0x64, 0x6f, 0x6e, 0x6c, 0x79, 0x0a,
+ 0x6d, 0x74, 0x2e, 0x73, 0x61, 0x76, 0x65, 0x64, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6d, 0x74, 0x5f, 0x6c,
+ 0x69, 0x6e, 0x65, 0x73, 0x20, 0x2d, 0x2d, 0x20, 0x61, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x20, 0x72,
+ 0x65, 0x61, 0x64, 0x6f, 0x6e, 0x6c, 0x79, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66,
+ 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69,
0x6f, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x68, 0x6f, 0x77, 0x29,
- 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x66, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20,
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x68,
- 0x6f, 0x77, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x27, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x27, 0x20,
- 0x61, 0x6e, 0x64, 0x20, 0x66, 0x69, 0x6e, 0x64, 0x28, 0x68, 0x6f, 0x77, 0x2c, 0x27, 0x77, 0x27,
- 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- 0x20, 0x20, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x66, 0x69, 0x6c,
- 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x27, 0x77, 0x27, 0x29, 0x0a,
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20,
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x63,
- 0x6f, 0x72, 0x64, 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x28, 0x6e, 0x61, 0x6d, 0x65,
- 0x2c, 0x27, 0x72, 0x27, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e,
- 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
- 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61,
- 0x6c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65,
- 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6f, 0x6e,
- 0x6c, 0x79, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x68, 0x6f, 0x77, 0x29, 0x0a, 0x20, 0x20, 0x20,
- 0x20, 0x69, 0x66, 0x20, 0x68, 0x6f, 0x77, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20,
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x6f, 0x77, 0x20, 0x3d, 0x20, 0x27, 0x72, 0x27, 0x0a, 0x20,
- 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- 0x68, 0x6f, 0x77, 0x20, 0x3d, 0x20, 0x67, 0x73, 0x75, 0x62, 0x28, 0x68, 0x6f, 0x77, 0x2c, 0x27,
- 0x5b, 0x5e, 0x72, 0x62, 0x5d, 0x27, 0x2c, 0x27, 0x27, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
- 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x68, 0x6f, 0x77, 0x20, 0x3d, 0x3d, 0x20, 0x27, 0x27, 0x20,
- 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- 0x20, 0x68, 0x6f, 0x77, 0x20, 0x3d, 0x20, 0x27, 0x72, 0x27, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
- 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20,
+ 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x68, 0x6f, 0x77, 0x20,
+ 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x6f, 0x77,
+ 0x20, 0x3d, 0x20, 0x27, 0x72, 0x27, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20,
0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f,
0x6f, 0x70, 0x65, 0x6e, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x68, 0x6f, 0x77, 0x29, 0x0a, 0x20,
0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x66, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20,
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x66,
- 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x27, 0x72, 0x27,
- 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
- 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61,
- 0x6c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65,
- 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c,
- 0x2e, 0x2e, 0x2e, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6f,
- 0x6b, 0x61, 0x79, 0x2c, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x66, 0x69, 0x6f,
- 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e,
- 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6f, 0x6b,
- 0x61, 0x79, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x74, 0x68, 0x65,
- 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
- 0x20, 0x69, 0x6f, 0x5f, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x2c,
- 0x2e, 0x2e, 0x2e, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64,
- 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
- 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73,
- 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c,
- 0x20, 0x66, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x6e, 0x61, 0x6d,
- 0x65, 0x2c, 0x27, 0x72, 0x27, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x66, 0x20,
- 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
- 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x29, 0x0a, 0x20,
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x68, 0x6f, 0x77,
+ 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x27, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x27, 0x20, 0x61, 0x6e,
+ 0x64, 0x20, 0x66, 0x69, 0x6e, 0x64, 0x28, 0x68, 0x6f, 0x77, 0x2c, 0x27, 0x77, 0x27, 0x29, 0x20,
+ 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x66, 0x69, 0x6c, 0x65, 0x6e,
+ 0x61, 0x6d, 0x65, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x27, 0x77, 0x27, 0x29, 0x0a, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x63, 0x6f, 0x72,
+ 0x64, 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x27,
+ 0x72, 0x27, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a,
+ 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
+ 0x72, 0x6e, 0x20, 0x66, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20,
+ 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f,
+ 0x69, 0x6f, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6f, 0x6e, 0x6c, 0x79,
+ 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x68, 0x6f, 0x77, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69,
+ 0x66, 0x20, 0x68, 0x6f, 0x77, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x68, 0x6f, 0x77, 0x20, 0x3d, 0x20, 0x27, 0x72, 0x27, 0x0a, 0x20, 0x20, 0x20,
+ 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x6f,
+ 0x77, 0x20, 0x3d, 0x20, 0x67, 0x73, 0x75, 0x62, 0x28, 0x68, 0x6f, 0x77, 0x2c, 0x27, 0x5b, 0x5e,
+ 0x72, 0x62, 0x5d, 0x27, 0x2c, 0x27, 0x27, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x69, 0x66, 0x20, 0x68, 0x6f, 0x77, 0x20, 0x3d, 0x3d, 0x20, 0x27, 0x27, 0x20, 0x74, 0x68,
+ 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68,
+ 0x6f, 0x77, 0x20, 0x3d, 0x20, 0x27, 0x72, 0x27, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20,
+ 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f, 0x6f, 0x70,
+ 0x65, 0x6e, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x68, 0x6f, 0x77, 0x29, 0x0a, 0x20, 0x20, 0x20,
+ 0x20, 0x69, 0x66, 0x20, 0x66, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x66, 0x69, 0x6c,
+ 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x27, 0x72, 0x27, 0x29, 0x0a,
+ 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
+ 0x72, 0x6e, 0x20, 0x66, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20,
+ 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f,
+ 0x69, 0x6f, 0x5f, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x2e, 0x2e,
+ 0x2e, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6f, 0x6b, 0x61,
+ 0x79, 0x2c, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x63,
+ 0x68, 0x65, 0x63, 0x6b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x28, 0x6e,
+ 0x61, 0x6d, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6f, 0x6b, 0x61, 0x79,
+ 0x20, 0x61, 0x6e, 0x64, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69,
+ 0x6f, 0x5f, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x2c, 0x2e, 0x2e,
+ 0x2e, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a,
+ 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c,
+ 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x28, 0x6e,
+ 0x61, 0x6d, 0x65, 0x2c, 0x68, 0x6f, 0x77, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20,
+ 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f, 0x6f,
+ 0x70, 0x65, 0x6e, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x68, 0x6f, 0x77, 0x20, 0x6f, 0x72, 0x20,
+ 0x27, 0x72, 0x27, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20,
+ 0x66, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
+ 0x6f, 0x6e, 0x28, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x69, 0x6f, 0x5f,
+ 0x72, 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x28, 0x66, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65,
+ 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
+ 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x28, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65,
+ 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x75,
+ 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f,
+ 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x28, 0x66, 0x29, 0x0a, 0x20, 0x20, 0x20,
+ 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+ 0x28, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
0x6e, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x28, 0x66,
- 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20,
- 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c,
- 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78,
- 0x5f, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x28, 0x66, 0x29, 0x0a,
- 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
- 0x69, 0x6f, 0x6e, 0x28, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
- 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e,
- 0x65, 0x28, 0x66, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64,
- 0x0a, 0x0a, 0x69, 0x6f, 0x2e, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61,
- 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x0a, 0x6d, 0x74, 0x2e,
- 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69,
- 0x6f, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x0a, 0x0a, 0x2d, 0x2d, 0x20, 0x57,
- 0x65, 0x20, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x20, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d,
- 0x65, 0x6e, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64,
- 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63,
- 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x6b, 0x70, 0x73, 0x65, 0x2e, 0x20, 0x54,
- 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x0a, 0x2d, 0x2d, 0x20, 0x63, 0x61,
- 0x73, 0x65, 0x20, 0x69, 0x6e, 0x20, 0x43, 0x6f, 0x6e, 0x54, 0x65, 0x58, 0x74, 0x2e, 0x0a, 0x0a,
- 0x69, 0x66, 0x20, 0x6b, 0x70, 0x73, 0x65, 0x75, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x3d, 0x20, 0x31,
- 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x6f, 0x70,
- 0x65, 0x6e, 0x20, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f, 0x5f,
- 0x6f, 0x70, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x70, 0x6f, 0x70, 0x65,
- 0x6e, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x70, 0x6f,
- 0x70, 0x65, 0x6e, 0x0a, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x66, 0x20, 0x73, 0x61, 0x66,
- 0x65, 0x72, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x3d, 0x20, 0x31, 0x20, 0x74, 0x68,
- 0x65, 0x6e, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75,
- 0x74, 0x65, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e,
- 0x73, 0x70, 0x61, 0x77, 0x6e, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20,
- 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6e,
- 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x73, 0x65, 0x74, 0x65, 0x6e, 0x76,
- 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x74,
- 0x65, 0x6d, 0x70, 0x64, 0x69, 0x72, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x20, 0x20,
- 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6e,
- 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20,
- 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e,
- 0x72, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20,
- 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x20, 0x3d, 0x20, 0x6e,
- 0x69, 0x6c, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x74, 0x6d, 0x70, 0x66, 0x69,
- 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e,
- 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x20,
- 0x20, 0x20, 0x20, 0x6c, 0x66, 0x73, 0x2e, 0x63, 0x68, 0x64, 0x69, 0x72, 0x20, 0x20, 0x3d, 0x20,
- 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x66, 0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b,
- 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x66, 0x73,
- 0x2e, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20,
- 0x20, 0x20, 0x6c, 0x66, 0x73, 0x2e, 0x72, 0x6d, 0x64, 0x69, 0x72, 0x20, 0x20, 0x3d, 0x20, 0x6e,
- 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x66, 0x73, 0x2e, 0x6d, 0x6b, 0x64, 0x69, 0x72,
- 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e,
- 0x73, 0x61, 0x76, 0x65, 0x64, 0x5f, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x3d, 0x20, 0x6e, 0x69,
- 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x73, 0x61, 0x76, 0x65, 0x64, 0x5f, 0x6f,
- 0x70, 0x65, 0x6e, 0x20, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f,
- 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6f, 0x6e, 0x6c, 0x79, 0x0a, 0x0a,
- 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x66, 0x20, 0x73, 0x61, 0x66, 0x65, 0x72, 0x6f, 0x70, 0x74,
- 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x3d, 0x20, 0x31, 0x20, 0x6f, 0x72, 0x20, 0x73, 0x68, 0x65, 0x6c,
- 0x6c, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x20, 0x7e, 0x3d, 0x20, 0x31, 0x20, 0x74, 0x68, 0x65,
- 0x6e, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x66, 0x69, 0x20, 0x3d, 0x20, 0x72, 0x65, 0x71,
- 0x75, 0x69, 0x72, 0x65, 0x28, 0x27, 0x66, 0x66, 0x69, 0x27, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20,
- 0x66, 0x6f, 0x72, 0x20, 0x6b, 0x2c, 0x20, 0x76, 0x20, 0x69, 0x6e, 0x20, 0x6e, 0x65, 0x78, 0x74,
- 0x2c, 0x20, 0x66, 0x66, 0x69, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- 0x20, 0x69, 0x66, 0x20, 0x6b, 0x20, 0x7e, 0x3d, 0x20, 0x27, 0x67, 0x63, 0x27, 0x20, 0x74, 0x68,
- 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66,
- 0x66, 0x69, 0x5b, 0x6b, 0x5d, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20,
- 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a,
- 0x20, 0x20, 0x20, 0x20, 0x66, 0x66, 0x69, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x65,
- 0x6e, 0x64, 0x0a, 0x0a, 0x2d, 0x2d, 0x20, 0x6f, 0x73, 0x2e, 0x5b, 0x65, 0x78, 0x65, 0x63, 0x75,
- 0x74, 0x65, 0x7c, 0x6f, 0x73, 0x2e, 0x73, 0x70, 0x61, 0x77, 0x6e, 0x7c, 0x6f, 0x73, 0x2e, 0x65,
- 0x78, 0x65, 0x63, 0x5d, 0x20, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x20, 0x61, 0x72, 0x65,
- 0x20, 0x73, 0x68, 0x65, 0x6c, 0x6c, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x20, 0x61, 0x77, 0x61,
- 0x72, 0x65, 0x29, 0x0a, 0x0a, 0x0a, 0x69, 0x66, 0x20, 0x6d, 0x64, 0x35, 0x20, 0x74, 0x68, 0x65,
- 0x6e, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x73, 0x75, 0x6d,
- 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6d, 0x64, 0x35, 0x2e, 0x73, 0x75, 0x6d, 0x0a, 0x20, 0x20,
- 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x67, 0x73, 0x75, 0x62, 0x20, 0x20, 0x20, 0x3d,
- 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x67, 0x73, 0x75, 0x62, 0x0a, 0x20, 0x20, 0x20,
- 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x20, 0x3d, 0x20,
- 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x0a, 0x20, 0x20,
- 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x62, 0x79, 0x74, 0x65, 0x20, 0x20, 0x20, 0x3d,
- 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x62, 0x79, 0x74, 0x65, 0x0a, 0x0a, 0x20, 0x20,
- 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6d, 0x64, 0x35, 0x2e, 0x73,
- 0x75, 0x6d, 0x68, 0x65, 0x78, 0x61, 0x28, 0x6b, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x28, 0x67, 0x73, 0x75, 0x62, 0x28, 0x73,
- 0x75, 0x6d, 0x28, 0x6b, 0x29, 0x2c, 0x20, 0x22, 0x2e, 0x22, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63,
- 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x63, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x6d, 0x61,
- 0x74, 0x28, 0x22, 0x25, 0x30, 0x32, 0x78, 0x22, 0x2c, 0x62, 0x79, 0x74, 0x65, 0x28, 0x63, 0x29,
- 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x29, 0x29, 0x0a,
- 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x75, 0x6e,
- 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6d, 0x64, 0x35, 0x2e, 0x73, 0x75, 0x6d, 0x48, 0x45, 0x58,
- 0x41, 0x28, 0x6b, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
- 0x75, 0x72, 0x6e, 0x20, 0x28, 0x67, 0x73, 0x75, 0x62, 0x28, 0x73, 0x75, 0x6d, 0x28, 0x6b, 0x29,
- 0x2c, 0x20, 0x22, 0x2e, 0x22, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28,
- 0x63, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72,
- 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x28, 0x22, 0x25, 0x30,
- 0x32, 0x58, 0x22, 0x2c, 0x62, 0x79, 0x74, 0x65, 0x28, 0x63, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x20,
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65,
- 0x6e, 0x64, 0x0a, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x00
+ 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69,
+ 0x6f, 0x2e, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78,
+ 0x5f, 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x0a, 0x6d, 0x74, 0x2e, 0x6c, 0x69, 0x6e,
+ 0x65, 0x73, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x72,
+ 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x0a, 0x0a, 0x2d, 0x2d, 0x20, 0x57, 0x65, 0x20, 0x61,
+ 0x73, 0x73, 0x75, 0x6d, 0x65, 0x20, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74,
+ 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x64, 0x20,
+ 0x62, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65,
+ 0x6e, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x6b, 0x70, 0x73, 0x65, 0x2e, 0x20, 0x54, 0x68, 0x69, 0x73,
+ 0x20, 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x0a, 0x2d, 0x2d, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20,
+ 0x69, 0x6e, 0x20, 0x43, 0x6f, 0x6e, 0x54, 0x65, 0x58, 0x74, 0x2e, 0x0a, 0x0a, 0x69, 0x66, 0x20,
+ 0x6b, 0x70, 0x73, 0x65, 0x75, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x3d, 0x20, 0x31, 0x20, 0x74, 0x68,
+ 0x65, 0x6e, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x20,
+ 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x6f, 0x70, 0x65,
+ 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x3d,
+ 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x70, 0x6f, 0x70, 0x65, 0x6e,
+ 0x0a, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x66, 0x20, 0x73, 0x61, 0x66, 0x65, 0x72, 0x6f,
+ 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x3d, 0x20, 0x31, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a,
+ 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x20,
+ 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x73, 0x70, 0x61,
+ 0x77, 0x6e, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f,
+ 0x73, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a,
+ 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x73, 0x65, 0x74, 0x65, 0x6e, 0x76, 0x20, 0x20, 0x3d,
+ 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x74, 0x65, 0x6d, 0x70,
+ 0x64, 0x69, 0x72, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69,
+ 0x6f, 0x2e, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a,
+ 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20, 0x20, 0x20, 0x3d,
+ 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x72, 0x65, 0x6e,
+ 0x61, 0x6d, 0x65, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f,
+ 0x73, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a,
+ 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x74, 0x6d, 0x70, 0x66, 0x69, 0x6c, 0x65, 0x20,
+ 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x6f, 0x75, 0x74,
+ 0x70, 0x75, 0x74, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20,
+ 0x6c, 0x66, 0x73, 0x2e, 0x63, 0x68, 0x64, 0x69, 0x72, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c,
+ 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x66, 0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x20, 0x20,
+ 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x66, 0x73, 0x2e, 0x74, 0x6f,
+ 0x75, 0x63, 0x68, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c,
+ 0x66, 0x73, 0x2e, 0x72, 0x6d, 0x64, 0x69, 0x72, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a,
+ 0x20, 0x20, 0x20, 0x20, 0x6c, 0x66, 0x73, 0x2e, 0x6d, 0x6b, 0x64, 0x69, 0x72, 0x20, 0x20, 0x3d,
+ 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x73, 0x61, 0x76,
+ 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65,
+ 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6f, 0x6e,
+ 0x6c, 0x79, 0x0a, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x66, 0x20, 0x73, 0x61, 0x66, 0x65,
+ 0x72, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x3d, 0x20, 0x31, 0x20, 0x6f, 0x72, 0x20,
+ 0x73, 0x68, 0x65, 0x6c, 0x6c, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x20, 0x7e, 0x3d, 0x20, 0x31,
+ 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x66, 0x69, 0x20, 0x3d,
+ 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x28, 0x27, 0x66, 0x66, 0x69, 0x27, 0x29, 0x0a,
+ 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x6b, 0x2c, 0x20, 0x76, 0x20, 0x69, 0x6e, 0x20,
+ 0x6e, 0x65, 0x78, 0x74, 0x2c, 0x20, 0x66, 0x66, 0x69, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6b, 0x20, 0x7e, 0x3d, 0x20, 0x27, 0x67, 0x63,
+ 0x27, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x66, 0x66, 0x69, 0x5b, 0x6b, 0x5d, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20,
+ 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x66, 0x69, 0x20, 0x3d, 0x20, 0x6e, 0x69,
+ 0x6c, 0x0a, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x2d, 0x2d, 0x20, 0x6f, 0x73, 0x2e, 0x5b, 0x65,
+ 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x7c, 0x6f, 0x73, 0x2e, 0x73, 0x70, 0x61, 0x77, 0x6e, 0x7c,
+ 0x6f, 0x73, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x5d, 0x20, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79,
+ 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x68, 0x65, 0x6c, 0x6c, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65,
+ 0x20, 0x61, 0x77, 0x61, 0x72, 0x65, 0x29, 0x0a, 0x0a, 0x0a, 0x69, 0x66, 0x20, 0x6d, 0x64, 0x35,
+ 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c,
+ 0x20, 0x73, 0x75, 0x6d, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6d, 0x64, 0x35, 0x2e, 0x73, 0x75,
+ 0x6d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x67, 0x73, 0x75, 0x62,
+ 0x20, 0x20, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x67, 0x73, 0x75, 0x62,
+ 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x6f, 0x72, 0x6d, 0x61,
+ 0x74, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x66, 0x6f, 0x72, 0x6d, 0x61,
+ 0x74, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x62, 0x79, 0x74, 0x65,
+ 0x20, 0x20, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x62, 0x79, 0x74, 0x65,
+ 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6d,
+ 0x64, 0x35, 0x2e, 0x73, 0x75, 0x6d, 0x68, 0x65, 0x78, 0x61, 0x28, 0x6b, 0x29, 0x0a, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x28, 0x67, 0x73,
+ 0x75, 0x62, 0x28, 0x73, 0x75, 0x6d, 0x28, 0x6b, 0x29, 0x2c, 0x20, 0x22, 0x2e, 0x22, 0x2c, 0x20,
+ 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x63, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66,
+ 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x28, 0x22, 0x25, 0x30, 0x32, 0x78, 0x22, 0x2c, 0x62, 0x79, 0x74,
+ 0x65, 0x28, 0x63, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e,
+ 0x64, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x20, 0x20, 0x20,
+ 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6d, 0x64, 0x35, 0x2e, 0x73, 0x75,
+ 0x6d, 0x48, 0x45, 0x58, 0x41, 0x28, 0x6b, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x28, 0x67, 0x73, 0x75, 0x62, 0x28, 0x73, 0x75,
+ 0x6d, 0x28, 0x6b, 0x29, 0x2c, 0x20, 0x22, 0x2e, 0x22, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
+ 0x69, 0x6f, 0x6e, 0x28, 0x63, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
+ 0x28, 0x22, 0x25, 0x30, 0x32, 0x58, 0x22, 0x2c, 0x62, 0x79, 0x74, 0x65, 0x28, 0x63, 0x29, 0x29,
+ 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x29, 0x29, 0x0a, 0x20,
+ 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x00
};
return luaL_dostring(L, (const char*) luatex_core_lua);
}
\ No newline at end of file
--- texk/web2c/luatexdir/lua/luatex-core.lua 2017/06/13 21:01:34 44589
+++ texk/web2c/luatexdir/lua/luatex-core.lua 2017/06/13 22:07:40 44590
@@ -1,210 +1,213 @@
--- if not modules then modules = { } end modules ['luatex-core'] = {
--- version = 1.001,
--- comment = 'companion to luatex',
--- author = 'Hans Hagen & Luigi Scarso',
--- copyright = 'LuaTeX Development Team',
--- }
-
-LUATEXCOREVERSION = 1.002
-
--- This file overloads some Lua functions. The readline variants provide the same
--- functionality as LuaTeX <= 1.04 and doing it this way permits us to keep the
--- original io libraries clean. Performance is probably even a bit better now.
-
-local type, next, getmetatable, require = type, next, getmetatable, require
-local find, gsub = string.find, string.gsub
-
-local io_open = io.open
-local io_popen = io.popen
-local io_line = io.lines
-
-local fio_readline = fio.readline
-local fio_checkpermission = fio.checkpermission
-local fio_recordfilename = fio.recordfilename
-
-local mt = getmetatable(io.stderr)
-local mt_lines = mt.lines
-local saferoption = status.safer_option
-local shellescape = status.shell_escape -- 0 (disabled) 1 (anything) 2 (restricted)
-local kpseused = status.kpse_used -- 0 1
-
-io.saved_open = io_open -- can be protected
-io.saved_popen = io_popen -- can be protected
-io.saved_lines = io_lines -- always readonly
-mt.saved_lines = mt_lines -- always readonly
-
-local function luatex_io_open(name,how)
- if not how then
- how = 'r'
- end
- local f = io_open(name,how)
- if f then
- if type(how) == 'string' and find(how,'w') then
- fio_recordfilename(name,'w')
- else
- fio_recordfilename(name,'r')
- end
- end
- return f
-end
-
-local function luatex_io_open_readonly(name,how)
- if how then
- how = 'r'
- else
- how = gsub(how,'[^rb]','')
- if how == '' then
- how = 'r'
- end
- end
- local f = io_open(name,how)
- if f then
- fio_recordfilename(name,'r')
- end
- return f
-end
-
-local function luatex_io_popen(name,...)
- local okay, found = fio_checkpermission(name)
- if okay and found then
- return io_popen(found,...)
- end
-end
-
-local function luatex_io_lines(name)
- local f = io_open(name,'r')
- if f then
- return function()
- return fio_readline(f)
- end
- end
-end
-
-local function luatex_io_readline(f)
- return function()
- return fio_readline(f)
- end
-end
-
-io.lines = luatex_io_lines
-mt.lines = luatex_io_readline
-
--- We assume management to be provided by the replacement of kpse. This is the
--- case in ConTeXt.
-
-if kpseused == 1 then
-
- io.open = luatex_io_open
- io.popen = luatex_io_popen
-
-end
-
-if saferoption == 1 then
-
- os.execute = nil
- os.spawn = nil
- os.exec = nil
- os.setenv = nil
- os.tempdir = nil
-
- io.popen = nil
- io.open = nil
-
- os.rename = nil
- os.remove = nil
-
- io.tmpfile = nil
- io.output = nil
-
- lfs.chdir = nil
- lfs.lock = nil
- lfs.touch = nil
- lfs.rmdir = nil
- lfs.mkdir = nil
-
- io.saved_popen = nil
- io.saved_open = luatex_io_open_readonly
-
-end
-
-if saferoption == 1 or shellescape ~= 1 then
-
- ffi = require('ffi')
- for k, v in next, ffi do
- if k ~= 'gc' then
- ffi[k] = nil
- end
- end
- ffi = nil
-
-end
-
--- os.[execute|os.spawn|os.exec] already are shellescape aware)
-
-
-if md5 then
-
- local sum = md5.sum
- local gsub = string.gsub
- local format = string.format
- local byte = string.byte
-
- function md5.sumhexa(k)
- return (gsub(sum(k), ".", function(c)
- return format("%02x",byte(c))
- end))
- end
-
- function md5.sumHEXA(k)
- return (gsub(sum(k), ".", function(c)
- return format("%02X",byte(c))
- end))
- end
-
-end
-
-if utilities and utilities.merger and utilities.merger.compact then
-
- local byte, format, gmatch = string.byte, string.format, string.gmatch
- local concat = table.concat
-
- local data = gsub(io.loaddata('luatex-core.lua'),'if%s+utilities.*','')
- local t = { }
- local r = { }
- local n = 0
- local d = gsub(data,'\r\n','\n') -- be nice for unix
- local s = utilities.merger.compact(d) -- no comments and less spaces
-
- t[#t+1] = '/* generated from and by luatex-core.lua */'
- t[#t+1] = ''
- -- t[#t+1] = format('/*\n\n%s\n\n*/',d)
- -- t[#t+1] = ''
- t[#t+1] = '#include "lua.h"'
- t[#t+1] = '#include "lauxlib.h"'
- t[#t+1] = ''
- t[#t+1] = 'int load_luatex_core_lua (lua_State * L);'
- t[#t+1] = ''
- t[#t+1] = 'int load_luatex_core_lua (lua_State * L)'
- t[#t+1] = '{'
- t[#t+1] = ' static unsigned char luatex_core_lua[] = {'
- for c in gmatch(d,'.') do
- if n == 16 then
- n = 1
- t[#t+1] = ' ' .. concat(r,', ') .. ','
- else
- n = n + 1
- end
- r[n] = format('0x%02x',byte(c))
- end
- n = n + 1
- r[n] = '0x00'
- t[#t+1] = ' ' .. concat(r,', ',1,n)
- t[#t+1] = ' };'
- -- t[#t+1] = format('unsigned int luatex_core_lua_len = 0x%x;',#d+1)
- t[#t+1] = ' return luaL_dostring(L, (const char*) luatex_core_lua);'
- t[#t+1] = '}'
-
- io.savedata('luatex-core.c',concat(t,'\n'))
- io.savedata('luatex-core-stripped.lua',s)
-
-end
+-- if not modules then modules = { } end modules ['luatex-core'] = {
+-- version = 1.001,
+-- comment = 'companion to luatex',
+-- author = 'Hans Hagen & Luigi Scarso',
+-- copyright = 'LuaTeX Development Team',
+-- }
+
+LUATEXCOREVERSION = 1.002
+
+-- This file overloads some Lua functions. The readline variants provide the same
+-- functionality as LuaTeX <= 1.04 and doing it this way permits us to keep the
+-- original io libraries clean. Performance is probably even a bit better now.
+
+local type, next, getmetatable, require = type, next, getmetatable, require
+local find, gsub = string.find, string.gsub
+
+local io_open = io.open
+local io_popen = io.popen
+local io_lines = io.lines
+
+local fio_readline = fio.readline
+local fio_checkpermission = fio.checkpermission
+local fio_recordfilename = fio.recordfilename
+
+local mt = getmetatable(io.stderr)
+local mt_lines = mt.lines
+local saferoption = status.safer_option
+local shellescape = status.shell_escape -- 0 (disabled) 1 (anything) 2 (restricted)
+local kpseused = status.kpse_used -- 0 1
+
+io.saved_open = io_open -- can be protected
+-- (deleted for tl17 rebuild) io.saved_popen = io_popen -- can be protected
+io.saved_lines = io_lines -- always readonly
+mt.saved_lines = mt_lines -- always readonly
+
+local function luatex_io_open(name,how)
+ if not how then
+ how = 'r'
+ end
+ local f = io_open(name,how)
+ if f then
+ if type(how) == 'string' and find(how,'w') then
+ fio_recordfilename(name,'w')
+ else
+ fio_recordfilename(name,'r')
+ end
+ end
+ return f
+end
+
+local function luatex_io_open_readonly(name,how)
+ if how then
+ how = 'r'
+ else
+ how = gsub(how,'[^rb]','')
+ if how == '' then
+ how = 'r'
+ end
+ end
+ local f = io_open(name,how)
+ if f then
+ fio_recordfilename(name,'r')
+ end
+ return f
+end
+
+local function luatex_io_popen(name,...)
+ local okay, found = fio_checkpermission(name)
+ if okay and found then
+ return io_popen(found,...)
+ end
+end
+
+local function luatex_io_lines(name,how)
+ if name then
+ local f = io_open(name,how or 'r')
+ if f then
+ return function()
+ return fio_readline(f)
+ end
+ end
+ else
+ return io_lines()
+ end
+end
+
+local function luatex_io_readline(f)
+ return function()
+ return fio_readline(f)
+ end
+end
+
+io.lines = luatex_io_lines
+mt.lines = luatex_io_readline
+
+-- We assume management to be provided by the replacement of kpse. This is the
+-- case in ConTeXt.
+
+if kpseused == 1 then
+
+ io.open = luatex_io_open
+ io.popen = luatex_io_popen
+
+end
+
+if saferoption == 1 then
+
+ os.execute = nil
+ os.spawn = nil
+ os.exec = nil
+ os.setenv = nil
+ os.tempdir = nil
+
+ io.popen = nil
+ io.open = nil
+
+ os.rename = nil
+ os.remove = nil
+
+ io.tmpfile = nil
+ io.output = nil
+
+ lfs.chdir = nil
+ lfs.lock = nil
+ lfs.touch = nil
+ lfs.rmdir = nil
+ lfs.mkdir = nil
+
+ io.saved_open = luatex_io_open_readonly
+
+end
+
+if saferoption == 1 or shellescape ~= 1 then
+
+ ffi = require('ffi')
+ for k, v in next, ffi do
+ if k ~= 'gc' then
+ ffi[k] = nil
+ end
+ end
+ ffi = nil
+
+end
+
+-- os.[execute|os.spawn|os.exec] already are shellescape aware)
+
+
+if md5 then
+
+ local sum = md5.sum
+ local gsub = string.gsub
+ local format = string.format
+ local byte = string.byte
+
+ function md5.sumhexa(k)
+ return (gsub(sum(k), ".", function(c)
+ return format("%02x",byte(c))
+ end))
+ end
+
+ function md5.sumHEXA(k)
+ return (gsub(sum(k), ".", function(c)
+ return format("%02X",byte(c))
+ end))
+ end
+
+end
+
+if utilities and utilities.merger and utilities.merger.compact then
+
+ local byte, format, gmatch = string.byte, string.format, string.gmatch
+ local concat = table.concat
+
+ local data = gsub(io.loaddata('luatex-core.lua'),'if%s+utilities.*','')
+ local t = { }
+ local r = { }
+ local n = 0
+ local d = gsub(data,'\r\n','\n') -- be nice for unix
+ local s = utilities.merger.compact(d) -- no comments and less spaces
+
+ t[#t+1] = '/* generated from and by luatex-core.lua */'
+ t[#t+1] = ''
+ -- t[#t+1] = format('/*\n\n%s\n\n*/',d)
+ -- t[#t+1] = ''
+ t[#t+1] = '#include "lua.h"'
+ t[#t+1] = '#include "lauxlib.h"'
+ t[#t+1] = ''
+ t[#t+1] = 'int load_luatex_core_lua (lua_State * L);'
+ t[#t+1] = ''
+ t[#t+1] = 'int load_luatex_core_lua (lua_State * L)'
+ t[#t+1] = '{'
+ t[#t+1] = ' static unsigned char luatex_core_lua[] = {'
+ for c in gmatch(d,'.') do
+ if n == 16 then
+ n = 1
+ t[#t+1] = ' ' .. concat(r,', ') .. ','
+ else
+ n = n + 1
+ end
+ r[n] = format('0x%02x',byte(c))
+ end
+ n = n + 1
+ r[n] = '0x00'
+ t[#t+1] = ' ' .. concat(r,', ',1,n)
+ t[#t+1] = ' };'
+ -- t[#t+1] = format('unsigned int luatex_core_lua_len = 0x%x;',#d+1)
+ t[#t+1] = ' return luaL_dostring(L, (const char*) luatex_core_lua);'
+ t[#t+1] = '}'
+
+ io.savedata('luatex-core.c',concat(t,'\n'))
+ io.savedata('luatex-core-stripped.lua',s)
+
+end
--- texk/web2c/luatexdir/luatex.c 2017/06/13 21:01:34 44589
+++ texk/web2c/luatexdir/luatex.c 2017/06/13 22:07:40 44590
@@ -28,9 +28,11 @@
#define TeX
+/* for tl17 update, change luatex_date_info but nothing else,
+ as context depends on the numeric version number. */
int luatex_version = 100; /* \.{\\luatexversion} */
int luatex_revision = '4'; /* \.{\\luatexrevision} */
-int luatex_date_info = 2017033109; /* the compile date is now hardwired :YEAR MONTH DAY HOUR*/
+int luatex_date_info = 2017060901; /* the compile date is now hardwired :YEAR MONTH DAY HOUR*/
const char *luatex_version_string = "1.0.4";
const char *engine_name = my_name; /* the name of this engine */

120
source-overflow.dif
View File

@ -1,25 +1,7 @@
--- ---
texk/upmendex/fwrite.c | 62 +++++++++++++++++++++++---------------------- utils/lacheck/lacheck.test | 3 ++-
utils/lacheck/lacheck.test | 3 +- 1 file changed, 2 insertions(+), 1 deletion(-)
2 files changed, 34 insertions(+), 31 deletions(-)
|--- texk/web2c/eptexdir/eptex.ech
|+++ texk/web2c/eptexdir/eptex.ech 2012-04-16 08:31:14.564665420 +0000
|@@ -300,10 +300,13 @@ othercases goto next_p
| hlist_node,vlist_node: begin r:=get_node(box_node_size);
| @z
| @x e-pTeX: just_copy
|+ mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
| words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
| @y
|- words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
|+ mem[r+7]:=mem[p+7]; mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5];
|+ {copy the last three words}
| add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r));
|+ words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
| @z
|
| @x e-pTeX: ifcsname l.28620
--- utils/lacheck/lacheck.test --- utils/lacheck/lacheck.test
+++ utils/lacheck/lacheck.test 2016-01-28 12:25:40.958687909 +0000 +++ utils/lacheck/lacheck.test 2016-01-28 12:25:40.958687909 +0000
@@ -6,5 +6,6 @@ @@ -6,5 +6,6 @@
@ -30,101 +12,3 @@
+test -e $srcdir/test.old || > $srcdir/test.old +test -e $srcdir/test.old || > $srcdir/test.old
+diff $srcdir/test.old test.out || true +diff $srcdir/test.old test.out || true
--- texk/upmendex/fwrite.c
+++ texk/upmendex/fwrite.c 2016-07-08 11:54:13.897971000 +0000
@@ -67,33 +67,38 @@ static inline int SAPPENDF(char *buf, co
static void fprint_uchar(FILE *fp, const UChar *a, const int mode, const int len)
{
- int k;
- char str[15], *ret;
- UChar istr[5];
+ char str[3*INITIALLENGTH+1];
+ UChar istr[INITIALLENGTH];
int olen, wclen;
UErrorCode perr;
if (len<0) {
- for (k=0; a[k] || k<4; k++) istr[k]=a[k];
- wclen=k;
+ u_strcpy(istr,a);
+ wclen=u_strlen(istr);
} else {
- wclen = is_surrogate_pair(a) ? 2 : 1;
+ wclen=is_surrogate_pair(a) ? 2 : 1;
istr[0]=a[0];
if (wclen==2) istr[1]=a[1];
+ istr[wclen]=L'\0';
}
- istr[wclen]=L'\0';
if (mode==M_TO_UPPER) {
- perr = U_ZERO_ERROR;
- u_strToUpper(istr,5,istr,wclen,"",&perr);
+ perr=U_ZERO_ERROR;
+ olen=u_strToUpper(istr,INITIALLENGTH,istr,wclen,"",&perr);
} else if (mode==M_TO_LOWER) {
- perr = U_ZERO_ERROR;
- u_strToLower(istr,5,istr,wclen, istr[0]==0x130&&turkish_i?"tr":"", &perr);
+ perr=U_ZERO_ERROR;
+ olen=u_strToLower(istr,INITIALLENGTH,istr,wclen, istr[0]==0x130&&turkish_i?"tr":"", &perr);
} else if (mode==M_TO_TITLE) {
- perr = U_ZERO_ERROR;
- u_strToTitle(istr,5,istr,wclen,NULL,"",&perr);
- }
- perr = U_ZERO_ERROR;
- ret = u_strToUTF8(str, 15, &olen, istr, wclen, &perr);
+ perr=U_ZERO_ERROR;
+ olen=u_strToTitle(istr,INITIALLENGTH,istr,wclen,NULL,"",&perr);
+ } else
+ olen=wclen;
+ if (olen>INITIALLENGTH) {
+ warn_printf(efp, "\nWarning, Too long (%d) header.\n", olen);
+ wclen=INITIALLENGTH;
+ } else
+ wclen=olen;
+ perr=U_ZERO_ERROR;
+ u_strToUTF8(str, 3*INITIALLENGTH+1, &olen, istr, wclen, &perr);
fprintf(fp,"%s",str);
}
@@ -844,7 +849,7 @@ static int initial_cmp_char(UChar *ini,
static int init_hanzi_header(void)
{
UChar strX[2],*pch0,*pch1;
- int k, hzmode;
+ int k, hzmode, len;
struct hanzi_index *hz_idx_init;
strX[0]=0x5B57; strX[1]=L'\0';
@@ -878,21 +883,18 @@ static int init_hanzi_header(void)
for (k=0;k<hz_index_len;k++) {
if (u_strlen(pch0)==0) break;
if ((pch1=u_strchr(pch0,L';'))>0) {
- if (pch1-pch0>=INITIALLENGTH) {
- warn_printf(efp, "\nWarning, Too long hanzi header.\n");
- break;
- }
- u_strncpy(hz_index[k].idx,pch0,pch1-pch0);
- hz_index[k].idx[pch1-pch0]=L'\0';
- pch0=pch1+1;
+ len=pch1-pch0;
} else {
- if (u_strlen(pch0)>=INITIALLENGTH) {
- warn_printf(efp, "\nWarning, Too long hanzi header.\n");
- break;
- }
- u_strcpy(hz_index[k].idx,pch0);
- break;
+ len=u_strlen(pch0);
}
+ if (len>=INITIALLENGTH) {
+ warn_printf(efp, "\nWarning, Too long (%d) hanzi header.\n", len);
+ len=INITIALLENGTH-1;
+ }
+ u_strncpy(hz_index[k].idx,pch0,len);
+ hz_index[k].idx[len]=L'\0';
+ if (pch1>0) pch0=pch1+1;
+ else break;
}
return hzmode;

2
source-warns.dif
View File

@ -23,7 +23,7 @@
am__v_CC_0 = @echo " CC " $@; am__v_CC_0 = @echo " CC " $@;
--- libs/icu/icu-src/source/i18n/decNumber.h --- libs/icu/icu-src/source/i18n/decNumber.h
+++ libs/icu/icu-src/source/i18n/decNumber.h 2016-06-07 13:29:33.925651292 +0000 +++ libs/icu/icu-src/source/i18n/decNumber.h 2016-06-07 13:29:33.925651292 +0000
@@ -54,26 +54,30 @@ @@ -56,26 +56,30 @@
/* For ICU, use one digit per byte, to make it easier to emulate the /* For ICU, use one digit per byte, to make it easier to emulate the
* old DigitList interface on top of a decNumber * old DigitList interface on top of a decNumber
*/ */

140
source.dif
View File

@ -9,7 +9,7 @@
texk/kpathsea/mktex.opt | 39 ++ texk/kpathsea/mktex.opt | 39 ++
texk/kpathsea/mktexlsr | 43 ++ texk/kpathsea/mktexlsr | 43 ++
texk/kpathsea/progname.c | 4 texk/kpathsea/progname.c | 4
texk/kpathsea/texmf.cnf | 173 +++++++----- texk/kpathsea/texmf.cnf | 174 +++++++-----
texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc | 3 texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc | 3
texk/ps2pk/pk2bm.c | 35 +- texk/ps2pk/pk2bm.c | 35 +-
texk/texlive/linked_scripts/musixtex/musixtex.lua | 17 - texk/texlive/linked_scripts/musixtex/musixtex.lua | 17 -
@ -27,11 +27,11 @@
texk/web2c/window/x11-Xt.c | 4 texk/web2c/window/x11-Xt.c | 4
texk/xdvik/psgs.c | 22 + texk/xdvik/psgs.c | 22 +
texk/xdvik/xdvi-sh.in | 19 + texk/xdvik/xdvi-sh.in | 19 +
28 files changed, 371 insertions(+), 196 deletions(-) 28 files changed, 374 insertions(+), 194 deletions(-)
--- libs/icu/icu-src/source/common/Makefile.in --- libs/icu/icu-src/source/common/Makefile.in
+++ libs/icu/icu-src/source/common/Makefile.in 2016-06-07 13:40:23.537446416 +0000 +++ libs/icu/icu-src/source/common/Makefile.in 2017-05-30 12:59:40.801914534 +0000
@@ -67,7 +67,7 @@ DEFS += -DU_COMMON_IMPLEMENTATION @@ -69,7 +69,7 @@ DEFS += -DU_COMMON_IMPLEMENTATION
LDFLAGS += $(LDFLAGSICUUC) LDFLAGS += $(LDFLAGSICUUC)
# for plugin configuration # for plugin configuration
@ -41,7 +41,7 @@
# for icu data location # for icu data location
ifeq ($(PKGDATA_MODE),common) ifeq ($(PKGDATA_MODE),common)
--- reautoconf --- reautoconf
+++ reautoconf 2016-06-07 13:40:23.537446416 +0000 +++ reautoconf 2017-05-30 12:59:40.801914534 +0000
@@ -83,7 +83,7 @@ echo "$0: TL_AUTOHEADER, T @@ -83,7 +83,7 @@ echo "$0: TL_AUTOHEADER, T
# Give users a chance to quit here # Give users a chance to quit here
@ -52,7 +52,7 @@
AUTOCONF=$TL_AUTOCONF AUTOCONF=$TL_AUTOCONF
AUTOHEADER=$TL_AUTOHEADER AUTOHEADER=$TL_AUTOHEADER
--- texk/dviljk/dvi2xx.c --- texk/dviljk/dvi2xx.c
+++ texk/dviljk/dvi2xx.c 2016-06-07 13:40:23.537446416 +0000 +++ texk/dviljk/dvi2xx.c 2017-05-30 12:59:40.809914620 +0000
@@ -168,7 +168,18 @@ main(int argc, char *argv[]) @@ -168,7 +168,18 @@ main(int argc, char *argv[])
setbuf(ERR_STREAM, NULL); setbuf(ERR_STREAM, NULL);
@ -73,7 +73,7 @@
G_progname = kpse_program_name; G_progname = kpse_program_name;
#else #else
--- texk/kpathsea/c-fopen.h --- texk/kpathsea/c-fopen.h
+++ texk/kpathsea/c-fopen.h 2016-06-07 13:40:23.537446416 +0000 +++ texk/kpathsea/c-fopen.h 2017-05-30 12:59:40.809914620 +0000
@@ -38,17 +38,17 @@ @@ -38,17 +38,17 @@
/* How to open a binary file for reading: */ /* How to open a binary file for reading: */
@ -96,7 +96,7 @@
/* How to switch an already open file handle to binary mode. /* How to switch an already open file handle to binary mode.
--- texk/kpathsea/c-memstr.h --- texk/kpathsea/c-memstr.h
+++ texk/kpathsea/c-memstr.h 2016-06-07 13:40:23.537446416 +0000 +++ texk/kpathsea/c-memstr.h 2017-05-30 12:59:40.817914706 +0000
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
/* For ancient systems that lack the system V/ANSI version of the /* For ancient systems that lack the system V/ANSI version of the
@ -113,7 +113,7 @@
+ +
#endif /* not KPATHSEA_C_MEMSTR_H */ #endif /* not KPATHSEA_C_MEMSTR_H */
--- texk/kpathsea/cnf-to-paths.awk --- texk/kpathsea/cnf-to-paths.awk
+++ texk/kpathsea/cnf-to-paths.awk 2016-06-07 13:40:23.537446416 +0000 +++ texk/kpathsea/cnf-to-paths.awk 2017-05-30 12:59:40.817914706 +0000
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
val = $0; val = $0;
sub(/^.*=[ \t]*/, "", val); sub(/^.*=[ \t]*/, "", val);
@ -124,7 +124,7 @@
if (val ~ /\$SELFAUTO/) { if (val ~ /\$SELFAUTO/) {
# Replace all semicolons with colons in the SELFAUTO paths we're keeping. # Replace all semicolons with colons in the SELFAUTO paths we're keeping.
--- texk/kpathsea/db.c --- texk/kpathsea/db.c
+++ texk/kpathsea/db.c 2016-06-07 13:40:23.537446416 +0000 +++ texk/kpathsea/db.c 2017-05-30 12:59:40.817914706 +0000
@@ -92,7 +92,8 @@ db_build (kpathsea kpse, hash_table_type @@ -92,7 +92,8 @@ db_build (kpathsea kpse, hash_table_type
unsigned len = strlen (db_filename) - sizeof (DB_NAME) + 1; /* Keep the /. */ unsigned len = strlen (db_filename) - sizeof (DB_NAME) + 1; /* Keep the /. */
string top_dir = (string)xmalloc (len + 1); string top_dir = (string)xmalloc (len + 1);
@ -153,7 +153,7 @@
len = strlen (line); len = strlen (line);
--- texk/kpathsea/mktex.opt --- texk/kpathsea/mktex.opt
+++ texk/kpathsea/mktex.opt 2016-06-07 13:40:23.537446416 +0000 +++ texk/kpathsea/mktex.opt 2017-05-30 12:59:40.817914706 +0000
@@ -38,10 +38,11 @@ if test "$DOSISH" = "no"; then SEP=':'; @@ -38,10 +38,11 @@ if test "$DOSISH" = "no"; then SEP=':';
# TEMPDIR needs to be unique to each process because of the possibility of two # TEMPDIR needs to be unique to each process because of the possibility of two
# people running dvips (or whatever) simultaneously. # people running dvips (or whatever) simultaneously.
@ -231,7 +231,7 @@
# Cache values that may be useful for recursive calls. # Cache values that may be useful for recursive calls.
export MT_MKTEX_OPT MT_MKTEX_CNF export MT_MKTEX_OPT MT_MKTEX_CNF
--- texk/kpathsea/mktexlsr --- texk/kpathsea/mktexlsr
+++ texk/kpathsea/mktexlsr 2016-06-07 13:40:23.537446416 +0000 +++ texk/kpathsea/mktexlsr 2017-05-30 12:59:40.817914706 +0000
@@ -58,6 +58,9 @@ if test "$DOSISH" = "no"; then SEP=':'; @@ -58,6 +58,9 @@ if test "$DOSISH" = "no"; then SEP=':';
# be done before kpsewhich can be called, and thus cannot be put into # be done before kpsewhich can be called, and thus cannot be put into
# mktex.opt. # mktex.opt.
@ -328,7 +328,7 @@
done done
--- texk/kpathsea/progname.c --- texk/kpathsea/progname.c
+++ texk/kpathsea/progname.c 2016-06-07 13:40:23.537446416 +0000 +++ texk/kpathsea/progname.c 2017-05-30 12:59:40.817914706 +0000
@@ -668,9 +668,9 @@ kpathsea_set_program_name (kpathsea kpse @@ -668,9 +668,9 @@ kpathsea_set_program_name (kpathsea kpse
/* SELFAUTODIR is actually the parent of the invocation directory, /* SELFAUTODIR is actually the parent of the invocation directory,
and SELFAUTOPARENT the grandparent. This is how teTeX did it. */ and SELFAUTOPARENT the grandparent. This is how teTeX did it. */
@ -342,8 +342,8 @@
sdir_greatgrandparent = xdirname (sdir_grandparent); sdir_greatgrandparent = xdirname (sdir_grandparent);
kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent)); kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent));
--- texk/kpathsea/texmf.cnf --- texk/kpathsea/texmf.cnf
+++ texk/kpathsea/texmf.cnf 2016-06-07 13:58:00.905630040 +0000 +++ texk/kpathsea/texmf.cnf 2017-05-30 13:09:02.347900901 +0000
@@ -57,32 +57,32 @@ @@ -57,20 +57,20 @@
TEXMFROOT = $SELFAUTOPARENT TEXMFROOT = $SELFAUTOPARENT
% The main tree of distributed packages and programs: % The main tree of distributed packages and programs:
@ -368,35 +368,33 @@
% Per-user texmf tree(s) -- organized per the TDS, as usual. To define % Per-user texmf tree(s) -- organized per the TDS, as usual. To define
% more than one per-user tree, set this to a list of directories in % more than one per-user tree, set this to a list of directories in
% braces, as described above. (This used to be HOMETEXMF.) ~ expands @@ -79,10 +79,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
% to %USERPROFILE% on Windows, $HOME otherwise. TEXMFHOME = ~/texmf
-TEXMFHOME = ~/texmf
+TEXMFHOME = $HOME/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2016/texmf-var -TEXMFVAR = ~/.texlive2017/texmf-var
+TEXMFVAR = ${TEXMFSYSVAR} +TEXMFVAR = ${TEXMFSYSVAR}
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2016/texmf-config -TEXMFCONFIG = ~/.texlive2017/texmf-config
+TEXMFCONFIG = ${TEXMFSYSCONFIG} +TEXMFCONFIG = ${TEXMFSYSCONFIG}
% List all the texmf trees. For an explanation of what they are, see the % This is the value manipulated by tlmgr's auxtrees subcommand in the
% TeX Live manual. % root texmf.cnf. Kpathsea warns about a literally empty string for a
@@ -94,7 +94,7 @@ TEXMFCONFIG = ~/.texlive2016/texmf-confi @@ -103,7 +103,7 @@ TEXMFAUXTREES = {}
% should take precedence over distribution files -- although it is % The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is
% generally a source of confusion to have different versions of a % ever defined (the 99% common case), no extra elements will be added to
% package installed, whatever the trees, so try to avoid it. % the search paths. tlmgr takes care to end any value with a trailing comma.
-TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} -TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
+TEXMF = {$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} +TEXMF = {$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST}
% Where to look for ls-R files. There need not be an ls-R in the % Where to look for ls-R files. There need not be an ls-R in the
% directories in this path, but if there is one, Kpathsea will use it. % directories in this path, but if there is one, Kpathsea will use it.
@@ -102,24 +102,23 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHO @@ -111,24 +111,23 @@ TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEX
% does not create ls-R files in the non-!! elements -- because if an % does not create ls-R files in the non-!! elements -- because if an
% ls-R is present, it will be used, and the disk will not be searched. % ls-R is present, it will be used, and the disk will not be searched.
% This is arguably a bug in kpathsea. % This is arguably a bug in kpathsea.
-TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} -TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
+TEXMFDBS = $TEXMF;$VARTEXFONTS;$HOMECACHE +TEXMFDBS = $TEXMF;$VARTEXFONTS;$HOMECACHE
% The system trees. These are the trees that are shared by all users. % The system trees. These are the trees that are shared by all users.
@ -420,7 +418,7 @@
% On some systems, there will be a system tree which contains all the font % 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 % files that may be created as well as the formats. For example
@@ -130,7 +129,8 @@ VARTEXFONTS = $TEXMFVAR/fonts @@ -139,7 +138,8 @@ VARTEXFONTS = $TEXMFVAR/fonts
% %
% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below % Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below
% one of the TEXMF directories (avoids overlapping ls-R files). % one of the TEXMF directories (avoids overlapping ls-R files).
@ -430,7 +428,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Usually you will not need to edit any of the following variables. % Usually you will not need to edit any of the following variables.
@@ -138,7 +138,7 @@ VARTEXFONTS = $TEXMFVAR/fonts @@ -147,7 +147,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
% WEB2C is for Web2C specific files. The current directory may not be % WEB2C is for Web2C specific files. The current directory may not be
% a good place to look for them. % a good place to look for them.
@ -439,7 +437,7 @@
% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input % 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 % or \openin, including .sty, .eps, etc. We specify paths for all known
@@ -179,18 +179,18 @@ TEXINPUTS.elatex = .;$TEXMF/tex/{ @@ -188,18 +188,18 @@ TEXINPUTS.elatex = .;$TEXMF/tex/{
TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}// TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}//
% pdfTeX. % pdfTeX.
@ -467,8 +465,8 @@
+TEXINPUTS.pdfetex = .;$TEXMF/{pdftex,tex}/{plain,generic,}// +TEXINPUTS.pdfetex = .;$TEXMF/{pdftex,tex}/{plain,generic,}//
% LuaTeX. % LuaTeX.
TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}//
@@ -238,18 +238,18 @@ BSTINPUTS.pbibtex = .;$TEXMF/{pbib @@ -248,18 +248,18 @@ BSTINPUTS.pbibtex = .;$TEXMF/{pbib
TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}// TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}//
% jadetex. % jadetex.
@ -493,7 +491,7 @@
% Earlier entries override later ones, so put this generic one last. % Earlier entries override later ones, so put this generic one last.
TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}// TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}//
@@ -258,7 +258,7 @@ TEXINPUTS = .;$TEXMF/tex/{ @@ -268,7 +268,7 @@ TEXINPUTS = .;$TEXMF/tex/{
TTF2TFMINPUTS = .;$TEXMF/ttf2pk// TTF2TFMINPUTS = .;$TEXMF/ttf2pk//
% Metafont, MetaPost inputs. % Metafont, MetaPost inputs.
@ -502,7 +500,7 @@
MPINPUTS = .;$TEXMF/metapost// MPINPUTS = .;$TEXMF/metapost//
% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read. % Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
@@ -268,31 +268,31 @@ MPINPUTS = .;$TEXMF/metapost// @@ -278,31 +278,31 @@ MPINPUTS = .;$TEXMF/metapost//
% We repeat the same definition three times because of the way fmtutil % We repeat the same definition three times because of the way fmtutil
% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats % is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats
% will not be found. % will not be found.
@ -541,7 +539,7 @@
% Similarly for the GF format, which only remains in existence because % Similarly for the GF format, which only remains in existence because
% Metafont outputs it (and MF isn't going to change). % Metafont outputs it (and MF isn't going to change).
@@ -302,7 +302,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD @@ -312,7 +312,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD
GLYPHFONTS = .;$TEXMF/fonts GLYPHFONTS = .;$TEXMF/fonts
% A place to puth everything that doesn't fit the other font categories. % A place to puth everything that doesn't fit the other font categories.
@ -550,7 +548,7 @@
% font name map files. This isn't just fonts/map// because ConTeXt % font name map files. This isn't just fonts/map// because ConTeXt
% wants support for having files with the same name in the different % wants support for having files with the same name in the different
@@ -384,8 +384,8 @@ MPSUPPORT = .;$TEXMF/metapost/support @@ -398,8 +398,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
% For xdvi to find mime.types and .mailcap, if they do not exist in % For xdvi to find mime.types and .mailcap, if they do not exist in
% ~. These are single directories, not paths. % ~. These are single directories, not paths.
% (But the default mime.types, at least, may well suffice.) % (But the default mime.types, at least, may well suffice.)
@ -561,7 +559,7 @@
% Default settings for the fontconfig library as used by the Windows % Default settings for the fontconfig library as used by the Windows
% versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems. % versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems.
@@ -404,10 +404,10 @@ WEBINPUTS = .;$TEXMF/web// @@ -418,10 +418,10 @@ WEBINPUTS = .;$TEXMF/web//
CWEBINPUTS = .;$TEXMF/cweb// CWEBINPUTS = .;$TEXMF/cweb//
% Omega-related fonts and other files. % Omega-related fonts and other files.
@ -576,7 +574,7 @@
OTPINPUTS = .;$TEXMF/omega/otp// OTPINPUTS = .;$TEXMF/omega/otp//
OCPINPUTS = .;$TEXMF/omega/ocp// OCPINPUTS = .;$TEXMF/omega/ocp//
@@ -490,32 +490,38 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna @@ -504,32 +504,38 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
% explicitly list every directory. Arguably more understandable anyway. % explicitly list every directory. Arguably more understandable anyway.
% %
TEXMFCNF = {\ TEXMFCNF = {\
@ -640,15 +638,7 @@
% %
% For reference, here is the old brace-using definition: % For reference, here is the old brace-using definition:
%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} %TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
@@ -568,7 +574,6 @@ extractbb,\ @@ -805,3 +811,33 @@ max_cols.gftype = 8191
gregorio,\
kpsewhich,\
makeindex,\
-mpost,\
repstopdf,\
% we'd like to allow:
@@ -791,3 +796,33 @@ max_cols.gftype = 8191
% Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends? % Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends?
% Default is 0, to not guess. % Default is 0, to not guess.
guess_input_kanji_encoding = 1 guess_input_kanji_encoding = 1
@ -683,7 +673,7 @@
+pool_size.jadetex = 500000 +pool_size.jadetex = 500000
+save_size.jadetex = 15000 +save_size.jadetex = 15000
--- texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc --- texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc
+++ texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc 2016-06-07 13:40:23.541446341 +0000 +++ texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc 2017-05-30 12:59:40.825914791 +0000
@@ -67,6 +67,9 @@ @@ -67,6 +67,9 @@
# include <io.h> # include <io.h>
#endif #endif
@ -695,7 +685,7 @@
#define VERSION_OPT 301 #define VERSION_OPT 301
--- texk/ps2pk/pk2bm.c --- texk/ps2pk/pk2bm.c
+++ texk/ps2pk/pk2bm.c 2016-06-07 13:54:20.741760758 +0000 +++ texk/ps2pk/pk2bm.c 2017-05-30 12:59:40.825914791 +0000
@@ -45,7 +45,6 @@ @@ -45,7 +45,6 @@
static quarterword lsbf(quarterword u); static quarterword lsbf(quarterword u);
@ -778,8 +768,8 @@
- return octal; - return octal;
-} -}
--- texk/texlive/linked_scripts/musixtex/musixtex.lua --- texk/texlive/linked_scripts/musixtex/musixtex.lua
+++ texk/texlive/linked_scripts/musixtex/musixtex.lua 2016-06-07 13:53:04.291194597 +0000 +++ texk/texlive/linked_scripts/musixtex/musixtex.lua 2017-05-30 13:11:42.885612642 +0000
@@ -172,14 +172,25 @@ end @@ -183,14 +183,25 @@ end
-- possible by exploiting the the fact that Lua has two false values. -- possible by exploiting the the fact that Lua has two false values.
-- dvi == nil "do not produce a DVI file" (but maybe PDF) -- dvi == nil "do not produce a DVI file" (but maybe PDF)
-- dvi == false "do not process the DVI file" (but stop after TeX) -- dvi == false "do not process the DVI file" (but stop after TeX)
@ -809,7 +799,7 @@
index = false index = false
latex = false latex = false
--- texk/texlive/linked_scripts/texlive/fmtutil-sys.sh --- texk/texlive/linked_scripts/texlive/fmtutil-sys.sh
+++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh 2016-06-07 13:40:23.541446341 +0000 +++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh 2017-05-30 12:59:40.825914791 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH @@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
# hack around a bug in zsh: # hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
@ -817,7 +807,7 @@
+umask 022 +umask 022
exec fmtutil --sys ${1+"$@"} exec fmtutil --sys ${1+"$@"}
--- texk/texlive/linked_scripts/texlive/fmtutil.pl --- texk/texlive/linked_scripts/texlive/fmtutil.pl
+++ texk/texlive/linked_scripts/texlive/fmtutil.pl 2016-06-07 13:47:22.161607756 +0000 +++ texk/texlive/linked_scripts/texlive/fmtutil.pl 2017-05-30 12:59:40.833914877 +0000
@@ -10,16 +10,16 @@ @@ -10,16 +10,16 @@
# History: # History:
# Original shell script (C) 2001 Thomas Esser, public domain # Original shell script (C) 2001 Thomas Esser, public domain
@ -840,7 +830,7 @@
require "mktexlsr.pl"; require "mktexlsr.pl";
TeX::Update->import(); TeX::Update->import();
} }
@@ -67,7 +67,7 @@ my @deferred_stdout; @@ -70,7 +70,7 @@ TeXLive::TLUtils::prepend_own_path();
# this function checks by itself whether it is running on windows or not # this function checks by itself whether it is running on windows or not
reset_root_home(); reset_root_home();
@ -849,7 +839,7 @@
chomp(our $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`); chomp(our $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`);
chomp(our $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`); chomp(our $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`);
chomp(our $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`); chomp(our $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
@@ -346,7 +346,14 @@ sub callback_build_formats { @@ -361,7 +361,14 @@ sub callback_build_formats {
TeXLive::TLWinGoo::maybe_make_ro ($tmpdir); TeXLive::TLWinGoo::maybe_make_ro ($tmpdir);
} }
} else { } else {
@ -864,7 +854,7 @@
} }
# set up destination directory # set up destination directory
$opts{'fmtdir'} ||= "$texmfvar/web2c"; $opts{'fmtdir'} ||= "$texmfvar/web2c";
@@ -559,6 +566,7 @@ sub rebuild_one_format { @@ -576,6 +583,7 @@ sub rebuild_one_format {
# check for existence of ini file before doing anything else # check for existence of ini file before doing anything else
if (system("kpsewhich -progname=$fmt -format=$kpsefmt $inifile >$nul 2>&1") != 0) { if (system("kpsewhich -progname=$fmt -format=$kpsefmt $inifile >$nul 2>&1") != 0) {
# we didn't find the ini file, skip # we didn't find the ini file, skip
@ -872,7 +862,7 @@
print_deferred_warning("inifile $inifile for $fmt/$eng not found.\n"); print_deferred_warning("inifile $inifile for $fmt/$eng not found.\n");
# The original script just skipped it but in TeX Live we expect that # The original script just skipped it but in TeX Live we expect that
# all activated formats are also buildable, thus return failure. # all activated formats are also buildable, thus return failure.
@@ -610,11 +618,15 @@ sub rebuild_one_format { @@ -635,11 +643,15 @@ sub rebuild_one_format {
",$opts{'no-error-if-no-engine'}," =~ m/,$eng,/) { ",$opts{'no-error-if-no-engine'}," =~ m/,$eng,/) {
return $FMT_NOTAVAIL; return $FMT_NOTAVAIL;
} else { } else {
@ -889,7 +879,7 @@
. "$prgswitch $texargs"; . "$prgswitch $texargs";
print_verbose("running \`$cmdline' ...\n"); print_verbose("running \`$cmdline' ...\n");
--- texk/texlive/linked_scripts/texlive/updmap-sys.sh --- texk/texlive/linked_scripts/texlive/updmap-sys.sh
+++ texk/texlive/linked_scripts/texlive/updmap-sys.sh 2016-06-07 13:40:23.541446341 +0000 +++ texk/texlive/linked_scripts/texlive/updmap-sys.sh 2017-05-30 12:59:40.833914877 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH @@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
# hack around a bug in zsh: # hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
@ -897,7 +887,7 @@
+umask 022 +umask 022
exec updmap --sys ${1+"$@"} exec updmap --sys ${1+"$@"}
--- texk/texlive/tl_scripts/fmtutil.cnf --- texk/texlive/tl_scripts/fmtutil.cnf
+++ texk/texlive/tl_scripts/fmtutil.cnf 2016-06-07 13:40:23.541446341 +0000 +++ texk/texlive/tl_scripts/fmtutil.cnf 2017-05-30 12:59:40.833914877 +0000
@@ -46,10 +46,11 @@ amstex pdftex - -translate-file=cp227.tc @@ -46,10 +46,11 @@ amstex pdftex - -translate-file=cp227.tc
# from context: # from context:
cont-en pdftex cont-usr.tex -8bit *cont-en.mkii cont-en pdftex cont-usr.tex -8bit *cont-en.mkii
@ -934,7 +924,7 @@
+xmltex pdftex language.dat -translate-file=cp227.tcx *xmltex.ini +xmltex pdftex language.dat -translate-file=cp227.tcx *xmltex.ini
+pdfxmltex pdftex language.dat -translate-file=cp227.tcx *pdfxmltex.ini +pdfxmltex pdftex language.dat -translate-file=cp227.tcx *pdfxmltex.ini
--- texk/texlive/tl_scripts/texconfig-dialog.sh --- texk/texlive/tl_scripts/texconfig-dialog.sh
+++ texk/texlive/tl_scripts/texconfig-dialog.sh 2016-06-07 13:40:23.541446341 +0000 +++ texk/texlive/tl_scripts/texconfig-dialog.sh 2017-05-30 12:59:40.833914877 +0000
@@ -157,7 +157,14 @@ termCtl() @@ -157,7 +157,14 @@ termCtl()
############################################################################### ###############################################################################
menuMain() menuMain()
@ -964,7 +954,7 @@
while :; do while :; do
logMessage='view logfile' logMessage='view logfile'
--- texk/texlive/tl_scripts/texconfig-sys.sh --- texk/texlive/tl_scripts/texconfig-sys.sh
+++ texk/texlive/tl_scripts/texconfig-sys.sh 2016-06-07 13:40:23.541446341 +0000 +++ texk/texlive/tl_scripts/texconfig-sys.sh 2017-05-30 12:59:40.833914877 +0000
@@ -30,4 +30,5 @@ TEXMFVAR="$v" @@ -30,4 +30,5 @@ TEXMFVAR="$v"
TEXMFCONFIG="$c" TEXMFCONFIG="$c"
export TEXMFVAR TEXMFCONFIG export TEXMFVAR TEXMFCONFIG
@ -972,7 +962,7 @@
+umask 022 +umask 022
exec texconfig ${1+"$@"} exec texconfig ${1+"$@"}
--- texk/texlive/tl_scripts/texconfig.sh --- texk/texlive/tl_scripts/texconfig.sh
+++ texk/texlive/tl_scripts/texconfig.sh 2016-06-07 13:40:23.541446341 +0000 +++ texk/texlive/tl_scripts/texconfig.sh 2017-05-30 12:59:40.833914877 +0000
@@ -40,7 +40,7 @@ envVars=" @@ -40,7 +40,7 @@ envVars="
TEXMFDBS TEXMFINI TEXMFSCRIPTS TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS TEXMFDBS TEXMFINI TEXMFSCRIPTS TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS
TEXSOURCES TFMFONTS TRFONTS TTFONTS VFFONTS WEB2C WEBINPUTS TEXSOURCES TFMFONTS TRFONTS TTFONTS VFFONTS WEB2C WEBINPUTS
@ -982,7 +972,7 @@
needsCleanup=false needsCleanup=false
lastUpdatedFile= lastUpdatedFile=
@@ -1010,21 +1010,6 @@ For more information about these \`featu @@ -975,21 +975,6 @@ For more information about these \`featu
;; ;;
formats) formats)
@ -1004,7 +994,7 @@
setupTmpDir setupTmpDir
echo "$progname: analyzing old configuration..." >&2 echo "$progname: analyzing old configuration..." >&2
fmtutil --catcfg > $tmpdir/pre fmtutil --catcfg > $tmpdir/pre
@@ -1050,22 +1035,6 @@ EOM @@ -1015,22 +1000,6 @@ EOM
# "hyphen FORMAT" # "hyphen FORMAT"
hyphen) hyphen)
@ -1027,7 +1017,7 @@
tcBatchHyphenFormat=$2 tcBatchHyphenFormat=$2
formatsForHyphen=`getFormatsForHyphen` formatsForHyphen=`getFormatsForHyphen`
formatsForHyphenFmt=`echo "$formatsForHyphen" | myFmt | sed 's@^@ @'` formatsForHyphenFmt=`echo "$formatsForHyphen" | myFmt | sed 's@^@ @'`
@@ -1317,7 +1286,7 @@ Valid PAPER settings: @@ -1276,7 +1245,7 @@ Valid PAPER settings:
;; ;;
rehash) rehash)
@ -1037,7 +1027,7 @@
# #
--- texk/texlive/tl_scripts/texlinks.sh --- texk/texlive/tl_scripts/texlinks.sh
+++ texk/texlive/tl_scripts/texlinks.sh 2016-06-07 13:40:23.541446341 +0000 +++ texk/texlive/tl_scripts/texlinks.sh 2017-05-30 12:59:40.841914963 +0000
@@ -100,7 +100,7 @@ setupTmpDir() @@ -100,7 +100,7 @@ setupTmpDir()
trap 'cleanup 1' 1 2 3 7 13 15 trap 'cleanup 1' 1 2 3 7 13 15
@ -1136,7 +1126,7 @@
if test -f "$d/$engine$exeext"; then if test -f "$d/$engine$exeext"; then
case $unlink in case $unlink in
--- texk/web2c/Makefile.in --- texk/web2c/Makefile.in
+++ texk/web2c/Makefile.in 2016-06-07 13:40:23.545446266 +0000 +++ texk/web2c/Makefile.in 2017-05-30 12:59:40.929915908 +0000
@@ -3816,7 +3816,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m @@ -3816,7 +3816,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m
md5main_CPPFLAGS = -I$(srcdir)/libmd5 md5main_CPPFLAGS = -I$(srcdir)/libmd5
md5main_SOURCES = libmd5/md5main.c md5main_SOURCES = libmd5/md5main.c
@ -1159,7 +1149,7 @@
($(am__cd) $(top_srcdir) && $(AUTOHEADER)) ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f w2c/stamp-h1 rm -f w2c/stamp-h1
--- texk/web2c/window/regis.c --- texk/web2c/window/regis.c
+++ texk/web2c/window/regis.c 2016-06-07 13:40:23.545446266 +0000 +++ texk/web2c/window/regis.c 2017-05-30 12:59:40.929915908 +0000
@@ -64,12 +64,14 @@ void mf_regis_blankrectangle (screencol @@ -64,12 +64,14 @@ void mf_regis_blankrectangle (screencol
screenrow top, screenrow top,
screenrow bottom) screenrow bottom)
@ -1179,7 +1169,7 @@
left,bottom,ESCAPE); left,bottom,ESCAPE);
} }
--- texk/web2c/window/x11-Xlib.c --- texk/web2c/window/x11-Xlib.c
+++ texk/web2c/window/x11-Xlib.c 2016-06-07 13:40:23.621444844 +0000 +++ texk/web2c/window/x11-Xlib.c 2017-05-30 12:59:40.929915908 +0000
@@ -73,6 +73,8 @@ static XWMHints wm_hints = { @@ -73,6 +73,8 @@ static XWMHints wm_hints = {
#define BORDER_WIDTH 1 /* Should get this from resource. */ #define BORDER_WIDTH 1 /* Should get this from resource. */
#define DEFAULT_X_POSITION 0 #define DEFAULT_X_POSITION 0
@ -1206,7 +1196,7 @@
/* Look up the geometry for this window. (Section 10.2 Obtaining X /* Look up the geometry for this window. (Section 10.2 Obtaining X
--- texk/web2c/window/x11-Xt.c --- texk/web2c/window/x11-Xt.c
+++ texk/web2c/window/x11-Xt.c 2016-06-07 13:40:23.621444844 +0000 +++ texk/web2c/window/x11-Xt.c 2017-05-30 12:59:40.929915908 +0000
@@ -18,8 +18,8 @@ @@ -18,8 +18,8 @@
#define PLANE 0 #define PLANE 0
@ -1219,7 +1209,7 @@
static Display *mf_display; static Display *mf_display;
static Window mf_window; static Window mf_window;
--- texk/xdvik/psgs.c --- texk/xdvik/psgs.c
+++ texk/xdvik/psgs.c 2016-06-07 13:40:23.621444844 +0000 +++ texk/xdvik/psgs.c 2017-05-30 12:59:40.929915908 +0000
@@ -34,6 +34,8 @@ OTHER DEALINGS IN THE SOFTWARE. @@ -34,6 +34,8 @@ OTHER DEALINGS IN THE SOFTWARE.
#include <sys/time.h> /* for timeval */ #include <sys/time.h> /* for timeval */
@ -1257,7 +1247,7 @@
GS_pid = vfork(); GS_pid = vfork();
if (GS_pid == 0) { /* child */ if (GS_pid == 0) { /* child */
--- texk/xdvik/xdvi-sh.in --- texk/xdvik/xdvi-sh.in
+++ texk/xdvik/xdvi-sh.in 2016-06-07 13:40:23.621444844 +0000 +++ texk/xdvik/xdvi-sh.in 2017-05-30 12:59:40.929915908 +0000
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/bin/sh -#!/bin/sh
+#!/bin/bash +#!/bin/bash

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

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

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

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

3
texlive-rpmlintrc
View File

@ -1,5 +1,6 @@
addFilter(".*texlive-(collection|scheme)-.*\.noarch:.*suse-filelist-empty.*") addFilter(".*texlive-(collection|scheme)-.*\.noarch:.*suse-filelist-empty.*")
addFilter(".*texlive-(extratools|devel)\.noarch:.*suse-filelist-empty.*") addFilter(".*texlive-(extratools|devel)\..*:.*suse-filelist-empty.*")
addFilter(".*texlive-bin-devel\..*:.*suse-filelist-empty.*")
addFilter(".*texlive.src:.*:.*macro-in-comment.*") addFilter(".*texlive.src:.*:.*macro-in-comment.*")
addFilter(".*texlive-scheme-.*.noarch:.*:-*summary-not-capitalized.*") addFilter(".*texlive-scheme-.*.noarch:.*:-*summary-not-capitalized.*")
addFilter(".*texlive-.*noarch:.*:.*filename-too-long-for-joliet.*") addFilter(".*texlive-.*noarch:.*:.*filename-too-long-for-joliet.*")

28
texlive.changes
View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Wed Jun 14 12:59:21 UTC 2017 - werner@suse.de
- Let biber test suite not use 64bit longs on 32bit architectures
-------------------------------------------------------------------
Wed Jun 14 08:10:24 UTC 2017 - werner@suse.de
- Modify patch source-luatex.dif, that is update luatex tree from
version 2017033109 (r44589) to version 2017060901 (r44590)
-------------------------------------------------------------------
Tue Jun 13 10:38:52 UTC 2017 - werner@suse.de
- Final TeXLive 2017 20170520
-------------------------------------------------------------------
Thu Jun 1 12:02:37 UTC 2017 - werner@suse.de
- Update to TeXLive 2017 20170520 pretest
- Update to biber 2.7
* Add missing bblxml.pm
- Remove patch biber-perl-pre5.22.0.dif
- Add patch source-luatex.dif for new gcc-7.1
- Adopted patches biber-certs.dif, biblatex-encoding.dif,
source-configure.dif, source-overflow.dif, source-warns.dif,
and source-warns.dif
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 26 15:22:17 UTC 2017 - werner@suse.de Fri May 26 15:22:17 UTC 2017 - werner@suse.de

385
texlive.spec
View File

@ -16,11 +16,11 @@
# #
%define texlive_version 2016 %define texlive_version 2017
%define texlive_previous 2015 %define texlive_previous 2016
%define texlive_release 20160523 %define texlive_release 20170520
%define texlive_noarch 122 %define texlive_noarch 123
%define texlive_source texlive-20160523-source %define texlive_source texlive-20170520-source
%define __perl_requires %{nil} %define __perl_requires %{nil}
%define __os_install_post /usr/lib/rpm/brp-compress \\\ %define __os_install_post /usr/lib/rpm/brp-compress \\\
@ -178,6 +178,7 @@ BuildRequires: zip
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: zziplib-devel BuildRequires: zziplib-devel
%if %{with buildbiber} %if %{with buildbiber}
BuildRequires: perl-base >= 5.24.1
BuildRequires: perl(autovivification) BuildRequires: perl(autovivification)
#BuildRequires: perl(Business::ISBN) #BuildRequires: perl(Business::ISBN)
BuildRequires: perl-Business-ISBN BuildRequires: perl-Business-ISBN
@ -185,11 +186,16 @@ BuildRequires: perl-Business-ISBN-Data
BuildRequires: perl(Business::ISMN) BuildRequires: perl(Business::ISMN)
BuildRequires: perl(Business::ISSN) BuildRequires: perl(Business::ISSN)
BuildRequires: perl(Class::Accessor) BuildRequires: perl(Class::Accessor)
BuildRequires: perl(Class::Factory::Util)
BuildRequires: perl(Config::AutoConf) >= 0.15 BuildRequires: perl(Config::AutoConf) >= 0.15
BuildRequires: perl(Data::Compare) BuildRequires: perl(Data::Compare)
BuildRequires: perl(Data::Dump) BuildRequires: perl(Data::Dump)
BuildRequires: perl(Data::Uniqid) BuildRequires: perl(Data::Uniqid)
BuildRequires: perl(Date::Simple) BuildRequires: perl(Date::Simple)
BuildRequires: perl(DateTime)
BuildRequires: perl(DateTime::Calendar::Julian)
BuildRequires: perl(DateTime::Format::Builder)
BuildRequires: perl(DateTime::Format::Strptime)
BuildRequires: perl(Encode::EUCJPASCII) BuildRequires: perl(Encode::EUCJPASCII)
BuildRequires: perl(Encode::HanExtra) BuildRequires: perl(Encode::HanExtra)
BuildRequires: perl(Encode::JIS2K) BuildRequires: perl(Encode::JIS2K)
@ -211,16 +217,23 @@ BuildRequires: perl(Module::Build)
%if 0%{suse_version} <= 1230 %if 0%{suse_version} <= 1230
BuildRequires: perl(PAR::Packer) BuildRequires: perl(PAR::Packer)
%endif %endif
BuildRequires: perl(Package::DeprecationManager)
BuildRequires: perl(Params::Util)
BuildRequires: perl(Readonly::XS) BuildRequires: perl(Readonly::XS)
BuildRequires: perl(Regexp::Common) BuildRequires: perl(Regexp::Common)
BuildRequires: perl(Sort::Key)
BuildRequires: perl(Sub::Install)
BuildRequires: perl(Test::Differences) BuildRequires: perl(Test::Differences)
BuildRequires: perl(Test::More) BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod) >= 1.22 BuildRequires: perl(Test::Pod) >= 1.22
BuildRequires: perl(Test::Pod::Coverage) >= 1.08 BuildRequires: perl(Test::Pod::Coverage) >= 1.08
BuildRequires: perl(Text::BibTeX) >= 0.71 BuildRequires: perl(Text::BibTeX) >= 0.76
BuildRequires: perl(Text::CSV)
BuildRequires: perl(Text::CSV_XS)
BuildRequires: perl(Text::Roman) BuildRequires: perl(Text::Roman)
BuildRequires: perl(Unicode::Collate) >= 1.14 BuildRequires: perl(Unicode::Collate) >= 1.18
BuildRequires: perl(Unicode::GCString) BuildRequires: perl(Unicode::GCString)
BuildRequires: perl(Unicode::LineBreak)
BuildRequires: perl(Unicode::Normalize) >= 1.23 BuildRequires: perl(Unicode::Normalize) >= 1.23
BuildRequires: perl(XML::LibXML::Simple) BuildRequires: perl(XML::LibXML::Simple)
BuildRequires: perl(XML::LibXSLT) BuildRequires: perl(XML::LibXSLT)
@ -228,7 +241,7 @@ BuildRequires: perl(XML::Writer::String)
%endif %endif
# Download at ftp://tug.org/texlive/historic/%{texlive_version}/ # Download at ftp://tug.org/texlive/historic/%{texlive_version}/
Source0: %{texlive_source}.tar.xz Source0: %{texlive_source}.tar.xz
Source3: biblatex-biber-2.5.tar.xz Source3: biblatex-biber-2.7.tar.xz
Source4: cnf-to-paths.awk Source4: cnf-to-paths.awk
Source30: texlive-rpmlintrc Source30: texlive-rpmlintrc
Source50: public.c Source50: public.c
@ -240,6 +253,7 @@ Patch3: source-arraysubs.dif
Patch5: source-texdoc.dif Patch5: source-texdoc.dif
Patch6: source-dviutils.dif Patch6: source-dviutils.dif
Patch8: source-psutils.dif Patch8: source-psutils.dif
Patch9: source-luatex.dif
Patch10: source-poppler.dif Patch10: source-poppler.dif
Patch11: source-lacheck.dif Patch11: source-lacheck.dif
Patch12: source-warns.dif Patch12: source-warns.dif
@ -255,8 +269,6 @@ Patch20: source-missed-scripts.dif
Patch42: biblatex-encoding.dif Patch42: biblatex-encoding.dif
# PATCH-FIX-SUSE Old problem back: we do not use internal Certs! # PATCH-FIX-SUSE Old problem back: we do not use internal Certs!
Patch44: biber-certs.dif Patch44: biber-certs.dif
# PATCH-FIX-SUSE Make biber work with perl pre 5.22.0
Patch45: biber-perl-pre5.22.0.dif
# PATCH-FIX-SUSE Make biber work with perl 5.18.2 # PATCH-FIX-SUSE Make biber work with perl 5.18.2
Patch47: biber-perl-5.18.2.dif Patch47: biber-perl-5.18.2.dif
Prefix: %{_bindir} Prefix: %{_bindir}
@ -363,7 +375,7 @@ Prefix: %{_bindir}
Binary files of adhocfilelist Binary files of adhocfilelist
%package afm2pl-bin %package afm2pl-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of afm2pl Summary: Binary files of afm2pl
License: LPPL-1.0 License: LPPL-1.0
@ -377,7 +389,7 @@ Prefix: %{_bindir}
Binary files of afm2pl Binary files of afm2pl
%package aleph-bin %package aleph-bin
Version: %{texlive_version}.%{texlive_release}.svn40987 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of aleph Summary: Binary files of aleph
License: LPPL-1.0 License: LPPL-1.0
@ -422,7 +434,7 @@ Prefix: %{_bindir}
Binary files of arara Binary files of arara
%package asymptote-bin %package asymptote-bin
Version: %{texlive_version}.%{texlive_release}.svn41076 Version: %{texlive_version}.%{texlive_release}.svn43843
Release: 0 Release: 0
Summary: Binary files of asymptote Summary: Binary files of asymptote
License: LPPL-1.0 License: LPPL-1.0
@ -450,7 +462,7 @@ Prefix: %{_bindir}
Binary files of authorindex Binary files of authorindex
%package autosp-bin %package autosp-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of autosp Summary: Binary files of autosp
License: LPPL-1.0 License: LPPL-1.0
@ -464,7 +476,7 @@ Prefix: %{_bindir}
Binary files of autosp Binary files of autosp
%package biber-bin %package biber-bin
Version: %{texlive_version}.%{texlive_release}.svn41193 Version: %{texlive_version}.%{texlive_release}.svn42679
Release: 0 Release: 0
Summary: Binary files of biber Summary: Binary files of biber
License: LPPL-1.0 License: LPPL-1.0
@ -504,7 +516,7 @@ Prefix: %{_bindir}
Binary files of bibexport Binary files of bibexport
%package bibtex-bin %package bibtex-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of bibtex Summary: Binary files of bibtex
License: LPPL-1.0 License: LPPL-1.0
@ -521,7 +533,7 @@ Prefix: %{_bindir}
Binary files of bibtex Binary files of bibtex
%package bibtex8-bin %package bibtex8-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of bibtex8 Summary: Binary files of bibtex8
License: LPPL-1.0 License: LPPL-1.0
@ -538,7 +550,7 @@ Prefix: %{_bindir}
Binary files of bibtex8 Binary files of bibtex8
%package bibtexu-bin %package bibtexu-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of bibtexu Summary: Binary files of bibtexu
License: LPPL-1.0 License: LPPL-1.0
@ -611,7 +623,7 @@ Prefix: %{_bindir}
Binary files of checklistings Binary files of checklistings
%package chktex-bin %package chktex-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of chktex Summary: Binary files of chktex
License: LPPL-1.0 License: LPPL-1.0
@ -642,7 +654,7 @@ Prefix: %{_bindir}
Binary files of cjk-gs-integrate Binary files of cjk-gs-integrate
%package cjkutils-bin %package cjkutils-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of cjkutils Summary: Binary files of cjkutils
License: LPPL-1.0 License: LPPL-1.0
@ -688,7 +700,7 @@ Prefix: %{_bindir}
Binary files of convbkmk Binary files of convbkmk
%package crossrefware-bin %package crossrefware-bin
Version: %{texlive_version}.%{texlive_release}.svn35401 Version: %{texlive_version}.%{texlive_release}.svn43866
Release: 0 Release: 0
Summary: Binary files of crossrefware Summary: Binary files of crossrefware
License: LPPL-1.0 License: LPPL-1.0
@ -761,7 +773,7 @@ Prefix: %{_bindir}
Binary files of ctanupload Binary files of ctanupload
%package ctie-bin %package ctie-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of ctie Summary: Binary files of ctie
License: LPPL-1.0 License: LPPL-1.0
@ -775,7 +787,7 @@ Prefix: %{_bindir}
Binary files of ctie Binary files of ctie
%package cweb-bin %package cweb-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of cweb Summary: Binary files of cweb
License: LPPL-1.0 License: LPPL-1.0
@ -817,7 +829,7 @@ Prefix: %{_bindir}
Binary files of de-macro Binary files of de-macro
%package detex-bin %package detex-bin
Version: %{texlive_version}.%{texlive_release}.svn40750 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of detex Summary: Binary files of detex
License: LPPL-1.0 License: LPPL-1.0
@ -833,20 +845,6 @@ Prefix: %{_bindir}
%description detex-bin %description detex-bin
Binary files of detex Binary files of detex
%package devnag-bin
Version: %{texlive_version}.%{texlive_release}.svn40987
Release: 0
Summary: Binary files of devnag
License: LPPL-1.0
Group: Productivity/Publishing/TeX/Utilities
Url: http://www.tug.org/texlive/
Requires(pre): texlive-devnag >= %{texlive_version}
#!BuildIgnore: texlive-devnag
Prefix: %{_bindir}
%description devnag-bin
Binary files of devnag
%package diadia-bin %package diadia-bin
Version: %{texlive_version}.%{texlive_release}.svn37645 Version: %{texlive_version}.%{texlive_release}.svn37645
Release: 0 Release: 0
@ -877,7 +875,7 @@ Prefix: %{_bindir}
Binary files of dosepsbin Binary files of dosepsbin
%package dtl-bin %package dtl-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of dtl Summary: Binary files of dtl
License: LPPL-1.0 License: LPPL-1.0
@ -919,7 +917,7 @@ Prefix: %{_bindir}
Binary files of dviasm Binary files of dviasm
%package dvicopy-bin %package dvicopy-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of dvicopy Summary: Binary files of dvicopy
License: LPPL-1.0 License: LPPL-1.0
@ -933,7 +931,7 @@ Prefix: %{_bindir}
Binary files of dvicopy Binary files of dvicopy
%package dvidvi-bin %package dvidvi-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of dvidvi Summary: Binary files of dvidvi
License: LPPL-1.0 License: LPPL-1.0
@ -946,8 +944,22 @@ Prefix: %{_bindir}
%description dvidvi-bin %description dvidvi-bin
Binary files of dvidvi Binary files of dvidvi
%package dviinfox-bin
Version: %{texlive_version}.%{texlive_release}.svn44515
Release: 0
Summary: Binary files of dviinfox
License: LPPL-1.0
Group: Productivity/Publishing/TeX/Utilities
Url: http://www.tug.org/texlive/
Requires(pre): texlive-dviinfox >= %{texlive_version}
#!BuildIgnore: texlive-dviinfox
Prefix: %{_bindir}
%description dviinfox-bin
Binary files of dviinfox
%package dviljk-bin %package dviljk-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of dviljk Summary: Binary files of dviljk
License: LPPL-1.0 License: LPPL-1.0
@ -980,7 +992,7 @@ Prefix: %{_bindir}
Binary files of dvipdfmx Binary files of dvipdfmx
%package dvipng-bin %package dvipng-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of dvipng Summary: Binary files of dvipng
License: LPPL-1.0 License: LPPL-1.0
@ -994,7 +1006,7 @@ Prefix: %{_bindir}
Binary files of dvipng Binary files of dvipng
%package dvipos-bin %package dvipos-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of dvipos Summary: Binary files of dvipos
License: LPPL-1.0 License: LPPL-1.0
@ -1008,7 +1020,7 @@ Prefix: %{_bindir}
Binary files of dvipos Binary files of dvipos
%package dvips-bin %package dvips-bin
Version: %{texlive_version}.%{texlive_release}.svn40987 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of dvips Summary: Binary files of dvips
License: LPPL-1.0 License: LPPL-1.0
@ -1168,7 +1180,7 @@ Prefix: %{_bindir}
Binary files of fontools Binary files of fontools
%package fontware-bin %package fontware-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of fontware Summary: Binary files of fontware
License: LPPL-1.0 License: LPPL-1.0
@ -1224,7 +1236,7 @@ Prefix: %{_bindir}
Binary files of glossaries Binary files of glossaries
%package gregoriotex-bin %package gregoriotex-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of gregoriotex Summary: Binary files of gregoriotex
License: LPPL-1.0 License: LPPL-1.0
@ -1241,7 +1253,7 @@ Prefix: %{_bindir}
Binary files of gregoriotex Binary files of gregoriotex
%package gsftopk-bin %package gsftopk-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of gsftopk Summary: Binary files of gsftopk
License: LPPL-1.0 License: LPPL-1.0
@ -1272,20 +1284,6 @@ Prefix: %{_bindir}
%description jadetex-bin %description jadetex-bin
Binary files of jadetex Binary files of jadetex
%package jfontmaps-bin
Version: %{texlive_version}.%{texlive_release}.svn29848
Release: 0
Summary: Binary files of jfontmaps
License: LPPL-1.0
Group: Productivity/Publishing/TeX/Utilities
Url: http://www.tug.org/texlive/
Requires(pre): texlive-jfontmaps >= %{texlive_version}
#!BuildIgnore: texlive-jfontmaps
Prefix: %{_bindir}
%description jfontmaps-bin
Binary files of jfontmaps
%package kotex-utils-bin %package kotex-utils-bin
Version: %{texlive_version}.%{texlive_release}.svn32101 Version: %{texlive_version}.%{texlive_release}.svn32101
Release: 0 Release: 0
@ -1304,7 +1302,7 @@ Prefix: %{_bindir}
Binary files of kotex-utils Binary files of kotex-utils
%package kpathsea-bin %package kpathsea-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of kpathsea Summary: Binary files of kpathsea
License: LPPL-1.0 License: LPPL-1.0
@ -1330,7 +1328,7 @@ Prefix: %{_bindir}
Binary files of kpathsea Binary files of kpathsea
%package lacheck-bin %package lacheck-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of lacheck Summary: Binary files of lacheck
License: LPPL-1.0 License: LPPL-1.0
@ -1378,6 +1376,23 @@ Prefix: %{_bindir}
%description latex-git-log-bin %description latex-git-log-bin
Binary files of latex-git-log Binary files of latex-git-log
%package latex-papersize-bin
Version: %{texlive_version}.%{texlive_release}.svn42296
Release: 0
Summary: Binary files of latex-papersize
License: LPPL-1.0
Group: Productivity/Publishing/TeX/Utilities
Url: http://www.tug.org/texlive/
Requires(pre): texlive-latex-papersize >= %{texlive_version}
#!BuildIgnore: texlive-latex-papersize
Recommends: texlive-collection-fontsrecommended >= %{texlive_version}
Recommends: texlive-collection-genericrecommended >= %{texlive_version}
Recommends: texlive-collection-latexrecommended >= %{texlive_version}
Prefix: %{_bindir}
%description latex-papersize-bin
Binary files of latex-papersize
%package latex2man-bin %package latex2man-bin
Version: %{texlive_version}.%{texlive_release}.svn13663 Version: %{texlive_version}.%{texlive_release}.svn13663
Release: 0 Release: 0
@ -1395,6 +1410,23 @@ Prefix: %{_bindir}
%description latex2man-bin %description latex2man-bin
Binary files of latex2man Binary files of latex2man
%package latex2nemeth-bin
Version: %{texlive_version}.%{texlive_release}.svn42300
Release: 0
Summary: Binary files of latex2nemeth
License: LPPL-1.0
Group: Productivity/Publishing/TeX/Utilities
Url: http://www.tug.org/texlive/
Requires(pre): texlive-latex2nemeth >= %{texlive_version}
#!BuildIgnore: texlive-latex2nemeth
Recommends: texlive-collection-fontsrecommended >= %{texlive_version}
Recommends: texlive-collection-genericrecommended >= %{texlive_version}
Recommends: texlive-collection-latexrecommended >= %{texlive_version}
Prefix: %{_bindir}
%description latex2nemeth-bin
Binary files of latex2nemeth
%package latexdiff-bin %package latexdiff-bin
Version: %{texlive_version}.%{texlive_release}.svn16420 Version: %{texlive_version}.%{texlive_release}.svn16420
Release: 0 Release: 0
@ -1481,7 +1513,7 @@ Prefix: %{_bindir}
Binary files of latexpand Binary files of latexpand
%package lcdftypetools-bin %package lcdftypetools-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of lcdftypetools Summary: Binary files of lcdftypetools
License: LPPL-1.0 License: LPPL-1.0
@ -1542,7 +1574,7 @@ Prefix: %{_bindir}
Binary files of listings-ext Binary files of listings-ext
%package lollipop-bin %package lollipop-bin
Version: %{texlive_version}.%{texlive_release}.svn41133 Version: %{texlive_version}.%{texlive_release}.svn41465
Release: 0 Release: 0
Summary: Binary files of lollipop Summary: Binary files of lollipop
License: LPPL-1.0 License: LPPL-1.0
@ -1612,7 +1644,7 @@ Prefix: %{_bindir}
Binary files of luaotfload Binary files of luaotfload
%package luatex-bin %package luatex-bin
Version: %{texlive_version}.%{texlive_release}.svn41091 Version: %{texlive_version}.%{texlive_release}.svn44549
Release: 0 Release: 0
Summary: Binary files of luatex Summary: Binary files of luatex
License: LPPL-1.0 License: LPPL-1.0
@ -1628,8 +1660,22 @@ Prefix: %{_bindir}
%description luatex-bin %description luatex-bin
Binary files of luatex Binary files of luatex
%package lwarp-bin
Version: %{texlive_version}.%{texlive_release}.svn43292
Release: 0
Summary: Binary files of lwarp
License: LPPL-1.0
Group: Productivity/Publishing/TeX/Utilities
Url: http://www.tug.org/texlive/
Requires(pre): texlive-lwarp >= %{texlive_version}
#!BuildIgnore: texlive-lwarp
Prefix: %{_bindir}
%description lwarp-bin
Binary files of lwarp
%package m-tx-bin %package m-tx-bin
Version: %{texlive_version}.%{texlive_release}.svn40961 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of m-tx Summary: Binary files of m-tx
License: LPPL-1.0 License: LPPL-1.0
@ -1671,7 +1717,7 @@ Prefix: %{_bindir}
Binary files of makedtx Binary files of makedtx
%package makeindex-bin %package makeindex-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of makeindex Summary: Binary files of makeindex
License: LPPL-1.0 License: LPPL-1.0
@ -1713,7 +1759,7 @@ Prefix: %{_bindir}
Binary files of mathspic Binary files of mathspic
%package metafont-bin %package metafont-bin
Version: %{texlive_version}.%{texlive_release}.svn40987 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of metafont Summary: Binary files of metafont
License: LPPL-1.0 License: LPPL-1.0
@ -1727,7 +1773,7 @@ Prefix: %{_bindir}
Binary files of metafont Binary files of metafont
%package metapost-bin %package metapost-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of metapost Summary: Binary files of metapost
License: LPPL-1.0 License: LPPL-1.0
@ -1770,7 +1816,7 @@ Prefix: %{_bindir}
Binary files of mf2pt1 Binary files of mf2pt1
%package mflua-bin %package mflua-bin
Version: %{texlive_version}.%{texlive_release}.svn40987 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of mflua Summary: Binary files of mflua
License: LPPL-1.0 License: LPPL-1.0
@ -1784,7 +1830,7 @@ Prefix: %{_bindir}
Binary files of mflua Binary files of mflua
%package mfware-bin %package mfware-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of mfware Summary: Binary files of mfware
License: LPPL-1.0 License: LPPL-1.0
@ -1908,7 +1954,7 @@ Prefix: %{_bindir}
Binary files of musixtex Binary files of musixtex
%package musixtnt-bin %package musixtnt-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of musixtnt Summary: Binary files of musixtnt
License: LPPL-1.0 License: LPPL-1.0
@ -1922,7 +1968,7 @@ Prefix: %{_bindir}
Binary files of musixtnt Binary files of musixtnt
%package omegaware-bin %package omegaware-bin
Version: %{texlive_version}.%{texlive_release}.svn40750 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of omegaware Summary: Binary files of omegaware
License: LPPL-1.0 License: LPPL-1.0
@ -1941,7 +1987,7 @@ Prefix: %{_bindir}
Binary files of omegaware Binary files of omegaware
%package patgen-bin %package patgen-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of patgen Summary: Binary files of patgen
License: LPPL-1.0 License: LPPL-1.0
@ -2010,8 +2056,25 @@ Prefix: %{_bindir}
%description pdfjam-bin %description pdfjam-bin
Binary files of pdfjam Binary files of pdfjam
%package pdflatexpicscale-bin
Version: %{texlive_version}.%{texlive_release}.svn41779
Release: 0
Summary: Binary files of pdflatexpicscale
License: LPPL-1.0
Group: Productivity/Publishing/TeX/Utilities
Url: http://www.tug.org/texlive/
Requires(pre): texlive-pdflatexpicscale >= %{texlive_version}
#!BuildIgnore: texlive-pdflatexpicscale
Recommends: texlive-collection-fontsrecommended >= %{texlive_version}
Recommends: texlive-collection-genericrecommended >= %{texlive_version}
Recommends: texlive-collection-latexrecommended >= %{texlive_version}
Prefix: %{_bindir}
%description pdflatexpicscale-bin
Binary files of pdflatexpicscale
%package pdftex-bin %package pdftex-bin
Version: %{texlive_version}.%{texlive_release}.svn40987 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of pdftex Summary: Binary files of pdftex
License: LPPL-1.0 License: LPPL-1.0
@ -2028,7 +2091,7 @@ Prefix: %{_bindir}
Binary files of pdftex Binary files of pdftex
%package pdftools-bin %package pdftools-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of pdftools Summary: Binary files of pdftools
License: LPPL-1.0 License: LPPL-1.0
@ -2160,7 +2223,7 @@ Prefix: %{_bindir}
Binary files of platex Binary files of platex
%package pmx-bin %package pmx-bin
Version: %{texlive_version}.%{texlive_release}.svn41091 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of pmx Summary: Binary files of pmx
License: LPPL-1.0 License: LPPL-1.0
@ -2188,7 +2251,7 @@ Prefix: %{_bindir}
Binary files of pmxchords Binary files of pmxchords
%package ps2pk-bin %package ps2pk-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of ps2pk Summary: Binary files of ps2pk
License: LPPL-1.0 License: LPPL-1.0
@ -2231,7 +2294,7 @@ Prefix: %{_bindir}
Binary files of pst2pdf Binary files of pst2pdf
%package pstools-bin %package pstools-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of pstools Summary: Binary files of pstools
License: LPPL-1.0 License: LPPL-1.0
@ -2244,8 +2307,25 @@ Prefix: %{_bindir}
%description pstools-bin %description pstools-bin
Binary files of pstools Binary files of pstools
%package ptex-fontmaps-bin
Version: %{texlive_version}.%{texlive_release}.svn44206
Release: 0
Summary: Binary files of ptex-fontmaps
License: LPPL-1.0
Group: Productivity/Publishing/TeX/Utilities
Url: http://www.tug.org/texlive/
Requires(pre): texlive-ptex-fontmaps >= %{texlive_version}
#!BuildIgnore: texlive-ptex-fontmaps
Recommends: texlive-collection-fontsrecommended >= %{texlive_version}
Recommends: texlive-collection-genericrecommended >= %{texlive_version}
Recommends: texlive-collection-basic >= %{texlive_version}
Prefix: %{_bindir}
%description ptex-fontmaps-bin
Binary files of ptex-fontmaps
%package ptex-bin %package ptex-bin
Version: %{texlive_version}.%{texlive_release}.svn40987 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of ptex Summary: Binary files of ptex
License: LPPL-1.0 License: LPPL-1.0
@ -2341,7 +2421,7 @@ Prefix: %{_bindir}
Binary files of rubik Binary files of rubik
%package seetexk-bin %package seetexk-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of seetexk Summary: Binary files of seetexk
License: LPPL-1.0 License: LPPL-1.0
@ -2414,7 +2494,7 @@ Prefix: %{_bindir}
Binary files of svn-multi Binary files of svn-multi
%package synctex-bin %package synctex-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of synctex Summary: Binary files of synctex
License: LPPL-1.0 License: LPPL-1.0
@ -2431,7 +2511,7 @@ Prefix: %{_bindir}
Binary files of synctex Binary files of synctex
%package tetex-bin %package tetex-bin
Version: %{texlive_version}.%{texlive_release}.svn36770 Version: %{texlive_version}.%{texlive_release}.svn43957
Release: 0 Release: 0
Summary: Binary files of tetex Summary: Binary files of tetex
License: LPPL-1.0 License: LPPL-1.0
@ -2448,7 +2528,7 @@ Prefix: %{_bindir}
Binary files of tetex Binary files of tetex
%package tex-bin %package tex-bin
Version: %{texlive_version}.%{texlive_release}.svn40987 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of tex Summary: Binary files of tex
License: LPPL-1.0 License: LPPL-1.0
@ -2482,7 +2562,7 @@ Prefix: %{_bindir}
Binary files of tex4ebook Binary files of tex4ebook
%package tex4ht-bin %package tex4ht-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of tex4ht Summary: Binary files of tex4ht
License: LPPL-1.0 License: LPPL-1.0
@ -2653,6 +2733,23 @@ Prefix: %{_bindir}
%description texloganalyser-bin %description texloganalyser-bin
Binary files of texloganalyser Binary files of texloganalyser
%package texosquery-bin
Version: %{texlive_version}.%{texlive_release}.svn43596
Release: 0
Summary: Binary files of texosquery
License: LPPL-1.0
Group: Productivity/Publishing/TeX/Utilities
Url: http://www.tug.org/texlive/
Requires(pre): texlive-texosquery >= %{texlive_version}
#!BuildIgnore: texlive-texosquery
Recommends: texlive-collection-fontsrecommended >= %{texlive_version}
Recommends: texlive-collection-genericrecommended >= %{texlive_version}
Recommends: texlive-collection-basic >= %{texlive_version}
Prefix: %{_bindir}
%description texosquery-bin
Binary files of texosquery
%package texsis-bin %package texsis-bin
Version: %{texlive_version}.%{texlive_release}.svn3006 Version: %{texlive_version}.%{texlive_release}.svn3006
Release: 0 Release: 0
@ -2671,7 +2768,7 @@ Prefix: %{_bindir}
Binary files of texsis Binary files of texsis
%package texware-bin %package texware-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of texware Summary: Binary files of texware
License: LPPL-1.0 License: LPPL-1.0
@ -2702,7 +2799,7 @@ Prefix: %{_bindir}
Binary files of thumbpdf Binary files of thumbpdf
%package tie-bin %package tie-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of tie Summary: Binary files of tie
License: LPPL-1.0 License: LPPL-1.0
@ -2733,7 +2830,7 @@ Prefix: %{_bindir}
Binary files of tpic2pdftex Binary files of tpic2pdftex
%package ttfutils-bin %package ttfutils-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of ttfutils Summary: Binary files of ttfutils
License: LPPL-1.0 License: LPPL-1.0
@ -2792,7 +2889,7 @@ Prefix: %{_bindir}
Binary files of uplatex Binary files of uplatex
%package uptex-bin %package uptex-bin
Version: %{texlive_version}.%{texlive_release}.svn40987 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of uptex Summary: Binary files of uptex
License: LPPL-1.0 License: LPPL-1.0
@ -2822,8 +2919,22 @@ Prefix: %{_bindir}
%description urlbst-bin %description urlbst-bin
Binary files of urlbst Binary files of urlbst
%package velthuis-bin
Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0
Summary: Binary files of velthuis
License: LPPL-1.0
Group: Productivity/Publishing/TeX/Utilities
Url: http://www.tug.org/texlive/
Requires(pre): texlive-velthuis >= %{texlive_version}
#!BuildIgnore: texlive-velthuis
Prefix: %{_bindir}
%description velthuis-bin
Binary files of velthuis
%package vlna-bin %package vlna-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of vlna Summary: Binary files of vlna
License: LPPL-1.0 License: LPPL-1.0
@ -2851,7 +2962,7 @@ Prefix: %{_bindir}
Binary files of vpe Binary files of vpe
%package web-bin %package web-bin
Version: %{texlive_version}.%{texlive_release}.svn40473 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of web Summary: Binary files of web
License: LPPL-1.0 License: LPPL-1.0
@ -2865,7 +2976,7 @@ Prefix: %{_bindir}
Binary files of web Binary files of web
%package xdvi-bin %package xdvi-bin
Version: %{texlive_version}.%{texlive_release}.svn40750 Version: %{texlive_version}.%{texlive_release}.svn44143
Release: 0 Release: 0
Summary: Binary files of xdvi Summary: Binary files of xdvi
License: LPPL-1.0 License: LPPL-1.0
@ -2879,7 +2990,7 @@ Prefix: %{_bindir}
Binary files of xdvi Binary files of xdvi
%package xetex-bin %package xetex-bin
Version: %{texlive_version}.%{texlive_release}.svn41091 Version: %{texlive_version}.%{texlive_release}.svn44361
Release: 0 Release: 0
Summary: Binary files of xetex Summary: Binary files of xetex
License: LPPL-1.0 License: LPPL-1.0
@ -2929,7 +3040,7 @@ Prefix: %{_bindir}
Binary files of yplan Binary files of yplan
%package -n libkpathsea6 %package -n libkpathsea6
Version: 6.2.2 Version: 6.2.3
Release: 0 Release: 0
Summary: Path searching library for TeX-related files Summary: Path searching library for TeX-related files
License: LGPL-2.1+ License: LGPL-2.1+
@ -2946,13 +3057,13 @@ separately, but rather is released and maintained as part of
the TeX-live sources. the TeX-live sources.
%package -n %{name}-kpathsea-devel %package -n %{name}-kpathsea-devel
Version: 6.2.2 Version: 6.2.3
Release: 0 Release: 0
Summary: Path searching library for TeX-related files Summary: Path searching library for TeX-related files
License: LGPL-2.1+ License: LGPL-2.1+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Url: http://www.tug.org/texlive/ Url: http://www.tug.org/texlive/
Requires: libkpathsea6 = 6.2.2 Requires: libkpathsea6 = 6.2.3
%description -n %{name}-kpathsea-devel %description -n %{name}-kpathsea-devel
Kpathsea is a library and utility programs which provide path Kpathsea is a library and utility programs which provide path
@ -2963,7 +3074,7 @@ separately, but rather is released and maintained as part of
the TeX-live sources. the TeX-live sources.
%package -n libptexenc1 %package -n libptexenc1
Version: 1.3.4 Version: 1.3.5
Release: 0 Release: 0
Summary: Libraries of Kanji code convert library for pTeX Summary: Libraries of Kanji code convert library for pTeX
License: BSD-3-Clause License: BSD-3-Clause
@ -2977,13 +3088,13 @@ The ptexenc is a useful library for Japanese pTeX
TeX by ASCII Co.) and its surrounding tools. TeX by ASCII Co.) and its surrounding tools.
%package -n %{name}-ptexenc-devel %package -n %{name}-ptexenc-devel
Version: 1.3.4 Version: 1.3.5
Release: 0 Release: 0
Summary: Libraries of Kanji code convert library for pTeX Summary: Libraries of Kanji code convert library for pTeX
License: BSD-3-Clause License: BSD-3-Clause
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Url: http://www.tug.org/texlive/ Url: http://www.tug.org/texlive/
Requires: libptexenc1 = 1.3.4 Requires: libptexenc1 = 1.3.5
%description -n %{name}-ptexenc-devel %description -n %{name}-ptexenc-devel
This package includes the ptexenc development files. This package includes the ptexenc development files.
@ -3083,8 +3194,8 @@ Summary: Basic development packages for TeXLive
License: LGPL-2.1+ and BSD-3-Clause and SUSE-TeX License: LGPL-2.1+ and BSD-3-Clause and SUSE-TeX
Group: Development/Languages/Other Group: Development/Languages/Other
Url: http://www.tug.org/texlive/ Url: http://www.tug.org/texlive/
Requires: libkpathsea6 = 6.2.2 Requires: libkpathsea6 = 6.2.3
Requires: libptexenc1 = 1.3.4 Requires: libptexenc1 = 1.3.5
Requires: libsynctex1 = 1.18 Requires: libsynctex1 = 1.18
Requires: libtexlua52-5 = 5.2.4 Requires: libtexlua52-5 = 5.2.4
%if %{with LuaJIT} %if %{with LuaJIT}
@ -3106,6 +3217,7 @@ License: LPPL-1.0
Group: Productivity/Publishing/TeX/Utilities Group: Productivity/Publishing/TeX/Utilities
Url: http://biblatex-biber.sourceforge.net/ Url: http://biblatex-biber.sourceforge.net/
Recommends: perl(Readonly::XS) Recommends: perl(Readonly::XS)
Requires: perl-base >= 5.24.1
Requires: perl(Business::ISBN) Requires: perl(Business::ISBN)
Requires: perl(Business::ISMN) Requires: perl(Business::ISMN)
Requires: perl(Business::ISSN) Requires: perl(Business::ISSN)
@ -3294,6 +3406,7 @@ This package is required by the package texlive-biber-bin.
%if %{with psutils} %if %{with psutils}
%patch8 -p0 -b .psutils %patch8 -p0 -b .psutils
%endif %endif
%patch9 -p0 -b .crash
%patch10 -p0 -b .poppler %patch10 -p0 -b .poppler
%patch11 -p0 -b .lacheck %patch11 -p0 -b .lacheck
%patch12 -p0 -b .warns %patch12 -p0 -b .warns
@ -3310,7 +3423,6 @@ pushd ../biblatex-biber-*
/usr/bin/chmod -Rf a+rX,u+w,g-w,o-w . /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .
%patch42 -p0 -b .en %patch42 -p0 -b .en
%patch44 -p0 -b .noica %patch44 -p0 -b .noica
%patch45 -p0 -b .fastsort
%if 0%{perl_versnum} < 5200 %if 0%{perl_versnum} < 5200
%patch47 -p0 -b .518 %patch47 -p0 -b .518
%endif %endif
@ -3384,6 +3496,7 @@ popd
../configure \ ../configure \
--host=${HOST} \ --host=${HOST} \
--build=${BUILD} \ --build=${BUILD} \
--enable-fast-install=no \
--disable-native-texlive-build \ --disable-native-texlive-build \
--disable-cxx-runtime-hack \ --disable-cxx-runtime-hack \
--cache-file=$cache \ --cache-file=$cache \
@ -3491,6 +3604,8 @@ popd
STRIP=/bin/true \ STRIP=/bin/true \
STRIPPROG=/bin/true \ STRIPPROG=/bin/true \
LDFLAGS="$LDFLAGS -L$PWD" \ LDFLAGS="$LDFLAGS -L$PWD" \
CFLAGS="${CFLAGS/-std=gnu99/}" \
CXXFLAGS="${CXXFLAGS/-std=gnu99/}" \
./configure \ ./configure \
--host=${HOST} \ --host=${HOST} \
--build=${BUILD} \ --build=${BUILD} \
@ -3505,6 +3620,7 @@ popd
--enable-fftw \ --enable-fftw \
--enable-gc=system \ --enable-gc=system \
--enable-gl --enable-gl
make clean
make asy make asy
mkdir -p ${prefix}/bin mkdir -p ${prefix}/bin
mkdir -p ${prefix}/texmf/asymptote/GUI mkdir -p ${prefix}/texmf/asymptote/GUI
@ -3549,6 +3665,10 @@ popd
pushd ../biblatex-biber-* pushd ../biblatex-biber-*
find -name '*.ca' | xargs -r rm -vf find -name '*.ca' | xargs -r rm -vf
if test "$(getconf LONG_BIT)" -lt 64 ; then
sed -ri '/17000002/{s@.*@eq_or_diff("dummy", "dummy", "skipped on 32bit");@}' t/dateformats.t
fi
LANG=en_US.UTF-8 %{__perl} ./Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS" LANG=en_US.UTF-8 %{__perl} ./Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS"
LANG=en_US.UTF-8 ./Build build flags=%{?_smp_mflags} LANG=en_US.UTF-8 ./Build build flags=%{?_smp_mflags}
@ -3834,6 +3954,10 @@ popd
printf '#!/bin/sh\nmtxrun --script rlxtools "$@"\n' > rlxtools printf '#!/bin/sh\nmtxrun --script rlxtools "$@"\n' > rlxtools
chmod 755 rlxtools chmod 755 rlxtools
fi fi
%if 0%{texlive_version} >= 2017
# new dviinfox perl script
ln -sf ../share/texmf/scripts/dviinfox/dviinfox.pl dviinfox
%endif
popd popd
# clear out all file below texmf tree as this will delivered by texlive tar balls # clear out all file below texmf tree as this will delivered by texlive tar balls
@ -4086,7 +4210,9 @@ rm -f /var/run/texlive/run-update
%files crossrefware-bin %files crossrefware-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/bbl2bib
%{_bindir}/bibdoiadd %{_bindir}/bibdoiadd
%{_bindir}/bibmradd
%{_bindir}/bibzbladd %{_bindir}/bibzbladd
%{_bindir}/ltx2crossrefxml %{_bindir}/ltx2crossrefxml
@ -4130,10 +4256,6 @@ rm -f /var/run/texlive/run-update
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/detex %{_bindir}/detex
%files devnag-bin
%defattr(-,root,root,755)
%{_bindir}/devnag
%files diadia-bin %files diadia-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/diadia %{_bindir}/diadia
@ -4163,6 +4285,10 @@ rm -f /var/run/texlive/run-update
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/dvidvi %{_bindir}/dvidvi
%files dviinfox-bin
%defattr(-,root,root,755)
%{_bindir}/dviinfox
%files dviljk-bin %files dviljk-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/dvihp %{_bindir}/dvihp
@ -4273,12 +4399,6 @@ rm -f /var/run/texlive/run-update
%{_bindir}/jadetex %{_bindir}/jadetex
%{_bindir}/pdfjadetex %{_bindir}/pdfjadetex
%files jfontmaps-bin
%defattr(-,root,root,755)
%{_bindir}/kanji-config-updmap
%{_bindir}/kanji-config-updmap-sys
%{_bindir}/kanji-fontmap-creator
%files kotex-utils-bin %files kotex-utils-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/jamo-normalize %{_bindir}/jamo-normalize
@ -4317,10 +4437,18 @@ rm -f /var/run/texlive/run-update
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/latex-git-log %{_bindir}/latex-git-log
%files latex-papersize-bin
%defattr(-,root,root,755)
%{_bindir}/latex-papersize
%files latex2man-bin %files latex2man-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/latex2man %{_bindir}/latex2man
%files latex2nemeth-bin
%defattr(-,root,root,755)
%{_bindir}/latex2nemeth
%files latexdiff-bin %files latexdiff-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/latexdiff %{_bindir}/latexdiff
@ -4403,6 +4531,10 @@ rm -f /var/run/texlive/run-update
%{_bindir}/texluajit %{_bindir}/texluajit
%{_bindir}/texluajitc %{_bindir}/texluajitc
%files lwarp-bin
%defattr(-,root,root,755)
%{_bindir}/lwarpmk
%files m-tx-bin %files m-tx-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/m-tx %{_bindir}/m-tx
@ -4554,6 +4686,10 @@ rm -f /var/run/texlive/run-update
%{_bindir}/pdfnup %{_bindir}/pdfnup
%{_bindir}/pdfpun %{_bindir}/pdfpun
%files pdflatexpicscale-bin
%defattr(-,root,root,755)
%{_bindir}/pdflatexpicscale
%files pdftex-bin %files pdftex-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/etex %{_bindir}/etex
@ -4604,7 +4740,6 @@ rm -f /var/run/texlive/run-update
%files pmx-bin %files pmx-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/pmx2pdf
%{_bindir}/pmxab %{_bindir}/pmxab
%{_bindir}/scor2prt %{_bindir}/scor2prt
@ -4634,6 +4769,13 @@ rm -f /var/run/texlive/run-update
%{_bindir}/ps2frag %{_bindir}/ps2frag
%{_bindir}/pslatex %{_bindir}/pslatex
%files ptex-fontmaps-bin
%defattr(-,root,root,755)
%{_bindir}/kanji-config-updmap
%{_bindir}/kanji-config-updmap-sys
%{_bindir}/kanji-config-updmap-user
%{_bindir}/kanji-fontmap-creator
%files ptex-bin %files ptex-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/eptex %{_bindir}/eptex
@ -4708,6 +4850,7 @@ rm -f /var/run/texlive/run-update
%{_bindir}/dvired %{_bindir}/dvired
%{_bindir}/fmtutil %{_bindir}/fmtutil
%{_bindir}/fmtutil-sys %{_bindir}/fmtutil-sys
%{_bindir}/fmtutil-user
%{_bindir}/kpsepath %{_bindir}/kpsepath
%{_bindir}/kpsetool %{_bindir}/kpsetool
%{_bindir}/kpsewhere %{_bindir}/kpsewhere
@ -4717,6 +4860,7 @@ rm -f /var/run/texlive/run-update
%{_bindir}/texlinks %{_bindir}/texlinks
%{_bindir}/updmap %{_bindir}/updmap
%{_bindir}/updmap-sys %{_bindir}/updmap-sys
%{_bindir}/updmap-user
%files tex-bin %files tex-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
@ -4740,6 +4884,7 @@ rm -f /var/run/texlive/run-update
%{_bindir}/mk4ht %{_bindir}/mk4ht
%{_bindir}/t4ht %{_bindir}/t4ht
%{_bindir}/tex4ht %{_bindir}/tex4ht
%{_bindir}/xhlatex
%files texconfig-bin %files texconfig-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
@ -4778,6 +4923,12 @@ rm -f /var/run/texlive/run-update
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/texloganalyser %{_bindir}/texloganalyser
%files texosquery-bin
%defattr(-,root,root,755)
%{_bindir}/texosquery
%{_bindir}/texosquery-jre5
%{_bindir}/texosquery-jre8
%files texsis-bin %files texsis-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/texsis %{_bindir}/texsis
@ -4834,6 +4985,10 @@ rm -f /var/run/texlive/run-update
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/urlbst %{_bindir}/urlbst
%files velthuis-bin
%defattr(-,root,root,755)
%{_bindir}/devnag
%files vlna-bin %files vlna-bin
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/vlna %{_bindir}/vlna