metanorma-jis 0.0.5 → 0.0.7

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -33,6 +33,12 @@ module IsoDoc
         ret
       end
 
+      def ol_depth(node)
+        depth = node.ancestors("ol").size + 1
+        depth == 1 and return :alphabetic
+        :arabic
+      end
+
       def admits(elem)
         elem.children.first.previous = @i18n.l10n("#{@i18n.admitted}: ")
       end

data/lib/isodoc/jis/word_convert.rb

@@ -172,6 +172,7 @@ module IsoDoc
 
       def commentary(isoxml, out)
         isoxml.xpath(ns("//annex[@commentary = 'true']")).each do |c|
+          out.span style: "mso-bookmark:PRECOMMENTARYPAGEREF"
           section_break(out)
           out.div class: "WordSectionCommentary" do |div|
             commentary_title(isoxml, div)

data/lib/isodoc/jis/xref.rb

@@ -1,6 +1,19 @@
 module IsoDoc
   module JIS
     class Counter < IsoDoc::XrefGen::Counter
+      def ol_type(list, depth)
+        return list["type"].to_sym if list["type"]
+        return :alphabet if depth == 1
+
+        :arabic
+      end
+
+      def listlabel(_list, depth)
+        case depth
+        when 1 then (96 + @num).chr.to_s
+        else @num.to_s
+        end
+      end
     end
 
     class Xref < IsoDoc::Iso::Xref
@@ -53,6 +66,35 @@ module IsoDoc
             title: clause_title(clause), level: level, type: "clause",
             elem: @labels["clause"] }
       end
+
+      def list_item_anchor_names(list, list_anchor, depth, prev_label,
+refer_list)
+        c = Counter.new(list["start"] ? list["start"].to_i - 1 : 0)
+        list.xpath(ns("./li")).each do |li|
+          bare_label, label = list_item_value(li, c, depth,
+                                              { list_anchor: list_anchor, prev_label: prev_label, refer_list: refer_list })
+          li["id"] and @anchors[li["id"]] =
+                         { label: bare_label, bare_xref: "#{bare_label})",
+                           xref: "#{label})", type: "listitem", refer_list:
+                                        refer_list, container: list_anchor[:container] }
+          (li.xpath(ns(".//ol")) - li.xpath(ns(".//ol//ol"))).each do |ol|
+            list_item_anchor_names(ol, list_anchor, depth + 1, label, false)
+          end
+        end
+      end
+
+      def list_item_value(entry, counter, depth, opts)
+        label1 = counter.increment(entry).listlabel(entry.parent, depth)
+        if depth > 2
+          base = opts[:prev_label].match(/^(.*?)([0-9.]+)$/) # a) 1.1.1
+          label1 = "#{base[2]}.#{label1}"
+          [label1, list_item_anchor_label(label1, opts[:list_anchor],
+                                          base[1].sub(/[^a-z0-9]*$/, ""), opts[:refer_list])]
+        else
+          [label1, list_item_anchor_label(label1, opts[:list_anchor], opts[:prev_label],
+                                          opts[:refer_list])]
+        end
+      end
     end
   end
 end

data/lib/metanorma/jis/cleanup.rb

@@ -38,6 +38,29 @@ module Metanorma
       end
 
       def docidentifier_cleanup(xmldoc); end
+
+      def note_cleanup(xmldoc)
+        note_example_to_table(xmldoc)
+        super
+        clean_example_keep_separate(xmldoc)
+      end
+
+      def note_example_to_table(xmldoc)
+        xmldoc.xpath("//table").each do |t|
+          t.xpath("./following-sibling::*").each do |n|
+            %w(note example).include?(n.name) or break
+            n["keep-separate"] == "true" and break
+            n.parent = t
+          end
+        end
+      end
+
+      def clean_example_keep_separate(xmldoc)
+        xmldoc.xpath("//example[@keep-separate] | " \
+                     "//termexample[@keep-separate]").each do |n|
+          n.delete("keep-separate")
+        end
+      end
     end
   end
 end

data/lib/metanorma/jis/converter.rb

@@ -39,6 +39,11 @@ module Metanorma
         ret
       end
 
+      def example_attrs(node)
+        attr_code(id_unnum_attrs(node).merge(keep_attrs(node))
+          .merge("keep-separate": node.attr("keep-separate")))
+      end
+
       def html_converter(node)
         if node.nil?
           IsoDoc::JIS::HtmlConvert.new({})

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.1 -->
+<!-- VERSION v1.2.2 -->
 <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">
@@ -211,6 +211,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <ref name="CitationType"/>
       <oneOrMore>
         <ref name="PureTextElement"/>
@@ -1009,6 +1012,7 @@
       <ref name="del"/>
       <ref name="span"/>
       <ref name="erefstack"/>
+      <ref name="date_inline"/>
     </choice>
   </define>
   <define name="add">
@@ -1050,6 +1054,23 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="date_inline">
+    <element name="date">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="format"/>
+      </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>
@@ -2136,6 +2157,7 @@
     <choice>
       <value>identical</value>
       <value>modified</value>
+      <value>adapted</value>
       <value>restyled</value>
       <value>context-added</value>
       <value>generalisation</value>

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.0.5".freeze
+    VERSION = "0.0.7".freeze
   end
 end
 

data/metanorma-jis.gemspec

@@ -31,6 +31,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "metanorma-iso", "~> 2.4.2"
+  #spec.add_dependency "relaton-bipm", "~> 1.14.8"
+  #spec.add_dependency "relaton-iho", "~> 1.14.3"
   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.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso