Simplify two‐step build

[Shushe] / parsers / tsv.xslt

diff --git a/parsers/tsv.xslt b/parsers/tsv.xslt
index ad7052e2fad764a55d610721ddc4401be6dd0b37..5b3cc684f6821c0e3a85f09e2637d7027c391c00 100644 (file)
--- a/parsers/tsv.xslt
+++ b/parsers/tsv.xslt
@@ -1,8 +1,12 @@
 <?xml version="1.0"?>
 <!--
 <?xml version="1.0"?>
 <!--

-⁌ ⛩️📰 书社 ∷ parsers/tsv.xslt
+SPDX-FileCopyrightText: 2023, 2024 Lady <https://www.ladys.computer/about/#lady>
+SPDX-License-Identifier: MPL-2.0
+-->
+<!--
+⁌ ⛩📰 书社 ∷ parsers/tsv.xslt

 
 

-© 2023–2024 Lady [@ Lady’s Computer]
+© 2023–2024 Lady [@ Ladys Computer].

 
 This Source Code Form is subject to the terms of the Mozilla Public License, v 2.0.
 If a copy of the M·P·L was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0/>.
 
 This Source Code Form is subject to the terms of the Mozilla Public License, v 2.0.
 If a copy of the M·P·L was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0/>.


@@ -13,18 +17,29 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
        xmlns:exslstr="http://exslt.org/strings"
        xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns:书社="urn:fdc:ladys.computer:20231231:Shu1She4"
        xmlns:exslstr="http://exslt.org/strings"
        xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns:书社="urn:fdc:ladys.computer:20231231:Shu1She4"

-       exclude-result-prefixes="exsl exslstr"
+       extension-element-prefixes="exsl exslstr"

        version="1.0"
 >
        version="1.0"
 >

+       <import href="../lib/split.xslt"/>

        <书社:id>urn:fdc:ladys.computer:20231231:Shu1She4:tsv.xslt</书社:id>
        <template match="html:script[@type='text/tab-separated-values']">
        <书社:id>urn:fdc:ladys.computer:20231231:Shu1She4:tsv.xslt</书社:id>
        <template match="html:script[@type='text/tab-separated-values']">

-               <variable name="rows" select="exslstr:tokenize(., '&#xA;')[normalize-space(.) and not(starts-with(., '#'))]"/>
-               <variable name="head" select="$rows[1]"/>
-               <variable name="body" select="$rows[not(position()=1)]"/>
-               <html:table class="tsv">
+               <variable name="lines" select="exslstr:tokenize(., '&#xA;')"/>
+               <variable name="head" select="$lines[normalize-space(.)!='' and not(starts-with(., '#'))][1]"/>
+               <variable name="headcols">
+                       <call-template name="书社:split">
+                               <with-param name="source" select="string($head)"/>
+                               <with-param name="separator" select="'&#x9;'"/>
+                       </call-template>
+               </variable>
+               <html:table>
+                       <for-each select="$lines[starts-with(., '#') and following-sibling::*[generate-id(.)=generate-id($head)]]">
+                               <comment>
+                                       <value-of select="substring-after(., '#')"/>
+                               </comment>
+                       </for-each>

                        <html:thead>
                                <html:tr>
                        <html:thead>
                                <html:tr>

-                                       <for-each select="exslstr:tokenize($head, '&#x9;')">
+                                       <for-each select="exsl:node-set($headcols)/*">

                                                <html:th scope="col">
                                                        <value-of select="."/>
                                                </html:th>
                                                <html:th scope="col">
                                                        <value-of select="."/>
                                                </html:th>


@@ -32,14 +47,41 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                </html:tr>
                        </html:thead>
                        <html:tbody>
                                </html:tr>
                        </html:thead>
                        <html:tbody>

-                               <for-each select="$body">
-                                       <html:tr>
-                                               <for-each select="exslstr:tokenize(., '&#x9;')">
-                                                       <html:td>
-                                                               <value-of select="."/>
-                                                       </html:td>
-                                               </for-each>
-                                       </html:tr>
+                               <for-each select="$head/following-sibling::*[normalize-space(.)!='']">
+                                       <choose>
+                                               <when test="starts-with(., '#')">
+                                                       <comment>
+                                                               <value-of select="substring-after(., '#')"/>
+                                                       </comment>
+                                               </when>
+                                               <otherwise>
+                                                       <variable name="cols">
+                                                               <call-template name="书社:split">
+                                                                       <with-param name="source" select="string(.)"/>
+                                                                       <with-param name="separator" select="'&#x9;'"/>
+                                                               </call-template>
+                                                       </variable>
+                                                       <html:tr>
+                                                               <for-each select="exsl:node-set($cols)/*[count(exsl:node-set($headcols)/*)>=position()]">
+                                                                       <html:td>
+                                                                               <attribute name="data-tsv-header">
+                                                                                       <value-of select="exsl:node-set($headcols)/*[count(current()/preceding-sibling::*)+1]"/>
+                                                                               </attribute>
+                                                                               <value-of select="."/>
+                                                                               <if test="position()=count(exsl:node-set($headcols)/*)">
+                                                                                       <for-each select="following-sibling::*">
+                                                                                               <text>&#x9;</text>
+                                                                                               <value-of select="."/>
+                                                                                       </for-each>
+                                                                               </if>
+                                                                       </html:td>
+                                                               </for-each>
+                                                               <for-each select="exsl:node-set($headcols)/*[position()>count(exsl:node-set($cols)/*)]">
+                                                                       <html:td/>
+                                                               </for-each>
+                                                       </html:tr>
+                                               </otherwise>
+                                       </choose>

                                </for-each>
                        </html:tbody>
                </html:table>
                                </for-each>
                        </html:tbody>
                </html:table>