summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-14 21:37:43 +0000
committerKarl Berry <karl@freefriends.org>2016-05-14 21:37:43 +0000
commitc285b32d78d4d2725778d9de6921cdc6ecbc1b08 (patch)
tree0aef7208e0d845165f9406e7ff230a96d752e79b /Build/source/texk
parentde31a6ac7fa4e3394e7b67033d3b15dcc6141a32 (diff)
context (14may16)
git-svn-id: svn://tug.org/texlive/trunk@41118 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/context/stubs/unix/mtxrun8
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl10
2 files changed, 9 insertions, 9 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/context/stubs/unix/mtxrun b/Build/source/texk/texlive/linked_scripts/context/stubs/unix/mtxrun
index 5254c925aec..420a809d4ec 100755
--- a/Build/source/texk/texlive/linked_scripts/context/stubs/unix/mtxrun
+++ b/Build/source/texk/texlive/linked_scripts/context/stubs/unix/mtxrun
@@ -11311,7 +11311,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["lxml-lpt"] = package.loaded["lxml-lpt"] or true
--- original size: 53877, stripped down to: 32495
+-- original size: 53892, stripped down to: 32508
if not modules then modules={} end modules ['lxml-lpt']={
version=1.001,
@@ -11740,7 +11740,7 @@ local rparent=P(")")
local noparent=1-(lparent+rparent)
local nested=P{lparent*(noparent+V(1))^0*rparent}
local value=P(lparent*C((noparent+nested)^0)*rparent)
-local lp_child=Cc("expr.child(ll,'")*R("az","AZ","--","__")^1*Cc("')")
+local lp_child=Cc("expr.child(ll,'")*R("az","AZ")*R("az","AZ","--","__")^0*Cc("')")
local lp_number=S("+-")*R("09")^1
local lp_string=Cc("'")*R("az","AZ","--","__")^1*Cc("'")
local lp_content=(P("'")*(1-P("'"))^0*P("'")+P('"')*(1-P('"'))^0*P('"'))
@@ -18743,8 +18743,8 @@ end -- of closure
-- used libraries : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 796970
--- stripped bytes : 289031
+-- original bytes : 796985
+-- stripped bytes : 289033
-- end library merge
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 62abb9eb1d1..88a2ac5521a 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,13 +1,13 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 41048 2016-05-11 21:43:33Z karl $
+# $Id: tlmgr.pl 41103 2016-05-13 23:13:18Z karl $
#
# Copyright 2008-2016 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
-my $svnrev = '$Revision: 41048 $';
-my $datrev = '$Date: 2016-05-11 23:43:33 +0200 (Wed, 11 May 2016) $';
+my $svnrev = '$Revision: 41103 $';
+my $datrev = '$Date: 2016-05-14 01:13:18 +0200 (Sat, 14 May 2016) $';
my $tlmgrrevision;
my $prg;
if ($svnrev =~ m/: ([0-9]+) /) {
@@ -3168,7 +3168,7 @@ sub action_update {
# dirs from the new package before re-installing the old one.
# TODO
logpackage("failed update: $pkg ($rev -> $mediarevstr)");
- tlwarn("$prg: Installation of new version of $pkg did fail, trying to unwind.\n");
+ tlwarn("$prg: Installation of new version of $pkg failed, trying to unwind.\n");
if (win32()) {
# w32 is notorious for not releasing a file immediately
# we experienced permission denied errors
@@ -4994,7 +4994,7 @@ sub check_runfiles {
=~ /^((czech|slovak)\.sty
|Changes
|Makefile
- |README
+ |README.*
|cid2code\.txt
|etex\.src
|fithesis.*