From 7290ea25841bc7bcbb28a3eaea18f9bc74ca9f51 Mon Sep 17 00:00:00 2001
From: Marius <mariausol@gmail.com>
Date: Mon, 31 Jan 2011 22:20:13 +0200
Subject: beta 2011.01.31 21:17
---
scripts/context/lua/mtxrun.lua | 13 ++++++++-----
scripts/context/stubs/mswin/mtxrun.lua | 13 ++++++++-----
scripts/context/stubs/unix/mtxrun | 13 ++++++++-----
tex/context/base/cont-new.mkii | 2 +-
tex/context/base/cont-new.mkiv | 2 +-
tex/context/base/context.mkii | 2 +-
tex/context/base/context.mkiv | 2 +-
tex/context/base/core-def.mkiv | 6 ++++++
tex/context/base/core-job.mkiv | 2 +-
tex/context/base/data-env.lua | 5 -----
tex/context/base/data-res.lua | 24 ++++++++++++++++++++++++
tex/context/base/data-tmp.lua | 2 ++
tex/context/base/font-run.mkiv | 3 +--
tex/context/base/grph-fig.mkiv | 4 ++--
tex/context/base/l-os.lua | 4 ++++
tex/context/base/status-files.pdf | Bin 23826 -> 23824 bytes
tex/context/base/syst-aux.mkiv | 2 +-
tex/generic/context/luatex-fonts-merged.lua | 2 +-
web2c/contextcnf.lua | 5 -----
19 files changed, 70 insertions(+), 36 deletions(-)
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index bf3a4453e..2b6a6c9f1 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -1989,6 +1989,7 @@ if not modules then modules = { } end modules ['l-os'] = {
local os = os
local find, format, gsub, upper = string.find, string.format, string.gsub, string.upper
+local concat = table.concat
local random, ceil = math.random, math.ceil
local rawget, rawset, type, getmetatable, setmetatable, tonumber = rawget, rawset, type, getmetatable, setmetatable, tonumber
@@ -2012,6 +2013,9 @@ if not os.__getenv__ then
end
local K = upper(k)
osenv[K] = v
+ if type(v) == "table" then
+ v = concat(v,";") -- path
+ end
ossetenv(K,v)
end
@@ -9909,11 +9913,6 @@ local relations = allocate { -- todo: handlers also here
variable = 'OPLFONTS',
suffixes = { 'opl' },
},
- otp = {
- names = { "otp" },
- variable = 'OTPINPUTS',
- suffixes = { 'otp' },
- },
ovp = {
names = { "ovp" },
variable = 'OVPFONTS',
@@ -10130,6 +10129,7 @@ local function identify()
for k=1,#texmfcaches do
local cachepath = texmfcaches[k]
if cachepath ~= "" then
+ cachepath = resolvers.resolve(cachepath)
cachepath = resolvers.cleanpath(cachepath)
cachepath = file.collapsepath(cachepath)
local valid = isdir(cachepath)
@@ -10164,6 +10164,7 @@ local function identify()
local cachepath = texmfcaches[k]
cachepath = resolvers.getenv(cachepath)
if cachepath ~= "" then
+ cachepath = resolvers.resolve(cachepath)
cachepath = resolvers.cleanpath(cachepath)
local valid = isdir(cachepath)
if valid and file.is_readable(cachepath) then
@@ -11158,6 +11159,8 @@ function resolvers.expandvariables()
end
end
+
+
function resolvers.variable(name)
return entry(instance.variables,name)
end
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index bf3a4453e..2b6a6c9f1 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -1989,6 +1989,7 @@ if not modules then modules = { } end modules ['l-os'] = {
local os = os
local find, format, gsub, upper = string.find, string.format, string.gsub, string.upper
+local concat = table.concat
local random, ceil = math.random, math.ceil
local rawget, rawset, type, getmetatable, setmetatable, tonumber = rawget, rawset, type, getmetatable, setmetatable, tonumber
@@ -2012,6 +2013,9 @@ if not os.__getenv__ then
end
local K = upper(k)
osenv[K] = v
+ if type(v) == "table" then
+ v = concat(v,";") -- path
+ end
ossetenv(K,v)
end
@@ -9909,11 +9913,6 @@ local relations = allocate { -- todo: handlers also here
variable = 'OPLFONTS',
suffixes = { 'opl' },
},
- otp = {
- names = { "otp" },
- variable = 'OTPINPUTS',
- suffixes = { 'otp' },
- },
ovp = {
names = { "ovp" },
variable = 'OVPFONTS',
@@ -10130,6 +10129,7 @@ local function identify()
for k=1,#texmfcaches do
local cachepath = texmfcaches[k]
if cachepath ~= "" then
+ cachepath = resolvers.resolve(cachepath)
cachepath = resolvers.cleanpath(cachepath)
cachepath = file.collapsepath(cachepath)
local valid = isdir(cachepath)
@@ -10164,6 +10164,7 @@ local function identify()
local cachepath = texmfcaches[k]
cachepath = resolvers.getenv(cachepath)
if cachepath ~= "" then
+ cachepath = resolvers.resolve(cachepath)
cachepath = resolvers.cleanpath(cachepath)
local valid = isdir(cachepath)
if valid and file.is_readable(cachepath) then
@@ -11158,6 +11159,8 @@ function resolvers.expandvariables()
end
end
+
+
function resolvers.variable(name)
return entry(instance.variables,name)
end
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index bf3a4453e..2b6a6c9f1 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -1989,6 +1989,7 @@ if not modules then modules = { } end modules ['l-os'] = {
local os = os
local find, format, gsub, upper = string.find, string.format, string.gsub, string.upper
+local concat = table.concat
local random, ceil = math.random, math.ceil
local rawget, rawset, type, getmetatable, setmetatable, tonumber = rawget, rawset, type, getmetatable, setmetatable, tonumber
@@ -2012,6 +2013,9 @@ if not os.__getenv__ then
end
local K = upper(k)
osenv[K] = v
+ if type(v) == "table" then
+ v = concat(v,";") -- path
+ end
ossetenv(K,v)
end
@@ -9909,11 +9913,6 @@ local relations = allocate { -- todo: handlers also here
variable = 'OPLFONTS',
suffixes = { 'opl' },
},
- otp = {
- names = { "otp" },
- variable = 'OTPINPUTS',
- suffixes = { 'otp' },
- },
ovp = {
names = { "ovp" },
variable = 'OVPFONTS',
@@ -10130,6 +10129,7 @@ local function identify()
for k=1,#texmfcaches do
local cachepath = texmfcaches[k]
if cachepath ~= "" then
+ cachepath = resolvers.resolve(cachepath)
cachepath = resolvers.cleanpath(cachepath)
cachepath = file.collapsepath(cachepath)
local valid = isdir(cachepath)
@@ -10164,6 +10164,7 @@ local function identify()
local cachepath = texmfcaches[k]
cachepath = resolvers.getenv(cachepath)
if cachepath ~= "" then
+ cachepath = resolvers.resolve(cachepath)
cachepath = resolvers.cleanpath(cachepath)
local valid = isdir(cachepath)
if valid and file.is_readable(cachepath) then
@@ -11158,6 +11159,8 @@ function resolvers.expandvariables()
end
end
+
+
function resolvers.variable(name)
return entry(instance.variables,name)
end
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index d58f5d6e6..557f5abf7 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2011.01.31 16:59}
+\newcontextversion{2011.01.31 21:17}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index d0ed28064..280cbaea0 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{2011.01.31 16:59}
+\newcontextversion{2011.01.31 21:17}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index ebb06407e..4c279ada9 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2011.01.31 16:59}
+\edef\contextversion{2011.01.31 21:17}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 9c4c6896e..55e9bf48c 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2011.01.31 16:59}
+\edef\contextversion{2011.01.31 21:17}
%D For those who want to use this:
diff --git a/tex/context/base/core-def.mkiv b/tex/context/base/core-def.mkiv
index fd91cddf6..36cd323b1 100644
--- a/tex/context/base/core-def.mkiv
+++ b/tex/context/base/core-def.mkiv
@@ -75,6 +75,12 @@
\unexpanded\def\arg{\mathortext\normalmatharg\normaltextarg}
+% for the moment here
+
+\enablemode[*nofonts]
+
+\nonknuthmode
+
% brrr
\appendtoks
diff --git a/tex/context/base/core-job.mkiv b/tex/context/base/core-job.mkiv
index d2e3dee1f..200bc9be3 100644
--- a/tex/context/base/core-job.mkiv
+++ b/tex/context/base/core-job.mkiv
@@ -287,7 +287,7 @@
{\beforesplitstring##1\at.\to\someevironment
\addtocommalist\someevironment\loadedlocalenvironments}%
\processcommalist[#1]\docommand
- \expanded{\doifcommonelse{\currentproject,\currentproduct,\currentcomponent,\currentenvironment}{\loadedlocalenvironments}} % \expanded not needed
+ \doifcommonelse{\currentproject,\currentproduct,\currentcomponent,\currentenvironment}\loadedlocalenvironments
{\letvalue{\e!stop\v!localenvironment}\relax}
{\grabuntil{\e!stop\v!localenvironment}\gobbleoneargument}}
diff --git a/tex/context/base/data-env.lua b/tex/context/base/data-env.lua
index 82e53c290..a053c1aca 100644
--- a/tex/context/base/data-env.lua
+++ b/tex/context/base/data-env.lua
@@ -144,11 +144,6 @@ local relations = allocate { -- todo: handlers also here
variable = 'OPLFONTS',
suffixes = { 'opl' },
},
- otp = {
- names = { "otp" },
- variable = 'OTPINPUTS',
- suffixes = { 'otp' },
- },
ovp = {
names = { "ovp" },
variable = 'OVPFONTS',
diff --git a/tex/context/base/data-res.lua b/tex/context/base/data-res.lua
index fe5ca1db0..0ed5c17e4 100644
--- a/tex/context/base/data-res.lua
+++ b/tex/context/base/data-res.lua
@@ -595,6 +595,30 @@ function resolvers.expandvariables()
end
end
+--~ -- this can become:
+
+--~ function resolvers.expandvariables()
+--~ local expansions, environment, variables = allocate(), instance.environment, instance.variables
+--~ instance.expansions = expansions
+--~ local engine, progname = instance.engine, instance.progname
+--~ if type(engine) ~= "string" then instance.engine, engine = "", "" end
+--~ if type(progname) ~= "string" then instance.progname, progname = "", "" end
+--~ if engine ~= "" then environment.engine = engine end
+--~ if progname ~= "" then environment.progname = progname end
+--~ setmetatable(expansions, { __index = function(t,k)
+--~ local v = environment[k]
+--~ if v == nil then
+--~ v = variables[k]
+--~ end
+--~ if type(v) == "string" then
+--~ v = lpegmatch(variable,v)
+--~ v = lpegmatch(cleaner,v)
+--~ end
+--~ t[k] = v
+--~ return v
+--~ end } )
+--~ end
+
function resolvers.variable(name)
return entry(instance.variables,name)
end
diff --git a/tex/context/base/data-tmp.lua b/tex/context/base/data-tmp.lua
index 5304c0a24..3d265a71a 100644
--- a/tex/context/base/data-tmp.lua
+++ b/tex/context/base/data-tmp.lua
@@ -72,6 +72,7 @@ local function identify()
for k=1,#texmfcaches do
local cachepath = texmfcaches[k]
if cachepath ~= "" then
+ cachepath = resolvers.resolve(cachepath)
cachepath = resolvers.cleanpath(cachepath)
cachepath = file.collapsepath(cachepath)
local valid = isdir(cachepath)
@@ -106,6 +107,7 @@ local function identify()
local cachepath = texmfcaches[k]
cachepath = resolvers.getenv(cachepath)
if cachepath ~= "" then
+ cachepath = resolvers.resolve(cachepath)
cachepath = resolvers.cleanpath(cachepath)
local valid = isdir(cachepath)
if valid and file.is_readable(cachepath) then
diff --git a/tex/context/base/font-run.mkiv b/tex/context/base/font-run.mkiv
index 0794a9b85..8b3002c0b 100644
--- a/tex/context/base/font-run.mkiv
+++ b/tex/context/base/font-run.mkiv
@@ -330,8 +330,7 @@
\gdef\showcharratio
{\dowithnextboxcontent
{\switchtobodyfont[10pt]}%
- {(\expanded{\withoutpt\the\nextboxht},%
- \expanded{\withoutpt\the\nextboxdp})}%
+ {(\withoutpt\the\nextboxht,\withoutpt\the\nextboxdp)}%
\hbox}
\protect \endinput
diff --git a/tex/context/base/grph-fig.mkiv b/tex/context/base/grph-fig.mkiv
index a89c0afc5..75f85103c 100644
--- a/tex/context/base/grph-fig.mkiv
+++ b/tex/context/base/grph-fig.mkiv
@@ -51,13 +51,13 @@
\def\externalfigurereplacement#1#2#3%
{\setupcolors
[\c!state=\v!local]%
- \expanded{\localframed
+ \localframed
[\??ef]
[\c!width=\figurewidth,
\c!height=\figureheight,
\c!background=\v!color,
\c!backgroundcolor=missingfigurecolor,
- \c!frame=\@@efframe]}%
+ \c!frame=\@@efframe]
{\tt\tfxx \nohyphens
name: \expanded{\verbatimstring{#1}}\\%
file: \expanded{\verbatimstring{#2}}\\%
diff --git a/tex/context/base/l-os.lua b/tex/context/base/l-os.lua
index 0448710ff..86b395a1d 100644
--- a/tex/context/base/l-os.lua
+++ b/tex/context/base/l-os.lua
@@ -10,6 +10,7 @@ if not modules then modules = { } end modules ['l-os'] = {
local os = os
local find, format, gsub, upper = string.find, string.format, string.gsub, string.upper
+local concat = table.concat
local random, ceil = math.random, math.ceil
local rawget, rawset, type, getmetatable, setmetatable, tonumber = rawget, rawset, type, getmetatable, setmetatable, tonumber
@@ -33,6 +34,9 @@ if not os.__getenv__ then
end
local K = upper(k)
osenv[K] = v
+ if type(v) == "table" then
+ v = concat(v,";") -- path
+ end
ossetenv(K,v)
end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 852dac1b2..4cf22e78e 100644
Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ
diff --git a/tex/context/base/syst-aux.mkiv b/tex/context/base/syst-aux.mkiv
index d0a557c19..1ce773f89 100644
--- a/tex/context/base/syst-aux.mkiv
+++ b/tex/context/base/syst-aux.mkiv
@@ -2640,7 +2640,7 @@
\def\doseventupleempty#1%
{\noshowargumenterror
\doifnextoptionalelse
- {\doseventupleemptyYESone#1}
+ {\doseventupleemptyYESone#1}%
{\doseventupleemptyNOPone#1}}
\long\def\doseventupleemptyYESone#1[#2]%
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 72a377434..b37d10f76 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 01/31/11 16:59:33
+-- merge date : 01/31/11 21:17:09
do -- begin closure to overcome local limits and interference
diff --git a/web2c/contextcnf.lua b/web2c/contextcnf.lua
index b420f485c..c7776b17e 100644
--- a/web2c/contextcnf.lua
+++ b/web2c/contextcnf.lua
@@ -89,11 +89,6 @@ return {
ICCPROFILES = ".;$TEXMF/colors/icc/{context,profiles}//;$OSCOLORDIR",
- -- Sort of obsolete.
-
- OTPINPUTS = ".;$TEXMF/omega/otp//",
- OCPINPUTS = ".;$TEXMF/omega/ocp//",
-
-- A few special ones that will change some day.
FONTCONFIG_FILE = "fonts.conf",
--
cgit v1.2.3