Check for glossterm.auto.link when linking firstterms; don't output gl. prefix on...

diff --git a/xsl/fo/inline.xsl b/xsl/fo/inline.xsl
index 8eb9ca49e1cf71933d689418173e16dce60716da..f3b7bbc393c4886c55c8fbe1487fe697fc2a98b1 100644 (file)
--- a/xsl/fo/inline.xsl
+++ b/xsl/fo/inline.xsl
@@ -533,6 +533,7 @@
 
     <xsl:when test="not(@linkend)
                     and ($firstterm.only.link = 0 or $firstterm = 1)
+                    and ($glossterm.auto.link != 0)
                     and $glossary.collection != ''">
       <xsl:variable name="term">
         <xsl:choose>
@@ -555,7 +556,6 @@
         </xsl:when>
         <xsl:otherwise>
           <xsl:variable name="id">
-            <xsl:text>gl.</xsl:text>
             <xsl:choose>
               <xsl:when test="$cterm/@id">
                 <xsl:value-of select="$cterm/@id"/>

diff --git a/xsl/html/inline.xsl b/xsl/html/inline.xsl
index 76b7da0d6699faf20e1752641c87fb670f67a06d..32f5412d4a9a349e38669b641790bf2f10fd16f1 100644 (file)
--- a/xsl/html/inline.xsl
+++ b/xsl/html/inline.xsl
@@ -664,7 +664,6 @@
   <xsl:param name="firstterm" select="0"/>
 
   <xsl:choose>
-
     <xsl:when test="($firstterm.only.link = 0 or $firstterm = 1) and @linkend">
       <xsl:variable name="targets" select="key('id',@linkend)"/>
       <xsl:variable name="target" select="$targets[1]"/>
@@ -692,6 +691,7 @@
 
     <xsl:when test="not(@linkend)
                     and ($firstterm.only.link = 0 or $firstterm = 1)
+                    and ($glossterm.auto.link != 0)
                     and $glossary.collection != ''">
       <xsl:variable name="term">
         <xsl:choose>
@@ -745,7 +745,6 @@
         </xsl:when>
         <xsl:otherwise>
           <xsl:variable name="id">
-            <xsl:text>gl.</xsl:text>
             <xsl:choose>
               <xsl:when test="$cterm/@id">
                 <xsl:value-of select="$cterm/@id"/>