--- a/templates/spartan/map	Wed May 13 22:42:19 2009 +0200
+++ b/templates/spartan/map	Wed May 13 22:42:40 2009 +0200
@@ -19,41 +19,153 @@
 searchentry = changelogentry.tmpl
 changeset = changeset.tmpl
 manifest = manifest.tmpl
-direntry = '<tr class="parity#parity#"><td><tt>drwxr-xr-x</tt>&nbsp;<td>&nbsp;<td>&nbsp;<td><a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">#basename|escape#/</a> <a href="#url#file/#node|short##path|urlescape#/#emptydirs|urlescape#{sessionvars%urlparameter}">#emptydirs|urlescape#</a>'
-fileentry = '<tr class="parity#parity#"><td><tt>#permissions|permissions#</tt>&nbsp;<td align=right><tt class="date">#date|isodate#</tt>&nbsp;<td align=right><tt>#size#</tt>&nbsp;<td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#basename|escape#</a>'
+
+direntry = '
+  <tr class="parity#parity#">
+    <td><tt>drwxr-xr-x</tt>&nbsp;
+    <td>&nbsp;
+    <td>&nbsp;
+    <td>
+      <a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">#basename|escape#/</a>
+      <a href="#url#file/#node|short##path|urlescape#/#emptydirs|urlescape#{sessionvars%urlparameter}">
+        #emptydirs|urlescape#
+      </a>'
+
+fileentry = '
+  <tr class="parity#parity#">
+    <td><tt>#permissions|permissions#</tt>&nbsp;
+    <td align=right><tt class="date">#date|isodate#</tt>&nbsp;
+    <td align=right><tt>#size#</tt>&nbsp;
+    <td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#basename|escape#</a>'
+
 filerevision = filerevision.tmpl
 fileannotate = fileannotate.tmpl
 filediff = filediff.tmpl
 filelog = filelog.tmpl
 fileline = '<div class="parity#parity#"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</div>'
 filelogentry = filelogentry.tmpl
-annotateline = '<tr class="parity#parity#"><td class="annotate"><a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}#l{targetline}" title="{node|short}: {desc|escape|firstline}">#author|user#@#rev#</a></td><td><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a></td><td><pre>#line|escape#</pre></td></tr>'
+annotateline = '
+  <tr class="parity#parity#">
+    <td class="annotate">
+      <a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}#l{targetline}"
+         title="{node|short}: {desc|escape|firstline}">#author|user#@#rev#</a>
+    </td>
+    <td>
+      <a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>
+    </td>
+    <td><pre>#line|escape#</pre></td>
+  </tr>'
 difflineplus = '<span class="plusline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>'
 difflineminus = '<span class="minusline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>'
 difflineat = '<span class="atline"><a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#</span>'
 diffline = '<a class="lineno" href="##lineid#" id="#lineid#">#linenumber#</a>#line|escape#'
-changelogparent = '<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
-changesetparent = '<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
-filerevparent = '<tr><td class="metatag">parent:</td><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a></td></tr>'
+changelogparent = '
+  <tr>
+    <th class="parent">parent #rev#:</th>
+    <td class="parent">
+      <a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a>
+    </td>
+  </tr>'
+changesetparent = '
+  <tr>
+    <th class="parent">parent #rev#:</th>
+    <td class="parent"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td>
+  </tr>'
+filerevparent = '
+  <tr>
+    <td class="metatag">parent:</td>
+    <td>
+      <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
+        {rename%filerename}{node|short}
+      </a>
+    </td>
+  </tr>'
 filerename = '{file|escape}@'
-filelogrename = '<tr><th>base:</th><td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#file|escape#@#node|short#</a></td></tr>'
-fileannotateparent = '<tr><td class="metatag">parent:</td><td><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a></td></tr>'
-changesetchild = '<tr><th class="child">child #rev#:</th><td class="child"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
-changelogchild = '<tr><th class="child">child #rev#:</th><td class="child"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
-filerevchild = '<tr><td class="metatag">child:</td><td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
-fileannotatechild = '<tr><td class="metatag">child:</td><td><a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
+filelogrename = '
+  <tr>
+    <th>base:</th>
+    <td>
+      <a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">
+        #file|escape#@#node|short#
+      </a>
+    </td>
+  </tr>'
+fileannotateparent = '
+  <tr>
+    <td class="metatag">parent:</td>
+    <td>
+      <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
+        {rename%filerename}{node|short}
+      </a>
+    </td>
+  </tr>'
+changesetchild = '
+  <tr>
+    <th class="child">child #rev#:</th>
+    <td class="child"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td>
+  </tr>'
+changelogchild = '
+  <tr>
+    <th class="child">child #rev#:</th>
+    <td class="child"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td>
+  </tr>'
+filerevchild = '
+  <tr>
+    <td class="metatag">child:</td>
+    <td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td>
+  </tr>'
+fileannotatechild = '
+  <tr>
+    <td class="metatag">child:</td>
+    <td><a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td>
+  </tr>'
 tags = tags.tmpl
-tagentry = '<li class="tagEntry parity#parity#"><tt class="node">#node#</tt> <a href="#url#rev/#node|short#{sessionvars%urlparameter}">#tag|escape#</a></li>'
+tagentry = '
+  <li class="tagEntry parity#parity#">
+    <tt class="node">#node#</tt>
+    <a href="#url#rev/#node|short#{sessionvars%urlparameter}">#tag|escape#</a>
+  </li>'
 branches = branches.tmpl
-branchentry = '<li class="tagEntry parity#parity#"><tt class="node">#node#</tt> <a href="#url#shortlog/#node|short#{sessionvars%urlparameter}">#branch|escape#</a></li>'
+branchentry = '
+  <li class="tagEntry parity#parity#">
+    <tt class="node">#node#</tt>
+    <a href="#url#shortlog/#node|short#{sessionvars%urlparameter}">#branch|escape#</a>
+  </li>'
 diffblock = '<pre class="parity#parity#">#lines#</pre>'
 changelogtag = '<tr><th class="tag">tag:</th><td class="tag">#tag|escape#</td></tr>'
 changesettag = '<tr><th class="tag">tag:</th><td class="tag">#tag|escape#</td></tr>'
-filediffparent = '<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
-filelogparent = '<tr><th>parent #rev#:</th><td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
-filediffchild = '<tr><th class="child">child #rev#:</th><td class="child"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
-filelogchild = '<tr><th>child #rev#:</th><td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
-indexentry = '<tr class="parity#parity#"><td><a href="#url#{sessionvars%urlparameter}">#name|escape#</a></td><td>#description#</td><td>#contact|obfuscate#</td><td class="age">#lastchange|age# ago</td><td class="indexlinks"><a href="#url#rss-log">RSS</a> <a href="#url#atom-log">Atom</a> #archives%archiveentry#</td></tr>'
+filediffparent = '
+  <tr>
+    <th class="parent">parent #rev#:</th>
+    <td class="parent"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td>
+  </tr>'
+filelogparent = '
+  <tr>
+    <th>parent #rev#:</th>
+    <td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td>
+  </tr>'
+filediffchild = '
+  <tr>
+    <th class="child">child #rev#:</th>
+    <td class="child"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td>
+  </tr>'
+filelogchild = '
+  <tr>
+    <th>child #rev#:</th>
+    <td><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td>
+  </tr>'
+indexentry = '
+  <tr class="parity#parity#">
+    <td><a href="#url#{sessionvars%urlparameter}">#name|escape#</a></td>
+    <td>#description#</td>
+    <td>#contact|obfuscate#</td>
+    <td class="age">#lastchange|age# ago</td>
+    <td class="indexlinks">
+      <a href="#url#rss-log">RSS</a>
+      <a href="#url#atom-log">Atom</a>
+      #archives%archiveentry#
+    </td>
+  </tr>'
 index = index.tmpl
 archiveentry = '<a href="#url#archive/#node|short##extension|urlescape#">#type|escape#</a> '
 notfound = notfound.tmpl

--- a/tests/test-hgweb-filelog.out	Wed May 13 22:42:19 2009 +0200
+++ b/tests/test-hgweb-filelog.out	Wed May 13 22:42:40 2009 +0200
@@ -535,7 +535,15 @@
    <a href="/annotate/a3b6a9e4507e/c?style=spartan">(annotate)</a>
   </td>
  </tr>
- <tr><th>base:</th><td><a href="/file/1e88685f5dde/b?style=spartan">b@1e88685f5dde</a></td></tr>
+ 
+<tr>
+<th>base:</th>
+<td>
+<a href="/file/1e88685f5dde/b?style=spartan">
+b@1e88685f5dde
+</a>
+</td>
+</tr>
  <tr>
   <th class="author">author:</th>
   <td class="author">&#116;&#101;&#115;&#116;</td>