metanorma-un 0.11.5 → 0.11.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +2 -8
  3. data/lib/isodoc/un/html/htmlstyle.css +8 -0
  4. data/lib/isodoc/un/i18n.rb +7 -2
  5. data/lib/isodoc/un/un.plenary-attachment.xsl +2 -2
  6. data/lib/isodoc/un/un.plenary.xsl +2 -2
  7. data/lib/isodoc/un/un.recommendation.xsl +2 -2
  8. data/lib/isodoc/un/xref.rb +5 -4
  9. data/lib/metanorma/un/basicdoc.rng +26 -17
  10. data/lib/metanorma/un/biblio.rng +13 -0
  11. data/lib/metanorma/un/isodoc.rng +11 -1
  12. data/lib/metanorma/un/version.rb +1 -1
  13. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 10442e536ce9ee7ee5874a8dcb042d9d8e1bc692ee4f1edfa75fad454289a6f2
4
- data.tar.gz: 9e2b5f3aaa3213d49eb685bdd56aecbf2f26af0051c394d23e57e29a8ff1dd79
3
+ metadata.gz: 180ec8341cf935357ed33d2ef1bdb578fe9ccfa9dcba09d7aee60dab04ecab4a
4
+ data.tar.gz: 596e73d96b3b45c0e243f44090bd8f1f6887a8595b844ed0db9ebac827f664d4
5
5
  SHA512:
6
- metadata.gz: 1ee5cfabb8beb9ee1c6c4e7a7e056fe83e5825e25a59f4d0f87e5821b6f6e25642c18e6c2d6428858ae42a05487f53b482abdd57629055d004c23988abf3684a
7
- data.tar.gz: 4a9898a667a6a7e357b4a873b4c58c724f20b4b6bdf5d106a279f875d85d4da8d4f21b0536376463e3e4f36da1c45018c00c084d2d11cf7f492c6d63b9ae4e09
6
+ metadata.gz: d1b9e13a83ad0fcec990270385d62aff3dac6ff70da2abf4e3d118ed2df79c52a87adf77312beef7154cfce674fca1bf695db59a3a0941602843142a83bca9a7
7
+ data.tar.gz: 56f82f644b2d86d5d77c0fa210a7c0b0a504ca314015e1968ed56862ec5ed0064213c95f5d93298424b32facf4780a8c52644866a436bd2cc6d20ef7159462eb
data/Gemfile CHANGED
@@ -4,12 +4,6 @@ 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
- group :development, :test do
8
- gem "rspec"
9
- end
10
-
11
- if File.exist? "Gemfile.devel"
12
- eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
13
- end
14
-
15
7
  gemspec
8
+
9
+ eval_gemfile("Gemfile.devel") rescue nil
data/lib/isodoc/un/html/htmlstyle.css CHANGED
@@ -139,6 +139,14 @@ a.FootnoteRef, span.FootnoteRef {
139
139
  color: red;
140
140
  text-decoration: line-through; }
141
141
 
142
+ ruby {
143
+ ruby-position: over;
144
+ -webkit-ruby-position: before; }
145
+
146
+ ruby ruby {
147
+ ruby-position: under;
148
+ -webkit-ruby-position: after; }
149
+
142
150
  /* code highlighting with line numbers */
143
151
  table.rouge-line-table td.rouge-gutter {
144
152
  -moz-user-select: none;
data/lib/isodoc/un/i18n.rb CHANGED
@@ -1,9 +1,14 @@
1
1
  module IsoDoc
2
2
  module UN
3
3
  class I18n < IsoDoc::I18n
4
+ def load_file(fname)
5
+ f = File.join(File.dirname(__FILE__), fname)
6
+ File.exist?(f) ? YAML.load_file(f) : {}
7
+ end
8
+
4
9
  def load_yaml1(lang, script)
5
- y = YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
6
- super.deep_merge(y)
10
+ y = load_file("i18n-#{yaml_lang(lang, script)}.yaml")
11
+ y.empty? ? load_file("i18n-en.yaml").merge(super) : super.deep_merge(y)
7
12
  end
8
13
  end
9
14
  end
data/lib/isodoc/un/un.plenary-attachment.xsl CHANGED
@@ -10073,10 +10073,10 @@
10073
10073
 
10074
10074
  <xsl:variable name="toc_level">
10075
10075
  <!-- https://www.metanorma.org/author/ref/document-attributes/ -->
10076
- <xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
10076
+ <xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf Number of table of contents levels to render in PDF output; used to override :toclevels:-->
10077
10077
  <xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
10078
10078
  <xsl:choose>
10079
- <xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
10079
+ <xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
10080
10080
  <xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
10081
10081
  <xsl:otherwise><!-- default value -->
10082
10082
  3
data/lib/isodoc/un/un.plenary.xsl CHANGED
@@ -10073,10 +10073,10 @@
10073
10073
 
10074
10074
  <xsl:variable name="toc_level">
10075
10075
  <!-- https://www.metanorma.org/author/ref/document-attributes/ -->
10076
- <xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
10076
+ <xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf Number of table of contents levels to render in PDF output; used to override :toclevels:-->
10077
10077
  <xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
10078
10078
  <xsl:choose>
10079
- <xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
10079
+ <xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
10080
10080
  <xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
10081
10081
  <xsl:otherwise><!-- default value -->
10082
10082
  3
data/lib/isodoc/un/un.recommendation.xsl CHANGED
@@ -10200,10 +10200,10 @@
10200
10200
 
10201
10201
  <xsl:variable name="toc_level">
10202
10202
  <!-- https://www.metanorma.org/author/ref/document-attributes/ -->
10203
- <xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
10203
+ <xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf Number of table of contents levels to render in PDF output; used to override :toclevels:-->
10204
10204
  <xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
10205
10205
  <xsl:choose>
10206
- <xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
10206
+ <xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
10207
10207
  <xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
10208
10208
  <xsl:otherwise><!-- default value -->
10209
10209
  3
data/lib/isodoc/un/xref.rb CHANGED
@@ -159,11 +159,12 @@ module IsoDoc
159
159
  ]
160
160
  end
161
161
 
162
- def sequential_admonition_names(clause)
162
+ def sequential_admonition_names(clause, container: false)
163
163
  i = 0
164
164
  clause.xpath(ns(".//admonition")).noblank.each do |t|
165
165
  i += 1 unless t["unnumbered"] == "true"
166
- @anchors[t["id"]] = anchor_struct(i.to_s, nil, @labels["admonition"],
166
+ @anchors[t["id"]] =
167
+ anchor_struct(i.to_s, container ? t : nil, @labels["admonition"],
167
168
  "box", t["unnumbered"])
168
169
  end
169
170
  end
@@ -178,9 +179,9 @@ module IsoDoc
178
179
  end
179
180
  end
180
181
 
181
- def sequential_asset_names(clause)
182
+ def sequential_asset_names(clause, container: false)
182
183
  super
183
- sequential_admonition_names(clause)
184
+ sequential_admonition_names(clause, container: container)
184
185
  end
185
186
 
186
187
  def hierarchical_asset_names(clause, num)
data/lib/metanorma/un/basicdoc.rng CHANGED
@@ -715,27 +715,36 @@
715
715
  </define>
716
716
  <define name="ruby">
717
717
  <element name="ruby">
718
- <zeroOrMore>
719
- <choice>
720
- <ref name="PureTextElement"/>
721
- <ref name="rp"/>
722
- <ref name="rt"/>
723
- </choice>
724
- </zeroOrMore>
718
+ <choice>
719
+ <ref name="ruby_pronunciation"/>
720
+ <ref name="ruby_annotation"/>
721
+ </choice>
722
+ <choice>
723
+ <text/>
724
+ <ref name="ruby"/>
725
+ </choice>
725
726
  </element>
726
727
  </define>
727
- <define name="rp">
728
- <element name="rp">
729
- <zeroOrMore>
730
- <ref name="PureTextElement"/>
731
- </zeroOrMore>
728
+ <define name="ruby_pronunciation">
729
+ <element name="pronunciation">
730
+ <attribute name="value"/>
731
+ <optional>
732
+ <attribute name="script"/>
733
+ </optional>
734
+ <optional>
735
+ <attribute name="lang"/>
736
+ </optional>
732
737
  </element>
733
738
  </define>
734
- <define name="rt">
735
- <element name="rt">
736
- <zeroOrMore>
737
- <ref name="PureTextElement"/>
738
- </zeroOrMore>
739
+ <define name="ruby_annotation">
740
+ <element name="annotation">
741
+ <attribute name="value"/>
742
+ <optional>
743
+ <attribute name="script"/>
744
+ </optional>
745
+ <optional>
746
+ <attribute name="lang"/>
747
+ </optional>
739
748
  </element>
740
749
  </define>
741
750
  <define name="br">
data/lib/metanorma/un/biblio.rng CHANGED
@@ -374,6 +374,16 @@
374
374
  <ref name="image"/>
375
375
  </element>
376
376
  </define>
377
+ <define name="depiction">
378
+ <element name="depiction">
379
+ <optional>
380
+ <attribute name="scope"/>
381
+ </optional>
382
+ <zeroOrMore>
383
+ <ref name="image"/>
384
+ </zeroOrMore>
385
+ </element>
386
+ </define>
377
387
  <define name="NameWithVariants">
378
388
  <element name="primary">
379
389
  <ref name="LocalizedString"/>
@@ -760,6 +770,9 @@
760
770
  <optional>
761
771
  <ref name="validity"/>
762
772
  </optional>
773
+ <optional>
774
+ <ref name="depiction"/>
775
+ </optional>
763
776
  </define>
764
777
  <define name="ReducedBibliographicItem">
765
778
  <optional>
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.8 -->
20
+ <!-- VERSION v1.2.9 -->
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">
@@ -1958,6 +1958,16 @@
1958
1958
  <data type="boolean"/>
1959
1959
  </attribute>
1960
1960
  </optional>
1961
+ <optional>
1962
+ <attribute name="type">
1963
+ <choice>
1964
+ <value>letter</value>
1965
+ <value>symbol</value>
1966
+ <value>formula</value>
1967
+ <value>equation</value>
1968
+ </choice>
1969
+ </attribute>
1970
+ </optional>
1961
1971
  <element name="name">
1962
1972
  <oneOrMore>
1963
1973
  <choice>
data/lib/metanorma/un/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.11.5".freeze
3
+ VERSION = "0.11.8".freeze
4
4
  end
5
5
  end
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.5
4
+ version: 0.11.8
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-27 00:00:00.000000000 Z
11
+ date: 2023-12-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639