metanorma-gb 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e077fbc8c1b78bd762f3f835e746c9ef3962b7b006b1d2f52b0ceb1f456a60b
-  data.tar.gz: e96cd7481cafe9c70008beca81331c3cd5fc39f76ffa90d27befe94311ce8fbf
+  metadata.gz: 8174bc7b39fa8089f62c94500ef94424ecbc48ac4ebe78022873307e2b619da5
+  data.tar.gz: 88b8c6ba983a7f49648edcf1839536bd947784b549bd29a9ced0a9bf2496d9e6
 SHA512:
-  metadata.gz: 95871f762fadc540a35ec9676d97a14f8c1996afa33d09525b22d603224e199fb284e82a762b84a7da10f554548511ee20c1ce3210df0ee96478cb0079fb2e49
-  data.tar.gz: 5a102ff4ecb8556943d21d66f73f1744a84bce3b27e8e8649c8feef778ad854a1d69ca94735952d823f287323e4d2b9875c41249671d857e4ec81416954257cd
+  metadata.gz: e6c702a9ea7b33d36a7d2ed08a12966472c475268037a19ca1f94a272d34a63a58b14090fb92b9f7ee066b6d879cabf01f35eacd91b4d794b62a71f4721b94ab
+  data.tar.gz: 6da57b1874fbff0ea896bd645d930a44c161647bc6a392848d5cb9244d7e7e8c6373ea08de696d44bfb1e4c6ffae4f6da9134e0e552a3b05368f3de34f9a07e0

data/Gemfile

@@ -3,7 +3,6 @@ Encoding.default_internal = Encoding::UTF_8
 
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
-
 gemspec
 
 if File.exist? 'Gemfile.devel'

data/Rakefile

@@ -1,6 +1,23 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require 'isodoc/gem_tasks'
 
+module IsoDoc
+  module GemTasks
+    module_function
+
+    def fonts_placeholder
+      <<~TEXT
+        $bodyfont: '{{bodyfont}}';
+        $headerfont: '{{headerfont}}';
+        $monospacefont: '{{monospacefont}}';
+        $titlefont: '{{titlefont}}';
+      TEXT
+    end
+  end
+end
+
+IsoDoc::GemTasks.install
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

data/lib/asciidoctor/gb/front_id.rb

@@ -15,7 +15,7 @@ module Asciidoctor
 
       def stage_name(stage, substage)
         return "Proof" if stage == "60" && substage == "00"
-        @language == "en" ?
+        @lang == "en" ?
           STAGE_NAMES[stage.to_sym] : STAGE_ABBRS_CN[stage.to_sym]
       end
 

data/lib/isodoc/gb/base_convert.rb

@@ -7,14 +7,14 @@ require "fileutils"
 module IsoDoc
   module Gb
     module BaseConvert
-      def extract_fonts(options)
+      def scss_fontheader
         b = options[:bodyfont] || "Arial"
         h = options[:headerfont] || "Arial"
         m = options[:monospacefont] || "Courier"
         t = options[:titlefont] || "Arial"
         "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"\
           "$titlefont: #{t};\n"
-      end   
+      end
 
       def metadata_init(lang, script, labels)
         unless ["en", "zh"].include? lang

data/lib/isodoc/gb/gb.recommendation.xsl

@@ -2526,6 +2526,7 @@
 						<xsl:attribute name="font-family">SimHei</xsl:attribute>
 					
 					
+					
 					<xsl:variable name="title-note">
 						<xsl:call-template name="getTitle">
 							<xsl:with-param name="name" select="'title-note'"/>
@@ -3618,4 +3619,35 @@
 		</xsl:if>
 	</xsl:template><xsl:template name="getDocumentId">		
 		<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
+	</xsl:template><xsl:template name="namespaceCheck">
+		<xsl:variable name="documentNS" select="namespace-uri(/*)"/>
+		<xsl:variable name="XSLNS">			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+						
+			
+				<xsl:value-of select="document('')//*/namespace::gb"/>
+						
+		</xsl:variable>
+		<xsl:if test="$documentNS != $XSLNS">
+			<xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
+		</xsl:if>
+	</xsl:template><xsl:template name="getLanguage">
+		<xsl:param name="lang"/>		
+		<xsl:variable name="language" select="java:toLowerCase(java:java.lang.String.new($lang))"/>
+		<xsl:choose>
+			<xsl:when test="$language = 'en'">English</xsl:when>
+			<xsl:when test="$language = 'fr'">French</xsl:when>
+			<xsl:when test="$language = 'de'">Deutsch</xsl:when>
+			<xsl:when test="$language = 'cn'">Chinese</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
+		</xsl:choose>
 	</xsl:template></xsl:stylesheet>

data/lib/isodoc/gb/html/htmlcompliantstyle.scss

@@ -1002,4 +1002,3 @@ span.keyword {
 .Admonition p, .admonition p {
     margin: 0;
 }
-

data/lib/isodoc/gb/html_convert.rb

@@ -27,6 +27,16 @@ module IsoDoc
         }
       end
 
+      def fonts_options
+        default_font_options = default_fonts(options)
+        {
+          bodyfont: options[:bodyfont] || default_font_options[:bodyfont],
+          headerfont: options[:headerfont] || default_font_options[:headerfont],
+          monospacefont: options[:monospacefont] || default_font_options[:monospacefont],
+          titlefont: options[:titlefont] || default_font_options[:titlefont]
+        }
+      end
+
       def default_file_locations(options)
         {
           htmlstylesheet: options[:compliant] ? html_doc_path("htmlcompliantstyle.scss") : html_doc_path("htmlstyle.scss"),
@@ -37,7 +47,7 @@ module IsoDoc
       end
 
       def populate_template(docxml, format)
-        meta = @meta.get.merge(@labels)
+        meta = @meta.get.merge(@labels).merge(@meta.fonts_options || {})
         logo = @common.format_logo(meta[:gbprefix], meta[:gbscope], format, @localdir)
         logofile = @meta.standard_logo(meta[:gbprefix])
         meta[:standard_agency_formatted] =

data/lib/isodoc/gb/word_convert.rb

@@ -24,11 +24,21 @@ module IsoDoc
           monospacefont: '"Courier New",monospace',
           titlefont: (scope == "national" ? (script != "Hans" ? '"Cambria",serif' : '"SimSun",serif' ) :
                       (script == "Hans" ? '"SimHei",sans-serif' : '"Calibri",sans-serif' ))
-        }     
-      end     
+        }
+      end
+
+      def fonts_options
+        default_font_options = default_fonts(options)
+        {
+          bodyfont: options[:bodyfont] || default_font_options[:bodyfont],
+          headerfont: options[:headerfont] || default_font_options[:headerfont],
+          monospacefont: options[:monospacefont] || default_font_options[:monospacefont],
+          titlefont: options[:titlefont] || default_font_options[:titlefont]
+        }
+      end
 
       def default_file_locations(options)
-        {   
+        {
           wordstylesheet: html_doc_path("wordstyle.scss"),
           standardstylesheet: html_doc_path("gb.scss"),
           header: html_doc_path("header.html"),
@@ -37,10 +47,10 @@ module IsoDoc
           ulstyle: "l7",
           olstyle: "l10",
         }
-      end 
+      end
 
       ENDLINE = <<~END.freeze
-      <v:line 
+      <v:line
  alt="" style='position:absolute;left:0;text-align:left;z-index:251662848;
  mso-wrap-edited:f;mso-width-percent:0;mso-height-percent:0;
  mso-width-percent:0;mso-height-percent:0'
@@ -71,7 +81,7 @@ module IsoDoc
       end
 
       def populate_template(docxml, format)
-        meta = @meta.get.merge(@labels)
+        meta = @meta.get.merge(@labels).merge(@meta.fonts_options || {})
         logo = @common.format_logo(meta[:gbprefix], meta[:gbscope], format, @localdir)
         logofile = @meta.standard_logo(meta[:gbprefix])
         meta[:standard_agency_formatted] =

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.4.1"
+    VERSION = "1.4.2"
   end
 end

data/metanorma-gb.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities", "~> 4.3.4"
 
   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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -94,6 +94,20 @@ 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