Index: jrst2/src/resources/xsl/xml2rst.xsl
diff -u jrst2/src/resources/xsl/xml2rst.xsl:1.3 jrst2/src/resources/xsl/xml2rst.xsl:1.4
--- jrst2/src/resources/xsl/xml2rst.xsl:1.3	Tue May 22 09:24:01 2007
+++ jrst2/src/resources/xsl/xml2rst.xsl	Tue Jun  5 15:52:14 2007
@@ -36,8 +36,8 @@
 <xsl:stylesheet
     version="1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:u="u"
-    xmlns:data="a"
+    xmlns:u="http://www.w3.org/1999/XSL/Transform/u"
+    xmlns:data="http://a"
     exclude-result-prefixes="data">
 
   <xsl:output
@@ -161,8 +161,8 @@
     <xsl:if
 	test="//generated[@class = 'sectnum']">
       <xsl:text>.. section-numbering::</xsl:text>
-      
-      
+      &tEOL;
+      &tCR;
     </xsl:if>
     <xsl:call-template
 	name="u:outputClass">
@@ -211,7 +211,7 @@
     <xsl:text>.. sidebar:: </xsl:text>
     <xsl:value-of
 	select="title"/>
-    
+    &tEOL;
     <xsl:if
 	test="subtitle">
       <xsl:call-template
@@ -230,7 +230,7 @@
     <xsl:call-template
 	name="u:params"/>
     <!-- Always blank line after parameter block -->
-    
+    &tCR;
     <xsl:apply-templates
 	select="*[not(self::title) and not(self::subtitle)]"/>
   </xsl:template>
@@ -250,7 +250,7 @@
     <xsl:text>.. topic:: </xsl:text>
     <xsl:value-of
 	select="title"/>
-    
+    &tEOL;
     <xsl:call-template
 	name="u:params"/>
     <xsl:apply-templates
@@ -267,7 +267,7 @@
 	select="title"/>
     <!-- TODO: Does not generate `:local:' and it is hard to give a
          heuristic for it (if in a `section'?) -->
-    
+    &tEOL;
     <xsl:call-template
 	name="u:params">
       <xsl:with-param
@@ -294,7 +294,7 @@
       </xsl:call-template>
     </xsl:if>
     <!-- Autogenerated content is discarded -->
-    
+    &tCR;
   </xsl:template>
 
   <!-- == structural_element == directive -->
@@ -306,7 +306,7 @@
     <xsl:apply-templates
 	select="title"/>
     <xsl:text>: </xsl:text>
-    
+    &tEOL;
     <xsl:apply-templates
 	select="*[not(self::title)]"/>
   </xsl:template>
@@ -326,7 +326,7 @@
     <xsl:text>.. admonition:: </xsl:text>
     <xsl:apply-templates
 	select="title"/>
-    
+    &tEOL;
     <xsl:call-template
 	name="u:params"/>
     <xsl:call-template
@@ -462,7 +462,7 @@
     <!-- contents handled by ordinary field lists -->
     <xsl:apply-templates/>
     <!-- Supply an EOL because following elements do not recognize this -->
-    
+    &tEOL;
   </xsl:template>
 
   <!--
@@ -498,13 +498,13 @@
       match="transition">
     <xsl:call-template
 	name="u:outputClass"/>
-     <!-- req: blank line before -->
+    &tCR; <!-- req: blank line before -->
     <xsl:text>-----</xsl:text>
-    
+    &tEOL;
     <!-- Add a required blank line after unless class follows immediately -->
     <xsl:if
 	test="not(following-sibling::*[1]/@class)">
-      
+      &tCR;
     </xsl:if>
   </xsl:template>
 
@@ -550,7 +550,7 @@
     </xsl:call-template>
     <xsl:value-of
 	select="$text"/>
-        
+    &tEOL;    
     <xsl:call-template
 	name="u:underline">
       <xsl:with-param
@@ -604,7 +604,7 @@
     </xsl:call-template>
     <xsl:value-of
 	select="$text"/>
-        
+    &tEOL;    
     <xsl:call-template
 	name="u:underline">
       <xsl:with-param
@@ -617,7 +617,7 @@
     <!-- Add a blank line after unless structure follows immediately -->
     <xsl:if
 	test="not(contains(concat($structural_elements, $compound_body_elements), concat('*', name(following-sibling::*[1]), '*')) or following-sibling::*[1]/@class)">
-      
+      &tCR;
     </xsl:if>
   </xsl:template>
 
@@ -673,7 +673,7 @@
 	select="string-length($text)"/>
 
     <!-- always a blank line above -->
-    
+    &tCR;
     <xsl:call-template
 	name="u:overline">
       <xsl:with-param
@@ -685,7 +685,7 @@
     </xsl:call-template>
     <xsl:value-of
 	select="$text"/>
-        
+    &tEOL;    
     <xsl:call-template
 	name="u:underline">
       <xsl:with-param
@@ -712,8 +712,8 @@
     <xsl:call-template
 	name="u:indent"/>
     <xsl:apply-templates/>
-    
-    
+    &tEOL;
+    &tCR;
   </xsl:template>
 
   <!-- ******************************************************************** -->
@@ -753,7 +753,7 @@
     <xsl:call-template
 	name="u:BandI"/>
     <xsl:apply-templates/>
-    
+    &tEOL;
   </xsl:template>
 
   <!-- ******************************************************************** -->
@@ -787,7 +787,7 @@
 	</xsl:if>
 	<xsl:value-of
 	    select="@uri"/>
-	
+	&tEOL;
 	<xsl:choose>
 	  <xsl:when
 	      test="parent::figure">
@@ -864,7 +864,7 @@
 	  </xsl:call-template>
 	</xsl:if>
 	<!-- Always blank line after parameter block -->
-	
+	&tCR;
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -943,7 +943,7 @@
       </xsl:when>
       <xsl:otherwise>
 	<xsl:text>|</xsl:text>
-	
+	&tEOL;
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -966,8 +966,8 @@
     <xsl:call-template
 	name="u:BandI"/>
     <xsl:text>::</xsl:text>
-    
-    
+    &tEOL;
+    &tCR;
     <xsl:variable
 	name="isQuotedLiteral">
       <xsl:call-template
@@ -996,7 +996,7 @@
 	<xsl:apply-templates/>
       </xsl:otherwise>
     </xsl:choose>
-    
+    &tEOL;
   </xsl:template>
 
   <!-- Indent a text of a quoted literal containing line feeds correctly -->
@@ -1078,7 +1078,7 @@
 	select="($previous or not(parent::list_item or ../parent::option_list_item or parent::field_body or parent::document or contains($admonitions, concat('*', name(..), '*')))) and (not($previous) or contains($body_elements, concat('*', name($previous), '*')) or name($previous) = 'title' and contains($titled_elements, concat('*', name(..), '*')) or name($previous) = 'docinfo')"/>
     <xsl:if
 	test="$needsBlank">
-      
+      &tCR;
     </xsl:if>
     <xsl:if
 	test="$needsIndent">
@@ -1126,14 +1126,14 @@
     <xsl:text>.. raw:: </xsl:text>
     <xsl:value-of
 	select="@format"/>
-    
+    &tEOL;
     <xsl:call-template
 	name="u:params">
       <xsl:with-param
 	  name="params"
 	  select="@*[name() != 'format']"/>
     </xsl:call-template>
-    
+    &tCR;
     <xsl:call-template
 	name="u:indent">
       <xsl:with-param
@@ -1141,7 +1141,7 @@
 	  select="ancestor-or-self::*"/>
     </xsl:call-template>
     <xsl:apply-templates/>
-    
+    &tEOL;
   </xsl:template>
 
   <!-- ******************************************************************** -->
@@ -1170,7 +1170,7 @@
     <xsl:call-template
 	name="u:BandI"/>
     <xsl:text>.. compound::</xsl:text>
-    
+    &tEOL;
     <xsl:call-template
 	name="u:params"/>
     <xsl:apply-templates/>
@@ -1236,7 +1236,7 @@
       <xsl:value-of
 	  select="@class"/>
       <xsl:text>::</xsl:text>
-      
+      &tEOL;
       <xsl:call-template
 	  name="u:params"/>
     </xsl:if>
@@ -1251,7 +1251,7 @@
     <xsl:call-template
 	name="u:outputClass"/>
     <!-- blank line between quote and attribution -->
-    
+    &tCR;
     <xsl:call-template
 	name="u:indent"/>
     <xsl:call-template
@@ -1378,7 +1378,7 @@
       <xsl:call-template
 	  name="u:BandI"/>
       <xsl:text>.. target-notes::</xsl:text>
-      
+      &tEOL;
     </xsl:if>
   </xsl:template>
 
@@ -1621,7 +1621,7 @@
   <xsl:template
       match="option_group">
     <xsl:apply-templates/>
-    
+    &tEOL;
   </xsl:template>
 
   <!-- ******************************************************************** -->
@@ -1690,7 +1690,7 @@
     <xsl:call-template
 	name="u:outputClass"/>
     <xsl:apply-templates/>
-    
+    &tEOL;
   </xsl:template>
 
   <!-- ******************************************************************** -->
@@ -1715,7 +1715,7 @@
 	name="u:BandI"/>
     <xsl:value-of
 	select="../@bullet"/>    
-      <!-- space after bullet -->
+    &tSP;  <!-- space after bullet -->
     <xsl:apply-templates/>
   </xsl:template>
 
@@ -1783,20 +1783,31 @@
 	  name="wanted"
 	  select="generate-id()"/>
       <!-- Generate the right current node list -->
-		<xsl:for-each select="../list_item">
-			<xsl:if test="generate-id() = $wanted">
-				<xsl:value-of select="position()"/>
-			</xsl:if>
-		</xsl:for-each>
+      <xsl:for-each
+	  select="../list_item">
+	<xsl:if
+	    test="generate-id() = $wanted">
+	  <xsl:value-of
+	      select="position()"/>
+	</xsl:if>
+      </xsl:for-each>
     </xsl:variable>
     <!-- Determine encoding of the number for the given numeration -->
-	<xsl:variable name="cur">
-		<xsl:call-template name="u:position2Enumerator">
-			<xsl:with-param name="enumType" select="$enumType"/>
-			<xsl:with-param name="position" select="$position"/>
-			<xsl:with-param name="start" select="$start"/>
-		</xsl:call-template>
-	</xsl:variable>
+    <xsl:variable
+	name="cur">
+      <xsl:call-template
+	  name="u:position2Enumerator">
+	<xsl:with-param
+	    name="enumType"
+	    select="$enumType"/>
+	<xsl:with-param
+	    name="position"
+	    select="$position"/>
+	<xsl:with-param
+	    name="start"
+	    select="$start"/>
+      </xsl:call-template>
+    </xsl:variable>
     <!-- Determine encoding of the maximum number -->
     <xsl:variable
 	name="max">
@@ -1821,7 +1832,7 @@
     <xsl:value-of
 	select="../@suffix"/>
     <!-- Output at least one trailing space -->
-    
+    &tSP;
     <!-- Output more whitespace to align with the maximum enumerator -->
     <xsl:if
 	test="$enumType != 'lowerroman' and $enumType != 'upperroman'">
@@ -1901,7 +1912,7 @@
 	  name="u:BandI"/>
       <xsl:apply-templates
 	  select="title"/>
-      
+      &tEOL;
     </xsl:if>
   </xsl:template>
 
@@ -1978,17 +1989,19 @@
     <!-- Determine heights in physical lines of all entries -->
     <xsl:variable
 	name="heights">
-		<xsl:for-each select="entry">
-			<xsl:variable name="text">
-				<!-- Catch the text of all entries -->
-				<xsl:apply-templates/>
-			</xsl:variable>
-			<!-- Compute height of this entry; leading and trailing EOL must be
-			subtracted -->
-			<xsl:value-of
-				select="string-length($text) - string-length(translate($text, '&#xA;', '')) - 1"/>
-			<!-- A space as a list separator -->
-		</xsl:for-each>
+      <xsl:for-each
+	  select="entry">
+	<xsl:variable
+	    name="text">
+	  <!-- Catch the text of all entries -->
+	  <xsl:apply-templates/>
+	</xsl:variable>
+	<!-- Compute height of this entry; leading and trailing EOL must be
+             subtracted -->
+	<xsl:value-of
+	    select="string-length($text) - string-length(translate($text, '&#xA;', '')) - 1"/>
+	&tSP; <!-- A space as a list separator -->
+      </xsl:for-each>
     </xsl:variable>
     <!-- Determine maximum height so every entry must be this high -->
     <xsl:variable
@@ -2055,7 +2068,7 @@
 	    select="$currentLine"/>
       </xsl:apply-templates>
       <!-- End of this physical line -->
-      
+      &tEOL;
       <!-- Continue with the next physical line -->
       <xsl:call-template
 	  name="u:rowLines">
@@ -2080,13 +2093,18 @@
     <xsl:text>+</xsl:text>
     <xsl:for-each
 	select="../../colspec">
-		<xsl:call-template name="u:repeat">
-			<xsl:with-param name="length" select="@colwidth"/>
-			<xsl:with-param name="chars" select="$char"/>
-		</xsl:call-template>
+      <xsl:call-template
+	  name="u:repeat">
+	<xsl:with-param
+	    name="length"
+	    select="@colwidth"/>
+	<xsl:with-param
+	    name="chars"
+	    select="$char"/>
+      </xsl:call-template>
       <xsl:text>+</xsl:text>
     </xsl:for-each>
-    
+    &tEOL;
   </xsl:template>
 
   <!-- ******************************************************************** -->
@@ -2312,7 +2330,7 @@
 	  <xsl:value-of
 	      select="string-length($padded)"/>
 	  <xsl:text>)</xsl:text>
-	  
+	  &tEOL;
 	</xsl:message>
       </xsl:if>
       <xsl:call-template
@@ -2329,7 +2347,7 @@
       <xsl:if
 	  test="$outputLine = 0">
 	<!-- Output linefeed only if we output all the lines -->
-	
+	&tEOL;
       </xsl:if>
       <!-- Output the remaining lines -->
       <xsl:call-template
@@ -2638,7 +2656,7 @@
 	  <xsl:value-of
 	      select="@refuri"/>
 	</xsl:if>
-	
+	&tEOL;
       </xsl:when>
       <xsl:when
 	  test="@anonymous">
@@ -2661,7 +2679,7 @@
 		select="@refuri"/>
 	  </xsl:when>
 	</xsl:choose>
-	
+	&tEOL;
       </xsl:when>
       <xsl:otherwise>
 	<!-- Should not happen -->
@@ -2791,7 +2809,7 @@
 	<!-- Reached the type of element we decide on -->
 	<xsl:if
 	    test="contains($blank_after, concat('*', name(.), '*'))">
-	  
+	  &tCR;
 	</xsl:if>
       </xsl:otherwise>
     </xsl:choose>
@@ -2803,8 +2821,8 @@
   Indent a block if it's a child of...
   -->
   <data:lookup>
-    <node
-	name="address"
+    <node 
+	name="address" 
 	indent="10"/>
     <node
 	name="author"
@@ -2868,33 +2886,47 @@
     <xsl:param
 	name="ancestors"
 	select="ancestor::*"/>
-	<xsl:for-each select="$ancestors">
-		<xsl:variable name="this" select="name()"/>
-		<xsl:choose>
-			<xsl:when test="contains($directives, concat('*', $this, '*'))">
-				<xsl:call-template name="u:repeat">
-					<xsl:with-param name="length" select="3"/>
-				</xsl:call-template>
-			</xsl:when>
-			<xsl:when test="$this = 'list_item' and parent::enumerated_list">
-				<!-- Enumerated list items base their indentation on the
-				numeration -->
-				<xsl:variable name="enumerator">
-					<xsl:call-template name="u:outputEnumerator"/>
-				</xsl:variable>
-				<xsl:call-template name="u:repeat">
-					<xsl:with-param name="length"
-						select="string-length($enumerator)"/>
-				</xsl:call-template>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:call-template name="u:repeat">
-					<xsl:with-param name="length"
-						select="document('')//data:lookup/node[@name=$this]/@indent"/>
-				</xsl:call-template>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:for-each>
+    <xsl:for-each
+	select="$ancestors">
+      <xsl:variable
+	  name="this"
+	  select="name()"/>
+      <xsl:choose>
+	<xsl:when
+	    test="contains($directives, concat('*', $this, '*'))">
+	  <xsl:call-template
+	      name="u:repeat">
+	    <xsl:with-param
+		name="length"
+		select="3"/>
+	  </xsl:call-template>
+	</xsl:when>
+	<xsl:when
+	    test="$this = 'list_item' and parent::enumerated_list">
+	  <!-- Enumerated list items base their indentation on the
+               numeration -->
+	  <xsl:variable
+	      name="enumerator">
+	    <xsl:call-template
+		name="u:outputEnumerator"/>
+	  </xsl:variable>
+	  <xsl:call-template
+	      name="u:repeat">
+	    <xsl:with-param
+		name="length"
+		select="string-length($enumerator)"/>
+	  </xsl:call-template>
+	</xsl:when>
+	<xsl:otherwise>
+	  <xsl:call-template
+	      name="u:repeat">
+	    <xsl:with-param
+		name="length"
+		select="document('')//data:lookup/node[@name=$this]/@indent"/>
+	  </xsl:call-template>
+	</xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
   </xsl:template>
 
   <!-- ******************************************************************** -->
@@ -2961,7 +2993,7 @@
 	<!-- Output first physical line -->
 	<xsl:value-of
 	    select="substring-before($string, '&#x0A;')"/>
-	
+	&tEOL;
 	<!-- Indent before the next line -->
 	<xsl:value-of
 	    select="$indent"/>
@@ -3025,13 +3057,13 @@
 	  <xsl:when
 	      test="$normalized = ''">
 	    <!-- Only white-space in string; output a single space here -->
-	    
+	    &tSP;
 	  </xsl:when>
 	  <xsl:otherwise>
 	    <!-- Output leading white-space here -->
 	    <xsl:if
 		test="normalize-space(substring($string, 1, 1)) = ''">
-	      
+	      &tSP;
 	    </xsl:if>
 	    <xsl:call-template
 		name="u:indentFold">
@@ -3048,7 +3080,7 @@
 	    <!-- Output trailing white-space here -->
 	    <xsl:if
 		test="normalize-space(substring($string, string-length($string), 1)) = ''">
-	      
+	      &tSP;
 	    </xsl:if>
 	  </xsl:otherwise>
 	</xsl:choose>
@@ -3058,7 +3090,7 @@
 	    select="$string"/>
       </xsl:otherwise>
     </xsl:choose>
-    
+    &tEOL;
   </xsl:template>
 
   <!-- ******************************************************************** -->
@@ -3127,7 +3159,7 @@
       <xsl:when
 	  test="$cursorColumn + 1 + string-length($firstWord) &gt; $fold">
 	<!-- Line would get too long; start new line, indent and continue -->
-	
+	&tEOL;
 	<xsl:value-of
 	    select="$indent"/>
 	<xsl:call-template
@@ -3148,7 +3180,7 @@
       </xsl:when>
       <xsl:otherwise>
 	<!-- In a line and first word fits; separate and add word -->
-	
+	&tSP;
 	<xsl:value-of
 	    select="$firstWord"/>
 	<xsl:call-template
@@ -3173,20 +3205,30 @@
   <!-- ******************************************************************** -->
 
   <!-- Output attributes of the current element as a field list -->
-	<xsl:template name="u:params">
-		<xsl:param name="params" select="@*"/>
-		<!-- Ancestors are needed for determining indentation; caller may give
-		them -->
-		<xsl:param name="ancestors" select="ancestor-or-self::*"/>
-		<xsl:for-each select="$params">
-			<!-- Skip URIs based on parent -->
-			<xsl:if test="name() != 'uri' and name() != 'xml:space'">
-				<xsl:call-template name="u:param">
-					<xsl:with-param name="ancestors" select="$ancestors"/>
-				</xsl:call-template>
-			</xsl:if>
-		</xsl:for-each>
-	</xsl:template>
+  <xsl:template
+      name="u:params">
+    <xsl:param
+	name="params"
+	select="@*"/>
+    <!-- Ancestors are needed for determining indentation; caller may give
+         them -->
+    <xsl:param
+	name="ancestors"
+	select="ancestor-or-self::*"/>
+    <xsl:for-each
+	select="$params">
+      <!-- Skip URIs based on parent -->
+      <xsl:if
+	  test="name() != 'uri' and name() != 'xml:space'">
+	<xsl:call-template
+	    name="u:param">
+	  <xsl:with-param
+	      name="ancestors"
+	      select="$ancestors"/>
+	</xsl:call-template>
+      </xsl:if>
+    </xsl:for-each>
+  </xsl:template>
 
   <!-- Output one attribute of the current element as a field list -->
   <xsl:template
@@ -3214,7 +3256,7 @@
     <xsl:text>: </xsl:text>
     <xsl:value-of
 	select="$value"/>
-    
+    &tEOL;
   </xsl:template>
 
   <!-- ******************************************************************** -->
@@ -3280,7 +3322,7 @@
     <xsl:value-of
 	select="name(.)"/>
     <xsl:text>' ########</xsl:text>
-    
+    &tEOL;
   </xsl:template>
 
   <!-- ******************************************************************** -->
@@ -3306,7 +3348,7 @@
 	    name="chars"
 	    select="substring($adornment, 2 * ($depth - 1) + 2, 1)"/>
       </xsl:call-template>
-      
+      &tEOL;
     </xsl:if>
   </xsl:template>
 
@@ -3328,7 +3370,7 @@
 	  name="chars"
 	  select="substring($adornment, 2 * ($depth - 1) + 2, 1)"/>
     </xsl:call-template>
-    
+    &tEOL;
   </xsl:template>
 
   <!-- ******************************************************************** -->
@@ -3404,26 +3446,37 @@
 	name="cleanNumbers"
 	select="normalize-space($numbers)"/>
     <xsl:choose>
-		<xsl:when test="contains($cleanNumbers, ' ')">
-			<xsl:variable name="head"
-				select="substring-before($cleanNumbers, ' ')"/>
-			<xsl:choose>
-				<xsl:when test="$head > $currentMax">
-					<xsl:call-template name="u:maxNumber">
-						<xsl:with-param name="numbers"
-							select="substring-after($cleanNumbers, ' ')"/>
-						<xsl:with-param name="currentMax" select="$head"/>
-					</xsl:call-template>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:call-template name="u:maxNumber">
-						<xsl:with-param name="numbers"
-							select="substring-after($cleanNumbers, ' ')"/>
-						<xsl:with-param name="currentMax" select="$currentMax"/>
-					</xsl:call-template>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:when>
+      <xsl:when
+	  test="contains($cleanNumbers, ' ')">
+	<xsl:variable
+	    name="head"
+	    select="substring-before($cleanNumbers, ' ')"/>
+	<xsl:choose>
+	  <xsl:when
+	      test="$head > $currentMax">
+	    <xsl:call-template
+		name="u:maxNumber">
+	      <xsl:with-param
+		  name="numbers"
+		  select="substring-after($cleanNumbers, ' ')"/>
+	      <xsl:with-param
+		  name="currentMax"
+		  select="$head"/>
+	    </xsl:call-template>
+	  </xsl:when>
+	  <xsl:otherwise>
+	    <xsl:call-template
+		name="u:maxNumber">
+	      <xsl:with-param
+		  name="numbers"
+		  select="substring-after($cleanNumbers, ' ')"/>
+	      <xsl:with-param
+		  name="currentMax"
+		  select="$currentMax"/>
+	    </xsl:call-template>
+	  </xsl:otherwise>
+	</xsl:choose>
+      </xsl:when>
       <xsl:otherwise>
 	<xsl:choose>
 	  <xsl:when
@@ -3473,10 +3526,10 @@
       <xsl:text>.. class:: </xsl:text>
       <xsl:value-of
 	  select="@class"/>
-      
+      &tEOL;
       <xsl:if
 	  test="$blankAfter">
-	
+	&tCR;
       </xsl:if>
     </xsl:if>
   </xsl:template>

Index: jrst2/src/resources/xsl/rst2xhtml.xsl
diff -u jrst2/src/resources/xsl/rst2xhtml.xsl:1.7 jrst2/src/resources/xsl/rst2xhtml.xsl:1.8
--- jrst2/src/resources/xsl/rst2xhtml.xsl:1.7	Wed May 30 19:18:24 2007
+++ jrst2/src/resources/xsl/rst2xhtml.xsl	Tue Jun  5 15:52:14 2007
@@ -31,7 +31,7 @@
 			<xsl:element name="h{count(ancestor::section) + 1}">
 				<xsl:attribute name="class">title</xsl:attribute>
 				<xsl:if test="@refid">
-					<a href="#{@refid}" id="{../@id}"><xsl:apply-templates/></a>
+					<a class="toc-backref" href="#{@refid}" id="{../@id}"><xsl:apply-templates/></a>
 				</xsl:if>
 				<xsl:if test="not(@refid)">
 					<xsl:apply-templates/>
@@ -74,7 +74,7 @@
 	<xsl:template match="author">
 		<xsl:if test="not(../../authors)">
 				<tr>
-					<th class="docpatterninfo-name">
+					<th class="docinfo-name">
 						<xsl:value-of select="name(.)"/> :
 					</th>
 					<td class="docinfo-content">
@@ -134,6 +134,8 @@
 		</xsl:if>
 		<xsl:if test="not(@refid)">
 			<a href="{@refuri}" id="{@id}"><xsl:apply-templates/></a>
+	
+			
 		</xsl:if>
 	</xsl:template>
 
@@ -327,14 +329,20 @@
 	</xsl:template>
 	
 	<xsl:template match="block_quote">
-		<div class="block_quote">
-			<p><xsl:apply-templates select="child::*[position()=1]"/></p>
+		
+		<blockquote>
+			
 			<xsl:if test="./attribution">
+				<p><xsl:apply-templates select="child::*[position()=1]"/></p>
 				<p class="attribution">
 					<xsl:apply-templates select="./attribution"/>
 				</p>
 			</xsl:if>
-		</div>
+			<xsl:if test="not(./attribution)">
+				<xsl:apply-templates select="child::*"/>
+				
+			</xsl:if>
+		</blockquote>
 	</xsl:template>
 	
 	<xsl:template match="doctest_block">

Index: jrst2/src/resources/xsl/XSLT-xsl.dtd
diff -u /dev/null jrst2/src/resources/xsl/XSLT-xsl.dtd:1.1
--- /dev/null	Tue Jun  5 15:52:21 2007
+++ jrst2/src/resources/xsl/XSLT-xsl.dtd	Tue Jun  5 15:52:14 2007
@@ -0,0 +1,340 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Taken from `http://www.w3.org/TR/1999/REC-xslt-19991116' and
+     modified to support stylesheets using `xsl' as namespace prefix for
+     the XSLT and allowing no result elements. -->
+
+<!ENTITY % result-elements "">
+
+<!ENTITY % char-instructions "
+  | xsl:apply-templates
+  | xsl:call-template
+  | xsl:apply-imports
+  | xsl:for-each
+  | xsl:value-of
+  | xsl:copy-of
+  | xsl:number
+  | xsl:choose
+  | xsl:if
+  | xsl:text
+  | xsl:copy
+  | xsl:variable
+  | xsl:message
+  | xsl:fallback
+">
+
+<!ENTITY % instructions "
+  %char-instructions;
+  | xsl:processing-instruction
+  | xsl:comment
+  | xsl:element
+  | xsl:attribute
+">
+
+<!ENTITY % char-template "
+ (#PCDATA
+  %char-instructions;)*
+">
+
+<!ENTITY % template "
+ (#PCDATA
+  %instructions;
+  %result-elements;)*
+">
+
+<!-- Used for the type of an attribute value that is a URI reference.-->
+<!ENTITY % URI "CDATA">
+
+<!-- Used for the type of an attribute value that is a pattern.-->
+<!ENTITY % pattern "CDATA">
+
+<!-- Used for the type of an attribute value that is an
+     attribute value template.-->
+<!ENTITY % avt "CDATA">
+
+<!-- Used for the type of an attribute value that is a QName; the prefix
+     gets expanded by the XSLT processor. -->
+<!ENTITY % qname "NMTOKEN">
+
+<!-- Like qname but a whitespace-separated list of QNames. -->
+<!ENTITY % qnames "NMTOKENS">
+
+<!-- Used for the type of an attribute value that is an expression.-->
+<!ENTITY % expr "CDATA">
+
+<!-- Used for the type of an attribute value that consists
+     of a single character.-->
+<!ENTITY % char "CDATA">
+
+<!-- Used for the type of an attribute value that is a priority. -->
+<!ENTITY % priority "NMTOKEN">
+
+<!ENTITY % space-att "xml:space (default|preserve) #IMPLIED">
+
+<!-- This may be overridden to customize the set of elements allowed
+at the top-level. -->
+
+<!ENTITY % non-xsl-top-level "">
+
+<!ENTITY % top-level "
+ (xsl:import*,
+  (xsl:include
+  | xsl:strip-space
+  | xsl:preserve-space
+  | xsl:output
+  | xsl:key
+  | xsl:decimal-format
+  | xsl:attribute-set
+  | xsl:variable
+  | xsl:param
+  | xsl:template
+  | xsl:namespace-alias
+  %non-xsl-top-level;)*)
+">
+
+<!ENTITY % top-level-atts '
+  extension-element-prefixes CDATA #IMPLIED
+  exclude-result-prefixes CDATA #IMPLIED
+  id ID #IMPLIED
+  version NMTOKEN #REQUIRED
+  xmlns:xsl CDATA #FIXED "http://www.w3.org/1999/XSL/Transform"
+  %space-att;
+'>
+
+<!-- This entity is defined for use in the ATTLIST declaration
+for result elements. -->
+
+<!ENTITY % result-element-atts '
+  xsl:extension-element-prefixes CDATA #IMPLIED
+  xsl:exclude-result-prefixes CDATA #IMPLIED
+  xsl:use-attribute-sets %qnames; #IMPLIED
+  xsl:version NMTOKEN #IMPLIED
+'>
+
+<!ELEMENT xsl:stylesheet %top-level;>
+<!ATTLIST xsl:stylesheet %top-level-atts;>
+
+<!ELEMENT xsl:transform %top-level;>
+<!ATTLIST xsl:transform %top-level-atts;>
+
+<!ELEMENT xsl:import EMPTY>
+<!ATTLIST xsl:import href %URI; #REQUIRED>
+
+<!ELEMENT xsl:include EMPTY>
+<!ATTLIST xsl:include href %URI; #REQUIRED>
+
+<!ELEMENT xsl:strip-space EMPTY>
+<!ATTLIST xsl:strip-space elements CDATA #REQUIRED>
+
+<!ELEMENT xsl:preserve-space EMPTY>
+<!ATTLIST xsl:preserve-space elements CDATA #REQUIRED>
+
+<!ELEMENT xsl:output EMPTY>
+<!ATTLIST xsl:output
+  method %qname; #IMPLIED
+  version NMTOKEN #IMPLIED
+  encoding CDATA #IMPLIED
+  omit-xml-declaration (yes|no) #IMPLIED
+  standalone (yes|no) #IMPLIED
+  doctype-public CDATA #IMPLIED
+  doctype-system CDATA #IMPLIED
+  cdata-section-elements %qnames; #IMPLIED
+  indent (yes|no) #IMPLIED
+  media-type CDATA #IMPLIED
+>
+
+<!ELEMENT xsl:key EMPTY>
+<!ATTLIST xsl:key
+  name %qname; #REQUIRED
+  match %pattern; #REQUIRED
+  use %expr; #REQUIRED
+>
+
+<!ELEMENT xsl:decimal-format EMPTY>
+<!ATTLIST xsl:decimal-format
+  name %qname; #IMPLIED
+  decimal-separator %char; "."
+  grouping-separator %char; ","
+  infinity CDATA "Infinity"
+  minus-sign %char; "-"
+  NaN CDATA "NaN"
+  percent %char; "%"
+  per-mille %char; "&#x2030;"
+  zero-digit %char; "0"
+  digit %char; "#"
+  pattern-separator %char; ";"
+>
+
+<!ELEMENT xsl:namespace-alias EMPTY>
+<!ATTLIST xsl:namespace-alias
+  stylesheet-prefix CDATA #REQUIRED
+  result-prefix CDATA #REQUIRED
+>
+
+<!ELEMENT xsl:template
+ (#PCDATA
+  %instructions;
+  %result-elements;
+  | xsl:param)*
+>
+
+<!ATTLIST xsl:template
+  match %pattern; #IMPLIED
+  name %qname; #IMPLIED
+  priority %priority; #IMPLIED
+  mode %qname; #IMPLIED
+  %space-att;
+>
+
+<!ELEMENT xsl:value-of EMPTY>
+<!ATTLIST xsl:value-of
+  select %expr; #REQUIRED
+  disable-output-escaping (yes|no) "no"
+>
+
+<!ELEMENT xsl:copy-of EMPTY>
+<!ATTLIST xsl:copy-of select %expr; #REQUIRED>
+
+<!ELEMENT xsl:number EMPTY>
+<!ATTLIST xsl:number
+   level (single|multiple|any) "single"
+   count %pattern; #IMPLIED
+   from %pattern; #IMPLIED
+   value %expr; #IMPLIED
+   format %avt; '1'
+   lang %avt; #IMPLIED
+   letter-value %avt; #IMPLIED
+   grouping-separator %avt; #IMPLIED
+   grouping-size %avt; #IMPLIED
+>
+
+<!ELEMENT xsl:apply-templates (xsl:sort|xsl:with-param)*>
+<!ATTLIST xsl:apply-templates
+  select %expr; "node()"
+  mode %qname; #IMPLIED
+>
+
+<!ELEMENT xsl:apply-imports EMPTY>
+
+<!-- xsl:sort cannot occur after any other elements or
+any non-whitespace character -->
+
+<!ELEMENT xsl:for-each
+ (#PCDATA
+  %instructions;
+  %result-elements;
+  | xsl:sort)*
+>
+
+<!ATTLIST xsl:for-each
+  select %expr; #REQUIRED
+  %space-att;
+>
+
+<!ELEMENT xsl:sort EMPTY>
+<!ATTLIST xsl:sort
+  select %expr; "."
+  lang %avt; #IMPLIED
+  data-type %avt; "text"
+  order %avt; "ascending"
+  case-order %avt; #IMPLIED
+>
+
+<!ELEMENT xsl:if %template;>
+<!ATTLIST xsl:if
+  test %expr; #REQUIRED
+  %space-att;
+>
+
+<!ELEMENT xsl:choose (xsl:when+, xsl:otherwise?)>
+<!ATTLIST xsl:choose %space-att;>
+
+<!ELEMENT xsl:when %template;>
+<!ATTLIST xsl:when
+  test %expr; #REQUIRED
+  %space-att;
+>
+
+<!ELEMENT xsl:otherwise %template;>
+<!ATTLIST xsl:otherwise %space-att;>
+
+<!ELEMENT xsl:attribute-set (xsl:attribute)*>
+<!ATTLIST xsl:attribute-set
+  name %qname; #REQUIRED
+  use-attribute-sets %qnames; #IMPLIED
+>
+
+<!ELEMENT xsl:call-template (xsl:with-param)*>
+<!ATTLIST xsl:call-template
+  name %qname; #REQUIRED
+>
+
+<!ELEMENT xsl:with-param %template;>
+<!ATTLIST xsl:with-param
+  name %qname; #REQUIRED
+  select %expr; #IMPLIED
+>
+
+<!ELEMENT xsl:variable %template;>
+<!ATTLIST xsl:variable 
+  name %qname; #REQUIRED
+  select %expr; #IMPLIED
+>
+
+<!ELEMENT xsl:param %template;>
+<!ATTLIST xsl:param 
+  name %qname; #REQUIRED
+  select %expr; #IMPLIED
+>
+
+<!ELEMENT xsl:text (#PCDATA)>
+<!ATTLIST xsl:text
+  disable-output-escaping (yes|no) "no"
+>
+
+<!ELEMENT xsl:processing-instruction %char-template;>
+<!ATTLIST xsl:processing-instruction 
+  name %avt; #REQUIRED
+  %space-att;
+>
+
+<!ELEMENT xsl:element %template;>
+<!ATTLIST xsl:element 
+  name %avt; #REQUIRED
+  namespace %avt; #IMPLIED
+  use-attribute-sets %qnames; #IMPLIED
+  %space-att;
+>
+
+<!ELEMENT xsl:attribute %char-template;>
+<!ATTLIST xsl:attribute 
+  name %avt; #REQUIRED
+  namespace %avt; #IMPLIED
+  %space-att;
+>
+
+<!ELEMENT xsl:comment %char-template;>
+<!ATTLIST xsl:comment %space-att;>
+
+<!ELEMENT xsl:copy %template;>
+<!ATTLIST xsl:copy
+  %space-att;
+  use-attribute-sets %qnames; #IMPLIED
+>
+
+<!ELEMENT xsl:message %template;>
+<!ATTLIST xsl:message
+  %space-att;
+  terminate (yes|no) "no"
+>
+
+<!ELEMENT xsl:fallback %template;>
+<!ATTLIST xsl:fallback %space-att;>
+
+<!ENTITY CR "&#x0A;">
+<!-- Used to create a blank line -->
+<!ENTITY tCR "<xsl:text>&CR;</xsl:text>">
+<!-- Used when the line before must be ended -->
+<!ENTITY tEOL "<xsl:text>&CR;</xsl:text>">
+<!ENTITY tSP "<xsl:text> </xsl:text>">
+<!ELEMENT data:lookup ANY>
+<!ENTITY % non-xsl-top-level "| data:lookup">