From fa26d76abf0733c5756188d6072517451dd63923 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 21 Apr 2017 22:51:43 +0000 Subject: context (Apr 20 22:20) git-svn-id: svn://tug.org/texlive/trunk@43966 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/context/modules/mkiv/x-mathml.lua | 1 + .../tex/context/modules/mkiv/x-mathml.mkiv | 37 ++++++++++++++++++---- 2 files changed, 31 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/context/modules/mkiv') diff --git a/Master/texmf-dist/tex/context/modules/mkiv/x-mathml.lua b/Master/texmf-dist/tex/context/modules/mkiv/x-mathml.lua index 7d0b42d2108..9650afab824 100644 --- a/Master/texmf-dist/tex/context/modules/mkiv/x-mathml.lua +++ b/Master/texmf-dist/tex/context/modules/mkiv/x-mathml.lua @@ -187,6 +187,7 @@ local i_replacements = { ["true"] = "{\\mathrm true}", ["declare"] = "{\\mathrm declare}", ["as"] = "{\\mathrm as}", + } -- we could use a metatable or when accessing fallback on the diff --git a/Master/texmf-dist/tex/context/modules/mkiv/x-mathml.mkiv b/Master/texmf-dist/tex/context/modules/mkiv/x-mathml.mkiv index 7ed1b432292..50d31da0ec3 100644 --- a/Master/texmf-dist/tex/context/modules/mkiv/x-mathml.mkiv +++ b/Master/texmf-dist/tex/context/modules/mkiv/x-mathml.mkiv @@ -204,7 +204,7 @@ %D The second implementation expanded the whole math sequence %D into an internal \TEX\ representation. This is a rather clean %D and fast process. Filtering and testing takes place by -%D redefining teh internal representation macros. +%D redefining the internal representation macros. %D %D The third implementation may look a bit more messy in some %D respects. This is because in \TEX\ it's not that trivial to @@ -1849,9 +1849,13 @@ \let\mmlfrac\frac \xmlmapvalue {mml:l} {+} {\let\mmlfrac\sfrac} +\xmlmapvalue {mml:d} {true} {\displaystyle} +\xmlmapvalue {mml:d} {false} {\textstyle} % or whatever + % todo: displaystyle=true/false (or whatever else shows up) \starttexdefinition setmmlmathstyle #1 + \xmlval{mml:d}{\xmlatt{#1}{displaystyle}}\empty % was: \mmmr \xmlval{mml:s}{\xmlatt{#1}{mathvariant}}\empty % was: \mmmr \stoptexdefinition @@ -2268,9 +2272,9 @@ \def\mmlextensible#1{\ctxmodulemathml{extensible(\!!bs#1\!!es)}} -\definemathtriplet [\v!mathematics] [mmlovertriplet] % or will we use a special instance -\definemathtriplet [\v!mathematics] [mmlundertriplet] % or will we use a special instance -\definemathtriplet [\v!mathematics] [mmldoubletriplet] % or will we use a special instance +\definemathtriplet [\v!mathematics] [mmlovertriplet] % or will we use a special instance +\definemathtriplet [\v!mathematics] [mmlundertriplet] % or will we use a special instance +\definemathtriplet [\v!mathematics] [mmldoubletriplet] % or will we use a special instance % common to munder/mover/munderover : will become core helper (speed up too) @@ -2319,9 +2323,15 @@ \startxmlsetups mml:mover \edef\mmlbasetoken{\mmlextensible{\xmlraw{#1}{/mml:*[1]}}}% /text() - \doifelseutfmathfiller\mmlbasetoken \mmloverbasefiller \mmloveraccentchecker {#1} + \doifelseutfmathlimop\mmlbasetoken + {\mmllimopover{#1}} + {\doifelseutfmathfiller\mmlbasetoken \mmloverbasefiller \mmloveraccentchecker {#1}} \stopxmlsetups +\starttexdefinition mmllimopover #1 + \mmlbasetoken ^{\mmlfencedsecond{#1}} +\stoptexdefinition + % munder \starttexdefinition unexpanded mmlunderbelow #1 @@ -2351,9 +2361,15 @@ \startxmlsetups mml:munder \edef\mmlbasetoken{\mmlextensible{\xmlraw{#1}{/mml:*[1]}}}% /text() - \doifelseutfmathfiller\mmlbasetoken \mmlunderbasefiller \mmlunderaccentchecker {#1} + \doifelseutfmathlimop\mmlbasetoken + {\mmllimopunder{#1}} + {\doifelseutfmathfiller\mmlbasetoken \mmlunderbasefiller \mmlunderaccentchecker {#1}} \stopxmlsetups +\starttexdefinition mmllimopunder #1 + \mmlbasetoken _{\mmlfencedsecond{#1}} +\stoptexdefinition + % munderover \starttexdefinition unexpanded mmlunderoveraccentcheckerUO #1 @@ -2412,11 +2428,18 @@ \edef\mmlbasecommand{e\utfmathcommandfiller\mmlbasetoken}% \mmlexecuteifdefined\mmlbasecommand \relax {\mmlfencedthird{#1}} {\mmlfencedsecond{#1}} \stoptexdefinition + \startxmlsetups mml:munderover \edef\mmlbasetoken{\mmlextensible{\xmlraw{#1}{/mml:*[1]}}}% /text() - \doifelseutfmathfiller\mmlbasetoken \mmlunderoverbasefiller \mmlunderoveraccentchecker {#1} + \doifelseutfmathlimop\mmlbasetoken + {\mmllimopunderover{#1}} + {\doifelseutfmathfiller\mmlbasetoken \mmlunderoverbasefiller \mmlunderoveraccentchecker {#1}} \stopxmlsetups +\starttexdefinition mmllimopunderover #1 + \mmlbasetoken ^{\mmlfencedthird{#1}}_{\mmlfencedsecond{#1}} +\stoptexdefinition + % tables (mml:mtable, mml:mtr, mml:mlabledtr, mml:mtd) \startxmlsetups mml:mtable % some more attributes need to be supported -- cgit v1.2.3