GNOME.org
 

[yelp-xsl] mal2html: Move ui:expanded out of experimental

commit c6dacbf4316bc46edfb1be2dbcb2efb0e3942b39
Author: Shaun McCance <shaunm gnome org>
Date:   Wed Oct 31 21:41:20 2012 -0400

    mal2html: Move ui:expanded out of experimental
    
    Dropped support for the never-tested ui:expander element.
    It could come back in the future, but I want to focus on
    stabilizing stuff people actually use.

 xslt/common/html.xsl                 |    2 +-
 xslt/mallard/html/mal2html-block.xsl |   19 ++++----
 xslt/mallard/html/mal2html-links.xsl |   17 +++++---
 xslt/mallard/html/mal2html-list.xsl  |   13 +++---
 xslt/mallard/html/mal2html-page.xsl  |    7 ++-
 xslt/mallard/html/mal2html-table.xsl |    7 ++-
 xslt/mallard/html/mal2html-ui.xsl    |   78 +++++++++++++++++----------------
 7 files changed, 77 insertions(+), 66 deletions(-)
---
diff --git a/xslt/common/html.xsl b/xslt/common/html.xsl
index 00a8613..e39e4c4 100644
--- a/xslt/common/html.xsl
+++ b/xslt/common/html.xsl
@@ -1668,7 +1668,7 @@ $(document).ready(function () {
       yelpdata.append($('<div class="yelp-title-expanded"></div>').html(titlespan.html()));
     if (title_c.length == 0)
       yelpdata.append($('<div class="yelp-title-collapsed"></div>').html(titlespan.html()));
-    if (yelpdata.attr('data-yelp-expanded') == 'no') {
+    if (yelpdata.attr('data-yelp-expanded') == 'false') {
       expander.addClass('ui-expander-c');
       region.attr('aria-expanded', 'false').hide();
       if (title_c.length != 0)
diff --git a/xslt/mallard/html/mal2html-block.xsl b/xslt/mallard/html/mal2html-block.xsl
index 95e3875..1241227 100644
--- a/xslt/mallard/html/mal2html-block.xsl
+++ b/xslt/mallard/html/mal2html-block.xsl
@@ -19,10 +19,11 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
                 xmlns:mal="http://projectmallard.org/1.0/";
                 xmlns:if="http://projectmallard.org/if/1.0/";
-                xmlns:ui="http://projectmallard.org/experimental/ui/";
+                xmlns:ui="http://projectmallard.org/ui/1.0/";
+                xmlns:uix="http://projectmallard.org/experimental/ui/";
                 xmlns:msg="http://projects.gnome.org/yelp/gettext/";
                 xmlns="http://www.w3.org/1999/xhtml";
-                exclude-result-prefixes="mal if ui msg"
+                exclude-result-prefixes="mal if ui uix msg"
                 version="1.0">
 
 <!--!!==========================================================================
@@ -212,7 +213,7 @@ in accordance with the Mallard specification on fallback block content.
       <xsl:call-template name="html.lang.attrs"/>
       <xsl:attribute name="class">
         <xsl:text>comment</xsl:text>
-        <xsl:if test="mal:title and @ui:expanded">
+        <xsl:if test="mal:title and (@ui:expanded or @uix:expanded)">
           <xsl:text> ui-expander</xsl:text>
         </xsl:if>
         <xsl:if test="$if != 'true'">
@@ -303,7 +304,7 @@ in accordance with the Mallard specification on fallback block content.
     <xsl:call-template name="html.lang.attrs"/>
     <xsl:attribute name="class">
       <xsl:text>figure</xsl:text>
-      <xsl:if test="mal:title and @ui:expanded">
+      <xsl:if test="mal:title and (@ui:expanded or @uix:expanded)">
         <xsl:text> ui-expander</xsl:text>
       </xsl:if>
       <xsl:if test="$if != 'true'">
@@ -346,7 +347,7 @@ in accordance with the Mallard specification on fallback block content.
     <xsl:call-template name="html.lang.attrs"/>
     <xsl:attribute name="class">
       <xsl:text>listing</xsl:text>
-      <xsl:if test="mal:title and @ui:expanded">
+      <xsl:if test="mal:title and (@ui:expanded or @uix:expanded)">
         <xsl:text> ui-expander</xsl:text>
       </xsl:if>
       <xsl:if test="$if != 'true'">
@@ -405,7 +406,7 @@ in accordance with the Mallard specification on fallback block content.
       <xsl:if test="$notestyle != 'Note'">
         <xsl:value-of select="concat(' note-', translate($notestyle, 'ABISTW', 'abistw'))"/>
       </xsl:if>
-      <xsl:if test="mal:title and @ui:expanded">
+      <xsl:if test="mal:title and (@ui:expanded or @uix:expanded)">
         <xsl:text> ui-expander</xsl:text>
       </xsl:if>
       <xsl:if test="$if != 'true'">
@@ -423,7 +424,7 @@ in accordance with the Mallard specification on fallback block content.
       <xsl:apply-templates mode="mal2html.block.mode" select="mal:title"/>
       <div class="region">
         <div class="contents">
-          <xsl:if test="mal:title and @ui:expanded">
+          <xsl:if test="mal:title and (@ui:expanded or @uix:expanded)">
             <xsl:attribute name="id">
               <xsl:value-of select="concat('-yelp-', generate-id(.))"/>
             </xsl:attribute>
@@ -463,7 +464,7 @@ in accordance with the Mallard specification on fallback block content.
     <xsl:call-template name="html.lang.attrs"/>
     <xsl:attribute name="class">
       <xsl:text>quote</xsl:text>
-      <xsl:if test="mal:title and @ui:expanded">
+      <xsl:if test="mal:title and (@ui:expanded or @uix:expanded)">
         <xsl:text> ui-expander</xsl:text>
       </xsl:if>
       <xsl:if test="$if != 'true'">
@@ -522,7 +523,7 @@ in accordance with the Mallard specification on fallback block content.
     <xsl:call-template name="html.lang.attrs"/>
     <xsl:attribute name="class">
       <xsl:text>synopsis</xsl:text>
-      <xsl:if test="mal:title and @ui:expanded">
+      <xsl:if test="mal:title and (@ui:expanded or @uix:expanded)">
         <xsl:text> ui-expander</xsl:text>
       </xsl:if>
       <xsl:if test="$if != 'true'">
diff --git a/xslt/mallard/html/mal2html-links.xsl b/xslt/mallard/html/mal2html-links.xsl
index f218895..b5e28d2 100644
--- a/xslt/mallard/html/mal2html-links.xsl
+++ b/xslt/mallard/html/mal2html-links.xsl
@@ -18,7 +18,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
                 xmlns:mal="http://projectmallard.org/1.0/";
-                xmlns:ui="http://projectmallard.org/experimental/ui/";
+                xmlns:ui="http://projectmallard.org/ui/1.0/";
+                xmlns:uix="http://projectmallard.org/experimental/ui/";
                 xmlns:e="http://projectmallard.org/experimental/";
                 xmlns:api="http://projectmallard.org/experimental/api/";
                 xmlns:exsl="http://exslt.org/common";
@@ -26,7 +27,7 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
                 xmlns:str="http://exslt.org/strings";
                 xmlns:html="http://www.w3.org/1999/xhtml";
                 xmlns="http://www.w3.org/1999/xhtml";
-                exclude-result-prefixes="mal ui e api exsl math str html"
+                exclude-result-prefixes="mal ui uix e api exsl math str html"
                 version="1.0">
 
 
@@ -76,7 +77,9 @@ parameter will be used if provided.
   <xsl:variable name="style" select="concat(' ', $node[self::mal:links or $role = 'topic']/@style, ' ')"/>
   <xsl:variable name="nodesc" select="contains($style, ' nodesc ')"/>
   <xsl:variable name="maltitle" select="$node/self::mal:links/mal:title"/>
-  <xsl:variable name="expander" select="($maltitle or ($title != '')) and $node/self::mal:links/@ui:expanded"/>
+  <xsl:variable name="expander" select="($maltitle or ($title != '')) and
+                                        ($node/self::mal:links/@ui:expanded or
+                                         $node/self::mal:links/@uix:expanded)"/>
   <xsl:variable name="depth_">
     <xsl:choose>
       <xsl:when test="$depth &lt; 6">
@@ -121,7 +124,7 @@ parameter will be used if provided.
       <div class="region">
         <xsl:variable name="uithumbs">
           <xsl:variable name="uithumbs_">
-            <xsl:for-each select="str:split(@ui:thumbs)">
+            <xsl:for-each select="str:split(@uix:thumbs)">
               <xsl:if test="string(.)='tiles' or string(.)='hover'">
                 <xsl:value-of select="."/>
               </xsl:if>
@@ -482,7 +485,7 @@ element containing ${node}.
             <xsl:text> floatright</xsl:text>
           </xsl:when>
         </xsl:choose>
-        <xsl:if test="mal:title and $node/@ui:expanded">
+        <xsl:if test="mal:title and ($node/@ui:expanded or $node/@uix:expanded)">
           <xsl:text> ui-expander</xsl:text>
         </xsl:if>
       </xsl:attribute>
@@ -578,7 +581,9 @@ This template calls *{mal2html.links.series.prev} and
   <xsl:variable name="page" select="$node/ancestor-or-self::mal:page[last()]"/>
   <xsl:variable name="title" select="$node/self::mal:links/mal:title"/>
   <xsl:variable name="style" select="concat(' ', $node/@style, ' ')"/>
-  <xsl:variable name="expander" select="$title and $node/self::mal:links/@ui:expanded"/>
+  <xsl:variable name="expander" select="$title and
+                                        ($node/self::mal:links/@ui:expanded or
+                                         $node/self::mal:links/@uix:expanded)"/>
   <div>
     <xsl:attribute name="class">
       <xsl:text>links serieslinks</xsl:text>
diff --git a/xslt/mallard/html/mal2html-list.xsl b/xslt/mallard/html/mal2html-list.xsl
index c05107e..e46be82 100644
--- a/xslt/mallard/html/mal2html-list.xsl
+++ b/xslt/mallard/html/mal2html-list.xsl
@@ -18,10 +18,11 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
                 xmlns:mal="http://projectmallard.org/1.0/";
-                xmlns:ui="http://projectmallard.org/experimental/ui/";
+                xmlns:ui="http://projectmallard.org/ui/1.0/";
+                xmlns:uix="http://projectmallard.org/experimental/ui/";
                 xmlns:str="http://exslt.org/strings";
                 xmlns="http://www.w3.org/1999/xhtml";
-                exclude-result-prefixes="mal ui str"
+                exclude-result-prefixes="mal ui uix str"
                 version="1.0">
 
 <!--!!==========================================================================
@@ -54,7 +55,7 @@ as well as any special processing for child #{item} elements.
     <xsl:call-template name="html.lang.attrs"/>
     <xsl:attribute name="class">
       <xsl:text>list</xsl:text>
-      <xsl:if test="mal:title and @ui:expanded">
+      <xsl:if test="mal:title and (@ui:expanded or @uix:expanded)">
         <xsl:text> ui-expander</xsl:text>
       </xsl:if>
       <xsl:if test="$if != 'true'">
@@ -110,7 +111,7 @@ as well as any special processing for child #{item} elements.
     <xsl:call-template name="html.lang.attrs"/>
     <xsl:attribute name="class">
       <xsl:text>steps</xsl:text>
-      <xsl:if test="mal:title and @ui:expanded">
+      <xsl:if test="mal:title and (@ui:expanded or @uix:expanded)">
         <xsl:text> ui-expander</xsl:text>
       </xsl:if>
       <xsl:if test="$if != 'true'">
@@ -156,7 +157,7 @@ as well as any special processing for child #{item} elements.
     <xsl:call-template name="html.lang.attrs"/>
     <xsl:attribute name="class">
       <xsl:text>terms</xsl:text>
-      <xsl:if test="mal:title and @ui:expanded">
+      <xsl:if test="mal:title and (@ui:expanded or @uix:expanded)">
         <xsl:text> ui-expander</xsl:text>
       </xsl:if>
       <xsl:if test="$if != 'true'">
@@ -226,7 +227,7 @@ as well as any special processing for child #{item} elements.
       <xsl:if test="$lines">
         <xsl:text> tree-lines</xsl:text>
       </xsl:if>
-      <xsl:if test="mal:title and @ui:expanded">
+      <xsl:if test="mal:title and (@ui:expanded or @uix:expanded)">
         <xsl:text> ui-expander</xsl:text>
       </xsl:if>
       <xsl:if test="$if != 'true'">
diff --git a/xslt/mallard/html/mal2html-page.xsl b/xslt/mallard/html/mal2html-page.xsl
index e0b810b..8dec3f8 100644
--- a/xslt/mallard/html/mal2html-page.xsl
+++ b/xslt/mallard/html/mal2html-page.xsl
@@ -18,13 +18,14 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
                 xmlns:mal="http://projectmallard.org/1.0/";
-                xmlns:ui="http://projectmallard.org/experimental/ui/";
+                xmlns:ui="http://projectmallard.org/ui/1.0/";
+                xmlns:uix="http://projectmallard.org/experimental/ui/";
                 xmlns:e="http://projectmallard.org/experimental/";
                 xmlns:exsl="http://exslt.org/common";
                 xmlns:set="http://exslt.org/sets";
                 xmlns:msg="http://projects.gnome.org/yelp/gettext/";
                 xmlns="http://www.w3.org/1999/xhtml";
-                exclude-result-prefixes="mal ui e exsl set msg"
+                exclude-result-prefixes="mal ui uix e exsl set msg"
                 version="1.0">
 
 <!--!!==========================================================================
@@ -595,7 +596,7 @@ templates that handle #{page} and #{section} elements.
   <div id="{$node/@id}">
     <xsl:attribute name="class">
       <xsl:text>sect</xsl:text>
-      <xsl:if test="@ui:expanded">
+      <xsl:if test="@ui:expanded or @uix:expanded">
         <xsl:text> ui-expander</xsl:text>
       </xsl:if>
     </xsl:attribute>
diff --git a/xslt/mallard/html/mal2html-table.xsl b/xslt/mallard/html/mal2html-table.xsl
index 0aa348e..92b201a 100644
--- a/xslt/mallard/html/mal2html-table.xsl
+++ b/xslt/mallard/html/mal2html-table.xsl
@@ -18,10 +18,11 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
                 xmlns:mal="http://projectmallard.org/1.0/";
-                xmlns:ui="http://projectmallard.org/experimental/ui/";
+                xmlns:ui="http://projectmallard.org/ui/1.0/";
+                xmlns:uix="http://projectmallard.org/experimental/ui/";
                 xmlns:str="http://exslt.org/strings";
                 xmlns="http://www.w3.org/1999/xhtml";
-                exclude-result-prefixes="mal ui str"
+                exclude-result-prefixes="mal ui uix str"
                 version="1.0">
 
 <!--!!==========================================================================
@@ -170,7 +171,7 @@ REMARK: Describe this module
       <xsl:for-each select="str:tokenize(@style)">
         <xsl:value-of select="concat(' style-', .)"/>
       </xsl:for-each>
-      <xsl:if test="mal:title and @ui:expanded">
+      <xsl:if test="mal:title and (@ui:expanded or @uix:expanded)">
         <xsl:text> ui-expander</xsl:text>
       </xsl:if>
       <xsl:if test="$if != 'true'">
diff --git a/xslt/mallard/html/mal2html-ui.xsl b/xslt/mallard/html/mal2html-ui.xsl
index fbc00e9..72e4702 100644
--- a/xslt/mallard/html/mal2html-ui.xsl
+++ b/xslt/mallard/html/mal2html-ui.xsl
@@ -18,10 +18,11 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
                 xmlns:mal="http://projectmallard.org/1.0/";
-                xmlns:ui="http://projectmallard.org/experimental/ui/";
+                xmlns:ui="http://projectmallard.org/ui/1.0/";
+                xmlns:uix="http://projectmallard.org/experimental/ui/";
                 xmlns:math="http://exslt.org/math";
                 xmlns="http://www.w3.org/1999/xhtml";
-                exclude-result-prefixes="mal ui math"
+                exclude-result-prefixes="mal ui uix math"
                 version="1.0">
 
 <!--!!==========================================================================
@@ -52,9 +53,10 @@ for blocks that produce automatic titles.
 -->
 <xsl:template name="mal2html.ui.expander.data">
   <xsl:param name="node" select="."/>
-  <xsl:param name="expander" select="$node/mal:title and
-                                     ($node/@ui:expanded or $node/self::ui:expander)"/>
-  <xsl:if test="$expander">
+  <xsl:if test="$node/@uix:expanded">
+    <!-- FIXME: deprecation warning -->
+  </xsl:if>
+  <xsl:if test="$node/mal:title and ($node/@ui:expanded or $node/@uix:expanded)">
     <xsl:variable name="title_e" select="$node/mal:info/mal:title[ type = 'ui:expanded'][1]"/>
     <xsl:variable name="title_c" select="$node/mal:info/mal:title[ type = 'ui:collapsed'][1]"/>
     <div class="yelp-data yelp-data-ui-expander">
@@ -63,14 +65,14 @@ for blocks that produce automatic titles.
       </xsl:attribute>
       <xsl:attribute name="data-yelp-expanded">
         <xsl:choose>
-          <xsl:when test="$node/self::ui:expander/@expanded = 'no'">
-            <xsl:text>no</xsl:text>
+          <xsl:when test="$node/@ui:expanded = 'false'">
+            <xsl:text>false</xsl:text>
           </xsl:when>
-          <xsl:when test="$node/@ui:expanded = 'no'">
-            <xsl:text>no</xsl:text>
+          <xsl:when test="$node/@uix:expanded = 'no'">
+            <xsl:text>false</xsl:text>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:text>yes</xsl:text>
+            <xsl:text>true</xsl:text>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:attribute>
@@ -111,8 +113,8 @@ This template handles link sorting.
   <xsl:param name="role"/>
   <xsl:variable name="width">
     <xsl:choose>
-      <xsl:when test="$node/@ui:width">
-        <xsl:value-of select="$node/@ui:width"/>
+      <xsl:when test="$node/@uix:width">
+        <xsl:value-of select="$node/@uix:width"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:text>200</xsl:text>
@@ -121,8 +123,8 @@ This template handles link sorting.
   </xsl:variable>
   <xsl:variable name="height">
     <xsl:choose>
-      <xsl:when test="$node/@ui:height">
-        <xsl:value-of select="$node/@ui:height"/>
+      <xsl:when test="$node/@uix:height">
+        <xsl:value-of select="$node/@uix:height"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:text>200</xsl:text>
@@ -146,7 +148,7 @@ This template handles link sorting.
             <xsl:copy-of select="."/>
           </xsl:if>
         </xsl:for-each>
-        <xsl:variable name="thumbs" select="$target/mal:info/ui:thumb"/>
+        <xsl:variable name="thumbs" select="$target/mal:info/uix:thumb"/>
         <a>
           <xsl:attribute name="href">
             <xsl:call-template name="mal.link.target">
@@ -228,8 +230,8 @@ This template handles link sorting.
   <xsl:param name="role"/>
   <xsl:variable name="width">
     <xsl:choose>
-      <xsl:when test="$node/@ui:width">
-        <xsl:value-of select="$node/@ui:width"/>
+      <xsl:when test="$node/@uix:width">
+        <xsl:value-of select="$node/@uix:width"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:text>250</xsl:text>
@@ -238,8 +240,8 @@ This template handles link sorting.
   </xsl:variable>
   <xsl:variable name="height">
     <xsl:choose>
-      <xsl:when test="$node/@ui:height">
-        <xsl:value-of select="$node/@ui:height"/>
+      <xsl:when test="$node/@uix:height">
+        <xsl:value-of select="$node/@uix:height"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:text>200</xsl:text>
@@ -247,7 +249,7 @@ This template handles link sorting.
     </xsl:choose>
   </xsl:variable>
   <div class="links-ui-hover" style="width: {$width}px; height: {$height}px;">
-    <xsl:for-each select="$node/ui:thumb[1]">
+    <xsl:for-each select="$node/uix:thumb[1]">
       <img>
         <xsl:copy-of select="@src"/>
         <xsl:call-template name="mal2html.ui.links.img.attrs">
@@ -267,7 +269,7 @@ This template handles link sorting.
       <xsl:variable name="xref" select="@xref"/>
       <xsl:for-each select="$mal.cache">
         <xsl:variable name="target" select="key('mal.cache.key', $xref)"/>
-        <xsl:variable name="thumbs" select="$target/mal:info/ui:thumb"/>
+        <xsl:variable name="thumbs" select="$target/mal:info/uix:thumb"/>
         <li class="links {$link/@class}">
           <xsl:for-each select="$link/@*">
             <xsl:if test="starts-with(name(.), 'data-')">
@@ -316,7 +318,7 @@ mal2html.ui.links.img
 Output an image for a link using UI thumbnails.
 :Revision:version="3.8" date="2012-10-27" status="final"
 $node: A #{links} element to link from.
-$thumbs: A list of candidate #{ui:thumb} elements.
+$thumbs: A list of candidate #{uix:thumb} elements.
 $role: A link role, used to select the appropriate thumbnail.
 $width: The width to fit thumbnails into.
 $height: The height to fit thumbnails into.
@@ -328,13 +330,13 @@ calls ${mal2html.ui.links.img.attrs} to output #{width} and #{height}
 attributes.
 
 Before checking for a best-fit thumbnail on dimensions, this template first
-looks for #{ui:thumb} elements with the #{type} attribute set to #{"links"}.
-Within those, it looks for #{ui:thumb} elements whose #{role} attribute
+looks for #{uix:thumb} elements with the #{type} attribute set to #{"links"}.
+Within those, it looks for #{uix:thumb} elements whose #{role} attribute
 matches the ${role} parameter. This is similar to how link titles are
 selected.
 
 If the ${thumbs} parameter is empty, this template attempts to use a default
-thumbnail provided by a #{ui:thumb} child element of ${node}.
+thumbnail provided by a #{uix:thumb} child element of ${node}.
 
 The ${width} and ${height} parameters can be computed automatically from the
 ${node} element.
@@ -343,8 +345,8 @@ ${node} element.
   <xsl:param name="node"/>
   <xsl:param name="thumbs"/>
   <xsl:param name="role"/>
-  <xsl:param name="width" select="$node/@ui:width"/>
-  <xsl:param name="height" select="$node/@ui:height"/>
+  <xsl:param name="width" select="$node/@uix:width"/>
+  <xsl:param name="height" select="$node/@uix:height"/>
   <xsl:choose>
   <xsl:when test="$thumbs">
     <img>
@@ -371,14 +373,14 @@ ${node} element.
       </xsl:for-each>
     </img>
   </xsl:when>
-  <xsl:when test="$node/ui:thumb">
+  <xsl:when test="$node/uix:thumb">
     <img>
       <xsl:attribute name="src">
-        <xsl:value-of select="$node/ui:thumb/@src"/>
+        <xsl:value-of select="$node/uix:thumb/@src"/>
       </xsl:attribute>
           <xsl:call-template name="mal2html.ui.links.img.attrs">
             <xsl:with-param name="node" select="$node"/>
-            <xsl:with-param name="thumb" select="$node/ui:thumb"/>
+            <xsl:with-param name="thumb" select="$node/uix:thumb"/>
             <xsl:with-param name="width" select="$width"/>
             <xsl:with-param name="height" select="$height"/>
           </xsl:call-template>
@@ -393,33 +395,33 @@ mal2html.ui.links.img.attrs
 Output the #{width} and #{height} attributes for a thumbnail image.
 :Revision:version="3.4" date="2012-02-25" status="final"
 $node: A #{links} element to link from.
-$thumbs: A list of candidate #{ui:thumb} elements.
+$thumbs: A list of candidate #{uix:thumb} elements.
 $width: The width to fit thumbnails into.
 $height: The height to fit thumbnails into.
 
 This template outputs #{width} and #{height} attributes for the HTML #{img}
-element created from ${thumb}, based on the #{ui:overflow} attribute on ${node}.
+element created from ${thumb}, based on the #{uix:overflow} attribute on ${node}.
 The ${width} and ${height} parameters can be computed automatically from the
 ${node} element.
 -->
 <xsl:template name="mal2html.ui.links.img.attrs">
   <xsl:param name="node"/>
   <xsl:param name="thumb"/>
-  <xsl:param name="width" select="$node/@ui:width"/>
-  <xsl:param name="height" select="$node/@ui:height"/>
+  <xsl:param name="width" select="$node/@uix:width"/>
+  <xsl:param name="height" select="$node/@uix:height"/>
   <xsl:choose>
-    <xsl:when test="$node/@ui:overflow = 'crop'"/>
-    <xsl:when test="$node/@ui:overflow = 'width'">
+    <xsl:when test="$node/@uix:overflow = 'crop'"/>
+    <xsl:when test="$node/@uix:overflow = 'width'">
       <xsl:attribute name="width">
         <xsl:value-of select="$width"/>
       </xsl:attribute>
     </xsl:when>
-    <xsl:when test="$node/@ui:overflow = 'height'">
+    <xsl:when test="$node/@uix:overflow = 'height'">
       <xsl:attribute name="height">
         <xsl:value-of select="$height"/>
       </xsl:attribute>
     </xsl:when>
-    <xsl:when test="$node/@ui:overflow = 'scale'">
+    <xsl:when test="$node/@uix:overflow = 'scale'">
       <xsl:attribute name="width">
         <xsl:value-of select="$width"/>
       </xsl:attribute>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]