metanorma-csa 1.4.11 → 1.4.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 55d4af6ba83ca97e3acd7d681f098d089836b5401ca5ad6c81fa06699d25f683
4
- data.tar.gz: be98e42091c65d9feddc509f2608693f113d90d521fe3aeb0d0d38bac045a618
3
+ metadata.gz: ea17175915907add771401ad25dc1de9031c155bb377f51d7af13a9f9cf285a0
4
+ data.tar.gz: 6530fcd7ca4af0d48b32c06cdd6e8309e75d5840a55b4e561124b544d7f7d37a
5
5
  SHA512:
6
- metadata.gz: def7ddc4e988aeac6be626bd6ef4d2cbbd43efcaef1c2039ef40fad4c2c481c121c1edbfa1fd380f2a8cd9808a33a338b590ec71175e91a846fe95cedad81368
7
- data.tar.gz: f1a6b34a19bb848990ead49974583dbc2e8167ce067f26e24b176196f502b035758f71363ffaaa3331d4aff9302bffc41dd3f2911100faecd3849d50fe6aafef
6
+ metadata.gz: 3973a74c611b4bf9419fddb3b490b27d52994f864170601d0cf5c1b18098e5ae2925edf8cc4e6aabac555a7d2414e95ede5c187f43cb99ef13606968daaca1d6
7
+ data.tar.gz: f8cb6061b751014e59087bc29b6b2b86dfe4d8f9bb61dec533d13a4aa4fc5ae9186b12e7d68218e0f65548242719860ba899204dde9b31cdfca836162208ff2b
@@ -661,9 +661,9 @@
661
661
  <optional>
662
662
  <ref name="status"/>
663
663
  </optional>
664
- <optional>
664
+ <zeroOrMore>
665
665
  <ref name="copyright"/>
666
- </optional>
666
+ </zeroOrMore>
667
667
  <zeroOrMore>
668
668
  <ref name="docrelation"/>
669
669
  </zeroOrMore>
@@ -1021,7 +1021,17 @@
1021
1021
  <optional>
1022
1022
  <ref name="to"/>
1023
1023
  </optional>
1024
- <ref name="owner"/>
1024
+ <oneOrMore>
1025
+ <ref name="owner"/>
1026
+ </oneOrMore>
1027
+ <optional>
1028
+ <ref name="copyright_scope"/>
1029
+ </optional>
1030
+ </element>
1031
+ </define>
1032
+ <define name="copyright_scope">
1033
+ <element name="scope">
1034
+ <text/>
1025
1035
  </element>
1026
1036
  </define>
1027
1037
  <define name="from">
@@ -53,6 +53,14 @@
53
53
  <optional>
54
54
  <attribute name="alt"/>
55
55
  </optional>
56
+ <optional>
57
+ <attribute name="case">
58
+ <choice>
59
+ <value>capital</value>
60
+ <value>lowercase</value>
61
+ </choice>
62
+ </attribute>
63
+ </optional>
56
64
  <text/>
57
65
  </element>
58
66
  </define>
@@ -902,7 +910,15 @@
902
910
  <attribute name="id">
903
911
  <data type="ID"/>
904
912
  </attribute>
905
- <ref name="paragraph"/>
913
+ <oneOrMore>
914
+ <choice>
915
+ <ref name="paragraph"/>
916
+ <ref name="ul"/>
917
+ <ref name="ol"/>
918
+ <ref name="dl"/>
919
+ <ref name="formula"/>
920
+ </choice>
921
+ </oneOrMore>
906
922
  </element>
907
923
  </define>
908
924
  <define name="termexample">
@@ -114,14 +114,7 @@
114
114
  <xsl:value-of select="normalize-space($abstract)"/>
115
115
  </dc:description>
116
116
  <pdf:Keywords>
117
- <xsl:for-each select="/csa:csa-standard/csa:bibdata//csa:keyword">
118
- <xsl:sort data-type="text" order="ascending"/>
119
- <xsl:apply-templates/>
120
- <xsl:choose>
121
- <xsl:when test="position() != last()">, </xsl:when>
122
- <xsl:otherwise>.</xsl:otherwise>
123
- </xsl:choose>
124
- </xsl:for-each>
117
+ <xsl:call-template name="insertKeywords"/>
125
118
  </pdf:Keywords>
126
119
  </rdf:Description>
127
120
  <rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
@@ -679,11 +672,15 @@
679
672
  <xsl:text>Keywords</xsl:text>
680
673
  </fo:block>
681
674
  <fo:block margin-bottom="12pt">The following are keywords to be used by search engines and document catalogues.</fo:block>
682
- <fo:block margin-bottom="12pt">
683
- <xsl:for-each select="/csa:csa-standard/csa:bibdata/csa:keyword">
675
+ <fo:block margin-bottom="12pt">
676
+ <xsl:call-template name="insertKeywords">
677
+ <xsl:with-param name="sorting">no</xsl:with-param>
678
+ <xsl:with-param name="charAtEnd"/>
679
+ </xsl:call-template>
680
+ <!-- <xsl:for-each select="/csa:csa-standard/csa:bibdata/csa:keyword">
684
681
  <xsl:value-of select="."/>
685
682
  <xsl:if test="position() != last()">, </xsl:if>
686
- </xsl:for-each>
683
+ </xsl:for-each> -->
687
684
  </fo:block>
688
685
  </xsl:template>
689
686
  <!-- Submitting Organizations -->
@@ -1373,58 +1370,7 @@
1373
1370
  <xsl:apply-templates select="csa:localityStack"/>
1374
1371
  </fo:basic-link>
1375
1372
  </xsl:template>
1376
-
1377
- <xsl:template match="csa:appendix">
1378
- <fo:block font-size="12pt" font-weight="bold" margin-top="12pt" margin-bottom="12pt">
1379
- <fo:inline padding-right="5mm">Appendix <xsl:number/></fo:inline>
1380
- <xsl:apply-templates select="csa:title" mode="process"/>
1381
- </fo:block>
1382
- <xsl:apply-templates/>
1383
- </xsl:template>
1384
-
1385
- <xsl:template match="csa:appendix//csa:example">
1386
- <fo:block font-size="10pt" margin-bottom="12pt">
1387
- <xsl:text>EXAMPLE</xsl:text>
1388
- <xsl:if test="csa:name">
1389
- <xsl:text> — </xsl:text><xsl:apply-templates select="csa:name" mode="process"/>
1390
- </xsl:if>
1391
- </fo:block>
1392
- <xsl:apply-templates/>
1393
- </xsl:template>
1394
-
1395
- <xsl:template match="csa:appendix//csa:example/csa:name"/>
1396
- <xsl:template match="csa:appendix//csa:example/csa:name" mode="process">
1397
- <fo:inline><xsl:apply-templates/></fo:inline>
1398
- </xsl:template>
1399
-
1400
- <xsl:template match="csa:callout">
1401
- <fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">&lt;<xsl:apply-templates/>&gt;</fo:basic-link>
1402
- </xsl:template>
1403
-
1404
- <xsl:template match="csa:annotation">
1405
- <fo:block>
1406
-
1407
- </fo:block>
1408
- <xsl:apply-templates/>
1409
- </xsl:template>
1410
-
1411
- <xsl:template match="csa:annotation/text()"/>
1412
-
1413
- <xsl:template match="csa:annotation/csa:p">
1414
- <xsl:variable name="annotation-id" select="../@id"/>
1415
- <xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/>
1416
- <fo:block id="{$annotation-id}">
1417
- <xsl:value-of select="concat('&lt;', $callout, '&gt; ')"/>
1418
- <xsl:apply-templates/>
1419
- </fo:block>
1420
- </xsl:template>
1421
-
1422
-
1423
- <xsl:template match="csa:appendix/csa:title"/>
1424
- <xsl:template match="csa:appendix/csa:title" mode="process">
1425
- <fo:inline><xsl:apply-templates/></fo:inline>
1426
- </xsl:template>
1427
-
1373
+
1428
1374
 
1429
1375
  <xsl:template match="csa:xref">
1430
1376
  <fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">
@@ -1453,17 +1399,8 @@
1453
1399
  </fo:basic-link>
1454
1400
  </xsl:template>
1455
1401
 
1456
- <xsl:template match="csa:sourcecode">
1457
- <fo:block font-family="SourceCodePro" font-size="10pt" margin-bottom="6pt" keep-with-next="always" line-height="113%">
1458
- <xsl:choose>
1459
- <xsl:when test="@lang = 'en'"/>
1460
- <xsl:otherwise>
1461
- <xsl:attribute name="white-space">pre</xsl:attribute>
1462
- <xsl:attribute name="wrap-option">wrap</xsl:attribute>
1463
- </xsl:otherwise>
1464
- </xsl:choose>
1465
- <xsl:apply-templates/>
1466
- </fo:block>
1402
+ <xsl:template match="csa:sourcecode" priority="2">
1403
+ <xsl:call-template name="sourcecode"/>
1467
1404
  <xsl:choose>
1468
1405
  <xsl:when test="@unnumbered='true'"/>
1469
1406
  <xsl:when test="ancestor::csa:example"/>
@@ -1654,11 +1591,7 @@
1654
1591
  <fo:block> </fo:block>
1655
1592
  <fo:block break-after="page"/>
1656
1593
  </xsl:template>
1657
-
1658
- <xsl:template match="csa:bookmark">
1659
- <fo:inline id="{@id}"/>
1660
- </xsl:template>
1661
-
1594
+
1662
1595
  <xsl:template name="insertHeaderFooter">
1663
1596
  <fo:static-content flow-name="header">
1664
1597
  <fo:block-container height="2.5mm" background-color="{$color-header-document}">
@@ -3026,19 +2959,80 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3026
2959
  </xsl:text>
3027
2960
  </xsl:variable>
3028
2961
 
3029
- <xsl:variable xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="linebreak" select="'&#8232;'"/><xsl:attribute-set xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="link-style">
2962
+ <xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-table">
2963
+
2964
+ <xsl:text>Table </xsl:text>
2965
+
2966
+
2967
+ </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-note">
2968
+
2969
+ <xsl:text>NOTE </xsl:text>
2970
+
2971
+
2972
+ </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-figure">
2973
+
2974
+ <xsl:text>Figure </xsl:text>
2975
+
2976
+
2977
+ </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-example">
2978
+
2979
+ <xsl:text>EXAMPLE </xsl:text>
2980
+
2981
+
2982
+ </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-inequality">Inequality </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-equation">Equation </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-annex">
2983
+
2984
+ <xsl:text>Annex </xsl:text>
2985
+
2986
+
2987
+ </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-appendix">
2988
+ <xsl:text>Appendix </xsl:text>
2989
+ </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-clause">
2990
+
2991
+ <xsl:text>Clause </xsl:text>
2992
+
2993
+
2994
+ </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-edition">
2995
+ <xsl:text>Edition </xsl:text>
2996
+ </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-toc">
2997
+
2998
+
2999
+ </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-page">Page</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-key">Key</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-where">where</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-descriptors">Descriptors</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-part-en">Part </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-part-fr">Partie </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-note-to-entry">Note # to entry: </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-modified">modified</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-source">SOURCE</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-keywords">Keywords</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="linebreak" select="'&#8232;'"/><xsl:attribute-set xmlns:java="http://xml.apache.org/xalan/java" name="link-style">
3030
3000
 
3031
3001
 
3032
3002
  <xsl:attribute name="color">rgb(33, 94, 159)</xsl:attribute>
3033
3003
  <xsl:attribute name="text-decoration">underline</xsl:attribute>
3034
3004
 
3035
- </xsl:attribute-set><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="text()">
3005
+ </xsl:attribute-set><xsl:attribute-set xmlns:java="http://xml.apache.org/xalan/java" name="sourcecode-style">
3006
+
3007
+
3008
+ <xsl:attribute name="font-family">SourceCodePro</xsl:attribute>
3009
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
3010
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3011
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
3012
+ <xsl:attribute name="line-height">113%</xsl:attribute>
3013
+
3014
+
3015
+
3016
+
3017
+
3018
+
3019
+
3020
+ </xsl:attribute-set><xsl:attribute-set xmlns:java="http://xml.apache.org/xalan/java" name="appendix-style">
3021
+
3022
+
3023
+
3024
+ </xsl:attribute-set><xsl:attribute-set xmlns:java="http://xml.apache.org/xalan/java" name="appendix-example-style">
3025
+
3026
+
3027
+
3028
+ </xsl:attribute-set><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="text()">
3036
3029
  <xsl:value-of select="."/>
3037
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='br']">
3030
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='br']">
3038
3031
  <xsl:value-of select="$linebreak"/>
3039
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
3040
- <xsl:call-template name="add-zero-spaces"/>
3041
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table']">
3032
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
3033
+ <!-- <xsl:call-template name="add-zero-spaces"/> -->
3034
+ <xsl:call-template name="add-zero-spaces-java"/>
3035
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='table']">
3042
3036
 
3043
3037
  <xsl:variable name="simple-table">
3044
3038
  <!-- <xsl:copy> -->
@@ -3119,6 +3113,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3119
3113
 
3120
3114
 
3121
3115
 
3116
+
3122
3117
  <fo:table id="{@id}" table-layout="fixed" width="100%" margin-left="{$margin-left}mm" margin-right="{$margin-left}mm" table-omit-footer-at-break="true">
3123
3118
 
3124
3119
 
@@ -3130,9 +3125,10 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3130
3125
 
3131
3126
 
3132
3127
 
3128
+
3133
3129
  <xsl:for-each select="xalan:nodeset($colwidths)//column">
3134
3130
  <xsl:choose>
3135
- <xsl:when test=". = 1">
3131
+ <xsl:when test=". = 1 or . = 0">
3136
3132
  <fo:table-column column-width="proportional-column-width(2)"/>
3137
3133
  </xsl:when>
3138
3134
  <xsl:otherwise>
@@ -3146,15 +3142,35 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3146
3142
 
3147
3143
 
3148
3144
  </fo:block-container>
3149
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table']/*[local-name()='name']"/><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table']/*[local-name()='name']" mode="process">
3145
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="getTableNumber">
3146
+ <xsl:choose>
3147
+ <xsl:when test="ancestor::*[local-name()='executivesummary']"> <!-- NIST -->
3148
+ <xsl:text>ES-</xsl:text><xsl:number format="1" count="*[local-name()='executivesummary']//*[local-name()='table'][not(@unnumbered) or @unnumbered != 'true']"/>
3149
+ </xsl:when>
3150
+ <xsl:when test="ancestor::*[local-name()='annex']">
3151
+
3152
+
3153
+
3154
+
3155
+
3156
+
3157
+
3158
+
3159
+ </xsl:when>
3160
+ <xsl:otherwise>
3161
+
3162
+
3163
+ </xsl:otherwise>
3164
+ </xsl:choose>
3165
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='table']/*[local-name()='name']"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='table']/*[local-name()='name']" mode="process">
3150
3166
  <xsl:apply-templates/>
3151
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="calculate-columns-numbers">
3167
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="calculate-columns-numbers">
3152
3168
  <xsl:param name="table-row"/>
3153
3169
  <xsl:variable name="columns-count" select="count($table-row/*)"/>
3154
3170
  <xsl:variable name="sum-colspans" select="sum($table-row/*/@colspan)"/>
3155
3171
  <xsl:variable name="columns-with-colspan" select="count($table-row/*[@colspan])"/>
3156
3172
  <xsl:value-of select="$columns-count + $sum-colspans - $columns-with-colspan"/>
3157
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="calculate-column-widths">
3173
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="calculate-column-widths">
3158
3174
  <xsl:param name="table"/>
3159
3175
  <xsl:param name="cols-count"/>
3160
3176
  <xsl:param name="curr-col" select="1"/>
@@ -3163,7 +3179,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3163
3179
  <xsl:if test="$curr-col &lt;= $cols-count">
3164
3180
  <xsl:variable name="widths">
3165
3181
  <xsl:choose>
3166
- <xsl:when test="not($table)">
3182
+ <xsl:when test="not($table)"><!-- this branch is not using in production, for debug only -->
3167
3183
  <xsl:for-each select="*[local-name()='thead']//*[local-name()='tr']">
3168
3184
  <xsl:variable name="words">
3169
3185
  <xsl:call-template name="tokenize">
@@ -3202,9 +3218,16 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3202
3218
  <xsl:apply-templates select="td[$curr-col]" mode="td_text"/>
3203
3219
  </xsl:variable>
3204
3220
  <xsl:variable name="words">
3221
+ <xsl:variable name="string_with_added_zerospaces">
3222
+ <xsl:call-template name="add-zero-spaces-java">
3223
+ <xsl:with-param name="text" select="$td_text"/>
3224
+ </xsl:call-template>
3225
+ </xsl:variable>
3205
3226
  <xsl:call-template name="tokenize">
3206
3227
  <!-- <xsl:with-param name="text" select="translate(td[$curr-col],'- —:', ' ')"/> -->
3207
- <xsl:with-param name="text" select="translate(normalize-space($td_text),'- —:', ' ')"/>
3228
+ <!-- 2009 thinspace -->
3229
+ <!-- <xsl:with-param name="text" select="translate(normalize-space($td_text),'- —:', ' ')"/> -->
3230
+ <xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '​', ' '))"/>
3208
3231
  </xsl:call-template>
3209
3232
  </xsl:variable>
3210
3233
  <xsl:variable name="max_length">
@@ -3245,17 +3268,24 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3245
3268
  <xsl:with-param name="table" select="$table"/>
3246
3269
  </xsl:call-template>
3247
3270
  </xsl:if>
3248
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="text()" mode="td_text">
3271
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="text()" mode="td_text">
3249
3272
  <xsl:variable name="zero-space">​</xsl:variable>
3250
3273
  <xsl:value-of select="translate(., $zero-space, ' ')"/><xsl:text> </xsl:text>
3251
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table2']"/><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='thead']"/><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='thead']" mode="process">
3274
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='termsource']" mode="td_text">
3275
+ <xsl:value-of select="*[local-name()='origin']/@citeas"/>
3276
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='link']" mode="td_text">
3277
+ <xsl:value-of select="@target"/>
3278
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='table2']"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='thead']"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='thead']" mode="process">
3279
+ <xsl:param name="cols-count"/>
3252
3280
  <!-- font-weight="bold" -->
3253
- <fo:table-header>
3281
+ <fo:table-header>
3282
+
3254
3283
  <xsl:apply-templates/>
3255
3284
  </fo:table-header>
3256
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tfoot']"/><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tfoot']" mode="process">
3285
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='tfoot']"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='tfoot']" mode="process">
3257
3286
  <xsl:apply-templates/>
3258
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="insertTableFooter">
3287
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="insertTableFooter">
3288
+ <xsl:param name="cols-count"/>
3259
3289
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
3260
3290
  <xsl:if test="../*[local-name()='tfoot'] or $isNoteOrFnExist = 'true'">
3261
3291
 
@@ -3266,22 +3296,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3266
3296
  <!-- if there are note(s) or fn(s) then create footer row -->
3267
3297
  <xsl:if test="$isNoteOrFnExist = 'true'">
3268
3298
 
3269
- <xsl:variable name="cols-count">
3270
- <xsl:choose>
3271
- <xsl:when test="../*[local-name()='thead']">
3272
- <!-- <xsl:value-of select="count(../*[local-name()='thead']/*[local-name()='tr']/*[local-name()='th'])"/> -->
3273
- <xsl:call-template name="calculate-columns-numbers">
3274
- <xsl:with-param name="table-row" select="../*[local-name()='thead']/*[local-name()='tr'][1]"/>
3275
- </xsl:call-template>
3276
- </xsl:when>
3277
- <xsl:otherwise>
3278
- <!-- <xsl:value-of select="count(./*[local-name()='tr'][1]/*[local-name()='td'])"/> -->
3279
- <xsl:call-template name="calculate-columns-numbers">
3280
- <xsl:with-param name="table-row" select="./*[local-name()='tr'][1]"/>
3281
- </xsl:call-template>
3282
- </xsl:otherwise>
3283
- </xsl:choose>
3284
- </xsl:variable>
3299
+
3285
3300
 
3286
3301
  <fo:table-row>
3287
3302
  <fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
@@ -3309,11 +3324,30 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3309
3324
  </fo:table-footer>
3310
3325
 
3311
3326
  </xsl:if>
3312
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tbody']">
3327
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='tbody']">
3328
+
3329
+ <xsl:variable name="cols-count">
3330
+ <xsl:choose>
3331
+ <xsl:when test="../*[local-name()='thead']">
3332
+ <xsl:call-template name="calculate-columns-numbers">
3333
+ <xsl:with-param name="table-row" select="../*[local-name()='thead']/*[local-name()='tr'][1]"/>
3334
+ </xsl:call-template>
3335
+ </xsl:when>
3336
+ <xsl:otherwise>
3337
+ <xsl:call-template name="calculate-columns-numbers">
3338
+ <xsl:with-param name="table-row" select="./*[local-name()='tr'][1]"/>
3339
+ </xsl:call-template>
3340
+ </xsl:otherwise>
3341
+ </xsl:choose>
3342
+ </xsl:variable>
3313
3343
 
3314
- <xsl:apply-templates select="../*[local-name()='thead']" mode="process"/>
3344
+ <xsl:apply-templates select="../*[local-name()='thead']" mode="process">
3345
+ <xsl:with-param name="cols-count" select="$cols-count"/>
3346
+ </xsl:apply-templates>
3315
3347
 
3316
- <xsl:call-template name="insertTableFooter"/>
3348
+ <xsl:call-template name="insertTableFooter">
3349
+ <xsl:with-param name="cols-count" select="$cols-count"/>
3350
+ </xsl:call-template>
3317
3351
 
3318
3352
  <fo:table-body>
3319
3353
  <xsl:apply-templates/>
@@ -3321,7 +3355,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3321
3355
 
3322
3356
  </fo:table-body>
3323
3357
 
3324
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tr']">
3358
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='tr']">
3325
3359
  <xsl:variable name="parent-name" select="local-name(..)"/>
3326
3360
  <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
3327
3361
  <fo:table-row min-height="4mm">
@@ -3341,7 +3375,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3341
3375
 
3342
3376
  <xsl:apply-templates/>
3343
3377
  </fo:table-row>
3344
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='th']">
3378
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='th']">
3345
3379
  <fo:table-cell text-align="{@align}" font-weight="bold" border="solid black 1pt" padding-left="1mm" display-align="center">
3346
3380
 
3347
3381
 
@@ -3364,7 +3398,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3364
3398
  <xsl:apply-templates/>
3365
3399
  </fo:block>
3366
3400
  </fo:table-cell>
3367
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='td']">
3401
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='td']">
3368
3402
  <fo:table-cell text-align="{@align}" display-align="center" border="solid black 1pt" padding-left="1mm">
3369
3403
 
3370
3404
 
@@ -3386,6 +3420,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3386
3420
  </xsl:attribute>
3387
3421
  </xsl:if>
3388
3422
  <fo:block>
3423
+
3389
3424
  <xsl:apply-templates/>
3390
3425
  </fo:block>
3391
3426
  <!-- <xsl:choose>
@@ -3401,16 +3436,18 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3401
3436
 
3402
3437
 
3403
3438
  </fo:table-cell>
3404
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table']/*[local-name()='note']"/><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table']/*[local-name()='note']" mode="process">
3439
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='table']/*[local-name()='note']"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='table']/*[local-name()='note']" mode="process">
3405
3440
 
3406
3441
 
3407
3442
  <fo:block font-size="10pt" margin-bottom="12pt">
3408
3443
 
3409
3444
 
3410
3445
 
3446
+
3411
3447
  <fo:inline padding-right="2mm">
3412
3448
 
3413
- <xsl:text>NOTE </xsl:text>
3449
+
3450
+ <xsl:value-of select="$title-note"/>
3414
3451
 
3415
3452
 
3416
3453
 
@@ -3418,9 +3455,9 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3418
3455
  <xsl:apply-templates mode="process"/>
3419
3456
  </fo:block>
3420
3457
 
3421
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" mode="process">
3458
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" mode="process">
3422
3459
  <xsl:apply-templates/>
3423
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="fn_display">
3460
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="fn_display">
3424
3461
  <xsl:variable name="references">
3425
3462
  <xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
3426
3463
  <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
@@ -3437,6 +3474,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3437
3474
 
3438
3475
 
3439
3476
 
3477
+
3440
3478
  <fo:inline font-size="80%" padding-right="5mm" id="{@id}">
3441
3479
 
3442
3480
 
@@ -3454,7 +3492,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3454
3492
  </fo:block>
3455
3493
  </xsl:if>
3456
3494
  </xsl:for-each>
3457
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="fn_name_display">
3495
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="fn_name_display">
3458
3496
  <!-- <xsl:variable name="references">
3459
3497
  <xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
3460
3498
  <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
@@ -3470,7 +3508,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3470
3508
  <xsl:apply-templates/>
3471
3509
  </fo:block>
3472
3510
  </xsl:for-each>
3473
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="fn_display_figure">
3511
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="fn_display_figure">
3474
3512
  <xsl:variable name="key_iso">
3475
3513
  <!-- and (not(@class) or @class !='pseudocode') -->
3476
3514
  </xsl:variable>
@@ -3521,7 +3559,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3521
3559
  </fo:block>
3522
3560
  </xsl:if>
3523
3561
 
3524
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='fn']">
3562
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='fn']">
3525
3563
  <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
3526
3564
  <fo:inline font-size="80%" keep-with-previous.within-line="always">
3527
3565
 
@@ -3533,11 +3571,11 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3533
3571
  <xsl:value-of select="@reference"/>
3534
3572
  </fo:basic-link>
3535
3573
  </fo:inline>
3536
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='fn']/*[local-name()='p']">
3574
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='fn']/*[local-name()='p']">
3537
3575
  <fo:inline>
3538
3576
  <xsl:apply-templates/>
3539
3577
  </fo:inline>
3540
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dl']">
3578
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dl']">
3541
3579
  <xsl:variable name="parent" select="local-name(..)"/>
3542
3580
 
3543
3581
  <xsl:variable name="key_iso">
@@ -3555,7 +3593,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3555
3593
 
3556
3594
 
3557
3595
 
3558
- <xsl:text>where</xsl:text>
3596
+ <xsl:value-of select="$title-where"/>
3559
3597
  </fo:block>
3560
3598
  </xsl:when>
3561
3599
  <xsl:when test="$parent = 'figure' and (not(../@class) or ../@class !='pseudocode')">
@@ -3563,7 +3601,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3563
3601
 
3564
3602
 
3565
3603
 
3566
- <xsl:text>Key</xsl:text>
3604
+ <xsl:value-of select="$title-key"/>
3567
3605
  </fo:block>
3568
3606
  </xsl:when>
3569
3607
  </xsl:choose>
@@ -3574,9 +3612,11 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3574
3612
 
3575
3613
 
3576
3614
 
3615
+
3577
3616
  <fo:block>
3578
3617
 
3579
3618
 
3619
+
3580
3620
  <!-- create virtual html table for dl/[dt and dd] -->
3581
3621
  <xsl:variable name="html-table">
3582
3622
  <xsl:variable name="ns" select="substring-before(name(/*), '-')"/>
@@ -3628,7 +3668,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3628
3668
  <xsl:otherwise>
3629
3669
  <xsl:for-each select="xalan:nodeset($colwidths)//column">
3630
3670
  <xsl:choose>
3631
- <xsl:when test=". = 1">
3671
+ <xsl:when test=". = 1 or . = 0">
3632
3672
  <fo:table-column column-width="proportional-column-width(2)"/>
3633
3673
  </xsl:when>
3634
3674
  <xsl:otherwise>
@@ -3651,7 +3691,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3651
3691
  </fo:block>
3652
3692
  </fo:block>
3653
3693
  </xsl:if>
3654
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dl']/*[local-name()='note']">
3694
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dl']/*[local-name()='note']">
3655
3695
  <xsl:param name="key_iso"/>
3656
3696
 
3657
3697
  <!-- <tr>
@@ -3667,7 +3707,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3667
3707
  <xsl:if test="normalize-space($key_iso) = 'true'">
3668
3708
  <xsl:attribute name="margin-top">0</xsl:attribute>
3669
3709
  </xsl:if>
3670
- NOTE
3710
+ <xsl:value-of select="$title-note"/>
3671
3711
  </fo:block>
3672
3712
  </fo:table-cell>
3673
3713
  <fo:table-cell>
@@ -3676,7 +3716,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3676
3716
  </fo:block>
3677
3717
  </fo:table-cell>
3678
3718
  </fo:table-row>
3679
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dt']" mode="dl">
3719
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dt']" mode="dl">
3680
3720
  <tr>
3681
3721
  <td>
3682
3722
  <xsl:apply-templates/>
@@ -3687,11 +3727,12 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3687
3727
  </td>
3688
3728
  </tr>
3689
3729
 
3690
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dt']">
3730
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dt']">
3691
3731
  <xsl:param name="key_iso"/>
3692
3732
 
3693
3733
  <fo:table-row>
3694
3734
  <fo:table-cell>
3735
+
3695
3736
  <fo:block margin-top="6pt">
3696
3737
 
3697
3738
 
@@ -3701,6 +3742,9 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3701
3742
  </xsl:if>
3702
3743
 
3703
3744
 
3745
+
3746
+
3747
+
3704
3748
  <xsl:apply-templates/>
3705
3749
 
3706
3750
  </fo:block>
@@ -3714,37 +3758,37 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3714
3758
  </fo:table-cell>
3715
3759
  </fo:table-row>
3716
3760
 
3717
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dd']" mode="dl"/><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dd']" mode="dl_process">
3761
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dd']" mode="dl"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dd']" mode="dl_process">
3718
3762
  <xsl:apply-templates/>
3719
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dd']"/><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dd']" mode="process">
3763
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dd']"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dd']" mode="process">
3720
3764
  <xsl:apply-templates/>
3721
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
3765
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
3722
3766
  <fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
3723
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='em']">
3767
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='em']">
3724
3768
  <fo:inline font-style="italic">
3725
3769
  <xsl:apply-templates/>
3726
3770
  </fo:inline>
3727
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='strong']">
3771
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='strong']">
3728
3772
  <fo:inline font-weight="bold">
3729
3773
  <xsl:apply-templates/>
3730
3774
  </fo:inline>
3731
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='sup']">
3775
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='sup']">
3732
3776
  <fo:inline font-size="80%" vertical-align="super">
3733
3777
  <xsl:apply-templates/>
3734
3778
  </fo:inline>
3735
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='sub']">
3779
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='sub']">
3736
3780
  <fo:inline font-size="80%" vertical-align="sub">
3737
3781
  <xsl:apply-templates/>
3738
3782
  </fo:inline>
3739
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tt']">
3740
- <fo:inline font-family="Courier" font-size="10pt">
3783
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='tt']">
3784
+ <fo:inline font-family="Courier" font-size="10pt">
3741
3785
  <xsl:apply-templates/>
3742
3786
  </fo:inline>
3743
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='del']">
3787
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='del']">
3744
3788
  <fo:inline font-size="10pt" color="red" text-decoration="line-through">
3745
3789
  <xsl:apply-templates/>
3746
3790
  </fo:inline>
3747
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="text()[ancestor::*[local-name()='smallcap']]">
3791
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="text()[ancestor::*[local-name()='smallcap']]">
3748
3792
  <xsl:variable name="text" select="normalize-space(.)"/>
3749
3793
  <fo:inline font-size="75%">
3750
3794
  <xsl:if test="string-length($text) &gt; 0">
@@ -3753,7 +3797,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3753
3797
  </xsl:call-template>
3754
3798
  </xsl:if>
3755
3799
  </fo:inline>
3756
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="recursiveSmallCaps">
3800
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="recursiveSmallCaps">
3757
3801
  <xsl:param name="text"/>
3758
3802
  <xsl:variable name="char" select="substring($text,1,1)"/>
3759
3803
  <xsl:variable name="upperCase" select="translate($char, $lower, $upper)"/>
@@ -3772,7 +3816,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3772
3816
  <xsl:with-param name="text" select="substring($text,2)"/>
3773
3817
  </xsl:call-template>
3774
3818
  </xsl:if>
3775
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="tokenize">
3819
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="tokenize">
3776
3820
  <xsl:param name="text"/>
3777
3821
  <xsl:param name="separator" select="' '"/>
3778
3822
  <xsl:choose>
@@ -3820,7 +3864,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3820
3864
  </xsl:call-template>
3821
3865
  </xsl:otherwise>
3822
3866
  </xsl:choose>
3823
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="max_length">
3867
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="max_length">
3824
3868
  <xsl:param name="words"/>
3825
3869
  <xsl:for-each select="$words//word">
3826
3870
  <xsl:sort select="." data-type="number" order="descending"/>
@@ -3828,7 +3872,11 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3828
3872
  <xsl:value-of select="."/>
3829
3873
  </xsl:if>
3830
3874
  </xsl:for-each>
3831
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="add-zero-spaces">
3875
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="add-zero-spaces-java">
3876
+ <xsl:param name="text" select="."/>
3877
+ <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space -->
3878
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| )','$1​')"/>
3879
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="add-zero-spaces">
3832
3880
  <xsl:param name="text" select="."/>
3833
3881
  <xsl:variable name="zero-space-after-chars">-</xsl:variable>
3834
3882
  <xsl:variable name="zero-space-after-dot">.</xsl:variable>
@@ -3881,7 +3929,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3881
3929
  <xsl:value-of select="$text"/>
3882
3930
  </xsl:otherwise>
3883
3931
  </xsl:choose>
3884
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="add-zero-spaces-equal">
3932
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="add-zero-spaces-equal">
3885
3933
  <xsl:param name="text" select="."/>
3886
3934
  <xsl:variable name="zero-space-after-equals">==========</xsl:variable>
3887
3935
  <xsl:variable name="zero-space-after-equal">=</xsl:variable>
@@ -3907,7 +3955,7 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3907
3955
  <xsl:value-of select="$text"/>
3908
3956
  </xsl:otherwise>
3909
3957
  </xsl:choose>
3910
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="getSimpleTable">
3958
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="getSimpleTable">
3911
3959
  <xsl:variable name="simple-table">
3912
3960
 
3913
3961
  <!-- Step 1. colspan processing -->
@@ -3934,9 +3982,9 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3934
3982
  </xsl:choose> -->
3935
3983
  </xsl:variable>
3936
3984
  <xsl:copy-of select="$simple-table"/>
3937
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='thead'] | *[local-name()='tbody']" mode="simple-table-colspan">
3985
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='thead'] | *[local-name()='tbody']" mode="simple-table-colspan">
3938
3986
  <xsl:apply-templates mode="simple-table-colspan"/>
3939
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='fn']" mode="simple-table-colspan"/><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='th'] | *[local-name()='td']" mode="simple-table-colspan">
3987
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='fn']" mode="simple-table-colspan"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='th'] | *[local-name()='td']" mode="simple-table-colspan">
3940
3988
  <xsl:choose>
3941
3989
  <xsl:when test="@colspan">
3942
3990
  <xsl:variable name="td">
@@ -3958,16 +4006,16 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3958
4006
  </xsl:element>
3959
4007
  </xsl:otherwise>
3960
4008
  </xsl:choose>
3961
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="@colspan" mode="simple-table-colspan"/><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tr']" mode="simple-table-colspan">
4009
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="@colspan" mode="simple-table-colspan"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='tr']" mode="simple-table-colspan">
3962
4010
  <xsl:element name="tr">
3963
4011
  <xsl:apply-templates select="@*" mode="simple-table-colspan"/>
3964
4012
  <xsl:apply-templates mode="simple-table-colspan"/>
3965
4013
  </xsl:element>
3966
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="@*|node()" mode="simple-table-colspan">
4014
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="@*|node()" mode="simple-table-colspan">
3967
4015
  <xsl:copy>
3968
4016
  <xsl:apply-templates select="@*|node()" mode="simple-table-colspan"/>
3969
4017
  </xsl:copy>
3970
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="repeatNode">
4018
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="repeatNode">
3971
4019
  <xsl:param name="count"/>
3972
4020
  <xsl:param name="node"/>
3973
4021
 
@@ -3978,18 +4026,18 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
3978
4026
  </xsl:call-template>
3979
4027
  <xsl:copy-of select="$node"/>
3980
4028
  </xsl:if>
3981
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="@*|node()" mode="simple-table-rowspan">
4029
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="@*|node()" mode="simple-table-rowspan">
3982
4030
  <xsl:copy>
3983
4031
  <xsl:apply-templates select="@*|node()" mode="simple-table-rowspan"/>
3984
4032
  </xsl:copy>
3985
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="tbody" mode="simple-table-rowspan">
4033
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="tbody" mode="simple-table-rowspan">
3986
4034
  <xsl:copy>
3987
4035
  <xsl:copy-of select="tr[1]"/>
3988
4036
  <xsl:apply-templates select="tr[2]" mode="simple-table-rowspan">
3989
4037
  <xsl:with-param name="previousRow" select="tr[1]"/>
3990
4038
  </xsl:apply-templates>
3991
4039
  </xsl:copy>
3992
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="tr" mode="simple-table-rowspan">
4040
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="tr" mode="simple-table-rowspan">
3993
4041
  <xsl:param name="previousRow"/>
3994
4042
  <xsl:variable name="currentRow" select="."/>
3995
4043
 
@@ -4023,13 +4071,13 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
4023
4071
  <xsl:apply-templates select="following-sibling::tr[1]" mode="simple-table-rowspan">
4024
4072
  <xsl:with-param name="previousRow" select="$newRow"/>
4025
4073
  </xsl:apply-templates>
4026
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="getLang">
4074
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="getLang">
4027
4075
  <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
4028
4076
  <xsl:choose>
4029
4077
  <xsl:when test="$language = 'English'">en</xsl:when>
4030
4078
  <xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
4031
4079
  </xsl:choose>
4032
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="capitalizeWords">
4080
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="capitalizeWords">
4033
4081
  <xsl:param name="str"/>
4034
4082
  <xsl:variable name="str2" select="translate($str, '-', ' ')"/>
4035
4083
  <xsl:choose>
@@ -4047,19 +4095,19 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
4047
4095
  <xsl:value-of select="substring($str2, 2)"/>
4048
4096
  </xsl:otherwise>
4049
4097
  </xsl:choose>
4050
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="mathml:math">
4098
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="mathml:math">
4051
4099
  <fo:inline font-family="STIX2Math">
4052
4100
  <fo:instream-foreign-object fox:alt-text="Math">
4053
4101
  <xsl:copy-of select="."/>
4054
4102
  </fo:instream-foreign-object>
4055
4103
  </fo:inline>
4056
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='localityStack']">
4104
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='localityStack']">
4057
4105
  <xsl:for-each select="*[local-name()='locality']">
4058
4106
  <xsl:if test="position() =1"><xsl:text>, </xsl:text></xsl:if>
4059
4107
  <xsl:apply-templates select="."/>
4060
4108
  <xsl:if test="position() != last()"><xsl:text>; </xsl:text></xsl:if>
4061
4109
  </xsl:for-each>
4062
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='link']" name="link">
4110
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='link']" name="link">
4063
4111
  <xsl:variable name="target">
4064
4112
  <xsl:choose>
4065
4113
  <xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
@@ -4089,4 +4137,122 @@ JP5/AQYA3Lt5kGz07MoAAAAASUVORK5CYII=
4089
4137
  </xsl:otherwise>
4090
4138
  </xsl:choose>
4091
4139
  </fo:inline>
4140
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='sourcecode']" name="sourcecode">
4141
+ <fo:block xsl:use-attribute-sets="sourcecode-style">
4142
+ <!-- <xsl:choose>
4143
+ <xsl:when test="@lang = 'en'"></xsl:when>
4144
+ <xsl:otherwise> -->
4145
+ <xsl:attribute name="white-space">pre</xsl:attribute>
4146
+ <xsl:attribute name="wrap-option">wrap</xsl:attribute>
4147
+ <!-- </xsl:otherwise>
4148
+ </xsl:choose> -->
4149
+ <xsl:apply-templates/>
4150
+ </fo:block>
4151
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='bookmark']">
4152
+ <fo:inline id="{@id}"/>
4153
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='appendix']">
4154
+ <fo:block id="{@id}" xsl:use-attribute-sets="appendix-style">
4155
+ <fo:inline padding-right="5mm"><xsl:value-of select="$title-appendix"/> <xsl:number/></fo:inline>
4156
+ <xsl:apply-templates select="*[local-name()='title']" mode="process"/>
4157
+ </fo:block>
4158
+ <xsl:apply-templates/>
4159
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='appendix']/*[local-name()='title']"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='appendix']/*[local-name()='title']" mode="process">
4160
+ <fo:inline><xsl:apply-templates/></fo:inline>
4161
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='appendix']//*[local-name()='example']">
4162
+ <fo:block xsl:use-attribute-sets="appendix-example-style">
4163
+ <xsl:variable name="claims_id" select="ancestor::*[local-name()='clause'][1]/@id"/>
4164
+ <xsl:value-of select="$title-example"/>
4165
+ <xsl:if test="count(ancestor::*[local-name()='clause'][1]//*[local-name()='example']) &gt; 1">
4166
+ <xsl:number count="*[local-name()='example'][ancestor::*[local-name()='clause'][@id = $claims_id]]" level="any"/><xsl:text> </xsl:text>
4167
+ </xsl:if>
4168
+ <xsl:if test="*[local-name()='name']">
4169
+ <xsl:text>— </xsl:text><xsl:apply-templates select="*[local-name()='name']" mode="process"/>
4170
+ </xsl:if>
4171
+ </fo:block>
4172
+ <xsl:apply-templates/>
4173
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='appendix']//*[local-name()='example']/*[local-name()='name']"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='appendix']//*[local-name()='example']/*[local-name()='name']" mode="process">
4174
+ <fo:inline><xsl:apply-templates/></fo:inline>
4175
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name() = 'callout']">
4176
+ <fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">&lt;<xsl:apply-templates/>&gt;</fo:basic-link>
4177
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name() = 'annotation']">
4178
+ <xsl:variable name="annotation-id" select="@id"/>
4179
+ <xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/>
4180
+ <fo:block id="{$annotation-id}" white-space="nowrap">
4181
+ <fo:inline>
4182
+ <xsl:apply-templates>
4183
+ <xsl:with-param name="callout" select="concat('&lt;', $callout, '&gt; ')"/>
4184
+ </xsl:apply-templates>
4185
+ </fo:inline>
4186
+ </fo:block>
4187
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name() = 'annotation']/*[local-name() = 'p']">
4188
+ <xsl:param name="callout"/>
4189
+ <fo:inline id="{@id}">
4190
+ <!-- for first p in annotation, put <x> -->
4191
+ <xsl:if test="not(preceding-sibling::*[local-name() = 'p'])"><xsl:value-of select="$callout"/></xsl:if>
4192
+ <xsl:apply-templates/>
4193
+ </fo:inline>
4194
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="convertDate">
4195
+ <xsl:param name="date"/>
4196
+ <xsl:param name="format" select="'short'"/>
4197
+ <xsl:variable name="year" select="substring($date, 1, 4)"/>
4198
+ <xsl:variable name="month" select="substring($date, 6, 2)"/>
4199
+ <xsl:variable name="day" select="substring($date, 9, 2)"/>
4200
+ <xsl:variable name="monthStr">
4201
+ <xsl:choose>
4202
+ <xsl:when test="$month = '01'">January</xsl:when>
4203
+ <xsl:when test="$month = '02'">February</xsl:when>
4204
+ <xsl:when test="$month = '03'">March</xsl:when>
4205
+ <xsl:when test="$month = '04'">April</xsl:when>
4206
+ <xsl:when test="$month = '05'">May</xsl:when>
4207
+ <xsl:when test="$month = '06'">June</xsl:when>
4208
+ <xsl:when test="$month = '07'">July</xsl:when>
4209
+ <xsl:when test="$month = '08'">August</xsl:when>
4210
+ <xsl:when test="$month = '09'">September</xsl:when>
4211
+ <xsl:when test="$month = '10'">October</xsl:when>
4212
+ <xsl:when test="$month = '11'">November</xsl:when>
4213
+ <xsl:when test="$month = '12'">December</xsl:when>
4214
+ </xsl:choose>
4215
+ </xsl:variable>
4216
+ <xsl:variable name="result">
4217
+ <xsl:choose>
4218
+ <xsl:when test="$format = 'short' or $day = ''">
4219
+ <xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
4220
+ </xsl:when>
4221
+ <xsl:otherwise>
4222
+ <xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
4223
+ </xsl:otherwise>
4224
+ </xsl:choose>
4225
+ </xsl:variable>
4226
+ <xsl:value-of select="$result"/>
4227
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="insertKeywords">
4228
+ <xsl:param name="sorting" select="'true'"/>
4229
+ <xsl:param name="charAtEnd" select="'.'"/>
4230
+ <xsl:param name="charDelim" select="', '"/>
4231
+ <xsl:choose>
4232
+ <xsl:when test="$sorting = 'true' or $sorting = 'yes'">
4233
+ <xsl:for-each select="/*/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
4234
+ <xsl:sort data-type="text" order="ascending"/>
4235
+ <xsl:call-template name="insertKeyword">
4236
+ <xsl:with-param name="charAtEnd" select="$charAtEnd"/>
4237
+ <xsl:with-param name="charDelim" select="$charDelim"/>
4238
+ </xsl:call-template>
4239
+ </xsl:for-each>
4240
+ </xsl:when>
4241
+ <xsl:otherwise>
4242
+ <xsl:for-each select="/*/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
4243
+ <xsl:call-template name="insertKeyword">
4244
+ <xsl:with-param name="charAtEnd" select="$charAtEnd"/>
4245
+ <xsl:with-param name="charDelim" select="$charDelim"/>
4246
+ </xsl:call-template>
4247
+ </xsl:for-each>
4248
+ </xsl:otherwise>
4249
+ </xsl:choose>
4250
+ </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="insertKeyword">
4251
+ <xsl:param name="charAtEnd"/>
4252
+ <xsl:param name="charDelim"/>
4253
+ <xsl:apply-templates/>
4254
+ <xsl:choose>
4255
+ <xsl:when test="position() != last()"><xsl:value-of select="$charDelim"/></xsl:when>
4256
+ <xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
4257
+ </xsl:choose>
4092
4258
  </xsl:template></xsl:stylesheet>
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Metanorma
4
4
  module Csa
5
- VERSION = '1.4.11'
5
+ VERSION = '1.4.12'
6
6
  end
7
7
  end
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
36
36
  spec.add_dependency "thread_safe"
37
37
  spec.add_dependency "uuidtools"
38
38
 
39
- spec.add_dependency "metanorma-standoc", "~> 1.3.0"
39
+ spec.add_dependency "metanorma-standoc", "~> 1.4.0"
40
40
  spec.add_dependency "isodoc", "~> 1.0.0"
41
41
 
42
42
  spec.add_development_dependency "byebug", "~> 9.1"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-csa
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.11
4
+ version: 1.4.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-05-26 00:00:00.000000000 Z
11
+ date: 2020-06-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities
@@ -100,14 +100,14 @@ dependencies:
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 1.3.0
103
+ version: 1.4.0
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 1.3.0
110
+ version: 1.4.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: isodoc
113
113
  requirement: !ruby/object:Gem::Requirement