From fc2a66afab872756a9b9b30b947296b5fc1b8e07 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Tue, 19 Jul 2011 20:53:06 +0300
Subject: [PATCH] + disable the use of extension to prevent the callouts from
 being generated (which caused some problems) + fixed some issues with image
 paths

---
 docs/build.gradle                                      |  4 ++--
 docs/src/reference/docbook/index.xml                   |  7 +------
 docs/src/reference/resources/xsl/html-custom.xsl       |  2 +-
 .../src/reference/resources/xsl/html-single-custom.xsl |  2 +-
 docs/src/reference/resources/xsl/pdf-custom.xsl        | 10 +++++-----
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/docs/build.gradle b/docs/build.gradle
index 79e74c90..915bc966 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -18,8 +18,8 @@ docbookHtmlSingle.stylesheet = new File(projectDir, 'src/reference/resources/xsl
 docbookFoPdf.stylesheet = new File(projectDir, 'src/reference/resources/xsl/pdf-custom.xsl')
 
 def imagesDir = new File(projectDir, 'src/reference/resources/images');
-docbookFoPdf.admonGraphicsPath = "${imagesDir}/admon"
-docbookFoPdf.imgSrcPath = "${imagesDir}"
+[docbookHtml, docbookFoPdf, docbookHtmlSingle]*.admonGraphicsPath = "./images/admon/"
+[docbookHtml, docbookFoPdf, docbookHtmlSingle]*.imgSrcPath = "${imagesDir}"
 
 refSpec = copySpec {
     into ('reference') {
diff --git a/docs/src/reference/docbook/index.xml b/docs/src/reference/docbook/index.xml
index c7b55414..214669c2 100644
--- a/docs/src/reference/docbook/index.xml
+++ b/docs/src/reference/docbook/index.xml
@@ -39,14 +39,10 @@
 
       <xi:include href="reference/introduction.xml"/>
       <xi:include href="reference/bootstrap.xml"/>
-      <!--
-
       <xi:include href="reference/data.xml"/>
       <xi:include href="reference/serialization.xml"/>
       <xi:include href="reference/samples.xml"/>
-      -->
   </part>
-    <!--
 
   <part id="resources">
       <title>Other Resources</title>
@@ -63,5 +59,4 @@
       <title>Appendices</title>
       <xi:include href="appendix/appendix-schema.xml"/>
   </part>
-  -->
-</book>
+</book>
\ No newline at end of file
diff --git a/docs/src/reference/resources/xsl/html-custom.xsl b/docs/src/reference/resources/xsl/html-custom.xsl
index 575267e3..a6330843 100644
--- a/docs/src/reference/resources/xsl/html-custom.xsl
+++ b/docs/src/reference/resources/xsl/html-custom.xsl
@@ -37,7 +37,7 @@
 	<xsl:param name="highlight.source">1</xsl:param>
 
 <!-- Extensions -->
-	<xsl:param name="use.extensions">1</xsl:param>
+	<xsl:param name="use.extensions">0</xsl:param>
 	<xsl:param name="tablecolumns.extension">0</xsl:param>
 	<xsl:param name="callout.extensions">1</xsl:param>
 
diff --git a/docs/src/reference/resources/xsl/html-single-custom.xsl b/docs/src/reference/resources/xsl/html-single-custom.xsl
index 264d9a81..c37095bb 100644
--- a/docs/src/reference/resources/xsl/html-single-custom.xsl
+++ b/docs/src/reference/resources/xsl/html-single-custom.xsl
@@ -34,7 +34,7 @@
     <xsl:param name="highlight.source">1</xsl:param>
 
 <!-- Extensions -->
-    <xsl:param name="use.extensions">1</xsl:param>
+    <xsl:param name="use.extensions">0</xsl:param>
     <xsl:param name="tablecolumns.extension">0</xsl:param>
     <xsl:param name="callout.extensions">1</xsl:param>
 
diff --git a/docs/src/reference/resources/xsl/pdf-custom.xsl b/docs/src/reference/resources/xsl/pdf-custom.xsl
index 2b229062..cf730cf9 100644
--- a/docs/src/reference/resources/xsl/pdf-custom.xsl
+++ b/docs/src/reference/resources/xsl/pdf-custom.xsl
@@ -24,7 +24,7 @@
                 xmlns:xslthl="http://xslthl.sf.net"
                 exclude-result-prefixes="xslthl"
                 version='1.0'>
-
+    
     <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/>
     <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/highlight.xsl"/>
 
@@ -201,9 +201,10 @@
     ################################################### -->
 
     <!-- These extensions are required for table printing and other stuff -->
-    <xsl:param name="use.extensions">1</xsl:param>
+    <xsl:param name="use.extensions">0</xsl:param>
     <xsl:param name="tablecolumns.extension">0</xsl:param>
-    <xsl:param name="callout.extensions">1</xsl:param>
+    <xsl:param name="callout.extensions">0</xsl:param>
+    <xsl:param name="callouts.extensions">0</xsl:param>
     <xsl:param name="fop1.extensions">1</xsl:param>
 
 <!--###################################################
@@ -486,7 +487,6 @@
 <!--###################################################
         colored and hyphenated links
     ################################################### -->
-<!--
     <xsl:template match="ulink">
         <fo:basic-link external-destination="{@url}"
                 xsl:use-attribute-sets="xref.properties"
@@ -518,5 +518,5 @@
             </xsl:choose>
         </fo:basic-link>
     </xsl:template>
--->
+
 </xsl:stylesheet>