metanorma-standoc 3.1.8 → 3.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f9dbe3941901bd06b1d493edd4fd500dc586fb067d74acabdb57827ffd1185c
-  data.tar.gz: beb8a1972200318ed816475c263785333fdbfcc0657250602dfc4612cc935796
+  metadata.gz: de01a94e3cb7bcfb9a89059997ab380a4ad0e4bc1b978e9564b1c6e868e1b4d2
+  data.tar.gz: 92d49d407c518a7296398da6c24ad78d8d05a97216a6019469574325762a2acc
 SHA512:
-  metadata.gz: '08a120c27f5e2bdfb9f86e8b459bd859f7de1b3d2188fa9050ffacd4dc4cd56dc77ac410856cd7a559f73340be5d1e6655c56aab83032fc869060b37c9df91ae'
-  data.tar.gz: 21c8fbe6de245752b97baff1a8d186b40de89da53f063e9722882276e200a76a8afb45ad12871e9e084adebc3c774639fc6a2bf7c715a90d3df762413b887285
+  metadata.gz: bc5941a5e7f2a3736b23ec67b9a54418570e0cbabaec1ee178c4685497db541c3db15788bff3ac0a3a49a068e367d71144bb8b2dbcff7fea82b7c26bb945fd76
+  data.tar.gz: 9ddd293a80d0947882a033cec025e2d7cf26de022bb86791c80f8eb4f51df994aebdf72be5c492f711dbc4a52b196ab156e70cc5854d7b78b8d78f5039d9b7b7

data/lib/metanorma/standoc/biblio.rng

@@ -869,7 +869,7 @@ depending on whether the items exist as independent documents, or are parts of a
       </zeroOrMore>
     </element>
   </define>
-  <define name="BibItemType" combine="choice">
+  <define name="BibItemType">
     <a:documentation>Type of bibliographic item.
 The value list complies with the types provided in ISO 690:2021.
 NOTE: These values represent a strict superset to BibTeX

data/lib/metanorma/standoc/blocks.rb

@@ -9,8 +9,7 @@ module Metanorma
         anchor = node&.id
         { id: "_#{UUIDTools::UUID.random_create}",
           anchor: anchor && !anchor.empty? ? anchor : nil,
-          tag: node&.attr("tag"),
-          columns: node&.attr("columns"),
+          tag: node&.attr("tag"), columns: node&.attr("columns"),
           "multilingual-rendering": node&.attr("multilingual-rendering") }
           .compact
       end
@@ -95,9 +94,7 @@ module Metanorma
       def term_example(node)
         noko do |xml|
           xml.termexample **attr_code(id_attr(node)
-            .merge(
-              keepasterm: node.option?("termexample") || nil,
-            )) do |ex|
+            .merge(keepasterm: node.option?("termexample") || nil)) do |ex|
             wrap_in_para(node, ex)
           end
         end
@@ -235,7 +232,7 @@ module Metanorma
         end
       end
 
-      PASSTHROUGH_ERR = <<~ERRMSG.freeze
+      PASSTHRU_ERR = <<~ERRMSG.freeze
         This is not valid Metanorma XML. If you intended a different format, such as HTML, you need to specify `format=` on the pass markup;
         refer to https://www.metanorma.org/author/topics/blocks/passthroughs/
       ERRMSG
@@ -247,8 +244,7 @@ module Metanorma
       # as it may be fragment, e.g. unterminated start of element markup
       def passthrough_validate(node, content, encoded_content)
         valid, = validate_document_fragment(content.dup)
-        err =
-          "Invalid passthrough content: #{encoded_content}\n#{PASSTHROUGH_ERR}"
+        err = "Invalid passthrough content: #{encoded_content}\n#{PASSTHRU_ERR}"
         !valid and
           @log.add("Metanorma XML Syntax", node, err, severity: 0)
       end

data/lib/metanorma/standoc/cleanup_block.rb

@@ -84,7 +84,21 @@ module Metanorma
         end
       end
 
+      def figure_table_cleanup(xmldoc)
+        xmldoc.xpath("//figure").each do |f|
+          t = f.at("./table") or next
+          t["plain"] = true
+          t.xpath(".//td | .//th").each do |d|
+            d["align"] = "center"
+            d["valign"] = "bottom"
+          end
+          t.xpath("./note | ./footnote | ./dl | ./source")
+            .each { |n| f << n }
+        end
+      end
+
       def figure_cleanup(xmldoc)
+        figure_table_cleanup(xmldoc)
         figure_footnote_cleanup(xmldoc)
         subfigure_cleanup(xmldoc)
         figure_dl_cleanup1(xmldoc)

data/lib/metanorma/standoc/cleanup_xref.rb

@@ -149,17 +149,20 @@ 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_parse_compound_locations(locations, xref).reverse_each do |y|
           xref.add_first_child "<xref target='#{y[1]}' connective='#{y[0]}'/>"
         end
         xref&.at("./sentinel")&.remove
       end
 
-      def xref_parse_compound_locations(locations)
+      def xref_parse_compound_locations(locations, xref)
         l = locations.map { |y| y.split("!", 2) }
         l.map.with_index do |y, i|
           y.size == 1 and
             y.unshift(l.dig(i + 1, 0) == "to" ? "from" : "and")
+          %w(and from to or).include?(y[0]) or
+            @log.add("Crossreferences", xref,
+                     "Illegal cross-reference connective: #{y[0]}", severity: 0)
           y
         end
       end

data/lib/metanorma/standoc/converter.rb

@@ -42,6 +42,7 @@ module Metanorma
         preprocessor Metanorma::Plugin::Lutaml::Json2TextPreprocessor
         preprocessor Metanorma::Plugin::Lutaml::Yaml2TextPreprocessor
         preprocessor Metanorma::Plugin::Lutaml::Data2TextPreprocessor
+        preprocessor Metanorma::Plugin::Lutaml::LutamlXmiUmlPreprocessor
         preprocessor Metanorma::Plugin::Glossarist::DatasetPreprocessor
         preprocessor Metanorma::Standoc::NamedEscapePreprocessor
         inline_macro Metanorma::Standoc::PreferredTermInlineMacro

data/lib/metanorma/standoc/front.rb

@@ -180,11 +180,12 @@ module Metanorma
       def title(node, xml)
         title_main(node, xml)
         title_other(node, xml)
+        title_fallback(node, xml)
       end
 
       # English plain title: :title: or implicit, typed as main
       def title_main(node, xml)
-        title = node.attr("title") || node.attr("doctitle")
+        title = node.attr("title")
         node.attr("title-en") and return
         add_title_xml(xml, title, "en", "main")
       end
@@ -206,6 +207,11 @@ module Metanorma
           t << Metanorma::Utils::asciidoc_sub(content)
         end
       end
+
+      def title_fallback(node, xml)
+        xml.parent.at("./title[not(normalize-space(.)='')]") and return
+        add_title_xml(xml, node.attr("doctitle"), @lang, "main")
+      end
     end
   end
 end

data/lib/metanorma/standoc/isodoc.rng

@@ -311,17 +311,28 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure</a:documentation>
-        <ref name="image"/>
+        <a:documentation>Content of the figure     </a:documentation>
+        <ref name="image">
+          <a:documentation>by default the content of a figure is a media file</a:documentation>
+        </ref>
         <ref name="video"/>
         <ref name="audio"/>
-        <ref name="pre"/>
+        <ref name="pre">
+          <a:documentation>figures can contain ASCII art</a:documentation>
+        </ref>
         <oneOrMore>
-          <ref name="paragraph-with-footnote"/>
+          <ref name="paragraph-with-footnote">
+            <a:documentation>figures can contain discursive art</a:documentation>
+          </ref>
         </oneOrMore>
         <zeroOrMore>
-          <ref name="figure"/>
+          <ref name="figure">
+            <a:documentation>subfigures, nested directly within a figure</a:documentation>
+          </ref>
         </zeroOrMore>
+        <ref name="table">
+          <a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
+        </ref>
       </choice>
       <zeroOrMore>
         <ref name="fn">
@@ -354,17 +365,28 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure</a:documentation>
-        <ref name="image-no-id"/>
+        <a:documentation>Content of the figure     </a:documentation>
+        <ref name="image-no-id">
+          <a:documentation>by default the content of a figure is a media file</a:documentation>
+        </ref>
         <ref name="video-no-id"/>
         <ref name="audio-no-id"/>
-        <ref name="pre-no-id"/>
+        <ref name="pre-no-id">
+          <a:documentation>figures can contain ASCII art</a:documentation>
+        </ref>
         <oneOrMore>
-          <ref name="paragraph-with-footnote-no-id"/>
+          <ref name="paragraph-with-footnote-no-id">
+            <a:documentation>figures can contain discursive art</a:documentation>
+          </ref>
         </oneOrMore>
         <zeroOrMore>
-          <ref name="figure-no-id"/>
+          <ref name="figure-no-id">
+            <a:documentation>subfigures, nested directly within a figure</a:documentation>
+          </ref>
         </zeroOrMore>
+        <ref name="table-no-id">
+          <a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
+        </ref>
       </choice>
       <zeroOrMore>
         <ref name="fn">
@@ -876,6 +898,9 @@ titlecase, or lowercase</a:documentation>
           <data type="boolean"/>
         </attribute>
       </optional>
+      <ref name="LocalizedStringAttributes">
+        <a:documentation>Specify language of bibitem, can be used to render it with language-specific bibliographic style</a:documentation>
+      </ref>
       <ref name="ReducedBibliographicItem"/>
     </element>
   </define>

data/lib/metanorma/standoc/spans_to_bibitem.rb

@@ -54,6 +54,9 @@ module Metanorma
           spans[:classification]&.each do |s|
             ret += span_to_docid(s, "classification")
           end
+          spans[:keyword]&.each do |s|
+            ret += span_to_docid(s, "keyword")
+          end
           spans[:image]&.each do |s|
             ret += "<depiction>#{s[:val]}</depiction>"
           end

data/lib/metanorma/standoc/spans_to_bibitem_preprocessing.rb

@@ -31,7 +31,7 @@ module Metanorma
 
         def empty_span_hash
           { contrib: [], docid: [], uri: [], date: [], classification: [],
-            image: [], extent: {}, in: {} }
+            keyword: [], image: [], extent: {}, in: {} }
         end
 
         def spans_preprocess(spans)
@@ -42,7 +42,7 @@ module Metanorma
 
         def span_preprocess1(span, ret)
           case span[:key]
-          when "uri", "docid", "classification"
+          when "uri", "docid", "classification", "keyword"
             val = link_unwrap(Nokogiri::XML.fragment(span[:val])).to_xml
             ret[span[:key].to_sym] << { type: span[:type], val: }
           when "date"

data/lib/metanorma/standoc/validate_term.rb

@@ -25,6 +25,7 @@ module Metanorma
       end
 
       def iev_validate1(term, loc, xmldoc)
+        require "debug"; binding.b
         iev = @iev.fetch(loc,
                          xmldoc.at("//language")&.text || "en") or return
         pref = term.xpath("./preferred//name").inject([]) do |m, x|

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.1.8".freeze
+    VERSION = "3.1.9".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.1.8
+  version: 3.1.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-29 00:00:00.000000000 Z
+date: 2025-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable