isodoc 2.10.0 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d98a917ee770ef1034262fa29628010e3254f3ddb5d8dfe63be54c57c3d58c0
-  data.tar.gz: 64b2107fddc44c0096653fc0319c7b0df81285327ab83600471b1b99971f3dbd
+  metadata.gz: 3e19ba3a2fd2440b24be729cbba835907ac504ca7c762f673632de52881922f1
+  data.tar.gz: 6b3fff1e5f4feebc785588093eee4fb81a1da3dc37ff1417b2e30445e353dbcc
 SHA512:
-  metadata.gz: 1b1ac5b466169fd9f2698b79617ef4d2c6dd9dbf35b0cca715102ddddfcb2a0013be3bd02153263da42a7f3cde0150ccffa4f3e16e7b750dd0f73be23420e4b1
-  data.tar.gz: 26338d106c6e1cb5133c305c97ec5a8bb1c75292120ce2928efb93572ea6ff79b203eef4a6d73419d097cad76d6a0e22e71beac64a0f483dc09919e8d7d25e86
+  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.rb

@@ -152,6 +152,7 @@ module IsoDoc
       end
 
       def table_of_contents(clause, out)
+        @bare and return
         page_break(out)
         out.div **attr_code(preface_attrs(clause)) do |div|
           clause_name(clause, clause.at(ns("./title")), div,
@@ -194,32 +195,28 @@ module IsoDoc
       end
 
       def copyright_parse(node, out)
-        return if @bare
-
+        @bare and return
         out.div class: "boilerplate-copyright" do |div|
           node.children.each { |n| parse(n, div) }
         end
       end
 
       def license_parse(node, out)
-        return if @bare
-
+        @bare and return
         out.div class: "boilerplate-license" do |div|
           node.children.each { |n| parse(n, div) }
         end
       end
 
       def legal_parse(node, out)
-        return if @bare
-
+        @bare and return
         out.div class: "boilerplate-legal" do |div|
           node.children.each { |n| parse(n, div) }
         end
       end
 
       def feedback_parse(node, out)
-        return if @bare
-
+        @bare and return
         out.div class: "boilerplate-feedback" do |div|
           node.children.each { |n| parse(n, div) }
         end

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

@@ -40,8 +40,10 @@ module IsoDoc
       end
 
       def html_preface(docxml)
-        html_cover(docxml) if @htmlcoverpage && !@bare
-        html_intro(docxml) if @htmlintropage && !@bare
+        @htmlcoverpage && !@htmlcoverpage.empty? && !@bare and
+          html_cover(docxml)
+        @htmlintropage && !@htmlintropage.empty? && !@bare and
+          html_intro(docxml)
         docxml.at("//body") << mathjax(@openmathdelim, @closemathdelim)
         html_main(docxml)
         authority_cleanup(docxml)
@@ -96,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/refs.rb

@@ -102,9 +102,14 @@ module IsoDoc
     end
 
     def bibliography_bibitem_number_insert_pt(bibitem)
-      unless ins = bibitem.at(ns(".//docidentifier")).previous_element
-        bibitem.at(ns(".//docidentifier")).previous = " "
-        ins = bibitem.at(ns(".//docidentifier")).previous
+      unless d = bibitem.at(ns(".//docidentifier"))
+        d = bibitem.children.first
+        d.previous = " "
+        return d.previous
+      end
+      unless ins = d.previous_element
+        d.previous = " "
+        ins = d.previous
       end
       ins
     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.0".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/word_function/postprocess.rb

@@ -64,10 +64,16 @@ module IsoDoc
         word_tab_clean(docxml)
         authority_cleanup(docxml)
         word_footnote_format(docxml)
+        word_remove_empty_toc(docxml)
         word_remove_empty_sections(docxml)
         docxml
       end
 
+      def word_remove_empty_toc(docxml)
+        docxml.at("//div[@class = 'TOC']//p[@class = 'MsoToc1']") and return
+        remove_toc_div(docxml)
+      end
+
       def word_sourcecode_annotations(html)
         ann = ".//div[@class = 'annotation']"
         html.xpath("//p[@class = '#{sourcecode_style}'][#{ann}]")

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -2,8 +2,10 @@ module IsoDoc
   module WordFunction
     module Postprocess
       def word_preface(docxml)
-        word_cover(docxml) if @wordcoverpage
-        word_intro(docxml, @wordToClevels) if @wordintropage
+        @wordcoverpage && !@wordcoverpage.empty? and
+          word_cover(docxml)
+        @wordintropage && !@wordintropage.empty? and
+          word_intro(docxml, @wordToClevels)
       end
 
       def word_remove_empty_sections(docxml)

data/lib/isodoc/word_function/postprocess_toc.rb

@@ -4,11 +4,7 @@ module IsoDoc
       def insert_toc(intro, docxml, level)
         toc = assemble_toc(docxml, level)
         if intro&.include?("WORDTOC")
-          if s = docxml.at("//div[@class = 'TOC']")
-            s&.previous_element&.elements&.first&.name == "br" and
-              s&.previous_element&.remove # page break
-            s.remove
-          end
+          remove_toc_div(docxml)
           intro.sub("WORDTOC", toc)
         else
           source = docxml.at("//div[@class = 'TOC']") and
@@ -17,6 +13,14 @@ module IsoDoc
         end
       end
 
+      def remove_toc_div(docxml)
+        s = docxml.at("//div[@class = 'TOC']") or return
+        prev = s.previous_element
+        prev&.elements&.first&.name == "br" and
+          prev&.remove # page break
+        s.remove
+      end
+
       def assemble_toc(docxml, level)
         toc = ""
         toc += make_WordToC(docxml, level)

data/lib/isodoc/xref/clause_order.rb

@@ -0,0 +1,41 @@
+module IsoDoc
+  module XrefGen
+    module Sections
+      def clause_order(docxml)
+        { preface: clause_order_preface(docxml),
+          main: clause_order_main(docxml),
+          annex: clause_order_annex(docxml),
+          back: clause_order_back(docxml) }
+      end
+
+      def clause_order_preface(_docxml)
+        [{ path: "//preface/*", multi: true }]
+      end
+
+      def clause_order_main(docxml)
+        [
+          { path: "//sections/clause[@type = 'scope']" },
+          { path: @klass.norm_ref_xpath },
+          { path: "//sections/terms | " \
+            "//sections/clause[descendant::terms]" },
+          { path: "//sections/definitions | " \
+            "//sections/clause[descendant::definitions]" \
+            "[not(descendant::terms)]" },
+          { path: @klass.middle_clause(docxml), multi: true },
+        ]
+      end
+
+      def clause_order_annex(_docxml)
+        [{ path: "//annex", multi: true }]
+      end
+
+      def clause_order_back(_docxml)
+        [
+          { path: @klass.bibliography_xpath },
+          { path: "//indexsect", multi: true },
+          { path: "//colophon/*", multi: true },
+        ]
+      end
+    end
+  end
+end

data/lib/isodoc/xref/xref_counter.rb

@@ -139,7 +139,7 @@ module IsoDoc
       end
 
       def increment(node)
-        @unnumbered = (node["unnumbered"] || node["hidden"]) and return self
+        @unnumbered = node["unnumbered"] == "true" || node["hidden"] == "true" and return self
         reset_overrides
         if node["subsequence"] != @subseq &&
             !(blank?(node["subsequence"]) && blank?(@subseq))

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")

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -1,42 +1,8 @@
+require_relative "clause_order"
+
 module IsoDoc
   module XrefGen
     module Sections
-      def clause_order(docxml)
-        { preface: clause_order_preface(docxml),
-          main: clause_order_main(docxml),
-          annex: clause_order_annex(docxml),
-          back: clause_order_back(docxml) }
-      end
-
-      def clause_order_preface(_docxml)
-        [{ path: "//preface/*", multi: true }]
-      end
-
-      def clause_order_main(docxml)
-        [
-          { path: "//sections/clause[@type = 'scope']" },
-          { path: @klass.norm_ref_xpath },
-          { path: "//sections/terms | " \
-            "//sections/clause[descendant::terms]" },
-          { path: "//sections/definitions | " \
-            "//sections/clause[descendant::definitions]" \
-            "[not(descendant::terms)]" },
-          { path: @klass.middle_clause(docxml), multi: true },
-        ]
-      end
-
-      def clause_order_annex(_docxml)
-        [{ path: "//annex", multi: true }]
-      end
-
-      def clause_order_back(_docxml)
-        [
-          { path: @klass.bibliography_xpath },
-          { path: "//indexsect", multi: true },
-          { path: "//colophon/*", multi: true },
-        ]
-      end
-
       def back_anchor_names(xml)
         if @parse_settings.empty? || @parse_settings[:clauses]
           annex_anchor_names(xml)
@@ -173,7 +139,7 @@ module IsoDoc
       end
 
       def section_names(clause, num, lvl)
-        clause.nil? and return num
+        unnumbered_section_name?(clause) and return num
         num.increment(clause)
         section_name_anchors(clause, num.print, lvl)
         clause.xpath(ns(SUBCLAUSES))
@@ -184,6 +150,7 @@ module IsoDoc
       end
 
       def section_names1(clause, num, level)
+        unnumbered_section_name?(clause) and return num
         section_name_anchors(clause, num, level)
         i = Counter.new(0, prefix: "#{num}.")
         clause.xpath(ns(SUBCLAUSES)).each do |c|
@@ -191,6 +158,15 @@ module IsoDoc
         end
       end
 
+      def unnumbered_section_name?(clause)
+        clause.nil? and return true
+        if clause["unnumbered"] == "true"
+          unnumbered_names(clause)
+          return true
+        end
+        false
+      end
+
       def section_name_anchors(clause, num, level)
         @anchors[clause["id"]] =
           { label: num, xref: l10n("#{@labels['clause']} #{num}"),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-08 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc
@@ -392,6 +392,7 @@ files:
 - lib/isodoc/word_function/postprocess_toc.rb
 - lib/isodoc/word_function/table.rb
 - lib/isodoc/xref.rb
+- lib/isodoc/xref/clause_order.rb
 - lib/isodoc/xref/xref_anchor.rb
 - lib/isodoc/xref/xref_counter.rb
 - lib/isodoc/xref/xref_gen.rb
@@ -424,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.