diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-04-06 13:02:10 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-04-06 13:02:10 +0000 |
commit | 808280db06d45875c9dff59b5c5d1968ca49e968 (patch) | |
tree | 98bc547d6f2cae98e24aabe489d4e9597ea54fb2 /Build/source/texk/web2c/luatexdir/tex | |
parent | 1a8710b741a150e498e679904912014e2e566da0 (diff) |
web2c/luatexdir: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@40259 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/tex')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/texmath.w | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/texnodes.w | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/luatexdir/tex/texmath.w b/Build/source/texk/web2c/luatexdir/tex/texmath.w index 5067764fbf9..abfd08db520 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texmath.w +++ b/Build/source/texk/web2c/luatexdir/tex/texmath.w @@ -2456,6 +2456,7 @@ void after_math(void) /* begin mathskip code */ if (! glue_is_zero(math_skip)) { copy_glue_values(tail,math_skip); + surround(tail) = 0; } /* end mathskip code */ if (dir_math_save) { @@ -2474,6 +2475,7 @@ void after_math(void) /* begin mathskip code */ if (! glue_is_zero(math_skip)) { copy_glue_values(tail,math_skip); + surround(tail) = 0; } /* end mathskip code */ space_factor = 1000; diff --git a/Build/source/texk/web2c/luatexdir/tex/texnodes.w b/Build/source/texk/web2c/luatexdir/tex/texnodes.w index 77610988d95..ef88d489845 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texnodes.w +++ b/Build/source/texk/web2c/luatexdir/tex/texnodes.w @@ -3022,11 +3022,9 @@ void show_node_list(int p) if (subtype(p) != normal) { print_char('('); if ((subtype(p) - 1) < thin_mu_skip_code) { - print_cmd_chr(assign_glue_cmd, - glue_base + (subtype(p) - 1)); + print_cmd_chr(assign_glue_cmd, glue_base + (subtype(p) - 1)); } else if (subtype(p) < cond_math_glue) { - print_cmd_chr(assign_mu_glue_cmd, - glue_base + (subtype(p) - 1)); + print_cmd_chr(assign_mu_glue_cmd, glue_base + (subtype(p) - 1)); } else if (subtype(p) == cond_math_glue) { tprint_esc("nonscript"); } else { @@ -3074,9 +3072,12 @@ void show_node_list(int p) tprint("on"); else tprint("off"); - if (width(p) != 0) { + if (!glue_is_zero(p)) { + tprint(", glued "); + print_spec(p, NULL); + } else if (surround(p) != 0) { tprint(", surrounded "); - print_scaled(width(p)); + print_scaled(surround(p)); } break; case penalty_node: |