summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2018-06-04 13:55:09 +0200
committerContext Git Mirror Bot <phg42.2a@gmail.com>2018-06-04 13:55:09 +0200
commitc2d2236242c95f4753e7b197d576102c6fc20446 (patch)
tree152b42b5fb05611da3309cdb45ec70f9689c3095 /tex
parentac0e3262fb027e4ab586204bf2d5a05e9a831933 (diff)
downloadcontext-c2d2236242c95f4753e7b197d576102c6fc20446.tar.gz
2018-06-04 12:25:00
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/mkii/cont-new.mkii2
-rw-r--r--tex/context/base/mkii/context.mkii2
-rw-r--r--tex/context/base/mkii/mult-pe.mkii1
-rw-r--r--tex/context/base/mkiv/cldf-ini.lua12
-rw-r--r--tex/context/base/mkiv/cldf-ini.mkiv2
-rw-r--r--tex/context/base/mkiv/cont-new.mkiv2
-rw-r--r--tex/context/base/mkiv/context.mkiv6
-rw-r--r--tex/context/base/mkiv/core-env.mkiv8
-rw-r--r--tex/context/base/mkiv/luat-ini.lua14
-rw-r--r--tex/context/base/mkiv/luat-run.lua2
-rw-r--r--tex/context/base/mkiv/status-files.pdfbin26071 -> 26081 bytes
-rw-r--r--tex/context/base/mkiv/status-lua.pdfbin259115 -> 259136 bytes
-rw-r--r--tex/context/interface/mkii/keys-pe.xml1
-rw-r--r--tex/context/interface/mkiv/i-context.pdfbin850578 -> 850685 bytes
-rw-r--r--tex/context/interface/mkiv/i-readme.pdfbin61086 -> 61084 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
16 files changed, 27 insertions, 27 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index bcbde1da7..af2120f0b 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2018.06.02 22:34}
+\newcontextversion{2018.06.04 12:18}
%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/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index d060c0332..4e05eedc2 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2018.06.02 22:34}
+\edef\contextversion{2018.06.04 12:18}
%D For those who want to use this:
diff --git a/tex/context/base/mkii/mult-pe.mkii b/tex/context/base/mkii/mult-pe.mkii
index 534c239da..0e12a29ed 100644
--- a/tex/context/base/mkii/mult-pe.mkii
+++ b/tex/context/base/mkii/mult-pe.mkii
@@ -1274,6 +1274,7 @@
\setinterfaceconstant{vcompact}{vcompact}
\setinterfaceconstant{vector}{vector}
\setinterfaceconstant{veroffset}{آفست‌عم}
+\setinterfaceconstant{vfactor}{vfactor}
\setinterfaceconstant{vfil}{vfil}
\setinterfaceconstant{viewerprefix}{viewerprefix}
\setinterfaceconstant{voffset}{آفست‌ع}
diff --git a/tex/context/base/mkiv/cldf-ini.lua b/tex/context/base/mkiv/cldf-ini.lua
index 71529f96c..54048b52a 100644
--- a/tex/context/base/mkiv/cldf-ini.lua
+++ b/tex/context/base/mkiv/cldf-ini.lua
@@ -29,7 +29,7 @@ if not modules then modules = { } end modules ['cldf-ini'] = {
-- todo : context("%bold{total: }%s",total)
-- todo : context.documentvariable("title")
--
--- during the crited project we ran into the situation that luajittex was 10-20 times
+-- During the crited project we ran into the situation that luajittex was 10-20 times
-- slower that luatex ... after 3 days of testing and probing we finally figured out that
-- the the differences between the lua and luajit hashers can lead to quite a slowdown
-- in some cases.
@@ -120,9 +120,9 @@ local nodeflushmode = false
local scannerdefmode = false
local maxflushnodeindex = 0x10FFFF - 1
-if LUATEXFUNCTIONALITY and LUATEXFUNCTIONALITY > 6780 then
+if LUATEXFUNCTIONALITY > 6780 then
- -- The gain in performasnce is neglectable.
+ -- The gain in performance is neglectable.
tokenflushmode = true
nodeflushmode = true
@@ -139,16 +139,12 @@ end
-- primitive \luafunctions was \luacall and we used our own implementation of
-- a function table (more indirectness).
-local trialtypesettingstate = 0
+local trialtypesettingstate = createtoken("trialtypesettingstate").index
function context.trialtypesetting()
return texgetcount(trialtypesettingstate) ~= 0
end
-function context.registertrialtypesetting(name)
- trialtypesettingstate = createtoken(name).index
-end
-
local knownfunctions = lua.get_functions_table()
local showstackusage = false
diff --git a/tex/context/base/mkiv/cldf-ini.mkiv b/tex/context/base/mkiv/cldf-ini.mkiv
index 0cf3b892c..d19add0fe 100644
--- a/tex/context/base/mkiv/cldf-ini.mkiv
+++ b/tex/context/base/mkiv/cldf-ini.mkiv
@@ -13,6 +13,8 @@
\writestatus{loading}{ConTeXt Lua Documents / Initialization}
+\newcount\trialtypesettingstate % gets aliased at the Lua end
+
\registerctxluafile{cldf-ini}{}
%D With each new update of \MKIV\ we can join Within Temptation in
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index c064cb4d5..a3c78b6ee 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2018.06.02 22:34}
+\newcontextversion{2018.06.04 12:18}
%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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 84cd66a3f..1ca9fd731 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -42,7 +42,7 @@
%D has to match \type {YYYY.MM.DD HH:MM} format.
\edef\contextformat {\jobname}
-\edef\contextversion{2018.06.02 22:34}
+\edef\contextversion{2018.06.04 12:18}
\edef\contextkind {beta}
%D For those who want to use this:
@@ -77,8 +77,8 @@
%D We just quit if new functionality is expected.
-\ifnum\luatexversion<105 % also change message
- \writestatus{!!!!}{Your luatex binary is too old, you need at least version 1.05!}
+\ifnum\luatexversion<107 % also change message
+ \writestatus{!!!!}{Your luatex binary is too old, you need at least version 1.07!}
\expandafter\end
\fi
diff --git a/tex/context/base/mkiv/core-env.mkiv b/tex/context/base/mkiv/core-env.mkiv
index 185df780f..fb9e15292 100644
--- a/tex/context/base/mkiv/core-env.mkiv
+++ b/tex/context/base/mkiv/core-env.mkiv
@@ -89,20 +89,18 @@
\newsystemmode{trialtypesetting}
-\expandafter\let\expandafter\c_trial_typesetting\csname\??mode\systemmodeprefix trialtypesetting\endcsname % private !
+\expandafter\let\csname\??mode\systemmodeprefix trialtypesetting\endcsname\trialtypesettingstate
\appendtoks
- \c_trial_typesetting\enabledmode
+ \trialtypesettingstate\enabledmode
\luacopyinputnodes\plusone
\to \everysettrialtypesetting
\appendtoks
- \c_trial_typesetting\disabledmode
+ \trialtypesettingstate\disabledmode
\luacopyinputnodes\zerocount
\to \everyresettrialtypesetting
-\ctxlua{context.registertrialtypesetting("c_trial_typesetting")}
-
% user ones
\let\syst_mode_prefix\relax
diff --git a/tex/context/base/mkiv/luat-ini.lua b/tex/context/base/mkiv/luat-ini.lua
index de7254922..487e92cfd 100644
--- a/tex/context/base/mkiv/luat-ini.lua
+++ b/tex/context/base/mkiv/luat-ini.lua
@@ -25,15 +25,17 @@ if not global then
global = _G
end
-LUATEXVERSION = status.luatex_version/100
- + tonumber(status.luatex_revision)/1000
+LUATEXVERSION = status.luatex_version/100
+ + tonumber(status.luatex_revision)/1000
-LUATEXENGINE = status.luatex_engine and string.lower(status.luatex_engine)
- or (string.find(status.banner,"LuajitTeX",1,true) and "luajittex" or "luatex")
+LUATEXENGINE = status.luatex_engine and string.lower(status.luatex_engine)
+ or (string.find(status.banner,"LuajitTeX",1,true) and "luajittex" or "luatex")
-JITSUPPORTED = LUATEXENGINE == "luajittex" or jit
+LUATEXFUNCTIONALITY = status.development_id or 6346
-INITEXMODE = status.ini_version
+JITSUPPORTED = LUATEXENGINE == "luajittex" or jit
+
+INITEXMODE = status.ini_version
function os.setlocale()
-- no need for a message
diff --git a/tex/context/base/mkiv/luat-run.lua b/tex/context/base/mkiv/luat-run.lua
index 59fb0b937..d09f01021 100644
--- a/tex/context/base/mkiv/luat-run.lua
+++ b/tex/context/base/mkiv/luat-run.lua
@@ -134,7 +134,7 @@ callbacks.register('process_output_buffer', false, "actions perf
callbacks.register("pre_dump", pre_dump_actions, "lua related finalizers called before we dump the format") -- comes after \everydump
-if LUATEXFUNCTIONALITY and LUATEXFUNCTIONALITY > 6505 then
+if LUATEXFUNCTIONALITY > 6505 then
callbacks.register("finish_synctex", wrapup_synctex, "rename temporary synctex file")
callbacks.register('wrapup_run', false, "actions performed after closing files")
else
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index ce9997904..4455a50c6 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 4df2c4555..6ddf8980f 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
Binary files differ
diff --git a/tex/context/interface/mkii/keys-pe.xml b/tex/context/interface/mkii/keys-pe.xml
index e587e1d6e..880a07489 100644
--- a/tex/context/interface/mkii/keys-pe.xml
+++ b/tex/context/interface/mkii/keys-pe.xml
@@ -1280,6 +1280,7 @@
<cd:constant name='vcompact' value='vcompact'/>
<cd:constant name='vector' value='vector'/>
<cd:constant name='veroffset' value='آفست‌عم'/>
+ <cd:constant name='vfactor' value='vfactor'/>
<cd:constant name='vfil' value='vfil'/>
<cd:constant name='viewerprefix' value='viewerprefix'/>
<cd:constant name='voffset' value='آفست‌ع'/>
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 43387f6a1..ce9625ff7 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
Binary files differ
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 1cb15e8b2..3d8a2a06f 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.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 f65ca966e..05acd5ede 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua
-- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date : 06/02/18 22:34:21
+-- merge date : 06/04/18 12:18:30
do -- begin closure to overcome local limits and interference