metanorma-jis 0.0.4 → 0.0.6

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -154,6 +154,7 @@ module IsoDoc
       def display_order(docxml)
         i = 0
         i = display_order_xpath(docxml, "//preface/*", i)
+        i = display_order_at(docxml, "//sections/introduction", i)
         i = display_order_at(docxml, "//clause[@type = 'scope']", i)
         i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
         i = display_order_at(docxml, "//sections/terms | " \
@@ -174,6 +175,27 @@ module IsoDoc
         elem.children = l10n("#{@i18n.source}: #{to_xml(elem.children).strip}")
       end
 
+      def toc_title_insert_pt(docxml)
+        ins = docxml.at(ns("//preface")) ||
+          docxml.at(ns("//sections | //annex | //bibliography"))
+            &.before("<preface> </preface>")
+            &.previous_element or return nil
+        ins.children.last.after(" ").next
+      end
+
+      def preface_rearrange(doc)
+        move_introduction(doc)
+        super
+      end
+
+      def move_introduction(doc)
+        source = doc.at(ns("//preface/introduction")) or return
+        dest = doc.at(ns("//sections")) ||
+          doc.at(ns("//preface")).after("<sections> </sections>").next_element
+        dest.children.empty? and dest.children = " "
+        dest.children.first.next = source
+      end
+
       include Init
     end
   end

data/lib/isodoc/jis/word_convert.rb

@@ -99,24 +99,16 @@ module IsoDoc
         end
       end
 
-      def preface(isoxml, out)
-        isoxml.xpath(ns("//preface/clause | //preface/references | " \
-                        "//preface/definitions | //preface/terms")).each do |f|
-          out.div **attr_code(class: "Section3", id: f["id"],
-                              type: f["type"]) do |div|
-            clause_name(f, f&.at(ns("./title")), div, { class: "IntroTitle" })
-            f.elements.each do |e|
-              parse(e, div) unless e.name == "title"
-            end
-          end
-        end
+      def preface_attrs(node)
+        { id: node["id"], type: node["type"],
+          class: node["type"] == "toc" ? "TOC" : "Section3" }
       end
 
-      def introduction(isoxml, out)
-        f = isoxml.at(ns("//introduction")) || return
-        out.div class: "Section3", id: f["id"] do |div|
-          clause_name(f, f.at(ns("./title")), div, { class: "IntroTitle" })
-          f.elements.each do |e|
+      def introduction(clause, out)
+        out.div class: "Section3", id: clause["id"] do |div|
+          clause_name(clause, clause.at(ns("./title")), div,
+                      { class: "IntroTitle" })
+          clause.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
         end
@@ -125,11 +117,7 @@ module IsoDoc
       def make_body2(body, docxml)
         body.div class: "WordSection2" do |div2|
           boilerplate docxml, div2
-          preface_block docxml, div2
-          abstract docxml, div2
-          foreword docxml, div2
-          preface docxml, div2
-          acknowledgements docxml, div2
+          front docxml, div2
           div2.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
@@ -138,7 +126,8 @@ module IsoDoc
       def middle(isoxml, out)
         middle_title(isoxml, out)
         middle_admonitions(isoxml, out)
-        introduction isoxml, out
+        i = isoxml.at(ns("//sections/introduction")) and
+          introduction i, out
         scope isoxml, out, 0
         norm_ref isoxml, out, 0
         clause_etc isoxml, out, 0
@@ -183,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,6 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
+<!-- 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">
@@ -210,6 +211,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <ref name="CitationType"/>
       <oneOrMore>
         <ref name="PureTextElement"/>
@@ -1349,15 +1353,19 @@
       </choice>
     </element>
   </define>
+  <define name="Root-Attributes">
+    <attribute name="version"/>
+    <attribute name="schema-version"/>
+    <attribute name="type">
+      <choice>
+        <value>semantic</value>
+        <value>presentation</value>
+      </choice>
+    </attribute>
+  </define>
   <define name="standard-document">
     <element name="standard-document">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <optional>
         <ref name="misccontainer"/>
@@ -2131,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/isostandard.rng

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
+  <!--
+    VERSION v1.2.1
+    default namespace isostandard = "https://www.metanorma.com/ns/iso"
+  -->
   <include href="isodoc.rng">
     <start>
       <ref name="iso-standard"/>
@@ -240,13 +243,7 @@
   -->
   <define name="iso-standard">
     <element name="iso-standard">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/metanorma/jis/jis.rng

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="https://www.metanorma.org/ns/jis" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <!-- default namespace = "https://www.metanorma.com/ns/jis" -->
+<grammar ns='https://www.metanorma.org/ns/jis' xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <!--
+    VERSION v1.2.1
+    default namespace = "https://www.metanorma.com/ns/jis"
+  -->
   <include href="relaton-jis.rng"/>
   <include href="isostandard.rng">
     <start>
@@ -37,13 +40,7 @@
   -->
   <define name="jis-standard">
     <element name="jis-standard">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.0.4".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.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso