diff options
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/tex/texnodes.h')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/texnodes.h | 61 |
1 files changed, 34 insertions, 27 deletions
diff --git a/Build/source/texk/web2c/luatexdir/tex/texnodes.h b/Build/source/texk/web2c/luatexdir/tex/texnodes.h index 93670b7f5b3..6650d17f410 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texnodes.h +++ b/Build/source/texk/web2c/luatexdir/tex/texnodes.h @@ -148,30 +148,33 @@ typedef enum { # define synctex_line_glue(a) vlink((a)+6) #define glue_is_zero(p) \ - ((p == null) || (width(p) == 0 && stretch(p) == 0 && shrink(p) == 0)) + ((p == null) || (width(p) == 0 && stretch(p) == 0 && shrink(p) == 0)) + +#define glue_is_positive(p) \ + ((p == null) || (width(p) > 0)) #define reset_glue_to_zero(p) \ - if (p != null) { \ - width(p) = 0; \ - stretch(p) = 0; \ - shrink(p) = 0; \ - stretch_order(p) = 0; \ - shrink_order(p) = 0; \ - } + if (p != null) { \ + width(p) = 0; \ + stretch(p) = 0; \ + shrink(p) = 0; \ + stretch_order(p) = 0; \ + shrink_order(p) = 0; \ + } #define copy_glue_values(p,q) \ - if (q == null) { \ - width(p) = 0; \ - stretch(p) = 0; \ - shrink(p) = 0; \ - stretch_order(p) = 0; \ - shrink_order(p) = 0; \ - } else { \ - width(p) = width(q); \ - stretch(p) = stretch(q); \ - shrink(p) = shrink(q); \ - stretch_order(p) = stretch_order(q); \ - shrink_order(p) = shrink_order(q); \ + if (q == null) { \ + width(p) = 0; \ + stretch(p) = 0; \ + shrink(p) = 0; \ + stretch_order(p) = 0; \ + shrink_order(p) = 0; \ + } else { \ + width(p) = width(q); \ + stretch(p) = stretch(q); \ + shrink(p) = shrink(q); \ + stretch_order(p) = stretch_order(q); \ + shrink_order(p) = shrink_order(q); \ } @@ -417,11 +420,17 @@ typedef enum { # define last_known_node temp_node /* used by \lastnodetype */ # define movement_node_size 3 -# define expr_node_size 3 # define if_node_size 2 # define align_stack_node_size 6 # define nesting_node_size 2 +# define expr_node_size 3 +# define expr_type(A) type((A)+1) +# define expr_state(A) subtype((A)+1) /* enum defined in scanning.w */ +# define expr_e_field(A) vlink((A)+1) /* saved expression so far */ +# define expr_t_field(A) vlink((A)+2) /* saved term so far */ +# define expr_n_field(A) vinfo((A)+2) /* saved numerator */ + # define span_node_size 3 # define span_span(a) vlink((a)+1) # define span_link(a) vinfo((a)+1) @@ -944,7 +953,10 @@ typedef enum { # define var_mem_stat_max (end_point+glyph_node_size-1) # define stretching 1 -# define shrinking 2 +# define shrinking 2 + +# define last_normal_node shape_node +# define last_whatsit_node pdf_restore_node # define is_running(A) ((A)==null_flag) /* tests for a running dimension */ @@ -978,11 +990,6 @@ extern int lua_properties_enabled ; extern int lua_properties_level ; extern int lua_properties_use_metatable ; -#define local_inter_line_penalty int_par(local_inter_line_penalty_code) -#define local_broken_penalty int_par(local_broken_penalty_code) -#define local_left_box equiv(local_left_box_base) -#define local_right_box equiv(local_right_box_base) - extern halfword make_local_par_node(int mode); #endif |