metanorma-generic 1.7.3 → 1.10.0

data/lib/isodoc/generic/html_convert.rb

@@ -25,14 +25,18 @@ module IsoDoc
       def default_fonts(options)
         {
           bodyfont: (
-            options[:script] == "Hans" ? '"SimSun",serif' :
+            options[:script] == "Hans" ? '"Source Han Sans",serif' :
             configuration.html_bodyfont || '"Overpass",sans-serif'
           ),
           headerfont: (
-            options[:script] == "Hans" ? '"SimHei",sans-serif' : 
+            options[:script] == "Hans" ? '"Source Han Sans",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
 
@@ -44,19 +48,12 @@ module IsoDoc
           html_doc_path("html_generic_titlepage.html"),
           htmlintropage: baselocation(configuration.htmlintropage) ||
           html_doc_path("html_generic_intro.html"),
-          scripts: baselocation(configuration.scripts) ||
-          html_doc_path("scripts.html"),
+          scripts: baselocation(configuration.scripts),
           i18nyaml: (configuration.i18nyaml.is_a?(String) ? 
                      baselocation(configuration.i18nyaml) : nil)
         }.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/pdf_convert.rb

@@ -22,9 +22,9 @@ module IsoDoc
 
        def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif'
+          bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif'
                      : configuration.html_bodyfont || '"Overpass",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+          headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' :
                        configuration.html_headerfont || '"Overpass",sans-serif'),
           monospacefont: configuration.html_monospacefont || '"Space Mono",monospace'
         }.transform_values { |v| v&.empty? ? nil : v }

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

@@ -24,14 +24,18 @@ module IsoDoc
       def default_fonts(options)
         {
           bodyfont: (
-            options[:script] == "Hans" ? '"SimSun",serif' : 
+            options[:script] == "Hans" ? '"Source Han Sans",serif' : 
             configuration.word_bodyfont || '"Arial",sans-serif'
           ),
           headerfont: (
-            options[:script] == "Hans" ? '"SimHei",sans-serif' : 
+            options[:script] == "Hans" ? '"Source Han Sans",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
@@ -42,31 +27,15 @@ module Metanorma
 
       def extract_options(file)
         head = file.sub(/\n\n.*$/m, "\n")
-        /\n:htmlstylesheet: (?<htmlstylesheet>[^\n]+)\n/ =~ head
-        /\n:htmlcoverpage: (?<htmlcoverpage>[^\n]+)\n/ =~ head
-        /\n:htmlintropage: (?<htmlintropage>[^\n]+)\n/ =~ head
-        /\n:scripts: (?<scripts>[^\n]+)\n/ =~ head
-        /\n:wordstylesheet: (?<wordstylesheet>[^\n]+)\n/ =~ head
-        /\n:standardstylesheet: (?<standardstylesheet>[^\n]+)\n/ =~ head
-        /\n:header: (?<header>[^\n]+)\n/ =~ head
-        /\n:wordcoverpage: (?<wordcoverpage>[^\n]+)\n/ =~ head
-        /\n:wordintropage: (?<wordintropage>[^\n]+)\n/ =~ head
-        /\n:ulstyle: (?<ulstyle>[^\n]+)\n/ =~ head
-        /\n:olstyle: (?<olstyle>[^\n]+)\n/ =~ head
-        new_options = {
-          htmlstylesheet: defined?(htmlstylesheet) ? htmlstylesheet : nil,
-          htmlcoverpage: defined?(htmlcoverpage) ? htmlcoverpage : nil,
-          htmlintropage: defined?(htmlintropage) ? htmlintropage : nil,
-          scripts: defined?(scripts) ? scripts : nil,
-          wordstylesheet: defined?(wordstylesheet) ? wordstylesheet : nil,
-          standardstylesheet: defined?(standardstylesheet) ? standardstylesheet : nil,
-          header: defined?(header) ? header : nil,
-          wordcoverpage: defined?(wordcoverpage) ? wordcoverpage : nil,
-          wordintropage: defined?(wordintropage) ? wordintropage : nil,
-          ulstyle: defined?(ulstyle) ? ulstyle : nil,
-          olstyle: defined?(olstyle) ? olstyle : nil,
-        }.reject { |_, val| val.nil? }
-        super.merge(new_options)
+        ret = %w(htmlstylesheet htmlcoverpage htmlintropage scripts scripts-pdf
+                 wordstylesheet standardstylesheet header wordcoverpage
+                 wordintropage datauriimage htmltoclevels doctoclevels
+                 ulstyle olstyle htmlstylesheet-override sectionsplit
+                 wordstylesheet-override).each_with_object({}) do |w, acc|
+          m = /\n:#{w}: ([^\n]+)\n/.match(head) or next
+          acc[w.sub(/-/, "_").to_sym] = m[1]
+        end
+        super.merge(ret)
       end
 
       def output(isodoc_node, inname, outname, format, options={})

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "1.7.3"
+    VERSION = "1.10.0".freeze
   end
 end

data/metanorma-generic.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/generic/version"
 
@@ -10,9 +10,9 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "Metanorma template gem for customisation."
   spec.description   = <<~DESCRIPTION
-    Metanorma template gem for customisation. This gem is meant to be customised for any downstream use.
-    
-    Formerly known as metanorma-acme
+        Metanorma template gem for customisation. This gem is meant to be customised for any downstream use.
+    #{'    '}
+        Formerly known as metanorma-acme
   DESCRIPTION
 
   spec.homepage      = "https://github.com/metanorma/metanorma-generic"
@@ -27,18 +27,18 @@ 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 "isodoc", "~> 1.6.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.9.0"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
-  spec.add_dependency "isodoc", "~> 1.2.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", "~> 12.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "= 0.54.0"
+  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.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.10.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -25,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.3.4
 - !ruby/object:Gem::Dependency
-  name: ruby-jing
+  name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
-  name: isodoc
+  name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,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
@@ -142,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -166,18 +152,32 @@ dependencies:
         version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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: 0.54.0
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -206,10 +206,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: |
-  Metanorma template gem for customisation. This gem is meant to be customised for any downstream use.
-
-  Formerly known as metanorma-acme
+description: "    Metanorma template gem for customisation. This gem is meant to be
+  customised for any downstream use.\n    \n    Formerly known as metanorma-acme\n"
 email:
 - open.source@ribose.com
 executables: []
@@ -219,8 +217,6 @@ files:
 - ".github/workflows/rake.yml"
 - ".gitignore"
 - ".hound.yml"
-- ".rubocop.ribose.yml"
-- ".rubocop.tb.yml"
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -262,6 +258,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
@@ -285,7 +282,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 template gem for customisation.