metanorma-standoc 2.9.7 → 2.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd70e2c82071482dcc338e1c8db424097e23a0fe5c8875960c47716903a05316
-  data.tar.gz: 249db61a4f2a706d67ce495535b169c934e0f85a257983827f43b93f1a186a26
+  metadata.gz: efa906e1b3067735301a14f3f21119e10cb6d100744f8e732dc4e404bf7c38ae
+  data.tar.gz: 96cd516c49dffa778854b6097f3264203cf892f7d643572d07e7712d18b3cd2b
 SHA512:
-  metadata.gz: ce2dc1394947485b5accdf9abf22de21729d3513f62965b633c2d4eb2ec5fa7a2a2858923596e064e598ce15c0ad51f4887660ac6ce6a4d6928d21f6a5a622c5
-  data.tar.gz: d5d49c9c2ebd8d2790c964d08457d080ff8b94009bd009c902f9c235195322e504314c79242932ce66bb995d3dab13263f00e7bb142437c7adde3049d94b867f
+  metadata.gz: 0103f46742310fd7fd639c59c58d54eb1275b3629c1bfdb47bacf613e185bf4b1e9f407d85f6370247aadcd7331968ff84927a09b0f277401e6762afdc6af1ad
+  data.tar.gz: aae472585794e5a22e2c0b8fbb666a332915f330a2af058d493076246b8b34333df3321bca5aacd0e53f90fef07ee28265ef1bca0f4a003693b10d6204c017b8

data/lib/metanorma/standoc/biblio-standoc.rng

@@ -72,6 +72,9 @@ standards defining organization, and that is rendered in a distinct manner</a:do
 from other documents in the same doctype</a:documentation>
       </ref>
     </optional>
+    <ref name="flavor">
+      <a:documentation>Flavour of Metanorma used to process this document</a:documentation>
+    </ref>
     <optional>
       <ref name="editorialgroup">
         <a:documentation>Groups associated with the production of the standards document, typically within
@@ -113,6 +116,16 @@ a standards definition organization</a:documentation>
   <define name="DocumentSubtype">
     <text/>
   </define>
+  <define name="flavor">
+    <element name="flavor">
+      <ref name="MetanormaFlavor"/>
+    </element>
+  </define>
+  <define name="MetanormaFlavor">
+    <a:documentation>This is in fact an enum, as of this writing: standoc iso generic ietf ieee itu nist ogc csa cc iho ribose jis iec bsi bipm plateau.
+However we prefer not to hardcode it, given ongoing extension.</a:documentation>
+    <text/>
+  </define>
   <define name="editorialgroup">
     <a:documentation>A group associated with the production of the standards document, typically within
 a standards definition organization</a:documentation>

data/lib/metanorma/standoc/biblio.rng

@@ -1382,18 +1382,7 @@ Applies whether the resource has already been created or not, and whether it is
   <define name="bdate">
     <a:documentation>Significant date in the lifecycle of the bibliographic item, including its production and its access</a:documentation>
     <element name="date">
-      <attribute name="type">
-        <a:documentation>The phase of the production of or access to a bibliographic item</a:documentation>
-        <choice>
-          <ref name="BibliographicDateType"/>
-          <text/>
-        </choice>
-      </attribute>
-      <optional>
-        <attribute name="text">
-          <a:documentation>An optional textual description of the date, especially when a Gregorian date is not applicable</a:documentation>
-        </attribute>
-      </optional>
+      <ref name="bDateAttributes"/>
       <optional>
         <choice>
           <group>
@@ -1416,6 +1405,20 @@ Applies whether the resource has already been created or not, and whether it is
       </optional>
     </element>
   </define>
+  <define name="bDateAttributes">
+    <attribute name="type">
+      <a:documentation>The phase of the production of or access to a bibliographic item</a:documentation>
+      <choice>
+        <ref name="BibliographicDateType"/>
+        <text/>
+      </choice>
+    </attribute>
+    <optional>
+      <attribute name="text">
+        <a:documentation>An optional textual description of the date, especially when a Gregorian date is not applicable</a:documentation>
+      </attribute>
+    </optional>
+  </define>
   <define name="docidentifier">
     <a:documentation>An identifier of a bibliographic item in an international standard scheme</a:documentation>
     <element name="docidentifier">
@@ -1884,6 +1887,10 @@ Detailed in https://www.relaton.org/model/relations/</a:documentation>
       <value>hasAnnotation</value>
       <value>draftOf</value>
       <value>hasDraft</value>
+      <value>preliminaryDraftOf</value>
+      <value>hasPreliminaryDraft</value>
+      <value>revisionDraftOf</value>
+      <value>hasRevisionDraft</value>
       <value>editionOf</value>
       <value>hasEdition</value>
       <value>updates</value>

data/lib/metanorma/standoc/cleanup_bibdata.rb

@@ -101,6 +101,8 @@ module Metanorma
         m = /:mn-document-class: (\S+)/.match(hdr[:text])
         if m then m[1].to_sym
         else Processor.new.asciidoctor_backend
+          # don't want processor() : we will leave embedded headers as standoc,
+          # not local flavour
         end
       end
 

data/lib/metanorma/standoc/cleanup_maths.rb

@@ -40,7 +40,8 @@ module Metanorma
           MATH
         else
           Plurimath::Math.parse(expr, "asciimath")
-            .to_mathml(display_style: elem["block"])
+            .to_mathml(display_style: elem["block"],
+                       unitsml_xml: expr.include?("unitsml"))
         end
       end
 

data/lib/metanorma/standoc/front.rb

@@ -127,6 +127,7 @@ module Metanorma
       def relation_normalise(type)
         type.sub(/-by$/, "By").sub(/-of$/, "Of").sub(/-from$/, "From")
           .sub(/-in$/, "In")
+          .sub(/^has-([a-z])/) { "has#{$1.upcase}" }
       end
 
       def metadata_getrelation(node, xml, type, desc = nil)
@@ -189,6 +190,7 @@ module Metanorma
       def metadata_ext(node, ext)
         metadata_doctype(node, ext)
         metadata_subdoctype(node, ext)
+        metadata_flavor(node, ext)
         metadata_committee(node, ext)
         metadata_ics(node, ext)
       end
@@ -201,6 +203,10 @@ module Metanorma
         s = node.attr("docsubtype") and xml.subdoctype s
       end
 
+      def metadata_flavor(_node, ext)
+        ext.flavor processor.new.asciidoctor_backend
+      end
+
       def metadata_note(node, xml); end
 
       def metadata_series(node, xml); end

data/lib/metanorma/standoc/macros_embed.rb

@@ -66,8 +66,8 @@ module Metanorma
       # -- but it won't: https://github.com/metanorma/metanorma-standoc/issues/802
       def read_flattened_embeds(ret, doc)
         reader = ::Asciidoctor::PreprocessorReader.new doc
-        b = Pathname.new doc.base_dir
-        ret.reverse.each do |l|
+        Pathname.new doc.base_dir
+        ret.reverse_each do |l|
           # if l[:file]
           # new = Pathname.new(l[:path]).relative_path_from(b).to_s
           # reader.push_include l[:lines], new, l[:path]

data/lib/metanorma/standoc/render.rb

@@ -93,7 +93,7 @@ module Metanorma
                          pdf-allow-print pdf-allow-print-hq
                          pdf-allow-access-content pdf-encrypt-metadata fonts
                          font-license-agreement).each_with_object({}) do |x, m|
-          m[x.gsub("-", "").to_i] = node.attr(x)
+          m[x.delete("-").to_i] = node.attr(x)
         end
 
         pdf_options.merge(fonts_manifest_option(node) || {})

data/lib/metanorma/standoc/spans_to_bibitem.rb

@@ -38,10 +38,17 @@ module Metanorma
           ret += spans_to_bibitem_docid(spans)
           ret += spans_to_contribs(spans)
           ret += spans_to_bibitem_edn(spans)
+          spans[:abstract] and ret += "<abstract>#{spans[:abstract]}</abstract>"
           ret += spans_to_series(spans)
           spans[:pubplace] and ret += "<place>#{spans[:pubplace]}</place>"
           ret += spans_to_bibitem_host(spans)
           ret += spans_to_bibitem_extent(spans[:extent])
+          spans[:classification]&.each do |s|
+            ret += span_to_docid(s, "classification")
+          end
+          spans[:image]&.each do |s|
+            ret += "<depiction>#{s[:val]}</depiction>"
+          end
           ret
         end
 

data/lib/metanorma/standoc/spans_to_bibitem_preprocessing.rb

@@ -3,10 +3,15 @@ module Metanorma
     module Cleanup
       class SpansToBibitem
         def extract_spans(bib)
-          bib.xpath("./formattedref//span").each_with_object([]) do |s, m|
+          ret = bib.xpath("./formattedref//span").each_with_object([]) do |s, m|
             s.at("./ancestor::span") and next
             extract_spans1(s, m)
           end
+          bib.xpath("./formattedref//image").each do |i|
+            i.delete("id")
+            ret << { key: "image", type: nil, val: i.remove.to_xml }
+          end
+          ret
         end
 
         def extract_spans1(span, acc)
@@ -25,7 +30,8 @@ module Metanorma
         end
 
         def empty_span_hash
-          { contrib: [], docid: [], uri: [], date: [], extent: {}, in: {} }
+          { contrib: [], docid: [], uri: [], date: [], classification: [],
+            image: [], extent: {}, in: {} }
         end
 
         def spans_preprocess(spans)
@@ -36,7 +42,7 @@ module Metanorma
 
         def span_preprocess1(span, ret)
           case span[:key]
-          when "uri", "docid"
+          when "uri", "docid", "classification"
             val = link_unwrap(Nokogiri::XML.fragment(span[:val])).to_xml
             ret[span[:key].to_sym] << { type: span[:type], val: }
           when "date"
@@ -45,8 +51,11 @@ module Metanorma
           when "pages", "volume", "issue"
             ret[:extent][span[:key].to_sym] ||= []
             ret[:extent][span[:key].to_sym] << span[:val]
-          when "pubplace", "title", "type", "series", "edition", "version"
+          when "pubplace", "title", "type", "series", "edition", "version",
+            "abstract"
             ret[span[:key].to_sym] = span[:val]
+          when "image"
+            ret[span[:key].to_sym] << { type: span[:type], val: span[:val] }
           when "note"
             ret[span[:key].to_sym] = { type: span[:type], val: span[:val] }
           when "in_title"

data/lib/metanorma/standoc/utils.rb

@@ -13,6 +13,16 @@ module Metanorma
         opts.empty? ? (send transform, node) : (send transform, node, opts)
       end
 
+      def processor
+        parent_type = self.class.name.split("::")[0...-1]
+        parent_type << "Processor"
+        begin
+          Object.const_get(parent_type.join("::"))
+        rescue NameError
+          nil
+        end
+      end
+
       def document_ns_attributes(_doc)
         nil
       end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.9.7".freeze
+    VERSION = "2.9.8".freeze
   end
 end

metadata

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