[Boost-commit] svn:boost r70450 - in branches/release/tools/boostbook: . xsl xsl/doxygen

Subject: [Boost-commit] svn:boost r70450 - in branches/release/tools/boostbook: . xsl xsl/doxygen
From: dnljms_at_[hidden]
Date: 2011-03-22 20:20:31

Author: danieljames
Date: 2011-03-22 20:20:29 EDT (Tue, 22 Mar 2011)
New Revision: 70450
URL: http://svn.boost.org/trac/boost/changeset/70450

Log:
Boostbook: merge changes.

Doxygen:

- Add support for verbatim (danieljames).
- Handle explicit (steven_watanabe).
- Handle description of public data members (steven_watanabe).

Fop:

- Working link to download, in setup_boostbook (garcia).
- Improved description of A4 in docs (garcia).

Properties modified: 
   branches/release/tools/boostbook/   (props changed)
Text files modified: 
   branches/release/tools/boostbook/setup_boostbook.py                |     3                                         
   branches/release/tools/boostbook/setup_boostbook.sh                |     5 +                                       
   branches/release/tools/boostbook/xsl/doxygen/doxygen2boostbook.xsl |     6 ++                                      
   branches/release/tools/boostbook/xsl/fo.xsl                        |     2                                         
   branches/release/tools/boostbook/xsl/type.xsl                      |   117 ++++++++++++++++++++++++++++++++++++++- 
   5 files changed, 124 insertions(+), 9 deletions(-)

Modified: branches/release/tools/boostbook/setup_boostbook.py
==============================================================================
--- branches/release/tools/boostbook/setup_boostbook.py	(original)
+++ branches/release/tools/boostbook/setup_boostbook.py	2011-03-22 20:20:29 EDT (Tue, 22 Mar 2011)
@@ -15,7 +15,8 @@
 DOCBOOK_DTD_VERSION = "4.2"
 FOP_VERSION = "0.94"
 FOP_JDK_VERSION="1.4"
-FOP_MIRROR = "http://mirrors.ibiblio.org/pub/mirrors/apache/xmlgraphics/fop/binaries"
+# FOP_MIRROR = "http://mirrors.ibiblio.org/pub/mirrors/apache/xmlgraphics/fop/binaries"
+FOP_MIRROR = "http://archive.apache.org/dist/xmlgraphics/fop/binaries/"
 SOURCEFORGE_DOWNLOAD = "http://sourceforge.net/projects/docbook/files"
 
 # No user configuration below this point-------------------------------------

Modified: branches/release/tools/boostbook/setup_boostbook.sh
==============================================================================
--- branches/release/tools/boostbook/setup_boostbook.sh	(original)
+++ branches/release/tools/boostbook/setup_boostbook.sh	2011-03-22 20:20:29 EDT (Tue, 22 Mar 2011)
@@ -11,7 +11,8 @@
 DOCBOOK_DTD_VERSION=4.2
 FOP_VERSION=0.94
 FOP_JDK_VERSION=1.4
-FOP_MIRROR=http://mirrors.ibiblio.org/pub/mirrors/apache/xmlgraphics/fop/binaries
+# FOP_MIRROR=http://mirrors.ibiblio.org/pub/mirrors/apache/xmlgraphics/fop/binaries
+FOP_MIRROR=http://archive.apache.org/dist/xmlgraphics/fop/binaries/
 SOURCEFORGE_DOWNLOAD=http://sourceforge.net/projects/docbook/files/
 HTTP_GET_CMD="curl -O -L"
 
@@ -19,7 +20,7 @@
 
 # Get the DocBook XSLT Stylesheets
 DOCBOOK_XSL_TARBALL=docbook-xsl-$DOCBOOK_XSL_VERSION.tar.gz
-DOCBOOK_XSL_URL=$SOURCEFORGE_DOWNLOAD/docbook-xsl/$DOCBOOK_XSL_VERSION/$DOCBOOK_XSL_TARBALL/download
+DOCBOOK_XSL_URL=$SOURCEFORGE_DOWNLOAD/docbook-xsl/$DOCBOOK_XSL_VERSION/$DOCBOOK_XSL_TARBALL
 if test -f $DOCBOOK_XSL_TARBALL; then
   echo "Using existing DocBook XSLT Stylesheets (version $DOCBOOK_XSL_VERSION)."
 else

Modified: branches/release/tools/boostbook/xsl/doxygen/doxygen2boostbook.xsl
==============================================================================
--- branches/release/tools/boostbook/xsl/doxygen/doxygen2boostbook.xsl	(original)
+++ branches/release/tools/boostbook/xsl/doxygen/doxygen2boostbook.xsl	2011-03-22 20:20:29 EDT (Tue, 22 Mar 2011)
@@ -1105,6 +1105,9 @@
   <!-- Handle constructors -->
   <xsl:template name="constructor">
     <constructor>
+      <xsl:if test="@explicit = 'yes'">
+        <xsl:attribute name="specifiers">explicit</xsl:attribute>
+      </xsl:if>
       <xsl:call-template name="function.children"/>
     </constructor>
   </xsl:template>
@@ -1242,6 +1245,9 @@
   <xsl:template match="copydoc" mode="passthrough">
     <xsl:apply-templates mode="passthrough"/>
   </xsl:template>
+  <xsl:template match="verbatim" mode="passthrough">
+    <xsl:copy-of select="node()"/>
+  </xsl:template>
 
   <xsl:template match="para/simplesect" mode="passthrough">
     <xsl:if test="not (@kind='pre') and

Modified: branches/release/tools/boostbook/xsl/fo.xsl
==============================================================================
--- branches/release/tools/boostbook/xsl/fo.xsl	(original)
+++ branches/release/tools/boostbook/xsl/fo.xsl	2011-03-22 20:20:29 EDT (Tue, 22 Mar 2011)
@@ -269,7 +269,7 @@
 * Body text is not indented compared to the titles.
 * Page margins are a rather small 0.5in, but we need
   all the space we can get for code blocks.
-* Paper size is A4: an ISO standard, and just slightly smaller than US Letter.
+* Paper size is A4: an ISO standard, slightly taller and narrower than US Letter.
 * Use SVG graphics for admonishments: the bitmaps look awful in PDF's.
 * Disable draft mode so we're not constantly trying to download the necessary graphic.
 * Set default image paths to pull down direct from SVN: individual Jamfiles can override this

Modified: branches/release/tools/boostbook/xsl/type.xsl
==============================================================================
--- branches/release/tools/boostbook/xsl/type.xsl	(original)
+++ branches/release/tools/boostbook/xsl/type.xsl	2011-03-22 20:20:29 EDT (Tue, 22 Mar 2011)
@@ -860,9 +860,34 @@
     </xsl:apply-templates>
 
     <!-- Data members -->
-    <xsl:apply-templates select="data-member" mode="synopsis">
-      <xsl:with-param name="indentation" select="$indentation + 2"/>
-    </xsl:apply-templates>
+    <xsl:if test="data-member">
+      <xsl:text>&#10;&#10;</xsl:text>
+      <xsl:call-template name="indent">
+        <xsl:with-param name="indentation" select="$indentation + 2"/>
+      </xsl:call-template>
+      <xsl:call-template name="highlight-comment">
+        <xsl:with-param name="text">
+          <xsl:text>// </xsl:text>
+          <xsl:choose>
+            <xsl:when test="data-member/description">
+              <xsl:call-template name="internal-link">
+                <xsl:with-param name="to">
+                  <xsl:call-template name="generate.id"/>
+                  <xsl:text>public-data-members</xsl:text>
+                </xsl:with-param>
+                <xsl:with-param name="text" select="'public data members'"/>
+              </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text>public data members</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:apply-templates select="data-member" mode="synopsis">
+        <xsl:with-param name="indentation" select="$indentation + 2"/>
+      </xsl:apply-templates>
+    </xsl:if>
   </xsl:template>
 
   <xsl:template name="print-access-specification">
@@ -1062,6 +1087,35 @@
     </xsl:if>
  </xsl:template>
 
+  <xsl:template name="data-member-reference">
+    <xsl:if test="data-member/description">
+      <xsl:call-template name="member-documentation">
+        <xsl:with-param name="name">
+          <xsl:call-template name="anchor">
+            <xsl:with-param name="to">
+              <xsl:call-template name="generate.id"/>
+              <xsl:text>public-data-members</xsl:text>
+            </xsl:with-param>
+            <xsl:with-param name="text" select="''"/>
+          </xsl:call-template>
+          <xsl:call-template name="monospaced">
+            <xsl:with-param name="text">
+              <xsl:call-template name="object-name"/>
+            </xsl:with-param>
+          </xsl:call-template>
+          <xsl:text> </xsl:text>
+          <xsl:call-template name="access-name"/>
+          <xsl:text> public data members</xsl:text>
+        </xsl:with-param>
+        <xsl:with-param name="text">
+          <orderedlist>
+            <xsl:apply-templates select="data-member" mode="reference"/>
+          </orderedlist>
+        </xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
   <xsl:template name="class-members-reference">
 
     <xsl:call-template name="member-typedefs-reference"/>
@@ -1071,6 +1125,8 @@
     <xsl:apply-templates
       select="method-group|method|overloaded-method"
       mode="reference"/>
+    
+    <xsl:call-template name="data-member-reference"/>
 
     <!-- Emit reference docs for nested classes -->
     <xsl:apply-templates
@@ -1211,7 +1267,24 @@
 
         <xsl:apply-templates select="type" mode="highlight"/>
         <xsl:text> </xsl:text>
-        <xsl:value-of select="@name"/>
+        <xsl:choose>
+          <xsl:when test="description">
+            <xsl:variable name="link-to">
+              <xsl:call-template name="generate.id"/>
+            </xsl:variable>
+            <xsl:call-template name="link-or-anchor">
+              <xsl:with-param name="to" select="$link-to"/>
+              <xsl:with-param name="text" select="@name"/>
+              <xsl:with-param name="link-type" select="'link'"/>
+              <xsl:with-param name="highlight" select="true()"/>
+            </xsl:call-template>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="highlight-identifier">
+              <xsl:with-param name="identifier" select="@name"/>
+            </xsl:call-template>
+          </xsl:otherwise>
+        </xsl:choose>
         <xsl:call-template name="highlight-text">
           <xsl:with-param name="text" select="';'"/>
         </xsl:call-template>
@@ -1246,7 +1319,41 @@
     <xsl:choose>
       <xsl:when test="ancestor::class|ancestor::class-specialization|
                       ancestor::struct|ancestor::struct-specialization|
-                      ancestor::union|ancestor::union-specialization"/>
+                      ancestor::union|ancestor::union-specialization">
+        <xsl:if test="description">
+          <listitem>
+            <para>
+              <xsl:variable name="link-to">
+                <xsl:call-template name="generate.id"/>
+              </xsl:variable>
+            
+              <xsl:call-template name="preformatted">
+                <xsl:with-param name="text">
+                  <xsl:if test="@specifiers">
+                    <xsl:call-template name="highlight-keyword">
+                      <xsl:with-param name="keyword" select="@specifiers"/>
+                    </xsl:call-template>
+                    <xsl:text> </xsl:text>
+                  </xsl:if>
+
+                  <xsl:apply-templates select="type" mode="highlight"/>
+                  <xsl:text> </xsl:text>
+                  <xsl:call-template name="link-or-anchor">
+                    <xsl:with-param name="to" select="$link-to"/>
+                    <xsl:with-param name="text" select="@name"/>
+                    <xsl:with-param name="link-type" select="'anchor'"/>
+                    <xsl:with-param name="highlight" select="true()"/>
+                  </xsl:call-template>
+                  <xsl:call-template name="highlight-special">
+                    <xsl:with-param name="text" select="';'"/>
+                  </xsl:call-template>
+                </xsl:with-param>
+              </xsl:call-template>
+            </para>
+            <xsl:apply-templates select="description"/>
+          </listitem>
+        </xsl:if>
+      </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="global-reference"/>
       </xsl:otherwise>