isodoc 1.0.29 → 1.1.3.pre.alpha2

data/lib/isodoc/html_convert.rb

@@ -16,10 +16,11 @@ module IsoDoc
 
     def initialize(options)
       @format = :html
+      @suffix = "html"
       super
     end
 
-    def convert(filename, file = nil, debug = false)
+    def convert(filename, file = nil, debug = false, output_filename = nil)
       ret = super
       Dir.exists?(tmpimagedir) and Dir["#{tmpimagedir}/*"].empty? and
         FileUtils.rm_r tmpimagedir

data/lib/isodoc/html_function/html.rb

@@ -4,7 +4,7 @@ require "base64"
 module IsoDoc::HtmlFunction
   module Html
     def convert1(docxml, filename, dir)
-      anchor_names docxml
+      @xrefs.parse docxml
       noko do |xml|
         xml.html **{ lang: "#{@lang}" } do |html|
           info docxml, nil

data/lib/isodoc/html_function/postprocess.rb

@@ -18,7 +18,7 @@ module IsoDoc::HtmlFunction
       #result = populate_template(result, :html)
       result = from_xhtml(move_images(to_xhtml(result)))
       result = html5(script_cdata(inject_script(result)))
-      File.open("#{filename}.html", "w:UTF-8") { |f| f.write(result) }
+      File.open(filename, "w:UTF-8") { |f| f.write(result) }
     end
 
     def html5(doc)

data/lib/isodoc/metadata.rb

@@ -1,10 +1,15 @@
-require_relative "./metadata_date"
+# frozen_string_literal: true
+
+require_relative './metadata_date'
 
 module IsoDoc
   class Metadata
     DATETYPES = %w{published accessed created implemented obsoleted confirmed
-    updated issued received transmitted copied unchanged circulated vote-started
-    vote-ended}.freeze
+                   updated issued received transmitted copied unchanged
+                   circulated vote-started
+                   vote-ended}.freeze
+
+    attr_accessor :fonts_options
 
     def ns(xpath)
       Common::ns(xpath)
@@ -14,13 +19,14 @@ module IsoDoc
       IsoDoc::Function::I18n::l10n(a, b, c)
     end
 
-    def initialize(lang, script, labels)
+    def initialize(lang, script, labels, fonts_options = {})
       @metadata = {}
-      DATETYPES.each { |w| @metadata["#{w.gsub(/-/, "_")}date".to_sym] = "XXX" }
+      DATETYPES.each { |w| @metadata["#{w.gsub(/-/, '_')}date".to_sym] = 'XXX' }
       @lang = lang
       @script = script
       @c = HTMLEntities.new
       @labels = labels
+      @fonts_options = fonts_options
     end
 
     def get
@@ -36,26 +42,26 @@ module IsoDoc
     end
 
     def extract_person_names(authors)
-      authors.inject([]) do |ret, a|
-        if a.at(ns("./name/completename"))
-          ret << a.at(ns("./name/completename")).text
+      authors.reduce([]) do |ret, a|
+        if a.at(ns('./name/completename'))
+          ret << a.at(ns('./name/completename')).text
         else
           fn = []
-          forenames = a.xpath(ns("./name/forename"))
+          forenames = a.xpath(ns('./name/forename'))
           forenames.each { |f| fn << f.text }
-          surname = a&.at(ns("./name/surname"))&.text
-          ret << fn.join(" ") + " " + surname
+          surname = a&.at(ns('./name/surname'))&.text
+          ret << fn.join(' ') + ' ' + surname
         end
       end
     end
 
     def extract_person_affiliations(authors)
-      authors.inject([]) do |m, a|
-        name = a&.at(ns("./affiliation/organization/name"))&.text
-        location = a&.at(ns("./affiliation/organization/address/"\
-                            "formattedAddress"))&.text
-        m << ((!name.nil? && !location.nil?) ? "#{name}, #{location}" :
-          (name || location || ""))
+      authors.reduce([]) do |m, a|
+        name = a&.at(ns('./affiliation/organization/name'))&.text
+        location = a&.at(ns('./affiliation/organization/address/'\
+                            'formattedAddress'))&.text
+        m << (!name.nil? && !location.nil? ? "#{name}, #{location}" :
+          (name || location || ''))
         m
       end
     end
@@ -84,99 +90,99 @@ module IsoDoc
     end
 
     def bibdate(isoxml, _out)
-      isoxml.xpath(ns("//bibdata/date")).each do |d|
-        set("#{d['type'].gsub(/-/, "_")}date".to_sym, Common::date_range(d))
+      isoxml.xpath(ns('//bibdata/date')).each do |d|
+        set("#{d['type'].gsub(/-/, '_')}date".to_sym, Common::date_range(d))
       end
     end
 
     def doctype(isoxml, _out)
-      b = isoxml&.at(ns("//bibdata/ext/doctype"))&.text || return
-      t = b.split(/[- ]/).map{ |w| w.capitalize }.join(" ")
+      b = isoxml&.at(ns('//bibdata/ext/doctype'))&.text || return
+      t = b.split(/[- ]/).map(&:capitalize).join(' ')
       set(:doctype, t)
     end
 
     def iso?(org)
-      name = org&.at(ns("./name"))&.text
-      abbrev = org&.at(ns("./abbreviation"))&.text
-      (abbrev == "ISO" ||
-       name == "International Organization for Standardization" )
+      name = org&.at(ns('./name'))&.text
+      abbrev = org&.at(ns('./abbreviation'))&.text
+      (abbrev == 'ISO' ||
+       name == 'International Organization for Standardization')
     end
 
     def agency(xml)
-      agency = ""
+      agency = ''
       publisher = []
       xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = 'publisher']/"\
-                   "organization")).each do |org|
-        name = org&.at(ns("./name"))&.text
-        agency1 = org&.at(ns("./abbreviation"))&.text || name
+                   'organization')).each do |org|
+        name = org&.at(ns('./name'))&.text
+        agency1 = org&.at(ns('./abbreviation'))&.text || name
         publisher << name if name
-        agency = iso?(org) ?  "ISO/#{agency}" : "#{agency}#{agency1}/"
+        agency = iso?(org) ? "ISO/#{agency}" : "#{agency}#{agency1}/"
       end
-      set(:agency, agency.sub(%r{/$}, ""))
-      set(:publisher, multiple_and(publisher, @labels["and"]))
+      set(:agency, agency.sub(%r{/$}, ''))
+      set(:publisher, multiple_and(publisher, @labels['and']))
     end
 
     def multiple_and(names, andword)
-      return "" if names.length == 0
+      return '' if names.empty?
       return names[0] if names.length == 1
-      names.length == 2 and
-        return l10n("#{names[0]} #{andword} #{names[1]}", @lang, @script)
-      l10n(names[0..-2].join(", ") + " #{andword} #{names[-1]}", @lang, @script)
+      (names.length == 2) &&
+        (return l10n("#{names[0]} #{andword} #{names[1]}", @lang, @script))
+      l10n(names[0..-2].join(', ') + " #{andword} #{names[-1]}", @lang, @script)
     end
 
     def docstatus(isoxml, _out)
-      docstatus = isoxml.at(ns("//bibdata/status/stage"))
+      docstatus = isoxml.at(ns('//bibdata/status/stage'))
       set(:unpublished, true)
       if docstatus
         set(:stage, status_print(docstatus.text))
-        i = isoxml&.at(ns("//bibdata/status/substage"))&.text and
+        (i = isoxml&.at(ns('//bibdata/status/substage'))&.text) &&
           set(:substage, i)
-        i = isoxml&.at(ns("//bibdata/status/iteration"))&.text and
+        (i = isoxml&.at(ns('//bibdata/status/iteration'))&.text) &&
           set(:iteration, i)
         set(:unpublished, unpublished(docstatus.text))
-        unpublished(docstatus.text) and
+        unpublished(docstatus.text) &&
           set(:stageabbr, stage_abbr(docstatus.text))
       end
     end
 
     def stage_abbr(docstatus)
-      status_print(docstatus).split(/ /).
-        map { |s| s[0].upcase }.join("")
+      status_print(docstatus).split(/ /)
+                             .map { |s| s[0].upcase }.join('')
     end
 
     def unpublished(status)
-      !(status.downcase == "published")
+      !status.casecmp('published').zero?
     end
 
     def status_print(status)
-      status.split(/-/).map{ |w| w.capitalize }.join(" ")
+      status.split(/-/).map(&:capitalize).join(' ')
     end
 
     def docid(isoxml, _out)
-      dn = isoxml.at(ns("//bibdata/docidentifier"))
+      dn = isoxml.at(ns('//bibdata/docidentifier'))
       set(:docnumber, dn&.text)
     end
 
     def docnumeric(isoxml, _out)
-      dn = isoxml.at(ns("//bibdata/docnumber"))
+      dn = isoxml.at(ns('//bibdata/docnumber'))
       set(:docnumeric, dn&.text)
     end
 
     def draftinfo(draft, revdate)
-      draftinfo = ""
+      draftinfo = ''
       if draft
-        draftinfo = " (#{@labels["draft_label"]} #{draft}"
+        draftinfo = " (#{@labels['draft_label']} #{draft}"
         draftinfo += ", #{revdate}" if revdate
-        draftinfo += ")"
+        draftinfo += ')'
       end
       l10n(draftinfo, @lang, @script)
     end
 
     def version(isoxml, _out)
-      set(:edition, isoxml&.at(ns("//bibdata/edition"))&.text)
-      set(:docyear, isoxml&.at(ns("//bibdata/copyright/from"))&.text)
-      set(:draft, isoxml&.at(ns("//version/draft"))&.text)
-      revdate = isoxml&.at(ns("//version/revision-date"))&.text
+      set(:edition, isoxml&.at(ns('//bibdata/edition'))&.text)
+      set(:docyear, isoxml&.at(ns('//bibdata/copyright/from'))&.text)
+      set(:draft, isoxml&.at(ns('//version/draft'))&.text)
+      revdate = isoxml&.at(ns('//version/revision-date'))&.text
       set(:revdate, revdate)
       set(:revdate_monthyear, monthyr(revdate))
       set(:draftinfo,
@@ -188,7 +194,7 @@ module IsoDoc
       set(:doctitle, main)
     end
 
-    def subtitle(isoxml, _out)
+    def subtitle(_isoxml, _out)
       nil
     end
 
@@ -199,29 +205,29 @@ module IsoDoc
 
     def relations_partof(isoxml)
       std = isoxml.at(ns("//bibdata/relation[@type = 'partOf']")) || return
-      id = std.at(ns(".//docidentifier"))
+      id = std.at(ns('.//docidentifier'))
       set(:partof, id.text) if id
     end
 
     def relations_obsoletes(isoxml)
       std = isoxml.at(ns("//bibdata/relation[@type = 'obsoletes']")) || return
-      locality = std.at(ns(".//locality"))
-      id = std.at(ns(".//docidentifier"))
+      locality = std.at(ns('.//locality'))
+      id = std.at(ns('.//docidentifier'))
       set(:obsoletes, id.text) if id
       set(:obsoletes_part, locality.text) if locality
     end
 
     def url(xml, _out)
-      a = xml.at(ns("//bibdata/uri[not(@type)]")) and set(:url, a.text)
-      a = xml.at(ns("//bibdata/uri[@type = 'html']")) and set(:html, a.text)
-      a = xml.at(ns("//bibdata/uri[@type = 'xml']")) and set(:xml, a.text)
-      a = xml.at(ns("//bibdata/uri[@type = 'pdf']")) and set(:pdf, a.text)
-      a = xml.at(ns("//bibdata/uri[@type = 'doc']")) and set(:doc, a.text)
+      (a = xml.at(ns('//bibdata/uri[not(@type)]'))) && set(:url, a.text)
+      (a = xml.at(ns("//bibdata/uri[@type = 'html']"))) && set(:html, a.text)
+      (a = xml.at(ns("//bibdata/uri[@type = 'xml']"))) && set(:xml, a.text)
+      (a = xml.at(ns("//bibdata/uri[@type = 'pdf']"))) && set(:pdf, a.text)
+      (a = xml.at(ns("//bibdata/uri[@type = 'doc']"))) && set(:doc, a.text)
     end
 
     def keywords(isoxml, _out)
       ret = []
-      isoxml.xpath(ns("//bibdata/keyword")).each { |kw| ret << kw.text }
+      isoxml.xpath(ns('//bibdata/keyword')).each { |kw| ret << kw.text }
       set(:keywords, ret)
     end
   end

data/lib/isodoc/pdf_convert.rb

@@ -24,19 +24,21 @@ module IsoDoc
 
     def initialize(options)
       @format = :pdf
+      @suffix = "pdf"
       super
     end
 
-    def convert(filename, file = nil, debug = false)
-      file = File.read(filename, encoding: "utf-8") if file.nil?
+    def convert(input_filename, file = nil, debug = false, output_filename = nil)
+      file = File.read(input_filename, encoding: "utf-8") if file.nil?
       @openmathdelim, @closemathdelim = extract_delims(file)
-      docxml, outname_html, dir = convert_init(file, filename, debug)
+      docxml, filename, dir = convert_init(file, input_filename, debug)
       result = convert1(docxml, filename, dir)
       return result if debug
-      postprocess(result, filename, dir)
+      postprocess(result, filename + ".tmp.html", dir)
       FileUtils.rm_rf dir
-      ::Metanorma::Output::Pdf.new.convert("#{filename}.html", outname_html + ".pdf")
-      FileUtils.rm_rf ["#{filename}.html", tmpimagedir]
+      ::Metanorma::Output::Pdf.new.convert("#{filename}.tmp.html",
+                                           output_filename || "#{filename}.#{@suffix}")
+      FileUtils.rm_rf ["#{filename}.tmp.html", tmpimagedir]
     end
 
     def xref_parse(node, out)

data/lib/isodoc/presentation_xml_convert.rb

@@ -0,0 +1,29 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def initialize(options)
+      @format = :presentation
+      @suffix = "presentation.xml"
+      super
+    end
+
+    def convert1(docxml, filename, dir)
+      @xrefs.parse docxml
+      info docxml, nil
+      docxml.to_xml
+    end
+
+    def postprocess(result, filename, dir)
+      #result = from_xhtml(cleanup(to_xhtml(textcleanup(result))))
+      toXML(result, filename)
+      @files_to_delete.each { |f| FileUtils.rm_rf f }
+    end
+
+    def toXML(result, filename)
+      #result = (from_xhtml(html_cleanup(to_xhtml(result))))
+      #result = from_xhtml(move_images(to_xhtml(result)))
+      #result = html5(script_cdata(inject_script(result)))
+      File.open(filename, "w:UTF-8") { |f| f.write(result) }
+    end
+  end
+end
+

data/lib/isodoc/sassc_importer.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'sassc'
+
+class SasscImporter < SassC::Importer
+  def imports(path, _parent_path)
+    unless path.match?(/(css|scss)$/)
+      Import.new("#{path}.scss")
+    end
+  end
+end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.29".freeze
+  VERSION = "1.1.3-alpha2".freeze
 end

data/lib/isodoc/word_convert.rb

@@ -32,10 +32,11 @@ module IsoDoc
 
     def initialize(options)
       @format = :doc
+      @suffix = "doc"
       super
     end
 
-    def convert(filename, file = nil, debug = false)
+    def convert(filename, file = nil, debug = false, output_filename = nil)
       ret = super
       FileUtils.rm_rf tmpimagedir
       ret

data/lib/isodoc/word_function/body.rb

@@ -156,7 +156,7 @@ module IsoDoc::WordFunction
       out.div **note_attrs(node) do |div|
         first = node.first_element_child
         div.p **{ class: "Note" } do |p|
-          anchor = get_anchors[node['id']]
+          anchor = @xrefs.get[node['id']]
           p << "#{anchor&.dig(:label) || '???'}: "
           para_then_remainder(first, node, p, div)
         end

data/lib/isodoc/word_function/postprocess.rb

@@ -32,6 +32,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     end
 
     def postprocess(result, filename, dir)
+      filename = filename.sub(/\.doc$/, "")
       header = generate_header(filename, dir)
       result = from_xhtml(cleanup(to_xhtml(textcleanup(result))))
       toWord(result, filename, dir, header)

data/lib/isodoc/xref.rb

@@ -0,0 +1,59 @@
+require_relative "xref/xref_anchor"
+require_relative "xref/xref_counter"
+require_relative "xref/xref_gen_seq"
+require_relative "xref/xref_gen"
+require_relative "xref/xref_sect_gen"
+require_relative "class_utils"
+
+module IsoDoc
+  class Xref
+    include XrefGen::Anchor
+    include XrefGen::Blocks
+    include XrefGen::Sections
+
+     def initialize(lang, script, klass, labels, options = {})
+      @anchors = {}
+      @lang = lang
+      @script = script
+      @klass = klass
+      @labels = labels
+      @options = options
+    end
+
+    def get
+      @anchors
+    end
+
+    def anchor(id, lbl, warning = true)
+      return nil if id.nil? || id.empty?
+      unless @anchors[id]
+        if warning
+          @seen ||= Seen_Anchor.instance
+          @seen.seen(id) or warn "No label has been processed for ID #{id}"
+          @seen.add(id)
+          return "[#{id}]"
+        end
+      end
+      @anchors.dig(id, lbl)
+    end
+
+    # extract names for all anchors, xref and label
+    def parse(docxml)
+      initial_anchor_names(docxml)
+      back_anchor_names(docxml)
+      # preempt clause notes with all other types of note (ISO default)
+      note_anchor_names(docxml.xpath(ns("//table | //figure")))
+      note_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
+      example_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
+      list_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
+    end
+
+    def ns(xpath)
+      Common::ns(xpath)
+    end
+
+    def l10n(a, lang = @lang, script = @script)
+      IsoDoc::Function::I18n::l10n(a, lang, script)
+    end
+  end
+end