metanorma-cc 1.6.1 → 1.6.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/cc/basicdoc.rng +32 -0
- data/lib/asciidoctor/cc/isodoc.rng +15 -0
- data/lib/isodoc/cc/csd.standard.xsl +64 -27
- data/lib/metanorma/cc/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: '01909c88a6295435f534845ce31ebf858ac2d4b50481d55d83d2bc7bb2912eb8'
|
4
|
+
data.tar.gz: ccd7bd40e4629e9de5a1a15d14bc86d553244e1a9b1f365bc4e3b1ae5eca91f9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ac51a2123bafb41d8d64f5cc8cc3d35963c89daafde6b7661d8d41bbf730c3a7a571ac03950eb18d3dae019e8ddf3cee967397b0d6499852efcca7381dcec954
|
7
|
+
data.tar.gz: 838cfefe10d28a04428101e5d50b107888ee331fcf1b578d362d74a8a0c29c375b978efb12d1b2098fe6fc9da3ab167f0cc524d2e77a305bc372f2f77aea0477
|
@@ -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>
|
@@ -596,7 +596,7 @@
|
|
596
596
|
<xsl:otherwise> <!-- for ordered lists -->
|
597
597
|
<xsl:choose>
|
598
598
|
<xsl:when test="../@type = 'arabic'">
|
599
|
-
<xsl:number format="a)"/>
|
599
|
+
<xsl:number format="a)" lang="en"/>
|
600
600
|
</xsl:when>
|
601
601
|
<xsl:when test="../@type = 'alphabet'">
|
602
602
|
<xsl:number format="1)"/>
|
@@ -1374,10 +1374,12 @@
|
|
1374
1374
|
|
1375
1375
|
|
1376
1376
|
<xsl:variable name="colwidths">
|
1377
|
-
<xsl:
|
1378
|
-
<xsl:
|
1379
|
-
|
1380
|
-
|
1377
|
+
<xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
|
1378
|
+
<xsl:call-template name="calculate-column-widths">
|
1379
|
+
<xsl:with-param name="cols-count" select="$cols-count"/>
|
1380
|
+
<xsl:with-param name="table" select="$simple-table"/>
|
1381
|
+
</xsl:call-template>
|
1382
|
+
</xsl:if>
|
1381
1383
|
</xsl:variable>
|
1382
1384
|
<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
|
1383
1385
|
|
@@ -1447,16 +1449,25 @@
|
|
1447
1449
|
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
|
1448
1450
|
</xsl:if>
|
1449
1451
|
|
1450
|
-
<xsl:
|
1451
|
-
<xsl:
|
1452
|
-
<xsl:
|
1453
|
-
<fo:table-column column-width="
|
1454
|
-
</xsl:
|
1455
|
-
|
1456
|
-
|
1457
|
-
|
1458
|
-
|
1459
|
-
|
1452
|
+
<xsl:choose>
|
1453
|
+
<xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
|
1454
|
+
<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
|
1455
|
+
<fo:table-column column-width="{@width}"/>
|
1456
|
+
</xsl:for-each>
|
1457
|
+
</xsl:when>
|
1458
|
+
<xsl:otherwise>
|
1459
|
+
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
1460
|
+
<xsl:choose>
|
1461
|
+
<xsl:when test=". = 1 or . = 0">
|
1462
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
1463
|
+
</xsl:when>
|
1464
|
+
<xsl:otherwise>
|
1465
|
+
<fo:table-column column-width="proportional-column-width({.})"/>
|
1466
|
+
</xsl:otherwise>
|
1467
|
+
</xsl:choose>
|
1468
|
+
</xsl:for-each>
|
1469
|
+
</xsl:otherwise>
|
1470
|
+
</xsl:choose>
|
1460
1471
|
|
1461
1472
|
<xsl:choose>
|
1462
1473
|
<xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
|
@@ -1469,10 +1480,12 @@
|
|
1469
1480
|
|
1470
1481
|
</fo:table>
|
1471
1482
|
|
1483
|
+
<xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
|
1472
1484
|
<xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
|
1473
1485
|
<xsl:call-template name="insertTableFooterInSeparateTable">
|
1474
1486
|
<xsl:with-param name="table_attributes" select="$table_attributes"/>
|
1475
1487
|
<xsl:with-param name="colwidths" select="$colwidths"/>
|
1488
|
+
<xsl:with-param name="colgroup" select="$colgroup"/>
|
1476
1489
|
</xsl:call-template>
|
1477
1490
|
</xsl:for-each>
|
1478
1491
|
|
@@ -1726,12 +1739,22 @@
|
|
1726
1739
|
</xsl:template><xsl:template name="insertTableFooterInSeparateTable">
|
1727
1740
|
<xsl:param name="table_attributes"/>
|
1728
1741
|
<xsl:param name="colwidths"/>
|
1742
|
+
<xsl:param name="colgroup"/>
|
1729
1743
|
|
1730
1744
|
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
|
1731
1745
|
|
1732
1746
|
<xsl:if test="$isNoteOrFnExist = 'true'">
|
1733
1747
|
|
1734
|
-
<xsl:variable name="cols-count"
|
1748
|
+
<xsl:variable name="cols-count">
|
1749
|
+
<xsl:choose>
|
1750
|
+
<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
|
1751
|
+
<xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
|
1752
|
+
</xsl:when>
|
1753
|
+
<xsl:otherwise>
|
1754
|
+
<xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
|
1755
|
+
</xsl:otherwise>
|
1756
|
+
</xsl:choose>
|
1757
|
+
</xsl:variable>
|
1735
1758
|
|
1736
1759
|
<fo:table keep-with-previous="always">
|
1737
1760
|
<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
|
@@ -1749,16 +1772,25 @@
|
|
1749
1772
|
</xsl:choose>
|
1750
1773
|
</xsl:for-each>
|
1751
1774
|
|
1752
|
-
<xsl:
|
1753
|
-
<xsl:
|
1754
|
-
<xsl:
|
1755
|
-
<fo:table-column column-width="
|
1756
|
-
</xsl:
|
1757
|
-
|
1758
|
-
|
1759
|
-
|
1760
|
-
|
1761
|
-
|
1775
|
+
<xsl:choose>
|
1776
|
+
<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
|
1777
|
+
<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
|
1778
|
+
<fo:table-column column-width="{@width}"/>
|
1779
|
+
</xsl:for-each>
|
1780
|
+
</xsl:when>
|
1781
|
+
<xsl:otherwise>
|
1782
|
+
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
1783
|
+
<xsl:choose>
|
1784
|
+
<xsl:when test=". = 1 or . = 0">
|
1785
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
1786
|
+
</xsl:when>
|
1787
|
+
<xsl:otherwise>
|
1788
|
+
<fo:table-column column-width="proportional-column-width({.})"/>
|
1789
|
+
</xsl:otherwise>
|
1790
|
+
</xsl:choose>
|
1791
|
+
</xsl:for-each>
|
1792
|
+
</xsl:otherwise>
|
1793
|
+
</xsl:choose>
|
1762
1794
|
|
1763
1795
|
<fo:table-body>
|
1764
1796
|
<fo:table-row>
|
@@ -3945,7 +3977,8 @@
|
|
3945
3977
|
<fo:table-column column-width="107mm"/>
|
3946
3978
|
<fo:table-column column-width="15mm"/>
|
3947
3979
|
<fo:table-body>
|
3948
|
-
<fo:table-row
|
3980
|
+
<fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
|
3981
|
+
|
3949
3982
|
<fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
|
3950
3983
|
<fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
|
3951
3984
|
<fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
|
@@ -3963,6 +3996,10 @@
|
|
3963
3996
|
<fo:block><xsl:apply-templates/></fo:block>
|
3964
3997
|
</fo:table-cell>
|
3965
3998
|
</xsl:template><xsl:template name="processBibitem">
|
3999
|
+
|
4000
|
+
|
4001
|
+
<!-- end BIPM bibitem processing-->
|
4002
|
+
|
3966
4003
|
|
3967
4004
|
|
3968
4005
|
|
data/lib/metanorma/cc/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-cc
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.6.
|
4
|
+
version: 1.6.2
|
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: metanorma-generic
|