[gnome-doc-utils/mallard: 39/87] Removing position attribute from seealso and page links

[Shaun McCance <shaunm src gnome org>]

commit e956fbe7ceed2a87e8c2ab78da8352c6795fd134
Author: Shaun McCance <shaunm gnome org>
Date:   Thu Nov 13 14:26:17 2008 -0600

    Removing position attribute from seealso and page links
---
 xslt/mallard/html/mal2html-css.xsl  |   17 -----
 xslt/mallard/html/mal2html-page.xsl |  116 +----------------------------------
 2 files changed, 1 insertions(+), 132 deletions(-)

diff --git a/xslt/mallard/html/mal2html-css.xsl b/xslt/mallard/html/mal2html-css.xsl
index 16e8f00..1eb8709 100644
--- a/xslt/mallard/html/mal2html-css.xsl
+++ b/xslt/mallard/html/mal2html-css.xsl
@@ -221,23 +221,6 @@ div.pagelink:hover {
   </xsl:call-template>
   <xsl:text>;
 }
-ul.guidelinks {
-  display: block;
-  margin: 0;
-  text-align: right;
-}
-li.guidelink { display: inline; }
-li.guidelink::before {
-  content: ' â?¢ ';
-  color: </xsl:text>
-  <xsl:call-template name="theme.get_color">
-    <xsl:with-param name="id" select="'gray-dark'"/>
-  </xsl:call-template>
-  <xsl:text>;
-}
-li.guidelink-first::before, li.guidelink-only::before {
-  content: '';
-}
 
 ul.seealsolinks {
   margin: 0; padding: 0;
diff --git a/xslt/mallard/html/mal2html-page.xsl b/xslt/mallard/html/mal2html-page.xsl
index 47310d2..50da8a2 100644
--- a/xslt/mallard/html/mal2html-page.xsl
+++ b/xslt/mallard/html/mal2html-page.xsl
@@ -86,24 +86,10 @@ REMARK: Describe this template
             </xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
-        <xsl:variable name="position">
-          <xsl:choose>
-            <xsl:when test="last() = 1 and count($guidelinks) = 0">
-              <xsl:text>only</xsl:text>
-            </xsl:when>
-            <xsl:when test="position() = 1">
-              <xsl:text>first</xsl:text>
-            </xsl:when>
-            <xsl:when test="position() = last() and count($guidelinks) = 0">
-              <xsl:text>last</xsl:text>
-            </xsl:when>
-          </xsl:choose>
-        </xsl:variable>
         <xsl:for-each select="$cache">
           <xsl:call-template name="mal2html.page.pagelink">
             <xsl:with-param name="node" select="$node"/>
             <xsl:with-param name="page" select="key('cache_key', $linkid)"/>
-            <xsl:with-param name="position" select="$position"/>
           </xsl:call-template>
         </xsl:for-each>
       </xsl:for-each>
@@ -116,19 +102,6 @@ REMARK: Describe this template
         <xsl:call-template name="mal2html.page.pagelink">
           <xsl:with-param name="node" select="$node"/>
           <xsl:with-param name="page" select="."/>
-          <xsl:with-param name="position">
-            <xsl:choose>
-              <xsl:when test="last() = 1 and count($pagelinks) = 0">
-                <xsl:text>only</xsl:text>
-              </xsl:when>
-              <xsl:when test="position() = 1 and count($pagelinks) = 0">
-                <xsl:text>first</xsl:text>
-              </xsl:when>
-              <xsl:when test="position() = last()">
-                <xsl:text>last</xsl:text>
-              </xsl:when>
-            </xsl:choose>
-          </xsl:with-param>
         </xsl:call-template>
       </xsl:for-each>
     </div>
@@ -141,14 +114,12 @@ mal2html.page.pagelink
 Outputs an automatic link block from a guide to a page
 $node: The #{guide} or #{section} element containing the link
 $page: The element from the cache file of the page being linked to
-$position: The position of this link in the list, either 'first', 'last', or ''
 
 REMARK: Describe this template
 -->
 <xsl:template name="mal2html.page.pagelink">
   <xsl:param name="node" select="."/>
   <xsl:param name="page"/>
-  <xsl:param name="position"/>
   <xsl:variable name="xref">
     <xsl:choose>
       <xsl:when test="$page/self::mal:section">
@@ -177,21 +148,7 @@ REMARK: Describe this template
         <xsl:with-param name="xref" select="$xref"/>
       </xsl:call-template>
     </xsl:attribute>
-    <div>
-      <xsl:attribute name="class">
-        <xsl:text>pagelink</xsl:text>
-        <xsl:choose>
-          <xsl:when test="$position = 'only'">
-            <xsl:text> pagelink-only</xsl:text>
-          </xsl:when>
-          <xsl:when test="$position = 'first'">
-            <xsl:text> pagelink-first</xsl:text>
-          </xsl:when>
-          <xsl:when test="$position = 'last'">
-            <xsl:text> pagelink-last</xsl:text>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:attribute>
+    <div class="pagelink">
       <!-- FIXME: call a common linkifier? -->
       <div class="title">
         <xsl:call-template name="mal.link.content">
@@ -258,23 +215,9 @@ REMARK: Describe this template
       <div class="seealsolinks">
         <ul class="seealsolinks">
           <xsl:for-each select="$pagelinks">
-            <xsl:variable name="position">
-              <xsl:choose>
-                <xsl:when test="last() = 1 and count($guidelinks) = 0">
-                  <xsl:text>only</xsl:text>
-                </xsl:when>
-                <xsl:when test="position() = 1">
-                  <xsl:text>first</xsl:text>
-                </xsl:when>
-                <xsl:when test="position() = last() and count($guidelinks) = 0">
-                  <xsl:text>last</xsl:text>
-                </xsl:when>
-              </xsl:choose>
-            </xsl:variable>
             <xsl:call-template name="mal2html.page.seealsolink">
               <xsl:with-param name="node" select="$node"/>
               <xsl:with-param name="page" select="."/>
-              <xsl:with-param name="position" select="$position"/>
             </xsl:call-template>
           </xsl:for-each>
           <!-- FIXME: exclude pagelinks -->
@@ -289,24 +232,10 @@ REMARK: Describe this template
                 </xsl:otherwise>
               </xsl:choose>
             </xsl:variable>
-            <xsl:variable name="position">
-              <xsl:choose>
-                <xsl:when test="last() = 1 and count($pagelinks) = 0">
-                  <xsl:text>only</xsl:text>
-                </xsl:when>
-                <xsl:when test="position() = 1 and count($pagelinks) = 0">
-                  <xsl:text>first</xsl:text>
-                </xsl:when>
-                <xsl:when test="position() = last()">
-                  <xsl:text>last</xsl:text>
-                </xsl:when>
-              </xsl:choose>
-            </xsl:variable>
             <xsl:for-each select="$cache">
               <xsl:call-template name="mal2html.page.seealsolink">
                 <xsl:with-param name="node" select="$node"/>
                 <xsl:with-param name="page" select="key('cache_key', $linkid)"/>
-                <xsl:with-param name="position" select="$position"/>
               </xsl:call-template>
             </xsl:for-each>
           </xsl:for-each>
@@ -319,19 +248,6 @@ REMARK: Describe this template
             <xsl:call-template name="mal2html.page.seealsolink">
               <xsl:with-param name="node" select="$node"/>
               <xsl:with-param name="page" select="."/>
-              <xsl:with-param name="position">
-                <xsl:choose>
-                  <xsl:when test="last() = 1 and count($outlinks) = 0">
-                    <xsl:text>only</xsl:text>
-                  </xsl:when>
-                  <xsl:when test="position() = 1">
-                    <xsl:text>first</xsl:text>
-                  </xsl:when>
-                  <xsl:when test="position() = last() and count($outlinks) = 0">
-                    <xsl:text>last</xsl:text>
-                  </xsl:when>
-                </xsl:choose>
-              </xsl:with-param>
             </xsl:call-template>
           </xsl:for-each>
           <xsl:for-each select="$outlinks">
@@ -345,24 +261,10 @@ REMARK: Describe this template
                 </xsl:otherwise>
               </xsl:choose>
             </xsl:variable>
-            <xsl:variable name="position">
-              <xsl:choose>
-                <xsl:when test="last() = 1 and count($inlinks) = 0">
-                  <xsl:text>only</xsl:text>
-                </xsl:when>
-                <xsl:when test="position() = 1 and count($inlinks) = 0">
-                  <xsl:text>first</xsl:text>
-                </xsl:when>
-                <xsl:when test="position() = last()">
-                  <xsl:text>last</xsl:text>
-                </xsl:when>
-              </xsl:choose>
-            </xsl:variable>
             <xsl:for-each select="$cache">
               <xsl:call-template name="mal2html.page.seealsolink">
                 <xsl:with-param name="node" select="$node"/>
                 <xsl:with-param name="page" select="key('cache_key', $linkid)"/>
-                <xsl:with-param name="position" select="$position"/>
               </xsl:call-template>
             </xsl:for-each>
           </xsl:for-each>
@@ -381,14 +283,12 @@ mal2html.page.seealsolink
 Outputs an automatic link block for a seealso link
 $node: The #{topic} or #{section} element containing the link
 $page: The element from the cache file of the page being linked to
-$position: The position of this link in the list, either 'first', 'last', or ''
 
 REMARK: Describe this template
 -->
 <xsl:template name="mal2html.page.seealsolink">
   <xsl:param name="node" select="."/>
   <xsl:param name="page"/>
-  <xsl:param name="position"/>
   <xsl:variable name="xref">
     <xsl:choose>
       <xsl:when test="$page/self::mal:section">
@@ -402,20 +302,6 @@ REMARK: Describe this template
     </xsl:choose>
   </xsl:variable>
   <li class="seealsolink">
-    <xsl:attribute name="class">
-      <xsl:text>seealsolink</xsl:text>
-      <xsl:choose>
-        <xsl:when test="$position = 'only'">
-          <xsl:text> seealsolink-only</xsl:text>
-        </xsl:when>
-        <xsl:when test="$position = 'first'">
-          <xsl:text> seealsolink-first</xsl:text>
-        </xsl:when>
-        <xsl:when test="$position = 'last'">
-          <xsl:text> seealsolink-last</xsl:text>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:attribute>
     <a>
       <xsl:attribute name="href">
         <xsl:call-template name="mal.link.target">