From 88b1a9ba49b1c070987753aff8d7a531d205a0d7 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mtg@gnu.org>
Date: Mon, 28 Sep 2015 23:58:59 -0400
Subject: [PATCH 1/4] Account for parity in Texinfo function anchor

---
 src/texinfo.xsl | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/texinfo.xsl b/src/texinfo.xsl
index eeca20f..f17cf5f 100644
--- a/src/texinfo.xsl
+++ b/src/texinfo.xsl
@@ -111,8 +111,8 @@
   @code{xs:sequence()}.  Parameters are output in a style consistent
   with the XPath specification.
 
-  An anchor will also be generated using the namespace prefix and
-  local name, which allows for easy and intuitive referencing.
+  An anchor will also be generated using the name and (for functions) arity,
+  which allows for easy and intuitive referencing.
 -->
 <template mode="xt:doc-gen" priority="5"
           match="xsl:template|xsl:function">
@@ -126,10 +126,18 @@
   <variable name="type" as="xs:string"
             select="if ( @as ) then @as else 'xs:sequence*'" />
 
+  <variable name="anchor" as="xs:string"
+            select="if ( . instance of element( xsl:function ) ) then
+                      concat( @name, ':', count( xsl:param ) )
+                    else
+                      @name" />
+
   <value-of select="concat(
                       $xt:nl,
-                      '@anchor{', @name, '}',
-                      $xt:nl,
+                      ( if ( not( $anchor = '' ) ) then
+                          concat( '@anchor{', $anchor, '}', $xt:nl )
+                        else
+                          '' ),
                       '@deftypefn ', name(), ' {', $type, '} ',
                         @name, ' (', $param-str, ')',
                       $xt:nl,

From c3d0839b9ae457af2df3b0029461f243148f35ec Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mtg@gnu.org>
Date: Mon, 28 Sep 2015 23:59:33 -0400
Subject: [PATCH 2/4] Prevent reading preceding sibling's docblock

---
 src/texinfo.xsl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/texinfo.xsl b/src/texinfo.xsl
index f17cf5f..9c3fe5d 100644
--- a/src/texinfo.xsl
+++ b/src/texinfo.xsl
@@ -189,8 +189,10 @@
 <function name="xt:get-docblock" as="comment()?">
   <param name="context" as="node()" />
 
-  <sequence select="$context/preceding-sibling::comment()[1][
-                      xt:is-docblock( . ) ]" />
+  <sequence select="( ( $context/preceding-sibling::node()[
+                          not( . instance of text() ) ] )
+                        [ last() ] )
+                      [ . instance of comment() ]" />
 </function>
 
 

From c9f9ab5d503fb82c842ed50b9006059375763880 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mtg@gnu.org>
Date: Tue, 29 Sep 2015 00:00:06 -0400
Subject: [PATCH 3/4] Prefix woven definition with text indicator

This helps make clear that the code snippet is not an example, or part of an
example that ends the description (in the docblock).
---
 src/texinfo.xsl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/texinfo.xsl b/src/texinfo.xsl
index 9c3fe5d..88af54e 100644
--- a/src/texinfo.xsl
+++ b/src/texinfo.xsl
@@ -143,6 +143,8 @@
                       $xt:nl,
                       $doc,
                       $xt:nl,
+                      '@emph{Definition:}',
+                      $xt:nl,
                       '@verbatim',
                       $xt:nl,
                       xt:serialize( . ),

From e27e4460068b5e3d787a10110eba96a11dee4681 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mtg@gnu.org>
Date: Tue, 29 Sep 2015 00:02:59 -0400
Subject: [PATCH 4/4] texinfo.xsl copyright year update

---
 src/texinfo.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/texinfo.xsl b/src/texinfo.xsl
index 88af54e..ad04147 100644
--- a/src/texinfo.xsl
+++ b/src/texinfo.xsl
@@ -2,7 +2,7 @@
 <!--@comment
   Texinfo documentation generator for XSL stylesheets
 
-  Copyright (C) 2014 LoVullo Associates, Inc.
+  Copyright (C) 2014, 2015 LoVullo Associates, Inc.
 
     This file is part of xslink.