metanorma-ietf 3.0.11 → 3.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1deb99aa6937a5ecea906469cd404152a74945e6e6fb595262c52358841bc53
-  data.tar.gz: 0cd0c817dffcc423b00043479704a63851807d0e1aa0ea77856c80871e6d11df
+  metadata.gz: 39ea21861ccd96e10a9c03dcfa3672df68347437aed1c307680160a402195b4b
+  data.tar.gz: effa7116f2bf9f02e880e9fd2d478ef140aa45b520dc14d083dd1c6f409dad0f
 SHA512:
-  metadata.gz: 5ee37a0a08b9f25e7aea0a381e383e154dadff6fd0bd9196cf375b7a4e3b199f327426e9f210452bf1ae4513220e4a7b6f1790d67aaf6e4a409134772fa1888b
-  data.tar.gz: 4d1df87114db20f71ba28f2fea1f254f8bfb47a03db1269b8e6db1d0a10013dcd44f164a493f5c8b3409e0e1f311b2b7eb7d65dfe84401d70da76fbd13bb441d
+  metadata.gz: bdba57407ebf106d7ca311d94dfee3e778e6f1453de5a09772d42e1f696c6b951be24d2b84764d623fe8d9e3b81d192930881b6c9ed2619a630c30c0b52addce
+  data.tar.gz: f57b8315d127c4f7dacbd295d6a899855d5d4df1ee262a9e0d993b38126c82f8b4c4c7d22529895b0351a44303efb0f8107b2ed2d0d76b4d027e2790db9a900b

data/lib/isodoc/ietf/validation.rb

@@ -8,7 +8,7 @@ module IsoDoc
         errors = Jing.new(File.join(File.dirname(__FILE__), "v3.rng"))
           .validate(filename)
         errors.each do |error|
-          warn "RFC XML: Line #{'%06d' % error[:line]}:#{error[:column]} "\
+          warn "RFC XML: Line #{'%06d' % error[:line]}:#{error[:column]} " \
                "#{error[:message]}"
         end
       rescue Jing::Error => e
@@ -38,26 +38,35 @@ module IsoDoc
       def numbered_sections_check(xml)
         ret = []
         xml.xpath("//section[@numbered = 'false']").each do |s1|
-          s1.xpath("./section[not(@numbered) or @numbered = 'true']")
-            .each do |s2|
-            ret << "Numbered section #{label(s2)} under unnumbered section "\
-                   "#{label(s1)}"
-          end
-          s1.xpath("./following-sibling::*[name() = 'section']"\
-                   "[not(@numbered) or @numbered = 'true']").each do |s2|
-            ret << "Numbered section #{label(s2)} following unnumbered "\
-                   "section #{label(s1)}"
-          end
+          ret += numbered_sections_check1(s1)
+          ret += numbered_sections_check2(s1)
         end
         ret
       end
 
+      def numbered_sections_check1(section)
+        section.xpath("./section[not(@numbered) or @numbered = 'true']")
+          .each_with_object([]) do |s2, m|
+          m << "Numbered section #{label(s2)} under unnumbered section " \
+               "#{label(section)}"
+        end
+      end
+
+      def numbered_sections_check2(section)
+        section.xpath("./following-sibling::*[name() = 'section']" \
+                      "[not(@numbered) or @numbered = 'true']")
+          .each_with_object([]) do |s2, m|
+          m << "Numbered section #{label(s2)} following unnumbered " \
+               "section #{label(section)}"
+        end
+      end
+
       # 5.2.7.  Section "toc" attribute
       def toc_sections_check(xml)
         ret = []
         xml.xpath("//section[@toc = 'exclude']").each do |s1|
           s1.xpath(".//section[@toc = 'include']").each do |s2|
-            ret << "Section #{label(s2)} with toc=include is included in "\
+            ret << "Section #{label(s2)} with toc=include is included in " \
                    "section #{label(s1)} with toc=exclude"
           end
         end
@@ -69,14 +78,14 @@ module IsoDoc
       def references_check(xml)
         ret = []
         xml.xpath("//reference[not(@target)]").each do |s|
-          s.xpath(".//seriesInfo[@name = 'RFC' or @name = 'Internet-Draft' "\
+          s.xpath(".//seriesInfo[@name = 'RFC' or @name = 'Internet-Draft' " \
                   "or @name = 'DOI'][not(@value)]").each do |s1|
-            ret << "for reference #{s['anchor']}, the seriesInfo with "\
+            ret << "for reference #{s['anchor']}, the seriesInfo with " \
                    "name=#{s1['name']} has been given no value"
           end
         end
         xml.xpath("//references | //section").each do |s|
-          s.at("./name") or ret << "Cannot generate table of contents entry "\
+          s.at("./name") or ret << "Cannot generate table of contents entry " \
                                    "for #{label(s)}, as it has no title"
         end
         ret
@@ -95,48 +104,48 @@ module IsoDoc
           x.delete("section") if x["section"] && x["section"].empty?
           if x["format"] == "title" && t.name == "reference"
             t.at("./front/title") or
-              ret << "reference #{t['anchor']} has been referenced by #{x.name} "\
+              ret << "reference #{t['anchor']} has been referenced by #{x.name} " \
                      "with format=title, but the reference has no title"
           end
           if x["format"] == "counter" && !%w(section table figure li
                                              reference references t dt).include?(t.name)
-            ret << "#{x.to_xml} with format=counter is only allowed for "\
-                   "clauses, tables, figures, list entries, definition terms, "\
+            ret << "#{x.to_xml} with format=counter is only allowed for " \
+                   "clauses, tables, figures, list entries, definition terms, " \
                    "paragraphs, bibliographies, and bibliographic entries"
           end
           if x["format"] == "counter" && t.name == "reference" && !x["section"]
-            ret << "reference #{t['anchor']} has been referenced by xref "\
-                   "#{x.to_xml} with format=counter, which requires a "\
+            ret << "reference #{t['anchor']} has been referenced by xref " \
+                   "#{x.to_xml} with format=counter, which requires a " \
                    "section attribute"
           end
           if x["format"] == "counter" && t.name == "li" && t.parent.name != "ol"
-            ret << "#{x.to_xml} with format=counter refers to an unnumbered "\
+            ret << "#{x.to_xml} with format=counter refers to an unnumbered " \
                    "list entry"
           end
           if x["format"] == "title" && %w(u author contact).include?(t.name)
-            ret << "#{x.to_xml} with format=title cannot reference a "\
+            ret << "#{x.to_xml} with format=title cannot reference a " \
                    "<#{t.name}> element"
           end
           if x["relative"] && !x["section"]
-            ret << "#{x.to_xml} with relative attribute requires a section "\
+            ret << "#{x.to_xml} with relative attribute requires a section " \
                    "attribute"
           end
           if (x["section"]) && t.name != "reference"
-            ret << "#{x.to_xml} has a section attribute, but #{x['target']} "\
+            ret << "#{x.to_xml} has a section attribute, but #{x['target']} " \
                    "points to a #{t.name}"
           end
           if (x["relative"]) && t.name != "reference"
-            ret << "#{x.to_xml} has a relative attribute, but #{x['target']} "\
+            ret << "#{x.to_xml} has a relative attribute, but #{x['target']} " \
                    "points to a #{t.name}"
           end
-          if !x["relative"] && x["section"] && !t.at(".//seriesInfo[@name = 'RFC' or @name = "\
+          if !x["relative"] && x["section"] && !t.at(".//seriesInfo[@name = 'RFC' or @name = " \
                                                      "'Internet-Draft']")
-            ret << "#{x.to_xml} must use a relative attribute, "\
+            ret << "#{x.to_xml} must use a relative attribute, " \
                    "since it does not point to a RFC or Internet-Draft reference"
           end
-          if x["relative"] && !(t.at(".//seriesInfo[@name = 'RFC' or @name = "\
+          if x["relative"] && !(t.at(".//seriesInfo[@name = 'RFC' or @name = " \
                                      "'Internet-Draft']") || t["target"])
-            ret << "need an explicit target= URL attribute in the reference "\
+            ret << "need an explicit target= URL attribute in the reference " \
                    "pointed to by #{x.to_xml}"
           end
         end
@@ -155,8 +164,8 @@ module IsoDoc
       def link_check(xml)
         l = xml&.at("//link[@rel = 'convertedFrom']")&.text
         !l || %r{^https://datatracker\.ietf\.org/doc/draft-}.match(l) or
-          return ["<link rel='convertedFrom'> (:derived-from: document "\
-                  "attribute) must start with "\
+          return ["<link rel='convertedFrom'> (:derived-from: document " \
+                  "attribute) must start with " \
                   "https://datatracker.ietf.org/doc/draft-"]
         []
       end
@@ -168,12 +177,12 @@ module IsoDoc
         rfcinfo = xml.at("//front//seriesInfo[@name = 'RFC']")
         rfcnumber = xml.root["number"]
         rfcinfo && rfcnumber && rfcnumber != rfcinfo["value"] and
-          ret << "Mismatch between <rfc number='#{rfcnumber}'> "\
-                 "(:docnumber: NUMBER) "\
-                 "and <seriesInfo name='RFC' value='#{rfcinfo['value']}'> "\
+          ret << "Mismatch between <rfc number='#{rfcnumber}'> " \
+                 "(:docnumber: NUMBER) " \
+                 "and <seriesInfo name='RFC' value='#{rfcinfo['value']}'> " \
                  "(:intended-series: TYPE NUMBER)"
         rfcinfo && !/^\d+$/.match(rfcnumber) and
-          ret << "RFC identifier <rfc number='#{rfcnumber}'> "\
+          ret << "RFC identifier <rfc number='#{rfcnumber}'> " \
                  "(:docnumber: NUMBER) must be a number"
         ret
       end
@@ -183,7 +192,7 @@ module IsoDoc
         xml.root["ipr"] or
           return ["Missing ipr attribute on <rfc> element (:ipr:)"]
         /trust200902$/.match(xml.root["ipr"]) or
-          return ["Unknown ipr attribute on <rfc> element (:ipr:): "\
+          return ["Unknown ipr attribute on <rfc> element (:ipr:): " \
                   "#{xml.root['ipr']}"]
         []
       end

data/lib/metanorma/ietf/basicdoc.rng

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <include href="biblio.rng">
-    <start>
-      <ref name="document"/>
-    </start>
-  </include>
   <define name="document">
     <element name="document">
       <optional>
@@ -1125,26 +1120,4 @@
       </zeroOrMore>
     </element>
   </define>
-  <define name="ext">
-    <element name="ext">
-      <ref name="BibDataExtensionType"/>
-    </element>
-  </define>
-  <define name="BibDataExtensionType">
-    <ref name="doctype"/>
-  </define>
-  <define name="doctype">
-    <element name="doctype">
-      <ref name="DocumentType"/>
-    </element>
-  </define>
-  <define name="DocumentType">
-    <value>document</value>
-  </define>
-  <define name="BibData">
-    <ref name="BibliographicItem"/>
-    <optional>
-      <ref name="ext"/>
-    </optional>
-  </define>
 </grammar>

data/lib/metanorma/ietf/biblio-standoc.rng

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+  <!--
+    Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
+    of relaton
+    
+    Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
+    (SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
+  -->
+  <include href="biblio.rng">
+    <define name="BibData">
+      <ref name="BibliographicItem"/>
+      <optional>
+        <ref name="ext"/>
+      </optional>
+    </define>
+  </include>
+  <define name="ext">
+    <element name="ext">
+      <ref name="BibDataExtensionType"/>
+    </element>
+  </define>
+  <define name="BibDataExtensionType">
+    <optional>
+      <attribute name="schema-version"/>
+    </optional>
+    <ref name="doctype"/>
+    <optional>
+      <ref name="docsubtype"/>
+    </optional>
+    <optional>
+      <ref name="editorialgroup"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="ics"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="structuredidentifier"/>
+    </zeroOrMore>
+  </define>
+  <define name="doctype">
+    <element name="doctype">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
+      <ref name="DocumentType"/>
+    </element>
+  </define>
+  <define name="DocumentType">
+    <value>document</value>
+  </define>
+  <define name="docsubtype">
+    <element name="subdoctype">
+      <ref name="DocumentSubtype"/>
+    </element>
+  </define>
+  <define name="DocumentSubtype">
+    <text/>
+  </define>
+  <define name="editorialgroup">
+    <element name="editorialgroup">
+      <oneOrMore>
+        <ref name="technical-committee"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="technical-committee">
+    <element name="technical-committee">
+      <ref name="IsoWorkgroup"/>
+    </element>
+  </define>
+  <define name="IsoWorkgroup">
+    <optional>
+      <attribute name="number"/>
+    </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
+    <optional>
+      <attribute name="identifier"/>
+    </optional>
+    <optional>
+      <attribute name="prefix"/>
+    </optional>
+    <text/>
+  </define>
+  <define name="ics">
+    <element name="ics">
+      <element name="code">
+        <text/>
+      </element>
+      <optional>
+        <element name="text">
+          <text/>
+        </element>
+      </optional>
+    </element>
+  </define>
+  <define name="structuredidentifier">
+    <element name="structuredidentifier">
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <oneOrMore>
+        <element name="agency">
+          <text/>
+        </element>
+      </oneOrMore>
+      <optional>
+        <element name="class">
+          <text/>
+        </element>
+      </optional>
+      <element name="docnumber">
+        <text/>
+      </element>
+      <optional>
+        <element name="partnumber">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="edition">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="version">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="supplementtype">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="supplementnumber">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="language">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="year">
+          <text/>
+        </element>
+      </optional>
+    </element>
+  </define>
+</grammar>

data/lib/metanorma/ietf/biblio.rng

@@ -33,9 +33,10 @@
       <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
     </data>
   </define>
-  <start>
-    <ref name="bibitem"/>
-  </start>
+  <!-- start = bibitem -->
+  <define name="BibData">
+    <ref name="BibliographicItem"/>
+  </define>
   <define name="status">
     <element name="status">
       <ref name="stage"/>
@@ -170,27 +171,30 @@
   </define>
   <define name="contributor">
     <element name="contributor">
-      <zeroOrMore>
+      <oneOrMore>
         <ref name="role"/>
-      </zeroOrMore>
+      </oneOrMore>
       <ref name="ContributorInfo"/>
     </element>
   </define>
   <define name="role">
     <element name="role">
-      <optional>
-        <attribute name="type">
-          <choice>
-            <value>author</value>
-            <value>performer</value>
-            <value>publisher</value>
-            <value>editor</value>
-            <value>adapter</value>
-            <value>translator</value>
-            <value>distributor</value>
-          </choice>
-        </attribute>
-      </optional>
+      <attribute name="type">
+        <choice>
+          <value>author</value>
+          <value>performer</value>
+          <value>publisher</value>
+          <value>editor</value>
+          <value>adapter</value>
+          <value>translator</value>
+          <value>distributor</value>
+          <value>realizer</value>
+          <value>owner</value>
+          <value>authorizer</value>
+          <value>enabler</value>
+          <value>subject</value>
+        </choice>
+      </attribute>
       <zeroOrMore>
         <ref name="roledescription"/>
       </zeroOrMore>
@@ -512,6 +516,17 @@
   </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>
@@ -524,6 +539,17 @@
   </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>
@@ -626,6 +652,9 @@
         <ref name="BibItemType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="schema-version"/>
+    </optional>
     <optional>
       <ref name="fetched"/>
     </optional>
@@ -720,6 +749,9 @@
         <ref name="BibItemType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="schema-version"/>
+    </optional>
     <optional>
       <ref name="fetched"/>
     </optional>

data/lib/metanorma/ietf/cleanup.rb

@@ -58,7 +58,7 @@ module Metanorma
         xmldoc
       end
 
-      def xref_to_eref(xref)
+      def xref_to_eref(xref, name)
         super
         xref.delete("format")
       end
@@ -77,7 +77,7 @@ module Metanorma
             x["uri"] = x["target"]
             x.delete("target")
           else
-            xref_to_eref(x)
+            xref_to_eref(x, "source")
           end
         end
       end