metanorma-ogc 2.0.2 → 2.0.5

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -12,11 +12,16 @@ module IsoDoc
         super
       end
 
-      def insert_preface_sections(docxml)
-        insert_executivesummary(docxml)
-        insert_submitting_orgs(docxml)
-        insert_security(docxml)
-        insert_keywords(docxml)
+      def insert_preface_sections(doc)
+        preface_insert(doc&.at(ns("//preface/clause"\
+                                  "[@type = 'executivesummary']")),
+                       doc.at(ns("//preface/abstract")), doc)
+        preface_insert(doc&.at(ns("//preface//submitters")),
+                       submit_orgs_append_pt(doc), doc)
+        insert_submitting_orgs(doc)
+        preface_insert(doc&.at(ns("//preface/clause[@type = 'security']")),
+                       submit_orgs_append_pt(doc), doc)
+        insert_keywords(doc)
       end
 
       def preface_init_insert_pt(docxml)
@@ -25,31 +30,22 @@ module IsoDoc
             .add_previous_sibling("<preface> </preface>").first
       end
 
-      def submit_orgs_append_pt(docxml)
-        docxml.at(ns("//introduction")) ||
-          docxml.at(ns("//foreword")) ||
-          docxml.at(ns("//preface/clause[@type = 'keywords']")) ||
-          docxml.at(ns("//preface/abstract"))
-      end
+      def preface_insert(clause, after, docxml)
+        return unless clause
 
-      def insert_security(docxml)
-        s = docxml&.at(ns("//preface/clause[@type = 'security']"))&.remove or
-          return
-        if a = submit_orgs_append_pt(docxml) then a.next = s
+        clause.remove
+        if after then after.next = clause
         else
           preface_init_insert_pt(docxml)&.children&.first
-            &.add_previous_sibling(s)
+            &.add_previous_sibling(clause)
         end
       end
 
-      def insert_executivesummary(docxml)
-        s = docxml&.at(ns("//preface/clause[@type = 'executivesummary']"))
-          &.remove or return
-        if a = docxml.at(ns("//preface/abstract")) then a.next = s
-        else
-          preface_init_insert_pt(docxml)&.children&.first
-            &.add_previous_sibling(s)
-        end
+      def submit_orgs_append_pt(docxml)
+        docxml.at(ns("//foreword")) ||
+          docxml.at(ns("//preface/clause[@type = 'keywords']")) ||
+          docxml.at(ns("//preface/clause[@type = 'executivesummary']")) ||
+          docxml.at(ns("//preface/abstract"))
       end
 
       def insert_submitting_orgs(docxml)
@@ -166,7 +162,6 @@ module IsoDoc
       def block(docxml)
         super
         recommendation_to_table(docxml)
-        ol docxml
       end
 
       def section(docxml)
@@ -213,16 +208,12 @@ module IsoDoc
           doctype.children = "technical-paper"
       end
 
-      def ol(docxml)
-        docxml.xpath(ns("//ol")).each { |f| ol1(f) }
-      end
-
-      def ol1(elem)
-        return unless elem["class"] == "steps"
+      def ol_depth(node)
+        return super unless node["class"] == "steps" ||
+          node.at(".//ancestor::xmlns:ol[@class = 'steps']")
 
-        idx = elem.xpath("./ancestor-or-self::xmlns:ol[@class = 'steps']").size
-        elem["type"] = %w(arabic alphabet roman alphabet_upper
-                          roman_upper)[(idx - 1) % 5]
+        idx = node.xpath("./ancestor-or-self::xmlns:ol[@class = 'steps']").size
+        %i(arabic alphabet roman alphabet_upper roman_upper)[(idx - 1) % 5]
       end
 
       def termsource1(elem)

data/lib/isodoc/ogc/reqt.rb

@@ -48,6 +48,7 @@ module IsoDoc
         label.xpath(ns(".//concept")).each { |f| concept1(f) }
         b = out.add_child("<tr><td colspan='2'><p></p></td></tr>")
         p = b.at(ns(".//p"))
+        p["class"] = "RecommendationLabel"
         p << label.children.to_xml
       end
 
@@ -103,7 +104,7 @@ module IsoDoc
       def recommendation_attr_keyvalue(node, key, value)
         tag = node&.at(ns("./#{key}"))&.remove
         value = node.at(ns("./#{value}"))&.remove
-        tag && value or return nil
+        (tag && value) or return nil
         node.remove
         [tag.text.capitalize, value.children]
       end

data/lib/isodoc/ogc/word_convert.rb

@@ -64,87 +64,11 @@ module IsoDoc
         end
       end
 
-      def insert_toc(intro, docxml, level)
-        toc = ""
-        toc += make_WordToC(docxml, level)
-        if docxml.at("//p[@class = 'TableTitle']")
-          toc += %{<p class="TOCTitle">List of Tables</p>}
-          toc += make_TableWordToC(docxml)
-        end
-        if docxml.at("//p[@class = 'FigureTitle']")
-          toc += %{<p class="TOCTitle">List of Figures</p>}
-          toc += make_FigureWordToC(docxml)
-        end
-        if docxml.at("//p[@class = 'RecommendationTitle']")
-          toc += %{<p class="TOCTitle">List of Recommendations</p>}
-          toc += make_RecommendationWordToC(docxml)
-        end
-        intro.sub(/WORDTOC/, toc)
-      end
-
-      WORD_TOC_RECOMMENDATION_PREFACE1 = <<~TOC.freeze
-                          <span lang="EN-GB"><span
-        style='mso-element:field-begin'></span><span
-        style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;RecommendationTitle,RecommendationTestTitle,recommendationtitle,recommendationtesttitle&quot;#{' '}
-        <span style='mso-element:field-separator'></span></span>
-      TOC
-
-      WORD_TOC_TABLE_PREFACE1 = <<~TOC.freeze
-                          <span lang="EN-GB"><span
-        style='mso-element:field-begin'></span><span
-        style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;TableTitle,tabletitle&quot; <span
-        style='mso-element:field-separator'></span></span>
-      TOC
-
-      WORD_TOC_FIGURE_PREFACE1 = <<~TOC.freeze
-                                      <span lang="EN-GB"><span
-        style='mso-element:field-begin'></span><span
-        style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;FigureTitle,figuretitle&quot; <span
-        style='mso-element:field-separator'></span></span>
-      TOC
-
-      def header_strip(h)
-        h = h.to_s.gsub(/<\/?p[^>]*>/, "")
+      def header_strip(hdr)
+        hdr = hdr.to_s.gsub(/<\/?p[^>]*>/, "")
         super
       end
 
-      def make_TableWordToC(docxml)
-        toc = ""
-        docxml.xpath("//p[@class = 'TableTitle']").each do |h|
-          toc += word_toc_entry(1, header_strip(h))
-        end
-        toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_TABLE_PREFACE1}}) + WORD_TOC_SUFFIX1
-      end
-
-      def make_FigureWordToC(docxml)
-        toc = ""
-        docxml.xpath("//p[@class = 'FigureTitle']").each do |h|
-          toc += word_toc_entry(1, header_strip(h))
-        end
-        toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_FIGURE_PREFACE1}}) + WORD_TOC_SUFFIX1
-      end
-
-      def make_RecommendationWordToC(docxml)
-        toc = ""
-        docxml.xpath("//p[@class = 'RecommendationTitle' or @class = 'RecommendationTestTitle']").sort_by do |h|
-          recommmendation_sort_key(h.text)
-        end.each do |h|
-          toc += word_toc_entry(1, header_strip(h))
-        end
-        toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_RECOMMENDATION_PREFACE1}}) + WORD_TOC_SUFFIX1
-      end
-
-      def recommmendation_sort_key(header)
-        m = /^([^0-9]+) (\d+)/.match(header) || /^([^:]+)/.match(header)
-        "#{recommmendation_sort_key1(m[1])}::#{'%04d' % m[2].to_i}"
-      end
-
       def recommmendation_sort_key1(type)
         case type.downcase
         when "requirements class" then "01"

data/lib/isodoc/ogc/xref.rb

@@ -23,7 +23,7 @@ module IsoDoc
           id = c.increment(t).print
           @anchors[t["id"]] = anchor_struct(id, t, label, klass,
                                             t["unnumbered"])
-          l = t.at(ns("./label"))&.text and @reqtlabels[l] = t["id"]
+          reqt_suffix_label(t)
           permission_parts(t, label, klass)
           sequential_permission_children(t, id)
         end
@@ -41,6 +41,13 @@ module IsoDoc
           "conformanceclass" => "@type = 'conformanceclass'" }
       end
 
+      def reqt_suffix_label(reqt)
+        if l = reqt.at(ns("./label"))&.text
+          @reqtlabels[l] = reqt["id"]
+          @anchors[reqt["id"]][:xref] += ": <tt>#{l}</tt>"
+        end
+      end
+
       def permission_parts(block, label, klass)
         block.xpath(ns("./component[@class = 'part']"))
           .each_with_index do |c, i|
@@ -116,7 +123,7 @@ module IsoDoc
           lbl = "#{num}#{hiersep}#{c.increment(t).print}"
           @anchors[t["id"]] = anchor_struct(lbl, t, label, klass,
                                             t["unnumbered"])
-          l = t.at(ns("./label"))&.text and @reqtlabels[l] = t["id"]
+          reqt_suffix_label(t)
           permission_parts(t, label, klass)
           sequential_permission_children(t, lbl)
         end
@@ -143,9 +150,9 @@ module IsoDoc
         @prefacenum = 0
         ["//preface/abstract", "//preface/clause[@type = 'executivesummary']",
          "//preface/clause[@type = 'keywords']",
-         "//foreword", "//introduction", "//preface/clause[@type = 'security']",
-         "//preface/clause[@type = 'submitting_orgs']",
-         "//submitters"].each do |path|
+         "//foreword", "//preface/clause[@type = 'security']",
+         "//preface/clause[@type = 'submitting_orgs']", "//submitters",
+         "//introduction"].each do |path|
           preface_names_numbered(doc.at(ns(path)))
         end
         doc.xpath(ns("//preface/clause[not(@type = 'keywords' or "\
@@ -185,7 +192,7 @@ module IsoDoc
       def preface_names_numbered1(clause, num, level)
         @anchors[clause["id"]] =
           { label: num, level: level, xref: l10n("#{@labels['clause']} #{num}"),
-            type: "clause" }
+            type: "clause", elem: @labels["clause"] }
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
           lbl = "#{num}.#{preface_number(i + 1, level + 1)}"
           preface_names_numbered1(c, lbl, level + 1)

data/lib/metanorma/ogc/basicdoc.rng

@@ -173,9 +173,11 @@
           <data type="dateTime"/>
         </attribute>
       </optional>
-      <attribute name="from">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="from">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="to">
           <data type="IDREF"/>

data/lib/metanorma/ogc/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

data/lib/metanorma/ogc/converter.rb

@@ -16,6 +16,13 @@ module Metanorma
 
       register_for "ogc"
 
+      def init_toc(node)
+        super
+        @tocfigures = true
+        @toctables = true
+        @tocrecommendations = true
+      end
+
       # ignore, we generate ToC outside of asciidoctor
       def toc(value); end
 

data/lib/metanorma/ogc/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/ogc/processor.rb

@@ -4,7 +4,7 @@ module Metanorma
   module Ogc
     class Processor < Metanorma::Processor
 
-      def initialize
+      def initialize # rubocop:disable Lint/MissingSuper
         @short = :ogc
         @input_format = :asciidoc
         @asciidoctor_backend = :ogc
@@ -14,7 +14,7 @@ module Metanorma
         super.merge(
           html: "html",
           doc: "doc",
-          pdf: "pdf"
+          pdf: "pdf",
         )
       end
 
@@ -41,14 +41,14 @@ module Metanorma
 
       def output(isodoc_node, inname, outname, format, options={})
         case format
-        when :html
-          IsoDoc::Ogc::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
-        when :doc
-          IsoDoc::Ogc::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
-        when :pdf
-          IsoDoc::Ogc::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
-        when :presentation
-          IsoDoc::Ogc::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
+        when :html then IsoDoc::Ogc::HtmlConvert.new(options)
+          .convert(inname, isodoc_node, nil, outname)
+        when :doc then IsoDoc::Ogc::WordConvert.new(options)
+          .convert(inname, isodoc_node, nil, outname)
+        when :pdf then IsoDoc::Ogc::PdfConvert.new(options)
+          .convert(inname, isodoc_node, nil, outname)
+        when :presentation then IsoDoc::Ogc::PresentationXMLConvert.new(options)
+          .convert(inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.0.2".freeze
+    VERSION = "2.0.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-22 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639