Merge branch 'master' into transp_logging_1031

[users/jgh/exim.git] / doc / doc-docbook / Tidytxt

diff --git a/doc/doc-docbook/Tidytxt b/doc/doc-docbook/Tidytxt
index 49aa2e68e7060aadf07f36a02d0deb147c531e4f..d218189ea065d509b210104ace0f2f25649b26de 100755 (executable)
--- a/doc/doc-docbook/Tidytxt
+++ b/doc/doc-docbook/Tidytxt
@@ -1,7 +1,5 @@
 #! /usr/bin/perl
 
 #! /usr/bin/perl
 

-# $Cambridge: exim/doc/doc-docbook/Tidytxt,v 1.4 2008/02/04 17:03:34 fanf2 Exp $
-

 # Script to tidy up the output of w3m when it makes a text file. First we
 # convert sequences of blank lines into a single blank line, to get everything
 # uniform. Then we go through and insert blank lines before chapter and
 # Script to tidy up the output of w3m when it makes a text file. First we
 # convert sequences of blank lines into a single blank line, to get everything
 # uniform. Then we go through and insert blank lines before chapter and


@@ -28,8 +26,8 @@ foreach $line (@lines)
   $line =~ s/\x{e2}\x{95}[\x{b4}\x{b6}\x{b8}\x{ba}\x{bc}\x{be}]/-/g;
   # (3b) vertical box drawing -> bar
   $line =~ s/\x{e2}\x{94}[\x{82}\x{83}\x{86}\x{87}\x{8a}\x{8b}]/|/g;
   $line =~ s/\x{e2}\x{95}[\x{b4}\x{b6}\x{b8}\x{ba}\x{bc}\x{be}]/-/g;
   # (3b) vertical box drawing -> bar
   $line =~ s/\x{e2}\x{94}[\x{82}\x{83}\x{86}\x{87}\x{8a}\x{8b}]/|/g;

-  $line =~ s/\x{e2}\x{95}[\x{8e}\x{8f}\x{91}]/+/g;
-  $line =~ s/\x{e2}\x{95}[\x{b5}\x{b7}\x{b9}\x{bb}\x{bd}\x{bf}]/-/g;
+  $line =~ s/\x{e2}\x{95}[\x{8e}\x{8f}\x{91}]/|/g;
+  $line =~ s/\x{e2}\x{95}[\x{b5}\x{b7}\x{b9}\x{bb}\x{bd}\x{bf}]/|/g;

   # (3c) corner box drawing -> plus
   $line =~ s/\x{e2}\x{94}[\x{8c}-\x{bf}]/+/g;
   $line =~ s/\x{e2}\x{95}[\x{80}-\x{8b}\x{92}-\x{b0}]/+/g;
   # (3c) corner box drawing -> plus
   $line =~ s/\x{e2}\x{94}[\x{8c}-\x{bf}]/+/g;
   $line =~ s/\x{e2}\x{95}[\x{80}-\x{8b}\x{92}-\x{b0}]/+/g;


@@ -38,6 +36,11 @@ foreach $line (@lines)
   $line =~ s/\x{e2}\x{95}\x{b2}/\\/g;
   $line =~ s/\x{e2}\x{95}\x{b3}/X/g;
 
   $line =~ s/\x{e2}\x{95}\x{b2}/\\/g;
   $line =~ s/\x{e2}\x{95}\x{b3}/X/g;
 

+  # w3m rendering issue apparently only seen by pdp
+  # affects section numbers after the ToC, some info on spool-file -lines, etc
+  # always appears to be a spurious extra character, safely just dropped.
+  $line =~ s/\x{c2}//g;
+

   if ($line =~ /^\s*$/)
     {
     $line = "" if $lastwasblank;
   if ($line =~ /^\s*$/)
     {
     $line = "" if $lastwasblank;