Forward bugfix from pdkim repo

[users/heiko/exim.git] / doc / doc-docbook / TidyHTML-spec

diff --git a/doc/doc-docbook/TidyHTML-spec b/doc/doc-docbook/TidyHTML-spec
index 05a9d826b5b4e3d43a79b58b9e7005898e612360..4e7b8a2cab43a4a4cb619acf216501b357f19975 100755 (executable)
--- a/doc/doc-docbook/TidyHTML-spec
+++ b/doc/doc-docbook/TidyHTML-spec
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# $Cambridge: exim/doc/doc-docbook/TidyHTML-spec,v 1.2 2005/11/10 12:30:13 ph10 Exp $
+# $Cambridge: exim/doc/doc-docbook/TidyHTML-spec,v 1.4 2006/04/04 14:03:49 ph10 Exp $
 
 # Script to tidy up the spec HTML files that are generated by xmlto. The
 # following changes are made:
@@ -15,7 +15,7 @@
 # 6. Before each occurrence of </td> insert &nbsp; so that the table's cell
 #    is a little bit wider than the text itself.
 
-chdir "spec.html";
+chdir "spec_html";
 
 $tocref = 1;
 
@@ -25,11 +25,23 @@ open(IN, "index.html") || die "Failed to open index.html for reading: $!\n";
 @toc = <IN>;
 close(IN);
 
-# Insert a newline after every > because the whole toc is generated as one
-# humungous line that is hard to check. Then split the lines so that each one
-# is a separate element in the vector.
+# Insert a newline after every > except when it is preceded by 'class="quote"',
+# because the whole toc is generated as one humungous line that is hard to
+# check. We have to avoid it in the quote case because that puts a space into
+# the output, and similarly for the </span> the comes afterwards. Easy way out
+# is just not to do it for all </span> occurrences. Unfortunately, Perl does
+# not implement lookbehinds where the alternatives are of different lengths, so
+# we have to take two passes.
+
+
+foreach $line (@toc)
+  {
+  $line =~ s/(?<!class="quote")>\s*/>\n/g;
+  $line =~ s/<\/span>\n/<\/span>/g;
+  }
+
+# Split the lines so that each one is a separate element in the vector.
 
-foreach $line (@toc) { $line =~ s/>\s*/>\n/g; }
 for ($i = 0; $i < scalar(@toc); $i++)
   { splice @toc, $i, 1, (split /(?<=\n)/, $toc[$i]); }
 
@@ -101,7 +113,7 @@ foreach $file (@chlist)
       $text[$i]= "$pre<a$opt href=\"index.html#$ref\" id=\"$id\">$title</a></h$post";
       }
 
-    elsif ($text[$i] eq "<div class=\"literallayout\">\n" && $text[$i+1] eq "<p>\n")
+    elsif ($text[$i] =~ /^<div [^>]*?class="literallayout">$/ && $text[$i+1] eq "<p>\n")
       {
       $text[++$i] = "";
       $thisdiv = 1;