metanorma-jis 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4996ea4b1bb499c2bf908cc1c253b8639b14b043826073dd25bf76b9b5e4a171
-  data.tar.gz: d81bbb783eed5d0cfd07368f4ca5a0feca7c04fe02bf99081a1dcb2dc72624cb
+  metadata.gz: 8bcd50e7099ae02c6427bbca496f824f9429ba102e0d3b8df1bdb2f2fd6cb9a2
+  data.tar.gz: 760abf62f4c69e4f73f8fa9e2bfc696e431b6fc4859b79f103e4595d6883bb3e
 SHA512:
-  metadata.gz: bb4ff093637c801ed9dd560b68000fd6a39ab5499ac31f3f48d98796450184e20357203aeb494a9dbfa4c5d07e654900e4df3dda181b617d735882671dc445aa
-  data.tar.gz: 3861d3f219c83c43c1dd34d02a26a77ea9f54dc315435f866c744f5c302119ab2250927977ccc288d8513cc71b766b552f106b6af59ac452f6bd4b5086848d4c
+  metadata.gz: d1128ad3d108ac316a8d4c324c69b2fa5328838b84a1ff4b59f7b01ab79464c7946839c151c1a0749c52bc4da406c5ab820f7be2aefb43a06c36464757ebf020
+  data.tar.gz: c06c9323c1e2af9c1fe73c5b2e43c68dcb81efebb4004bc8c6f88959b2bfc43cc3989366c92242eab460873e137419e7efa83c6b5732f2a33ee71ea9f46f0168

data/Gemfile

@@ -2,11 +2,14 @@ Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
 source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-# Specify your gem's dependencies in gemspec
-gemspec
+group :development, :test do
+  gem "rspec"
+end
 
 if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
 
+gemspec

data/lib/isodoc/jis/jis.international-standard.xsl

@@ -5835,8 +5835,17 @@
 		<xsl:variable name="styles_">
 			<xsl:for-each select="xalan:nodeset($styles__)/item">
 				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
-				<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
-				<xsl:if test="$key = 'font-family' or $key = 'color'">
+				<xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
+				<xsl:variable name="value">
+					<xsl:choose>
+						<!-- if font-size is digits only -->
+						<xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="$value_"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
 					<style name="{$key}"><xsl:value-of select="$value"/></style>
 				</xsl:if>
 			</xsl:for-each>

data/lib/isodoc/jis/xref.rb

@@ -78,8 +78,9 @@ 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) do |c, i|
-          commentary_names1(c, root, "#{num}.#{i.increment(c).print}",
+        clause.xpath(ns(SUBCLAUSES))
+          .each_with_object(Counter.new(0, prefix: "#{num}.")) do |c, i|
+          commentary_names1(c, root, i.increment(c).print,
                             level + 1)
         end
       end

data/lib/metanorma/jis/basicdoc.rng

@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,6 +654,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -655,7 +663,11 @@
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -898,44 +914,47 @@
   -->
   <define name="image">
     <element name="image">
-      <attribute name="id">
-        <data type="ID"/>
+      <ref name="Image"/>
+    </element>
+  </define>
+  <define name="Image">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <attribute name="src">
+      <data type="anyURI"/>
+    </attribute>
+    <attribute name="mimetype"/>
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+    <optional>
+      <attribute name="width">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
       </attribute>
-      <attribute name="src">
+    </optional>
+    <optional>
+      <attribute name="height">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <attribute name="longdesc">
         <data type="anyURI"/>
       </attribute>
-      <attribute name="mimetype"/>
-      <optional>
-        <attribute name="filename"/>
-      </optional>
-      <optional>
-        <attribute name="width">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="height">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="alt"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <optional>
-        <attribute name="longdesc">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-    </element>
+    </optional>
   </define>
   <define name="video">
     <element name="video">

data/lib/metanorma/jis/biblio.rng

@@ -348,6 +348,9 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
+      <optional>
+        <ref name="logo"/>
+      </optional>
     </element>
   </define>
   <define name="orgname">
@@ -366,6 +369,11 @@
       </choice>
     </element>
   </define>
+  <define name="logo">
+    <element name="logo">
+      <ref name="image"/>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -942,6 +950,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>
@@ -1283,7 +1292,7 @@
       <value>mergedInto</value>
       <value>splits</value>
       <value>splitInto</value>
-      <value>instance</value>
+      <value>instanceOf</value>
       <value>hasInstance</value>
       <value>exemplarOf</value>
       <value>hasExemplar</value>

data/lib/metanorma/jis/converter.rb

@@ -1,8 +1,8 @@
 require "asciidoctor"
 require "metanorma-iso"
-require_relative "./front"
-require_relative "./validate"
-require_relative "./cleanup"
+require_relative "front"
+require_relative "validate"
+require_relative "cleanup"
 
 module Metanorma
   module JIS
@@ -74,7 +74,9 @@ module Metanorma
         if node.nil?
           IsoDoc::JIS::PresentationXMLConvert.new({})
         else
-          IsoDoc::JIS::PresentationXMLConvert.new(doc_extract_attributes(node))
+          IsoDoc::JIS::PresentationXMLConvert
+            .new(doc_extract_attributes(node)
+            .merge(output_formats: ::Metanorma::JIS::Processor.new.output_formats))
         end
       end
     end

data/lib/metanorma/jis/front.rb

@@ -7,29 +7,49 @@ module Metanorma
         super.merge("Japanese Industrial Standards" => "JIS")
       end
 
-      def home_agency
+      def default_publisher
         "JIS"
       end
 
-      # Like the ISO code, but multilingual
+      #       # Like the ISO code, but multilingual
+      #       def metadata_author(node, xml)
+      #         metadata_contrib_sdo(node, xml, JIS_HASH,
+      #                              { role: "author", sourcerole: "publisher" })
+      #         node.attr("doctype") == "expert-commentary" and
+      #           personal_author(node, xml)
+      #       end
+
       def metadata_author(node, xml)
-        metadata_contrib_sdo(node, xml, JIS_HASH,
-                             { role: "author", sourcerole: "publisher" })
+        org_contributor(node, xml,
+                        { source: ["publisher", "pub"], role: "author",
+                          default: JIS_HASH })
         node.attr("doctype") == "expert-commentary" and
           personal_author(node, xml)
       end
 
+      #       def metadata_publisher(node, xml)
+      #         metadata_contrib_sdo(node, xml, JIS_HASH,
+      #                              { role: "publisher", sourcerole: "publisher" })
+      #         metadata_contrib_sdo(node, xml, nil,
+      #                              { role: "authorizer",
+      #                                sourcerole: "investigative-organization",
+      #                                desc: "Investigative organization" })
+      #         metadata_contrib_sdo(node, xml, nil,
+      #                              { role: "authorizer",
+      #                                sourcerole: "investigative-committee",
+      #                                desc: "Investigative committee" })
+      #       end
+
       def metadata_publisher(node, xml)
-        metadata_contrib_sdo(node, xml, JIS_HASH,
-                             { role: "publisher", sourcerole: "publisher" })
-        metadata_contrib_sdo(node, xml, nil,
-                             { role: "authorizer",
-                               sourcerole: "investigative-organization",
-                               desc: "Investigative organization" })
-        metadata_contrib_sdo(node, xml, nil,
-                             { role: "authorizer",
-                               sourcerole: "investigative-committee",
-                               desc: "Investigative committee" })
+        [{ source: ["publisher", "pub"], role: "publisher", default: JIS_HASH },
+         { role: "authorizer",
+           source: ["investigative-organization"],
+           desc: "Investigative organization" },
+         { role: "authorizer",
+           source: ["investigative-committee"],
+           desc: "Investigative committee" }].each do |o|
+          org_contributor(node, xml, o)
+        end
       end
 
       LANGS = %w(ja en).freeze
@@ -37,56 +57,111 @@ module Metanorma
       JIS_HASH =
         { "ja" => "日本工業規格", "en" => "Japanese Industrial Standards" }.freeze
 
-      def metadata_contrib_sdo(node, xml, default_value, opt)
-        pub, default = metadata_contrib_extract(node, opt[:sourcerole], default_value)
-        metadata_contrib_sdo_build(node, xml, pub, default, opt)
+      #       def metadata_contrib_sdo(node, xml, default_value, opt)
+      #         pub, default = metadata_contrib_extract(node, opt[:sourcerole], default_value)
+      #         metadata_contrib_sdo_build(node, xml, pub, default, opt)
+      #       end
+      #
+      #       def metadata_contrib_sdo_build(node, xml, pub, default, opt)
+      #         pub&.each do |p|
+      #           xml.contributor do |c|
+      #             c.role type: opt[:role] do |r|
+      #               opt[:desc] and r.description opt[:desc]
+      #             end
+      #             c.organization do |a|
+      #               organization(a, p, opt[:role] == "publisher", node, default)
+      #             end
+      #           end
+      #         end
+      #       end
+      #
+      #       def metadata_contrib_extract(node, role, default_value)
+      #         pub, default = multiling_docattr_csv(node, role, LANGS, default_value)
+      #         a = node.attr("#{role}-abbr") and abbr = a # one abbrev for all languages
+      #         [pub&.map { |p| { name: p, abbr: abbr } }, default]
+      #       end
+      #
+      #       def multiling_docattr(node, attr, langs)
+      #         ret = node.attr(attr) and return ret
+      #         ret = langs.each_with_object({}).each do |l, m|
+      #           x = node.attr("#{attr}-#{l}") and m[l] = x
+      #         end.compact
+      #         ret.empty? and return nil
+      #         ret
+      #       end
+      #
+      #       def multiling_docattr_csv(node, attr, langs, default)
+      #         ret = multiling_docattr(node, attr, langs)
+      #         not_found = ret.nil?
+      #         ret ||= default
+      #         ret &&= if ret.is_a?(Hash) then interleave_multiling_docattr(ret)
+      #                 else csv_split(ret)
+      #                 end
+      #         [ret, not_found]
+      #       end
+      #
+      #       # TODO abort if CSV count different between different languages
+      #       def interleave_multiling_docattr(ret)
+      #         h = ret.transform_values { |v| csv_split(v) }
+      #         h.each_with_object([]) do |(k, v), m|
+      #           v.each_with_index do |v1, i|
+      #             m[i] ||= {}
+      #             m[i][k] = v1
+      #           end
+      #         end
+      #       end
+
+      def org_organization(node, xml, org)
+        organization(xml, { name: org[:name], abbr: org[:abbr] }.compact,
+                     node, !multiling_docattr(node, "publisher", "", LANGS))
+        org_address(org, xml)
+        org_logo(xml, org[:logo])
       end
 
-      def metadata_contrib_sdo_build(node, xml, pub, default, opt)
-        pub&.each do |p|
-          xml.contributor do |c|
-            c.role type: opt[:role] do |r|
-              opt[:desc] and r.description opt[:desc]
-            end
-            c.organization do |a|
-              organization(a, p, opt[:role] == "publisher", node, default)
-            end
+      def org_attrs_parse(node, opts)
+        source = opts[:source]&.detect { |s| node.attr(s) }
+          source ||= opts[:source]&.detect do |s|
+            LANGS.detect { |l| node.attr("#{s}-#{l}") }
           end
-        end
+        org_attrs_simple_parse(node, opts, source) ||
+          org_attrs_complex_parse(node, opts, source)
       end
 
-      def metadata_contrib_extract(node, role, default_value)
-        pub, default = multiling_docattr_csv(node, role, LANGS, default_value)
-        a = node.attr("#{role}-abbr") and abbr = a # one abbrev for all languages
-        [pub&.map { |p| { name: p, abbr: abbr } }, default]
+      def org_attrs_complex_parse(node, opts, source)
+        i = 1
+        suffix = ""
+        ret = []
+        while multiling_docattr(node, source, suffix, LANGS)
+          ret << extract_org_attrs_complex(node, opts, source, suffix)
+          i += 1
+          suffix = "_#{i}"
+        end
+        ret
       end
 
-      def multiling_docattr(node, attr, langs)
-        ret = node.attr(attr) and return ret
+      def multiling_docattr(node, attr, suffix, langs)
+        ret = node.attr(attr + suffix) and return ret
         ret = langs.each_with_object({}).each do |l, m|
-          x = node.attr("#{attr}-#{l}") and m[l] = x
+          x = node.attr("#{attr}-#{l}#{suffix}") and m[l] = x
         end.compact
         ret.empty? and return nil
         ret
       end
 
-      def multiling_docattr_csv(node, attr, langs, default)
-        ret = multiling_docattr(node, attr, langs)
-        not_found = ret.nil?
-        ret ||= default
-        ret &&= if ret.is_a?(Hash) then interleave_multiling_docattr(ret)
-                else csv_split(ret)
-                end
-        [ret, not_found]
+      def extract_org_attrs_complex(node, opts, source, suffix)
+        { name: multiling_docattr(node, source, suffix, LANGS),
+          role: opts[:role], desc: opts[:desc],
+          abbr: multiling_docattr(node, "#{source}-abbr", suffix, LANGS),
+          logo: multiling_docattr(node, "#{source}_logo", suffix, LANGS) }
+          .compact
+          .merge(extract_org_attrs_address(node, opts, suffix))
       end
 
-      # TODO abort if CSV count different between different languages
-      def interleave_multiling_docattr(ret)
-        h = ret.transform_values { |v| csv_split(v) }
-        h.each_with_object([]) do |(k, v), m|
-          v.each_with_index do |v1, i|
-            m[i] ||= {}
-            m[i][k] = v1
+      def extract_org_attrs_address(node, opts, suffix)
+        %w(address phone fax email uri).each_with_object({}) do |a, m|
+          opts[:source]&.each do |s|
+            p = multiling_docattr(node, "#{s}-#{a}", suffix, LANGS) and
+              m[a.to_sym] = p
           end
         end
       end
@@ -104,37 +179,44 @@ module Metanorma
         end
       end
 
-      def organization(xml, org, _is_pub, node = nil, default_org = nil)
-        org.is_a?(Hash) or org = { name: org }
+      def organization(xml, org, node = nil, default_org = nil)
+        org.is_a?(Hash) && org[:name] or org = { name: org }
         abbrevs = org_abbrev
         name_str = org[:name].is_a?(Hash) ? org[:name]["en"] : org[:name]
         n = abbrevs.invert[org[:name]] and org = { name: n, abbr: org[:name] }
         multiling_noko_value(org[:name], "name", xml)
-        default_org && a = multiling_docattr(node, "subdivision", LANGS) and
+        default_org && a = multiling_docattr(node, "subdivision", "", LANGS) and
           multiling_noko_value(a, "subdivision", xml)
         abbr = org[:abbr]
         abbr ||= org_abbrev[name_str]
         default_org && b = node.attr("subdivision-abbr") and abbr = b
         abbr and xml.abbreviation abbr
-        # is_pub && node and org_address(node, org) # should refactor into struct, like abbr
       end
 
-      def metadata_copyright(node, xml)
-        pub, default = metadata_contrib_extract(node, "copyright-holder", nil)
-        if default
-          pub, default = metadata_contrib_extract(node, "publisher", JIS_HASH)
-        end
+      #       def metadata_copyright(node, xml)
+      #         pub, default = metadata_contrib_extract(node, "copyright-holder", nil)
+      #         if default
+      #           pub, default = metadata_contrib_extract(node, "publisher", JIS_HASH)
+      #         end
+      #
+      #         pub&.each do |p|
+      #           xml.copyright do |c|
+      #             c.from (node.attr("copyright-year") || Date.today.year)
+      #             c.owner do |owner|
+      #               owner.organization do |o|
+      #                 organization(o, p, true, node, default)
+      #               end
+      #             end
+      #           end
+      #         end
+      #       end
 
-        pub&.each do |p|
-          xml.copyright do |c|
-            c.from (node.attr("copyright-year") || Date.today.year)
-            c.owner do |owner|
-              owner.organization do |o|
-                organization(o, p, true, node, default)
-              end
-            end
-          end
-        end
+      def copyright_parse(node)
+        opt = { source: ["copyright-holder", "publisher", "pub"],
+                role: "publisher", default: JIS_HASH }
+        ret = org_attrs_parse(node, opt)
+        ret.empty? and ret = [{ name: "-" }]
+        ret
       end
 
       def title(node, xml)

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.2.4 -->
+<!-- VERSION v1.2.8 -->
 <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">
@@ -485,6 +485,8 @@
           <choice>
             <text/>
             <ref name="callout"/>
+            <ref name="xref"/>
+            <ref name="eref"/>
           </choice>
         </oneOrMore>
         <zeroOrMore>
@@ -865,6 +867,7 @@
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -880,6 +883,7 @@
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -894,6 +898,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -908,6 +913,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -918,6 +924,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -928,6 +935,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -938,6 +946,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -1004,6 +1013,14 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="BasicBlock" combine="choice">
+    <ref name="columnbreak"/>
+  </define>
+  <define name="columnbreak">
+    <element name="columnbreak">
+      <empty/>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -1037,6 +1054,17 @@
       <ref name="date_inline"/>
     </choice>
   </define>
+  <define name="PureTextElement" combine="choice">
+    <ref name="passthrough_inline"/>
+  </define>
+  <define name="passthrough_inline">
+    <element name="passthrough">
+      <optional>
+        <attribute name="formats"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
   <define name="add">
     <element name="add">
       <choice>
@@ -1047,6 +1075,8 @@
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
@@ -1060,6 +1090,8 @@
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
@@ -1071,6 +1103,9 @@
       <optional>
         <attribute name="style"/>
       </optional>
+      <optional>
+        <attribute name="custom-charset"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1126,6 +1161,8 @@
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>
@@ -1136,6 +1173,8 @@
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>
@@ -1369,6 +1408,9 @@
       <optional>
         <attribute name="number"/>
       </optional>
+      <optional>
+        <attribute name="branch-number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1592,6 +1634,9 @@
     <optional>
       <attribute name="number"/>
     </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
     <optional>
       <attribute name="type"/>
     </optional>
@@ -1643,6 +1688,9 @@
     <optional>
       <attribute name="number"/>
     </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1740,6 +1788,9 @@
       <optional>
         <attribute name="number"/>
       </optional>
+      <optional>
+        <attribute name="branch-number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>

data/lib/metanorma/jis/isostandard.rng

@@ -220,6 +220,9 @@
       <optional>
         <attribute name="number"/>
       </optional>
+      <optional>
+        <attribute name="branch-number"/>
+      </optional>
       <optional>
         <attribute name="type"/>
       </optional>

data/lib/metanorma/jis/processor.rb

@@ -35,6 +35,7 @@ module Metanorma
       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)

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.1.2".freeze
+    VERSION = "0.1.4".freeze
   end
 end
 

data/metanorma-jis.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-iso", "~> 2.5.2"
+  spec.add_dependency "metanorma-iso", "~> 2.6.0"
   spec.add_dependency "pubid-jis"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: pubid-jis
   requirement: !ruby/object:Gem::Requirement