metanorma-jis 0.0.3 → 0.0.5

data/lib/isodoc/jis/metadata.rb

@@ -49,6 +49,13 @@ module IsoDoc
       end
 
       PART_LABEL = { en: "Part", ja: "その" }.freeze
+
+      def docid(isoxml, _out)
+        id = isoxml.at(ns("//bibdata/docidentifier[@type = 'JIS']"))&.text or
+          return
+        set(:docnumber, id)
+        set(:docnumber_undated, id.sub(/:\d{4}$/, ""))
+      end
     end
   end
 end

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -22,7 +22,7 @@ module IsoDoc
       def strong1(text)
         jpan = /^[#{JPAN}]/o.match?(text[0])
         ret = jpan ? JPAN_BOLD : "<strong>"
-        text.split("").each do |n|
+        text.chars.each do |n|
           new = /^[#{JPAN}]/o.match?(n)
           jpan && !new and ret += "</span><strong>"
           !jpan && new and ret += "</strong>#{JPAN_BOLD}"
@@ -33,6 +33,10 @@ module IsoDoc
         ret
       end
 
+      def admits(elem)
+        elem.children.first.previous = @i18n.l10n("#{@i18n.admitted}: ")
+      end
+
       def block(docxml)
         super
         dl docxml
@@ -50,35 +54,74 @@ module IsoDoc
       end
 
       def dl_to_para(node)
+        ret = dl_to_para_name(node)
+        ret += dl_to_para_terms(node)
+        node.elements.reject { |n| %w(dt dd name).include?(n.name) }.each do |x|
+          ret += x.to_xml
+        end
+        dl_id_insert(node, ret)
+      end
+
+      def dl_id_insert(node, ret)
+        a = node.replace(ret)
+        p = a.at("./descendant-or-self::xmlns:p")
+        node["id"] and p << "<bookmark id='#{node['id']}'/>"
+        a.xpath("./descendant-or-self::*[@id = '']").each { |x| x.delete("id") }
+      end
+
+      def dl_to_para_name(node)
+        e = node.at(ns("./name"))
+        "<p class='ListTitle'>#{e&.children&.to_xml || @i18n.key}</p>"
+      end
+
+      def dl_to_para_terms(node)
         ret = ""
-        e = node.at(ns("./name")) and
-          ret += "<p class='ListTitle' id='#{dlist['id']}'>" \
-                 "#{e.children.to_xml}</p>"
         node.elements.select { |n| dt_dd?(n) }.each_slice(2) do |dt, dd|
-          term = dt.children.to_xml.gsub(%r{</?p( [^>]*)>}, "")
-          defn = dd.children.to_xml.gsub(%r{</?p( [^>]*)>}, "")
-          ret += "<p id='#{dt['id']}'>#{term}: " \
-                 "<bookmark id='#{dd['id']}'/>#{defn}</p>"
-        end
-        node.elements.each do |x|
-          %w(dt dd name).include?(x.name) and next
-          ret += x.to_xml
+          term = strip_para(dt)
+          defn = strip_para(dd)
+          bkmk = dd["id"] ? "<bookmark id='#{dd['id']}'/>" : ""
+          ret += "<p class='dl' id='#{dt['id']}'>#{term}: #{bkmk}#{defn}</p>"
         end
-        node.replace(ret.gsub(/ id=''/, ""))
+        ret
+      end
+
+      def strip_para(node)
+        node.children.to_xml.gsub(%r{</?p( [^>]*)?>}, "")
       end
 
       def table1(node)
         super
+        cols = table_cols_count(node)
+        name = node.at(ns("./name"))
+        thead = table_thead_pt(node, name)
+        table_unit_note(node, thead, cols)
+        table_name(name, thead, cols)
+      end
+
+      def table_thead_pt(node, name)
+        node.at(ns("./thead")) ||
+          name&.after("<thead> </thead>")&.next ||
+          node.elements.first.before("<thead> </thead>").previous
+      end
+
+      def table_cols_count(node)
         cols = 0
         node.at(ns(".//tr")).xpath(ns("./td | ./th")).each do |x|
           cols += x["colspan"]&.to_i || 1
         end
-        name = node.at(ns("./name"))
-        h = node.at(ns("./thead")) || name.after("<thead> </thead>").next
-        unit_note = node.at(ns(".//note[@type = 'units']"))&.remove
-        unit_note and h.children.first.previous = full_row(cols, unit_row.to_xml)
-        name and h.children.first.previous =
-          full_row(cols, "<p class='TableTitle' style='text-align:center;'>#{name.remove.children.to_xml}</p>")
+        cols
+      end
+
+      def table_unit_note(node, thead, cols)
+        unit_note = node.at(ns(".//note[@type = 'units']")) or return
+        thead.children.first.previous = full_row(cols, unit_note.remove.to_xml)
+      end
+
+      def table_name(name, thead, cols)
+        name or return
+        thead.children.first.previous =
+          full_row(cols, "<p class='TableTitle' style='text-align:center;'> " \
+                         "#{name.remove.children.to_xml}</p>")
       end
 
       def full_row(cols, elem)
@@ -86,12 +129,72 @@ module IsoDoc
       end
 
       def annex1(elem)
-      lbl = @xrefs.anchor(elem["id"], :label)
-      if t = elem.at(ns("./title"))
-        t.children = "<strong>#{to_xml(t.children)}</strong>"
+        elem["commentary"] == "true" and return
+        lbl = @xrefs.anchor(elem["id"], :label)
+        if t = elem.at(ns("./title"))
+          t.children = "<strong>#{to_xml(t.children)}</strong>"
+        end
+        prefix_name(elem, "<br/>", lbl, "title")
+      end
+
+      def annex(docxml)
+        super
+        move_commentaries_to_end(docxml)
+      end
+
+      def move_commentaries_to_end(docxml)
+        docxml.at(ns("//annex[@commentary = 'true']")) or return
+        b = docxml.at(ns("//bibliography")) ||
+          docxml.at(ns("//annex[last()]")).after(" ").next
+        docxml.xpath(ns("//annex[@commentary = 'true']")).reverse.each do |x|
+          b.next = x.remove
+        end
+      end
+
+      def display_order(docxml)
+        i = 0
+        i = display_order_xpath(docxml, "//preface/*", i)
+        i = display_order_at(docxml, "//sections/introduction", i)
+        i = display_order_at(docxml, "//clause[@type = 'scope']", i)
+        i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
+        i = display_order_at(docxml, "//sections/terms | " \
+                                     "//sections/clause[descendant::terms]", i)
+        i = display_order_at(docxml, "//sections/definitions", i)
+        i = display_order_xpath(docxml, @xrefs.klass.middle_clause(docxml), i)
+        i = display_order_xpath(docxml, "//annex[not(@commentary = 'true')]", i)
+        i = display_order_xpath(docxml, @xrefs.klass.bibliography_xpath, i)
+        i = display_order_xpath(docxml, "//annex[@commentary = 'true']", i)
+        i = display_order_xpath(docxml, "//indexsect", i)
+        display_order_xpath(docxml, "//colophon/*", i)
+      end
+
+      def tablesource(elem)
+        while elem&.next_element&.name == "source"
+          elem << "; #{to_xml(elem.next_element.remove.children)}"
+        end
+        elem.children = l10n("#{@i18n.source}: #{to_xml(elem.children).strip}")
+      end
+
+      def toc_title_insert_pt(docxml)
+        ins = docxml.at(ns("//preface")) ||
+          docxml.at(ns("//sections | //annex | //bibliography"))
+            &.before("<preface> </preface>")
+            &.previous_element or return nil
+        ins.children.last.after(" ").next
+      end
+
+      def preface_rearrange(doc)
+        move_introduction(doc)
+        super
+      end
+
+      def move_introduction(doc)
+        source = doc.at(ns("//preface/introduction")) or return
+        dest = doc.at(ns("//sections")) ||
+          doc.at(ns("//preface")).after("<sections> </sections>").next_element
+        dest.children.empty? and dest.children = " "
+        dest.children.first.next = source
       end
-      prefix_name(elem, "<br/>", lbl, "title")
-    end
 
       include Init
     end

data/lib/isodoc/jis/table.rb

@@ -0,0 +1,58 @@
+module IsoDoc
+  module JIS
+    class WordConvert < IsoDoc::Iso::WordConvert
+      def make_table_footnote_target(out, fnid, fnref)
+        attrs = { id: fnid, class: "TableFootnoteRef" }
+        out.span do |s|
+          s << @i18n.table_footnote
+          out.span **attrs do |a|
+            a << "#{fnref})"
+          end
+          insert_tab(s, 1)
+        end
+      end
+
+      def table_title_parse(node, out); end
+
+      def table_attrs(node)
+        { id: node["id"], title: node["alt"],
+          summary: node["summary"], width: node["width"],
+          class: (node.text.length > 4000 ? "MsoTableGridBig" : "MsoTableGrid"),
+          style: "border-collapse:collapse;" \
+                 "mso-table-anchor-horizontal:column;mso-table-overlap:never;" \
+                 "border:none;mso-padding-alt: " \
+                 "0cm 5.4pt 0cm 5.4pt;mso-border-insideh:none;" \
+                 "mso-border-insidev:none;#{keep_style(node)}",
+          border: 0, cellspacing: 0, cellpadding: 0 }
+      end
+
+      def make_tr_attr_style(cell, row, rowmax, totalrows, opt)
+        top = row.zero? ? "#{SW1} 1.5pt;" : "none;"
+        bottom = "#{SW1} #{rowmax >= totalrows ? '1.5' : '1.0'}pt;"
+        ret = <<~STYLE.gsub(/\n/, "")
+          border-top:#{top}mso-border-top-alt:#{top}
+          border-left:#{bottom}mso-border-top-alt:#{bottom}
+          border-right:#{bottom}mso-border-top-alt:#{bottom}
+          border-bottom:#{bottom}mso-border-bottom-alt:#{bottom}
+        STYLE
+        opt[:bordered] or ret = ""
+        pb = keep_rows_together(cell, rowmax, totalrows, opt) ? "avoid" : "auto"
+        "#{ret}page-break-after:#{pb};"
+      end
+
+      def new_fullcolspan_row(table, tfoot)
+        # how many columns in the table?
+        cols = 0
+        table.at(".//tr").xpath("./td | ./th").each do |td|
+          cols += (td["colspan"] ? td["colspan"].to_i : 1)
+        end
+        style = "border-top:0pt;mso-border-top-alt:0pt;" \
+                "border-bottom:#{SW1} 1.5pt;mso-border-bottom-alt:#{SW1} 1.5pt;" \
+                "border-left:#{SW1} 1.5pt;mso-border-left-alt:#{SW1} 1.5pt;" \
+                "border-right:#{SW1} 1.5pt;mso-border-right-alt:#{SW1} 1.5pt;"
+        tfoot.add_child("<tr><td colspan='#{cols}' style='#{style}'/></tr>")
+        tfoot.xpath(".//td").last
+      end
+    end
+  end
+end

data/lib/isodoc/jis/word_cleanup.rb

@@ -21,10 +21,10 @@ module IsoDoc
       def move_to_inner_cover(docxml)
         source = docxml.at("//div[@type = 'inner-cover-note']")
         dest = docxml.at("//div[@id = 'boilerplate-inner-cover-note']")
-        source && dest and dest.replace(source)
+        source && dest and dest.replace(source.remove)
         source = docxml.at("//div[@type = 'contributors']")
         dest = docxml.at("//div[@id = 'boilerplate-contributors']")
-        source && dest and dest.replace(source)
+        source && dest and dest.replace(source.remove)
         docxml
       end
 
@@ -120,22 +120,22 @@ module IsoDoc
       def heading_to_para(docxml)
         docxml.xpath("//h1[@class = 'ForewordTitle']").each do |p|
           p.name = "p"
-          p.xpath("../div/p[not(@class) or @class = 'MsoNormal']").each do |n|
+          p.parent.xpath("./p[not(@class) or @class = 'MsoNormal']").each do |n|
             n["class"] = "ForewordText"
           end
         end
         docxml.xpath("//h1[@class = 'IntroTitle'] | //h1[@class = 'Annex'] | " \
                      "//h2[@class = 'Terms'] | " \
                      "//h3[@class = 'Terms'] | //h4[@class = 'Terms'] | " \
-                     "//h5[@class = 'Terms'] | //h6[@class = 'Terms']").each do |p|
-          p.name = "p"
+                     "//h5[@class = 'Terms'] | //h6[@class = 'Terms']").each do |n|
+          n.name = "p"
         end
       end
 
       def word_annex_cleanup1(docxml, lvl)
         docxml.xpath("//h#{lvl}[ancestor::*[@class = 'Section3']]").each do |h2|
           h2.name = "p"
-          h2["class"] = ".h#{lvl}Annex"
+          h2["class"] = "h#{lvl}Annex"
         end
       end
     end

data/lib/isodoc/jis/word_convert.rb

@@ -2,6 +2,8 @@ require_relative "base_convert"
 require "isodoc"
 require_relative "init"
 require_relative "word_cleanup"
+require_relative "figure"
+require_relative "table"
 
 module IsoDoc
   module JIS
@@ -97,24 +99,16 @@ module IsoDoc
         end
       end
 
-      def preface(isoxml, out)
-        isoxml.xpath(ns("//preface/clause | //preface/references | " \
-                        "//preface/definitions | //preface/terms")).each do |f|
-          out.div **attr_code(class: "Section3", id: f["id"],
-                              type: f["type"]) do |div|
-            clause_name(f, f&.at(ns("./title")), div, { class: "IntroTitle" })
-            f.elements.each do |e|
-              parse(e, div) unless e.name == "title"
-            end
-          end
-        end
+      def preface_attrs(node)
+        { id: node["id"], type: node["type"],
+          class: node["type"] == "toc" ? "TOC" : "Section3" }
       end
 
-      def introduction(isoxml, out)
-        f = isoxml.at(ns("//introduction")) || return
-        out.div class: "Section3", id: f["id"] do |div|
-          clause_name(f, f.at(ns("./title")), div, { class: "IntroTitle" })
-          f.elements.each do |e|
+      def introduction(clause, out)
+        out.div class: "Section3", id: clause["id"] do |div|
+          clause_name(clause, clause.at(ns("./title")), div,
+                      { class: "IntroTitle" })
+          clause.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
         end
@@ -123,11 +117,7 @@ module IsoDoc
       def make_body2(body, docxml)
         body.div class: "WordSection2" do |div2|
           boilerplate docxml, div2
-          preface_block docxml, div2
-          abstract docxml, div2
-          foreword docxml, div2
-          preface docxml, div2
-          acknowledgements docxml, div2
+          front docxml, div2
           div2.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
@@ -136,115 +126,18 @@ module IsoDoc
       def middle(isoxml, out)
         middle_title(isoxml, out)
         middle_admonitions(isoxml, out)
-        introduction isoxml, out
+        i = isoxml.at(ns("//sections/introduction")) and
+          introduction i, out
         scope isoxml, out, 0
         norm_ref isoxml, out, 0
-        terms_defs isoxml, out, 0
-        symbols_abbrevs isoxml, out, 0
-        clause isoxml, out
+        clause_etc isoxml, out, 0
         annex isoxml, out
         bibliography isoxml, out
-        # colophon isoxml, out
-      end
-
-      def figure_attrs(node)
-        attr_code(id: node["id"], class: "MsoTableGrid",
-                  style: "border-collapse:collapse;" \
-                         "border:none;mso-padding-alt: " \
-                         "0cm 5.4pt 0cm 5.4pt;mso-border-insideh:none;" \
-                         "mso-border-insidev:none;#{keep_style(node)}",
-                  border: 0, cellspacing: 0, cellpadding: 0)
-      end
-
-      def figure_components(node)
-        { units: node.at(ns("./note[@type = 'units']/p")),
-          notes_etc: figure_notes_examples_paras(node
-          .xpath(ns("./note[not(@type = 'units')] | ./example | ./p"))),
-          name: node.at(ns("./name")),
-          key: node.at(ns("./dl")),
-          img: node.at(ns("./image")),
-          aside: node.at(ns("./aside")),
-          subfigs: node.xpath(ns("./figure")).map { |n| figure_components(n) } }
-      end
-
-      def figure_notes_examples_paras(xpath)
-        xpath.empty? and return nil
-        curr = ""
-        xpath.each_with_object([]) do |e, m|
-          e.name == curr or m << []
-          curr = e.name
-          m[-1] << e
-        end
-      end
-
-      def figure_parse1(node, out)
-        c = figure_components(node)
-        out.table **figure_attrs(node) do |div|
-          %i(units img subfigs key notes_etc aside name).each do |key|
-            case key
-            when :subfigs
-              c[key].each do |n|
-                n[:subname] = n[:name]
-                figure_row(node, div, n, :img)
-                figure_row(node, div, n, :subname)
-              end
-            when :notes_etc
-              c[key].each do |n|
-                figure_row(node, div, n, :notes_etc)
-              end
-            else figure_row(node, div, c, key)
-            end
-          end
-        end
-      end
-
-      def figure_name_parse(_node, div, name)
-        name.nil? and return
-        div.p class: "Tabletitle", style: "text-align:center;" do |p|
-          name.children.each { |n| parse(n, p) }
-        end
-      end
-
-      def figure_row(node, table, hash, key)
-        key != :notes_etc && (
-        hash[key].nil? || (hash[key].is_a?(Array) && hash[key].empty?)) and
-          return
-        table.tr do |r|
-          r.td valign: "top", style: "padding:0cm 5.4pt 0cm 5.4pt" do |d|
-            figure_row1(node, d, hash, key)
-          end
-        end
-      end
-
-      def fig_para(klass, row, nodes)
-        row.td valign: "top", style: "padding:0cm 5.4pt 0cm 5.4pt" do |d|
-          d.p class: klass do |p|
-            nodes.each { |n| parse(n, p) }
-          end
-        end
       end
 
-      def figure_row1(node, cell, hash, key)
-        case key
-        when :units
-          cell.p class: "UnitStatement" do |p|
-            hash[key].children.each { |n| parse(n, p) }
-          end
-        when :key
-          figure_key(cell)
-          parse(hash[key], cell)
-        when :notes_etc, :aside
-          hash.each { |n| parse(n, cell) }
-        when :name then figure_name_parse(node, cell, hash[key])
-        when :img
-          cell.p class: "Figure" do |p|
-            parse(hash[key], p)
-          end
-        when :subname
-          cell.p class: "SubfigureCaption" do |p|
-            hash[key].children.each { |n| parse(n, p) }
-          end
-        end
+      def make_body3(body, docxml)
+        super
+        commentary docxml, body
       end
 
       def footnote_parse(node, out)
@@ -268,57 +161,33 @@ module IsoDoc
         @seen_footnote << fn
       end
 
-      def make_table_footnote_target(out, fnid, fnref)
-        attrs = { id: fnid, class: "TableFootnoteRef" }
-        out.span do |s|
-          s << @i18n.table_footnote
-          out.span **attrs do |a|
-            a << "#{fnref})"
-          end
-          insert_tab(s, 1)
+      def annex(isoxml, out)
+        amd(isoxml) and @suppressheadingnumbers = @oldsuppressheadingnumbers
+        isoxml.xpath(ns("//annex[not(@commentary = 'true')]")).each do |c|
+          page_break(out)
+          render_annex(out, c)
         end
+        amd(isoxml) and @suppressheadingnumbers = true
       end
 
-      def table_title_parse(node, out); end
-
-      def table_attrs(node)
-        { id: node["id"], title: node["alt"],
-          summary: node["summary"], width: node["width"],
-          class: (node.text.length > 4000 ? "MsoTableGridBig" : "MsoTableGrid"),
-          style: "border-collapse:collapse;" \
-                 "mso-table-anchor-horizontal:column;mso-table-overlap:never;" \
-                 "border:none;mso-padding-alt: " \
-                 "0cm 5.4pt 0cm 5.4pt;mso-border-insideh:none;" \
-                 "mso-border-insidev:none;#{keep_style(node)}",
-          border: 0, cellspacing: 0, cellpadding: 0 }
-      end
-
-      def make_tr_attr_style(cell, row, rowmax, totalrows, opt)
-        top = row.zero? ? "#{SW1} 1.5pt;" : "none;"
-        bottom = "#{SW1} #{rowmax >= totalrows ? '1.5' : '1.0'}pt;"
-        ret = <<~STYLE.gsub(/\n/, "")
-          border-top:#{top}mso-border-top-alt:#{top}
-          border-left:#{bottom}mso-border-top-alt:#{bottom}
-          border-right:#{bottom}mso-border-top-alt:#{bottom}
-          border-bottom:#{bottom}mso-border-bottom-alt:#{bottom}
-        STYLE
-        opt[:bordered] or ret = ""
-        pb = keep_rows_together(cell, rowmax, totalrows, opt) ? "avoid" : "auto"
-        "#{ret}page-break-after:#{pb};"
+      def commentary(isoxml, out)
+        isoxml.xpath(ns("//annex[@commentary = 'true']")).each do |c|
+          section_break(out)
+          out.div class: "WordSectionCommentary" do |div|
+            commentary_title(isoxml, div)
+            render_annex(div, c)
+          end
+        end
       end
 
-      def new_fullcolspan_row(table, tfoot)
-        # how many columns in the table?
-        cols = 0
-        table.at(".//tr").xpath("./td | ./th").each do |td|
-          cols += (td["colspan"] ? td["colspan"].to_i : 1)
+      def render_annex(out, clause)
+        out.div **attr_code(annex_attrs(clause)) do |s|
+          clause.elements.each do |c1|
+            if c1.name == "title" then annex_name(clause, c1, s)
+            else parse(c1, s)
+            end
+          end
         end
-        style = "border-top:0pt;mso-border-top-alt:0pt;" \
-                "border-bottom:#{SW1} 1.5pt;mso-border-bottom-alt:#{SW1} 1.5pt;" \
-                "border-left:#{SW1} 1.5pt;mso-border-left-alt:#{SW1} 1.5pt;" \
-                "border-right:#{SW1} 1.5pt;mso-border-right-alt:#{SW1} 1.5pt;"
-        tfoot.add_child("<tr><td colspan='#{cols}' style='#{style}'/></tr>")
-        tfoot.xpath(".//td").last
       end
 
       include BaseConvert

data/lib/isodoc/jis/xref.rb

@@ -1,5 +1,8 @@
 module IsoDoc
   module JIS
+    class Counter < IsoDoc::XrefGen::Counter
+    end
+
     class Xref < IsoDoc::Iso::Xref
       def annex_name_lbl(clause, num)
         obl = l10n("(#{@labels['inform_annex']})")
@@ -8,6 +11,48 @@ module IsoDoc
         title = Common::case_with_markup(@labels["annex"], "capital", @script)
         l10n("#{title} #{num}<br/>#{obl}")
       end
+
+      def back_anchor_names(xml)
+        if @parse_settings.empty? || @parse_settings[:clauses]
+          i = Counter.new("@")
+          xml.xpath(ns("//annex")).each do |c|
+            if c["commentary"] == "true"
+              commentary_names(c)
+            else
+              annex_names(c, i.increment(c).print)
+            end
+          end
+          xml.xpath(ns(@klass.bibliography_xpath)).each do |b|
+            preface_names(b)
+          end
+          xml.xpath(ns("//colophon/clause")).each { |b| preface_names(b) }
+          xml.xpath(ns("//indexsect")).each { |b| preface_names(b) }
+        end
+        references(xml) if @parse_settings.empty? || @parse_settings[:refs]
+      end
+
+      def commentary_names(clause)
+        preface_name_anchors(clause, 1, clause_title(clause))
+        clause.xpath(ns(SUBCLAUSES)).each_with_object(Counter.new) do |c, i|
+          commentary_names1(c, clause["id"], i.increment(c).print, 2)
+        end
+      end
+
+      def commentary_names1(clause, root, num, level)
+        commentary_name_anchors(clause, num, root, level)
+        clause.xpath(ns(SUBCLAUSES)).each_with_object(Counter.new) do |c, i|
+          commentary_names1(c, root, "#{num}.#{i.increment(c).print}",
+                            level + 1)
+        end
+      end
+
+      def commentary_name_anchors(clause, num, root, level)
+        @anchors[clause["id"]] =
+          { label: num, xref: l10n("#{@labels['clause']} #{num}"),
+            container: root,
+            title: clause_title(clause), level: level, type: "clause",
+            elem: @labels["clause"] }
+      end
     end
   end
 end

data/lib/metanorma/jis/cleanup.rb

@@ -31,12 +31,13 @@ module Metanorma
         xmldoc.xpath("//table | //figure").each do |t|
           seen = {}
           i = 0
-          #t.xpath(".//fn[not(ancestor::name)]").each do |fn|
           t.xpath(".//fn").each do |fn|
             i, seen = table_footnote_renumber1(fn, i, seen)
           end
         end
       end
+
+      def docidentifier_cleanup(xmldoc); end
     end
   end
 end

data/lib/metanorma/jis/converter.rb

@@ -29,6 +29,16 @@ module Metanorma
         File.join(@libdir, "jis_intro_jp.xml")
       end
 
+      def section_attributes(node)
+        ret = super
+        if node.attr("style") == "appendix" && node.level == 1 &&
+            node.option?("commentary")
+          ret[:commentary] = true
+          node.set_attr("obligation", "informative")
+        end
+        ret
+      end
+
       def html_converter(node)
         if node.nil?
           IsoDoc::JIS::HtmlConvert.new({})