relaton-iso-bib 1.6.pre1 → 1.8.1

data/grammars/isostandard.rng

@@ -38,6 +38,9 @@
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="horizontal"/>
+      </optional>
       <ref name="editorialgroup"/>
       <zeroOrMore>
         <ref name="ics"/>
@@ -76,19 +79,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>
@@ -137,22 +127,28 @@
           </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>
+      <group>
+        <choice>
+          <group>
+            <oneOrMore>
+              <ref name="BasicBlock"/>
+            </oneOrMore>
+            <zeroOrMore>
+              <ref name="note"/>
+            </zeroOrMore>
+          </group>
+          <ref name="amend"/>
+        </choice>
         <oneOrMore>
           <ref name="clause-subsection"/>
         </oneOrMore>
-      </choice>
+      </group>
     </define>
     <define name="term">
       <element name="term">
@@ -183,17 +179,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 +256,7 @@
         <value>guide</value>
         <value>amendment</value>
         <value>technical-corrigendum</value>
+        <value>directive</value>
       </choice>
     </define>
     <define name="structuredidentifier">
@@ -324,6 +310,11 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="inline-header">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -332,6 +323,12 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="number"/>
+      </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <ref name="section-title"/>
       </optional>
@@ -349,54 +346,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 +365,9 @@
       <zeroOrMore>
         <ref name="termdocsource"/>
       </zeroOrMore>
+      <optional>
+        <ref name="misccontainer"/>
+      </optional>
       <optional>
         <ref name="boilerplate"/>
       </optional>
@@ -427,6 +379,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 +470,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.rb

@@ -10,7 +10,7 @@ module RelatonIsoBib
   def self.grammar_hash
     gem_path = File.expand_path "..", __dir__
     grammars_path = File.join gem_path, "grammars", "*"
-    grammars = Dir[grammars_path].sort.map { |gp| File.read gp }.join
+    grammars = Dir[grammars_path].sort.map { |gp| File.read gp, encoding: "UTF-8" }.join
     Digest::MD5.hexdigest grammars
   end
 end

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) ? IsoSubgroup.new(**tc) : tc
       end
       @subcommittee = args.fetch(:subcommittee, []).map do |sc|
-        sc.is_a?(Hash) ? IsoSubgroup.new(sc) : sc
+        sc.is_a?(Hash) ? IsoSubgroup.new(**sc) : sc
       end
       @workgroup = args.fetch(:workgroup, []).map do |wg|
-        wg.is_a?(Hash) ? IsoSubgroup.new(wg) : wg
+        wg.is_a?(Hash) ? IsoSubgroup.new(**wg) : wg
       end
       @secretariat = args[:secretariat]
     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

data/lib/relaton_iso_bib/ics.rb

@@ -27,6 +27,7 @@ module RelatonIsoBib
     def to_hash
       hash = {}
       hash["code"] = code if code
+      hash["text"] = description if description
       hash
     end
 

data/lib/relaton_iso_bib/iso_bibliographic_item.rb

@@ -24,7 +24,7 @@ module RelatonIsoBib
     TYPES = %w[
       international-standard technical-specification technical-report
       publicly-available-specification international-workshop-agreement guide
-      amendment technical-corrigendum
+      amendment technical-corrigendum directive
     ].freeze
 
     # @return [RelatonIsoBib::StructuredIdentifier]
@@ -36,6 +36,9 @@ module RelatonIsoBib
     # @return [String, NilClass]
     attr_reader :doctype, :stagename
 
+    # @return [Boolean, nil]
+    attr_reader :horizontal
+
     # @return [RelatonIsoBib::EditorialGroup]
     attr_reader :editorialgroup
 
@@ -62,6 +65,8 @@ module RelatonIsoBib
     # @param classification [RelatonBib::Classification, NilClass]
     # @param validity [RelatonBib:Validity, NilClass]
     # @param docid [Array<RelatonBib::DocumentIdentifier>]
+    # @param doctype [String, nil]
+    # @param horizontal [Boolean, nil]
     # @param structuredidentifier [RelatonIsoBib::StructuredIdentifier]
     # @param stagename [String, NilClass]
     #
@@ -131,20 +136,20 @@ module RelatonIsoBib
            copyright link fetched docid formattedref extent accesslocation
            classification validity doctype keyword].include? k
       end
-      super super_args
+      super **super_args
 
       @type = args[:type] || "standard"
 
       if args[:editorialgroup]
         @editorialgroup = if args[:editorialgroup].is_a?(Hash)
-                            EditorialGroup.new(args[:editorialgroup])
+                            EditorialGroup.new(**args[:editorialgroup])
                           else args[:editorialgroup]
                           end
       end
 
       @structuredidentifier = args[:structuredidentifier]
-      # @doctype = args[:doctype] || "international-standard"
-      @ics = args.fetch(:ics, []).map { |i| i.is_a?(Hash) ? Ics.new(i) : i }
+      @horizontal = args[:horizontal]
+      @ics = args.fetch(:ics, []).map { |i| i.is_a?(Hash) ? Ics.new(**i) : i }
       @stagename = args[:stagename]
       @id_attribute = true
     end
@@ -156,22 +161,22 @@ module RelatonIsoBib
     # @return [String] XML
     def to_xml(**opts)
       super **opts do |b|
-        if opts[:bibdata] && (doctype || respond_to?(:committee) && committee ||
-          editorialgroup || ics.any? || structuredidentifier || stagename ||
-          block_given?)
+        if block_given? then yield b
+        elsif opts[:bibdata] && has_ext_attrs?
           b.ext do
             b.doctype doctype if doctype
-            b.docsubtype docsubtype if respond_to?(:docsubtype) && docsubtype
+            b.horizontal horizontal unless horizontal.nil?
+            # b.docsubtype docsubtype if respond_to?(:docsubtype) && docsubtype
             # GB renders gbcommittee elements istead of an editorialgroup
-            if respond_to? :committee
-              committee&.to_xml b
-            else
-              editorialgroup&.to_xml b
-            end
+            # if respond_to? :committee
+            #   committee&.to_xml b
+            # else
+            editorialgroup&.to_xml b
+            # end
             ics.each { |i| i.to_xml b }
             structuredidentifier&.to_xml b
             b.stagename stagename if stagename
-            yield b if block_given?
+            # yield b if block_given?
           end
         end
       end
@@ -183,6 +188,7 @@ module RelatonIsoBib
     # @return [Hash]
     def to_hash
       hash = super
+      hash["horizontal"] = horizontal unless horizontal.nil?
       hash["stagename"] = stagename if stagename
       hash
     end
@@ -190,7 +196,7 @@ module RelatonIsoBib
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "")
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       out = super
       out += "#{pref}stagename:: #{stagename}\n" if stagename
       out
@@ -218,5 +224,13 @@ module RelatonIsoBib
       end
       idstr&.gsub(/:/, "-")&.gsub(/\s/, "")&.strip
     end
+
+    #
+    # @return [Boolean]
+    #
+    def has_ext_attrs? # rubocop:disable Metrics/CyclomaticComplexity
+      (doctype || !horizontal.nil? || editorialgroup || ics.any? ||
+        structuredidentifier || stagename || horizontal)
+    end
   end
 end