relaton-un 1.9.0 → 1.10.0

data/grammars/reqt.rng

@@ -64,9 +64,9 @@
     <optional>
       <ref name="label"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="subject"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="reqinherit"/>
     </zeroOrMore>
@@ -80,6 +80,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -105,12 +106,16 @@
   </define>
   <define name="subject">
     <element name="subject">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="reqinherit">
     <element name="inherit">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="measurementtarget">
@@ -138,6 +143,12 @@
       <ref name="RequirementSubpart"/>
     </element>
   </define>
+  <define name="component">
+    <element name="component">
+      <attribute name="class"/>
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
   <define name="reqt_references">
     <element name="references">
       <oneOrMore>

data/grammars/un.rng

@@ -96,7 +96,10 @@
     <define name="sections">
       <element name="sections">
         <oneOrMore>
-          <ref name="clause"/>
+          <choice>
+            <ref name="clause"/>
+            <ref name="floating-title"/>
+          </choice>
         </oneOrMore>
       </element>
     </define>
@@ -178,19 +181,15 @@
         <ref name="section-title"/>
       </optional>
       <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
         <zeroOrMore>
           <choice>
             <ref name="clause-subsection"/>
             <ref name="terms"/>
             <ref name="definitions"/>
+            <ref name="floating-title"/>
           </choice>
         </zeroOrMore>
       </group>
@@ -229,20 +228,16 @@
         <ref name="section-title"/>
       </optional>
       <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
         <zeroOrMore>
           <choice>
             <ref name="annex-subsection"/>
             <ref name="terms"/>
             <ref name="definitions"/>
             <ref name="references"/>
+            <ref name="floating-title"/>
           </choice>
         </zeroOrMore>
       </group>

data/lib/relaton_un/un_bibliographic_item.rb

@@ -25,13 +25,13 @@ module RelatonUn
     def initialize(**args)
       if args[:distribution] && !DISTRIBUTIONS.has_value?(args[:distribution])
         warn "[relaton-un] WARNING: invalid distribution: "\
-        "#{args[:distribution]}"
+             "#{args[:distribution]}"
       end
       @submissionlanguage = args.delete :submissionlanguage
       @distribution = args.delete :distribution
       @session = args.delete :session
       @job_number = args.delete :job_number
-      super **args
+      super(**args)
     end
 
     # @param opts [Hash]
@@ -40,7 +40,7 @@ module RelatonUn
     # @option opts [String] :lang language
     # @return [String] XML
     def to_xml(**opts) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-      super **opts do |b|
+      super(**opts) do |b|
         b.ext do
           b.doctype doctype if doctype
           submissionlanguage&.each { |sl| b.submissionlanguage sl }
@@ -68,7 +68,7 @@ module RelatonUn
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "") # rubocop:disable Metrics/AbcSize
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       out = super
       submissionlanguage.each do |sl|
         out += "#{pref}submissionlanguage:: #{sl}\n"

data/lib/relaton_un/version.rb

@@ -1,3 +1,3 @@
 module RelatonUn
-  VERSION = "1.9.0".freeze
+  VERSION = "1.10.0".freeze
 end

data/relaton_un.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "faraday"
   spec.add_dependency "http-cookie"
-  spec.add_dependency "relaton-bib", "~> 1.9.0"
+  spec.add_dependency "relaton-bib", "~> 1.10.0"
   spec.add_dependency "unf_ext", ">= 0.0.7.7"
 end
 # rubocop:enable Metrics/BlockLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-un
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2022-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: unf_ext
   requirement: !ruby/object:Gem::Requirement