metanorma 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c62d15c313b6595ca184016faa8f0996de7d1d8f1321e932e6adc89d230682d
-  data.tar.gz: f13f182618c3fec66f42e412bfe3d4baa142b877421458fb2555912ce077f8e5
+  metadata.gz: 504b901a50469dec68785b7c3cb207e287757a7b2a86394843210dd90b8703ed
+  data.tar.gz: '097ecbfebaa22181ecbb33330d4d5a8b609a24bf56d3df882a4a50504324ba17'
 SHA512:
-  metadata.gz: 3d7e934fa1d1f0348a9877f25e037294e09513a3df04873ec6394b908d443cb2152480bd14c3e5948071657a6c4bcee2907964b8a2b408c7bb0d67a3f99e37c5
-  data.tar.gz: e1e626b4795c18b5a934262bc37faf0c4fe997832661f73e27e852f6bf66f67bde8c2b2edc86343463e3fde70eefd722e9af19fca186957761048193c70fc29b
+  metadata.gz: dc055a69f2d0ab1e130ea9692e438df7e8547529191b601581ae7547b410c03e2cd35b54fb1f574dfad9795c4e3113f2e60dea924a16be4537a30c6dd6d13cd1
+  data.tar.gz: 609f4b00335d2ded1b480edf5839518c3b2ee7d857a063a1b5dab8dc0a0d5a2b2232b6ae5502b92593c51bbb5cb53d3c969f86edfac804dc6e6aff24aa4cc1e1

data/lib/metanorma/collection_renderer.rb

@@ -119,7 +119,7 @@ module Metanorma
       end
 
       def attr(key)
-        if key == "fonts-manifest" && @font_locations
+        if key == "fonts-manifest" && @fonts_manifest
           @fonts_manifest
         end
       end

data/lib/metanorma/input/asciidoc.rb

@@ -60,7 +60,7 @@ module Metanorma
         %w(htmlstylesheet htmlcoverpage htmlintropage scripts
            scripts-override scripts-pdf wordstylesheet i18nyaml
            standardstylesheet header wordcoverpage wordintropage
-           ulstyle olstyle htmlstylesheet-override bare
+           ulstyle olstyle htmlstylesheet-override bare toclevels
            htmltoclevels doctoclevels sectionsplit base-asset-path
            body-font header-font monospace-font title-font
            align-cross-elements wordstylesheet-override ieee-dtd
@@ -68,38 +68,50 @@ module Metanorma
            pdf-owner-password pdf-allow-copy-content pdf-allow-edit-content
            pdf-allow-assemble-document pdf-allow-edit-annotations
            pdf-allow-print pdf-allow-print-hq pdf-allow-fill-in-forms
-           toc-figures toc-tables toc-recommendations fonts
-           font-license-agreement pdf-allow-access-content
+           fonts font-license-agreement pdf-allow-access-content
            pdf-encrypt-metadata iso-word-template document-scheme
-           localize-number).freeze
+           localize-number iso-word-bg-strip-color
+           modspec-identifier-base).freeze
+
+      EMPTY_ADOC_OPTIONS_DEFAULT_TRUE =
+        %w(data-uri-image suppress-asciimath-dup use-xinclude).freeze
+
+      EMPTY_ADOC_OPTIONS_DEFAULT_FALSE =
+        %w(hierarchical-assets break-up-urls-in-tables toc-figures
+           toc-tables toc-recommendations).freeze
+
+      def attr_name_normalise(name)
+        name.gsub(/-/, "").sub(/override$/, "_override").sub(/pdf$/, "_pdf")
+          .to_sym
+      end
 
       def extract_options(file)
         header = file.sub(/\n\n.*$/m, "\n")
         ret = ADOC_OPTIONS.each_with_object({}) do |w, acc|
           m = /\n:#{w}: ([^\n]+)\n/.match(header) or next
-          acc[w.gsub(/-/, "").sub(/override$/, "_override")
-            .sub(/pdf$/, "_pdf").to_sym] = m[1]
+          acc[attr_name_normalise(w)] = m[1]
         end
-        /\n:data-uri-image: (?<datauriimage>[^\n]+)\n/ =~ header
-        /\n:(?<hier_assets>hierarchical-assets:[^\n]*)\n/ =~ header
-        /\n:(?<use_xinclude>use-xinclude:[^\n]*)\n/ =~ header
-        /\n:(?<break_up>break-up-urls-in-tables:[^\n]*)\n/ =~ header
-        /\n:suppress-asciimath-dup: (?<suppress_asciimath_dup>[^\n]+)\n/ =~ header
-
-        defined?(hier_assets) and
-          hier_assets = empty_attr(hier_assets, "hierarchical-assets")
-        defined?(use_xinclude) and
-          use_xinclude = empty_attr(use_xinclude, "use-xinclude")
-        defined?(break_up) and
-          break_up = empty_attr(break_up, "break-up-urls-in-tables")
-        ret.merge(
-          datauriimage: defined?(datauriimage) ? datauriimage != "false" : true,
-          suppressasciimathdup: defined?(suppress_asciimath_dup) ? suppress_asciimath_dup != "false" : nil,
-          hierarchical_assets: defined?(hier_assets) ? hier_assets : nil,
-          use_xinclude: defined?(use_xinclude) ? use_xinclude : nil,
-          break_up_urls_in_tables: defined?(break_up) ? break_up : nil,
-        ).compact
+        ret2 = EMPTY_ADOC_OPTIONS_DEFAULT_TRUE.each_with_object({}) do |w, acc|
+          m = /\n:#{w}:([^\n]*)\n/.match(header) || [nil, "true"]
+          #require "debug" binding.b if w == "break-up-urls-in-tables"
+          acc[attr_name_normalise(w)] = (m[1].strip != "false")
+        end
+        ret3 = EMPTY_ADOC_OPTIONS_DEFAULT_FALSE.each_with_object({}) do |w, acc|
+          m = /\n:#{w}:([^\n]*)\n/.match(header) || [nil, "false"]
+          #require "debug" binding.b if w == "break-up-urls-in-tables"
+          acc[attr_name_normalise(w)] = !["false"].include?(m[1].strip)
+        end
+        ret.merge(ret2).merge(ret3).compact
       end
+
+      #         ret.merge(
+      #           datauriimage: defined?(datauriimage) ? datauriimage != "false" : true,
+      #           suppressasciimathdup: defined?(suppress_asciimath_dup) ? suppress_asciimath_dup != "false" : nil,
+      #           hierarchical_assets: defined?(hier_assets) ? hier_assets : nil,
+      #           use_xinclude: defined?(use_xinclude) ? use_xinclude : nil,
+      #           break_up_urls_in_tables: defined?(break_up) ? break_up : nil,
+      #         ).compact
+      #       end
     end
   end
 end

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.5.1".freeze
+  VERSION = "1.5.3".freeze
 end

data/metanorma.gemspec

@@ -14,13 +14,14 @@ Gem::Specification.new do |spec|
   spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test|spec|features|bin|.github)/}) \
+    || f.match(%r{Rakefile|bin/rspec})
   end
   spec.extra_rdoc_files = %w[README.adoc CHANGELOG.adoc LICENSE.txt]
   spec.bindir        = "bin"
   # spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   spec.add_runtime_dependency "asciidoctor"
   spec.add_runtime_dependency "fontist", ">= 1.14.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -258,10 +258,6 @@ extra_rdoc_files:
 - CHANGELOG.adoc
 - LICENSE.txt
 files:
-- ".github/workflows/dependent_repos.env"
-- ".github/workflows/notify.yml"
-- ".github/workflows/rake.yml"
-- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
@@ -271,12 +267,6 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.adoc
-- Rakefile
-- bin/console
-- bin/metanorma-pdf.js
-- bin/rasterize.js
-- bin/rspec
-- bin/setup
 - lib/metanorma.rb
 - lib/metanorma/asciidoctor_extensions.rb
 - lib/metanorma/asciidoctor_extensions/glob_include_processor.rb
@@ -314,14 +304,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Metanorma is the standard of standards; the metanorma gem allows you to create

data/.github/workflows/dependent_repos.env

@@ -1,2 +0,0 @@
-ORGANISATION=metanorma
-DEPENDENT_REPOS="metanorma-docker"

data/.github/workflows/notify.yml

@@ -1,47 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: notify
-
-on:
-  repository_dispatch:
-    types: [ notify ]
-
-jobs:
-  notify:
-    name: Notify dependent repos
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Trigger repositories
-        env:
-          GH_USERNAME: metanorma-ci
-          GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-        run: |
-          curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
-          [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
-          CLIENT_PAYLOAD=$(cat <<EOF
-          "{ "ref": "${{ github.event.client_payload.ref }}", "repo": "${GITHUB_REPOSITORY}" }"
-          EOF
-          )
-          for repo in $TEMPLATE_REPOS" $SAMPLES_REPOS"
-          do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
-          done
-
-      - name: Trigger release repositories
-        if: github.event.client_payload.ref == 'refs/heads/master' || startsWith(github.event.client_payload.ref, 'refs/tags/v')
-        env:
-          GH_USERNAME: metanorma-ci
-          GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-        run: |
-          curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
-          [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
-          CLIENT_PAYLOAD=$(cat <<EOF
-          "{ "ref": "${{ github.event.client_payload.ref }}", "repo": "${GITHUB_REPOSITORY}" }"
-          EOF
-          )
-          for repo in $DEPENDENT_REPOS
-          do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
-          done

data/.github/workflows/rake.yml

@@ -1,15 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: rake
-
-on:
-  push:
-    branches: [ master, main ]
-    tags: [ v* ]
-  pull_request:
-
-jobs:
-  rake:
-    uses: metanorma/ci/.github/workflows/inkscape-rake.yml@main
-    secrets:
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -1,27 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: release
-
-on:
-  workflow_dispatch:
-    inputs:
-      next_version:
-        description: |
-          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
-        required: true
-        default: 'skip'
-  push:
-    tags: [ v* ]
-
-jobs:
-  release:
-    uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
-    with:
-      next_version: ${{ github.event.inputs.next_version }}
-      release_command: rake release
-      bundler_cache: false
-      post_install: gem install bundler rake rspec
-    secrets:
-      rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "metanorma"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/metanorma-pdf.js

@@ -1,39 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-const puppeteer = require('puppeteer');
-
-const args = () => {
-  let args = ['--no-sandbox', '--disable-setuid-sandbox', '--headless'];
-  if (!process.platform.startsWith('win')) {
-    args << '--single-process';
-  }
-  return {args};
-}
-
-const createPdf = async() => {
-  let browser;
-  let exitCode = 0;
-  try {
-    browser = await puppeteer.launch(args());
-    const page = await browser.newPage();
-    await page.goto(process.argv[2], {
-      waitUntil: 'networkidle0',
-      timeout: 120000 //ms
-    });
-    await page.pdf({
-      path: process.argv[3],
-      format: 'A4'
-    });
-  } catch (err) {
-    console.error(err.message);
-    console.error(err.stack);
-    exitCode = 1;
-  } finally {
-    if (browser) {
-      browser.close();
-    }
-    process.exit(exitCode);
-  }
-};
-createPdf();

data/bin/rasterize.js

@@ -1,49 +0,0 @@
-"use strict";
-var page = require('webpage').create(),
-    system = require('system'),
-    address, output, size, pageWidth, pageHeight;
-
-if (system.args.length < 3 || system.args.length > 5) {
-    console.log('Usage: rasterize.js URL filename [paperwidth*paperheight|paperformat] [zoom]');
-    console.log('  paper (pdf output) examples: "5in*7.5in", "10cm*20cm", "A4", "Letter"');
-    console.log('  image (png/jpg output) examples: "1920px" entire page, window width 1920px');
-    console.log('                                   "800px*600px" window, clipped to 800x600');
-    phantom.exit(1);
-} else {
-    address = system.args[1];
-    output = system.args[2];
-    page.viewportSize = { width: 600, height: 600 };
-    if (system.args.length > 3 && system.args[2].substr(-4) === ".pdf") {
-        size = system.args[3].split('*');
-        page.paperSize = size.length === 2 ? { width: size[0], height: size[1], margin: '0px' }
-                                           : { format: system.args[3], orientation: 'portrait', margin: '1cm' };
-    } else if (system.args.length > 3 && system.args[3].substr(-2) === "px") {
-        size = system.args[3].split('*');
-        if (size.length === 2) {
-            pageWidth = parseInt(size[0], 10);
-            pageHeight = parseInt(size[1], 10);
-            page.viewportSize = { width: pageWidth, height: pageHeight };
-            page.clipRect = { top: 0, left: 0, width: pageWidth, height: pageHeight };
-        } else {
-            console.log("size:", system.args[3]);
-            pageWidth = parseInt(system.args[3], 10);
-            pageHeight = parseInt(pageWidth * 3/4, 10); // it's as good an assumption as any
-            console.log ("pageHeight:",pageHeight);
-            page.viewportSize = { width: pageWidth, height: pageHeight };
-        }
-    }
-    if (system.args.length > 4) {
-        page.zoomFactor = system.args[4];
-    }
-    page.open(address, function (status) {
-        if (status !== 'success') {
-            console.log('Unable to load the address!');
-            phantom.exit(1);
-        } else {
-            window.setTimeout(function () {
-                page.render(output);
-                phantom.exit();
-            }, 200);
-        }
-    });
-}

data/bin/rspec

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here