metanorma-un 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca6423742e73f915cfe6fed182931dde2237f2d7b5d23bf2ce356113ec4c4ebb
-  data.tar.gz: 256e00b7357d4f839f48690132f20ba0265c1c13ccd2e4f49a7d5135c01109f8
+  metadata.gz: 9434eaf6a8d055ea8eb6fd49dbd53948f5421208780084497f9f525368c955d6
+  data.tar.gz: d4a1b4904ae6fdc1c2affeea0d5f459f31538a818277da8932934f7aa0336470
 SHA512:
-  metadata.gz: 17758698e986a248570200ff0802717ecc0ab688136c2b76e9cf610fd65d375d04ad4ec436a3ce998080507a106dcdefaed7b4c0119b6525595edae0865ec549
-  data.tar.gz: 2f00c75f5cbfbea77427026ef8b9583eb3709708ea83522dd5ef272b728763f8aad5e5b0f7483d9a55fedf53caf1fb41e0670431b2cc4055facf60b4d2608a13
+  metadata.gz: 07451413d407acafa990d3c5f08ffc31fe82026f9978916a4c41af6a25428bfa643ec41d7863232b14e813cb6d160b072526d93022ac7119e3b36b9acd56fd4c
+  data.tar.gz: 5d036e3bc7b239cad032250d624dc401a6ff6a138a780fc535b683752254b33fb48e88d782d8949c9b98ae82c81e78fc0f25faf5572ce8c87d3fa2db73bb5f0b

data/lib/isodoc/un/base_convert.rb

@@ -33,10 +33,16 @@ module IsoDoc
       MIDDLE_CLAUSE = "//clause[parent::sections]".freeze
 
       def initial_anchor_names(d)
-        preface_names(d.at(ns("//abstract")))
+        preface_names(d.at(ns("//preface/abstract")))
         preface_names(d.at(ns("//foreword")))
         preface_names(d.at(ns("//introduction")))
-        sequential_asset_names(d.xpath(ns("//foreword | //introduction")))
+        d.xpath(ns("//preface/clause")).each do |c| 
+          preface_names(c)
+        end
+        preface_names(d.at(ns("//acknowledgements")))
+        sequential_asset_names(
+          d.xpath(ns("//preface/abstract | //foreword | //introduction | "\
+                     "//preface/clause | //acknowledgements")))
         middle_section_asset_names(d)
         clause_names(d, 0)
         termnote_anchor_names(d)
@@ -213,13 +219,12 @@ module IsoDoc
       end
 
       def inline_header_title(out, node, c1)
-        title = c1&.content || ""
         out.span **{ class: "zzMoveToFollowing" } do |s|
           if lbl = anchor(node['id'], :label)
             s << "#{lbl}. " unless @suppressheadingnumbers
             insert_tab(s, 1)
           end
-          s << "#{title} "
+          c1&.children&.each { |c2| parse(c2, s) }
         end
       end
     end

data/lib/isodoc/un/html_convert.rb

@@ -65,6 +65,8 @@ module IsoDoc
           abstract docxml, div3
           foreword docxml, div3
           introduction docxml, div3
+          preface docxml, div3
+          acknowledgements docxml, div3
           middle docxml, div3
           footnotes div3
           comments div3

data/lib/isodoc/un/pdf_convert.rb

@@ -72,6 +72,8 @@ module IsoDoc
           abstract docxml, div3
           foreword docxml, div3
           introduction docxml, div3
+          preface docxml, div3
+          acknowledgements docxml, div3
           middle docxml, div3
           footnotes div3
           comments div3

data/lib/isodoc/un/word_convert.rb

@@ -71,6 +71,8 @@ module IsoDoc
           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)

data/lib/metanorma/un/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module UN
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-un
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities