summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2017-08-29 20:52:12 +0200
committerContext Git Mirror Bot <phg42.2a@gmail.com>2017-08-29 20:52:12 +0200
commit2faa09e17f36cccda88b3ce144e5f2d76e092580 (patch)
tree1b372d1cd4e65ce1f7ed66543a60a700a48194f2 /tex
parent833f45553da60d8185f7095b5efbafc540c21173 (diff)
downloadcontext-2faa09e17f36cccda88b3ce144e5f2d76e092580.tar.gz
2017-08-29 19:41: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/mkiv/buff-ver.lua33
-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/math-ali.mkiv87
-rw-r--r--tex/context/base/mkiv/math-ini.mkiv47
-rw-r--r--tex/context/base/mkiv/math-pln.mkiv110
-rw-r--r--tex/context/base/mkiv/math-stc.mkvi87
-rw-r--r--tex/context/base/mkiv/mult-low.lua1
-rw-r--r--tex/context/base/mkiv/page-lay.mkiv4
-rw-r--r--tex/context/base/mkiv/status-files.pdfbin25759 -> 25767 bytes
-rw-r--r--tex/context/base/mkiv/status-lua.pdfbin426472 -> 426471 bytes
-rw-r--r--tex/context/interface/mkiv/i-context.pdfbin818292 -> 818415 bytes
-rw-r--r--tex/context/interface/mkiv/i-readme.pdfbin60775 -> 60775 bytes
-rw-r--r--tex/context/modules/mkiv/m-scite.mkiv1
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
17 files changed, 290 insertions, 90 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index cbb494925..f30ca0714 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{2017.08.28 12:14}
+\newcontextversion{2017.08.29 19:35}
%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 2892b98e8..4c48a7ce1 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{2017.08.28 12:14}
+\edef\contextversion{2017.08.29 19:35}
%D For those who want to use this:
diff --git a/tex/context/base/mkiv/buff-ver.lua b/tex/context/base/mkiv/buff-ver.lua
index db3db5aea..bf2859435 100644
--- a/tex/context/base/mkiv/buff-ver.lua
+++ b/tex/context/base/mkiv/buff-ver.lua
@@ -33,6 +33,8 @@ local context = context
local commands = commands
local implement = interfaces.implement
+local formatters = string.formatters
+
local tabtospace = utilities.strings.tabtospace
local variables = interfaces.variables
local settings_to_array = utilities.parsers.settings_to_array
@@ -267,14 +269,15 @@ function visualizers.register(name,specification)
report_visualizers("registering visualizer %a",name)
end
specifications[name] = specification
- local parser, handler = specification.parser, specification.handler
- local displayparser = specification.display or parser
- local inlineparser = specification.inline or parser
- local isparser = is_lpeg(parser)
+ local parser = specification.parser
+ local handler = specification.handler
+ local displayparser = specification.display or parser
+ local inlineparser = specification.inline or parser
+ local isparser = is_lpeg(parser)
local start, stop
if isparser then
start = makepattern(handler,"start",patterns.alwaysmatched)
- stop = makepattern(handler,"stop",patterns.alwaysmatched)
+ stop = makepattern(handler,"stop", patterns.alwaysmatched)
end
if handler then
if isparser then
@@ -375,7 +378,7 @@ function visualizers.registerescapepattern(name,befores,afters,normalmethod,esca
name,i,before,after,processor or "default")
end
before = P(before) * space_pattern
- after = space_pattern * P(after)
+ after = space_pattern * P(after)
local action
if processor then
action = function(s) apply_processor(processor,s) end
@@ -452,15 +455,16 @@ function visualizers.registerescapecommand(name,token,normalmethod,escapecommand
return escapepattern
end
-local escapedvisualizers = { }
+local escapedvisualizers = { }
+local f_escapedvisualizer = formatters["%s : %s"]
local function visualize(content,settings) -- maybe also method in settings
if content and content ~= "" then
local method = lower(settings.method or "default")
- local m
+ local m = specifications[method] or specifications.default
local e = settings.escape
- if e and e ~= "" then
- local newname = format("%s : %s",method,e)
+ if e and e ~= "" and not m.handler.noescape then
+ local newname = f_escapedvisualizer(method,e)
local newspec = specifications[newname]
if newspec then
m = newspec
@@ -484,9 +488,10 @@ local function visualize(content,settings) -- maybe also method in settings
end
end
end
- local oldvisualizer = specifications[method] or specifications.default
- local oldparser = oldvisualizer.direct
- local newparser
+ local oldm = m
+ local oldparser = oldm.direct
+ local newhandler = oldm.handler
+ local newparser = oldm.parser -- nil
if starts[1] and stops[1] ~= "" then
newparser = visualizers.registerescapepattern(newname,starts,stops,oldparser,nil,processors)
elseif starts[1] then
@@ -496,7 +501,7 @@ local function visualize(content,settings) -- maybe also method in settings
end
m = visualizers.register(newname, {
parser = newparser,
- handler = oldvisualizer.handler,
+ handler = newhandler,
})
end
else
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 1dd7fa178..7574ee83e 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{2017.08.28 12:14}
+\newcontextversion{2017.08.29 19:35}
%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 d2ab572a1..9c6ed8e91 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -41,7 +41,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2017.08.28 12:14}
+\edef\contextversion{2017.08.29 19:35}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/mkiv/math-ali.mkiv b/tex/context/base/mkiv/math-ali.mkiv
index 31bdbd900..a7dfa8815 100644
--- a/tex/context/base/mkiv/math-ali.mkiv
+++ b/tex/context/base/mkiv/math-ali.mkiv
@@ -354,22 +354,27 @@
\let\math_alignment_snap_start\relax
\let\math_alignment_snap_stop \relax
-% experimental
-
-\def\math_alignment_snap_start
- {\ifgridsnapping
- \edef\p_math_alignment_grid{\mathalignmentparameter\c!grid}%
- \ifx\p_math_alignment_grid\v!no\else
- \snaptogrid[\p_math_alignment_grid]\vbox\bgroup
- \fi
- \fi}
+% % experimental:
+%
+% \def\math_alignment_snap_start
+% {\ifgridsnapping
+% \edef\p_math_alignment_grid{\mathalignmentparameter\c!grid}%
+% \ifx\p_math_alignment_grid\v!no\else
+% \snaptogrid[\p_math_alignment_grid]\vbox\bgroup
+% \fi
+% \fi}
+%
+% \def\math_alignment_snap_stop
+% {\ifgridsnapping
+% \ifx\p_math_alignment_grid\v!no\else
+% \egroup
+% \fi
+% \fi}
+%
+% % doesn't work well, so:
-\def\math_alignment_snap_stop
- {\ifgridsnapping
- \ifx\p_math_alignment_grid\v!no\else
- \egroup
- \fi
- \fi}
+\let\math_alignment_snap_start\relax
+\let\math_alignment_snap_stop \relax
% end of experimental
@@ -860,10 +865,8 @@
\def\math_matrix_stop
{\crcr
- % \ifgridsnapping \else
- \mathstrut\crcr
- \noalign{\vskip-\baselineskip}%
- % \fi
+ \mathstrut\crcr
+ \noalign{\vskip-\baselineskip}%
\egroup
\egroup
\mathmatrixright
@@ -1132,28 +1135,29 @@
\egroup
\endgroup}
-%D \macros
-%D {bordermatrix}
-%D
-%D In \PLAIN\ \TEX\ the width of a parenthesis is stored in
-%D the \DIMENSION\ \type{\mathparentwd}. This value is derived from
-%D the width of \type{\tenrm B}, so let's take care of it now:
-
-\ifx\mathparentwd\undefined \newdimen\mathparentwd \fi
-
-\let\normalbordermatrix\bordermatrix % move that code to here instead
-
-\def\bordermatrix
- {\begingroup
- \setbox\scratchbox\hbox{\mr\char"239C}%
- \global\mathparentwd\wd\scratchbox
- \endgroup
- \normalbordermatrix}
-
-% to be tested
+% %D \macros
+% %D {bordermatrix}
+% %D
+% %D In \PLAIN\ \TEX\ the width of a parenthesis is stored in
+% %D the \DIMENSION\ \type{\mathparentwd}. This value is derived from
+% %D the width of \type{\tenrm B}, so let's take care of it now:
+%
+% \ifx\mathparentwd\undefined \newdimen\mathparentwd \fi
+%
+% \let\normalbordermatrix\bordermatrix % move that code to here instead
+%
+% \unexpanded\def\bordermatrix
+% {\begingroup
+% \setbox\scratchbox\hbox{\mr\char"239C}%
+% \global\mathparentwd\wd\scratchbox
+% \endgroup
+% \normalbordermatrix}
%
% \def\bordermatrix
-% {\begingroup\mr\global\mathparentwd\fontcharwd\font"239C\relax\endgroup
+% {\begingroup
+% \mr
+% \global\mathparentwd\fontcharwd\font"239C\relax
+% \endgroup
% \normalbordermatrix}
%D \macros{overset, underset}
@@ -1612,11 +1616,6 @@
\unexpanded\def\strc_math_box_stop
{\stopforceddisplaymath
\egroup
- % % not needed, attribute driven
- % \ifgridsnapping
- % \snaptogrid[\v!math]\vbox
- % \fi
- % \bgroup
% check number
\d_strc_math_number_width\wd\b_strc_formulas_number
%
diff --git a/tex/context/base/mkiv/math-ini.mkiv b/tex/context/base/mkiv/math-ini.mkiv
index c765677da..83d190e61 100644
--- a/tex/context/base/mkiv/math-ini.mkiv
+++ b/tex/context/base/mkiv/math-ini.mkiv
@@ -1807,6 +1807,40 @@
\unexpanded\def\showmathstyle{\verbosemathstyle\normalmathstyle}
+%D Some dimension fun:
+
+\def\mathexheight
+ {\fontdimen
+ \plusfive
+ \ifcase\numexpr\normalmathstyle\relax
+ \textfont \or % 0
+ \textfont \or % 1
+ \textfont \or % 2
+ \textfont \or % 3
+ \scriptfont \or % 4
+ \scriptfont \or % 5
+ \scriptscriptfont \or % 6
+ \scriptscriptfont \else
+ \textfont
+ \fi
+ \zeropoint}
+
+\def\mathemwidth
+ {\fontdimen
+ \plussix
+ \ifcase\numexpr\normalmathstyle\relax
+ \textfont \or % 0
+ \textfont \or % 1
+ \textfont \or % 2
+ \textfont \or % 3
+ \scriptfont \or % 4
+ \scriptfont \or % 5
+ \scriptscriptfont \or % 6
+ \scriptscriptfont \else
+ \textfont
+ \fi
+ \zeropoint}
+
%D A plain inheritance:
\def\mathpalette#1#2%
@@ -1826,9 +1860,16 @@
% to be tested: {#1} but it could have side effects
-\unexpanded\def\mathstylehbox#1% sensitive for: a \over b => {a\over b} or \frac{a}{b}
- {\normalexpanded{\hbox\bgroup
- \startimath\triggermathstyle\normalmathstyle}\mathsurround\zeropoint#1\stopimath\egroup}
+% \unexpanded\def\mathstylehbox#1% sensitive for: a \over b => {a\over b} or \frac{a}{b}
+% {\normalexpanded{\hbox\bgroup
+% \startimath\triggermathstyle\normalmathstyle}\mathsurround\zeropoint#1\stopimath\egroup}
+
+\unexpanded\def\mathstylehbox#1#% sensitive for: a \over b => {a\over b} or \frac{a}{b}
+ {\math_style_hbox{#1}}
+
+\unexpanded\def\math_style_hbox#1#2% sensitive for: a \over b => {a\over b} or \frac{a}{b}
+ {\normalexpanded{\hbox#1\bgroup
+ \startimath\triggermathstyle\normalmathstyle}\mathsurround\zeropoint#2\stopimath\egroup}
\unexpanded\def\mathstylevbox#1%
{\normalexpanded{\vbox\bgroup
diff --git a/tex/context/base/mkiv/math-pln.mkiv b/tex/context/base/mkiv/math-pln.mkiv
index 754cb6141..d0e7e377d 100644
--- a/tex/context/base/mkiv/math-pln.mkiv
+++ b/tex/context/base/mkiv/math-pln.mkiv
@@ -138,4 +138,114 @@
\normalstartimath\tabskip\zeroskip\everycr\emptytoks\hfil\displaystyle\alignmark\alignmark\hfil\normalstopimath}\crcr
#1\crcr}}
+%D This comes from plain but I gave it a \CONTEXT\ touch:
+
+\def\math_border_NC_indeed
+ {\gdef\math_border_NC{\aligntab}}
+
+\let\math_border_NC\math_border_NC_indeed
+
+\def\math_border_NR
+ {\glet\math_border_NC\math_border_NC_indeed
+ \cr}
+
+\unexpanded\def\math_border_matrix#1#2#3% adapted plain
+ {\begingroup
+ %
+ \pushmacro\cr
+ %
+ \setbox\scratchbox\hbox\bgroup
+ \mr B%
+ \egroup
+ \scratchdimenone\wd\scratchbox
+ %
+ \scratchdimentwo.2\bodyfontsize
+ %
+ \mathsurround\zeropoint
+ %
+ \def\NC{\math_border_NC}%
+ \def\NR{\math_border_NR}%
+ %
+ \setbox\scratchboxone\vbox\bgroup
+ \def\cr{%
+ \crcr
+ \noalign\bgroup
+ \kern\scratchdimentwo
+ \global\let\cr\endline
+ \egroup
+ }%
+ \ialign{%
+ \startimath\alignmark\alignmark\stopimath
+ \hfil
+ \kern\dimexpr\scratchdimentwo+\scratchdimenone\relax
+ \aligntab
+ \thinspace
+ \hfil
+ \startimath\alignmark\alignmark\stopimath
+ \hfil
+ \aligntab
+ \aligntab
+ \quad
+ \hfil
+ \startimath\alignmark\alignmark\stopimath
+ \hfil
+ \crcr
+ \omit
+ \strut
+ \hfil
+ \crcr
+ \noalign{\kern-\baselineskip}%
+ #3\crcr
+ \omit
+ \strut
+ \cr
+ }%
+ \egroup
+ \setbox\scratchboxtwo\vbox\bgroup
+ \unvcopy\scratchboxone
+ \global\setbox\globalscratchbox\lastbox
+ \egroup
+ \setbox\scratchboxtwo\hbox\bgroup
+ \unhbox\globalscratchbox
+ \unskip
+ \global\setbox\globalscratchbox\lastbox
+ \egroup
+ \setbox\scratchboxtwo\hbox\bgroup
+ \startimath
+ \kern\dimexpr\wd\globalscratchbox-\scratchdimenone\relax
+ \left#1\relax
+ \kern-\wd\globalscratchbox
+ \global\setbox\globalscratchbox\vbox\bgroup
+ \box\globalscratchbox
+ \kern\scratchdimentwo
+ \egroup
+ \vcenter\bgroup
+ \kern-\ht\globalscratchbox
+ \unvbox\scratchboxone
+ \kern-\baselineskip
+ \egroup
+ \thinspace
+ \right#2\relax
+ \stopimath
+ \egroup
+ \null
+ \thickspace
+ \vbox\bgroup
+ \kern\ht\globalscratchbox
+ \box\scratchboxtwo
+ \egroup
+ %
+ \popmacro\cr
+ %
+ \endgroup}
+
+\unexpanded\def\bordermatrix {\math_border_matrix()}
+\unexpanded\def\bbordermatrix{\math_border_matrix[]}
+
+\unexpanded\def\startbordermatrix #1\stopbordermatrix {\math_border_matrix(){#1}}
+\unexpanded\def\startbbordermatrix#1\stopbbordermatrix{\math_border_matrix[]{#1}}
+
+\let\stopbordermatrix \relax
+\let\stopbbordermatrix\relax
+
\protect \endinput
diff --git a/tex/context/base/mkiv/math-stc.mkvi b/tex/context/base/mkiv/math-stc.mkvi
index 208e756f6..2b10bca45 100644
--- a/tex/context/base/mkiv/math-stc.mkvi
+++ b/tex/context/base/mkiv/math-stc.mkvi
@@ -69,12 +69,19 @@
% currently no italic correction ... problem is that we don't know yet if we have an italic
% below so we we need to postpone
-\def\math_stackers_fallback
- {\hbox to \scratchwidth{\csname\??mathextensiblefallbacks\ifcsname\??mathextensiblefallbacks\number\scratchunicode\endcsname\number\scratchunicode\fi\endcsname}}
- %{\csname\??mathextensiblefallbacks\ifcsname\??mathextensiblefallbacks\number\scratchunicode\endcsname\number\scratchunicode\fi\endcsname }
+% \def\math_stackers_fallback
+% {\hbox to \scratchwidth{\csname\??mathextensiblefallbacks\ifcsname\??mathextensiblefallbacks\number\scratchunicode\endcsname\number\scratchunicode\fi\endcsname}}
+% %{\csname\??mathextensiblefallbacks\ifcsname\??mathextensiblefallbacks\number\scratchunicode\endcsname\number\scratchunicode\fi\endcsname }
-% \def\math_stackers_regular
-% {\mathstylehbox{\Umathaccent\fam\zerocount\scratchunicode{\hskip\scratchwidth}}}
+\def\math_stackers_fallback
+ {\mathstylehbox to \scratchwidth{\usemathstackerscolorparameter\c!color
+ \hss
+ \ifcsname\??mathextensiblefallbacks\number\scratchunicode\endcsname
+ \lastnamedcs
+ \else
+ \Umathchar \fam \zerocount \scratchunicode
+ \fi
+ \hss}}
\def\math_stackers_regular
{\mathstylehbox{\usemathstackerscolorparameter\c!color
@@ -89,7 +96,8 @@
% $\Umathaccent 0 0 "2190{x}$ \par $\Umathaccent 0 0 "27F8{x}$\par
% $\Udelimiterunder 0 "2190{x}$ \par $\Udelimiterunder 0 "27F8{x}$\par
-\setvalue{\??mathextensiblefallbacks}{\hbox{\vrule\!!width\scratchwidth\!!height.1\exheight\!!depth\zeropoint}}
+\setvalue{\??mathextensiblefallbacks}%
+ {\hbox{\vrule\s!width\scratchwidth\s!height.1\exheight\s!depth\zeropoint}}
% \def\math_stackers_with_fallback#codepoint%
% {\begingroup
@@ -645,21 +653,50 @@
\unexpanded\def\mathunder {\begingroup\dosingleempty\math_stackers_handle_under }
\unexpanded\def\mathdouble{\begingroup\dodoubleempty\math_stackers_handle_double}
-\def\math_stackers_handle_over[#category]%
- {\math_stackers_direct_double\plusone\zerocount
- {\iffirstargument#category\else\v!top \fi}} % will be defined later on
+\unexpanded\def\definemathover {\dotripleargument \math_stackers_define_over }
+\unexpanded\def\definemathunder {\dotripleargument \math_stackers_define_under }
+\unexpanded\def\definemathdouble{\doquadrupleargument\math_stackers_define_double}
+
+\def\math_stackers_define_over[#category][#command][#topcode]%
+ {\setuvalue{#command}{\math_stackers_handle_direct\plusone\zerocount{#category}{#topcode}{0}}}
+
+\def\math_stackers_define_under[#category][#command][#bottomcode]%
+ {\setuvalue{#command}{\math_stackers_handle_direct\zerocount\plusone{#category}{#bottomcode}{0}}}
+
+\def\math_stackers_define_double[#category][#command][#topcode][#bottomcode]%
+ {\setuvalue{#command}{\math_stackers_handle_direct\plusone\plusone{#category}{#topcode}{#bottomcode}}}
+
+\unexpanded\def\mathover {\begingroup\dosingleempty\math_stackers_handle_over }
+\unexpanded\def\mathunder {\begingroup\dosingleempty\math_stackers_handle_under }
+\unexpanded\def\mathdouble{\begingroup\dosingleempty\math_stackers_handle_double}
+
+\def\math_stackers_handle_over[#category]#topcode#text%
+ {\math_stackers_make_double\plusone\zerocount
+ {\iffirstargument#category\else\v!top\fi}%
+ {#topcode}%
+ {0}%
+ {#text}%
+ \endgroup}
-\def\math_stackers_handle_under[#category]%
- {\math_stackers_direct_double\zerocount\plusone
- {\iffirstargument#category\else\v!bottom\fi}} % will be defined later on
+\def\math_stackers_handle_under[#category]#bottomcode#text%
+ {\math_stackers_make_double\zerocount\plusone
+ {\iffirstargument#category\else\v!bottom\fi}%
+ {#bottomcode}%
+ {0}%
+ {#text}%
+ \endgroup}
-\def\math_stackers_handle_double[#topcategory][#bottomcategory]%
- {\math_stackers_direct_double\plusone\plusone
- {\iffirstargument #topcategory\else\v!top \fi}%
- {\ifsecondargument#bottomcategory\else\v!bottom\fi}}
+\def\math_stackers_handle_double[#category]#topcode#bottomcode#text%
+ {\math_stackers_make_double\plusone\plusone
+ {\iffirstargument#category\else\v!both\fi}%
+ {#topcode}%
+ {#bottomcode}%
+ {#text}%
+ \endgroup}
-\def\math_stackers_direct_double#top#bottom#category#codepoint#text%
- {\math_stackers_make_double#top#bottom{#category}{#codepoint}{0}{#text}%
+\def\math_stackers_handle_direct#top#bottom#category#topcode#bottomcode#text%
+ {\begingroup
+ \math_stackers_make_double#top#bottom{#category}{#topcode}{#bottomcode}{#text}%
\endgroup}
%D A relative new one is a combination of accents and text (as needed in mathml):
@@ -1197,14 +1234,14 @@
\unexpanded\def\defineextensiblefiller
{\dodoubleargument\math_stackers_define_filler}
-\def\math_stackers_define_filler[#1][#2]%
- {\setuevalue{#1}{\leaders\number#2\hfill}}
+% \def\math_stackers_define_filler[#1][#2]%
+% {\setuevalue{#1}{\leaders\number#2\hfill}}
-%D For the moment:
+%D For the moment (needs checking):
\def\math_stackers_define_filler[#1][#2]%
{\expandafter\let\csname\??mathextensiblefallbacks\number#2\expandafter\endcsname\csname#1\endcsname
- \expandafter\let\csname #1\expandafter\endcsname\csname#1\endcsname}
+ \expandafter\let\csname #1\expandafter\endcsname\csname#1\endcsname} % huh?
\defineextensiblefiller [barfill] ["203E]
\defineextensiblefiller [relfill] ["002D]
@@ -1283,6 +1320,12 @@
\definemathunstacked [\v!wide] [implies] ["27F9] % \mathrel{\;\Longrightarrow\;}
\definemathunstacked [\v!wide] [iff] ["27FA] % \mathrel{\;\Longleftrightarrow\;}
+% New (an example of using \mathexheight):
+
+\definemathstackers[\v!symbol][\c!voffset=-.40\mathexheight,\c!hoffset=\zeropoint]
+
+\definemathover[\v!symbol][interiorset]["2217]
+
\protect \endinput
% \mathrel{\mathop{\hbox to \dimen0{\hss\copy4\hss}}
diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua
index bc9bcaf71..6fe57b2ce 100644
--- a/tex/context/base/mkiv/mult-low.lua
+++ b/tex/context/base/mkiv/mult-low.lua
@@ -85,6 +85,7 @@ return {
--
"fontslantperpoint", "fontinterwordspace", "fontinterwordstretch", "fontinterwordshrink",
"fontexheight", "fontemwidth", "fontextraspace", "slantperpoint",
+ "mathexheight", "mathemwidth",
"interwordspace", "interwordstretch", "interwordshrink", "exheight", "emwidth", "extraspace",
"mathsupdisplay", "mathsupnormal", "mathsupcramped", "mathsubnormal", "mathsubcombined", "mathaxisheight",
"muquad",
diff --git a/tex/context/base/mkiv/page-lay.mkiv b/tex/context/base/mkiv/page-lay.mkiv
index f2e39c660..6eec90149 100644
--- a/tex/context/base/mkiv/page-lay.mkiv
+++ b/tex/context/base/mkiv/page-lay.mkiv
@@ -1590,8 +1590,8 @@
\definepapersize
[doubleoversized]
- [ \c!width=\dimexpr \paperheight+\layouttargetparameter\c!distance\relax,
- \c!height=\dimexpr2\paperwidth +\layouttargetparameter\c!distance\relax]
+ [ \c!width=\dimexpr \paperwidth +\layouttargetparameter\c!distance\relax,
+ \c!height=\dimexpr2\paperheight+\layouttargetparameter\c!distance\relax]
\definepapersize
[doublewide]
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 0a1c6d9d0..52f74e413 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 386ad3a6a..0b11a250e 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/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 2810ec148..b3398d7d7 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 edc1f7df4..ec31adeff 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
Binary files differ
diff --git a/tex/context/modules/mkiv/m-scite.mkiv b/tex/context/modules/mkiv/m-scite.mkiv
index c381475d0..18950f6a1 100644
--- a/tex/context/modules/mkiv/m-scite.mkiv
+++ b/tex/context/modules/mkiv/m-scite.mkiv
@@ -252,6 +252,7 @@ local handler = visualizers.newhandler {
stopinline = function(settings) stopInlineScite() end,
startdisplay = function(settings) startDisplayScite(settings.name or "") end,
stopdisplay = function(settings) stopDisplayScite() end,
+ noescape = true,
}
local knownlexers = scite.knownlexers
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 8cb21b53b..e9a5b4127 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 : 08/28/17 12:14:10
+-- merge date : 08/29/17 19:35:06
do -- begin closure to overcome local limits and interference