isodoc 1.5.2 → 1.6.1

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

@@ -24,6 +24,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 +52,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 +93,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 +122,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 +152,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 +187,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 +207,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/inline.rb

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

data/lib/isodoc/function/references.rb

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

data/lib/isodoc/function/to_word_html.rb

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

data/lib/isodoc/function/utils.rb

@@ -28,10 +28,10 @@ module IsoDoc::Function
     # to allow for HTMLentities
     def noko(&block)
       doc = ::Nokogiri::XML.parse(NOKOHEAD)
-      fragment = doc.fragment('')
+      fragment = doc.fragment("")
       ::Nokogiri::XML::Builder.with fragment, &block
-      fragment.to_xml(encoding: 'US-ASCII').lines.map do |l|
-        l.gsub(/\s*\n/, '')
+      fragment.to_xml(encoding: "US-ASCII").lines.map do |l|
+        l.gsub(/\s*\n/, "")
       end
     end
 
@@ -46,17 +46,18 @@ module IsoDoc::Function
       '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
 
     def to_xhtml(xml)
-      xml.gsub!(/<\?xml[^>]*>/, '')
+      xml.gsub!(/<\?xml[^>]*>/, "")
       /<!DOCTYPE /.match(xml) || (xml = DOCTYPE_HDR + xml)
       xml = xml.split(/(\&[^ \r\n\t#;]+;)/).map do |t|
         /^(\&[^ \t\r\n#;]+;)/.match?(t) ?
           HTMLEntities.new.encode(HTMLEntities.new.decode(t), :hexadecimal) : t
-      end.join('')
+      end.join("")
       begin
         Nokogiri::XML.parse(xml, &:strict)
       rescue Nokogiri::XML::SyntaxError => e
-        File.open("#{@filename}.#{@format}.err", 'w:UTF-8') { |f| f.write xml }
-        abort "Malformed Output XML for #{@format}: #{e} (see #{@filename}.#{@format}.err)"
+        File.open("#{@filename}.#{@format}.err", "w:UTF-8") { |f| f.write xml }
+        abort "Malformed Output XML for #{@format}: #{e} "\
+          "(see #{@filename}.#{@format}.err)"
       end
     end
 
@@ -67,11 +68,12 @@ module IsoDoc::Function
     end
 
     def from_xhtml(xml)
-      xml.to_xml.sub(%r{ xmlns="http://www.w3.org/1999/xhtml"}, '')
+      xml.to_xml.sub(%r{ xmlns="http://www.w3.org/1999/xhtml"}, "")
     end
 
     CLAUSE_ANCESTOR =
       ".//ancestor::*[local-name() = 'annex' or "\
+      "local-name() = 'definitions' or "\
       "local-name() = 'acknowledgements' or local-name() = 'term' or "\
       "local-name() = 'appendix' or local-name() = 'foreword' or "\
       "local-name() = 'introduction' or local-name() = 'terms' or "\
@@ -102,31 +104,32 @@ module IsoDoc::Function
       else
         @i18n.l10n("#{array[0..-2].join(', ')} "\
                    "#{@i18n.and} #{array.last}",
-                                     @lang, @script)
+                   @lang, @script)
       end
     end
 
     # avoid `; avoid {{ (Liquid Templates); avoid [[ (Javascript)
     def extract_delims(text)
-      @openmathdelim = '(#('
-      @closemathdelim = ')#)'
+      @openmathdelim = "(#("
+      @closemathdelim = ")#)"
       while text.include?(@openmathdelim) || text.include?(@closemathdelim)
-        @openmathdelim += '('
-        @closemathdelim += ')'
+        @openmathdelim += "("
+        @closemathdelim += ")"
       end
       [@openmathdelim, @closemathdelim]
     end
 
     def header_strip(h)
-      h = h.to_s.gsub(%r{<br\s*/>}, ' ').gsub(/<\/?h[123456][^>]*>/, '')
-           .gsub(/<\/?b[^>]*>/, '')
+      h = h.to_s.gsub(%r{<br\s*/>}, " ").gsub(/<\/?h[123456][^>]*>/, "")
+        .gsub(/<\/?b[^>]*>/, "")
       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 == 'span' && x['class'] == 'MsoCommentReference'
-        x.remove if x.name == 'a' && x['class'] == 'FootnoteRef'
-        x.remove if x.name == 'span' && /mso-bookmark/.match(x['style'])
-        x.replace(x.children) if x.name == 'a'
+        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"])
+        x.replace(x.children) if x.name == "a"
       end
       from_xhtml(h1)
     end
@@ -138,9 +141,9 @@ module IsoDoc::Function
     def liquid(doc)
       # unescape HTML escapes in doc
       doc = doc.split(%r<(\{%|%\})>).each_slice(4).map do |a|
-        a[2] = a[2].gsub(/\&lt;/, '<').gsub(/\&gt;/, '>') if a.size > 2
-        a.join('')
-      end.join('')
+        a[2] = a[2].gsub(/\&lt;/, "<").gsub(/\&gt;/, ">") if a.size > 2
+        a.join("")
+      end.join("")
       Liquid::Template.parse(doc)
     end
 
@@ -151,20 +154,20 @@ module IsoDoc::Function
 
     def populate_template(docxml, _format = nil)
       meta = @meta
-             .get
-             .merge(@labels ? {labels: @labels} : {})
-             .merge(@meta.labels ? {labels: @meta.labels} : {})
-             .merge(fonts_options || {})
+        .get
+        .merge(@labels ? {labels: @labels} : {})
+        .merge(@meta.labels ? {labels: @meta.labels} : {})
+        .merge(fonts_options || {})
       template = liquid(docxml)
       template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h)
-              .gsub('&lt;', '&#x3c;').gsub('&gt;', '&#x3e;').gsub('&amp;', '&#x26;')
+        .gsub("&lt;", "&#x3c;").gsub("&gt;", "&#x3e;").gsub("&amp;", "&#x26;")
     end
 
     def save_dataimage(uri, _relative_dir = true)
       %r{^data:(image|application)/(?<imgtype>[^;]+);base64,(?<imgdata>.+)$} =~ uri
-      imgtype.sub!(/\+[a-z0-9]+$/, '') # svg+xml
-      imgtype = 'png' unless /^[a-z0-9]+$/.match imgtype
-      Tempfile.open(['image', ".#{imgtype}"]) do |f|
+      imgtype.sub!(/\+[a-z0-9]+$/, "") # svg+xml
+      imgtype = "png" unless /^[a-z0-9]+$/.match imgtype
+      Tempfile.open(["image", ".#{imgtype}"]) do |f|
         f.binmode
         f.write(Base64.strict_decode64(imgdata))
         @tempfile_cache << f # persist to the end
@@ -173,18 +176,18 @@ module IsoDoc::Function
     end
 
     def image_localfile(i)
-      if /^data:/.match? i['src']
-        save_dataimage(i['src'], false)
-      elsif %r{^([A-Z]:)?/}.match? i['src']
-        i['src']
+      if /^data:/.match? i["src"]
+        save_dataimage(i["src"], false)
+      elsif %r{^([A-Z]:)?/}.match? i["src"]
+        i["src"]
       else
-        File.join(@localdir, i['src'])
+        File.join(@localdir, i["src"])
       end
     end
 
     def labelled_ancestor(node)
-      !node.ancestors('example, requirement, recommendation, permission, '\
-                             'note, table, figure, sourcecode').empty?
+      !node.ancestors("example, requirement, recommendation, permission, "\
+                      "note, table, figure, sourcecode").empty?
     end
   end
 end