metanorma-acme 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9d601ee51c1830ca813d20b85309d021b0e5064c438f2000251070100d8d0ee
-  data.tar.gz: c49236b4c46b2b34f5bd1b1881516c56b36341d6bc6c4a96b21a5e0e5dceb49e
+  metadata.gz: 4d38983bff42e94e27d19ae72ab3c6809467ec137e44529b6bc1f06a7d56a746
+  data.tar.gz: f9f1e18030443e96ffb4f65c8d4d749db40528335a5fcdc9a91069c17fcd8b24
 SHA512:
-  metadata.gz: 8c5aaacf9c48a7507457962bf9521be83dc8f13f77a944231dcd519f88505cfc2d130f97b086225dd42a4ea9fdbb607ea153da32aab93e69c704e1853bd6da5d
-  data.tar.gz: c4a81ebdd99f0a73b331fb12378130c4b5a6c0dd8c731979bbc830e1f9d6fe1c43391a1cfcf6946d2f80b900ccae87871237716230749147dfc39d72da7ea59d
+  metadata.gz: 06dd665eae90ccec10bdfe15f57ecd3f6dca44b86f8fdcd8fe6fd13a4645cbbcddc5767f105c5c1e3d2efbfe22c661b8bcd19817159550622fb8bac18a864d61
+  data.tar.gz: 434734db9c61af0eb346e1eb38a604b9dc0fb4b8fd4dc883fdcc7ed53b2c9eb6bd359af589141fc1bee734d19ec506f1a0eda07462a752ec4d0955b1f231f6b0

data/lib/asciidoctor/acme/converter.rb

@@ -14,6 +14,11 @@ module Asciidoctor
 
       register_for "acme"
 
+       def baselocation(loc)
+        return nil if loc.nil?
+        File.expand_path(File.join(File.dirname(self.class::_file || __FILE__), "..", "..", "..", loc))
+      end
+
       def metadata_author(node, xml)
         xml.contributor do |c|
           c.role **{ type: "author" }
@@ -21,6 +26,7 @@ module Asciidoctor
             a.name configuration.organization_name_short
           end
         end
+        personal_author(node, xml)
       end
 
       def metadata_publisher(node, xml)
@@ -83,21 +89,25 @@ module Asciidoctor
         result = textcleanup(result)
         ret1 = cleanup(Nokogiri::XML(result))
         validate(ret1) unless @novalid
-        ret1.root.add_namespace(nil, configuration.document_namespace || XML_NAMESPACE)
+        ret1.root.add_namespace(nil, configuration.document_namespace ||
+                                XML_NAMESPACE)
         ret1
       end
 
       def doctype(node)
         d = node.attr("doctype")
-        unless %w{policy-and-procedures best-practices supporting-document report legal directives proposal standard}.include? d
-          warn "#{d} is not a legal document type: reverting to 'standard'"
+        unless %w{policy-and-procedures best-practices supporting-document
+          report legal directives proposal standard}.include? d
+          @log.add("Document Attributes", nil,
+                   "#{d} is not a legal document type: reverting to 'standard'")
           d = "standard"
         end
         d
       end
 
       def read_config_file(path_to_config_file)
-        Metanorma::Acme.configuration.set_default_values_from_yaml_file(path_to_config_file)
+        Metanorma::Acme.configuration.
+          set_default_values_from_yaml_file(path_to_config_file)
       end
 
       def document(node)
@@ -113,6 +123,7 @@ module Asciidoctor
           word_converter(node).convert filename unless node.attr("nodoc")
           pdf_converter(node).convert filename unless node.attr("nodoc")
         end
+        @log.write(@filename + ".err") unless @novalid
         @files_to_delete.each { |f| FileUtils.rm f }
         ret
       end
@@ -120,7 +131,7 @@ module Asciidoctor
       def validate(doc)
         content_validate(doc)
         schema_validate(formattedstr_strip(doc.dup),
-                        configuration.validate_rng_file ||
+                        baselocation(configuration.validate_rng_file) ||
                         File.join(File.dirname(__FILE__), "acme.rng"))
       end
 

data/lib/asciidoctor/acme/isodoc.rng

@@ -645,6 +645,11 @@
     <optional>
       <attribute name="script"/>
     </optional>
+    <optional>
+      <attribute name="inline-header">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="obligation">
         <choice>

data/lib/isodoc/acme/html/html_acme_titlepage.html

@@ -1,8 +1,8 @@
-<div class="document-stage-band" id='{{ stage | downcase | replace: " ", "-" }}-band'>
+<div class="document-stage-band" id="{{ stage | downcase | replace: ' ', '-' }}-band">
     <p class="document-stage">{{ stage }}</p>
 </div>
 
-<div class="document-type-band" id='{{ doctype | downcase | replace: " ", "-" }}-band'>
+<div class="document-type-band" id="{{ doctype | downcase | replace: ' ', '-' }}-band">
     <p class="document-type">Acme {{ doctype }}</p>
 </div>
 

data/lib/isodoc/acme/html_convert.rb

@@ -23,9 +23,11 @@ module IsoDoc
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Overpass",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Overpass",sans-serif'),
-          monospacefont: '"Space Mono",monospace'
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' 
+                     : configuration.html_bodyfont || '"Overpass",sans-serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : 
+                       configuration.html_headerfont || '"Overpass",sans-serif'),
+          monospacefont: configuration.html_monospacefont || '"Space Mono",monospace'
         }
       end
 

data/lib/isodoc/acme/pdf_convert.rb

@@ -19,11 +19,13 @@ module IsoDoc
         k._file = caller_locations.first.absolute_path
       end
 
-      def default_fonts(options)
+       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Overpass",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Overpass",sans-serif'),
-          monospacefont: '"Space Mono",monospace'
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif'
+                     : configuration.html_bodyfont || '"Overpass",sans-serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+                       configuration.html_headerfont || '"Overpass",sans-serif'),
+          monospacefont: configuration.html_monospacefont || '"Space Mono",monospace'
         }
       end
 

data/lib/isodoc/acme/word_convert.rb

@@ -22,9 +22,9 @@ module IsoDoc
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Arial",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Arial",sans-serif'),
-          monospacefont: '"Courier New",monospace'
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : configuration.word_bodyfont || '"Arial",sans-serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :  configuration.word_headerfont ||  '"Arial",sans-serif'),
+          monospacefont:  configuration.word_monospacefont ||  '"Courier New",monospace'
         }
       end
 

data/lib/metanorma/acme.rb

@@ -22,6 +22,9 @@ module Metanorma
         htmlcoverpage
         htmlintropage
         htmlstylesheet
+        html_bodyfont
+        html_headerfont
+        html_monospacefont
         published_stages
         stage_abbreviations
         scripts
@@ -31,15 +34,27 @@ module Metanorma
         wordcoverpage
         wordintropage
         wordstylesheet
+        word_bodyfont
+        word_headerfont
+        word_monospacefont
         xml_root_tag
       ].freeze
 
       attr_accessor(*CONFIG_ATTRS)
 
+      class << self
+        attr_accessor :_file
+      end
+
+      def self.inherited( k )
+        k._file = caller_locations.first.absolute_path
+      end
+
       def initialize(*args)
         super
         # Try to set config values from yaml file in current directory
-        set_default_values_from_yaml_file(YAML_CONFIG_FILE) if File.file?(YAML_CONFIG_FILE)
+        @yaml = File.join(File.dirname(self.class::_file || __FILE__), "..", "..", YAML_CONFIG_FILE)
+        set_default_values_from_yaml_file(@yaml) if File.file?(@yaml)
         self.organization_name_short ||= ORGANIZATION_NAME_SHORT
         self.organization_name_long ||= ORGANIZATION_NAME_LONG
         self.document_namespace ||= DOCUMENT_NAMESPACE

data/lib/metanorma/acme/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Acme
-    VERSION = "1.4.3"
+    VERSION = "1.4.4"
   end
 end

data/metanorma-acme.gemspec

@@ -40,5 +40,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "= 0.54.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "metanorma", "~> 0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-acme
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -192,20 +192,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: metanorma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 description: |
   Metanorma for the (fictitious) Acme Corp.