isodoc 1.5.3 → 1.6.2

data/lib/isodoc/convert.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "isodoc/common"
 require "fileutils"
 require "tempfile"
@@ -7,12 +8,12 @@ require_relative "css"
 
 module IsoDoc
   class Convert < ::IsoDoc::Common
-    attr_accessor :options
-    attr_accessor :i18n
-    attr_accessor :meta
+    attr_accessor :options, :i18n, :meta, :xrefs
 
     # htmlstylesheet: Generic stylesheet for HTML
+    # htmlstylesheet_override: Override stylesheet for HTML
     # wordstylesheet: Generic stylesheet for Word
+    # wordstylesheet_override: Override stylesheet for Word
     # standardsheet: Stylesheet specific to Standard
     # header: Header file for Word
     # htmlcoverpage: Cover page for HTML
@@ -36,11 +37,10 @@ module IsoDoc
     # break_up_urls_in_tables: whether to insert spaces in URLs in tables
     #   every 40-odd chars
     def initialize(options)
-      @libdir ||= File.dirname(__FILE__)
+      @libdir ||= File.dirname(__FILE__) # rubocop:disable Lint/DisjunctiveAssignmentInConstructor
       options.merge!(default_fonts(options)) do |_, old, new|
         old || new
-      end
-             .merge!(default_file_locations(options)) do |_, old, new|
+      end.merge!(default_file_locations(options)) do |_, old, new|
         old || new
       end
       @options = options
@@ -48,7 +48,10 @@ module IsoDoc
       @tempfile_cache = []
       @htmlstylesheet_name = options[:htmlstylesheet]
       @wordstylesheet_name = options[:wordstylesheet]
+      @htmlstylesheet_override_name = options[:htmlstylesheet_override]
+      @wordstylesheet_override_name = options[:wordstylesheet_override]
       @standardstylesheet_name = options[:standardstylesheet]
+      @sourcefilename = options[:sourcefilename]
       @header = options[:header]
       @htmlcoverpage = options[:htmlcoverpage]
       @wordcoverpage = options[:wordcoverpage]
@@ -58,15 +61,16 @@ module IsoDoc
       @smallerfontsize = options[:smallerfontsize]
       @monospacefontsize = options[:monospacefontsize]
       @footnotefontsize = options[:footnotefontsize]
-      @scripts = options[:scripts]
+      @scripts = options[:scripts] ||
+        File.join(File.dirname(__FILE__), "base_style", "scripts.html")
       @scripts_pdf = options[:scripts_pdf]
       @i18nyaml = options[:i18nyaml]
       @ulstyle = options[:ulstyle]
       @olstyle = options[:olstyle]
       @datauriimage = options[:datauriimage]
       @suppressheadingnumbers = options[:suppressheadingnumbers]
-      @break_up_urls_in_tables = options[:break_up_urls_in_tables] == 'true'
-      @termdomain = ''
+      @break_up_urls_in_tables = options[:break_up_urls_in_tables] == "true"
+      @termdomain = ""
       @termexample = false
       @note = false
       @sourcecode = false
@@ -88,17 +92,17 @@ module IsoDoc
       @wordToClevels = 2 if @wordToClevels.zero?
       @htmlToClevels = options[:htmltoclevels].to_i
       @htmlToClevels = 2 if @htmlToClevels.zero?
-      @bookmarks_allocated = { 'X' => true }
+      @bookmarks_allocated = { "X" => true }
       @fn_bookmarks = {}
     end
 
     def tmpimagedir_suffix
-      '_images'
+      "_images"
     end
 
     def html_doc_path(*file)
       file.each do |f|
-        ret = File.join(@libdir, File.join('html', f))
+        ret = File.join(@libdir, File.join("html", f))
         File.exist?(ret) and return ret
       end
       nil
@@ -108,7 +112,7 @@ module IsoDoc
       @xrefs.parse docxml
       noko do |xml|
         xml.html **{ lang: @lang.to_s } do |html|
-          html.parent.add_namespace('epub', 'http://www.idpf.org/2007/ops')
+          html.parent.add_namespace("epub", "http://www.idpf.org/2007/ops")
           info docxml, nil
           populate_css
           html.head { |head| define_head head, filename, dir }
@@ -130,8 +134,8 @@ module IsoDoc
       @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
     end
 
-    def l10n(x, lang = @lang, script = @script)
-      @i18n.l10n(x, lang, script)
+    def l10n(expr, lang = @lang, script = @script)
+      @i18n.l10n(expr, lang, script)
     end
 
     def convert_init(file, input_filename, debug)
@@ -153,14 +157,23 @@ module IsoDoc
       docxml, filename, dir = convert_init(file, input_filename, debug)
       result = convert1(docxml, filename, dir)
       return result if debug
+
       output_filename ||= "#{filename}.#{@suffix}"
       postprocess(result, output_filename, dir)
       FileUtils.rm_rf dir
     end
 
-    def middle_clause(docxml = nil)
+    def middle_clause(_docxml = nil)
       "//clause[parent::sections][not(@type = 'scope')]"\
-        '[not(descendant::terms)]'
+        "[not(descendant::terms)]"
+    end
+
+    def target_pdf(node)
+      if /#/.match?(node["target"])
+        node["target"].sub(/#/, ".pdf#")
+      else
+        "##{node['target']}"
+      end
     end
   end
 end

data/lib/isodoc/css.rb

@@ -6,26 +6,40 @@ module IsoDoc
     def precompiled_style_or_original(stylesheet_path)
       # Already have compiled stylesheet, use it
       return stylesheet_path if stylesheet_path.nil? ||
-        File.extname(stylesheet_path) == '.css'
-      basename = File.basename(stylesheet_path, '.*')
+        File.extname(stylesheet_path) == ".css"
+
+      basename = File.basename(stylesheet_path, ".*")
       compiled_path = File.join(File.dirname(stylesheet_path),
                                 "#{basename}.css")
       return stylesheet_path unless File.file?(compiled_path)
+
       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)
       {
-        bodyfont: 'Arial',
-        headerfont: 'Arial',
-        monospacefont: 'Courier',
+        bodyfont: "Arial",
+        headerfont: "Arial",
+        monospacefont: "Courier",
       }
     end
 
@@ -37,35 +51,35 @@ module IsoDoc
 
     def fonts_options
       {
-        'bodyfont' => options[:bodyfont] || 'Arial',
-        'headerfont' => options[:headerfont] || 'Arial',
-        'monospacefont' => options[:monospacefont] || 'Courier',
+        "bodyfont" => options[:bodyfont] || "Arial",
+        "headerfont" => options[:headerfont] || "Arial",
+        "monospacefont" => options[:monospacefont] || "Courier",
         "normalfontsize" => options[:normalfontsize],
         "monospacefontsize" => options[:monospacefontsize],
         "smallerfontsize" => options[:smallerfontsize],
-        "footnotefontsize" => options[:footnotefontsize] 
+        "footnotefontsize" => options[:footnotefontsize],
       }
     end
 
     def scss_fontheader(is_html_css)
-      b = options[:bodyfont] || 'Arial'
-      h = options[:headerfont] || 'Arial'
-      m = options[:monospacefont] || 'Courier'
-      ns = options[:normalfontsize] || (is_html_css ? "1.0em" : '12.0pt')
-      ms = options[:monospacefontsize] || (is_html_css ? "0.8em" : '11.0pt')
-      ss = options[:smallerfontsize] || (is_html_css ? "0.9em" : '10.0pt')
-      fs = options[:footnotefontsize] || (is_html_css ? "0.9em" : '9.0pt')
+      b = options[:bodyfont] || "Arial"
+      h = options[:headerfont] || "Arial"
+      m = options[:monospacefont] || "Courier"
+      ns = options[:normalfontsize] || (is_html_css ? "1.0em" : "12.0pt")
+      ms = options[:monospacefontsize] || (is_html_css ? "0.8em" : "11.0pt")
+      ss = options[:smallerfontsize] || (is_html_css ? "0.9em" : "10.0pt")
+      fs = options[:footnotefontsize] || (is_html_css ? "0.9em" : "9.0pt")
       "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"\
         "$normalfontsize: #{ns};\n$monospacefontsize: #{ms};\n"\
         "$smallerfontsize: #{ss};\n$footnotefontsize: #{fs};\n"
     end
 
     def convert_scss(filename, stylesheet, stripwordcss)
-      require 'sassc'
-      require 'isodoc/sassc_importer'
+      require "sassc"
+      require "isodoc/sassc_importer"
 
-      [File.join(Gem.loaded_specs['isodoc'].full_gem_path,
-                 'lib', 'isodoc'),
+      [File.join(Gem.loaded_specs["isodoc"].full_gem_path,
+                 "lib", "isodoc"),
                  File.dirname(filename)].each do |name|
                    SassC.load_paths << name
                  end
@@ -79,14 +93,14 @@ module IsoDoc
       return nil if filename.nil?
 
       filename = precompiled_style_or_original(filename)
-      stylesheet = File.read(filename, encoding: 'UTF-8')
+      stylesheet = File.read(filename, encoding: "UTF-8")
       stylesheet = populate_template(stylesheet, :word)
-      stylesheet.gsub!(/(\s|\{)mso-[^:]+:[^;]+;/m, '\\1') if stripwordcss
-      if File.extname(filename) == '.scss'
+      stylesheet.gsub!(/(\s|\{)mso-[^:]+:[^;]+;/m, "\\1") if stripwordcss
+      if File.extname(filename) == ".scss"
         stylesheet = convert_scss(filename, stylesheet, stripwordcss)
       end
-      Tempfile.open([File.basename(filename, '.*'), 'css'],
-                    encoding: 'utf-8') do |f|
+      Tempfile.open([File.basename(filename, ".*"), "css"],
+                    encoding: "utf-8") do |f|
         f.write(stylesheet)
         f
       end

data/lib/isodoc/function/blocks.rb

@@ -4,6 +4,16 @@ module IsoDoc::Function
   module Blocks
     @annotation = false
 
+    def middle_title(_isoxml, out)
+      out.p(**{ class: "zzSTDTitle1" }) { |p| p << @meta.get[:doctitle] }
+    end
+
+    def middle_admonitions(isoxml, out)
+      isoxml.xpath(ns("//sections/note | //sections/admonition")).each do |x|
+        parse(x, out)
+      end
+    end
+
     def figure_name_parse(node, div, name)
       return if name.nil? 
       div.p **{ class: "FigureTitle", style: "text-align:center;" } do |p|
@@ -24,6 +34,7 @@ module IsoDoc::Function
     def figure_parse(node, out)
       return pseudocode_parse(node, out) if node["class"] == "pseudocode" ||
         node["type"] == "pseudocode"
+
       @in_figure = true
       out.div **figure_attrs(node) do |div|
         node.children.each do |n|
@@ -51,6 +62,7 @@ module IsoDoc::Function
 
     def sourcecode_name_parse(node, div, name)
       return if name.nil? 
+
       div.p **{ class: "SourceTitle", style: "text-align:center;" } do |p|
         name.children.each { |n| parse(n, p) }
       end
@@ -91,14 +103,15 @@ module IsoDoc::Function
       @annotation = false
     end
 
-    def admonition_class(node)
+    def admonition_class(_node)
       "Admonition"
     end
 
     def admonition_name(node, type)
       name = node&.at(ns("./name")) and return name
-      name = Nokogiri::XML::Node.new('name', node.document)
+      name = Nokogiri::XML::Node.new("name", node.document)
       return unless type && @i18n.admonition[type]
+
       name << @i18n.admonition[type]&.upcase
       name
     end
@@ -119,7 +132,8 @@ module IsoDoc::Function
 
     def formula_where(dl, out)
       return unless dl
-      out.p **{ style: "page-break-after:avoid;"} do |p|
+
+      out.p **{ style: "page-break-after:avoid;" } do |p|
         p << @i18n.where
       end
       parse(dl, out)
@@ -148,6 +162,7 @@ module IsoDoc::Function
         formula_where(node.at(ns("./dl")), div)
         node.children.each do |n|
           next if %w(stem dl name).include? n.name
+
           parse(n, div)
         end
       end
@@ -182,6 +197,7 @@ module IsoDoc::Function
       author = node.at(ns("./author"))
       source = node.at(ns("./source"))
       return if author.nil? && source.nil?
+
       out.p **{ class: "QuoteAttribution" } do |p|
         p << "&mdash; #{author.text}" if author
         p << ", " if author && source
@@ -201,9 +217,14 @@ module IsoDoc::Function
     end
 
     def passthrough_parse(node, out)
-      return if node["format"] and
+      return if node["format"] &&
         !(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/blocks_example_note.rb

@@ -59,7 +59,7 @@ module IsoDoc::Function
       name = node&.at(ns("./name"))&.remove
       div.p do |p|
         name and p.span **{ class: "note_label" } do |s|
-          name and name.children.each { |n| parse(n, s) }
+          name.children.each { |n| parse(n, s) }
           s << note_delim
         end
         insert_tab(p, 1)
@@ -98,7 +98,7 @@ module IsoDoc::Function
       @note = true
       out.div **note_attrs(node) do |div|
         node&.at(ns("./*[local-name() != 'name'][1]"))&.name == "p" ?
-        #node.first_element_child.name == "p" ?
+        # node.first_element_child.name == "p" ?
           note_p_parse(node, div) : note_parse1(node, div)
       end
       @note = false

data/lib/isodoc/function/cleanup.rb

@@ -204,8 +204,7 @@ module IsoDoc::Function
       docxml
     end
 
-    def symbols_cleanup(docxml)
-    end
+    def symbols_cleanup(docxml); end
 
     def table_footnote_reference_format(a)
       a

data/lib/isodoc/function/form.rb

@@ -0,0 +1,51 @@
+module IsoDoc::Function
+  module Form
+    def form_parse(node, out)
+      node.children.each do |n|
+        parse(n, out)
+      end
+    end
+
+    def input_parse(node, out)
+      case node["type"]
+      when "button" then out << "[#{node['value'] || 'BUTTON'}]"
+      when "checkbox" then out << "&#x2610; "
+      when "date" then text_input(out)
+      when "file" then text_input(out)
+      when "password" then text_input(out)
+      when "radio" then out << "&#x25CE; "
+      when "submit" # nop
+      when "text" then text_input(out, node["maxlength"])
+      end
+    end
+
+    def text_input(out, length = 10)
+      length ||= 10
+      length = length.to_i
+      length.zero? and length = 10
+      out << "_" * length
+      out << " "
+    end
+
+    def select_parse(node, out)
+      text_input(out, node["size"] || 10)
+    end
+
+    def label_parse(node, out)
+      node.children.each do |n|
+        parse(n, out)
+      end
+    end
+
+    def option_parse(node, out); end
+
+    def textarea_parse(_node, out)
+      out.table **{ border: 1, width: "50%" } do |t|
+        t.tr do |tr|
+          tr.td do |td|
+          end
+        end
+      end
+    end
+  end
+end

data/lib/isodoc/function/inline.rb

@@ -23,21 +23,27 @@ 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)
+      return url unless File.extname(url).empty?
+
       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 +74,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 +100,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 +113,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|