diff options
| -rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/context/base/context-version.pdf | bin | 4248 -> 4252 bytes | |||
| -rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/context.mkiv | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/font-ots.lua | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/status-files.pdf | bin | 9191 -> 9194 bytes | |||
| -rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/status-lua.pdf | bin | 268039 -> 268042 bytes | |||
| -rw-r--r-- | Master/texmf-dist/tex/context/interface/mkiv/i-context.pdf | bin | 820291 -> 820295 bytes | |||
| -rw-r--r-- | Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdf | bin | 60789 -> 60793 bytes | |||
| -rw-r--r-- | Master/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua | 4 |
10 files changed, 11 insertions, 9 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 9909f91af4f..d42a017e08d 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 40770 2016-04-26 21:42:20Z preining $ +# $Id: tlmgr.pl 40782 2016-04-27 10:25:08Z preining $ # # Copyright 2008-2016 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # -my $svnrev = '$Revision: 40770 $'; -my $datrev = '$Date: 2016-04-26 23:42:20 +0200 (Tue, 26 Apr 2016) $'; +my $svnrev = '$Revision: 40782 $'; +my $datrev = '$Date: 2016-04-27 12:25:08 +0200 (Wed, 27 Apr 2016) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -5962,6 +5962,8 @@ END_NO_INTERNET $remotetlpdb = TeXLive::TLPDB->new(root => $location, tlpdbfile => $loc_copy_of_remote_tlpdb); $local_copy_tlpdb_used = 1; + # we did verify this tlpdb, make sure that is recorded + $remotetlpdb->is_verified(1); } else { tldie("$0: unexpected return value from verify_checksum: $ret\n"); } diff --git a/Master/texmf-dist/tex/context/base/context-version.pdf b/Master/texmf-dist/tex/context/base/context-version.pdf Binary files differindex 20d35880285..ce6d65a9865 100644 --- a/Master/texmf-dist/tex/context/base/context-version.pdf +++ b/Master/texmf-dist/tex/context/base/context-version.pdf diff --git a/Master/texmf-dist/tex/context/base/mkiv/cont-new.mkiv b/Master/texmf-dist/tex/context/base/mkiv/cont-new.mkiv index 1c48a221dae..128ab6e6cc8 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/cont-new.mkiv +++ b/Master/texmf-dist/tex/context/base/mkiv/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2016.04.27 00:00} +\newcontextversion{2016.04.27 10:18} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/Master/texmf-dist/tex/context/base/mkiv/context.mkiv b/Master/texmf-dist/tex/context/base/mkiv/context.mkiv index ce8eceacfde..53a0811a084 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/context.mkiv +++ b/Master/texmf-dist/tex/context/base/mkiv/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2016.04.27 00:00} +\edef\contextversion{2016.04.27 10:18} \edef\contextkind {beta} %D For those who want to use this: diff --git a/Master/texmf-dist/tex/context/base/mkiv/font-ots.lua b/Master/texmf-dist/tex/context/base/mkiv/font-ots.lua index 57ddf907198..90fcde28cce 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/font-ots.lua +++ b/Master/texmf-dist/tex/context/base/mkiv/font-ots.lua @@ -2492,14 +2492,14 @@ local function handle_contextchain(head,start,dataset,sequence,contexts,rlmode) else -- skip 'm end + -- maybe only if match + current = getnext(current) elseif seq[n][32] then -- brrr n = n + 1 else match = false break end - -- maybe only if match - current = getnext(current) elseif seq[n][32] then n = n + 1 current = getnext(current) diff --git a/Master/texmf-dist/tex/context/base/mkiv/status-files.pdf b/Master/texmf-dist/tex/context/base/mkiv/status-files.pdf Binary files differindex 2a3cd85e758..6ad1e32c31a 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/status-files.pdf +++ b/Master/texmf-dist/tex/context/base/mkiv/status-files.pdf diff --git a/Master/texmf-dist/tex/context/base/mkiv/status-lua.pdf b/Master/texmf-dist/tex/context/base/mkiv/status-lua.pdf Binary files differindex 832ebd0a0a1..e36b93b6d57 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/status-lua.pdf +++ b/Master/texmf-dist/tex/context/base/mkiv/status-lua.pdf diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-context.pdf b/Master/texmf-dist/tex/context/interface/mkiv/i-context.pdf Binary files differindex 07eb73732df..8b08c916820 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-context.pdf +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-context.pdf diff --git a/Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdf b/Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdf Binary files differindex 18327f2f045..a7d76f313b0 100644 --- a/Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdf +++ b/Master/texmf-dist/tex/context/interface/mkiv/i-readme.pdf diff --git a/Master/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua b/Master/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua index efb7aebff80..5be64934644 100644 --- a/Master/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/Master/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 04/27/16 00:00:41 +-- merge date : 04/27/16 10:18:10 do -- begin closure to overcome local limits and interference @@ -20371,13 +20371,13 @@ local function handle_contextchain(head,start,dataset,sequence,contexts,rlmode) end else end + current=getnext(current) elseif seq[n][32] then n=n+1 else match=false break end - current=getnext(current) elseif seq[n][32] then n=n+1 current=getnext(current) |