metanorma-ietf 3.0.1 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a30dfa750747253b30b4f126a42af57de34cf3dfa8aadb9fea370479318dbbca
-  data.tar.gz: efc69ed17e66a50bf4ee3dfcabac1142602e1447a41c7b06f5551355ee5860c5
+  metadata.gz: 51d0713bcfae4cec3a50c1c840c445df4b12d0b7c8b31ae75eae87ef5dde0a67
+  data.tar.gz: 62ca2ad04f15976d681a621d399bb463cf339d496b98a8111cf4ec8ef9792c8a
 SHA512:
-  metadata.gz: 889ffb5917a97616ff220dda0fb23167e13180f107cfd9adef5c395dbc35079927fdb671a4018e1c920fbecc1f2c35c8b2faca7169a2b1c6106b1d6c47dc81c1
-  data.tar.gz: ce7908251bcc737ca78a1233d7d35d79636bd5a356ec1aa0de262659f93c06a66af7702002c1471e8be873e77f334a830ecbb7d5cad5ae569718b5fdda80d894
+  metadata.gz: dfb117a7bae17c2ad66302424b97672dc35bbc4b710af759c4e191c9a01dfa4d30326324786760cc5437b845e7941472fd524dc8b6ee9b85cb94f8ef29424dd4
+  data.tar.gz: a4ecb6cc11f97bde100cb8c9a8870379ddd732fcf638abf6b928502b056c95e80ed82c044a65998f5b1e871bf2a9b6dc21d3ac58a4c388168ea97e09191ffac5

data/lib/isodoc/ietf/inline.rb

@@ -107,10 +107,10 @@ module IsoDoc
       end
 
       def get_linkend(node)
-        contents = node.children.reject do |c|
-                     %w{locality localityStack}.include? c.name
-                   end
-          .select { |c| !c.text? || /\S/.match(c) }
+        no_loc_contents = node.children.reject do |c|
+          %w{locality localityStack location}.include? c.name
+        end
+        contents = no_loc_contents.select { |c| !c.text? || /\S/.match(c) }
         !contents.empty? and
           return Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
         ""
@@ -122,9 +122,10 @@ module IsoDoc
         end
         relative = node["relative"] ||
           node.at(ns(".//locality[@type = 'anchor']/referenceFrom"))&.text || ""
-        section = eref_clause(node.xpath(ns("./locality | ./localityStack")),
-                              nil) || ""
-        #section = "" unless relative.empty?
+        section = @isodoc.eref_localities(
+          node.xpath(ns("./locality | ./localityStack")), nil, node
+        )&.sub(/^,/, "")&.sub(/^\s*(Section|Clause)/, "")&.strip&.sub(/,$/, "") || ""
+        # section = "" unless relative.empty?
         out.relref **attr_code(target: node["bibitemid"], section: section,
                                relative: relative,
                                displayFormat: node["displayFormat"]) do |l|
@@ -132,30 +133,6 @@ module IsoDoc
                                end
       end
 
-      def eref_clause(refs, target)
-        ret = []
-        ret1 = ""
-        refs.each do |l|
-          if l.name == "localityStack"
-            ret << ret1
-            ret1 = ""
-            ret << eref_clause1(l.elements, target)
-          else ret1 += eref_clause1([l], target)
-          end
-        end
-        ret << ret1
-        ret.reject { |c| c.nil? || c.empty? }.join("; ")
-      end
-
-      def eref_clause1(refs, _target)
-        refs.each do |l|
-          next unless %w(clause section).include? l["type"]
-
-          return l&.at(ns("./referenceFrom"))&.text
-        end
-        ""
-      end
-
       def index_parse(node, out)
         out.iref nil, **attr_code(item: node.at(ns("./primary")).text,
                                   primary: node["primary"],

data/lib/isodoc/ietf/rfc_convert.rb

@@ -13,85 +13,89 @@ require_relative "./validation"
 require_relative "./xref"
 require_relative "./init"
 
-module IsoDoc::Ietf
-  class RfcConvert < ::IsoDoc::Convert
-    def convert1(docxml, _filename, _dir)
-      @xrefs.parse docxml
-      info docxml, nil
-      xml = noko do |xml|
-        xml.rfc **attr_code(rfc_attributes(docxml)) do |html|
-          make_link(html, docxml)
-          make_front(html, docxml)
-          make_middle(html, docxml)
-          make_back(html, docxml)
-        end
-      end.join("\n").sub(/<!DOCTYPE[^>]+>\n/, "")
-      set_pis(docxml, Nokogiri::XML(xml))
-    end
+module IsoDoc
+  module Ietf
+    class RfcConvert < ::IsoDoc::Convert
+      def convert1(docxml, _filename, _dir)
+        @xrefs.parse docxml
+        info docxml, nil
+        ret = noko do |xml|
+          xml.rfc **attr_code(rfc_attributes(docxml)) do |html|
+            make_link(html, docxml)
+            make_front(html, docxml)
+            make_middle(html, docxml)
+            make_back(html, docxml)
+          end
+        end.join("\n").sub(/<!DOCTYPE[^>]+>\n/, "")
+        set_pis(docxml, Nokogiri::XML(ret))
+      end
 
-    def metadata_init(lang, script, i18n)
-      @meta = Metadata.new(lang, script, i18n)
-    end
+      def metadata_init(lang, script, i18n)
+        @meta = Metadata.new(lang, script, i18n)
+      end
 
-    def xref_init(lang, script, klass, i18n, options)
-      @xrefs = Xref.new(lang, script, klass, i18n, options)
-    end
+      def xref_init(lang, script, klass, i18n, options)
+        @xrefs = Xref.new(lang, script, klass, i18n, options)
+      end
 
-    def extract_delims(text)
-      @openmathdelim = "$$"
-      @closemathdelim = "$$"
-      while %r{#{Regexp.escape(@openmathdelim)}}m.match(text) ||
-          %r{#{Regexp.escape(@closemathdelim)}}m.match(text)
-        @openmathdelim += "$"
-        @closemathdelim += "$"
+      def extract_delims(text)
+        @openmathdelim = "$$"
+        @closemathdelim = "$$"
+        while %r{#{Regexp.escape(@openmathdelim)}}m.match(text) ||
+            %r{#{Regexp.escape(@closemathdelim)}}m.match(text)
+          @openmathdelim += "$"
+          @closemathdelim += "$"
+        end
+        [@openmathdelim, @closemathdelim]
       end
-      [@openmathdelim, @closemathdelim]
-    end
 
-    def error_parse(node, out)
-      case node.name
-      when "bcp14" then bcp14_parse(node, out)
-      when "concept" then concept_parse(node, out)
-      when "verbal-definition", "non-verbal-representation"
-        node.elements.each { |n| parse(n, out) }
-      else
-        text = node.to_xml.gsub(/</, "&lt;").gsub(/>/, "&gt;")
-        out.t { |p| p << text }
+      def error_parse(node, out)
+        case node.name
+        when "bcp14" then bcp14_parse(node, out)
+        when "concept" then concept_parse(node, out)
+        when "verbal-definition", "non-verbal-representation"
+          node.elements.each { |n| parse(n, out) }
+        else
+          text = node.to_xml.gsub(/</, "&lt;").gsub(/>/, "&gt;")
+          out.t { |p| p << text }
+        end
       end
-    end
 
-    def omit_docid_prefix(prefix)
-      return true if %w(IETF RFC).include?(prefix)
+      def omit_docid_prefix(prefix)
+        return true if %w(IETF RFC).include?(prefix)
 
-      super
-    end
+        super
+      end
 
-    def textcleanup(docxml)
-      passthrough_cleanup(docxml)
-    end
+      def textcleanup(docxml)
+        passthrough_cleanup(docxml)
+      end
 
-    def postprocess(result, filename, _dir)
-      result = from_xhtml(cleanup(to_xhtml(textcleanup(result))))
-        .sub(/<!DOCTYPE[^>]+>\n/, "")
-        .sub(/(<rfc[^<]+? )lang="[^"]+"/, "\\1")
-      File.open(filename, "w:UTF-8") { |f| f.write(result) }
-      schema_validate(filename)
-      @files_to_delete.each { |f| FileUtils.rm_rf f }
-      content_validate(to_xhtml(result), filename)
-    end
+      def postprocess(result, filename, _dir)
+        result = from_xhtml(cleanup(to_xhtml(textcleanup(result))))
+          .sub(/<!DOCTYPE[^>]+>\n/, "")
+          .sub(/(<rfc[^<]+? )lang="[^"]+"/, "\\1")
+        File.open(filename, "w:UTF-8") { |f| f.write(result) }
+        schema_validate(filename)
+        @files_to_delete.each { |f| FileUtils.rm_rf f }
+        content_validate(to_xhtml(result), filename)
+      end
 
-    def init_file(filename, debug)
-      filename = filename.sub(/\.rfc\.xml$/, ".rfc")
-      super
-    end
+      def init_file(filename, debug)
+        filename = filename.sub(/\.rfc\.xml$/, ".rfc")
+        super
+      end
 
-    def initialize(options)
-      super
-      @xinclude = options[:use_xinclude] == "true"
-      @format = :rfc
-      @suffix = "rfc.xml"
-    end
+      def initialize(options)
+        super
+        @xinclude = options[:use_xinclude] == "true"
+        @format = :rfc
+        @suffix = "rfc.xml"
+        @isodoc = IsoDoc::PresentationXMLConvert.new({})
+        @isodoc.i18n_init("en", "Latn")
+      end
 
-    include ::IsoDoc::Ietf::Init
+      include ::IsoDoc::Ietf::Init
+    end
   end
 end

data/lib/isodoc/ietf/terms.rb

@@ -47,7 +47,7 @@ module IsoDoc
       def termdef_parse(node, out)
         set_termdomain("")
         node.xpath(ns("./definition")).size > 1 and
-          IsoDoc::PresentationXMLConvert.new({}).multidef(node)
+          @isodoc.multidef(node)
         clause_parse(node, out)
       end
 

data/lib/isodoc/ietf/xref.rb

@@ -9,6 +9,7 @@ module IsoDoc
           notes = t.xpath(ns(".//termnote"))
           notes.each do |n|
             next if n["id"].nil? || n["id"].empty?
+
             idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
             @anchors[n["id"]] =
               anchor_struct(idx, n, @labels["note_xref"], "note", false)

data/lib/metanorma/ietf/ietf.rng

@@ -345,7 +345,7 @@
         <optional>
           <attribute name="format"/>
         </optional>
-        <text/>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">

data/lib/metanorma/ietf/isodoc.rng

@@ -152,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -188,6 +186,42 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </define>
+    <define name="localityStack">
+      <element name="localityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sourceLocalityStack">
+      <element name="sourceLocalityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -1098,6 +1132,16 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="image" combine="choice">
+    <element name="svg">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -2631,4 +2675,30 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefBody">
+    <zeroOrMore>
+      <ref name="XrefTarget"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="XrefTarget">
+    <element name="location">
+      <attribute name="target">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+      <attribute name="connective">
+        <choice>
+          <value>and</value>
+          <value>or</value>
+          <value>from</value>
+          <value>to</value>
+          <value/>
+        </choice>
+      </attribute>
+    </element>
+  </define>
 </grammar>

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.0.1".freeze
+    VERSION = "3.0.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath