From 941ad0b93a6b1dc5d7d0f8176139fbabf2e0910c Mon Sep 17 00:00:00 2001
From: Regina Obe <lr@pcorp.us>
Date: Mon, 31 Oct 2011 05:32:43 +0000
Subject: [PATCH] more cleanup -- only print example sections if they have
 examples

git-svn-id: http://svn.osgeo.org/postgis/trunk@8058 b70326c6-7e19-0410-871a-916f4a2858ee
---
 doc/xsl/tiger_geocoder_cheatsheet.html.xsl | 18 ++++++++-------
 doc/xsl/topology_cheatsheet.html.xsl       | 27 +++++++++++++---------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/doc/xsl/tiger_geocoder_cheatsheet.html.xsl b/doc/xsl/tiger_geocoder_cheatsheet.html.xsl
index e5ccd76a6..b607c2ee5 100644
--- a/doc/xsl/tiger_geocoder_cheatsheet.html.xsl
+++ b/doc/xsl/tiger_geocoder_cheatsheet.html.xsl
@@ -83,7 +83,7 @@ h1 {
 			<xsl:text><![CDATA[</div>]]></xsl:text>
 			<xsl:text><![CDATA[<div id="content_examples">]]></xsl:text>
 			<!-- examples go here -->
-			<xsl:apply-templates select="/book/chapter[@id='Extras']/sect1[count(//refentry//refsection//programlisting) > 0]"  />
+			<xsl:apply-templates select="/book/chapter[@id='Extras']/sect1[count(//refentry//refsection//programlisting) &gt; 0]"  />
 			<xsl:text><![CDATA[</div>]]></xsl:text>
 			<xsl:text><![CDATA[</body></html>]]></xsl:text>
 </xsl:template>
@@ -106,15 +106,17 @@ h1 {
 		</xsl:for-each>
 	</xsl:template>
 	
-	 <xsl:template match="sect1[count(//refentry//refsection//programlisting) > 0]">
+	 <xsl:template match="sect1[count(//refentry//refsection//programlisting) &gt; 0]">
 			<!--Beginning of section -->
-				<xsl:variable name="lt"><xsl:text><![CDATA[<]]></xsl:text></xsl:variable>
+			<xsl:variable name="lt"><xsl:text><![CDATA[<]]></xsl:text></xsl:variable>
+			<xsl:if test="contains(., 'Example')">
+			<xsl:text><![CDATA[<table><tr><th colspan="2" class="example_heading">]]></xsl:text>
+			<xsl:value-of select="title" /> Examples
 
-			 	<xsl:text><![CDATA[<table><tr><th colspan="2" class="example_heading">]]></xsl:text>
-				<xsl:value-of select="title" /> Examples
+				<!--only pull the first example seciton of each function -->
+			<xsl:for-each select="refentry//refsection[contains(title,'Example')][1]/programlisting[1]">
 				<!-- end of section header beginning of function list -->
 				<xsl:text><![CDATA[</th></tr>]]></xsl:text>
-			<xsl:for-each select="refentry//refsection[contains(title,'Example')]/programlisting[1]">
 				 <xsl:variable name='plainlisting'>
 					<xsl:call-template name="globalReplace">
 						<xsl:with-param name="outputString" select="."/>
@@ -129,14 +131,14 @@ h1 {
 					</xsl:call-template>
 				</xsl:variable>
 				
-
-
 				<!-- add row for each function and alternate colors of rows -->
 		 		<![CDATA[<tr]]> class="<xsl:choose><xsl:when test="position() mod 2 = 0">evenrow</xsl:when><xsl:otherwise>oddrow</xsl:otherwise></xsl:choose>"<![CDATA[>]]>
 		 		<![CDATA[<td><b>]]><xsl:value-of select="ancestor::refentry/refnamediv/refname" /><![CDATA[</b><br /><code>]]><xsl:value-of select="$listing"  disable-output-escaping="no"/><![CDATA[</code></td></tr>]]>
+		 		
 		 	</xsl:for-each>
 		 	<!--close section -->
 		 	<![CDATA[</table>]]>
+		 	</xsl:if>
 		
 	</xsl:template>
 	
diff --git a/doc/xsl/topology_cheatsheet.html.xsl b/doc/xsl/topology_cheatsheet.html.xsl
index 2f24a88d3..a3e9c8880 100644
--- a/doc/xsl/topology_cheatsheet.html.xsl
+++ b/doc/xsl/topology_cheatsheet.html.xsl
@@ -30,12 +30,12 @@ body {
 
 #content_functions {
 	float: left;
-	width:40%;
+	width:100%;
 }
 
 #content_examples {
-	float: right;
-	width: 58%;
+	float: left;
+	width: 100%;
 }
 
 .section {
@@ -82,7 +82,7 @@ h1 {
 			<xsl:text><![CDATA[</div>]]></xsl:text>
 			<xsl:text><![CDATA[<div id="content_examples">]]></xsl:text>
 			<!-- examples go here -->
-			<xsl:apply-templates select="/book/chapter[@id='Topology']/sect1[count(//refentry//refsection//programlisting) > 0]"  />
+			<xsl:apply-templates select="/book/chapter[@id='Topology']/sect1[count(//refentry//refsection//programlisting) &gt; 0]"  />
 			<xsl:text><![CDATA[</div>]]></xsl:text>
 			<xsl:text><![CDATA[</body></html>]]></xsl:text>
 </xsl:template>
@@ -105,15 +105,18 @@ h1 {
 		</xsl:for-each>
 	</xsl:template>
 	
-	 <xsl:template match="sect1[count(//refentry//refsection//programlisting) > 0]">
+	 <xsl:template match="sect1[//refentry//refsection[contains(title,'Example')]]">
+	 		<!-- less than needed for converting html tags in listings so they are printable -->
+	 		<xsl:variable name="lt"><xsl:text><![CDATA[<]]></xsl:text></xsl:variable>
+	 		<!-- only print section header if it has examples - not sure why this is necessary -->
+	 		<xsl:if test="contains(., 'Example')">
 			<!--Beginning of section -->
-				<xsl:variable name="lt"><xsl:text><![CDATA[<]]></xsl:text></xsl:variable>
-
-			 	<xsl:text><![CDATA[<table><tr><th colspan="2" class="example_heading">]]></xsl:text>
+				<xsl:text><![CDATA[<table><tr><th colspan="2" class="example_heading">]]></xsl:text>
 				<xsl:value-of select="title" /> Examples
+				<!--only pull the first example section of each function -->
+			<xsl:for-each select="refentry//refsection[contains(title,'Example')][1]/programlisting[1]">
 				<!-- end of section header beginning of function list -->
 				<xsl:text><![CDATA[</th></tr>]]></xsl:text>
-			<xsl:for-each select="refentry//refsection[contains(title,'Example')]/programlisting[1]">
 				 <xsl:variable name='plainlisting'>
 					<xsl:call-template name="globalReplace">
 						<xsl:with-param name="outputString" select="."/>
@@ -132,10 +135,12 @@ h1 {
 
 				<!-- add row for each function and alternate colors of rows -->
 		 		<![CDATA[<tr]]> class="<xsl:choose><xsl:when test="position() mod 2 = 0">evenrow</xsl:when><xsl:otherwise>oddrow</xsl:otherwise></xsl:choose>"<![CDATA[>]]>
-		 		<![CDATA[<td><code>]]><xsl:value-of select="$listing"  disable-output-escaping="no"/><![CDATA[</code></td></tr>]]>
+		 		<![CDATA[<td><b>]]><xsl:value-of select="ancestor::refentry/refnamediv/refname" /><![CDATA[</b><br /><code>]]><xsl:value-of select="$listing"  disable-output-escaping="no"/><![CDATA[</code></td></tr>]]>
 		 	</xsl:for-each>
-		 	<!--close section -->
 		 	<![CDATA[</table>]]>
+		 	</xsl:if>
+		 	<!--close section -->
+		 
 		
 	</xsl:template>
 	
-- 
2.50.0