isodoc 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff51f3c21ebf20a813ca5e0a64f0284ce479dcea8752cc6f40a6d49af4e5a325
-  data.tar.gz: e1385e83fe57b5e7c3b9bd7dec912437a18c12f4b27ba1403da3839dbd535a2b
+  metadata.gz: 1c17faca6084ff975799b3c8ffd31b6fffeaf6d11145547042e59c6be7abf8e6
+  data.tar.gz: dbb039f5b14cdcd30579eeaea0b7cbbe5e0496e20d566280a9350f9a14ce2177
 SHA512:
-  metadata.gz: 881d006ae01107292d309b437a261ca1ad07dacdda64ee9349ce1b5e790e0c14c75e91d63217207c43d1fc19695995ecf9e957b2e8240a815d48d5bf262c7d56
-  data.tar.gz: '0159616d6bf2d7b03f30409e08703c9b2261e8fa0373a51f8c5714e81670b9b8672e14a0ee5707dde49845c2de0991ad9ec8a7957320fa26beb36844c546db20'
+  metadata.gz: e50e9e38683d8a21577d96e81c8c38771c89b4fce3b6482cda3c12e6812385151601c5a3e1085dc47e0fedbf6d561dd4c308c0b9a55e3936ed5cc0c4068188ac
+  data.tar.gz: ddc25eddf928b63c959fca69570c76fd6264b811601432e2869efc91bf6553c7e633f4ae3bb29c17e5a157ac2ade5949827aba9d930333dea0d715fb79bef25b

data/.github/workflows/macos.yml

@@ -2,7 +2,11 @@
 # use ci-master https://github.com/metanorma/metanorma-build-scripts
 name: macos
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
 
 jobs:
   test-macos:

data/.github/workflows/ubuntu.yml

@@ -2,7 +2,11 @@
 # use ci-master https://github.com/metanorma/metanorma-build-scripts
 name: ubuntu
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
 
 jobs:
   test-linux:

data/.github/workflows/windows.yml

@@ -2,7 +2,11 @@
 # use ci-master https://github.com/metanorma/metanorma-build-scripts
 name: windows
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
 
 jobs:
   test-windows:

data/lib/isodoc/base_style/blocks.scss

@@ -58,7 +58,8 @@
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
-  overflow: auto;
+  overflow-y: auto;
+  overflow-x: scroll;;
 }
 
 @mixin pseudocodeBlock($colorBg, $colorFg: null) {

data/lib/isodoc/base_style/reset.scss

@@ -96,3 +96,31 @@ blockquote, q {
     content: none;
   }
 }
+
+  .h2Annex {
+  font-family: $headerfont;
+}
+
+dl {
+  display: grid;
+  grid-template-columns: max-content auto;
+
+  dt, dd {
+    p {
+      margin-top: 0;
+    }
+  }
+
+  dt {
+    grid-column-start: 1;
+  }
+
+  dd {
+    grid-column-start: 2;
+  }
+}
+
+b, strong {
+  font-weight: bold;
+}
+

data/lib/isodoc/base_style/typography.scss

@@ -1,30 +1,3 @@
-.h2Annex {
-  font-family: $headerfont;
-}
-
-dl {
-  display: grid;
-  grid-template-columns: max-content auto;
-
-  dt, dd {
-    p {
-      margin-top: 0;
-    }
-  }
-
-  dt {
-    grid-column-start: 1;
-  }
-
-  dd {
-    grid-column-start: 2;
-  }
-}
-
-b, strong {
-  font-weight: bold;
-}
-
 @mixin bodyStyle1($fontSize, $lineHeight, $colorText, $colorBackground, $fontWeight: 400) {
   margin-left: auto;
   margin-right: auto;
@@ -38,6 +11,7 @@ b, strong {
   main {
     margin: 0 3em 0 6em;
   }
+
 }
 
 @mixin elementStyles($color, $colorHighlightBg, $colorHighlightFg) {

data/lib/isodoc/function/inline.rb

@@ -45,7 +45,7 @@ module IsoDoc::Function
         container = anchor(node["target"], :container, false)
         (container && get_note_container_id(node) != container &&
          @anchors[node["target"]]) &&
-          linkend = prefix_container(container, linkend, node["target"])
+        linkend = prefix_container(container, linkend, node["target"])
       end
       linkend || "???"
     end
@@ -53,7 +53,8 @@ module IsoDoc::Function
     def get_linkend(node)
       link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
       link += eref_localities(node.xpath(ns("./locality")), link)
-      contents = node.children.select { |c| c.name != "locality" }
+      contents = node.children.select { |c| c.name != "locality" }.
+        select { |c| !c.text? || /\S/.match(c) }
       return link if contents.nil? || contents.empty?
       Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
       # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
@@ -63,7 +64,7 @@ module IsoDoc::Function
     def xref_parse(node, out)
       target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".html#") :
         "##{node["target"]}"
-      out.a(**{ "href": target }) { |l| l << get_linkend(node) }
+        out.a(**{ "href": target }) { |l| l << get_linkend(node) }
     end
 
     def eref_localities(refs, target)
@@ -89,6 +90,22 @@ module IsoDoc::Function
       end
     end
 
+    def termrefelem_parse(node, out)
+      out << "Termbase #{node['base']}, term ID #{node['target']}"
+    end
+
+    def concept_parse(node, out)
+      content = node.first_element_child.children.select { |c| c.name != "locality" }.
+        select { |c| !c.text? || /\S/.match(c) }
+      if content.empty?
+        out << "[Term defined in "
+        parse(node.first_element_child, out)
+        out << "]"
+      else
+        content.each { |n| parse(n, out) }
+      end
+    end
+
     def stem_parse(node, out)
       ooml = if node["type"] == "AsciiMath"
                "#{@openmathdelim}#{HTMLEntities.new.encode(node.text)}#{@closemathdelim}"
@@ -101,7 +118,7 @@ module IsoDoc::Function
       end
     end
 
-     def image_title_parse(out, caption)
+    def image_title_parse(out, caption)
       unless caption.nil?
         out.p **{ class: "FigureTitle", style: "text-align:center;" } do |p|
           p.b { |b| b << caption.to_s }

data/lib/isodoc/function/reqt.rb

@@ -22,10 +22,10 @@ module IsoDoc::Function
       out = [] 
       oblig = node["obligation"] and out << "Obligation: #{oblig}" 
       subj = node&.at(ns("./subject"))&.text and out << "Subject: #{subj}" 
+      node.xpath(ns("./inherit")).each { |i| out << "Inherit: #{i.text}" }
       node.xpath(ns("./classification")).each do |c|
-        tag = c.at(ns("./tag"))
-        value = c.at(ns("./value"))
-        tag && value or next
+        tag = c.at(ns("./tag")) or next
+        value = c.at(ns("./value")) or next
         out << "#{tag.text.capitalize}: #{value.text}"
       end
       out
@@ -42,7 +42,7 @@ module IsoDoc::Function
     end
 
     def reqt_metadata_node(n)
-      %w(label title subject classification tag value).include? n.name
+      %w(label title subject classification tag value inherit).include? n.name
     end
 
     def recommendation_parse(node, out)

data/lib/isodoc/function/to_word_html.rb

@@ -249,6 +249,8 @@ module IsoDoc::Function
         when "verification" then requirement_component_parse(node, out)
         when "import" then requirement_component_parse(node, out)
         when "index" then index_parse(node, out)
+        when "concept" then concept_parse(node, out)
+        when "termref" then termrefelem_parse(node, out)
         else
           error_parse(node, out)
         end

data/lib/isodoc/html_convert.rb

@@ -1,6 +1,7 @@
 require_relative "html_function/comments.rb"
 require_relative "html_function/footnotes.rb"
 require_relative "html_function/html.rb"
+require_relative "html_function/postprocess.rb"
 
 module IsoDoc
   class HtmlConvert < ::IsoDoc::Convert

data/lib/isodoc/html_function/html.rb

@@ -28,62 +28,6 @@ module IsoDoc::HtmlFunction
       end
     end
 
-    def postprocess(result, filename, dir)
-      result = from_xhtml(cleanup(to_xhtml(result)))
-      toHTML(result, filename)
-      @files_to_delete.each { |f| FileUtils.rm_rf f }
-    end
-
-    def script_cdata(result)
-      result.gsub(%r{<script([^>]*)>\s*<!\[CDATA\[}m, "<script\\1>").
-        gsub(%r{\]\]>\s*</script>}, "</script>").
-        gsub(%r{<!\[CDATA\[\s*<script([^>]*)>}m, "<script\\1>").
-        gsub(%r{</script>\s*\]\]>}, "</script>")
-    end
-
-    def toHTML(result, filename)
-      result = (from_xhtml(html_cleanup(to_xhtml(result))))
-      result = populate_template(result, :html)
-      result = from_xhtml(move_images(to_xhtml(result)))
-      result = html5(script_cdata(inject_script(result)))
-      File.open("#{filename}.html", "w:UTF-8") { |f| f.write(result) }
-    end
-
-    def html5(doc)
-      doc.sub(%r{<!DOCTYPE html [^>]+>}, "<!DOCTYPE html>").
-        sub(%r{<\?xml[^>]+>}, "")
-    end
-
-    def html_cleanup(x)
-      footnote_backlinks(html_toc(
-        term_header((html_footnote_filter(html_preface(htmlstyle(x))))))
-                        )
-    end
-
-    MATHJAX_ADDR =
-      "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/latest.js".freeze
-    MATHJAX = <<~"MATHJAX".freeze
-      <script type="text/x-mathjax-config">
-        MathJax.Hub.Config({
-          asciimath2jax: { delimiters: [['OPEN', 'CLOSE']] }
-       });
-      </script>
-      <script src="#{MATHJAX_ADDR}?config=MML_HTMLorMML-full" async="async"></script>
-    MATHJAX
-
-    def mathjax(open, close)
-      MATHJAX.gsub("OPEN", open).gsub("CLOSE", close)
-    end
-
-    def term_header(docxml)
-      %w(h1 h2 h3 h4 h5 h6 h7 h8).each do |h|
-        docxml.xpath("//p[@class = 'TermNum'][../#{h}]").each do |p|
-          p.name = "h#{h[1].to_i + 1}"
-        end
-      end
-      docxml
-    end
-
     def googlefonts()
       <<~HEAD.freeze
       <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
@@ -121,10 +65,6 @@ 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
@@ -154,163 +94,5 @@ module IsoDoc::HtmlFunction
         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
-      html_main(docxml)
-      docxml
-    end
-
-    def inject_script(doc)
-      return doc unless @scripts
-      scripts = File.read(@scripts, encoding: "UTF-8")
-      doc.sub("</body>", scripts + "\n</body>")
-    end
-
-    def html_cover(docxml)
-      doc = to_xhtml_fragment(File.read(@htmlcoverpage, encoding: "UTF-8"))
-      d = docxml.at('//div[@class="title-section"]')
-      d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
-    end
-
-    def html_intro(docxml)
-      doc = to_xhtml_fragment(File.read(@htmlintropage, encoding: "UTF-8"))
-      d = docxml.at('//div[@class="prefatory-section"]')
-      d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
-    end
-
-    def htmlstylesheet
-      #stylesheet = File.read(@htmlstylesheet, encoding: "UTF-8")
-      @htmlstylesheet.open
-      stylesheet = @htmlstylesheet.read
-      xml = Nokogiri::XML("<style/>")
-      xml.children.first << Nokogiri::XML::Comment.new(xml, "\n#{stylesheet}\n")
-      @htmlstylesheet.close!
-      xml.root.to_s
-    end
-
-    def htmlstyle(docxml)
-      return docxml unless @htmlstylesheet
-      title = docxml.at("//*[local-name() = 'head']/*[local-name() = 'title']")
-      head = docxml.at("//*[local-name() = 'head']")
-=begin
-      css = htmlstylesheet
-      if title.nil? then head.children.first.add_previous_sibling css
-      else
-        title.add_next_sibling css
-      end
-=end
-      head << htmlstylesheet
-      docxml
-    end
-
-    def update_footnote_filter(fn, x, i, seen)
-      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|
-        fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
-        i, seen = update_footnote_filter(fn, x, i, seen)
-      end
-      docxml
-    end
-
-    def footnote_backlinks(docxml)
-      seen = {}
-      docxml.xpath('//a[@epub:type = "footnote"]').each_with_index do |x, i|
-        seen[x["href"]] and next or seen[x["href"]] = true
-        fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
-        xdup = x.dup
-        xdup.remove["id"]
-        fn.elements.first.children.first.previous = xdup
-        x["id"] ||= "fnref:#{i + 1}"
-        fn.add_child "<a href='##{x['id']}'>&#x21A9;</a>"
-      end
-      docxml
-    end
-
-    # presupposes that the image source is local
-    def move_images(docxml)
-      FileUtils.rm_rf tmpimagedir
-      FileUtils.mkdir tmpimagedir
-      docxml.xpath("//*[local-name() = 'img']").each do |i|
-        i["width"], i["height"] = Html2Doc.image_resize(i, image_localfile(i),
-                                                        @maxheight, @maxwidth)
-        next if /^data:image/.match i["src"]
-        @datauriimage ? datauri(i) : move_image1(i)
-      end
-      docxml
-    end
-
-    def datauri(i)
-      type = i["src"].split(".")[-1]
-      bin = IO.binread(image_localfile(i))
-      data = Base64.strict_encode64(bin)
-      i["src"] = "data:image/#{type};base64,#{data}"
-    end
-
-    def image_suffix(i)
-      type = i["mimetype"]&.sub(%r{^[^/*]+/}, "")
-      matched = /\.(?<suffix>[^. \r\n\t]+)$/.match i["src"]
-      type and !type.empty? and return type
-      !matched.nil? and matched[:suffix] and return matched[:suffix]
-      "png"
-    end
-
-      def move_image1(i)
-      suffix = image_suffix(i)
-      uuid = UUIDTools::UUID.random_create.to_s
-      fname = "#{uuid}.#{suffix}"
-      new_full_filename = File.join(tmpimagedir, fname)
-      local_filename = image_localfile(i)
-      FileUtils.cp local_filename, new_full_filename
-      i["src"] = File.join(rel_tmpimagedir, fname)
-    end
-
-    def html_toc_entry(level, header)
-      %(<li class="#{level}"><a href="##{header['id']}">\
-      #{header_strip(header)}</a></li>)
-    end
-
-    def toclevel_classes
-      (1..@htmlToClevels).inject([]) { |m, i| m << "h#{i}" }
-    end
-
-    def toclevel
-      ret = toclevel_classes.map { |l| "#{l}:not(:empty):not(.TermNum):not(.noTOC)" }
-      <<~HEAD.freeze
-    function toclevel() { return "#{ret.join(',')}";}
-      HEAD
-    end
-
-    # needs to be same output as toclevel
-    def html_toc(docxml)
-      idx = docxml.at("//div[@id = 'toc']") or return docxml
-      toc = "<ul>"
-      path = toclevel_classes.map do |l|
-        "//main//#{l}[not(@class = 'TermNum')][not(@class = 'noTOC')][not(text())]"
-      end
-      docxml.xpath(path.join(" | ")).each_with_index do |h, tocidx|
-        h["id"] ||= "toc#{tocidx}"
-        toc += html_toc_entry(h.name, h)
-      end
-      idx.children = "#{toc}</ul>"
-      docxml
-    end
   end
 end

data/lib/isodoc/html_function/postprocess.rb

@@ -0,0 +1,226 @@
+module IsoDoc::HtmlFunction
+  module Html
+    def postprocess(result, filename, dir)
+      result = from_xhtml(cleanup(to_xhtml(result)))
+      toHTML(result, filename)
+      @files_to_delete.each { |f| FileUtils.rm_rf f }
+    end
+
+    def script_cdata(result)
+      result.gsub(%r{<script([^>]*)>\s*<!\[CDATA\[}m, "<script\\1>").
+        gsub(%r{\]\]>\s*</script>}, "</script>").
+        gsub(%r{<!\[CDATA\[\s*<script([^>]*)>}m, "<script\\1>").
+        gsub(%r{</script>\s*\]\]>}, "</script>")
+    end
+
+    def toHTML(result, filename)
+      result = (from_xhtml(html_cleanup(to_xhtml(result))))
+      result = populate_template(result, :html)
+      result = from_xhtml(move_images(to_xhtml(result)))
+      result = html5(script_cdata(inject_script(result)))
+      File.open("#{filename}.html", "w:UTF-8") { |f| f.write(result) }
+    end
+
+    def html5(doc)
+      doc.sub(%r{<!DOCTYPE html [^>]+>}, "<!DOCTYPE html>").
+        sub(%r{<\?xml[^>]+>}, "")
+    end
+
+    def html_cleanup(x)
+      footnote_backlinks(html_toc(
+        term_header((html_footnote_filter(html_preface(htmlstyle(x))))))
+                        )
+    end
+
+    def htmlstylesheet
+      @htmlstylesheet.open
+      stylesheet = @htmlstylesheet.read
+      xml = Nokogiri::XML("<style/>")
+      xml.children.first << Nokogiri::XML::Comment.new(xml, "\n#{stylesheet}\n")
+      @htmlstylesheet.close!
+      xml.root.to_s
+    end
+
+    def htmlstyle(docxml)
+      return docxml unless @htmlstylesheet
+      title = docxml.at("//*[local-name() = 'head']/*[local-name() = 'title']")
+      head = docxml.at("//*[local-name() = 'head']")
+      head << htmlstylesheet
+      docxml
+    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
+      html_main(docxml)
+      docxml
+    end
+
+    def html_cover(docxml)
+      doc = to_xhtml_fragment(File.read(@htmlcoverpage, encoding: "UTF-8"))
+      d = docxml.at('//div[@class="title-section"]')
+      d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
+    end
+
+    def html_intro(docxml)
+      doc = to_xhtml_fragment(File.read(@htmlintropage, encoding: "UTF-8"))
+      d = docxml.at('//div[@class="prefatory-section"]')
+      d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
+    end
+
+
+    def html_cover(docxml)
+      doc = to_xhtml_fragment(File.read(@htmlcoverpage, encoding: "UTF-8"))
+      d = docxml.at('//div[@class="title-section"]')
+      d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
+    end
+
+    def html_intro(docxml)
+      doc = to_xhtml_fragment(File.read(@htmlintropage, encoding: "UTF-8"))
+      d = docxml.at('//div[@class="prefatory-section"]')
+      d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
+    end
+
+    def html_toc_entry(level, header)
+      %(<li class="#{level}"><a href="##{header['id']}">\
+      #{header_strip(header)}</a></li>)
+    end
+
+    def toclevel_classes
+      (1..@htmlToClevels).inject([]) { |m, i| m << "h#{i}" }
+    end
+
+    def toclevel
+      ret = toclevel_classes.map { |l| "#{l}:not(:empty):not(.TermNum):not(.noTOC)" }
+      <<~HEAD.freeze
+    function toclevel() { return "#{ret.join(',')}";}
+      HEAD
+    end
+
+    # needs to be same output as toclevel
+    def html_toc(docxml)
+      idx = docxml.at("//div[@id = 'toc']") or return docxml
+      toc = "<ul>"
+      path = toclevel_classes.map do |l|
+        "//main//#{l}[not(@class = 'TermNum')][not(@class = 'noTOC')][not(text())]"
+      end
+      docxml.xpath(path.join(" | ")).each_with_index do |h, tocidx|
+        h["id"] ||= "toc#{tocidx}"
+        toc += html_toc_entry(h.name, h)
+      end
+      idx.children = "#{toc}</ul>"
+      docxml
+    end
+
+    # presupposes that the image source is local
+    def move_images(docxml)
+      FileUtils.rm_rf tmpimagedir
+      FileUtils.mkdir tmpimagedir
+      docxml.xpath("//*[local-name() = 'img']").each do |i|
+        i["width"], i["height"] = Html2Doc.image_resize(i, image_localfile(i),
+                                                        @maxheight, @maxwidth)
+        next if /^data:image/.match i["src"]
+        @datauriimage ? datauri(i) : move_image1(i)
+      end
+      docxml
+    end
+
+    def datauri(i)
+      type = i["src"].split(".")[-1]
+      bin = IO.binread(image_localfile(i))
+      data = Base64.strict_encode64(bin)
+      i["src"] = "data:image/#{type};base64,#{data}"
+    end
+
+    def image_suffix(i)
+      type = i["mimetype"]&.sub(%r{^[^/*]+/}, "")
+      matched = /\.(?<suffix>[^. \r\n\t]+)$/.match i["src"]
+      type and !type.empty? and return type
+      !matched.nil? and matched[:suffix] and return matched[:suffix]
+      "png"
+    end
+
+    def move_image1(i)
+      suffix = image_suffix(i)
+      uuid = UUIDTools::UUID.random_create.to_s
+      fname = "#{uuid}.#{suffix}"
+      new_full_filename = File.join(tmpimagedir, fname)
+      local_filename = image_localfile(i)
+      FileUtils.cp local_filename, new_full_filename
+      i["src"] = File.join(rel_tmpimagedir, fname)
+    end
+
+    def inject_script(doc)
+      return doc unless @scripts
+      scripts = File.read(@scripts, encoding: "UTF-8")
+      doc.sub("</body>", scripts + "\n</body>")
+    end
+
+    def update_footnote_filter(fn, x, i, seen)
+      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|
+        fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
+        i, seen = update_footnote_filter(fn, x, i, seen)
+      end
+      docxml
+    end
+
+    def footnote_backlinks(docxml)
+      seen = {}
+      docxml.xpath('//a[@epub:type = "footnote"]').each_with_index do |x, i|
+        seen[x["href"]] and next or seen[x["href"]] = true
+        fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
+        xdup = x.dup
+        xdup.remove["id"]
+        fn.elements.first.children.first.previous = xdup
+        x["id"] ||= "fnref:#{i + 1}"
+        fn.add_child "<a href='##{x['id']}'>&#x21A9;</a>"
+      end
+      docxml
+    end
+
+    def sourcecode_highlighter
+      '<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>'
+    end
+
+    MATHJAX_ADDR =
+      "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/latest.js".freeze
+    MATHJAX = <<~"MATHJAX".freeze
+      <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+          asciimath2jax: { delimiters: [['OPEN', 'CLOSE']] }
+       });
+      </script>
+      <script src="#{MATHJAX_ADDR}?config=MML_HTMLorMML-full" async="async"></script>
+    MATHJAX
+
+    def mathjax(open, close)
+      MATHJAX.gsub("OPEN", open).gsub("CLOSE", close)
+    end
+
+    def term_header(docxml)
+      %w(h1 h2 h3 h4 h5 h6 h7 h8).each do |h|
+        docxml.xpath("//p[@class = 'TermNum'][../#{h}]").each do |p|
+          p.name = "h#{h[1].to_i + 1}"
+        end
+      end
+      docxml
+    end
+  end
+end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.13".freeze
+  VERSION = "1.0.14".freeze
 end

data/spec/isodoc/blocks_spec.rb

@@ -785,6 +785,7 @@ World</p>
     <permission id="_">
   <label>/ogc/recommendation/wfs/2</label>
   <inherit>/ss/584/2015/level/1</inherit>
+  <inherit>/ss/584/2015/level/2</inherit>
   <subject>user</subject>
   <classification> <tag>control-class</tag> <value>Technical</value> </classification><classification> <tag>priority</tag> <value>P0</value> </classification><classification> <tag>family</tag> <value>System and Communications Protection</value> </classification><classification> <tag>family</tag> <value>System and Communications Protocols</value> </classification>
   <description>
@@ -834,9 +835,12 @@ World</p>
       <div>
         <h1 class="ForewordTitle">Foreword</h1>
         <div class="permission"><p class="RecommendationTitle">Permission 1:<br/>/ogc/recommendation/wfs/2</p>
-        <p><i>Subject: user<br/>Control-class: Technical<br/>Priority: P0<br/>Family: System and Communications Protection<br/>Family: System and Communications Protocols</i></p>
+        <p><i>Subject: user<br/>
+Inherit: /ss/584/2015/level/1
+<br/>
+Inherit: /ss/584/2015/level/2
+<br/>Control-class: Technical<br/>Priority: P0<br/>Family: System and Communications Protection<br/>Family: System and Communications Protocols</i></p>
 
-  <div class="requirement-inherit">/ss/584/2015/level/1</div>
   <div class="requirement-description">
     <p id="_">I recommend <i>this</i>.</p>
   </div>
@@ -919,9 +923,8 @@ World</p>
         <br/>
       <div>
         <h1 class="ForewordTitle">Foreword</h1>
-        <div class="require"><p class="RecommendationTitle">Requirement:<br/>/ogc/recommendation/wfs/2. A New Requirement</p><p><i>Subject: user</i></p>
+        <div class="require"><p class="RecommendationTitle">Requirement:<br/>/ogc/recommendation/wfs/2. A New Requirement</p><p><i>Subject: user<br/>Inherit: /ss/584/2015/level/1</i></p>
 
-  <div class="requirement-inherit">/ss/584/2015/level/1</div>
   <div class="requirement-description">
     <p id="_">I recommend <i>this</i>.</p>
   </div>
@@ -1005,8 +1008,7 @@ World</p>
        <br/>
       <div>
         <h1 class="ForewordTitle">Foreword</h1>
-<div class="recommend"><p class="RecommendationTitle">Recommendation 1:<br/>/ogc/recommendation/wfs/2</p><p><i>Obligation: shall,could<br/>Subject: user<br/>Type: text<br/>Language: BASIC</i></p>
-  <div class="requirement-inherit">/ss/584/2015/level/1</div>
+<div class="recommend"><p class="RecommendationTitle">Recommendation 1:<br/>/ogc/recommendation/wfs/2</p><p><i>Obligation: shall,could<br/>Subject: user<br/>Inherit: /ss/584/2015/level/1<br/>Type: text<br/>Language: BASIC</i></p>
   <div class="requirement-description">
     <p id="_">I recommend <i>this</i>.</p>
   </div>

data/spec/isodoc/inline_spec.rb

@@ -53,6 +53,123 @@ RSpec.describe IsoDoc do
     OUTPUT
     end
 
+    it "processes concept markup" do
+      expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <p>
+    <ul>
+    <li><concept term='term'>
+        <xref target='clause1'/>
+      </concept></li>
+    <li><concept term='term'>
+        <xref target='clause1'>w[o]rd</xref>
+      </concept></li>
+      <li><concept term='term'>
+        <eref bibitemid="ISO712" type="inline" citeas="ISO 712"/>
+      </concept></li>
+      <li><concept term='term'>
+        <eref bibitemid="ISO712" type="inline" citeas="ISO 712">word</eref>
+      </concept></li>
+      <li><concept>
+        <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+          <locality type='clause'>
+            <referenceFrom>3.1</referenceFrom>
+          </locality>
+          <locality type='figure'>
+            <referenceFrom>a</referenceFrom>
+          </locality>
+        </eref>
+      </concept></li>
+      <li><concept>
+        <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+          <locality type='clause'>
+            <referenceFrom>3.1</referenceFrom>
+          </locality>
+          <locality type='figure'>
+            <referenceFrom>a</referenceFrom>
+          </locality>
+          <em>word</em>
+        </eref>
+      </concept></li>
+      <li><concept term='term'>
+        <termref base='IEV' target='135-13-13'/>
+      </concept></li>
+      <li><concept term='term'>
+        <termref base='IEV' target='135-13-13'><em>word</em> word</termref>
+      </concept></li>
+      </ul>
+    </p>
+    </foreword></preface>
+    <sections>
+    <clause id="clause1"><title>Clause 1</title></clause>
+    </sections>
+    <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
+    <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
+<bibitem id="ISO712" type="standard">
+  <title format="text/plain">Cereals or cereal products</title>
+  <title type="main" format="text/plain">Cereals and cereal products</title>
+  <docidentifier type="ISO">ISO 712</docidentifier>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+    </organization>
+  </contributor>
+</bibitem>
+</references></bibliography>
+    </iso-standard>
+    INPUT
+        #{HTML_HDR}
+        <br/>
+             <div>
+               <h1 class='ForewordTitle'>Foreword</h1>
+               <p>
+                 <ul>
+                   <li>
+                     [Term defined in <a href='#clause1'>Clause 2</a>]
+                   </li>
+                   <li>w[o]rd</li>
+                   <li>
+                     [Term defined in <a href='#ISO712'>ISO 712</a>]
+                   </li>
+                   <li>word</li>
+                   <li>
+                     [Term defined in <a href='#ISO712'>ISO 712, Clause 3.1, Figure a</a>]
+                   </li>
+                   <li>
+                     <i>word</i>
+                   </li>
+                   <li>[Term defined in Termbase IEV, term ID 135-13-13]</li>
+                   <li>
+                     <i>word</i> word
+                   </li>
+                 </ul>
+               </p>
+             </div>
+             <p class='zzSTDTitle1'/>
+             <div>
+               <h1>1.&#160; Normative references</h1>
+               <p>
+                 The following documents are referred to in the text in such a way that
+                 some or all of their content constitutes requirements of this
+                 document. For dated references, only the edition cited applies. For
+                 undated references, the latest edition of the referenced document
+                 (including any amendments) applies.
+               </p>
+               <p id='ISO712' class='NormRef'>
+                 ISO 712, <i>Cereals and cereal products</i>
+               </p>
+             </div>
+             <div id='clause1'>
+               <h1>2.&#160; Clause 1</h1>
+             </div>
+           </div>
+         </body>
+       </html>
+OUTPUT
+    end
+
   it "processes embedded inline formatting" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -341,6 +341,7 @@ files:
 - lib/isodoc/html_function/comments.rb
 - lib/isodoc/html_function/footnotes.rb
 - lib/isodoc/html_function/html.rb
+- lib/isodoc/html_function/postprocess.rb
 - lib/isodoc/metadata.rb
 - lib/isodoc/pdf_convert.rb
 - lib/isodoc/version.rb