Index: jrst2/src/resources/xsl/rst2xhtml.xsl
diff -u jrst2/src/resources/xsl/rst2xhtml.xsl:1.3 jrst2/src/resources/xsl/rst2xhtml.xsl:1.4
--- jrst2/src/resources/xsl/rst2xhtml.xsl:1.3	Mon May 14 14:41:07 2007
+++ jrst2/src/resources/xsl/rst2xhtml.xsl	Tue May 22 09:24:01 2007
@@ -20,7 +20,13 @@
 
 	<xsl:template match="title">
 	   <xsl:element name="h{count(ancestor::section) + 1}">
-         <xsl:apply-templates/>
+		   <xsl:if test="@refid">
+     		 <a href="#{@refid}" id="{../@id}"><xsl:apply-templates/></a>
+    	   </xsl:if>
+		   <xsl:if test="not(@refid)">
+     		 <xsl:apply-templates/>
+    	   </xsl:if>
+         
        </xsl:element>
 	</xsl:template>
 	
@@ -43,7 +49,7 @@
 	  </table>
 	</xsl:template>
 	
-	<xsl:template match="author|organization|address|contact|version|revision|status|date|copyright">
+	<xsl:template match="organization|address|contact|version|revision|status|date|copyright">
 		<tr>
 			<th class="docinfo-name">
 				<xsl:value-of select="name(.)"/> : 
@@ -54,6 +60,43 @@
 		</tr>
 	</xsl:template>
 			
+	<xsl:template match="author">
+		<xsl:if test="not(../../authors)">
+				<tr>
+					<th class="docpatterninfo-name">
+						<xsl:value-of select="name(.)"/> :
+					</th>
+					<td class="docinfo-content">
+						<xsl:apply-templates/>
+					</td>
+				</tr>
+    	</xsl:if>
+		<xsl:if test="../../authors">
+			<xsl:variable name="num" select="position()"/>
+			<xsl:if test="$num=1">
+				<tr>
+					<th class="docinfo-name">
+						<xsl:value-of select="authors"/>authors :
+					</th>
+					<td class="docinfo-content">
+						<xsl:apply-templates/>
+					</td>
+				</tr>
+			</xsl:if>
+			<xsl:if test="$num>1">
+				<tr>
+					<th>
+						
+					</th>
+					<td class="docinfo-content">
+						<xsl:apply-templates/>
+					</td>
+				</tr>
+			</xsl:if>
+		</xsl:if>
+	</xsl:template>
+	
+		
 	<xsl:template match="transition">
 	  <hr/>
 	</xsl:template>
@@ -75,7 +118,7 @@
 	</xsl:template>
 
 	<xsl:template match="reference">
-	  <a href="{@refuri}"><xsl:apply-templates/></a>
+	  <a href="{@refuri}#{@refid}" id="{@id}"><xsl:apply-templates/></a>
 	</xsl:template>
 
 	<xsl:template match="emphasis">
@@ -222,6 +265,137 @@
 			<xsl:apply-templates/>
 		</td>
 	</xsl:template>
-
-
+	
+	<xsl:template match="admonition">
+		<div class="admonition">
+			<div class="{@class}">
+				<p class="{title}">
+					<xsl:apply-templates select="./title"/>
+				</p>
+				<p class="body">
+					<xsl:apply-templates select="child::*[position()>1]"/>
+				</p>
+			</div>
+		</div>
+	</xsl:template>
+	
+	<xsl:template match="attention|caution|danger|error|hint|important|note|tip|warning">
+		<div class="{name(.)}">
+			<p class="title"><xsl:value-of select="name(.)"/> :</p>
+			<p class="body">
+				<xsl:apply-templates/>
+			</p>
+		</div>
+	</xsl:template>
+	
+	<xsl:template match="block_quote">
+		<div class="block_quote">
+			<p><xsl:apply-templates select="child::*[position()=1]"/></p>
+			<xsl:if test="./attribution">
+				<p class="attribution">
+					<xsl:apply-templates select="./attribution"/>
+				</p>
+			</xsl:if>
+		</div>
+	</xsl:template>
+	
+	<xsl:template match="doctest_block">
+		<pre class="doctest_block">
+			<xsl:apply-templates/>
+		</pre>
+	</xsl:template>
+	
+	<xsl:template match="line_block">
+		<div class="line_block">
+			<xsl:apply-templates/>
+		</div>
+	</xsl:template>
+	
+	<xsl:template match="line">
+		<div class="line">
+			<xsl:apply-templates/>
+		</div>
+	</xsl:template>
+	
+	<xsl:template match="sidebar">
+		<div class="sidebar">
+			<p class="title">
+				<xsl:apply-templates select="./title"/>
+			</p>
+			<xsl:if test="./subtitle">
+				<p class="subtitle">
+					<xsl:apply-templates select="./subtitle"/>
+				</p>
+			</xsl:if>
+			<xsl:choose>
+				<xsl:when test="./subtitle">
+					<xsl:apply-templates select="child::*[position()>2]"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="child::*[position()>1]"/>
+				</xsl:otherwise>
+			</xsl:choose>
+			
+		</div>
+	</xsl:template>
+	
+	<xsl:template match="topic">
+		<div class="topic">
+			<p class="title">
+				<xsl:apply-templates select="./title"/>
+			</p>
+			<xsl:apply-templates select="child::*[position()>1]"/>
+		</div>
+	</xsl:template>
+	
+	<xsl:template match="option_list">
+		<table class="option_list">
+			<col class="option" />
+			<col class="description" />
+			<tbody valign="top">
+				
+				<xsl:apply-templates/>
+				
+			</tbody>
+		</table>
+	</xsl:template>
+	
+	<xsl:template match="option_list_item">
+		<tr>
+			<td class="option-group">
+				<kbd>
+					<span class="option">
+						<xsl:value-of
+							select="option_group/option/option_string"/>
+					</span>
+				</kbd>
+			</td>
+			<td>
+				<xsl:value-of select="description"/>
+			</td>
+		</tr>
+	</xsl:template>
+	
+	
+	<xsl:template match="footnote">
+		<table class="footnote" frame="void" id="{@id}" rules="none">
+			<colgroup>
+				<col class="label"/>
+				<col/>
+			</colgroup>
+			<tbody valign="top">
+				<tr>
+					<td class="label">
+						<a class="backref" href="#{@backrefs}" name="{id}">
+							[<xsl:value-of select="label"/>]
+						</a>
+					</td>
+					<td>
+						<xsl:value-of select="child::*[position()>1]"/>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</xsl:template>
+	
 </xsl:stylesheet>
\ No newline at end of file

Index: jrst2/src/resources/xsl/xml2rst.xsl
diff -u jrst2/src/resources/xsl/xml2rst.xsl:1.2 jrst2/src/resources/xsl/xml2rst.xsl:1.3
--- jrst2/src/resources/xsl/xml2rst.xsl:1.2	Thu May  3 16:37:08 2007
+++ jrst2/src/resources/xsl/xml2rst.xsl	Tue May 22 09:24:01 2007
@@ -1783,31 +1783,20 @@
 	  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">
@@ -1989,19 +1978,17 @@
     <!-- 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"/>
+			<!-- A space as a list separator -->
+		</xsl:for-each>
     </xsl:variable>
     <!-- Determine maximum height so every entry must be this high -->
     <xsl:variable
@@ -2093,15 +2080,10 @@
     <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>
     
@@ -2886,47 +2868,33 @@
     <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>
 
   <!-- ******************************************************************** -->
@@ -3205,30 +3173,20 @@
   <!-- ******************************************************************** -->
 
   <!-- 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
@@ -3446,37 +3404,26 @@
 	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