summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4377 -> 4386 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/publ-ini.lua18
-rw-r--r--tex/context/base/s-syntax.mkiv26
-rw-r--r--tex/context/base/status-files.pdfbin24950 -> 24954 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin333212 -> 333217 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
8 files changed, 34 insertions, 16 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 9f60db71e..56e5e989d 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{2015.01.23 22:11}
+\newcontextversion{2015.01.26 11:39}
%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 5c41d8c1f..0a67b7040 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 f461f9b1c..867768c0b 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2015.01.23 22:11}
+\edef\contextversion{2015.01.26 11:39}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/publ-ini.lua b/tex/context/base/publ-ini.lua
index bf2102a9a..1b6c708a5 100644
--- a/tex/context/base/publ-ini.lua
+++ b/tex/context/base/publ-ini.lua
@@ -1427,11 +1427,11 @@ do
return #renderings[dataset].registered
end
- local function validkeyword(dataset,entry,keyword)
- local kw = fastget(dataset,entry,"keywords") -- hard coded for the moment
+ local function validkeyword(dataset,tag,keyword,specification) -- todo: pass specification
+ local kw = getcasted(dataset,tag,"keywords",specification)
if kw then
- for k in next, keyword do
- if kw[k] then
+ for i=1,#kw do
+ if keyword[kw[i]] then
return true
end
end
@@ -1457,11 +1457,11 @@ do
methods[v_dataset] = function(dataset,rendering,keyword)
-- why only once unless criterium=all?
- local current = datasets[dataset]
- local luadata = current.luadata
+ local current = datasets[dataset]
+ local luadata = current.luadata
local list = rendering.list
for tag, data in sortedhash(luadata) do
- if not keyword or validkeyword(dataset,data,keyword) then
+ if not keyword or validkeyword(dataset,tag,keyword) then
list[#list+1] = { tag, false, 0, false, false }
end
end
@@ -1479,7 +1479,7 @@ do
local u = r.userdata
if u and u.btxset == dataset then
local tag = u.btxref
- if tag and (not keyword or validkeyword(dataset,luadata[tag],keyword)) then
+ if tag and (not keyword or validkeyword(dataset,tag,keyword)) then
list[#list+1] = { tag, listindex, 0, u, u.btxint }
end
end
@@ -1515,7 +1515,7 @@ do
-- skip
elseif doglobal and alldone[tag] then
-- skip
- elseif not keyword or validkeyword(dataset,luadata[tag],keyword) then
+ elseif not keyword or validkeyword(dataset,tag,keyword) then
if traced then
local l = traced[tag]
if l then
diff --git a/tex/context/base/s-syntax.mkiv b/tex/context/base/s-syntax.mkiv
index 7fe7cde8a..96312f771 100644
--- a/tex/context/base/s-syntax.mkiv
+++ b/tex/context/base/s-syntax.mkiv
@@ -11,15 +11,20 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-%D This is needed for the \METAFUN\ manual.
+%D This is needed for the \METAFUN\ manual: quite old code that I would do
+%D differently nowadays.
\unprotect
\unexpanded\def\module_syntax_Indent #1{\ifvmode\noindent\hbox to 2em{\hss#1}\else#1\fi}
-\unexpanded\def\module_syntax_Sugar #1{\ifhmode\unskip\unskip\unskip\fi\kern.25em{#1}\kern.25em\ignorespaces}
+\unexpanded\def\module_syntax_Sugar #1{\removeunwantedspaces\kern.25em{#1}\kern.25em\ignorespaces}
\unexpanded\def\module_syntax_Something #1{\Sugar{\mathematics{\langle\hbox{#1}\rangle}}}
\unexpanded\def\module_syntax_Lbrace {\Sugar{\tttf\leftargument}}
\unexpanded\def\module_syntax_Rbrace {\Sugar{\tttf\rightargument}}
+\unexpanded\def\module_syntax_Lparent {\Sugar{\tttf(}}
+\unexpanded\def\module_syntax_Rparent {\Sugar{\tttf)}}
+\unexpanded\def\module_syntax_Lbracket {\Sugar{\tttf[}}
+\unexpanded\def\module_syntax_Rbracket {\Sugar{\tttf]}}
\unexpanded\def\module_syntax_Or {\Sugar{\mathematics{\vert}}}
\unexpanded\def\module_syntax_Optional #1{\Sugar{\mathematics{[\hbox{#1}]}}}
\unexpanded\def\module_syntax_Means {\Sugar{\mathematics{\rightarrow}}}
@@ -35,14 +40,17 @@
\unexpanded\def\module_syntax_FlaggedSomething#1{\module_syntax_Something{\color[darkred]{#1}}}
\unexpanded\def\StartSyntax
- {\goodbreak % to be reconsidered
- \startlines
+ {\startlines
% formatters
\let\Indent \module_syntax_Indent
\let\Sugar \module_syntax_Sugar
\let\Something \module_syntax_Something
\let\Lbrace \module_syntax_Lbrace
\let\Rbrace \module_syntax_Rbrace
+ \let\Lparent \module_syntax_Lparent
+ \let\Rparent \module_syntax_Rparent
+ \let\Lbracket \module_syntax_Lbracket
+ \let\Rbracket \module_syntax_Rbracket
\let\Or \module_syntax_Or
\let\Optional \module_syntax_Optional
\let\Means \module_syntax_Means
@@ -66,6 +74,16 @@
\let\Q \module_syntax_Quote
\let\LB \module_syntax_Lbrace
\let\RB \module_syntax_Rbrace
+ \let\LP \module_syntax_Lparent
+ \let\RP \module_syntax_Rparent
+ \let\LS \module_syntax_Lbracket
+ \let\RS \module_syntax_Rbracket
+ \let\{ \module_syntax_Lbrace
+ \let\} \module_syntax_Rbrace
+ \let\( \module_syntax_Lparent
+ \let\) \module_syntax_Rparent
+ \let\[ \module_syntax_Lbracket
+ \let\] \module_syntax_Rbracket
% precaution
\catcode`\#\othercatcode}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 5c8aebff7..7b2d5f398 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 237343253..0e1bb5d3a 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 68db85670..246dba7f2 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/23/15 22:11:53
+-- merge date : 01/26/15 11:39:16
do -- begin closure to overcome local limits and interference