Yet another round of improvements to manual font selection.

Unify handling of \f and .ft.
Support \f4 (bold+italic).
Support ".ft BI" and ".ft CW" for terminal output.
Support the .ft request in HTML output.
Reject the bogus fonts \f(C1, \f(C2, \f(C3, and \f(CP.
In regress.pl, only strip leading whitespace in math mode.

1 files changed, 11 insertions, 9 deletions

diff --git a/regress/regress.pl b/regress/regress.pl
index 8c62a147..b9fb849b 100755
--- a/regress/regress.pl
+++ b/regress/regress.pl
@@ -79,23 +79,25 @@ sub syshtml ($@) {
 	open my $outfd, '>', $outfile or die "$outfile: $!";
 	my $infd;
 	my $pid = open3 undef, $infd, undef, @_;
-	my $state;
+	my $state = 0;
 	while (<$infd>) {
 		chomp;
 		if (!$state && s/.*<math class="eqn">//) {
-			$state = 1;
+			$state = 'math';
 			next unless length;
+		} elsif (/^BEGINTEST/) {
+			$state = 'other';
 		}
-		$state = 1 if /^BEGINTEST/;
-		if ($state && s/<\/math>.*//) {
+		if ($state eq 'math') {
 			s/^ *//;
-			print $outfd "$_\n" if length;
-			undef $state;
-			next;
+			if (s/<\/math>.*//) {
+				print $outfd "$_\n" if length;
+				$state = 0;
+				next;
+			}
 		}
-		s/^ *//;
 		print $outfd "$_\n" if $state;
-		undef $state if /^ENDTEST/;
+		$state = 0 if /^ENDTEST/;
 	}
 	close $outfd;
 	close $infd;