comparison visualise.xpl @ 40:ac6d1ca099f7

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
comparison
equal deleted inserted replaced
39:4c6a341e75da 40:ac6d1ca099f7
68 </p:input> 68 </p:input>
69 <p:with-param name="elabDir" select="$elabDir"/> 69 <p:with-param name="elabDir" select="$elabDir"/>
70 <p:with-param name="xlDir" select="$root"/> 70 <p:with-param name="xlDir" select="$root"/>
71 </p:xslt> 71 </p:xslt>
72 72
73 <p:load name="ss2">
74 <p:with-option name="href" select="concat($elabDir,'/rect.xsl')"/>
75 </p:load>
76
77 <p:xslt name="rect">
78 <p:input port="source">
79 <p:pipe step="format" port="result"/>
80 </p:input>
81 <p:input port="stylesheet">
82 <p:pipe step="ss2" port="result"/>
83 </p:input>
84 <p:with-param name="sheet-number" select="$sheet-number"/>
85 <p:with-param name="xlDir" select="$root"/>
86 </p:xslt>
87
73 <p:load name="ssr"> 88 <p:load name="ssr">
74 <p:with-option name="href" select="concat($elabDir,'/refs.xsl')"/> 89 <p:with-option name="href" select="concat($elabDir,'/refs.xsl')"/>
75 <p:documentation> 90 <p:documentation>
76 <div>Tokenise cell formulae and extract local, range and external references</div> 91 <div>Tokenise cell formulae and extract local, range and external references</div>
77 </p:documentation> 92 </p:documentation>
78 </p:load> 93 </p:load>
79 94
80 <p:xslt name="refs"> 95 <p:xslt name="refs">
81 <p:input port="source"> 96 <p:input port="source">
82 <p:pipe step="vis" port="source"/> 97 <p:pipe step="rect" port="result"/>
83 </p:input> 98 </p:input>
84 <p:input port="stylesheet"> 99 <p:input port="stylesheet">
85 <p:pipe step="ssr" port="result"/> 100 <p:pipe step="ssr" port="result"/>
86 </p:input> 101 </p:input>
87 <p:with-param name="sheet-number" select="$sheet-number"/> 102 <p:with-param name="sheet-number" select="$sheet-number"/>
101 </p:input> 116 </p:input>
102 <p:input port="stylesheet"> 117 <p:input port="stylesheet">
103 <p:pipe step="ssr2" port="result"/> 118 <p:pipe step="ssr2" port="result"/>
104 </p:input> 119 </p:input>
105 </p:xslt> 120 </p:xslt>
106 121
107 <p:load name="ss2"> 122 <p:load name="ssg">
108 <p:with-option name="href" select="concat($elabDir,'/rect.xsl')"/> 123 <p:with-option name="href" select="concat($elabDir,'/merge.xsl')"/>
124 <p:documentation>
125 <div>Combine rectangular array and inverted ref table</div>
126 </p:documentation>
109 </p:load> 127 </p:load>
110 128
111 <p:xslt name="rect"> 129 <p:xslt name="merge">
112 <p:input port="source"> 130 <p:input port="source">
113 <p:pipe step="format" port="result"/> 131 <p:pipe step="rect" port="result"/>
114 <p:pipe step="refs2" port="result"/> 132 <p:pipe step="refs2" port="result"/>
115 </p:input> 133 </p:input>
116 <p:input port="stylesheet"> 134 <p:input port="stylesheet">
117 <p:pipe step="ss2" port="result"/> 135 <p:pipe step="ssg" port="result"/>
118 </p:input> 136 </p:input>
119 <p:with-param name="sheet-number" select="$sheet-number"/>
120 <p:with-param name="xlDir" select="$root"/>
121 </p:xslt> 137 </p:xslt>
122 138
123 <p:choose> 139 <p:choose>
124 <p:when test="p:value-available('format')"> 140 <p:when test="p:value-available('format')">
125 <p:load name="ss3"> 141 <p:load name="ss3">
126 <p:with-option name="href" select="concat($elabDir,'/',$format)"/> 142 <p:with-option name="href" select="concat($elabDir,'/',$format)"/>
127 </p:load> 143 </p:load>
128 <p:xslt name="fmt"> 144 <p:xslt name="fmt">
129 <p:input port="source"> 145 <p:input port="source">
130 <p:pipe step="rect" port="result"/> 146 <p:pipe step="merge" port="result"/>
131 </p:input> 147 </p:input>
132 <p:input port="stylesheet"> 148 <p:input port="stylesheet">
133 <p:pipe step="ss3" port="result"/> 149 <p:pipe step="ss3" port="result"/>
134 </p:input> 150 </p:input>
135 </p:xslt> 151 </p:xslt>
136 </p:when> 152 </p:when>
137 <p:otherwise> 153 <p:otherwise>
138 <p:identity/> 154 <p:identity>
155 <p:input port="source">
156 <p:pipe step="merge" port="result"/>
157 </p:input>
158 </p:identity>
139 </p:otherwise> 159 </p:otherwise>
140 </p:choose> 160 </p:choose>
141 </p:pipeline> 161 </p:pipeline>