isodoc 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '084d4f07e708055ffd6bdd9b3a7aef78e9b437b5938cb3a0594f9a5f44dae6bd'
-  data.tar.gz: 046f4c2c521c1a3a13a502369229df28e3aa64eb4319eb2dc8761127d473f918
+  metadata.gz: 8da1e26ad7132ffa08da0fcea2d5690591d195fed192f9de480f142045526f00
+  data.tar.gz: 6f7790baee1639e89aa09f8234a17dd024cac0a9d47ad95039f2caa273264d94
 SHA512:
-  metadata.gz: b7d440fc7f367c502b4b9fe61faa41b1c2ed3f189edaae426777f849217f98a81fb27fbd7facdbf5051b50a7bea6c23d88b5adcbecb48ea92502b6bb81c0672f
-  data.tar.gz: 27cfead9b111414f1dd384869707cd6e55db06680574d6035c203019272e435ee0c6c616114867531384715be89024e1647faf6743d053c196d5e447b7d1b29e
+  metadata.gz: 5f72f7cbc23636918dade5e52ceb6e1115cdd018b4a051ffd965162d11c081b6e7dfcafe04cf583373e55d5f2262d4393823497b7a5ed4a0a8d248dc5c1574a6
+  data.tar.gz: 249e6bb5247039595870c52969c49bc4acbb40a1dcae798a4f925ab6fa5ea4640a22a8defdd60ad64134159a21f26088268324ce2381f00aa79db673ffcb3695

data/.github/workflows/rake.yml

@@ -50,4 +50,4 @@ jobs:
           token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
           repository: ${{ github.repository }}
           event-type: notify
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
+          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'

data/lib/isodoc/function/blocks.rb

@@ -205,5 +205,9 @@ module IsoDoc::Function
         !(node["format"].split(/,/).include? @format.to_s)
       out.passthrough node.text
     end
+
+    def svg_parse(node, out)
+      out << node.to_xml
+    end
   end
 end

data/lib/isodoc/function/to_word_html.rb

@@ -225,6 +225,7 @@ module IsoDoc::Function
         when "passthrough" then passthrough_parse(node, out)
         when "amend" then amend_parse(node, out)
         when "tab" then clausedelimspace(out) # in Presentation XML only
+        when "svg" then svg_parse(node, out) # introduced in Presentation XML only
         else
           error_parse(node, out)
         end

data/lib/isodoc/presentation_function/block.rb

@@ -1,3 +1,5 @@
+require "base64"
+
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def lower2cap(s)
@@ -6,9 +8,8 @@ module IsoDoc
     end
 
     def figure(docxml)
-      docxml.xpath(ns("//figure")).each do |f|
-        figure1(f)
-      end
+      docxml.xpath(ns("//image")).each { |f| svg_extract(f) }
+      docxml.xpath(ns("//figure")).each { |f| figure1(f) }
       docxml.xpath(ns("//svgmap")).each do |s|
         if f = s.at(ns("./figure")) then s.replace(f)
         else
@@ -17,9 +18,14 @@ module IsoDoc
       end
     end
 
+    def svg_extract(f)
+      return unless %r{^data:image/svg\+xml;base64,}.match(f["src"])
+      svg = Base64.strict_decode64(f["src"].sub(%r{^data:image/svg\+xml;base64,}, ""))
+      f.replace(svg.sub(/<\?xml[^>]*>/, ""))
+    end
+
     def figure1(f)
-      return sourcecode1(f) if f["class"] == "pseudocode" ||
-        f["type"] == "pseudocode"
+      return sourcecode1(f) if f["class"] == "pseudocode" || f["type"] == "pseudocode"
       return if labelled_ancestor(f) && f.ancestors("figure").empty?
       return if f.at(ns("./figure")) and !f.at(ns("./name"))
       lbl = @xrefs.anchor(f['id'], :label, false) or return

data/lib/isodoc/presentation_function/inline.rb

@@ -1,4 +1,6 @@
 require "twitter_cldr"
+require "bigdecimal"
+require_relative "../../twitter-cldr/patch"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -10,8 +12,7 @@ module IsoDoc
       if node["citeas"].nil? && node["bibitemid"]
         return @xrefs.anchor(node["bibitemid"] ,:xref) || "???"
       elsif node["target"] && node["droploc"]
-        return @xrefs.anchor(node["target"], :value) ||
-          @xrefs.anchor(node["target"], :label) ||
+        return @xrefs.anchor(node["target"], :value) || @xrefs.anchor(node["target"], :label) ||
           @xrefs.anchor(node["target"], :xref) || "???"
       elsif node["target"] && !/.#./.match(node["target"])
         linkend = anchor_linkend1(node)
@@ -22,9 +23,8 @@ module IsoDoc
     def anchor_linkend1(node)
       linkend = @xrefs.anchor(node["target"], :xref)
       container = @xrefs.anchor(node["target"], :container, false)
-      (container && get_note_container_id(node) != container &&
-       @xrefs.get[node["target"]]) &&
-      linkend = prefix_container(container, linkend, node["target"])
+      (container && get_note_container_id(node) != container && @xrefs.get[node["target"]]) &&
+        linkend = prefix_container(container, linkend, node["target"])
       capitalise_xref(node, linkend)
     end
 
@@ -35,13 +35,11 @@ module IsoDoc
       return linkend if linkend[0,1].match(/\p{Upper}/)
       prec = nearest_block_parent(node).xpath("./descendant-or-self::text()") &
         node.xpath("./preceding::text()")
-      (prec.empty? || /(?!<[^.].)\.\s+$/.match(prec.map { |p| p.text }.join)) ?
-        linkend&.capitalize : linkend
+      (prec.empty? || /(?!<[^.].)\.\s+$/.match(prec.map { |p| p.text }.join)) ?  linkend&.capitalize : linkend
     end
 
     def nearest_block_parent(node)
-      until %w(p title td th name formula
-        li dt dd sourcecode pre).include?(node.name)
+      until %w(p title td th name formula li dt dd sourcecode pre).include?(node.name)
         node = node.parent
       end
       node
@@ -89,8 +87,7 @@ module IsoDoc
     def eref_localities0(r, i, target, delim)
       if r["type"] == "whole" then l10n("#{delim} #{@i18n.wholeoftext}")
       else
-        eref_localities1(target, r["type"], r.at(ns("./referenceFrom")),
-                         r.at(ns("./referenceTo")), delim, @lang)
+        eref_localities1(target, r["type"], r.at(ns("./referenceFrom")), r.at(ns("./referenceTo")), delim, @lang)
       end
     end
 
@@ -106,8 +103,7 @@ module IsoDoc
     # TODO: move to localization file
     def eref_localities1(target, type, from, to, delim, lang = "en")
       return "" if type == "anchor"
-      lang == "zh" and
-        return l10n(eref_localities1_zh(target, type, from, to, delim))
+      lang == "zh" and return l10n(eref_localities1_zh(target, type, from, to, delim))
       ret = delim
       loc = @i18n.locality[type] || type.sub(/^locality:/, "").capitalize
       ret += " #{loc}"
@@ -163,23 +159,23 @@ module IsoDoc
     # TwitterCldr::DataReaders::NumberDataReader.new(locale).symbols
     def localize_maths(f, locale)
       f.xpath(".//m:mn", MATHML).each do |x|
-        num = /\./.match(x.text) ? x.text.to_f : x.text.to_i
+        num = BigDecimal(x.text)
         precision = /\./.match(x.text) ? x.text.sub(/^.*\./, "").size : 0
         x.children = localized_number(num, locale, precision)
       end
     end
 
-    # By itself twiiter cldr does not support fraction part digits grouping
+    # By itself twitter-cldr does not support fraction part digits grouping
     # and custom delimeter, will decorate fraction part manually
     def localized_number(num, locale, precision)
-      localized = precision == 0 ? num.localize(locale).to_s :
+      TwitterCldr::Localized::LocalizedNumber.localize(BigDecimal)
+      localized = (precision == 0) ? num.localize(locale).to_s :
         num.localize(locale).to_decimal.to_s(:precision => precision)
       twitter_cldr_reader_symbols = twitter_cldr_reader(locale)
       return localized unless twitter_cldr_reader_symbols[:decimal]
       integer, fraction = localized.split(twitter_cldr_reader_symbols[:decimal])
       return localized if fraction.nil? || fraction.length.zero?
-      [integer, decorate_fraction_part(fraction, locale)].
-        join(twitter_cldr_reader_symbols[:decimal])
+      [integer, decorate_fraction_part(fraction, locale)].join(twitter_cldr_reader_symbols[:decimal])
     end
 
     def decorate_fraction_part(fract, locale)
@@ -229,8 +225,7 @@ module IsoDoc
     end
 
     def variant1(node)
-      if (!node["lang"] || node["lang"] == @lang) &&
-          (!node["script"] || node["script"] == @script)
+      if (!node["lang"] || node["lang"] == @lang) && (!node["script"] || node["script"] == @script)
       elsif found_matching_variant_sibling(node)
         node["remove"] = "true"
       else
@@ -243,8 +238,7 @@ module IsoDoc
       foll = node.xpath("./following-sibling::xmlns:variant")
       found = false
       (prev + foll).each do |n|
-        found = true if n["lang"] == @lang &&
-          (!n["script"] || n["script"] == @script)
+        found = true if n["lang"] == @lang && (!n["script"] || n["script"] == @script)
       end
       found
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.5.3".freeze
+  VERSION = "1.5.4".freeze
 end

data/lib/isodoc/word_function/inline.rb

@@ -22,6 +22,12 @@ module IsoDoc::WordFunction
       end
     end
 
+    def svg_parse(node, out)
+      svg = Base64.strict_encode64(node.to_xml)
+      r = node.replace("<img src='data:image/svg+xml;base64,#{svg}' mimetype='image/svg+xml'/>").first
+      image_parse(r, out, nil)
+    end
+
     def imgsrc(node)
       ret = svg_to_emf(node) and return ret
       return node["src"] unless %r{^data:}.match node["src"]

data/lib/twitter-cldr/patch.rb

@@ -0,0 +1,39 @@
+module ::TwitterCldr
+  module Formatters
+    class NumberFormatter
+      def parse_number(number, options = {})
+        precision = options[:precision] || precision_from(number)
+        rounding = options[:rounding] || 0
+        if number.is_a? BigDecimal
+          number = precision == 0 ? 
+            round_to(number, precision, rounding).abs.fix.to_s("F") :
+            round_to(number, precision, rounding).abs.round(precision).to_s("F")
+        else
+          number = "%.#{precision}f" % round_to(number, precision, rounding).abs
+        end
+        number.split(".")
+      end
+
+      def round_to(number, precision, rounding = 0)
+        factor = 10 ** precision
+        result = number.is_a?(BigDecimal) ?
+          ((number * factor).fix / factor) :
+          ((number * factor).round.to_f / factor)
+        if rounding > 0
+          rounding = rounding.to_f / factor
+          result = number.is_a?(BigDecimal) ?
+            ((result *  (1.0 / rounding)).fix / (1.0 / rounding)) :
+            ((result *  (1.0 / rounding)).round.to_f / (1.0 / rounding))
+        end
+        result
+      end
+
+      def precision_from(num)
+        return 0 if num.is_a?(BigDecimal) && num.fix == num
+        parts = (num.is_a?(BigDecimal) ? num.to_s("F") : num.to_s ).split(".")
+        parts.size == 2 ? parts[1].size : 0
+      end
+    end
+  end
+end
+

data/spec/isodoc/blocks_spec.rb

@@ -768,6 +768,93 @@ B</pre>
     expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", presxml, true).gsub(/['"][^'".]+\.(gif|xml)['"]/, "'_.\\1'").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")))).to be_equivalent_to xmlpp(word)
   end
 
+  it "processes SVG" do
+    input = <<~INPUT
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <figure id="figureA-1">
+    <image src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj4KICA8Y2lyY2xlIGZpbGw9IiMwMDkiIHI9IjQ1IiBjeD0iNTAiIGN5PSI1MCIvPgogIDxwYXRoIGQ9Ik0zMywyNkg3OEEzNywzNywwLDAsMSwzMyw4M1Y1N0g1OVY0M0gzM1oiIGZpbGw9IiNGRkYiLz4KPC9zdmc+Cg==" id="_d3731866-1a07-435a-a6c2-1acd41023a4e" mimetype="image/svg+xml" height="auto" width="auto"/>
+</figure>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+
+    presxml = <<~OUTPUT
+    <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+  <preface>
+    <foreword>
+      <figure id='figureA-1'>
+        <name>Figure 1</name>
+        <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'>
+          <circle fill='#009' r='45' cx='50' cy='50'/>
+          <path d='M33,26H78A37,37,0,0,1,33,83V57H59V43H33Z' fill='#FFF'/>
+        </svg>
+      </figure>
+    </foreword>
+  </preface>
+</iso-standard>
+    OUTPUT
+
+    html = <<~HTML
+    #{HTML_HDR}
+    <br/>
+      <div>
+        <h1 class='ForewordTitle'>Foreword</h1>
+        <div id='figureA-1' class='figure'>
+          <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'>
+            <circle fill='#009' r='45' cx='50' cy='50'/>
+            <path d='M33,26H78A37,37,0,0,1,33,83V57H59V43H33Z' fill='#FFF'/>
+          </svg>
+          <p class='FigureTitle' style='text-align:center;'>Figure 1</p>
+        </div>
+      </div>
+      <p class='zzSTDTitle1'/>
+    </div>
+  </body>
+</html>
+    HTML
+
+    doc = <<~DOC
+    <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
+<head>
+<style>
+        </style>
+  </head>
+      <body lang='EN-US' link='blue' vlink='#954F72'>
+    <div class='WordSection1'>
+      <p>&#160;</p>
+    </div>
+    <p>
+      <br clear='all' class='section'/>
+    </p>
+    <div class='WordSection2'>
+      <p>
+        <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+      </p>
+      <div>
+        <h1 class='ForewordTitle'>Foreword</h1>
+        <div id='figureA-1' class='figure'>
+        <img src='_.emf'/>
+          <p class='FigureTitle' style='text-align:center;'>Figure 1</p>
+        </div>
+      </div>
+      <p>&#160;</p>
+    </div>
+    <p>
+      <br clear='all' class='section'/>
+    </p>
+    <div class='WordSection3'>
+      <p class='zzSTDTitle1'/>
+    </div>
+  </body>
+</html>
+    DOC
+
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true).gsub(/\&lt;/, "&#x3c;"))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true)))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", presxml, true).gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.emf['"]/, "'_.emf'").gsub(/['"][^'".]+\.(gif|xml)['"]/, "'_.\\1'")))).to be_equivalent_to xmlpp(doc)
+  end
+
    it "converts SVG (Word)" do
     FileUtils.rm_rf "spec/assets/odf1.emf"
     expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true).gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.emf['"]/, "'_.emf'").gsub(/['"][^'".]+\.(gif|xml)['"]/, "'_.\\1'").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")))).to be_equivalent_to xmlpp(<<~"OUTPUT")

data/spec/isodoc/presentation_xml_spec.rb

@@ -25,7 +25,10 @@ it "localises numbers in MathML" do
         <title language="en">test</title>
         </bibdata>
         <preface>
-        <p><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
+        <p>
+        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>64212149677264515</mn></math></stem>
+        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>642121496772645.15</mn></math></stem>
+        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
         <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>
@@ -37,7 +40,8 @@ it "localises numbers in MathML" do
 
   <preface>
     <p>
-      30,000
+      64,212,149,677,264,515
+      642,121,496,772,645.15 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.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -418,6 +418,7 @@ files:
 - lib/isodoc/xref/xref_gen_seq.rb
 - lib/isodoc/xref/xref_sect_gen.rb
 - lib/isodoc/xslfo_convert.rb
+- lib/twitter-cldr/patch.rb
 - spec/assets/header.html
 - spec/assets/html.scss
 - spec/assets/htmlcover.html