isodoc 1.0.29 → 1.1.3.pre.alpha2

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/function/to_word_html.rb

@@ -18,7 +18,7 @@ module IsoDoc::Function
 
     def init_file(filename, debug)
       filepath = Pathname.new(filename)
-      filename = filepath.sub_ext('').to_s
+      filename = filepath.sub_ext('').sub(/\.presentation$/, "").to_s
       dir = "#{filename}_files"
       unless debug
         Dir.mkdir(dir, 0777) unless File.exists?(dir)
@@ -45,7 +45,7 @@ module IsoDoc::Function
         head.style do |style|
           @standardstylesheet.open
           stylesheet = @standardstylesheet.read.
-            gsub("FILENAME", File.basename(filename))
+            gsub("FILENAME", File.basename(filename).sub(/\.presentation$/, ""))
           style.comment "\n#{stylesheet}\n"
         end
       end

data/lib/isodoc/function/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IsoDoc::Function
   module Utils
     def date_range(date)
@@ -9,50 +11,50 @@ module IsoDoc::Function
     end
 
     def insert_tab(out, n)
-      [1..n].each { out << "&nbsp; " }
+      [1..n].each { out << '&nbsp; ' }
     end
 
     # add namespaces for Word fragments
-    NOKOHEAD = <<~HERE.freeze
-    <!DOCTYPE html SYSTEM
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-    <html xmlns="http://www.w3.org/1999/xhtml">
-    <head> <title></title> <meta charset="UTF-8" /> </head>
-    <body> </body> </html>
+    NOKOHEAD = <<~HERE
+      <!DOCTYPE html SYSTEM
+      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+      <html xmlns="http://www.w3.org/1999/xhtml">
+      <head> <title></title> <meta charset="UTF-8" /> </head>
+      <body> </body> </html>
     HERE
 
     # block for processing XML document fragments as XHTML,
     # 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
 
     def attr_code(attributes)
       attributes = attributes.reject { |_, val| val.nil? }.map
       attributes.map do |k, v|
-        [k, (v.is_a? String) ? HTMLEntities.new.decode(v) : v]
+        [k, v.is_a?(String) ? HTMLEntities.new.decode(v) : v]
       end.to_h
     end
 
     DOCTYPE_HDR = '<!DOCTYPE html SYSTEM '\
-      '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.freeze
+      '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
 
     def to_xhtml(xml)
-      xml.gsub!(/<\?xml[^>]*>/, "")
-      /<!DOCTYPE /.match xml or xml = DOCTYPE_HDR + 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) ? 
+        /^(\&[^ \t\r\n#;]+;)/.match?(t) ?
           HTMLEntities.new.encode(HTMLEntities.new.decode(t), :hexadecimal) : t
-      end.join("")
+      end.join('')
       begin
-        Nokogiri::XML.parse(xml) { |config| config.strict }
+        Nokogiri::XML.parse(xml, &:strict)
       rescue Nokogiri::XML::SyntaxError => e
-        File.open("#{@filename}.#{@format}.err", "w:UTF-8") { |f| f.write xml }
+        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
@@ -64,7 +66,7 @@ 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 =
@@ -72,7 +74,7 @@ module IsoDoc::Function
       "local-name() = 'acknowledgements' or local-name() = 'term' or "\
       "local-name() = 'appendix' or local-name() = 'foreword' or "\
       "local-name() = 'introduction' or local-name() = 'terms' or "\
-      "local-name() = 'clause' or local-name() = 'references']/@id".freeze
+      "local-name() = 'clause' or local-name() = 'references']/@id"
 
     def get_clause_id(node)
       clause = node.xpath(CLAUSE_ANCESTOR)
@@ -86,7 +88,7 @@ module IsoDoc::Function
       "local-name() = 'acknowledgements' or local-name() = 'term' or "\
       "local-name() = 'clause' or local-name() = 'references' or "\
       "local-name() = 'figure' or local-name() = 'formula' or "\
-      "local-name() = 'table' or local-name() = 'example']/@id".freeze
+      "local-name() = 'table' or local-name() = 'example']/@id"
 
     def get_note_container_id(node)
       container = node.xpath(NOTE_CONTAINER_ANCESTOR)
@@ -94,7 +96,7 @@ module IsoDoc::Function
     end
 
     def sentence_join(array)
-      return "" if array.nil? || array.empty?
+      return '' if array.nil? || array.empty?
       if array.length == 1 then array[0]
       else
         IsoDoc::Function::I18n::l10n("#{array[0..-2].join(', ')} "\
@@ -105,25 +107,25 @@ module IsoDoc::Function
 
     # 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 == '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
@@ -135,9 +137,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
 
@@ -147,37 +149,41 @@ module IsoDoc::Function
     end
 
     def populate_template(docxml, _format = nil)
-      meta = @meta.get.merge(@labels || {}).merge(@meta.labels || {})
+      meta = @meta
+             .get
+             .merge(@labels || {})
+             .merge(@meta.labels || {})
+             .merge(@meta.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;')
+      template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h)
+              .gsub('&lt;', '&#x3c;').gsub('&gt;', '&#x3e;').gsub('&amp;', '&#x26;')
     end
 
-    def save_dataimage(uri, relative_dir = true)
+    def save_dataimage(uri, _relative_dir = true)
       %r{^data:image/(?<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
+        @tempfile_cache << f # persist to the end
         f.path
       end
     end
 
     def image_localfile(i)
-      if /^data:image/.match i["src"]
-        save_dataimage(i["src"], false)
-      elsif %r{^([A-Z]:)?/}.match i["src"]
-        i["src"]
+      if /^data:image/.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)
-      return !node.ancestors("example, requirement, recommendation, permission, "\
-                             "table, figure, sourcecode").empty?
+      !node.ancestors('example, requirement, recommendation, permission, '\
+                             'table, figure, sourcecode').empty?
     end
   end
 end

data/lib/isodoc/gem_tasks.rb

@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+
+require 'sassc'
+require 'isodoc/sassc_importer'
+require 'rake/clean'
+
+module IsoDoc
+  module GemTasks
+    extend Rake::DSL if defined? Rake::DSL
+
+    module_function
+
+    def install
+      rule '.css' => [proc { |tn| tn.sub(/\.css$/, '.scss') }] do |current_task|
+        begin
+          puts(current_task)
+          compile_scss_task(current_task)
+        rescue StandardError => e
+          puts(e.message, "skiping #{current_task}")
+        end
+      end
+
+      scss_files = Rake::FileList['lib/**/*.scss']
+      source_files = scss_files.ext('.css')
+
+      task :comment_out_liquid do
+        process_css_files(scss_files) do |file_name|
+          comment_out_liquid(File.read(file_name, encoding: 'UTF-8'))
+        end
+      end
+
+      task build_scss: [:comment_out_liquid].push(*source_files) do
+        process_css_files(scss_files) do |file_name|
+          uncomment_out_liquid(File.read(file_name, encoding: 'UTF-8'))
+        end
+        git_cache_compiled_files && puts('Built scss!')
+      end
+
+      Rake::Task['build'].enhance [:build_scss] do
+        git_rm_compiled_files
+        Rake::Task[:clean].invoke
+      end
+    end
+
+    def git_cache_compiled_files
+      CLEAN.each do |css_file|
+        sh "git add #{css_file}"
+      end
+    end
+
+    def git_rm_compiled_files
+      CLEAN.each do |css_file|
+        sh "git rm --cached #{css_file}"
+      end
+    end
+
+    def process_css_files(scss_files)
+      scss_files.each do |file_name|
+        result = yield(file_name)
+        File.open(file_name, 'w', encoding: 'UTF-8') do |file|
+          file.puts(result)
+        end
+      end
+    end
+
+    def comment_out_liquid(text)
+      text.split("\n").map do |line|
+        if line.match?(/{({|%).+(}|%)}/)
+          "/* LIQUID_COMMENT#{line}LIQUID_COMMENT */"
+        else
+          line
+        end
+      end
+          .join("\n")
+    end
+
+    def uncomment_out_liquid(text)
+      text
+        .gsub('/* LIQUID_COMMENT', '')
+        .gsub('LIQUID_COMMENT */', '')
+        .gsub('"{{', '{{').gsub('}}"', '}}')
+    end
+
+    def fonts_placeholder
+      <<~TEXT
+        $bodyfont: '{{bodyfont}}';
+        $headerfont: '{{headerfont}}';
+        $monospacefont: '{{monospacefont}}';
+      TEXT
+    end
+
+    def compile_scss(filename)
+      require 'sassc'
+
+      [File.join('lib', 'isodoc'),
+       File.dirname(filename)].each do |name|
+        SassC.load_paths << name
+      end
+      sheet_content = File.read(filename, encoding: 'UTF-8')
+      SassC::Engine.new(fonts_placeholder + sheet_content,
+                        syntax: :scss,
+                        importer: SasscImporter)
+                   .render
+    end
+
+    def compile_scss_task(current_task)
+      filename = current_task.source
+      basename = File.basename(filename, '.*')
+      compiled_path = File.join(File.dirname(filename), "#{basename}.css")
+      content = uncomment_out_liquid(compile_scss(filename))
+      File.open(compiled_path, 'w:UTF-8') do |f|
+        f.write(content)
+      end
+      CLEAN << compiled_path
+    end
+  end
+end

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