diff options
| author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-04-18 13:15:27 +0000 |
|---|---|---|
| committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-04-18 13:15:27 +0000 |
| commit | 2031219ad063957257e2aff9e73a7c6ffb2c53ae (patch) | |
| tree | 4ab46c283f306388c8d2225a95280011f1fd50a8 /Build/source/texk/web2c | |
| parent | 54e5afc8c27e8ca504b374283376847b57566c72 (diff) | |
web2c/luatexdir: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@40595 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/texnodes.h | 2 | ||||
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/texnodes.w | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/luatexdir/tex/texnodes.h b/Build/source/texk/web2c/luatexdir/tex/texnodes.h index 4db62bf61b8..93670b7f5b3 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texnodes.h +++ b/Build/source/texk/web2c/luatexdir/tex/texnodes.h @@ -654,7 +654,7 @@ typedef enum { word_boundary, } boundary_subtypes ; -# define boundary_size 3 +# define boundary_node_size 3 # define boundary_value(a) vinfo((a)+2) # define special_node_size 3 diff --git a/Build/source/texk/web2c/luatexdir/tex/texnodes.w b/Build/source/texk/web2c/luatexdir/tex/texnodes.w index 4cbd0c00bea..df7de17db5f 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texnodes.w +++ b/Build/source/texk/web2c/luatexdir/tex/texnodes.w @@ -330,7 +330,7 @@ node_info node_data[] = { /* the last entry in a row is the etex number */ { ins_node, ins_node_size, node_fields_insert, "ins", 4 }, { mark_node, mark_node_size, node_fields_mark, "mark", 5 }, { adjust_node, adjust_node_size, node_fields_adjust, "adjust", 6 }, - { boundary_node, boundary_size, node_fields_boundary, "boundary", -1 }, + { boundary_node, boundary_node_size, node_fields_boundary, "boundary", -1 }, { disc_node, disc_node_size, node_fields_disc, "disc", 8 }, { whatsit_node, -1, NULL, "whatsit", 9 }, { local_par_node, local_par_size, node_fields_local_par, "local_par", -1 }, @@ -626,7 +626,13 @@ static int test_count = 1; #define check_action_ref(a) { dorangetest(p,a,var_mem_max); } #define check_attribute_ref(a) { dorangetest(p,a,var_mem_max); } -#define check_token_ref(a) { confusion("fuzzy token cleanup in node"); } +#define check_token_ref(a) { \ + if (type(p) == whatsit_node) { \ + formatted_error("nodes","fuzzy token cleanup in whatsit node with id %i and subtype %i",type(p),subtype(p)); \ + } else { \ + formatted_error("nodes","fuzzy token cleanup in node with id %i",type(p)); \ + } \ +} #ifdef CHECK_NODE_USAGE |