relaton-iec 1.7.4 → 1.8.0

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_iec.rb

@@ -10,12 +10,76 @@ require "relaton_iec/hash_converter"
 require "digest/md5"
 
 module RelatonIec
-  # Returns hash of XML reammar
-  # @return [String]
-  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
-    Digest::MD5.hexdigest grammars
+  class << self
+    # Returns hash of XML reammar
+    # @return [String]
+    def 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
+      Digest::MD5.hexdigest grammars
+    end
+
+    # @param code [String]
+    # @param lang [String]
+    # @return [String, nil]
+    def code_to_urn(code, lang = nil) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+      rest = code.downcase.sub(%r{
+        (?<head>[^\s]+)\s
+        (?<type>is|ts|tr|pas|srd|guide|tec|wp)?(?(<type>)\s)
+        (?<pnum>[\d-]+)\s?
+        (?<_dd>:)?(?(<_dd>)(?<date>[\d-]+)\s?)
+      }x, "")
+      m = $~
+      return unless m[:head] && m[:pnum]
+
+      deliv = /cmv|csv|exv|prv|rlv|ser/.match(code.downcase).to_s
+      urn = ["urn", "iec", "std", m[:head].split("/").join("-"), m[:pnum], m[:date], m[:type], deliv, lang]
+      (urn + ajunct_to_urn(rest)).join ":"
+    end
+
+    # @param urn [String]
+    # @return [Array<String>, nil] urn & language
+    def urn_to_code(urn) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+      fields = urn.upcase.split ":"
+      return if fields.size < 5
+
+      head, num, date, type, deliv, lang = fields[3, 8]
+      code = head.gsub("-", "/")
+      code += " #{type}" unless type.nil? || type.empty?
+      code += " #{num}"
+      code += ":#{date}" unless date.nil? || date.empty?
+      code += ajanct_to_code(fields[9..-1])
+      code += " #{deliv}" unless deliv.nil? || deliv.empty?
+      [code, lang&.downcase]
+    end
+
+    private
+
+    # @param fields [Array<String>]
+    # @return [String]
+    def ajanct_to_code(fields)
+      return "" if fields.nil? || fields.empty?
+
+      rel, type, num, date = fields[0..3]
+      code = (rel.empty? ? "/" : "+") + type + num
+      code += ":#{date}" unless date.empty?
+      code + ajanct_to_code(fields[4..-1])
+    end
+
+    # @param rest [String]
+    # @return [Array<String, nil>]
+    def ajunct_to_urn(rest)
+      r = rest.sub(%r{
+        (?<pl>\+|\/)(?(<pl>)(?<adjunct>(amd|cor|ish))(?<adjnum>\d+)\s?)
+        (?<_d2>:)?(?(<_d2>)(?<adjdt>[\d-]+)\s?)
+      }x, "")
+      m = $~ || {}
+      return [] unless m[:adjunct]
+
+      plus = "plus" if m[:pl] == "+"
+      urn = [plus, m[:adjunct], m[:adjnum], m[:adjdt]]
+      urn + ajunct_to_urn(r)
+    end
   end
 end

data/lib/relaton_iec/basic_block/alignment.rb

@@ -0,0 +1,30 @@
+module BasicBlock
+  class Alignment
+    ALIGNS = %w[left right center justified].freeze
+
+    #
+    # @param [String] content
+    #
+    def initialize(content)
+      unless ALIGNS.include?(content)
+        warn "[basic-block] WARNING: invalid alignment \"#{content}\""
+        warn "[basic-block] alloved aligments are: #{ALIGNS.join ', '}"
+      end
+      @content = content
+    end
+
+    #
+    # @return [String]
+    #
+    def to_s
+      @content
+    end
+
+    #
+    # @return [String]
+    #
+    def inspect
+      to_s
+    end
+  end
+end

data/lib/relaton_iec/basic_block/basic_block.rb

@@ -0,0 +1,15 @@
+require_relative "alignment"
+require_relative "citation_type"
+require_relative "dl"
+require_relative "eref_type"
+require_relative "eref"
+require_relative "formula"
+require_relative "image"
+require_relative "index_xref"
+require_relative "index"
+require_relative "note"
+require_relative "paragraph_with_footnote"
+require_relative "paragraph"
+require_relative "reference_format"
+require_relative "stem"
+require_relative "text_element"

data/lib/relaton_iec/basic_block/citation_type.rb

@@ -0,0 +1,32 @@
+module RelatonIec
+  class CitationType
+    # @return [String]
+    attr_reader :bibitemid
+
+    # @return [Array<elatonBib::Locality, RelatonBib::LocalityStack>]
+    attr_reader :locality
+
+    # @return [String, nil]
+    attr_reader :date
+
+    #
+    # @param [String] bibitemid
+    # @param [Array<RelatonBib::Locality, RelatonBib::LocalityStack>] locality
+    # @param [String, nil] date
+    #
+    def initialize(bibitemid:, locality:, date: nil)
+      @bibitemid = bibitemid
+      @locality = locality
+      @date = date
+    end
+
+    #
+    # @param [Nokogiri::XML::Builder] builder
+    #
+    def to_xml(builder)
+      builder.parent[:bibitemid] = bibitemid
+      locality.each { |l| l.to_xml builder }
+      builder.date date if date
+    end
+  end
+end