metanorma-standoc 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0a69974476cfd73fd74d1072ae10647b54c1c9f55d3cfb3d3cf9151a3f8be12
-  data.tar.gz: ed1cb04fdc539fafe18e87c4f7b173e9394644425b3791fa56bca4eb6935cd48
+  metadata.gz: fe69b54cc4d7ab2744446c02c80d3e4bcfd5af8b098ab4f709f71269bfeed28e
+  data.tar.gz: d16ff11d49036801eb8d7a14b277d6d57b6079435682f4b4a07bf5b0140702d7
 SHA512:
-  metadata.gz: 2a2306e053d66020cfc017e973c30770eb00db604e12bcdccfdccd303fe2b8ddc2c87d7783067665b666e1db49c6c11044a29ae8420b5d72793c5363a9524d04
-  data.tar.gz: eda982b66f7f780b1d8ef7a7d48d5063154446792a5e5f50e5e3bd1470036896bba1d6f8060858a498f01d55a06c4d9f2b4c87fe8cbb67aec2bb1b6fffeee699
+  metadata.gz: f6f68dceb7b3ab96e34b1b09f91b616b2b53e627ee6383cab0246ca1d429b975dee17f90118bae28a60ece153310c0fb78697c1ea863731c965d556b81fcab0f
+  data.tar.gz: 2613d30ba2e9bef9812787c5fc247205ca2c14929e5f50ba83138049c9cae7c1f0835bcc104127016516db61dc1477c911fb55f8161b9271c18251290f5684e2

data/lib/metanorma/standoc/basicdoc.rng

@@ -198,14 +198,14 @@ Applicable to modify and delete</a:documentation>
         </zeroOrMore>
       </element>
     </optional>
-    <optional>
+    <zeroOrMore>
       <element name="description">
-        <a:documentation>Description of the change described in this block</a:documentation>
-        <zeroOrMore>
+        <a:documentation>Description(s) of the change described in this block</a:documentation>
+        <oneOrMore>
           <ref name="BasicBlock"/>
-        </zeroOrMore>
+        </oneOrMore>
       </element>
-    </optional>
+    </zeroOrMore>
     <optional>
       <element name="newcontent">
         <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>

data/lib/metanorma/standoc/cleanup_block.rb

@@ -211,8 +211,8 @@ module Metanorma
       def para_index_cleanup1(para, prev, foll)
         if include_indexterm?(prev)
           prev << para.remove.children
-        elsif include_indexterm?(foll) && !foll.children.empty?
-          foll.children.first.previous = para.remove.children
+        elsif include_indexterm?(foll) # && !foll.children.empty?
+          foll.add_first_child para.remove.children
         end
       end
 

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -48,11 +48,9 @@ module Metanorma
         x = xmldoc.dup
         x.root.add_namespace(nil, xml_namespace)
         xml = Nokogiri::XML(x.to_xml)
-        #require "debug"; binding.b
         @isodoc ||= isodoc(@lang, @script, @locale)
         # initialise @isodoc.xrefs, for @isodoc.xrefs.info
         @isodoc.bibdata(xml) # do i18n
-        #@isodoc.info(xml, nil)
         @isodoc
       end
 
@@ -156,7 +154,7 @@ module Metanorma
         if user_add.at("./clause") then built_in << user_add.children
         else
           user_add.name = "clause"
-          if user_add["id"].nil? || uuid?(user_add["id"])
+          if user_add["id"].nil? || Metanorma::Utils::guid_anchor?(user_add["id"])
             user_add["anchor"] = "_boilerplate-#{statement}-statement-append"
             add_id(user_add)
           end
@@ -167,11 +165,12 @@ module Metanorma
       # Asciidoc macro, e.g. span:publisher[...]
       # May contain one or more {{ }} in target, with spaces in them
       # Does not end in \]
-      ADOC_MACRO_START = '\S+:(?:[^\[\] ]+|\{\{[^{}]+\}\})*\[.*?(?<!\\\\)\]'.freeze
+      ADOC_MACRO_START =
+        '\S+:(?:[^\[\] ]+|\{\{[^{}]+\}\})*\[.*?(?<!\\\\)\]'.freeze
 
       # Replace {{ ... }} with {{ pass:[...]}} to preserve any XML markup
       # use pass:[...\] if {{}} is already inside an Asciidoc macro
-      # Do not use pass: if this is a macro target: mailto:{{x}}[] 
+      # Do not use pass: if this is a macro target: mailto:{{x}}[]
       # or body: mailto:[{{x}}]
       def boilerplate_read(file)
         ret = File.read(file, encoding: "UTF-8")

data/lib/metanorma/standoc/cleanup_image.rb

@@ -14,7 +14,7 @@ module Metanorma
         xmldoc.xpath("//svgmap").each do |s|
           f = s.at(".//figure") or next
           (t = s.at("./name")) && !f.at("./name") and
-            f.children.first.previous = t.remove
+            f.add_first_child t.remove
           if s["anchor"] # && Metanorma::Utils::guid_anchor?(f["id"])
             f["anchor"] = s["anchor"]
             s.delete("anchor")

data/lib/metanorma/standoc/cleanup_inline.rb

@@ -143,17 +143,12 @@ module Metanorma
         doc.xpath("//*[@id]").each_with_object({}) do |x, m|
           # should always be true
           Metanorma::Utils::guid_anchor?(x["id"]) or next
-          m[x["id"]] = contenthash(x)
+          m[x["id"]] = Metanorma::Utils::contenthash(x)
           x["anchor"] and m[x["anchor"]] = m[x["id"]]
           x["id"] = m[x["id"]]
         end
       end
 
-      def contenthash(elem)
-        Digest::MD5.hexdigest("#{elem.path}////#{elem.text}")
-          .sub(/^(.{8})(.{4})(.{4})(.{4})(.{12})$/, "_\\1-\\2-\\3-\\4-\\5")
-      end
-
       def passthrough_cleanup(doc)
         doc.xpath("//passthrough-inline").each do |p|
           p.name = "passthrough"

data/lib/metanorma/standoc/cleanup_section_names.rb

@@ -2,13 +2,7 @@ module Metanorma
   module Standoc
     module Cleanup
       def get_or_make_title(node)
-        unless node.at("./title")
-          if node.children.empty?
-            node << "<title/>"
-          else
-            node.children.first.previous = "<title/>"
-          end
-        end
+        node.at("./title") or node.add_first_child "<title/>"
         ret = node.at("./title")
         add_id(ret)
         ret
@@ -154,7 +148,7 @@ module Metanorma
           p.delete("variant_title")
           p.xpath("(#{path})[last()]").each do |sect|
             (ins = sect.at("./title") and ins.next = p) or
-              sect.children.first.previous = p
+              sect.add_first_child(p)
           end
         end
       end
@@ -180,8 +174,7 @@ module Metanorma
       def floating_title_preface2sections(xmldoc)
         t = xmldoc.at("//preface/floating-title") or return
         s = xmldoc.at("//sections")
-        t.next_element or
-          s.children.first.previous = t.remove
+        t.next_element or s.add_first_child(t.remove)
       end
     end
   end

data/lib/metanorma/standoc/cleanup_terms_designations.rb

@@ -168,7 +168,7 @@ module Metanorma
           end.reverse
           t << " "
           des.each do |x|
-            t.children.first.previous = x
+            t.add_first_child(x)
           end
         end
       end

data/lib/metanorma/standoc/cleanup_text.rb

@@ -3,13 +3,7 @@ module Metanorma
     module Cleanup
       def textcleanup(result)
         text = result.flatten.map(&:rstrip) * "\n"
-        text = text.gsub(/(?<!\s)\s+<fn /, "<fn ")
-        #@semantic_headless and return text
-        #%w(passthrough passthrough-inline).each do |v|
-          #text.gsub!(%r{<#{v}\s+formats="metanorma">([^<]*)
-                    #</#{v}>}mx) { @c.decode($1) }
-        #end
-        text
+        text.gsub(/(?<!\s)\s+<fn /, "<fn ")
       end
 
       def ancestor_include?(elem, ancestors)
@@ -133,8 +127,7 @@ module Metanorma
         prev.content = "#{prev.text}#{m[1]}"
       end
 
-      IGNORE_TEXT_ELEMENTS =
-        %w(index fn).freeze
+      IGNORE_TEXT_ELEMENTS = %w(index fn).freeze
 
       def ignoretext?(elem)
         IGNORE_TEXT_ELEMENTS.include? elem.name

data/lib/metanorma/standoc/cleanup_xref.rb

@@ -150,8 +150,7 @@ module Metanorma
       def xref_compound_cleanup1(xref, locations)
         xref.children.empty? and xref.children = "<sentinel/>"
         xref_parse_compound_locations(locations).reverse_each do |y|
-          xref.children.first.previous =
-            "<xref target='#{y[1]}' connective='#{y[0]}'/>"
+          xref.add_first_child "<xref target='#{y[1]}' connective='#{y[0]}'/>"
         end
         xref&.at("./sentinel")&.remove
       end

data/lib/metanorma/standoc/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-<!-- VERSION v2.0.8 -->
+<!-- VERSION v2.1.0 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -735,6 +735,12 @@ titlecase, or lowercase</a:documentation>
     <ref name="BlockAttributes"/>
   </define>
   <define name="TableAttributes" combine="interleave">
+    <optional>
+      <attribute name="plain">
+        <a:documentation>Render as a plain attribute, with no shading or borders</a:documentation>
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="width">
         <a:documentation>Width of the table block in rendering</a:documentation>

data/lib/metanorma/standoc/render.rb

@@ -12,7 +12,7 @@ module Metanorma
           scope: node.attr("scope"),
           htmlstylesheet: node.attr("htmlstylesheet") || node.attr("html-stylesheet"),
           htmlstylesheet_override: node.attr("htmlstylesheet-override") || node.attr("html-stylesheet-override"),
-          htmlcoverpage: node.attr("htmlcoverpage") || node.attr("htmlcoverpage"),
+          htmlcoverpage: node.attr("htmlcoverpage") || node.attr("html-coverpage"),
           htmlintropage: node.attr("htmlintropage") || node.attr("html-intropage"),
           scripts: node.attr("scripts"),
           scripts_override: node.attr("scripts-override"),

data/lib/metanorma/standoc/spans_to_bibitem.rb

@@ -58,7 +58,7 @@ module Metanorma
         end
 
         def spans_to_bibitem_host(spans)
-          spans[:in].empty? and return ""
+          spans[:in].nil? || spans[:in].empty? and return ""
           ret =
             "<relation type='includedIn'><bibitem type='#{spans[:in][:type]}'>"
           spans[:in].delete(:type)
@@ -67,9 +67,9 @@ module Metanorma
 
         def spans_to_bibitem_docid(spans)
           ret = ""
-          spans[:uri].each { |s| ret += span_to_docid(s, "uri") }
-          spans[:docid].each { |s| ret += span_to_docid(s, "docidentifier") }
-          spans[:date].each { |s| ret += span_to_date(s) }
+          spans[:uri]&.each { |s| ret += span_to_docid(s, "uri") }
+          spans[:docid]&.each { |s| ret += span_to_docid(s, "docidentifier") }
+          spans[:date]&.each { |s| ret += span_to_date(s) }
           ret
         end
 
@@ -84,6 +84,7 @@ module Metanorma
         end
 
         def spans_to_bibitem_extent(spans)
+          spans.nil? and return ""
           ret = ""
           { volume: "volume", issue: "issue", pages: "page" }.each do |k, v|
             spans[k]&.each { |s| ret += span_to_extent(s, v) }
@@ -120,7 +121,7 @@ module Metanorma
 
         def spans_to_contribs(spans)
           ret = ""
-          spans[:contrib].each do |s|
+          spans[:contrib]&.each do |s|
             ret += span_to_contrib(s, spans[:title])
           end
           ret

data/lib/metanorma/standoc/table.rb

@@ -6,6 +6,7 @@ module Metanorma
           .merge(id_unnum_attrs(node))
           .merge(headerrows: node.attr("headerrows"),
                  alt: node.attr("alt"),
+                 plain: node.option?("plain") ? "true" : nil,
                  style: node.attr("css-style"),
                  summary: node.attr("summary"),
                  width: node.attr("width"))

data/lib/metanorma/standoc/utils.rb

@@ -178,11 +178,6 @@ module Metanorma
         @refids.include? ref
       end
 
-      def uuid?(ref)
-        /^_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/
-          .match?(ref)
-      end
-
       module_function :adoc2xml
 
       class EmptyAttr

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.1.1".freeze
+    VERSION = "3.1.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-05 00:00:00.000000000 Z
+date: 2025-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable