metanorma-jis 0.3.6 → 0.4.0

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

@@ -65,7 +65,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 +73,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)
@@ -135,6 +131,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)
@@ -142,10 +142,58 @@ module IsoDoc
 
       def date_translate(bibdata)
         bibdata.xpath(ns("./date")).each do |d|
-          d.children = @i18n.japanese_date(d.text.strip)
+          j = @i18n.japanese_date(d.text.strip)
+          @autonumbering_style == :japanese and
+            j.gsub!(/(\d+)/) do
+              $1.to_i.localize(:ja).spellout
+            end
+          d.children = j
         end
       end
 
+      def edition_translate(bibdata)
+        x = bibdata.at(ns("./edition")) or return
+        /^\d+$/.match?(x.text) or return
+        @i18n.edition_ordinal or return
+        num = x.text.to_i
+        @autonumbering_style == :japanese and num = num.localize(:ja).spellout
+        x.next =
+          %(<edition language="#{@lang}" numberonly="true">#{num}</edition>)
+        tag_translate(x, @lang, @i18n
+          .populate("edition_ordinal", { "var1" => num }))
+      end
+
+      def convert1(xml, filename, dir)
+        j = xml.at(ns("//metanorma-extension/presentation-metadata/" \
+                     "autonumbering-style"))&.text
+        j ||= "arabic"
+        @autonumbering_style = j.to_sym
+        @xrefs.autonumbering_style = j.to_sym
+        super
+      end
+
+      def localized_strings(docxml)
+        super
+        a = docxml.at(ns("//localized-strings")) or return
+        ret = (0..1000).map do |i|
+          n = i.localize(:ja).spellout
+          "<localized-string key='#{i}' language='ja'>#{n}</localized-string>"
+        end.join("\n")
+        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

@@ -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/xref.rb

@@ -5,18 +5,41 @@ module IsoDoc
         return list["type"].to_sym if list["type"]
         return :alphabet if depth == 1
 
-        :arabic
+        @style == :japanese ? :japanese : :arabic
       end
 
       def listlabel(_list, depth)
         case depth
         when 1 then (96 + @num).chr.to_s
-        else @num.to_s
+        else
+          if @style == :japanese
+            @num.localize(:ja).spellout
+          else
+            @num.to_s
+          end
         end
       end
     end
 
     class Xref < IsoDoc::Iso::Xref
+      attr_accessor :autonumbering_style
+
+      def clause_sep
+        @autonumbering_style == :japanese ? "\u30fb" : "."
+      end
+
+      def clause_counter(num, opts)
+        opts[:numerals] ||= @autonumbering_style
+        opts[:separator] ||= clause_sep
+        super
+      end
+
+      def list_counter(num, opts)
+        opts[:numerals] ||= @autonumbering_style
+        opts[:separator] ||= clause_sep
+        IsoDoc::Jis::Counter.new(num, opts)
+      end
+
       def hierfigsep
         @lang == "ja" ? "の" : super
       end
@@ -28,12 +51,12 @@ module IsoDoc
       end
 
       def annex_name_lbl(clause, num)
-        obl = l10n("(#{@labels['inform_annex']})")
+        obl = "(#{@labels['inform_annex']})"
         clause["obligation"] == "normative" and
-          obl = l10n("(#{@labels['norm_annex']})")
+          obl = "(#{@labels['norm_annex']})"
         title = Common::case_with_markup(@labels["annex"], "capital",
                                          @script)
-        l10n("#{title} #{num}<br/>#{obl}")
+        "#{title} #{num}<br/>#{obl}"
       end
 
       def annex_name_anchors1(clause, num, level)
@@ -44,7 +67,7 @@ module IsoDoc
 
       def annex_names1(clause, num, level)
         annex_name_anchors1(clause, num, level)
-        i = ::IsoDoc::XrefGen::Counter.new(0, prefix: "#{num}.")
+        i = clause_counter(0, prefix: num)
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           annex_names1(c, i.increment(c).print, level + 1)
         end
@@ -81,6 +104,16 @@ module IsoDoc
         super
       end
 
+      def main_anchor_names(xml)
+        n = Counter.new(0, { numerals: @autonumbering_style })
+        clause_order_main(xml).each do |a|
+          xml.xpath(ns(a[:path])).each do |c|
+            section_names(c, n, 1)
+            a[:multi] or break
+          end
+        end
+      end
+
       def back_clauses_anchor_names(xml)
         clause_order_back(xml).each do |a|
           xml.xpath(ns(a[:path])).each do |c|
@@ -96,7 +129,8 @@ module IsoDoc
 
       def commentary_names(clause)
         preface_name_anchors(clause, 1, clause_title(clause))
-        clause.xpath(ns(SUBCLAUSES)).each_with_object(Counter.new) do |c, i|
+        clause.xpath(ns(SUBCLAUSES))
+          .each_with_object(clause_counter(0, {})) do |c, i|
           commentary_names1(c, clause["id"], i.increment(c).print, 2)
         end
       end
@@ -104,7 +138,7 @@ module IsoDoc
       def commentary_names1(clause, root, num, level)
         commentary_name_anchors(clause, num, root, level)
         clause.xpath(ns(SUBCLAUSES))
-          .each_with_object(Counter.new(0, prefix: "#{num}.")) do |c, i|
+          .each_with_object(clause_counter(0, prefix: num)) do |c, i|
           commentary_names1(c, root, i.increment(c).print,
                             level + 1)
         end
@@ -120,15 +154,19 @@ module IsoDoc
 
       def list_item_anchor_names(list, list_anchor, depth, prev_label,
 refer_list)
-        c = Counter.new(list["start"] ? list["start"].to_i - 1 : 0)
+        c = list_counter(list["start"] ? list["start"].to_i - 1 : 0, {})
         list.xpath(ns("./li")).each do |li|
           bare_label, label =
-            list_item_value(li, c, depth, { list_anchor: list_anchor,
-                                            prev_label: prev_label, refer_list: depth == 1 ? refer_list : nil })
+            list_item_value(li, c, depth,
+                            { list_anchor: list_anchor,
+                              prev_label: prev_label,
+                              refer_list: depth == 1 ? refer_list : nil })
           li["id"] and @anchors[li["id"]] =
-                         { label: bare_label, bare_xref: "#{bare_label})",
+                         { label: bare_label,
+                           bare_xref: "#{bare_label})",
                            xref: "#{label})", type: "listitem",
-                           refer_list: refer_list, container: list_anchor[:container] }
+                           refer_list: refer_list,
+                           container: list_anchor[:container] }
           (li.xpath(ns(".//ol")) - li.xpath(ns(".//ol//ol"))).each do |ol|
             list_item_anchor_names(ol, list_anchor, depth + 1, label,
                                    refer_list)
@@ -139,10 +177,10 @@ refer_list)
       def list_item_value(entry, counter, depth, opts)
         label1 = counter.increment(entry).listlabel(entry.parent, depth)
         if depth > 2
-          base = opts[:prev_label].match(/^(.*?)([0-9.]+)$/) # a) 1.1.1
-          label1 = "#{base[2]}.#{label1}"
+          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[1].sub(/[^a-z0-9]*$/, ""), opts[:refer_list])]
+                                          base[0].sub(/[\p{Zs})]+$/, ""), opts[:refer_list])]
         else
           [label1, list_item_anchor_label(label1, opts[:list_anchor], opts[:prev_label],
                                           opts[:refer_list])]

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.0 -->
 <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

@@ -23,6 +23,14 @@ module Metanorma
           "STIX Two Math" => nil,
           "IPAexGothic" => nil,
           "IPAexMincho" => nil,
+=begin
+          "Noto Serif JP" => nil,
+          "Noto Serif JP ExtraLight" => nil,
+          "Noto Serif JP Medium" => nil,
+          "Noto Serif JP Black" => nil,
+          "Noto Sans JP Thin" => nil,
+          "Noto Sans JP Medium" => nil,
+=end
           "Courier New" => nil,
           "Cambria Math" => nil,
           "Times New Roman" => nil,

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "0.3.6".freeze
+    VERSION = "0.4.0".freeze
   end
 end
 

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

@@ -6,15 +6,19 @@ module Relaton
       class Parse < ::Relaton::Render::Iso::Parse
         def simple_or_host_xml2hash(doc, host)
           ret = super
-          ret.merge(home_standard: home_standard(doc, ret[:publisher_raw] ||
-                                                 ret[:author_raw]))
+          orgs = %i(publisher_raw author_raw authorizer_raw)
+            .each_with_object([]) do |i, m|
+            ret[i] and m << ret[i]
+          end
+          ret.merge(home_standard: home_standard(doc, orgs.flatten))
         end
 
         def home_standard(_doc, pubs)
           pubs&.any? do |r|
             ["International Organization for Standardization", "ISO",
              "International Electrotechnical Commission", "IEC",
-             "一般財団法人　日本規格協会", "Japanese Industrial Standards"]
+             "日本規格協会", "一般財団法人　日本規格協会",
+             "Japanese Industrial Standards"]
               .include?(r[:nonpersonal])
           end
         end

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.0"
   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.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-14 00:00:00.000000000 Z
+date: 2024-11-11 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.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement