metanorma-iso 2.9.6 → 3.0.1

data/lib/isodoc/iso/presentation_terms.rb

@@ -9,8 +9,9 @@ module IsoDoc
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
       def concept(docxml)
         concept_term(docxml)
-        docxml.xpath(ns("//concept")).each do |node|
-              node.ancestors("definition, termsource, related").empty? and
+        (docxml.xpath(ns("//concept")) - docxml.xpath(ns("//term//concept")))
+          .each do |node|
+          node.ancestors("definition, termsource, related").empty? and
           concept_render(node, ital: "false", ref: "false",
                                linkref: "true", linkmention: "false")
         end

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -207,22 +207,40 @@ module IsoDoc
       def table1(elem)
         table1_key(elem)
         if elem["class"] == "modspec"
-          n = elem.at(ns(".//fmt-name")).remove
-          n.name = "name"
+          if n = elem.at(ns(".//fmt-name"))
+            n.remove.name = "name"
           elem.add_first_child(n)
+          end
           elem.at(ns("./thead"))&.remove
           super
-          elem.at(ns("./name")).remove
+          elem.at(ns("./name"))&.remove
+          table1_fmt_xref_modspec(elem)
         else super
         end
       end
 
+      def table1_fmt_xref_modspec(elem)
+        p = elem.parent.parent.at(ns("./fmt-xref-label"))
+        t = elem.at(ns("./fmt-xref-label"))&.remove or return
+        n = t.at(ns("./span[@class='fmt-element-name'][2]")) or return
+        while i = n.next
+          i.remove
+        end
+        n.remove
+        p.children.first.previous = to_xml(t.children)
+      end
+
       def table1_key(elem)
         elem.xpath(ns(".//dl[@key = 'true'][not(./name)]")).each do |dl|
           dl.add_first_child "<name>#{@i18n.key}</name>"
         end
       end
 
+      def labelled_ancestor(elem, exceptions = [])
+        elem["class"] == "modspec" and return false
+        super
+      end
+
       def toc_title(docxml)
         %w(amendment technical-corrigendum).include?(@doctype) and return
         super

data/lib/isodoc/iso/xref.rb

@@ -197,15 +197,16 @@ module IsoDoc
       end
 
       def modspec_table_components_xrefs(table, table_label, container: false)
-        table.xpath(ns(".//tr[@id]")).each do |tr|
+        table.xpath(ns(".//tr[@id] | .//td[@id] | .//bookmark[@id]")).each do |tr|
           xref_to_modspec(tr["id"], table_label) or next
           container or @anchors[tr["id"]].delete(:container)
         end
       end
 
       def xref_to_modspec(id, table_label)
-        (@anchors[id] && !@anchors[id][:has_modspec]) or return
-        @anchors[id][:has_modspec] = true
+        #(@anchors[id] && !@anchors[id][:has_modspec]) or return
+        (@anchors[id] && !@anchors[id][:has_table_prefix]) or return
+        @anchors[id][:has_table_prefix] = true
         x = @anchors_previous[id][:xref_bare] || @anchors_previous[id][:xref]
         # @anchors[id][:xref] = l10n("#{table_label}<span class='fmt-comma'>,</span> #{x}")
 
@@ -217,6 +218,17 @@ module IsoDoc
         true
       end
 
+      def bookmark_anchor_names(xml)
+        xml.xpath(ns(".//bookmark")).noblank.each do |n|
+          @anchors.dig(n["id"], :has_table_prefix) and next
+          _parent, id = id_ancestor(n)
+          # container = bookmark_container(parent)
+          @anchors[n["id"]] = { type: "bookmark", label: nil, value: nil,
+                                xref: @anchors.dig(id, :xref) || "???",
+                                container: @anchors.dig(id, :container) }
+        end
+      end
+
       def hierarchical_table_names(clause, _num)
         super
         modspec_table_xrefs(clause) if @anchors_previous
@@ -235,6 +247,12 @@ module IsoDoc
                           { unnum: false, container: true })
         end
       end
+
+      # KILL
+      def sequential_permission_childrenx(elem, lbl, klass, container: false)
+        container = true
+        super
+      end
     end
   end
 end

data/lib/metanorma/iso/basicdoc.rng

@@ -599,17 +599,9 @@ It is included for convenience, in case processing the citation to extract the a
         <a:documentation>The caption of the block</a:documentation>
       </ref>
     </optional>
-    <oneOrMore>
-      <choice>
-        <text>
-          <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
-(The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
-        </text>
-        <ref name="callout">
-          <a:documentation>Zero or more cross-references; these are intended to be embedded within the content string, and link to annotations</a:documentation>
-        </ref>
-      </choice>
-    </oneOrMore>
+    <ref name="sourcecodebody">
+      <a:documentation>The sourcecode content</a:documentation>
+    </ref>
     <zeroOrMore>
       <ref name="annotation">
         <a:documentation>Annotations to the source code; each annotation consists of zero or more paragraphs,
@@ -628,17 +620,9 @@ and is intended to be referenced by a callout within the source code</a:document
         <a:documentation>The caption of the block</a:documentation>
       </ref>
     </optional>
-    <oneOrMore>
-      <choice>
-        <text>
-          <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
-(The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
-        </text>
-        <ref name="callout">
-          <a:documentation>Zero or more cross-references; these are intended to be embedded within the content string, and link to annotations</a:documentation>
-        </ref>
-      </choice>
-    </oneOrMore>
+    <ref name="sourcecodebody">
+      <a:documentation>The sourcecode content</a:documentation>
+    </ref>
     <zeroOrMore>
       <ref name="annotation">
         <a:documentation>Annotations to the source code; each annotation consists of zero or more paragraphs,
@@ -651,6 +635,20 @@ and is intended to be referenced by a callout within the source code</a:document
       </ref>
     </zeroOrMore>
   </define>
+  <define name="sourcecodebody">
+    <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
+(The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
+    <element name="body">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="callout">
+            <a:documentation>Zero or more cross-references; these are intended to be embedded within the content string, and link to annotations</a:documentation>
+          </ref>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="pre">
     <a:documentation>Pre-formatted block. Wrapper for text to be rendered with fixed-width typeface, and preserving spaces including line breaks. 
 They are intended for a restricted number of functions, most typically ASCII Art (which is still in prominent use in some 
@@ -1672,18 +1670,25 @@ which can be bookmarks as well as block or section references</a:documentation>
     </optional>
   </define>
   <define name="XrefBody">
-    <oneOrMore>
-      <ref name="PureTextElement">
-        <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
-      </ref>
-    </oneOrMore>
+    <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
+    <optional>
+      <element name="display-text">
+        <oneOrMore>
+          <ref name="PureTextElement"/>
+        </oneOrMore>
+      </element>
+    </optional>
   </define>
   <define name="ErefBody">
-    <oneOrMore>
-      <ref name="PureTextElement">
-        <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
-      </ref>
-    </oneOrMore>
+    <optional>
+      <element name="display-text">
+        <oneOrMore>
+          <ref name="PureTextElement">
+            <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
+          </ref>
+        </oneOrMore>
+      </element>
+    </optional>
   </define>
   <define name="fn">
     <a:documentation>Inline reference to a paragraph or paragraphs, appearing as a footnote.

data/lib/metanorma/iso/biblio.rng

@@ -947,6 +947,8 @@ May be electronic (e.g. Twitter direct message, email) or voice (e.g. a remark m
 typically cited as "personal communication")</a:documentation>
       <value>conversation</value>
       <a:documentation>An exchange of messages between two or more persons. May be electronic (e.g. web chat) or voice (e.g. phone call)</a:documentation>
+      <value>collection</value>
+      <a:documentation>A compound resource consisting of other resources, which are themselves presupposed to have their type specified..</a:documentation>
       <value>misc</value>
       <a:documentation>Bibliographic type not adequately described in the foregoing</a:documentation>
     </choice>

data/lib/metanorma/iso/front_id.rb

@@ -187,9 +187,10 @@ module Metanorma
 
       def iso_id_default(params)
         params_nolang = params.dup.tap { |hs| hs.delete(:language) }
-        params1 = if params[:unpublished]
-                    params_nolang.dup.tap { |hs| hs.delete(:year) }
-                  else params_nolang end
+        #params1 = if params[:unpublished]
+                    #params_nolang.dup.tap { |hs| hs.delete(:year) }
+                  #else params_nolang end
+        params1 = params_nolang
         params1.delete(:unpublished)
         pubid_select(params1).create(**params1)
       end
@@ -204,9 +205,10 @@ module Metanorma
       end
 
       def iso_id_with_lang(params)
-        params1 = if params[:unpublished]
-                    params.dup.tap { |hs| hs.delete(:year) }
-                  else params end
+        #params1 = if params[:unpublished]
+                    #params.dup.tap { |hs| hs.delete(:year) }
+                  #else params end
+        params1 = params
         params1.delete(:unpublished)
         pubid_select(params1).create(**params1)
       end

data/lib/metanorma/iso/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.4.1 -->
+<!-- VERSION v2.0.0 -->
 <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">
@@ -245,23 +245,9 @@
           <a:documentation>The caption of the block</a:documentation>
         </ref>
       </optional>
-      <oneOrMore>
-        <choice>
-          <text>
-            <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
-(The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
-          </text>
-          <ref name="callout">
-            <a:documentation>Zero or more cross-references; these are intended to be embedded within the content string, and link to annotations</a:documentation>
-          </ref>
-          <ref name="xref">
-            <a:documentation>Hyperlink of code segment to another part of the document</a:documentation>
-          </ref>
-          <ref name="eref">
-            <a:documentation>Hyperlink of code segment to external bibliographic resource</a:documentation>
-          </ref>
-        </choice>
-      </oneOrMore>
+      <ref name="sourcecodebody">
+        <a:documentation>The sourcecode content</a:documentation>
+      </ref>
       <zeroOrMore>
         <ref name="annotation">
           <a:documentation>Annotations to the source code; each annotation consists of zero or more paragraphs,
@@ -277,6 +263,26 @@ and is intended to be referenced by a callout within the source code</a:document
         <a:documentation>A source for the block</a:documentation>
       </ref>
     </define>
+    <define name="sourcecodebody">
+      <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
+(The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
+      <element name="body">
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="callout">
+              <a:documentation>Zero or more cross-references; these are intended to be embedded within the content string, and link to annotations</a:documentation>
+            </ref>
+            <ref name="xref">
+              <a:documentation>Hyperlink of code segment to another part of the document</a:documentation>
+            </ref>
+            <ref name="eref">
+              <a:documentation>Hyperlink of code segment to external bibliographic resource</a:documentation>
+            </ref>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="sections">
       <element name="sections">
         <oneOrMore>
@@ -459,11 +465,14 @@ gives an explicit page orientation</a:documentation>
           <a:documentation>Description of location in a reference, which can be combined with other locations in a single citation</a:documentation>
         </ref>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="PureTextElement">
+      <optional>
+        <element name="display-text">
           <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
-        </ref>
-      </zeroOrMore>
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
+      </optional>
     </define>
   </include>
   <!-- end overrides -->
@@ -1205,10 +1214,13 @@ numbers</a:documentation>
         <value>presentation</value>
       </choice>
     </attribute>
+    <attribute name="flavor">
+      <a:documentation>Metanorma flavor, indicating SDO whose requiremnts the realisation aligns to</a:documentation>
+    </attribute>
   </define>
   <define name="standard-document">
     <a:documentation>Representation of a standardisation document</a:documentation>
-    <element name="standard-document">
+    <element name="metanorma">
       <ref name="Root-Attributes"/>
       <ref name="bibdata">
         <a:documentation>Bibliographic description of the document itself, expressed in the Relaton model</a:documentation>

data/lib/metanorma/iso/isostandard-amd.rng

@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="https://www.metanorma.org/ns/iso" xmlns="http://relaxng.org/ns/structure/1.0">
+<grammar ns="https://www.metanorma.org/ns/standoc" xmlns="http://relaxng.org/ns/structure/1.0">
   <!--
     VERSION v1.2.1
     default namespace isostandard = "https://www.metanorma.com/ns/iso"
   -->
   <include href="relaton-iso.rng"/>
   <include href="isostandard.rng">
-    <start>
-      <ref name="iso-standard"/>
-    </start>
     <define name="sections">
       <element name="sections">
         <oneOrMore>
@@ -33,8 +30,8 @@
         <ref name="Clause-Section"/>
       </element>
     </define>
-    <define name="iso-standard">
-      <element name="iso-standard">
+    <define name="standard-document">
+      <element name="metanorma">
         <ref name="Root-Attributes"/>
         <ref name="bibdata"/>
         <optional>

data/lib/metanorma/iso/isostandard-compile.rng

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="https://www.metanorma.org/ns/iso" xmlns="http://relaxng.org/ns/structure/1.0">
-  <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
+<grammar ns="https://www.metanorma.org/ns/standoc" xmlns="http://relaxng.org/ns/structure/1.0">
   <include href="relaton-iso.rng"/>
   <include href="isostandard.rng"/>
 </grammar>

data/lib/metanorma/iso/isostandard.rng

@@ -5,9 +5,6 @@
     default namespace isostandard = "https://www.metanorma.com/ns/iso"
   -->
   <include href="isodoc.rng">
-    <start>
-      <ref name="iso-standard"/>
-    </start>
     <define name="sections">
       <element name="sections">
         <zeroOrMore>
@@ -238,38 +235,38 @@
         </oneOrMore>
       </choice>
     </define>
+    <!--
+      We display the Normative References between scope and terms; but to keep the
+      grammar simple, we keep the references together
+    -->
+    <define name="standard-document">
+      <element name="metanorma">
+        <ref name="Root-Attributes"/>
+        <ref name="bibdata"/>
+        <zeroOrMore>
+          <ref name="termdocsource"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="misccontainer"/>
+        </optional>
+        <optional>
+          <ref name="boilerplate"/>
+        </optional>
+        <ref name="preface"/>
+        <oneOrMore>
+          <ref name="sections"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="annex"/>
+        </zeroOrMore>
+        <ref name="bibliography"/>
+        <zeroOrMore>
+          <ref name="indexsect"/>
+        </zeroOrMore>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
-  <!--
-    We display the Normative References between scope and terms; but to keep the
-    grammar simple, we keep the references together
-  -->
-  <define name="iso-standard">
-    <element name="iso-standard">
-      <ref name="Root-Attributes"/>
-      <ref name="bibdata"/>
-      <zeroOrMore>
-        <ref name="termdocsource"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="misccontainer"/>
-      </optional>
-      <optional>
-        <ref name="boilerplate"/>
-      </optional>
-      <ref name="preface"/>
-      <oneOrMore>
-        <ref name="sections"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="annex"/>
-      </zeroOrMore>
-      <ref name="bibliography"/>
-      <zeroOrMore>
-        <ref name="indexsect"/>
-      </zeroOrMore>
-    </element>
-  </define>
   <define name="clause-hanging-paragraph-with-footnote">
     <element name="clause">
       <optional>

data/lib/metanorma/iso/relaton-iso.rng

@@ -63,19 +63,13 @@
         </choice>
       </element>
     </define>
-    <define name="OrganizationType" combine="interleave">
-      <optional>
-        <ref name="technical-committee"/>
-      </optional>
-      <optional>
-        <ref name="subcommittee"/>
-      </optional>
-      <optional>
-        <ref name="workgroup"/>
-      </optional>
-      <optional>
-        <ref name="secretariat"/>
-      </optional>
+    <define name="organization">
+      <element name="organization">
+        <choice>
+          <ref name="OrganizationType"/>
+          <ref name="IsoOrganizationType"/>
+        </choice>
+      </element>
     </define>
     <define name="DocumentType">
       <choice>
@@ -225,4 +219,18 @@
       <text/>
     </element>
   </define>
+  <define name="IsoOrganizationType">
+    <optional>
+      <ref name="technical-committee"/>
+    </optional>
+    <optional>
+      <ref name="subcommittee"/>
+    </optional>
+    <optional>
+      <ref name="workgroup"/>
+    </optional>
+    <optional>
+      <ref name="secretariat"/>
+    </optional>
+  </define>
 </grammar>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "2.9.6".freeze
+    VERSION = "3.0.1".freeze
   end
 end

data/lib/metanorma/requirements/modspec.rb

@@ -2,35 +2,19 @@ module Metanorma
   class Requirements
     class Modspec
       class Iso < ::Metanorma::Requirements::Modspec
-=begin
-        def recommendation_label(elem, type, xrefs)
-          lbl = super
-          title = elem.at(ns("./title"))
-          return lbl unless title &&
-            elem.ancestors("requirement, recommendation, permission").empty?
-
-          lbl += "<span class='fmt-caption-delim'>: </span>" if lbl
-          lbl += "<semx element='title' source='#{elem['id']}'>#{title.children.to_xml}</semx>"
-          require "debug"; binding.b
-          l10n(lbl)
-        end
-
-        # ISO labels modspec reqt as table, with reqt label as title
-        def recommendation_header(reqt, out)
-          n = reqt.at(ns("./fmt-name")) and out << n
-          out
-        end
-=end
-
-        def requirement_table_nested_cleanup(node, table)
-          table["type"] == "recommendclass" or return table
-          ins = table.at(ns("./tbody/tr[td/table]")) or return table
-          ins.replace(requirement_table_cleanup_nested_replacement(node, table))
-          table.xpath(ns("./tbody/tr[td/table]")).each(&:remove)
+        def requirement_table_nested_cleanup(node, out, table)
+          (out.xpath(ns(".//table")) - out.xpath(ns("./fmt-provision/table"))).each do |x|
+            x["unnumbered"] = "true"
+          end
+          table["type"] == "recommendclass" or return super # table
+          ins = table.at(ns("./tbody/tr[td/*/fmt-provision/table]")) or return table
+          ins.replace(requirement_table_cleanup_nested_replacement(node, out, table))
+          table.xpath(ns("./tbody/tr[td/*/fmt-provision/table]")).each(&:remove)
+          out.xpath(ns("./*/fmt-provision")).each(&:remove)
           table
         end
 
-        def requirement_table_cleanup_nested_replacement(node, table)
+        def requirement_table_cleanup_nested_replacement(node, out, table)
           label = "provision"
           node["type"] == "conformanceclass" and label = "conformancetest"
           n = nested_tables_names(table)
@@ -40,14 +24,18 @@ module Metanorma
         end
 
         def nested_tables_names(table)
-          table.xpath(ns("./tbody/tr/td/table"))
+          table.xpath(ns("./tbody/tr/td/*/fmt-provision/table"))
             .each_with_object([]) do |t, m|
-              m << t.at(ns(".//fmt-name")).children.to_xml
+              id = t["original-id"] || t["id"]
+              id and b = "<bookmark id='#{id}'/>"
+              m << b + to_xml(t.at(ns(".//fmt-name")).children).strip
             end
         end
 
         def postprocess_anchor_struct(block, anchor)
           super
+          t = block.at(ns("./fmt-provision/table")) and
+            anchor[:container] = t["id"]
           anchor[:modspec] = anchor[:xref_bare]
           if l = block.at(ns("./title"))
             anchor[:modspec] =

data/metanorma-iso.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.test_files = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.10.2"
+  spec.add_dependency "metanorma-standoc", "~> 3.0.0"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "pubid"
   spec.add_dependency "tokenizer", "~> 0.3.0"
@@ -44,8 +44,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "iev", "~> 0.3.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "~> 1.5.2"
-  spec.add_development_dependency "sassc", "2.4.0"
+  spec.add_development_dependency "rubocop", "~> 1"
+spec.add_development_dependency "rubocop-performance"
+  spec.add_development_dependency "sassc-embedded", "~> 1"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "vcr", "~> 6.1.0"