# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1317388401 0
# Node ID 2bcfb5f75e06ee038d1d2b72dde0f8865fda1357
# Parent  dc74e3a8f324200fc5047460e4e33195a5e1baa3
Supporting new format of <module> and <section>:
<module name="..." ...> and <section id="..." name="...">
Old format should be eventually removed.

diff --git a/xsls/body.xsls b/xsls/body.xsls
--- a/xsls/body.xsls
+++ b/xsls/body.xsls
@@ -11,7 +11,7 @@ X:template body (lang) {
 
     <tr>
         <td width="70%"><center><h3>
-            !{@title} X:if "$YEAR" { X:text{: } !{$YEAR} }
+            !{@name | @title} X:if "$YEAR" { X:text{: } !{$YEAR} }
         </h3></center></td>
 
         <td rowspan="2" align="{$ALIGN}" valign="top">
@@ -29,8 +29,14 @@ X:template body (lang) {
     <tr><td valign="top">
 
         <table width="100%"><tr><td align="{$ALIGN}">
-        X:for-each "section[@name]" {
-            <a href="#{@name}"> !{@title} </a><br/>
+        X:if "section[@id]" {
+            X:for-each "section[@id]" {
+                <a href="#{@id}"> !{@name} </a><br/>
+            }
+        } else {
+            X:for-each "section[@name]" {
+                <a href="#{@name}"> !{@title} </a><br/>
+            }
         }
         </td></tr></table>
 
diff --git a/xsls/content.xsls b/xsls/content.xsls
--- a/xsls/content.xsls
+++ b/xsls/content.xsls
@@ -1,5 +1,19 @@
 X:stylesheet {
 
+    X:template = "section[@id and @name]" {
+	<a name="{@id}" /> <center><h4> !{@name} </h4></center>
+	!!;
+    }
+
+    X:template = "section[not(@id) and @name]" {
+	<center><h4> !{@name} </h4></center>
+	!!;
+    }
+
+    X:template = "section[not(@id) and not(@name)]" { !!; }
+
+    <!-- legacy section templates -->
+
     X:template = "section[@name and @title]" {
 	<a name="{@name}" /> <center><h4> !{@title} </h4></center>
 	!!;
@@ -12,6 +26,8 @@ X:stylesheet {
 
     X:template = "section[not(@name) and not(@title)]" { !!; }
 
+    <!-- -->
+
     X:template = "para" { <p> !!; </p> }
 
     X:template = "item/para" { <p class="noindent"> !!; </p> }
diff --git a/xsls/link.xsls b/xsls/link.xsls
--- a/xsls/link.xsls
+++ b/xsls/link.xsls
@@ -31,8 +31,10 @@ X:template = "a[starts-with(@href, '/')
                             |document(concat($XML, @href))/module/@link) }
         }
     }
-    !{ document(concat($XML, @href))/article/@title
-       |document(concat($XML, @href))/module/@title }
+    !{  document(concat($XML, @href))/article/@title
+       |document(concat($XML, @href))/article/@name
+       |document(concat($XML, @href))/module/@title
+       |document(concat($XML, @href))/module/@name }
     </a>
 }