metanorma-jis 0.5.7 → 0.5.9

data/lib/isodoc/jis/presentation_list.rb

@@ -2,24 +2,19 @@ module IsoDoc
   module Jis
     class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
       def ol_depth(node)
-        depth == 1 and return :alphabet
-        :arabic
+        depth = node.ancestors("ol").size + 1
+        @counter.ol_type(node, depth) # defined in Xref::Counter
       end
 
-         def ol_depth(node)
-      depth = node.ancestors("ol").size + 1
-      @counter.ol_type(node, depth) # defined in Xref::Counter
-    end
-
-         def ul_label_list(_elem)
-      %w(&#xFF0D; &#x30FB;)
-    end
+      def ul_label_list(_elem)
+        %w(&#xFF0D; &#x30FB;)
+      end
 
-    def ul_label_value(elem)
-      depth = elem.ancestors("ul").size
-      val = ul_label_list(elem)
-      val[(depth - 1) % val.size]
-    end
+      def ul_label_value(elem)
+        depth = elem.ancestors("ul").size
+        val = ul_label_list(elem)
+        val[(depth - 1) % val.size]
+      end
 
       # TODO: move the table/figure key processing to Word, not Presentation XML
       def dl(docxml)

data/lib/isodoc/jis/presentation_section.rb

@@ -82,10 +82,10 @@ module IsoDoc
         s, t, y, d = participant_table_prep(clause)
         s or return nil
         out1 = <<~OUTPUT
-          <clause id='_#{UUIDTools::UUID.random_create}' type="participants"><title>#{t}</title>
-          <table unnumbered='true'>
+          <clause #{add_id_text} type="participants"><title>#{t}</title>
+          <table #{add_id_text} unnumbered='true'>
           <thead>
-          <tr><th/><th>#{@i18n.full_name}</th><th>#{@i18n.affiliation}</th></tr>
+          <tr #{add_id_text}><th #{add_id_text}/><th #{add_id_text}>#{@i18n.full_name}</th><th #{add_id_text}>#{@i18n.affiliation}</th></tr>
           </thead>
           <tbody>
         OUTPUT
@@ -110,11 +110,12 @@ module IsoDoc
           r = y["role"] ? @i18n.l10n("(#{y['role']})") : ""
           n = y["name"]
           if n.is_a?(Hash)
-            n =
-              if @lang == "ja" then "#{n['surname']} #{n['givenname']}"
-              else "#{n['givenname']} #{n['surname']}" end
+            n = if @lang == "ja" then "#{n['surname']} #{n['givenname']}"
+                else "#{n['givenname']} #{n['surname']}" end
           end
-          "<tr><td>#{r}</rd><td>#{n}</td><td>#{y['affiliation']}</td></tr>"
+          <<~XML
+            <tr #{add_id_text}><td #{add_id_text}>#{r}</td><td #{add_id_text}>#{n}</td><td #{add_id_text}>#{y['affiliation']}</td></tr>
+          XML
         end.join("\n")
       end
 

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -75,29 +75,15 @@ module IsoDoc
       end
 
       def full_row(cols, elem)
-        "<tr><td border='0' colspan='#{cols}'>#{elem}</td></tr>"
-      end
-
-      # KILL
-      def tablesourcex(elem)
-        ret = [semx_fmt_dup(elem)]
-        n = elem
-        while n = n&.next_element
-          case n.name
-          when "source"
-          when "fmt-source"
-            ret << to_xml(n.remove.children)
-          else break
-          end
-        end
-        s = ret.map(&:strip).join("; ")
-        tablesource_label(elem, s)
+        <<~XML
+          <tr #{add_id_text}><td #{add_id_text} border='0' colspan='#{cols}'>#{elem}</td></tr>
+        XML
       end
 
       def source1_label(elem, sources, ancestor)
         case ancestor
         when :table
-        elem.children = l10n("#{@i18n.source}: #{sources}")
+          elem.children = l10n("#{@i18n.source}: #{sources}")
         else super
         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.0.6 -->
+<!-- VERSION v2.0.7 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -76,6 +76,7 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <a:documentation>Title(s) of a clause</a:documentation>
       <element name="title">
         <a:documentation>Title proper for a clause</a:documentation>
+        <ref name="RequiredId"/>
         <zeroOrMore>
           <ref name="TextElement"/>
         </zeroOrMore>
@@ -83,10 +84,19 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <zeroOrMore>
         <element name="variant-title">
           <a:documentation>Alternate title for a clause</a:documentation>
+          <ref name="RequiredId"/>
           <ref name="TypedTitleString"/>
         </element>
       </zeroOrMore>
     </define>
+    <define name="tname">
+      <element name="name">
+        <ref name="RequiredId"/>
+        <oneOrMore>
+          <ref name="NestedTextElement"/>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="UlBody">
       <optional>
         <ref name="tname">
@@ -475,6 +485,7 @@ normative or informative references, some split references into sections organiz
     <!-- exclude figures? -->
     <define name="dd">
       <element name="dd">
+        <ref name="OptionalId"/>
         <zeroOrMore>
           <!-- exclude figures? -->
           <ref name="BasicBlock"/>
@@ -526,6 +537,7 @@ normative or informative references, some split references into sections organiz
       </choice>
     </define>
     <define name="TrAttributes">
+      <ref name="OptionalId"/>
       <optional>
         <attribute name="style">
           <a:documentation>CSS style: only background-color supported</a:documentation>
@@ -595,6 +607,7 @@ gives an explicit page orientation</a:documentation>
   </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.
@@ -604,6 +617,7 @@ This is done if the footnote reference is already presented in some other form,
     </optional>
   </define>
   <define name="TdAttributes" combine="interleave">
+    <ref name="RequiredId"/>
     <optional>
       <attribute name="style">
         <a:documentation>CSS style: only background-color supported</a:documentation>
@@ -1821,7 +1835,7 @@ used in document amendments</a:documentation>
     </element>
   </define>
   <define name="TermAttributes">
-    <ref name="OptionalId"/>
+    <ref name="RequiredId"/>
     <ref name="LocalizedStringAttributes"/>
     <ref name="BlockAttributes"/>
   </define>
@@ -2164,6 +2178,7 @@ used in document amendments</a:documentation>
   <define name="termdefinition">
     <a:documentation>The definition of a term applied in the current document</a:documentation>
     <element name="definition">
+      <ref name="RequiredId"/>
       <optional>
         <attribute name="type">
           <a:documentation>Type of definition, used to differentiate it from other definitions of the same term if present</a:documentation>
@@ -2185,6 +2200,7 @@ used in document amendments</a:documentation>
   </define>
   <define name="verbaldefinition">
     <element name="verbal-definition">
+      <ref name="RequiredId"/>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
@@ -2205,6 +2221,7 @@ used in document amendments</a:documentation>
   <define name="nonverbalrep">
     <a:documentation>Non-verbal representation of the term</a:documentation>
     <element name="non-verbal-representation">
+      <ref name="RequiredId"/>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the non-verbal representation of the term</a:documentation>

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "0.5.7".freeze
+    VERSION = "0.5.9".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-26 00:00:00.000000000 Z
+date: 2025-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar