From 5bc10c338c60ac979b05ae7901ab638cb61ee576 Mon Sep 17 00:00:00 2001
From: Winslow Dalpe <rwdalpe@gmail.com>
Date: Thu, 7 Jan 2016 21:34:51 -0800
Subject: [PATCH 1/2] olink.doctitle expected to be string in one place

Fixing an issue where the default value for olink.doctitle is an integer
but the stylesheets expect it (in one place) to be a string.
---
 xslt/base/common/olink.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xslt/base/common/olink.xsl b/xslt/base/common/olink.xsl
index 5b75459f..4786151e 100644
--- a/xslt/base/common/olink.xsl
+++ b/xslt/base/common/olink.xsl
@@ -1020,7 +1020,7 @@
 
   <xsl:if test="not(starts-with(normalize-space($xrefstyle), 'select:') 
               and (contains($xrefstyle, 'docname')))
-              and ($olink.doctitle = 'yes' or $olink.doctitle = '1')
+              and ($olink.doctitle = 1)
               and $current.docid != '' 
               and $rootptr != $targetptr
               and $current.docid != $targetdoc

From 33e7b96014a7f86419f56847ae2f55b8da7bdc8e Mon Sep 17 00:00:00 2001
From: Winslow Dalpe <rwdalpe@gmail.com>
Date: Thu, 7 Jan 2016 21:36:24 -0800
Subject: [PATCH 2/2] Glossary handling failing a bit when more than one
 glossterm present

Glossary rendering and preprocessing had some issues when more than
one `glossterm` element was present inside a `glossentry`.
---
 xslt/base/html/inlines.xsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xslt/base/html/inlines.xsl b/xslt/base/html/inlines.xsl
index 15b5d600..9d38964a 100644
--- a/xslt/base/html/inlines.xsl
+++ b/xslt/base/html/inlines.xsl
@@ -691,8 +691,8 @@ and <tag>firstterm</tag> elements.</para>
 
 	<xsl:variable name="targets"
 		      select="//db:glossentry
-			        [normalize-space(db:glossterm) = $term
-			         or normalize-space(db:glossterm/@baseform)
+			        [db:glossterm/normalize-space(.) = $term
+			         or db:glossterm/normalize-space(@baseform)
 				    = $term]"/>
 
 	<xsl:variable name="target" select="$targets[1]"/>