metanorma-mpdf 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71bcc175d700c507ef9167ab50aeb47b4e5abdffd9b4e0b7cc9fdc21f0645bf9
-  data.tar.gz: 460d396daf3dfbc9f0ddd5cc0e2cf8c64ead2e16e68a1b8923f1ebc8c5a38927
+  metadata.gz: 5f4eb229f4a2e784830c7475d8ae2758343a5ce585828f427f59ba5cde7f5006
+  data.tar.gz: 6b32629de2950aa5118b981a68cd329a0e0830656aae44ffac3c339657752ad8
 SHA512:
-  metadata.gz: ed08198df8ce30ed889e01559aa415abc14d817c30ccd6db13a21d57aceda011b7afb70d03299c0c7cf6d5eae6f273d33ef809ad68a7c55e0fa6a50795c65052
-  data.tar.gz: 5e3e26a1ffc02c10ab40441d0b7b3aa6d3cefc707cd23f1bcc7efab5364101059dc9e3ac1e36b87337d51f908a20be98093dd3483e6224bbb218edd4fc124f78
+  metadata.gz: e3022603c410b267d091078806e8a6794888ff286597277f71f0b5c8b7f1675d1cbd7b6fc59d78f894f61dc13357030d38cb7a46546dfa7dfce6ae87942cc19c
+  data.tar.gz: 92be4b9fbcd8b65a37554c8a53716f521979c46a08d7bb853a1bb2285b16cb0dd7ed50b06b524b17b25470dcbd1edd4c57926ac6e5de38757453f438f69bfc9d

data/.travis.yml

@@ -4,6 +4,7 @@ language: ruby
 rvm:
   - 2.5
   - 2.4
+  - 2.3
   - ruby-head
 before_install:
   - gem install bundler -v 1.16.1

data/lib/asciidoctor/mpfd/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Mpfd
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/isodoc/mpfd/html_convert.rb

@@ -252,61 +252,60 @@ module IsoDoc
         l10n("<b>#{@annex_lbl} #{num}</b>")
       end
 
-      def clause_names(docxml, sect_num)
-        q = "//clause[parent::sections]"\
-          "[not(descendant::terms)]"
-        @topnum = sect_num
+      def xclause_names(docxml, _sect_num)
+        q = "//clause[parent::sections]"
+        @topnum = nil
         docxml.xpath(ns(q)).each do |c|
           section_names(c, @topnum, 1)
         end
       end
 
-      def section_naming(c, num, lvl, i)
-        if c["guidance"] then section_names1(c, "#{num}E", lvl + 1)
-        elsif c.parent["container"] then 
-          i+= 1
-          section_names1(c, i, lvl)
-        else
-          i+= 1
-          section_names1(c, "#{num}.#{i}", lvl + 1)
+      def clause_names(docxml, sect_num)
+        q = "//clause[parent::sections]"
+        @topnum = nil
+        lvl = 0
+        docxml.xpath(ns(q)).each do |c|
+          container_names(c, 0)
+          sect_num, lvl = sect_names(c, nil, sect_num, 0, lvl)
         end
-        i
       end
 
-      def section_names(clause, num, lvl)
-        return num if clause.nil?
-        num = num + 1
-        @topnum = num unless clause["container"]
-        @anchors[clause["id"]] = clause["container"] ?
-          { label: nil, xref: clause.at(ns("./title"))&.text, level: 1 } :
-          { label: num.to_s, xref: l10n("#{@clause_lbl} #{num}"), level: lvl }
-        i = 0
-        i = @topnum if clause.parent["container"] && !clause["container"]
-        if clause.parent["container"] && !clause["container"]
+      def container_names(clause, lvl)
+        if clause["container"]
+          @anchors[clause["id"]] = 
+            { label: nil, xref: clause.at(ns("./title"))&.text, level: lvl+1 }
         end
         clause.xpath(ns("./clause | ./term  | ./terms | "\
                         "./definitions")).each do |c|
-          i = section_naming(c, num, lvl, i)
+          container_names(c, clause["container"] ? lvl+1 : lvl)
         end
-        num
       end
 
-      def section_names1(clause, num, lvl)
-        if clause.parent["container"] && !clause["container"]
-          newsect = true
-          if @topnum > 1
-            num = @topnum + 1
-          end
+      def sect_names(clause, num, i, lvl, prev_lvl)
+        return i if clause.nil?
+        curr = i
+        if clause["container"]
+          retlvl = lvl+1
+        else  
+          retlvl = lvl
+          i+=1
+          curr = i
+          name = num.nil? ? i.to_s : "#{num}.#{i}"
+          @anchors[clause["id"]] = { label: name, xref: l10n("#{@clause_lbl} #{name}"), level: lvl+1 }
         end
-        @anchors[clause["id"]] = clause["container"] ?
-          { label: nil, xref: clause.at(ns("./title")), level: clause.ancestors("clause[@container]").length + 1 } :
-          { label: num.to_s, xref: l10n("#{@clause_lbl} #{num}"), level: lvl }
-        i = 0
-        clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).
-          each do |c|
-          i = section_naming(c, num, lvl, i)
+        prev = lvl
+        j = 0
+        clause.xpath(ns("./clause | ./term  | ./terms | "\
+                        "./definitions")).each do |c|
+          if clause["container"]
+            i, lvl = sect_names(c, num, i, lvl, lvl)
+          else
+            j, prev = sect_names(c, name, j, lvl+1, prev)
+          end
         end
-        @topnum = num if newsect
+        i = j if j >0
+        i = curr if lvl < prev
+        [i, prev]
       end
 
       def annex_naming(c, num, lvl, i)

data/lib/isodoc/mpfd/pdf_convert.rb

@@ -256,52 +256,52 @@ module IsoDoc
        l10n("<b>#{@annex_lbl} #{num}</b>")
      end
 
-      def section_naming(c, num, lvl, i)
-        if c["guidance"] then section_names1(c, "#{num}E", lvl + 1)
-        elsif c.parent["container"] then
-          i+= 1
-          section_names1(c, i, lvl)
-        else
-          i+= 1
-          section_names1(c, "#{num}.#{i}", lvl + 1)
+           def clause_names(docxml, sect_num)
+        q = "//clause[parent::sections]"
+        @topnum = nil
+        lvl = 0
+        docxml.xpath(ns(q)).each do |c|
+          container_names(c, 0)
+          sect_num, lvl = sect_names(c, nil, sect_num, 0, lvl)
         end
-        i
       end
 
-      def section_names(clause, num, lvl)
-        return num if clause.nil?
-        num = num + 1
-        @topnum = num unless clause["container"]
-        @anchors[clause["id"]] = clause["container"] ?
-          { label: nil, xref: clause.at(ns("./title"))&.text, level: 1 } :
-          { label: num.to_s, xref: l10n("#{@clause_lbl} #{num}"), level: lvl }
-        i = 0
-        i = @topnum if clause.parent["container"] && !clause["container"]
-        if clause.parent["container"] && !clause["container"]
+      def container_names(clause, lvl)
+        if clause["container"]
+          @anchors[clause["id"]] =
+            { label: nil, xref: clause.at(ns("./title"))&.text, level: lvl+1 }
         end
         clause.xpath(ns("./clause | ./term  | ./terms | "\
                         "./definitions")).each do |c|
-          i = section_naming(c, num, lvl, i)
+          container_names(c, clause["container"] ? lvl+1 : lvl)
         end
-        num
       end
 
-      def section_names1(clause, num, lvl)
-        if clause.parent["container"] && !clause["container"]
-          newsect = true
-          if @topnum > 1
-            num = @topnum + 1
-          end
+      def sect_names(clause, num, i, lvl, prev_lvl)
+        return i if clause.nil?
+        curr = i
+        if clause["container"]
+          retlvl = lvl+1
+        else
+          retlvl = lvl
+          i+=1
+          curr = i
+          name = num.nil? ? i.to_s : "#{num}.#{i}"
+          @anchors[clause["id"]] = { label: name, xref: l10n("#{@clause_lbl} #{name}"), level: lvl+1 }
         end
-        @anchors[clause["id"]] = clause["container"] ?
-          { label: nil, xref: clause.at(ns("./title")), level: clause.ancestors("clause[@container]").length + 1 } :
-          { label: num.to_s, xref: l10n("#{@clause_lbl} #{num}"), level: lvl }
-        i = 0
-        clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).
-          each do |c|
-          i = section_naming(c, num, lvl, i)
+        prev = lvl
+        j = 0
+        clause.xpath(ns("./clause | ./term  | ./terms | "\
+                        "./definitions")).each do |c|
+          if clause["container"]
+            i, lvl = sect_names(c, num, i, lvl, lvl)
+          else
+            j, prev = sect_names(c, name, j, lvl+1, prev)
+          end
         end
-        @topnum = num if newsect
+        i = j if j >0
+        i = curr if lvl < prev
+        [i, prev]
       end
 
       def annex_naming(c, num, lvl, i)

data/lib/isodoc/mpfd/word_convert.rb

@@ -80,7 +80,7 @@ module IsoDoc
         h1 = to_xhtml_fragment(h.dup)
         h1.traverse do |x|
           x.replace(" ") if x.name == "span" &&
-            /mso-tab-count/.match?(x["style"])
+            /mso-tab-count/.match(x["style"])
           x.remove if x.name == "span" && x["class"] == "MsoCommentReference"
           x.remove if x.name == "a" && x["epub:type"] == "footnote"
           x.replace(x.children) if x.name == "a"
@@ -191,10 +191,6 @@ module IsoDoc
       end
 
       def initial_anchor_names(d)
-        #preface_names(d.at(ns("//foreword")))
-        #preface_names(d.at(ns("//introduction")))
-        #preface_names(d.at(ns("//preface/terms | "\
-        #"//preface/clause[descendant::terms]")))
         d.xpath(ns(FRONT_CLAUSE)).each do |c|
           preface_names(c)
           sequential_asset_names(c)
@@ -241,52 +237,52 @@ module IsoDoc
        l10n("<b>#{@annex_lbl} #{num}</b>")
      end
 
-      def section_naming(c, num, lvl, i)
-        if c["guidance"] then section_names1(c, "#{num}E", lvl + 1)
-        elsif c.parent["container"] then
-          i+= 1
-          section_names1(c, i, lvl)
-        else
-          i+= 1
-          section_names1(c, "#{num}.#{i}", lvl + 1)
+           def clause_names(docxml, sect_num)
+        q = "//clause[parent::sections]"
+        @topnum = nil
+        lvl = 0
+        docxml.xpath(ns(q)).each do |c|
+          container_names(c, 0)
+          sect_num, lvl = sect_names(c, nil, sect_num, 0, lvl)
         end
-        i
       end
 
-      def section_names(clause, num, lvl)
-        return num if clause.nil?
-        num = num + 1
-        @topnum = num unless clause["container"]
-        @anchors[clause["id"]] = clause["container"] ?
-          { label: nil, xref: clause.at(ns("./title"))&.text, level: 1 } :
-          { label: num.to_s, xref: l10n("#{@clause_lbl} #{num}"), level: lvl }
-        i = 0
-        i = @topnum if clause.parent["container"] && !clause["container"]
-        if clause.parent["container"] && !clause["container"]
+      def container_names(clause, lvl)
+        if clause["container"]
+          @anchors[clause["id"]] =
+            { label: nil, xref: clause.at(ns("./title"))&.text, level: lvl+1 }
         end
         clause.xpath(ns("./clause | ./term  | ./terms | "\
                         "./definitions")).each do |c|
-          i = section_naming(c, num, lvl, i)
+          container_names(c, clause["container"] ? lvl+1 : lvl)
         end
-        num
       end
 
-      def section_names1(clause, num, lvl)
-        if clause.parent["container"] && !clause["container"]
-          newsect = true
-          if @topnum > 1
-            num = @topnum + 1
-          end
+      def sect_names(clause, num, i, lvl, prev_lvl)
+        return i if clause.nil?
+        curr = i
+        if clause["container"]
+          retlvl = lvl+1
+        else
+          retlvl = lvl
+          i+=1
+          curr = i
+          name = num.nil? ? i.to_s : "#{num}.#{i}"
+          @anchors[clause["id"]] = { label: name, xref: l10n("#{@clause_lbl} #{name}"), level: lvl+1 }
         end
-        @anchors[clause["id"]] = clause["container"] ?
-          { label: nil, xref: clause.at(ns("./title")), level: clause.ancestors("clause[@container]").length + 1 } :
-          { label: num.to_s, xref: l10n("#{@clause_lbl} #{num}"), level: lvl }
-        i = 0
-        clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).
-          each do |c|
-          i = section_naming(c, num, lvl, i)
+        prev = lvl
+        j = 0
+        clause.xpath(ns("./clause | ./term  | ./terms | "\
+                        "./definitions")).each do |c|
+          if clause["container"]
+            i, lvl = sect_names(c, num, i, lvl, lvl)
+          else
+            j, prev = sect_names(c, name, j, lvl+1, prev)
+          end
         end
-        @topnum = num if newsect
+        i = j if j >0
+        i = curr if lvl < prev
+        [i, prev]
       end
 
       def annex_naming(c, num, lvl, i)

data/metanorma-mpfd.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "nokogiri"
-  spec.add_dependency "asciidoctor-iso", "~> 0.9.6"
+  spec.add_dependency "asciidoctor-iso", "~> 0.10.1"
   spec.add_dependency "isodoc", ">= 0.8.4"
   spec.add_dependency "twitter_cldr"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-mpdf
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2018-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement