Mercurial > hg > ooxml

diff visualise.xpl @ 40:ac6d1ca099f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplified rect output, refs (not refs2) working again
author Henry S. Thompson <ht@markup.co.uk>
date Tue, 02 May 2017 09:20:13 +0100
parents 4c6a341e75da
children 5d9806f90896
line wrap: on
line diff
--- a/visualise.xpl	Wed Apr 26 18:51:34 2017 +0100
+++ b/visualise.xpl	Tue May 02 09:20:13 2017 +0100
@@ -70,6 +70,21 @@
   <p:with-param name="xlDir" select="$root"/>
  </p:xslt>
 
+ <p:load name="ss2">
+  <p:with-option name="href" select="concat($elabDir,'/rect.xsl')"/>
+ </p:load>
+ 
+ <p:xslt name="rect">
+   <p:input port="source">
+    <p:pipe step="format" port="result"/>
+   </p:input>
+  <p:input port="stylesheet">
+   <p:pipe step="ss2" port="result"/>
+  </p:input>
+  <p:with-param name="sheet-number" select="$sheet-number"/>
+  <p:with-param name="xlDir" select="$root"/>  
+ </p:xslt> 
+
  <p:load name="ssr">
   <p:with-option name="href" select="concat($elabDir,'/refs.xsl')"/>
   <p:documentation>
@@ -79,7 +94,7 @@
 
  <p:xslt name="refs">
   <p:input port="source">
-   <p:pipe step="vis" port="source"/>
+   <p:pipe step="rect" port="result"/>
   </p:input>
   <p:input port="stylesheet">
      <p:pipe step="ssr" port="result"/>
@@ -103,21 +118,22 @@
      <p:pipe step="ssr2" port="result"/>
     </p:input>
  </p:xslt>
-
- <p:load name="ss2">
-  <p:with-option name="href" select="concat($elabDir,'/rect.xsl')"/>
+ 
+ <p:load name="ssg">
+  <p:with-option name="href" select="concat($elabDir,'/merge.xsl')"/>
+  <p:documentation>
+   <div>Combine rectangular array and inverted ref table</div>
+  </p:documentation>
  </p:load>
  
- <p:xslt name="rect">
-   <p:input port="source">
-    <p:pipe step="format" port="result"/>
-    <p:pipe step="refs2" port="result"/>
-   </p:input>
+ <p:xslt name="merge">
+  <p:input port="source">
+   <p:pipe step="rect" port="result"/>
+   <p:pipe step="refs2" port="result"/>
+  </p:input>
   <p:input port="stylesheet">
-   <p:pipe step="ss2" port="result"/>
-  </p:input>
-  <p:with-param name="sheet-number" select="$sheet-number"/>
-  <p:with-param name="xlDir" select="$root"/>  
+     <p:pipe step="ssg" port="result"/>
+    </p:input>
  </p:xslt>
  
  <p:choose> 
@@ -127,7 +143,7 @@
    </p:load>
    <p:xslt name="fmt">
     <p:input port="source">
-     <p:pipe step="rect" port="result"/>
+     <p:pipe step="merge" port="result"/>
     </p:input>
     <p:input port="stylesheet">
      <p:pipe step="ss3" port="result"/>
@@ -135,7 +151,11 @@
    </p:xslt>
   </p:when>
   <p:otherwise>
-   <p:identity/>
+   <p:identity>
+    <p:input port="source">
+     <p:pipe step="merge" port="result"/>
+    </p:input>
+   </p:identity>
   </p:otherwise>
  </p:choose>
 </p:pipeline>