metanorma-iho 0.2.2 → 0.2.7

data/lib/isodoc/iho/init.rb

@@ -15,7 +15,9 @@ module IsoDoc
       end
 
       def i18n_init(lang, script, i18nyaml = nil)
-        @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
+        @i18n = I18n.new(
+          lang, script, i18nyaml || 
+          Metanorma::IHO.configuration.i18nyaml || @i18nyaml)
       end
     end
   end

data/lib/isodoc/iho/metadata.rb

@@ -8,14 +8,6 @@ module IsoDoc
         Metanorma::IHO.configuration
       end
 
-      def commentperiod(ixml, _out)
-        from = ixml.at(ns("//bibdata/ext/commentperiod/from"))&.text
-        to = ixml.at(ns("//bibdata/ext/commentperiod/to"))&.text
-        extended = ixml.at(ns("//bibdata/ext/commentperiod/extended"))&.text
-        set(:comment_from, from) if from
-        set(:comment_to, to) if to
-      end
-
       def series(xml, _out)
         set(:series, xml.at(ns("//bibdata/series[@type = 'main']/title"))&.text)
         a = xml.at(ns("//bibdata/series[@type = 'main']/abbreviation"))&.text and

data/lib/isodoc/iho/xref.rb

@@ -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: l10n("#{lbl} #{num}"), level: 1, value: lbl }
         if a = single_annex_special_section(clause)
           annex_names1(a, "#{num}", 1)
         else
@@ -43,7 +43,7 @@ module IsoDoc
         lbl = clause.at("./ancestor::xmlns:annex/@obligation").
           text == "informative" ?  @labels["appendix"] : @labels["annex"]
         @anchors[clause["id"]] =
-          { label: num, xref: "#{lbl} #{num}",
+          { label: num, xref: l10n("#{lbl} #{num}"),
             level: level, type: "clause" }
         clause.xpath(ns("./clause | ./references | ./terms | ./definitions")).
           each_with_index do |c, i|
@@ -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.2.2"
+    VERSION = "0.2.7"
   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.5.0"
   spec.add_dependency "isodoc", "~> 1.2.0"
-  spec.add_dependency 'metanorma-generic', '~> 1.6.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.2.2
+  version: 0.2.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -24,20 +24,6 @@ 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.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -216,9 +202,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -254,6 +238,7 @@ 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

data/.github/workflows/macos.yml

@@ -1,41 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/ubuntu.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-macos:
-    name: Test on Ruby ${{ matrix.ruby }} macOS
-    runs-on: macos-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          bundle install --jobs 4 --retry 3
-      - name: Install PlantUML
-        run: |
-          brew install plantuml
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,45 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: ubuntu
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-linux:
-    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
-    runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Install PlantUML
-        uses: nick-invision/retry@v1
-        with:
-          polling_interval_seconds: 5
-          timeout_minutes: 5
-          max_attempts: 3
-          command: sudo apt-get update -y && sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/windows.yml

@@ -1,43 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: windows
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/ubuntu.yml
-
-jobs:
-  test-windows:
-    name: Test on Ruby ${{ matrix.ruby }} Windows
-    runs-on: windows-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: Install PlantUML
-        run: |
-          cinst -y plantuml
-      - name: Run specs
-        run: |
-          bundle exec rake