isodoc 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a6782d0471fb7cd450a7dce15e825e76a86e4f3c8854ddc69faaa648f65974c
-  data.tar.gz: 8062dc310b20e6c1d13a41ac100489dff153be0152a543c20b1aa043093aa72c
+  metadata.gz: 14a2b122e4618bfd1d6ef74231405ad9b28d18bb7a8b812df2381c65f3443ca9
+  data.tar.gz: 47ee8c2b1bc90444256371e188ffec407ca79facafe199684ac8693c1254dd80
 SHA512:
-  metadata.gz: fc34ddc8a06fd1632889c00b4a60641c33f983a5b6c3ac6c18c290992d7a8dee91d3074044513ce3608146488a710fa1a0099a09b2103bcc63355c7e570572be
-  data.tar.gz: f9977b4049756a609cc048e022aa138731182beb53a36be53dfb8a46b7285a48c836fa280782ea95f10d06196c05e6bf5a99a5b02dee0c50b6b190e4f2f74f83
+  metadata.gz: a6d74be6c585040de05deb7aeb5d92ec39651dc5a77f4f210479b77ef9cbb6fb82013ac87dfa77863853132b4026c3946039e79e51aad691243ca8fbfa86c5cf
+  data.tar.gz: '010093e4801400b6308c204cdd9745944def9a405b98934f57f16529e0cd1272cdcaf03ef85befe4acb91392d694161af5a38ea35d67dffeeda2ccede0ea1298'

data/lib/isodoc/function/inline.rb

@@ -22,16 +22,19 @@ module IsoDoc::Function
       out << " &lt;#{node.text}&gt;"
     end
 
+    def prefix_container(container, linkend, _target)
+      l10n(get_anchors[container][:xref] + ", " + linkend)
+    end
+
     def anchor_linkend(node, linkend)
       if node["citeas"].nil? && node["bibitemid"] &&
           get_anchors.has_key?(node["bibitemid"])
-        #return get_anchors[node["bibitemid"]][:xref]
         return get_anchors.dig(node["bibitemid"] ,:xref)
       elsif node["target"] && get_anchors.has_key?(node["target"])
         linkend = get_anchors[node["target"]][:xref]
         container = get_anchors[node["target"]][:container]
         (container && get_note_container_id(node) != container) &&
-          linkend = l10n(get_anchors[container][:xref] + ", " + linkend)
+          linkend = prefix_container(container, linkend, node["target"])
       end
       linkend
     end
@@ -76,10 +79,10 @@ module IsoDoc::Function
 
     def stem_parse(node, out)
       ooml = if node["type"] == "AsciiMath"
-               "#{@openmathdelim}#{node.text}#{@closemathdelim}"
+               "#{@openmathdelim}#{HTMLEntities.new.encode(node.text)}#{@closemathdelim}"
              elsif node["type"] == "MathML" then node.first_element_child.to_s
              else
-               node.text
+               HTMLEntities.new.encode(node.text)
              end
       out.span **{ class: "stem" } do |span|
         span.parent.add_child ooml

data/lib/isodoc/function/to_word_html.rb

@@ -20,9 +20,15 @@ module IsoDoc::Function
         Dir.mkdir(dir) unless File.exists?(dir)
         system "rm -r #{dir}/*"
       end
+      @filename = filename
       [filename, dir]
     end
 
+    def tmpimagedir
+      @filename + @tmpimagedir
+    end
+
+
     # isodoc.css overrides any CSS injected by Html2Doc, which
     # is inserted before this CSS.
     def define_head(html, filename, _dir)

data/lib/isodoc/function/xref_gen.rb

@@ -19,7 +19,7 @@ module IsoDoc::Function
           return if n["id"].nil? || n["id"].empty?
           @anchors[n["id"]] =
             { label: termnote_label(i + 1),
-              #xref: l10n("#{@anchors[t['id']][:xref]}, "\
+              type: "termnote",
               xref: l10n("#{@anchors.dig(t['id'], :xref)}, "\
                          "#{@note_xref_lbl} #{i + 1}") }
         end
@@ -33,7 +33,7 @@ module IsoDoc::Function
           return if n["id"].nil? || n["id"].empty?
           idx = examples.size == 1 ? "" : (i + 1).to_s
           @anchors[n["id"]] = {
-            #label: idx, xref: l10n("#{@anchors[t['id']][:xref]}, "\
+            type: "termexample",
             label: idx, xref: l10n("#{@anchors.dig(t['id'], :xref)}, "\
                                    "#{@note_xref_lbl} #{i + 1}") }
         end
@@ -56,7 +56,7 @@ module IsoDoc::Function
           next if @anchors[n["id"]]
           next if n["id"].nil? || n["id"].empty?
           idx = notes.size == 1 ? "" : " #{i + 1}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @note_xref_lbl)
+          @anchors[n["id"]] = anchor_struct(idx, n, @note_xref_lbl, "note")
         end
         note_anchor_names(s.xpath(ns("./clause | ./appendix")))
       end
@@ -73,7 +73,7 @@ module IsoDoc::Function
           next if @anchors[n["id"]]
           next if n["id"].nil? || n["id"].empty?
           idx = notes.size == 1 ? "" : " #{i + 1}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @example_xref_lbl)
+          @anchors[n["id"]] = anchor_struct(idx, n, @example_xref_lbl, "example")
         end
         example_anchor_names(s.xpath(ns("./clause | ./appendix")))
       end
@@ -86,7 +86,7 @@ module IsoDoc::Function
         notes.each_with_index do |n, i|
           next if n["id"].nil? || n["id"].empty?
           idx = notes.size == 1 ? "" : " #{i + 1}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @list_lbl)
+          @anchors[n["id"]] = anchor_struct(idx, n, @list_lbl, "list")
           list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
         end
         list_anchor_names(s.xpath(ns("./clause | ./appendix")))
@@ -108,6 +108,7 @@ module IsoDoc::Function
         label = "#{prev_label}.#{label}" unless prev_label.empty?
         label = "#{list_anchor[:xref]} #{label}" if refer_list
         li["id"] && @anchors[li["id"]] = { xref: "#{label})",
+                                           type: "listitem",
                                            container: list_anchor[:container] }
         li.xpath(ns("./ol")).each do |ol|
           list_item_anchor_names(ol, list_anchor, depth + 1, label, false)
@@ -137,7 +138,7 @@ module IsoDoc::Function
         end
         label = i.to_s + (j.zero? ? "" : "-#{j}")
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(label, nil, @figure_lbl)
+        @anchors[t["id"]] = anchor_struct(label, nil, @figure_lbl, "figure")
       end
     end
 
@@ -157,24 +158,25 @@ module IsoDoc::Function
       end
     end
 
-    def anchor_struct(lbl, container, elem)
+    def anchor_struct(lbl, container, elem, type)
       ret = {}
       ret[:label] = anchor_struct_label(lbl, elem)
       ret[:xref] = anchor_struct_xref(lbl, elem)
       ret[:xref].gsub!(/ $/, "")
       ret[:container] = get_clause_id(container) unless container.nil?
+      ret[:type] = type
       ret
     end
 
     def sequential_asset_names(clause)
       clause.xpath(ns(".//table")).each_with_index do |t, i|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(i + 1, nil, @table_lbl)
+        @anchors[t["id"]] = anchor_struct(i + 1, nil, @table_lbl, "table")
       end
       sequential_figure_names(clause)
       clause.xpath(ns(".//formula")).each_with_index do |t, i|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(i + 1, t, @formula_lbl)
+        @anchors[t["id"]] = anchor_struct(i + 1, t, @formula_lbl, "formula")
       end
     end
 
@@ -188,19 +190,19 @@ module IsoDoc::Function
         end
         label = "#{num}.#{i}" + (j.zero? ? "" : "-#{j}")
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(label, nil, @figure_lbl)
+        @anchors[t["id"]] = anchor_struct(label, nil, @figure_lbl, "figure")
       end
     end
 
     def hierarchical_asset_names(clause, num)
       clause.xpath(ns(".//table")).each_with_index do |t, i|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct("#{num}.#{i + 1}", nil, @table_lbl)
+        @anchors[t["id"]] = anchor_struct("#{num}.#{i + 1}", nil, @table_lbl, "table")
       end
       hierarchical_figure_names(clause, num)
       clause.xpath(ns(".//formula")).each_with_index do |t, i|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct("#{num}.#{i + 1}", t, @formula_lbl)
+        @anchors[t["id"]] = anchor_struct("#{num}.#{i + 1}", t, @formula_lbl, "formula")
       end
     end
   end

data/lib/isodoc/function/xref_sect_gen.rb

@@ -34,7 +34,7 @@ module IsoDoc::Function
     def preface_names(clause)
       return if clause.nil?
       @anchors[clause["id"]] =
-        { label: nil, level: 1, xref: preface_clause_name(clause) }
+        { label: nil, level: 1, xref: preface_clause_name(clause), type: "clause" }
       clause.xpath(ns("./clause")).each_with_index do |c, i|
         preface_names1(c, c.at(ns("./title"))&.text, "#{preface_clause_name(clause)}, #{i+1}", 2)
       end
@@ -43,7 +43,7 @@ module IsoDoc::Function
     def preface_names1(clause, title, parent_title, level)
       label = title || parent_title
       @anchors[clause["id"]] =
-        { label: nil, level: level, xref: label }
+        { label: nil, level: level, xref: label, type: "clause" }
       clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).
         each_with_index do |c, i|
         preface_names1(c, c.at(ns("./title"))&.text, "#{label} #{i+1}", level + 1)
@@ -71,7 +71,7 @@ module IsoDoc::Function
       return num if clause.nil?
       num = num + 1
       @anchors[clause["id"]] =
-        { label: num.to_s, xref: l10n("#{@clause_lbl} #{num}"), level: lvl }
+        { label: num.to_s, xref: l10n("#{@clause_lbl} #{num}"), level: lvl, type: "clause" }
       clause.xpath(ns("./clause | ./term  | ./terms | ./definitions")).
         each_with_index do |c, i|
         section_names1(c, "#{num}.#{i + 1}", lvl + 1)
@@ -81,7 +81,7 @@ module IsoDoc::Function
 
     def section_names1(clause, num, level)
       @anchors[clause["id"]] =
-        { label: num, level: level, xref: l10n("#{@clause_lbl} #{num}") }
+        { label: num, level: level, xref: l10n("#{@clause_lbl} #{num}"), type: "clause" }
       clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).
         each_with_index do |c, i|
         section_names1(c, "#{num}.#{i + 1}", level + 1)
@@ -95,7 +95,7 @@ module IsoDoc::Function
     end
 
     def annex_names(clause, num)
-      @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
+      @anchors[clause["id"]] = { label: annex_name_lbl(clause, num), type: "clause",
                                  xref: "#{@annex_lbl} #{num}", level: 1 }
       clause.xpath(ns("./clause")).each_with_index do |c, i|
         annex_names1(c, "#{num}.#{i + 1}", 2)
@@ -106,7 +106,7 @@ module IsoDoc::Function
 
     def annex_names1(clause, num, level)
       @anchors[clause["id"]] = { label: num, xref: "#{@annex_lbl} #{num}",
-                                 level: level }
+                                 level: level, type: "clause" }
       clause.xpath(ns("./clause")).each_with_index do |c, i|
         annex_names1(c, "#{num}.#{i + 1}", level + 1)
       end

data/lib/isodoc/headlesshtml_convert.rb

@@ -23,7 +23,7 @@ module IsoDoc
       postprocess(result, filename + ".tmp", dir)
       system "rm -fr #{dir}"
       strip_head(filename + ".tmp.html", outname_html + ".headless.html")
-      system "rm -r #{filename + '.tmp.html'} #{@tmpimagedir}"
+      system "rm -r #{filename + '.tmp.html'} #{tmpimagedir}"
     end
 
     def strip_head(input, output)

data/lib/isodoc/html_function/html.rb

@@ -192,12 +192,12 @@ module IsoDoc::HtmlFunction
 
     # presupposes that the image source is local
     def move_images(docxml)
-      system "rm -r #{@tmpimagedir}; mkdir #{@tmpimagedir}"
+      system "rm -r #{tmpimagedir}; mkdir #{tmpimagedir}"
       docxml.xpath("//*[local-name() = 'img']").each do |i|
         next if /^data:image/.match i["src"]
         matched = /\.(?<suffix>\S+)$/.match i["src"]
         uuid = UUIDTools::UUID.random_create.to_s
-        new_full_filename = File.join(@tmpimagedir, "#{uuid}.#{matched[:suffix]}")
+        new_full_filename = File.join(tmpimagedir, "#{uuid}.#{matched[:suffix]}")
         move_image1(i, new_full_filename)
       end
       docxml

data/lib/isodoc/pdf_convert.rb

@@ -28,7 +28,7 @@ module IsoDoc
       postprocess(result, filename, dir)
       system "rm -fr #{dir}"
       ::Metanorma::Output::Pdf.new.convert(filename + ".html", outname_html + ".pdf")
-      system "rm -r #{filename + '.html'} #{@tmpimagedir}"
+      system "rm -r #{filename + '.html'} #{tmpimagedir}"
     end
   end
 end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.9.0".freeze
+  VERSION = "0.9.1".freeze
 end

data/spec/isodoc/inline_spec.rb

@@ -94,7 +94,7 @@ RSpec.describe IsoDoc do
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <p>
-    <stem type="AsciiMath">A</stem>
+    <stem type="AsciiMath">&lt;A&gt;</stem>
     <stem type="MathML"><m:math><m:row>X</m:row></m:math></stem>
     <stem type="None">Latex?</stem>
     </p>
@@ -107,7 +107,7 @@ RSpec.describe IsoDoc do
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p>
-       <span class="stem">(#(A)#)</span>
+       <span class="stem">(#(&lt;A&gt;)#)</span>
        <span class="stem"><m:math>
          <m:row>X</m:row>
        </m:math></span>

data/spec/isodoc/postproc_spec.rb

@@ -468,7 +468,7 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
 
   it "moves images in HTML" do
     system "rm -f test.html"
-    system "rm -rf _images"
+    system "rm -rf test_images"
     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>
@@ -483,16 +483,16 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
     INPUT
     html = File.read("test.html").sub(/^.*<main class="main-section">/m, '<main class="main-section">').
       sub(%r{</main>.*$}m, "</main>")
-    expect(`ls _images`).to match(/\.png$/)
+    expect(`ls test_images`).to match(/\.png$/)
     expect(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png")).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>
                <div id="_" class="figure">
-               <img src="_images/_.png" height="776" width="922" />
-<img src="_images/_.png" height="800" width="53" />
-<img src="_images/_.png" height="83" width="99" />
+               <img src="test_images/_.png" height="776" width="922" />
+<img src="test_images/_.png" height="800" width="53" />
+<img src="test_images/_.png" height="83" width="99" />
        <p class="FigureTitle" align="center">Figure 1&#xA0;&#x2014; Split-it-right sample divider</p></div>
              </div>
              <p class="zzSTDTitle1"></p>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2018-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath