metanorma-iho 0.2.9 → 0.2.14

data/lib/isodoc/iho/xref.rb

@@ -2,6 +2,9 @@ require "isodoc/generic/xref"
 
 module IsoDoc
   module IHO
+    class Counter < IsoDoc::XrefGen::Counter
+    end
+
     class Xref < IsoDoc::Generic::Xref
       def annex_name_lbl(clause, num)
         lbl = clause["obligation"] == "informative" ?
@@ -19,9 +22,11 @@ module IsoDoc
         if a = single_annex_special_section(clause)
           annex_names1(a, "#{num}", 1)
         else
+          i = Counter.new
           clause.xpath(ns("./clause | ./references | ./terms | ./definitions")).
-            each_with_index do |c, i|
-            annex_names1(c, "#{num}.#{i + 1}", 2)
+            each do |c|
+            i.increment(c)
+            annex_names1(c, "#{num}.#{i.print}", 2)
           end
         end
         hierarchical_asset_names(clause, num)
@@ -29,13 +34,18 @@ module IsoDoc
 
       def back_anchor_names(docxml)
         super
+        i = Counter.new
         docxml.xpath(ns("//annex[@obligation = 'informative']")).
-          each_with_index do |c, i|
-          annex_names(c, i + 1)
+          each do |c|
+          i.increment(c)
+          annex_names(c, i.print)
         end
+        i = Counter.new("@")
         docxml.xpath(ns("//annex[not(@obligation = 'informative')]")).
-          each_with_index do |c, i|
-          annex_names(c, (65 + i + (i > 7 ? 1 : 0)).chr.to_s)
+          each do |c|
+          i.increment(c)
+          i.increment(c) if i.print == "I"
+          annex_names(c, i.print)
         end
       end
 
@@ -45,16 +55,20 @@ module IsoDoc
         @anchors[clause["id"]] =
           { label: num, xref: l10n("#{lbl} #{num}"),
             level: level, type: "clause" }
+         i = Counter.new
         clause.xpath(ns("./clause | ./references | ./terms | ./definitions")).
-          each_with_index do |c, i|
-          annex_names1(c, "#{num}.#{i + 1}", level + 1)
+          each do |c|
+          i.increment(c)
+          annex_names1(c, "#{num}.#{i.print}", level + 1)
         end
       end
 
       def appendix_names(clause, num)
-        clause.xpath(ns("./appendix")).each_with_index do |c, i|
+         i = Counter.new
+        clause.xpath(ns("./appendix")).each_with_index do |c|
+          i.increment(c)
           @anchors[c["id"]] =
-            anchor_struct(i + 1, nil, @labels["appendix"], "clause")
+            anchor_struct(i.print, nil, @labels["appendix"], "clause")
           @anchors[c["id"]][:level] = 2
           @anchors[c["id"]][:container] = clause["id"]
         end
@@ -64,9 +78,10 @@ module IsoDoc
       @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)
+      i = Counter.new
+      clause.xpath(ns(SUBCLAUSES)).each_with_index do |c|
+        i.increment(c)
+        section_names1(c, "#{num}.#{i.print}", level + 1)
       end
     end
     end

data/lib/metanorma/iho/processor.rb

@@ -15,6 +15,20 @@ module Metanorma
         )
       end
 
+      def fonts_manifest
+        {
+          "Arial" => nil,
+          "Cambria Math" => nil,
+          "Courier" => nil,
+          "Fira Code" => nil,
+          "Source Sans Pro" => [ "Light" ],
+          "Source Serif Pro" => nil,
+          "Source Code Pro" => [ "Light" ],
+          "Source Han Sans" => nil,
+          "STIX Two Math" => nil,
+        }
+      end
+
       def version
         "Metanorma::IHO #{Metanorma::IHO::VERSION}"
       end

data/lib/metanorma/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IHO
-    VERSION = "0.2.9"
+    VERSION = "0.2.14"
   end
 end

data/metanorma-iho.gemspec

@@ -27,7 +27,7 @@ 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-generic', '~> 1.8.0'
+  spec.add_dependency 'metanorma-generic', '~> 1.9.0'
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "2.4.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iho
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.14
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +189,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -235,7 +236,6 @@ files:
 - lib/isodoc/iho/xref.rb
 - lib/metanorma-iho.rb
 - lib/metanorma/iho.rb
-- lib/metanorma/iho/fonts_manifest.yaml
 - lib/metanorma/iho/processor.rb
 - lib/metanorma/iho/version.rb
 - metanorma-iho.gemspec
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: metanorma-iho lets you write IHO in AsciiDoc.

data/lib/metanorma/iho/fonts_manifest.yaml

@@ -1,8 +0,0 @@
----
-Source Sans Pro:
-- Light
-Source Serif Pro:
-Source Code Pro:
-- Light
-Source Han Sans:
-FiraCode: