bk commit into 4.0 tree

[arjen]

Below is the list of changes that have just been committed into a
4.0 repository of arjen. When arjen does a push, they will be propogated to 
the main repository and within 24 hours after the push to the public repository. 
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2002-02-04 14:28:17+10:00, arjen@stripped
  A few required additions to XML docbook fixup script.
  Added url to success story form in manual.

  Docs/manual.texi
    1.761 02/02/04 14:28:16 arjen@stripped +3 -1
    Added url to success story form.

  Docs/Support/docbook-fixup.pl
    1.7 02/02/04 14:28:15 arjen@stripped +44 -4
    A few required additions to script.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	arjen
# Host:	co3064164-a.bitbike.com
# Root:	/home/arjen/mysql-4.0

--- 1.760/Docs/manual.texi	Sun Feb  3 09:26:34 2002
+++ 1.761/Docs/manual.texi	Mon Feb  4 14:28:16 2002
@@ -1969,8 +1969,10 @@
 This information can give you an idea of who uses the @code{MySQL}
 database software and how @code{MySQL Server} can fulfill
 requirements.
+
 Do let us know about @emph{your} site or success story too!
- 
+@uref{http://www.mysql.com/feedback/testimonial.php}.
+
 @item Software
 Find, buy, download several applications and wrappers that make
 use of the @code{MySQL} server.

--- 1.6/Docs/Support/docbook-fixup.pl	Wed Jan 30 17:44:46 2002
+++ 1.7/Docs/Support/docbook-fixup.pl	Mon Feb  4 14:28:15 2002
@@ -1,11 +1,19 @@
 #!/usr/bin/perl
 
-sub fix {
+sub fix_underscore {
   $str = shift;
   $str =~ tr/_/-/;
   return $str;
 };
 
+sub strip_emph {
+  $str = shift;
+  $str =~ s{<emphasis>(.+?)</emphasis>}
+           {$1}gs;
+  return $str;
+};
+
+
 $data = join "", <STDIN>;
 
 print STDERR "Changing @@ to @...\n";
@@ -13,9 +21,9 @@
 
 print STDERR "Changing '_' to '-' in references...\n";
 $data =~ s{id=\"(.+?)\"}
-          {"id=\"".&fix($1)."\""}gsex;
+          {"id=\"".&fix_underscore($1)."\""}gsex;
 $data =~ s{linkend=\"(.+?)\"}
-          {"linkend=\"".&fix($1)."\""}gsex;
+          {"linkend=\"".&fix_underscore($1)."\""}gsex;
 
 print STDERR "Changing ULINK to SYSTEMITEM...\n";
 $data =~ s{<ulink url=\"(.+?)\"></ulink>}
@@ -26,7 +34,7 @@
           {}gs;
 
 print STDERR "Adding PARA inside ENTRY...\n";
-$data =~ s{<entry>(.+?)</entry>}
+$data =~ s{<entry>(.*?)</entry>}
           {<entry><para>$1</para></entry>}gs;
 
 print STDERR "Removing mailto: from email addresses...\n";
@@ -41,6 +49,38 @@
 print STDERR "Removing COLSPEC...\n";
 $data =~ s{\n *<colspec colwidth=\"[0-9]+\*\">}
           {}gs;
+
+# 2002-01-31 arjen@stripped
+print STDERR "Making first row in table THEAD...\n";
+$data =~ s{([ ]*)<tbody>\n([ ]*<row>(.+?)</row>)}
+          {$1<thead>\n$2\n$1</thead>\n$1<tbody>}gs;
+
+# 2002-01-31 arjen@stripped
+print STDERR "Removing EMPHASIS inside THEAD...\n";
+$data =~ s{<thead>(.+?)</thead>}
+          {"<thead>".&strip_emph($1)."</thead>"}gsex;
+
+# 2002-01-31 arjen@stripped
+print STDERR "Removing lf before /PARA in ENTRY...\n";
+$data =~ s{(<entry><para>(.+?))\n(</para></entry>)}
+          {$1$3}gs;
+
+# 2002-01-31 arjen@stripped
+print STDERR "Removing whitespace before /PARA...\n";
+$data =~ s{[ ]+</para>}
+          {</para>}gs;
+
+# 2002-01-31 arjen@stripped
+print STDERR "Removing empty PARA in ENTRY...\n";
+$data =~ s{<entry><para></para></entry>}
+          {<entry></entry>}gs;
+
+# 2002-01-31 arjen@stripped
+print STDERR "Removing PARA around INDEXENTRY if no text in PARA...\n";
+$data =~ s{<para>((<indexterm role=\"(cp|fn)\">(<(primary|secondary)>[^<]+?</(primary|secondary)>)+?</indexterm>)+?)[\n]*</para>[\n]*}
+          {$1\n}gs;
+
+# -----
 
 @apx = ("Users", "MySQL Testimonials", "News",
         "GPL-license", "LGPL-license");