diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-03-18 23:02:50 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-03-18 23:02:50 +0000 |
commit | 7c08e78692ed78bd6a10ca95133966ddcc326d4e (patch) | |
tree | 313cc3c5f4d525e906d6a5de2428d78fb88aa86b /Build/source/texk/web2c/luatexdir/tex/maincontrol.w | |
parent | 870b25c98edb0948ac01b134b3ed8447addd82d9 (diff) |
web2c/luatexdir: sync with the luatex trunk
git-svn-id: svn://tug.org/texlive/trunk@40069 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/tex/maincontrol.w')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/maincontrol.w | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/Build/source/texk/web2c/luatexdir/tex/maincontrol.w b/Build/source/texk/web2c/luatexdir/tex/maincontrol.w index 12a4bbab583..bf432e308da 100644 --- a/Build/source/texk/web2c/luatexdir/tex/maincontrol.w +++ b/Build/source/texk/web2c/luatexdir/tex/maincontrol.w @@ -87,8 +87,6 @@ #define prev_graf cur_list.pg_field #define dir_save cur_list.dirs_field -#define check_filter(A) if (!output_active) lua_node_filter_s(buildpage_filter_callback,lua_key_index(A)) - #define var_code 7 /* math code meaning ``use the current family'' */ @ We come now to the |main_control| routine, which contains the master @@ -238,6 +236,8 @@ static void run_app_space (void) { } else { temp_ptr = new_param_glue(space_skip_code); } +/* so from now we have a subtype with spaces: */ +subtype(temp_ptr) = space_skip_code + 1 ; couple_nodes(tail,temp_ptr); tail = temp_ptr; } @@ -484,7 +484,7 @@ like \.{\\vbox}, \.{\\insert}, or \.{\\output}. static void run_par_end_vmode (void) { normal_paragraph(); if (mode > 0) { - check_filter(vmode_par); + checked_page_filter(vmode_par); build_page(); } } @@ -495,7 +495,7 @@ static void run_par_end_hmode (void) { off_save(); /* this tries to recover from an alignment that didn't end properly */ end_graf(bottom_level); /* this takes us to the enclosing mode, if |mode>0| */ if (mode == vmode) { - check_filter(hmode_par); + checked_page_filter(hmode_par); build_page(); } } @@ -1003,6 +1003,8 @@ void app_space(void) halfword q; /* glue node */ if ((space_factor >= 2000) && (xspace_skip != zero_glue)) { q = new_param_glue(xspace_skip_code); +/* so from now we have a subtype with spaces: */ +subtype(q) = xspace_skip_code + 1; } else { if (space_skip != zero_glue) { main_p = new_spec(space_skip); @@ -1019,6 +1021,8 @@ void app_space(void) shrink(main_p) = xn_over_d(shrink(main_p), 1000, space_factor); q = new_glue(main_p); glue_ref_count(main_p) = null; +/* so from now we have a subtype with spaces: */ +subtype(q) = space_skip_code + 1; } couple_nodes(tail, q); tail = q; @@ -1114,7 +1118,7 @@ boolean its_all_over(void) width(tail) = hsize; tail_append(new_glue(fill_glue)); tail_append(new_penalty(-010000000000)); - lua_node_filter_s(buildpage_filter_callback,lua_key_index(end)); + normal_page_filter(end); build_page(); /* append \.{\\hbox to \\hsize\{\}\\vfill\\penalty-'10000000000} */ } return false; @@ -1309,7 +1313,7 @@ void handle_right_brace(void) list_ptr(p) = null; flush_node(p); if (nest_ptr == 0) { - check_filter(insert); + checked_page_filter(insert); build_page(); } break; @@ -1435,7 +1439,7 @@ void box_end(int box_context) adjust_tail = null; } if (mode > 0) { - check_filter(box); + checked_page_filter(box); build_page(); } } else { @@ -1545,7 +1549,7 @@ void new_graf(boolean indented) if (every_par != null) begin_token_list(every_par, every_par_text); if (nest_ptr == 1) { - check_filter(new_graf); + checked_page_filter(new_graf); build_page(); /* put |par_skip| glue on current page */ } } @@ -1679,7 +1683,7 @@ void append_penalty(void) scan_int(); tail_append(new_penalty(cur_val)); if (mode == vmode) { - check_filter(penalty); + checked_page_filter(penalty); build_page(); } } |