Index: wiki2xdoc.xsl
===================================================================
--- wiki2xdoc.xsl	(revision 10134)
+++ wiki2xdoc.xsl	(working copy)
@@ -25,10 +25,28 @@
              doctype-system="document-v11.dtd"
              cdata-section-elements="source"/>
 
+ <xsl:param name="name" select="''"/>
+
+ <xsl:template name="spacify">
+  <xsl:param name="name" select="''"/>
+  <xsl:value-of select="replace($name,'[a-z][A-Z]','$1 $2')"/>
+ </xsl:template>
+
  <xsl:template match="st:output">
    <document>  
     <header>  
-     <title><xsl:value-of select="st:document/st:section/st:title/st:textsequence"/></title>  
+     <title>
+      <xsl:choose>
+       <xsl:when test="$name">
+        <xsl:call-template name="spacify">
+         <xsl:with-param name="name" select="$name"/>
+        </xsl:call-template>
+       </xsl:when>
+       <xsl:otherwise>
+        <xsl:value-of select="st:document/st:section/st:title/st:textsequence"/>
+       </xsl:otherwise>
+      </xsl:choose>
+     </title>  
     </header>  
     <body>
       <xsl:apply-templates select="st:document/st:paragraphs/st:paragraph/*" mode="paragraph"/>  
@@ -131,7 +149,7 @@
       </link>
      </xsl:when>
      <xsl:otherwise>
-      <link href="view.do?page={$href}">
+      <link href="{$href}.html">
        <xsl:value-of select="$text"/>
       </link>
      </xsl:otherwise>
@@ -191,18 +209,42 @@
   <code><xsl:value-of select="st:text"/></code><xsl:text> </xsl:text>
  </xsl:template>
 
- <xsl:template match="st:bulletedlist" mode="paragraph">
+ <xsl:template match="st:bulletedlist1" mode="paragraph">
   <ul>
-   <xsl:apply-templates select="st:bulletedlistitem"/>
+   <xsl:apply-templates select="st:bulletedlistitem1|st:bulletedlist2"/>
   </ul>
  </xsl:template>
 
- <xsl:template match="st:bulletedlistitem" >
+ <xsl:template match="st:bulletedlistitem1" >
   <li>
    <xsl:apply-templates select="st:textsequence/st:textblock/*"/>
   </li>
  </xsl:template>
 
+ <xsl:template match="st:bulletedlist2" >
+  <ul>
+   <xsl:apply-templates select="st:bulletedlistitem2|st:bulletedlist3"/>
+  </ul>
+ </xsl:template>
+    
+ <xsl:template match="st:bulletedlistitem2" >
+  <li>
+   <xsl:apply-templates select="st:textsequence/st:textblock/*"/>
+  </li>
+ </xsl:template>
+
+ <xsl:template match="st:bulletedlist3" >
+  <ul>
+   <xsl:apply-templates select="st:bulletedlistitem3"/>
+  </ul>
+ </xsl:template>
+    
+ <xsl:template match="st:bulletedlistitem3" >
+  <li>
+   <xsl:apply-templates select="st:textsequence/st:textblock/*"/>
+  </li>
+ </xsl:template>
+
  <xsl:template match="st:numberedlist1" mode="paragraph">
   <ol>
    <xsl:apply-templates select="st:numberedlistitem1|st:numberedlist2"/>
