From b53c0e0e1c40a636b663105d620d404b73c65699 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Mon, 24 Oct 2011 06:33:51 +0000
Subject: [PATCH] Add support for generate.consistent.ids parameter.

---
 xsl/common/common.xsl | 13 +++++++++++--
 xsl/fo/param.ent      |  1 +
 xsl/fo/param.xweb     |  2 ++
 xsl/html/param.ent    |  1 +
 xsl/html/param.xweb   |  2 ++
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/xsl/common/common.xsl b/xsl/common/common.xsl
index b647995cb..10c89cef7 100644
--- a/xsl/common/common.xsl
+++ b/xsl/common/common.xsl
@@ -458,6 +458,13 @@ Defaults to the context node.</para>
     <xsl:when test="$object/@xml:id">
       <xsl:value-of select="$object/@xml:id"/>
     </xsl:when>
+    <xsl:when test="$generate.consistent.ids != 0">
+      <!-- Make $object the current node -->
+      <xsl:for-each select="$object">
+        <xsl:text>id-</xsl:text>
+        <xsl:number level="multiple" count="*"/>
+      </xsl:for-each>
+    </xsl:when>
     <xsl:otherwise>
       <xsl:value-of select="generate-id($object)"/>
     </xsl:otherwise>
@@ -1326,8 +1333,10 @@ pointed to by the link is one of the elements listed in
       </xsl:choose>
     </xsl:when>
     <xsl:otherwise>
-      <xsl:variable name="prevlist"
-        select="$list/preceding::orderedlist[1]"/>
+      <!-- match on previous list at same nesting level -->
+      <xsl:variable name="prevlist" 
+       select="$list/preceding::orderedlist
+                [count($list/ancestor::orderedlist) = count(ancestor::orderedlist)][1]"/>
       <xsl:choose>
         <xsl:when test="count($prevlist) = 0">2</xsl:when>
         <xsl:otherwise>
diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index e6c2c31c9..a9322609e 100644
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -344,3 +344,4 @@
 <!ENTITY callout.properties SYSTEM "../params/callout.properties.xml">
 <!ENTITY calloutlist.properties SYSTEM "../params/calloutlist.properties.xml">
 <!ENTITY task.properties SYSTEM "../params/task.properties.xml">
+<!ENTITY generate.consistent.ids SYSTEM "../params/generate.consistent.ids.xml">
diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index 3728e5b41..8a5d3c410 100644
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -277,6 +277,7 @@ generate.section.toc.level;
 &monospace.verbatim.font.width;
 &exsl.node.set.available;
 &bookmarks.collapse;
+&generate.consistent.ids;
 </reference>
 <reference xml:id="graphics"><title>Graphics</title>
 &graphic.default.extension;
@@ -657,6 +658,7 @@ around all these parameters.</para>
 <src:fragref linkend="funcsynopsis.decoration.frag"/>
 <src:fragref linkend="funcsynopsis.style.frag"/>
 <src:fragref linkend="function.parens.frag"/>
+<src:fragref linkend="generate.consistent.ids.frag"/>
 <src:fragref linkend="generate.index.frag"/>
 <src:fragref linkend="generate.section.toc.level.frag"/>
 <src:fragref linkend="generate.toc.frag"/>
diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index 342b53ec4..42a0d6fbd 100644
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -316,3 +316,4 @@
 <!ENTITY generate.css.header SYSTEM "../params/generate.css.header.xml">
 <!ENTITY make.clean.html SYSTEM "../params/make.clean.html.xml">
 <!ENTITY custom.css.source SYSTEM "../params/custom.css.source.xml">
+<!ENTITY generate.consistent.ids SYSTEM "../params/generate.consistent.ids.xml">
diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index 76e9f97fa..60c6adf9a 100644
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -136,6 +136,7 @@ $Id$
 &draft.mode;
 &draft.watermark.image;
 &generate.id.attributes;
+&generate.consistent.ids;
 &generate.meta.abstract;
 &make.clean.html;
 &docbook.css.source;
@@ -521,6 +522,7 @@ around all these parameters.</para>
 <src:fragref linkend="funcsynopsis.decoration.frag"/>
 <src:fragref linkend="funcsynopsis.style.frag"/>
 <src:fragref linkend="function.parens.frag"/>
+<src:fragref linkend="generate.consistent.ids.frag"/>
 <src:fragref linkend="generate.css.header.frag"/>
 <src:fragref linkend="generate.id.attributes.frag"/>
 <src:fragref linkend="generate.index.frag"/>
-- 
2.40.0