isodoc 2.10.1 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6867b3f44bce43fcfbd4c65115b8b71b6eb38cb7b1e39c20215addc7af8ad086
-  data.tar.gz: f335e4aecc20758c7c9810083d7da486ec73e0db4c377b9528841b46166085de
+  metadata.gz: 3e19ba3a2fd2440b24be729cbba835907ac504ca7c762f673632de52881922f1
+  data.tar.gz: 6b3fff1e5f4feebc785588093eee4fb81a1da3dc37ff1417b2e30445e353dbcc
 SHA512:
-  metadata.gz: 0bda93db557ef73dc1c5999bbd88d9ba06ac9977f48b93f4adca7aaac7e762d5b4fed0d62d8934151ce3ecf1becea0060d3fab65c92e2150a8a00a0c49895ee6
-  data.tar.gz: 1b0d780a2e450e8a22e8f6d4dcbcaa991e73bdcf1343ca3675c2e81b5f52688be7882f58762c18820fd2e99c4c37ea6043af8efc7f454ec44b553e00c3d356e3
+  metadata.gz: 8751365f532c1123f30df8480fca7021cb90122c419e963b4ba46fb6ece8bca0c4bd1593d4c3d3f987f5db5dde295012e01a59af5392929dc3db972db5bb50c9
+  data.tar.gz: '006383549c57caf4cb72ef35b51aaad6ada733981858f2188eb7515f08d8d1e964b7a27e47d723199737c6dc70cd7c379775804ee28b55757fda18a1c77dcb63'

data/lib/isodoc/base_style/all.css

@@ -169,6 +169,50 @@ table.rouge-line-table pre {
   overflow-x: visible;
   font-size: 100%; }
 
+a.header {
+  color: inherit;
+  text-decoration: none; }
+
+a.header:hover {
+  color: #a53221; }
+
+a.header:visited {
+  color: inherit;
+  text-decoration: none; }
+
+a.anchor {
+  position: absolute;
+  z-index: 1001;
+  width: 1.5ex;
+  margin-left: -1.5ex;
+  display: block;
+  text-decoration: none !important;
+  visibility: hidden;
+  text-align: center;
+  font-weight: 400; }
+
+a.anchor::before {
+  content: "\00A7";
+  font-size: .85em;
+  display: block;
+  padding-top: .1em; }
+
+h1 > a.anchor:hover,
+h2 > a.anchor:hover,
+h3 > a.anchor:hover,
+h4 > a.anchor:hover,
+h5 > a.anchor:hover,
+h6 > a.anchor:hover,
+.inline-header > a.anchor:hover,
+h1:hover > a.anchor,
+h2:hover > a.anchor,
+h3:hover > a.anchor,
+h4:hover > a.anchor,
+h5:hover > a.anchor,
+h6:hover > a.anchor,
+.inline-header:hover > a.anchor {
+  visibility: visible; }
+
 #standard-band {
   background-color: #0AC442; }
 

data/lib/isodoc/base_style/reset.css

@@ -168,3 +168,47 @@ table.rouge-line-table pre {
   padding: 0;
   overflow-x: visible;
   font-size: 100%; }
+
+a.header {
+  color: inherit;
+  text-decoration: none; }
+
+a.header:hover {
+  color: #a53221; }
+
+a.header:visited {
+  color: inherit;
+  text-decoration: none; }
+
+a.anchor {
+  position: absolute;
+  z-index: 1001;
+  width: 1.5ex;
+  margin-left: -1.5ex;
+  display: block;
+  text-decoration: none !important;
+  visibility: hidden;
+  text-align: center;
+  font-weight: 400; }
+
+a.anchor::before {
+  content: "\00A7";
+  font-size: .85em;
+  display: block;
+  padding-top: .1em; }
+
+h1 > a.anchor:hover,
+h2 > a.anchor:hover,
+h3 > a.anchor:hover,
+h4 > a.anchor:hover,
+h5 > a.anchor:hover,
+h6 > a.anchor:hover,
+.inline-header > a.anchor:hover,
+h1:hover > a.anchor,
+h2:hover > a.anchor,
+h3:hover > a.anchor,
+h4:hover > a.anchor,
+h5:hover > a.anchor,
+h6:hover > a.anchor,
+.inline-header:hover > a.anchor {
+  visibility: visible; }

data/lib/isodoc/base_style/reset.scss

@@ -199,3 +199,25 @@ table.rouge-line-table pre {
   overflow-x: visible;
   font-size: 100%;
 }
+
+a.header{color:inherit;text-decoration:none}
+a.header:hover{color:#a53221}
+a.header:visited{color:inherit;text-decoration:none}
+a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none!important;visibility:hidden;text-align:center;font-weight:400}
+a.anchor::before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em}
+h1>a.anchor:hover,
+h2>a.anchor:hover,
+h3>a.anchor:hover,
+h4>a.anchor:hover,
+h5>a.anchor:hover,
+h6>a.anchor:hover,
+.inline-header>a.anchor:hover,
+h1:hover>a.anchor,
+h2:hover>a.anchor,
+h3:hover>a.anchor,
+h4:hover>a.anchor,
+h5:hover>a.anchor,
+h6:hover>a.anchor,
+.inline-header:hover>a.anchor{
+visibility:visible;
+}

data/lib/isodoc/function/cleanup.rb

@@ -157,13 +157,14 @@ module IsoDoc
         tfoot.xpath(".//td").last
       end
 
+      TABLENOTE_CSS = "div[@class = 'Note' or @class = 'BlockSource' " \
+        "or @class = 'TableFootnote' or @class = 'figdl']".freeze
+
       def table_note_cleanup(docxml)
-        docxml.xpath("//table[dl or div[@class = 'Note' or @class = 'BlockSource' " \
-                     "or @class = 'TableFootnote']]").each do |t|
+        docxml.xpath("//table[dl or #{TABLENOTE_CSS}]").each do |t|
           tfoot = table_get_or_make_tfoot(t)
           insert_here = new_fullcolspan_row(t, tfoot)
-          t.xpath("dl | div[@class = 'Note' or @class = 'BlockSource' or " \
-                  "@class = 'TableFootnote']")
+          t.xpath("dl | p[@class = 'ListTitle'] | #{TABLENOTE_CSS}")
             .each do |d|
             d.parent = insert_here
           end

data/lib/isodoc/function/lists.rb

@@ -13,9 +13,11 @@ module IsoDoc
       end
 
       def ul_parse(node, out)
-        list_title_parse(node, out)
-        out.ul **attr_code(ul_attrs(node)) do |ul|
-          node.children.each { |n| n.name == "name" or parse(n, ul) }
+        out.div **attr_code(class: "ul_wrap") do |div|
+          list_title_parse(node, div)
+          div.ul **attr_code(ul_attrs(node)) do |ul|
+            node.children.each { |n| n.name == "name" or parse(n, ul) }
+          end
         end
       end
 
@@ -52,9 +54,11 @@ module IsoDoc
       end
 
       def ol_parse(node, out)
-        list_title_parse(node, out)
-        out.ol **attr_code(ol_attrs(node)) do |ol|
-          node.children.each { |n| n.name == "name" or parse(n, ol) }
+        out.div **attr_code(class: "ol_wrap") do |div|
+          list_title_parse(node, div)
+          div.ol **attr_code(ol_attrs(node)) do |ol|
+            node.children.each { |n| n.name == "name" or parse(n, ol) }
+          end
         end
       end
 
@@ -90,13 +94,15 @@ module IsoDoc
       end
 
       def dl_parse(node, out)
-        list_title_parse(node, out)
-        out.dl **dl_attrs(node) do |v|
-          node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
-            dl_parse1(v, dt, dd)
+        out.div **attr_code(class: "figdl") do |div|
+          list_title_parse(node, div)
+          div.dl **dl_attrs(node) do |v|
+            node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
+              dl_parse1(v, dt, dd)
+            end
           end
+          dl_parse_notes(node, div)
         end
-        dl_parse_notes(node, out)
       end
 
       def dl_parse_notes(node, out)

data/lib/isodoc/function/section_titles.rb

@@ -10,7 +10,7 @@ module IsoDoc
       end
 
       def inline_header_title(out, node, title)
-        out.span class: "zzMoveToFollowing" do |s|
+        out.span class: "zzMoveToFollowing inline-header" do |s|
           s.b do |b|
             title&.children&.each { |c2| parse(c2, b) }
             clausedelimspace(node, out) if /\S/.match?(title&.text)

data/lib/isodoc/html_function/postprocess.rb

@@ -26,9 +26,26 @@ module IsoDoc
 
       def html_cleanup(html)
         html = term_header(html_footnote_filter(html_preface(htmlstyle(html))))
-        html = footnote_format(footnote_backlinks(html_toc(html)))
+        html = footnote_format(footnote_backlinks(html))
         html = mathml(html_list_clean(remove_placeholder_paras(html)))
-        sourcecode_cleanup(html)
+        html_toc(heading_anchors(sourcecode_cleanup(html)))
+      end
+
+      def heading_anchors(html)
+        html.xpath("//h1 | //h2 | //h3 | //h4 | //h5 | //h6 | //h7 | //h8 "\
+                   "//span[@class = 'inline-header']").each do |h|
+          h.at("./ancestor::div[@id='toc']") and next
+          div = h.xpath("./ancestor::div[@id]")
+          div.empty? and next
+          heading_anchor(h, div[-1]["id"])
+        end
+        html
+      end
+
+      def heading_anchor(hdr, id)
+        hdr.children = <<~HTML.strip
+          <a class='anchor' href='##{id}'/><a class='header' href='##{id}'>#{hdr.children.to_xml}</a>
+        HTML
       end
 
       def sourcecode_cleanup(html)
@@ -52,7 +69,7 @@ module IsoDoc
 
       def html_list_clean(html)
         html.xpath("//ol/div | //ul/div").each do |div|
-          li = div&.xpath("./preceding-sibling::li")&.last ||
+          li = div.xpath("./preceding-sibling::li")&.last ||
             div.at("./following-sibling::li")
           div.parent = li
         end
@@ -92,7 +109,6 @@ module IsoDoc
         type = img["mimetype"]&.sub(%r{^[^/*]+/}, "")
         matched = /\.(?<suffix>[^. \r\n\t]+)$/.match img["src"]
         type and !type.empty? and return type
-
         !matched.nil? and matched[:suffix] and return matched[:suffix]
         "png"
       end
@@ -111,6 +127,9 @@ module IsoDoc
         %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}"
+            id = p["id"]
+            p["id"] = "_#{UUIDTools::UUID.random_create}"
+            p.wrap("<div id='#{id}'></div>")
           end
         end
         docxml

data/lib/isodoc/html_function/postprocess_cover.rb

@@ -98,7 +98,9 @@ module IsoDoc
       def html_toc_entry(level, header)
         content = header.at("./following-sibling::p" \
                             "[@class = 'variant-title-toc']") || header
-        %(<li class="#{level}"><a href="##{header['id']}">\
+        id = header.at(".//a[@class = 'anchor']/@href")&.text&.sub(/^#/, "") ||
+          header["id"]
+        %(<li class="#{level}"><a href="##{id}">\
       #{header_strip(content)}</a></li>)
       end
 

data/lib/isodoc/presentation_function/sourcecode.rb

@@ -141,8 +141,8 @@ module IsoDoc
     end
 
     def source_lex(elem)
-      lexer = (Rouge::Lexer.find(elem["lang"] || "plaintext") ||
-       Rouge::Lexer.find("plaintext"))
+      lexer = Rouge::Lexer.find(elem["lang"] || "plaintext") ||
+        Rouge::Lexer.find("plaintext")
       l = Rouge::Lexers::Escape.new(start: "{^^{", end: "}^^}", lang: lexer)
       source = to_xml(elem.children).gsub(/</, "{^^{<").gsub(/>/, ">}^^}")
       l.lang.reset!

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.10.1".freeze
+  VERSION = "2.10.2".freeze
 end

data/lib/isodoc/word_function/lists.rb

@@ -24,13 +24,15 @@ module IsoDoc
       end
 
       def dl_parse_nontable(node, out)
-        node["id"] and bookmark_parse(node, out)
-        list_title_parse(node, out)
+        out.div **attr_code(class: "figdl") do |div|
+        node["id"] and bookmark_parse(node, div)
+        list_title_parse(node, div)
         node.elements.select { |n| dt_dd?(n) }
           .each_slice(2) do |dt, dd|
-          dl_parse_nontable1(out, dt, dd)
+          dl_parse_nontable1(div, dt, dd)
+        end
+        dl_parse_notes(node, div)
         end
-        dl_parse_notes(node, out)
       end
 
       WORD_EMBED_DL_ATTRS =

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -27,7 +27,7 @@ module IsoDoc
       def sequential_figure_names(clause, container: false)
         c = Counter.new
         j = 0
-        clause.xpath(ns(FIGURE_NO_CLASS)).noblank.each do |t|
+        clause.xpath(ns(self.class::FIGURE_NO_CLASS)).noblank.each do |t|
           j = subfigure_increment(j, c, t)
           sequential_figure_body(j, c, t, "figure", container: container)
         end
@@ -155,7 +155,7 @@ module IsoDoc
       def hierarchical_figure_names(clause, num)
         c = Counter.new
         j = 0
-        clause.xpath(ns(FIGURE_NO_CLASS)).noblank.each do |t|
+        clause.xpath(ns(self.class::FIGURE_NO_CLASS)).noblank.each do |t|
           # next if labelled_ancestor(t) && t.ancestors("figure").empty?
           j = subfigure_increment(j, c, t)
           hierarchical_figure_body(num, j, c, t, "figure")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-22 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc
@@ -425,7 +425,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.