metanorma-un 0.5.8 → 0.5.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/un/basicdoc.rng +32 -0
- data/lib/asciidoctor/un/isodoc.rng +15 -0
- data/lib/isodoc/un/un.plenary-attachment.xsl +64 -27
- data/lib/isodoc/un/un.plenary.xsl +64 -27
- data/lib/isodoc/un/un.recommendation.xsl +65 -28
- data/lib/metanorma/un/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d2ace1a52aae154584b20d0cfd1ad6c406e8e03fe94d05f0856c1bee51a3f4e9
|
|
4
|
+
data.tar.gz: 343c07319b3614aae5dc670b758a673e0e9e9e23dc85479456f728cdb6b53fdc
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 385e51a5b3b7370c9e87dad6da2c2af529933dced215d9f53ddc56729c35f08fbf4ad91836efad4cf078cb58d800c1018e12bba81040f2e6ff1ba320d64415b4
|
|
7
|
+
data.tar.gz: 9a43c038e94d2974ab446513729b774a169b49220414e7d5db74fc18dc63902b57c08bcbd673d30c1b4cde878399a66233a04b5c90b7a2ae03c0157a6bf091ea
|
|
@@ -596,6 +596,7 @@
|
|
|
596
596
|
<ref name="bookmark"/>
|
|
597
597
|
<ref name="image"/>
|
|
598
598
|
<ref name="index"/>
|
|
599
|
+
<ref name="index-xref"/>
|
|
599
600
|
</choice>
|
|
600
601
|
</define>
|
|
601
602
|
<define name="PureTextElement">
|
|
@@ -737,6 +738,37 @@
|
|
|
737
738
|
</optional>
|
|
738
739
|
</element>
|
|
739
740
|
</define>
|
|
741
|
+
<define name="index-xref">
|
|
742
|
+
<element name="index-xref">
|
|
743
|
+
<attribute name="also">
|
|
744
|
+
<data type="boolean"/>
|
|
745
|
+
</attribute>
|
|
746
|
+
<element name="primary">
|
|
747
|
+
<oneOrMore>
|
|
748
|
+
<ref name="PureTextElement"/>
|
|
749
|
+
</oneOrMore>
|
|
750
|
+
</element>
|
|
751
|
+
<optional>
|
|
752
|
+
<element name="secondary">
|
|
753
|
+
<oneOrMore>
|
|
754
|
+
<ref name="PureTextElement"/>
|
|
755
|
+
</oneOrMore>
|
|
756
|
+
</element>
|
|
757
|
+
</optional>
|
|
758
|
+
<optional>
|
|
759
|
+
<element name="tertiary">
|
|
760
|
+
<oneOrMore>
|
|
761
|
+
<ref name="PureTextElement"/>
|
|
762
|
+
</oneOrMore>
|
|
763
|
+
</element>
|
|
764
|
+
</optional>
|
|
765
|
+
<element name="target">
|
|
766
|
+
<oneOrMore>
|
|
767
|
+
<ref name="PureTextElement"/>
|
|
768
|
+
</oneOrMore>
|
|
769
|
+
</element>
|
|
770
|
+
</element>
|
|
771
|
+
</define>
|
|
740
772
|
<!-- bare ID element, used for referencing arbitrary spans of text -->
|
|
741
773
|
<define name="bookmark">
|
|
742
774
|
<element name="bookmark">
|
|
@@ -246,6 +246,9 @@
|
|
|
246
246
|
<data type="boolean"/>
|
|
247
247
|
</attribute>
|
|
248
248
|
</optional>
|
|
249
|
+
<optional>
|
|
250
|
+
<ref name="colgroup"/>
|
|
251
|
+
</optional>
|
|
249
252
|
<optional>
|
|
250
253
|
<ref name="tname"/>
|
|
251
254
|
</optional>
|
|
@@ -764,6 +767,18 @@
|
|
|
764
767
|
</define>
|
|
765
768
|
</include>
|
|
766
769
|
<!-- end overrides -->
|
|
770
|
+
<define name="colgroup">
|
|
771
|
+
<element name="colgroup">
|
|
772
|
+
<oneOrMore>
|
|
773
|
+
<ref name="col"/>
|
|
774
|
+
</oneOrMore>
|
|
775
|
+
</element>
|
|
776
|
+
</define>
|
|
777
|
+
<define name="col">
|
|
778
|
+
<element name="col">
|
|
779
|
+
<attribute name="width"/>
|
|
780
|
+
</element>
|
|
781
|
+
</define>
|
|
767
782
|
<define name="TextElement" combine="choice">
|
|
768
783
|
<ref name="concept"/>
|
|
769
784
|
</define>
|
|
@@ -616,7 +616,7 @@
|
|
|
616
616
|
<xsl:when test="ancestor::*[un:annex]">
|
|
617
617
|
<xsl:choose>
|
|
618
618
|
<xsl:when test="$level = 1">
|
|
619
|
-
<xsl:number format="a)"/>
|
|
619
|
+
<xsl:number format="a)" lang="en"/>
|
|
620
620
|
</xsl:when>
|
|
621
621
|
<xsl:when test="$level = 2">
|
|
622
622
|
<xsl:number format="i)"/>
|
|
@@ -1742,10 +1742,12 @@
|
|
|
1742
1742
|
|
|
1743
1743
|
|
|
1744
1744
|
<xsl:variable name="colwidths">
|
|
1745
|
-
<xsl:
|
|
1746
|
-
<xsl:
|
|
1747
|
-
|
|
1748
|
-
|
|
1745
|
+
<xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
|
|
1746
|
+
<xsl:call-template name="calculate-column-widths">
|
|
1747
|
+
<xsl:with-param name="cols-count" select="$cols-count"/>
|
|
1748
|
+
<xsl:with-param name="table" select="$simple-table"/>
|
|
1749
|
+
</xsl:call-template>
|
|
1750
|
+
</xsl:if>
|
|
1749
1751
|
</xsl:variable>
|
|
1750
1752
|
<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
|
|
1751
1753
|
|
|
@@ -1818,16 +1820,25 @@
|
|
|
1818
1820
|
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
|
|
1819
1821
|
</xsl:if>
|
|
1820
1822
|
|
|
1821
|
-
<xsl:
|
|
1822
|
-
<xsl:
|
|
1823
|
-
<xsl:
|
|
1824
|
-
<fo:table-column column-width="
|
|
1825
|
-
</xsl:
|
|
1826
|
-
|
|
1827
|
-
|
|
1828
|
-
|
|
1829
|
-
|
|
1830
|
-
|
|
1823
|
+
<xsl:choose>
|
|
1824
|
+
<xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
|
|
1825
|
+
<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
|
|
1826
|
+
<fo:table-column column-width="{@width}"/>
|
|
1827
|
+
</xsl:for-each>
|
|
1828
|
+
</xsl:when>
|
|
1829
|
+
<xsl:otherwise>
|
|
1830
|
+
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
|
1831
|
+
<xsl:choose>
|
|
1832
|
+
<xsl:when test=". = 1 or . = 0">
|
|
1833
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
|
1834
|
+
</xsl:when>
|
|
1835
|
+
<xsl:otherwise>
|
|
1836
|
+
<fo:table-column column-width="proportional-column-width({.})"/>
|
|
1837
|
+
</xsl:otherwise>
|
|
1838
|
+
</xsl:choose>
|
|
1839
|
+
</xsl:for-each>
|
|
1840
|
+
</xsl:otherwise>
|
|
1841
|
+
</xsl:choose>
|
|
1831
1842
|
|
|
1832
1843
|
<xsl:choose>
|
|
1833
1844
|
<xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
|
|
@@ -1840,10 +1851,12 @@
|
|
|
1840
1851
|
|
|
1841
1852
|
</fo:table>
|
|
1842
1853
|
|
|
1854
|
+
<xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
|
|
1843
1855
|
<xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
|
|
1844
1856
|
<xsl:call-template name="insertTableFooterInSeparateTable">
|
|
1845
1857
|
<xsl:with-param name="table_attributes" select="$table_attributes"/>
|
|
1846
1858
|
<xsl:with-param name="colwidths" select="$colwidths"/>
|
|
1859
|
+
<xsl:with-param name="colgroup" select="$colgroup"/>
|
|
1847
1860
|
</xsl:call-template>
|
|
1848
1861
|
</xsl:for-each>
|
|
1849
1862
|
|
|
@@ -2097,12 +2110,22 @@
|
|
|
2097
2110
|
</xsl:template><xsl:template name="insertTableFooterInSeparateTable">
|
|
2098
2111
|
<xsl:param name="table_attributes"/>
|
|
2099
2112
|
<xsl:param name="colwidths"/>
|
|
2113
|
+
<xsl:param name="colgroup"/>
|
|
2100
2114
|
|
|
2101
2115
|
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
|
|
2102
2116
|
|
|
2103
2117
|
<xsl:if test="$isNoteOrFnExist = 'true'">
|
|
2104
2118
|
|
|
2105
|
-
<xsl:variable name="cols-count"
|
|
2119
|
+
<xsl:variable name="cols-count">
|
|
2120
|
+
<xsl:choose>
|
|
2121
|
+
<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
|
|
2122
|
+
<xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
|
|
2123
|
+
</xsl:when>
|
|
2124
|
+
<xsl:otherwise>
|
|
2125
|
+
<xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
|
|
2126
|
+
</xsl:otherwise>
|
|
2127
|
+
</xsl:choose>
|
|
2128
|
+
</xsl:variable>
|
|
2106
2129
|
|
|
2107
2130
|
<fo:table keep-with-previous="always">
|
|
2108
2131
|
<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
|
|
@@ -2120,16 +2143,25 @@
|
|
|
2120
2143
|
</xsl:choose>
|
|
2121
2144
|
</xsl:for-each>
|
|
2122
2145
|
|
|
2123
|
-
<xsl:
|
|
2124
|
-
<xsl:
|
|
2125
|
-
<xsl:
|
|
2126
|
-
<fo:table-column column-width="
|
|
2127
|
-
</xsl:
|
|
2128
|
-
|
|
2129
|
-
|
|
2130
|
-
|
|
2131
|
-
|
|
2132
|
-
|
|
2146
|
+
<xsl:choose>
|
|
2147
|
+
<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
|
|
2148
|
+
<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
|
|
2149
|
+
<fo:table-column column-width="{@width}"/>
|
|
2150
|
+
</xsl:for-each>
|
|
2151
|
+
</xsl:when>
|
|
2152
|
+
<xsl:otherwise>
|
|
2153
|
+
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
|
2154
|
+
<xsl:choose>
|
|
2155
|
+
<xsl:when test=". = 1 or . = 0">
|
|
2156
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
|
2157
|
+
</xsl:when>
|
|
2158
|
+
<xsl:otherwise>
|
|
2159
|
+
<fo:table-column column-width="proportional-column-width({.})"/>
|
|
2160
|
+
</xsl:otherwise>
|
|
2161
|
+
</xsl:choose>
|
|
2162
|
+
</xsl:for-each>
|
|
2163
|
+
</xsl:otherwise>
|
|
2164
|
+
</xsl:choose>
|
|
2133
2165
|
|
|
2134
2166
|
<fo:table-body>
|
|
2135
2167
|
<fo:table-row>
|
|
@@ -4354,7 +4386,8 @@
|
|
|
4354
4386
|
<fo:table-column column-width="107mm"/>
|
|
4355
4387
|
<fo:table-column column-width="15mm"/>
|
|
4356
4388
|
<fo:table-body>
|
|
4357
|
-
<fo:table-row
|
|
4389
|
+
<fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
|
|
4390
|
+
|
|
4358
4391
|
<fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
|
|
4359
4392
|
<fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
|
|
4360
4393
|
<fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
|
|
@@ -4372,6 +4405,10 @@
|
|
|
4372
4405
|
<fo:block><xsl:apply-templates/></fo:block>
|
|
4373
4406
|
</fo:table-cell>
|
|
4374
4407
|
</xsl:template><xsl:template name="processBibitem">
|
|
4408
|
+
|
|
4409
|
+
|
|
4410
|
+
<!-- end BIPM bibitem processing-->
|
|
4411
|
+
|
|
4375
4412
|
|
|
4376
4413
|
|
|
4377
4414
|
|
|
@@ -616,7 +616,7 @@
|
|
|
616
616
|
<xsl:when test="ancestor::*[un:annex]">
|
|
617
617
|
<xsl:choose>
|
|
618
618
|
<xsl:when test="$level = 1">
|
|
619
|
-
<xsl:number format="a)"/>
|
|
619
|
+
<xsl:number format="a)" lang="en"/>
|
|
620
620
|
</xsl:when>
|
|
621
621
|
<xsl:when test="$level = 2">
|
|
622
622
|
<xsl:number format="i)"/>
|
|
@@ -1742,10 +1742,12 @@
|
|
|
1742
1742
|
|
|
1743
1743
|
|
|
1744
1744
|
<xsl:variable name="colwidths">
|
|
1745
|
-
<xsl:
|
|
1746
|
-
<xsl:
|
|
1747
|
-
|
|
1748
|
-
|
|
1745
|
+
<xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
|
|
1746
|
+
<xsl:call-template name="calculate-column-widths">
|
|
1747
|
+
<xsl:with-param name="cols-count" select="$cols-count"/>
|
|
1748
|
+
<xsl:with-param name="table" select="$simple-table"/>
|
|
1749
|
+
</xsl:call-template>
|
|
1750
|
+
</xsl:if>
|
|
1749
1751
|
</xsl:variable>
|
|
1750
1752
|
<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
|
|
1751
1753
|
|
|
@@ -1818,16 +1820,25 @@
|
|
|
1818
1820
|
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
|
|
1819
1821
|
</xsl:if>
|
|
1820
1822
|
|
|
1821
|
-
<xsl:
|
|
1822
|
-
<xsl:
|
|
1823
|
-
<xsl:
|
|
1824
|
-
<fo:table-column column-width="
|
|
1825
|
-
</xsl:
|
|
1826
|
-
|
|
1827
|
-
|
|
1828
|
-
|
|
1829
|
-
|
|
1830
|
-
|
|
1823
|
+
<xsl:choose>
|
|
1824
|
+
<xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
|
|
1825
|
+
<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
|
|
1826
|
+
<fo:table-column column-width="{@width}"/>
|
|
1827
|
+
</xsl:for-each>
|
|
1828
|
+
</xsl:when>
|
|
1829
|
+
<xsl:otherwise>
|
|
1830
|
+
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
|
1831
|
+
<xsl:choose>
|
|
1832
|
+
<xsl:when test=". = 1 or . = 0">
|
|
1833
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
|
1834
|
+
</xsl:when>
|
|
1835
|
+
<xsl:otherwise>
|
|
1836
|
+
<fo:table-column column-width="proportional-column-width({.})"/>
|
|
1837
|
+
</xsl:otherwise>
|
|
1838
|
+
</xsl:choose>
|
|
1839
|
+
</xsl:for-each>
|
|
1840
|
+
</xsl:otherwise>
|
|
1841
|
+
</xsl:choose>
|
|
1831
1842
|
|
|
1832
1843
|
<xsl:choose>
|
|
1833
1844
|
<xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
|
|
@@ -1840,10 +1851,12 @@
|
|
|
1840
1851
|
|
|
1841
1852
|
</fo:table>
|
|
1842
1853
|
|
|
1854
|
+
<xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
|
|
1843
1855
|
<xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
|
|
1844
1856
|
<xsl:call-template name="insertTableFooterInSeparateTable">
|
|
1845
1857
|
<xsl:with-param name="table_attributes" select="$table_attributes"/>
|
|
1846
1858
|
<xsl:with-param name="colwidths" select="$colwidths"/>
|
|
1859
|
+
<xsl:with-param name="colgroup" select="$colgroup"/>
|
|
1847
1860
|
</xsl:call-template>
|
|
1848
1861
|
</xsl:for-each>
|
|
1849
1862
|
|
|
@@ -2097,12 +2110,22 @@
|
|
|
2097
2110
|
</xsl:template><xsl:template name="insertTableFooterInSeparateTable">
|
|
2098
2111
|
<xsl:param name="table_attributes"/>
|
|
2099
2112
|
<xsl:param name="colwidths"/>
|
|
2113
|
+
<xsl:param name="colgroup"/>
|
|
2100
2114
|
|
|
2101
2115
|
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
|
|
2102
2116
|
|
|
2103
2117
|
<xsl:if test="$isNoteOrFnExist = 'true'">
|
|
2104
2118
|
|
|
2105
|
-
<xsl:variable name="cols-count"
|
|
2119
|
+
<xsl:variable name="cols-count">
|
|
2120
|
+
<xsl:choose>
|
|
2121
|
+
<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
|
|
2122
|
+
<xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
|
|
2123
|
+
</xsl:when>
|
|
2124
|
+
<xsl:otherwise>
|
|
2125
|
+
<xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
|
|
2126
|
+
</xsl:otherwise>
|
|
2127
|
+
</xsl:choose>
|
|
2128
|
+
</xsl:variable>
|
|
2106
2129
|
|
|
2107
2130
|
<fo:table keep-with-previous="always">
|
|
2108
2131
|
<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
|
|
@@ -2120,16 +2143,25 @@
|
|
|
2120
2143
|
</xsl:choose>
|
|
2121
2144
|
</xsl:for-each>
|
|
2122
2145
|
|
|
2123
|
-
<xsl:
|
|
2124
|
-
<xsl:
|
|
2125
|
-
<xsl:
|
|
2126
|
-
<fo:table-column column-width="
|
|
2127
|
-
</xsl:
|
|
2128
|
-
|
|
2129
|
-
|
|
2130
|
-
|
|
2131
|
-
|
|
2132
|
-
|
|
2146
|
+
<xsl:choose>
|
|
2147
|
+
<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
|
|
2148
|
+
<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
|
|
2149
|
+
<fo:table-column column-width="{@width}"/>
|
|
2150
|
+
</xsl:for-each>
|
|
2151
|
+
</xsl:when>
|
|
2152
|
+
<xsl:otherwise>
|
|
2153
|
+
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
|
2154
|
+
<xsl:choose>
|
|
2155
|
+
<xsl:when test=". = 1 or . = 0">
|
|
2156
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
|
2157
|
+
</xsl:when>
|
|
2158
|
+
<xsl:otherwise>
|
|
2159
|
+
<fo:table-column column-width="proportional-column-width({.})"/>
|
|
2160
|
+
</xsl:otherwise>
|
|
2161
|
+
</xsl:choose>
|
|
2162
|
+
</xsl:for-each>
|
|
2163
|
+
</xsl:otherwise>
|
|
2164
|
+
</xsl:choose>
|
|
2133
2165
|
|
|
2134
2166
|
<fo:table-body>
|
|
2135
2167
|
<fo:table-row>
|
|
@@ -4354,7 +4386,8 @@
|
|
|
4354
4386
|
<fo:table-column column-width="107mm"/>
|
|
4355
4387
|
<fo:table-column column-width="15mm"/>
|
|
4356
4388
|
<fo:table-body>
|
|
4357
|
-
<fo:table-row
|
|
4389
|
+
<fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
|
|
4390
|
+
|
|
4358
4391
|
<fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
|
|
4359
4392
|
<fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
|
|
4360
4393
|
<fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
|
|
@@ -4372,6 +4405,10 @@
|
|
|
4372
4405
|
<fo:block><xsl:apply-templates/></fo:block>
|
|
4373
4406
|
</fo:table-cell>
|
|
4374
4407
|
</xsl:template><xsl:template name="processBibitem">
|
|
4408
|
+
|
|
4409
|
+
|
|
4410
|
+
<!-- end BIPM bibitem processing-->
|
|
4411
|
+
|
|
4375
4412
|
|
|
4376
4413
|
|
|
4377
4414
|
|
|
@@ -644,7 +644,7 @@
|
|
|
644
644
|
<xsl:otherwise> <!-- for ordered lists -->
|
|
645
645
|
<xsl:choose>
|
|
646
646
|
<xsl:when test="../@type = 'arabic'">
|
|
647
|
-
<xsl:number format="a)"/>
|
|
647
|
+
<xsl:number format="a)" lang="en"/>
|
|
648
648
|
</xsl:when>
|
|
649
649
|
<xsl:when test="../@type = 'alphabet'">
|
|
650
650
|
<xsl:number format="1)"/>
|
|
@@ -652,7 +652,7 @@
|
|
|
652
652
|
<xsl:when test="ancestor::*[un:annex]">
|
|
653
653
|
<xsl:choose>
|
|
654
654
|
<xsl:when test="$level = 1">
|
|
655
|
-
<xsl:number format="a)"/>
|
|
655
|
+
<xsl:number format="a)" lang="en"/>
|
|
656
656
|
</xsl:when>
|
|
657
657
|
<xsl:when test="$level = 2">
|
|
658
658
|
<xsl:number format="i)"/>
|
|
@@ -1602,10 +1602,12 @@
|
|
|
1602
1602
|
|
|
1603
1603
|
|
|
1604
1604
|
<xsl:variable name="colwidths">
|
|
1605
|
-
<xsl:
|
|
1606
|
-
<xsl:
|
|
1607
|
-
|
|
1608
|
-
|
|
1605
|
+
<xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
|
|
1606
|
+
<xsl:call-template name="calculate-column-widths">
|
|
1607
|
+
<xsl:with-param name="cols-count" select="$cols-count"/>
|
|
1608
|
+
<xsl:with-param name="table" select="$simple-table"/>
|
|
1609
|
+
</xsl:call-template>
|
|
1610
|
+
</xsl:if>
|
|
1609
1611
|
</xsl:variable>
|
|
1610
1612
|
<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
|
|
1611
1613
|
|
|
@@ -1683,16 +1685,25 @@
|
|
|
1683
1685
|
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
|
|
1684
1686
|
</xsl:if>
|
|
1685
1687
|
|
|
1686
|
-
<xsl:
|
|
1687
|
-
<xsl:
|
|
1688
|
-
<xsl:
|
|
1689
|
-
<fo:table-column column-width="
|
|
1690
|
-
</xsl:
|
|
1691
|
-
|
|
1692
|
-
|
|
1693
|
-
|
|
1694
|
-
|
|
1695
|
-
|
|
1688
|
+
<xsl:choose>
|
|
1689
|
+
<xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
|
|
1690
|
+
<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
|
|
1691
|
+
<fo:table-column column-width="{@width}"/>
|
|
1692
|
+
</xsl:for-each>
|
|
1693
|
+
</xsl:when>
|
|
1694
|
+
<xsl:otherwise>
|
|
1695
|
+
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
|
1696
|
+
<xsl:choose>
|
|
1697
|
+
<xsl:when test=". = 1 or . = 0">
|
|
1698
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
|
1699
|
+
</xsl:when>
|
|
1700
|
+
<xsl:otherwise>
|
|
1701
|
+
<fo:table-column column-width="proportional-column-width({.})"/>
|
|
1702
|
+
</xsl:otherwise>
|
|
1703
|
+
</xsl:choose>
|
|
1704
|
+
</xsl:for-each>
|
|
1705
|
+
</xsl:otherwise>
|
|
1706
|
+
</xsl:choose>
|
|
1696
1707
|
|
|
1697
1708
|
<xsl:choose>
|
|
1698
1709
|
<xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
|
|
@@ -1705,10 +1716,12 @@
|
|
|
1705
1716
|
|
|
1706
1717
|
</fo:table>
|
|
1707
1718
|
|
|
1719
|
+
<xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
|
|
1708
1720
|
<xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
|
|
1709
1721
|
<xsl:call-template name="insertTableFooterInSeparateTable">
|
|
1710
1722
|
<xsl:with-param name="table_attributes" select="$table_attributes"/>
|
|
1711
1723
|
<xsl:with-param name="colwidths" select="$colwidths"/>
|
|
1724
|
+
<xsl:with-param name="colgroup" select="$colgroup"/>
|
|
1712
1725
|
</xsl:call-template>
|
|
1713
1726
|
</xsl:for-each>
|
|
1714
1727
|
|
|
@@ -1962,12 +1975,22 @@
|
|
|
1962
1975
|
</xsl:template><xsl:template name="insertTableFooterInSeparateTable">
|
|
1963
1976
|
<xsl:param name="table_attributes"/>
|
|
1964
1977
|
<xsl:param name="colwidths"/>
|
|
1978
|
+
<xsl:param name="colgroup"/>
|
|
1965
1979
|
|
|
1966
1980
|
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
|
|
1967
1981
|
|
|
1968
1982
|
<xsl:if test="$isNoteOrFnExist = 'true'">
|
|
1969
1983
|
|
|
1970
|
-
<xsl:variable name="cols-count"
|
|
1984
|
+
<xsl:variable name="cols-count">
|
|
1985
|
+
<xsl:choose>
|
|
1986
|
+
<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
|
|
1987
|
+
<xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
|
|
1988
|
+
</xsl:when>
|
|
1989
|
+
<xsl:otherwise>
|
|
1990
|
+
<xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
|
|
1991
|
+
</xsl:otherwise>
|
|
1992
|
+
</xsl:choose>
|
|
1993
|
+
</xsl:variable>
|
|
1971
1994
|
|
|
1972
1995
|
<fo:table keep-with-previous="always">
|
|
1973
1996
|
<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
|
|
@@ -1985,16 +2008,25 @@
|
|
|
1985
2008
|
</xsl:choose>
|
|
1986
2009
|
</xsl:for-each>
|
|
1987
2010
|
|
|
1988
|
-
<xsl:
|
|
1989
|
-
<xsl:
|
|
1990
|
-
<xsl:
|
|
1991
|
-
<fo:table-column column-width="
|
|
1992
|
-
</xsl:
|
|
1993
|
-
|
|
1994
|
-
|
|
1995
|
-
|
|
1996
|
-
|
|
1997
|
-
|
|
2011
|
+
<xsl:choose>
|
|
2012
|
+
<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
|
|
2013
|
+
<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
|
|
2014
|
+
<fo:table-column column-width="{@width}"/>
|
|
2015
|
+
</xsl:for-each>
|
|
2016
|
+
</xsl:when>
|
|
2017
|
+
<xsl:otherwise>
|
|
2018
|
+
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
|
2019
|
+
<xsl:choose>
|
|
2020
|
+
<xsl:when test=". = 1 or . = 0">
|
|
2021
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
|
2022
|
+
</xsl:when>
|
|
2023
|
+
<xsl:otherwise>
|
|
2024
|
+
<fo:table-column column-width="proportional-column-width({.})"/>
|
|
2025
|
+
</xsl:otherwise>
|
|
2026
|
+
</xsl:choose>
|
|
2027
|
+
</xsl:for-each>
|
|
2028
|
+
</xsl:otherwise>
|
|
2029
|
+
</xsl:choose>
|
|
1998
2030
|
|
|
1999
2031
|
<fo:table-body>
|
|
2000
2032
|
<fo:table-row>
|
|
@@ -4228,7 +4260,8 @@
|
|
|
4228
4260
|
<fo:table-column column-width="107mm"/>
|
|
4229
4261
|
<fo:table-column column-width="15mm"/>
|
|
4230
4262
|
<fo:table-body>
|
|
4231
|
-
<fo:table-row
|
|
4263
|
+
<fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
|
|
4264
|
+
|
|
4232
4265
|
<fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
|
|
4233
4266
|
<fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
|
|
4234
4267
|
<fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
|
|
@@ -4246,6 +4279,10 @@
|
|
|
4246
4279
|
<fo:block><xsl:apply-templates/></fo:block>
|
|
4247
4280
|
</fo:table-cell>
|
|
4248
4281
|
</xsl:template><xsl:template name="processBibitem">
|
|
4282
|
+
|
|
4283
|
+
|
|
4284
|
+
<!-- end BIPM bibitem processing-->
|
|
4285
|
+
|
|
4249
4286
|
|
|
4250
4287
|
|
|
4251
4288
|
|
data/lib/metanorma/un/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-un
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.5.
|
|
4
|
+
version: 0.5.9
|
|
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-
|
|
11
|
+
date: 2020-12-14 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: roman-numerals
|