texlive[72171] Build/source/texk/web2c: [WEB] Fix sorting order of
commits+ascherer at tug.org
commits+ascherer at tug.org
Mon Sep 2 19:47:30 CEST 2024
Revision: 72171
https://tug.org/svn/texlive?view=revision&revision=72171
Author: ascherer
Date: 2024-09-02 19:47:30 +0200 (Mon, 02 Sep 2024)
Log Message:
-----------
[WEB] Fix sorting order of names-of-sections.
These three WEB codes reside in the 'other' category of 'knuth-pdf'.
Modified Paths:
--------------
trunk/Build/source/texk/web2c/ChangeLog
trunk/Build/source/texk/web2c/dvicopy.ch
trunk/Build/source/texk/web2c/dvicopy.web
trunk/Build/source/texk/web2c/patgen.ch
trunk/Build/source/texk/web2c/patgen.web
trunk/Build/source/texk/web2c/pktogf.ch
trunk/Build/source/texk/web2c/pktogf.web
trunk/Build/source/texk/web2c/tangle.ch
trunk/Build/source/texk/web2c/vftovp.ch
trunk/Build/source/texk/web2c/vptovf.ch
Modified: trunk/Build/source/texk/web2c/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ChangeLog 2024-09-02 17:47:28 UTC (rev 72170)
+++ trunk/Build/source/texk/web2c/ChangeLog 2024-09-02 17:47:30 UTC (rev 72171)
@@ -1,21 +1,25 @@
-2024-09-01 Andreas Scherer <https://ascherer.github.io>
+2024-09-02 Andreas Scherer <https://ascherer.github.io>
* bibtex.ch,
- * dvicopy.ch,
* dvitype.ch,
* gftodvi.ch,
* gftopk.ch,
* gftype.ch,
* mft.ch,
- * patgen.ch,
- * pktogf.ch,
* pktype.ch,
* pltotf.ch,
* pooltype.ch,
* tangle.ch,
* tftopl.ch,
+ * vftovp.ch,
* vptovf.ch,
* weave.ch: Flip two section names in the index.
+ * dvicopy.ch,
+ * dvicopy.web,
+ * patgen.ch,
+ * patgen.web,
+ * pktogf.ch,
+ * pktogf.web: Fix sorting order in 'other' WEB codees.
2024-08-31 Andreas Scherer <https://ascherer.github.io>
Modified: trunk/Build/source/texk/web2c/dvicopy.ch
===================================================================
--- trunk/Build/source/texk/web2c/dvicopy.ch 2024-09-02 17:47:28 UTC (rev 72170)
+++ trunk/Build/source/texk/web2c/dvicopy.ch 2024-09-02 17:47:30 UTC (rev 72171)
@@ -8,12 +8,6 @@
% Mar 20 91 THD Updated to dvicopy 1.2
% (more recent changes in the ChangeLog)
- at x [0] l.35
-\def\(#1){} % this is used to make section names sort themselves better
- at y
-\def\({} % this is used to make section names sort themselves better
- at z
-
@x [0] l.59 WEAVE: print changes only
\pageno=\contentspagenumber \advance\pageno by 1
@y
Modified: trunk/Build/source/texk/web2c/dvicopy.web
===================================================================
--- trunk/Build/source/texk/web2c/dvicopy.web 2024-09-02 17:47:28 UTC (rev 72170)
+++ trunk/Build/source/texk/web2c/dvicopy.web 2024-09-02 17:47:30 UTC (rev 72171)
@@ -22,6 +22,7 @@
% bug fix (not for Web2C) and some typos (May 2014)
% from Udo Wermuth (u.wermuth@@icloud.com).
% 17 July 2018, still version 1.6: typos corrected, no code changes.
+% 02 Sep 2024, still version 1.6: fix sorting order of names-of-sections.
% Here is TeX material that gets inserted after \input webmac
\def\hang{\hangindent 3em\indent\ignorespaces}
@@ -32,7 +33,7 @@
\def\MF{{\logo META}\-{\logo FONT}}
\mathchardef\RA="3221 % right arrow
-\def\(#1){} % this is used to make section names sort themselves better
+\def\({} % this is used to make section names sort themselves better
\def\9#1{} % this is used for sort keys in the index
\def\title{DVI\lowercase{copy}} % don't change this line!
@@ -1747,7 +1748,7 @@
case font_type(cur_fnt) of
defined_font: confusion(str_fonts);
loaded_font: bad_tfm;
- @<Cases for |bad_font|@>@;@/
+ @<Cases for \(|bad_font|@>@;@/
othercases abort('internal error');
endcases;
end;
@@ -2470,7 +2471,7 @@
gives an error message which refers the user to \.{VFtoVP} and \.{VPtoVF},
and terminates \.{\title}.
-@<Cases for |bad_font|@>=
+@<Cases for \(|bad_font|@>=
vf_font_type: begin print('Bad VF file'); print_font(cur_fnt);
@.Bad VF file@>
print_ln(' loc=',vf_loc:1);
@@ -3523,7 +3524,7 @@
the variable |type_setting| accordingly.
@p procedure do_bop;@/
-@<OUT: Declare additional local variables |do_bop|@>@;
+@<OUT: Declare additional local variables for |do_bop|@>@;
@!i,@!j:0..9; {indices into |count|}
begin @<Determine whether this page should be processed or skipped@>;
print('DVI: ');
@@ -3642,7 +3643,7 @@
The |do_rule| procedure is called in order to typeset a rule.
@p procedure do_rule;@/
-@<OUT: Declare additional local variables |do_rule|@>@;
+@<OUT: Declare additional local variables for |do_rule|@>@;
@!visible:boolean;
begin h_rule_pixels@;
if (cur_h_dimen>0)and(cur_v_dimen>0) then
@@ -3663,7 +3664,7 @@
@p procedure do_char;@/
@<OUT: Declare local variables (if any) for |do_char|@>@;
-begin @<OUT: Typeset a |char|@>@;
+begin @<OUT: Typeset a \(|char|@>@;
if cur_upd then
begin h_upd_char(widths[cur_wp])(char_pixels[cur_cp]);
@<OUT: Move right@>@;
@@ -4284,7 +4285,7 @@
@ These are the additional local variables (if any) needed for |do_bop|;
the variables |@!i| and |@!j| are already declared.
-@<OUT: Declare additional local variables |do_bop|@>=
+@<OUT: Declare additional local variables for |do_bop|@>=
var
@ And here is the device dependent code for |do_bop|.
@@ -4378,7 +4379,7 @@
@ These are the additional local variables (if any) needed for |do_rule|;
the variable |@!visible| is already declared.
-@<OUT: Declare additional local variables |do_rule|@>=
+@<OUT: Declare additional local variables for |do_rule|@>=
var
@ And here is the device dependent code for |do_rule|.
@@ -4421,7 +4422,7 @@
@ And here is the device dependent code for |do_char|.
-@<OUT: Typeset a |char|@>=
+@<OUT: Typeset a \(|char|@>=
@!debug if font_type(cur_fnt)<>out_font_type then confusion(str_fonts);
gubed @;
if cur_fnt<>out_fnt then
Modified: trunk/Build/source/texk/web2c/patgen.ch
===================================================================
--- trunk/Build/source/texk/web2c/patgen.ch 2024-09-02 17:47:28 UTC (rev 72170)
+++ trunk/Build/source/texk/web2c/patgen.ch 2024-09-02 17:47:30 UTC (rev 72171)
@@ -5,14 +5,6 @@
% properly---it is hard to test without more information.
% 03/23/88 (ETM) Brought up to date, converted for use with WEB to C.
- at x [0] l.13
-\def\PASCAL{Pascal}
- at y
-\def\PASCAL{Pascal}
-
-\def\({} % this is used to make section names sort themselves better
- at z
-
@x [0] Extend program title.
\def\title{PATGEN}
@y
Modified: trunk/Build/source/texk/web2c/patgen.web
===================================================================
--- trunk/Build/source/texk/web2c/patgen.web 2024-09-02 17:47:28 UTC (rev 72170)
+++ trunk/Build/source/texk/web2c/patgen.web 2024-09-02 17:47:30 UTC (rev 72171)
@@ -7,11 +7,14 @@
% Version 2.3 avoided division by zero - Karl Berry (October, 1996).
% Version 2.4 avoided use of uninitialized variables (September, 2009).
% A few typos fixed, no version change (April, 2020).
+% Sorting order fixed, no version change (September, 2024).
% Here is TeX material that gets inserted after \input webmac
\def\hang{\hangindent 3em\indent\ignorespaces}
\def\PASCAL{Pascal}
+\def\({} % this is used to make section names sort themselves better
+
\def\title{PATGEN}
\def\contentspagenumber{45} % should be odd
\def\topofcontents{\null
@@ -722,7 +725,7 @@
@p function first_fit: trie_pointer;
label found, not_found;
var s, @!t: trie_pointer; @!q: q_index;
-begin @<Set |s| to the trie base location at which this state should be
+begin @<Set \(|s| to the trie base location at which this state should be
packed@>;
for q:=1 to qmax do {pack it}
begin t:=s+q_char(q);@/
@@ -743,7 +746,7 @@
subsequent levels because the pattern trie will be sparser after bad
patterns are deleted (see |delete_bad_patterns|).
-@<Set |s| to the trie base location at which this state should be packed@>=
+@<Set \(|s| to the trie base location at which this state should be packed@>=
if qmax>qmax_thresh then t:=trie_back(trie_max+1) @+else t:=0;
loop begin t:=trie_link(t); s:=t-q_char(1); {get next unoccupied cell}
@<Ensure |trie| linked up to |s+num_ASCII_codes|@>;
@@ -914,7 +917,7 @@
@p function firstc_fit: triec_pointer;
label found, not_found;
var a, @!b: triec_pointer; @!q: q_index;
-begin @<Set |b| to the count trie base location at which this state should
+begin @<Set \(|b| to the count trie base location at which this state should
be packed@>;
for q:=1 to qmax do {pack it}
begin a:=b+q_char(q);@/
@@ -932,7 +935,7 @@
@ The threshold for attempting a first-fit packing is 3 transitions, which
is lower than for the pattern trie because speed is more important here.
-@<Set |b| to the count trie base location...@>=
+@<Set \(|b| to the count trie base location...@>=
if qmax>3 then a:=triec_back(triec_max+1) @+else a:=0;
loop begin a:=triec_link(a); b:=a-q_char(1);@/
@<Ensure |triec| linked up to |b+num_ASCII_codes|@>;
Modified: trunk/Build/source/texk/web2c/pktogf.ch
===================================================================
--- trunk/Build/source/texk/web2c/pktogf.ch 2024-09-02 17:47:28 UTC (rev 72170)
+++ trunk/Build/source/texk/web2c/pktogf.ch 2024-09-02 17:47:30 UTC (rev 72171)
@@ -12,12 +12,6 @@
% gf and pk formats. PKtoGF runs silently unless it is given the
% -v switch in the command line.
- at x [0] l.19
-\def\(#1){} % this is used to make section names sort themselves better
- at y
-\def\({} % this is used to make section names sort themselves better
- at z
-
@x [0] l.21
\def\title{PKtoGF}
@y
Modified: trunk/Build/source/texk/web2c/pktogf.web
===================================================================
--- trunk/Build/source/texk/web2c/pktogf.web 2024-09-02 17:47:28 UTC (rev 72170)
+++ trunk/Build/source/texk/web2c/pktogf.web 2024-09-02 17:47:30 UTC (rev 72171)
@@ -8,6 +8,7 @@
% Cleaned up description (bitweight errors) no version change: July 1990
% Fixed bug with empty character setting min_n to 1 (1.1): 19 October 1990
% A few typos, no version change: 22 April 2020, 27 October 2020
+% Sorting order fixed, no version change: 02 September 2024
\def\versiondate{22 April 2020}
%
\font\ninerm=cmr9
@@ -16,7 +17,7 @@
\def\MF{{\logo META}\-{\logo FONT}}
\def\PASCAL{{\mc Pascal}}
\def\tamu{Texas A\char38 M}
-\def\(#1){} % this is used to make section names sort themselves better
+\def\({} % this is used to make section names sort themselves better
\def\9#1{} % this is used for sort keys in the index
\def\title{PKtoGF}
\def\contentspagenumber{1}
@@ -1197,7 +1198,7 @@
@<Read short character preamble@> ;
@<Calculate and check |min_m|, |max_m|, |min_n|, and |max_n|@> ;
@<Save character locator@> ;
-@<Write character preamble@> ;
+@<Write \(character preamble@> ;
@<Read and translate raster description@> ;
gf_byte(eoc) ;
last_eoc := gf_loc ;
@@ -1360,7 +1361,7 @@
@ This module takes care of the simple job of writing the character
preamble, after picking one to fit.
-@<Write character preamble@>=
+@<Write \(character preamble@>=
begin
if (char_pointer[car mod 256] = -1) and
(car >= 0) and (car < 256) and
@@ -1408,7 +1409,7 @@
@ And another module to write out those character locators we have so
carefully saved up the information for.
-@<Write character locators@>=
+@<Write \(character locators@>=
for i := 0 to 255 do
if char_pointer[i] <> -1 then begin
if (s_ver_esc[i] = 0) and (s_hor_esc[i] >= 0) and
@@ -1615,7 +1616,7 @@
gf_quad(mmax_m) ;
gf_quad(mmin_n) ;
gf_quad(mmax_n) ;
-@<Write character locators@> ;
+@<Write \(character locators@> ;
gf_byte(post_post) ;
gf_quad(j) ;
gf_byte(gf_id_byte) ;
Modified: trunk/Build/source/texk/web2c/tangle.ch
===================================================================
--- trunk/Build/source/texk/web2c/tangle.ch 2024-09-02 17:47:28 UTC (rev 72170)
+++ trunk/Build/source/texk/web2c/tangle.ch 2024-09-02 17:47:30 UTC (rev 72171)
@@ -302,6 +302,12 @@
chopped_id[s]:=buffer[i]+@'40
@z
+ at x [1.2] l.3
+else @<Define and output a new string of the pool@>;
+ at y
+else @<Define \(and output a new string of the pool@>;
+ at z
+
@x [6.63] l.1102 - Case smashing options/strict checking.
if c<>"_" then
begin if c>="a" then c:=c-@'40; {merge lowercase with uppercase}
@@ -321,7 +327,7 @@
else begin equiv[p]:=string_ptr+@'100000;
l:=l-double_chars-1;
@y
-@<Define and output a new string...@>=
+@<Define \(and output a new string...@>=
begin ilk[p]:=numeric; {strings are like numeric macros}
if l-double_chars=2 then {this string is for a single character}
equiv[p]:=buffer[id_first+1]+@'10000000000
Modified: trunk/Build/source/texk/web2c/vftovp.ch
===================================================================
--- trunk/Build/source/texk/web2c/vftovp.ch 2024-09-02 17:47:28 UTC (rev 72170)
+++ trunk/Build/source/texk/web2c/vftovp.ch 2024-09-02 17:47:30 UTC (rev 72171)
@@ -555,7 +555,7 @@
@!current_option: 0..n_options;
begin
@<Initialize the option variables@>;
- @<Define \(t)the option table@>;
+ @<Define the option table@>;
repeat
getopt_return_val := getopt_long_only (argc, argv, '', long_options,
address_of (option_index));
@@ -602,7 +602,7 @@
@ Here are the options we allow. The first is one of the standard GNU options.
@.-help@>
-@<Define \(t)the option...@> =
+@<Define the option...@> =
current_option := 0;
long_options[current_option].name := 'help';
long_options[current_option].has_arg := 0;
@@ -613,7 +613,7 @@
@ Another of the standard options.
@.-version@>
-@<Define \(t)the option...@> =
+@<Define the option...@> =
long_options[current_option].name := 'version';
long_options[current_option].has_arg := 0;
long_options[current_option].flag := 0;
@@ -623,7 +623,7 @@
@ Print progress information?
@.-verbose@>
-@<Define \(t)the option...@> =
+@<Define the option...@> =
long_options[current_option].name := 'verbose';
long_options[current_option].has_arg := 0;
long_options[current_option].flag := address_of (verbose);
@@ -644,7 +644,7 @@
@ Here is an option to change how we output character codes.
@.-charcode-format@>
-@<Define \(t)the option...@> =
+@<Define the option...@> =
long_options[current_option].name := 'charcode-format';
long_options[current_option].has_arg := 1;
long_options[current_option].flag := 0;
@@ -672,7 +672,7 @@
@ An element with all zeros always ends the list.
-@<Define \(t)the option...@> =
+@<Define the option...@> =
long_options[current_option].name := 0;
long_options[current_option].has_arg := 0;
long_options[current_option].flag := 0;
Modified: trunk/Build/source/texk/web2c/vptovf.ch
===================================================================
--- trunk/Build/source/texk/web2c/vptovf.ch 2024-09-02 17:47:28 UTC (rev 72170)
+++ trunk/Build/source/texk/web2c/vptovf.ch 2024-09-02 17:47:30 UTC (rev 72171)
@@ -1,5 +1,11 @@
% vptovf.ch for C compilation with web2c.
+ at x [0] l.19
+\def\(#1){} % this is used to make section names sort themselves better
+ at y
+\def\({} % this is used to make section names sort themselves better
+ at z
+
@x [0] l.22
\def\title{VP\lowercase{to}VF}
@y
More information about the tex-live-commits
mailing list.