isodoc 1.5.5 → 1.6.0

data/lib/isodoc/css.rb

@@ -14,17 +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)
-      if @htmlstylesheet_override_name
-        @htmlstylesheet_override = File.open(@htmlstylesheet_override_name)
-      end
-      if @wordstylesheet_override_name
-        @wordstylesheet_override = File.open(@wordstylesheet_override_name)
-      end
+      @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)

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/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,7 +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) # introduced 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/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/inline.rb

@@ -50,67 +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)
+        eref_localities1(target, r["type"], r.at(ns("./referenceFrom")),
+                         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

data/lib/isodoc/presentation_xml_convert.rb

@@ -59,7 +59,7 @@ module IsoDoc
       variant docxml
     end
 
-    def postprocess(result, filename, dir)
+    def postprocess(result, filename, _dir)
       toXML(result, filename)
       @files_to_delete.each { |f| FileUtils.rm_rf f }
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.5.5".freeze
+  VERSION = "1.6.0".freeze
 end

data/lib/isodoc/xslfo_convert.rb

@@ -2,52 +2,61 @@ require "metanorma"
 
 module IsoDoc
   class XslfoPdfConvert < ::IsoDoc::Convert
+    MN2PDF_OPTIONS = :mn2pdf
+    MN2PDF_FONT_MANIFEST = :font_manifest_file
 
     def initialize(options)
+      @format = :pdf
+      @suffix = "pdf"
       super
-      @maxwidth = 500
-      @maxheight = 800
     end
 
     def tmpimagedir_suffix
       "_pdfimages"
     end
 
-    def initialize(options)
-      @format = :pdf
-      @suffix = "pdf"
-      super
-    end
-
-    def pdf_stylesheet(docxml)
+    def pdf_stylesheet(_docxml)
       nil
     end
 
-    def pdf_options(docxml)
-      font_manifest_file = @options.dig(:mn2pdf, :font_manifest_file)
-      "--font_manifest #{font_manifest_file}" if font_manifest_file
-      ""
+    def pdf_options(_docxml)
+      if font_manifest_file = @options.dig(MN2PDF_OPTIONS,
+                                           MN2PDF_FONT_MANIFEST)
+        "--font-manifest #{font_manifest_file}"
+      else
+        ""
+      end
     end
 
-    def convert(input_filename, file = nil, debug = false, output_filename = nil)
+    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
+      input_filename, docxml, filename = input_xml_path(input_filename,
+                                                        file, debug)
+      ::Metanorma::Output::XslfoPdf.new.convert(
+        input_filename,
+        output_filename || "#{filename}.#{@suffix}",
+        File.join(@libdir, pdf_stylesheet(docxml)),
+        pdf_options(docxml)
+      )
+    end
+
+    def xref_parse(node, out)
+      out.a(**{ "href": target_pdf(node) }) { |l| l << get_linkend(node) }
+    end
+
+    def input_xml_path(input_filename, xml_file, debug)
+      docxml, filename, dir = convert_init(xml_file, input_filename, debug)
+      unless /\.xml$/.match?(input_filename)
+        input_filename = Tempfile.open([filename, ".xml"],
+                                       encoding: "utf-8") do |f|
+          f.write xml_file
           f.path
         end
+      end
       FileUtils.rm_rf dir
-      ::Metanorma::Output::XslfoPdf.new.convert(input_filename,
-                                                output_filename || "#{filename}.#{@suffix}", 
-                                               File.join(@libdir, pdf_stylesheet(docxml)),
-                                               pdf_options(docxml))
-    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) }
+      [input_filename, docxml, filename]
     end
   end
 end

data/spec/isodoc/footnotes_spec.rb

@@ -155,17 +155,8 @@ RSpec.describe IsoDoc do
     </preface>
     </iso-standard>
     INPUT
-    html = File.read("test.html").sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")
+    html = File.read("test.html").sub(/^.*<main/m, "<main").sub(%r{</main>.*$}m, "</main>")
     expect(xmlpp(html)).to be_equivalent_to xmlpp(<<~"OUTPUT")
-     <body lang="en" xml:lang="en">
-           <div class="title-section">
-             <p>&#xA0;</p>
-           </div>
-           <br />
-           <div class="prefatory-section">
-             <p>&#xA0;</p>
-           </div>
-           <br />
            <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
              <br />
              <div>
@@ -180,12 +171,6 @@ RSpec.describe IsoDoc do
              </div>
              <p class="zzSTDTitle1"></p>
            </main>
-           <script type='text/x-mathjax-config'>
-   MathJax.Hub.Config({ "HTML-CSS": { preferredFont: "STIX" }, asciimath2jax:
-  { delimiters: [['(#(', ')#)']] } });
-</script>
-       <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/latest.js?config=MML_HTMLorMML-full" async="async"></script>
-       <script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script></body>
     OUTPUT
   end