metanorma-iho 1.1.4 → 1.1.5

data/lib/isodoc/iho/presentation_xml_convert.rb

@@ -17,19 +17,6 @@ _bib)
 
       def middle_title(docxml); end
 
-      def preface_rearrange(doc)
-        preface_move(doc.xpath(ns("//preface/abstract")),
-                     %w(foreword executivesummary introduction clause acknowledgements), doc)
-        preface_move(doc.xpath(ns("//preface/foreword")),
-                     %w(executivesummary introduction clause acknowledgements), doc)
-        preface_move(doc.xpath(ns("//preface/executivesummary")),
-                     %w(introduction clause acknowledgements), doc)
-        preface_move(doc.xpath(ns("//preface/introduction")),
-                     %w(clause acknowledgements), doc)
-        preface_move(doc.xpath(ns("//preface/acknowledgements")),
-                     %w(), doc)
-      end
-
       def bibdata(docxml)
         super
         dochistory(docxml)
@@ -86,18 +73,19 @@ _bib)
       end
 
       def dochistory_contributor(contrib)
-        ret = contrib.at("./organization/abbreviation") ||
-          contrib.at("./organization/subdivision") ||
-          contrib.at("./organization/name") ||
-          contrib.at("./person/name/abbreviation") ||
-          contrib.at("./person/name/completename")
+        ret = contrib.at(ns("./organization/abbreviation")) ||
+          contrib.at(ns("./organization/subdivision")) ||
+          contrib.at(ns("./organization/name")) ||
+          contrib.at(ns("./person/name/abbreviation")) ||
+          contrib.at(ns("./person/name/completename"))
         ret and return ret.text
         format_personalname(contrib)
       end
 
       def format_personalname(contrib)
         Relaton::Render::General.new(template: { book: "{{ creatornames }}" })
-          .render("<bibitem type='book'>#{contrib.to_xml}</bibitem>")
+          .render("<bibitem type='book'>#{contrib.to_xml}</bibitem>",
+                  embedded: true)
       end
 
       def dochistory_description(item)
@@ -154,13 +142,6 @@ _bib)
         ""
       end
 
-      def clause(docxml)
-        super
-        docxml.xpath(ns("//executivesummary | //appendix")).each do |x|
-          clause1(x)
-        end
-      end
-
       def ul_label_list(_elem)
         %w(&#x2022; &#x2014; &#x6f;)
       end

data/lib/isodoc/iho/xref.rb

@@ -126,7 +126,6 @@ module IsoDoc
         lbl = clause_number_semx(parentnum, clause, num)
         @anchors[clause["id"]] =
           { label: lbl, level: level,
-            #xref: l10n("#{@labels['subclause']} #{num}"),
             xref: labelled_autonum(@labels['subclause'], lbl),
             type: "clause", elem: @labels["subclause"] }
         i = Counter.new(0)

data/lib/metanorma/iho/converter.rb

@@ -9,19 +9,8 @@ module Metanorma
 
       register_for "iho"
 
-      def clause_parse(attrs, xml, node)
-        node.option? "appendix" and
-          return appendix_parse(attrs, xml, node)
-        super
-      end
-
-      def appendix_parse(attrs, xml, node)
-        attrs[:"inline-header"] = node.option? "inline-header"
-        set_obligation(attrs, node)
-        xml.appendix **attr_code(attrs) do |xml_section|
-          xml_section.title { |name| name << node.title }
-          xml_section << node.content
-        end
+      def support_appendix?(_node)
+        true
       end
 
       SERIESNAME = {

data/lib/metanorma/iho/iho.rng

@@ -27,9 +27,4 @@
       </element>
     </define>
   </include>
-  <define name="annex-appendix">
-    <element name="appendix">
-      <ref name="Clause-Section"/>
-    </element>
-  </define>
 </grammar>

data/lib/metanorma/iho/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.3 -->
+<!-- VERSION v2.0.4 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -1328,6 +1328,7 @@ numbers</a:documentation>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
+          <ref name="executivesummary"/>
         </choice>
       </oneOrMore>
     </element>
@@ -1351,6 +1352,11 @@ numbers</a:documentation>
       <ref name="Content-Section"/>
     </element>
   </define>
+  <define name="executivesummary">
+    <element name="executivesummary">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
   <define name="indexsect">
     <element name="indexsect">
       <ref name="Content-Section"/>
@@ -1576,6 +1582,15 @@ used in document amendments</a:documentation>
   <define name="annex">
     <element name="annex">
       <ref name="Annex-Section"/>
+      <zeroOrMore>
+        <ref name="annex-appendix"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="annex-appendix">
+    <a:documentation>Appendix, distinct subclause type for annexes (annex to annex, rather than subclause to annex)</a:documentation>
+    <element name="appendix">
+      <ref name="Clause-Section"/>
     </element>
   </define>
   <define name="terms">

data/lib/metanorma/iho/relaton-iho.rng

@@ -11,6 +11,9 @@
         <value>directives</value>
         <value>proposal</value>
         <value>standard</value>
+        <value>specification</value>
+        <value>resolution</value>
+        <value>regulation</value>
       </choice>
     </define>
     <define name="editorialgroup">

data/lib/metanorma/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iho
-    VERSION = "1.1.4".freeze
+    VERSION = "1.1.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iho
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-14 00:00:00.000000000 Z
+date: 2025-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic