isodoc 1.5.1 → 1.6.0

data/lib/isodoc/css.rb

@@ -14,11 +14,22 @@ module IsoDoc
       compiled_path
     end
 
+    def localpath(path)
+      return path if %r{^[A-Z]:|^/|^file:/}.match(path)
+      return path unless (@sourcedir || @localdir) && path
+      File.expand_path(File.join((@sourcedir || @localdir), path))
+    end
+
     # run this after @meta is populated
     def populate_css
-      @htmlstylesheet = generate_css(@htmlstylesheet_name, true)
-      @wordstylesheet = generate_css(@wordstylesheet_name, false)
-      @standardstylesheet = generate_css(@standardstylesheet_name, false)
+      @htmlstylesheet = generate_css(localpath(@htmlstylesheet_name), true)
+      @wordstylesheet = generate_css(localpath(@wordstylesheet_name), false)
+      @standardstylesheet =
+        generate_css(localpath(@standardstylesheet_name), false)
+      @htmlstylesheet_override_name and @htmlstylesheet_override =
+        File.open(localpath(@htmlstylesheet_override_name))
+      @wordstylesheet_override_name and @wordstylesheet_override =
+        File.open(localpath(@wordstylesheet_override_name))
     end
 
     def default_fonts(_options)
@@ -77,7 +88,6 @@ module IsoDoc
     # stripwordcss if HTML stylesheet, !stripwordcss if DOC stylesheet
     def generate_css(filename, stripwordcss)
       return nil if filename.nil?
-
       filename = precompiled_style_or_original(filename)
       stylesheet = File.read(filename, encoding: 'UTF-8')
       stylesheet = populate_template(stylesheet, :word)

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/inline.rb

@@ -23,21 +23,26 @@ module IsoDoc::Function
     end
 
     def xref_parse(node, out)
-      target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".html#") :
-        "##{node["target"]}"
-        out.a(**{ "href": target }) { |l| no_locality_parse(node, l) }
+      target = if /#/.match?(node["target"])
+                 node["target"].sub(/#/, ".html#")
+               else
+                 "##{node['target']}"
+               end
+      out.a(**{ "href": target }) { |l| no_locality_parse(node, l) }
     end
 
     def suffix_url(url)
-      return url if %r{^http[s]?://}.match(url)
+      return url if %r{^https?://}.match?(url)
+
       url.sub(/#{File.extname(url)}$/, ".html")
     end
 
     def eref_target(node)
-      href = "#" + node["bibitemid"]
+      href = "##{node['bibitemid']}"
       url = node.at(ns("//bibitem[@id = '#{node['bibitemid']}']/"\
                        "uri[@type = 'citation']"))
       return href unless url
+
       href = suffix_url(url.text)
       anchor = node&.at(ns(".//locality[@type = 'anchor']"))&.text&.strip
       anchor and href += "##{anchor}"
@@ -68,10 +73,11 @@ module IsoDoc::Function
     end
 
     def stem_parse(node, out)
-      ooml = if node["type"] == "AsciiMath"
+      ooml = case node["type"]
+             when "AsciiMath"
                "#{@openmathdelim}#{HTMLEntities.new.encode(node.text)}"\
                  "#{@closemathdelim}"
-             elsif node["type"] == "MathML" then node.first_element_child.to_s
+             when "MathML" then node.first_element_child.to_s
              else
                HTMLEntities.new.encode(node.text)
              end
@@ -93,7 +99,7 @@ module IsoDoc::Function
                 height: node["height"] || "auto",
                 width: node["width"] || "auto",
                 title: node["title"],
-                alt: node["alt"]  }
+                alt: node["alt"] }
       out.img **attr_code(attrs)
       image_title_parse(out, caption)
     end
@@ -106,12 +112,27 @@ module IsoDoc::Function
 
     def text_parse(node, out)
       return if node.nil? || node.text.nil?
+
       text = node.to_s
-      text = text.gsub("\n", "<br/>").gsub("<br/> ", "<br/>&nbsp;").
-        gsub(/[ ](?=[ ])/, "&nbsp;") if in_sourcecode
+      if in_sourcecode
+        text = text.gsub("\n", "<br/>").gsub("<br/> ", "<br/>&nbsp;")
+          .gsub(/ (?= )/, "&nbsp;")
+      end
       out << text
     end
 
+    def add_parse(node, out)
+      out.span **{class: "addition"} do |e|
+        node.children.each { |n| parse(n, e) }
+      end
+    end
+
+    def del_parse(node, out)
+      out.span **{class: "deletion"} do |e|
+        node.children.each { |n| parse(n, e) }
+      end
+    end
+
     def error_parse(node, out)
       text = node.to_xml.gsub(/</, "&lt;").gsub(/>/, "&gt;")
       out.para do |p|

data/lib/isodoc/function/references.rb

@@ -87,7 +87,7 @@ module IsoDoc::Function
 
     def omit_docid_prefix(prefix)
       return true if prefix.nil? || prefix.empty?
-      return %w(ISO IEC ITU W3C metanorma).include? prefix
+      return %w(ISO IEC IEV ITU W3C csd metanorma rfc-anchor).include? prefix
     end
 
     def date_note_process(b, ref)

data/lib/isodoc/function/to_word_html.rb

@@ -19,14 +19,21 @@ module IsoDoc::Function
     def init_file(filename, debug)
       filepath = Pathname.new(filename)
       filename = filepath.sub_ext('').sub(/\.presentation$/, "").to_s
+      dir = init_dir(filename, debug)
+      @filename = filename
+      @localdir = filepath.parent.to_s + '/'
+      @sourcedir = @localdir
+      @sourcefilename and @sourcedir = Pathname.new(@sourcefilename).parent.to_s + '/'
+      [filename, dir]
+    end
+
+    def init_dir(filename, debug)
       dir = "#{filename}_files"
       unless debug
         Dir.mkdir(dir, 0777) unless File.exists?(dir)
         FileUtils.rm_rf "#{dir}/*"
       end
-      @filename = filename
-      @localdir = filepath.parent.to_s + '/'
-      [filename, dir]
+      dir
     end
 
     # tmp image dir is same directory as @filename
@@ -44,15 +51,16 @@ module IsoDoc::Function
       if @standardstylesheet
         head.style do |style|
           @standardstylesheet.open
-          stylesheet = @standardstylesheet.read.
-            gsub("FILENAME", File.basename(filename).sub(/\.presentation$/, ""))
+          stylesheet = @standardstylesheet.read.gsub(
+            "FILENAME", File.basename(filename).sub(/\.presentation$/, "")
+          )
           style.comment "\n#{stylesheet}\n"
         end
       end
     end
 
     def body_attr
-      { lang: "#{@lang}" }
+      { lang: @lang.to_s }
     end
 
     def make_body(xml, docxml)
@@ -125,7 +133,7 @@ module IsoDoc::Function
       i = scope isoxml, out, 0
       i = norm_ref isoxml, out, i
       i = terms_defs isoxml, out, i
-      i = symbols_abbrevs isoxml, out, i
+      symbols_abbrevs isoxml, out, i
       clause isoxml, out
       annex isoxml, out
       bibliography isoxml, out
@@ -133,7 +141,7 @@ module IsoDoc::Function
 
     def boilerplate(node, out)
       boilerplate = node.at(ns("//boilerplate")) or return
-      out.div **{class: "authority"} do |s|
+      out.div **{ class: "authority" } do |s|
         boilerplate.children.each do |n|
           if n.name == "title"
             s.h1 do |h|
@@ -225,6 +233,9 @@ 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) # in Presentation XML only
+        when "add" then add_parse(node, out)
+        when "del" then del_parse(node, out)
         else
           error_parse(node, out)
         end

data/lib/isodoc/function/utils.rb

@@ -123,6 +123,7 @@ module IsoDoc::Function
       h1 = to_xhtml_fragment(h.dup)
       h1.traverse do |x|
         x.replace(' ') if x.name == 'span' && /mso-tab-count/.match(x['style'])
+        x.remove if x.name == 'img'
         x.remove if x.name == 'span' && x['class'] == 'MsoCommentReference'
         x.remove if x.name == 'a' && x['class'] == 'FootnoteRef'
         x.remove if x.name == 'span' && /mso-bookmark/.match(x['style'])

data/lib/isodoc/html_function/postprocess.rb

@@ -44,12 +44,14 @@ module IsoDoc::HtmlFunction
       IsoDoc::HtmlFunction::MathvariantToPlain.new(docxml).convert
     end
 
-    def htmlstylesheet
-      @htmlstylesheet.open
-      stylesheet = @htmlstylesheet.read
+    def htmlstylesheet(file)
+      return if file.nil?
+      file.open if file.is_a?(Tempfile)
+      stylesheet = file.read
       xml = Nokogiri::XML("<style/>")
       xml.children.first << Nokogiri::XML::Comment.new(xml, "\n#{stylesheet}\n")
-      @htmlstylesheet.close!
+      file.close
+      file.unlink if file.is_a?(Tempfile)
       xml.root.to_s
     end
 
@@ -57,7 +59,8 @@ module IsoDoc::HtmlFunction
       return docxml unless @htmlstylesheet
       title = docxml.at("//*[local-name() = 'head']/*[local-name() = 'title']")
       head = docxml.at("//*[local-name() = 'head']")
-      head << htmlstylesheet
+      head << htmlstylesheet(@htmlstylesheet)
+      s = htmlstylesheet(@htmlstylesheet_override) and head << s
       docxml
     end
 

data/lib/isodoc/pdf_convert.rb

@@ -42,9 +42,7 @@ module IsoDoc
     end
 
     def xref_parse(node, out)
-      target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".pdf#") :
-        "##{node["target"]}"
-      out.a(**{ "href": target }) { |l| l << get_linkend(node) }
+      out.a(**{ "href": target_pdf(node) }) { |l| l << get_linkend(node) }
     end
   end
 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,5 @@
 require "twitter_cldr"
+require "bigdecimal"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -10,8 +11,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 +22,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 +34,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
@@ -53,69 +50,79 @@ module IsoDoc
       end
     end
 
-    def get_linkend(n)
-      contents = non_locality_elems(n).select { |c| !c.text? || /\S/.match(c) }
+    def get_linkend(node)
+      contents = non_locality_elems(node).select { |c| !c.text? || /\S/.match(c) }
       return unless contents.empty?
-      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)
+      link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
+      link += eref_localities(node.xpath(ns("./locality | ./localityStack")), link, node)
+      non_locality_elems(node).each { |n| n.remove }
+      node.add_child(link)
     end
     # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
     # <locality type="section"><reference>3.1</reference></locality></origin>
 
-    def eref_localities(refs, target)
+    def eref_localities(refs, target, n)
       ret = ""
       refs.each_with_index do |r, i|
         delim = ","
         delim = ";" if r.name == "localityStack" && i>0
-        ret = eref_locality_stack(r, i, target, delim, ret)
+        ret = eref_locality_stack(r, i, target, delim, ret, n)
       end
       ret
     end
 
-    def eref_locality_stack(r, i, target, delim, ret)
+    def eref_locality_stack(r, i, target, delim, ret, n)
       if r.name == "localityStack"
         r.elements.each_with_index do |rr, j|
-          ret += eref_localities0(rr, j, target, delim)
+          ret += eref_localities0(rr, j, target, delim, n)
           delim = ","
         end
       else
-        ret += eref_localities0(r, i, target, delim)
+        ret += eref_localities0(r, i, target, delim, n)
       end
       ret
     end
 
-    def eref_localities0(r, i, target, delim)
+    def eref_localities0(r, i, target, delim, n)
       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)
+                         r.at(ns("./referenceTo")), delim, n, @lang)
       end
     end
 
     # TODO: move to localization file
-    def eref_localities1_zh(target, type, from, to, delim)
+    def eref_localities1_zh(target, type, from, to, n, delim)
       ret = "#{delim} 第#{from.text}" if from
       ret += "&ndash;#{to.text}" if to
       loc = (@i18n.locality[type] || type.sub(/^locality:/, "").capitalize )
-      ret += " #{loc}"
+      ret += " #{loc}" unless n["droploc"] == "true"
       ret
     end
 
     # TODO: move to localization file
-    def eref_localities1(target, type, from, to, delim, lang = "en")
+    def eref_localities1(target, type, from, to, delim, n, 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, n, delim))
       ret = delim
-      loc = @i18n.locality[type] || type.sub(/^locality:/, "").capitalize
-      ret += " #{loc}"
+      ret += eref_locality_populate(type, n)
       ret += " #{from.text}" if from
       ret += "&ndash;#{to.text}" if to
       l10n(ret)
     end
 
+    def eref_locality_populate(type, n)
+      return "" if n["droploc"] == "true"
+      loc = @i18n.locality[type] || type.sub(/^locality:/, "")
+      loc = case n["case"]
+            when "capital" then loc.capitalize
+            when "lowercase" then loc.downcase
+            else
+              loc.capitalize
+            end
+      " #{loc}"
+    end
+
     def xref(docxml)
       docxml.xpath(ns("//xref")).each { |f| xref1(f) }
     end
@@ -163,23 +170,22 @@ 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 :
+      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 +235,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 +248,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