metanorma-ietf 3.1.5 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1de8bb90257472a5f374f7fd19856322e1f69e0510eedafde925e2f935883f8
-  data.tar.gz: d6b838f193f84b6c78df8ccad0e4d15f2ba46f1cd81a58d05751287561a96bfd
+  metadata.gz: 1e369ff9743d4d7458c716e2d5657b3211afd6e00f2d2edff2fabc296fb9a928
+  data.tar.gz: 7ff3c2920d93555731eb5a532cc2a179e44e045b259cd088e27fe10596240ef9
 SHA512:
-  metadata.gz: d75bd0f7b1c507efaae0514a050fa41ab81b14e4cd10677dbeed3f194a609c325a12931ff015c1bcac305a921c9d798d4153ebb87ff5db4ba321d04db32b7d64
-  data.tar.gz: dd62ea88a5a93d0b22f189ed4c9268b9d9bfcae0d2fa3b8c59d2e41fdab7d5d8a3e6eabe48b0fa454ce927c6e85947eca3b0bae9534a3e52e5f043fc1bc3d758
+  metadata.gz: 0fde6762789876d636a84673ae6a86e9742a6b9b7165ef50eaf3dc5ef2f57f6c4928de9a6a9ffae382eef3956596d23e18f026adde2ce4d8bac6d0292cf3c867
+  data.tar.gz: 388e7f69a84adad887fe3dac523f52758f9ef0fd8456c25071c993508915ef5a131d0773e8b1ffbd921b2e509f505837f0a1a8ed907f47b78420b50b39887ae2

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/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"/>
@@ -1008,6 +1012,7 @@
       <ref name="del"/>
       <ref name="span"/>
       <ref name="erefstack"/>
+      <ref name="date_inline"/>
     </choice>
   </define>
   <define name="add">
@@ -1049,6 +1054,23 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="date_inline">
+    <element name="date">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="format"/>
+      </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>
@@ -1349,15 +1371,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"/>
@@ -2131,6 +2157,7 @@
     <choice>
       <value>identical</value>
       <value>modified</value>
+      <value>adapted</value>
       <value>restyled</value>
       <value>context-added</value>
       <value>generalisation</value>

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.1.5".freeze
+    VERSION = "3.1.7".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath