metanorma-ribose 1.6.8 → 1.6.9

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.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/ribose/basicdoc.rng +32 -0
  3. data/lib/asciidoctor/ribose/isodoc.rng +15 -0
  4. data/lib/isodoc/ribose/rsd.standard.xsl +65 -28
  5. data/lib/metanorma/ribose/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5b8397d03f03da8ff6d015bdd4385f6b1670362bde92ec5a98e5d1b5b34a0f6c
4
- data.tar.gz: d51347bf7b7a494e3f2f0d2f328e5ecc93e7ec34e49d2503ebd0b9219237bfc9
3
+ metadata.gz: b2c4a5ba7d755cbb8fe23c7b5014abf4404da23e3ac37aa7ce477acb8702b8bf
4
+ data.tar.gz: b41a2778deecefb259045c118b0fd33ac53b00439e35213a66ed586444ecedce
5
5
  SHA512:
6
- metadata.gz: efa57a6d0d6abc5107ca8408045259e68c18035e3c01b6b9b4b226b5cbef96fb8f0fba78fcb4da7b367815c3896343b2b7899c319d4dcf565da8c774c873724f
7
- data.tar.gz: 4dbbbb02ba634a2041e20da6cc81976f101b1ba2919708359a791d5e1f7b51413e103cb0511e8dccab2f595fbe3c8043d3945185c97b67d150048004302735b3
6
+ metadata.gz: 4f8c5c669329c95b6b8fa3ad042d0573491da6f31a2536faea1b0c02fa7785e3331be96b25c23a8fe8a18fb53ca05f49ed151302a56304c17dd39b36d3ae3ade
7
+ data.tar.gz: a857c88860eafcd4ece6dabc0a8b00f2953e6186175e91ecb460a2ca78f91e72c2109cb643f2e0e2e5efcf9fc9b455e6fd2aebe5eec99b6dbecb90fbfcf0d858
data/lib/asciidoctor/ribose/basicdoc.rng CHANGED
@@ -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">
data/lib/asciidoctor/ribose/isodoc.rng CHANGED
@@ -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>
data/lib/isodoc/ribose/rsd.standard.xsl CHANGED
@@ -674,13 +674,13 @@
674
674
  <xsl:otherwise> <!-- for ordered lists -->
675
675
  <xsl:choose>
676
676
  <xsl:when test="../@type = 'arabic'">
677
- <xsl:number format="a)"/>
677
+ <xsl:number format="a)" lang="en"/>
678
678
  </xsl:when>
679
679
  <xsl:when test="../@type = 'alphabet'">
680
680
  <xsl:number format="1)"/>
681
681
  </xsl:when>
682
682
  <xsl:when test="../@type = 'alphabet_upper'">
683
- <xsl:number format="A)"/>
683
+ <xsl:number format="A)" lang="en"/>
684
684
  </xsl:when>
685
685
 
686
686
  <xsl:when test="../@type = 'roman'">
@@ -1483,10 +1483,12 @@
1483
1483
 
1484
1484
 
1485
1485
  <xsl:variable name="colwidths">
1486
- <xsl:call-template name="calculate-column-widths">
1487
- <xsl:with-param name="cols-count" select="$cols-count"/>
1488
- <xsl:with-param name="table" select="$simple-table"/>
1489
- </xsl:call-template>
1486
+ <xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
1487
+ <xsl:call-template name="calculate-column-widths">
1488
+ <xsl:with-param name="cols-count" select="$cols-count"/>
1489
+ <xsl:with-param name="table" select="$simple-table"/>
1490
+ </xsl:call-template>
1491
+ </xsl:if>
1490
1492
  </xsl:variable>
1491
1493
  <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
1492
1494
 
@@ -1554,16 +1556,25 @@
1554
1556
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
1555
1557
  </xsl:if>
1556
1558
 
1557
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
1558
- <xsl:choose>
1559
- <xsl:when test=". = 1 or . = 0">
1560
- <fo:table-column column-width="proportional-column-width(2)"/>
1561
- </xsl:when>
1562
- <xsl:otherwise>
1563
- <fo:table-column column-width="proportional-column-width({.})"/>
1564
- </xsl:otherwise>
1565
- </xsl:choose>
1566
- </xsl:for-each>
1559
+ <xsl:choose>
1560
+ <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
1561
+ <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
1562
+ <fo:table-column column-width="{@width}"/>
1563
+ </xsl:for-each>
1564
+ </xsl:when>
1565
+ <xsl:otherwise>
1566
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
1567
+ <xsl:choose>
1568
+ <xsl:when test=". = 1 or . = 0">
1569
+ <fo:table-column column-width="proportional-column-width(2)"/>
1570
+ </xsl:when>
1571
+ <xsl:otherwise>
1572
+ <fo:table-column column-width="proportional-column-width({.})"/>
1573
+ </xsl:otherwise>
1574
+ </xsl:choose>
1575
+ </xsl:for-each>
1576
+ </xsl:otherwise>
1577
+ </xsl:choose>
1567
1578
 
1568
1579
  <xsl:choose>
1569
1580
  <xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
@@ -1576,10 +1587,12 @@
1576
1587
 
1577
1588
  </fo:table>
1578
1589
 
1590
+ <xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
1579
1591
  <xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
1580
1592
  <xsl:call-template name="insertTableFooterInSeparateTable">
1581
1593
  <xsl:with-param name="table_attributes" select="$table_attributes"/>
1582
1594
  <xsl:with-param name="colwidths" select="$colwidths"/>
1595
+ <xsl:with-param name="colgroup" select="$colgroup"/>
1583
1596
  </xsl:call-template>
1584
1597
  </xsl:for-each>
1585
1598
 
@@ -1833,12 +1846,22 @@
1833
1846
  </xsl:template><xsl:template name="insertTableFooterInSeparateTable">
1834
1847
  <xsl:param name="table_attributes"/>
1835
1848
  <xsl:param name="colwidths"/>
1849
+ <xsl:param name="colgroup"/>
1836
1850
 
1837
1851
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
1838
1852
 
1839
1853
  <xsl:if test="$isNoteOrFnExist = 'true'">
1840
1854
 
1841
- <xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
1855
+ <xsl:variable name="cols-count">
1856
+ <xsl:choose>
1857
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
1858
+ <xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
1859
+ </xsl:when>
1860
+ <xsl:otherwise>
1861
+ <xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
1862
+ </xsl:otherwise>
1863
+ </xsl:choose>
1864
+ </xsl:variable>
1842
1865
 
1843
1866
  <fo:table keep-with-previous="always">
1844
1867
  <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
@@ -1856,16 +1879,25 @@
1856
1879
  </xsl:choose>
1857
1880
  </xsl:for-each>
1858
1881
 
1859
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
1860
- <xsl:choose>
1861
- <xsl:when test=". = 1 or . = 0">
1862
- <fo:table-column column-width="proportional-column-width(2)"/>
1863
- </xsl:when>
1864
- <xsl:otherwise>
1865
- <fo:table-column column-width="proportional-column-width({.})"/>
1866
- </xsl:otherwise>
1867
- </xsl:choose>
1868
- </xsl:for-each>
1882
+ <xsl:choose>
1883
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
1884
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
1885
+ <fo:table-column column-width="{@width}"/>
1886
+ </xsl:for-each>
1887
+ </xsl:when>
1888
+ <xsl:otherwise>
1889
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
1890
+ <xsl:choose>
1891
+ <xsl:when test=". = 1 or . = 0">
1892
+ <fo:table-column column-width="proportional-column-width(2)"/>
1893
+ </xsl:when>
1894
+ <xsl:otherwise>
1895
+ <fo:table-column column-width="proportional-column-width({.})"/>
1896
+ </xsl:otherwise>
1897
+ </xsl:choose>
1898
+ </xsl:for-each>
1899
+ </xsl:otherwise>
1900
+ </xsl:choose>
1869
1901
 
1870
1902
  <fo:table-body>
1871
1903
  <fo:table-row>
@@ -4049,7 +4081,8 @@
4049
4081
  <fo:table-column column-width="107mm"/>
4050
4082
  <fo:table-column column-width="15mm"/>
4051
4083
  <fo:table-body>
4052
- <fo:table-row font-family="Arial" text-align="center" font-weight="bold" background-color="black" color="white">
4084
+ <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
4085
+
4053
4086
  <fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
4054
4087
  <fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
4055
4088
  <fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
@@ -4067,6 +4100,10 @@
4067
4100
  <fo:block><xsl:apply-templates/></fo:block>
4068
4101
  </fo:table-cell>
4069
4102
  </xsl:template><xsl:template name="processBibitem">
4103
+
4104
+
4105
+ <!-- end BIPM bibitem processing-->
4106
+
4070
4107
 
4071
4108
 
4072
4109
 
data/lib/metanorma/ribose/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ribose
3
- VERSION = "1.6.8"
3
+ VERSION = "1.6.9"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ribose
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.8
4
+ version: 1.6.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-30 00:00:00.000000000 Z
11
+ date: 2020-12-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic