From 705b807c950a697d3c8be592c452a6fb3e561c7e Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Wed, 4 Jan 2023 12:09:26 +0100
Subject: 2023-01-04 11:35:00

---
 source/luametatex/source/tex/texscanning.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'source/luametatex/source/tex/texscanning.c')

diff --git a/source/luametatex/source/tex/texscanning.c b/source/luametatex/source/tex/texscanning.c
index a78a68a23..845b6fa55 100644
--- a/source/luametatex/source/tex/texscanning.c
+++ b/source/luametatex/source/tex/texscanning.c
@@ -895,10 +895,9 @@ static int tex_aux_set_cur_val_by_some_cmd(int code)
 
 static void tex_aux_set_cur_val_by_auxiliary_cmd(int chr)
 {
-    halfword mode = abs(cur_list.mode);
     switch (chr) {
         case space_factor_code:
-            if (mode == hmode) {
+            if (is_h_mode(cur_list.mode)) {
                 cur_val = cur_list.space_factor;
             } else {
                 tex_handle_error(normal_error_type, "Improper %C", set_auxiliary_cmd, chr,
@@ -910,7 +909,7 @@ static void tex_aux_set_cur_val_by_auxiliary_cmd(int chr)
             cur_val_level = int_val_level;
             break;
         case prev_depth_code:
-            if (mode == vmode) {
+            if (is_v_mode(cur_list.mode)) {
                 cur_val = cur_list.prev_depth;
             } else {
                 tex_handle_error(normal_error_type, "Improper %C", set_auxiliary_cmd, chr,
@@ -922,7 +921,7 @@ static void tex_aux_set_cur_val_by_auxiliary_cmd(int chr)
             cur_val_level = dimen_val_level;
             break;
         case prev_graf_code:
-            if (mode == nomode) {
+            if (cur_list.mode == nomode) {
                 /*tex So |prev_graf=0| within |\write|, not that we have that. */
                 cur_val = 0;
             } else {
@@ -3071,7 +3070,7 @@ halfword tex_the_detokenized_toks(halfword *tail)
     halfword head = tex_scan_general_text(tail);
     int saved_selector;
     push_selector;
-    tex_show_token_list(head, null, extreme_token_show_max, 0);
+    tex_show_token_list(head, 0);
     pop_selector;
     tex_flush_token_list(head);
     return tex_cur_str_toks(tail);
@@ -3127,7 +3126,7 @@ strnumber tex_the_scanned_result(void)
             break;
         case tok_val_level:
             if (cur_val) {
-                tex_token_show(cur_val, extreme_token_show_max);
+                tex_token_show(cur_val);
                 break;
             } else {
                 r = get_nullstr();
-- 
cgit v1.2.3