metanorma-iho 0.7.7 → 0.7.9

data/lib/isodoc/iho/presentation_xml_convert.rb

@@ -14,10 +14,24 @@ module IsoDoc
         "[#{ordinal}]<tab/>"
       end
 
-      def biblio_ref_entry_code(ordinal, _idents, _ids, _standard, _datefn, _bib)
+      def biblio_ref_entry_code(ordinal, _idents, _ids, _standard, _datefn,
+_bib)
         "[#{ordinal}]<tab/>"
       end
 
+      def preface_rearrange(doc)
+        preface_move(doc.at(ns("//preface/abstract")),
+                     %w(foreword executivesummary introduction clause acknowledgements), doc)
+        preface_move(doc.at(ns("//preface/foreword")),
+                     %w(executivesummary introduction clause acknowledgements), doc)
+        preface_move(doc.at(ns("//preface/executivesummary")),
+                     %w(introduction clause acknowledgements), doc)
+        preface_move(doc.at(ns("//preface/introduction")),
+                     %w(clause acknowledgements), doc)
+        preface_move(doc.at(ns("//preface/acknowledgements")),
+                     %w(), doc)
+      end
+
       include Init
     end
   end

data/lib/isodoc/iho/word_convert.rb

@@ -12,32 +12,32 @@ module IsoDoc
       end
 
       def make_body1(body, _docxml)
-        body.div **{ class: "WordSection1" } do |div1|
-          div1.p **{style: "font-size:0pt;" } do
-            |p| p << "&nbsp;" 
+        body.div class: "WordSection1" do |div1|
+          div1.p style: "font-size:0pt;" do |p|
+            p << "&nbsp;"
           end # placeholder
         end
         section_break(body)
       end
 
-      def make_body2(body, docxml)
-        body.div **{ class: "WordSection2" } do |div2|
-          boilerplate docxml, div2
-          preface_block docxml, div2
-          abstract docxml, div2
-          foreword docxml, div2
-          introduction docxml, div2
-          preface docxml, div2
-          acknowledgements docxml, div2
-          div2.p { |p| p << "&nbsp;" } # placeholder
-        end
-        section_break(body)
-      end
+      #       def make_body2(body, docxml)
+      #         body.div **{ class: "WordSection2" } do |div2|
+      #           boilerplate docxml, div2
+      #           preface_block docxml, div2
+      #           abstract docxml, div2
+      #           foreword docxml, div2
+      #           introduction docxml, div2
+      #           preface docxml, div2
+      #           acknowledgements docxml, div2
+      #           div2.p { |p| p << "&nbsp;" } # placeholder
+      #         end
+      #         section_break(body)
+      #       end
 
       def authority_cleanup(docxml)
         super
         docxml.xpath("//div[@class = 'boilerplate-feedback']/p").each do |p|
-          p["style"] = 'font-size:8pt;font-family:Arial;text-align:right'
+          p["style"] = "font-size:8pt;font-family:Arial;text-align:right"
         end
       end
 

data/lib/metanorma/iho/iho.rng

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="https://www.metanorma.org/ns/iho" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar ns='https://www.metanorma.org/ns/iho' xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!--
+    VERSION v1.2.1
     Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
     we cannot have a new default namespace: we will end up with a grammar with two different
     namespaces, one for isostandard and one for csand additions. And we do not want that.
@@ -63,13 +64,7 @@
   </define>
   <define name="iho-standard">
     <element name="iho-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/iho/isodoc.rng

@@ -17,6 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
+<!-- VERSION v1.2.1 -->
 <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">
@@ -382,6 +383,9 @@
         <optional>
           <ref name="dl"/>
         </optional>
+        <optional>
+          <ref name="source"/>
+        </optional>
       </element>
     </define>
     <define name="figure">
@@ -404,9 +408,6 @@
           <attribute name="class"/>
         </optional>
         <ref name="BlockAttributes"/>
-        <optional>
-          <ref name="source"/>
-        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -431,6 +432,20 @@
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
+        <optional>
+          <ref name="source"/>
+        </optional>
+      </element>
+    </define>
+    <define name="source">
+      <element name="source">
+        <attribute name="status">
+          <ref name="SourceStatusType"/>
+        </attribute>
+        <ref name="origin"/>
+        <optional>
+          <ref name="modification"/>
+        </optional>
       </element>
     </define>
     <define name="sourcecode">
@@ -1335,15 +1350,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"/>
@@ -2099,10 +2118,7 @@
   <define name="termsource">
     <element name="termsource">
       <attribute name="status">
-        <choice>
-          <value>identical</value>
-          <value>modified</value>
-        </choice>
+        <ref name="SourceStatusType"/>
       </attribute>
       <attribute name="type">
         <choice>
@@ -2116,6 +2132,17 @@
       </optional>
     </element>
   </define>
+  <define name="SourceStatusType">
+    <choice>
+      <value>identical</value>
+      <value>modified</value>
+      <value>restyled</value>
+      <value>context-added</value>
+      <value>generalisation</value>
+      <value>specialisation</value>
+      <value>unspecified</value>
+    </choice>
+  </define>
   <define name="origin">
     <element name="origin">
       <choice>

data/lib/metanorma/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IHO
-    VERSION = "0.7.7".freeze
+    VERSION = "0.7.9".freeze
   end
 end

data/metanorma-iho.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.4.0"
+  spec.add_dependency "metanorma-generic", "~> 2.4.1"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iho
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement