metanorma-un 0.7.2 → 0.7.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/un/isodoc.rng +42 -17
  3. data/lib/isodoc/un/html/htmlstyle.css +4 -4
  4. data/lib/isodoc/un/html/htmlstyle.scss +5 -4
  5. data/lib/isodoc/un/html/unece.css +0 -1
  6. data/lib/isodoc/un/html/unece.scss +0 -1
  7. data/lib/isodoc/un/un.plenary-attachment.xsl +19 -7
  8. data/lib/isodoc/un/un.plenary.xsl +19 -7
  9. data/lib/isodoc/un/un.recommendation.xsl +19 -7
  10. data/lib/metanorma/un/version.rb +1 -1
  11. data/metanorma-unece.gemspec +1 -1
  12. metadata +7 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: eca42d8621931a241e16887d84b062ec064593a110d5f23a5f28f9b5282bd3cf
4
- data.tar.gz: d51f24a5825cf0ba38ab77ea41d2e38659ab245a2f74e0cdcbe6e525b2e09708
3
+ metadata.gz: d22d2a2819fa74b365c8052975abb0dfc2af24f2b1c5cdac9883800b211de3e7
4
+ data.tar.gz: 80d427b92261fd22e98e680d57f513ad13aa21e232e90db2c8ce42d77a3a661e
5
5
  SHA512:
6
- metadata.gz: 9df76ef394aa561dfd1dea3231104cbdd6d44e24ccaec50a98dc9b1c8405a48a390cac3a5057fa4b686816301253ef7dd6f440e406faf2f4902c9058fbaa3c68
7
- data.tar.gz: 4b27092ea855f381cdac3e0ef4901d2bfd90ba692941b065e2bebc099a9dab1e24560ee025dc7ca52b3f21f20169c8bf6016e17ec17d9288ff130b0acb31b66f
6
+ metadata.gz: d9f251ee7f43bc0e1b493db91b38b87127612c2f35a4667df0e51d89f662aba17b732adfd86ea5fab8510a329e6822c8c766fca3b276c9addd77cf70d9056bdc
7
+ data.tar.gz: 4525ece9666d7b3673bbb5996db9b6f68fae3dc2c61f274a23631cab587af43b4eb10584052ecfbd686466ca4293294f4341d2bab95d24afe8c935799a996742
data/lib/asciidoctor/un/isodoc.rng CHANGED
@@ -58,7 +58,7 @@
58
58
  <attribute name="alt"/>
59
59
  </optional>
60
60
  <optional>
61
- <attribute name="updatetype">
61
+ <attribute name="update-type">
62
62
  <data type="boolean"/>
63
63
  </attribute>
64
64
  </optional>
@@ -1814,9 +1814,6 @@
1814
1814
  <optional>
1815
1815
  <ref name="termsubject"/>
1816
1816
  </optional>
1817
- <optional>
1818
- <ref name="termusage"/>
1819
- </optional>
1820
1817
  <oneOrMore>
1821
1818
  <ref name="termdefinition"/>
1822
1819
  </oneOrMore>
@@ -1880,17 +1877,37 @@
1880
1877
  </attribute>
1881
1878
  </optional>
1882
1879
  <optional>
1883
- <attribute name="geographicArea"/>
1880
+ <attribute name="geographic-area"/>
1884
1881
  </optional>
1885
1882
  <choice>
1886
1883
  <ref name="expression_designation"/>
1887
1884
  <ref name="letter_symbol_designation"/>
1888
1885
  <ref name="graphical_symbol_designation"/>
1889
1886
  </choice>
1887
+ <optional>
1888
+ <ref name="fieldofapplication"/>
1889
+ </optional>
1890
+ <optional>
1891
+ <ref name="usageinfo"/>
1892
+ </optional>
1890
1893
  <zeroOrMore>
1891
1894
  <ref name="termsource"/>
1892
1895
  </zeroOrMore>
1893
1896
  </define>
1897
+ <define name="fieldofapplication">
1898
+ <element name="field-of-application">
1899
+ <oneOrMore>
1900
+ <ref name="PureTextElement"/>
1901
+ </oneOrMore>
1902
+ </element>
1903
+ </define>
1904
+ <define name="usageinfo">
1905
+ <element name="usage-info">
1906
+ <oneOrMore>
1907
+ <ref name="PureTextElement"/>
1908
+ </oneOrMore>
1909
+ </element>
1910
+ </define>
1894
1911
  <define name="letter_symbol_designation">
1895
1912
  <element name="letter-symbol">
1896
1913
  <optional>
@@ -1946,7 +1963,7 @@
1946
1963
  </zeroOrMore>
1947
1964
  </element>
1948
1965
  <optional>
1949
- <element name="abbreviationType">
1966
+ <element name="abbreviation-type">
1950
1967
  <ref name="AbbreviationType"/>
1951
1968
  </element>
1952
1969
  </optional>
@@ -1956,7 +1973,7 @@
1956
1973
  </element>
1957
1974
  </optional>
1958
1975
  <optional>
1959
- <element name="grammarInfo">
1976
+ <element name="grammar-info">
1960
1977
  <ref name="Grammar"/>
1961
1978
  </element>
1962
1979
  </optional>
@@ -1983,6 +2000,11 @@
1983
2000
  <ref name="GrammarGender"/>
1984
2001
  </element>
1985
2002
  </zeroOrMore>
2003
+ <zeroOrMore>
2004
+ <element name="number">
2005
+ <ref name="GrammarNumber"/>
2006
+ </element>
2007
+ </zeroOrMore>
1986
2008
  <optional>
1987
2009
  <element name="isPreposition">
1988
2010
  <data type="boolean"/>
@@ -2014,7 +2036,7 @@
2014
2036
  </element>
2015
2037
  </optional>
2016
2038
  <zeroOrMore>
2017
- <element name="grammarvalue">
2039
+ <element name="grammar-value">
2018
2040
  <text/>
2019
2041
  </element>
2020
2042
  </zeroOrMore>
@@ -2027,6 +2049,13 @@
2027
2049
  <value>common</value>
2028
2050
  </choice>
2029
2051
  </define>
2052
+ <define name="GrammarNumber">
2053
+ <choice>
2054
+ <value>singular</value>
2055
+ <value>dual</value>
2056
+ <value>plural</value>
2057
+ </choice>
2058
+ </define>
2030
2059
  <define name="termdomain">
2031
2060
  <element name="domain">
2032
2061
  <oneOrMore>
@@ -2041,13 +2070,6 @@
2041
2070
  </oneOrMore>
2042
2071
  </element>
2043
2072
  </define>
2044
- <define name="termusage">
2045
- <element name="usageinfo">
2046
- <oneOrMore>
2047
- <ref name="BasicBlock"/>
2048
- </oneOrMore>
2049
- </element>
2050
- </define>
2051
2073
  <define name="termdefinition">
2052
2074
  <element name="definition">
2053
2075
  <choice>
@@ -2061,13 +2083,16 @@
2061
2083
  </element>
2062
2084
  </define>
2063
2085
  <define name="verbaldefinition">
2064
- <element name="verbaldefinition">
2086
+ <element name="verbal-definition">
2065
2087
  <oneOrMore>
2066
2088
  <choice>
2067
2089
  <ref name="paragraph"/>
2068
2090
  <ref name="dl"/>
2069
2091
  <ref name="ol"/>
2070
2092
  <ref name="ul"/>
2093
+ <ref name="table"/>
2094
+ <ref name="figure"/>
2095
+ <ref name="formula"/>
2071
2096
  </choice>
2072
2097
  </oneOrMore>
2073
2098
  <zeroOrMore>
@@ -2076,7 +2101,7 @@
2076
2101
  </element>
2077
2102
  </define>
2078
2103
  <define name="nonverbalrep">
2079
- <element name="nonverbalrepresentation">
2104
+ <element name="non-verbal-representation">
2080
2105
  <oneOrMore>
2081
2106
  <choice>
2082
2107
  <ref name="table"/>
data/lib/isodoc/un/html/htmlstyle.css CHANGED
@@ -625,12 +625,12 @@ h6 {
625
625
  font-size: 1.1em;
626
626
  font-weight: 100;
627
627
  }*/
628
- .TermNum,
629
- .Terms,
630
- .AltTerms {
631
- color: #00ADEF;
628
+ .TermNum {
632
629
  font-weight: 100; }
633
630
 
631
+ .TermNum, .Terms, .AltTerms {
632
+ color: #00ADEF; }
633
+
634
634
  h2.TermNum {
635
635
  margin-bottom: 0; }
636
636
 
data/lib/isodoc/un/html/htmlstyle.scss CHANGED
@@ -346,13 +346,14 @@ h6 {
346
346
  font-weight: 100;
347
347
  }*/
348
348
 
349
- .TermNum,
350
- .Terms,
351
- .AltTerms {
352
- color: $un-blue;
349
+ .TermNum {
353
350
  font-weight: 100;
354
351
  }
355
352
 
353
+ .TermNum, .Terms, .AltTerms {
354
+ color: $un-blue;
355
+ }
356
+
356
357
  h2.TermNum {
357
358
  margin-bottom: 0;
358
359
  }
data/lib/isodoc/un/html/unece.css CHANGED
@@ -314,7 +314,6 @@ p.Terms, li.Terms, div.Terms {
314
314
  mso-fareast-font-family: {{headerfont}};
315
315
  mso-bidi-font-family: {{headerfont}};
316
316
  mso-ansi-language: EN-GB;
317
- font-weight: bold;
318
317
  mso-bidi-font-weight: normal; }
319
318
 
320
319
  p.AltTerms, li.AltTerms, div.AltTerms {
data/lib/isodoc/un/html/unece.scss CHANGED
@@ -314,7 +314,6 @@ p.Terms, li.Terms, div.Terms
314
314
  mso-fareast-font-family:$headerfont;
315
315
  mso-bidi-font-family:$headerfont;
316
316
  mso-ansi-language:EN-GB;
317
- font-weight:bold;
318
317
  mso-bidi-font-weight:normal;}
319
318
  p.AltTerms, li.AltTerms, div.AltTerms
320
319
  {mso-style-name:"AltTerm\(s\)";
data/lib/isodoc/un/un.plenary-attachment.xsl CHANGED
@@ -1670,7 +1670,8 @@
1670
1670
  <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]" mode="contents"/>
1671
1671
 
1672
1672
  </xsl:template><xsl:template name="processMainSectionsDefault_Contents">
1673
- <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
1673
+
1674
+ <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]">
1674
1675
  <xsl:sort select="@displayorder" data-type="number"/>
1675
1676
  <xsl:apply-templates select="." mode="contents"/>
1676
1677
  </xsl:for-each>
@@ -1680,7 +1681,7 @@
1680
1681
  <xsl:apply-templates select="." mode="contents"/>
1681
1682
  </xsl:for-each>
1682
1683
 
1683
- <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
1684
+ <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
1684
1685
  <xsl:sort select="@displayorder" data-type="number"/>
1685
1686
  <xsl:apply-templates select="." mode="contents"/>
1686
1687
  </xsl:for-each>
@@ -4388,12 +4389,12 @@
4388
4389
  </xsl:template><xsl:template match="*[local-name() = 'emf']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
4389
4390
  <xsl:apply-templates mode="contents"/>
4390
4391
  <xsl:text> </xsl:text>
4391
- </xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="bookmarks">
4392
+ </xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name'] | *[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="bookmarks">
4392
4393
  <xsl:apply-templates mode="bookmarks"/>
4393
4394
  <xsl:text> </xsl:text>
4394
4395
  </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
4395
4396
  <xsl:value-of select="."/>
4396
- </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
4397
+ </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement' or local-name() = 'sourcecode']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
4397
4398
  <xsl:value-of select="."/>
4398
4399
  </xsl:template><xsl:template match="node()" mode="contents">
4399
4400
  <xsl:apply-templates mode="contents"/>
@@ -4663,6 +4664,8 @@
4663
4664
 
4664
4665
 
4665
4666
 
4667
+
4668
+
4666
4669
  <fo:block xsl:use-attribute-sets="sourcecode-style">
4667
4670
  <xsl:variable name="_font-size">
4668
4671
 
@@ -4696,13 +4699,17 @@
4696
4699
 
4697
4700
 
4698
4701
 
4702
+
4703
+
4699
4704
  <xsl:apply-templates/>
4700
4705
  </fo:block>
4701
-
4706
+
4702
4707
 
4703
4708
  <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4704
4709
 
4705
4710
 
4711
+
4712
+
4706
4713
  </fo:block-container>
4707
4714
  </fo:block-container>
4708
4715
  </xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
@@ -5285,15 +5292,20 @@
5285
5292
  <fo:block xsl:use-attribute-sets="deprecates-style">
5286
5293
  <xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
5287
5294
  </fo:block>
5295
+ </xsl:template><xsl:template name="setStyle_preferred">
5296
+ <xsl:if test="*[local-name() = 'strong']">
5297
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
5298
+ </xsl:if>
5288
5299
  </xsl:template><xsl:template match="*[local-name() = 'definition']">
5289
5300
  <fo:block xsl:use-attribute-sets="definition-style">
5290
5301
  <xsl:apply-templates/>
5291
5302
  </fo:block>
5292
5303
  </xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
5293
5304
  <xsl:apply-templates/>
5294
- </xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
5305
+ </xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
5295
5306
  <fo:inline> <xsl:apply-templates/></fo:inline>
5296
- <fo:block> </fo:block>
5307
+ <!-- <fo:block>&#xA0;</fo:block> -->
5308
+ <fo:block/>
5297
5309
  </xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
5298
5310
 
5299
5311
  <fo:block>
data/lib/isodoc/un/un.plenary.xsl CHANGED
@@ -1670,7 +1670,8 @@
1670
1670
  <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]" mode="contents"/>
1671
1671
 
1672
1672
  </xsl:template><xsl:template name="processMainSectionsDefault_Contents">
1673
- <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
1673
+
1674
+ <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]">
1674
1675
  <xsl:sort select="@displayorder" data-type="number"/>
1675
1676
  <xsl:apply-templates select="." mode="contents"/>
1676
1677
  </xsl:for-each>
@@ -1680,7 +1681,7 @@
1680
1681
  <xsl:apply-templates select="." mode="contents"/>
1681
1682
  </xsl:for-each>
1682
1683
 
1683
- <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
1684
+ <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
1684
1685
  <xsl:sort select="@displayorder" data-type="number"/>
1685
1686
  <xsl:apply-templates select="." mode="contents"/>
1686
1687
  </xsl:for-each>
@@ -4388,12 +4389,12 @@
4388
4389
  </xsl:template><xsl:template match="*[local-name() = 'emf']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
4389
4390
  <xsl:apply-templates mode="contents"/>
4390
4391
  <xsl:text> </xsl:text>
4391
- </xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="bookmarks">
4392
+ </xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name'] | *[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="bookmarks">
4392
4393
  <xsl:apply-templates mode="bookmarks"/>
4393
4394
  <xsl:text> </xsl:text>
4394
4395
  </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
4395
4396
  <xsl:value-of select="."/>
4396
- </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
4397
+ </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement' or local-name() = 'sourcecode']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
4397
4398
  <xsl:value-of select="."/>
4398
4399
  </xsl:template><xsl:template match="node()" mode="contents">
4399
4400
  <xsl:apply-templates mode="contents"/>
@@ -4663,6 +4664,8 @@
4663
4664
 
4664
4665
 
4665
4666
 
4667
+
4668
+
4666
4669
  <fo:block xsl:use-attribute-sets="sourcecode-style">
4667
4670
  <xsl:variable name="_font-size">
4668
4671
 
@@ -4696,13 +4699,17 @@
4696
4699
 
4697
4700
 
4698
4701
 
4702
+
4703
+
4699
4704
  <xsl:apply-templates/>
4700
4705
  </fo:block>
4701
-
4706
+
4702
4707
 
4703
4708
  <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4704
4709
 
4705
4710
 
4711
+
4712
+
4706
4713
  </fo:block-container>
4707
4714
  </fo:block-container>
4708
4715
  </xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
@@ -5285,15 +5292,20 @@
5285
5292
  <fo:block xsl:use-attribute-sets="deprecates-style">
5286
5293
  <xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
5287
5294
  </fo:block>
5295
+ </xsl:template><xsl:template name="setStyle_preferred">
5296
+ <xsl:if test="*[local-name() = 'strong']">
5297
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
5298
+ </xsl:if>
5288
5299
  </xsl:template><xsl:template match="*[local-name() = 'definition']">
5289
5300
  <fo:block xsl:use-attribute-sets="definition-style">
5290
5301
  <xsl:apply-templates/>
5291
5302
  </fo:block>
5292
5303
  </xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
5293
5304
  <xsl:apply-templates/>
5294
- </xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
5305
+ </xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
5295
5306
  <fo:inline> <xsl:apply-templates/></fo:inline>
5296
- <fo:block> </fo:block>
5307
+ <!-- <fo:block>&#xA0;</fo:block> -->
5308
+ <fo:block/>
5297
5309
  </xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
5298
5310
 
5299
5311
  <fo:block>
data/lib/isodoc/un/un.recommendation.xsl CHANGED
@@ -1628,7 +1628,8 @@
1628
1628
  <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]" mode="contents"/>
1629
1629
 
1630
1630
  </xsl:template><xsl:template name="processMainSectionsDefault_Contents">
1631
- <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
1631
+
1632
+ <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]">
1632
1633
  <xsl:sort select="@displayorder" data-type="number"/>
1633
1634
  <xsl:apply-templates select="." mode="contents"/>
1634
1635
  </xsl:for-each>
@@ -1638,7 +1639,7 @@
1638
1639
  <xsl:apply-templates select="." mode="contents"/>
1639
1640
  </xsl:for-each>
1640
1641
 
1641
- <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
1642
+ <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
1642
1643
  <xsl:sort select="@displayorder" data-type="number"/>
1643
1644
  <xsl:apply-templates select="." mode="contents"/>
1644
1645
  </xsl:for-each>
@@ -4360,12 +4361,12 @@
4360
4361
  </xsl:template><xsl:template match="*[local-name() = 'emf']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
4361
4362
  <xsl:apply-templates mode="contents"/>
4362
4363
  <xsl:text> </xsl:text>
4363
- </xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="bookmarks">
4364
+ </xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name'] | *[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="bookmarks">
4364
4365
  <xsl:apply-templates mode="bookmarks"/>
4365
4366
  <xsl:text> </xsl:text>
4366
4367
  </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
4367
4368
  <xsl:value-of select="."/>
4368
- </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
4369
+ </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement' or local-name() = 'sourcecode']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
4369
4370
  <xsl:value-of select="."/>
4370
4371
  </xsl:template><xsl:template match="node()" mode="contents">
4371
4372
  <xsl:apply-templates mode="contents"/>
@@ -4635,6 +4636,8 @@
4635
4636
 
4636
4637
 
4637
4638
 
4639
+
4640
+
4638
4641
  <fo:block xsl:use-attribute-sets="sourcecode-style">
4639
4642
  <xsl:variable name="_font-size">
4640
4643
 
@@ -4668,13 +4671,17 @@
4668
4671
 
4669
4672
 
4670
4673
 
4674
+
4675
+
4671
4676
  <xsl:apply-templates/>
4672
4677
  </fo:block>
4673
-
4678
+
4674
4679
 
4675
4680
  <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
4676
4681
 
4677
4682
 
4683
+
4684
+
4678
4685
  </fo:block-container>
4679
4686
  </fo:block-container>
4680
4687
  </xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
@@ -5255,15 +5262,20 @@
5255
5262
  <fo:block xsl:use-attribute-sets="deprecates-style">
5256
5263
  <xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
5257
5264
  </fo:block>
5265
+ </xsl:template><xsl:template name="setStyle_preferred">
5266
+ <xsl:if test="*[local-name() = 'strong']">
5267
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
5268
+ </xsl:if>
5258
5269
  </xsl:template><xsl:template match="*[local-name() = 'definition']">
5259
5270
  <fo:block xsl:use-attribute-sets="definition-style">
5260
5271
  <xsl:apply-templates/>
5261
5272
  </fo:block>
5262
5273
  </xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
5263
5274
  <xsl:apply-templates/>
5264
- </xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
5275
+ </xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
5265
5276
  <fo:inline> <xsl:apply-templates/></fo:inline>
5266
- <fo:block> </fo:block>
5277
+ <!-- <fo:block>&#xA0;</fo:block> -->
5278
+ <fo:block/>
5267
5279
  </xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
5268
5280
 
5269
5281
  <fo:block break-after="page"/>
data/lib/metanorma/un/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.7.2".freeze
3
+ VERSION = "0.7.3".freeze
4
4
  end
5
5
  end
data/metanorma-unece.gemspec CHANGED
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
32
32
 
33
33
  spec.add_dependency "metanorma-standoc", "~> 1.11.0"
34
34
 
35
- spec.add_development_dependency "byebug", "~> 9.1"
35
+ spec.add_development_dependency "debug"
36
36
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
37
37
  spec.add_development_dependency "guard", "~> 2.14"
38
38
  spec.add_development_dependency "guard-rspec", "~> 4.7"
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.7.2
4
+ version: 0.7.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-11-15 00:00:00.000000000 Z
11
+ date: 2021-11-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639
@@ -67,19 +67,19 @@ dependencies:
67
67
  - !ruby/object:Gem::Version
68
68
  version: 1.11.0
69
69
  - !ruby/object:Gem::Dependency
70
- name: byebug
70
+ name: debug
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
- version: '9.1'
75
+ version: '0'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - "~>"
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
- version: '9.1'
82
+ version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: equivalent-xml
85
85
  requirement: !ruby/object:Gem::Requirement