isodoc 1.0.29 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56ed930565ee3a3bbb9649d61e3b552f6a13de3bb66cbf6f0e134d341c457386
-  data.tar.gz: ee72443f7f96082b52b60bd525cb54d14088f0776c60bd88456bd5796de9d7a9
+  metadata.gz: 5b5e9597107793ecac111d5706640c399dcdec0411fdf49489c7058cf342bac2
+  data.tar.gz: 0b488bc57ff9c36a418f0012a49d68111a2e5f519a0a5d6191d201db99356526
 SHA512:
-  metadata.gz: 8effb0abf7faf7a63a40a3cee55465290e5d156be8af54f16b36283e191f52ff3cba4443cce54f95c6b38a86c951656d78179cb02b4010c98a6bea8d80c97501
-  data.tar.gz: 15c19b41ec493b97cc0ed06fbfe161f1d39f99e069f6d760a20858330f676c2bd35a60fe04f83b88569e6c61238090d0e2c336129f9665f6b695882fc75801d3
+  metadata.gz: 26660b7ac5d08b63f0846c5d8a3caea1f58eed0491c1fcfe83ee3d3b9b3d73da9eaf57636fc48ed84370f12a1dd25e6043b5372750b03d6fc20547be0c6f22f0
+  data.tar.gz: 99fe284cd22c1c19dc3f4528ae057857194b0354f55cf31414b1dbc1d54f9c564b1b45101faaad426c69fb2fb15dd3ae2186d0532a95a1675f5b92f7658d7546

data/isodoc.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "liquid"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "sassc", "~> 2.4.0"
-  spec.add_dependency "metanorma", "~> 1.0.0"
+  spec.add_dependency "metanorma", "~> 1.1.0"
   spec.add_dependency "rake", "~> 12.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"

data/lib/isodoc.rb

@@ -21,6 +21,8 @@ require "isodoc/word_convert"
 require "isodoc/pdf_convert"
 require "isodoc/xslfo_convert"
 require "isodoc/headlesshtml_convert"
+require "isodoc/presentation_xml_convert"
+require "isodoc/xref"
 
 module IsoDoc
 

data/lib/isodoc/common.rb

@@ -9,8 +9,6 @@ require_relative "./function/table"
 require_relative "./function/terms"
 require_relative "./function/to_word_html"
 require_relative "./function/utils"
-require_relative "./function/xref_gen"
-require_relative "./function/xref_sect_gen"
 require_relative "./function/reqt"
 require_relative "./class_utils"
 
@@ -27,8 +25,6 @@ module IsoDoc
     include Function::Terms
     include Function::ToWordHtml
     include Function::Utils
-    include Function::XrefGen
-    include Function::XrefSectGen
 
     extend ::IsoDoc::ClassUtils
   end

data/lib/isodoc/convert.rb

@@ -53,7 +53,6 @@ module IsoDoc
       @termexample = false
       @note = false
       @sourcecode = false
-      @anchors = {}
       @footnotes = []
       @comments = []
       @in_footnote = false
@@ -142,7 +141,7 @@ module IsoDoc
     end
 
     def convert1(docxml, filename, dir)
-      anchor_names docxml
+      @xrefs.parse docxml
       noko do |xml|
         xml.html **{ lang: "#{@lang}" } do |html|
           html.parent.add_namespace("epub", "http://www.idpf.org/2007/ops")
@@ -158,25 +157,36 @@ module IsoDoc
       @meta = Metadata.new(lang, script, labels)
     end
 
-    def convert_init(file, filename, debug)
+    def xref_init(lang, script, klass, labels, options)
+      @xrefs = Xref.new(lang, script, klass, labels, options)
+    end
+
+    def convert_init(file, input_filename, debug)
       docxml = Nokogiri::XML(file)
-      filename, dir = init_file(filename, debug)
+      filename, dir = init_file(input_filename, debug)
       docxml.root.default_namespace = ""
       lang = docxml&.at(ns("//bibdata/language"))&.text || @lang
       script = docxml&.at(ns("//bibdata/script"))&.text || @script
       i18n_init(lang, script)
       metadata_init(lang, script, @labels)
+      xref_init(lang, script, self, @labels, {})
       [docxml, filename, dir]
     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, filename, 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)
+      output_filename ||= "#{filename}.#{@suffix}"
+      postprocess(result, output_filename, dir)
       FileUtils.rm_rf dir
     end
+
+    def middle_clause
+      "//clause[parent::sections][not(xmlns:title = 'Scope')]"\
+      "[not(descendant::terms)]".freeze
+    end
   end
 end

data/lib/isodoc/function/blocks.rb

@@ -6,7 +6,7 @@ module IsoDoc::Function
 
     def figure_name_parse(node, div, name)
       return if name.nil? && node.at(ns("./figure"))
-      lbl = anchor(node['id'], :label, false)
+      lbl = @xrefs.anchor(node['id'], :label, false)
       lbl = nil if labelled_ancestor(node) && node.ancestors("figure").empty?
       return if lbl.nil? && name.nil?
       div.p **{ class: "FigureTitle", style: "text-align:center;" } do |p|
@@ -55,7 +55,7 @@ module IsoDoc::Function
     end
 
     def sourcecode_name_parse(node, div, name)
-      lbl = anchor(node['id'], :label, false)
+      lbl = @xrefs.anchor(node['id'], :label, false)
       lbl = nil if labelled_ancestor(node)
       return if lbl.nil? && name.nil?
       div.p **{ class: "SourceTitle", style: "text-align:center;" } do |p|
@@ -141,7 +141,7 @@ module IsoDoc::Function
       out.div **attr_code(class: "formula") do |div|
         div.p do |p|
           parse(node.at(ns("./stem")), div)
-          lbl = anchor(node['id'], :label, false)
+          lbl = @xrefs.anchor(node['id'], :label, false)
           unless lbl.nil?
             insert_tab(div, 1)
             div << "(#{lbl})"

data/lib/isodoc/function/blocks_example_note.rb

@@ -1,7 +1,7 @@
 module IsoDoc::Function
   module Blocks
     def example_label(node, div, name)
-      n = get_anchors[node["id"]]
+      n = @xrefs.get[node["id"]]
       div.p **{ class: "example-title" } do |p|
         lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @example_lbl :
           l10n("#{@example_lbl} #{n[:label]}")
@@ -56,7 +56,7 @@ module IsoDoc::Function
     end
 
     def note_label(node)
-      n = get_anchors[node["id"]]
+      n = @xrefs.get[node["id"]]
       return @note_lbl if n.nil? || n[:label].nil? || n[:label].empty?
       l10n("#{@note_lbl} #{n[:label]}")
     end

data/lib/isodoc/function/inline.rb

@@ -17,17 +17,17 @@ module IsoDoc::Function
     end
 
     def prefix_container(container, linkend, _target)
-      l10n(anchor(container, :xref) + ", " + linkend)
+      l10n(@xrefs.anchor(container, :xref) + ", " + linkend)
     end
 
     def anchor_linkend(node, linkend)
       if node["citeas"].nil? && node["bibitemid"] 
-        return anchor(node["bibitemid"] ,:xref) || "???"
+        return @xrefs.anchor(node["bibitemid"] ,:xref) || "???"
       elsif node["target"] && !/.#./.match(node["target"])
-        linkend = anchor(node["target"], :xref)
-        container = anchor(node["target"], :container, false)
+        linkend = @xrefs.anchor(node["target"], :xref)
+        container = @xrefs.anchor(node["target"], :container, false)
         (container && get_note_container_id(node) != container &&
-         @anchors[node["target"]]) &&
+         @xrefs.get[node["target"]]) &&
         linkend = prefix_container(container, linkend, node["target"])
         linkend = capitalise_xref(node, linkend)
       end

data/lib/isodoc/function/references.rb

@@ -129,12 +129,6 @@ module IsoDoc::Function
       end
     end
 
-    ISO_PUBLISHER_XPATH =
-      "./contributor[xmlns:role/@type = 'publisher']/"\
-      "organization[abbreviation = 'ISO' or xmlns:abbreviation = 'IEC' or "\
-      "xmlns:name = 'International Organization for Standardization' or "\
-      "xmlns:name = 'International Electrotechnical Commission']".freeze
-
     def is_standard(b)
       ret = false
       b.xpath(ns("./docidentifier")).each do |id|
@@ -185,7 +179,7 @@ module IsoDoc::Function
     def bibliography_parse(node, out)
       title = node&.at(ns("./title"))&.text || ""
       out.div do |div|
-        anchor(node['id'], :label, false) and
+        @xrefs.anchor(node['id'], :label, false) and
           clause_parse_title(node, div, node.at(ns("./title")), out) or
           div.h2 title, **{ class: "Section3" }
         biblio_list(node, div, true)
@@ -199,16 +193,6 @@ module IsoDoc::Function
         ref
     end
 
-    def reference_names(ref)
-      isopub = ref.at(ns(ISO_PUBLISHER_XPATH))
-      ids = bibitem_ref_code(ref)
-      identifiers = render_identifier(ids)
-      date = ref.at(ns("./date[@type = 'published']"))
-      allparts = ref.at(ns("./extent[@type='part'][referenceFrom='all']"))
-      reference = docid_l10n(identifiers[0] || identifiers[1])
-      @anchors[ref["id"]] = { xref: reference }
-    end
-
     # def ref_names(ref)
     #  linkend = ref.text
     # linkend.gsub!(/[\[\]]/, "") unless /^\[\d+\]$/.match linkend

data/lib/isodoc/function/reqt.rb

@@ -2,7 +2,7 @@ module IsoDoc::Function
   module Blocks
     def recommendation_labels(node)
       [node.at(ns("./label")), node.at(ns("./title")), 
-       anchor(node['id'], :label, false)]
+       @xrefs.anchor(node['id'], :label, false)]
     end
 
     def recommendation_name(node, out, type)

data/lib/isodoc/function/section.rb

@@ -11,8 +11,8 @@ module IsoDoc::Function
     def inline_header_title(out, node, c1)
       out.span **{ class: "zzMoveToFollowing" } do |s|
         s.b do |b|
-          if anchor(node['id'], :label, false) && !@suppressheadingnumbers
-            b << "#{anchor(node['id'], :label)}#{clausedelim}"
+          if @xrefs.anchor(node['id'], :label, false) && !@suppressheadingnumbers
+            b << "#{@xrefs.anchor(node['id'], :label)}#{clausedelim}"
             clausedelimspace(out)
           end
           c1&.children&.each { |c2| parse(c2, b) }
@@ -26,8 +26,8 @@ module IsoDoc::Function
       if node["inline-header"] == "true"
         inline_header_title(out, node, c1)
       else
-        div.send "h#{anchor(node['id'], :level, false) || '1'}" do |h|
-          lbl = anchor(node['id'], :label, false)
+        div.send "h#{@xrefs.anchor(node['id'], :level, false) || '1'}" do |h|
+          lbl = @xrefs.anchor(node['id'], :label, false)
           h << "#{lbl}#{clausedelim}" if lbl && !@suppressheadingnumbers
           clausedelimspace(out) if lbl && !@suppressheadingnumbers
           c1&.children&.each { |c2| parse(c2, h) }
@@ -58,14 +58,10 @@ module IsoDoc::Function
       div.parent.at(".//h1")
     end
 
-    MIDDLE_CLAUSE =
-      "//clause[parent::sections][not(xmlns:title = 'Scope')]"\
-      "[not(descendant::terms)]".freeze
-
     def clause(isoxml, out)
-      isoxml.xpath(ns(self.class::MIDDLE_CLAUSE)).each do |c|
+      isoxml.xpath(ns(middle_clause)).each do |c|
         out.div **attr_code(id: c["id"]) do |s|
-          clause_name(anchor(c['id'], :label),
+          clause_name(@xrefs.anchor(c['id'], :label),
                       c&.at(ns("./title")), s, nil)
           c.elements.reject { |c1| c1.name == "title" }.each do |c1|
             parse(c1, s)
@@ -76,7 +72,7 @@ module IsoDoc::Function
 
     def annex_name(annex, name, div)
       div.h1 **{ class: "Annex" } do |t|
-        t << "#{anchor(annex['id'], :label)}<br/><br/>"
+        t << "#{@xrefs.anchor(annex['id'], :label)}<br/><br/>"
         t.b do |b|
           name&.children&.each { |c2| parse(c2, b) }
         end

data/lib/isodoc/function/table.rb

@@ -3,7 +3,7 @@ module IsoDoc::Function
 
     def table_title_parse(node, out)
       name = node.at(ns("./name"))
-      lbl = anchor(node['id'], :label, false)
+      lbl = @xrefs.anchor(node['id'], :label, false)
       lbl = nil if labelled_ancestor(node)
       return if name.nil? && lbl.nil?
       out.p **{ class: "TableTitle", style: "text-align:center;" } do |p|

data/lib/isodoc/function/terms.rb

@@ -43,7 +43,7 @@ module IsoDoc::Function
       out.div **note_attrs(node) do |div|
         first = node.first_element_child
         div.p do |p|
-          p << "#{anchor(node['id'], :label) || '???'}: "
+          p << "#{@xrefs.anchor(node['id'], :label) || '???'}: "
           para_then_remainder(first, node, p, div)
         end
       end
@@ -59,7 +59,7 @@ module IsoDoc::Function
 
     def termdef_parse(node, out)
       out.p **{ class: "TermNum", id: node["id"] } do |p|
-        p << "#{get_anchors[node["id"]][:label]}#{clausedelim}"
+        p << "#{@xrefs.get[node["id"]][:label]}#{clausedelim}"
       end
       set_termdomain("")
       node.children.each { |n| parse(n, out) }

data/lib/isodoc/headlesshtml_convert.rb

@@ -16,18 +16,19 @@ module IsoDoc
 
     def initialize(options)
       @format = :html
+      @suffix = "headless.html"
       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)
-      result = convert1(docxml, outname_html, dir)
+      docxml, filename, dir = convert_init(file, input_filename, debug)
+      result = convert1(docxml, filename, dir)
       return result if debug
-      postprocess(result, filename + ".tmp", dir)
+      postprocess(result, filename + ".tmp.html", dir)
       FileUtils.rm_rf dir
-      strip_head(filename + ".tmp.html", outname_html + ".headless.html")
+      strip_head(filename + ".tmp.html", output_filename || "#{filename}.#{@suffix}")
       FileUtils.rm_rf ["#{filename}.tmp.html", tmpimagedir]
     end
 

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

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.29".freeze
+  VERSION = "1.1.0".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

data/lib/isodoc/{function → xref}/xref_anchor.rb

@@ -1,7 +1,7 @@
 require "singleton"
 
-module IsoDoc::Function
-  module XrefGen
+module IsoDoc::XrefGen
+  module Anchor
     class Seen_Anchor
       include Singleton
 
@@ -12,34 +12,23 @@ module IsoDoc::Function
       def seen(x)
         @seen.has_key?(x)
       end
-      
+
       def add(x)
         @seen[x] = true
       end
     end
 
-    @anchors = {}
+    def initialize()
+      @anchors = {}
+    end
 
     def get_anchors
       @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
-
     def anchor_struct_label(lbl, elem)
       case elem
-      when @appendix_lbl then l10n("#{elem} #{lbl}")
+      when @labels["appendix"] then l10n("#{elem} #{lbl}")
       else
         lbl.to_s
       end
@@ -47,8 +36,8 @@ module IsoDoc::Function
 
     def anchor_struct_xref(lbl, elem)
       case elem
-      when @formula_lbl then l10n("#{elem} (#{lbl})")
-      when @inequality_lbl then l10n("#{elem} (#{lbl})")
+      when @labels["formula"] then l10n("#{elem} (#{lbl})")
+      when @labels["inequality"] then l10n("#{elem} (#{lbl})")
       else
         l10n("#{elem} #{lbl}")
       end
@@ -59,7 +48,7 @@ module IsoDoc::Function
       ret[:label] = unnumbered == "true" ? nil : anchor_struct_label(lbl, elem)
       ret[:xref] = anchor_struct_xref(unnumbered == "true" ? "(??)" : lbl, elem)
       ret[:xref].gsub!(/ $/, "")
-      ret[:container] = get_clause_id(container) unless container.nil?
+      ret[:container] = @klass.get_clause_id(container) unless container.nil?
       ret[:type] = type
       ret
     end

data/lib/isodoc/xref/xref_counter.rb

@@ -0,0 +1,74 @@
+require "roman-numerals"
+
+module IsoDoc::XrefGen
+  class Counter
+    def initialize
+      @num = 0
+      @letter = ""
+      @subseq = ""
+      @letter_override = nil
+      @number_override = nil
+    end
+
+    def new_subseq_increment(node)
+      @subseq = node["subsequence"]
+      @num += 1
+      @letter = node["subsequence"] ? "a" : ""
+      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
+        else
+          @letter_override = node["number"]
+          @letter = @letter_override if /^[a-z]$/.match(@letter_override)
+        end
+      end
+    end
+
+    def sequence_increment(node)
+      if node["number"]
+        @number_override = node["number"]
+        @num = @number_override.to_i if /^\d+$/.match(@number_override)
+      else
+        @num += 1
+      end
+    end
+
+    def subsequence_increment(node)
+      if node["number"]
+        @letter_override = node["number"]
+        @letter = @letter_override if /^[a-z]$/.match(@letter_override)
+      else
+        @letter = (@letter.ord + 1).chr.to_s
+      end
+    end
+
+    def increment(node)
+      return self if node["unnumbered"]
+      @letter_override = nil
+      @number_override = nil
+      if node["subsequence"] != @subseq
+        new_subseq_increment(node)
+      elsif @letter.empty?
+        sequence_increment(node)
+      else
+        subsequence_increment(node)
+      end
+      self
+    end
+
+    def print
+      "#{@number_override || @num}#{@letter_override || @letter}"
+    end
+
+    def listlabel(depth)
+      return @num.to_s if [2, 7].include? depth
+      return (96 + @num).chr.to_s if [1, 6].include? depth
+      return (64 + @num).chr.to_s if [4, 9].include? depth
+      return RomanNumerals.to_roman(@num).downcase if [3, 8].include? depth
+      return RomanNumerals.to_roman(@num).upcase if [5, 10].include? depth
+      return @num.to_s
+    end
+  end
+end

data/lib/isodoc/{function → xref}/xref_gen.rb

@@ -1,11 +1,9 @@
-require_relative "xref_counter"
-require_relative "xref_anchor"
-require_relative "xref_gen_seq"
+require_relative "xref_gen_seq.rb"
 
-module IsoDoc::Function
-  module XrefGen
+module IsoDoc::XrefGen
+  module Blocks
     def termnote_label(n)
-      @termnote_lbl.gsub(/%/, n.to_s)
+      @labels["termnote"].gsub(/%/, n.to_s)
     end
 
     def termnote_anchor_names(docxml)
@@ -17,7 +15,7 @@ module IsoDoc::Function
           @anchors[n["id"]] =
             { label: termnote_label(c.print), type: "termnote",
               xref: l10n("#{anchor(t['id'], :xref)}, "\
-                         "#{@note_xref_lbl} #{c.print}") }
+                         "#{@labels["note_xref"]} #{c.print}") }
         end
       end
     end
@@ -33,7 +31,7 @@ module IsoDoc::Function
           @anchors[n["id"]] = {
             type: "termexample", label: idx, 
             xref: l10n("#{anchor(t['id'], :xref)}, "\
-                       "#{@example_xref_lbl} #{c.print}") }
+                       "#{@labels["example_xref"]} #{c.print}") }
         end
       end
     end
@@ -57,7 +55,7 @@ module IsoDoc::Function
         notes.each do |n|
           next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
           idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @note_xref_lbl, 
+          @anchors[n["id"]] = anchor_struct(idx, n, @labels["note_xref"], 
                                             "note", false)
         end
         note_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
@@ -79,7 +77,7 @@ module IsoDoc::Function
           next if @anchors[n["id"]]
           next if n["id"].nil? || n["id"].empty?
           idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @example_xref_lbl,
+          @anchors[n["id"]] = anchor_struct(idx, n, @labels["example_xref"],
                                             "example", n["unnumbered"])
         end
         example_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
@@ -94,7 +92,7 @@ module IsoDoc::Function
         notes.each do |n|
           next if n["id"].nil? || n["id"].empty?
           idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @list_lbl, "list", false)
+          @anchors[n["id"]] = anchor_struct(idx, n, @labels["list"], "list", false)
           list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
         end
         list_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
@@ -115,16 +113,5 @@ module IsoDoc::Function
         end
       end
     end
-
-    # extract names for all anchors, xref and label
-    def anchor_names(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
   end
 end

data/lib/isodoc/{function → xref}/xref_gen_seq.rb

@@ -1,11 +1,19 @@
-module IsoDoc::Function
-  module XrefGen
+module IsoDoc::XrefGen
+  module Blocks
+    def hiersep
+      "."
+    end
+
+    def hierfigsep
+      "-"
+    end
+
     def subfigure_increment(j, c, t)
       if t.parent.name == "figure" then j += 1
-        else
-          j = 0
-          c.increment(t)
-        end
+      else
+        j = 0
+        c.increment(t)
+      end
       j
     end
 
@@ -18,7 +26,7 @@ module IsoDoc::Function
         label = c.print + (j.zero? ? "" : "-#{j}")
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] =
-          anchor_struct(label, nil, @figure_lbl, "figure", t["unnumbered"])
+          anchor_struct(label, nil, @labels["figure"], "figure", t["unnumbered"])
       end
     end
 
@@ -27,7 +35,7 @@ module IsoDoc::Function
       clause.xpath(ns(".//table")).each do |t|
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] = anchor_struct(c.increment(t).print, nil, 
-                                          @table_lbl, "table", t["unnumbered"])
+                                          @labels["table"], "table", t["unnumbered"])
       end
     end
 
@@ -37,7 +45,7 @@ module IsoDoc::Function
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] =
           anchor_struct(c.increment(t).print, t, 
-                        t["inequality"] ? @inequality_lbl : @formula_lbl,
+                        t["inequality"] ? @labels["inequality"] : @labels["formula"],
                         "formula", t["unnumbered"])
       end
     end
@@ -56,9 +64,9 @@ module IsoDoc::Function
     end
 
     def sequential_permission_names2(t, id)
-      sequential_permission_names1(t, id, "permission", @permission_lbl)
-      sequential_permission_names1(t, id, "requirement", @requirement_lbl)
-      sequential_permission_names1(t, id, "recommendation", @recommendation_lbl)
+      sequential_permission_names1(t, id, "permission", @labels["permission"])
+      sequential_permission_names1(t, id, "requirement", @labels["requirement"])
+      sequential_permission_names1(t, id, "recommendation", @labels["recommendation"])
     end
 
     def sequential_permission_names1(block, lbl, klass, label)
@@ -75,9 +83,9 @@ module IsoDoc::Function
       sequential_table_names(clause)
       sequential_figure_names(clause)
       sequential_formula_names(clause)
-      sequential_permission_names(clause, "permission", @permission_lbl)
-      sequential_permission_names(clause, "requirement", @requirement_lbl)
-      sequential_permission_names(clause, "recommendation", @recommendation_lbl)
+      sequential_permission_names(clause, "permission", @labels["permission"])
+      sequential_permission_names(clause, "requirement", @labels["requirement"])
+      sequential_permission_names(clause, "recommendation", @labels["recommendation"])
     end
 
     def hierarchical_figure_names(clause, num)
@@ -89,7 +97,7 @@ module IsoDoc::Function
         label = "#{num}#{hiersep}#{c.print}" +
           (j.zero? ? "" : "#{hierfigsep}#{j}")
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(label, nil, @figure_lbl, "figure",
+        @anchors[t["id"]] = anchor_struct(label, nil, @labels["figure"], "figure",
                                           t["unnumbered"])
       end
     end
@@ -100,7 +108,7 @@ module IsoDoc::Function
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] =
           anchor_struct("#{num}#{hiersep}#{c.increment(t).print}",
-                        nil, @table_lbl, "table", t["unnumbered"])
+                        nil, @labels["table"], "table", t["unnumbered"])
       end
     end
 
@@ -108,11 +116,11 @@ module IsoDoc::Function
       hierarchical_table_names(clause, num)
       hierarchical_figure_names(clause, num)
       hierarchical_formula_names(clause, num)
-      hierarchical_permission_names(clause, num, "permission", @permission_lbl)
+      hierarchical_permission_names(clause, num, "permission", @labels["permission"])
       hierarchical_permission_names(clause, num, "requirement",
-                                    @requirement_lbl)
+                                    @labels["requirement"])
       hierarchical_permission_names(clause, num, "recommendation",
-                                    @recommendation_lbl)
+                                    @labels["recommendation"])
     end
 
     def hierarchical_formula_names(clause, num)
@@ -121,7 +129,7 @@ module IsoDoc::Function
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] =
           anchor_struct("#{num}#{hiersep}#{c.increment(t).print}", nil,
-                        t["inequality"] ? @inequality_lbl : @formula_lbl,
+                        t["inequality"] ? @labels["inequality"] : @labels["formula"],
                         "formula", t["unnumbered"])
       end
     end
@@ -136,13 +144,13 @@ module IsoDoc::Function
       end
     end
 
-     def hierarchical_permission_names2(t, id)
-      hierarchical_permission_names1(t, id, "permission", @permission_lbl)
-      hierarchical_permission_names1(t, id, "requirement", @requirement_lbl)
-      hierarchical_permission_names1(t, id, "recommendation", @recommendation_lbl)
+    def hierarchical_permission_names2(t, id)
+      hierarchical_permission_names1(t, id, "permission", @labels["permission"])
+      hierarchical_permission_names1(t, id, "requirement", @labels["requirement"])
+      hierarchical_permission_names1(t, id, "recommendation", @labels["recommendation"])
     end
 
-     def hierarchical_permission_names1(block, lbl, klass, label)
+    def hierarchical_permission_names1(block, lbl, klass, label)
       c = Counter.new
       block.xpath(ns("./#{klass}")).each do |t|
         next if t["id"].nil? || t["id"].empty?

data/lib/isodoc/{function → xref}/xref_sect_gen.rb

@@ -1,18 +1,18 @@
-module IsoDoc::Function
-  module XrefSectGen
+module IsoDoc::XrefGen
+  module Sections
     def back_anchor_names(docxml)
       docxml.xpath(ns("//annex")).each_with_index do |c, i|
         annex_names(c, (65 + i).chr.to_s)
       end
       docxml.xpath(
-           ns("//bibliography/clause[.//references[@normative = 'false']] | "\
+        ns("//bibliography/clause[.//references[@normative = 'false']] | "\
            "//bibliography/references[@normative = 'false']"
-           )).each do |b|
-        preface_names(b)
-      end
-      docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
-        reference_names(ref)
-      end
+          )).each do |b|
+            preface_names(b)
+          end
+          docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
+            reference_names(ref)
+          end
     end
 
     def initial_anchor_names(d)
@@ -72,8 +72,7 @@ module IsoDoc::Function
     end
 
     def clause_names(docxml, sect_num)
-      q = self.class::MIDDLE_CLAUSE
-      docxml.xpath(ns(q)).each_with_index do |c, i|
+      docxml.xpath(ns(@klass.middle_clause)).each_with_index do |c, i|
         section_names(c, (i + sect_num), 1)
       end
     end
@@ -82,7 +81,7 @@ module IsoDoc::Function
       return num if clause.nil?
       num = num + 1
       @anchors[clause["id"]] =
-        { label: num.to_s, xref: l10n("#{@clause_lbl} #{num}"), level: lvl,
+        { label: num.to_s, xref: l10n("#{@labels["clause"]} #{num}"), level: lvl,
           type: "clause" }
       clause.xpath(ns(SUBCLAUSES)).
         each_with_index do |c, i|
@@ -93,7 +92,7 @@ module IsoDoc::Function
 
     def section_names1(clause, num, level)
       @anchors[clause["id"]] =
-        { label: num, level: level, xref: l10n("#{@clause_lbl} #{num}"),
+        { label: num, level: level, xref: l10n("#{@labels["clause"]} #{num}"),
           type: "clause" }
       clause.xpath(ns(SUBCLAUSES)).
         each_with_index do |c, i|
@@ -102,9 +101,9 @@ module IsoDoc::Function
     end
 
     def annex_name_lbl(clause, num)
-      obl = l10n("(#{@inform_annex_lbl})")
-      obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
-      l10n("<b>#{@annex_lbl} #{num}</b><br/>#{obl}")
+      obl = l10n("(#{@labels["inform_annex"]})")
+      obl = l10n("(#{@labels["norm_annex"]})") if clause["obligation"] == "normative"
+      l10n("<b>#{@labels["annex"]} #{num}</b><br/>#{obl}")
     end
 
     def single_annex_special_section(clause)
@@ -119,7 +118,7 @@ module IsoDoc::Function
     def annex_names(clause, num)
       @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
                                  type: "clause",
-                                 xref: "#{@annex_lbl} #{num}", level: 1 }
+                                 xref: "#{@labels["annex"]} #{num}", level: 1 }
       if a = single_annex_special_section(clause)
         annex_names1(a, "#{num}", 1)
       else
@@ -131,11 +130,26 @@ module IsoDoc::Function
     end
 
     def annex_names1(clause, num, level)
-      @anchors[clause["id"]] = { label: num, xref: "#{@annex_lbl} #{num}",
+      @anchors[clause["id"]] = { label: num, xref: "#{@labels["annex"]} #{num}",
                                  level: level, type: "clause" }
       clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
         annex_names1(c, "#{num}.#{i + 1}", level + 1)
       end
     end
+
+    ISO_PUBLISHER_XPATH =
+      "./contributor[xmlns:role/@type = 'publisher']/"\
+      "organization[abbreviation = 'ISO' or xmlns:abbreviation = 'IEC' or "\
+      "xmlns:name = 'International Organization for Standardization' or "\
+      "xmlns:name = 'International Electrotechnical Commission']".freeze
+
+    def reference_names(ref)
+      isopub = ref.at(ns(ISO_PUBLISHER_XPATH))
+      ids = @klass.bibitem_ref_code(ref)
+      identifiers = @klass.render_identifier(ids)
+      date = ref.at(ns("./date[@type = 'published']"))
+      reference = @klass.docid_l10n(identifiers[0] || identifiers[1])
+      @anchors[ref["id"]] = { xref: reference }
+    end
   end
 end

data/lib/isodoc/xslfo_convert.rb

@@ -15,14 +15,26 @@ 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?
-      docxml, outname_html, dir = convert_init(file, filename, debug)
+    def pdf_stylesheet(docxml)
+      nil
+    end
+
+    def convert(input_filename, file = nil, debug = false, output_filename = nil)
+      file = File.read(input_filename, encoding: "utf-8") if file.nil?
+      docxml, filename, dir = convert_init(file, input_filename, debug)
+      /\.xml$/.match(input_filename) or
+          input_filename = Tempfile.open([filename, ".xml"], encoding: "utf-8") do |f|
+          f.write file
+          f.path
+        end
       FileUtils.rm_rf dir
-      ::Metanorma::Output::XslfoPdf.new.convert(filename, outname_html + ".pdf", nil)
+      ::Metanorma::Output::XslfoPdf.new.convert(input_filename,
+                                                output_filename || "#{filename}.#{@suffix}", 
+                                               File.join(@libdir, pdf_stylesheet(docxml)))
     end
 
     def xref_parse(node, out)

data/spec/isodoc/presentation_xml_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+  
+RSpec.describe IsoDoc do
+it "generates file based on string input" do
+  FileUtils.rm_f "test.presentation.xml"
+    IsoDoc::PresentationXMLConvert.new({filename: "test"}).convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <bibdata>
+        <title language="en">test</title>
+        </bibdata>
+    <preface><foreword>
+    <note>
+  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+</note>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    expect(File.exist?("test.presentation.xml")).to be true
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.0.29
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -333,11 +333,6 @@ files:
 - lib/isodoc/function/terms.rb
 - lib/isodoc/function/to_word_html.rb
 - lib/isodoc/function/utils.rb
-- lib/isodoc/function/xref_anchor.rb
-- lib/isodoc/function/xref_counter.rb
-- lib/isodoc/function/xref_gen.rb
-- lib/isodoc/function/xref_gen_seq.rb
-- lib/isodoc/function/xref_sect_gen.rb
 - lib/isodoc/headlesshtml_convert.rb
 - lib/isodoc/html_convert.rb
 - lib/isodoc/html_function.rb
@@ -348,6 +343,7 @@ files:
 - lib/isodoc/metadata.rb
 - lib/isodoc/metadata_date.rb
 - lib/isodoc/pdf_convert.rb
+- lib/isodoc/presentation_xml_convert.rb
 - lib/isodoc/version.rb
 - lib/isodoc/word_convert.rb
 - lib/isodoc/word_function.rb
@@ -358,6 +354,12 @@ files:
 - lib/isodoc/word_function/postprocess.rb
 - lib/isodoc/word_function/postprocess_cover.rb
 - lib/isodoc/word_function/table.rb
+- lib/isodoc/xref.rb
+- lib/isodoc/xref/xref_anchor.rb
+- lib/isodoc/xref/xref_counter.rb
+- lib/isodoc/xref/xref_gen.rb
+- lib/isodoc/xref/xref_gen_seq.rb
+- lib/isodoc/xref/xref_sect_gen.rb
 - lib/isodoc/xslfo_convert.rb
 - spec/assets/header.html
 - spec/assets/html.css
@@ -383,6 +385,7 @@ files:
 - spec/isodoc/lists_spec.rb
 - spec/isodoc/metadata_spec.rb
 - spec/isodoc/postproc_spec.rb
+- spec/isodoc/presentation_xml_spec.rb
 - spec/isodoc/ref_spec.rb
 - spec/isodoc/section_spec.rb
 - spec/isodoc/table_spec.rb
@@ -393,7 +396,7 @@ homepage: https://github.com/metanorma/isodoc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -408,9 +411,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.
 test_files: []

data/lib/isodoc/function/xref_counter.rb

@@ -1,84 +0,0 @@
-require "roman-numerals"
-
-module IsoDoc::Function
-  module XrefGen
-    def hiersep
-      "."
-    end
-
-    def hierfigsep
-      "-"
-    end
-
-    class Counter
-      def initialize
-        @num = 0
-        @letter = ""
-        @subseq = ""
-        @letter_override = nil
-        @number_override = nil
-      end
-
-      def new_subseq_increment(node)
-        @subseq = node["subsequence"]
-        @num += 1
-        @letter = node["subsequence"] ? "a" : ""
-        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
-          else
-            @letter_override = node["number"]
-            @letter = @letter_override if /^[a-z]$/.match(@letter_override)
-          end
-        end
-      end
-
-      def sequence_increment(node)
-        if node["number"]
-          @number_override = node["number"]
-          @num = @number_override.to_i if /^\d+$/.match(@number_override)
-        else
-          @num += 1
-        end
-      end
-
-      def subsequence_increment(node)
-        if node["number"]
-          @letter_override = node["number"]
-          @letter = @letter_override if /^[a-z]$/.match(@letter_override)
-        else
-          @letter = (@letter.ord + 1).chr.to_s
-        end
-      end
-
-      def increment(node)
-        return self if node["unnumbered"]
-        @letter_override = nil
-        @number_override = nil
-        if node["subsequence"] != @subseq
-          new_subseq_increment(node)
-        elsif @letter.empty?
-          sequence_increment(node)
-        else
-          subsequence_increment(node)
-        end
-        self
-      end
-
-      def print
-        "#{@number_override || @num}#{@letter_override || @letter}"
-      end
-
-      def listlabel(depth)
-        return @num.to_s if [2, 7].include? depth
-        return (96 + @num).chr.to_s if [1, 6].include? depth
-        return (64 + @num).chr.to_s if [4, 9].include? depth
-        return RomanNumerals.to_roman(@num).downcase if [3, 8].include? depth
-        return RomanNumerals.to_roman(@num).upcase if [5, 10].include? depth
-        return @num.to_s
-      end
-    end
-  end
-end