metanorma-ribose 2.5.5 → 2.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c3761f452a1896870000f02c8af971bbe606801653ba71a7e5bfdc46474e731
-  data.tar.gz: 622820aa78a60196670b478f5a2a000c6a2c478ecd2c21ce263b6dd1f87afff8
+  metadata.gz: 4610f907d3022077b5cc2a16f0d05228c3e805bc7dc191b5133a681a1bf8d2d3
+  data.tar.gz: 63cecb2f77af07422987f3b09591045c243d0207b76f8fdbba752e27fc146c21
 SHA512:
-  metadata.gz: ca70973ef801ddb22d29d66e6ab0b85125a38986bb4814c6f5cff1e554752126da9889334e9b1c2fc5c0d5cc73a186fd474e4f503d7ad866c133e9be687457c6
-  data.tar.gz: b0601319759e71784f409a4bb0bb8f04c08935677d2c6a4ba41ab2db5c2eb38cd71d8a0d3b9234b0f73d78e41501a30d6758c0d7a575b843c5fb2d284cabba61
+  metadata.gz: c15a22c66e48ae6ae92525dc682e40c10e7cee5a4a98111e244e5dd3d60dbb7c08c77b95f0d2a1f6b448124f89e8b21a497cc142fcc2b413c6122014d4b08a07
+  data.tar.gz: ba2a58f12b20d3b513e128b9cf0f82f0ba65516a283d33b31f4ef6c26254e9ec271040c4dcb074365feff3289fbf4bdb2989054cb5edea01b70871ce9a24e9e6

data/lib/isodoc/ribose/base_convert.rb

@@ -5,13 +5,17 @@ module IsoDoc
         title_attr = { class: "IntroTitle" }
         page_break(out)
         out.div class: "Section3", id: clause["id"] do |div|
-          clause_name(clause, clause&.at(ns("./title")), div, title_attr)
+          clause_name(clause, clause&.at(ns("./fmt-title")), div, title_attr)
           clause.elements.each do |e|
-            parse(e, div) unless e.name == "title"
+            parse(e, div) unless e.name == "fmt-title"
           end
         end
       end
 
+      def sections_names
+        super << "executivesummary"
+      end
+
       def is_clause?(name)
         return true if name == "executivesummary"
 

data/lib/isodoc/ribose/presentation_xml_convert.rb

@@ -5,34 +5,42 @@ require "metanorma-generic"
 module IsoDoc
   module Ribose
     class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
-      def annex1(elem)
+      # KILL
+      def annex1x(elem)
         lbl = @xrefs.anchor(elem["id"], :label)
         prefix_name(elem, "<br/><br/>", lbl, "title")
       end
 
+      def annex_delim(_elem)
+        "<br/><br/>"
+      end
+
       def middle_title(docxml); end
 
       def termsource1(elem)
-        mod = elem.at(ns("./modification")) and
-          termsource_modification(mod)
         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")),
+        preface_move(doc.xpath(ns("//preface/abstract")),
                      %w(foreword executivesummary introduction clause acknowledgements), doc)
-        preface_move(doc.at(ns("//preface/foreword")),
+        preface_move(doc.xpath(ns("//preface/foreword")),
                      %w(executivesummary introduction clause acknowledgements), doc)
-        preface_move(doc.at(ns("//preface/executivesummary")),
+        preface_move(doc.xpath(ns("//preface/executivesummary")),
                      %w(introduction clause acknowledgements), doc)
-        preface_move(doc.at(ns("//preface/introduction")),
+        preface_move(doc.xpath(ns("//preface/introduction")),
                      %w(clause acknowledgements), doc)
-        preface_move(doc.at(ns("//preface/acknowledgements")),
+        preface_move(doc.xpath(ns("//preface/acknowledgements")),
                      %w(), doc)
       end
 
+       def clause(docxml)
+         super
+         docxml.xpath(ns("//executivesummary | //appendix")).each { |x| clause1(x) }
+       end
+
       include Init
     end
   end