metanorma-jis 0.6.3 → 0.6.5

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -103,7 +103,8 @@ module IsoDoc
       end
 
       def figure_fn(elem)
-        fnotes = elem.xpath(ns(".//fn")) - elem.xpath(ns("./name//fn"))
+        fnotes = elem.xpath(ns(".//fn")) - elem.xpath(ns("./name//fn")) -
+          elem.xpath(ns("./fmt-name//fn"))
         ret = footnote_collect(fnotes)
         f = footnote_container(fnotes, ret) and elem << f
       end
@@ -142,11 +143,8 @@ module IsoDoc
         end
       end
 
-      def non_document_footnotes(docxml)
-        table_fns = docxml.xpath(ns("//table//fn"))
-        fig_fns = docxml.xpath(ns("//figure//fn")) -
-          docxml.xpath(ns("//figure/name//fn"))
-        table_fns + fig_fns
+      def table_footnotes(docxml)
+        docxml.xpath(ns("//table//fn"))
       end
 
       include Init

data/lib/metanorma/jis/cleanup.rb

@@ -1,14 +1,15 @@
 module Metanorma
   module Jis
     class Converter < Iso::Converter
-      def norm_ref_preface(ref)
+      def norm_ref_preface(ref, isodoc)
         if ref.at("./note[@type = 'boilerplate']")
           unwrap_boilerplate_clauses(ref, ".")
         else
           pref = if ref_empty?(ref) then @i18n.norm_empty_pref
                  else @i18n.get[ref_dated(ref)]
                  end
-          ref.at("./title").next = "<p>#{pref}</p>"
+          #ref.at("./title").next = "<p>#{pref}</p>"
+          ref.at("./title").next = boilerplate_snippet_convert(pref, isodoc)
         end
       end
 

data/lib/metanorma/jis/front.rb

@@ -11,12 +11,7 @@ module Metanorma
         "JIS"
       end
 
-      def metadata_author(node, xml)
-        org_contributor(node, xml,
-                        { source: ["publisher", "pub"], role: "author",
-                          default: pub_hash })
-        personal_author(node, xml)
-      end
+      def committee_contributors(node, xml, default, opt); end
 
       def metadata_publisher(node, xml)
         [{ source: ["publisher", "pub"], role: "publisher", default: pub_hash },
@@ -30,6 +25,17 @@ module Metanorma
         end
       end
 
+      def org_author(node, xml)
+        if node.attr("corporate-author")
+          org_contributor(node, xml, { source: ["corporate-author"],
+                                       role: "author" })
+        else
+          org_contributor(node, xml,
+                          { source: ["publisher", "pub"], role: "author",
+                            default: pub_hash })
+        end
+      end
+
       LANGS = %w(ja en).freeze
 
       def pub_hash
@@ -128,12 +134,12 @@ module Metanorma
 
       def title(node, xml)
         %w(en ja).each do |lang|
-          at = { language: lang, format: "text/plain" }
-          title_full(node, xml, lang, at)
-          title_intro(node, xml, lang, at)
-          title_main(node, xml, lang, at)
-          title_part(node, xml, lang, at)
-          title_amd(node, xml, lang, at) if @amd
+          title_full(node, xml, lang)
+          %w(intro main part).each do |w|
+            title_component(node, xml, lang, { name: w, abbr: w })
+          end
+          @amd and title_component(node, xml, lang,
+                                   { name: "amendment", abbr: "amd" })
         end
       end
 
@@ -187,6 +193,11 @@ module Metanorma
       rescue StandardError => e
         clean_abort("Document identifier: #{e}", xml)
       end
+
+      def personal_author(node, xml)
+        ::Metanorma::Standoc::Converter.instance_method(:personal_author).bind(self)
+          .call(node, xml)
+      end
     end
   end
 end

data/lib/metanorma/jis/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-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">
-<!-- VERSION v2.1.1 -->
+<!-- VERSION v2.1.3 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -123,6 +123,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="OlBody">
       <optional>
@@ -140,6 +144,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="OlAttributes">
       <a:documentation>NOTE: `start` attribute is not included by default, because of problems it raises with DOC output</a:documentation>
@@ -188,6 +196,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="dt">
       <element name="dt">
@@ -443,14 +455,7 @@ normative or informative references, some split references into sections organiz
           </ref>
         </zeroOrMore>
         <zeroOrMore>
-          <ref name="doc_bibitem">
-            <a:documentation>Bibliographic item cited in the document</a:documentation>
-          </ref>
-          <zeroOrMore>
-            <ref name="note">
-              <a:documentation>Annotation of the bibliographic item</a:documentation>
-            </ref>
-          </zeroOrMore>
+          <ref name="ReferenceEntry"/>
         </zeroOrMore>
         <zeroOrMore>
           <ref name="references">
@@ -592,18 +597,21 @@ gives an explicit page orientation</a:documentation>
         </element>
       </optional>
     </define>
-  </include>
-  <!-- end overrides -->
-  <define name="FnAttributes" combine="interleave">
-    <ref name="RequiredId"/>
-    <optional>
-      <attribute name="hiddenref">
-        <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
+    <define name="FnAttributes">
+      <ref name="RequiredId"/>
+      <optional>
+        <attribute name="hiddenref">
+          <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
 This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
-        <data type="boolean"/>
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <attribute name="reference">
+        <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
       </attribute>
-    </optional>
-  </define>
+    </define>
+  </include>
+  <!-- end overrides -->
   <define name="TdAttributes" combine="interleave">
     <ref name="RequiredId"/>
     <optional>
@@ -841,6 +849,17 @@ titlecase, or lowercase</a:documentation>
       <value>informative</value>
     </choice>
   </define>
+  <define name="ReferenceEntry">
+    <a:documentation>Entry in bibliography</a:documentation>
+    <ref name="doc_bibitem">
+      <a:documentation>Bibliographic item cited in the document</a:documentation>
+    </ref>
+    <zeroOrMore>
+      <ref name="note">
+        <a:documentation>Annotation of the bibliographic item</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="doc_bibitem">
     <a:documentation>Standardisation document representation of bibliographic entry</a:documentation>
     <element name="bibitem">
@@ -871,6 +890,12 @@ titlecase, or lowercase</a:documentation>
       </oneOrMore>
     </element>
   </define>
+  <define name="ParagraphFnBody" combine="interleave">
+    <ref name="BlockSource">
+      <a:documentation>Bibliographic source for the information in the paragraph
+parargaph sources are currently only rendered in metanorma-plateau</a:documentation>
+    </ref>
+  </define>
   <define name="BasicBlock" combine="choice">
     <ref name="columnbreak"/>
   </define>

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "0.6.3".freeze
+    VERSION = "0.6.5".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-18 00:00:00.000000000 Z
+date: 2025-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar