← Back to team overview

anewt-developers team mailing list archive

[Branch ~uws/anewt/anewt.uws] Rev 1700: [doc] Fix missing text; support strong text and ordered lists

 

------------------------------------------------------------
revno: 1700
committer: Wouter Bolsterlee <uws@xxxxxxxxx>
branch nick: anewt.uws
timestamp: Tue 2009-07-21 20:25:49 +0200
message:
  [doc] Fix missing text; support strong text and ordered lists
modified:
  doc/manual/assets/style.css
  doc/manual/doxygen.xsl

=== modified file 'doc/manual/assets/style.css'
--- doc/manual/assets/style.css	2008-05-24 15:41:27 +0000
+++ doc/manual/assets/style.css	2009-07-21 18:25:49 +0000
@@ -221,11 +221,9 @@
 /* Lists */
 
 ul, ol {
- list-style-type: square;
- list-style-position: outside;
+ list-style-position: inside;
  text-indent: 0;
  margin: 0;
- margin-left: 1em;
  padding: 0;
 }
 
@@ -234,6 +232,10 @@
  margin-left: 1em;
 }
 
+ul {
+ list-style-type: square;
+}
+
 dl {
 }
 

=== modified file 'doc/manual/doxygen.xsl'
--- doc/manual/doxygen.xsl	2009-03-26 17:04:51 +0000
+++ doc/manual/doxygen.xsl	2009-07-21 18:25:49 +0000
@@ -336,14 +336,23 @@
 		<xsl:choose>
 
 			<xsl:when test="itemizedlist|parameterlist|simplesect|xrefsect">
-				<!-- This para has subparas regular paragraph of text -->
-				<xsl:for-each select="./*">
+				<!-- This para has sub-paras -->
+				<xsl:for-each select="*|text()">
 					<xsl:choose>
 						<xsl:when test="name() = 'itemizedlist' or name() = 'parameterlist' or name() = 'simplesect' or name() = 'xrefsect'">
+							<!-- Process child elements -->
 							<xsl:apply-templates select="."/>
 						</xsl:when>
+						<xsl:when test="string-length(normalize-space(string(.))) > 0">
+							<!-- This is a non-whitespace text node -->
+							<p><xsl:value-of select="."/></p>
+						</xsl:when>
+						<xsl:when test="string-length(normalize-space(string(.))) = 0">
+							<!-- This is whitespace only; skip -->
+						</xsl:when>
 						<xsl:otherwise>
-							<xsl:message>nee: <xsl:value-of select="name()"/></xsl:message>
+							<!-- Unknown sub-para -->
+							<xsl:message terminate="yes">Unhandled sub-paragraph: <xsl:value-of select="."/></xsl:message>
 							<p><xsl:apply-templates/></p>
 						</xsl:otherwise>
 					</xsl:choose>
@@ -411,10 +420,24 @@
 		</ul>
 	</xsl:template>
 
+	<xsl:template match="orderedlist">
+		<ol>
+			<xsl:for-each select="listitem">
+				<li>
+					<xsl:apply-templates/>
+				</li>
+			</xsl:for-each>
+		</ol>
+	</xsl:template>
+
 	<xsl:template match="computeroutput">
 		<code><xsl:apply-templates/></code>
 	</xsl:template>
 
+	<xsl:template match="bold">
+		<strong><xsl:apply-templates/></strong>
+	</xsl:template>
+
 	<xsl:template match="argsstring|inbodydescription|location">
 		<xsl:apply-templates/>
 	</xsl:template>
@@ -517,7 +540,7 @@
 
 	<xsl:template match="*">
 		<xsl:message>FIXME: <xsl:value-of select="name()"/></xsl:message>
-		FIXME: <xsl:value-of select="name()"/>
+		FIXME: &lt;<xsl:value-of select="name()"/>&gt;<xsl:apply-templates/>&lt;/<xsl:value-of select="name()"/>&gt;
 	</xsl:template>
 
 



--
lp:anewt
https://code.launchpad.net/~uws/anewt/anewt.uws

Your team Anewt developers is subscribed to branch lp:anewt.
To unsubscribe from this branch go to https://code.launchpad.net/~uws/anewt/anewt.uws/+edit-subscription.