metanorma-jis 0.0.5 → 0.0.6

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/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"/>
@@ -2136,6 +2139,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.6".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.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso