isodoc 3.4.5 → 3.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8b88a6aed03f811db7d034a9eac97cbce2110e5efb1ba78d70c6c8666af1b66
-  data.tar.gz: 814cbba6debefab5d23c5beb9764438160aeee1937c18279a53bde60bd49c5bf
+  metadata.gz: 1dfc380b722c0dbf909171f7dccc2f5b69680919557e4ec2be439bf6c4688936
+  data.tar.gz: a904964e3515b179f4bc5bdf7d7475852f891515465a0d841848ec8cf14e5588
 SHA512:
-  metadata.gz: de5040ab72de3052667440ac395eabc311621f0361979d9a5d637091e8e263547bf7723e3b7d19c995985252f14db4a9123eec1d0315a8f0fca0c062e0c79d3d
-  data.tar.gz: 53d2892698b75cfc7a8a40f7c921e810830b177f450b9187aa273e8479ecdaa937b0b58b9469bd616a3f7c8841d8c7ec0794a9e75185aada63c6a87580590edb
+  metadata.gz: 2f86e6318d8da11758a70fb48d212b542cf978a1e0f96ab38ce8fecf6730c07c05da9300c1eaff665202d0690cd82ebc5271df083ac2f35809a6385fcf6bf899
+  data.tar.gz: 9bb507861832387cd2b0968d85fa704656ea204a3097e9da05c4793ee6705fef9e4251ab5b042711aed35d50e1f2a55fdb26cb5da3f4fae9c34595ac66727214

data/Gemfile.devel

@@ -0,0 +1,2 @@
+gem "html2doc", git: "https://github.com/metanorma/html2doc", branch: "main"
+

data/isodoc.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "twitter_cldr", ">= 6.6.0"
   spec.add_dependency "uuidtools"
 
-  spec.add_development_dependency "bigdecimal"
+  spec.add_development_dependency "benchmark"
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"

data/lib/isodoc/base_style/all.css

@@ -312,6 +312,11 @@ svg {
   display: block; /* ← removes unwanted inline spacing */
 }
 
+/* style dfn by override in flavor */
+dfn {
+  font-style: inherit;
+}
+
 #standard-band {
   background-color: #0AC442;
 }

data/lib/isodoc/base_style/reset.css

@@ -311,3 +311,8 @@ svg {
   height: auto; /* ← key to maintaining aspect ratio */
   display: block; /* ← removes unwanted inline spacing */
 }
+
+/* style dfn by override in flavor */
+dfn {
+  font-style: inherit;
+}

data/lib/isodoc/base_style/reset.scss

@@ -277,3 +277,6 @@ svg {
   height: auto;       /* ← key to maintaining aspect ratio */
   display: block;     /* ← removes unwanted inline spacing */
 }
+
+/* style dfn by override in flavor */
+dfn { font-style: inherit; }

data/lib/isodoc/function/blocks.rb

@@ -23,7 +23,7 @@ module IsoDoc
       end
 
       def figure_parse1(node, out)
-        out.figure **figure_attrs(node) do |div|
+        out.figure(**figure_attrs(node)) do |div|
           node.children.each do |n|
             parse(n, div) unless n.name == "fmt-name"
           end
@@ -35,11 +35,15 @@ module IsoDoc
         attr_code(id: node["id"], class: "pseudocode", style: keep_style(node))
       end
 
+      def pseudocode_tag
+        "div"
+      end
+
       def pseudocode_parse(node, out)
         @in_figure = true
         name = node.at(ns("./fmt-name"))
         s = node.at(ns("./fmt-figure")) || node
-        out.div **pseudocode_attrs(node) do |div|
+        out.send pseudocode_tag, **pseudocode_attrs(node) do |div|
           s.children.each { |n| parse(n, div) unless n.name == "fmt-name" }
           sourcecode_name_parse(node, div, name)
         end
@@ -61,7 +65,7 @@ module IsoDoc
         name = node.at(ns("./fmt-name"))
         n = node.at(ns("./fmt-sourcecode"))
         s = n || node
-        out.p **sourcecode_attrs(node) do |div|
+        out.p(**sourcecode_attrs(node)) do |div|
           sourcecode_parse1(s, div)
         end
         annotation_parse(s, out)
@@ -81,7 +85,7 @@ module IsoDoc
       end
 
       def pre_parse(node, out)
-        out.pre node.text, **attr_code(id: node["id"])
+        out.pre(node.text, **attr_code(id: node["id"]))
       end
 
       def annotation_parse(node, out)
@@ -93,7 +97,7 @@ module IsoDoc
       end
 
       def formula_parse1(node, out)
-        out.div **attr_code(class: "formula") do |div|
+        out.div(**attr_code(class: "formula")) do |div|
           div.p do |_p|
             parse(node.at(ns("./fmt-stem")), div)
             if lbl = node&.at(ns("./fmt-name"))&.text
@@ -109,7 +113,7 @@ module IsoDoc
       end
 
       def formula_parse(node, out)
-        out.div **formula_attrs(node) do |div|
+        out.div(**formula_attrs(node)) do |div|
           formula_parse1(node, div)
           node.children.each do |n|
             %w(stem fmt-name fmt-stem).include? n.name and next
@@ -120,7 +124,7 @@ module IsoDoc
 
       def key_parse(node, out)
         klass = "key #{node['class']}".strip
-        out.div **attr_code(class: klass) do |div|
+        out.div(**attr_code(class: klass)) do |div|
           node.children.each do |n|
             if n.name == "name"
               key_name_parse(n, div)
@@ -160,7 +164,7 @@ module IsoDoc
       end
 
       def para_parse(node, out)
-        out.p **attr_code(para_attrs(node)) do |p|
+        out.p(**attr_code(para_attrs(node))) do |p|
           para_prefix(node, p)
           node.children.each { |n| parse(n, p) unless n.name == "note" }
         end
@@ -178,7 +182,7 @@ module IsoDoc
       def quote_parse(node, out)
         attrs = para_attrs(node)
         attrs[:class] = "Quote"
-        out.div **attr_code(attrs) do |p|
+        out.div(**attr_code(attrs)) do |p|
           node.children.each { |n| parse(n, p) unless n.name == "source" }
         end
       end

data/lib/isodoc/function/blocks_example_note.rb

@@ -18,7 +18,7 @@ module IsoDoc
 
       # used if we are boxing examples
       def example_div_parse(node, out)
-        out.div **example_div_attr(node) do |div|
+        out.div(**example_div_attr(node)) do |div|
           example_label(node, div, node.at(ns("./fmt-name")))
           node.children.each do |n|
             parse(n, div) unless n.name == "fmt-name"
@@ -36,12 +36,12 @@ module IsoDoc
         { style: "vertical-align:top;padding:0;", class: "example" }.freeze
 
       def example_table_parse(node, out)
-        out.table **example_table_attr(node) do |t|
+        out.table(**example_table_attr(node)) do |t|
           t.tr do |tr|
-            tr.td **EXAMPLE_TBL_ATTR do |td|
+            tr.td(**EXAMPLE_TBL_ATTR) do |td|
               example_label(node, td, node.at(ns("./fmt-name")))
             end
-            tr.td **EXAMPLE_TD_ATTR do |td|
+            tr.td(**EXAMPLE_TD_ATTR) do |td|
               node.children.each do |n|
                 parse(n, td) unless n.name == "fmt-name"
               end
@@ -64,10 +64,10 @@ module IsoDoc
       end
 
       def starts_with_para?(node)
-        elem = block_body_first_elem(node) or return
+        elem = block_body_first_elem(node) or return false
         elem.name == "p" || block_body_first_elem(elem)&.name == "p" ||
-          elem.elements.first&.name == "semx" &&
-            block_body_first_elem(elem.elements.first)&.name == "p"
+          (elem.elements.first&.name == "semx" &&
+            block_body_first_elem(elem.elements.first)&.name == "p")
       end
 
       def note_p_class
@@ -77,7 +77,7 @@ module IsoDoc
       def note_p_parse(node, div)
         name = node.at(ns("./fmt-name"))
         para = node.at(ns("./p")) || node.at(ns("./semx/p"))
-        div.p **attr_code(class: note_p_class) do |p|
+        div.p(**attr_code(class: note_p_class)) do |p|
           name and p.span class: "note_label" do |s|
             name.children.each { |n| parse(n, s) }
           end
@@ -88,7 +88,7 @@ module IsoDoc
 
       def note_parse1(node, div)
         name = node.at(ns("./fmt-name")) and
-          div.p **attr_code(class: note_p_class) do |p|
+          div.p(**attr_code(class: note_p_class)) do |p|
             p.span class: "note_label" do |s|
               name.remove.children.each { |n| parse(n, s) }
             end
@@ -115,7 +115,7 @@ module IsoDoc
 
       def note_parse(node, out)
         @note = true
-        out.div **note_attrs(node) do |div|
+        out.div(**note_attrs(node)) do |div|
           if starts_with_para?(node)
             note_p_parse(node, div)
           else
@@ -125,14 +125,31 @@ module IsoDoc
         @note = false
       end
 
-      def admonition_name_parse(_node, div, name)
-        div.p class: "AdmonitionTitle", style: "text-align:center;" do |p|
+      def admonition_name_parse(node, div, name)
+        div.p class: "AdmonitionTitle #{admonition_subclass(node)}".strip,
+              style: "text-align:center;" do |p|
           children_parse(name, p)
         end
       end
 
-      def admonition_class(_node)
-        "Admonition"
+      def admonition_class(node)
+        "Admonition #{admonition_subclass(node)}".strip
+      end
+
+      def admonition_subclass(node)
+        case node["type"]
+        when "important" then "AdmonitionImportant"
+        when "warning" then "AdmonitionWarning"
+        when "caution" then "AdmonitionCaution"
+        when "todo" then "AdmonitionTodo"
+        when "editor" then "AdmonitionEditor"
+        when "editorial" then "AdmonitionEditorial"
+        when "tip" then "AdmonitionTip"
+        when "statement" then "AdmonitionStatement"
+        when "box" then "AdmonitionBox"
+        when "safety-precaution" then "AdmonitionSafetyPrecaution"
+        else "AdmonitionOther"
+        end
       end
 
       def admonition_name(node, _type)
@@ -145,7 +162,7 @@ module IsoDoc
       end
 
       def admonition_parse(node, out)
-        out.div **admonition_attrs(node) do |div|
+        out.div(**admonition_attrs(node)) do |div|
           if starts_with_para?(node)
             admonition_p_parse(node, div)
           else

data/lib/isodoc/function/footnotes.rb

@@ -4,7 +4,7 @@ module IsoDoc
       def make_table_footnote_link(out, fnid, node)
         attrs = { href: "##{fnid}", class: "TableFootnoteRef" }
         sup = node.at(ns(".//sup")) and sup.replace(sup.children)
-        out.a **attrs do |a|
+        out.a(**attrs) do |a|
           children_parse(node, a)
         end
       end
@@ -52,7 +52,7 @@ module IsoDoc
         fn = node["target"] # || UUIDTools::UUID.random_create.to_s
         attrs = { class: "FootnoteRef", href: "#fn:#{fn}" }
         f = node.at(ns("./fmt-fn-label"))
-        out.a **attrs do |a|
+        out.a(**attrs) do |a|
           children_parse(f, a)
         end
       end

data/lib/isodoc/function/form.rb

@@ -2,8 +2,8 @@ module IsoDoc
   module Function
     module Form
       def form_parse(node, out)
-        out.div **attr_code(class: node["class"],
-                            id: node["id"]) do |div|
+        out.div(**attr_code(class: node["class"],
+                            id: node["id"])) do |div|
           children_parse(node, div)
         end
       end
@@ -38,7 +38,7 @@ module IsoDoc
       def option_parse(node, out); end
 
       def textarea_parse(_node, out)
-        out.table **{ border: 1, width: "50%" } do |t|
+        out.table(**{ border: 1, width: "50%" }) do |t|
           t.tr do |tr|
             tr.td do |td|
             end

data/lib/isodoc/function/inline.rb

@@ -5,8 +5,8 @@ module IsoDoc
     module Inline
       def link_parse(node, out)
         url = link_parse_url(node)
-        out.a **attr_code(href: url, title: node["alt"],
-                          class: node["style"]) do |l|
+        out.a(**attr_code(href: url, title: node["alt"],
+                          class: node["style"])) do |l|
           if node.elements.empty? && node.text.strip.empty?
             l << @c.encode(node["target"].sub(/^mailto:/, ""), :basic,
                            :hexadecimal)
@@ -30,8 +30,8 @@ module IsoDoc
       def span_parse(node, out)
         klass = node["style"] || node["class"]
         if klass && !SPAN_UNWRAP_CLASSES.include?(klass)
-          out.span **attr_code(style: node["style"],
-                               class: node["class"]) do |s|
+          out.span(**attr_code(style: node["style"],
+                               class: node["class"])) do |s|
             children_parse(node, s)
           end
         else children_parse(node, out)
@@ -92,7 +92,7 @@ module IsoDoc
         ret = node.at(ns("./semx[@element = 'stem']")) || node
         ooml, text_only = stem_parse1(ret, node["type"])
         klass = text_only ? {} : { class: "stem" }
-        out.span **klass do |span|
+        out.span(**klass) do |span|
           span.parent.add_child ooml
         end
       end
@@ -127,17 +127,41 @@ module IsoDoc
         [HTMLEntities.new.encode(a), /^[[0-9,.+-]]*$/.match?(a)]
       end
 
+      def image_attrs(node)
+        { src: node["src"],
+          height: node["height"] || "auto",
+          width: node["width"] || "auto",
+          title: node["title"],
+          alt: node["alt"] }
+      end
+
       def image_parse(node, out)
-        attrs = { src: node["src"],
-                  height: node["height"] || "auto",
-                  width: node["width"] || "auto",
-                  title: node["title"],
-                  alt: node["alt"] }
-        image_body_parse(node, attrs, out)
+        image_body_parse(node, image_attrs(node), out)
+      end
+
+      def image_body_parse(node, attrs, out)
+        n = select_altsource(node)
+        if n.empty?
+          out.img(**attr_code(attrs))
+        else
+          image_parse(n.first, out)
+        end
+      end
+
+      def select_altsource(node)
+        ret = node.xpath(ns("./altsource")).each_with_object([]) do |a, m|
+          tags = a["tag"].split(/,\s*/)
+          select_altsource?(a, tags) and m << a
+        end
+        ret.empty? and
+          ret = node.xpath(ns("./altsource")).each_with_object([]) do |a, m|
+            a["tag"] == "default" and m << a
+          end
+        ret
       end
 
-      def image_body_parse(_node, attrs, out)
-        out.img **attr_code(attrs)
+      def select_altsource?(_altsource, tags)
+        tags.include?("doc")
       end
 
       def smallcap_parse(node, xml)

data/lib/isodoc/function/inline_simple.rb

@@ -26,7 +26,7 @@ module IsoDoc
       def index_xref_parse(node, out); end
 
       def bookmark_parse(node, out)
-        out.a **attr_code(id: node["id"])
+        out.a(**attr_code(id: node["id"]))
       end
 
       def keyword_parse(node, out)
@@ -73,7 +73,7 @@ module IsoDoc
 
       def underline_parse(node, out)
         node["style"] and style = "text-decoration: #{node['style']}"
-        out.u **attr_code(style: style) do |e|
+        out.u(**attr_code(style: style)) do |e|
           children_parse(node, e)
         end
       end

data/lib/isodoc/function/lists.rb

@@ -13,9 +13,9 @@ module IsoDoc
       end
 
       def ul_parse(node, out)
-        out.div **attr_code(class: "ul_wrap") do |div|
+        out.div(**attr_code(class: "ul_wrap")) do |div|
           list_title_parse(node, div)
-          div.ul **attr_code(ul_attrs(node)) do |ul|
+          div.ul(**attr_code(ul_attrs(node))) do |ul|
             node.children.each { |n| n.name == "fmt-name" or parse(n, ul) }
           end
         end
@@ -42,9 +42,9 @@ module IsoDoc
       end
 
       def ol_parse(node, out)
-        out.div **attr_code(class: "ol_wrap") do |div|
+        out.div(**attr_code(class: "ol_wrap")) do |div|
           list_title_parse(node, div)
-          div.ol **attr_code(ol_attrs(node)) do |ol|
+          div.ol(**attr_code(ol_attrs(node))) do |ol|
             node.children.each { |n| n.name == "fmt-name" or parse(n, ol) }
           end
         end
@@ -62,7 +62,7 @@ module IsoDoc
       end
 
       def li_parse(node, out)
-        out.li **attr_code(id: node["id"]) do |li|
+        out.li(**attr_code(id: node["id"])) do |li|
           li << li_checkbox(node)
           node.children.each do |n|
             n.name == "fmt-name" and next
@@ -90,9 +90,9 @@ module IsoDoc
       end
 
       def dl_parse(node, out)
-        out.div **attr_code(class: "figdl") do |div|
+        out.div(**attr_code(class: "figdl")) do |div|
           list_title_parse(node, div)
-          div.dl **dl_attrs(node) do |v|
+          div.dl(**dl_attrs(node)) do |v|
             node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
               dl_parse1(v, dt, dd)
             end
@@ -107,10 +107,10 @@ module IsoDoc
       end
 
       def dl_parse1(dlist, dterm, ddef)
-        dlist.dt **attr_code(id: dterm["id"]) do |term|
+        dlist.dt(**attr_code(id: dterm["id"])) do |term|
           dt_parse(dterm, term)
         end
-        dlist.dd **attr_code(id: ddef["id"]) do |listitem|
+        dlist.dd(**attr_code(id: ddef["id"])) do |listitem|
           ddef.children.each { |n| parse(n, listitem) }
         end
       end

data/lib/isodoc/function/references.rb

@@ -2,7 +2,7 @@ module IsoDoc
   module Function
     module References
       def bibitem_entry(list, bib, _ordinal, biblio)
-        list.p **attr_code(iso_bibitem_entry_attrs(bib, biblio)) do |ref|
+        list.p(**attr_code(iso_bibitem_entry_attrs(bib, biblio))) do |ref|
           children_parse(bib.at(ns("./biblio-tag")), ref)
           reference_format(bib, ref)
         end

data/lib/isodoc/function/reqt.rb

@@ -14,7 +14,7 @@ module IsoDoc
       end
 
       def recommendation_parse(node, out)
-        out.div **reqt_attrs(node, "recommend") do |t|
+        out.div(**reqt_attrs(node, "recommend")) do |t|
           recommendation_parse1(node, t)
         end
       end
@@ -28,19 +28,19 @@ module IsoDoc
       end
 
       def requirement_parse(node, out)
-        out.div **reqt_attrs(node, "require") do |t|
+        out.div(**reqt_attrs(node, "require")) do |t|
           recommendation_parse1(node, t)
         end
       end
 
       def permission_parse(node, out)
-        out.div **reqt_attrs(node, "permission") do |t|
+        out.div(**reqt_attrs(node, "permission")) do |t|
           recommendation_parse1(node, t)
         end
       end
 
       def div_parse(node, out)
-        out.div **reqt_attrs(node, node["type"]) do |div|
+        out.div(**reqt_attrs(node, node["type"])) do |div|
           children_parse(node, div)
         end
       end

data/lib/isodoc/function/section.rb

@@ -9,7 +9,7 @@ module IsoDoc
 
       # used for subclauses
       def clause_parse(node, out)
-        out.div **attr_code(clause_attrs(node)) do |div|
+        out.div(**attr_code(clause_attrs(node))) do |div|
           clause_parse_title(node, div, node.at(ns("./fmt-title")), out)
           node.children.reject { |c1| c1.name == "fmt-title" }.each do |c1|
             parse(c1, div)
@@ -18,7 +18,7 @@ module IsoDoc
       end
 
       def clause(node, out)
-        out.div **attr_code(clause_attrs(node)) do |s|
+        out.div(**attr_code(clause_attrs(node))) do |s|
           clause_name(node, node.at(ns("./fmt-title")), s, nil)
           node.elements.reject { |c1| c1.name == "fmt-title" }.each do |c1|
             parse(c1, s)
@@ -32,7 +32,7 @@ module IsoDoc
 
       def annex(node, out)
         page_break(out)
-        out.div **attr_code(annex_attrs(node)) do |s|
+        out.div(**attr_code(annex_attrs(node))) do |s|
           node.elements.each do |c1|
             if c1.name == "fmt-title" then annex_name(node, c1, s)
             else parse(c1, s)
@@ -50,7 +50,7 @@ module IsoDoc
       end
 
       def scope(node, out)
-        out.div **attr_code(id: node["id"]) do |div|
+        out.div(**attr_code(id: node["id"])) do |div|
           clause_name(node, node.at(ns("./fmt-title")), div, nil)
           node.elements.each do |e|
             parse(e, div) unless e.name == "fmt-title"
@@ -62,7 +62,7 @@ module IsoDoc
                     "//sections/clause[descendant::terms]".freeze
 
       def terms_defs(node, out)
-        out.div **attr_code(id: node["id"]) do |div|
+        out.div(**attr_code(id: node["id"])) do |div|
           clause_name(node, node.at(ns("./fmt-title")), div, nil)
           node.elements.each do |e|
             parse(e, div) unless %w{fmt-title source}.include? e.name
@@ -76,7 +76,7 @@ module IsoDoc
       end
 
       def symbols_abbrevs(node, out)
-        out.div **attr_code(id: node["id"], class: "Symbols") do |div|
+        out.div(**attr_code(id: node["id"], class: "Symbols")) do |div|
           clause_name(node, node.at(ns("./fmt-title")), div, nil)
           node.elements.each do |e|
             parse(e, div) unless e.name == "fmt-title"
@@ -102,7 +102,7 @@ module IsoDoc
 
       def foreword(clause, out)
         page_break(out)
-        out.div **attr_code(id: clause["id"]) do |s|
+        out.div(**attr_code(id: clause["id"])) do |s|
           clause_name(clause, clause.at(ns("./fmt-title")), s,
                       { class: "ForewordTitle" })
           clause.elements.each { |e| parse(e, s) unless e.name == "fmt-title" }
@@ -122,7 +122,7 @@ module IsoDoc
 
       def abstract(clause, out)
         page_break(out)
-        out.div **attr_code(id: clause["id"]) do |s|
+        out.div(**attr_code(id: clause["id"])) do |s|
           clause_name(clause, clause.at(ns("./fmt-title")), s,
                       { class: "AbstractTitle" })
           clause.elements.each { |e| parse(e, s) unless e.name == "fmt-title" }
@@ -144,7 +144,7 @@ module IsoDoc
 
       def preface_normal(clause, out)
         page_break(out)
-        out.div **attr_code(preface_attrs(clause)) do |div|
+        out.div(**attr_code(preface_attrs(clause))) do |div|
           clause_name(clause, clause.at(ns("./fmt-title")), div,
                       { class: "IntroTitle" })
           clause.elements.each do |e|
@@ -156,7 +156,7 @@ module IsoDoc
       def table_of_contents(clause, out)
         @bare and return
         page_break(out)
-        out.div **attr_code(preface_attrs(clause)) do |div|
+        out.div(**attr_code(preface_attrs(clause))) do |div|
           clause_name(clause, clause.at(ns("./fmt-title")), div,
                       { class: "IntroTitle" })
           clause.elements.each do |e|

data/lib/isodoc/function/section_titles.rb

@@ -69,7 +69,7 @@ module IsoDoc
       # top level clause names
       def clause_name(_node, title, div, header_class)
         header_class = {} if header_class.nil?
-        div.h1 **attr_code(header_class) do |h1|
+        div.h1(**attr_code(header_class)) do |h1|
           if title.is_a?(String) then h1 << title
           elsif title
             children_parse(title, h1)
@@ -88,8 +88,8 @@ module IsoDoc
       end
 
       def variant_title(node, out)
-        out.p **attr_code(style: "display:none;",
-                          class: "variant-title-#{node['type']}") do |p|
+        out.p(**attr_code(style: "display:none;",
+                          class: "variant-title-#{node['type']}")) do |p|
           children_parse(node, p)
         end
       end

data/lib/isodoc/function/table.rb

@@ -81,7 +81,7 @@ module IsoDoc
 
       def table_parse(node, out)
         @in_table = true
-        out.table **table_attrs(node) do |t|
+        out.table(**table_attrs(node)) do |t|
           table_title_parse(node, t)
           table_parse_core(node, t)
           table_parse_tail(node, t)
@@ -140,7 +140,7 @@ module IsoDoc
 
       def tr_parse(node, out, ord, totalrows, header)
         bordered = table_bordered?(node)
-        out.tr **attr_code(style: node["style"]) do |r|
+        out.tr(**attr_code(style: node["style"])) do |r|
           node.elements.each do |td|
             attrs = make_tr_attr(td, ord, totalrows - 1, header, bordered)
             r.send td.name, **attr_code(attrs) do |entry|