fanf2 2008/02/04 17:03:35 GMT
Modified files:
exim-doc/doc-docbook Tidytxt spec.xfpt
Log:
Fix a duplicate section anchor.
Revision Changes Path
1.4 +19 -3 exim/exim-doc/doc-docbook/Tidytxt
1.34 +1 -1 exim/exim-doc/doc-docbook/spec.xfpt
Index: Tidytxt
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-docbook/Tidytxt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Tidytxt 29 Aug 2007 13:37:28 -0000 1.3
+++ Tidytxt 4 Feb 2008 17:03:34 -0000 1.4
@@ -1,6 +1,6 @@
#! /usr/bin/perl
-# $Cambridge: exim/exim-doc/doc-docbook/Tidytxt,v 1.3 2007/08/29 13:37:28 ph10 Exp $
+# $Cambridge: exim/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
@@ -10,17 +10,33 @@
# We also have to do some character translation in the first pass. It seems
# that xmlto now generates Unicode in its HTML pages. This gives three problems:
# (1) It inserts the byte sequence C2 A0 (U+00A0) as a fixed-width space;
-# (2) It inserts a whole slew of "box drawing" characters round the heading.
-# (3) It uses U+25CF as its bullet character.
+# (2) It uses U+25CF as its bullet character.
+# (3) It inserts a whole slew of "box drawing" characters round the heading.
@lines = <>;
$lastwasblank = 0;
foreach $line (@lines)
{
+ # (1) non-break space -> normal space
$line =~ s/\x{c2}\x{a0}/ /g;
- $line =~ s/\x{e2}\x{94}[\x{80}-\x{bf}]/-/g;
+ # (2) bullet -> asterisk
$line =~ s/\x{e2}\x{97}\x{8f}/*/g;
+ # (3a) horizontal box drawing -> hyphen
+ $line =~ s/\x{e2}\x{94}[\x{80}\x{81}\x{84}\x{85}\x{88}\x{89}]/-/g;
+ $line =~ s/\x{e2}\x{95}[\x{8c}\x{8d}\x{90}]/-/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;
+ # (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;
+ # other
+ $line =~ s/\x{e2}\x{95}\x{b1}/\//g;
+ $line =~ s/\x{e2}\x{95}\x{b2}/\\/g;
+ $line =~ s/\x{e2}\x{95}\x{b3}/X/g;
if ($line =~ /^\s*$/)
{
Index: spec.xfpt
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-docbook/spec.xfpt,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- spec.xfpt 30 Jan 2008 14:56:54 -0000 1.33
+++ spec.xfpt 4 Feb 2008 17:03:35 -0000 1.34
@@ -1,4 +1,4 @@
-. $Cambridge: exim/exim-doc/doc-docbook/spec.xfpt,v 1.33 2008/01/30 14:56:54 fanf2 Exp $
+. $Cambridge: exim/exim-doc/doc-docbook/spec.xfpt,v 1.34 2008/02/04 17:03:35 fanf2 Exp $
.
. /////////////////////////////////////////////////////////////////////////////
. This is the primary source of the Exim Manual. It is an xfpt document that is
@@ -1655,7 +1655,7 @@
overridden if necessary.
-.section "PCRE library" "SECTdb"
+.section "PCRE library" "SECTpcre"
.cindex "PCRE library"
Exim no longer has an embedded PCRE library as the vast majority of
modern systems include PCRE as a system library, although you may need