metanorma-standoc 3.1.5 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 101539eb3a9ab93dced9b971970f3ff3901d7d85de59be1cac19e92495b0e9d3
-  data.tar.gz: f628e233575e4b13e92aeb6980fd42c9b97e05256f8e859f892fbb71643247f1
+  metadata.gz: 154ca8c34101aef7d0dfb0cad7c1bf0cfafaf3df110a0fef56a7d524b17a7d5b
+  data.tar.gz: 7904a365e5bbaf50e159e164c5fc11e74d356f48a50de19889433f015eb9040d
 SHA512:
-  metadata.gz: '0943020cfe1c2a7a7947f470c0443ff200cbb5ca894b8268dda16e66e8e310f810cb0c0dc64d495b544c987d14995bd5e57d69ac25e61432a3b563bf1b8f2036'
-  data.tar.gz: 1d68cd3ebd13e2681442a65975201ce39bdcf84eaa6f7b299345716e0b091129babaea12eb6faf5af207415af45a5d4a39cf59c362659156fcdf635f8f9b86f4
+  metadata.gz: 5d50a9d2df00a760fe948b97d28f50652c09fe313942a48d2648018a68edf4e783d62288d965e9a34225b4804bdae4bf483f4c47317fcb2188590ecf4b4495e5
+  data.tar.gz: 616012d1b9ceaafbfd255aed0d477e66e201affece833b21413529c7ee2172c708400bc63422f3b29d460ca1d5b787a420f111b7cbfa7ec11deb46f103da893c

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

@@ -9,6 +9,7 @@ require "metanorma-utils"
 require_relative "render"
 require_relative "localbib"
 require_relative "init"
+require_relative "isolated_converter"
 require "mn-requirements"
 
 module Asciidoctor
@@ -20,6 +21,8 @@ end
 module Metanorma
   module Standoc
     module Base
+      include IsolatedConverter
+      
       # XML_ROOT_TAG = "standard-document".freeze
       # XML_NAMESPACE = "https://www.metanorma.org/ns/standoc".freeze
       FONTS_MANIFEST = "fonts-manifest".freeze
@@ -107,10 +110,14 @@ module Metanorma
         result = makexml1(node)
         ret1 = cleanup(Nokogiri::XML(insert_xml_cr(result)))
         ret1.root.add_namespace(nil, xml_namespace)
-        validate(ret1) unless @novalid
+        validate(ret1) unless @novalid || in_isolated_conversion?
         ret1
       end
 
+      def in_isolated_conversion?
+        !@isolated_conversion_stack.empty?
+      end
+
       def draft?
         @draft
       end
@@ -139,7 +146,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)
@@ -132,7 +134,7 @@ module Metanorma
            verbal-definition non-verbal-representation}.freeze
 
       # it seems Nokogiri::XML is treating the content of <script> as cdata,
-      # because of its use in HTML. Bad nokogiri. Undoing that, since we use
+      # because of its use in HTML. Bad Nokogiri. Undoing that, since we use
       # script as a normal tag
       def script_cleanup(xmldoc)
         xmldoc.xpath("//script").each { |x| x.content = x.to_str }
@@ -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_attachment.rb

@@ -0,0 +1,71 @@
+module Metanorma
+  module Standoc
+    module Cleanup
+      def attachment_cleanup(xmldoc)
+        xmldoc.xpath("//bibitem[uri/@type = 'attachment']").each do |b|
+          b["hidden"] = "true"
+          b.at("./docidentifier[@type = 'title']")&.remove
+          u = b.at("./uri[@type = 'attachment']")
+          c = b.at("./uri[@type = 'citation']") ||
+            u.after("<uri type='citation'/>")
+          uri = attachment_uri(u.text, b)
+          u.children = uri
+          c.children = uri
+        end
+      end
+
+      def attachment_uri(path, bib)
+        init_attachments
+        path = File.join(@localdir, path)
+        valid_attachment?(path, bib) or return ""
+        @datauriattachment or return attachment_location(path)
+        save_attachment(path, bib)
+      end
+
+      def save_attachment(path, bib)
+        init_attachments
+        f = File.basename(path)
+        File.exist?(File.join(@attachmentsdir, f)) and
+          f += "_#{UUIDTools::UUID.random_create}"
+        out_fld = File.join(@attachmentsdir, f)
+        FileUtils.cp(path, out_fld)
+        datauri_attachment(out_fld, bib.document)
+      end
+
+      def attachment_location(path)
+        f = path
+        @datauriattachment and
+          f = File.join(@attachmentsdir, File.basename(path))
+        Pathname.new(File.expand_path(f))
+          .relative_path_from(Pathname.new(File.expand_path(@output_dir))).to_s
+      end
+
+      def datauri_attachment(path, doc)
+        @datauriattachment or return
+        m = add_misc_container(doc)
+        f = attachment_location(path)
+        e = (m << "<attachment name='#{f}'/>").last_element_child
+        Vectory::Utils::datauri(path, @output_dir).scan(/.{1,60}/)
+          .each { |dd| e << "#{dd}\n" }
+        f
+      end
+
+      def valid_attachment?(path, bib)
+        File.exist?(path) and return true
+        p = Pathname.new(path).cleanpath
+        @log.add("Bibliography", bib, "Attachment #{p} does not exist",
+                 severity: 0)
+        false
+      end
+
+      def init_attachments
+        @datauriattachment or return
+        @attachmentsdir and return
+        @attachmentsfld = "_#{@filename}_attachments"
+        @attachmentsdir = File.join(@output_dir, @attachmentsfld)
+        FileUtils.rm_rf(@attachmentsdir)
+        FileUtils.mkdir_p(@attachmentsdir)
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/cleanup_bibdata.rb

@@ -119,9 +119,9 @@ module Metanorma
       end
 
       def hdr2bibitem(hdr)
-        xml = Asciidoctor
-          .convert(hdr[:text], backend: hdr2bibitem_type(hdr),
-                               header_footer: true)
+        xml = isolated_asciidoctor_convert(hdr[:text], 
+                                         backend: hdr2bibitem_type(hdr),
+                                         header_footer: true)
         b = Nokogiri::XML(xml).at("//xmlns:bibdata")
         b.name = "bibitem"
         b.delete("type")

data/lib/metanorma/standoc/cleanup_bibitem.rb

@@ -1,3 +1,5 @@
+require_relative "cleanup_attachment"
+
 module Metanorma
   module Standoc
     module Cleanup
@@ -145,71 +147,6 @@ module Metanorma
         end
       end
 
-      def attachment_cleanup(xmldoc)
-        xmldoc.xpath("//bibitem[uri/@type = 'attachment']").each do |b|
-          b["hidden"] = "true"
-          u = b.at("./uri[@type = 'attachment']")
-          c = b.at("./uri[@type = 'citation']") ||
-            u.after("<uri type='citation'/>")
-          uri = attachment_uri(u.text, b)
-          u.children = uri
-          c.children = uri
-        end
-      end
-
-      def attachment_uri(path, bib)
-        init_attachments
-        path = File.join(@localdir, path)
-        valid_attachment?(path, bib) or return ""
-        @datauriattachment or return attachment_location(path)
-        save_attachment(path, bib)
-      end
-
-      def save_attachment(path, bib)
-        init_attachments
-        f = File.basename(path)
-        File.exist?(File.join(@attachmentsdir, f)) and
-          f += "_#{UUIDTools::UUID.random_create}"
-        out_fld = File.join(@attachmentsdir, f)
-        FileUtils.cp(path, out_fld)
-        datauri_attachment(out_fld, bib.document)
-      end
-
-      def attachment_location(path)
-        f = path
-        @datauriattachment and
-          f = File.join(@attachmentsdir, File.basename(path))
-        Pathname.new(File.expand_path(f))
-          .relative_path_from(Pathname.new(File.expand_path(@output_dir))).to_s
-      end
-
-      def datauri_attachment(path, doc)
-        @datauriattachment or return
-        m = add_misc_container(doc)
-        f = attachment_location(path)
-        e = (m << "<attachment name='#{f}'/>").last_element_child
-        Vectory::Utils::datauri(path, @output_dir).scan(/.{1,60}/)
-          .each { |dd| e << "#{dd}\n" }
-        f
-      end
-
-      def valid_attachment?(path, bib)
-        File.exist?(path) and return true
-        p = Pathname.new(path).cleanpath
-        @log.add("Bibliography", bib, "Attachment #{p} does not exist",
-                 severity: 0)
-        false
-      end
-
-      def init_attachments
-        @datauriattachment or return
-        @attachmentsdir and return
-        @attachmentsfld = "_#{@filename}_attachments"
-        @attachmentsdir = File.join(@output_dir, @attachmentsfld)
-        FileUtils.rm_rf(@attachmentsdir)
-        FileUtils.mkdir_p(@attachmentsdir)
-      end
-
       # remove dupes if both same ID and same docid, in case dupes introduced
       # through termbases
       def remove_dup_bibtem_id(xmldoc)
@@ -229,12 +166,42 @@ module Metanorma
         end
       end
 
+      def remove_empty_docid(xmldoc)
+        xmldoc.xpath("//bibitem/docidentifier[normalize-space(.)='']")
+          .each(&:remove)
+      end
+
+      def empty_docid_to_title(xmldoc)
+        xmldoc.xpath("//references/bibitem").each do |b|
+          b.at("./docidentifier[not(@type = 'metanorma' or @type = 'DOI' or " \
+           "@type = 'metanorma-ordinal')]") and next
+          empty_docid_to_title?(b) or next
+          ins = b.at("./title[last()]") || b.at("./formattedref")
+          id = bibitem_title_to_id(b) or return
+          ins.next = <<~XML
+            <docidentifier type='title' primary='true'>#{id}</docidentifier>
+          XML
+        end
+      end
+
+      def bibitem_title_to_id(bibitem)
+        t = bibitem.at("./title") || bibitem.at("./formattedref") or return
+        t.text
+      end
+
+      # normative references only, biblio uses ordinal code instead
+      def empty_docid_to_title?(bibitem)
+        bibitem.parent["normative"] == "true"
+      end
+
       def bibitem_cleanup(xmldoc)
         bibitem_nested_id(xmldoc) # feeds remove_dup_bibtem_id
-        remove_dup_bibtem_id(xmldoc)
         ref_dl_cleanup(xmldoc)
         formattedref_spans(xmldoc)
         fetch_local_bibitem(xmldoc)
+        remove_empty_docid(xmldoc)
+        empty_docid_to_title(xmldoc)
+        remove_dup_bibtem_id(xmldoc)
         attachment_cleanup(xmldoc)
       end
     end

data/lib/metanorma/standoc/cleanup_block.rb

@@ -163,7 +163,7 @@ module Metanorma
           .each_slice(4).map.with_object([]) do |a, acc|
           acc << safe_noko(a[0], node.document)
           a.size == 4 or next
-          acc << Asciidoctor.convert(
+          acc << isolated_asciidoctor_convert(
             a[2], doctype: :inline, backend: backend&.to_sym || :standoc
           )
         end.join

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_contributor.rb

@@ -7,7 +7,9 @@ module Metanorma
       def metadata_author(node, xml)
         org_author(node, xml)
         personal_author(node, xml)
-        committee_contributors(node, xml, default_publisher, {})
+        corporate_author = node.attr("corporate-author") ||
+          node.attr("publisher") || default_publisher
+        committee_contributors(node, xml, corporate_author, {})
       end
 
       def org_author(node, xml)

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/init.rb

@@ -49,6 +49,7 @@ module Metanorma
         @localdir = Metanorma::Utils::localdir(node)
         @xrefstyle = node.attr("xrefstyle")
         @novalid = node.attr("novalid")
+        @isolated_conversion_stack = []
         @smartquotes = node.attr("smartquotes") != "false"
         @sourcecode_markup_start = node.attr("sourcecode-markup-start") || "{{{"
         @sourcecode_markup_end = node.attr("sourcecode-markup-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/isolated_converter.rb

@@ -0,0 +1,65 @@
+module Metanorma
+  module Standoc
+    module IsolatedConverter
+      # Create an isolated Asciidoctor conversion that doesn't interfere with 
+      # the current converter's instance variables
+      def isolated_asciidoctor_convert(content, options = {})
+        # Track that we're in an isolated conversion (for nested calls)
+        @isolated_conversion_stack << true
+        
+        begin
+          # Ensure we get a completely fresh Document and conversion context
+          # Each call to Asciidoctor.convert creates a new Document with its own converter
+          # This naturally isolates the conversion from the current instance variables
+          
+          # Save critical options that should be preserved from the current context
+          preserved_options = extract_preserved_options(options)
+          
+          # Merge with isolated options to ensure clean state and skip validation
+          isolated_options = preserved_options.merge(options).merge(
+            attributes: (preserved_options[:attributes] || {}).merge(
+              'novalid' => ''  # Force no validation for isolated documents
+            )
+          )
+          
+          # Perform the isolated conversion
+          Asciidoctor.convert(content, isolated_options)
+        ensure
+          # Always pop from stack, even if conversion fails
+          @isolated_conversion_stack.pop
+        end
+      end
+
+      private
+
+      # Extract options that should be preserved from the current conversion context
+      def extract_preserved_options(user_options)
+        options = {}
+        
+        # Preserve safe mode to maintain security context
+        options[:safe] = user_options[:safe] if user_options.key?(:safe)
+        
+        # Preserve local directory context if not explicitly overridden
+        options[:base_dir] = @localdir if @localdir && !user_options.key?(:base_dir)
+        
+        # Preserve attributes that are safe to share
+        if user_options[:attributes].nil? && respond_to?(:safe_shared_attributes)
+          options[:attributes] = safe_shared_attributes
+        end
+        
+        options
+      end
+
+      # Define attributes that are safe to share between converter instances
+      def safe_shared_attributes
+        # Only include read-only or configuration attributes
+        # Avoid any attributes that could cause state pollution
+        {
+          'source-highlighter' => 'html-pipeline', # Use simple highlighter
+          'nofooter' => '',
+          'no-header-footer' => ''
+        }
+      end
+    end
+  end
+end

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/spans_to_bibitem.rb

@@ -16,11 +16,19 @@ module Metanorma
           @spans[:docid] = override_docids(ids[:docid], @spans[:docid])
         end
 
+        # override old values with new values if type is the same
+        # comparison is case-insensitive
+        # if types differ in case, use the old value's type, not the new
         def override_docids(old, new)
           ret = new
-          keys = new.map { |a| a[:type] }
+          keys = new.map { |a| a[:type]&.upcase }
           old.each do |e|
-            keys.include?(e[:type]) or ret << e
+            if keys.include?(e[:type]&.upcase)
+              ret.each do |a|
+                a[:type]&.upcase == e[:type]&.upcase and a[:type] = e[:type]
+              end
+            else ret << e
+            end
           end
           ret
         end

data/lib/metanorma/standoc/spans_to_bibitem_preprocessing.rb

@@ -119,7 +119,7 @@ module Metanorma
         end
 
         def spans_preprocess_new_contrib?(span, contrib)
-          contrib.empty? ||
+          contrib.empty? || contrib[-1][:entity] == "organization" ||
             (span[:key] == "surname" && contrib[-1][:surname]) ||
             contrib[-1][:role] != (span[:type] || "author")
         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",
@@ -153,7 +155,7 @@ module Metanorma
 
           #{text}
         ADOC
-        c = Asciidoctor.convert(doc, backend: flavour, header_footer: true)
+        c = isolated_asciidoctor_convert(doc, backend: flavour, header_footer: true)
         ret = Nokogiri::XML(c).at("//xmlns:sections")
         separate_numbering_footnotes(ret)
       end

data/lib/metanorma/standoc/version.rb

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

data/metanorma-standoc.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "crass", "~> 1.0.0"
   spec.add_dependency "iev", "~> 0.3.5"
-  spec.add_dependency "isodoc", "~> 3.2.0"
+  spec.add_dependency "isodoc", "~> 3.3.0"
   spec.add_dependency "metanorma", ">= 1.6.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.2.3"
   spec.add_dependency "metanorma-plugin-lutaml", "~> 0.7.31"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-01 00:00:00.000000000 Z
+date: 2025-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -501,6 +501,7 @@ files:
 - lib/metanorma/standoc/cleanup.rb
 - lib/metanorma/standoc/cleanup_amend.rb
 - lib/metanorma/standoc/cleanup_asciibib.rb
+- lib/metanorma/standoc/cleanup_attachment.rb
 - lib/metanorma/standoc/cleanup_bibdata.rb
 - lib/metanorma/standoc/cleanup_bibitem.rb
 - lib/metanorma/standoc/cleanup_block.rb
@@ -528,11 +529,13 @@ 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
 - lib/metanorma/standoc/isodoc-compile.rng
 - lib/metanorma/standoc/isodoc.rng
+- lib/metanorma/standoc/isolated_converter.rb
 - lib/metanorma/standoc/lists.rb
 - lib/metanorma/standoc/localbib.rb
 - lib/metanorma/standoc/macros.rb