metanorma-acme 1.0.1 → 1.0.3

data/lib/isodoc/acme/html_convert.rb

@@ -12,7 +12,6 @@ module IsoDoc
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
-        #system "cp #{html_doc_path('logo.jpg')} logo.jpg"
         FileUtils.cp html_doc_path('logo.jpg'), "logo.jpg"
         @files_to_delete << "logo.jpg"
       end
@@ -34,12 +33,12 @@ module IsoDoc
         }
       end
 
-        def metadata_init(lang, script, labels)
-          @meta = Metadata.new(lang, script, labels)
-        end
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
+      end
 
-        def html_head
-          <<~HEAD.freeze
+      def html_head
+        <<~HEAD.freeze
           <title>{{ doctitle }}</title>
     <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 
@@ -53,148 +52,85 @@ module IsoDoc
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
     <style class="anchorjs"></style>
-          HEAD
-        end
-
-        def make_body(xml, docxml)
-          body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
-          xml.body **body_attr do |body|
-            make_body1(body, docxml)
-            make_body2(body, docxml)
-            make_body3(body, docxml)
-          end
-        end
-
-        def html_toc(docxml)
-          docxml
-        end
-
-        def annex_name(annex, name, div)
-          div.h1 **{ class: "Annex" } do |t|
-            t << "#{get_anchors[annex['id']][:label]} "
-            t << "<b>#{name.text}</b>"
-          end
-        end
-
-        def annex_name_lbl(clause, num)
-          obl = l10n("(#{@inform_annex_lbl})")
-          obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
-          l10n("<b>#{@annex_lbl} #{num}</b> #{obl}")
-        end
-
-        def pre_parse(node, out)
-          out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
-        end
-
-        def term_defs_boilerplate(div, source, term, preface)
-          if source.empty? && term.nil?
-            div << @no_terms_boilerplate
-          else
-            div << term_defs_boilerplate_cont(source, term)
-          end
-        end
-
-        def i18n_init(lang, script)
-          super
-          @annex_lbl = "Appendix"
-        end
-
-        def error_parse(node, out)
-          # catch elements not defined in ISO
-          case node.name
-          when "pre"
-            pre_parse(node, out)
-          when "keyword"
-            out.span node.text, **{ class: "keyword" }
-          else
-            super
-          end
-        end
-
-        def fileloc(loc)
-          File.join(File.dirname(__FILE__), loc)
-        end
-
-        def cleanup(docxml)
-          super
-          term_cleanup(docxml)
-        end
+        HEAD
+      end
 
-        def term_cleanup(docxml)
-          docxml.xpath("//p[@class = 'Terms']").each do |d|
-            h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-            h2.add_child("&nbsp;")
-            h2.add_child(d.remove)
-          end
-          docxml
+      def make_body(xml, docxml)
+        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
+        xml.body **body_attr do |body|
+          make_body1(body, docxml)
+          make_body2(body, docxml)
+          make_body3(body, docxml)
         end
+      end
 
-        def info(isoxml, out)
-          @meta.security isoxml, out
-          super
-        end
+      def html_toc(docxml)
+        docxml
+      end
 
-        def annex_name(annex, name, div)
-          div.h1 **{ class: "Annex" } do |t|
-            t << "#{get_anchors[annex['id']][:label]} "
-            t << "<b>#{name.text}</b>"
+      def annex_name(annex, name, div)
+        div.h1 **{ class: "Annex" } do |t|
+          t << "#{get_anchors[annex['id']][:label]}"
+          t.br
+          t.b do |b|
+            name&.children&.each { |c2| parse(c2, b) }
           end
         end
+      end
 
-        def annex_name_lbl(clause, num)
-          obl = l10n("(#{@inform_annex_lbl})")
-          obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
-          l10n("<b>#{@annex_lbl} #{num}</b> #{obl}")
-        end
+      def pre_parse(node, out)
+        out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
+      end
 
-        def pre_parse(node, out)
-          out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
+      def term_defs_boilerplate(div, source, term, preface)
+        if source.empty? && term.nil?
+          div << @no_terms_boilerplate
+        else
+          div << term_defs_boilerplate_cont(source, term)
         end
+      end
 
-        def term_defs_boilerplate(div, source, term, preface)
-          if source.empty? && term.nil?
-            div << @no_terms_boilerplate
-          else
-            div << term_defs_boilerplate_cont(source, term)
-          end
-        end
+      def i18n_init(lang, script)
+        super
+        @annex_lbl = "Appendix"
+      end
 
-        def i18n_init(lang, script)
+      def error_parse(node, out)
+        # catch elements not defined in ISO
+        case node.name
+        when "pre"
+          pre_parse(node, out)
+        when "keyword"
+          out.span node.text, **{ class: "keyword" }
+        else
           super
-          @annex_lbl = "Appendix"
-        end
-
-        def error_parse(node, out)
-          # catch elements not defined in ISO
-          case node.name
-          when "pre"
-            pre_parse(node, out)
-          when "keyword"
-            out.span node.text, **{ class: "keyword" }
-          else
-            super
-          end
         end
+      end
 
-        def fileloc(loc)
-          File.join(File.dirname(__FILE__), loc)
-        end
+      def fileloc(loc)
+        File.join(File.dirname(__FILE__), loc)
+      end
 
-        def cleanup(docxml)
-          super
-          term_cleanup(docxml)
-        end
+      def cleanup(docxml)
+        super
+        term_cleanup(docxml)
+      end
 
-        def term_cleanup(docxml)
-          docxml.xpath("//p[@class = 'Terms']").each do |d|
-            h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-            h2.add_child("&nbsp;")
-            h2.add_child(d.remove)
-          end
-          docxml
+      def term_cleanup(docxml)
+        docxml.xpath("//p[@class = 'Terms']").each do |d|
+          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
+          h2.add_child("&nbsp;")
+          h2.add_child(d.remove)
         end
+        docxml
+      end
 
+      def info(isoxml, out)
+        @meta.security isoxml, out
+        super
       end
+
     end
   end
+end
 

data/lib/isodoc/acme/pdf_convert.rb

@@ -10,7 +10,6 @@ module IsoDoc
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
-        #system "cp #{html_doc_path('logo.jpg')} logo.jpg"
         FileUtils.cp html_doc_path('logo.jpg'), "logo.jpg"
         @files_to_delete << "logo.jpg"
       end
@@ -70,14 +69,11 @@ module IsoDoc
       def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|
           t << "#{get_anchors[annex['id']][:label]} "
-          t << "<b>#{name.text}</b>"
+          t.br
+          t.b do |b|
+          name&.children&.each { |c2| parse(c2, b) }
+        end
         end
-      end
-
-      def annex_name_lbl(clause, num)
-        obl = l10n("(#{@inform_annex_lbl})")
-        obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
-        l10n("<b>#{@annex_lbl} #{num}</b> #{obl}")
       end
 
       def pre_parse(node, out)
@@ -131,67 +127,6 @@ module IsoDoc
         @meta.security isoxml, out
         super
       end
-
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{get_anchors[annex['id']][:label]} "
-          t << "<b>#{name.text}</b>"
-        end
-      end
-
-      def annex_name_lbl(clause, num)
-        obl = l10n("(#{@inform_annex_lbl})")
-        obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
-        l10n("<b>#{@annex_lbl} #{num}</b> #{obl}")
-      end
-
-      def pre_parse(node, out)
-        out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
-      end
-
-      def term_defs_boilerplate(div, source, term, preface)
-        if source.empty? && term.nil?
-          div << @no_terms_boilerplate
-        else
-          div << term_defs_boilerplate_cont(source, term)
-        end
-      end
-
-      def i18n_init(lang, script)
-        super
-        @annex_lbl = "Appendix"
-      end
-
-      def error_parse(node, out)
-        # catch elements not defined in ISO
-        case node.name
-        when "pre"
-          pre_parse(node, out)
-        when "keyword"
-          out.span node.text, **{ class: "keyword" }
-        else
-          super
-        end
-      end
-
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
-      end
-
-      def cleanup(docxml)
-        super
-        term_cleanup(docxml)
-      end
-
-      def term_cleanup(docxml)
-        docxml.xpath("//p[@class = 'Terms']").each do |d|
-          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          h2.add_child("&nbsp;")
-          h2.add_child(d.remove)
-        end
-        docxml
-      end
-
     end
   end
 end

data/lib/isodoc/acme/word_convert.rb

@@ -11,7 +11,6 @@ module IsoDoc
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
-        #system "cp #{html_doc_path('logo.jpg')} logo.jpg"
         FileUtils.cp html_doc_path('logo.jpg'), "logo.jpg"
       end
 
@@ -95,14 +94,11 @@ module IsoDoc
       def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|
           t << "#{get_anchors[annex['id']][:label]} "
-          t << "<b>#{name.text}</b>"
+          t.br
+          t.b do |b|
+          name&.children&.each { |c2| parse(c2, b) }
+        end
         end
-      end
-
-      def annex_name_lbl(clause, num)
-        obl = l10n("(#{@inform_annex_lbl})")
-        obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
-        l10n("<b>#{@annex_lbl} #{num}</b> #{obl}")
       end
 
       def pre_parse(node, out)

data/lib/metanorma/acme/processor.rb

@@ -22,8 +22,8 @@ module Metanorma
         "Metanorma::Acme #{Metanorma::Acme::VERSION}"
       end
 
-      def input_to_isodoc(file)
-        Metanorma::Input::Asciidoc.new.process(file, @asciidoctor_backend)
+      def input_to_isodoc(file, filename)
+        Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
       end
 
       def extract_options(file)

data/lib/metanorma/acme/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Acme
-    VERSION = "1.0.1"
+    VERSION = "1.0.3"
   end
 end

data/metanorma-acme.gemspec

@@ -28,8 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
-
-  spec.add_dependency "metanorma-standoc", "~> 1.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.0.8"
   spec.add_dependency "isodoc", "~> 0.9.0"
 
   spec.add_development_dependency "bundler", "~> 1.15"
@@ -42,6 +41,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "~> 0.50"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "metanorma", "~> 0.2.5"
-  spec.add_development_dependency "metanorma-cli", "~> 1.0.0"
+  spec.add_development_dependency "metanorma", "~> 0.3.0"
+  spec.add_development_dependency "metanorma-cli", "~> 1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-acme
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.8
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -226,28 +226,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: metanorma-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.3
 description: |
   Metanorma for the (fictitious) Acme Corp.
 
@@ -259,6 +259,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
+- ".rubocop.ribose.yml"
+- ".rubocop.tb.yml"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile