isodoc 0.9.16 → 0.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b26664ab07349891d3a840f0c98f4a9bea787bc176dd6beb8580608564d4cd1c
-  data.tar.gz: aa45cdbd35faeed78af75730ec6cac6275e7b91e40bcc8f9e1d08f7484de8846
+  metadata.gz: 3db2fc3806a2953f1cd51c3edc7a3f8abe930e7a85562f1e3786452a987eb427
+  data.tar.gz: 92247d33287542fec1bc39186ba8670dd2570e797895a49cfe3257156840099a
 SHA512:
-  metadata.gz: fc0285784f98018d1d9c333fd5fa3e54ef5de5867447cbbcb5c1749038b5c749169c1d9c69a72af9ef6dc6a4073a62c5bedcabca23a88a943171e1e8f08b796b
-  data.tar.gz: 94e7ec97ed84bcece612a9e3237c053780de2d6b2e534049a7147a5409699b3129ba3c07e5c88fa9464a851b10133c70d9001d795102e065af2b827a4230afb2
+  metadata.gz: 2a59a21657f9148c4ce184b4429aa1583b096b7ad2925c23be8b0744522efbd74e63aba7d958a9fdcb16ba6bf1d0165ef8e8ffeb059f0406c0068dbdad589188
+  data.tar.gz: 4c3dcacbc1e711db4618070f17f6b9e8d1b97c72745ed959b620e705fe4eb878a54c3f2ccdf17ff3fea6e3d510e0faf36afa1a7a2d87b2de1c979f3dfc2fee0b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.9.16)
+    isodoc (0.9.17)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -61,8 +61,9 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    metanorma (0.3.7)
+    metanorma (0.3.8)
       asciidoctor
+      htmlentities
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)

data/lib/isodoc/function/blocks.rb

@@ -116,11 +116,17 @@ module IsoDoc::Function
     end
 
     def sourcecode_name_parse(_node, div, name)
-      div.p **{ class: "FigureTitle", align: "center" } do |p|
+      div.p **{ class: "SourceTitle", align: "center" } do |p|
           name.children.each { |n| parse(n, p) }
       end
     end
 
+    def admonition_name_parse(_node, div, name)
+      div.p **{ class: "AdmonitionTitle", align: "center" } do |p|
+        name.children.each { |n| parse(n, p) }
+      end
+    end
+
     def sourcecode_parse(node, out)
       name = node.at(ns("./name"))
       out.p **attr_code(id: node["id"], class: "Sourcecode") do |div|
@@ -151,12 +157,21 @@ module IsoDoc::Function
       "Admonition"
     end
 
+    def admonition_name(node, type)
+      name = node&.at(ns("./name")) and return name
+      name = Nokogiri::XML::Node.new('name', node.document)
+      return unless type && @admonition[type]
+      name << @admonition[type]&.upcase
+      name
+    end
+
     def admonition_parse(node, out)
-      name = node["type"]
+      type = node["type"]
+      name = admonition_name(node, type)
       out.div **{ class: admonition_class(node) } do |t|
-        t.title { |b| b << @admonition[name].upcase } if name
+        admonition_name_parse(node, t, name) if name
         node.children.each do |n|
-          parse(n, t)
+          parse(n, t) unless n.name == "name"
         end
       end
     end
@@ -212,7 +227,8 @@ module IsoDoc::Function
       author = node.at(ns("./author"))
       source = node.at(ns("./source"))
       out.p **{ class: "QuoteAttribution" } do |p|
-        p << "&mdash; #{author.text}, " if author
+        p << "&mdash; #{author.text}" if author
+        p << ", " if author && source
         eref_parse(source, p) if source
       end
     end

data/lib/isodoc/function/table.rb

@@ -24,7 +24,7 @@ module IsoDoc::Function
     end
 
     def tbody_parse(node, t)
-      tbody = node.at(ns("./tbody"))
+      tbody = node.at(ns("./tbody")) || return
       t.tbody do |h|
         tbody.element_children.each_with_index do |n, i|
           tr_parse(n, h, i, tbody.element_children.size, false)

data/lib/isodoc/function/utils.rb

@@ -140,7 +140,8 @@ module IsoDoc::Function
         gsub(/\s*\[\/TERMREF\]\s*/, l10n("]")).
         gsub(/\s*\[MODIFICATION\]/, l10n(", #{@modified_lbl} — "))
       template = liquid(docxml)
-      template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h)
+      template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h).
+        gsub('<', '<').gsub('>', '>').gsub('&', '&')
     end
   end
 end

data/lib/isodoc/html_function/html.rb

@@ -112,10 +112,47 @@ module IsoDoc::HtmlFunction
       d.children.empty? or d.children.first.previous = html_button()
     end
 
+    def sourcecode_highlighter
+      '<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>'
+    end
+
+    def sourcecodelang(lang)
+      return unless lang
+      case lang.downcase
+      when "javascript" then "lang-js"
+      when "c" then "lang-c"
+      when "c+" then "lang-cpp"
+      when "console" then "lang-bsh"
+      when "ruby" then "lang-rb"
+      when "html" then "lang-html"
+      when "java" then "lang-java"
+      when "xml" then "lang-xml"
+      when "perl" then "lang-perl"
+      when "python" then "lang-py"
+      when "xsl" then "lang-xsl"
+      else
+        ""
+      end
+    end
+
+    def sourcecode_parse(node, out)
+      name = node.at(ns("./name"))
+      out.pre **attr_code(id: node["id"], 
+                          class: "prettyprint #{sourcecodelang(node&.at(ns('./@lang'))&.value)}") do |div|
+        @sourcecode = true
+        node.children.each do |n|
+          parse(n, div) unless n.name == "name"
+        end
+        @sourcecode = false
+        sourcecode_name_parse(node, div, name) if name
+      end
+    end
+
     def html_preface(docxml)
       html_cover(docxml) if @htmlcoverpage
       html_intro(docxml) if @htmlintropage
       docxml.at("//body") << mathjax(@openmathdelim, @closemathdelim)
+      docxml.at("//body") << sourcecode_highlighter
       if @scripts
         scripts = File.read(@scripts, encoding: "UTF-8")
         a = docxml.at("//body").add_child docxml.create_cdata(scripts)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.9.16".freeze
+  VERSION = "0.9.17".freeze
 end

data/spec/isodoc/blocks_spec.rb

@@ -397,7 +397,7 @@ B</pre>
     expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <sourcecode id="samplecode">
+    <sourcecode lang="ruby" id="samplecode">
     <name>Ruby <em>code</em></name>
   puts x
 </sourcecode>
@@ -408,7 +408,7 @@ B</pre>
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160; <br/>&#160; puts x<br/><p class="FigureTitle" align="center">Ruby <i>code</i></p></p>
+                 <pre id="samplecode" class="prettyprint lang-rb"><br/>&#160;&#160;&#160; <br/>&#160; puts x<br/><p class="SourceTitle" align="center">Ruby <i>code</i></p></pre>
                </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -417,6 +417,47 @@ B</pre>
     OUTPUT
   end
 
+  it "processes sourcecode (Word)" do
+    expect(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <sourcecode lang="ruby" id="samplecode">
+    <name>Ruby <em>code</em></name>
+  puts x
+</sourcecode>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    <html xmlns:epub="http://www.idpf.org/2007/ops">
+         <head/>
+         <body lang="EN-US" link="blue" vlink="#954F72">
+           <div class="WordSection1">
+             <p>&#160;</p>
+           </div>
+           <p>
+             <br clear="all" class="section"/>
+           </p>
+           <div class="WordSection2">
+             <p>
+               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+             </p>
+               <div>
+                 <h1 class="ForewordTitle">Foreword</h1>
+                 <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160; <br/>&#160; puts x<br/><p class="SourceTitle" align="center">Ruby <i>code</i></p></p>
+               </div>
+                  <p>&#160;</p>
+ </div>
+ <p>
+   <br clear="all" class="section"/>
+ </p>
+ <div class="WordSection3">
+               <p class="zzSTDTitle1"/>
+             </div>
+           </body>
+       </html>
+    OUTPUT
+  end
+
   it "processes sourcecode with escapes preserved" do
     expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -432,7 +473,7 @@ B</pre>
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160; <br/>&#160; &lt;xml&gt;<br/><p class="FigureTitle" align="center">XML code</p></p>
+                 <pre id="samplecode" class="prettyprint "><br/>&#160;&#160;&#160; <br/>&#160; &lt;xml&gt;<br/><p class="SourceTitle" align="center">XML code</p></pre>
                </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -460,11 +501,11 @@ B</pre>
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <p id="_" class="Sourcecode">puts "Hello, world."  &lt;1&gt;<br/>&#160;&#160; %w{a b c}.each do |x|<br/>&#160;&#160;&#160;&#160; puts x  &lt;2&gt;<br/>&#160;&#160; end<span class="zzMoveToFollowing">&lt;1&gt; </span>
+                 <pre id="_" class="prettyprint ">puts "Hello, world."  &lt;1&gt;<br/>&#160;&#160; %w{a b c}.each do |x|<br/>&#160;&#160;&#160;&#160; puts x  &lt;2&gt;<br/>&#160;&#160; end<span class="zzMoveToFollowing">&lt;1&gt; </span>
             <p class="Sourcecode" id="_">This is one callout</p>
           <span class="zzMoveToFollowing">&lt;2&gt; </span>
             <p class="Sourcecode" id="_">This is another callout</p>
-          </p>
+          </pre>
                </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -487,7 +528,7 @@ B</pre>
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div class="Admonition"><title>CAUTION</title>
+                 <div class="Admonition"><p class="AdmonitionTitle" align="center">CAUTION</p>
          <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
        </div>
                </div>
@@ -498,6 +539,33 @@ B</pre>
     OUTPUT
   end
 
+  it "processes admonitions with titles" do
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="caution">
+    <name>Title</name>
+  <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+</admonition>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+        #{HTML_HDR}
+               <br/>
+               <div>
+                 <h1 class="ForewordTitle">Foreword</h1>
+                 <div class="Admonition"><p class="AdmonitionTitle" align="center">Title</p>
+         <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+       </div>
+               </div>
+               <p class="zzSTDTitle1"/>
+             </div>
+           </body>
+       </html>
+    OUTPUT
+  end
+
+
   it "processes formulae" do
     expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">

data/spec/isodoc/footnotes_spec.rb

@@ -153,6 +153,7 @@ RSpec.describe IsoDoc do
         });
        </script>
        <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=AM_HTMLorMML"></script>
+       <script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>
        </body>
     OUTPUT
   end

data/spec/isodoc/postproc_spec.rb

@@ -683,4 +683,62 @@ ICAgICAgIDogRU5EIERPQyBJRAoKRklMRU5BTUU6IHRlc3QKCg==
     OUTPUT
   end
 
+  it "does not lose HTML escapes in postprocessing" do
+        FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
+    IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <sourcecode id="samplecode">
+    <name>XML code</name>
+  &lt;xml&gt; &amp;
+</sourcecode>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+        html = File.read("test.html").sub(/^.*<main class="main-section">/m, '<main class="main-section">').
+      sub(%r{</main>.*$}m, "</main>")
+    expect(html).to be_equivalent_to <<~"OUTPUT"
+    <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
+      <br />
+      <div>
+        <h1 class="ForewordTitle">Foreword</h1>
+        <pre id="samplecode" class="prettyprint "><br />&#xA0;&#xA0;&#xA0; <br />&#xA0; &lt;xml&gt; &amp;<br /><p class="SourceTitle" align="center">XML code</p></pre>
+      </div>
+      <p class="zzSTDTitle1"></p>
+    </main>
+    OUTPUT
+  end
+
+
+  it "does not lose HTML escapes in postprocessing (Word)" do
+        FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
+    IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <sourcecode id="samplecode">
+    <name>XML code</name>
+  &lt;xml&gt; &amp;
+</sourcecode>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+        word = File.read("test.doc").sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2">').
+      sub(%r{<p class="MsoNormal">\s*<br clear="all" class="section"/>\s*</p>\s*<div class="WordSection3">.*$}m, "")
+    expect(word).to be_equivalent_to <<~"OUTPUT"
+    <div class="WordSection2">
+      <p class="MsoNormal">
+        <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+      </p>
+      <div>
+        <h1 class="ForewordTitle">Foreword</h1>
+        <p class="Sourcecode"><a name="samplecode" id="samplecode"></a><br/>&#xA0;&#xA0;&#xA0; <br/>&#xA0; &lt;xml&gt; &amp;<br/><p class="SourceTitle" align="center">XML code</p></p>
+      </div>
+      <p class="MsoNormal">&#xA0;</p>
+    </div>
+
+    OUTPUT
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.9.17
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath