metanorma-itu 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92b374ee3e278b12759d26c62e85d81023788306f4639ca919aa78906149c616
-  data.tar.gz: 043a1c9e5369836d7c55a008e2feda0ebdd24885be8bd80bc7eb8713b67d90cc
+  metadata.gz: 6fdcd13b8422d4f34b193763e505ce838c6a9db793fa61be7e9259d063f2d42e
+  data.tar.gz: 530301c50e4dd6f121015b5821b1e4d971a7de37eb8016ded73143e37ab03dfd
 SHA512:
-  metadata.gz: 179787fb1008d36a701db731f7273acf0993a0ce7d1c2f36c92dc35dba6928264e5bcce59336bdf5de2db62e69aa05603c1b4ceaadcb0b1b7b38f287836ee566
-  data.tar.gz: 9fb8d8a62f6530e15a0205ef068f2fd90f5d6992b8e90010b7305f9ad34a506c74d883204207b24bb684f3636049171825cac4832a4448455ecef924f656a182
+  metadata.gz: 2667f0a8b869354315893203b60b4a091565c027b95136ca42636bffc175d82add61ce900ea8a3430f3d6c09e21482f0489651a188c181ed08b35ef197c9e911
+  data.tar.gz: 3c6a9be2da83277ac8286c41c2512bfb8f49995a30fb0231169e61c4dbb1fc7284c647c60a181003cb7e32ca7fb4c354d2784877da3932bc31f392610586f13a

data/lib/asciidoctor/itu/converter.rb

@@ -43,32 +43,14 @@ module Asciidoctor
       end
 
       def olist(node)
+        id = Asciidoctor::Standoc::Utils::anchor_or_uuid(node)
         noko do |xml|
-          xml.ol **attr_code(id: Asciidoctor::Standoc::Utils::anchor_or_uuid(node),
-                             class: node.attr("class")) do |xml_ol|
+          xml.ol **attr_code(id: id, class: node.attr("class")) do |xml_ol|
             node.items.each { |item| li(xml_ol, item) }
           end
         end.join("\n")
       end
 
-      def clause_parse(attrs, xml, node)
-        attrs[:preface] = true if node.attr("style") == "preface"
-        super
-      end
-
-      def move_sections_into_preface(x, preface)
-        x.xpath("//clause[@preface]").each do |c|
-          c.delete("preface")
-          preface.add_child c.remove
-        end
-      end
-
-      def make_preface(x, s)
-        s.add_previous_sibling("<preface/>") unless x.at("//preface")
-        make_abstract(x, s)
-        move_sections_into_preface(x, x.at("//preface"))
-      end
-
       def document(node)
         init(node)
         ret1 = makexml(node)
@@ -99,40 +81,12 @@ module Asciidoctor
         case ret
         when "definitions" then "terms and definitions"
         when "abbreviations and acronyms" then "symbols and abbreviated terms"
+        when "references" then "normative references"
         else
           super
         end
       end
 
-      def section(node)
-        a = section_attributes(node)
-        noko do |xml|
-          case sectiontype(node)
-          when "references" then norm_ref_parse(a, xml, node)
-          when "terms and definitions"
-            @term_def = true
-            term_def_parse(a, xml, node, true)
-            @term_def = false
-          when "symbols and abbreviated terms"
-            symbols_parse(a, xml, node)
-          when "bibliography" then bibliography_parse(a, xml, node)
-          else
-            if @term_def then term_def_subclause_parse(a, xml, node)
-            elsif @definitions then symbols_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") == "abstract"
-              abstract_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
-
       def norm_ref_parse(attrs, xml, node)
         @norm_ref = true
         xml.references **attr_code(attrs) do |xml_section|

data/lib/isodoc/itu/base_convert.rb

@@ -29,7 +29,7 @@ module IsoDoc
         isoxml.xpath(ns(FRONT_CLAUSE)).each do |c|
           title = c&.at(ns("./title"))
           out.div **attr_code(id: c["id"]) do |s|
-            clause_name(nil, title&.content, s, class: "IntroTitle")
+            clause_name(nil, title, s, class: "IntroTitle")
             c.elements.reject { |c1| c1.name == "title" }.each do |c1|
               parse(c1, s)
             end

data/lib/isodoc/itu/xref.rb

@@ -70,9 +70,9 @@ module IsoDoc
       def middle_section_asset_names(d)
         return super unless @hierarchical_assets
         middle_sections = "//clause[title = 'Scope'] | "\
-          "//foreword | //introduction | "\
+          "//foreword | //introduction | //acknowledgements | "\
           "//references[title = 'References' or title = 'references'] | "\
-          "//sections/terms | "\
+          "//sections/terms | //preface/clause | "\
           "//sections/definitions | //clause[parent::sections]"
         d.xpath(ns(middle_sections)).each do |c|
           hierarchical_asset_names(c, @anchors[c["id"]][:label])

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.0.8"
+    VERSION = "1.0.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 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