metanorma-jis 0.2.10 → 0.3.0

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -1,6 +1,7 @@
 require_relative "init"
 require "isodoc"
 require_relative "presentation_section"
+require_relative "../../relaton/render-jis/general"
 
 module IsoDoc
   module JIS
@@ -77,8 +78,8 @@ module IsoDoc
       end
 
       def dl_to_para_name(node)
-        e = node.at(ns("./name"))
-        "<p class='ListTitle'>#{e&.children&.to_xml || @i18n.key}</p>"
+        e = node.at(ns("./name")) or return ""
+        "<p class='ListTitle'>#{e.children.to_xml}</p>"
       end
 
       def dl_to_para_terms(node)

data/lib/isodoc/jis/xref.rb

@@ -17,11 +17,22 @@ module IsoDoc
     end
 
     class Xref < IsoDoc::Iso::Xref
+      def hierfigsep
+        @lang == "ja" ? "の" : super
+      end
+
+      def subfigure_label(subfignum)
+        subfignum.zero? and return ""
+        sep = @lang == "ja" ? "の" : " "
+        "#{sep}#{(subfignum + 96).chr})"
+      end
+
       def annex_name_lbl(clause, num)
         obl = l10n("(#{@labels['inform_annex']})")
         clause["obligation"] == "normative" and
           obl = l10n("(#{@labels['norm_annex']})")
-        title = Common::case_with_markup(@labels["annex"], "capital", @script)
+        title = Common::case_with_markup(@labels["annex"], "capital",
+                                         @script)
         l10n("#{title} #{num}<br/>#{obl}")
       end
 

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.2 -->
+<!-- VERSION v1.3.3 -->
 <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">
@@ -331,9 +331,9 @@
       <zeroOrMore>
         <ref name="table-note"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="source"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="FigureAttr">
       <optional>
@@ -380,9 +380,9 @@
       <zeroOrMore>
         <ref name="note"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="source"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="source">
       <element name="source">

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.2.10".freeze
+    VERSION = "0.3.0".freeze
   end
 end
 

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

@@ -0,0 +1,21 @@
+require "relaton-render"
+require "metanorma-iso"
+require "isodoc"
+require_relative "parse"
+
+module Relaton
+  module Render
+    module JIS
+      class General < ::Relaton::Render::Iso::General
+        #def config_loc
+        #  YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
+        #end
+
+        def klass_initialize(_options)
+          super
+          @parseklass = Relaton::Render::JIS::Parse
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+require "metanorma-iso"
+
+module Relaton
+  module Render
+    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]))
+        end
+
+        def home_standard(_doc, pubs)
+          pubs&.any? do |r|
+            ["International Organization for Standardization", "ISO",
+             "International Electrotechnical Commission", "IEC",
+             "一般財団法人　日本規格協会", "JIS"]
+              .include?(r[:nonpersonal])
+          end
+        end
+      end
+    end
+  end
+end

data/metanorma-jis.gemspec

@@ -28,10 +28,10 @@ Gem::Specification.new do |spec|
     || f.match(%r{Rakefile|bin/rspec})
   end
   spec.test_files = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   spec.add_dependency "japanese_calendar", "~> 0"
-  spec.add_dependency "metanorma-iso", "~> 2.7.3"
+  spec.add_dependency "metanorma-iso", "~> 2.8.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.2.10
+  version: 0.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-07-22 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.7.3
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.3
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement
@@ -300,6 +300,8 @@ files:
 - lib/metanorma/jis/reqt.rng
 - lib/metanorma/jis/validate.rb
 - lib/metanorma/jis/version.rb
+- lib/relaton/render-jis/general.rb
+- lib/relaton/render-jis/parse.rb
 - metanorma-jis.gemspec
 homepage: https://github.com/metanorma/metanorma-jis
 licenses:
@@ -313,7 +315,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="