metanorma-iec 2.1.0 → 2.1.1

data/lib/isodoc/iec/metadata.rb

@@ -3,7 +3,7 @@ require "metanorma-iso"
 
 module IsoDoc
   module Iec
-    class  Metadata < IsoDoc::Iso::Metadata
+    class Metadata < IsoDoc::Iso::Metadata
       def docstatus(isoxml, _out)
         docstatus = isoxml.at(ns("//bibdata/status/stage"))
         substage = isoxml.at(ns("//bibdata/status/substage"))
@@ -22,7 +22,7 @@ module IsoDoc
 
       def doctype(isoxml, _out)
         super
-        b = isoxml&.at(ns("//bibdata/ext/doctype#{NOLANG}"))&.text 
+        b = isoxml&.at(ns("//bibdata/ext/doctype#{NOLANG}"))&.text
         b1 = isoxml&.at(ns("//bibdata/ext/doctype[@language = 'en']"))&.text || b
         b1 and set(:doctype_en, status_print(b1))
         b1 = isoxml&.at(ns("//bibdata/ext/doctype[@language = 'fr']"))&.text || b

data/lib/isodoc/iec/word_convert.rb

@@ -58,7 +58,7 @@ module IsoDoc
                           <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;TableTitle,tabletitle&quot; <span
+        \\h \\z \\t "TableTitle,tabletitle" <span
         style='mso-element:field-separator'></span></span>
       TOC
 
@@ -66,7 +66,7 @@ module IsoDoc
                                       <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;FigureTitle,figuretitle&quot; <span
+        \\h \\z \\t "FigureTitle,figuretitle" <span
         style='mso-element:field-separator'></span></span>
       TOC
 
@@ -93,7 +93,7 @@ module IsoDoc
           <span lang="EN-GB"><span
             style='mso-element:field-begin'></span><span
             style='mso-spacerun:yes'>&#xA0;</span>TOC
-            \\o &quot;1-#{level}&quot; \\h \\z \\u <span
+            \\o "1-#{level}" \\h \\z \\u <span
             style='mso-element:field-separator'></span></span>
         TOC
       end

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.1.0".freeze
+    VERSION = "2.1.1".freeze
   end
 end
 

data/metanorma-iec.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["open.source@ribose.com"]
 
   spec.summary       = "metanorma-iec lets you write IEC standards "\
-    "in AsciiDoc."
+                       "in AsciiDoc."
   spec.description   = <<~DESCRIPTION
     metanorma-iec lets you write IEC standards in AsciiDoc syntax.
 
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-iso", "~> 2.1.0"
+  spec.add_dependency "metanorma-iso", "~> 2.1.1"
   spec.add_dependency "ruby-jing"
 
   spec.add_development_dependency "debug"
@@ -41,4 +41,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.metadata["rubygems_mfa_required"] = "true"
 end

data/spec/isodoc/metadata_spec.rb

@@ -87,19 +87,19 @@ INPUT
 :circulateddate=>"XXX",
 :confirmeddate=>"XXX",
 :copieddate=>"XXX",
-:createddate=>"2010–2011",
+:createddate=>"2010–2011",
 :docnumber=>"ISO/PreCD3 17301-1",
 :docnumeric=>"1730",
-:docsubtitle=>"Céréales et légumineuses — Spécification et méthodes d'essai — Partie 1: Riz",
+:docsubtitle=>"Céréales et légumineuses — Spécification et méthodes d'essai — Partie 1: Riz",
 :docsubtitleintro=>"Céréales et légumineuses",
 :docsubtitlemain=>"Spécification et méthodes d'essai",
 :docsubtitlepart=>"Riz",
-:docsubtitlepartlabel=>"Partie 1",
-:doctitle=>"Cereals and pulses — Specifications and test methods — Part 1: Rice",
+:docsubtitlepartlabel=>"Partie 1",
+:doctitle=>"Cereals and pulses — Specifications and test methods — Part 1: Rice",
 :doctitleintro=>"Cereals and pulses",
 :doctitlemain=>"Specifications and test methods",
 :doctitlepart=>"Rice",
-:doctitlepartlabel=>"Part 1",
+:doctitlepartlabel=>"Part 1",
 :doctype=>"International Standard",
 :doctype_display=>"International Standard",
 :doctype_en=>"International Standard",
@@ -228,16 +228,16 @@ INPUT
 :copieddate=>"XXX",
 :createddate=>"XXX",
 :docnumber=>"ISO/IEC/CD 17301-1-3",
-:docsubtitle=>"Céréales et légumineuses — Spécification et méthodes d'essai — Partie 1–3: Riz",
+:docsubtitle=>"Céréales et légumineuses — Spécification et méthodes d'essai — Partie 1–3: Riz",
 :docsubtitleintro=>"Céréales et légumineuses",
 :docsubtitlemain=>"Spécification et méthodes d'essai",
 :docsubtitlepart=>"Riz",
-:docsubtitlepartlabel=>"Partie 1–3",
-:doctitle=>"Cereals and pulses — Specifications and test methods — Part 1–3: Rice",
+:docsubtitlepartlabel=>"Partie 1–3",
+:doctitle=>"Cereals and pulses — Specifications and test methods — Part 1–3: Rice",
 :doctitleintro=>"Cereals and pulses",
 :doctitlemain=>"Specifications and test methods",
 :doctitlepart=>"Rice",
-:doctitlepartlabel=>"Part 1–3",
+:doctitlepartlabel=>"Part 1–3",
 :doctype=>"Technical Report",
 :doctype_display=>"Technical Report",
 :doctype_en=>"Technical Report",

data/spec/isodoc/postproc_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe IsoDoc do
       .convert("test", input, false)
     expect(File.exist?("test.html")).to be true
     html = File.read("test.html", encoding: "UTF-8")
-    expect(html).to match(%r{<title>Cereals and pulses&#xA0;&#x2014; Specifications and test methods&#xA0;&#x2014; Rice</title>})
+    expect(html).to include "<title>Cereals and pulses&#xA0;&#x2014; Specifications and test methods&#xA0;&#x2014; Rice</title>"
     expect(html).to match(%r{cdnjs\.cloudflare\.com/ajax/libs/mathjax/})
     expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
   end
@@ -57,7 +57,7 @@ RSpec.describe IsoDoc do
       .convert("test", input, false)
     expect(File.exist?("test.html")).to be true
     html = File.read("test.html", encoding: "UTF-8")
-    expect(html).to match(%r{<title>Cereals and pulses&#xA0;&#x2014; Specifications and test methods&#xA0;&#x2014; Rice</title>})
+    expect(html).to include "<title>Cereals and pulses&#xA0;&#x2014; Specifications and test methods&#xA0;&#x2014; Rice</title>"
     expect(html).to match(%r{cdnjs\.cloudflare\.com/ajax/libs/mathjax/})
     expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
   end

data/spec/spec_helper.rb

@@ -37,6 +37,13 @@ def strip_guid(xml)
 end
 
 def xmlpp(xml)
+  c = HTMLEntities.new
+  xml &&= xml.split(/(&\S+?;)/).map do |n|
+    if /^&\S+?;$/.match?(n)
+      c.encode(c.decode(n), :hexadecimal)
+    else n
+    end
+  end.join
   s = ""
   f = REXML::Formatters::Pretty.new(2)
   f.compact = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement