metanorma 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9718bdc06f44f31d38c70b61597971da40b59aec92c34803fd90dee5a9737ef3
-  data.tar.gz: b4441a0010cc32bcea52b79533649bdde985f3a18054827f039346c1db0ba296
+  metadata.gz: cd65d9c42b99b4d3fb54c89a6189e736fc3927c48cd28da8b96e14ece003c194
+  data.tar.gz: 71d55f8449c7495a348c3acca4f2840562179cfebd96fdeaaf82b59965a4bf98
 SHA512:
-  metadata.gz: ed6c60df3dc293db574f7484e918deda0de754d23696e95834d30856bbc8c6a0917aebf15d0fad56e13bc7bfc5ef133b9554e92a679f949ac6495171bcc77025
-  data.tar.gz: 5c65c98e7194b3a366977a356d9f44fdbc3f2b2ebf4d871ee76b8f040f7ef824d540eccc82850c1e06908058210ed2cf2f58740388eee29fd63c977b6a80fa78
+  metadata.gz: 44b4797c97b3e306c9655c5073ec302563517d49982eba22a99fef10002c48763724309946c89edfd8617d954885b6a72bd7b4463e2a39148e174408f0428909
+  data.tar.gz: 4e77d61c5bb7078f05ce2eabe7a58ba2b451d0d6f257fb6c79855366ad7f4e63fe79bf7851646a5313ff044a5715e21c173d5302e42de6784cc73b4e5bf67f91

data/.github/workflows/rake.yml

@@ -4,7 +4,7 @@ name: rake
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, main  ]
     tags: [ v* ]
   pull_request:
 
@@ -32,24 +32,30 @@ jobs:
     steps:
       - uses: actions/checkout@master
 
-      - name: Use Ruby
-        uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
 
-      - name: Update gems
-        run: bundle install --jobs 4 --retry 3
+      - if: matrix.os == 'macos-latest'
+        run: brew install autoconf automake libtool
 
-      - name: Run specs
-        run: bundle exec rake
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
+          restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
+
+      - run: bundle config set path 'vendor/bundle'
+
+      - run: bundle install --jobs 4 --retry 3
+
+      - run: bundle exec rake
 
-  notify:
-    name: Trigger notify workflow
+  tests-passed:
     needs: rake
     runs-on: ubuntu-latest
     steps:
-      - name: Trigger notify workflow
+      - name: Trigger tests passed event
         uses: Sibz/github-status-action@v1
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}

data/lib/metanorma/collection_renderer.rb

@@ -33,6 +33,7 @@ module Metanorma
       @outdir = options[:output_folder]
       @coverpage = options[:coverpage]
       @format = options[:format]
+      @compile_options = options[:compile] || {}
 
       # list of files in the collection
       @files = read_files folder
@@ -164,9 +165,13 @@ module Metanorma
       xrefs = @isodoc.xref_init(@lang, @script, @isodoc, @isodoc.i18n, {})
       xrefs.parse xml
       xrefs.get.each do |k, v|
-        v[:label] && v[:type] || next
         ret[v[:type]] ||= {}
-        ret[v[:type]][v[:label]] = k
+        index = v[:container] || v[:label].nil? || v[:label].empty? ? 
+          UUIDTools::UUID.random_create.to_s : v[:label]
+        # Note: will only key clauses, which have unambiguous reference label in locality.
+        # Notes, examples etc with containers are just plunked agaisnt UUIDs, so that their
+        # IDs can at least be registered to be tracked as existing.
+        ret[v[:type]][index] = k
       end
       ret
     end
@@ -297,7 +302,6 @@ module Metanorma
       docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |b|
         docid = b&.at(ns("./docidentifier[@type = 'repository']"))&.text
         next unless docid && %r{^current-metanorma-collection/}.match(docid)
-
         update_bibitem(b, identifier)
         update_anchors(b, docxml, docid)
       end
@@ -311,18 +315,25 @@ module Metanorma
     # anchor given the locality, and insert it into the crossref
     def update_anchors(bib, docxml, _id) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       docid = bib&.at(ns("./docidentifier"))&.text
+      document_suffix = Asciidoctor::Standoc::Cleanup.to_ncname(docid)
       docxml.xpath("//xmlns:eref[@citeas = '#{docid}']").each do |e|
-        e.at(ns(".//locality[@type = 'anchor']")).nil? || next
-        ins = e.at(ns("./localityStack")) || next
-        type = ins&.at(ns("./locality/@type"))&.text
-        ref = ins&.at(ns("./locality/referenceFrom"))&.text
-        (anchor = @files[docid][:anchors][type][ref]) || next
-        ref_from = Nokogiri::XML::Node.new "referenceFrom", bib
-        ref_from.content = anchor.sub(/^_/, "")
-        locality = Nokogiri::XML::Node.new "locality", bib
-        locality[:type] = "anchor"
-        locality.add_child ref_from
-        ins << locality
+        if loc = e.at(ns(".//locality[@type = 'anchor']"))
+          ref = loc.at(ns("./referenceFrom")) || next
+          anchor = "#{ref.text}_#{document_suffix}"
+          next unless @files[docid][:anchors].inject([]) { |m, (_, x)| m+= x.values }.include?(anchor)
+          ref.content = anchor
+        else
+          ins = e.at(ns("./localityStack")) || next
+          type = ins&.at(ns("./locality/@type"))&.text
+          ref = ins&.at(ns("./locality/referenceFrom"))&.text
+          (anchor = @files[docid][:anchors][type][ref]) || next
+          ref_from = Nokogiri::XML::Node.new "referenceFrom", bib
+          ref_from.content = anchor.sub(/^_/, "")
+          locality = Nokogiri::XML::Node.new "locality", bib
+          locality[:type] = "anchor"
+          locality.add_child ref_from
+          ins << locality
+        end
       end
     end
 
@@ -337,7 +348,8 @@ module Metanorma
           f.close
           # warn "metanorma compile -x html #{f.path}"
           c = Compile.new
-          c.compile f.path, format: :asciidoc, extension_keys: @format
+          options = { format: :asciidoc, extension_keys: @format }.merge @compile_options
+          c.compile f.path, options
           @files[identifier][:outputs] = {}
           @format.each do |e|
             ext = c.processor.output_formats[e]

data/lib/metanorma/compile.rb

@@ -2,6 +2,9 @@ require "fileutils"
 require "nokogiri"
 require "htmlentities"
 
+require "fontist"
+require "fontist/manifest/install"
+
 module Metanorma
   class Compile
     # @return [Array<String>]
@@ -21,6 +24,7 @@ module Metanorma
       (file, isodoc = process_input(filename, options)) or return nil
       relaton_export(isodoc, options)
       extract(isodoc, options[:extract], options[:extract_type])
+      install_fonts(options)
       process_extensions(extensions, file, isodoc, options)
     end
 
@@ -63,21 +67,32 @@ module Metanorma
         Util.log("[metanorma] Error: Please specify a standard type: #{@registry.supported_backends}.", :error)
         return nil
       end
+
       stdtype = options[:type].to_sym
+      metanorma_flavor = "metanorma-#{stdtype}"
+
       unless @registry.supported_backends.include? stdtype
-        Util.log("[metanorma] Info: Loading `metanorma-#{stdtype}` gem for standard type `#{stdtype}`.", :info)
+        Util.log("[metanorma] Info: Loading `#{metanorma_flavor}` gem for standard type `#{stdtype}`.", :info)
       end
+
       begin
         require "metanorma-#{stdtype}"
-        Util.log("[metanorma] Info: gem `metanorma-#{stdtype}` loaded.", :info)
+        Util.log("[metanorma] Info: gem `#{metanorma_flavor}` loaded.", :info)
+
+      rescue Gem::ConflictError
+        Util.log("[metanorma] Error: Couldn't resolve dependencies for `metanorma-#{stdtype}`, Please add it to your Gemfile and run bundle install first", :error)
+        return false
+
       rescue LoadError
-        Util.log("[metanorma] Error: loading gem `metanorma-#{stdtype}` failed. Exiting.", :error)
+        Util.log("[metanorma] Error: loading gem `#{metanorma_flavor}` failed. Exiting.", :error)
         return false
       end
+
       unless @registry.supported_backends.include? stdtype
-        Util.log("[metanorma] Error: The `metanorma-#{stdtype}` gem still doesn't support `#{stdtype}`. Exiting.", :error)
+        Util.log("[metanorma] Error: The `#{metanorma_flavor}` gem still doesn't support `#{stdtype}`. Exiting.", :error)
         return false
       end
+
       true
     end
 
@@ -252,8 +267,54 @@ module Metanorma
       end
     end
 
+    def install_fonts(options)
+      if options[:"no-install-fonts"]
+        Util.log("[fontist] Skip font installation because" \
+          " --no-install-fonts argument passed", :debug)
+        return
+      end
+
+      if !@processor.respond_to?(:fonts_manifest) || @processor.fonts_manifest.nil?
+        Util.log("[fontist] Skip font installation because font_manifest is missing", :debug)
+        return
+      end
+
+      manifest = @processor.fonts_manifest
+      agree_to_terms = options[:"agree-to-terms"] || false
+      continue_without_fonts = options[:"continue-without-fonts"] || false
+
+      install_fonts_safe(manifest, agree_to_terms, continue_without_fonts)
+    end
+
     private
 
+    def install_fonts_safe(manifest, agree, continue)
+      fontist_install(manifest, agree)
+    rescue Fontist::Errors::LicensingError
+      if continue
+        Util.log("[fontist] Processing will continue without fonts installed", :debug)
+      else
+        Util.log("[fontist] Aborting without proper fonts installed," \
+          " make sure that you have set option --agree-to-terms", :fatal)
+      end
+    rescue Fontist::Errors::MissingFontError => e
+      font = /Font '([^']+)'/.match(e.to_s)[1]
+      Util.log("[fontist] '#{font}' font is not supported. " \
+        "Please report this issue at github.com/metanorma/metanorma-#{@processor.short}/issues" \
+        " to report this issue.", :info)
+    rescue Fontist::Errors::FormulaIndexNotFoundError
+      Util.log("[fontist] Missing formula index. Fetching it...", :debug)
+      Fontist::Formula.update_formulas_repo
+      fontist_install(manifest, agree)
+    end
+
+    def fontist_install(manifest, agree)
+      Fontist::Manifest::Install.from_hash(
+        manifest,
+        confirmation: agree ? "yes" : "no"
+      )
+    end
+
     # @param options [Hash]
     # @return [String]
     def change_output_dir(options)

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/metanorma.gemspec

@@ -28,6 +28,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'nokogiri'
   spec.add_runtime_dependency 'mn2pdf', "~> 1"
   spec.add_runtime_dependency 'pry'
+  spec.add_runtime_dependency 'fontist', '~> 1.8'
+
 # get relaton-cli to avoic circular reference with metanorma-standoc
   #spec.add_dependency "relaton-cli"
   #spec.add_dependency "metanorma-standoc", "~> 1.5.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fontist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement