X-Git-Url: http://git.draconx.ca/gitweb/homepage.git/blobdiff_plain/86d0dac7b5713b9d312dd8fea8da80132829d6e6..e1908f247e262b45949dd6d4a0d62ca54664cf15:/layouts/default.xsl

diff --git a/layouts/default.xsl b/layouts/default.xsl
index 2e14ce8..837a792 100644
--- a/layouts/default.xsl
+++ b/layouts/default.xsl
@@ -265,7 +265,7 @@
   <xsl:variable name='node' select='.' />
   <p>
     <xsl:choose>
-      <xsl:when test='/document/image[license != $node]'>
+      <xsl:when test='/document/image[license/identifier != $node/identifier]'>
         <xsl:text>Except as otherwise noted, copying</xsl:text>
       </xsl:when>
       <xsl:otherwise>Copying</xsl:otherwise>
@@ -412,8 +412,9 @@
   </xsl:if>
 </xsl:template>
 
-<xsl:template match='xhtml:p[count(*)=1 and normalize-space(text())=""
-                             and descendant::xhtml:img]'>
+<xsl:template name='imgpara' match='xhtml:p[count(*)=1]
+                                           [normalize-space(text())=""]
+                                           [descendant::xhtml:img]'>
   <xsl:copy>
     <xsl:apply-templates select='@*[local-name() != "class"]' />
     <xsl:attribute name='class'>
@@ -426,6 +427,30 @@
   </xsl:copy>
 </xsl:template>
 
+<xsl:key name='gallery'
+  match='xhtml:html/xhtml:p[descendant::*[@generate-gallery]]'
+  use='generate-id(
+        ( ( preceding-sibling::*[not(descendant::*[@generate-gallery])][1]
+          /following-sibling::* ) | self::* ) [1])' />
+
+<xsl:template match='@generate-gallery' />
+<xsl:template match='xhtml:html/xhtml:p[descendant::*[@generate-gallery]]' />
+<xsl:template match='xhtml:html/xhtml:p[key("gallery", generate-id(.))]'>
+  <xsl:variable name='images' select='key("gallery", generate-id(.))' />
+  <xsl:choose>
+    <xsl:when test='count($images) > 1'>
+      <div class='gallery'>
+        <xsl:for-each select='$images'>
+          <xsl:call-template name='imgpara' />
+        </xsl:for-each>
+      </div>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:call-template name='imgpara' />
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
 <xsl:template match='/'>
   <html>
     <head>
@@ -468,7 +493,8 @@
       <div id='footer'>
         <xsl:apply-templates select='/document/copyright' />
         <xsl:apply-templates select='/document/license' />
-        <xsl:if test='/document/image'>
+        <xsl:if test='/document/image[copyright != /document/copyright
+                      or license/identifier != /document/license/identifier]'>
           <xsl:call-template name='image-attribution' />
         </xsl:if>
         <xsl:apply-templates select='/document/source' />
