metanorma-generic 1.7.3 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c325e9aa02cddaf26372e0199b21c55338e5abff1b8a1e8a25007567fb03b799
-  data.tar.gz: b6fc284631a359dc78e4f83744d1fbda26211b1692d74417b5a45af254b0266b
+  metadata.gz: 4ecff55e1f5665be747c3502c80865395444c81341f884f886fdd2962e769824
+  data.tar.gz: b6ca5204417ec9fd4a55010a85dfdc9379747aab1519254762410c72bca330e7
 SHA512:
-  metadata.gz: a0496b1c8cb2ef30e8265d08eaf4c0206f110a6687f6e2acc7d9e172e2e1975e266f9740ac628fa492d5b151ecad4a171653f9cc8704625e76359676231b6364
-  data.tar.gz: 3a4fd80dfd4fd4540950837182bf860676d4ea15f6a09cc207f64ab2025c2a54b0fa9aa84ba324585f6dcee41632ff38117b00a1dc8594c6d215e8b6779cc0e8
+  metadata.gz: 36b0019a33b5900b6d3ecd5392fc8f99e061f3d0f0e1b58e504095d002db8b44efb6ec11fb518468a6398a4f89d0da88f824bf799ccc7fbe3edec1b27ac6bc74
+  data.tar.gz: 425d8153f56479453f61c760799fdf2625a0ee9bb78e34fd8dfff3ca4d54eb793810bee43bb9faf1d41a8930a9aa220a2fbc652f312a5973dbe42cab4161021a

data/.github/workflows/rake.yml

@@ -36,7 +36,7 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
 
-      - uses: actions/cache@v1
+      - uses: actions/cache@v2
         with:
           path: vendor/bundle
           key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
@@ -48,15 +48,14 @@ jobs:
 
       - 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 }}
+          authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
           context: 'tests-passed-successfully'
           description: 'Tests passed successfully'
           state: 'success'

data/lib/asciidoctor/generic/converter.rb

@@ -21,6 +21,7 @@ module Asciidoctor
 
        def baselocation(loc)
         return nil if loc.nil?
+        return loc
         File.expand_path(File.join(File.dirname(
           self.class::_file || __FILE__), "..", "..", "..", loc))
       end

data/lib/isodoc/generic/html_convert.rb

@@ -32,7 +32,11 @@ module IsoDoc
             options[:script] == "Hans" ? '"SimHei",sans-serif' : 
             configuration.html_headerfont || '"Overpass",sans-serif'
           ),
-          monospacefont: configuration.html_monospacefont || '"Space Mono",monospace'
+          monospacefont: configuration.html_monospacefont || '"Space Mono",monospace',
+          normalfontsize: configuration.html_normalfontsize,
+          smallerfontsize: configuration.html_smallerfontsize,
+          footnotefontsize: configuration.html_footnotefontsize,
+          monospacefontsize: configuration.html_monospacefontsize,
         }.transform_values { |v| v&.empty? ? nil : v }
       end
 
@@ -51,12 +55,6 @@ module IsoDoc
         }.transform_values { |v| v&.empty? ? nil : v }
       end
 
-=begin
-      def configuration
-        Metanorma::Generic.configuration
-      end
-=end
-
       def googlefonts
         return unless configuration.webfont
         Array(configuration.webfont).map do |x|

data/lib/isodoc/generic/utils.rb

@@ -12,6 +12,7 @@ module IsoDoc
       def baselocation(loc)
         return nil if loc.nil?
         return "" if loc.empty?
+        return loc
         f = defined?(self.class::_file) ? (self.class::_file || __FILE__) :
           __FILE__
         File.expand_path(File.join(

data/lib/isodoc/generic/word_convert.rb

@@ -31,7 +31,11 @@ module IsoDoc
             options[:script] == "Hans" ? '"SimHei",sans-serif' : 
             configuration.word_headerfont ||  '"Arial",sans-serif'
           ),
-          monospacefont:  configuration.word_monospacefont ||  '"Courier New",monospace'
+          monospacefont:  configuration.word_monospacefont ||  '"Courier New",monospace',
+          normalfontsize: configuration.word_normalfontsize,
+          smallerfontsize: configuration.word_smallerfontsize,
+          footnotefontsize: configuration.word_footnotefontsize,
+          monospacefontsize: configuration.word_monospacefontsize,
         }.transform_values { |v| v&.empty? ? nil : v  }
       end
 

data/lib/metanorma/generic.rb

@@ -31,6 +31,10 @@ module Metanorma
         html_bodyfont
         html_headerfont
         html_monospacefont
+        html_normalfontsize
+        html_monospacefontsize
+        html_smallerfontsize
+        html_footnotefontsize
         metadata_extensions
         metanorma_name
         normref_titles
@@ -51,9 +55,33 @@ module Metanorma
         word_bodyfont
         word_headerfont
         word_monospacefont
+        word_normalfontsize
+        word_monospacefontsize
+        word_smallerfontsize
+        word_footnotefontsize
         xml_root_tag
       ].freeze
 
+      def filepath_attrs
+        return %i[
+          i18nyaml
+          boilerplate
+          logo_path
+          logo_paths
+          header
+          htmlcoverpage
+          htmlintropage
+          htmlstylesheet
+          scripts
+          scripts_pdf
+          standardstylesheet
+          validate_rng_file
+          wordcoverpage
+          wordintropage
+          wordstylesheet
+        ]
+      end
+
       attr_accessor(*CONFIG_ATTRS)
 
       class << self
@@ -84,17 +112,47 @@ module Metanorma
       end
 
       def set_default_values_from_yaml_file(config_file)
+        root_path = File.dirname(self.class::_file || __FILE__)
         default_config_options = YAML.load(File.read(config_file))
         if default_config_options["doctypes"]&.is_a? Array
           default_config_options["doctypes"] = default_config_options["doctypes"].
             each_with_object({}) { |k, m| m[k] = nil }
         end
         CONFIG_ATTRS.each do |attr_name|
-          instance_variable_set("@#{attr_name}", default_config_options[attr_name.to_s])
+          value = default_config_options[attr_name.to_s]
+          if value && filepath_attrs.include?(attr_name)
+            value = absolute_path(value, root_path)
+          end
+
+          instance_variable_set("@#{attr_name}", value)
+        end
+      end
+
+      def blank?(v)
+        v.nil? || v.respond_to?(:empty?) && v.empty?
+      end
+
+      def absolute_path(value, root_path)
+        if value.is_a? Hash then absolute_path1(value, root_path)
+        elsif value.is_a? Array
+          value.reject { |a| blank?(a) }.each_with_object([]) do |v1, g|
+            g << absolute_path(v1, root_path)
+          end
+        elsif value.is_a?(String) && !value.empty?
+          File.join(root_path, "..", "..", value)
+        else
+          value
+        end
+      end
+
+      def absolute_path1(h, pref)
+        h.reject { |k, v| blank?(v) }.each_with_object({}) do |(k, v), g|
+          g[k] = absolute_path(v, pref)
         end
       end
     end
 
+
     class << self
       extend Forwardable
 

data/lib/metanorma/generic/fonts_manifest.yaml

@@ -0,0 +1,5 @@
+---
+Source Sans Pro:
+Overpass:
+Space Mono:
+Arial:

data/lib/metanorma/generic/processor.rb

@@ -2,21 +2,6 @@ require "metanorma/processor"
 
 module Metanorma
   module Generic
-    def self.fonts_used
-      {
-        html: [
-          configuration.html_bodyfont || "Overpass", configuration.html_headerfont || "Overpass", 
-          configuration.html_monospacefont || "Space Mono"
-        ].uniq,
-        doc: [
-          configuration.word_bodyfont || "Overpass", configuration.word_headerfont || "Overpass", 
-          configuration.word_monospacefont || "Space Mono"].uniq,
-        pdf: [
-          configuration.word_bodyfont || "Overpass", configuration.word_headerfont || "Overpass", 
-          configuration.word_monospacefont || "Space Mono"].uniq,
-      }
-    end
-
     class Processor < Metanorma::Processor
       def configuration
         Metanorma::Generic.configuration

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "1.7.3"
+    VERSION = "1.8.0"
   end
 end

data/metanorma-generic.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "metanorma-standoc", "~> 1.6.0"
-  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "isodoc", "~> 1.3.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "2.4.0"

data/metanorma.yml.example

@@ -14,6 +14,10 @@ htmlstylesheet: /metanorma-mine/lib/isodoc/mine/html/htmlstyle.scss
 html_bodyfont: '"Source Sans Pro",sans-serif'
 html_headerfont: '"Source Sans Pro",sans-serif'
 html_monospacefont: '"Source Code Pro",monospace'
+html_normalfontsize: "1.0em"
+html_monospacefontsize: "0.8em"
+html_smallerfontsize: "0.9em"
+html_footnotefontsize: "0.8em"
 scripts: /metanorma-mine/lib/isodoc/mine/html/scripts.html
 scripts_pdf: /metanorma-mine/lib/isodoc/mine/html/scripts.prd.html
 standardstylesheet: /metanorma-mine/lib/isodoc/mine/html/
@@ -24,6 +28,10 @@ wordstylesheet: /metanorma-mine/lib/isodoc/mine/html/wordstyle.scss
 word_bodyfont: '"Source Sans Pro","Arial",sans-serif'
 word_headerfont: '"Source Sans Pro","Arial",sans-serif'
 word_monospacefont: '"Source Code Pro",monospace'
+word_normalfontsize: "12.0pt"
+word_monospacefontsize: "11.0pt"
+word_smallerfontsize: "10.0pt"
+word_footnotefontsize: "9.0pt"
 docid_template: "{{ organization_name_short }} {{ docnumeric }}"
 metadata_extensions:
   - security

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.8.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +262,7 @@ files:
 - lib/isodoc/generic/xref.rb
 - lib/metanorma-generic.rb
 - lib/metanorma/generic.rb
+- lib/metanorma/generic/fonts_manifest.yaml
 - lib/metanorma/generic/processor.rb
 - lib/metanorma/generic/version.rb
 - metanorma-generic.gemspec