metanorma-jis 0.3.7 → 0.4.1

data/lib/isodoc/jis/metadata.rb

@@ -54,7 +54,7 @@ module IsoDoc
         isoxml.xpath(ns("//bibdata/date")).each do |d|
           val = Common::date_range(d)
           @lang == "ja" and val = @i18n.japanese_date(val)
-          set("#{d['type'].gsub(/-/, '_')}date".to_sym, val)
+          set("#{d['type'].tr('-', '_')}date".to_sym, val)
         end
       end
 

data/lib/isodoc/jis/presentation_section.rb

@@ -10,7 +10,7 @@ module IsoDoc
         if t = elem.at(ns("./title"))
           t.children = "<strong>#{to_xml(t.children)}</strong>"
         end
-        prefix_name(elem, "<br/>", lbl, "title")
+        prefix_name(elem, { caption: "<br/>" }, lbl, "title")
       end
 
       def annex(docxml)
@@ -31,6 +31,7 @@ module IsoDoc
         t = elem.elements.first
         commentary_title_hdr(t)
         middle_title_main(t, "CommentaryStandardName")
+        prefix_name(elem, {}, nil, "title")
       end
 
       def commentary_title_hdr(elem)
@@ -65,7 +66,7 @@ module IsoDoc
         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
+        dest.add_first_child source
       end
 
       def move_participants(doc)
@@ -73,7 +74,7 @@ module IsoDoc
         t = participant_table(p) or return
         p.remove
         ins = make_preface(doc) or return nil
-        ins.children.first.previous = t
+        ins.add_first_child t
       end
 
       def participant_table(clause)

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -45,12 +45,8 @@ module IsoDoc
         elem.children.first.previous = @i18n.l10n("#{@i18n.admitted}: ")
       end
 
-      def block(docxml)
-        super
-        dl docxml
-      end
-
       def dl(docxml)
+        super
         docxml.xpath(ns("//table//dl | //figure//dl")).each do |l|
           l.at(ns("./dl")) || l.at("./ancestor::xmlns:dl") and next
           dl_to_para(l)
@@ -64,7 +60,8 @@ module IsoDoc
       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|
+        node.elements.reject { |n| %w(dt dd name fmt-name).include?(n.name) }
+          .each do |x|
           ret += x.to_xml
         end
         dl_id_insert(node, ret)
@@ -78,7 +75,7 @@ module IsoDoc
       end
 
       def dl_to_para_name(node)
-        e = node.at(ns("./name")) or return ""
+        e = node.at(ns("./fmt-name")) or return ""
         "<p class='ListTitle'>#{e.children.to_xml}</p>"
       end
 
@@ -100,8 +97,9 @@ module IsoDoc
       def table1(node)
         super
         cols = table_cols_count(node)
-        name = node.at(ns("./name"))
-        thead = table_thead_pt(node, name)
+        ins = node.at(ns("./fmt-xref-label")) ||
+          node.at(ns("./fmt-name"))
+        thead = table_thead_pt(node, ins)
         table_unit_note(node, thead, cols)
       end
 
@@ -135,6 +133,10 @@ module IsoDoc
         elem.children = l10n("#{@i18n.source}: #{to_xml(elem.children).strip}")
       end
 
+      def table_fn1(_table, fnote, _idx)
+        fnote["reference"] += ")"
+      end
+
       def bibdata_i18n(bibdata)
         super
         @lang == "ja" and date_translate(bibdata)
@@ -182,6 +184,18 @@ module IsoDoc
         a << ret
       end
 
+      def figure_fn(elem)
+        (elem.xpath(ns(".//fn")) - elem.xpath(ns("./name//fn")))
+          .each do |f|
+            table_fn1(elem, f, nil)
+          end
+      end
+
+      def omit_docid_prefix(prefix)
+        prefix.nil? || prefix.empty? and return true
+        super || %w(JIS).include?(prefix)
+      end
+
       include Init
     end
   end

data/lib/isodoc/jis/table.rb

@@ -6,7 +6,7 @@ module IsoDoc
         out.span do |s|
           s << @i18n.table_footnote
           out.span **attrs do |a|
-            a << "#{fnref})"
+            a << fnref.sub(/(?!<\))$/, ")") # TODO TO Presentation XML
           end
           insert_tab(s, 1)
         end
@@ -29,7 +29,7 @@ module IsoDoc
       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/, "")
+        ret = <<~STYLE.delete("\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}

data/lib/isodoc/jis/word_convert.rb

@@ -66,9 +66,9 @@ module IsoDoc
       def norm_ref(node, out)
         node["hidden"] != "true" or return
         out.div class: "normref_div" do |div|
-          clause_name(node, node.at(ns("./title")), div, nil)
+          clause_name(node, node.at(ns("./fmt-title")), div, nil)
           if node.name == "clause"
-            node.elements.each { |e| parse(e, div) unless e.name == "title" }
+            node.elements.each { |e| parse(e, div) unless e.name == "fmt-title" }
           else biblio_list(node, div, false)
           end
         end
@@ -79,7 +79,7 @@ module IsoDoc
         page_break(out)
         out.div class: "bibliography" do |div|
           div.h1 class: "Section3" do |h1|
-            node.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
+            node.at(ns("./fmt-title"))&.children&.each { |c2| parse(c2, h1) }
           end
           biblio_list(node, div, true)
         end
@@ -101,10 +101,10 @@ module IsoDoc
 
       def introduction(clause, out)
         out.div class: "Section3", id: clause["id"] do |div|
-          clause_name(clause, clause.at(ns("./title")), div,
+          clause_name(clause, clause.at(ns("./fmt-title")), div,
                       { class: "IntroTitle" })
           clause.elements.each do |e|
-            parse(e, div) unless e.name == "title"
+            parse(e, div) unless e.name == "fmt-title"
           end
         end
       end
@@ -150,7 +150,7 @@ module IsoDoc
       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)
+            if c1.name == "fmt-title" then annex_name(clause, c1, s)
             else parse(c1, s)
             end
           end

data/lib/isodoc/jis/xref.rb

@@ -24,19 +24,19 @@ module IsoDoc
     class Xref < IsoDoc::Iso::Xref
       attr_accessor :autonumbering_style
 
-      def clause_sep
+      def clausesep
         @autonumbering_style == :japanese ? "\u30fb" : "."
       end
 
-      def clause_counter(num, opts)
+      def clause_counter(num, opts = { })
         opts[:numerals] ||= @autonumbering_style
-        opts[:separator] ||= clause_sep
+        opts[:separator] ||= clausesep
         super
       end
 
-      def list_counter(num, opts)
+      def list_counter(num, opts = { })
         opts[:numerals] ||= @autonumbering_style
-        opts[:separator] ||= clause_sep
+        opts[:separator] ||= clausesep
         IsoDoc::Jis::Counter.new(num, opts)
       end
 
@@ -44,13 +44,43 @@ module IsoDoc
         @lang == "ja" ? "の" : super
       end
 
-      def subfigure_label(subfignum)
+      def hierreqtsep
+        @lang == "ja" ? "の" : super
+      end
+
+      # KILL
+      def subfigure_labelx(subfignum)
         subfignum.zero? and return ""
         sep = @lang == "ja" ? "の" : " "
         "#{sep}#{(subfignum + 96).chr})"
       end
 
-      def annex_name_lbl(clause, num)
+      def subfigure_label(subfignum)
+        subfignum.zero? and return
+        (subfignum + 96).chr
+      end
+
+      def subfigure_delim
+        ")"
+      end
+
+      # taken from isodoc to override ISO
+def subfigure_anchor(elem, sublabel, label, klass, container: false)
+        figlabel = fig_subfig_label(label, sublabel)
+        @anchors[elem["id"]] = anchor_struct(
+          figlabel, elem, @labels[klass] || klass.capitalize, klass,
+          { unnumb: elem["unnumbered"], container: }
+        ) 
+        if elem["unnumbered"] != "true"
+          x = semx(elem, sublabel)
+          @anchors[elem["id"]][:label] = x
+          @anchors[elem["id"]][:xref] = @anchors[elem.parent["id"]][:xref] + 
+            subfigure_separator(markup: true) + x + delim_wrap(subfigure_delim)
+        end
+      end 
+
+      # KILL
+      def annex_name_lblx(clause, num)
         obl = "(#{@labels['inform_annex']})"
         clause["obligation"] == "normative" and
           obl = "(#{@labels['norm_annex']})"
@@ -59,19 +89,16 @@ module IsoDoc
         "#{title} #{num}<br/>#{obl}"
       end
 
-      def annex_name_anchors1(clause, num, level)
-        @anchors[clause["id"]] =
-          { xref: num, label: num, level: level,
-            subtype: "annex" }
+      def annex_name_lbl(clause, num)
+        super.gsub(%r{</?strong>}, "")
       end
 
-      def annex_names1(clause, num, level)
-        annex_name_anchors1(clause, num, level)
-        i = clause_counter(0, prefix: num)
-        clause.xpath(ns(SUBCLAUSES)).each do |c|
-          annex_names1(c, i.increment(c).print, level + 1)
-        end
-      end
+def annex_name_anchors1(clause, num, level)
+  super
+  # undo ISO "Clause A.2" in favour of "A.2"
+  level == 2 and
+            @anchors[clause["id"]][:xref] =  semx(clause, num)
+end
 
       def clause_order_main(docxml)
         [
@@ -128,31 +155,34 @@ module IsoDoc
       end
 
       def commentary_names(clause)
+        #require "debug" ; binding.b
         preface_name_anchors(clause, 1, clause_title(clause))
         clause.xpath(ns(SUBCLAUSES))
           .each_with_object(clause_counter(0, {})) do |c, i|
-          commentary_names1(c, clause["id"], i.increment(c).print, 2)
+          commentary_names1(c, clause["id"], nil, i.increment(c).print, 2)
         end
       end
 
-      def commentary_names1(clause, root, num, level)
-        commentary_name_anchors(clause, num, root, level)
+      def commentary_names1(clause, root, parentnum, num, level)
+        lbl = clause_number_semx(parentnum, clause, num)
+        commentary_name_anchors(clause, lbl, root, level)
         clause.xpath(ns(SUBCLAUSES))
-          .each_with_object(clause_counter(0, prefix: num)) do |c, i|
-          commentary_names1(c, root, i.increment(c).print,
+          .each_with_object(clause_counter(0)) do |c, i|
+          commentary_names1(c, root, lbl, 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}"),
+          { label: num, xref: labelled_autonum(@labels["clause"], num),
             container: root,
             title: clause_title(clause), level: level, type: "clause",
             elem: @labels["clause"] }
       end
 
-      def list_item_anchor_names(list, list_anchor, depth, prev_label,
+      # KILL ?
+      def list_item_anchor_namesx(list, list_anchor, depth, prev_label,
 refer_list)
         c = list_counter(list["start"] ? list["start"].to_i - 1 : 0, {})
         list.xpath(ns("./li")).each do |li|
@@ -161,10 +191,11 @@ refer_list)
                             { list_anchor: list_anchor,
                               prev_label: prev_label,
                               refer_list: depth == 1 ? refer_list : nil })
-          li["id"] and @anchors[li["id"]] =
+          li["id"] ||= "_#{UUIDTools::UUID.random_create}"
+          @anchors[li["id"]] =
                          { label: bare_label,
                            bare_xref: "#{bare_label})",
-                           xref: "#{label})", type: "listitem",
+                           xref: "#{label}#{list_item_delim}", type: "listitem",
                            refer_list: refer_list,
                            container: list_anchor[:container] }
           (li.xpath(ns(".//ol")) - li.xpath(ns(".//ol//ol"))).each do |ol|
@@ -174,16 +205,23 @@ refer_list)
         end
       end
 
+      # KILL
+      def list_anchor_names(s)
+        super
+        #require "debug"; binding.b
+      end
+
       def list_item_value(entry, counter, depth, opts)
-        label1 = counter.increment(entry).listlabel(entry.parent, depth)
         if depth > 2
-          base = @c.decode(opts[:prev_label]).split(/\)\s*/) # List a) 1.1.1
-          label1 = "#{base[-1].sub(/^の/,'')}#{clause_sep}#{label1}"
-          [label1, list_item_anchor_label(label1, opts[:list_anchor],
-                                          base[0].sub(/[\p{Zs})]+$/, ""), opts[:refer_list])]
+#          require 'debug'; binding.b
+        label = counter.increment(entry).listlabel(entry.parent, depth)
+        s = semx(entry, label)
+          base = @c.decode(opts[:prev_label].gsub(%r{<[^>]+>}, "")).split(/\)\s*/) # List a) 1.1.1
+          label = "#{base[-1].sub(/^の/,'')}#{clausesep}#{label}"
+          #[label, J=list_item_anchor_label(opts[:prev_label] + delim_wrap(clause_sep) + s, opts[:list_anchor], base[0].sub(/[\p{Zs})]+$/, ""), opts[:refer_list])]
+          [label, opts[:prev_label] + delim_wrap(clausesep) + s]
         else
-          [label1, list_item_anchor_label(label1, opts[:list_anchor], opts[:prev_label],
-                                          opts[:refer_list])]
+          super
         end
       end
     end

data/lib/metanorma/jis/biblio.rng

@@ -1783,9 +1783,21 @@ that the `number` given for the series applies to the second iteration of number
 May be used to differentiate rendering of notes in bibliographies</a:documentation>
         </attribute>
       </optional>
-      <ref name="LocalizedMarkedUpString">
+      <ref name="LocalizedStringAttributes">
         <a:documentation>The content of the note</a:documentation>
       </ref>
+      <choice>
+        <oneOrMore>
+          <ref name="BasicBlockNoId">
+            <a:documentation>Multiple blocks of content</a:documentation>
+          </ref>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="TextElement">
+            <a:documentation>Single block of content</a:documentation>
+          </ref>
+        </oneOrMore>
+      </choice>
     </element>
   </define>
   <define name="bibabstract">

data/lib/metanorma/jis/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.4 -->
+<!-- VERSION v1.4.1 -->
 <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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -326,7 +326,7 @@ normative or informative references, some split references into sections organiz
       <a:documentation>Content of note</a:documentation>
       <oneOrMore>
         <choice>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -412,7 +412,7 @@ normative or informative references, some split references into sections organiz
       <element name="note">
         <ref name="OptionalId"/>
         <oneOrMore>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
         </oneOrMore>
       </element>
     </define>
@@ -1977,7 +1977,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
@@ -2015,7 +2015,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the term note</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -2037,7 +2037,7 @@ used in document amendments</a:documentation>
           <ref name="dl"/>
           <ref name="quote"/>
           <ref name="sourcecode"/>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="figure"/>
         </choice>
       </oneOrMore>

data/lib/metanorma/jis/processor.rb

@@ -27,7 +27,6 @@ module Metanorma
           "Noto Serif JP" => nil,
           "Noto Serif JP ExtraLight" => nil,
           "Noto Serif JP Medium" => nil,
-          "Noto Serif JP Bold" => nil,
           "Noto Serif JP Black" => nil,
           "Noto Sans JP Thin" => nil,
           "Noto Sans JP Medium" => nil,

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "0.3.7".freeze
+    VERSION = "0.4.1".freeze
   end
 end
 

data/lib/relaton/render-jis/general.rb

@@ -20,7 +20,7 @@ module Relaton
           r = doc.relation.select { |x| x.type == "hasRepresentation" }
             .map { |x| @i18n.also_pub_as + render_single_bibitem(x.bibitem) }
           out = [render_single_bibitem(doc)] + r
-          @i18n.l10n(out.join(". ").gsub(".. ", ". ").sub(/\.\s*$/, ""))
+          @i18n.l10n(out.join(". ").gsub(/[.。]\. /, ". ").sub(/[.。]\s*$/, ""))
         end
 
         def render_all(bib, type: "author-date")

data/metanorma-jis.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   spec.add_dependency "japanese_calendar", "~> 0"
-  spec.add_dependency "metanorma-iso", "~> 2.8.0"
+  spec.add_dependency "metanorma-iso", "~> 2.9.1"
   spec.add_dependency "pubid"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-28 00:00:00.000000000 Z
+date: 2024-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.9.1
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement