metanorma-jis 0.6.3 → 0.6.4

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
@@ -145,7 +146,8 @@ module IsoDoc
       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"))
+          docxml.xpath(ns("//figure/name//fn")) -
+          docxml.xpath(ns("//figure/fmt-name//fn"))
         table_fns + fig_fns
       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
@@ -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.2 -->
 
   <!--
     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">
@@ -871,6 +883,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.4".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.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-18 00:00:00.000000000 Z
+date: 2025-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar