diff options
author | Taco Hoekwater <taco@elvenkind.com> | 2009-05-08 14:05:36 +0000 |
---|---|---|
committer | Taco Hoekwater <taco@elvenkind.com> | 2009-05-08 14:05:36 +0000 |
commit | 847dd2c2b80b429e4ed54c704930ce3c5b32dec3 (patch) | |
tree | 1274cf3bee7d12d28f98cd6b4d6cdece736ecca5 /Build/source/texk/web2c/luatexdir/tex | |
parent | 885eedd3f48fa03875f20c49589f9db732782de3 (diff) |
Here is luatex 0.40.1
git-svn-id: svn://tug.org/texlive/trunk@13007 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/tex')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/math.c | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/mlist.c | 23 |
2 files changed, 12 insertions, 15 deletions
diff --git a/Build/source/texk/web2c/luatexdir/tex/math.c b/Build/source/texk/web2c/luatexdir/tex/math.c index 9ec4aab9b39..9c40d128981 100644 --- a/Build/source/texk/web2c/luatexdir/tex/math.c +++ b/Build/source/texk/web2c/luatexdir/tex/math.c @@ -27,7 +27,7 @@ #include "tokens.h" static const char _svn_version[] = - "$Id: math.c 2314 2009-04-17 20:57:48Z hhenkel $ " + "$Id: math.c 2362 2009-04-29 16:03:00Z taco $ " "$URL: http://scm.foundry.supelec.fr/svn/luatex/trunk/source/texk/web2c/luatexdir/tex/math.c $"; #define mode cur_list.mode_field @@ -1320,7 +1320,7 @@ void set_math_char(mathcodeval mval) case 3: subtype(p) = rel_noad_type; break; case 4: subtype(p) = open_noad_type; break; case 5: subtype(p) = close_noad_type; break; - case 6: subtype(p) = inner_noad_type; break; + case 6: subtype(p) = punct_noad_type; break; } } vlink(tail) = p; diff --git a/Build/source/texk/web2c/luatexdir/tex/mlist.c b/Build/source/texk/web2c/luatexdir/tex/mlist.c index 0f211151fbc..5f19d162fdb 100644 --- a/Build/source/texk/web2c/luatexdir/tex/mlist.c +++ b/Build/source/texk/web2c/luatexdir/tex/mlist.c @@ -24,7 +24,7 @@ #include "commands.h" static const char _svn_version[] = - "$Id: mlist.c 2323 2009-04-18 09:53:47Z taco $ $URL: http://scm.foundry.supelec.fr/svn/luatex/trunk/source/texk/web2c/luatexdir/tex/mlist.c $"; + "$Id: mlist.c 2358 2009-04-27 06:39:33Z taco $ $URL: http://scm.foundry.supelec.fr/svn/luatex/trunk/source/texk/web2c/luatexdir/tex/mlist.c $"; #define delimiter_factor int_par(param_delimiter_factor_code) #define delimiter_shortfall dimen_par(param_delimiter_shortfall_code) @@ -2356,21 +2356,17 @@ void make_radical(pointer q) theta = fraction_rule(cur_style); y = var_delimiter(left_delimiter(q), cur_size, height(x) + depth(x) + clr + theta); - left_delimiter(q) = null; theta = height(y); - delta = depth(y) - (height(x) + depth(x) + clr); - if (delta > 0) - clr = clr + half(delta); /* increase the actual clearance */ - shift_amount(y) = -(height(x) + clr); - h = shift_amount(y) + height(y); } else { y = var_delimiter(left_delimiter(q), cur_size, height(x) + depth(x) + clr + theta); - left_delimiter(q) = null; - delta = height(y) - (height(x) + clr + theta); - shift_amount(y) = delta; - h = -(height(y) - shift_amount(y)); } + left_delimiter(q) = null; + delta = (depth(y)+height(y)-theta) - (height(x) + depth(x) + clr); + if (delta > 0) + clr = clr + half(delta); /* increase the actual clearance */ + shift_amount(y) = (height(y)-theta)-(height(x) + clr); + h = depth(y) + height(y); p = overbar(x, clr, theta, radical_kern(cur_style), node_attr(y)); vlink(y) = p; if (degree(q) != null) { @@ -2388,8 +2384,9 @@ void make_radical(pointer q) x = new_kern(ar); reset_attributes(x, node_attr(degree(q))); vlink(x) = y; - shift_amount(r) = - (xn_over_d(h, radical_degree_raise(cur_style), 100)); + shift_amount(r) = + - ((xn_over_d(h, radical_degree_raise(cur_style), 100)) - + depth(y) - shift_amount(y)); vlink(r) = x; x = new_kern(br); reset_attributes(x, node_attr(degree(q))); |