metanorma-standoc 2.3.8 → 2.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00ae5b84e04807e4d13ce97c2be80f47fc46a0004c8a1630d59f041597627f9e
-  data.tar.gz: 1e67f2c42a5b84081e44a6ad63b0cce70d980cc8478014de53355cf4b74e5e24
+  metadata.gz: 0fb752d30fc48409836f4b8b63f7f57864ffe6626f624ca2520875b918ff5df3
+  data.tar.gz: 5da9f771b4caa899c275a131c4484f0c0ae14a05041012994edd57de3588ff63
 SHA512:
-  metadata.gz: 65608377bcc5b0b06e6895f6d9ed842c956def5cf77e28e25d4db3ae554b062f0e798afa2a964a18265396c22243d6aeebea98e913b4c269ddf09c04e3f06f92
-  data.tar.gz: 01aff668829eb7d52cec2e94e9b9da8b06353b56847a615b543e6fa2cfefad4fe8e9a9cc0f72e266b74e4f7535671f23ed34b31da43b6cddffe14ba189165e4c
+  metadata.gz: 5c85f82ea6c5121977b3f511d5e70b74420bc8ed9f3256117ecf16a2547e454a9b738188d5ace110127533395b4d230787fbfef1dcb37384bc07f1a8403ffc0a
+  data.tar.gz: 8bcb04197dd817d9a853692935e07c76c70f2293821e4b1e2fb560a6e52c2eccc5b9dfc993ef5b562d09af75381e067af9dac5f2063d92c5995b447d0219c0a5

data/lib/metanorma/standoc/base.rb

@@ -82,14 +82,20 @@ module Metanorma
       end
 
       def init_toc(node)
-        @htmltoclevels = node.attr("htmltoclevels")
-        @doctoclevels = node.attr("doctoclevels")
-        @toclevels = node.attr("toclevels")
+        @htmltoclevels = node.attr("htmltoclevels") ||
+          node.attr("toclevels") || toc_default[:html_levels]
+        @doctoclevels = node.attr("doctoclevels") ||
+          node.attr("toclevels") || toc_default[:word_levels]
+        @toclevels = node.attr("toclevels") || toc_default[:word_levels]
         @tocfigures = node.attr("toc-figures")
         @toctables = node.attr("toc-tables")
         @tocrecommendations = node.attr("toc-recommendations")
       end
 
+      def toc_default
+        { word_levels: 2, html_levels: 2 }
+      end
+
       def init_output(node)
         @fontheader = default_fonts(node)
         @log = Metanorma::Utils::Log.new

data/lib/metanorma/standoc/biblio.rng

@@ -216,6 +216,9 @@
       <optional>
         <ref name="fullname"/>
       </optional>
+      <zeroOrMore>
+        <ref name="credential"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="affiliation"/>
       </zeroOrMore>
@@ -232,6 +235,11 @@
       <ref name="FullNameType"/>
     </element>
   </define>
+  <define name="credential">
+    <element name="credential">
+      <text/>
+    </element>
+  </define>
   <define name="FullNameType">
     <choice>
       <group>
@@ -305,7 +313,9 @@
       <zeroOrMore>
         <ref name="affiliationdescription"/>
       </zeroOrMore>
-      <ref name="organization"/>
+      <optional>
+        <ref name="organization"/>
+      </optional>
     </element>
   </define>
   <define name="affiliationname">

data/lib/metanorma/standoc/cleanup.rb

@@ -60,6 +60,7 @@ module Metanorma
         quotesource_cleanup(xmldoc)
         callout_cleanup(xmldoc)
         footnote_cleanup(xmldoc)
+        ol_cleanup(xmldoc)
         mathml_cleanup(xmldoc)
         script_cleanup(xmldoc)
         docidentifier_cleanup(xmldoc) # feeds: bibdata_cleanup

data/lib/metanorma/standoc/cleanup_block.rb

@@ -100,8 +100,7 @@ module Metanorma
       # it is moved inside its preceding block if it is not delimited
       # (so there was no way of making that block include the note)
       def note_cleanup(xmldoc)
-        q = "//note[following-sibling::*[not(local-name() = 'note')]]"
-        xmldoc.xpath(q).each do |n|
+        xmldoc.xpath("//note").each do |n|
           next if n["keep-separate"] == "true" || !n.ancestors("table").empty?
 
           prev = n.previous_element || next
@@ -221,6 +220,14 @@ module Metanorma
           foll.children.first.previous = para.remove.children
         end
       end
+
+      def ol_cleanup(doc)
+        doc.xpath("//ol[@explicit-type]").each do |x|
+          x.delete("explicit-type")
+          @log.add("Bibliography", x,
+                   "Style override set for ordered list")
+        end
+      end
     end
   end
 end

data/lib/metanorma/standoc/cleanup_image.rb

@@ -80,7 +80,7 @@ module Metanorma
         types = MIME::Types.type_for(path) or return false
         types.first == "image/svg+xml" or return false
         svg = File.read(path, encoding: "utf-8") or return false
-        img.replace(Nokogiri::XML(svg).root.to_xml)
+        img.replace(Nokogiri::XML(svg).root)
         true
       end
 

data/lib/metanorma/standoc/cleanup_section.rb

@@ -11,18 +11,31 @@ module Metanorma
         if xml.at("//foreword | //introduction | //acknowledgements | " \
                   "//*[@preface]")
           preface = sect.add_previous_sibling("<preface/>").first
-          f = xml.at("//foreword") and preface.add_child f.remove
-          f = xml.at("//introduction") and preface.add_child f.remove
+          f = xml.at("//foreword") and to_preface(preface, f)
+          f = xml.at("//introduction") and to_preface(preface, f)
           move_clauses_into_preface(xml, preface)
-          f = xml.at("//acknowledgements") and preface.add_child f.remove
+          f = xml.at("//acknowledgements") and to_preface(preface, f)
         end
         make_abstract(xml, sect)
       end
 
       def move_clauses_into_preface(xml, preface)
         xml.xpath("//*[@preface]").each do |c|
-          c.delete("preface")
-          preface.add_child c.remove
+          to_preface(preface, c)
+        end
+      end
+
+      def to_preface(preface, clause)
+        clause.delete("preface")
+        preface.add_child clause.remove
+      end
+
+      def make_colophon(xml)
+        xml.at("//clause[@colophon]") or return
+        colophon = xml.root.add_child("<colophon/>").first
+        xml.xpath("//*[@colophon]").each do |c|
+          c.delete("colophon")
+          colophon.add_child c.remove
         end
       end
 
@@ -77,6 +90,7 @@ module Metanorma
         make_annexes(xml)
         make_indexsect(xml, s)
         make_bibliography(xml, s)
+        make_colophon(xml)
         xml.xpath("//sections/annex").reverse_each { |r| s.next = r.remove }
       end
 

data/lib/metanorma/standoc/cleanup_toc.rb

@@ -86,9 +86,9 @@ module Metanorma
 
       def toc_metadata1(ins)
         [[@toclevels, "TOC Heading Levels"],
-         [@toclevels, "TOC Heading Levels"],
-         [@toclevels, "TOC Heading Levels"]].each do |n|
-          n[0] and ins << "<presentation-metadata><name>#{n[1]}</name>"\
+         [@htmltoclevels, "HTML TOC Heading Levels"],
+         [@doctoclevels, "DOC TOC Heading Levels"]].each do |n|
+          n[0] and ins << "<presentation-metadata><name>#{n[1]}</name>" \
                           "<value>#{n[0]}</value></presentation-metadata>"
         end
       end

data/lib/metanorma/standoc/front.rb

@@ -9,12 +9,17 @@ module Metanorma
   module Standoc
     module Front
       def metadata_id(node, xml)
+        id = node.attr("docidentifier") || metadata_id_build(node)
+        xml.docidentifier id
+        xml.docnumber node.attr("docnumber")
+      end
+
+      def metadata_id_build(node)
         part, subpart = node&.attr("partnumber")&.split(/-/)
         id = node.attr("docnumber") || ""
         id += "-#{part}" if part
         id += "-#{subpart}" if subpart
-        xml.docidentifier id
-        xml.docnumber node.attr("docnumber")
+        id
       end
 
       def metadata_other_id(node, xml)
@@ -69,7 +74,7 @@ module Metanorma
 
       def metadata_date1(node, xml, type)
         date = node.attr("#{type}-date")
-        date and xml.date **{ type: type } do |d|
+        date and xml.date type: type do |d|
           d.on date
         end
       end
@@ -87,7 +92,7 @@ module Metanorma
 
           type, date = node.attr(a).split(/ /, 2)
           type or next
-          xml.date **{ type: type } do |d|
+          xml.date type: type do |d|
             d.on date
           end
         end
@@ -134,7 +139,7 @@ module Metanorma
 
       def metadata_getrelation1(doc, xml, type, desc)
         id = doc.split(/,\s*/)
-        xml.relation **{ type: relation_normalise(type) } do |r|
+        xml.relation type: relation_normalise(type) do |r|
           desc.nil? or r.description desc.gsub(/-/, " ")
           fetch_ref(r, doc, nil, **{}) or r.bibitem do |b|
             b.title id[1] || "--"

data/lib/metanorma/standoc/front_contributor.rb

@@ -86,6 +86,7 @@ module Metanorma
           personal_role(node, c, suffix)
           c.person do |p|
             person_name(node, xml, suffix, p)
+            person_credentials(node, xml, suffix, p)
             person_affiliation(node, xml, suffix, p)
             personal_contact(node, suffix, p)
           end
@@ -104,9 +105,17 @@ module Metanorma
         end
       end
 
+      def person_credentials(node, _xml, suffix, person)
+        c = node.attr("contributor-credentials#{suffix}") and
+          person.credentials c
+      end
+
       def person_affiliation(node, _xml, suffix, person)
-        node.attr("affiliation#{suffix}") and person.affiliation do |a|
-          a.organization do |o|
+        aff = node.attr("affiliation#{suffix}")
+        pos = node.attr("contributor-position#{suffix}")
+        (aff || pos) and person.affiliation do |a|
+          pos and a.name pos
+          aff and a.organization do |o|
             person_organization(node, suffix, o)
           end
         end

data/lib/metanorma/standoc/isodoc.rng

@@ -1578,6 +1578,9 @@
       <zeroOrMore>
         <ref name="indexsect"/>
       </zeroOrMore>
+      <optional>
+        <ref name="colophon"/>
+      </optional>
     </element>
   </define>
   <define name="misccontainer">
@@ -1600,6 +1603,13 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="colophon">
+    <element name="colophon">
+      <oneOrMore>
+        <ref name="content"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="foreword">
     <element name="foreword">
       <ref name="Content-Section"/>

data/lib/metanorma/standoc/lists.rb

@@ -53,9 +53,12 @@ module Metanorma
         style
       end
 
+      # node.attributes[1] == node.style only if style explicitly set
+      # as a positional attribute
       def ol_attrs(node)
         attr_code(id_attr(node).merge(keep_attrs(node)
-          .merge(type: olist_style(node.style))))
+          .merge(type: olist_style(node.style),
+                 "explicit-type": olist_style(node.attributes[1]))))
       end
 
       def olist(node)

data/lib/metanorma/standoc/merge_bibitems.rb

@@ -35,7 +35,7 @@ module Metanorma
         end
 
         def merge1(old, new)
-          %i(link docidentifier date title series).each do |k|
+          %i(link docid date title series).each do |k|
             merge_by_type(old, new, k, :type)
           end
           merge_extent(old, new)

data/lib/metanorma/standoc/section.rb

@@ -92,6 +92,10 @@ module Metanorma
                         end),
                 tag: node&.attr("tag"),
                 "multilingual-rendering": node&.attr("multilingual-rendering"),
+                colophon: (if node.role == "colophon" ||
+                          node.attr("style") == "colophon"
+                            true
+                          end),
                 preface: (if node.role == "preface" ||
                           node.attr("style") == "preface"
                             true

data/lib/metanorma/standoc/spans_to_bibitem.rb

@@ -9,11 +9,18 @@ module Metanorma
         def initialize(bib)
           @bib = bib
           @err = []
-          @spans = spans_preprocess(extract_content(bib))
+          @spans = spans_preprocess(extract_spans(bib))
+          ids = spans_preprocess(extract_docid(bib))
+          @spans[:docid] = override_docids(ids[:docid], @spans[:docid])
         end
 
-        def extract_content(bib)
-          extract_docid(bib) + extract_spans(bib)
+        def override_docids(old, new)
+          ret = new
+          keys = new.map { |a| a[:type] }
+          old.each do |e|
+            keys.include?(e[:type]) or ret << e
+          end
+          ret
         end
 
         def extract_spans(bib)

data/lib/metanorma/standoc/validate.rb

@@ -97,18 +97,6 @@ module Metanorma
         @fatalerror << err2
       end
 
-      def norm_ref_validate(doc)
-        found = false
-        doc.xpath("//references[@normative = 'true']/bibitem").each do |b|
-          docid = b.at("./docidentifier[@type = 'metanorma']") or next
-          /^\[\d+\]$/.match?(docid.text) or next
-          @log.add("Bibliography", b,
-                   "Numeric reference in normative references")
-          found = true
-        end
-        found and @fatalerror << "Numeric reference in normative references"
-      end
-
       def concept_validate(doc, tag, refterm)
         found = false
         concept_validate_ids(doc)

data/lib/metanorma/standoc/validate_section.rb

@@ -40,7 +40,7 @@ module Metanorma
       end
 
       def hanging_para_style(root)
-        root.xpath("//clause | //annex | //foreword | //introduction | "\
+        root.xpath("//clause | //annex | //foreword | //introduction | " \
                    "//acknowledgements").each do |c|
           next unless c.at("./clause")
           next if c.elements.reject do |n|
@@ -50,6 +50,18 @@ module Metanorma
           style_warning(c, "Hanging paragraph in clause")
         end
       end
+
+      def norm_ref_validate(doc)
+        found = false
+        doc.xpath("//references[@normative = 'true']/bibitem").each do |b|
+          docid = b.at("./docidentifier[@type = 'metanorma']") or next
+          /^\[\d+\]$/.match?(docid.text) or next
+          @log.add("Bibliography", b,
+                   "Numeric reference in normative references")
+          found = true
+        end
+        found and @fatalerror << "Numeric reference in normative references"
+      end
     end
   end
 end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.3.8".freeze
+    VERSION = "2.3.9".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.3.8
+  version: 2.3.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor