diff options
Diffstat (limited to 'tex/context')
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4107 -> 4111 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/math-fen.mkiv | 20 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24767 -> 24771 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.log | 2 | ||||
| -rw-r--r-- | tex/context/base/x-mathml.mkiv | 67 |
7 files changed, 67 insertions, 26 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index be47d5d52..69039bd41 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{2013.08.26 12:08} +\newcontextversion{2013.08.26 13:54} %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 Binary files differindex c45b138af..4ec7d204b 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 08493a92c..333343e45 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -25,7 +25,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2013.08.26 12:08} +\edef\contextversion{2013.08.26 13:54} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/math-fen.mkiv b/tex/context/base/math-fen.mkiv index 8d8ad7ae7..b487e6b5c 100644 --- a/tex/context/base/math-fen.mkiv +++ b/tex/context/base/math-fen.mkiv @@ -346,21 +346,31 @@ \expandafter\math_fences_saved_right \fi} -\unexpanded\def\math_fences_finish +\unexpanded\def\math_fences_checked_left_or_middle + {\ifcase\c_math_fenced_nesting + \expandafter\math_fences_saved_left + \else + \expandafter\math_fences_saved_middle + \fi} + +\unexpanded\def\math_fences_checked_start + {\c_math_fenced_nesting\zerocount} + +\unexpanded\def\math_fences_checked_stop {\ifcase\c_math_fenced_nesting\else \right.\relax % error, todo: nil spacing - \expandafter\math_fences_finish + \expandafter\math_fences_checked_stop \fi} \unexpanded\def\startcheckedfences {\begingroup - %\let\left \math_fences_checked_left + \let\left \math_fences_checked_left \let\middle\math_fences_checked_middle \let\right \math_fences_checked_right - \c_math_fenced_nesting\zerocount} + \math_fences_checked_start} \unexpanded\def\stopcheckedfences - {\math_fences_finish + {\math_fences_checked_stop \endgroup} %D The next characters were used for constructing nicer extensibles but diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex bb7e9df66..97d508098 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log index 3e9340ec2..4abf13779 100644 --- a/tex/context/base/status-lua.log +++ b/tex/context/base/status-lua.log @@ -1,6 +1,6 @@ (cont-yes.mkiv -ConTeXt ver: 2013.08.26 12:08 MKIV beta fmt: 2013.8.26 int: english/english +ConTeXt ver: 2013.08.26 13:54 MKIV beta fmt: 2013.8.26 int: english/english system > 'cont-new.mkiv' loaded (cont-new.mkiv) diff --git a/tex/context/base/x-mathml.mkiv b/tex/context/base/x-mathml.mkiv index 15c1694ff..3fd58a5b3 100644 --- a/tex/context/base/x-mathml.mkiv +++ b/tex/context/base/x-mathml.mkiv @@ -106,14 +106,24 @@ \settrue \mmlsomeleftdelimiter\expandafter\MMLright \fi} -\ifx\MMLleft \undefined \let\MMLleft \firstofoneargument \fi -\ifx\MMLright \undefined \let\MMLright \firstofoneargument \fi -\ifx\MMLmiddle\undefined \let\MMLmiddle\firstofoneargument \fi +% \ifx\MMLleft \undefined \let\MMLleft \firstofoneargument \fi +% \ifx\MMLright \undefined \let\MMLright \firstofoneargument \fi +% \ifx\MMLmiddle\undefined \let\MMLmiddle\firstofoneargument \fi -\def\mmlleftdelimiter #1{\ifconditional\mmlignoredelimiter#1\else\normalordelimiter{#1}{\MMLleft #1}\fi} -\def\mmlrightdelimiter #1{\ifconditional\mmlignoredelimiter#1\else\normalordelimiter{#1}{\MMLright #1}\fi} -\def\mmlmiddledelimiter #1{\ifconditional\mmlignoredelimiter#1\else\normalordelimiter{#1}{\MMLmiddle #1}\fi} -\def\mmlleftorrightdelimiter#1{\ifconditional\mmlignoredelimiter#1\else\normalordelimiter{#1}{\MMLleftorright#1}\fi} +% \def\mmlleftdelimiter #1{\ifconditional\mmlignoredelimiter#1\else\normalordelimiter{#1}{\MMLleft #1}\fi} +% \def\mmlrightdelimiter #1{\ifconditional\mmlignoredelimiter#1\else\normalordelimiter{#1}{\MMLright #1}\fi} +% \def\mmlmiddledelimiter #1{\ifconditional\mmlignoredelimiter#1\else\normalordelimiter{#1}{\MMLmiddle #1}\fi} +% \def\mmlleftorrightdelimiter#1{\ifconditional\mmlignoredelimiter#1\else\normalordelimiter{#1}{\MMLleftorright#1}\fi} + +% assumes +% +% \math_fences_checked_start +% \math_fences_checked_stop + +\let\mmlleftdelimiter \math_fences_checked_left +\let\mmlmiddledelimiter \math_fences_checked_middle +\let\mmlleftorrightdelimiter\math_fences_checked_left_or_middle +\let\mmlrightdelimiter \math_fences_checked_right \def\mmlchar#1{\char#1 } % used in lua code @@ -1887,13 +1897,20 @@ \setfalse\mmlignoredelimiter \stopxmlsetups +% \startxmlsetups mml:mfenced % {} around separator is needed for spacing +% \def\MMLleft {\left }% weird +% \def\MMLright {\right} +% \def\MMLmiddle{\middle} +% \ctxmodulemathml{mfenced("#1")} +% \stopxmlsetups + \startxmlsetups mml:mfenced % {} around separator is needed for spacing - \def\MMLleft {\left }% weird - \def\MMLright {\right} - \def\MMLmiddle{\middle} + \math_fences_checked_start \ctxmodulemathml{mfenced("#1")} + \math_fences_checked_stop \stopxmlsetups + \defineoverlay [mml:enclose:box] [\useMPgraphic{mml:enclose:box}] \defineoverlay [mml:enclose:roundedbox] [\useMPgraphic{mml:enclose:roundedbox}] \defineoverlay [mml:enclose:circle] [\useMPgraphic{mml:enclose:circle}] @@ -2105,18 +2122,32 @@ % % fails on { ... so we need +% \startxmlsetups mml:mrow +% \begingroup +% \xmldoifelse {#1} {/mml:mo[first() or last()]} {% we need a {} +% \def\MMLleft {\left } +% \def\MMLright {\right} +% \def\MMLmiddle{\middle} +% \enabledelimiter +% \checkdelimiters{\xmlall{#1}{/mml:mo}} +% \fakeleftdelimiter +% \xmlflush{#1} +% \fakerightdelimiter +% \disabledelimiter +% } { +% \xmlflush{#1} +% } +% \endgroup +% \stopxmlsetups +% +% more modern: + \startxmlsetups mml:mrow \begingroup \xmldoifelse {#1} {/mml:mo[first() or last()]} {% we need a {} - \def\MMLleft {\left } - \def\MMLright {\right} - \def\MMLmiddle{\middle} - \enabledelimiter - \checkdelimiters{\xmlall{#1}{/mml:mo}} - \fakeleftdelimiter + \math_fences_checked_start \xmlflush{#1} - \fakerightdelimiter - \disabledelimiter + \math_fences_checked_stop } { \xmlflush{#1} } |