metanorma-standoc 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 101539eb3a9ab93dced9b971970f3ff3901d7d85de59be1cac19e92495b0e9d3
-  data.tar.gz: f628e233575e4b13e92aeb6980fd42c9b97e05256f8e859f892fbb71643247f1
+  metadata.gz: 9bc2bfaaaf9871ba417d1d455867a0d67b6df3f219886aa290a6195583eacafc
+  data.tar.gz: 3f2a6511903492d4853334fc0780143a7b01d13e8d8f6d27630631208fc10b5d
 SHA512:
-  metadata.gz: '0943020cfe1c2a7a7947f470c0443ff200cbb5ca894b8268dda16e66e8e310f810cb0c0dc64d495b544c987d14995bd5e57d69ac25e61432a3b563bf1b8f2036'
-  data.tar.gz: 1d68cd3ebd13e2681442a65975201ce39bdcf84eaa6f7b299345716e0b091129babaea12eb6faf5af207415af45a5d4a39cf59c362659156fcdf635f8f9b86f4
+  metadata.gz: 3485d18dfbe8b3474770f3e97d80652225539cca579b06cf1f0ca9a2ebe414c8ba1663a9b099eabecdea30cd3c630c2bebc54dfc1eb7dd954ffe89155d9d1da4
+  data.tar.gz: 8953152a143fbc28f9117e1f593b47e26f06b54eebd6498b71b98c5b5ea91a2240e41fae83af96d5f0a1ae618ebf0cb0d55b6f787db68d4ceb3509937493413c

data/lib/isodoc/html/htmlstyle.css

@@ -145,16 +145,6 @@ div.document-stage-band, div.document-type-band {
   background-color: #333333;
 }
 
-a.FootnoteRef + a.FootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
-a.TableFootnoteRef + a.TableFootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
 a.TableFootnoteRef, span.TableFootnoteRef,
 a.FootnoteRef, span.FootnoteRef {
   vertical-align: super;
@@ -477,11 +467,13 @@ body {
   line-height: 1.4em;
   color: #1d1d1d;
   background-color: #ffffff;
-  font-weight: 400;
 }
 body main {
   margin: 0 3em 0 6em;
 }
+body {
+  font-weight: 400;
+}
 body pre * {
   font-family: {{bodyfont}} !important;
 }
@@ -489,10 +481,6 @@ body pre * {
 /*
     2. Responsive navigation layout
 */
-#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
-  font-family: {{bodyfont}};
-  font-weight: 400;
-}
 #toc ul, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
   margin: 0;
   padding: 0;
@@ -544,6 +532,10 @@ body pre * {
     color: black;
   }
 }
+#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  font-family: {{bodyfont}};
+  font-weight: 400;
+}
 @media screen and (max-width: 768px) {
   #toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0 1.5em;
@@ -632,12 +624,6 @@ body pre * {
   }
 }
 
-div.figure {
-  line-height: 1.6em;
-  padding: 1.5em;
-  margin: 2em 0 1em 0;
-  overflow: auto;
-}
 div.figure .FigureTitle, div.figure .figure-title {
   font-weight: 700;
   font-size: 1em;
@@ -650,6 +636,12 @@ div.figure > img, div.figure > svg {
   max-width: 100%;
   height: auto;
 }
+div.figure {
+  line-height: 1.6em;
+  padding: 1.5em;
+  margin: 2em 0 1em 0;
+  overflow: auto;
+}
 
 /*
     Document types + stages
@@ -969,6 +961,13 @@ p.Biblio, p.NormRef {
 /*
     3.6 Source Code + figures
 */
+.figure .SourceTitle,
+pre .SourceTitle,
+.pseudocode .SourceTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+}
 .figure,
 pre,
 .pseudocode {
@@ -979,13 +978,6 @@ pre,
   margin: 2em 0 1em 0;
   overflow: auto;
 }
-.figure .SourceTitle,
-pre .SourceTitle,
-.pseudocode .SourceTitle {
-  font-weight: 700;
-  font-size: 1em;
-  text-align: center;
-}
 
 pre {
   font-family: {{monospacefont}};
@@ -1032,12 +1024,14 @@ pre {
   padding: 1.2em;
   margin: 2em 0 1em 0;
   text-align: left;
-  color: #424242;
-  padding-left: 2.7em;
 }
 .example p {
   margin: 0;
 }
+.example {
+  color: #424242;
+  padding-left: 2.7em;
+}
 .example .example-title {
   font-weight: 700;
   text-transform: uppercase;
@@ -1318,7 +1312,6 @@ To top button
   cursor: pointer;
   padding: 10px 15px 10px 15px;
   border-radius: 4px;
-  text-transform: uppercase;
 }
 #myBtn:hover {
   opacity: 1;
@@ -1328,6 +1321,9 @@ To top button
     display: none;
   }
 }
+#myBtn {
+  text-transform: uppercase;
+}
 #myBtn a.anchorjs-link:hover {
   background: none;
   color: #485094;

data/lib/metanorma/standoc/base.rb

@@ -139,7 +139,7 @@ module Metanorma
           %w(presentation semantic).each do |t|
             /^#{t}-metadata-/.match?(k) or next
             k = k.sub(/^#{t}-metadata-/, "")
-            quoted_csv_split(v.gsub("&#", "&#"))&.each do |c|
+            csv_split(v.gsub("&#", "&#"), ",", encode: false)&.each do |c|
               ret << "<#{t}-metadata><#{k}>#{c}</#{k}></#{t}-metadata>"
             end
           end

data/lib/metanorma/standoc/cleanup.rb

@@ -83,7 +83,9 @@ module Metanorma
         ext_contributor_cleanup(xmldoc) # feeds: bibdata_cleanup
         ext_dochistory_cleanup(xmldoc) # feeds: bibdata_cleanup
         bibdata_cleanup(xmldoc) # feeds: boilerplate_cleanup
-        boilerplate_cleanup(xmldoc) # feeds: xref_cleanup for new <<>> introduced
+        boilerplate_cleanup(xmldoc) # feeds: xref_cleanup for new <<>> 
+        # introduced, pres_metadata_cleanup
+        pres_metadata_cleanup(xmldoc)
         xref_cleanup(xmldoc)
         svgmap_cleanup(xmldoc) # feeds: img_cleanup
         review_cleanup(xmldoc)
@@ -209,6 +211,16 @@ module Metanorma
         ins = add_misc_container(xmldoc)
         ins << @metadata_attrs
       end
+
+      def pres_metadata_cleanup(xmldoc)
+        @isodoc ||= isodoc(@lang, @script, @locale)
+        isodoc_bibdata_parse(xmldoc)
+        xmldoc.xpath("//presentation-metadata/* | //semantic-metadata/*")
+          .each do |x|
+          /\{\{|\{%/.match?(x) or next
+          x.children = @isodoc.populate_template(to_xml(x.children), nil)
+        end
+      end
     end
   end
 end

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -3,7 +3,7 @@ require_relative "cleanup_terms_boilerplate"
 module Metanorma
   module Standoc
     module Cleanup
-      def norm_ref_preface(ref)
+      def norm_ref_preface(ref, isodoc)
         ins = norm_ref_boilerplate_insert_location(ref)
         ins2 = norm_ref_process_boilerplate_note(ref)
         ins2 == :populated and return
@@ -12,7 +12,7 @@ module Metanorma
           %w(references bibitem).include? e.name
         end
         pref = refs.empty? ? @i18n.norm_empty_pref : @i18n.norm_with_refs_pref
-        ins.next = boilerplate_snippet_convert(pref)
+        ins.next = boilerplate_snippet_convert(pref, isodoc)
       end
 
       def norm_ref_process_boilerplate_note(ref)
@@ -40,18 +40,27 @@ module Metanorma
         "//bibliography/references[@normative = 'true'][not(@hidden)] | " \
         "//bibliography/clause[.//references[@normative = 'true']]".freeze
 
+      def dup_with_namespace(elem)
+        ret = elem.dup
+        ret.add_namespace(nil, xml_namespace)
+        ret
+      end
+
       def boilerplate_isodoc(xmldoc)
         # prevent infinite recursion of asciidoc boilerplate processing
         # in termdef_boilerplate_insert and initial_boilerplate
         xmldoc.at("//metanorma-extension/semantic-metadata/" \
                   "headless[text() = 'true']") and return nil
-        x = xmldoc.dup
-        x.root.add_namespace(nil, xml_namespace)
-        xml = Nokogiri::XML(x.to_xml)
         @isodoc ||= isodoc(@lang, @script, @locale)
+        isodoc_bibdata_parse(xmldoc)
+        @isodoc
+      end
+
+      def isodoc_bibdata_parse(xmldoc)
         # initialise @isodoc.xrefs, for @isodoc.xrefs.info
+        x = dup_with_namespace(xmldoc.root)
+        xml = Nokogiri::XML(x.to_xml)
         @isodoc.bibdata(xml) # do i18n
-        @isodoc
       end
 
       def unwrap_boilerplate_clauses(xmldoc, xpath)
@@ -71,7 +80,7 @@ module Metanorma
         termdef_boilerplate_insert(xmldoc, isodoc)
         unwrap_boilerplate_clauses(xmldoc, self.class::TERM_CLAUSE)
         if f = xmldoc.at(self.class::NORM_REF)
-          norm_ref_preface(f)
+          norm_ref_preface(f, isodoc)
           unwrap_boilerplate_clauses(f, ".")
         end
         initial_boilerplate(xmldoc, isodoc)
@@ -210,16 +219,16 @@ module Metanorma
         /\.adoc(\.liquid)?$/.match?(file) or return ret
 
         # Split content into macro and non-macro parts
-        parts = ret.split(/(#{ADOC_MACRO_PATTERN})/)
+        parts = ret.split(/(#{ADOC_MACRO_PATTERN})/o)
 
         parts.map.with_index do |part, index|
-          if index.odd? && is_valid_macro?(part)
+          if index.odd? && valid_macro?(part)
             # This is a macro - leave unchanged
             part
           else
             # Not a macro - wrap {{ }} patterns
             part.gsub(/(?<!\{)(\{\{[^{}]+\}\})(?!\})/,
-                     "pass-format:metanorma[++\\1++]")
+                      "pass-format:metanorma[++\\1++]")
           end
         end.join
       end
@@ -240,7 +249,7 @@ module Metanorma
 
       private
 
-      def is_valid_macro?(text)
+      def valid_macro?(text)
         # Simple validation - does it look like a macro?
         text.match?(/^\S+:[^\[]*\[.*\]$/)
       end

data/lib/metanorma/standoc/cleanup_terms_boilerplate.rb

@@ -11,19 +11,20 @@ module Metanorma
         e.gsub(/%(?=\p{P}|\p{Z}|$)/, sources || "??")
       end
 
-      def boilerplate_snippet_convert(adoc)
-        ret = boilerplate_xml_cleanup(adoc2xml(adoc, backend.to_sym))
+      def boilerplate_snippet_convert(adoc, isodoc)
+        b = isodoc.populate_template(adoc, nil)
+        ret = boilerplate_xml_cleanup(adoc2xml(b, backend.to_sym))
         @i18n.l10n(ret.children.to_xml, @lang, @script)
       end
 
       def term_defs_boilerplate(div, source, term, _preface, isodoc)
         verify_term_defs_source(source)
         a = @i18n.term_def_boilerplate and
-          div.next = boilerplate_snippet_convert(a)
+          div.next = boilerplate_snippet_convert(a, isodoc)
         a = if source.empty? && term.nil? then @i18n.no_terms_boilerplate
             else term_defs_boilerplate_cont(source, term, isodoc)
             end
-        a and div.next = boilerplate_snippet_convert(a)
+        a and div.next = boilerplate_snippet_convert(a, isodoc)
       end
 
       def verify_term_defs_source(source)

data/lib/metanorma/standoc/converter.rb

@@ -35,6 +35,7 @@ module Metanorma
         block_macro Metanorma::Plugin::Lutaml::LutamlKlassTableBlockMacro
         block_macro Metanorma::Plugin::Lutaml::LutamlEnumTableBlockMacro
         block Metanorma::Plugin::Plantuml::BlockProcessor
+        block_macro Metanorma::Plugin::Plantuml::ImageBlockMacroProcessor
         preprocessor Metanorma::Standoc::EmbedIncludeProcessor
         preprocessor Metanorma::Standoc::LinkProtectPreprocessor
         preprocessor Metanorma::Standoc::PassProtectPreprocessor

data/lib/metanorma/standoc/front.rb

@@ -1,6 +1,7 @@
 require "date"
 require "pathname"
 require_relative "./front_contributor"
+require_relative "./front_ext"
 require "isoics"
 
 module Metanorma
@@ -53,17 +54,6 @@ module Metanorma
         end
       end
 
-      def metadata_ics(node, xml)
-        ics = node.attr("library-ics")
-        ics&.split(/,\s*/)&.each do |i|
-          xml.ics do |elem|
-            elem.code i
-            icsdata = Isoics.fetch i
-            elem.text_ icsdata.description
-          end
-        end
-      end
-
       def metadata_source(node, xml)
         node.attr("uri") && xml.uri(node.attr("uri"))
         %w(xml html pdf doc relaton).each do |t|
@@ -183,66 +173,37 @@ module Metanorma
         end
       end
 
-      def metadata_ext(node, ext)
-        metadata_doctype(node, ext)
-        metadata_subdoctype(node, ext)
-        metadata_flavor(node, ext)
-        metadata_ics(node, ext)
-        structured_id(node, ext)
-        metadata_coverpage_images(node, ext)
-      end
-
-      def structured_id(node, xml); end
-
-      def metadata_doctype(node, xml)
-        xml.doctype doctype(node)
-      end
-
-      def metadata_subdoctype(node, xml)
-        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
 
       def title(node, xml)
-        title_english(node, xml)
-        title_otherlangs(node, xml)
-      end
-
-      def title_english(node, xml)
-        ["en"].each do |lang|
-          at = { language: lang, format: "text/plain" }
-          xml.title **attr_code(at) do |t|
-            title = Metanorma::Utils::asciidoc_sub(
-              node.attr("title") || node.attr("title-en") || node.attr("doctitle"),
-            )
-            t << title
-          end
-        end
+        title_main(node, xml)
+        title_other(node, xml)
       end
 
-      def title_otherlangs(node, xml)
+      # English plain title: :title: or implicit, typed as main
+      def title_main(node, xml)
+        title = node.attr("title") || node.attr("doctitle")
+        node.attr("title-en") and return
+        add_title_xml(xml, title, "en", "main")
+      end
+
+      def title_other(node, xml)
         node.attributes.each do |k, v|
-          /^title-(?<titlelang>.+)$/ =~ k or next
-          titlelang == "en" and next
-          xml.title v, { language: titlelang, format: "text/plain" }
+          /^title-(?<remainder>.+)$/ =~ k or next
+          type, language = remainder.split("-", 2)
+          if language.nil?
+            language = type
+            type = "main"
+          end
+          add_title_xml(xml, v, language, type)
         end
       end
 
-      def metadata_coverpage_images(node, xml)
-        %w(coverpage-image innercoverpage-image tocside-image
-           backpage-image).each do |n|
-          if a = node.attr(n)
-            xml.send n do |c|
-              a.split(",").each { |x| c.image src: x }
-            end
-          end
+      def add_title_xml(xml, content, language, type)
+        xml.title **attr_code(language: language, type: type) do |t|
+          t << Metanorma::Utils::asciidoc_sub(content)
         end
       end
     end

data/lib/metanorma/standoc/front_ext.rb

@@ -0,0 +1,50 @@
+module Metanorma
+  module Standoc
+    module Front
+      def metadata_ics(node, xml)
+        ics = node.attr("library-ics")
+        ics&.split(/,\s*/)&.each do |i|
+          xml.ics do |elem|
+            elem.code i
+            icsdata = Isoics.fetch i
+            elem.text_ icsdata.description
+          end
+        end
+      end
+
+      def metadata_ext(node, ext)
+        metadata_doctype(node, ext)
+        metadata_subdoctype(node, ext)
+        metadata_flavor(node, ext)
+        metadata_ics(node, ext)
+        structured_id(node, ext)
+        metadata_coverpage_images(node, ext)
+      end
+
+      def structured_id(node, xml); end
+
+      def metadata_doctype(node, xml)
+        xml.doctype doctype(node)
+      end
+
+      def metadata_subdoctype(node, xml)
+        s = node.attr("docsubtype") and xml.subdoctype s
+      end
+
+      def metadata_flavor(_node, ext)
+        ext.flavor processor.new.asciidoctor_backend
+      end
+
+      def metadata_coverpage_images(node, xml)
+        %w(coverpage-image innercoverpage-image tocside-image
+           backpage-image).each do |n|
+          if a = node.attr(n)
+            xml.send n do |c|
+              a.split(",").each { |x| c.image src: x }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/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.2 -->
+<!-- VERSION v2.1.3 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -455,14 +455,7 @@ normative or informative references, some split references into sections organiz
           </ref>
         </zeroOrMore>
         <zeroOrMore>
-          <ref name="doc_bibitem">
-            <a:documentation>Bibliographic item cited in the document</a:documentation>
-          </ref>
-          <zeroOrMore>
-            <ref name="note">
-              <a:documentation>Annotation of the bibliographic item</a:documentation>
-            </ref>
-          </zeroOrMore>
+          <ref name="ReferenceEntry"/>
         </zeroOrMore>
         <zeroOrMore>
           <ref name="references">
@@ -604,18 +597,21 @@ gives an explicit page orientation</a:documentation>
         </element>
       </optional>
     </define>
-  </include>
-  <!-- end overrides -->
-  <define name="FnAttributes" combine="interleave">
-    <ref name="RequiredId"/>
-    <optional>
-      <attribute name="hiddenref">
-        <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
+    <define name="FnAttributes">
+      <ref name="RequiredId"/>
+      <optional>
+        <attribute name="hiddenref">
+          <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
 This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
-        <data type="boolean"/>
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <attribute name="reference">
+        <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
       </attribute>
-    </optional>
-  </define>
+    </define>
+  </include>
+  <!-- end overrides -->
   <define name="TdAttributes" combine="interleave">
     <ref name="RequiredId"/>
     <optional>
@@ -853,6 +849,17 @@ titlecase, or lowercase</a:documentation>
       <value>informative</value>
     </choice>
   </define>
+  <define name="ReferenceEntry">
+    <a:documentation>Entry in bibliography</a:documentation>
+    <ref name="doc_bibitem">
+      <a:documentation>Bibliographic item cited in the document</a:documentation>
+    </ref>
+    <zeroOrMore>
+      <ref name="note">
+        <a:documentation>Annotation of the bibliographic item</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="doc_bibitem">
     <a:documentation>Standardisation document representation of bibliographic entry</a:documentation>
     <element name="bibitem">

data/lib/metanorma/standoc/ref.rb

@@ -27,7 +27,7 @@ module Metanorma
       def isorefmatchescode(match, _item)
         code = analyse_ref_code(match[:code])
         yr = norm_year(match[:year])
-        { code: match[:code], year: yr, match:,
+        { code: match[:code], year: yr, match:, fn: match[:fn],
           title: match[:text], usrlbl: match[:usrlbl] || code[:usrlabel],
           analyse_code: code, lang: @lang || :all }
       end
@@ -58,6 +58,14 @@ module Metanorma
         end
       end
 
+      def ref_fn(match, xml)
+        if match.names.include?("fn") && match[:fn]
+          xml.note(**plaintxt.merge(type: "Unpublished-Status")) do |p|
+            p << match[:fn].to_s
+          end
+        end
+      end
+
       def isorefmatches2_1(xml, match, code)
         xml.bibitem **attr_code(ref_attributes(match)) do |t|
           isorefrender1(t, match, code, "--")
@@ -65,11 +73,7 @@ module Metanorma
             d.on "--"
           end
           iso_publisher(t, match[:code])
-          unless match[:fn].nil?
-            t.note(**plaintxt.merge(type: "Unpublished-Status")) do |p|
-              p << match[:fn].to_s
-            end
-          end
+          ref_fn(match, t)
         end
       end
 
@@ -97,11 +101,7 @@ module Metanorma
           isorefrender1(t, match, code, year, " (all parts)")
           conditional_date(t, match, year == "--")
           iso_publisher(t, match[:code])
-          if match.names.include?("fn") && match[:fn]
-            t.note(**plaintxt.merge(type: "Unpublished-Status")) do |p|
-              p << match[:fn].to_s
-            end
-          end
+          ref_fn(match, t)
           t.extent type: "part" do |e|
             e.referenceFrom "all"
           end
@@ -137,6 +137,7 @@ module Metanorma
           /^\d+$|^\(.+\)$/.match?(code[:id]) or
             docnumber(t, code[:id]&.sub(/[:-](19|20)[0-9][0-9]$/, ""))
           conditional_date(t, yr_match || match, false)
+          ref_fn(match, t)
         end
       end
 
@@ -165,11 +166,11 @@ module Metanorma
       def refitem1code(_item, match)
         code = analyse_ref_code(match[:code])
         ((code[:id] && code[:numeric]) || code[:nofetch]) and
-          return { code: nil, match:, analyse_code: code,
+          return { code: nil, match:, analyse_code: code, fn: match[:fn],
                    hidden: code[:hidden] }
         { code: code[:id], analyse_code: code, localfile: code[:localfile],
           year: (m = refitem1yr(code[:id])) ? m[:year] : nil,
-          title: match[:text], match:, hidden: code[:hidden],
+          title: match[:text], match:, hidden: code[:hidden], fn: match[:fn],
           usrlbl: match[:usrlbl] || code[:usrlabel], lang: @lang || :all }
       end
 

data/lib/metanorma/standoc/ref_queue.rb

@@ -195,7 +195,7 @@ module Metanorma
       def smart_render_xml(xml, code, opts)
         xml.respond_to? :to_xml or return nil
         xml = Nokogiri::XML(xml.to_xml(lang: opts[:lang]))
-        emend_biblio(xml, code, opts[:title], opts[:usrlbl])
+        emend_biblio(xml, code, opts)
         xml.xpath("//date").each { |d| Metanorma::Utils::endash_date(d) }
         xml.traverse do |n|
           n.text? and n.replace(Metanorma::Utils::smartformat(n.text))

data/lib/metanorma/standoc/ref_sect.rb

@@ -53,10 +53,11 @@ module Metanorma
         end
       end
 
-      def emend_biblio(xml, code, title, usrlbl)
+      def emend_biblio(xml, code, opts)
         emend_biblio_id(xml, code)
-        emend_biblio_title(xml, code, title)
-        emend_biblio_usrlbl(xml, usrlbl)
+        emend_biblio_title(xml, code, opts[:title])
+        emend_biblio_usrlbl(xml, opts[:usrlbl])
+        emend_biblio_fn(xml, opts[:fn])
       end
 
       def emend_biblio_id(xml, code)
@@ -86,6 +87,11 @@ module Metanorma
         xml.at("/bibitem/docidentifier").next =
           "<docidentifier type='metanorma'>#{mn_code(usrlbl)}</docidentifier>"
       end
+
+      def emend_biblio_fn(xml, fnote)
+        fnote or return
+        xml.root << "<note type='Unpublished-Status'><p>#{fnote}</p></note>"
+      end
     end
   end
 end

data/lib/metanorma/standoc/regex.rb

@@ -53,7 +53,8 @@ module Metanorma
       ISO_REF =
         %r{^<ref\sid="(?<anchor>[^"]+)">
       \[(?<usrlbl>\(.+\))?(?<code>(?:ISO|IEC)[^0-9]*\s[0-9-]+|IEV)
-      (?::(?<year>[0-9][0-9-]+))?\]</ref>,?\s*(?<text>.*)$}xm
+      (?::(?<year>[0-9][0-9-]+))?\]</ref>,?\s*
+        (?:<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>)?\s*(?<text>.*)$}xm
 
       ISO_REF_NO_YEAR =
         %r{^<ref\sid="(?<anchor>[^"]+)">
@@ -70,10 +71,12 @@ module Metanorma
 
       # These regexes allow () inside usrlbl but not inside code
       NON_ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<usrlbl>\(.+\))?(?<code>.+?)\]</ref>,?\s*(?<text>.*)$}xm
+      \[(?<usrlbl>\(.+\))?(?<code>.+?)\]</ref>,?\s*
+      (?:<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>)?(?<text>.*)$}xm
 
       NON_ISO_REF1 = %r{^<ref\sid="(?<anchor>[^"]+)">
-      (?<usrlbl>\(.+\))?(?<code>.+?)</ref>,?\s*(?<text>.*)$}xm
+      (?<usrlbl>\(.+\))?(?<code>.+?)</ref>,?\s*
+      (?:<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>\s*)?(?<text>.*)$}xm
     end
   end
 end

data/lib/metanorma/standoc/utils.rb

@@ -43,9 +43,11 @@ module Metanorma
         %(id = "_#{UUIDTools::UUID.random_create}")
       end
 
-      def csv_split(text, delim = ";")
-        Metanorma::Utils::csv_split(@c.decode(text), delim)
-          .map { |x| @c.encode(x, :basic, :hexadecimal) }
+      def csv_split(text, delim = ";", encode: true)
+        ret = Metanorma::Utils::csv_split(@c.decode(text), delim)
+        encode and
+          ret.map! { |x| @c.encode(x, :basic, :hexadecimal) }
+        ret
       end
 
       # quoted strings: key="va,lue",

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.1.5".freeze
+    VERSION = "3.1.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-01 00:00:00.000000000 Z
+date: 2025-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -528,6 +528,7 @@ files:
 - lib/metanorma/standoc/front.rb
 - lib/metanorma/standoc/front_committee.rb
 - lib/metanorma/standoc/front_contributor.rb
+- lib/metanorma/standoc/front_ext.rb
 - lib/metanorma/standoc/front_organisation.rb
 - lib/metanorma/standoc/init.rb
 - lib/metanorma/standoc/inline.rb