metanorma-un 0.11.3 → 0.11.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +5 -1
  3. data/lib/isodoc/un/un.plenary-attachment.xsl +11 -2
  4. data/lib/isodoc/un/un.plenary.xsl +11 -2
  5. data/lib/isodoc/un/un.recommendation.xsl +11 -2
  6. data/lib/metanorma/un/basicdoc.rng +38 -35
  7. data/lib/metanorma/un/biblio.rng +9 -0
  8. data/lib/metanorma/un/isodoc.rng +27 -1
  9. data/lib/metanorma/un/version.rb +1 -1
  10. data/metanorma-un.gemspec +1 -1
  11. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 893911187f440c2a22dc5e6ac6399be48569729d68df0f06771bc9f0082c7ce6
4
- data.tar.gz: 0acdfe2cab3e3d993c216cb05f99c19c54b7c520a2a154d51b0c55dd2f525ce5
3
+ metadata.gz: 10442e536ce9ee7ee5874a8dcb042d9d8e1bc692ee4f1edfa75fad454289a6f2
4
+ data.tar.gz: 9e2b5f3aaa3213d49eb685bdd56aecbf2f26af0051c394d23e57e29a8ff1dd79
5
5
  SHA512:
6
- metadata.gz: 70580505445dcedb730c190da09ef95033ace92233a2428bdeadcdbe76d4bd9fd57565907fa4b10a9dce9d7573ba85bc67bb9e47bc1dc83bd0b5868bd797e58a
7
- data.tar.gz: 41626b7890c63328f847e397a849dfce7491af3e4922ac104d76e23eae2bfd575a6496dce8dc664bb1d8746911610831e406180a202b59e72eeb1abe5c6943b0
6
+ metadata.gz: 1ee5cfabb8beb9ee1c6c4e7a7e056fe83e5825e25a59f4d0f87e5821b6f6e25642c18e6c2d6428858ae42a05487f53b482abdd57629055d004c23988abf3684a
7
+ data.tar.gz: 4a9898a667a6a7e357b4a873b4c58c724f20b4b6bdf5d106a279f875d85d4da8d4f21b0536376463e3e4f36da1c45018c00c084d2d11cf7f492c6d63b9ae4e09
data/Gemfile CHANGED
@@ -4,8 +4,12 @@ Encoding.default_internal = Encoding::UTF_8
4
4
  source "https://rubygems.org"
5
5
  git_source(:github) { |repo| "https://github.com/#{repo}" }
6
6
 
7
- gemspec
7
+ group :development, :test do
8
+ gem "rspec"
9
+ end
8
10
 
9
11
  if File.exist? "Gemfile.devel"
10
12
  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
11
13
  end
14
+
15
+ gemspec
data/lib/isodoc/un/un.plenary-attachment.xsl CHANGED
@@ -4965,8 +4965,17 @@
4965
4965
  <xsl:variable name="styles_">
4966
4966
  <xsl:for-each select="xalan:nodeset($styles__)/item">
4967
4967
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
4968
- <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
4969
- <xsl:if test="$key = 'font-family' or $key = 'color'">
4968
+ <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
4969
+ <xsl:variable name="value">
4970
+ <xsl:choose>
4971
+ <!-- if font-size is digits only -->
4972
+ <xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
4973
+ <xsl:otherwise>
4974
+ <xsl:value-of select="$value_"/>
4975
+ </xsl:otherwise>
4976
+ </xsl:choose>
4977
+ </xsl:variable>
4978
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
4970
4979
  <style name="{$key}"><xsl:value-of select="$value"/></style>
4971
4980
  </xsl:if>
4972
4981
  </xsl:for-each>
data/lib/isodoc/un/un.plenary.xsl CHANGED
@@ -4965,8 +4965,17 @@
4965
4965
  <xsl:variable name="styles_">
4966
4966
  <xsl:for-each select="xalan:nodeset($styles__)/item">
4967
4967
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
4968
- <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
4969
- <xsl:if test="$key = 'font-family' or $key = 'color'">
4968
+ <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
4969
+ <xsl:variable name="value">
4970
+ <xsl:choose>
4971
+ <!-- if font-size is digits only -->
4972
+ <xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
4973
+ <xsl:otherwise>
4974
+ <xsl:value-of select="$value_"/>
4975
+ </xsl:otherwise>
4976
+ </xsl:choose>
4977
+ </xsl:variable>
4978
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
4970
4979
  <style name="{$key}"><xsl:value-of select="$value"/></style>
4971
4980
  </xsl:if>
4972
4981
  </xsl:for-each>
data/lib/isodoc/un/un.recommendation.xsl CHANGED
@@ -5092,8 +5092,17 @@
5092
5092
  <xsl:variable name="styles_">
5093
5093
  <xsl:for-each select="xalan:nodeset($styles__)/item">
5094
5094
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
5095
- <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5096
- <xsl:if test="$key = 'font-family' or $key = 'color'">
5095
+ <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5096
+ <xsl:variable name="value">
5097
+ <xsl:choose>
5098
+ <!-- if font-size is digits only -->
5099
+ <xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
5100
+ <xsl:otherwise>
5101
+ <xsl:value-of select="$value_"/>
5102
+ </xsl:otherwise>
5103
+ </xsl:choose>
5104
+ </xsl:variable>
5105
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
5097
5106
  <style name="{$key}"><xsl:value-of select="$value"/></style>
5098
5107
  </xsl:if>
5099
5108
  </xsl:for-each>
data/lib/metanorma/un/basicdoc.rng CHANGED
@@ -914,44 +914,47 @@
914
914
  -->
915
915
  <define name="image">
916
916
  <element name="image">
917
- <attribute name="id">
918
- <data type="ID"/>
917
+ <ref name="Image"/>
918
+ </element>
919
+ </define>
920
+ <define name="Image">
921
+ <attribute name="id">
922
+ <data type="ID"/>
923
+ </attribute>
924
+ <attribute name="src">
925
+ <data type="anyURI"/>
926
+ </attribute>
927
+ <attribute name="mimetype"/>
928
+ <optional>
929
+ <attribute name="filename"/>
930
+ </optional>
931
+ <optional>
932
+ <attribute name="width">
933
+ <choice>
934
+ <data type="int"/>
935
+ <value>auto</value>
936
+ </choice>
919
937
  </attribute>
920
- <attribute name="src">
938
+ </optional>
939
+ <optional>
940
+ <attribute name="height">
941
+ <choice>
942
+ <data type="int"/>
943
+ <value>auto</value>
944
+ </choice>
945
+ </attribute>
946
+ </optional>
947
+ <optional>
948
+ <attribute name="alt"/>
949
+ </optional>
950
+ <optional>
951
+ <attribute name="title"/>
952
+ </optional>
953
+ <optional>
954
+ <attribute name="longdesc">
921
955
  <data type="anyURI"/>
922
956
  </attribute>
923
- <attribute name="mimetype"/>
924
- <optional>
925
- <attribute name="filename"/>
926
- </optional>
927
- <optional>
928
- <attribute name="width">
929
- <choice>
930
- <data type="int"/>
931
- <value>auto</value>
932
- </choice>
933
- </attribute>
934
- </optional>
935
- <optional>
936
- <attribute name="height">
937
- <choice>
938
- <data type="int"/>
939
- <value>auto</value>
940
- </choice>
941
- </attribute>
942
- </optional>
943
- <optional>
944
- <attribute name="alt"/>
945
- </optional>
946
- <optional>
947
- <attribute name="title"/>
948
- </optional>
949
- <optional>
950
- <attribute name="longdesc">
951
- <data type="anyURI"/>
952
- </attribute>
953
- </optional>
954
- </element>
957
+ </optional>
955
958
  </define>
956
959
  <define name="video">
957
960
  <element name="video">
data/lib/metanorma/un/biblio.rng CHANGED
@@ -348,6 +348,9 @@
348
348
  <zeroOrMore>
349
349
  <ref name="contact"/>
350
350
  </zeroOrMore>
351
+ <optional>
352
+ <ref name="logo"/>
353
+ </optional>
351
354
  </element>
352
355
  </define>
353
356
  <define name="orgname">
@@ -366,6 +369,11 @@
366
369
  </choice>
367
370
  </element>
368
371
  </define>
372
+ <define name="logo">
373
+ <element name="logo">
374
+ <ref name="image"/>
375
+ </element>
376
+ </define>
369
377
  <define name="NameWithVariants">
370
378
  <element name="primary">
371
379
  <ref name="LocalizedString"/>
@@ -942,6 +950,7 @@
942
950
  <value>obsoleted</value>
943
951
  <value>confirmed</value>
944
952
  <value>updated</value>
953
+ <value>corrected</value>
945
954
  <value>issued</value>
946
955
  <value>transmitted</value>
947
956
  <value>copied</value>
data/lib/metanorma/un/isodoc.rng CHANGED
@@ -17,7 +17,7 @@
17
17
  these elements; we just want one namespace for any child grammars
18
18
  of this.
19
19
  -->
20
- <!-- VERSION v1.2.6 -->
20
+ <!-- VERSION v1.2.8 -->
21
21
  <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
22
22
  <include href="reqt.rng"/>
23
23
  <include href="basicdoc.rng">
@@ -1054,6 +1054,17 @@
1054
1054
  <ref name="date_inline"/>
1055
1055
  </choice>
1056
1056
  </define>
1057
+ <define name="PureTextElement" combine="choice">
1058
+ <ref name="passthrough_inline"/>
1059
+ </define>
1060
+ <define name="passthrough_inline">
1061
+ <element name="passthrough">
1062
+ <optional>
1063
+ <attribute name="formats"/>
1064
+ </optional>
1065
+ <text/>
1066
+ </element>
1067
+ </define>
1057
1068
  <define name="add">
1058
1069
  <element name="add">
1059
1070
  <choice>
@@ -1092,6 +1103,9 @@
1092
1103
  <optional>
1093
1104
  <attribute name="style"/>
1094
1105
  </optional>
1106
+ <optional>
1107
+ <attribute name="custom-charset"/>
1108
+ </optional>
1095
1109
  <oneOrMore>
1096
1110
  <ref name="TextElement"/>
1097
1111
  </oneOrMore>
@@ -1394,6 +1408,9 @@
1394
1408
  <optional>
1395
1409
  <attribute name="number"/>
1396
1410
  </optional>
1411
+ <optional>
1412
+ <attribute name="branch-number"/>
1413
+ </optional>
1397
1414
  <optional>
1398
1415
  <attribute name="obligation">
1399
1416
  <choice>
@@ -1617,6 +1634,9 @@
1617
1634
  <optional>
1618
1635
  <attribute name="number"/>
1619
1636
  </optional>
1637
+ <optional>
1638
+ <attribute name="branch-number"/>
1639
+ </optional>
1620
1640
  <optional>
1621
1641
  <attribute name="type"/>
1622
1642
  </optional>
@@ -1668,6 +1688,9 @@
1668
1688
  <optional>
1669
1689
  <attribute name="number"/>
1670
1690
  </optional>
1691
+ <optional>
1692
+ <attribute name="branch-number"/>
1693
+ </optional>
1671
1694
  <optional>
1672
1695
  <ref name="section-title"/>
1673
1696
  </optional>
@@ -1765,6 +1788,9 @@
1765
1788
  <optional>
1766
1789
  <attribute name="number"/>
1767
1790
  </optional>
1791
+ <optional>
1792
+ <attribute name="branch-number"/>
1793
+ </optional>
1768
1794
  <optional>
1769
1795
  <attribute name="obligation">
1770
1796
  <choice>
data/lib/metanorma/un/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.11.3".freeze
3
+ VERSION = "0.11.5".freeze
4
4
  end
5
5
  end
data/metanorma-un.gemspec CHANGED
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
31
31
  spec.add_dependency "roman-numerals"
32
32
  spec.add_dependency "twitter_cldr"
33
33
 
34
- spec.add_dependency "metanorma-standoc", "~> 2.6.0"
34
+ spec.add_dependency "metanorma-standoc", "~> 2.7.0"
35
35
 
36
36
  spec.add_development_dependency "debug"
37
37
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
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.11.3
4
+ version: 0.11.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-11-06 00:00:00.000000000 Z
11
+ date: 2023-11-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639
@@ -58,14 +58,14 @@ dependencies:
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 2.6.0
61
+ version: 2.7.0
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 2.6.0
68
+ version: 2.7.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: debug
71
71
  requirement: !ruby/object:Gem::Requirement