isodoc 1.2.3 → 1.2.8

data/lib/isodoc/presentation_function/inline.rb

@@ -1,3 +1,5 @@
+require "twitter_cldr"
+
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def prefix_container(container, linkend, _target)
@@ -7,17 +9,25 @@ module IsoDoc
     def anchor_linkend(node, linkend)
       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) ||
+          @xrefs.anchor(node["target"], :xref) || "???"
       elsif node["target"] && !/.#./.match(node["target"])
-        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"])
-        linkend = capitalise_xref(node, linkend)
+        linkend = anchor_linkend1(node)
       end
       linkend || "???"
     end
 
+    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"])
+      capitalise_xref(node, linkend)
+    end
+
     def capitalise_xref(node, linkend)
       return linkend unless %w(Latn Cyrl Grek).include? @script
       return linkend&.capitalize if node["case"] == "capital"
@@ -30,7 +40,7 @@ module IsoDoc
     end
 
     def nearest_block_parent(node)
-      until %w(p title td th name formula 
+      until %w(p title td th name formula
         li dt dd sourcecode pre).include?(node.name)
         node = node.parent
       end
@@ -43,13 +53,13 @@ module IsoDoc
       end
     end
 
-    def get_linkend(node)
-      contents = non_locality_elems(node).select { |c| !c.text? || /\S/.match(c) }
+    def get_linkend(n)
+      contents = non_locality_elems(n).select { |c| !c.text? || /\S/.match(c) }
       return unless contents.empty?
-      link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
-      link += eref_localities(node.xpath(ns("./locality | ./localityStack")), link)
-      non_locality_elems(node).each { |n| n.remove }
-      node.add_child(link)
+      link = anchor_linkend(n, docid_l10n(n["target"] || n["citeas"]))
+      link += eref_localities(n.xpath(ns("./locality | ./localityStack")), link)
+      non_locality_elems(n).each { |n| n.remove }
+      n.add_child(link)
     end
     # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
     # <locality type="section"><reference>3.1</reference></locality></origin>
@@ -59,14 +69,19 @@ module IsoDoc
       refs.each_with_index do |r, i|
         delim = ","
         delim = ";" if r.name == "localityStack" && i>0
-        if r.name == "localityStack"
-          r.elements.each_with_index do |rr, j|
-            ret += eref_localities0(rr, j, target, delim)
-            delim = ","
-          end
-        else
-          ret += eref_localities0(r, i, target, delim)
+        ret = eref_locality_stack(r, i, target, delim, ret)
+      end
+      ret
+    end
+
+    def eref_locality_stack(r, i, target, delim, ret)
+      if r.name == "localityStack"
+        r.elements.each_with_index do |rr, j|
+          ret += eref_localities0(rr, j, target, delim)
+          delim = ","
         end
+      else
+        ret += eref_localities0(r, i, target, delim)
       end
       ret
     end
@@ -79,7 +94,7 @@ module IsoDoc
       end
     end
 
-     # TODO: move to localization file
+    # TODO: move to localization file
     def eref_localities1_zh(target, type, from, to, delim)
       ret = "#{delim} 第#{from.text}" if from
       ret += "&ndash;#{to.text}" if to
@@ -91,7 +106,8 @@ module IsoDoc
     # TODO: move to localization file
     def eref_localities1(target, type, from, to, delim, lang = "en")
       return "" if type == "anchor"
-      return l10n(eref_localities1_zh(target, type, from, to, delim)) if lang == "zh"
+      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}"
@@ -101,31 +117,130 @@ module IsoDoc
     end
 
     def xref(docxml)
-      docxml.xpath(ns("//xref")).each do |f|
-        xref1(f)
-      end
+      docxml.xpath(ns("//xref")).each { |f| xref1(f) }
     end
 
     def eref(docxml)
-      docxml.xpath(ns("//eref")).each do |f|
-        xref1(f)
-      end
+      docxml.xpath(ns("//eref")).each { |f| xref1(f) }
     end
 
     def origin(docxml)
-      docxml.xpath(ns("//origin[not(termref)]")).each do |f|
-        xref1(f)
-      end
+      docxml.xpath(ns("//origin[not(termref)]")).each { |f| xref1(f) }
     end
 
     def quotesource(docxml)
-      docxml.xpath(ns("//quote/source")).each do |f|
-        xref1(f)
-      end
+      docxml.xpath(ns("//quote/source")).each { |f| xref1(f) }
     end
 
     def xref1(f)
       get_linkend(f)
     end
+
+    def concept(docxml)
+      docxml.xpath(ns("//concept")).each { |f| concept1(f) }
+    end
+
+    def concept1(node)
+      content = node.first_element_child.children.select do |c|
+        !%w{locality localityStack}.include? c.name
+      end.select { |c| !c.text? || /\S/.match(c) }
+      node.replace content.empty? ? 
+        @i18n.term_defined_in.sub(/%/, node.first_element_child.to_xml) :
+        "<em>#{node.children.to_xml}</em>"
+    end
+
+
+    MATHML = { "m" => "http://www.w3.org/1998/Math/MathML" }.freeze
+
+    def mathml(docxml)
+      locale = twitter_cldr_localiser()
+      docxml.xpath("//m:math", MATHML).each do |f|
+        mathml1(f, locale)
+      end
+    end
+
+    # symbols is merged into
+    # 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
+        x.children = localized_number(num, locale)
+      end
+    end
+
+    # By itself twiiter cldr does not support fraction part digits grouping
+    # and custom delimeter, will decorate fraction part manually
+    def localized_number(num, locale)
+      localized = num.localize(locale).to_s
+      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])
+    end
+
+    def decorate_fraction_part(fract, locale)
+      result = []
+      twitter_cldr_reader_symbols = twitter_cldr_reader(locale)
+      fract = fract.slice(0..(twitter_cldr_reader_symbols[:precision] || -1))
+      fr_group_digits = twitter_cldr_reader_symbols[:fraction_group_digits] || 1
+      until fract.empty?
+        result.push(fract.slice!(0, fr_group_digits))
+      end
+      result.join(twitter_cldr_reader_symbols[:fraction_group].to_s)
+    end
+
+    def twitter_cldr_localiser_symbols
+      {}
+    end
+
+    def twitter_cldr_reader(locale)
+      num = TwitterCldr::DataReaders::NumberDataReader.new(locale)
+      num.symbols.merge!(twitter_cldr_localiser_symbols)
+    end
+
+    def twitter_cldr_localiser()
+      locale = TwitterCldr.supported_locale?(@lang.to_sym) ? @lang.to_sym : :en
+      twitter_cldr_reader(locale)
+      locale
+    end
+
+    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)
+    end
+
+    def variant(docxml)
+      docxml.xpath(ns("//variant")).each { |f| variant1(f) }
+      docxml.xpath(ns("//variant[@remove = 'true']")).each { |f| f.remove }
+      docxml.xpath(ns("//variant")).each do |v|
+        next unless v&.next&.name == "variant"
+        v.next = "/"
+      end
+      docxml.xpath(ns("//variant")).each { |f| f.replace(f.children) }
+    end
+
+    def variant1(node)
+      if (!node["lang"] || node["lang"] == @lang) &&
+          (!node["script"] || node["script"] == @script)
+      elsif found_matching_variant_sibling(node)
+        node["remove"] = "true"
+      else
+        #return unless !node.at("./preceding-sibling::xmlns:variant")
+      end
+    end
+
+    def found_matching_variant_sibling(node)
+      prev = node.xpath("./preceding-sibling::xmlns:variant")
+      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)
+      end
+      found
+    end
   end
 end

data/lib/isodoc/presentation_xml_convert.rb

@@ -1,6 +1,7 @@
 require_relative "presentation_function/block"
 require_relative "presentation_function/inline"
 require_relative "presentation_function/section"
+require_relative "presentation_function/bibdata"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -14,10 +15,12 @@ module IsoDoc
       @xrefs.parse docxml
       info docxml, nil
       conversions(docxml)
+      docxml.root["type"] = "presentation"
       docxml.to_xml
     end
 
     def conversions(docxml)
+      bibdata docxml
       section docxml
       block docxml
       inline docxml
@@ -30,6 +33,7 @@ module IsoDoc
     end
 
     def block(docxml)
+      amend docxml
       table docxml
       figure docxml
       sourcecode docxml
@@ -47,7 +51,10 @@ module IsoDoc
       xref docxml
       eref docxml
       origin docxml
+      concept docxml
       quotesource docxml
+      mathml docxml
+      variant docxml
     end
 
     def postprocess(result, filename, dir)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.2.3".freeze
+  VERSION = "1.2.8".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -196,6 +196,18 @@ module IsoDoc::WordFunction
       out.parent.at("./table")["class"] = "formula_dl"
     end
 
+    def formula_parse1(node, out)
+      out.div **attr_code(class: "formula") do |div|
+        div.p do |p|
+          parse(node.at(ns("./stem")), div)
+          insert_tab(div, 1)
+          if lbl = node&.at(ns("./name"))&.text
+            div << "(#{lbl})"
+          end
+        end
+      end
+    end
+
     def li_parse(node, out)
       out.li  **attr_code(id: node["id"]) do |li|
         if node["uncheckedcheckbox"] == "true"

data/lib/isodoc/word_function/postprocess.rb

@@ -127,7 +127,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     def list_add(xpath, lvl)
       xpath.each do |list|
         (list.xpath(".//li") - list.xpath(".//ol//li | .//ul//li")).each do |l|
-          l.xpath("./p | ./div").each_with_index do |p, i|
+          l.xpath("./p | ./div | ./table").each_with_index do |p, i|
             next if i == 0
             p.wrap(%{<div class="ListContLevel#{lvl}"/>})
           end
@@ -183,7 +183,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     def generate_header(filename, _dir)
       return nil unless @header
       template = IsoDoc::Common.liquid(File.read(@header, encoding: "UTF-8"))
-      meta = @meta.get
+      meta = @meta.get.merge(@labels || {}).merge(@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/lib/isodoc/word_function/table.rb

@@ -29,7 +29,7 @@ module IsoDoc::WordFunction
         border-bottom:#{SW1} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
         mso-border-bottom-alt:#{SW1} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
       STYLE
-      { rowspan: td["rowspan"], colspan: td["colspan"],
+      { rowspan: td["rowspan"], colspan: td["colspan"], valign: td["valign"],
         align: td["align"], style: style.gsub(/\n/, "") }
     end
 
@@ -38,7 +38,8 @@ module IsoDoc::WordFunction
         summary: node["summary"],
         width: node["width"],
         style: "mso-table-anchor-horizontal:column;"\
-        "mso-table-overlap:never;border-spacing:0;border-width:1px;#{keep_style(node)}"
+        "mso-table-overlap:never;border-spacing:0;border-width:1px;#{keep_style(node)}",
+        class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable")
       }))
     end
 

data/lib/isodoc/xref.rb

@@ -41,6 +41,7 @@ module IsoDoc
 
     # extract names for all anchors, xref and label
     def parse(docxml)
+      amend_preprocess(docxml)
       initial_anchor_names(docxml)
       back_anchor_names(docxml)
       # preempt clause notes with all other types of note (ISO default)

data/lib/isodoc/xref/xref_anchor.rb

@@ -35,11 +35,15 @@ module IsoDoc::XrefGen
     end
 
     def anchor_struct_xref(lbl, elem)
+      l10n("#{elem} #{anchor_struct_value(lbl, elem)}")
+    end
+
+    def anchor_struct_value(lbl, elem)
       case elem
-      when @labels["formula"] then l10n("#{elem} (#{lbl})")
-      when @labels["inequality"] then l10n("#{elem} (#{lbl})")
+      when @labels["formula"] then "(#{lbl})"
+      when @labels["inequality"] then "(#{lbl})"
       else
-        l10n("#{elem} #{lbl}")
+        lbl
       end
     end
 
@@ -50,6 +54,7 @@ module IsoDoc::XrefGen
       ret[:xref].gsub!(/ $/, "")
       ret[:container] = @klass.get_clause_id(container) unless container.nil?
       ret[:type] = type
+      ret[:value] = anchor_struct_value(lbl, elem)
       ret
     end
   end

data/lib/isodoc/xref/xref_counter.rb

@@ -8,17 +8,20 @@ module IsoDoc::XrefGen
       @subseq = ""
       @letter_override = nil
       @number_override = nil
+      @base = ""
     end
 
     def new_subseq_increment(node)
       @subseq = node["subsequence"]
       @num += 1
       @letter = node["subsequence"] ? "a" : ""
+      @base = ""
       if node["number"]
-        /^(?<n>\d*)(?<a>[a-z]*)$/ =~ node["number"]
-        if n || a
-          @letter_override = @letter = a if a
-          @number_override = @num = n.to_i if n
+        /^(?<b>.*?)(?<n>\d*)(?<a>[a-z]*)$/ =~ node["number"]
+        if !n.empty? || !a.empty?
+          @letter_override = @letter = a unless a.empty?
+          @number_override = @num = n.to_i unless n.empty?
+          @base = b
         else
           @letter_override = node["number"]
           @letter = @letter_override if /^[a-z]$/.match(@letter_override)
@@ -28,8 +31,13 @@ module IsoDoc::XrefGen
 
     def sequence_increment(node)
       if node["number"]
+        @base = ""
         @number_override = node["number"]
-        @num = @number_override.to_i if /^\d+$/.match(@number_override)
+        /^(?<b>.*?)(?<n>\d+)$/ =~ node["number"]
+        unless n.nil? || n.empty?
+          @num = n.to_i
+          @base = b
+        end
       else
         @num += 1
       end
@@ -37,8 +45,14 @@ module IsoDoc::XrefGen
 
     def subsequence_increment(node)
       if node["number"]
+        @base = ""
         @letter_override = node["number"]
-        @letter = @letter_override if /^[a-z]$/.match(@letter_override)
+        /^(?<b>.*?)(?<n>\d*)(?<a>[a-z]+)$/ =~ node["number"]
+        unless a.empty?
+          @letter = a
+          @base = b
+          @number_override = @num = n.to_i unless n.empty?
+        end
       else
         @letter = (@letter.ord + 1).chr.to_s
       end
@@ -59,7 +73,7 @@ module IsoDoc::XrefGen
     end
 
     def print
-      "#{@number_override || @num}#{@letter_override || @letter}"
+      "#{@base}#{@number_override || @num}#{@letter_override || @letter}"
     end
 
     def listlabel(depth)