summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scripts/context/lua/mtx-update.lua38
-rwxr-xr-xscripts/context/stubs/mswin/first-setup.bat16
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4096 -> 4113 bytes
-rw-r--r--tex/context/base/context.mkiv4
-rw-r--r--tex/context/base/meta-pdf.lua5
-rw-r--r--tex/context/base/status-files.pdfbin24524 -> 24544 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin228233 -> 228188 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
9 files changed, 44 insertions, 23 deletions
diff --git a/scripts/context/lua/mtx-update.lua b/scripts/context/lua/mtx-update.lua
index 107096d04..c7eb74395 100644
--- a/scripts/context/lua/mtx-update.lua
+++ b/scripts/context/lua/mtx-update.lua
@@ -378,7 +378,7 @@ function scripts.update.synchronize()
asked[s] = nil
end
if next(asked) then
- report("skipping unknown modules: %s",table.concat(table.sortedkeys(asked),", "))
+ report("skipping unknown modules: %s",concat(table.sortedkeys(asked),", "))
end
end
@@ -396,7 +396,7 @@ function scripts.update.synchronize()
asked[s] = nil
end
if next(asked) then
- report("skipping unknown fonts: %s",table.concat(table.sortedkeys(asked),", "))
+ report("skipping unknown fonts: %s",concat(table.sortedkeys(asked),", "))
end
end
@@ -410,7 +410,7 @@ function scripts.update.synchronize()
local destination = format("%s/%s", texroot, gsub(c[2],"<platform>", platform))
destination = gsub(destination,"\\","/")
archive = gsub(archive,"<version>",version)
- if osplatform == "windows" or osplatform == "mswin" then
+ if osplatform == "windows" or osplatform == "mswin" or osplatform == "win64" then
destination = drive(destination)
end
individual[#individual+1] = { archive, destination }
@@ -419,24 +419,24 @@ function scripts.update.synchronize()
end
end
- for platform, _ in next, platforms do
+ for platform in table.sortedhash(platforms) do
add_collection(scripts.update.base,platform)
end
- for platform, _ in next, platforms do
+ for platform in table.sortedhash(platforms) do
add_collection(scripts.update.modules,platform)
end
- for platform, _ in next, platforms do
+ for platform in table.sortedhash(platforms) do
add_collection(scripts.update.fonts,platform)
end
- for engine, _ in next, engines do
- for platform, _ in next, platforms do
+ for engine in table.sortedhash(engines) do
+ for platform in table.sortedhash(platforms) do
add_collection(scripts.update.engines[engine],platform)
end
end
if goodies and type(goodies) == "table" then
- for goodie, _ in next, goodies do
- for platform, _ in next, platforms do
+ for goodie in table.sortedhash(goodies) do
+ for platform in table.sortedhash(platforms) do
add_collection(scripts.update.goodies[goodie],platform)
end
end
@@ -447,7 +447,7 @@ function scripts.update.synchronize()
for i=1,#update_repositories do
local repository = update_repositories[i]
if repositories[repository] then
- for _, v in next, individual do
+ for _, v in table.sortedhash(individual) do
local archive, destination = v[1], v[2]
local cd = combined[destination]
if not cd then
@@ -458,7 +458,7 @@ function scripts.update.synchronize()
end
end
end
- for destination, archive in next, combined do
+ for destination, archive in table.sortedhash(combined) do
local archives, command = concat(archive," "), ""
local normalflags, deleteflags = states.get("rsync.flags.normal"), ""
if os.name == "windows" then
@@ -471,7 +471,7 @@ function scripts.update.synchronize()
if (find(destination,"texmf$") or find(destination,"texmf%-context$") or find(destination,"texmf%-modules$")) and (not environment.argument("keep")) then
deleteflags = states.get("rsync.flags.delete")
end
- command = format("%s %s %s %s %s'%s' '%s'", bin, normalflags, deleteflags, dryrunflags, url, archives, destination)
+ command = format("%s %s %s %s %s'%s' '%s'", bin, normalflags, deleteflags, dryrunflags, url, archives, drive(destination))
-- report("running command: %s",command)
if not fetched[command] then
scripts.update.run(command,true)
@@ -488,7 +488,7 @@ function scripts.update.synchronize()
if windowsplatform[platform] then
bin = drive(bin)
texroot = drive(texroot)
- command = format([[%s -t "%s/texmf-context/scripts/context/lua/%s.lua" "%s/texmf-mswin/bin/"]], bin, texroot, script, texroot)
+ command = format([[%s -t "%s/texmf-context/scripts/context/lua/%s.lua" "%s/texmf-%s/bin/"]], bin, texroot, script, texroot, platform)
else
command = format([[%s -tgo --chmod=a+x '%s/texmf-context/scripts/context/lua/%s.lua' '%s/texmf-%s/bin/%s']], bin, texroot, script, texroot, platform, script)
end
@@ -497,7 +497,7 @@ function scripts.update.synchronize()
end
end
- for platform, _ in next, platforms do
+ for platform in table.sortedhash(platforms) do
for i=1, #scripts.update.selfscripts do
update_script(scripts.update.selfscripts[i],platform)
end
@@ -522,7 +522,7 @@ end
function table.fromhash(t)
local h = { }
- for k, v in next, t do -- not indexed
+ for k, v in table.sortedhash(t) do -- not indexed
if v then h[#h+1] = k end
end
return h
@@ -548,19 +548,19 @@ function scripts.update.make()
local askedformats = formats
local texformats = table.tohash(scripts.update.texformats)
local mpformats = table.tohash(scripts.update.mpformats)
- for k,v in next, texformats do
+ for k,v in table.sortedhash(texformats) do
if not askedformats[k] then
texformats[k] = nil
end
end
- for k,v in next, mpformats do
+ for k,v in table.sortedhash(mpformats) do
if not askedformats[k] then
mpformats[k] = nil
end
end
local formatlist = concat(table.fromhash(texformats), " ")
if formatlist ~= "" then
- for engine in next, engines do
+ for engine in table.sortedhash(engines) do
if engine == "luatex" then
scripts.update.run(format('mtxrun --tree="%s" --script context --autogenerate --make',texroot))
elseif engine == "luajittex" then
diff --git a/scripts/context/stubs/mswin/first-setup.bat b/scripts/context/stubs/mswin/first-setup.bat
index 2c2eaec62..f06ad0e6b 100755
--- a/scripts/context/stubs/mswin/first-setup.bat
+++ b/scripts/context/stubs/mswin/first-setup.bat
@@ -16,10 +16,26 @@ if defined ProgramFiles(x86) (
if "%PROCESSOR_ARCHITEW6432%"=="AMD64" set PLATFORM=win64
)
+REM ~ copy /y bin\mtx-update.lua bin\x.lua
+
+if "%PLATFORM%" == "win64" goto update-win64
+
+:update-win32
+
rsync -av --exclude 'rsync.exe' --exclude 'cygwin1.dll' --exclude 'cygiconv-2.dll' rsync://contextgarden.net/minimals/setup/mswin/bin/ bin
+goto update
+
+:update-win64
+
+rsync -av --exclude 'rsync.exe' --exclude 'cygwin1.dll' --exclude 'cygiconv-2.dll' rsync://contextgarden.net/minimals/setup/win64/bin/ bin
+
+goto update
+
:update
+REM ~ copy /y bin\x.lua bin\mtx-update.lua
+
REM --mingw --nofiledatabase --engine=luatex
mtxrun --script ./bin/mtx-update.lua --update --force --make --engine=all --context=beta --texroot=%OWNPATH%tex %*
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index d1ed5972a..f6060b838 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2014.01.01 14:11}
+\newcontextversion{2014.01.02 20:05}
%D This file is loaded at runtime, thereby providing an excellent place for
%D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index c4f54879d..1b10c6818 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 9c2f652d3..26e0d4e62 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,8 +28,8 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2014.01.01 14:11}
-\edef\contextkind {beta}
+\edef\contextversion{2014.01.02 20:05}
+\edef\contextkind {current}
%D For those who want to use this:
diff --git a/tex/context/base/meta-pdf.lua b/tex/context/base/meta-pdf.lua
index c49ad92ae..46e20ad31 100644
--- a/tex/context/base/meta-pdf.lua
+++ b/tex/context/base/meta-pdf.lua
@@ -527,8 +527,13 @@ local captures_new = ( space + verbose + procset + preamble )^0
local function parse(m_data)
if find(m_data,"%%%%BeginResource: procset mpost") then
+ -- report_mptopdf("using sparse scanner, case 1")
+ lpegmatch(captures_new,m_data)
+ elseif find(m_data,"%%%%BeginProlog%s*%S+(.-)%%%%EndProlog") then
+ -- report_mptopdf("using sparse scanner, case 2")
lpegmatch(captures_new,m_data)
else
+ -- report_mptopdf("using verbose ps scanner")
lpegmatch(captures_old,m_data)
end
end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 1e398b8a0..354441a11 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index de6a11472..1f2ce679a 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 14a389922..59a4c0d3b 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 01/01/14 14:11:59
+-- merge date : 01/02/14 20:05:20
do -- begin closure to overcome local limits and interference
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 09:17:12 +0000