metanorma-ribose 2.2.7 → 2.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7165b810d75c75ae9265cd7536229c31effbf384eca0d8df7bc3886b3104068d
-  data.tar.gz: 596450c4cbf2a31dd4294950e86a6762d20f59a26a8a289d8a84ee2b703ccf1a
+  metadata.gz: 5310dfaa7747f6ac6d3756261e5d9f776e930b5b324a0800782bbe370ccc3297
+  data.tar.gz: e7079c1ad9ae4c0077d244ab013853b5109f374fdee3447a1896a11e0cb38fb3
 SHA512:
-  metadata.gz: 467db5e091b769e9e0fe6b285e03dd2cdb504420dd2f2f7d5f70bd456131035339d54617bb4e692986af9f56067e3e5c51d40c38523db0c4b79abebd8478d331
-  data.tar.gz: 8dcd95606761269f05d2f4cf7eea3a531374fa389b52e55904b682824a56f4be6b7d4861858d1155dace7d16d6791bb76b19ce729e324077e4c64988c0171361
+  metadata.gz: d659ef6831f2a1508d8e02f7b6bc84a035c88d0ed153cf0a2bb45a97e914d708bfb810e9fc76196ef9dbed479264ec8f9cb1f6ef39b2a6f9fcd4150a9d0d53d6
+  data.tar.gz: 0015f2d55595a86cf9b500a12d51af1a6b2fe186b38c1662167d2daf7cfaa444dc1edb746643e6ac7173e7f3727857d3a6555d83e788a1d4de5cfbfdc4babbe1

data/lib/isodoc/ribose/base_convert.rb

@@ -1,13 +1,12 @@
 module IsoDoc
   module Ribose
     module BaseConvert
-      def executivesummary(docxml, out)
-        f = docxml.at(ns("//executivesummary")) || return
+      def executivesummary(clause, out)
         title_attr = { class: "IntroTitle" }
         page_break(out)
-        out.div class: "Section3", id: f["id"] do |div|
-          clause_name(f, f&.at(ns("./title")), div, title_attr)
-          f.elements.each do |e|
+        out.div class: "Section3", id: clause["id"] do |div|
+          clause_name(clause, clause&.at(ns("./title")), div, title_attr)
+          clause.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
         end

data/lib/isodoc/ribose/html/html_rsd_intro.html

@@ -1,5 +1,4 @@
 <nav>
-  <h1 id="content">Contents</h1>
   <div id="toc"></div>
 
 </nav>

data/lib/isodoc/ribose/html/word_rsd_intro.html

@@ -1,6 +1,3 @@
-<p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">Contents</span></p>
-
-WORDTOC
 
 <div class="zzCopyright">
   <div id="boilerplate-copyright-destination" style='color:windowtext'/>

data/lib/isodoc/ribose/html_convert.rb

@@ -14,15 +14,9 @@ module IsoDoc
       end
 
       def make_body3(body, docxml)
-        body.div **{ class: "main-section" } do |div3|
+        body.div class: "main-section" do |div3|
           boilerplate docxml, div3
-          preface_block docxml, div3
-          abstract docxml, div3
-          foreword docxml, div3
-          executivesummary docxml, div3
-          introduction docxml, div3
-          preface docxml, div3
-          acknowledgements docxml, div3
+          front docxml, div3
           middle docxml, div3
           footnotes div3
           comments div3

data/lib/isodoc/ribose/presentation_xml_convert.rb

@@ -13,11 +13,24 @@ module IsoDoc
       def termsource1(elem)
         mod = elem.at(ns("./modification")) and
           termsource_modification(mod)
-        elem.children = l10n("<strong>#{@i18n.source}:</strong> "\
+        elem.children = l10n("<strong>#{@i18n.source}:</strong> " \
                              "#{to_xml(elem.children).strip}")
         elem&.next_element&.name == "termsource" and elem.next = "; "
       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