# HG changeset patch
# User ht
# Date 1261043734 0
# Node ID d49f2ca9374c7eb165dd842bc5a6e612bf585620
# Parent  8f4be7dfda7aa9722d552778265c6af334e9f93b
all but proemium working

diff -r 8f4be7dfda7a -r d49f2ca9374c summa/bilingual/merge.xsl
--- a/summa/bilingual/merge.xsl	Wed Dec 16 23:11:44 2009 +0000
+++ b/summa/bilingual/merge.xsl	Thu Dec 17 09:55:34 2009 +0000
@@ -22,5 +22,27 @@
   <xsl:variable name="n" select="count(preceding-sibling::x:div[@n])+1"/>
   <xsl:variable name="ld" select="$la/x:div[@class='a'][position()=$n]"/>
   <xsl:message><xsl:value-of select="@n"/>,<xsl:value-of select="$n"/>,<xsl:value-of select="@title"/>,<xsl:value-of select="count(x:div)"/>,<xsl:value-of select="$ld/x:h3"/>,<xsl:value-of select="count($ld/x:p)"/></xsl:message>
+  <xsl:choose>
+   <xsl:when test="count(x:div)=count($ld/x:p)">
+    <xsl:copy>
+     <xsl:apply-templates select="@*|x:h4"/>
+     <xsl:for-each select="x:div">
+      <xsl:variable name="i" select="position()"/>
+      <xsl:copy>
+         <xsl:apply-templates select="@*|x:div[1]"/>
+         <xsl:for-each select="x:div[2]">
+          <xsl:copy>
+           <xsl:apply-templates select="@*"/>
+           <xsl:apply-templates select="$ld/x:p[position()=$i]"/>
+          </xsl:copy>
+         </xsl:for-each>
+        </xsl:copy>
+     </xsl:for-each>
+    </xsl:copy>
+   </xsl:when>
+   <xsl:otherwise>
+    <xsl:message>Can't merge article <xsl:value-of select="@n"/>, <xsl:value-of select="count(x:div)"/>!=<xsl:value-of select="count($ld/x:p)"/></xsl:message>
+   </xsl:otherwise>
+  </xsl:choose>  
  </xsl:template>
 </xsl:stylesheet>