From 52a703669fab0dfbd9d786b7a92d8601ac135057 Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Wed, 24 Nov 2021 14:38:46 +0000 Subject: [CWEB] Reshuffle code in CWEAVE. The 'mathness' stuff can be factored out from the 'big_app' stuff. git-svn-id: svn://tug.org/texlive/trunk@61138 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/cwebdir/ChangeLog | 5 ++++ Build/source/texk/web2c/cwebdir/ctwill-mini.ch | 7 ++---- Build/source/texk/web2c/cwebdir/cweave.w | 33 +++++++++++++------------- 3 files changed, 24 insertions(+), 21 deletions(-) (limited to 'Build/source/texk/web2c/cwebdir') diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog index a47e9869d92..01b038a5861 100644 --- a/Build/source/texk/web2c/cwebdir/ChangeLog +++ b/Build/source/texk/web2c/cwebdir/ChangeLog @@ -1,3 +1,8 @@ +2021-11-24 Andreas Scherer + + * ctwill-mini.ch, + * cweave.w: Reshuffle code in CWEAVE. + 2021-11-22 Andreas Scherer * Makefile, diff --git a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch index fd9f27d0bb0..246015bbd3a 100644 --- a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch +++ b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch @@ -1018,12 +1018,9 @@ followed by `|reduce(pp,3,exp,-2,3)|'. Section 133. @x -The code below is an exact translation of the production rules into +@ The |mathness| is an attribute of scraps that says whether they are @y -@ The code below is an exact translation of the production rules into -@-a@> -@-c@> -@-p@> +@r @ The |mathness| is an attribute of scraps that says whether they are @z Section 136--137. diff --git a/Build/source/texk/web2c/cwebdir/cweave.w b/Build/source/texk/web2c/cwebdir/cweave.w index b98078fc95f..0a780b18c4e 100644 --- a/Build/source/texk/web2c/cwebdir/cweave.w +++ b/Build/source/texk/web2c/cwebdir/cweave.w @@ -2316,7 +2316,18 @@ checks whether there can be a conflict between math and non-math tokens, and intercalates a `\.{\$}' token if necessary. When in doubt what to use, use |big_app|. -The |mathness| is an attribute of scraps that says whether they are +@d app(a) *(tok_ptr++)=(token)(a) +@d big_app2(a) big_app1(a);@+big_app1(a+1) +@d big_app3(a) big_app2(a);@+big_app1(a+2) +@d big_app4(a) big_app3(a);@+big_app1(a+3) +@d big_app1_insert(p,c) big_app1(p);@+big_app(c);@+big_app1(p+1) + +@= +static void app_str(const char *);@/ +static void big_app(token);@/ +static void big_app1(scrap_pointer); + +@ The |mathness| is an attribute of scraps that says whether they are to be printed in a math mode context or not. It is separate from the ``part of speech'' (the |cat|) because to make each |cat| have a fixed |mathness| (as in the original \.{WEAVE}) would multiply the @@ -2333,29 +2344,19 @@ irreducible scrap has a |yes_math| boundary the scrap gets preceded or followed by a~\.{\$}. The left boundary is |maybe_math| if and only if the right boundary is. -The code below is an exact translation of the production rules into -\CEE/, using such macros, and the reader should have no difficulty -understanding the format by comparing the code with the symbolic -productions as they were listed earlier. - @d no_math 2 /* should be in horizontal mode */ @d yes_math 1 /* should be in math mode */ @d maybe_math 0 /* works in either horizontal or math mode */ -@d big_app2(a) big_app1(a);@+big_app1(a+1) -@d big_app3(a) big_app2(a);@+big_app1(a+2) -@d big_app4(a) big_app3(a);@+big_app1(a+3) -@d big_app1_insert(p,c) big_app1(p);@+big_app(c);@+big_app1(p+1) -@d app(a) *(tok_ptr++)=(token)(a) @= static int cur_mathness, init_mathness; -@ @= -static void app_str(const char *);@/ -static void big_app(token);@/ -static void big_app1(scrap_pointer); +@ The code below is an exact translation of the production rules into +\CEE/, using such macros, and the reader should have no difficulty +understanding the format by comparing the code with the symbolic +productions as they were listed earlier. -@ @c +@c static void app_str( const char *s) -- cgit v1.2.3