isodoc 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1704124a224846f711e07140b38b352fe8d9548465654168467b0d892c29867d
-  data.tar.gz: eedf867e52f1ff13d2c7166a4bd9361ac432da5afc688c4d7bfa50f0f91bada5
+  metadata.gz: a85471023c45913439b8f282b641e3ef150cc8ae85a98abe0175308c4a0f66c7
+  data.tar.gz: de812d85b19a63560c65cf1920b25bed1f0bf53a1c94cd63cf45414c37d8b816
 SHA512:
-  metadata.gz: 20ce7106f1eb73784cf58ef1ed0bf7bfc7f5bcd6c1a8495f4bec0b19326b70f7228fc2b0886abe4c98df19d2f42cc0456be55c6eba6d90c7806bbbff56bd5cd7
-  data.tar.gz: ca9607aceeafd8d263a6cc779f6311d709b1c35c6be218ec6b0dee2193e86eb1cdc1725b0457d79c8967bcb27e6c4df4b062ca972960e96690e309ab7c9e9503
+  metadata.gz: b3c04391ab690ff67d9c2841158feb4c92f8f4f1e35fc62e6bf61daf64abd8fcec08193af1bdbff30d2bc4feec1994d75c1920c461e4ca0e38720ff8cebe1cf6
+  data.tar.gz: 77377cce8adc055116f91c972c6204c9aecd15a95df79c66b54ab07e78d7a2c0a1efa2e60262a8a1542b1f3c623da53b7f83631ce6a222e2107602ac6370039f

data/lib/isodoc/base_style/all.css

@@ -143,6 +143,11 @@ a.FootnoteRef, span.FootnoteRef {
   vertical-align: super;
 }
 
+a.TableFootnoteRef, a.FootnoteRef, a.footnote-number,
+sup a, a:has(> sup) {
+  vertical-align: baseline;
+}
+
 .addition {
   color: blue;
 }

data/lib/isodoc/base_style/reset.css

@@ -130,6 +130,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/isodoc/base_style/reset.scss

@@ -137,6 +137,18 @@ dl {
   }
 }
 
+// metanorma-taste#150: a symbols definition list holds the AsciiMath *source*
+// string in its dt (HTML renders math client-side via async MathJax, which never
+// reflows the grid), so a long source blows out the max-content term column and
+// pushes every definition far right. Cap the term column of stem-bearing dls so
+// the term-to-definition gap stays bounded; plain/abbreviation dls keep
+// max-content, which is correct for them. 8em is a crude, tunable ceiling.
+// STOPGAP: remove this rule and restore plain max-content once HTML emits
+// server-side MathML (the term column will then size to the rendered symbol).
+dl:has(dt .stem) {
+  grid-template-columns: fit-content(8em) auto;
+}
+
 b, strong {
   font-weight: bold;
 }

data/lib/isodoc/metadata_bibdata.rb

@@ -63,11 +63,59 @@ module IsoDoc
       bib = BibdataConfig.from_xml(
         "<metanorma>#{stripped.root.to_xml}</metanorma>",
       ).bibdata or return nil
-      YAML.safe_load(bib.to_yaml, permitted_classes: [Date, Symbol],
-                                  symbolize_names: true)
+      hash = YAML.safe_load(bib.to_yaml, permitted_classes: [Date, Symbol],
+                                         symbolize_names: true)
+      hash and fold_in_bibdata_ext(hash, stripped)
+      hash
     rescue StandardError => e
       warn "Failed to parse bibdata for Liquid template use: #{e.message}"
       nil
     end
+
+    # The Liquid `bibdata` object is built by round-tripping //bibdata through
+    # the Relaton object model, which represents bibliographic-item fields but
+    # not the Metanorma-document extension metadata under bibdata/ext
+    # (coverpage-image, innercoverpage-image, ...). Relaton drops those, so
+    # fold the raw ext subtree back in, using the same serialisation convention
+    # Relaton uses: element text -> :content, attributes -> sibling keys,
+    # repeated elements -> arrays, hyphens -> underscores (as in
+    # schema-version -> schema_version). Relaton-modelled keys win on collision;
+    # :ext is only populated when <ext> is present.
+    def fold_in_bibdata_ext(hash, stripped)
+      ext = stripped.at("//bibdata/ext") or return
+      raw = xml_element_hash(ext)
+      raw.is_a?(Hash) or return
+      modelled = hash[:ext].is_a?(Hash) ? hash[:ext] : {}
+      hash[:ext] = raw.merge(modelled)
+    end
+
+    # Generic Nokogiri element -> nested hash in Relaton's serialisation shape.
+    def xml_element_hash(node)
+      hash = {}
+      node.attribute_nodes.each { |a| hash[ext_hash_key(a.node_name)] = a.value }
+      children = node.element_children
+      if children.empty?
+        text = node.text.strip
+        hash[:content] = text unless text.empty?
+      else
+        children.each do |c|
+          add_ext_child(hash, ext_hash_key(c.node_name), xml_element_hash(c))
+        end
+      end
+      hash
+    end
+
+    def add_ext_child(hash, key, value)
+      if hash.key?(key)
+        hash[key] = [hash[key]] unless hash[key].is_a?(Array)
+        hash[key] << value
+      else
+        hash[key] = value
+      end
+    end
+
+    def ext_hash_key(name)
+      name.tr("-", "_").to_sym
+    end
   end
 end

data/lib/isodoc/presentation_function/sourcecode.rb

@@ -51,7 +51,19 @@ module IsoDoc
 
     def sourcecode1(elem)
       ret1 = semx_fmt_dup(elem)
-      b = ret1.at(ns(".//body")) and b.replace(b.children)
+      if (b = ret1.at(ns(".//body")))
+        # Remove formatting whitespace *preceding* the body (e.g. the newlines
+        # standoc emits around a <name> with inline markup). Once the body is
+        # unwrapped and the name removed, such stray whitespace would be lexed
+        # as leading blank lines of code. Whitespace after the body and the
+        # verbatim body content itself are untouched, so genuine code
+        # indentation is preserved.
+        b.parent.children.each do |c|
+          c == b and break
+          c.text? && c.text.strip.empty? and c.remove
+        end
+        b.replace(b.children)
+      end
       source_label(elem)
       source_highlight(ret1, elem["linenums"] == "true", elem["lang"])
       callouts(elem)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.7.0".freeze
+  VERSION = "3.7.1".freeze
 end

data/lib/isodoc/xref/xref_anchor.rb

@@ -70,9 +70,19 @@ module IsoDoc
                              elem_name)
         ret[:container] = @klass.get_clause_id(node) if opt[:container]
         ret[:value] = stripsemx(lbl)
+        t = asset_title(node) and ret[:title] = t
         ret
       end
 
+      # Caption of a numbered asset (its <name>, or a modspec requirement's
+      # <title>), semx-wrapped, so that xrefstyle=full can render
+      # "Table 3, caption" the way clauses render "Clause 6, Title". Returns nil
+      # when the asset has no caption, so anchor_xref_full falls back to short.
+      def asset_title(node)
+        n = node.at(ns("./name")) || node.at(ns("./title")) or return nil
+        semx(node, n.children.to_xml, n.name)
+      end
+
       include ::IsoDoc::XrefGen::Util
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - Ribose Inc.