metanorma-standoc 3.4.9 → 3.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a76abb834a587adae31dae92f93936ca82968bc7b77a9d907633b51a0de29319
-  data.tar.gz: a03fe3c22052427818cc8161c376786c27b3ee570dec4f4fa243713b54ef30a6
+  metadata.gz: b5094a6f74d9378c42e68b279963b6ac50f9c94412e259175c5d689111ddf6e6
+  data.tar.gz: 193d1ecb96eaba4fe068290844230558579feb43a911ac55f11d0cac086bb073
 SHA512:
-  metadata.gz: 17ac7b991acf83f47f01e79c8c0eb71f1531db814c77ec60b5fa69b0828707a25702f83a92492b49a2217f23525287d22fb6e064b3a48a3b3ecbbc8646a964d4
-  data.tar.gz: df7537f969e7559c90569125da0c3847da7cc723c998f96e1393229607d22271191b909c36262a8ee89a0c63fea20b5a4e005fa925e430c6b2e6b08d6699c1a6
+  metadata.gz: 793e4b2daecbde3ff0778cf36373bf9e6fc4ba63705bc7b42b545dc7fa6f52a40f6776325f15d55aaa18ea16e94fafbec88540896ae04f85989d97c67474a021
+  data.tar.gz: 90d033cbd1290db48e3a8fd9c33817970c8fb7488c13782b1fbd7ff7519105d4cf5608eeed51e014f9b85645c9d7036dc745a97d6c74a00adf5f92f6ccc173b5

data/lib/isodoc/html/htmlstyle.css

@@ -137,6 +137,10 @@ dl dd {
   grid-column-start: 2;
 }
 
+dl:has(dt .stem) {
+  grid-template-columns: fit-content(8em) auto;
+}
+
 b, strong {
   font-weight: bold;
 }

data/lib/metanorma/cleanup/bibitem.rb

@@ -34,6 +34,26 @@ module Metanorma
           bib.children = new.children.to_xml
         else bib << new.children.to_xml
         end
+        bibitem_reorder_elems(bib)
+      end
+
+      # canonical element order of BibliographicItem per biblio.rnc
+      BIBITEM_ELEM_ORDER =
+        %w(fetched formattedref title uri docidentifier docnumber date
+           contributor edition version note language locale script abstract
+           status copyright relation series medium place price extent size
+           accesslocation license classification keyword validity depiction)
+          .freeze
+
+      # the spans-derived fragment is appended after any elements already on
+      # the bibitem (e.g. formattedref, docnumber, date), which violates the
+      # ordered relaton content model; restore grammar order, stably
+      def bibitem_reorder_elems(bib)
+        bib.element_children
+          .sort_by
+          .with_index do |e, i|
+            [BIBITEM_ELEM_ORDER.index(e.name) || BIBITEM_ELEM_ORDER.size, i]
+          end.each { |e| bib << e }
       end
 
       def merge_bibitem_from_formattedref_span_attrs(bib, new)

data/lib/metanorma/cleanup/index.rb

@@ -1,10 +1,13 @@
 module Metanorma
   module Standoc
     module Index
+      # normalize-space(.) rather than normalize-space(text()): index terms
+      # wrapped entirely in formatting (<em>a priori</em>, stem) have no
+      # direct text nodes but are not empty
       EMPTY_INDEX_XPATH =
-        "//index[not(.//primary[normalize-space(text())]) " \
-        "or .//secondary[. and not(normalize-space(text()))] " \
-        "or .//tertiary[. and not(normalize-space(text()))]]".freeze
+        "//index[not(.//primary[normalize-space(.)]) " \
+        "or .//secondary[. and not(normalize-space(.))] " \
+        "or .//tertiary[. and not(normalize-space(.))]]".freeze
 
       def index_cleanup(xmldoc)
         para_index_cleanup(xmldoc)

data/lib/metanorma/cleanup/review.rb

@@ -35,6 +35,11 @@ module Metanorma
               when "ol", "ul" then node.at(".//p | .//name") || node.at("./li")
               when "dl" then node.at(".//p | .//name") || node.at("./dt | ./dd")
               when "table" then node.at(".//td[text()] | .//th[text()]")
+              # terms and their children have no legal place for a loose
+              # paragraph, so the bookmark must land inside existing content
+              when "term", "definition", "verbal-definition", "preferred",
+                "admitted", "deprecates", "related", "termnote", "termexample"
+                node.at(".//p | .//name")
               end or return nil
         first_non_stem_text(ret)
       end

data/lib/metanorma/cleanup/spans_to_bibitem.rb

@@ -58,7 +58,9 @@ module Metanorma
             ret += span_to_docid(s, "classification")
           end
           spans[:keyword]&.each do |s|
-            ret += span_to_docid(s, "keyword")
+            # keyword content is structured per the grammar: an uncontrolled
+            # keyword is a vocab entry, not bare text
+            ret += "<keyword><vocab>#{s[:val]}</vocab></keyword>"
           end
           spans[:image]&.each do |s|
             ret += "<depiction>#{s[:val]}</depiction>"

data/lib/metanorma/converter/base.rb

@@ -58,7 +58,7 @@ module Metanorma
             pronunciation|grammar|term|terms|termnote|termexample|source|
             origin|termref|modification)>)}x, "\\1\n")
           .gsub(%r{(<(title|name))}, "\n\\1")
-          .gsub(%r{(<sourcecode[^<>]*>)\s+(<name[^<>]*>[^<]+</name>)\s+},
+          .gsub(%r{(<sourcecode[^<>]*+>)\s++(<name[^<>]*+>(?>.*?</name>))\s++}m,
                 "\\1\\2")
       end
 

data/lib/metanorma/converter/converter.rb

@@ -54,6 +54,12 @@ module Metanorma
         preprocessor Metanorma::Standoc::NamedEscapePreprocessor
         inline_macro Metanorma::Standoc::PreferredTermInlineMacro
         inline_macro Metanorma::Standoc::DateInlineMacro
+        # PassFormat must run before Span (and the other bracketed inline macros
+        # below) so that a nested pass/pass-format passthrough is resolved to a
+        # bracket-free placeholder before Span delimits its own [...]; otherwise
+        # Span stops at the inner passthrough's ] and over-captures. See
+        # metanorma-standoc#1221.
+        inline_macro Metanorma::Standoc::PassFormatInlineMacro
         inline_macro Metanorma::Standoc::SpanInlineMacro
         inline_macro Metanorma::Standoc::AltTermInlineMacro
         inline_macro Metanorma::Standoc::AdmittedTermInlineMacro
@@ -79,7 +85,6 @@ module Metanorma
         inline_macro Metanorma::Standoc::FormSelectMacro
         inline_macro Metanorma::Standoc::FormOptionMacro
         inline_macro Metanorma::Standoc::ToCInlineMacro
-        inline_macro Metanorma::Standoc::PassFormatInlineMacro
         inline_macro Metanorma::Standoc::StdLinkInlineMacro
         inline_macro Metanorma::Standoc::NumberInlineMacro
         inline_macro Metanorma::Standoc::TrStyleInlineMacro

data/lib/metanorma/converter/front.rb

@@ -174,7 +174,12 @@ module Metanorma
       def metadata_keywords(node, xml)
         node.attr("keywords") or return
         node.attr("keywords").split(/,\s*/).each do |kw|
-          add_noko_elem(xml, "keyword", kw)
+          kw.empty? and next
+          # keyword content is structured per the grammar: an uncontrolled
+          # keyword is a vocab entry, not bare text
+          xml.keyword do |k|
+            add_noko_elem(k, "vocab", kw)
+          end
         end
       end
 

data/lib/metanorma/converter/inline.rb

@@ -160,12 +160,19 @@ module Metanorma
         uri
       end
 
+      # empty-string dimensions (image::x.png["","",""]) must fall back to
+      # "auto": ImageSize admits only numbers, percentages, or "auto"
+      def image_dim_attr(node, key)
+        ret = node.attr(key)
+        ret.nil? || ret.empty? ? "auto" : ret
+      end
+
       def image_attributes1(node, uri, sourceuri, type, altmedia)
         /^data:/.match?(sourceuri) and sourceuri = nil
         attr_code(altmedia_id_attr(node, altmedia)
           .merge(src: uri, mimetype: type,
-                 height: node.attr("height") || "auto",
-                 width: node.attr("width") || "auto",
+                 height: image_dim_attr(node, "height"),
+                 width: image_dim_attr(node, "width"),
                  filename: node.attr("filename") || sourceuri,
                  title: node.attr("titleattr"),
                  media: node.attr("media"), altmedia: altmedia,

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.4.9".freeze
+    VERSION = "3.4.10".freeze
   end
 end

data/lib/metanorma/validate/basicdoc.rng

@@ -1527,12 +1527,16 @@ to indicate that the index range covers a range of locations between the current
       <ref name="index-primary">
         <a:documentation>Primary index term to be recorded at the current location</a:documentation>
       </ref>
-      <ref name="index-secondary">
-        <a:documentation>Secondary index term to be recorded at the current location</a:documentation>
-      </ref>
-      <ref name="index-tertiary">
-        <a:documentation>Tertiary index term to be recorded at the current </a:documentation>
-      </ref>
+      <optional>
+        <ref name="index-secondary">
+          <a:documentation>Secondary index term to be recorded at the current location</a:documentation>
+        </ref>
+      </optional>
+      <optional>
+        <ref name="index-tertiary">
+          <a:documentation>Tertiary index term to be recorded at the current </a:documentation>
+        </ref>
+      </optional>
     </element>
   </define>
   <define name="index-xref">
@@ -1547,12 +1551,16 @@ The text in the inline element is the primary index term to be be cross-referenc
       <ref name="index-primary">
         <a:documentation>The primary index term to be cross-referenced</a:documentation>
       </ref>
-      <ref name="index-secondary">
-        <a:documentation>The secondary index term to be cross-referenced</a:documentation>
-      </ref>
-      <ref name="index-tertiary">
-        <a:documentation>The tertiary index term to be cross-referenced</a:documentation>
-      </ref>
+      <optional>
+        <ref name="index-secondary">
+          <a:documentation>The secondary index term to be cross-referenced</a:documentation>
+        </ref>
+      </optional>
+      <optional>
+        <ref name="index-tertiary">
+          <a:documentation>The tertiary index term to be cross-referenced</a:documentation>
+        </ref>
+      </optional>
       <element name="target">
         <a:documentation>The index term to be cross-referenced to</a:documentation>
         <oneOrMore>
@@ -1933,7 +1941,8 @@ or as the string "auto"</a:documentation>
   <define name="mathml">
     <a:documentation>Encoding of MathML: the official W3C MathML 4 grammar (namespace
 http://www.w3.org/1998/Math/MathML), via the metanorma wrapper in
-grammars/mathml/. See grammars/mathml/README.adoc and basicdoc-models#35.</a:documentation>
+grammars/mathml/. See grammars/mathml/README.adoc, basicdoc-models#35,
+and the MathML 3 -&gt; 4 migration: basicdoc-models#39 / metanorma#585.</a:documentation>
     <externalRef href="metanorma-mathml.rng"/>
   </define>
   <define name="StemAttributes">

data/lib/metanorma/validate/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.1.6 -->
+<!-- VERSION v2.2.0 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.4.9
+  version: 3.4.10
 platform: ruby
 authors:
 - Ribose Inc.