metanorma-ribose 2.5.6 → 2.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05086b1e6dc3621f076c54173f85ceb4c6c48100bbf2b90526d96bfac99a6e75'
-  data.tar.gz: 214bf84f77dcc4d3138e6f608cc345f6c29471d675fa34e52c5378514194a3a1
+  metadata.gz: c2ce34357fcbe779b956860fb3d3da2ebca0f0a709520854f213f7bfd156f771
+  data.tar.gz: dc2499f9ac4065e5587d87cdbd23213de19be6520bcf256eaf1b389225f156dd
 SHA512:
-  metadata.gz: a33ab5a0f6242bc8d523b90d7cf5a10dd5cfa71d514fface30926a98d1dc8992af9f053f0d225e9d94235ce1278a4c2d3c21702a1485e45a7b64ad46725bb00f
-  data.tar.gz: e8d5d0b52010f7fd0fde5fb21bf68494be774e9cb7d9fcd86301441c19b5667e9d73385fef16b9e40d1d8c46552c49d857978fff33292b3edef4bc1d4873a719
+  metadata.gz: 2ec6784ba3c09413d4fa57fd359e1a65831a80092d79728c8a1a25eb678e92b118334ae3d0bc72d80da8f9b437a4d6b5ead1e8c915dcb368c9449d66da616256
+  data.tar.gz: a22da98d2becdb55928d9fbd7fd12516e4f74cf41c44dfc8971ce49a2262fe37c45a11a2651080ada49604e42222931d51dff3fb819d79317873d1d6e36697e3

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