metanorma-iho 0.1.2 → 0.2.4

data/lib/isodoc/iho/init.rb

@@ -0,0 +1,25 @@
+require "isodoc"
+require_relative "metadata"
+require_relative "xref"
+
+module IsoDoc
+  module IHO
+    module Init
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
+      end
+
+      def xref_init(lang, script, klass, labels, options)
+        html = HtmlConvert.new(language: lang, script: script)
+        @xrefs = Xref.new(lang, script, html, labels, options)
+      end
+
+      def i18n_init(lang, script, i18nyaml = nil)
+        @i18n = I18n.new(
+          lang, script, i18nyaml || 
+          Metanorma::IHO.configuration.i18nyaml || @i18nyaml)
+      end
+    end
+  end
+end
+

data/lib/isodoc/iho/pdf_convert.rb

@@ -1,5 +1,4 @@
 require "isodoc"
-require "isodoc/iho/metadata"
 
 module IsoDoc
   module IHO

data/lib/isodoc/iho/presentation_xml_convert.rb

@@ -1,10 +1,11 @@
-require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 require "metanorma-generic"
 
 module IsoDoc
   module IHO
     class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
+      include Init
     end
   end
 end

data/lib/isodoc/iho/word_convert.rb

@@ -1,6 +1,6 @@
 require "isodoc"
 require "isodoc/generic/word_convert"
-require "isodoc/iho/metadata"
+require_relative "init"
 
 module IsoDoc
   module IHO
@@ -23,6 +23,7 @@ module IsoDoc
       def make_body2(body, docxml)
         body.div **{ class: "WordSection2" } do |div2|
           boilerplate docxml, div2
+          preface_block docxml, div2
           abstract docxml, div2
           foreword docxml, div2
           introduction docxml, div2
@@ -41,6 +42,7 @@ module IsoDoc
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/iho/xref.rb

@@ -6,7 +6,7 @@ module IsoDoc
       def annex_name_lbl(clause, num)
         lbl = clause["obligation"] == "informative" ?
           @labels["appendix"] : @labels["annex"]
-        l10n("<b>#{lbl} #{num}</b>")
+        l10n("<strong>#{lbl} #{num}</strong>")
       end
 
       def annex_names(clause, num)
@@ -15,7 +15,7 @@ module IsoDoc
           @labels["appendix"] : @labels["annex"]
         @anchors[clause["id"]] =
           { label: annex_name_lbl(clause, num), type: "clause",
-            xref: "#{lbl} #{num}", level: 1 }
+            xref: "#{lbl} #{num}", level: 1, value: lbl }
         if a = single_annex_special_section(clause)
           annex_names1(a, "#{num}", 1)
         else
@@ -59,6 +59,16 @@ module IsoDoc
           @anchors[c["id"]][:container] = clause["id"]
         end
       end
+
+    def section_names1(clause, num, level)
+      @anchors[clause["id"]] =
+        { label: num, level: level, xref: l10n("#{@labels["subclause"]} #{num}"),
+          type: "clause" }
+      clause.xpath(ns(SUBCLAUSES)).
+        each_with_index do |c, i|
+        section_names1(c, "#{num}.#{i + 1}", level + 1)
+      end
+    end
     end
   end
 end

data/lib/metanorma/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IHO
-    VERSION = "0.1.2"
+    VERSION = "0.2.4"
   end
 end

data/metanorma-iho.gemspec

@@ -27,9 +27,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
-  spec.add_dependency "isodoc", "~> 1.1.0"
-  spec.add_dependency 'metanorma-generic', '~> 1.5.0'
+  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency 'metanorma-generic', '~> 1.7.0'
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "2.4.0"

data/metanorma.yml

@@ -9,6 +9,7 @@ logo_paths:
   - lib/isodoc/iho/html/image002.png
   - lib/isodoc/iho/html/image003.png
 validate_rng_file: lib/asciidoctor/iho/iho.rng
+i18nyaml: lib/isodoc/iho/i18n-en.yaml
 htmlcoverpage: lib/isodoc/iho/html/html_iho_titlepage.html
 htmlintropage: lib/isodoc/iho/html/html_iho_intro.html
 htmlstylesheet: lib/isodoc/iho/html/htmlstyle.scss

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iho
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-26 00:00:00.000000000 Z
+date: 2020-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -24,48 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.3.4
-- !ruby/object:Gem::Dependency
-  name: metanorma-standoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -254,8 +240,10 @@ files:
 - lib/isodoc/iho/html/wordstyle.css
 - lib/isodoc/iho/html/wordstyle.scss
 - lib/isodoc/iho/html_convert.rb
+- lib/isodoc/iho/i18n-en.yaml
 - lib/isodoc/iho/iho.specification.xsl
 - lib/isodoc/iho/iho.standard.xsl
+- lib/isodoc/iho/init.rb
 - lib/isodoc/iho/metadata.rb
 - lib/isodoc/iho/pdf_convert.rb
 - lib/isodoc/iho/presentation_xml_convert.rb