metanorma-un 0.7.2 → 0.8.0

data/lib/{asciidoctor → metanorma}/un/converter.rb

@@ -1,9 +1,9 @@
 require "asciidoctor"
-require "asciidoctor/standoc/converter"
+require "metanorma/standoc/converter"
 require "fileutils"
 require_relative "validate"
 
-module Asciidoctor
+module Metanorma
   module UN
     class Converter < Standoc::Converter
       XML_ROOT_TAG = "un-standard".freeze
@@ -169,7 +169,7 @@ module Asciidoctor
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
 
-        IsoDoc::UN::PdfConvert.new(doc_extract_attributes(node))
+        IsoDoc::UN::PdfConvert.new(pdf_extract_attributes(node))
       end
 
       def sections_cleanup(xmldoc)

data/lib/{asciidoctor → metanorma}/un/isodoc.rng

@@ -58,7 +58,7 @@
           <attribute name="alt"/>
         </optional>
         <optional>
-          <attribute name="updatetype">
+          <attribute name="update-type">
             <data type="boolean"/>
           </attribute>
         </optional>
@@ -1796,6 +1796,20 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="tag"/>
+      </optional>
+      <optional>
+        <attribute name="multilingual-rendering">
+          <ref name="MultilingualRenderingType"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="preferred"/>
       </oneOrMore>
@@ -1814,9 +1828,6 @@
       <optional>
         <ref name="termsubject"/>
       </optional>
-      <optional>
-        <ref name="termusage"/>
-      </optional>
       <oneOrMore>
         <ref name="termdefinition"/>
       </oneOrMore>
@@ -1880,17 +1891,37 @@
       </attribute>
     </optional>
     <optional>
-      <attribute name="geographicArea"/>
+      <attribute name="geographic-area"/>
     </optional>
     <choice>
       <ref name="expression_designation"/>
       <ref name="letter_symbol_designation"/>
       <ref name="graphical_symbol_designation"/>
     </choice>
+    <optional>
+      <ref name="fieldofapplication"/>
+    </optional>
+    <optional>
+      <ref name="usageinfo"/>
+    </optional>
     <zeroOrMore>
       <ref name="termsource"/>
     </zeroOrMore>
   </define>
+  <define name="fieldofapplication">
+    <element name="field-of-application">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="usageinfo">
+    <element name="usage-info">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="letter_symbol_designation">
     <element name="letter-symbol">
       <optional>
@@ -1942,11 +1973,15 @@
       </optional>
       <element name="name">
         <zeroOrMore>
-          <ref name="PureTextElement"/>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
         </zeroOrMore>
       </element>
       <optional>
-        <element name="abbreviationType">
+        <element name="abbreviation-type">
           <ref name="AbbreviationType"/>
         </element>
       </optional>
@@ -1956,7 +1991,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammarInfo">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -1983,6 +2018,11 @@
         <ref name="GrammarGender"/>
       </element>
     </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
     <optional>
       <element name="isPreposition">
         <data type="boolean"/>
@@ -2014,7 +2054,7 @@
       </element>
     </optional>
     <zeroOrMore>
-      <element name="grammarvalue">
+      <element name="grammar-value">
         <text/>
       </element>
     </zeroOrMore>
@@ -2027,6 +2067,13 @@
       <value>common</value>
     </choice>
   </define>
+  <define name="GrammarNumber">
+    <choice>
+      <value>singular</value>
+      <value>dual</value>
+      <value>plural</value>
+    </choice>
+  </define>
   <define name="termdomain">
     <element name="domain">
       <oneOrMore>
@@ -2041,13 +2088,6 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="termusage">
-    <element name="usageinfo">
-      <oneOrMore>
-        <ref name="BasicBlock"/>
-      </oneOrMore>
-    </element>
-  </define>
   <define name="termdefinition">
     <element name="definition">
       <choice>
@@ -2061,13 +2101,16 @@
     </element>
   </define>
   <define name="verbaldefinition">
-    <element name="verbaldefinition">
+    <element name="verbal-definition">
       <oneOrMore>
         <choice>
           <ref name="paragraph"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
+          <ref name="table"/>
+          <ref name="figure"/>
+          <ref name="formula"/>
         </choice>
       </oneOrMore>
       <zeroOrMore>
@@ -2076,7 +2119,7 @@
     </element>
   </define>
   <define name="nonverbalrep">
-    <element name="nonverbalrepresentation">
+    <element name="non-verbal-representation">
       <oneOrMore>
         <choice>
           <ref name="table"/>

data/lib/{asciidoctor → metanorma}/un/validate.rb

@@ -1,4 +1,4 @@
-module Asciidoctor
+module Metanorma
   module UN
     class Converter < Standoc::Converter
       def content_validate(doc)

data/lib/metanorma/un/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module UN
-    VERSION = "0.7.2".freeze
+    VERSION = "0.8.0".freeze
   end
 end

data/lib/metanorma/un.rb

@@ -1,6 +1,7 @@
 require "metanorma/un/processor"
 require "metanorma/un/input"
 require "metanorma/un/version"
+require "metanorma/un/converter"
 
 module Metanorma
   module UN

data/lib/metanorma-un.rb

@@ -1,6 +1,5 @@
 require "metanorma/un"
 require "asciidoctor"
-require "asciidoctor/un"
 require "isodoc/un"
 
 if defined? Metanorma

data/metanorma-unece.gemspec

@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "roman-numerals"
   spec.add_dependency "twitter_cldr"
 
-  spec.add_dependency "metanorma-standoc", "~> 1.11.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.0.0"
 
-  spec.add_development_dependency "byebug", "~> 9.1"
+  spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-un
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -228,15 +228,6 @@ files:
 - bin/console
 - bin/rspec
 - bin/setup
-- lib/asciidoctor/un.rb
-- lib/asciidoctor/un/basicdoc.rng
-- lib/asciidoctor/un/biblio.rng
-- lib/asciidoctor/un/boilerplate.xml
-- lib/asciidoctor/un/converter.rb
-- lib/asciidoctor/un/isodoc.rng
-- lib/asciidoctor/un/reqt.rng
-- lib/asciidoctor/un/un.rng
-- lib/asciidoctor/un/validate.rb
 - lib/isodoc/un.rb
 - lib/isodoc/un/base_convert.rb
 - lib/isodoc/un/html/header.html
@@ -269,8 +260,16 @@ files:
 - lib/metanorma-un.rb
 - lib/metanorma/un.rb
 - lib/metanorma/un/UN_emblem_blue.svg
+- lib/metanorma/un/basicdoc.rng
+- lib/metanorma/un/biblio.rng
+- lib/metanorma/un/boilerplate.xml
+- lib/metanorma/un/converter.rb
 - lib/metanorma/un/input.rb
+- lib/metanorma/un/isodoc.rng
 - lib/metanorma/un/processor.rb
+- lib/metanorma/un/reqt.rng
+- lib/metanorma/un/un.rng
+- lib/metanorma/un/validate.rb
 - lib/metanorma/un/version.rb
 - metanorma-unece.gemspec
 homepage: https://github.com/metanorma/metanorma-un
@@ -292,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Metanorma for UN.

data/lib/asciidoctor/un.rb

@@ -1,7 +0,0 @@
-require "asciidoctor/un/converter"
-
-module Asciidoctor
-  module UN
-
-  end
-end