metanorma-generic 2.6.4 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a12ea05bf58a67d2a94e6a23de2071f6ee646b9f9d2707c0638200cf7775f404
-  data.tar.gz: aceb04e90988c48eded4ad6ec3ce979ac7cbf46d474823634cac43fa7263d7c9
+  metadata.gz: b3436616b2990529b36337c88267a1bb486c784760ee9e5dd44e8261d16d3a91
+  data.tar.gz: d203b11d9d077960844d90a4245c19fcfdd533c917bc6fbda7d2600fa3c0a8eb
 SHA512:
-  metadata.gz: a55c8445de4ef47a173c1d019b1325da3ee62151e986bfda30f5988b3d35338ef6a99ee07e79dd9ab838669adfc135b11036ec084609e2eb56d3f4be1a522a2e
-  data.tar.gz: d9d7b74bd49c7ab50e72b456a4467f453c667dffd515a864e83c8113dd5bbc8bf00f56040b72426f8b8e03b0cb90d484483d2010689cda4524c55517b428d0bb
+  metadata.gz: 36d17d3720c65830aecaaec84e9cfda717044f1024112ed52cb2bea93ce65db0a31f3e55da1f7637bf2306b11bf0d69cc18b5e77818952aea9b6bdad1b1470e8
+  data.tar.gz: 561e57900505474883823a8a6c7d7fb41b5fa6c49ae04ec284ba14d35dad45f520fa36881cc30dce6bc1298293c85f3ec1f3b2a2c20b3dc659d66308e739598f

data/lib/isodoc/generic/html/htmlstyle.scss

@@ -40,7 +40,7 @@ main {margin: 0 3em 0 6em;}
  }
 
 nav {
-  @include sidebarNav(#f7f7f7, 323px, 45px);
+  @include sidebarNav(#f7f7f7, 323px, 30px);
 }
 
 #toggle {

data/lib/isodoc/generic/pdf_convert.rb

@@ -0,0 +1,21 @@
+require_relative "base_convert"
+require "metanorma-generic"
+require "isodoc"
+
+module IsoDoc
+  module Generic
+    class PdfConvert < IsoDoc::XslfoPdfConvert
+      def initialize(options)
+        @libdir = File.dirname(__FILE__)
+        super
+      end
+
+      def pdf_stylesheet(docxml)
+        configuration.pdf_stylesheet
+      end
+
+      include BaseConvert
+      include Init
+    end
+  end
+end

data/lib/isodoc/generic.rb

@@ -1,6 +1,7 @@
 require "isodoc/generic/metadata"
 require "isodoc/generic/html_convert"
 require "isodoc/generic/word_convert"
+require "isodoc/generic/pdf_convert"
 require "isodoc/generic/presentation_xml_convert"
 
 module IsoDoc

data/lib/metanorma/generic/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.2 -->
+<!-- VERSION v1.3.3 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -331,9 +331,9 @@
       <zeroOrMore>
         <ref name="table-note"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="source"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="FigureAttr">
       <optional>
@@ -380,9 +380,9 @@
       <zeroOrMore>
         <ref name="note"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="source"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="source">
       <element name="source">

data/lib/metanorma/generic/processor.rb

@@ -21,6 +21,10 @@ module Metanorma
         )
       end
 
+      def fonts_manifest
+        configuration&.fonts_manifest
+      end
+
       def version
         "Metanorma::Generic #{Metanorma::Generic::VERSION}"
       end

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "2.6.4".freeze
+    VERSION = "2.7.0".freeze
   end
 end

data/lib/metanorma/generic.rb

@@ -21,6 +21,7 @@ module Metanorma
         docid_template
         doctypes
         default_doctype
+        fonts_manifest
         i18nyaml
         logo_path
         logo_paths
@@ -60,13 +61,14 @@ module Metanorma
         word_smallerfontsize
         word_footnotefontsize
         xml_root_tag
+        pdf_stylesheet
       ].freeze
 
       def filepath_attrs
-        %i[i18nyaml boilerplate logo_path logo_paths header
+        %i[i18nyaml boilerplate logo_path logo_paths header boilerplate
            htmlcoverpage htmlintropage htmlstylesheet scripts scripts_pdf
            standardstylesheet validate_rng_file wordcoverpage wordintropage
-           wordstylesheet]
+           wordstylesheet pdf_stylesheet]
       end
 
       attr_accessor(*CONFIG_ATTRS)
@@ -116,7 +118,8 @@ module Metanorma
       end
 
       def set_default_values_from_yaml_file_prep(config_file)
-        root_path = File.dirname(self.class::_file || __FILE__)
+        # root_path = File.dirname(self.class::_file || __FILE__)
+        root_path = File.dirname(config_file)
         default_config_options =
           YAML.safe_load(File.read(config_file, encoding: "UTF-8"))
         default_config_options["doctypes"].is_a? Array and
@@ -133,12 +136,10 @@ module Metanorma
 
       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)
+        elsif value.is_a? Array then absolute_path1_array(value, root_path)
+        elsif value.is_a?(String) && !value.empty? &&
+            !Pathname.new(value).absolute?
+          Pathname.new(File.join(root_path, value)).cleanpath.to_s
         else value
         end
       end
@@ -148,6 +149,12 @@ module Metanorma
           absolute_path(v, pref)
         end
       end
+
+      def absolute_path1_array(value, pref)
+        value.reject { |a| blank?(a) }.each_with_object([]) do |v1, g|
+          g << absolute_path(v1, pref)
+        end
+      end
     end
 
     class << self

data/metanorma-generic.gemspec

@@ -25,9 +25,9 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.8.4"
+  spec.add_dependency "metanorma-standoc", "~> 2.9.3"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
@@ -39,4 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
+  spec.add_development_dependency "xml-c14n"
 end

data/metanorma.yml.example

@@ -25,6 +25,7 @@ header: /metanorma-mine/lib/isodoc/mine/html/header.html
 wordcoverpage: /metanorma-mine/lib/isodoc/mine/html/word_mine_titlepage.html
 wordintropage: /metanorma-mine/lib/isodoc/mine/html/word_mine_intro.html
 wordstylesheet: /metanorma-mine/lib/isodoc/mine/html/wordstyle.scss
+pdf_stylesheet: /metanorma-mine/lib/isodoc/mine/html/mine.xsl
 word_bodyfont: '"Source Sans Pro","Arial",sans-serif'
 word_headerfont: '"Source Sans Pro","Arial",sans-serif'
 word_monospacefont: '"Source Code Pro",monospace'
@@ -72,3 +73,6 @@ normref_titles:
   - Normative references
 bibliography_titles:
   - Bibliography
+fonts_manifest:
+  - Font1
+  - Font2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-03 00:00:00.000000000 Z
+date: 2024-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.4
+        version: 2.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.4
+        version: 2.9.3
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: xml-c14n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Metanorma template gem for customisation. This gem is meant to be customised for any downstream use.
 
@@ -201,6 +215,7 @@ files:
 - lib/isodoc/generic/i18n.rb
 - lib/isodoc/generic/init.rb
 - lib/isodoc/generic/metadata.rb
+- lib/isodoc/generic/pdf_convert.rb
 - lib/isodoc/generic/presentation_xml_convert.rb
 - lib/isodoc/generic/utils.rb
 - lib/isodoc/generic/word_convert.rb
@@ -233,7 +248,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="