[Boost-commit] svn:boost r67666 - in branches/release/tools/boostbook: . test/more test/more/tests/book test/more/tests/libs test/more/tests/syntax-highlight xsl

Subject: [Boost-commit] svn:boost r67666 - in branches/release/tools/boostbook: . test/more test/more/tests/book test/more/tests/libs test/more/tests/syntax-highlight xsl
From: dnljms_at_[hidden]
Date: 2011-01-04 18:10:49

Author: danieljames
Date: 2011-01-04 18:10:47 EST (Tue, 04 Jan 2011)
New Revision: 67666
URL: http://svn.boost.org/trac/boost/changeset/67666

Log:
Merge boostbook from trunk.

- Better support for attributes on root elements - including `lang`.
- Add missing copyright to some files.

Added:
   branches/release/tools/boostbook/test/more/tests/book/chapter.gold
      - copied unchanged from r67106, /trunk/tools/boostbook/test/more/tests/book/chapter.gold
   branches/release/tools/boostbook/test/more/tests/book/chapter.xml
      - copied, changed from r67106, /trunk/tools/boostbook/test/more/tests/book/chapter.xml
   branches/release/tools/boostbook/test/more/tests/book/library-autoid.gold
      - copied unchanged from r67106, /trunk/tools/boostbook/test/more/tests/book/library-autoid.gold
   branches/release/tools/boostbook/test/more/tests/book/library-autoid.xml
      - copied, changed from r67106, /trunk/tools/boostbook/test/more/tests/book/library-autoid.xml
   branches/release/tools/boostbook/test/more/tests/book/library.gold
      - copied unchanged from r67106, /trunk/tools/boostbook/test/more/tests/book/library.gold
   branches/release/tools/boostbook/test/more/tests/book/library.xml
      - copied, changed from r67106, /trunk/tools/boostbook/test/more/tests/book/library.xml
Properties modified: 
   branches/release/tools/boostbook/   (props changed)
Text files modified: 
   branches/release/tools/boostbook/test/more/run-tests.py                        |     4 ++++                                    
   branches/release/tools/boostbook/test/more/tests/book/boostbook.gold           |     2 +-                                      
   branches/release/tools/boostbook/test/more/tests/book/boostbook.xml            |    10 +++++++++-                              
   branches/release/tools/boostbook/test/more/tests/book/chapter.xml              |     7 +++++++                                 
   branches/release/tools/boostbook/test/more/tests/book/library-autoid.xml       |     7 +++++++                                 
   branches/release/tools/boostbook/test/more/tests/book/library.xml              |     7 +++++++                                 
   branches/release/tools/boostbook/test/more/tests/libs/array.xml                |     7 +++++++                                 
   branches/release/tools/boostbook/test/more/tests/syntax-highlight/comments.xml |     7 +++++++                                 
   branches/release/tools/boostbook/xsl/docbook.xsl                               |    21 ++++++++++-----------                   
   9 files changed, 59 insertions(+), 13 deletions(-)

Modified: branches/release/tools/boostbook/test/more/run-tests.py
==============================================================================
--- branches/release/tools/boostbook/test/more/run-tests.py	(original)
+++ branches/release/tools/boostbook/test/more/run-tests.py	2011-01-04 18:10:47 EST (Tue, 04 Jan 2011)
@@ -1,5 +1,9 @@
 #!/usr/bin/env python
 
+# Copyright 2010 Daniel James.
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
 """Boostbook tests
 
 Usage: python build_docs.py [--generate-gold]

Modified: branches/release/tools/boostbook/test/more/tests/book/boostbook.gold
==============================================================================
--- branches/release/tools/boostbook/test/more/tests/book/boostbook.gold	(original)
+++ branches/release/tools/boostbook/test/more/tests/book/boostbook.gold	2011-01-04 18:10:47 EST (Tue, 04 Jan 2011)
@@ -1,4 +1,4 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<book xmlns:xi="http://www.w3.org/2001/XInclude" id="test" last-revision="$Date: 2010-10-30 15:29:27 +0100 (Sat, 30 Oct 2010) $">
+<book xmlns:xi="http://www.w3.org/2001/XInclude" id="test" lang="en">
   <title>Test 'boostbook' root.</title>
 </book>
\ No newline at end of file

Modified: branches/release/tools/boostbook/test/more/tests/book/boostbook.xml
==============================================================================
--- branches/release/tools/boostbook/test/more/tests/book/boostbook.xml	(original)
+++ branches/release/tools/boostbook/test/more/tests/book/boostbook.xml	2011-01-04 18:10:47 EST (Tue, 04 Jan 2011)
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2010 Daniel James.
+
+    Distributed under the Boost Software License, Version 1.0.
+    (See accompanying file LICENSE_1_0.txt or copy at
+    http://www.boost.org/LICENSE_1_0.txt)
+-->
 <!DOCTYPE boostbook PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <boostbook id="test" xmlns:xi="http://www.w3.org/2001/XInclude"
-           last-revision="$Date: 2010-10-30 15:29:27 +0100 (Sat, 30 Oct 2010) $">
+           last-revision="$Date: 2010-10-30 15:29:27 +0100 (Sat, 30 Oct 2010) $"
+           lang="en">
   <title>Test 'boostbook' root.</title>
 </boostbook>
 

Copied: branches/release/tools/boostbook/test/more/tests/book/chapter.xml (from r67106, /trunk/tools/boostbook/test/more/tests/book/chapter.xml)
==============================================================================
--- /trunk/tools/boostbook/test/more/tests/book/chapter.xml	(original)
+++ branches/release/tools/boostbook/test/more/tests/book/chapter.xml	2011-01-04 18:10:47 EST (Tue, 04 Jan 2011)
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2010 Daniel James.
+
+    Distributed under the Boost Software License, Version 1.0.
+    (See accompanying file LICENSE_1_0.txt or copy at
+    http://www.boost.org/LICENSE_1_0.txt)
+-->
 <!DOCTYPE chapter PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <chapter id="test" xmlns:xi="http://www.w3.org/2001/XInclude"

Copied: branches/release/tools/boostbook/test/more/tests/book/library-autoid.xml (from r67106, /trunk/tools/boostbook/test/more/tests/book/library-autoid.xml)
==============================================================================
--- /trunk/tools/boostbook/test/more/tests/book/library-autoid.xml	(original)
+++ branches/release/tools/boostbook/test/more/tests/book/library-autoid.xml	2011-01-04 18:10:47 EST (Tue, 04 Jan 2011)
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2010 Daniel James.
+
+    Distributed under the Boost Software License, Version 1.0.
+    (See accompanying file LICENSE_1_0.txt or copy at
+    http://www.boost.org/LICENSE_1_0.txt)
+-->
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <library lang="en">

Copied: branches/release/tools/boostbook/test/more/tests/book/library.xml (from r67106, /trunk/tools/boostbook/test/more/tests/book/library.xml)
==============================================================================
--- /trunk/tools/boostbook/test/more/tests/book/library.xml	(original)
+++ branches/release/tools/boostbook/test/more/tests/book/library.xml	2011-01-04 18:10:47 EST (Tue, 04 Jan 2011)
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2010 Daniel James.
+
+    Distributed under the Boost Software License, Version 1.0.
+    (See accompanying file LICENSE_1_0.txt or copy at
+    http://www.boost.org/LICENSE_1_0.txt)
+-->
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <library id="test" xmlns:xi="http://www.w3.org/2001/XInclude"

Modified: branches/release/tools/boostbook/test/more/tests/libs/array.xml
==============================================================================
--- branches/release/tools/boostbook/test/more/tests/libs/array.xml	(original)
+++ branches/release/tools/boostbook/test/more/tests/libs/array.xml	2011-01-04 18:10:47 EST (Tue, 04 Jan 2011)
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2010 Daniel James.
+
+    Distributed under the Boost Software License, Version 1.0.
+    (See accompanying file LICENSE_1_0.txt or copy at
+    http://www.boost.org/LICENSE_1_0.txt)
+-->
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <library name="Array" dirname="array" id="array" last-revision="$Date$">

Modified: branches/release/tools/boostbook/test/more/tests/syntax-highlight/comments.xml
==============================================================================
--- branches/release/tools/boostbook/test/more/tests/syntax-highlight/comments.xml	(original)
+++ branches/release/tools/boostbook/test/more/tests/syntax-highlight/comments.xml	2011-01-04 18:10:47 EST (Tue, 04 Jan 2011)
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2010 Daniel James.
+
+    Distributed under the Boost Software License, Version 1.0.
+    (See accompanying file LICENSE_1_0.txt or copy at
+    http://www.boost.org/LICENSE_1_0.txt)
+-->
 <header name="example.hpp">
   <para>
     Fake reference documentation, so that the syntax highlighter will kick in.

Modified: branches/release/tools/boostbook/xsl/docbook.xsl
==============================================================================
--- branches/release/tools/boostbook/xsl/docbook.xsl	(original)
+++ branches/release/tools/boostbook/xsl/docbook.xsl	2011-01-04 18:10:47 EST (Tue, 04 Jan 2011)
@@ -399,16 +399,12 @@
                   ($boost.include.libraries='' or
                    contains($boost.include.libraries, @id))">
       <chapter>
-        <xsl:attribute name="id">
-          <xsl:choose>
-            <xsl:when test="@id">
-              <xsl:value-of select="@id"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:call-template name="generate.id"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
+        <xsl:copy-of select="@*[not(contains(' last-revision name dirname html-only url ', concat(' ',local-name(),' ')))]"/>
+        <xsl:if test="not(@id)">
+          <xsl:attribute name="id">
+            <xsl:call-template name="generate.id"/>
+          </xsl:attribute>
+        </xsl:if>
 
         <xsl:if test="@last-revision">
           <xsl:attribute
@@ -437,7 +433,10 @@
   </xsl:template>
 
   <xsl:template match="boostbook">
-    <book><xsl:copy-of select="@*"/><xsl:apply-templates/></book>
+    <book>
+      <xsl:copy-of select="@*[not(contains(' last-revision name dirname html-only url ', concat(' ',local-name(),' ')))]"/>
+      <xsl:apply-templates/>
+    </book>
   </xsl:template>
 
   <xsl:template match="programlisting">