diff options
26 files changed, 165 insertions, 222 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index e0b419e04..dee646123 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.07.19 23:54} +\newcontextversion{2013.07.20 13:31} %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 651eb697d..581fcb652 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 f3d70c375..6cd2879c7 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.07.19 23:54} +\edef\contextversion{2013.07.20 13:31} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/math-fbk.lua b/tex/context/base/math-fbk.lua index f319fdf07..383b08f0d 100644 --- a/tex/context/base/math-fbk.lua +++ b/tex/context/base/math-fbk.lua @@ -398,6 +398,7 @@ virtualcharacters[0x203E] = function(data) -- could be FE33E instead end virtualcharacters[0xFE33E] = virtualcharacters[0x203E] -- convenient +virtualcharacters[0xFE33F] = virtualcharacters[0x203E] -- convenient virtualcharacters[0xFE3DE] = function(data) local target, original = data.target, data.original diff --git a/tex/context/base/math-rad.mkvi b/tex/context/base/math-rad.mkvi index a4329c489..386b1deaf 100644 --- a/tex/context/base/math-rad.mkvi +++ b/tex/context/base/math-rad.mkvi @@ -35,7 +35,7 @@ \setupmathradical [\c!alternative=\v!normal, - \c!offset=.25\exheight] + \c!mpoffset=.25\exheight] \appendtoks \setuevalue{\currentmathradical}{\math_radical_handle{\currentmathradical}} @@ -151,7 +151,7 @@ \setvalue{\??mathradicalalternative\v!mp}#body% we could use dowithnextbox {\begingroup - \scratchoffset\mathradicalparameter\c!offset + \scratchoffset\mathradicalparameter\c!mpoffset \setbox\nextbox\mathstylehbox{#body}% % we use the \overlay variables as these are passes anyway and % it's more efficient than using parameters @@ -199,7 +199,7 @@ \setupmathornament [\c!alternative=\v!mp, % currently mp only .. maybe some day layer too - \c!offset=.25\exheight] + \c!mpoffset=.25\exheight] \appendtoks \setuevalue{\currentmathornament}{\math_ornament_handle{\currentmathornament}} @@ -213,7 +213,7 @@ \setvalue{\??mathornamentalternative\v!mp}#body% we could use dowithnextbox {\begingroup - \scratchoffset\mathornamentparameter\c!offset + \scratchoffset\mathornamentparameter\c!mpoffset \setbox\nextbox\mathstylehbox{#body}% \edef\overlaywidth {\the\wd\nextbox}% \edef\overlayheight {\the\ht\nextbox}% diff --git a/tex/context/base/math-stc.mkvi b/tex/context/base/math-stc.mkvi index a8a215a07..5a7ba85ec 100644 --- a/tex/context/base/math-stc.mkvi +++ b/tex/context/base/math-stc.mkvi @@ -48,6 +48,10 @@ %D %D In the end we have a more flexible mechanism which also handles text variants. +%D When wrapping up some math developments I decided to add mp support here +%D as well. A nice evening job with Joe Bonamassa performing live on the big +%D screen (real nice bluray's). See meta-imp-mat.mkiv for examples. + % possible improvements: % % - we could skip the left/right offsets when offset=normal, this saves some access time @@ -121,6 +125,9 @@ \c!right=, \c!alternative=\v!normal, \c!mp=math:stacker:\number\scratchunicode, + \c!mpheight=\exheight, + \c!mpdepth=\exheight, + \c!mpoffset=.25\exheight, \c!voffset=.25\exheight, \c!hoffset=.5\emwidth, \c!minheight=\exheight, @@ -187,11 +194,10 @@ \setvalue{\??mathstackersalternative\v!mp}% {\hbox\bgroup % todo: add code key + tag - \scratchoffset\mathstackersparameter\c!offset \edef\overlaywidth {\the\scratchwidth}% - \edef\overlayheight {\the\dimexpr\mathstackersparameter\c!height}% - \edef\overlaydepth {\the\dimexpr\mathstackersparameter\c!depth}% - \edef\overlayoffset {\the\scratchoffset}% + \edef\overlayheight {\the\dimexpr\mathstackersparameter\c!mpheight}% + \edef\overlaydepth {\the\dimexpr\mathstackersparameter\c!mpdepth}% + \edef\overlayoffset {\the\dimexpr\mathstackersparameter\c!mpoffset}% \edef\overlaylinewidth{\the\linewidth}% \edef\overlaylinecolor{\mathstackersparameter\c!color}% \edef\p_mp{\mathstackersparameter\c!mp}% @@ -753,9 +759,9 @@ % alternatively we can move the original to FE* -\definemathunderextensible [vfenced] [underbar] ["FE33E] % ["203E] \definemathoverextensible [vfenced] [overbar] ["FE33E] % ["203E] -\definemathdoubleextensible [vfenced] [doublebar] ["FE33E] ["FE33E] +\definemathunderextensible [vfenced] [underbar] ["FE33F] % ["203E] +\definemathdoubleextensible [vfenced] [doublebar] ["FE33E] ["FE33F] \definemathoverextensible [vfenced] [overbrace] ["FE3DE] % ["023DE] \definemathunderextensible [vfenced] [underbrace] ["FE3DF] % ["023DF] diff --git a/tex/context/base/mult-de.mkii b/tex/context/base/mult-de.mkii index 60eccd7f7..ab5e66140 100644 --- a/tex/context/base/mult-de.mkii +++ b/tex/context/base/mult-de.mkii @@ -822,6 +822,10 @@ \setinterfaceconstant{minwidth}{minbreite} \setinterfaceconstant{monthconversion}{monthconversion} \setinterfaceconstant{more}{more} +\setinterfaceconstant{mpdepth}{mpdepth} +\setinterfaceconstant{mpheight}{mpheight} +\setinterfaceconstant{mpoffset}{mpoffset} +\setinterfaceconstant{mpwidth}{mpwidth} \setinterfaceconstant{n}{n} \setinterfaceconstant{name}{name} \setinterfaceconstant{namesep}{namesep} diff --git a/tex/context/base/mult-def.lua b/tex/context/base/mult-def.lua index 10e99888e..8c515ba8b 100644 --- a/tex/context/base/mult-def.lua +++ b/tex/context/base/mult-def.lua @@ -8924,6 +8924,22 @@ return { ["pe"]="کمترینعرض", ["ro"]="latimeminima", }, + ["mpwidth"]={ + ["en"]="mpwidth", + ["nl"]="mpbreedte", + }, + ["mpheight"]={ + ["en"]="mpheight", + ["nl"]="mphoogte", + }, + ["mpdepth"]={ + ["en"]="mpdepth", + ["nl"]="mpdiepte", + }, + ["mpoffset"]={ + ["en"]="mpoffset", + ["nl"]="mpoffset", + }, ["monthconversion"]={ ["en"]="monthconversion", ["nl"]="maandconversie", diff --git a/tex/context/base/mult-en.mkii b/tex/context/base/mult-en.mkii index 49076741c..a543151ce 100644 --- a/tex/context/base/mult-en.mkii +++ b/tex/context/base/mult-en.mkii @@ -822,6 +822,10 @@ \setinterfaceconstant{minwidth}{minwidth} \setinterfaceconstant{monthconversion}{monthconversion} \setinterfaceconstant{more}{more} +\setinterfaceconstant{mpdepth}{mpdepth} +\setinterfaceconstant{mpheight}{mpheight} +\setinterfaceconstant{mpoffset}{mpoffset} +\setinterfaceconstant{mpwidth}{mpwidth} \setinterfaceconstant{n}{n} \setinterfaceconstant{name}{name} \setinterfaceconstant{namesep}{namesep} diff --git a/tex/context/base/mult-fr.mkii b/tex/context/base/mult-fr.mkii index 945c5f74f..10c9e6713 100644 --- a/tex/context/base/mult-fr.mkii +++ b/tex/context/base/mult-fr.mkii @@ -822,6 +822,10 @@ \setinterfaceconstant{minwidth}{largeurmin} \setinterfaceconstant{monthconversion}{monthconversion} \setinterfaceconstant{more}{more} +\setinterfaceconstant{mpdepth}{mpdepth} +\setinterfaceconstant{mpheight}{mpheight} +\setinterfaceconstant{mpoffset}{mpoffset} +\setinterfaceconstant{mpwidth}{mpwidth} \setinterfaceconstant{n}{n} \setinterfaceconstant{name}{nom} \setinterfaceconstant{namesep}{namesep} diff --git a/tex/context/base/mult-it.mkii b/tex/context/base/mult-it.mkii index 20fe0be3f..c485cbf31 100644 --- a/tex/context/base/mult-it.mkii +++ b/tex/context/base/mult-it.mkii @@ -822,6 +822,10 @@ \setinterfaceconstant{minwidth}{ampiezzamin} \setinterfaceconstant{monthconversion}{monthconversion} \setinterfaceconstant{more}{more} +\setinterfaceconstant{mpdepth}{mpdepth} +\setinterfaceconstant{mpheight}{mpheight} +\setinterfaceconstant{mpoffset}{mpoffset} +\setinterfaceconstant{mpwidth}{mpwidth} \setinterfaceconstant{n}{n} \setinterfaceconstant{name}{nome} \setinterfaceconstant{namesep}{namesep} diff --git a/tex/context/base/mult-nl.mkii b/tex/context/base/mult-nl.mkii index 11c25f4e9..adaf09b01 100644 --- a/tex/context/base/mult-nl.mkii +++ b/tex/context/base/mult-nl.mkii @@ -822,6 +822,10 @@ \setinterfaceconstant{minwidth}{minbreedte} \setinterfaceconstant{monthconversion}{maandconversie} \setinterfaceconstant{more}{meer} +\setinterfaceconstant{mpdepth}{mpdiepte} +\setinterfaceconstant{mpheight}{mphoogte} +\setinterfaceconstant{mpoffset}{mpoffset} +\setinterfaceconstant{mpwidth}{mpbreedte} \setinterfaceconstant{n}{n} \setinterfaceconstant{name}{naam} \setinterfaceconstant{namesep}{namesep} diff --git a/tex/context/base/mult-pe.mkii b/tex/context/base/mult-pe.mkii index 39ae60042..5954d1d6f 100644 --- a/tex/context/base/mult-pe.mkii +++ b/tex/context/base/mult-pe.mkii @@ -822,6 +822,10 @@ \setinterfaceconstant{minwidth}{کمترینعرض} \setinterfaceconstant{monthconversion}{monthconversion} \setinterfaceconstant{more}{more} +\setinterfaceconstant{mpdepth}{mpdepth} +\setinterfaceconstant{mpheight}{mpheight} +\setinterfaceconstant{mpoffset}{mpoffset} +\setinterfaceconstant{mpwidth}{mpwidth} \setinterfaceconstant{n}{n} \setinterfaceconstant{name}{نام} \setinterfaceconstant{namesep}{namesep} diff --git a/tex/context/base/mult-ro.mkii b/tex/context/base/mult-ro.mkii index f61321e8b..4fa4d3ce1 100644 --- a/tex/context/base/mult-ro.mkii +++ b/tex/context/base/mult-ro.mkii @@ -822,6 +822,10 @@ \setinterfaceconstant{minwidth}{latimeminima} \setinterfaceconstant{monthconversion}{monthconversion} \setinterfaceconstant{more}{more} +\setinterfaceconstant{mpdepth}{mpdepth} +\setinterfaceconstant{mpheight}{mpheight} +\setinterfaceconstant{mpoffset}{mpoffset} +\setinterfaceconstant{mpwidth}{mpwidth} \setinterfaceconstant{n}{n} \setinterfaceconstant{name}{nume} \setinterfaceconstant{namesep}{namesep} diff --git a/tex/context/base/page-app.mkiv b/tex/context/base/page-app.mkiv index 272245cce..e4858d48f 100644 --- a/tex/context/base/page-app.mkiv +++ b/tex/context/base/page-app.mkiv @@ -106,7 +106,7 @@ \fi \d_page_fitting_width \wd\b_page_fitting \d_page_fitting_height\ht\b_page_fitting -% wrong now: \startlocallayout % still valid? + \startlocallayout % hm, we change the papersize so we still need it \let\checkcurrentlayout\relax % else interference with odd/even layout \processaction [\fittingpageparameter\c!paper] @@ -117,7 +117,7 @@ \startmakeup[fittingpage]% \box\b_page_fitting \stopmakeup -% wrong now: \stoplocallayout % still valid? + \stoplocallayout % we need to get rid of this and use the built-in \egroup \autostoptext} diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 00a6349a0..589c2b66b 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 86fdf6321..2fa958598 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.07.19 23:54 MKIV beta fmt: 2013.7.19 int: english/english +ConTeXt ver: 2013.07.20 13:31 MKIV beta fmt: 2013.7.20 int: english/english system > 'cont-new.mkiv' loaded (cont-new.mkiv) @@ -14,216 +14,14 @@ system > files > jobname 's-inf-03', input './s-inf-03.mkiv', result 's fonts > latin modern fonts are not preloaded languages > language 'en' is active (c:/data/develop/context/texmf/tex/context/base/s-inf-03.mkiv (c:/data/develop/context/sources/type-loc.mkiv) (type-imp-dejavu.mkiv) (type-imp-xits.mkiv (type-imp-texgyre.mkiv)) -fonts > otf loading > loading 'c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSerif.ttf', hash 'dejavuserif' -fonts > otf loading > loading done -fonts > otf loading > file size: 363200 -fonts > encoding > loading (extended) adobe glyph list -fonts > otf loading > saving 'c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSerif.ttf' in cache -system > lua > compiling 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavuserif.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavuserif.tmc' -system > lua > dumping 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavuserif.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavuserif.tmc' stripped -fonts > otf loading > preprocessing and caching time 0.699, packtime 0.032 -fonts > otf loading > loading 'c:/data/develop/tex-context/tex/texmf/fonts/opentype/public/xits/xits-math.otf', hash 'xits-math' -fonts > otf loading > loading done -fonts > otf loading > file size: 506752 -fonts > otf loading > skipping cyclic reference U+00028 in math variant U+00028 -fonts > otf loading > skipping cyclic reference U+00029 in math variant U+00029 -fonts > otf loading > skipping cyclic reference U+0002F in math variant U+0002F -fonts > otf loading > skipping cyclic reference U+0005B in math variant U+0005B -fonts > otf loading > skipping cyclic reference U+0005C in math variant U+0005C -fonts > otf loading > skipping cyclic reference U+0005D in math variant U+0005D -fonts > otf loading > skipping cyclic reference U+0007B in math variant U+0007B -fonts > otf loading > skipping cyclic reference U+0007C in math variant U+0007C -fonts > otf loading > skipping cyclic reference U+0007D in math variant U+0007D -fonts > otf loading > skipping cyclic reference U+00302 in math variant U+00302 -fonts > otf loading > skipping cyclic reference U+00303 in math variant U+00303 -fonts > otf loading > skipping cyclic reference U+00305 in math variant U+00305 -fonts > otf loading > skipping cyclic reference U+0030C in math variant U+0030C -fonts > otf loading > skipping cyclic reference U+00330 in math variant U+00330 -fonts > otf loading > skipping cyclic reference U+00332 in math variant U+00332 -fonts > otf loading > skipping cyclic reference U+00338 in math variant U+00338 -fonts > otf loading > skipping cyclic reference U+0034D in math variant U+0034D -fonts > otf loading > skipping cyclic reference U+027E6 in math variant U+027E6 -fonts > otf loading > skipping cyclic reference U+02986 in math variant U+02986 -fonts > otf loading > skipping cyclic reference U+02A06 in math variant U+02A06 -fonts > otf loading > skipping cyclic reference U+027E7 in math variant U+027E7 -fonts > otf loading > skipping cyclic reference U+02A07 in math variant U+02A07 -fonts > otf loading > skipping cyclic reference U+02308 in math variant U+02308 -fonts > otf loading > skipping cyclic reference U+027E8 in math variant U+027E8 -fonts > otf loading > skipping cyclic reference U+02A08 in math variant U+02A08 -fonts > otf loading > skipping cyclic reference U+020E9 in math variant U+020E9 -fonts > otf loading > skipping cyclic reference U+02309 in math variant U+02309 -fonts > otf loading > skipping cyclic reference U+027E9 in math variant U+027E9 -fonts > otf loading > skipping cyclic reference U+02A09 in math variant U+02A09 -fonts > otf loading > skipping cyclic reference U+027EA in math variant U+027EA -fonts > otf loading > skipping cyclic reference U+02A0A in math variant U+02A0A -fonts > otf loading > skipping cyclic reference U+0222B in math variant U+0222B -fonts > otf loading > skipping cyclic reference U+0230B in math variant U+0230B -fonts > otf loading > skipping cyclic reference U+027EB in math variant U+027EB -fonts > otf loading > skipping cyclic reference U+02A0B in math variant U+02A0B -fonts > otf loading > skipping cyclic reference U+020EC in math variant U+020EC -fonts > otf loading > skipping cyclic reference U+0222C in math variant U+0222C -fonts > otf loading > skipping cyclic reference U+02A0C in math variant U+02A0C -fonts > otf loading > skipping cyclic reference U+020ED in math variant U+020ED -fonts > otf loading > skipping cyclic reference U+0222D in math variant U+0222D -fonts > otf loading > skipping cyclic reference U+02A0D in math variant U+02A0D -fonts > otf loading > skipping cyclic reference U+020EE in math variant U+020EE -fonts > otf loading > skipping cyclic reference U+0222E in math variant U+0222E -fonts > otf loading > skipping cyclic reference U+027EE in math variant U+027EE -fonts > otf loading > skipping cyclic reference U+02A0E in math variant U+02A0E -fonts > otf loading > skipping cyclic reference U+020EF in math variant U+020EF -fonts > otf loading > skipping cyclic reference U+0220F in math variant U+0220F -fonts > otf loading > skipping cyclic reference U+0222F in math variant U+0222F -fonts > otf loading > skipping cyclic reference U+027EF in math variant U+027EF -fonts > otf loading > skipping cyclic reference U+02A0F in math variant U+02A0F -fonts > otf loading > skipping cyclic reference U+020D0 in math variant U+020D0 -fonts > otf loading > skipping cyclic reference U+02210 in math variant U+02210 -fonts > otf loading > skipping cyclic reference U+02230 in math variant U+02230 -fonts > otf loading > skipping cyclic reference U+023B0 in math variant U+023B0 -fonts > otf loading > skipping cyclic reference U+02A10 in math variant U+02A10 -fonts > otf loading > skipping cyclic reference U+02211 in math variant U+02211 -fonts > otf loading > skipping cyclic reference U+023B1 in math variant U+023B1 -fonts > otf loading > skipping cyclic reference U+02A11 in math variant U+02A11 -fonts > otf loading > skipping cyclic reference U+00606 in math variant U+00606 -fonts > otf loading > skipping cyclic reference U+020D2 in math variant U+020D2 -fonts > otf loading > skipping cyclic reference U+02232 in math variant U+02232 -fonts > otf loading > skipping cyclic reference U+02772 in math variant U+02772 -fonts > otf loading > skipping cyclic reference U+02A12 in math variant U+02A12 -fonts > otf loading > skipping cyclic reference U+02233 in math variant U+02233 -fonts > otf loading > skipping cyclic reference U+02773 in math variant U+02773 -fonts > otf loading > skipping cyclic reference U+02A13 in math variant U+02A13 -fonts > otf loading > skipping cyclic reference U+023B4 in math variant U+023B4 -fonts > otf loading > skipping cyclic reference U+02A14 in math variant U+02A14 -fonts > otf loading > skipping cyclic reference U+023B5 in math variant U+023B5 -fonts > otf loading > skipping cyclic reference U+02A15 in math variant U+02A15 -fonts > otf loading > skipping cyclic reference U+02016 in math variant U+02016 -fonts > otf loading > skipping cyclic reference U+020D6 in math variant U+020D6 -fonts > otf loading > skipping cyclic reference U+02A16 in math variant U+02A16 -fonts > otf loading > skipping cyclic reference U+F02B5 in math variant U+F02B5 -fonts > otf loading > skipping cyclic reference U+F02B4 in math variant U+F02B4 -fonts > otf loading > skipping cyclic reference U+F02B3 in math variant U+F02B3 -fonts > otf loading > skipping cyclic reference U+F02B2 in math variant U+F02B2 -fonts > otf loading > skipping cyclic reference U+F02B1 in math variant U+F02B1 -fonts > otf loading > skipping cyclic reference U+020D7 in math variant U+020D7 -fonts > otf loading > skipping cyclic reference U+F029C in math variant U+F029C -fonts > otf loading > skipping cyclic reference U+F02AE in math variant U+F02AE -fonts > otf loading > skipping cyclic reference U+F029D in math variant U+F029D -fonts > otf loading > skipping cyclic reference U+F029E in math variant U+F029E -fonts > otf loading > skipping cyclic reference U+F029F in math variant U+F029F -fonts > otf loading > skipping cyclic reference U+F029B in math variant U+F029B -fonts > otf loading > skipping cyclic reference U+F02A0 in math variant U+F02A0 -fonts > otf loading > skipping cyclic reference U+F02A2 in math variant U+F02A2 -fonts > otf loading > skipping cyclic reference U+F02A3 in math variant U+F02A3 -fonts > otf loading > skipping cyclic reference U+F02AA in math variant U+F02AA -fonts > otf loading > skipping cyclic reference U+F02A9 in math variant U+F02A9 -fonts > otf loading > skipping cyclic reference U+F02A5 in math variant U+F02A5 -fonts > otf loading > skipping cyclic reference U+F02A7 in math variant U+F02A7 -fonts > otf loading > skipping cyclic reference U+F02A6 in math variant U+F02A6 -fonts > otf loading > skipping cyclic reference U+F02A8 in math variant U+F02A8 -fonts > otf loading > skipping cyclic reference U+F02A4 in math variant U+F02A4 -fonts > otf loading > skipping cyclic reference U+F02AB in math variant U+F02AB -fonts > otf loading > skipping cyclic reference U+F02A1 in math variant U+F02A1 -fonts > otf loading > skipping cyclic reference U+F02AC in math variant U+F02AC -fonts > otf loading > skipping cyclic reference U+F02AD in math variant U+F02AD -fonts > otf loading > skipping cyclic reference U+F02AF in math variant U+F02AF -fonts > otf loading > skipping cyclic reference U+F02B0 in math variant U+F02B0 -fonts > otf loading > skipping cyclic reference U+02A17 in math variant U+02A17 -fonts > otf loading > skipping cyclic reference U+029F8 in math variant U+029F8 -fonts > otf loading > skipping cyclic reference U+02A18 in math variant U+02A18 -fonts > otf loading > skipping cyclic reference U+029F9 in math variant U+029F9 -fonts > otf loading > skipping cyclic reference U+02A19 in math variant U+02A19 -fonts > otf loading > skipping cyclic reference U+0221A in math variant U+0221A -fonts > otf loading > skipping cyclic reference U+02A1A in math variant U+02A1A -fonts > otf loading > skipping cyclic reference U+0221B in math variant U+0221B -fonts > otf loading > skipping cyclic reference U+02A1B in math variant U+02A1B -fonts > otf loading > skipping cyclic reference U+0221C in math variant U+0221C -fonts > otf loading > skipping cyclic reference U+023DC in math variant U+023DC -fonts > otf loading > skipping cyclic reference U+02A1C in math variant U+02A1C -fonts > otf loading > skipping cyclic reference U+02AFC in math variant U+02AFC -fonts > otf loading > skipping cyclic reference U+023DD in math variant U+023DD -fonts > otf loading > skipping cyclic reference U+02A00 in math variant U+02A00 -fonts > otf loading > skipping cyclic reference U+0203E in math variant U+0203E -fonts > otf loading > skipping cyclic reference U+023DE in math variant U+023DE -fonts > otf loading > skipping cyclic reference U+023DF in math variant U+023DF -fonts > otf loading > skipping cyclic reference U+02AFF in math variant U+02AFF -fonts > otf loading > skipping cyclic reference U+02140 in math variant U+02140 -fonts > otf loading > skipping cyclic reference U+022C0 in math variant U+022C0 -fonts > otf loading > skipping cyclic reference U+023E0 in math variant U+023E0 -fonts > otf loading > skipping cyclic reference U+02980 in math variant U+02980 -fonts > otf loading > skipping cyclic reference U+023E1 in math variant U+023E1 -fonts > otf loading > skipping cyclic reference U+02A01 in math variant U+02A01 -fonts > otf loading > skipping cyclic reference U+022C2 in math variant U+022C2 -fonts > otf loading > skipping cyclic reference U+02A02 in math variant U+02A02 -fonts > otf loading > skipping cyclic reference U+022C3 in math variant U+022C3 -fonts > otf loading > skipping cyclic reference U+02983 in math variant U+02983 -fonts > otf loading > skipping cyclic reference U+02A03 in math variant U+02A03 -fonts > otf loading > skipping cyclic reference U+02044 in math variant U+02044 -fonts > otf loading > skipping cyclic reference U+02984 in math variant U+02984 -fonts > otf loading > skipping cyclic reference U+02A04 in math variant U+02A04 -fonts > otf loading > skipping cyclic reference U+020D1 in math variant U+020D1 -fonts > otf loading > skipping cyclic reference U+020E1 in math variant U+020E1 -fonts > otf loading > skipping cyclic reference U+02231 in math variant U+02231 -fonts > otf loading > skipping cyclic reference U+022C1 in math variant U+022C1 -fonts > otf loading > skipping cyclic reference U+02985 in math variant U+02985 -fonts > otf loading > skipping cyclic reference U+02A05 in math variant U+02A05 -fonts > otf loading > skipping cyclic reference U+00607 in math variant U+00607 -fonts > otf loading > skipping cyclic reference U+0230A in math variant U+0230A -fonts > otf loading > saving 'c:/data/develop/tex-context/tex/texmf/fonts/opentype/public/xits/xits-math.otf' in cache -system > lua > compiling 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-math.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-math.tmc' -system > lua > dumping 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-math.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-math.tmc' stripped -fonts > otf loading > preprocessing and caching time 0.317, packtime 0.030 -fonts > otf loading > loading 'c:/data/develop/tex-context/tex/texmf/fonts/opentype/public/xits/xits-mathbold.otf', hash 'xits-mathbold' -fonts > otf loading > loading done -fonts > otf loading > file size: 248944 -fonts > otf loading > skipping cyclic reference U+00028 in math variant U+00028 -fonts > otf loading > skipping cyclic reference U+00029 in math variant U+00029 -fonts > otf loading > skipping cyclic reference U+0002F in math variant U+0002F -fonts > otf loading > skipping cyclic reference U+0005B in math variant U+0005B -fonts > otf loading > skipping cyclic reference U+0005C in math variant U+0005C -fonts > otf loading > skipping cyclic reference U+0005D in math variant U+0005D -fonts > otf loading > skipping cyclic reference U+0007B in math variant U+0007B -fonts > otf loading > skipping cyclic reference U+0007D in math variant U+0007D -fonts > otf loading > skipping cyclic reference U+02A0C in math variant U+02A0C -fonts > otf loading > skipping cyclic reference U+0222D in math variant U+0222D -fonts > otf loading > skipping cyclic reference U+0222E in math variant U+0222E -fonts > otf loading > skipping cyclic reference U+02A0E in math variant U+02A0E -fonts > otf loading > skipping cyclic reference U+0222F in math variant U+0222F -fonts > otf loading > skipping cyclic reference U+02140 in math variant U+02140 -fonts > otf loading > skipping cyclic reference U+02A0F in math variant U+02A0F -fonts > otf loading > skipping cyclic reference U+02230 in math variant U+02230 -fonts > otf loading > skipping cyclic reference U+02A10 in math variant U+02A10 -fonts > otf loading > skipping cyclic reference U+02A11 in math variant U+02A11 -fonts > otf loading > skipping cyclic reference U+02233 in math variant U+02233 -fonts > otf loading > skipping cyclic reference U+02A1A in math variant U+02A1A -fonts > otf loading > skipping cyclic reference U+02A0D in math variant U+02A0D -fonts > otf loading > skipping cyclic reference U+0222B in math variant U+0222B -fonts > otf loading > skipping cyclic reference U+02A13 in math variant U+02A13 -fonts > otf loading > skipping cyclic reference U+02A15 in math variant U+02A15 -fonts > otf loading > skipping cyclic reference U+02A16 in math variant U+02A16 -fonts > otf loading > skipping cyclic reference U+0220F in math variant U+0220F -fonts > otf loading > skipping cyclic reference U+02A17 in math variant U+02A17 -fonts > otf loading > skipping cyclic reference U+02231 in math variant U+02231 -fonts > otf loading > skipping cyclic reference U+02A19 in math variant U+02A19 -fonts > otf loading > skipping cyclic reference U+02210 in math variant U+02210 -fonts > otf loading > skipping cyclic reference U+02A18 in math variant U+02A18 -fonts > otf loading > skipping cyclic reference U+02211 in math variant U+02211 -fonts > otf loading > skipping cyclic reference U+02232 in math variant U+02232 -fonts > otf loading > skipping cyclic reference U+02A1B in math variant U+02A1B -fonts > otf loading > skipping cyclic reference U+0222C in math variant U+0222C -fonts > otf loading > skipping cyclic reference U+02A1C in math variant U+02A1C -fonts > otf loading > skipping cyclic reference U+02A14 in math variant U+02A14 -fonts > otf loading > skipping cyclic reference U+02A12 in math variant U+02A12 -fonts > otf loading > skipping cyclic reference U+02A0B in math variant U+02A0B -fonts > otf loading > saving 'c:/data/develop/tex-context/tex/texmf/fonts/opentype/public/xits/xits-mathbold.otf' in cache -system > lua > compiling 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-mathbold.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-mathbold.tmc' -system > lua > dumping 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-mathbold.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-mathbold.tmc' stripped -fonts > otf loading > preprocessing and caching time 0.190, packtime 0.018 fonts > otf loading > loading 'c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSansMono.ttf', hash 'dejavusansmono' fonts > otf loading > loading done fonts > otf loading > file size: 333636 +fonts > encoding > loading (extended) adobe glyph list fonts > otf loading > saving 'c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSansMono.ttf' in cache system > lua > compiling 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono.tmc' system > lua > dumping 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono.tmc' stripped -fonts > otf loading > preprocessing and caching time 0.220, packtime 0.032 +fonts > otf loading > preprocessing and caching time 0.219, packtime 0.031 {c:/data/develop/tex-context/tex/texmf-context/fonts/map/pdftex/context/mkiv-base.map} fonts > otf loading > loading 'c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSansMono-Bold.ttf', hash 'dejavusansmono-bold' fonts > otf loading > loading done @@ -231,7 +29,7 @@ fonts > otf loading > file size: 313856 fonts > otf loading > saving 'c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSansMono-Bold.ttf' in cache system > lua > compiling 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono-bold.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono-bold.tmc' system > lua > dumping 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono-bold.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono-bold.tmc' stripped -fonts > otf loading > preprocessing and caching time 0.176, packtime 0.026 +fonts > otf loading > preprocessing and caching time 0.203, packtime 0.016 (virtual://buffer.noname.1 references > unknown reference '[][]' references > unknown reference '[][attributes]' @@ -270,4 +68,66 @@ references > unknown reference '[][fontloader]' references > unknown reference '[][fonts]' references > unknown reference '[][functions]' references > unknown reference '[][graphics]' -references > unknown r
\ No newline at end of file +references > unknown reference '[][gzip]' +references > unknown reference '[][img]' +references > unknown reference '[][interactions]' +references > unknown reference '[][interfaces]' +references > unknown reference '[][io]' +references > unknown reference '[][job]' +references > unknown reference '[][lang]' +references > unknown reference '[][languages]' +references > unknown reference '[][layouts]' +references > unknown reference '[][lfs]' +references > unknown reference '[][libraries]' +references > unknown reference '[][lmx]' +references > unknown reference '[][logs]' +references > unknown reference '[][lpdf]' +references > unknown reference '[][lpeg]' +references > unknown reference '[][ltn12]' +references > unknown reference '[][lua]' +references > unknown reference '[][luatex]' +references > unknown reference '[][lxml]' +references > unknown reference '[][math]' +references > unknown reference '[][mathematics]' +references > unknown reference '[][mbox]' +references > unknown reference '[][md5]' +references > unknown reference '[][metapost]' +references > unknown reference '[][mime]' +references > unknown reference '[][moduledata]' +references > unknown reference '[][modules]' +references > unknown reference '[][mplib]' +references > unknown reference '[][noads]' +references > unknown reference '[][node]' +references > unknown reference '[][nodes]' +references > unknown reference '[][number]' +references > unknown reference '[][os]' +references > unknown reference '[][package]' +references > unknown reference '[][pagebuilders]' +references > unknown reference '[][parametersets]' +references > unknown reference '[][pdf]' +references > unknown reference '[][pdfscanner]' +references > unknown reference '[][physics]' +references > unknown reference '[][profiler]' +references > unknown reference '[][regimes]' +references > unknown reference '[][resolvers]' +references > unknown reference '[][scripts]' +references > unknown reference '[][set]' +references > unknown reference '[][socket]' +references > unknown reference '[][sorters]' +references > unknown reference '[][statistics]' +references > unknown reference '[][status]' +references > unknown reference '[][storage]' +references > unknown reference '[][streams]' +references > unknown reference '[][string]' +references > unknown reference '[][structures]' +references > unknown reference '[][table]' +references > unknown reference '[][tex]' +references > unknown reference '[][texconfig]' +references > unknown reference '[][texio]' +references > unknown reference '[][thirddata]' +references > unknown reference '[][token]' +references > unknown reference '[][tokens]' +references > unknown reference '[][tracers]' +references > unknown reference '[][trackers]' +references > unknown reference '[][typesetters]' +references
\ No newline at end of file diff --git a/tex/context/interface/keys-cs.xml b/tex/context/interface/keys-cs.xml index 2499186f3..7853f731b 100644 --- a/tex/context/interface/keys-cs.xml +++ b/tex/context/interface/keys-cs.xml @@ -828,6 +828,10 @@ <cd:constant name='minwidth' value='minsirka'/> <cd:constant name='monthconversion' value='monthconversion'/> <cd:constant name='more' value='more'/> + <cd:constant name='mpdepth' value='mpdepth'/> + <cd:constant name='mpheight' value='mpheight'/> + <cd:constant name='mpoffset' value='mpoffset'/> + <cd:constant name='mpwidth' value='mpwidth'/> <cd:constant name='n' value='n'/> <cd:constant name='name' value='jmeno'/> <cd:constant name='namesep' value='namesep'/> diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index 6464bd44e..6d6b8858e 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -828,6 +828,10 @@ <cd:constant name='minwidth' value='minbreite'/> <cd:constant name='monthconversion' value='monthconversion'/> <cd:constant name='more' value='more'/> + <cd:constant name='mpdepth' value='mpdepth'/> + <cd:constant name='mpheight' value='mpheight'/> + <cd:constant name='mpoffset' value='mpoffset'/> + <cd:constant name='mpwidth' value='mpwidth'/> <cd:constant name='n' value='n'/> <cd:constant name='name' value='name'/> <cd:constant name='namesep' value='namesep'/> diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index 8a4eb55a9..b0777e355 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -828,6 +828,10 @@ <cd:constant name='minwidth' value='minwidth'/> <cd:constant name='monthconversion' value='monthconversion'/> <cd:constant name='more' value='more'/> + <cd:constant name='mpdepth' value='mpdepth'/> + <cd:constant name='mpheight' value='mpheight'/> + <cd:constant name='mpoffset' value='mpoffset'/> + <cd:constant name='mpwidth' value='mpwidth'/> <cd:constant name='n' value='n'/> <cd:constant name='name' value='name'/> <cd:constant name='namesep' value='namesep'/> diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml index 604e4560b..2633fe572 100644 --- a/tex/context/interface/keys-fr.xml +++ b/tex/context/interface/keys-fr.xml @@ -828,6 +828,10 @@ <cd:constant name='minwidth' value='largeurmin'/> <cd:constant name='monthconversion' value='monthconversion'/> <cd:constant name='more' value='more'/> + <cd:constant name='mpdepth' value='mpdepth'/> + <cd:constant name='mpheight' value='mpheight'/> + <cd:constant name='mpoffset' value='mpoffset'/> + <cd:constant name='mpwidth' value='mpwidth'/> <cd:constant name='n' value='n'/> <cd:constant name='name' value='nom'/> <cd:constant name='namesep' value='namesep'/> diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index ff23d0973..7cd34c3b6 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -828,6 +828,10 @@ <cd:constant name='minwidth' value='ampiezzamin'/> <cd:constant name='monthconversion' value='monthconversion'/> <cd:constant name='more' value='more'/> + <cd:constant name='mpdepth' value='mpdepth'/> + <cd:constant name='mpheight' value='mpheight'/> + <cd:constant name='mpoffset' value='mpoffset'/> + <cd:constant name='mpwidth' value='mpwidth'/> <cd:constant name='n' value='n'/> <cd:constant name='name' value='nome'/> <cd:constant name='namesep' value='namesep'/> diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index 6597300b3..3b427906a 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -828,6 +828,10 @@ <cd:constant name='minwidth' value='minbreedte'/> <cd:constant name='monthconversion' value='maandconversie'/> <cd:constant name='more' value='meer'/> + <cd:constant name='mpdepth' value='mpdiepte'/> + <cd:constant name='mpheight' value='mphoogte'/> + <cd:constant name='mpoffset' value='mpoffset'/> + <cd:constant name='mpwidth' value='mpbreedte'/> <cd:constant name='n' value='n'/> <cd:constant name='name' value='naam'/> <cd:constant name='namesep' value='namesep'/> diff --git a/tex/context/interface/keys-pe.xml b/tex/context/interface/keys-pe.xml index 212941015..64bad296e 100644 --- a/tex/context/interface/keys-pe.xml +++ b/tex/context/interface/keys-pe.xml @@ -828,6 +828,10 @@ <cd:constant name='minwidth' value='کمترینعرض'/> <cd:constant name='monthconversion' value='monthconversion'/> <cd:constant name='more' value='more'/> + <cd:constant name='mpdepth' value='mpdepth'/> + <cd:constant name='mpheight' value='mpheight'/> + <cd:constant name='mpoffset' value='mpoffset'/> + <cd:constant name='mpwidth' value='mpwidth'/> <cd:constant name='n' value='n'/> <cd:constant name='name' value='نام'/> <cd:constant name='namesep' value='namesep'/> diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index deb7ad559..d23d1b7bc 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -828,6 +828,10 @@ <cd:constant name='minwidth' value='latimeminima'/> <cd:constant name='monthconversion' value='monthconversion'/> <cd:constant name='more' value='more'/> + <cd:constant name='mpdepth' value='mpdepth'/> + <cd:constant name='mpheight' value='mpheight'/> + <cd:constant name='mpoffset' value='mpoffset'/> + <cd:constant name='mpwidth' value='mpwidth'/> <cd:constant name='n' value='n'/> <cd:constant name='name' value='nume'/> <cd:constant name='namesep' value='namesep'/> diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 0db62fe58..399135592 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 : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 07/19/13 23:54:06 +-- merge date : 07/20/13 13:31:51 do -- begin closure to overcome local limits and interference |