isodoc 0.5.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90089f0b90f1392ef99b4d676db3215397bb70fc
-  data.tar.gz: 5d82f8fb83a29877f878716df97dc6499a998834
+  metadata.gz: e18be494066e54a1661baf231c7f7636c2be91d9
+  data.tar.gz: 366c0b7966f513d9dca521cf3f93803b9a1f0adf
 SHA512:
-  metadata.gz: eb49c04b480775ba01401325d448b9d03181c93f6f456525755ac7a704b8eae5b19a88afd3ac736ff234bb5fc4e7e3a2c0affa0555128efc1e89071eec14f10b
-  data.tar.gz: 382f620801c7e6a447f00de270f2d372a81abbc6f7bb878760e7a000527e2c085389ae694483a426f76d3b75fdb48d93d1d40abcd0601d9db68dee5bc6fd3e95
+  metadata.gz: c4d115c0302d6db04d082e282209333ea47b84f3beca675714d3744ef96a4a0a06cd0bfbd8b5fb50b520ca58ba196e1f8916d211884d62961377437c28a8f6c2
+  data.tar.gz: 441a80cb9e5160483563c7563c839ec9b4630c447042d72a7bf078083dda8acfb53f5614c3bf5d6d79ea6470188efcbe49977bb690d07fa843cb3a83f01529a7

data/isodoc.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "html2doc"
   spec.add_dependency "liquid"
   spec.add_dependency "roman-numerals"
+  spec.add_dependency "sass"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"

data/lib/isodoc.rb

@@ -13,4 +13,6 @@ require "set"
 require "pp"
 require "isodoc/convert"
 require "isodoc/wordconvert/convert"
+require "isodoc/iso/convert"
+require "isodoc/iso/wordconvert"
 end

data/lib/isodoc/convert.rb

@@ -15,6 +15,7 @@ require "isodoc/xref_gen"
 require "isodoc/xref_sect_gen"
 require "isodoc/html"
 require "isodoc/i18n"
+require "sass"
 
 module IsoDoc
   class Convert
@@ -65,11 +66,26 @@ module IsoDoc
       @files_to_delete = []
     end
 
+    def html_doc_path(file)
+      File.join(File.dirname(__FILE__), File.join("html", file))
+    end
+
+    def generate_css(filename, stripwordcss, fontheader)
+      stylesheet = File.read(filename, encoding: "UTF-8")
+      stylesheet.gsub!(/(\s|\{)mso-[^:]+:[^;]+;/m, "\\1") if stripwordcss
+      engine = Sass::Engine.new(fontheader + stylesheet, syntax: :scss)
+      outname = File.basename(filename, ".*") + ".css"
+      File.open(outname, "w") { |f| f.write(engine.render) }
+      @files_to_delete << outname
+      outname
+    end
+
     def convert1(docxml, filename, dir)
+      anchor_names docxml
       noko do |xml|
         xml.html do |html|
           html.parent.add_namespace("epub", "http://www.idpf.org/2007/ops")
-          html_header(html, docxml, filename, dir)
+          define_head html, filename, dir
           make_body(html, docxml)
         end
       end.join("\n")

data/lib/isodoc/footnotes.rb

@@ -23,7 +23,7 @@ module IsoDoc
     end
 
     def make_table_footnote_text(node, fnid, fnref)
-      attrs = { id: "ftn#{fnid}" }
+      attrs = { id: "fn:#{fnid}" }
       noko do |xml|
         xml.div **attr_code(attrs) do |div|
           make_table_footnote_target(div, fnid, fnref)
@@ -34,7 +34,7 @@ module IsoDoc
 
     def make_generic_footnote_text(node, fnid)
       noko do |xml|
-        xml.aside **{ id: "ftn#{fnid}", class: "footnote" } do |div|
+        xml.aside **{ id: "fn:#{fnid}", class: "footnote" } do |div|
           node.children.each { |n| parse(n, div) }
         end
       end.join("\n")
@@ -63,9 +63,14 @@ module IsoDoc
     def footnote_parse(node, out)
       return table_footnote_parse(node, out) if @in_table || @in_figure
       fn = node["reference"]
-      out.a **{ "epub:type": "footnote", href: "#ftn#{fn}" } do |a|
+      attrs = { "epub:type": "footnote", rel: "footnote", href: "#fn:#{fn}" }
+      out.a **attrs do |a|
         a.sup { |sup| sup << fn }
       end
+      make_footnote(node, fn)
+    end
+    
+    def make_footnote(node, fn)
       return if @seen_footnote.include?(fn)
       @in_footnote = true
       @footnotes << make_generic_footnote_text(node, fn)

data/lib/isodoc/html.rb

@@ -6,10 +6,15 @@ module IsoDoc
       @files_to_delete.each { |f| system "rm #{f}" }
     end
 
+    def script_cdata(result)
+      result.gsub(%r{<script>\s*<!\[CDATA\[}m, "<script>").
+        gsub(%r{\]\]>\s*</script>}, "</script>").
+        gsub(%r{<!\[CDATA\[\s*<script>}m, "<script>").
+        gsub(%r{</script>\s*\]\]>}, "</script>")
+    end
+
     def toHTML(result, filename)
-      result = from_xhtml(html_cleanup(to_xhtml(result))).
-        gsub(%r{<script><!\[CDATA\[}, "<script>").
-        gsub(%r{\]\]></script>}, "</script>")
+      result = script_cdata(from_xhtml(html_cleanup(to_xhtml(result))))
       result = populate_template(result, :html)
       File.open("#{filename}.html", "w") do |f|
         f.write(result)
@@ -48,14 +53,43 @@ module IsoDoc
       docxml
     end
 
+    def html_head() 
+      <<~HEAD.freeze
+    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+
+    <!--TOC script import-->
+    <script type="text/javascript"  src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
+
+    <!--Google fonts-->
+    <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Lato:400,400i,700,900" rel="stylesheet">
+    <!--Font awesome import for the link icon-->
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
+      HEAD
+    end
+
+    def html_button() 
+      '<button onclick="topFunction()" id="myBtn" '\
+        'title="Go to top">Top</button>'.freeze
+    end
+
+    def html_main(docxml)
+      docxml.at("//head").add_child(html_head())
+      d = docxml.at('//div[@class="WordSection3"]')
+      d.name = "main"
+      d.children.first.previous = html_button()
+    end
+
     def html_preface(docxml)
       html_cover(docxml) if @htmlcoverpage
       html_intro(docxml) if @htmlintropage
       docxml.at("//body") << mathjax(@openmathdelim, @closemathdelim)
       if @scripts
         scripts = File.read(@scripts, encoding: "UTF-8")
-        docxml.at("//body").add_child scripts #scripts.to_xml(encoding: "US-ASCII")
+        a = docxml.at("//body").add_child docxml.create_cdata(scripts) #scripts.to_xml(encoding: "US-ASCII")
       end
+      html_main(docxml)
       docxml
     end
 
@@ -120,9 +154,9 @@ module IsoDoc
         next if seen[x["href"]]
         seen[x["href"]] = true
         fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
-        x["id"] || x["id"] = "_footnote#{i + 1}"
-        fn.elements.first.children.first.previous =
-          "<a href='##{x['id']}'>#{x.at('./sup').text}) </a>"
+        x["id"] || x["id"] = "fnref:#{i + 1}"
+        fn.elements.first.children.first.previous = x.dup
+        fn.add_child "<a href='##{x['id']}'>&#x21A9;</a>"
       end
       docxml
     end
@@ -141,28 +175,32 @@ module IsoDoc
       docxml
     end
 
-    def html_toc1(h, ret, prevname)
-      h["id"] = UUIDTools::UUID.random_create.to_s unless h["id"]
-      li = "<li><a href='##{h["id"]}'>#{header_strip(h)}</a></li>"
-      if h.name == "h1"
-        ret += "</ul>" if prevname == "h2"
-      else
-        ret += "<ul>" if prevname == "h1"
-      end
-      ret + li
-    end
+    #def html_toc1(h, ret, prevname)
+      #h["id"] = UUIDTools::UUID.random_create.to_s unless h["id"]
+      #li = "<li><a href='##{h["id"]}'>#{header_strip(h)}</a></li>"
+      #if h.name == "h1"
+        #ret += "</ul>" if prevname == "h2"
+      #else
+        #ret += "<ul>" if prevname == "h1"
+      #end
+      #ret + li
+    #end
+#
+    #def html_toc_obsolete(docxml)
+      #return docxml unless @htmlintropage
+      #ret = ""
+      #prevname = ""
+      #docxml.xpath("//h1 | //h2").each do |h|
+        #next if ["toc-contents", "TermNum"].include? h["class"]
+        #ret = html_toc1(h, ret, prevname)
+        #prevname = h.name
+      #end
+      #ret += "<ul>" if prevname == "h2"
+      #docxml.at("//*[@id='toc-list']").replace("<ul>#{ret}</ret>")
+      #docxml
+    #end
 
     def html_toc(docxml)
-      return docxml unless @htmlintropage
-      ret = ""
-      prevname = ""
-      docxml.xpath("//h1 | //h2").each do |h|
-        next if ["toc-contents", "TermNum"].include? h["class"]
-        ret = html_toc1(h, ret, prevname)
-        prevname = h.name
-      end
-      ret += "<ul>" if prevname == "h2"
-      docxml.at("//*[@id='toc-list']").replace("<ul>#{ret}</ret>")
       docxml
     end
   end

data/lib/isodoc/i18n-en.yaml

@@ -64,7 +64,7 @@ admonition: {
   warning: Warning,
   caution: Caution,
   important: Important,
-  safety precautions: Safety Precautions,
+  safety precautions: Safety Precautions
 }
 locality: {
                       section: Section,

data/lib/isodoc/iso/convert.rb

@@ -0,0 +1,46 @@
+module IsoDoc
+  module Iso
+    class Convert < IsoDoc::Convert
+
+      def default_fonts(options)
+        b = options[:bodyfont] ||
+          (options[:script] == "Hans" ? '"SimSun",serif' :
+           '"Cambria",serif')
+        h = options[:headerfont] ||
+          (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+           '"Cambria",serif')
+        m = options[:monospacefont] || '"Courier New",monospace'
+        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
+      end
+
+      def alt_fonts(options)
+        b = options[:bodyfont] ||
+          (options[:script] == "Hans" ? '"SimSun",serif' :
+           '"Lato",sans-serif')
+        h = options[:headerfont] ||
+          (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+           '"Lato",sans-serif')
+        m = options[:monospacefont] || '"Space Mono",monospace'
+        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
+      end
+
+      def html_doc_path(file)
+        File.join(File.dirname(__FILE__), File.join("html", file))
+      end
+
+      def initialize(options)
+        super
+        if options[:alt]
+          css = generate_css(html_doc_path("style-human.scss"), true, alt_fonts(options))
+        else
+          css = generate_css(html_doc_path("style-iso.scss"), true, default_fonts(options))
+        end
+        @htmlstylesheet = css
+        @htmlcoverpage = html_doc_path("html_iso_titlepage.html")
+        @htmlintropage = html_doc_path("html_iso_intro.html")
+        @scripts = html_doc_path("scripts.html")
+      end
+
+    end
+  end
+end

data/lib/isodoc/iso/html/header.html

@@ -0,0 +1,184 @@
+<html xmlns:v="urn:schemas-microsoft-com:vml"
+xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns:m="http://schemas.microsoft.com/office/2004/12/omml"
+xmlns:mv="http://macVmlSchemaUri" xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta name=Title content="">
+<meta name=Keywords content="">
+<meta http-equiv=Content-Type content="text/html; charset=utf-8">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 15">
+<meta name=Originator content="Microsoft Word 15">
+<link id=Main-File rel=Main-File href="../{{ filename }}.html">
+<!--[if gte mso 9]><xml>
+ <o:shapedefaults v:ext="edit" spidmax="2049"/>
+</xml><![endif]-->
+</head>
+
+<body lang=EN link=blue vlink="#954F72">
+
+<div style='mso-element:footnote-separator' id=fs>
+
+<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+normal'><span lang=EN-GB><span style='mso-special-character:footnote-separator'><![if !supportFootnotes]>
+
+<hr align=left size=1 width="33%">
+
+<![endif]></span></span></p>
+
+</div>
+
+<div style='mso-element:footnote-continuation-separator' id=fcs>
+
+<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+normal'><span lang=EN-GB><span style='mso-special-character:footnote-continuation-separator'><![if !supportFootnotes]>
+
+<hr align=left size=1>
+
+<![endif]></span></span></p>
+
+</div>
+
+<div style='mso-element:endnote-separator' id=es>
+
+<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+normal'><span lang=EN-GB><span style='mso-special-character:footnote-separator'><![if !supportFootnotes]>
+
+<hr align=left size=1 width="33%">
+
+<![endif]></span></span></p>
+
+</div>
+
+<div style='mso-element:endnote-continuation-separator' id=ecs>
+
+<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+normal'><span lang=EN-GB><span style='mso-special-character:footnote-continuation-separator'><![if !supportFootnotes]>
+
+<hr align=left size=1>
+
+<![endif]></span></span></p>
+
+</div>
+
+<div style='mso-element:header' id=eha>
+
+<p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
+mso-line-height-rule:exactly'><span lang=EN-GB>{{ agency }}&nbsp;{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
+
+</div>
+
+<div style='mso-element:header' id=ha>
+
+<p class=MsoHeader style='margin-bottom:18.0pt'><span lang=EN-GB
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt;font-weight:normal'>©
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved</span><span lang=EN-GB
+style='font-weight:normal'><o:p></o:p></span></p>
+
+</div>
+
+<div style='mso-element:footer' id=efa>
+
+<p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
+exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
+lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
+style='mso-element:field-begin'></span><span
+style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
+</span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><b
+style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
+mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>2</span></span></b><!--[if supportFields]><b
+style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
+mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
+lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
+style='mso-tab-count:1'>                                                                                                                                                                           </span>©
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
+
+</div>
+
+<div style='mso-element:header' id=eh2>
+
+<p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
+mso-line-height-rule:exactly'><span lang=EN-GB>{{ agency }}&nbsp;{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
+
+</div>
+
+<div style='mso-element:header' id=h2>
+
+<p class=MsoHeader align=right style='text-align:right;line-height:12.0pt;
+mso-line-height-rule:exactly'><span lang=EN-GB>{{ agency }}&nbsp;{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
+
+</div>
+
+<div style='mso-element:footer' id=ef2>
+
+<p class=MsoFooter style='line-height:12.0pt;mso-line-height-rule:exactly'><!--[if supportFields]><span
+lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
+style='mso-element:field-begin'></span><span
+style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
+</span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
+lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
+style='mso-no-proof:yes'>ii</span></span><!--[if supportFields]><span
+lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
+style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
+1'>                                                                                                                                                                           </span>©
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
+
+</div>
+
+<div style='mso-element:footer' id=f2>
+
+<p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– All
+rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
+lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
+style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
+</span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
+lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
+style='mso-no-proof:yes'>iii</span></span><!--[if supportFields]><span
+lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
+style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
+
+</div>
+
+<div style='mso-element:footer' id=ef3>
+
+<p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
+exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
+lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
+style='mso-element:field-begin'></span><span
+style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
+</span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><b
+style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
+mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>2</span></span></b><!--[if supportFields]><b
+style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
+mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
+lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
+style='mso-tab-count:1'>                                                                                                                                                                           </span>©
+{{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
+
+</div>
+
+<div style='mso-element:footer' id=f3>
+
+<p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– All
+rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
+style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
+mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
+PAGE<span style='mso-spacerun:yes'>   </span>\* MERGEFORMAT <span
+style='mso-element:field-separator'></span></span></b><![endif]--><b
+style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
+mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>3</span></span></b><!--[if supportFields]><b
+style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
+mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
+lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
+
+</div>
+
+</body>
+
+</html>