isodoc 0.4.0 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0679d357232b392889d42dff130949b390726397'
-  data.tar.gz: 1c5eb12db5f8c9b1cb29802a5a538bf66dbb8ea9
+  metadata.gz: 92ad102a0e0bc53916aaec5d7a4f23d71828f3d4
+  data.tar.gz: 7dbbd1969e0e1714c9074ac455a335939f634335
 SHA512:
-  metadata.gz: e4fe6d944d1cd243db21b7faca859d7658f22fa8ae5076d31920ef3f979e5804e10a57da7073cbf54a2366fa9b4ac0261aa3289cb146905ebf9e74c7c13e6808
-  data.tar.gz: 1d0fcdd12674101553cac3a3834a787179000933a22ce07365c6c820557d4c763c17060d2e9cde04039d86a18bc948f6a35bf5975896de500474a5ad6637f9a0
+  metadata.gz: 1b570dec93a170716366cf0d433d20dc614026ebe2224b02e659216fccf006b1680a1126e763a953f8d61c8154a0c9b133dfd989b05e25e675b5b3aa1f10d980
+  data.tar.gz: b9499b701f2eaca4a27d71ff85ff27926bd58e43a2b255dd429180eaf8b8c72704f8ba3768b2eb894f41128136f887308e6f2a29e89c000b7f02cf2dcb391e51

data/README.adoc

@@ -1,5 +1,10 @@
 = isodoc
 
+
+image:https://img.shields.io/gem/v/isodoc.svg["Gem Version", link="https://rubygems.org/gems/isodoc"]
+image:https://img.shields.io/travis/riboseinc/asciidoctor-iso/master.svg["Build Status", link="https://travis-ci.org/riboseinc/isodoc"]
+image:https://codeclimate.com/github/riboseinc/isodoc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/isodoc"]
+
 This Gem converts documents in the https://github.com/riboseinc/isodoc-models[ISODoc document model] into HTML and Microsoft Word.
 
 The Gem is a class called with a hash of file locations:

data/isodoc.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
   spec.add_dependency "html2doc"
+  spec.add_dependency "liquid"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"

data/lib/isodoc.rb

@@ -20,6 +20,7 @@ require_relative "isodoc/blocks"
 require_relative "isodoc/lists"
 require_relative "isodoc/table"
 require_relative "isodoc/inline"
+require_relative "isodoc/notes"
 require_relative "isodoc/xref_gen"
 require_relative "isodoc/html"
 require "pp"
@@ -50,9 +51,11 @@ module IsoDoc
       @sourcecode = false
       @anchors = {}
       @meta = {}
+      init_metadata
       @footnotes = []
       @comments = []
       @in_footnote = false
+      @in_comment = false
       @in_table = false
       @in_figure = false
       @seen_footnote = Set.new
@@ -64,6 +67,7 @@ module IsoDoc
       docxml.root.default_namespace = ""
       result = noko do |xml|
         xml.html do |html|
+          html.parent.add_namespace("epub", "http://www.idpf.org/2007/ops")
           html_header(html, docxml, filename, dir)
           make_body(html, docxml)
         end

data/lib/isodoc/blocks.rb

@@ -80,6 +80,16 @@ module IsoDoc
       @in_figure = false
     end
 
+        def example_parse(node, out)
+      name = node.at(ns("./name"))
+      out.div **attr_code(id: node["id"], class: "figure") do |div|
+        node.children.each do |n|
+          parse(n, div) unless n.name == "name"
+        end
+        figure_name_parse(node, div, name) if name
+      end
+    end
+
     def sourcecode_name_parse(node, div, name)
       div.p **{ class: "FigureTitle", align: "center" } do |p|
         p.b do |b|
@@ -109,13 +119,18 @@ module IsoDoc
     def admonition_parse(node, out)
       name = node["type"]
       out.div **{ class: "Admonition" } do |t|
-        t.p.b { |b| b << name.upcase } if name
+        t.title { |b| b << name.upcase } if name
         node.children.each do |n|
           parse(n, t)
         end
       end
     end
 
+    def formula_where(dl, out)
+             out.p { |p| p << "where" }
+        parse(dl, out)
+    end
+
     def formula_parse(node, out)
       dl = node.at(ns("./dl"))
       out.div **attr_code(id: node["id"], class: "formula") do |div|
@@ -123,17 +138,15 @@ module IsoDoc
         insert_tab(div, 1)
         div << "(#{get_anchors()[node['id']][:label]})"
       end
-      if dl
-        out.p { |p| p << "where" }
-        parse(dl, out) 
-      end
+        formula_where(dl, out) if dl
     end
 
     def para_attrs(node)
       classtype = nil
       classtype = "Note" if @note
-      classtype = "MsoFootnoteText" if in_footnote
-      attrs = { class: classtype }
+      # classtype = "MsoFootnoteText" if in_footnote
+      classtype = "MsoCommentText" if in_comment
+      attrs = { class: classtype, id: node["id"] }
       unless node["align"].nil?
         attrs[:align] = node["align"] unless node["align"] == "justify"
         attrs[:style] = "text-align:#{node["align"]}"
@@ -152,15 +165,18 @@ module IsoDoc
     end
 
     def quote_attribution(node, out)
-      author = node.at(ns("./author/fullname/"))
+      author = node.at(ns("./author"))
       source = node.at(ns("./source"))
-      # TODO implement
+      out.p **{ class: "QuoteAttribution" } do |p|
+        p << "&mdash; #{author.text}, " if author
+        eref_parse(source, p)
+      end
     end
 
     def quote_parse(node, out)
       attrs = para_attrs(node)
       attrs[:class] = "Quote"
-      out.p **attr_code(attrs) do |p|
+      out.div **attr_code(attrs) do |p|
         node.children.each do 
           |n| parse(n, p) unless ["author", "source"].include? n.name
         end

data/lib/isodoc/cleanup.rb

@@ -11,9 +11,18 @@ module IsoDoc
       inline_header_cleanup(docxml)
       figure_cleanup(docxml)
       table_cleanup(docxml)
+      admonition_cleanup(docxml)
       docxml
     end
 
+    def admonition_cleanup(docxml)
+      docxml.xpath("//div[@class = 'Admonition'][title]").each do |d|
+        title = d.at("./title")
+        n = title.next_element
+        n&.children&.first&.add_previous_sibling(title.text + "—")
+      end
+    end
+
     def figure_get_or_make_dl(t)
       dl = t.at(".//dl")
       if dl.nil?
@@ -29,8 +38,8 @@ module IsoDoc
 
     def figure_aside_process(f, aside, key)
       # get rid of footnote link, it is in diagram
-      f.at("./a[@class='zzFootnote']").remove
-      fnref = f.at(".//a[@class='zzFootnote']")
+      f.at("./a[@class='TableFootnoteRef']").remove
+      fnref = f.at(".//a[@class='TableFootnoteRef']")
       dt = key.add_child("<dt></dt>").first
       dd = key.add_child("<dd></dd>").first
       fnref.parent = dt
@@ -64,26 +73,15 @@ module IsoDoc
       end
     end
 
-    def comment_cleanup(docxml)
-      docxml.xpath('//div/span[@style="MsoCommentReference"]').
-        each do |x|
-        prev = x.previous_element
-        x.parent = prev unless prev.nil?
-      end
-      docxml
-    end
-
     def footnote_cleanup(docxml)
-      docxml.xpath('//div[@style="mso-element:footnote"]/a').
-        each do |x|
-        n = x.next_element
-        n&.children&.first&.add_previous_sibling(x.remove)
+      docxml.xpath('//a[@epub:type = "footnote"]/sup').each_with_index do |x, i|
+        x.content = (i + 1).to_s
       end
       docxml
     end
 
     def merge_fnref_into_fn_text(a)
-      fn = a.at('.//a[@class="zzFootnote"]')
+      fn = a.at('.//a[@class="TableFootnoteRef"]')
       n = fn.next_element
       n&.children&.first&.add_previous_sibling(fn.remove)
     end
@@ -113,7 +111,6 @@ module IsoDoc
         t.add_child("<tfoot></tfoot>")
         tfoot = t.at(".//tfoot")
       else
-        # nuke its bottom border
         tfoot.xpath(".//td | .//th").each { |td| remove_bottom_border(td) }
       end
       tfoot
@@ -135,10 +132,14 @@ module IsoDoc
       docxml.xpath("//table[div[@class = 'Note']]").each do |t|
         tfoot = table_get_or_make_tfoot(t)
         insert_here = new_fullcolspan_row(t, tfoot)
-        t.xpath("div[@class = 'Note']").each do |d|
-          d.parent = insert_here
-        end
+        t.xpath("div[@class = 'Note']").each { |d| d.parent = insert_here }
       end
+      # preempt html2doc putting MsoNormal there
+      docxml.xpath("//p[not(self::*[@class])]"\
+                   "[ancestor::*[@class = 'Note']]").each do |p|
+        p["class"] = "Note"
+      end
+
     end
 
     def table_cleanup(docxml)

data/lib/isodoc/html.rb

@@ -2,13 +2,18 @@ module IsoDoc
   class Convert
 
     def toHTML(result, filename)
-      result = htmlPreface(htmlstyle(Nokogiri::HTML(result))).to_xml
-      result = populate_template(result)
+      # result = html_cleanup(Nokogiri::HTML(result)).to_xml
+      result = from_xhtml(html_cleanup(to_xhtml(result)))
+      result = populate_template(result, :html)
       File.open("#{filename}.html", "w") do |f|
         f.write(result)
       end
     end
 
+    def html_cleanup(x)
+      footnote_backlinks(move_images(html_footnote_filter(htmlPreface(htmlstyle(x)))))
+    end
+
     def htmlPreface(docxml)
       cover = Nokogiri::HTML(File.read(@htmlcoverpage, encoding: "UTF-8"))
       d = docxml.at('//div[@class="WordSection1"]')
@@ -39,5 +44,56 @@ module IsoDoc
       end
       docxml
     end
+
+    def update_footnote_filter(docxml, x, i, seen)
+      fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || return
+      if seen[fn.text]
+        x.at("./sup").content = seen[fn.text][:num].to_s
+        fn.remove unless x["href"] == seen[fn.text][:href]
+        x["href"] = seen[fn.text][:href]
+      else
+        seen[fn.text] = { num: i, href: x["href"] }
+        x.at("./sup").content = i.to_s
+        i += 1
+      end
+      [i, seen]
+    end
+
+    def html_footnote_filter(docxml)
+      seen = {}
+      i = 1
+      docxml.xpath('//a[@epub:type = "footnote"]').each do |x|
+        i, seen = update_footnote_filter(docxml, x, i, seen)
+      end
+      docxml
+    end
+
+    def footnote_backlinks(docxml)
+      seen = {}
+      docxml.xpath('//a[@epub:type = "footnote"]').each_with_index do |x, i|
+        next if seen[x["href"]]
+        seen[x["href"]] = true
+        sup = x.at("./sup").text
+        fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
+        x["id"] || x["id"] = "_footnote#{i + 1}"
+        fn.elements.first.children.first.
+          add_previous_sibling("<a href='##{x['id']}'>#{sup}) </a>")
+      end
+      docxml
+    end
+
+    def move_images(docxml)
+      system "rm -r _images; mkdir _images"
+      docxml.xpath("//*[local-name() = 'img']").each do |i|
+        matched = /\.(?<suffix>\S+)$/.match i["src"]
+        uuid = UUIDTools::UUID.random_create.to_s
+        new_full_filename = File.join("_images", "#{uuid}.#{matched[:suffix]}")
+        # presupposes that the image source is local
+        system "cp #{i['src']} #{new_full_filename}"
+        i["src"] = new_full_filename
+        i["width"], i["height"] = Html2Doc.image_resize(i, 800, 1200)
+      end
+      docxml
+    end
   end
 end

data/lib/isodoc/inline.rb

@@ -2,11 +2,6 @@ require "uuidtools"
 
 module IsoDoc
   class Convert
-
-    def in_footnote
-      @in_footnote
-    end
-
     def section_break(body)
       body.br **{ clear: "all", class: "section" }
     end
@@ -30,35 +25,46 @@ module IsoDoc
 
     def get_linkend(node)
       linkend = node["target"] || node["citeas"]
-      if get_anchors().has_key? node["target"]
+      get_anchors().has_key?(node["target"]) &&
         linkend = get_anchors()[node["target"]][:xref]
-      end
       if node["citeas"].nil? && get_anchors().has_key?(node["bibitemid"])
         linkend = get_anchors()[node["bibitemid"]][:xref]
       end
+      linkend += eref_localities(node.xpath(ns("./locality"))) 
       text = node.children.select { |c| c.text? && !c.text.empty? }
       linkend = text.join(" ") unless text.nil? || text.empty?
       # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
-      # <locality type="section">3.1</locality></origin>
+      # <locality type="section"><reference>3.1</reference></locality></origin>
       linkend
     end
 
     def xref_parse(node, out)
       linkend = get_linkend(node)
-      out.a **{ "href": node["target"] } { |l| l << linkend }
+      out.a **{ "href": "#" + node["target"] } { |l| l << linkend }
+    end
+
+    def eref_localities(r)
+      ret = ""
+      r.each do |r|
+        if r["type"] == "whole"
+          ret += ", Whole of text"
+        else
+          ret += ", #{r["type"].capitalize}"
+          ref = r.at(ns("./reference"))
+          ret += " #{ref.text}" if ref
+        end
+      end
+      ret
     end
 
     def eref_parse(node, out)
       linkend = get_linkend(node)
-      section = node.at(ns("./locality"))
-      section.nil? or
-        linkend += ", #{section["type"].capitalize} #{section.text}"
       if node["type"] == "footnote"
         out.sup do |s|
-          s.a **{ "href": node["bibitemid"] } { |l| l << linkend }
+          s.a **{ "href": "#" + node["bibitemid"] } { |l| l << linkend }
         end
       else
-        out.a **{ "href": node["bibitemid"] } { |l| l << linkend }
+        out.a **{ "href": "#" + node["bibitemid"] } { |l| l << linkend }
       end
     end
 
@@ -68,144 +74,21 @@ module IsoDoc
              else
                node.text
              end
-        out.span **{ class: "stem" } do |span|
-          span.parent.add_child ooml
-        end
-      end
-
-      def pagebreak_parse(node, out)
-        attrs = { clear: all, class: "pagebreak" }
-        out.br **attrs
-      end
-
-      def error_parse(node, out)
-        text = node.to_xml.gsub(/</, "&lt;").gsub(/>/, "&gt;")
-        out.para do |p|
-          p.b **{ role: "strong" } { |e| e << text }
-        end
-      end
-
-      def footnotes(div)
-        return if @footnotes.empty?
-        div.div **{ style: "mso-element:footnote-list" } do |div1|
-          @footnotes.each do |fn|
-            div1.parent << fn
-          end
-        end
-      end
-
-      def footnote_attributes(fn, is_footnote)
-        style = nil
-        style = "mso-footnote-id:ftn#{fn}" if is_footnote
-        { style: style,
-          href: "#_ftn#{fn}",
-          name: "_ftnref#{fn}",
-          title: "",
-          class: "zzFootnote" }
-      end
-
-      def make_footnote_link(a, fnid, fnref, is_footnote)
-        a.span **{ class: "MsoFootnoteReference" } do |s|
-          if is_footnote
-            s.span **{ style: "mso-special-character:footnote" }
-          else
-            s.a **{href: fnid} { a << fnref }
-          end
-        end
-      end
-
-      def make_footnote_target(a, fnid, fnref, is_footnote)
-        a.span **{ class: "MsoFootnoteReference" } do |s|
-          if is_footnote
-            s.span **{ style: "mso-special-character:footnote" }
-          else
-            s.a **{name: fnid} { a << fnref }
-          end
-        end
-      end
-
-      def make_footnote_text(node, fnid, fnref, is_footnote)
-        attrs = { style: "mso-element:footnote", id: "ftn#{fnid}" }
-        attrs[:style] = nil unless is_footnote
-        noko do |xml|
-          xml.div **attr_code(attrs) do |div|
-            div.a **footnote_attributes(fnid, is_footnote) do |a|
-              make_footnote_target(a, fnid, fnref, is_footnote)
-              insert_tab(a, 1) unless is_footnote
-            end
-            node.children.each { |n| parse(n, div) }
-          end
-        end.join("\n")
-      end
-
-      def get_table_ancestor_id(node)
-        table = node.ancestors("table") || node.ancestors("figure")
-        return UUIDTools::UUID.random_create.to_s if table.empty?
-        table.last["id"]
-      end
-
-      def table_footnote_parse(node, out)
-        fn = node["reference"]
-        tid = get_table_ancestor_id(node)
-        out.a **footnote_attributes(tid + fn, false) do |a|
-          make_footnote_link(a, tid + fn, fn, false)
-        end
-        # do not output footnote text if we have already seen it for this table
-        return if @seen_footnote.include?(tid + fn)
-        @in_footnote = true
-        out.aside { |a| a << make_footnote_text(node, tid + fn, fn, false) }
-        @in_footnote = false
-        @seen_footnote << (tid + fn)
-      end
-
-      def footnote_parse(node, out)
-        return table_footnote_parse(node, out) if @in_table || @in_figure
-        fn = node["reference"]
-        out.a **footnote_attributes(fn, true) do |a|
-          make_footnote_link(a, nil, nil, true)
-        end
-        @in_footnote = true
-        @footnotes << make_footnote_text(node, fn, fn, true)
-        @in_footnote = false
-      end
-
-      def comments(div)
-        return if @comments.empty?
-        div.div **{ style: "mso-element:comment-list" } do |div1|
-          @comments.each do |fn|
-            div1.parent << fn
-          end
-        end
-      end
-
-      def make_comment_link(out, fn, date, from)
-        out.span **{ style: "MsoCommentReference" } do |s1|
-          s1.span **{ lang: "EN-GB", style: "font-size:9.0pt"} do |s2|
-            s2.a **{ style: "mso-comment-reference:SMC_#{fn};"\
-                     "mso-comment-date:#{date}" } if from
-            s2.span **{ style: "mso-special-character:comment" } do |s|
-              s << "&nbsp;"
-            end
-          end
-        end
+      out.span **{ class: "stem" } do |span|
+        span.parent.add_child ooml
       end
+    end
 
-      def make_comment_text(node, fn)
-        noko do |xml|
-          xml.div **{ style: "mso-element:comment" } do |div|
-            div.span **{ style: %{mso-comment-author:"#{node["reviewer"]}"} }
-            div.p **{ class: "MsoCommentText" } do |p|
-              make_comment_link(p, fn, node["date"], false)
-              node.children.each { |n| parse(n, p) }
-            end
-          end
-        end.join("\n")
-      end
+    def pagebreak_parse(node, out)
+      attrs = { clear: all, class: "pagebreak" }
+      out.br **attrs
+    end
 
-      def review_note_parse(node, out)
-        fn = @comments.length + 1
-        make_comment_link(out, fn, node["date"], true)
-        @comments << make_comment_text(node, fn)
+    def error_parse(node, out)
+      text = node.to_xml.gsub(/</, "&lt;").gsub(/>/, "&gt;")
+      out.para do |p|
+        p.b **{ role: "strong" } { |e| e << text }
       end
+    end
   end
 end

data/lib/isodoc/iso2wordhtml.rb

@@ -22,8 +22,7 @@ module IsoDoc
 
     def make_body1(body, docxml)
       body.div **{ class: "WordSection1" } do |div1|
-# placeholder
-        div1.p { |p| p << "&nbsp;" }
+        div1.p { |p| p << "&nbsp;" } # placeholder
       end
       section_break(body)
     end
@@ -31,6 +30,7 @@ module IsoDoc
     def make_body2(body, docxml)
       body.div **{ class: "WordSection2" } do |div2|
         info docxml, div2
+        div2.p { |p| p << "&nbsp;" } # placeholder
       end
       section_break(body)
     end
@@ -49,6 +49,7 @@ module IsoDoc
       subtitle isoxml, out
       id isoxml, out
       author isoxml, out
+      bibdate isoxml, out
       version isoxml, out
       foreword isoxml, out
       introduction isoxml, out
@@ -77,11 +78,16 @@ module IsoDoc
     end
 
     def text_parse(node, out)
+      return if node.nil? || node.text.nil?
       text = node.text
-      text.gsub!("\n", "<br/>").gsub!(" ", "&nbsp;") if in_sourcecode
+      text = text.gsub("\n", "<br/>").gsub(" ", "&nbsp;") if in_sourcecode
       out << text
     end
 
+    def bookmark_parse(node, out)
+      out.a **attr_code(id: node["id"])
+    end
+
     def parse(node, out)
       if node.text?
         text_parse(node, out)
@@ -96,6 +102,7 @@ module IsoDoc
         when "smallcap" then smallcap_parse(node, out)
         when "br" then out.br
         when "hr" then out.hr
+        when "bookmark" then bookmark_parse(node, out)
         when "pagebreak" then pagebreak_parse(node, out)
         when "callout" then callout_parse(node, out)
         when "stem" then stem_parse(node, out)
@@ -119,6 +126,7 @@ module IsoDoc
         when "formula" then formula_parse(node, out)
         when "table" then table_parse(node, out)
         when "figure" then figure_parse(node, out)
+        when "example" then example_parse(node, out)
         when "image" then image_parse(node["src"], out, nil)
         when "sourcecode" then sourcecode_parse(node, out)
         when "annotation" then annotation_parse(node, out)

data/lib/isodoc/metadata.rb

@@ -3,6 +3,19 @@ require "htmlentities"
 module IsoDoc
   class Convert
 
+    def init_metadata
+      @meta = {
+        tc: "XXXX",
+        sc: "XXXX",
+        wg: "XXXX",
+        editorialgroup: [],
+        secretariat: "XXXX",
+      }
+      %w{published accessed created activated obsoleted}.each do |w|
+        @meta["#{w}date".to_sym] = "XXX"
+      end
+    end
+
     def get_metadata
       @meta
     end
@@ -11,22 +24,64 @@ module IsoDoc
       @meta[key] = value
     end
 
-    def author(isoxml, _out)
-      # tc = isoxml.at(ns("//technical-committee"))
-      tc_num = isoxml.at(ns("//technical-committee/@number"))
-      # sc = isoxml.at(ns("//subcommittee"))
-      sc_num = isoxml.at(ns("//subcommittee/@number"))
-      # wg = isoxml.at(ns("//workgroup"))
-      wg_num = isoxml.at(ns("//workgroup/@number"))
-      secretariat = isoxml.at(ns("//secretariat"))
-      set_metadata(:tc, "XXXX")
-      set_metadata(:sc, "XXXX")
-      set_metadata(:wg, "XXXX")
-      set_metadata(:secretariat, "XXXX")
-      set_metadata(:tc,  tc_num.text) if tc_num
-      set_metadata(:sc, sc_num.text) if sc_num
-      set_metadata(:wg, wg_num.text) if wg_num
-      set_metadata(:secretariat, secretariat.text) if secretariat
+    def author(xml, _out)
+      tc(xml)
+      sc(xml)
+      wg(xml)
+      secretariat(xml)
+      agency(xml)
+    end
+
+    def tc(xml)
+      tc_num = xml.at(ns("//editorialgroup/technical-committee/@number"))
+      tc_type = xml.at(ns("//editorialgroup/technical-committee/@type"))&.
+        text || "TC"
+      if tc_num
+        tcid = "#{tc_type} #{tc_num.text}"
+        set_metadata(:tc,  tcid)
+        set_metadata(:editorialgroup, get_metadata[:editorialgroup] << tcid)
+      end
+    end
+
+    def sc(xml)
+      sc_num = xml.at(ns("//editorialgroup/subcommittee/@number"))
+      sc_type = xml.at(ns("//editorialgroup/subcommittee/@type"))&.text || "SC"
+      if sc_num
+        scid = "#{sc_type} #{sc_num.text}"
+        set_metadata(:sc, scid)
+        set_metadata(:editorialgroup, get_metadata[:editorialgroup] << scid)
+      end
+    end
+
+    def wg(xml)
+      wg_num = xml.at(ns("//editorialgroup/workgroup/@number"))
+      wg_type = xml.at(ns("//editorialgroup/workgroup/@type"))&.text || "WG"
+      if wg_num
+        wgid =  "#{wg_type} #{wg_num.text}"
+        set_metadata(:wg, wgid)
+        set_metadata(:editorialgroup, get_metadata[:editorialgroup] << wgid)
+      end
+    end
+
+    def secretariat(xml)
+      sec = xml.at(ns("//editorialgroup/secretariat"))
+      set_metadata(:secretariat, sec.text) if sec
+    end
+
+    def bibdate(isoxml, _out)
+      isoxml.xpath(ns("//bibdata/date")).each do |d|
+        set_metadata("#{d["type"]}date".to_sym, d.text)
+      end
+    end
+
+    def agency(xml)
+      agency = ""
+      pub = xml.xpath(ns("//bibdata/contributor"\
+                         "[xmlns:role/@type = 'publisher']/"\
+                         "organization/name")).each do |org|
+        agency = org.text == "ISO" ? "ISO/#{agency}" : "#{agency}#{org.text}/"
+      end
+      set_metadata(:agency, agency.sub(%r{/$}, ""))
     end
 
     def id(isoxml, _out)
@@ -66,33 +121,41 @@ module IsoDoc
       set_metadata(:draftinfo, draftinfo(draft, revdate))
     end
 
+    def part_label(lang)
+      case lang
+      when "en" then "Part"
+      when "fr" then "Part"
+      end
+    end
 
-    def compose_title(main, intro, part, partnumber)
+    def compose_title(main, intro, part, partnum, lang)
       c = HTMLEntities.new
       main = c.encode(main.text, :hexadecimal)
       intro &&
         main = "#{c.encode(intro.text, :hexadecimal)}&nbsp;&mdash; #{main}"
-      part &&
-        main = "#{main}&nbsp;&mdash; Part&nbsp;#{partnumber}: "\
-        "#{c.encode(part.text, :hexadecimal)}"
+      if part
+        suffix = c.encode(part.text, :hexadecimal)
+        suffix = "#{part_label(lang)}&nbsp;#{partnum}: " + suffix if partnum
+        main = "#{main}&nbsp;&mdash; #{suffix}"
+      end
       main
     end
 
     def title(isoxml, _out)
-      intro = isoxml.at(ns("//title[@language='en']/title-intro"))
-      main = isoxml.at(ns("//title[@language='en']/title-main"))
-      part = isoxml.at(ns("//title[@language='en']/title-part"))
-      partnumber = isoxml.at(ns("//id/project-number/@part"))
-      main = compose_title(main, intro, part, partnumber)
+      intro = isoxml.at(ns("//title-intro[@language='en']"))
+      main = isoxml.at(ns("//title-main[@language='en']"))
+      part = isoxml.at(ns("//title-part[@language='en']"))
+      partnumber = isoxml.at(ns("//project-number/@part"))
+      main = compose_title(main, intro, part, partnumber, "en")
       set_metadata(:doctitle, main)
     end
 
     def subtitle(isoxml, _out)
-      intro = isoxml.at(ns("//title[@language='fr']/title-intro"))
-      main = isoxml.at(ns("//title[@language='fr']/title-main"))
-      part = isoxml.at(ns("//title[@language='fr']/title-part"))
-      partnumber = isoxml.at(ns("//id/project-number/@part"))
-      main = compose_title(main, intro, part, partnumber)
+      intro = isoxml.at(ns("//title-intro[@language='fr']"))
+      main = isoxml.at(ns("//title-main[@language='fr']"))
+      part = isoxml.at(ns("//title-part[@language='fr']"))
+      partnumber = isoxml.at(ns("//project-number/@part"))
+      main = compose_title(main, intro, part, partnumber, "fr")
       set_metadata(:docsubtitle, main)
     end
   end

data/lib/isodoc/notes.rb

@@ -0,0 +1,218 @@
+require "uuidtools"
+
+module IsoDoc
+  class Convert
+    def in_footnote
+      @in_footnote
+    end
+
+    def in_comment
+      @in_comment
+    end
+
+    def footnotes(div)
+      return if @footnotes.empty?
+      @footnotes.each { |fn| div.parent << fn }
+    end
+
+    def make_table_footnote_link(out, fnid, fnref)
+      attrs = { href: "##{fnid}", class: "TableFootnoteRef" }
+      out.a **attrs do |a|
+        a << fnref
+      end
+    end
+
+    def make_table_footnote_target(out, fnid, fnref)
+      attrs = { id: fnid, class: "TableFootnoteRef" }
+      out.a **attrs do |a|
+        a << fnref
+        insert_tab(a, 1)
+      end
+    end
+
+    def make_table_footnote_text(node, fnid, fnref)
+      attrs = { id: "ftn#{fnid}" }
+      noko do |xml|
+        xml.div **attr_code(attrs) do |div|
+          make_table_footnote_target(div, fnid, fnref)
+          node.children.each { |n| parse(n, div) }
+        end
+      end.join("\n")
+    end
+
+    def make_generic_footnote_text(node, fnid, fn_ref)
+      noko do |xml|
+        xml.aside **{ id: "ftn#{fnid}" } do |div|
+          node.children.each { |n| parse(n, div) }
+        end
+      end.join("\n")
+    end
+
+    def get_table_ancestor_id(node)
+      table = node.ancestors("table") || node.ancestors("figure")
+      return UUIDTools::UUID.random_create.to_s if table.empty?
+      table.last["id"]
+    end
+
+    def table_footnote_parse(node, out)
+      fn = node["reference"]
+      tid = get_table_ancestor_id(node)
+      make_table_footnote_link(out, tid + fn, fn)
+      # do not output footnote text if we have already seen it for this table
+      return if @seen_footnote.include?(tid + fn)
+      @in_footnote = true
+      out.aside { |a| a << make_table_footnote_text(node, tid + fn, fn) }
+      @in_footnote = false
+      @seen_footnote << (tid + fn)
+    end
+
+    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|
+        a.sup { |sup| sup << fn }
+      end
+      return if @seen_footnote.include?(fn) 
+      @in_footnote = true
+      @footnotes << make_generic_footnote_text(node, fn, fn)
+      @in_footnote = false
+      @seen_footnote << fn
+    end
+
+    def comments(div)
+      return if @comments.empty?
+      div.div **{ style: "mso-element:comment-list" } do |div1|
+        @comments.each { |fn| div1.parent << fn }
+      end
+    end
+
+    def review_note_parse(node, out)
+      fn = @comments.length + 1
+      make_comment_link(out, fn, node)
+      @in_comment = true
+      @comments << make_comment_text(node, fn)
+      @in_comment = false
+    end
+
+    # add in from and to links to move the comment into place
+    def make_comment_link(out, fn, node)
+      out.span **{ style: "MsoCommentReference", target: fn,
+                   class: "commentLink", from: node['from'],
+                   to: node['to']} do |s1|
+                     s1.span **{ lang: "EN-GB", style: "font-size:9.0pt"} do |s2|
+                       s2.a **{ style: "mso-comment-reference:SMC_#{fn};"\
+                                "mso-comment-date:#{node['date']}"}
+                       s2.span **{ style: "mso-special-character:comment",
+                                   target: fn } # do |s|
+                       #s << "&nbsp;"
+                       #end
+                     end
+                   end
+    end
+
+    def make_comment_target(out)
+      out.span **{ style: "MsoCommentReference" } do |s1|
+        s1.span **{ lang: "EN-GB", style: "font-size:9.0pt"} do |s2|
+          s2.span **{ style: "mso-special-character:comment" } # do |s|
+          # s << "&nbsp;"
+          # end
+        end
+      end
+    end
+
+    def make_comment_text(node, fn)
+      noko do |xml|
+        xml.div **{ style: "mso-element:comment", id: fn } do |div|
+          div.span **{ style: %{mso-comment-author:"#{node["reviewer"]}"} }
+          make_comment_target(div)
+          node.children.each { |n| parse(n, div) }
+        end
+      end.join("\n")
+    end
+
+    def comment_cleanup(docxml)
+      move_comment_link_to_from(docxml)
+      reorder_comments_by_comment_link(docxml)
+      embed_comment_in_comment_list(docxml)
+    end
+
+    COMMENT_IN_COMMENT_LIST =
+      '//div[@style="mso-element:comment-list"]//'\
+      'span[@style="MsoCommentReference"]'
+
+    def embed_comment_in_comment_list(docxml)
+      docxml.xpath(COMMENT_IN_COMMENT_LIST).each do |x|
+        n = x.next_element
+        n&.children&.first&.add_previous_sibling(x.remove)
+      end
+      docxml
+    end
+
+    def move_comment_link_to_from1(x, fromlink, docxml)
+      x.remove
+      link = x.at(".//a")
+      fromlink.replace(x)
+      link.children = fromlink
+    end
+
+    def comment_attributes(docxml, x)
+      fromlink = docxml.at("//*[@id='#{x["from"]}']")
+      return(nil) if fromlink.nil?
+      tolink = docxml.at("//*[@id='#{x["to"]}']") || fromlink
+      target = docxml.at("//*[@id='#{x["target"]}']")
+      { from: fromlink, to: tolink, target: target }
+    end
+
+    def wrap_comment_cont(from, target)
+      s = from.replace("<span style='mso-comment-continuation:#{target}'>")
+      s.first.children = from
+    end
+
+    def skip_comment_wrap(from)
+      from["style"] != "mso-special-character:comment"
+    end
+
+    def insert_comment_cont(from, to, target, docxml)
+      # includes_to = from.at(".//*[@id='#{to}']")
+      while !from.nil? && from["id"] != to
+        following = from.xpath("./following::*")
+        (from = following.shift) && incl_to = from.at(".//*[@id='#{to}']")
+        while !incl_to.nil? && !from.nil? && skip_comment_wrap(from)
+          (from = following.shift) && incl_to = from.at(".//*[@id='#{to}']")
+        end
+        wrap_comment_cont(from, target) if !from.nil?
+      end
+    end
+
+    def move_comment_link_to_from(docxml)
+      docxml.xpath('//span[@style="MsoCommentReference"][@from]').each do |x|
+        attrs = comment_attributes(docxml, x) || next
+        move_comment_link_to_from1(x, attrs[:from], docxml)
+        insert_comment_cont(attrs[:from], x["to"], x["target"], docxml)
+      end
+    end
+
+    def get_comments_from_text(docxml, link_order)
+      comments = []
+      docxml.xpath("//div[@style='mso-element:comment']").each do |c|
+        next unless c["id"] && !link_order[c["id"]].nil?
+        comments << { text: c.remove.to_s, id: c["id"] }
+      end
+      comments.sort! { |a, b| link_order[a[:id]] <=> link_order[b[:id]] }
+      comments
+    end
+
+    COMMENT_TARGET_XREFS =
+      "//span[@style='mso-special-character:comment']/@target"
+
+    def reorder_comments_by_comment_link(docxml)
+      link_order = {}
+      docxml.xpath(COMMENT_TARGET_XREFS).each_with_index do |target, i|
+        link_order[target.value] = i
+      end
+      comments = get_comments_from_text(docxml, link_order)
+      list = docxml.at("//*[@style='mso-element:comment-list']") or return
+      list.children = comments.map { |c| c[:text] }.join("\n")
+    end
+  end
+end

data/lib/isodoc/postprocessing.rb

@@ -1,6 +1,7 @@
 require "html2doc"
 require "htmlentities"
 require "nokogiri"
+require "liquid"
 require "pp"
 
 module IsoDoc
@@ -15,7 +16,7 @@ module IsoDoc
 
     def toWord(result, filename, dir)
       result = from_xhtml(wordCleanup(to_xhtml(result)))
-      result = populate_template(result)
+      result = populate_template(result, :word)
       Html2Doc.process(result, filename, @wordstylesheet, "header.html", 
                        dir, ['`', '`'])
     end
@@ -45,33 +46,24 @@ module IsoDoc
       d.children.first.add_previous_sibling intro.to_xml(encoding: 'US-ASCII')
     end
 
-    def populate_template(docxml)
+    def populate_template(docxml, _format)
       meta = get_metadata
       docxml.
-        gsub(/DOCYEAR/, meta[:docyear]).
-        gsub(/DOCNUMBER/, meta[:docnumber]).
-        gsub(/TCNUM/, meta[:tc]).
-        gsub(/SCNUM/, meta[:sc]).
-        gsub(/WGNUM/, meta[:wg]).
-        gsub(/DOCTITLE/, meta[:doctitle]).
-        gsub(/DOCSUBTITLE/, meta[:docsubtitle]).
-        gsub(/SECRETARIAT/, meta[:secretariat]).
-        gsub(/[ ]?DRAFTINFO/, meta[:draftinfo]).
         gsub(/\[TERMREF\]\s*/, "[SOURCE: ").
         gsub(/\s*\[\/TERMREF\]\s*/, "]").
         gsub(/\s*\[ISOSECTION\]/, ", ").
-        gsub(/\s*\[MODIFICATION\]/, ", modified — ").
-        gsub(%r{WD/CD/DIS/FDIS}, meta[:stageabbr])
+        gsub(/\s*\[MODIFICATION\]/, ", modified — ")
+      template = Liquid::Template.parse(docxml)
+      template.render(meta.map { |k, v| [k.to_s, v] }.to_h)
     end
 
     def generate_header(filename, dir)
-      header = File.read(@header, encoding: "UTF-8").
-        gsub(/FILENAME/, filename).
-        gsub(/DOCYEAR/, get_metadata()[:docyear]).
-        gsub(/[ ]?DRAFTINFO/, get_metadata()[:draftinfo]).
-        gsub(/DOCNUMBER/, get_metadata()[:docnumber])
+      template = Liquid::Template.parse(File.read(@header, encoding: "UTF-8"))
+      meta = get_metadata
+      meta[:filename] = filename
+      params = meta.map { |k, v| [k.to_s, v] }.to_h
       File.open("header.html", "w") do |f|
-        f.write(header)
+        f.write(template.render(params))
       end
     end
 
@@ -138,8 +130,17 @@ module IsoDoc
     TOC
 
     def header_strip(h)
-      h.to_s.gsub(%r{<br/>}, " ").
+      h = h.to_s.gsub(%r{<br/>}, " ").
         sub(/<h[12][^>]*>/, "").sub(%r{</h[12]>}, "")
+      h1 = to_xhtml_fragment(h)    
+      #h1.xpath(".//*[@style = 'MsoCommentReference']").each do |x|
+      h1.xpath(".//*").each do |x|
+        if x.name == "span" && x['style'] == "MsoCommentReference"
+          x.children.remove
+          x.content = ""
+        end
+      end
+      from_xhtml(h1)
     end
 
     def makeWordToC(docxml)

data/lib/isodoc/references.rb

@@ -2,20 +2,18 @@ module IsoDoc
   class Convert
     def iso_bibitem_ref_code(b)
       isocode = b.at(ns("./docidentifier"))
-      isodate = b.at(ns("./publishdate"))
+      isodate = b.at(ns("./date[@type = 'published']"))
       reference = "ISO #{isocode.text}"
       reference += ": #{isodate.text}" if isodate
       reference
     end
 
     def date_note_process(b, ref)
-      date_note = b.xpath(ns("./note[text()][contains(.,'ISO DATE:')]"))
-      unless date_note.empty?
-        date_note.first.content =
-          date_note.first.content.gsub(/ISO DATE: /, "")
-        date_note.wrap("<p></p>")
-        footnote_parse(date_note.first, ref)
-      end
+      date_note = b.at(ns("./note[text()][contains(.,'ISO DATE:')]"))
+      return if date_note.nil?
+      date_note.content = date_note.content.gsub(/ISO DATE: /, "")
+      date_note.children.first.replace("<p>#{date_note.content}</p>")
+      footnote_parse(date_note, ref)
     end
 
     def iso_bibitem_entry(list, b, ordinal, biblio)
@@ -28,7 +26,7 @@ module IsoDoc
         ref << iso_bibitem_ref_code(b)
         date_note_process(b, ref)
         ref << ", " if biblio
-        ref.i { |i| i << " #{b.at(ns('./name')).text}" }
+        ref.i { |i| i << " #{b.at(ns('./title')).text}" }
       end
     end
 
@@ -54,18 +52,21 @@ module IsoDoc
 
     def noniso_bibitem(list, b, ordinal, bibliography)
       ref = b.at(ns("./docidentifier"))
-      para = b.at(ns("./formatted"))
+      para = b.at(ns("./formattedref"))
       list.p **attr_code("id": b["id"], class: "Biblio") do |r|
         ref_entry_code(r, ordinal, ref.text.gsub(/[\[\]]/, ""))
         para.children.each { |n| parse(n, r) }
       end
     end
 
+    ISO_PUBLISHER_XPATH =
+      "./contributor[xmlns:role/@type = 'publisher']/organization[name = 'ISO']"
+
     def split_bibitems(f)
       iso_bibitem = []
       non_iso_bibitem = []
       f.xpath(ns("./bibitem")).each do |x|
-        if x.at(ns("./publisher/affiliation[name = 'ISO']")).nil?
+        if x.at(ns(ISO_PUBLISHER_XPATH)).nil?
           non_iso_bibitem << x
         else
           iso_bibitem << x
@@ -99,12 +100,15 @@ module IsoDoc
       refs = f.elements.select do |e|
         ["reference", "bibitem"].include? e.name
       end
-      pref = refs.empty? ? NORM_EMPTY_PREF : NORM_WITH_REFS_PREF
+      pref = if refs.empty? then self.class::NORM_EMPTY_PREF 
+             else 
+               self.class::NORM_WITH_REFS_PREF
+             end
       div.p pref
     end
 
     def norm_ref(isoxml, out)
-      q = "//sections/references[title = 'Normative References']"
+      q = "./*/references[title = 'Normative References']"
       f = isoxml.at(ns(q)) or return
       out.div do |div|
         clause_name("2.", "Normative References", div, false)
@@ -114,7 +118,7 @@ module IsoDoc
     end
 
     def bibliography(isoxml, out)
-      q = "//sections/references[title = 'Bibliography']"
+      q = "./*/references[title = 'Bibliography']"
       f = isoxml.at(ns(q)) or return
       page_break(out)
       out.div do |div|

data/lib/isodoc/section.rb

@@ -1,7 +1,7 @@
 module IsoDoc
   class Convert
     def clause_parse(node, out)
-      out.div **attr_code("id": node["id"]) do |s|
+      out.div **attr_code(id: node["id"]) do |s|
         node.children.each do |c1|
           if c1.name == "title"
             if node["inline-header"]
@@ -42,7 +42,7 @@ module IsoDoc
     def clause(isoxml, out)
       isoxml.xpath(ns("//clause[parent::sections]")).each do |c|
         next if c.at(ns("./title")).text == "Scope"
-        out.div **attr_code("id": c["id"]) do |s|
+        out.div **attr_code(id: c["id"]) do |s|
           c.elements.each do |c1|
             if c1.name == "title"
               clause_name("#{get_anchors()[c['id']][:label]}.", 
@@ -65,7 +65,7 @@ module IsoDoc
     def annex(isoxml, out)
       isoxml.xpath(ns("//annex")).each do |c|
         page_break(out)
-        out.div **attr_code("id": c["id"], class: "Section3" ) do |s|
+        out.div **attr_code(id: c["id"], class: "Section3" ) do |s|
           #s1.div **{ class: "annex" } do |s|
             c.elements.each do |c1|
               if c1.name == "title" then annex_name(c, c1, s)
@@ -80,7 +80,7 @@ module IsoDoc
 
     def scope(isoxml, out)
       f = isoxml.at(ns("//clause[title = 'Scope']")) || return
-      out.div do |div|
+      out.div **attr_code(id: f["id"]) do |div|
         clause_name("1.", "Scope", div, false)
         f.elements.each do |e|
           parse(e, div) unless e.name == "title"
@@ -90,7 +90,7 @@ module IsoDoc
 
     def terms_defs(isoxml, out)
       f = isoxml.at(ns("//terms")) || return
-      out.div do |div|
+      out.div **attr_code(id: f["id"]) do |div|
         clause_name("3.", "Terms and Definitions", div, false)
         f.elements.each do |e|
           parse(e, div) unless e.name == "title"
@@ -100,7 +100,7 @@ module IsoDoc
 
     def symbols_abbrevs(isoxml, out)
       f = isoxml.at(ns("//symbols-abbrevs")) || return
-      out.div do |div|
+      out.div **attr_code(id: f["id"]) do |div|
         clause_name("4.", "Symbols and Abbreviations", div, false)
         f.elements.each do |e|
           parse(e, div) unless e.name == "title"
@@ -109,10 +109,10 @@ module IsoDoc
     end
 
     def introduction(isoxml, out)
-      f = isoxml.at(ns("//content[title = 'Introduction']")) || return
+      f = isoxml.at(ns("//introduction")) || return
       title_attr = { class: "IntroTitle" }
       page_break(out)
-      out.div **{ class: "Section3" } do |div|
+      out.div **{ class: "Section3", id: f["id"] } do |div|
         div.h1 "Introduction", **attr_code(title_attr)
         f.elements.each do |e|
           if e.name == "patent-notice"
@@ -125,9 +125,9 @@ module IsoDoc
     end
 
     def foreword(isoxml, out)
-      f = isoxml.at(ns("//content[title = 'Foreword']")) || return
+      f = isoxml.at(ns("//foreword")) || return
       page_break(out)
-      out.div do |s|
+      out.div **attr_code(id: f["id"]) do |s|
         s.h1 **{ class: "ForewordTitle" } { |h1| h1 << "Foreword" }
         f.elements.each { |e| parse(e, s) unless e.name == "title" }
       end

data/lib/isodoc/utils.rb

@@ -58,14 +58,6 @@ module IsoDoc
       end.to_h
     end
 
-    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
-
     def to_xhtml(xml)
       xml.gsub!(/<\?xml[^>]*>/, "")
       unless /<!DOCTYPE /.match? xml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.4.0".freeze
+  VERSION = "0.4.5".freeze
 end

data/lib/isodoc/xref_gen.rb

@@ -20,7 +20,7 @@ module IsoDoc
     end
 
     def initial_anchor_names(d)
-      introduction_names(d.at(ns("//content[title = 'Introduction']")))
+      introduction_names(d.at(ns("//introduction")))
       section_names(d.at(ns("//clause[title = 'Scope']")), "1", 1)
       section_names(d.at(ns(
         "//references[title = 'Normative References']")), "2", 1)
@@ -135,8 +135,9 @@ module IsoDoc
     end
 
     def introduction_names(clause)
+      return if clause.nil?
       clause.xpath(ns("./subsection")).each_with_index do |c, i|
-        section_names(c, "0.#{i + 1}")
+        section_names1(c, "0.#{i + 1}", 2)
       end
     end
 
@@ -186,10 +187,10 @@ module IsoDoc
     end
 
     def reference_names(ref)
-      isopub = ref.at(ns("./publisher/affiliation[name = 'ISO']"))
+      isopub = ref.at(ns(ISO_PUBLISHER_XPATH))
       docid = ref.at(ns("./docidentifier"))
       return ref_names(ref) unless docid
-      date = ref.at(ns("./publisherdate"))
+      date = ref.at(ns("./date[@type = 'published']"))
       reference = format_ref(docid.text, isopub)
       reference += ": #{date.text}" if date && isopub
       @anchors[ref["id"]] = { xref: reference }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: liquid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -303,6 +317,7 @@ files:
 - lib/isodoc/iso2wordhtml.rb
 - lib/isodoc/lists.rb
 - lib/isodoc/metadata.rb
+- lib/isodoc/notes.rb
 - lib/isodoc/postprocessing.rb
 - lib/isodoc/references.rb
 - lib/isodoc/section.rb