beta 2013.08.20 13:38

10 files changed, 77 insertions, 87 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 13bfcc907..c1d44cc59 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.20 12:31}
+\newcontextversion{2013.08.20 13:38}
 
 %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
index 9b5a5f67e..edf7b01d2 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 c4747fd46..7ac17a1bc 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.20 12:31}
+\edef\contextversion{2013.08.20 13:38}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/font-con.lua b/tex/context/base/font-con.lua
index 2e35d3ad7..c5f891f27 100644
--- a/tex/context/base/font-con.lua
+++ b/tex/context/base/font-con.lua
@@ -385,7 +385,7 @@ function constructors.scale(tfmdata,specification)
     local hdelta         = delta
     local vdelta         = delta
     --
-    target.designsize    = parameters.designsize -- not really needed so it muight become obsolete
+    target.designsize    = parameters.designsize -- not really needed so it might become obsolete
     target.units_per_em  = units                 -- just a trigger for the backend (does luatex use this? if not it will go)
     --
     local direction      = properties.direction or tfmdata.direction or 0 -- pointless, as we don't use omf fonts at all
@@ -475,13 +475,13 @@ function constructors.scale(tfmdata,specification)
     --
     target.postprocessors = tfmdata.postprocessors
     --
-    local targetslant         = (parameters.slant         or parameters[1] or 0) -- *hdelta ? needs checking
-    local targetspace         = (parameters.space         or parameters[2] or 0)*hdelta
-    local targetspace_stretch = (parameters.space_stretch or parameters[3] or 0)*hdelta
-    local targetspace_shrink  = (parameters.space_shrink  or parameters[4] or 0)*hdelta
-    local targetx_height      = (parameters.x_height      or parameters[5] or 0)*vdelta
-    local targetquad          = (parameters.quad          or parameters[6] or 0)*hdelta
-    local targetextra_space   = (parameters.extra_space   or parameters[7] or 0)*hdelta
+    local targetslant         = (parameters.slant         or parameters[1] or 0) * factors.pt -- per point
+    local targetspace         = (parameters.space         or parameters[2] or 0) * hdelta
+    local targetspace_stretch = (parameters.space_stretch or parameters[3] or 0) * hdelta
+    local targetspace_shrink  = (parameters.space_shrink  or parameters[4] or 0) * hdelta
+    local targetx_height      = (parameters.x_height      or parameters[5] or 0) * vdelta
+    local targetquad          = (parameters.quad          or parameters[6] or 0) * hdelta
+    local targetextra_space   = (parameters.extra_space   or parameters[7] or 0) * hdelta
     --
     targetparameters.slant         = targetslant -- slantperpoint
     targetparameters.space         = targetspace
@@ -842,7 +842,7 @@ function constructors.finalize(tfmdata)
     end
     --
     if not parameters.designsize then
-        parameters.designsize = tfmdata.designsize or 655360
+        parameters.designsize = tfmdata.designsize or (factors.pt * 10)
     end
     --
     if not parameters.units then
diff --git a/tex/context/base/math-def.mkiv b/tex/context/base/math-def.mkiv
index cc75252aa..250986959 100644
--- a/tex/context/base/math-def.mkiv
+++ b/tex/context/base/math-def.mkiv
@@ -83,10 +83,6 @@
 \setoperatorlimits \ointclockwise    \intlimits
 \setoperatorlimits \ointctrclockwise \intlimits
 
-%D The following colon related definitions are provided by Aditya
-%D Mahajan who derived them from \type {mathtools.sty} and \type
-%D {colonequals.sty}.
-
 %D \macros
 %D   {centercolon, colonminus, minuscolon, colonequals, equalscolon,
 %D    colonapprox, approxcolon, colonsim, simcolon, coloncolon,
@@ -94,6 +90,11 @@
 %D    equalscoloncolon, coloncolonapprox, approxcoloncolon,
 %D    colonsim, simcoloncolon}
 %D
+%D The following colon related definitions are provided by Aditya
+%D Mahajan who derived them from \type {mathtools.sty} and \type
+%D {colonequals.sty}. This will be redone as part of the overhaul
+%D and font updates.
+%D
 %D In $a := b$ the colon is not vertically centered with the equal
 %D to. Also the distance between colon and equal to is a bit large.
 %D So, we define a vertically centered colon \tex {centercolon} and
@@ -119,16 +120,13 @@
 %D \formula {A \colonsim          B}
 %D \formula {A \simcoloncolon     B}
 %D \stoplines
-
+%D
 %D The next macros take care of the space between the colon and the
 %D relation symbol.
 
 \definemathcommand  [colonsep]        {\mkern-1.2mu}
 \definemathcommand  [doublecolonsep]  {\mkern-0.9mu}
 
-%D Now we define all the colon relations .. needs checking with char-def.lua ...
-%D will move to a separate module.
-
 \definemathcommand [centercolon]      [rel] {\mathstylevcenteredhbox\colon}
 \definemathcommand [colonminus]       [rel] {\centercolon\colonsep\mathrel{-}}
 \definemathcommand [minuscolon]       [rel] {\mathrel{-}\colonsep\centercolon} % native char
@@ -149,68 +147,6 @@
 \definemathcommand [colonsim]         [rel] {\coloncolon\colonsep\sim}
 \definemathcommand [simcoloncolon]    [rel] {\sim\coloncolon\colonsep}
 
-%D Goodies. We might move this elsewhere.
-
-% Be careful in choosing what accents you take (the code below uses a
-% combining one):
-%
-% \startbuffer
-% % $\Umathaccent top        0 0 "20D7 {example}$
-% % $\Umathaccent top  fixed 0 0 "20D7 {example}$
-% $\Umathaccent              0 0 "20D7 {example}$
-% $\Umathaccent        fixed 0 0 "20D7 {example}$
-% $\Umathaccent bottom       0 0 "20D7 {example}$
-% $\Umathaccent bottom fixed 0 0 "20D7 {example}$
-% $\Umathaccent both         0 0 "20D7
-%                            0 0 "20D7 {example}$
-% $\Umathaccent both fixed   0 0 "20D7
-%                    fixed   0 0 "20D7 {example}$
-% $\Umathaccent both         0 0 "20D7
-%                    fixed   0 0 "20D7 {example}$
-% $\Umathaccent both fixed   0 0 "20D7
-%                            0 0 "20D7 {example}$
-% \stopbuffer
-%
-% \setupbodyfont[modern]  \getbuffer
-% \setupbodyfont[xits]    \getbuffer
-% \setupbodyfont[cambria] \getbuffer
-
-\unexpanded\def\underleftarrow #1{\mathop{\Uunderdelimiter \defaultmathfamily "2190 {#1}}}
-\unexpanded\def\overleftarrow  #1{\mathop{\Uoverdelimiter  \defaultmathfamily "2190 {#1}}}
-\unexpanded\def\underrightarrow#1{\mathop{\Uunderdelimiter \defaultmathfamily "2192 {#1}}}
-\unexpanded\def\overrightarrow #1{\mathop{\Uoverdelimiter  \defaultmathfamily "2192 {#1}}}
-
-% watch out: here we have a class (zero):
-
-\unexpanded\def\normaldoublebrace {\Umathaccents 0 \defaultmathfamily "23DE 0 \defaultmathfamily "23DF }
-\unexpanded\def\normaldoubleparent{\Umathaccents 0 \defaultmathfamily "23DC 0 \defaultmathfamily "23DD }
-
-% let's keep this
-
-\let\normaloverbrace      \overbrace
-\let\normalunderbrace     \underbrace
-\let\normaloverparent     \overparent
-\let\normalunderparent    \underparent
-\let\normaloverbracket    \overbracket
-\let\normalunderbracket   \underbracket
-\let\normalunderleftarrow \underleftarrow
-\let\normaloverleftarrow  \overleftarrow
-\let\normalunderrightarrow\underrightarrow
-\let\normaloverrightarrow \overrightarrow
-
-\unexpanded\def\mathopwithlimits#1#2{\mathop{#1{#2}}\limits}
-\unexpanded\def\stackrel        #1#2{\mathrel{\mathop{#2}\limits^{#1}}}
-
-\let\lceil \lceiling
-\let\rceil \rceiling
-
-% todo mathclass=punctuation ord
-
-% \Umathcode"02C="6 \defaultmathfamily "02C
-% \Umathcode"02E="0 \defaultmathfamily "02E
-
-% tricky .. todo
-
 % \appendtoks
 %     \def\over{\primitive\over}%
 % \to \everymathematics
diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv
index bac46cbec..0ef206075 100644
--- a/tex/context/base/math-ini.mkiv
+++ b/tex/context/base/math-ini.mkiv
@@ -364,8 +364,14 @@
 
 %D Let's define a few comands here:
 
-\definemathcommand [mathstrut] {\vphantom{(}}
-\definemathcommand [joinrel]   {\mathrel{\mkern-3mu}}
+\definemathcommand [mathstrut]       {\vphantom{(}}
+%definemathcommand [joinrel]         {\mathrel{\mkern-3mu}}
+\definemathcommand [joinrel]   [rel] {\mkern-3mu}
+
+%D We could have a arg variant \unknown\ but not now.
+
+\unexpanded\def\mathopwithlimits#1#2{\mathop{#1{#2}}\limits}
+\unexpanded\def\stackrel        #1#2{\mathrel{\mathop{#2}\limits^{#1}}}
 
 %D Moved from font-ini.mkiv:
 %D
diff --git a/tex/context/base/math-stc.mkvi b/tex/context/base/math-stc.mkvi
index dd74f494c..76a07db5c 100644
--- a/tex/context/base/math-stc.mkvi
+++ b/tex/context/base/math-stc.mkvi
@@ -663,6 +663,54 @@
 
 % todo: top= bottom= middle= is nicer (compare math-fen)
 
+%D We save a few definitions that we automatically got from the \type {char-def.lua}
+%D database.
+
+% Be careful in choosing what accents you take (the code below uses a
+% combining one):
+%
+% \startbuffer
+% % $\Umathaccent top        0 0 "20D7 {example}$
+% % $\Umathaccent top  fixed 0 0 "20D7 {example}$
+% $\Umathaccent              0 0 "20D7 {example}$
+% $\Umathaccent        fixed 0 0 "20D7 {example}$
+% $\Umathaccent bottom       0 0 "20D7 {example}$
+% $\Umathaccent bottom fixed 0 0 "20D7 {example}$
+% $\Umathaccent both         0 0 "20D7
+%                            0 0 "20D7 {example}$
+% $\Umathaccent both fixed   0 0 "20D7
+%                    fixed   0 0 "20D7 {example}$
+% $\Umathaccent both         0 0 "20D7
+%                    fixed   0 0 "20D7 {example}$
+% $\Umathaccent both fixed   0 0 "20D7
+%                            0 0 "20D7 {example}$
+% \stopbuffer
+%
+% \setupbodyfont[modern]  \getbuffer
+% \setupbodyfont[xits]    \getbuffer
+% \setupbodyfont[cambria] \getbuffer
+
+\unexpanded\def\normaldoublebrace {\Umathaccents 0 \defaultmathfamily "23DE 0 \defaultmathfamily "23DF }
+\unexpanded\def\normaldoubleparent{\Umathaccents 0 \defaultmathfamily "23DC 0 \defaultmathfamily "23DD }
+
+% let's keep this
+
+\let\normaloverbrace      \overbrace
+\let\normalunderbrace     \underbrace
+\let\normaloverparent     \overparent
+\let\normalunderparent    \underparent
+\let\normaloverbracket    \overbracket
+\let\normalunderbracket   \underbracket
+\let\normalunderleftarrow \underleftarrow
+\let\normaloverleftarrow  \overleftarrow
+\let\normalunderrightarrow\underrightarrow
+\let\normaloverrightarrow \overrightarrow
+
+\let\lceil                \lceiling
+\let\rceil                \rceiling
+
+%D Here come the new ones:
+
 \definemathstackers [\v!none]   [\v!mathematics] [\c!hoffset=\zeropoint]
 \definemathstackers [\v!normal] [\v!mathematics] [\c!hoffset=0.5\emwidth] % the default
 \definemathstackers [\v!small]  [\v!mathematics] [\c!hoffset=1\emwidth]
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index f032aa51f..2313e57ca 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 f8901d762..cf5474a6f 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.20 12:31 MKIV beta  fmt: 2013.8.20  int: english/english
+ConTeXt  ver: 2013.08.20 13:38 MKIV beta  fmt: 2013.8.20  int: english/english
 
 system          > 'cont-new.mkiv' loaded
 (cont-new.mkiv)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 8e883bf9a..2a68f8baf 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  : 08/20/13 12:31:41
+-- merge date  : 08/20/13 13:38:20
 
 do -- begin closure to overcome local limits and interference
 
@@ -3802,7 +3802,7 @@ function constructors.scale(tfmdata,specification)
   end
   target.type=isvirtual and "virtual" or "real"
   target.postprocessors=tfmdata.postprocessors
-  local targetslant=(parameters.slant     or parameters[1] or 0) 
+  local targetslant=(parameters.slant     or parameters[1] or 0)*factors.pt 
   local targetspace=(parameters.space     or parameters[2] or 0)*hdelta
   local targetspace_stretch=(parameters.space_stretch or parameters[3] or 0)*hdelta
   local targetspace_shrink=(parameters.space_shrink or parameters[4] or 0)*hdelta
@@ -4120,7 +4120,7 @@ function constructors.finalize(tfmdata)
     parameters.slantfactor=tfmdata.slant or 0
   end
   if not parameters.designsize then
-    parameters.designsize=tfmdata.designsize or 655360
+    parameters.designsize=tfmdata.designsize or (factors.pt*10)
   end
   if not parameters.units then
     parameters.units=tfmdata.units_per_em or 1000