metanorma-gb 1.3.16 → 1.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d7249dc6de3238469a43aacba0f948f627724f3741a06bdd7d68c1a4d0e04a6
-  data.tar.gz: c6b8a1441579a1a3130e304b8388d0ca9924c3368ae987da49f46ac6496cda82
+  metadata.gz: 12d26f3652d331eb89eb5c545dc44ff9f1e6ef1133207e5d956a885ce265fe97
+  data.tar.gz: 4d3cbba1a209ac37ee19f30fd7ca58d2d3a0109473a9e1cac168508636f93065
 SHA512:
-  metadata.gz: 997a008d8ba5dd0eb3c5a7be5a5058f6ee51d6d6c8787cf989911536d72a9a03a2e94c2d75f2ae0be7c159cdbbec95537c426f8674d6d4d4c960ef4a2997c794
-  data.tar.gz: ccec18189310fc771252d6ff176014839ea9974de5a290686aefbddea45cb3562445692939c17318421cfd09345080a521f0dff170715cfa7c82a0a7a8261123
+  metadata.gz: 63f65895d2b1c1953037139959c668cda40c5ad4b96253c5492c26fbecab5b781da9c058a4356a640e2257a2ea93c4646d5efddac6ff95d71f87c5ab6fc545bf
+  data.tar.gz: 66da605ead05aa52d0513ed4518109210fe7099abfc6f1210716f56fe371309c47bea9f5b46a6d645563663c82f7ed54ead3b69feb09630499a05e6a954be62e

data/lib/asciidoctor/gb/converter.rb

@@ -237,10 +237,11 @@ module Asciidoctor
         isodoc = boilerplate_isodoc(xmldoc)
         initial_boilerplate(xmldoc, isodoc)
         return if @keepboilerplate
-        f = xmldoc.at(self.class::TERM_CLAUSE) and
+        xmldoc.xpath(self.class::TERM_CLAUSE).each do |f|
           term_defs_boilerplate(f.at("./title"),
                                 xmldoc.xpath(".//termdocsource"),
                                 f.at(".//term"), f.at(".//p"), isodoc)
+        end
         f = xmldoc.at(self.class::NORM_REF) and
           norm_ref_preface(f)
       end

data/lib/asciidoctor/gb/section_input.rb

@@ -33,6 +33,7 @@ module Asciidoctor
           "terms and definitions"
         when "符号、代号和缩略语" then "symbols and abbreviated terms"
         when "参考文献" then "bibliography"
+        when "致谢" then "acknowledgements"
         else
           super
         end
@@ -42,46 +43,6 @@ module Asciidoctor
         clause_parse(attrs, xml, node)
       end
 
-=begin
-      def section(node)
-        a = section_attributes(node)
-        noko do |xml|
-          case sectiontype(node)
-          when "引言", "introduction" then introduction_parse(a, xml, node)
-          when "patent notice" then patent_notice_parse(xml, node)
-          when "范围", "scope" then scope_parse(a, xml, node)
-          when "规范性引用文件", "normative references"
-            norm_ref_parse(a, xml, node)
-          when "术语和定义", "terms and definitions",
-            "术语、定义、符号、代号和缩略语",
-            "terms, definitions, symbols and abbreviated terms",
-            "terms, definitions, symbols and abbreviations",
-            "terms, definitions and symbols",
-            "terms, definitions and abbreviations",
-            "terms, definitions and abbreviated terms"
-            @term_def = true
-            term_def_parse(a, xml, node, true)
-            @term_def = false
-          when "符号、代号和缩略语", "symbols and abbreviated terms",
-            "abbreviated terms", "abbreviations", "symbols"
-            symbols_parse(a, xml, node)
-          when "参考文献", "bibliography"
-            bibliography_parse(a, xml, node)
-          else
-            if @term_def then term_def_subclause_parse(a, xml, node)
-            elsif @biblio then bibliography_parse(a, xml, node)
-            elsif node.attr("style") == "bibliography"
-              bibliography_parse(a, xml, node)
-            elsif node.attr("style") == "appendix" && node.level == 1
-              annex_parse(a, xml, node)
-            else
-              clause_parse(a, xml, node)
-            end
-          end
-        end.join("\n")
-      end
-=end
-
 =begin
       # spec of permissible section sequence
       SEQ = [

data/lib/isodoc/gb/gbbaseconvert.rb

@@ -203,7 +203,8 @@ module IsoDoc
             h1 << "#{num}."
             h1 << "&#x3000;"
           end
-          h1 << title
+          title.is_a?(String) ? h1 << title :
+          title&.children&.each { |c2| parse(c2, h1) }
         end
         div.parent.at(".//h1")
       end

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.3.16"
+    VERSION = "1.3.17"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.3.16
+  version: 1.3.17
 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: metanorma-iso