metanorma-standoc 3.0.15 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87e7b185086a1c7a576276d5cb0936fbbee3881e5bd377f64f8d2c4dad977d60
-  data.tar.gz: d4f2ea5da3139ac765f99db91ea52177ffb584af920ba27d31e264e51fdac3c6
+  metadata.gz: 6c1ea7078b1b5abbb7f7db93972c6efd1d55e076faa631ae25e351dd5ce48fb5
+  data.tar.gz: 509b11d44c11d9facc4985bcff19b0333d863585af462fef0fdca80017235881
 SHA512:
-  metadata.gz: 3b4fc65d63c9f696a3bca40bfd95d9f22da114698fb16291ede3c5d5127c3f29449b41c3e02a0e508e23ddf1c81c5e07d5dcd3b0148dc7f9d0424d3ae1b6ed60
-  data.tar.gz: 15a940affa34106aee7059457d3be4a270e93d1550acd2c1b152bc4d303ef6aebb95e5ca682155d2068a8a658836e47a4e866ebea91b600ac4254945046f8cf3
+  metadata.gz: 5936e1fb18c00b4bb9201f77b7bc26c0ec213163710bbe542c659237abc2f9209209a2fa2445fd5fb9e8dc81f3dc7b8b84c7ff38ff2c4caa20ca6f75967a5e1d
+  data.tar.gz: e70ccf305e69b6af130afb0d903bfb509df06c659ed96d961a4204f22e7a265a64da19b1dd23336c434ac3df300028edb04e8175a2fa81876c25b678888b1960

data/lib/isodoc/html/htmlstyle.css

@@ -318,9 +318,15 @@ h6:hover > a.anchor,
   padding: 0;
 }
 
+.svg-container {
+  width: 100%; /* or any desired width */
+  display: block; /* ← removes unwanted inline spacing */
+}
+
 svg {
   width: 100%;
-  overflow: visible;
+  height: auto; /* ← key to maintaining aspect ratio */
+  display: block; /* ← removes unwanted inline spacing */
 }
 
 #standard-band {

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -48,8 +48,11 @@ 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)
-        @isodoc.info(xml, nil)
+        # initialise @isodoc.xrefs, for @isodoc.xrefs.info
+        @isodoc.bibdata(xml) # do i18n
+        #@isodoc.info(xml, nil)
         @isodoc
       end
 
@@ -76,19 +79,6 @@ module Metanorma
         initial_boilerplate(xmldoc, isodoc)
       end
 
-      # KILL
-      # escape < > & to > etc,
-      # for passthrough insertion into boilerplate
-      def boilerplate_isodoc_values(isodoc)
-        isodoc.meta.get.each do |k, v|
-          if v.is_a?(String)
-            isodoc.meta.set(k, v.gsub("&", "&&&&&&&")
-              .gsub("<", "<").gsub(">", ">")
-              .gsub("&&&&&&&", "&"))
-          end
-        end
-      end
-
       def initial_boilerplate(xml, isodoc)
         xml.at("//boilerplate") and return
         preface = xml.at("//preface | //sections | //annex | //references") or

data/lib/metanorma/standoc/cleanup_maths.rb

@@ -19,6 +19,7 @@ module Metanorma
       def asciimath2mathml_indiv(elem)
         elem["type"] = "MathML"
         expr = @c.decode(elem.text)
+        expr.strip.empty? and return
         ret = asciimath_parse(expr, elem)&.strip
         ret += "<asciimath>#{@c.encode(expr, :basic)}</asciimath>"
         elem.children = ret
@@ -35,9 +36,9 @@ module Metanorma
             <math xmlns='#{MATHML_NS}'><mstyle displaystyle='false'><mn>#{expr}</mn></mstyle></math>
           MATH
         else
+          expr.strip.empty? and return
           unitsml = if expr.include?("unitsml")
-                      { unitsml: { xml: true,
-                                   multiplier: :space } }
+                      { unitsml: { xml: true, multiplier: :space } }
                     else {} end
           Plurimath::Math.parse(expr, "asciimath")
             .to_mathml(**{ display_style: elem["block"] }.merge(unitsml))

data/lib/metanorma/standoc/front.rb

@@ -30,13 +30,21 @@ module Metanorma
       end
 
       def metadata_version(node, xml)
+        draft = metadata_version_value(node)
         xml.edition node.attr("edition") if node.attr("edition")
         xml.version do |v|
           v.revision_date node.attr("revdate") if node.attr("revdate")
-          v.draft node.attr("draft") if node.attr("draft")
+          v.draft draft if draft
         end
       end
 
+      def metadata_version_value(node)
+        draft = node.attr("version") and return draft
+        draft = node.attr("draft") or return nil
+        draft.empty? and return nil
+        draft
+      end
+
       def metadata_status(node, xml)
         xml.status do |s|
           s.stage (node.attr("status") || node.attr("docstage") || "published")

data/lib/metanorma/standoc/macros.rb

@@ -124,11 +124,6 @@ module Metanorma
         end
       end
 
-      # KILL
-      def pass_convert(text)
-        text.sub(/^pass:\[(.+)$/, "pass-format:metanorma[\\1")
-      end
-
       # InlineLinkRx = %r((^|link:|#{CG_BLANK}|&lt;|[>\(\)\[\];"'])(\\?(?:https?|file|ftp|irc)://)(?:([^\s\[\]]+)\[(|#{CC_ALL}*?[^\\])\]|([^\s\[\]<]*([^\s,.?!\[\]<\)]))))m
       #
       InlineLinkRx = %r((^|(?<![-\\])\blink:(?!\+)|\p{Blank}|&lt;|[<>\(\)\[\];"'])((?:https?|file|ftp|irc)://)(?:([^\s\[\]]+)(?:(\[(|.*?[^\\])\])|([^\s\[\]<]*([^\s,.?!\[\]<\)])))))m

data/lib/metanorma/standoc/macros_inline.rb

@@ -134,7 +134,6 @@ module Metanorma
       end
     end
 
-    # inject ZWNJ to prevent Asciidoctor from attempting regex substitutions
     class PassFormatInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
       named :"pass-format"
@@ -143,29 +142,12 @@ module Metanorma
       def process(parent, target, attrs)
         format = target || "metanorma"
         out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"],
-                                      type: :pass, attributes: { 'subs' => [] }).convert
+                                      type: :pass, attributes: { "subs" => [] })
+          .convert
         <<~XML.strip
-          <passthrough-inline formats="#{format}">#{xml_process(out)}</passthrough-inline>
+          <passthrough-inline formats="#{format}">#{out}</passthrough-inline>
         XML
       end
-
-      # KILL
-      # Split content into XML tags (including XML-escaped instances),
-      # XML escapes, and text segments
-      # Then only apply ZWNJ to punctuation in text segments
-      def xml_process(out)
-        processed_out = ""
-        segments = out.split(/(<[^>]*>|&lt;[^&]*&gt;|&[^;]*;)/)
-        segments.each_with_index do |segment, index|
-          processed_out += if index.even? # Text segment (not a tag or escape)
-                             #segment.gsub(/([[:punct:]])/, "\\1&#x200c;")
-                             segment
-                           else # XML tag or escape
-                             segment
-                           end
-        end
-        processed_out
-      end
     end
 
     class IdentifierInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor

data/lib/metanorma/standoc/merge_bibitems.rb

@@ -13,6 +13,23 @@ module Metanorma
           end
         end
 
+        class ::Hash
+          def deep_merge(second)
+            merger = proc { |_, v1, v2|
+              if ::Hash === v1 && ::Hash === v2
+                v1.merge(v2, &merger)
+              elsif ::Array === v1 && ::Array === v2
+                v2 # overwrite old with new
+              elsif [:undefined].include?(v2)
+                v1
+              else
+                v2
+              end
+            }
+            merge(second.to_h, &merger)
+          end
+        end
+
         def initialize(old, new)
           @old = load_bibitem(old)
           @new = load_bibitem(new)

data/lib/metanorma/standoc/utils.rb

@@ -87,6 +87,8 @@ module Metanorma
         conv = presentation_xml_converter(EmptyAttr.new)
         i18n = conv.i18n_init(lang, script, locale, i18nyaml)
         conv.metadata_init(lang, script, locale, i18n)
+        conv.xref_init(lang, script, nil, i18n, {})
+        conv.xrefs.klass.meta = conv.meta
         conv
       end
 

data/lib/metanorma/standoc/validate.rb

@@ -1,11 +1,11 @@
 require "metanorma/standoc/utils"
+require_relative "validate_image"
 require_relative "validate_section"
 require_relative "validate_table"
 require_relative "validate_term"
 require_relative "validate_schema"
 require "nokogiri"
 require "iev"
-require "pngcheck"
 
 module Metanorma
   module Standoc
@@ -14,7 +14,6 @@ module Metanorma
         @doctype = doc.at("//bibdata/ext/doctype")&.text
         repeat_id_validate(doc.root) # feeds xref_validate, termsect_validate
         xref_validate(doc) # feeds nested_asset_validate
-        nested_asset_validate(doc)
         section_validate(doc)
         norm_ref_validate(doc)
         iev_validate(doc.root)
@@ -25,6 +24,7 @@ module Metanorma
         table_validate(doc)
         requirement_validate(doc)
         image_validate(doc)
+        block_validate(doc)
         math_validate(doc)
         fatalerrors = @log.abort_messages
         fatalerrors.empty? or
@@ -98,61 +98,6 @@ module Metanorma
         @log.add("Style", i, err2)
       end
 
-      def image_validate(doc)
-        image_exists(doc)
-        image_toobig(doc)
-        png_validate(doc)
-      end
-
-      def image_exists(doc)
-        doc.xpath("//image").each do |i|
-          Vectory::Utils::url?(i["src"]) and next
-          Vectory::Utils::datauri?(i["src"]) and next
-          expand_path(i["src"]) and next
-          @log.add("Images", i.parent,
-                   "Image not found: #{i['src']}", severity: 0)
-        end
-      end
-
-      def expand_path(loc)
-        relative_path = File.join(@localdir, loc)
-        [loc, relative_path].detect do |p|
-          File.exist?(p) ? p : nil
-        end
-      end
-
-      def png_validate(doc)
-        doc.xpath("//image[@mimetype = 'image/png']").each do |i|
-          Vectory::Utils::url?(i["src"]) and next
-          decoded = if Vectory::Utils::datauri?(i["src"])
-                      Vectory::Utils::decode_datauri(i["src"])[:data]
-                    else
-                      path = expand_path(i["src"]) or next
-                      File.binread(path)
-                    end
-          png_validate1(i, decoded)
-        end
-      end
-
-      def png_validate1(img, buffer)
-        PngCheck.check_buffer(buffer)
-      rescue PngCheck::CorruptPngError => e
-        @log.add("Images", img.parent,
-                 "Corrupt PNG image detected: #{e.message}")
-      end
-
-      TOO_BIG_IMG_ERR = <<~ERR.freeze
-        Image too large for Data URI encoding: disable Data URI encoding (`:data-uri-image: false`), or set `:data-uri-maxsize: 0`
-      ERR
-
-      def image_toobig(doc)
-        @dataurimaxsize.zero? and return
-        doc.xpath("//image").each do |i|
-          i["src"].size > @dataurimaxsize and
-            @log.add("Images", i.parent, TOO_BIG_IMG_ERR, severity: 0)
-        end
-      end
-
       def validate(doc)
         content_validate(doc)
         schema_validate(formattedstr_strip(doc.dup), schema_location)
@@ -250,6 +195,39 @@ module Metanorma
         get_anchors_between(from["target"], to_location["target"])
           .each { |id| @doc_xrefs[id] = from }
       end
+
+      def block_validate(doc)
+        nested_asset_validate(doc)
+        all_empty_block_validate(doc)
+      end
+
+      def all_empty_block_validate(doc)
+        %w(note example admonition figure quote pre).each do |tag|
+          empty_block_validate(doc, "//#{tag}", nil)
+        end
+        empty_block_validate(doc, "//sourcecode", "body")
+        empty_block_validate(doc, "//formula", "stem")
+        empty_block_validate(doc, "//ol", "li")
+        empty_block_validate(doc, "//ul", "li")
+        empty_block_validate(doc, "//dl", "dt")
+      end
+
+      def empty_block_validate(doc, tag, body)
+        # require "debug"; binding.b
+        doc.xpath(tag).each do |t|
+          body and t = t.at("./#{body}")
+          empty_block?(t) or next
+          @log.add("Blocks", t, "#{tag.sub(/^\/\//, '')} is empty", severity: 1)
+        end
+      end
+
+      def empty_block?(block)
+        content = block.children.reject { |n| n.name == "name" }
+        content.map do |n|
+          %w(image xref eref).include?(n.name) ? n.name : n
+        end
+        content.map(&:to_s).join.strip.empty?
+      end
     end
   end
 end

data/lib/metanorma/standoc/validate_image.rb

@@ -0,0 +1,62 @@
+require "pngcheck"
+
+module Metanorma
+  module Standoc
+    module Validate
+      def image_validate(doc)
+        image_exists(doc)
+        image_toobig(doc)
+        png_validate(doc)
+      end
+
+      def image_exists(doc)
+        doc.xpath("//image").each do |i|
+          Vectory::Utils::url?(i["src"]) and next
+          Vectory::Utils::datauri?(i["src"]) and next
+          expand_path(i["src"]) and next
+          @log.add("Images", i.parent,
+                   "Image not found: #{i['src']}", severity: 0)
+        end
+      end
+
+      def expand_path(loc)
+        relative_path = File.join(@localdir, loc)
+        [loc, relative_path].detect do |p|
+          File.exist?(p) ? p : nil
+        end
+      end
+
+      def png_validate(doc)
+        doc.xpath("//image[@mimetype = 'image/png']").each do |i|
+          Vectory::Utils::url?(i["src"]) and next
+          decoded = if Vectory::Utils::datauri?(i["src"])
+                      Vectory::Utils::decode_datauri(i["src"])[:data]
+                    else
+                      path = expand_path(i["src"]) or next
+                      File.binread(path)
+                    end
+          png_validate1(i, decoded)
+        end
+      end
+
+      def png_validate1(img, buffer)
+        PngCheck.check_buffer(buffer)
+      rescue PngCheck::CorruptPngError => e
+        @log.add("Images", img.parent,
+                 "Corrupt PNG image detected: #{e.message}")
+      end
+
+      TOO_BIG_IMG_ERR = <<~ERR.freeze
+        Image too large for Data URI encoding: disable Data URI encoding (`:data-uri-image: false`), or set `:data-uri-maxsize: 0`
+      ERR
+
+      def image_toobig(doc)
+        @dataurimaxsize.zero? and return
+        doc.xpath("//image").each do |i|
+          i["src"].size > @dataurimaxsize and
+            @log.add("Images", i.parent, TOO_BIG_IMG_ERR, severity: 0)
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.0.15".freeze
+    VERSION = "3.1.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.0.15
+  version: 3.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-09 00:00:00.000000000 Z
+date: 2025-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -554,6 +554,7 @@ files:
 - lib/metanorma/standoc/terms.rb
 - lib/metanorma/standoc/utils.rb
 - lib/metanorma/standoc/validate.rb
+- lib/metanorma/standoc/validate_image.rb
 - lib/metanorma/standoc/validate_schema.rb
 - lib/metanorma/standoc/validate_section.rb
 - lib/metanorma/standoc/validate_table.rb