summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/context/manuals/allkind/mkiv-publications.tex3
-rw-r--r--doc/context/manuals/allkind/publications-en.xml4
-rw-r--r--scripts/context/stubs/unix/contextjit5
-rw-r--r--scripts/context/stubs/win64/contextjit.exebin0 -> 15360 bytes
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4086 -> 4089 bytes
-rw-r--r--tex/context/base/context-version.pngbin40350 -> 38170 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/publ-ini.lua26
-rw-r--r--tex/context/base/publ-ini.mkiv6
-rw-r--r--tex/context/base/status-files.pdfbin24840 -> 24824 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin226845 -> 226847 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
13 files changed, 31 insertions, 19 deletions
diff --git a/doc/context/manuals/allkind/mkiv-publications.tex b/doc/context/manuals/allkind/mkiv-publications.tex
index 3d9572138..3300a0f53 100644
--- a/doc/context/manuals/allkind/mkiv-publications.tex
+++ b/doc/context/manuals/allkind/mkiv-publications.tex
@@ -1,5 +1,8 @@
% language=uk
+% \setupbtxrendering[continue=yes]
+% \btxfield{manipulator_a->manipulator_b->fieldname}
+
% engine=luajittex
% criterium: all + sorttype=cite => citex before rest
diff --git a/doc/context/manuals/allkind/publications-en.xml b/doc/context/manuals/allkind/publications-en.xml
index 6b6e8c86b..ea577ccf4 100644
--- a/doc/context/manuals/allkind/publications-en.xml
+++ b/doc/context/manuals/allkind/publications-en.xml
@@ -97,6 +97,10 @@
<cd:parameter name="distance">
<cd:constant type="cd:dimension"/>
</cd:parameter>
+ <cd:parameter name="continue">
+ <cd:constant type="yes"/>
+ <cd:constant type="no"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
</cd:command>
diff --git a/scripts/context/stubs/unix/contextjit b/scripts/context/stubs/unix/contextjit
new file mode 100644
index 000000000..5ac1947c7
--- /dev/null
+++ b/scripts/context/stubs/unix/contextjit
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+luajittex --luaonly $(dirname $0)/mtxrun --script context "$@"
+
+# luajittex --luaonly ${0%contextjit}mtxrun --script context "$@"
diff --git a/scripts/context/stubs/win64/contextjit.exe b/scripts/context/stubs/win64/contextjit.exe
new file mode 100644
index 000000000..93290a6e0
--- /dev/null
+++ b/scripts/context/stubs/win64/contextjit.exe
Binary files differ
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 9c28f21b9..587b9e5a5 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.02.01 12:12}
+\newcontextversion{2014.02.01 14:22}
%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 abc32db00..b12d442b4 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-version.png b/tex/context/base/context-version.png
index 67edf8a53..39c348e48 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index abc24dda1..36a0e8645 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{2014.02.01 12:12}
+\edef\contextversion{2014.02.01 14:22}
\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 48b5b4ed2..924caf561 100644
--- a/tex/context/base/publ-ini.lua
+++ b/tex/context/base/publ-ini.lua
@@ -9,10 +9,10 @@ if not modules then modules = { } end modules ['publ-ini'] = {
-- for the moment here
local lpegmatch = lpeg.match
-local P, C, Ct = lpeg.P, lpeg.C, lpeg.Ct
+local P, C, Ct, Cs = lpeg.P, lpeg.C, lpeg.Ct, lpeg.Cs
local lpegmatch = lpeg.match
-local pattern = lpeg.Cs((1 - lpeg.P(1) * lpeg.P(-1))^0 * (lpeg.P(".")/"" + lpeg.P(1)))
+local pattern = Cs((1 - P(1) * P(-1))^0 * (P(".")/"" + P(1)))
local manipulators = {
stripperiod = function(str) return lpegmatch(pattern,str) end,
@@ -86,10 +86,10 @@ local logspushtarget = logs.pushtarget
local logspoptarget = logs.poptarget
local csname_id = token.csname_id
-local basiccompare = sorters.basicsorter -- (a,b)
-local compare = sorters.comparers.basic -- (a,b)
-local strip = sorters.strip
-local splitter = sorters.splitters.utf
+local basicsorter = sorters.basicsorter -- (a,b)
+local sortcomparer = sorters.comparers.basic -- (a,b)
+local sortstripper = sorters.strip
+local sortsplitter = sorters.splitters.utf
local context = context
@@ -280,7 +280,7 @@ end
local splitauthorstring = publications.authors.splitstring
-local pagessplitter = lpeg.splitat(lpeg.P("-")^1)
+local pagessplitter = lpeg.splitat(P("-")^1)
-- maybe not redo when already done
@@ -876,7 +876,7 @@ lists.sorters = {
-- nothing to sort
else
-- if needed we can wrap compare and use the list directly but this is cleaner
- sorters.sort(valid,compare)
+ sorters.sort(valid,sortcomparer)
for i=1,#valid do
local v = valid[i]
valid[i] = list[v.index]
@@ -1113,7 +1113,7 @@ local function sortedtags(dataset,list,sorttype)
if key then
valid[#valid+1] = {
tag = tag,
- split = splitter(strip(key))
+ split = sortsplitter(sortstripper(key))
}
else
end
@@ -1122,7 +1122,7 @@ local function sortedtags(dataset,list,sorttype)
if #valid == 0 or #valid ~= #list then
return list
else
- sorters.sort(valid,basiccompare)
+ sorters.sort(valid,basicsorter)
for i=1,#valid do
valid[i] = valid[i].tag
end
@@ -1132,10 +1132,10 @@ end
-- todo: standard : current
-local splitter = lpeg.splitat("::")
+local prefixsplitter = lpeg.splitat("::")
function commands.btxhandlecite(dataset,tag,mark,variant,sorttype,setup) -- variant for tracing
- local prefix, rest = lpegmatch(splitter,tag)
+ local prefix, rest = lpegmatch(prefixsplitter,tag)
if rest then
dataset = prefix
else
@@ -1167,7 +1167,7 @@ end
function commands.btxhandlenocite(dataset,tag,mark)
if mark ~= false then
- local prefix, rest = lpegmatch(splitter,tag)
+ local prefix, rest = lpegmatch(prefixsplitter,tag)
if rest then
dataset = prefix
else
diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv
index 34e628148..fc2b00055 100644
--- a/tex/context/base/publ-ini.mkiv
+++ b/tex/context/base/publ-ini.mkiv
@@ -627,7 +627,7 @@
\to \everysetupbtxciteplacement
\appendtoks
- \doifnot{\btxlistvariantparameter\c!option}\v!continue
+ \doifnot{\btxrenderingparameter\c!continue}\v!yes
{\global\btxcounter\zerocount}%
\to \everysetupbtxlistplacement
@@ -794,11 +794,11 @@
\def\currentbtxindex{0}
-\unexpanded\def\btxlistvariant#1%
+\unexpanded\def\btxlistvariant#1% was \currentbtxindex
{\begingroup
\edef\currentbtxlistvariant{#1}%
\btxlistvariantparameter\c!left
- \ctxcommand{btxlistvariant("\currentbtxdataset","\currentbtxblock","\currentbtxtag","#1","\currentbtxindex")}% some can go
+ \ctxcommand{btxlistvariant("\currentbtxdataset","\currentbtxblock","\currentbtxtag","#1","\number\btxcounter")}% some can go
\btxlistvariantparameter\c!right
\endgroup}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 34b802a2c..e089e9b11 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 617e15c03..af6e21167 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 47776fa30..3986118a0 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 : 02/01/14 12:12:13
+-- merge date : 02/01/14 14:22:42
do -- begin closure to overcome local limits and interference