metanorma-iec 1.2.12 → 1.2.17

data/lib/isodoc/iec/word_convert.rb

@@ -13,8 +13,8 @@ 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'),
+          bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' : '"Arial",sans-serif'),
+          headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' : '"Arial",sans-serif'),
           monospacefont: '"Courier New",monospace',
           normalfontsize: "10.0pt",
           footnotefontsize: "8.0pt",

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "1.2.12"
+    VERSION = "1.2.17"
   end
 end
 

data/metanorma-iec.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "metanorma-iec lets you write IEC standards "\
     "in AsciiDoc."
   spec.description   = <<~DESCRIPTION
-    metanorma-iso lets you write IEC standards in AsciiDoc syntax.
+    metanorma-iec lets you write IEC standards in AsciiDoc syntax.
 
     This gem is in active development.
   DESCRIPTION
@@ -28,16 +28,16 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-iso", "~> 1.6.1"
+  spec.add_dependency "metanorma-iso", "~> 1.7.0"
 
   spec.add_development_dependency "byebug"
   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 "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "iev", "~> 0.2.0"

data/spec/asciidoctor-iec/base_spec.rb

@@ -101,6 +101,7 @@ end
       :cen-processing: true
       :secretary: Fred Nerk
       :interest-to-committees: TC 6121, SC 12
+      :obsoletes: ABC; DEF
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <iec-standard xmlns="https://www.metanorma.org/ns/iec" type="semantic" version="#{Metanorma::Iec::VERSION}">
@@ -150,6 +151,18 @@ end
              </organization>
            </owner>
          </copyright>
+         <relation type='obsoletes'>
+  <bibitem>
+    <title>--</title>
+    <docidentifier>ABC</docidentifier>
+  </bibitem>
+</relation>
+<relation type='obsoletes'>
+  <bibitem>
+    <title>--</title>
+    <docidentifier>DEF</docidentifier>
+  </bibitem>
+</relation>
          <ext>
          <doctype>article</doctype>
          <horizontal>false</horizontal>
@@ -987,8 +1000,8 @@ OUTPUT
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "SimSun", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "SimHei", sans-serif;]m)
+    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Source Han Sans", serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Source Han Sans", sans-serif;]m)
   end
 
   it "uses specified fonts" do

data/spec/asciidoctor-iec/validate_spec.rb

@@ -15,41 +15,42 @@ RSpec.describe Asciidoctor::Iec do
 
     it "generates error file" do
       expect do
+        mock_pdf
         Metanorma::Compile
           .new
-          .compile("spec/assets/xref_error.adoc", type: "iec")
+          .compile("spec/assets/xref_error.adoc", type: "iec", no_install_fonts: true)
       end.to(change { File.exist?("spec/assets/xref_error.err") }
               .from(false).to(true))
     end
   end
 
-it "Warns of illegal doctype" do
+  it "Warns of illegal doctype" do
     FileUtils.rm_f "test.err"
     Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)
-  = Document title
-  Author
-  :docfile: test.adoc
-  :nodoc:
-  :no-isobib:
-  :doctype: pizza
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :no-isobib:
+      :doctype: pizza
 
-  text
-  INPUT
+      text
+    INPUT
     expect(File.read("test.err")).to include "pizza is not a recognised document type"
-end
+  end
 
-it "Warns of illegal function" do
+  it "Warns of illegal function" do
     FileUtils.rm_f "test.err"
     Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)
-  = Document title
-  Author
-  :docfile: test.adoc
-  :nodoc:
-  :no-isobib:
-  :function: pizza
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :no-isobib:
+      :function: pizza
 
-  text
-  INPUT
+      text
+    INPUT
     expect(File.read("test.err")).to include "pizza is not a recognised document function"
-end
+  end
 end

data/spec/isodoc/iso_spec.rb

@@ -32,8 +32,8 @@ RSpec.describe IsoDoc::Iec do
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "SimSun", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "SimHei", sans-serif;]m)
+    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Source Han Sans", serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Source Han Sans", sans-serif;]m)
   end
 
   it "processes isodoc as ISO: user nominated fonts" do

data/spec/spec_helper.rb

@@ -261,6 +261,12 @@ def stub_fetch_ref(**opts)
   end.at_least :once
 end
 
+def mock_pdf
+  allow(::Mn2pdf).to receive(:convert) do |url, output, c, d|
+    FileUtils.cp(url.gsub(/"/, ""), output.gsub(/"/, ""))
+  end
+end
+
 private
 
 def get_xml(search, code, opts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 1.2.12
+  version: 1.2.17
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,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
@@ -140,16 +140,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 description: |
-  metanorma-iso lets you write IEC standards in AsciiDoc syntax.
+  metanorma-iec lets you write IEC standards in AsciiDoc syntax.
 
   This gem is in active development.
 email:
@@ -307,7 +307,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-iec lets you write IEC standards in AsciiDoc.