summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
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-ro.mkii2
-rw-r--r--tex/context/base/mkiv/cont-new.mkiv2
-rw-r--r--tex/context/base/mkiv/context.mkiv2
-rw-r--r--tex/context/base/mkiv/context.mkxl2
-rw-r--r--tex/context/base/mkiv/mult-prm.lua1
-rw-r--r--tex/context/base/mkiv/spac-par.mkiv14
-rw-r--r--tex/context/base/mkiv/status-files.pdfbin28138 -> 28112 bytes
-rw-r--r--tex/context/base/mkiv/status-lua.pdfbin254736 -> 254795 bytes
-rw-r--r--tex/context/base/mkiv/trac-ctx.lua36
-rw-r--r--tex/context/base/mkiv/trac-ctx.mkiv4
-rw-r--r--tex/context/base/mkiv/typo-cap.mkiv5
-rw-r--r--tex/context/interface/mkii/keys-ro.xml2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
15 files changed, 59 insertions, 17 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 2ba3d9bc8..57d7fd42c 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{2020.07.21 18:36}
+\newcontextversion{2020.07.22 10:51}
%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 1de3a7250..b6aee08f6 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{2020.07.21 18:36}
+\edef\contextversion{2020.07.22 10:51}
%D For those who want to use this:
diff --git a/tex/context/base/mkii/mult-ro.mkii b/tex/context/base/mkii/mult-ro.mkii
index 57cb85aba..29d7fc29b 100644
--- a/tex/context/base/mkii/mult-ro.mkii
+++ b/tex/context/base/mkii/mult-ro.mkii
@@ -886,6 +886,7 @@
\setinterfaceconstant{increment}{increment}
\setinterfaceconstant{incrementnumber}{numarincrement}
\setinterfaceconstant{indenting}{aliniat}
+\setinterfaceconstant{indentlist}{indentlist}
\setinterfaceconstant{indentnext}{aliniaturmator}
\setinterfaceconstant{index}{index}
\setinterfaceconstant{indicator}{indicator}
@@ -1090,6 +1091,7 @@
\setinterfaceconstant{period}{period}
\setinterfaceconstant{place}{pune}
\setinterfaceconstant{placehead}{punetitlu}
+\setinterfaceconstant{placeholder}{placeholder}
\setinterfaceconstant{placestopper}{punestopper}
\setinterfaceconstant{position}{pozitie}
\setinterfaceconstant{prefix}{prefix}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index a54645989..cead1eed6 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -13,7 +13,7 @@
% \normalend % uncomment this to get the real base runtime
-\newcontextversion{2020.07.21 18:36}
+\newcontextversion{2020.07.22 10:51}
%D This file is loaded at runtime, thereby providing an excellent place for hacks,
%D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 9ef82e072..81b89f509 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,7 +45,7 @@
%D {YYYY.MM.DD HH:MM} format.
\edef\contextformat {\jobname}
-\edef\contextversion{2020.07.21 18:36}
+\edef\contextversion{2020.07.22 10:51}
%D Kind of special:
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index 26825b102..13b31cc27 100644
--- a/tex/context/base/mkiv/context.mkxl
+++ b/tex/context/base/mkiv/context.mkxl
@@ -29,7 +29,7 @@
%D {YYYY.MM.DD HH:MM} format.
\edef\contextformat {\jobname}
-\edef\contextversion{2020.07.21 18:36}
+\edef\contextversion{2020.07.22 10:51}
%D Kind of special:
diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua
index e842c485a..3b720fa8f 100644
--- a/tex/context/base/mkiv/mult-prm.lua
+++ b/tex/context/base/mkiv/mult-prm.lua
@@ -382,6 +382,7 @@ return {
"novrule",
"orelse",
"outputbox",
+ "parattr",
"pardirection",
"postexhyphenchar",
"posthyphenchar",
diff --git a/tex/context/base/mkiv/spac-par.mkiv b/tex/context/base/mkiv/spac-par.mkiv
index e36fb5483..627a43bcf 100644
--- a/tex/context/base/mkiv/spac-par.mkiv
+++ b/tex/context/base/mkiv/spac-par.mkiv
@@ -51,8 +51,20 @@
%D New experimental stuff:
-\unexpanded\def\freezeparagraphproperties{\snapshotpar\maxdimen}
+\ifcase\contextlmtxmode
+ \let\freezeparagraphproperties\donothing
+
+\else
+
+ \unexpanded\def\freezeparagraphproperties{\snapshotpar\maxdimen}
+
+ \installtexexperiment
+ {paragraphs.freeze}
+ {\appendtoksonce\freezeparagraphproperties\to \everypar}
+ {\removetoks \freezeparagraphproperties\from\everypar}
+
+\fi
%D Beware, changing this will break some code (like pos/backgrounds) but it has been
%D changed anyway so let's see where things go wrong.
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 85cfd67cc..ad9fe84a5 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 8b5617c52..5eb3b2c86 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/base/mkiv/trac-ctx.lua b/tex/context/base/mkiv/trac-ctx.lua
index 6681be51c..a808778b3 100644
--- a/tex/context/base/mkiv/trac-ctx.lua
+++ b/tex/context/base/mkiv/trac-ctx.lua
@@ -8,18 +8,21 @@ if not modules then modules = { } end modules ['trac-ctx'] = {
local next = next
-local context = context
-local implement = interfaces.implement
-local register = trackers.register
+local context = context
+local implement = interfaces.implement
+local register = trackers.register
-local textrackers = tex.trackers or { }
-local texdirectives = tex.directives or { }
+local textrackers = tex.trackers or { }
+local texdirectives = tex.directives or { }
+local texexperiments = tex.experiments or { }
-tex.trackers = textrackers
-tex.directives = texdirectives
+tex.trackers = textrackers
+tex.directives = texdirectives
+tex.experiments = texexperiments
-storage.register("tex/trackers", textrackers, "tex.trackers")
-storage.register("tex/directives",texdirectives,"tex.directives")
+storage.register("tex/trackers", textrackers, "tex.trackers")
+storage.register("tex/directives", texdirectives, "tex.directives")
+storage.register("tex/experiments",texexperiments,"tex.experiments")
local function doit(category,tag,v)
local tt = category[tag]
@@ -56,6 +59,13 @@ implement {
}
implement {
+ name = "initializetexexperiments",
+ actions = function()
+ initialize(texexperiments,experiments.register)
+ end
+}
+
+implement {
name = "installtextracker",
arguments = "3 strings",
actions = function(tag,enable,disable)
@@ -71,6 +81,14 @@ implement {
end,
}
+implement {
+ name = "installtexexperiment",
+ arguments = "3 strings",
+ actions = function(tag,enable,disable)
+ install(texexperiments,experiments.register,tag,enable,disable)
+ end,
+}
+
-- this one might move
interfaces.implement {
diff --git a/tex/context/base/mkiv/trac-ctx.mkiv b/tex/context/base/mkiv/trac-ctx.mkiv
index 66b5ef1ee..77e4a4f0f 100644
--- a/tex/context/base/mkiv/trac-ctx.mkiv
+++ b/tex/context/base/mkiv/trac-ctx.mkiv
@@ -23,9 +23,13 @@
\unexpanded\def\installtexdirective#1#2#3%
{\clf_installtexdirective{#1}{\detokenize{#2}}{\detokenize{#3}}}
+\unexpanded\def\installtexexperiment#1#2#3%
+ {\clf_installtexexperiment{#1}{\detokenize{#2}}{\detokenize{#3}}}
+
\appendtoks
\clf_initializetextrackers
\clf_initializetexdirectives
+ \clf_initializetexexperiments
\to \everyjob
\protect \endinput
diff --git a/tex/context/base/mkiv/typo-cap.mkiv b/tex/context/base/mkiv/typo-cap.mkiv
index 8f7b6ae2c..3dea50c99 100644
--- a/tex/context/base/mkiv/typo-cap.mkiv
+++ b/tex/context/base/mkiv/typo-cap.mkiv
@@ -228,8 +228,11 @@
\unexpanded\def\autocap{\ifmmode\expandafter\normalcap\else\expandafter\smallcapped\fi}
-\appendtoks
+\prependtoks
\let\normalcap\cap % mathmode cap
+\to \everydump
+
+\appendtoks
\let\cap\autocap
\to \everydump
diff --git a/tex/context/interface/mkii/keys-ro.xml b/tex/context/interface/mkii/keys-ro.xml
index 8abd508b7..00f0388d9 100644
--- a/tex/context/interface/mkii/keys-ro.xml
+++ b/tex/context/interface/mkii/keys-ro.xml
@@ -892,6 +892,7 @@
<cd:constant name='increment' value='increment'/>
<cd:constant name='incrementnumber' value='numarincrement'/>
<cd:constant name='indenting' value='aliniat'/>
+ <cd:constant name='indentlist' value='indentlist'/>
<cd:constant name='indentnext' value='aliniaturmator'/>
<cd:constant name='index' value='index'/>
<cd:constant name='indicator' value='indicator'/>
@@ -1096,6 +1097,7 @@
<cd:constant name='period' value='period'/>
<cd:constant name='place' value='pune'/>
<cd:constant name='placehead' value='punetitlu'/>
+ <cd:constant name='placeholder' value='placeholder'/>
<cd:constant name='placestopper' value='punestopper'/>
<cd:constant name='position' value='pozitie'/>
<cd:constant name='prefix' value='prefix'/>
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 88174f35a..55fcfd27b 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 : 2020-07-21 18:36
+-- merge date : 2020-07-22 10:51
do -- begin closure to overcome local limits and interference
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-15 20:18:36 +0000