metanorma-ietf 3.1.4 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77f374d41d27e5ae1c4180f322ac2bba54ff71bc94676c138f01441349155904
-  data.tar.gz: 4e1ce912a2612cc577c26eebeaf38baca2fb9bd128fce58ce94b0ce61bbf4691
+  metadata.gz: 964f8ef59757342a374a94bb7aafa59e6486f54333a72e22d9b4d6de87c13277
+  data.tar.gz: a146d584aed9903007f40ab0d899bb517ec247c49adb40e1e5abcc1bb4cfabac
 SHA512:
-  metadata.gz: a1be7b947dd7e087e48721cea713fa11238809ebf64daa1e7442a12215b60e444a7d0e1ff5a387f2ddee50246d737b3f7359100f34a7dcae45e2632f2824ceaa
-  data.tar.gz: ad196ce8dabad6753c5d31cc022ea3c864b656a184d6fc6e46cd8482326714082833e8d8455636e9172cbf593945931c4e02ede4dfe1fd6a6909f9775c098cf7
+  metadata.gz: 02cb6e4655562acc988f616a222d415369677abcdf759fd2883e05401b535f8f6d30ec31b6be095f5ef9e0f638c643f541f73e3687c956141a06c6121e0d43b0
+  data.tar.gz: 5cb6eb0d2e991ff34419b62f07b9fd7d386fe52bb6af1bae8f51b599ed5ec61eea698c86d6225f1e8130a2979754b90e9263b6ca3a3283db59c9810aab7946b3

data/lib/isodoc/ietf/blocks.rb

@@ -87,8 +87,8 @@ module IsoDoc
             p << note_label(node)
             first.name == "p" and first.children.each { |n| parse(n, p) }
           end
-          first.name == "p" and
-            node.elements.drop(1).each { |n| parse(n, out) } or
+          (first.name == "p" and
+            node.elements.drop(1).each { |n| parse(n, out) }) or
             node.children.each { |n| parse(n, out) }
         end
       end
@@ -112,13 +112,21 @@ module IsoDoc
         end
       end
 
+      def source_parse(node, out)
+        termref_parse(node, out)
+      end
+
       def sourcecode_parse(node, out)
         out.sourcecode **attr_code(
           anchor: node["id"], type: node["lang"], name: node["filename"],
           markers: node["markers"], src: node["src"]
         ) do |s|
-          node.children.each { |x| parse(x, s) unless x.name == "name" }
+          node.children.each do |x|
+            %w(name dl).include?(x.name) and next
+            parse(x, s)
+          end
         end
+        annotation_parse(node, out)
       end
 
       def pre_parse(node, out)
@@ -130,13 +138,20 @@ module IsoDoc
 
       def annotation_parse(node, out)
         @sourcecode = false
-        @annotation = true
-        node.at("./preceding-sibling::*[local-name() = 'annotation']") or
-          out << "\n\n"
-        callout = node.at(ns("//callout[@target='#{node['id']}']"))
-        out << "\n&lt;#{callout.text}&gt; "
-        out << node&.children&.text&.strip
-        @annotation = false
+        node.at(ns("./annotation")) or return
+        out.t { |p| p << @i18n.key }
+        out.dl do |dl|
+          node.xpath(ns("./annotation")).each do |a|
+            annotation_parse1(a, dl)
+          end
+        end
+      end
+
+      def annotation_parse1(ann, dlist)
+        dlist.dt ann.at(ns("//callout[@target='#{ann['id']}']")).text
+        dlist.dd do |dd|
+          ann.children.each { |n| parse(n, dd) }
+        end
       end
 
       def formula_where(dlist, out)
@@ -189,7 +204,7 @@ module IsoDoc
       end
 
       def admonition_name_parse(_node, div, name)
-        div.t **{ keepWithNext: "true" } do |p|
+        div.t keepWithNext: "true" do |p|
           name.children.each { |n| parse(n, p) }
         end
       end
@@ -197,7 +212,7 @@ module IsoDoc
       def admonition_parse(node, out)
         type = node["type"]
         name = admonition_name(node, type)
-        out.aside **{ anchor: node["id"] } do |t|
+        out.aside anchor: node["id"] do |t|
           admonition_name_parse(node, t, name) if name
           node.children.each { |n| parse(n, t) unless n.name == "name" }
         end

data/lib/isodoc/ietf/inline.rb

@@ -93,7 +93,7 @@ module IsoDoc
 
       def image_title_parse(out, caption)
         unless caption.nil?
-          out.t **{ align: "center", keepWithPrevious: "true" } do |p|
+          out.t align: "center", keepWithPrevious: "true" do |p|
             p << caption.to_s
           end
         end
@@ -141,6 +141,14 @@ module IsoDoc
           &.sub(/,$/, "") || ""
       end
 
+      def origin_parse(node, out)
+        if t = node.at(ns("./termref"))
+          termrefelem_parse(t, out)
+        else
+          eref_parse(node, out)
+        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/table.rb

@@ -8,14 +8,19 @@ module IsoDoc
       def table_parse(node, out)
         @in_table = true
         out.table **table_attrs(node) do |t|
-          table_title_parse(node, out)
+          table_title_parse(node, t)
           thead_parse(node, t)
           tbody_parse(node, t)
           tfoot_parse(node, t)
         end
+        table_parse_tail(node, out)
+        @in_table = false
+      end
+
+      def table_parse_tail(node, out)
         (dl = node.at(ns("./dl"))) && parse(dl, out)
+        node.xpath(ns("./source")).each { |n| parse(n, out) }
         node.xpath(ns("./note")).each { |n| parse(n, out) }
-        @in_table = false
       end
 
       def table_title_parse(node, out)

data/lib/isodoc/ietf/terms.rb

@@ -37,13 +37,6 @@ module IsoDoc
         note_parse(node, out)
       end
 
-      def termref_parse(node, out)
-        out.t do |p|
-          p << "SOURCE: "
-          node.children.each { |n| parse(n, p) }
-        end
-      end
-
       def termdef_parse(node, out)
         set_termdomain("")
         node.xpath(ns("./definition")).size > 1 and
@@ -65,6 +58,38 @@ module IsoDoc
         parse(r, out)
         out << "]"
       end
+
+      def termsource_status(status)
+        case status
+        when "modified" then @i18n.modified
+        when "adapted" then @i18n.adapted
+        end
+      end
+
+      def termsource_add_modification_text(mod)
+        mod or return
+        mod.text.strip.empty? or mod.previous = " &#x2013; "
+        mod.elements.size == 1 and
+          mod.elements[0].replace(mod.elements[0].children)
+        mod.replace(mod.children)
+      end
+
+      def preprocess_termref(elem)
+        origin = elem.at(ns("./origin"))
+        s = termsource_status(elem["status"]) and origin.next = l10n(", #{s}")
+        termsource_add_modification_text(elem.at(ns("./modification")))
+        while elem&.next_element&.name == "termsource"
+          elem << "; #{to_xml(elem.next_element.remove.children)}"
+        end
+      end
+
+      def termref_parse(elem, out)
+        preprocess_termref(elem)
+        elem.children = l10n("[#{@i18n.source}: #{to_xml(elem.children).strip}]")
+        out.t do |p|
+          elem.children.each { |n| parse(n, p) }
+        end
+      end
     end
   end
 end

data/lib/metanorma/ietf/ietf.rng

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="https://www.metanorma.org/ns/ietf" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar ns='https://www.metanorma.org/ns/ietf' xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!--
+    VERSION v1.2.1
     Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
     we cannot have a new default namespace: we will end up with a grammar with two different
     namespaces, one for isostandard and one for ietf additions. And we do not want that.
@@ -584,13 +585,7 @@
   </define>
   <define name="ietf-standard">
     <element name="ietf-standard">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/metanorma/ietf/isodoc.rng

@@ -17,6 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
+<!-- VERSION v1.2.2 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -210,6 +211,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <ref name="CitationType"/>
       <oneOrMore>
         <ref name="PureTextElement"/>
@@ -382,6 +386,9 @@
         <optional>
           <ref name="dl"/>
         </optional>
+        <optional>
+          <ref name="source"/>
+        </optional>
       </element>
     </define>
     <define name="figure">
@@ -404,9 +411,6 @@
           <attribute name="class"/>
         </optional>
         <ref name="BlockAttributes"/>
-        <optional>
-          <ref name="source"/>
-        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -431,6 +435,20 @@
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
+        <optional>
+          <ref name="source"/>
+        </optional>
+      </element>
+    </define>
+    <define name="source">
+      <element name="source">
+        <attribute name="status">
+          <ref name="SourceStatusType"/>
+        </attribute>
+        <ref name="origin"/>
+        <optional>
+          <ref name="modification"/>
+        </optional>
       </element>
     </define>
     <define name="sourcecode">
@@ -1335,15 +1353,19 @@
       </choice>
     </element>
   </define>
+  <define name="Root-Attributes">
+    <attribute name="version"/>
+    <attribute name="schema-version"/>
+    <attribute name="type">
+      <choice>
+        <value>semantic</value>
+        <value>presentation</value>
+      </choice>
+    </attribute>
+  </define>
   <define name="standard-document">
     <element name="standard-document">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <optional>
         <ref name="misccontainer"/>
@@ -2099,10 +2121,7 @@
   <define name="termsource">
     <element name="termsource">
       <attribute name="status">
-        <choice>
-          <value>identical</value>
-          <value>modified</value>
-        </choice>
+        <ref name="SourceStatusType"/>
       </attribute>
       <attribute name="type">
         <choice>
@@ -2116,6 +2135,18 @@
       </optional>
     </element>
   </define>
+  <define name="SourceStatusType">
+    <choice>
+      <value>identical</value>
+      <value>modified</value>
+      <value>adapted</value>
+      <value>restyled</value>
+      <value>context-added</value>
+      <value>generalisation</value>
+      <value>specialisation</value>
+      <value>unspecified</value>
+    </choice>
+  </define>
   <define name="origin">
     <element name="origin">
       <choice>

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.1.4".freeze
+    VERSION = "3.1.6".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "metanorma-ietf-data"
-  spec.add_dependency "metanorma-standoc", "~> 2.4.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.4.2"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement