metanorma-jis 0.5.1 → 0.5.2

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -42,12 +42,12 @@ module IsoDoc
       end
 
       def admits(elem)
-        #elem.children.first.previous = @i18n.l10n("#{@i18n.admitted}: ")
         elem.xpath(ns(".//semx[@element = 'admitted']")).each do |t|
-        t.previous = @i18n.l10n("#{@i18n.admitted}: ")
-      end
+          t.previous = @i18n.l10n("#{@i18n.admitted}: ")
+        end
       end
 
+      # TODO: move the table/figure key processing to Word, not Presentation XML
       def dl(docxml)
         super
         docxml.xpath(ns("//table//dl | //figure//dl")).each do |l|
@@ -130,30 +130,18 @@ module IsoDoc
         "<tr><td border='0' colspan='#{cols}'>#{elem}</td></tr>"
       end
 
-      # KILL
+      # TODO preserve original Semantic XML source
       def tablesource(elem)
+        ret = [semx_fmt_dup(elem)]
         while elem&.next_element&.name == "source"
-          elem << "; #{to_xml(elem.next_element.remove.children)}"
+          ret << semx_fmt_dup(elem.next_element.remove)
         end
-        elem.children = l10n("#{@i18n.source}: #{to_xml(elem.children).strip}")
-      end
-
-      # TODO preserve original Semantic XML source
-      def tablesource(elem)
-      ret = [semx_fmt_dup(elem)]
-      while elem&.next_element&.name == "source"
-        ret << semx_fmt_dup(elem.next_element.remove)
+        s = ret.map { |x| to_xml(x) }.map(&:strip).join("; ")
+        tablesource_label(elem, s)
       end
-      s = ret.map { |x| to_xml(x) }.map(&:strip).join("; ")
-      tablesource_label(elem, s)
-    end
-
-    def tablesource_label(elem, sources)
-      elem.children = l10n("#{@i18n.source}: #{sources}")
-    end
 
-      def table_fn1(_table, fnote, _idx)
-        fnote["reference"] += ")"
+      def tablesource_label(elem, sources)
+        elem.children = l10n("#{@i18n.source}: #{sources}")
       end
 
       def bibdata_i18n(bibdata)
@@ -204,10 +192,15 @@ module IsoDoc
       end
 
       def figure_fn(elem)
-        (elem.xpath(ns(".//fn")) - elem.xpath(ns("./name//fn")))
-          .each do |f|
-            table_fn1(elem, f, nil)
-          end
+        fnotes = elem.xpath(ns(".//fn")) - elem.xpath(ns("./name//fn"))
+        ret = footnote_collect(fnotes)
+        f = footnote_container(fnotes, ret) and elem << f
+      end
+
+      def table_fn(elem)
+        fnotes = elem.xpath(ns(".//fn"))
+        ret = footnote_collect(fnotes)
+        f = footnote_container(fnotes, ret) and elem << f
       end
 
       def omit_docid_prefix(prefix)
@@ -215,6 +208,36 @@ module IsoDoc
         super || %w(JIS).include?(prefix)
       end
 
+      def fn_ref_label(fnote)
+        if fnote.ancestors("table, figure").empty? ||
+            !fnote.ancestors("figure").empty? &&
+                !fnote.ancestors("name, fmt-name").empty?
+          "<sup>#{fn_label(fnote)}</sup>"
+        else
+          "<sup>#{fn_label(fnote)}" \
+            "<span class='fmt-label-delim'>)</span></sup>"
+        end
+      end
+
+      def fn_body_label(fnote)
+        if fnote.ancestors("table, figure").empty? ||
+            !fnote.ancestors("figure").empty? &&
+                !fnote.ancestors("name, fmt-name").empty?
+          "<sup>#{fn_label(fnote)}</sup>"
+        else
+          spc = %w(zh ja ko).include?(@lang) ? "" : " "
+          "#{@i18n.table_footnote}#{spc}<sup>#{fn_label(fnote)}" \
+            "<span class='fmt-label-delim'>)</span></sup>"
+        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
+      end
+
       include Init
     end
   end

data/lib/isodoc/jis/table.rb

@@ -1,7 +1,8 @@
 module IsoDoc
   module Jis
     class WordConvert < IsoDoc::Iso::WordConvert
-      def make_table_footnote_target(out, fnid, fnref)
+      # KILL
+      def make_table_footnote_targetx(out, fnid, fnref)
         attrs = { id: fnid, class: "TableFootnoteRef" }
         out.span do |s|
           s << @i18n.table_footnote

data/lib/isodoc/jis/word_convert.rb

@@ -109,11 +109,10 @@ module IsoDoc
         end
       end
 
-      def footnote_parse(node, out)
+      # KILL
+      def footnote_parsex(node, out)
         return table_footnote_parse(node, out) if @in_table || @in_figure # &&
 
-        # !node.ancestors.map(&:name).include?("name")
-
         fn = node["reference"] || UUIDTools::UUID.random_create.to_s
         return seen_footnote_parse(node, out, fn) if @seen_footnote.include?(fn)
 

data/lib/metanorma/jis/basicdoc.rng

@@ -599,17 +599,9 @@ It is included for convenience, in case processing the citation to extract the a
         <a:documentation>The caption of the block</a:documentation>
       </ref>
     </optional>
-    <oneOrMore>
-      <choice>
-        <text>
-          <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
-(The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
-        </text>
-        <ref name="callout">
-          <a:documentation>Zero or more cross-references; these are intended to be embedded within the content string, and link to annotations</a:documentation>
-        </ref>
-      </choice>
-    </oneOrMore>
+    <ref name="sourcecodebody">
+      <a:documentation>The sourcecode content</a:documentation>
+    </ref>
     <zeroOrMore>
       <ref name="annotation">
         <a:documentation>Annotations to the source code; each annotation consists of zero or more paragraphs,
@@ -628,17 +620,9 @@ and is intended to be referenced by a callout within the source code</a:document
         <a:documentation>The caption of the block</a:documentation>
       </ref>
     </optional>
-    <oneOrMore>
-      <choice>
-        <text>
-          <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
-(The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
-        </text>
-        <ref name="callout">
-          <a:documentation>Zero or more cross-references; these are intended to be embedded within the content string, and link to annotations</a:documentation>
-        </ref>
-      </choice>
-    </oneOrMore>
+    <ref name="sourcecodebody">
+      <a:documentation>The sourcecode content</a:documentation>
+    </ref>
     <zeroOrMore>
       <ref name="annotation">
         <a:documentation>Annotations to the source code; each annotation consists of zero or more paragraphs,
@@ -651,6 +635,20 @@ and is intended to be referenced by a callout within the source code</a:document
       </ref>
     </zeroOrMore>
   </define>
+  <define name="sourcecodebody">
+    <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
+(The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
+    <element name="body">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="callout">
+            <a:documentation>Zero or more cross-references; these are intended to be embedded within the content string, and link to annotations</a:documentation>
+          </ref>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="pre">
     <a:documentation>Pre-formatted block. Wrapper for text to be rendered with fixed-width typeface, and preserving spaces including line breaks. 
 They are intended for a restricted number of functions, most typically ASCII Art (which is still in prominent use in some 
@@ -1672,18 +1670,25 @@ which can be bookmarks as well as block or section references</a:documentation>
     </optional>
   </define>
   <define name="XrefBody">
-    <oneOrMore>
-      <ref name="PureTextElement">
-        <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
-      </ref>
-    </oneOrMore>
+    <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
+    <optional>
+      <element name="display-text">
+        <oneOrMore>
+          <ref name="PureTextElement"/>
+        </oneOrMore>
+      </element>
+    </optional>
   </define>
   <define name="ErefBody">
-    <oneOrMore>
-      <ref name="PureTextElement">
-        <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
-      </ref>
-    </oneOrMore>
+    <optional>
+      <element name="display-text">
+        <oneOrMore>
+          <ref name="PureTextElement">
+            <a:documentation>The textual content of the element. The `text` is what we wish to show the link as (e.g., the "content" of `&lt;xx&gt;my link text&lt;/xx&gt;`)</a:documentation>
+          </ref>
+        </oneOrMore>
+      </element>
+    </optional>
   </define>
   <define name="fn">
     <a:documentation>Inline reference to a paragraph or paragraphs, appearing as a footnote.

data/lib/metanorma/jis/isodoc.rng

@@ -33,6 +33,15 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="fn" combine="interleave">
+      <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"/>
+        </attribute>
+      </optional>
+    </define>
     <define name="index-primary">
       <element name="primary">
         <oneOrMore>
@@ -245,23 +254,9 @@
           <a:documentation>The caption of the block</a:documentation>
         </ref>
       </optional>
-      <oneOrMore>
-        <choice>
-          <text>
-            <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
-(The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
-          </text>
-          <ref name="callout">
-            <a:documentation>Zero or more cross-references; these are intended to be embedded within the content string, and link to annotations</a:documentation>
-          </ref>
-          <ref name="xref">
-            <a:documentation>Hyperlink of code segment to another part of the document</a:documentation>
-          </ref>
-          <ref name="eref">
-            <a:documentation>Hyperlink of code segment to external bibliographic resource</a:documentation>
-          </ref>
-        </choice>
-      </oneOrMore>
+      <ref name="sourcecodebody">
+        <a:documentation>The sourcecode content</a:documentation>
+      </ref>
       <zeroOrMore>
         <ref name="annotation">
           <a:documentation>Annotations to the source code; each annotation consists of zero or more paragraphs,
@@ -277,6 +272,26 @@ and is intended to be referenced by a callout within the source code</a:document
         <a:documentation>A source for the block</a:documentation>
       </ref>
     </define>
+    <define name="sourcecodebody">
+      <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
+(The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
+      <element name="body">
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="callout">
+              <a:documentation>Zero or more cross-references; these are intended to be embedded within the content string, and link to annotations</a:documentation>
+            </ref>
+            <ref name="xref">
+              <a:documentation>Hyperlink of code segment to another part of the document</a:documentation>
+            </ref>
+            <ref name="eref">
+              <a:documentation>Hyperlink of code segment to external bibliographic resource</a:documentation>
+            </ref>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="sections">
       <element name="sections">
         <oneOrMore>

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "0.5.1".freeze
+    VERSION = "0.5.2".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-04 00:00:00.000000000 Z
+date: 2025-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar