8 files changed, 29 insertions, 30 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 02ec3b62051..7fa5fd62fee 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,5 +1,15 @@
 2020-06-10  Andreas Scherer  <https://ascherer.github.io>
 
+	* bibtex.ch,
+	* gftodvi.ch,
+	* gftopk.ch,
+	* pktogf.ch,
+	* pltotf.ch,
+	* tftopl.ch,
+	* vftovp.ch: Avoid line breaks in sections with empty TeX part.
+
+2020-06-10  Andreas Scherer  <https://ascherer.github.io>
+
 	* weave.ch: Missing forced line break.
 
 2020-06-09  Andreas Scherer  <https://ascherer.github.io>
diff --git a/Build/source/texk/web2c/bibtex.ch b/Build/source/texk/web2c/bibtex.ch
index d410f209023..c0cc4b74cde 100644
--- a/Build/source/texk/web2c/bibtex.ch
+++ b/Build/source/texk/web2c/bibtex.ch
@@ -745,6 +745,10 @@ aux_not_found:
 aux_found:                      {now we're ready to read the \.{.aux} file}
 end;
 @y
+This module and the next two must be changed on those systems using
+command-line arguments.
+@^system dependencies@>
+
 @<Procedures and functions for the reading and processing of input files@>=
 procedure get_the_top_level_aux_file_name;
 label aux_found,@!aux_not_found;
@@ -1684,8 +1688,7 @@ long_options[current_option].flag := 0;
 long_options[current_option].val := 0;
 incr (current_option);
 
-@
-@<Glob...@> =
+@ @<Glob...@> =
 @!min_crossrefs: integer;
 
 @ Set |min_crossrefs| to two by default, so we match the
diff --git a/Build/source/texk/web2c/gftodvi.ch b/Build/source/texk/web2c/gftodvi.ch
index 7df959ce4fd..07a5ed024bb 100644
--- a/Build/source/texk/web2c/gftodvi.ch
+++ b/Build/source/texk/web2c/gftodvi.ch
@@ -669,12 +669,10 @@ long_options[current_option].flag := address_of (verbose);
 long_options[current_option].val := 1;
 incr (current_option);
 
-@
-@<Glob...@> =
+@ @<Glob...@> =
 @!verbose: c_int_type;
 
-@
-@<Initialize the option...@> =
+@ @<Initialize the option...@> =
 verbose := false;
 
 @ Change how far from the right edge of the character boxes we print
diff --git a/Build/source/texk/web2c/gftopk.ch b/Build/source/texk/web2c/gftopk.ch
index fa496d44058..80f333e77e4 100644
--- a/Build/source/texk/web2c/gftopk.ch
+++ b/Build/source/texk/web2c/gftopk.ch
@@ -477,12 +477,10 @@ long_options[current_option].flag := address_of (verbose);
 long_options[current_option].val := 1;
 incr (current_option);
 
-@
-@<Glob...@> =
+@ @<Glob...@> =
 @!verbose: c_int_type;
 
-@
-@<Initialize the option...@> =
+@ @<Initialize the option...@> =
 verbose := false;
 
 @ An element with all zeros always ends the list.
diff --git a/Build/source/texk/web2c/pktogf.ch b/Build/source/texk/web2c/pktogf.ch
index 1451e2278a9..64419092f75 100644
--- a/Build/source/texk/web2c/pktogf.ch
+++ b/Build/source/texk/web2c/pktogf.ch
@@ -510,12 +510,10 @@ long_options[current_option].flag := address_of (verbose);
 long_options[current_option].val := 1;
 incr (current_option);
 
-@
-@<Glob...@> =
+@ @<Glob...@> =
 @!verbose: c_int_type;
 
-@
-@<Initialize the option...@> =
+@ @<Initialize the option...@> =
 verbose := false;
 
 @ An element with all zeros always ends the list.
diff --git a/Build/source/texk/web2c/pltotf.ch b/Build/source/texk/web2c/pltotf.ch
index 575d31b3e27..d877353e73f 100644
--- a/Build/source/texk/web2c/pltotf.ch
+++ b/Build/source/texk/web2c/pltotf.ch
@@ -333,12 +333,10 @@ long_options[current_option].flag := address_of (verbose);
 long_options[current_option].val := 1;
 incr (current_option);
 
-@
-@<Glob...@> =
+@ @<Glob...@> =
 @!verbose: c_int_type;
 
-@
-@<Initialize the option...@> =
+@ @<Initialize the option...@> =
 verbose := false;
 
 @ An element with all zeros always ends the list.
diff --git a/Build/source/texk/web2c/tftopl.ch b/Build/source/texk/web2c/tftopl.ch
index 48a2cd209a1..4726146a097 100644
--- a/Build/source/texk/web2c/tftopl.ch
+++ b/Build/source/texk/web2c/tftopl.ch
@@ -409,12 +409,10 @@ long_options[current_option].flag := address_of (verbose);
 long_options[current_option].val := 1;
 incr (current_option);
 
-@
-@<Glob...@> =
+@ @<Glob...@> =
 @!verbose: c_int_type;
 
-@
-@<Initialize the option...@> =
+@ @<Initialize the option...@> =
 verbose := false;
 
 @ This option changes how we output character codes.
@@ -432,14 +430,12 @@ incr (current_option);
 @<Type...@> =
 @!charcode_format_type = charcode_ascii..charcode_default;
 
-@
-@<Const...@> =
+@ @<Const...@> =
 @!charcode_ascii = 0;
 @!charcode_octal = 1;
 @!charcode_default = 2;
 
-@
-@<Global...@> =
+@ @<Global...@> =
 @!charcode_format: charcode_format_type;
 
 @ It starts off as the default, that is, we output letters and digits as
diff --git a/Build/source/texk/web2c/vftovp.ch b/Build/source/texk/web2c/vftovp.ch
index 91472325360..f972b51f148 100644
--- a/Build/source/texk/web2c/vftovp.ch
+++ b/Build/source/texk/web2c/vftovp.ch
@@ -658,14 +658,12 @@ incr (current_option);
 @<Type...@> =
 @!charcode_format_type = charcode_ascii..charcode_default;
 
-@
-@<Const...@> =
+@ @<Const...@> =
 @!charcode_ascii = 0;
 @!charcode_octal = 1;
 @!charcode_default = 2;
 
-@
-@<Global...@> =
+@ @<Global...@> =
 @!charcode_format: charcode_format_type;
 
 @ It starts off as the default, that is, we output letters and digits as