metanorma-jis 0.3.5 → 0.3.7

data/lib/isodoc/jis/metadata.rb

@@ -2,7 +2,7 @@ require "isodoc"
 require "metanorma-iso"
 
 module IsoDoc
-  module JIS
+  module Jis
     class Metadata < IsoDoc::Iso::Metadata
       def title(isoxml, _out)
         lang = @lang

data/lib/isodoc/jis/pdf_convert.rb

@@ -2,7 +2,7 @@ require_relative "base_convert"
 require "isodoc"
 
 module IsoDoc
-  module JIS
+  module Jis
     class PdfConvert < IsoDoc::XslfoPdfConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)

data/lib/isodoc/jis/presentation_section.rb

@@ -2,7 +2,7 @@ require_relative "init"
 require "isodoc"
 
 module IsoDoc
-  module JIS
+  module Jis
     class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
       def annex1(elem)
         elem["commentary"] == "true" and return commentary(elem)

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -4,7 +4,7 @@ require_relative "presentation_section"
 require_relative "../../relaton/render-jis/general"
 
 module IsoDoc
-  module JIS
+  module Jis
     class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
       def inline(docxml)
         super
@@ -142,10 +142,46 @@ 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
+
       include Init
     end
   end

data/lib/isodoc/jis/table.rb

@@ -1,5 +1,5 @@
 module IsoDoc
-  module JIS
+  module Jis
     class WordConvert < IsoDoc::Iso::WordConvert
       def make_table_footnote_target(out, fnid, fnref)
         attrs = { id: fnid, class: "TableFootnoteRef" }

data/lib/isodoc/jis/word_cleanup.rb

@@ -1,7 +1,7 @@
 require_relative "../../html2doc/lists"
 
 module IsoDoc
-  module JIS
+  module Jis
     class WordConvert < IsoDoc::Iso::WordConvert
       def word_cleanup(docxml)
         word_note_cleanup(docxml)
@@ -65,7 +65,7 @@ module IsoDoc
       def to_word1(result, filename, dir, header)
         result or return
         result = from_xhtml(result).gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
-        ::Html2Doc::JIS.new(
+        ::Html2Doc::Jis.new(
           filename: filename, imagedir: @localdir,
           stylesheet: @wordstylesheet&.path,
           header_file: header&.path, dir: dir,

data/lib/isodoc/jis/word_convert.rb

@@ -6,7 +6,7 @@ require_relative "figure"
 require_relative "table"
 
 module IsoDoc
-  module JIS
+  module Jis
     class WordConvert < IsoDoc::Iso::WordConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)

data/lib/isodoc/jis/xref.rb

@@ -1,22 +1,45 @@
 module IsoDoc
-  module JIS
+  module Jis
     class Counter < IsoDoc::XrefGen::Counter
       def ol_type(list, depth)
         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-standoc.rng

@@ -72,6 +72,9 @@ standards defining organization, and that is rendered in a distinct manner</a:do
 from other documents in the same doctype</a:documentation>
       </ref>
     </optional>
+    <ref name="flavor">
+      <a:documentation>Flavour of Metanorma used to process this document</a:documentation>
+    </ref>
     <optional>
       <ref name="editorialgroup">
         <a:documentation>Groups associated with the production of the standards document, typically within
@@ -113,6 +116,16 @@ a standards definition organization</a:documentation>
   <define name="DocumentSubtype">
     <text/>
   </define>
+  <define name="flavor">
+    <element name="flavor">
+      <ref name="MetanormaFlavor"/>
+    </element>
+  </define>
+  <define name="MetanormaFlavor">
+    <a:documentation>This is in fact an enum, as of this writing: standoc iso generic ietf ieee itu nist ogc csa cc iho ribose jis iec bsi bipm plateau.
+However we prefer not to hardcode it, given ongoing extension.</a:documentation>
+    <text/>
+  </define>
   <define name="editorialgroup">
     <a:documentation>A group associated with the production of the standards document, typically within
 a standards definition organization</a:documentation>

data/lib/metanorma/jis/biblio.rng

@@ -1382,18 +1382,7 @@ Applies whether the resource has already been created or not, and whether it is
   <define name="bdate">
     <a:documentation>Significant date in the lifecycle of the bibliographic item, including its production and its access</a:documentation>
     <element name="date">
-      <attribute name="type">
-        <a:documentation>The phase of the production of or access to a bibliographic item</a:documentation>
-        <choice>
-          <ref name="BibliographicDateType"/>
-          <text/>
-        </choice>
-      </attribute>
-      <optional>
-        <attribute name="text">
-          <a:documentation>An optional textual description of the date, especially when a Gregorian date is not applicable</a:documentation>
-        </attribute>
-      </optional>
+      <ref name="bDateAttributes"/>
       <optional>
         <choice>
           <group>
@@ -1416,6 +1405,20 @@ Applies whether the resource has already been created or not, and whether it is
       </optional>
     </element>
   </define>
+  <define name="bDateAttributes">
+    <attribute name="type">
+      <a:documentation>The phase of the production of or access to a bibliographic item</a:documentation>
+      <choice>
+        <ref name="BibliographicDateType"/>
+        <text/>
+      </choice>
+    </attribute>
+    <optional>
+      <attribute name="text">
+        <a:documentation>An optional textual description of the date, especially when a Gregorian date is not applicable</a:documentation>
+      </attribute>
+    </optional>
+  </define>
   <define name="docidentifier">
     <a:documentation>An identifier of a bibliographic item in an international standard scheme</a:documentation>
     <element name="docidentifier">
@@ -1884,6 +1887,10 @@ Detailed in https://www.relaton.org/model/relations/</a:documentation>
       <value>hasAnnotation</value>
       <value>draftOf</value>
       <value>hasDraft</value>
+      <value>preliminaryDraftOf</value>
+      <value>hasPreliminaryDraft</value>
+      <value>revisionDraftOf</value>
+      <value>hasRevisionDraft</value>
       <value>editionOf</value>
       <value>hasEdition</value>
       <value>updates</value>

data/lib/metanorma/jis/cleanup.rb

@@ -1,6 +1,6 @@
 module Metanorma
-  module JIS
-    class Converter < ISO::Converter
+  module Jis
+    class Converter < Iso::Converter
       def norm_ref_preface(ref)
         if ref.at("./note[@type = 'boilerplate']")
           unwrap_boilerplate_clauses(ref, ".")

data/lib/metanorma/jis/converter.rb

@@ -5,8 +5,8 @@ require_relative "validate"
 require_relative "cleanup"
 
 module Metanorma
-  module JIS
-    class Converter < ISO::Converter
+  module Jis
+    class Converter < Iso::Converter
       XML_ROOT_TAG = "jis-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/jis".freeze
 
@@ -48,17 +48,17 @@ module Metanorma
 
       def html_converter(node)
         if node.nil?
-          IsoDoc::JIS::HtmlConvert.new({})
+          IsoDoc::Jis::HtmlConvert.new({})
         else
-          IsoDoc::JIS::HtmlConvert.new(html_extract_attributes(node))
+          IsoDoc::Jis::HtmlConvert.new(html_extract_attributes(node))
         end
       end
 
       def doc_converter(node)
         if node.nil?
-          IsoDoc::JIS::WordConvert.new({})
+          IsoDoc::Jis::WordConvert.new({})
         else
-          IsoDoc::JIS::WordConvert.new(doc_extract_attributes(node))
+          IsoDoc::Jis::WordConvert.new(doc_extract_attributes(node))
         end
       end
 
@@ -66,19 +66,19 @@ module Metanorma
         return if node.attr("no-pdf")
 
         if node.nil?
-          IsoDoc::JIS::PdfConvert.new({})
+          IsoDoc::Jis::PdfConvert.new({})
         else
-          IsoDoc::JIS::PdfConvert.new(pdf_extract_attributes(node))
+          IsoDoc::Jis::PdfConvert.new(pdf_extract_attributes(node))
         end
       end
 
       def presentation_xml_converter(node)
         if node.nil?
-          IsoDoc::JIS::PresentationXMLConvert.new({})
+          IsoDoc::Jis::PresentationXMLConvert.new({})
         else
-          IsoDoc::JIS::PresentationXMLConvert
+          IsoDoc::Jis::PresentationXMLConvert
             .new(doc_extract_attributes(node)
-            .merge(output_formats: ::Metanorma::JIS::Processor.new
+            .merge(output_formats: ::Metanorma::Jis::Processor.new
             .output_formats))
         end
       end

data/lib/metanorma/jis/front.rb

@@ -1,8 +1,8 @@
 require "pubid-jis"
 
 module Metanorma
-  module JIS
-    class Converter < ISO::Converter
+  module Jis
+    class Converter < Iso::Converter
       def org_abbrev
         super.merge("Japanese Industrial Standards" => "JIS")
       end

data/lib/metanorma/jis/processor.rb

@@ -1,7 +1,7 @@
 require "metanorma/processor"
 
 module Metanorma
-  module JIS
+  module Jis
     class Processor < Metanorma::Processor
 
       def initialize # rubocop:disable Lint/MissingSuper
@@ -23,6 +23,15 @@ 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 Bold" => 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,
@@ -31,20 +40,20 @@ module Metanorma
       end
 
       def version
-        "Metanorma::JIS #{Metanorma::JIS::VERSION}"
+        "Metanorma::Jis #{Metanorma::Jis::VERSION}"
       end
 
       def output(xml, inname, outname, format, options = {})
         options_preprocess(options)
         case format
         when :html
-          IsoDoc::JIS::HtmlConvert.new(options).convert(inname, xml, nil, outname)
+          IsoDoc::Jis::HtmlConvert.new(options).convert(inname, xml, nil, outname)
         when :doc
-          IsoDoc::JIS::WordConvert.new(options).convert(inname, xml, nil, outname)
+          IsoDoc::Jis::WordConvert.new(options).convert(inname, xml, nil, outname)
         when :pdf
-          IsoDoc::JIS::PdfConvert.new(options).convert(inname, xml, nil, outname)
+          IsoDoc::Jis::PdfConvert.new(options).convert(inname, xml, nil, outname)
         when :presentation
-          IsoDoc::JIS::PresentationXMLConvert.new(options).convert(inname, xml, nil, outname)
+          IsoDoc::Jis::PresentationXMLConvert.new(options).convert(inname, xml, nil, outname)
         else
           super
         end

data/lib/metanorma/jis/relaton-jis.rng

@@ -7,6 +7,7 @@
       </optional>
       <ref name="doctype"/>
       <ref name="editorialgroup"/>
+      <ref name="flavor"/>
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>

data/lib/metanorma/jis/validate.rb

@@ -1,6 +1,6 @@
 module Metanorma
-  module JIS
-    class Converter < ISO::Converter
+  module Jis
+    class Converter < Iso::Converter
       def doctype_validate(_xmldoc)
         %w(japanese-industrial-standard technical-report
            technical-specification amendment).include? @doctype or

data/lib/metanorma/jis/version.rb

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

data/lib/metanorma/jis.rb

@@ -1,6 +1,6 @@
 require_relative "./jis/processor"
 
 module Metanorma
-  module JIS
+  module Jis
   end
 end

data/lib/metanorma-jis.rb

@@ -11,6 +11,6 @@ require "metanorma"
 
 if defined? Metanorma::Registry
   require_relative "metanorma/jis"
-  Metanorma::Registry.instance.register(Metanorma::JIS::Processor)
+  Metanorma::Registry.instance.register(Metanorma::Jis::Processor)
 end
 

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

@@ -5,7 +5,7 @@ require_relative "parse"
 
 module Relaton
   module Render
-    module JIS
+    module Jis
       class General < ::Relaton::Render::Iso::General
         def config_loc
           YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
@@ -13,7 +13,7 @@ module Relaton
 
         def klass_initialize(_options)
           super
-          @parseklass = Relaton::Render::JIS::Parse
+          @parseklass = Relaton::Render::Jis::Parse
         end
 
         def render1(doc)

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

@@ -2,19 +2,23 @@ require "metanorma-iso"
 
 module Relaton
   module Render
-    module JIS
+    module Jis
       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

@@ -6,7 +6,7 @@ require "metanorma/jis/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "metanorma-jis"
-  spec.version       = Metanorma::JIS::VERSION
+  spec.version       = Metanorma::Jis::VERSION
   spec.authors       = ["Ribose Inc."]
   spec.email         = ["open.source@ribose.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar