relaton-iso-bib 1.7.0 → 1.9.0

data/grammars/isostandard.rng

@@ -38,6 +38,12 @@
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
+      <optional>
+        <ref name="horizontal"/>
+      </optional>
       <ref name="editorialgroup"/>
       <zeroOrMore>
         <ref name="ics"/>
@@ -76,19 +82,6 @@
         </choice>
       </element>
     </define>
-    <define name="ul">
-      <element name="ul">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <oneOrMore>
-          <ref name="ul_li"/>
-        </oneOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </element>
-    </define>
     <define name="sections">
       <element name="sections">
         <zeroOrMore>
@@ -108,7 +101,11 @@
           <ref name="definitions"/>
         </optional>
         <oneOrMore>
-          <ref name="clause"/>
+          <choice>
+            <ref name="clause"/>
+            <ref name="term-clause"/>
+            <ref name="terms"/>
+          </choice>
         </oneOrMore>
       </element>
     </define>
@@ -137,18 +134,24 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <ref name="section-title"/>
       </optional>
       <choice>
-        <group>
-          <oneOrMore>
-            <ref name="BasicBlock"/>
-          </oneOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
+        <choice>
+          <group>
+            <oneOrMore>
+              <ref name="BasicBlock"/>
+            </oneOrMore>
+            <zeroOrMore>
+              <ref name="note"/>
+            </zeroOrMore>
+          </group>
+          <ref name="amend"/>
+        </choice>
         <oneOrMore>
           <ref name="clause-subsection"/>
         </oneOrMore>
@@ -183,17 +186,6 @@
         </zeroOrMore>
       </element>
     </define>
-    <define name="definition">
-      <element name="definition">
-        <oneOrMore>
-          <choice>
-            <ref name="paragraph"/>
-            <ref name="figure"/>
-            <ref name="formula"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
     <define name="annex">
       <element name="annex">
         <optional>
@@ -271,6 +263,15 @@
         <value>guide</value>
         <value>amendment</value>
         <value>technical-corrigendum</value>
+        <value>directive</value>
+      </choice>
+    </define>
+    <define name="DocumentSubtype">
+      <choice>
+        <value>specification</value>
+        <value>method-of-test</value>
+        <value>vocabulary</value>
+        <value>code-of-practice</value>
       </choice>
     </define>
     <define name="structuredidentifier">
@@ -324,6 +325,11 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="inline-header">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -332,6 +338,12 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="number"/>
+      </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <ref name="section-title"/>
       </optional>
@@ -349,54 +361,6 @@
         </oneOrMore>
       </choice>
     </define>
-    <define name="table">
-      <element name="table">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <optional>
-          <attribute name="width"/>
-        </optional>
-        <optional>
-          <attribute name="unnumbered">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="number"/>
-        </optional>
-        <optional>
-          <attribute name="subsequence"/>
-        </optional>
-        <optional>
-          <attribute name="alt"/>
-        </optional>
-        <optional>
-          <attribute name="summary"/>
-        </optional>
-        <optional>
-          <attribute name="uri">
-            <data type="anyURI"/>
-          </attribute>
-        </optional>
-        <optional>
-          <ref name="tname"/>
-        </optional>
-        <optional>
-          <ref name="thead"/>
-        </optional>
-        <ref name="tbody"/>
-        <optional>
-          <ref name="tfoot"/>
-        </optional>
-        <zeroOrMore>
-          <ref name="table-note"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="dl"/>
-        </optional>
-      </element>
-    </define>
   </include>
   <!-- end overrides -->
   <!--
@@ -416,6 +380,9 @@
       <zeroOrMore>
         <ref name="termdocsource"/>
       </zeroOrMore>
+      <optional>
+        <ref name="misccontainer"/>
+      </optional>
       <optional>
         <ref name="boilerplate"/>
       </optional>
@@ -427,6 +394,14 @@
         <ref name="annex"/>
       </zeroOrMore>
       <ref name="bibliography"/>
+      <zeroOrMore>
+        <ref name="indexsect"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="horizontal">
+    <element name="horizontal">
+      <data type="boolean"/>
     </element>
   </define>
   <define name="documentnumber">
@@ -510,28 +485,6 @@
       <ref name="Clause-Section"/>
     </element>
   </define>
-  <define name="ul_li">
-    <element name="li">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="uncheckedcheckbox">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="checkedcheckbox">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <oneOrMore>
-        <ref name="BasicBlock"/>
-      </oneOrMore>
-    </element>
-  </define>
   <define name="stagename">
     <element name="stagename">
       <text/>

data/grammars/reqt.rng

@@ -30,15 +30,34 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <attribute name="subsequence"/>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <attribute name="id">
       <data type="ID"/>
     </attribute>
     <optional>
       <attribute name="filename"/>
     </optional>
+    <optional>
+      <attribute name="model"/>
+    </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
@@ -48,9 +67,9 @@
     <optional>
       <ref name="subject"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="reqinherit"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="classification"/>
     </zeroOrMore>
@@ -135,6 +154,16 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <oneOrMore>
       <ref name="BasicBlock"/>
     </oneOrMore>

data/lib/relaton_iso_bib/editorial_group.rb

@@ -35,13 +35,13 @@ module RelatonIsoBib
     # @param secretariat [String, NilClass]
     def initialize(technical_committee:, **args) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize
       @technical_committee = technical_committee.map do |tc|
-        tc.is_a?(Hash) ? IsoSubgroup.new(tc) : tc
+        tc.is_a?(Hash) ? RelatonBib::WorkGroup.new(**tc) : tc
       end
       @subcommittee = args.fetch(:subcommittee, []).map do |sc|
-        sc.is_a?(Hash) ? IsoSubgroup.new(sc) : sc
+        sc.is_a?(Hash) ? RelatonBib::WorkGroup.new(**sc) : sc
       end
       @workgroup = args.fetch(:workgroup, []).map do |wg|
-        wg.is_a?(Hash) ? IsoSubgroup.new(wg) : wg
+        wg.is_a?(Hash) ? RelatonBib::WorkGroup.new(**wg) : wg
       end
       @secretariat = args[:secretariat]
     end
@@ -86,7 +86,7 @@ module RelatonIsoBib
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "") # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       pref += "editorialgroup"
       out = ""
       technical_committee.each do |tc|
@@ -105,48 +105,48 @@ module RelatonIsoBib
   end
 
   # ISO subgroup.
-  class IsoSubgroup
-    # @return [String, NilClass]
-    attr_reader :type
-
-    # @return [Integer, NilClass]
-    attr_reader :number
-
-    # @return [String]
-    attr_reader :name
-
-    # @param name [String]
-    # @param type [String, NilClass]
-    # @param number [Integer, NilClass]
-    def initialize(name:, type: nil, number: nil)
-      @name   = name
-      @type   = type
-      @number = number
-    end
-
-    # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder)
-      builder.parent[:number] = number if number
-      builder.parent[:type] = type if type
-      builder.text name
-    end
-
-    # @return [Hash]
-    def to_hash
-      hash = { "name" => name }
-      hash["type"] = type if type
-      hash["number"] = number if number
-      hash
-    end
-
-    # @param prefix [String]
-    # @param count [Integer] number of the elements
-    def to_asciibib(prefix, count = 1)
-      out = count > 1 ? "#{prefix}::\n" : ""
-      out += "#{prefix}.type:: #{type}\n" if type
-      out += "#{prefix}.number:: #{number}\n" if number
-      out += "#{prefix}.name:: #{name}\n"
-      out
-    end
-  end
+  # class IsoSubgroup
+  #   # @return [String, NilClass]
+  #   attr_reader :type
+
+  #   # @return [Integer, NilClass]
+  #   attr_reader :number
+
+  #   # @return [String]
+  #   attr_reader :name
+
+  #   # @param name [String]
+  #   # @param type [String, NilClass]
+  #   # @param number [Integer, NilClass]
+  #   def initialize(name:, type: nil, number: nil)
+  #     @name   = name
+  #     @type   = type
+  #     @number = number
+  #   end
+
+  #   # @param builder [Nokogiri::XML::Builder]
+  #   def to_xml(builder)
+  #     builder.parent[:number] = number if number
+  #     builder.parent[:type] = type if type
+  #     builder.text name
+  #   end
+
+  #   # @return [Hash]
+  #   def to_hash
+  #     hash = { "name" => name }
+  #     hash["type"] = type if type
+  #     hash["number"] = number if number
+  #     hash
+  #   end
+
+  #   # @param prefix [String]
+  #   # @param count [Integer] number of the elements
+  #   def to_asciibib(prefix, count = 1)
+  #     out = count > 1 ? "#{prefix}::\n" : ""
+  #     out += "#{prefix}.type:: #{type}\n" if type
+  #     out += "#{prefix}.number:: #{number}\n" if number
+  #     out += "#{prefix}.name:: #{name}\n"
+  #     out
+  #   end
+  # end
 end

data/lib/relaton_iso_bib/hash_converter.rb

@@ -9,7 +9,7 @@ module RelatonIsoBib
       # @param item [Hash]
       # @retirn [RelatonIsoBib::IsoBibliographicItem]
       def bib_item(item)
-        IsoBibliographicItem.new(item)
+        IsoBibliographicItem.new(**item)
       end
 
       #
@@ -18,7 +18,7 @@ module RelatonIsoBib
       # @param title [Hash]
       # @return [RelatonBib::TypedTitleString]
       def typed_title_strig(title)
-        RelatonBib::TypedTitleString.new title
+        RelatonBib::TypedTitleString.new(**title)
       end
 
       # @param ret [Hash]
@@ -45,9 +45,7 @@ module RelatonIsoBib
       def structuredidentifier_hash_to_bib(ret)
         return unless ret[:structuredidentifier]
 
-        ret[:structuredidentifier] = RelatonIsoBib::StructuredIdentifier.new(
-          ret[:structuredidentifier],
-        )
+        ret[:structuredidentifier] = RelatonIsoBib::StructuredIdentifier.new(**ret[:structuredidentifier])
       end
     end
   end