engine_xetex: plumb in specials used by spx2html

Author: pkgw

crates/engine_xetex/xetex/xetex-math.c

@@ -323,6 +323,11 @@ void init_math(void)
         eq_word_define(INT_BASE + INT_PAR__pre_display_direction, x);
         eq_word_define(DIMEN_BASE + DIMEN_PAR__display_width, l);
         eq_word_define(DIMEN_BASE + DIMEN_PAR__display_indent, s);
+
+        /* Tectonic customization: flag canvas start */
+        if (semantic_pagination_enabled)
+            tt_insert_special("tdux:cs dmath");
+
         if (LOCAL(every_display) != TEX_NULL)
             begin_token_list(LOCAL(every_display), EVERY_DISPLAY_TEXT);
         if (nest_ptr == 1)
@@ -335,6 +340,11 @@ void init_math(void)
             eq_word_define(INT_BASE + INT_PAR__cur_fam, -1);
             if ((insert_src_special_every_math))
                 insert_src_special();
+
+            /* Tectonic customization: flag canvas start */
+            if (semantic_pagination_enabled)
+                tt_insert_special("tdux:cs math");
+
             if (LOCAL(every_math) != TEX_NULL)
                 begin_token_list(LOCAL(every_math), EVERY_MATH_TEXT);
         }
@@ -1037,6 +1047,11 @@ void after_math(void)
             cur_list.tail = LLIST_link(cur_list.tail);
         }
         cur_list.aux.b32.s0 = 1000;
+
+        /* Tectonic customization: flag canvas end */
+        if (semantic_pagination_enabled)
+            tt_insert_special("tdux:ce math");
+
         unsave();
     } else {
 
@@ -1170,6 +1185,11 @@ void after_math(void)
             cur_list.tail = LLIST_link(cur_list.tail);
         }
         flush_node_list(j);
+
+        /* Tectonic customization: flag canvas end */
+        if (semantic_pagination_enabled)
+            tt_insert_special("tdux:ce dmath");
+
         resume_after_display();
     }
 }

crates/engine_xetex/xetex/xetex-pagebuilder.c

@@ -347,9 +347,7 @@ fire_up(int32_t c)
         TOKEN_LIST_ref_count(cur_mark[TOP_MARK_CODE])++;
     }
 
-    /* Tectonic: in semantic pagination mode, ignore the output routine. */
-
-    if (LOCAL(output_routine) != TEX_NULL && !semantic_pagination_enabled) {
+    if (LOCAL(output_routine) != TEX_NULL) {
         if (dead_cycles >= INTPAR(max_dead_cycles)) {
             /*1059: "Explain that too many dead cycles have happened in a row." */
             error_here_with_diagnostic("Output loop---");

crates/engine_xetex/xetex/xetex-xetex0.c

@@ -9108,6 +9108,9 @@ void pseudo_start(void)
     }
 }
 
+/* "The token list created by str toks begins at `LLIST_link(TEMP_HEAD)` and
+ * ends at the value `p` that is returned. (If `p = temp head`, the list is
+ * empty.)" */
 int32_t
 str_toks_cat(pool_pointer b, small_number cat)
 {
@@ -14670,37 +14673,48 @@ small_number norm_min(int32_t h)
         return h;
 }
 
-void new_graf(bool indented)
+
+void
+new_graf(bool indented)
 {
     cur_list.prev_graf = 0;
 
-    if ((cur_list.mode == VMODE) || (cur_list.head != cur_list.tail)) {
+    if (cur_list.mode == VMODE || cur_list.head != cur_list.tail) {
         mem[cur_list.tail].b32.s1 = new_param_glue(GLUE_PAR__par_skip);
         cur_list.tail = LLIST_link(cur_list.tail);
     }
 
     push_nest();
     cur_list.mode = HMODE;
     cur_list.aux.b32.s0 = 1000;
+
     if (INTPAR(language) <= 0)
         cur_lang = 0;
     else if (INTPAR(language) > BIGGEST_LANG)
         cur_lang = 0;
     else
         cur_lang = INTPAR(language);
+
     cur_list.aux.b32.s1 = cur_lang;
     cur_list.prev_graf =
         (norm_min(INTPAR(left_hyphen_min)) * 64 +
          norm_min(INTPAR(right_hyphen_min))) * 65536L + cur_lang;
+
     if (indented) {
         cur_list.tail = new_null_box();
         mem[cur_list.head].b32.s1 = cur_list.tail;
         mem[cur_list.tail + 1].b32.s1 = eqtb[DIMEN_BASE].b32.s1;
-        if ((insert_src_special_every_par))
+        if (insert_src_special_every_par)
             insert_src_special();
     }
+
+    /* Tectonic customization: insert <p> flagged as automatic */
+    if (semantic_pagination_enabled)
+        tt_insert_special("tdux:as p");
+
     if (LOCAL(every_par) != TEX_NULL)
         begin_token_list(LOCAL(every_par), EVERY_PAR_TEXT);
+
     if (nest_ptr == 1)
         build_page();
 }
@@ -14756,17 +14770,24 @@ void head_for_vmode(void)
     }
 }
 
-void end_graf(void)
+void
+end_graf(void)
 {
     if (cur_list.mode == HMODE) {
+        /* Tectonic customization: insert </p> flagged as automatic */
+        if (semantic_pagination_enabled)
+            tt_insert_special("tdux:ae p");
+
         if (cur_list.head == cur_list.tail)
             pop_nest();
         else
             line_break(false);
+
         if (cur_list.eTeX_aux != TEX_NULL) {
             flush_list(cur_list.eTeX_aux);
             cur_list.eTeX_aux = TEX_NULL;
         }
+
         normal_paragraph();
         error_count = 0;
     }
@@ -16567,6 +16588,40 @@ void append_src_special(void)
 }
 
 
+/* Tectonic: insert a \special into the current token stream */
+void
+tt_insert_special(const char *ascii_text)
+{
+    int32_t toklist_start, p, q;
+    pool_pointer start_pool_ptr = pool_ptr;
+
+    /* Copy the text into the string pool so that we can use str_toks() */
+    if (pool_ptr + strlen(ascii_text) >= (size_t) pool_size)
+        _tt_abort("string pool overflow");
+
+    while (*ascii_text)
+        str_pool[pool_ptr++] = *ascii_text++;
+
+    /* Create the linked list of inserted tokens */
+    p = toklist_start = get_avail();
+    LLIST_info(p) = CS_TOKEN_FLAG + FROZEN_SPECIAL;
+
+    q = get_avail();
+    LLIST_info(q) = LEFT_BRACE_TOKEN + '{';
+    LLIST_link(p) = q;
+
+    /* NB: str_toks creates a list starting at LLIST_link(TEMP_HEAD) and ending at `p` */
+    p = str_toks(start_pool_ptr);
+    LLIST_link(q) = LLIST_link(TEMP_HEAD);
+
+    q = get_avail();
+    LLIST_info(q) = RIGHT_BRACE_TOKEN + '}';
+    LLIST_link(p) = q;
+
+    /* Queue it up and we're done. */
+    begin_token_list(toklist_start, INSERTED);
+}
+
 void
 handle_right_brace(void)
 {

crates/engine_xetex/xetex/xetex-xetexd.h

@@ -1173,6 +1173,8 @@ cur_length(void) {
 void tt_cleanup(void);
 tt_history_t tt_run_engine(const char *dump_name, const char *input_file_name, time_t build_date);
 
+void tt_insert_special(const char *ascii_text);
+
 
 /* formerly xetex.h: */
 /* additional declarations we want to slip in for xetex */