Re: [Boost-docs] [boostbook][patch] patches to trunk

Subject: Re: [Boost-docs] [boostbook][patch] patches to trunk
From: Frank Mori Hess (frank.hess_at_[hidden])
Date: 2007-10-11 14:54:26


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Monday 08 October 2007 19:38 pm, Frank Mori Hess wrote:
> And here is the patch against trunk to eliminate the empty <itemizedlist>
> in the "See also" section. bjam pdf still doesn't work yet, apparently
> there are more bugs elsewhere...

Okay, I've finally managed to get the boost documentation built with fop 0.94
(2000+ page pdf!). Two more patches that fix invalid xml are attached. There
were also a few problems with duplicate ids in the date_time xml-from-doxygen
xml that I only fixed locally, but at least I'm confident that fop 0.94 is
useable now.

partintro.patch adds a <partintro> element to boost.xml, fixing some invalid
docbook (<para> children of <part>).

build_docs.patch changes the top-level element of the build documentation from
a <part> to a <chapter>, since boost.xml includes the build documentation
inside a <part> already (<part> is not permitted to have another <part> as
child). This also requires various <chapter> and <appendix> elements to be
changed into <section>s. It also changes the standalone version of the build
docs from a book to an article, to accomodate the other changes. I wasn't
able to test the standalone changes since I don't know how to build the
standalone version.

- --
Frank
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFHDjkm5vihyNWuA4URAiorAJ9lSZbegzSofWSXhRZdh+iv7py15ACggKwu
xH6DdAezrbe4g3kgJiJLYDg=
=IXAF
-----END PGP SIGNATURE-----

--Boundary-00=_mkjDHKjuMACB8f8
Content-Type: text/x-diff;
  charset="utf-8";
  name="partintro.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
        filename="partintro.patch"

Index: doc/src/boost.xml
===================================================================
--- doc/src/boost.xml (revision 39768)
+++ doc/src/boost.xml (working copy)
@@ -733,17 +733,18 @@
 
   <part id="tools">
     <title>Boost Tools</title>
- <para>
- Boost developers, testers, and maintainers have developed various programs to
- help with the administration of the Boost Libraries. Like everything else about
- Boost, these tools are available in source form, and are part of the regular
- Boost distribution.
- </para>
- <para>
- Users may find these tools useful when porting Boost libraries to a new platform,
- or for use with their own applications.
- </para>
-
+ <partintro>
+ <para>
+ Boost developers, testers, and maintainers have developed various programs to
+ help with the administration of the Boost Libraries. Like everything else about
+ Boost, these tools are available in source form, and are part of the regular
+ Boost distribution.
+ </para>
+ <para>
+ Users may find these tools useful when porting Boost libraries to a new platform,
+ or for use with their own applications.
+ </para>
+ </partintro>
     <xi:include href="../../tools/boostbook/doc/boostbook.xml"/>
     <xi:include href="quickbook.xml"/>
     <xi:include href="bjam.xml"/>

--Boundary-00=_mkjDHKjuMACB8f8
Content-Type: text/x-diff;
  charset="utf-8";
  name="build_docs.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
        filename="build_docs.patch"

Index: tools/build/v2/doc/src/architecture.xml
===================================================================
--- tools/build/v2/doc/src/architecture.xml (revision 39768)
+++ tools/build/v2/doc/src/architecture.xml (working copy)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
+<!DOCTYPE section PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 
- <appendix id="bbv2.arch">
+ <section id="bbv2.arch">
     <title>Boost.Build v2 architecture</title>
 
   <sidebar>
@@ -624,7 +624,7 @@
         </section>
       </section>
     </section>
- </appendix>
+ </section>
 
 <!--
      Local Variables:
Index: tools/build/v2/doc/src/extending.xml
===================================================================
--- tools/build/v2/doc/src/extending.xml (revision 39768)
+++ tools/build/v2/doc/src/extending.xml (working copy)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
+<!DOCTYPE section PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 
- <chapter id="bbv2.extender">
+ <section id="bbv2.extender">
     <title>Extender Manual</title>
 
     <section id="bbv2.extender.intro">
@@ -862,7 +862,7 @@
 
   </section>
 
- </chapter>
+ </section>
 
 <!--
      Local Variables:
Index: tools/build/v2/doc/src/tasks.xml
===================================================================
--- tools/build/v2/doc/src/tasks.xml (revision 39768)
+++ tools/build/v2/doc/src/tasks.xml (working copy)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
+<!DOCTYPE section PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 
 <!-- Copyright 2006 Vladimir Prus -->
 <!-- Distributed under the Boost Software License, Version 1.0. -->
 <!-- (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) -->
 
-<chapter id="bbv2.tasks">
+<section id="bbv2.tasks">
   <title>Common tasks</title>
 
   <para>This section describes main targets types that Boost.Build supports
@@ -640,7 +640,7 @@
       </para>
 </section>
     
-</chapter>
+</section>
 
 
 <!--
Index: tools/build/v2/doc/src/fragments.xml
===================================================================
--- tools/build/v2/doc/src/fragments.xml (revision 39768)
+++ tools/build/v2/doc/src/fragments.xml (working copy)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
+<!DOCTYPE section PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 
-<chapter>
+<section>
   <section id="root_option">
     <varlistentry>
       <term><literal>root</literal></term>
@@ -55,4 +55,4 @@
 
   </section>
 
-</chapter>
+</section>
Index: tools/build/v2/doc/src/standalone.xml
===================================================================
--- tools/build/v2/doc/src/standalone.xml (revision 39768)
+++ tools/build/v2/doc/src/standalone.xml (working copy)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 
-<book xmlns:xi="http://www.w3.org/2001/XInclude"
+<article xmlns:xi="http://www.w3.org/2001/XInclude"
       id="bbv2" last-revision="$Date$">
 
   <title>Boost.Build V2 User Manual</title>
@@ -27,4 +27,4 @@
 
   <xi:include href="v1_vs_v2.xml"/>
 
-</book>
+</article>
Index: tools/build/v2/doc/src/recipes.xml
===================================================================
--- tools/build/v2/doc/src/recipes.xml (revision 39768)
+++ tools/build/v2/doc/src/recipes.xml (working copy)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
+<!DOCTYPE section PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 
   <!-- The file is empty. It's not clear if it will be needed in
        future or FAQ completely supercedes it. -->
 
- <appendix id="bbv2.recipies">
+ <section id="bbv2.recipies">
     <title>Boost Build System V2 recipes</title>
 
- </appendix>
+ </section>
Index: tools/build/v2/doc/src/reference.xml
===================================================================
--- tools/build/v2/doc/src/reference.xml (revision 39768)
+++ tools/build/v2/doc/src/reference.xml (working copy)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
+<!DOCTYPE section PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd"
 [
 <!ENTITY toolset_ops "<optional><replaceable>version</replaceable></optional> : <optional><replaceable>c++-compile-command</replaceable></optional> : <optional><replaceable>compiler options</replaceable></optional>">
@@ -7,7 +7,7 @@
 <!ENTITY using_repeation "<para>This statement may be repeated several times, if you want to configure several versions of the compiler.</para>">
 ]>
 
-<chapter id="bbv2.reference"
+<section id="bbv2.reference"
          xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>Detailed reference</title>
 
@@ -1938,7 +1938,7 @@
     </section>
   </section>
 
-</chapter>
+</section>
 
 <!--
      Local Variables:
Index: tools/build/v2/doc/src/howto.xml
===================================================================
--- tools/build/v2/doc/src/howto.xml (revision 39768)
+++ tools/build/v2/doc/src/howto.xml (working copy)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
+<!DOCTYPE section PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 
- <chapter id="bbv2.howto">
+ <section id="bbv2.howto">
     <title>How to use this document</title>
 
     <para>
@@ -31,4 +31,4 @@
       also mirrowed to newsgroup <ulink url="news://news.gmane.org/gmane.comp.lib.boost.build"/>.
     </para>
 
- </chapter>
+ </section>
Index: tools/build/v2/doc/src/tutorial.xml
===================================================================
--- tools/build/v2/doc/src/tutorial.xml (revision 39768)
+++ tools/build/v2/doc/src/tutorial.xml (working copy)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
+<!DOCTYPE section PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 
 <?psgml nofill screen programlisting literallayout?>
 
-<chapter id="bbv2.tutorial">
+<section id="bbv2.tutorial">
   <title>Tutorial</title>
 
 <!-- You can't launch into this stuff without describing how to configure -->
@@ -694,7 +694,7 @@
 
   </section>
 
-</chapter>
+</section>
 
 <!--
      Local Variables:
Index: tools/build/v2/doc/src/advanced.xml
===================================================================
--- tools/build/v2/doc/src/advanced.xml (revision 39768)
+++ tools/build/v2/doc/src/advanced.xml (working copy)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
+<!DOCTYPE section PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 
- <chapter id="bbv2.advanced">
+ <section id="bbv2.advanced">
     <title>Overview</title>
 
   <para>This section will provide the information necessary to create your own
@@ -1223,7 +1223,7 @@
 
   </section>
     
- </chapter>
+ </section>
 
 <!--
      Local Variables:
Index: tools/build/v2/doc/src/v1_vs_v2.xml
===================================================================
--- tools/build/v2/doc/src/v1_vs_v2.xml (revision 39768)
+++ tools/build/v2/doc/src/v1_vs_v2.xml (working copy)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
+<!DOCTYPE section PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 
 <!-- Copyright 2006 Vladimir Prus -->
 <!-- Distributed under the Boost Software License, Version 1.0. -->
 <!-- (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) -->
 
-<appendix id="bbv2.vs_v1">
+<section id="bbv2.vs_v1">
   <title>Differences to Boost.Build V1</title>
   <!-- "Differences to" is the British English usage. American
        English is "differences from." You can use the former but be
@@ -98,7 +98,7 @@
 
             
     </section>
- </appendix>
+ </section>
 
 
 <!--
Index: tools/build/v2/doc/src/install.xml
===================================================================
--- tools/build/v2/doc/src/install.xml (revision 39768)
+++ tools/build/v2/doc/src/install.xml (working copy)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
+<!DOCTYPE section PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 
- <chapter id="bbv2.installation">
+ <section id="bbv2.installation">
     <title>Installation</title>
 
     <para>
@@ -205,7 +205,7 @@
     
       
 
- </chapter>
+ </section>
 
 <!--
      Local Variables:
Index: tools/build/v2/doc/src/faq.xml
===================================================================
--- tools/build/v2/doc/src/faq.xml (revision 39768)
+++ tools/build/v2/doc/src/faq.xml (working copy)
@@ -2,7 +2,7 @@
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
      "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 
- <chapter id="bbv2.faq">
+ <section id="bbv2.faq">
     <title>Frequently Asked Questions</title>
 
     <section>
@@ -389,7 +389,7 @@
   </section>
 
     
- </chapter>
+ </section>
 <!--
      Local Variables:
      mode: nxml
@@ -397,4 +397,5 @@
      sgml-parent-document: ("userman.xml" "chapter")
      sgml-set-face: t
      End:
--->
\ No newline at end of file
+-->
+
Index: tools/build/v2/doc/src/userman.xml
===================================================================
--- tools/build/v2/doc/src/userman.xml (revision 39768)
+++ tools/build/v2/doc/src/userman.xml (working copy)
@@ -2,7 +2,7 @@
 <!DOCTYPE part PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 
-<part xmlns:xi="http://www.w3.org/2001/XInclude"
+<chapter xmlns:xi="http://www.w3.org/2001/XInclude"
       id="bbv2" last-revision="$Date$">
 
   <title>Boost.Build V2 User Manual</title>
@@ -21,4 +21,4 @@
 <!-- <xi:include href="architecture.xml"/> -->
   <xi:include href="v1_vs_v2.xml"/>
 
-</part>
+</chapter>

--Boundary-00=_mkjDHKjuMACB8f8--


This archive was generated by hypermail 2.1.7 : 2017-11-11 08:50:40 UTC