isodoc 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3c777ea5977413526f9c0178d0460978e495a4292335201d871c1150b0f48ac
-  data.tar.gz: d5a5cbf4385dbdaa4ab65be04bc902853a236d470247d093f35eb3c12fe3cbc4
+  metadata.gz: 46206b47756f66c1927ca1810020fbe63141a27f6ad000e95b7938f5b2f8cdcc
+  data.tar.gz: bbce350ccfa6c97bff0c45cccdc15febde0a2c17b1e415fb8132f205ba202d85
 SHA512:
-  metadata.gz: 554df5885f22823b5aaec3453da4695fce9c0c32ee90de6830a4159f8029b070385f2124c9fae5a7082b63688df596f8ea2b39d58297e64f20304b0e40e030cb
-  data.tar.gz: f8adad1944d3062b2ce674c7fb0201f81e6ad4ff43bdd4f43f08429b6cc808f5ab40aa1905473365e3b59d66a6a413a064fdbc20f755c986ed3a763b017fe5b3
+  metadata.gz: 7679fe14d35c348ffc9fcda332f27bf39e898337ae5c0cd7a8638e74f1d26a77ca528cad7d210b82f546336b80e0115c4131c49d9cec1ae82a8174d34002ead3
+  data.tar.gz: 20ca1c4d733511fa7f5dc5fe28295c754803b20167e3ae8d39209b1c2d3f63fc064308668a7c23cf834a6a1d93e46ec486931d2c189c0e47210507b32c0291a2

data/isodoc.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
   spec.add_dependency "html2doc", "~> 1.0.0"
-  spec.add_dependency "liquid"
+  spec.add_dependency "liquid", "~> 4"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "metanorma", "~> 1.2.0"

data/lib/isodoc/convert.rb

@@ -9,6 +9,7 @@ module IsoDoc
   class Convert < ::IsoDoc::Common
     attr_accessor :options
     attr_accessor :i18n
+    attr_accessor :meta
 
     # htmlstylesheet: Generic stylesheet for HTML
     # wordstylesheet: Generic stylesheet for Word

data/lib/isodoc/function/utils.rb

@@ -152,8 +152,8 @@ module IsoDoc::Function
     def populate_template(docxml, _format = nil)
       meta = @meta
              .get
-             .merge(@labels || {})
-             .merge(@meta.labels || {})
+             .merge(@labels ? {labels: @labels} : {})
+             .merge(@meta.labels ? {labels: @meta.labels} : {})
              .merge(fonts_options || {})
       template = liquid(docxml)
       template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h)

data/lib/isodoc/presentation_function/inline.rb

@@ -211,7 +211,11 @@ module IsoDoc
     def mathml1(f, locale)
       localize_maths(f, locale)
       return unless f.elements.size == 1 && f.elements.first.name == "mn"
-      f.replace(f.at("./m:mn", MATHML).children)
+      if f.parent.name == "stem"
+        f.parent.replace(f.at("./m:mn", MATHML).children)
+      else
+        f.replace(f.at("./m:mn", MATHML).children)
+      end
     end
 
     def variant(docxml)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.4.2".freeze
+  VERSION = "1.5.0".freeze
 end

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -96,7 +96,7 @@ module IsoDoc::WordFunction
     def generate_header(filename, _dir)
       return nil unless @header
       template = IsoDoc::Common.liquid(File.read(@header, encoding: "UTF-8"))
-      meta = @meta.get.merge(@labels || {}).merge(@meta.labels || {})
+      meta = @meta.get.merge(@labels ? { labels: @labels } : {}).merge(@meta.labels ? { labels: @meta.labels } : {})
       meta[:filename] = filename
       params = meta.map { |k, v| [k.to_s, v] }.to_h
       Tempfile.open(%w(header html), :encoding => "utf-8") do |f|

data/spec/isodoc/presentation_xml_spec.rb

@@ -37,7 +37,7 @@ it "localises numbers in MathML" do
 
   <preface>
     <p>
-      <stem type='MathML'>30,000</stem>
+      30,000
       <stem type='MathML'>
         <math xmlns='http://www.w3.org/1998/Math/MathML'>
           <mi>P</mi>
@@ -248,7 +248,7 @@ end
 
           <preface>
             <p>
-              <stem type='MathML'>30,000</stem>
+              30,000
               <stem type='MathML'>
                 <math xmlns='http://www.w3.org/1998/Math/MathML'>
                   <mi>P</mi>
@@ -382,7 +382,7 @@ it "localises numbers in MathML in French" do
         <language>fr</language>
         </bibdata>
         <preface>
-        <p><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
+        <p><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math>
         <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
         </preface>
    </iso-standard>
@@ -395,7 +395,7 @@ it "localises numbers in MathML in French" do
 
   <preface>
     <p>
-      <stem type='MathML'>30&#x202F;000</stem>
+      30&#x202F;000
       <stem type='MathML'>
         <math xmlns='http://www.w3.org/1998/Math/MathML'>
           <mi>P</mi>
@@ -506,7 +506,7 @@ it "customises localisation of numbers" do
 
          <preface>
            <p>
-             <stem type='MathML'>30'000</stem>
+             30'000
              <stem type='MathML'>
                <math xmlns='http://www.w3.org/1998/Math/MathML'>
                  <mi>P</mi>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -98,16 +98,16 @@ dependencies:
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement