metanorma-ribose 1.6.16 → 1.7.4

data/lib/isodoc/ribose/xref.rb

@@ -8,16 +8,21 @@ module IsoDoc
     class Xref < IsoDoc::Generic::Xref
       def annex_name_lbl(clause, num)
         obl = l10n("(#{@labels['inform_annex']})")
-        obl = l10n("(#{@labels['norm_annex']})") if clause["obligation"] == "normative"
+        clause["obligation"] == "normative" and
+          obl = l10n("(#{@labels['norm_annex']})")
         l10n("#{@labels['annex']} #{num}<br/>#{obl}")
       end
 
-      def initial_anchor_names(d)
-        preface_names(d.at(ns("//executivesummary")))
+      def initial_anchor_names(doc)
+        preface_names(doc.at(ns("//executivesummary")))
         super
+        introduction_names(doc.at(ns("//introduction")))
         sequential_asset_names(
-          d.xpath(ns("//preface/abstract | //foreword | //introduction | "\
-                     "//preface/clause | //acknowledgements | //executivesummary")))
+          doc.xpath(
+            ns("//preface/abstract | //foreword | //introduction | "\
+               "//preface/clause | //acknowledgements | //executivesummary"),
+          ),
+        )
       end
 
       def section_names1(clause, num, level)
@@ -25,12 +30,26 @@ module IsoDoc
           { label: num, level: level, xref: num }
         # subclauses are not prefixed with "Clause"
         i = Counter.new
-        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | ./references")).
-          each do |c|
+        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
+                        "./references")).each do |c|
           i.increment(c)
           section_names1(c, "#{num}.#{i.print}", level + 1)
         end
       end
+
+      # we can reference 0-number clauses in introduction
+      def introduction_names(clause)
+        return if clause.nil?
+
+        clause.at(ns("./clause")) and
+          @anchors[clause["id"]] = { label: "0", level: 1, type: "clause",
+                                     xref: clause.at(ns("./title"))&.text }
+        i = Counter.new
+        clause.xpath(ns("./clause")).each do |c|
+          i.increment(c)
+          section_names1(c, "0.#{i.print}", 2)
+        end
+      end
     end
   end
 end

data/lib/metanorma/ribose.rb

@@ -4,11 +4,7 @@ require "metanorma/ribose/processor"
 
 module Metanorma
   module Ribose
-
     class Configuration < Metanorma::Generic::Configuration
-      def initialize(*args)
-        super
-      end
     end
 
     class << self

data/lib/metanorma/ribose/processor.rb

@@ -11,7 +11,7 @@ module Metanorma
         super.merge(
           html: "html",
           doc: "doc",
-          pdf: "pdf"
+          pdf: "pdf",
         )
       end
 
@@ -28,16 +28,20 @@ module Metanorma
         "Metanorma::Ribose #{Metanorma::Ribose::VERSION}"
       end
 
-      def output(isodoc_node, inname, outname, format, options={})
+      def output(isodoc_node, inname, outname, format, options = {})
         case format
         when :html
-          IsoDoc::Ribose::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Ribose::HtmlConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :doc
-          IsoDoc::Ribose::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Ribose::WordConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :pdf
-          IsoDoc::Ribose::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Ribose::PdfConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :presentation
-          IsoDoc::Ribose::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Ribose::PresentationXMLConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/ribose/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ribose
-    VERSION = "1.6.16"
+    VERSION = "1.7.4".freeze
   end
 end

data/metanorma-ribose.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "metanorma/ribose/version"
 
@@ -28,16 +28,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency 'metanorma-generic', '~> 1.9.0'
+  spec.add_dependency "metanorma-generic", "~> 1.10.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
-  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1.5.2"
+  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
 end

data/metanorma.yml

@@ -5,6 +5,7 @@ document_namespace: https://www.metanorma.org/ns/rsd
 xml_root_tag: 'rsd-standard'
 logo_path: lib/isodoc/ribose/html/logo.png
 validate_rng_file: lib/asciidoctor/ribose/rsd.rng
+i18nyaml: lib/isodoc/ribose/i18n-en.yaml
 htmlcoverpage: lib/isodoc/ribose/html/html_rsd_titlepage.html
 htmlintropage: lib/isodoc/ribose/html/html_rsd_intro.html
 htmlstylesheet: lib/isodoc/ribose/html/htmlstyle.scss

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ribose
 version: !ruby/object:Gem::Version
-  version: 1.6.16
+  version: 1.7.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '9.1'
-- !ruby/object:Gem::Dependency
-  name: sassc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +212,7 @@ files:
 - lib/isodoc/ribose/html/wordstyle.css
 - lib/isodoc/ribose/html/wordstyle.scss
 - lib/isodoc/ribose/html_convert.rb
+- lib/isodoc/ribose/i18n-en.yaml
 - lib/isodoc/ribose/init.rb
 - lib/isodoc/ribose/metadata.rb
 - lib/isodoc/ribose/pdf_convert.rb