metanorma-standoc 3.0.9 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4234211796c2c39d12d6bf987d799c6cc5c65745105540ca7e2078794ed38511
-  data.tar.gz: 3785018f24e1689ff70f7ad53dd4a82ec86e845815f939edecf08562aa57d7c4
+  metadata.gz: db6d5e84280a719a76127b82021c52b54a140d3238f49ee7a5ac7c972d142e37
+  data.tar.gz: a0b7796f74365c18f35d05b27bffc7fbb369def03e1d29753ddeb7adbc9bef86
 SHA512:
-  metadata.gz: 7655c4607ed54692a82c533a29345f9f89f5ba6b506b3137d225e27ae47717d303abd17ddae1488b627b4b5a998e486f5b11db9c64fee6871f5f5aee2139feea
-  data.tar.gz: 5730669dbca0c7bf59204fb88464e382b67c0c2e4a7a6cbce6acb8b5e84c84d83112beebc7f8f2e2df6824ca41d9dda042fb621345d2b86cbc909d89d8601fcf
+  metadata.gz: f6991e701daa845955fc12f72f602eab1947ff397ecad2e8514e3ec9a9b04fdfa68fa0e6d946b3a8d53ae6d1feb8fcb78ff81f5d71e17ffa580157cda891ccde
+  data.tar.gz: d9025688e127d12e7103537af3d8d6f50b8d1c6a67eff352a365a0ebcb67acb7d976bbfb391dd30980df56b193bf3a56c99d98db6f326e4ede057cc29b3bf935

data/lib/metanorma/standoc/anchor.rb

@@ -121,7 +121,7 @@ module Metanorma
         @fn_number ||= 0
         noko do |xml|
           @fn_number += 1
-          xml.fn reference: @fn_number do |fn|
+          xml.fn **attr_code(id_attr(nil).merge(reference: @fn_number)) do |fn|
             fn.p { |p| p << node.text }
           end
         end

data/lib/metanorma/standoc/blocks.rb

@@ -47,6 +47,13 @@ module Metanorma
         result
       end
 
+      def block_title(node, out)
+        node.title.nil? and return
+        out.name **attr_code(id_attr(nil)) do |name|
+          name << node.title
+        end
+      end
+
       def form_attrs(node)
         attr_code(id_attr(node)
           .merge(class: node.attr("class"),
@@ -68,7 +75,7 @@ module Metanorma
       def literal(node)
         noko do |xml|
           xml.figure **literal_attrs(node) do |f|
-            figure_title(node, f)
+            block_title(node, f)
             pre_attrs = id_attr(node).tap { |h| h.delete(:anchor) }
               .merge(alt: node.attr("alt"))
             f.pre node.lines.join("\n"), **attr_code(pre_attrs)
@@ -128,7 +135,7 @@ module Metanorma
         node.blocks.each { |b| b.remove_sub(:replacements) }
         noko do |xml|
           xml.figure **example_attrs(node).merge(class: "pseudocode") do |ex|
-            figure_title(node, ex)
+            block_title(node, ex)
             wrap_in_para(node, ex)
           end
         end
@@ -141,7 +148,7 @@ module Metanorma
       def example_proper(node)
         noko do |xml|
           xml.example **example_attrs(node) do |ex|
-            node.title.nil? or ex.name { |name| name << node.title }
+            block_title(node, xml)
             wrap_in_para(node, ex)
           end
         end
@@ -203,7 +210,7 @@ module Metanorma
       def listing(node)
         fragment = ::Nokogiri::XML::Builder.new do |xml|
           xml.sourcecode **listing_attrs(node) do |s|
-            figure_title(node, s)
+            block_title(node, s)
             s.body do |b|
               b << node.content
             end

data/lib/metanorma/standoc/blocks_image.rb

@@ -10,7 +10,7 @@ module Metanorma
           xml.svgmap **attr_code(svgmap_attrs(node).merge(
                                    src: node.attr("src"), alt: node.attr("alt"),
                                  )) do |ex|
-            figure_title(node, ex)
+            block_title(node, ex)
             ex << node.content
           end
         end
@@ -19,17 +19,12 @@ module Metanorma
       def figure_example(node)
         noko do |xml|
           xml.figure **figure_attrs(node) do |ex|
-            node.title.nil? or ex.name { |name| name << node.title }
+            block_title(node, ex)
             wrap_in_para(node, ex)
           end
         end
       end
 
-      def figure_title(node, out)
-        node.title.nil? and return
-        out.name { |name| name << node.title }
-      end
-
       def figure_attrs(node)
         attr_code(id_unnum_attrs(node).merge(keep_attrs(node))
           .merge(class: node.attr("class"),
@@ -39,7 +34,7 @@ module Metanorma
       def image(node)
         noko do |xml|
           xml.figure **figure_attrs(node) do |f|
-            figure_title(node, f)
+            block_title(node, f)
             f.image **(image_attributes(node).tap { |h| h.delete(:anchor) })
           end
         end

data/lib/metanorma/standoc/blocks_notes.rb

@@ -96,7 +96,7 @@ module Metanorma
         ret = admonition_alternatives(node) and return ret
         noko do |xml|
           xml.admonition **admonition_attrs(node) do |a|
-            node.title.nil? or a.name { |name| name << node.title }
+            block_title(node, a)
             wrap_in_para(node, a)
           end
         end

data/lib/metanorma/standoc/cleanup_bibdata.rb

@@ -52,7 +52,7 @@ module Metanorma
         i = i.add_child("<references hidden='true' normative='false'/>").first
         refs.each do |x|
           i << <<~BIB
-            <bibitem anchor="#{x}" id="_#{UUIDTools::UUID.random_create}" type="internal">
+            <bibitem anchor="#{x}" #{add_id_text} type="internal">
             <docidentifier type="repository">#{x.sub(/^#{prefix}_/, "#{prefix}/")}</docidentifier>
             </bibitem>
           BIB

data/lib/metanorma/standoc/cleanup_bibitem.rb

@@ -174,7 +174,7 @@ module Metanorma
         @datauriattachment and
           f = File.join(@attachmentsdir, File.basename(path))
         Pathname.new(File.expand_path(f))
-          .relative_path_from(Pathname.new(File.expand_path(@localdir))).to_s
+          .relative_path_from(Pathname.new(File.expand_path(@output_dir))).to_s
       end
 
       def datauri_attachment(path, doc)
@@ -182,7 +182,7 @@ module Metanorma
         m = add_misc_container(doc)
         f = attachment_location(path)
         e = (m << "<attachment name='#{f}'/>").last_element_child
-        Vectory::Utils::datauri(path, @localdir).scan(/.{1,60}/)
+        Vectory::Utils::datauri(path, @output_dir).scan(/.{1,60}/)
           .each { |dd| e << "#{dd}\n" }
         f
       end
@@ -196,6 +196,7 @@ module Metanorma
       end
 
       def init_attachments
+        @datauriattachment or return
         @attachmentsdir and return
         @attachmentsfld = "_#{@filename}_attachments"
         @attachmentsdir = File.join(@output_dir, @attachmentsfld)

data/lib/metanorma/standoc/cleanup_footnotes.rb

@@ -94,6 +94,7 @@ module Metanorma
       def footnote_block_cleanup(xmldoc)
         ids = xmldoc.xpath("//footnoteblock").each_with_object([]) do |f, m|
           f.name = "fn"
+          add_id(f)
           m << f.text
           if id = xmldoc.at("//*[@anchor = '#{f.text}']")
             f.children = id.dup.children

data/lib/metanorma/standoc/cleanup_section.rb

@@ -148,7 +148,7 @@ module Metanorma
           xml.root << <<~XML
             <metanorma-extension-clause>
             <clause>
-            <title>#{s['path']}</title>
+            <title #{add_id_text}>#{s['path']}</title>
             <source>#{r} </source>
             </clause>
             </metanorma-extension-clause>

data/lib/metanorma/standoc/cleanup_section_names.rb

@@ -9,7 +9,9 @@ module Metanorma
             node.children.first.previous = "<title/>"
           end
         end
-        node.at("./title")
+        ret = node.at("./title")
+        add_id(ret)
+        ret
       end
 
       def replace_title(doc, xpath, text, first = false)
@@ -149,7 +151,6 @@ module Metanorma
         path = section_containers.map { |x| "./ancestor::#{x}" }.join(" | ")
         xml.xpath("//p[@variant_title]").each do |p|
           p.name = "variant-title"
-          p.delete("id")
           p.delete("variant_title")
           p.xpath("(#{path})[last()]").each do |sect|
             (ins = sect.at("./title") and ins.next = p) or

data/lib/metanorma/standoc/cleanup_terms.rb

@@ -34,6 +34,7 @@ module Metanorma
         xmldoc.xpath("//term[not(definition)]").each do |d|
           first_child = d.at(TERMDEF_BLOCKS) || next
           t = Nokogiri::XML::Element.new("definition", xmldoc)
+          add_id(t)
           first_child.replace(t)
           t << first_child.remove
           d.xpath(TERMDEF_BLOCKS).each do |n|
@@ -45,10 +46,13 @@ module Metanorma
       def split_termdefinitions(xmldoc)
         xmldoc.xpath("//definition").each do |d|
           if d.at("./p | ./ol | ./dl | ./ul")
-            d.children = "<verbal-definition>#{d.children}</verbal-definition>"
+            d.children = <<~XML.strip
+              <verbal-definition #{add_id_text}>#{d.children}</verbal-definition>
+            XML
           else
-            d.children = "<non-verbal-representation>" \
-                         "#{d.children}</non-verbal-representation>"
+            d.children = <<~XML.strip
+              <non-verbal-representation #{add_id_text}>#{d.children}</non-verbal-representation>
+            XML
           end
         end
       end
@@ -124,9 +128,16 @@ module Metanorma
         termdefinition_cleanup(xmldoc)
         termdomain1_cleanup(xmldoc)
         termnote_example_cleanup(xmldoc)
+        term_id_attr_cleanup(xmldoc)
         term_children_cleanup(xmldoc)
       end
 
+      def term_id_attr_cleanup(xmldoc)
+        xmldoc.xpath("//usage-info[@id]").each do |u|
+          u.delete("id")
+        end
+      end
+
       def term_index_cleanup(xmldoc)
         @index_terms or return
         xmldoc.xpath("//preferred").each do |p|

data/lib/metanorma/standoc/converter.rb

@@ -35,6 +35,7 @@ module Metanorma
         block_macro Metanorma::Plugin::Lutaml::LutamlKlassTableBlockMacro
         preprocessor Metanorma::Standoc::EmbedIncludeProcessor
         preprocessor Metanorma::Standoc::LinkProtectPreprocessor
+        preprocessor Metanorma::Standoc::PassProtectPreprocessor
         preprocessor Metanorma::Standoc::Datamodel::AttributesTablePreprocessor
         preprocessor Metanorma::Standoc::Datamodel::DiagramPreprocessor
         preprocessor Metanorma::Plugin::Lutaml::Json2TextPreprocessor
@@ -69,7 +70,7 @@ module Metanorma
         inline_macro Metanorma::Standoc::FormSelectMacro
         inline_macro Metanorma::Standoc::FormOptionMacro
         inline_macro Metanorma::Standoc::ToCInlineMacro
-        inline_macro Metanorma::Standoc::PassInlineMacro
+        inline_macro Metanorma::Standoc::PassFormatInlineMacro
         inline_macro Metanorma::Standoc::StdLinkInlineMacro
         inline_macro Metanorma::Standoc::NumberInlineMacro
         inline_macro Metanorma::Standoc::TrStyleInlineMacro

data/lib/metanorma/standoc/init.rb

@@ -105,14 +105,20 @@ module Metanorma
         @output_dir = outputdir node
       end
 
+      def i18nyaml_path(node)
+        if i18nyaml = node.attr("i18nyaml")
+          (Pathname.new i18nyaml).absolute? or
+            i18nyaml = File.join(@localdir, i18nyaml)
+        end
+        i18nyaml
+      end
+
       def init_i18n(node)
         @lang = node.attr("language") || "en"
         @script = node.attr("script") ||
           Metanorma::Utils.default_script(node.attr("language"))
         @locale = node.attr("locale")
-        i18nyaml = node.attr("i18nyaml")
-        i18nyaml &&= File.join(@localdir, i18nyaml)
-        @isodoc = isodoc(@lang, @script, @locale, i18nyaml)
+        @isodoc = isodoc(@lang, @script, @locale, i18nyaml_path(node))
         @i18n = @isodoc.i18n
       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.0.6 -->
+<!-- VERSION v2.0.7 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -76,6 +76,7 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <a:documentation>Title(s) of a clause</a:documentation>
       <element name="title">
         <a:documentation>Title proper for a clause</a:documentation>
+        <ref name="RequiredId"/>
         <zeroOrMore>
           <ref name="TextElement"/>
         </zeroOrMore>
@@ -83,10 +84,19 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <zeroOrMore>
         <element name="variant-title">
           <a:documentation>Alternate title for a clause</a:documentation>
+          <ref name="RequiredId"/>
           <ref name="TypedTitleString"/>
         </element>
       </zeroOrMore>
     </define>
+    <define name="tname">
+      <element name="name">
+        <ref name="RequiredId"/>
+        <oneOrMore>
+          <ref name="NestedTextElement"/>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="UlBody">
       <optional>
         <ref name="tname">
@@ -475,6 +485,7 @@ normative or informative references, some split references into sections organiz
     <!-- exclude figures? -->
     <define name="dd">
       <element name="dd">
+        <ref name="OptionalId"/>
         <zeroOrMore>
           <!-- exclude figures? -->
           <ref name="BasicBlock"/>
@@ -526,6 +537,7 @@ normative or informative references, some split references into sections organiz
       </choice>
     </define>
     <define name="TrAttributes">
+      <ref name="OptionalId"/>
       <optional>
         <attribute name="style">
           <a:documentation>CSS style: only background-color supported</a:documentation>
@@ -595,6 +607,7 @@ gives an explicit page orientation</a:documentation>
   </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.
@@ -604,6 +617,7 @@ This is done if the footnote reference is already presented in some other form,
     </optional>
   </define>
   <define name="TdAttributes" combine="interleave">
+    <ref name="RequiredId"/>
     <optional>
       <attribute name="style">
         <a:documentation>CSS style: only background-color supported</a:documentation>
@@ -1821,7 +1835,7 @@ used in document amendments</a:documentation>
     </element>
   </define>
   <define name="TermAttributes">
-    <ref name="OptionalId"/>
+    <ref name="RequiredId"/>
     <ref name="LocalizedStringAttributes"/>
     <ref name="BlockAttributes"/>
   </define>
@@ -2164,6 +2178,7 @@ used in document amendments</a:documentation>
   <define name="termdefinition">
     <a:documentation>The definition of a term applied in the current document</a:documentation>
     <element name="definition">
+      <ref name="RequiredId"/>
       <optional>
         <attribute name="type">
           <a:documentation>Type of definition, used to differentiate it from other definitions of the same term if present</a:documentation>
@@ -2185,6 +2200,7 @@ used in document amendments</a:documentation>
   </define>
   <define name="verbaldefinition">
     <element name="verbal-definition">
+      <ref name="RequiredId"/>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
@@ -2205,6 +2221,7 @@ used in document amendments</a:documentation>
   <define name="nonverbalrep">
     <a:documentation>Non-verbal representation of the term</a:documentation>
     <element name="non-verbal-representation">
+      <ref name="RequiredId"/>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the non-verbal representation of the term</a:documentation>

data/lib/metanorma/standoc/lists.rb

@@ -85,7 +85,7 @@ module Metanorma
           xml_dl.dd
           return
         end
-        xml_dl.dd do |xml_dd|
+        xml_dl.dd **dl_attrs(ddefn) do |xml_dd|
           xml_dd.p { |t| t << ddefn.text } if ddefn.text?
           xml_dd << ddefn.content if ddefn.blocks?
         end
@@ -122,7 +122,7 @@ module Metanorma
       end
 
       def list_caption(node, out)
-        a = node.title and out.name { |n| n << a }
+        block_title(node, out)
       end
     end
   end

data/lib/metanorma/standoc/macros.rb

@@ -57,6 +57,7 @@ module Metanorma
           p.process(l)
           p.pass ? l : convert(l, c)
         end
+        log(document, lines)
         ::Asciidoctor::PreprocessorReader.new document, lines
       end
 
@@ -65,6 +66,18 @@ module Metanorma
           /^&[A-Za-z]/.match?(s) ? esc.encode(esc.decode(s), :hexadecimal) : s
         end.join
       end
+
+      # debugging output of results of all preprocessing,
+      # including include files concatenation and Lutaml/Liquid processing
+      def log(doc, text)
+        source = doc.attr("docfile") || "metanorma"
+        dirname  = File.dirname(source)
+        basename = File.basename(source, ".*")
+        fname = File.join(dirname, "#{basename}.asciidoc.log.txt")
+        File.open(fname, "w:UTF-8") do |f|
+          f.write(text.join("\n"))
+        end
+      end
     end
 
     class ColumnBreakBlockMacro < Asciidoctor::Extensions::BlockMacroProcessor
@@ -107,10 +120,14 @@ module Metanorma
 
       def pass_inline_split(text)
         text.split(PASS_INLINE_MACRO_RX).each.map do |x|
-          PASS_INLINE_MACRO_RX.match?(x) ? x : yield(x)
+          PASS_INLINE_MACRO_RX.match?(x) ? pass_convert(x) : yield(x)
         end
       end
 
+      def pass_convert(text)
+        text.sub(/^pass:\[(.+)$/, "pass-format:metanorma[\\1")
+      end
+
       # InlineLinkRx = %r((^|link:|#{CG_BLANK}|&lt;|[>\(\)\[\];"'])(\\?(?:https?|file|ftp|irc)://)(?:([^\s\[\]]+)\[(|#{CC_ALL}*?[^\\])\]|([^\s\[\]<]*([^\s,.?!\[\]<\)]))))m
       #
       InlineLinkRx = %r((^|(?<![-\\])\blink:(?!\+)|\p{Blank}|&lt;|[<>\(\)\[\];"'])((?:https?|file|ftp|irc)://)(?:([^\s\[\]]+)(?:(\[(|.*?[^\\])\])|([^\s\[\]<]*([^\s,.?!\[\]<\)])))))m
@@ -185,5 +202,33 @@ module Metanorma
         end.join
       end
     end
+
+    # convert pass:[] to pass-format:metanorma[]
+    class PassProtectPreprocessor < LinkProtectPreprocessor
+      def process(document, reader)
+        p = Metanorma::Utils::LineStatus.new
+        lines = reader.lines.map do |t|
+          p.process(t)
+          !p.pass && t.include?("pass:") and t = inlinelink(t)
+          t
+        end
+        ::Asciidoctor::PreprocessorReader.new document, lines
+      end
+
+      def pass_inline_split(text)
+        text.split(PASS_INLINE_MACRO_RX).each.map do |x|
+          PASS_INLINE_MACRO_RX.match?(x) ? pass_convert(x) : x
+        end
+      end
+
+      def pass_convert(text)
+        text.sub(/^pass:\[(.+)$/, "pass-format:metanorma[\\1")
+      end
+
+      def inlinelink(text)
+        /^\[.*\]\s*$/.match?(text) and return text
+        pass_inline_split(text).join
+      end
+    end
   end
 end

data/lib/metanorma/standoc/macros_inline.rb

@@ -135,7 +135,7 @@ module Metanorma
     end
 
     # inject ZWNJ to prevent Asciidoctor from attempting regex substitutions
-    class PassInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+    class PassFormatInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
       named :"pass-format"
       parse_content_as :text
@@ -143,8 +143,25 @@ module Metanorma
       def process(parent, target, attrs)
         format = target || "metanorma"
         out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
-          .gsub(/((?![<>&])[[:punct:]])/, "\\1&#x200c;")
-        %{<passthrough-inline formats="#{format}">#{out}</passthrough-inline>}
+        <<~XML
+          <passthrough-inline formats="#{format}">#{xml_process(out)}</passthrough-inline>
+        XML
+      end
+
+      # Split content into XML tags (including XML-escaped instances),
+      # XML escapes, and text segments
+      # Then only apply ZWNJ to punctuation in text segments
+      def xml_process(out)
+        processed_out = ""
+        segments = out.split(/(<[^>]*>|&lt;[^&]*&gt;|&[^;]*;)/)
+        segments.each_with_index do |segment, index|
+          processed_out += if index.even? # Text segment (not a tag or escape)
+                             segment.gsub(/([[:punct:]])/, "\\1&#x200c;")
+                           else # XML tag or escape
+                             segment
+                           end
+        end
+        processed_out
       end
     end
 

data/lib/metanorma/standoc/ref_sect.rb

@@ -14,7 +14,7 @@ module Metanorma
         @biblio = true
         attrs = attrs.merge(normative: node.attr("normative") || false)
         xml.references **attr_code(attrs) do |xml_section|
-          xml_section.title { |t| t << node.title }
+          section_title(xml_section, node.title)
           xml_section << node.content
         end
         @biblio = false
@@ -36,7 +36,7 @@ module Metanorma
         @norm_ref = true
         attrs = attrs.merge(normative: node.attr("normative") || true)
         xml.references **attr_code(attrs) do |xml_section|
-          xml_section.title { |t| t << node.title }
+          section_title(xml_section, node.title)
           xml_section << node.content
         end
         @norm_ref = false

data/lib/metanorma/standoc/render.rb

@@ -2,8 +2,7 @@ module Metanorma
   module Standoc
     module Base
       def html_extract_attributes(node)
-        i18nyaml = node.attr("i18nyaml")
-        i18nyaml &&= File.join(@localdir, i18nyaml)
+        i18nyaml = i18nyaml_path(node)
         {
           script: node.attr("script"),
           bodyfont: node.attr("body-font"),
@@ -11,10 +10,10 @@ module Metanorma
           monospacefont: node.attr("monospace-font"),
           i18nyaml: i18nyaml,
           scope: node.attr("scope"),
-          htmlstylesheet: node.attr("htmlstylesheet"),
-          htmlstylesheet_override: node.attr("htmlstylesheet-override"),
-          htmlcoverpage: node.attr("htmlcoverpage"),
-          htmlintropage: node.attr("htmlintropage"),
+          htmlstylesheet: node.attr("htmlstylesheet") || node.attr("html-stylesheet"),
+          htmlstylesheet_override: node.attr("htmlstylesheet-override") || node.attr("html-stylesheet-override"),
+          htmlcoverpage: node.attr("htmlcoverpage") || node.attr("htmlcoverpage"),
+          htmlintropage: node.attr("htmlintropage") || node.attr("html-intropage"),
           scripts: node.attr("scripts"),
           scripts_override: node.attr("scripts-override"),
           scripts_pdf: node.attr("scripts-pdf"),
@@ -50,8 +49,7 @@ module Metanorma
       end
 
       def doc_extract_attributes(node)
-        i18nyaml = node.attr("i18nyaml")
-        i18nyaml &&= File.join(@localdir, i18nyaml)
+        i18nyaml = i18nyaml_path(node)
         attrs = {
           script: node.attr("script"),
           bodyfont: node.attr("body-font"),
@@ -59,9 +57,9 @@ module Metanorma
           monospacefont: node.attr("monospace-font"),
           i18nyaml: i18nyaml,
           scope: node.attr("scope"),
-          wordstylesheet: node.attr("wordstylesheet"),
-          wordstylesheet_override: node.attr("wordstylesheet-override"),
-          standardstylesheet: node.attr("standardstylesheet"),
+          wordstylesheet: node.attr("wordstylesheet") || node.attr("word-stylesheet"),
+          wordstylesheet_override: node.attr("wordstylesheet-override") || node.attr("word-stylesheet-override"),
+          standardstylesheet: node.attr("standardstylesheet") || node.attr("standard-stylesheet"),
           header: node.attr("header"),
           wordcoverpage: node.attr("wordcoverpage"),
           wordintropage: node.attr("wordintropage"),
@@ -96,13 +94,24 @@ module Metanorma
                          pdf-allow-assemble-document pdf-allow-edit-annotations
                          pdf-allow-print pdf-allow-print-hq
                          pdf-allow-access-content pdf-encrypt-metadata fonts
+                         pdf-stylesheet pdf-stylesheet-override
                          font-license-agreement).each_with_object({}) do |x, m|
-          m[x.delete("-").to_i] = node.attr(x)
+          m[x.delete("-").sub(/override$/, "_override").to_sym] =
+            node.attr(x) || node.attr(x.sub("pdf-", "pdf"))
         end
-
+        absolute_path_pdf_attributes(pdf_options)
         pdf_options.merge(fonts_manifest_option(node) || {})
       end
 
+      def absolute_path_pdf_attributes(pdf_options)
+        %i(pdfstylesheet pdfstylesheet_override).each do |x|
+          pdf_options[x] or next
+          (Pathname.new pdf_options[x]).absolute? or
+            pdf_options[x] =
+              File.join(File.expand_path(@localdir), pdf_options[x])
+        end
+      end
+
       def doc_converter(node)
         IsoDoc::WordConvert.new(doc_extract_attributes(node))
       end

data/lib/metanorma/standoc/section.rb

@@ -85,12 +85,17 @@ module Metanorma
           end
       end
 
+      def section_title(xml, title)
+        title.nil? and return
+        xml.title **attr_code(id_attr(nil)) do |t|
+          t << title
+        end
+      end
+
       def preamble(node)
         noko do |xml|
           xml.foreword **attr_code(section_attributes(node)) do |xml_abstract|
-            xml_abstract.title do |t|
-              t << (node.blocks[0].title || @i18n.foreword)
-            end
+            section_title(xml_abstract, node.blocks[0].title || @i18n.foreword)
             xml_abstract << node.content
           end
         end
@@ -104,7 +109,7 @@ module Metanorma
 
       def indexsect_parse(attrs, xml, node)
         xml.indexsect **attr_code(attrs) do |xml_section|
-          xml_section.title { |name| name << node.title }
+          section_title(xml_section, node.title)
           xml_section << node.content
         end
       end
@@ -131,7 +136,7 @@ module Metanorma
         node.option?("appendix") && support_appendix?(node) and
           return appendix_parse(attrs, xml, node)
         xml.send :clause, **attr_code(attrs) do |xml_section|
-          xml_section.title { |n| n << node.title } unless node.title.nil?
+          section_title(xml_section, node.title)
           xml_section << node.content
         end
       end
@@ -144,7 +149,7 @@ module Metanorma
       def annex_parse(attrs, xml, node)
         annex_attrs_preprocess(attrs, node)
         xml.annex **attr_code(attrs) do |xml_section|
-          xml_section.title { |name| name << node.title }
+          section_title(xml_section, node.title)
           xml_section << node.content
         end
       end
@@ -157,35 +162,35 @@ module Metanorma
         attrs[:"inline-header"] = node.option? "inline-header"
         set_obligation(attrs, node)
         xml.appendix **attr_code(attrs) do |xml_section|
-          xml_section.title { |name| name << node.title }
+          section_title(xml_section, node.title)
           xml_section << node.content
         end
       end
 
       def introduction_parse(attrs, xml, node)
         xml.introduction **attr_code(attrs) do |xml_section|
-          xml_section.title { |t| t << @i18n.introduction }
+          section_title(xml_section, @i18n.introduction)
           xml_section << node.content
         end
       end
 
       def foreword_parse(attrs, xml, node)
         xml.foreword **attr_code(attrs) do |xml_section|
-          xml_section.title { |t| t << node.title }
+          section_title(xml_section, node.title)
           xml_section << node.content
         end
       end
 
       def acknowledgements_parse(attrs, xml, node)
         xml.acknowledgements **attr_code(attrs) do |xml_section|
-          xml_section.title { |t| (t << node.title) || @i18n.acknowledgements }
+          section_title(xml_section, node.title || @i18n.acknowledgements)
           xml_section << node.content
         end
       end
 
       def executivesummary_parse(attrs, xml, node)
         xml.executivesummary **attr_code(attrs) do |xml_section|
-          xml_section.title { |t| (t << node.title) || @i18n.executivesummary }
+          section_title(xml_section, node.title || @i18n.executivesummary)
           xml_section << node.content
         end
       end

data/lib/metanorma/standoc/table.rb

@@ -36,11 +36,7 @@ module Metanorma
       end
 
       def table_name(node, xml_table)
-        if node.title?
-          xml_table.name do |n|
-            n << node.title
-          end
-        end
+        block_title(node, xml_table)
       end
 
       def table_cell1(cell)
@@ -67,7 +63,7 @@ module Metanorma
         %i(head body foot).reject { |s| node.rows[s].empty? }.each do |s|
           xml.send "t#{s}" do |xml_tblsec|
             node.rows[s].each do |row|
-              xml_tblsec.tr do |xml_tr|
+              xml_tblsec.tr **attr_code(id_attr(nil)) do |xml_tr|
                 row.each { |cell| table_cell(cell, xml_tr, s) }
               end
             end

data/lib/metanorma/standoc/terms.rb

@@ -24,7 +24,7 @@ module Metanorma
       def symbols_parse(attr, xml, node)
         node.role == "nonterm" and return nonterm_symbols_parse(attr, xml, node)
         xml.definitions **attr_code(attr) do |xml_section|
-          xml_section.title { |t| t << node.title }
+          section_title(xml_section, node.title)
           stash_symbols
           @definitions = true
           stash_term_def
@@ -98,7 +98,7 @@ module Metanorma
 
       def term_def_parse(attrs, xml, node, _toplevel)
         xml.terms **attr_code(attrs) do |section|
-          section.title { |t| t << node.title }
+          section_title(section, node.title)
           (s = node.attr("source")) && s.split(",").each do |s1|
             section.termdocsource(nil, **attr_code(bibitemid: s1))
           end
@@ -166,7 +166,8 @@ module Metanorma
 
       def termdefinition(node)
         noko do |xml|
-          xml.definition **attr_code(type: node.attr("type")) do |d|
+          xml.definition **attr_code(id_attr(nil)
+            .merge(type: node.attr("type"))) do |d|
             d << node.content
           end
         end

data/lib/metanorma/standoc/utils.rb

@@ -39,6 +39,10 @@ module Metanorma
         node["id"] = "_#{UUIDTools::UUID.random_create}"
       end
 
+      def add_id_text
+        %(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) }

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.0.9".freeze
+    VERSION = "3.0.10".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-26 00:00:00.000000000 Z
+date: 2025-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable