isodoc 2.10.1 → 2.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6867b3f44bce43fcfbd4c65115b8b71b6eb38cb7b1e39c20215addc7af8ad086
-  data.tar.gz: f335e4aecc20758c7c9810083d7da486ec73e0db4c377b9528841b46166085de
+  metadata.gz: d57eb699105f5f1b40c5b31cf51259a1bd60b458ac2b6ab0326beaa915c63750
+  data.tar.gz: 99b2d95988e2f1bb989f0779a60298c57fe08e69127bc07f063bd813403e5858
 SHA512:
-  metadata.gz: 0bda93db557ef73dc1c5999bbd88d9ba06ac9977f48b93f4adca7aaac7e762d5b4fed0d62d8934151ce3ecf1becea0060d3fab65c92e2150a8a00a0c49895ee6
-  data.tar.gz: 1b0d780a2e450e8a22e8f6d4dcbcaa991e73bdcf1343ca3675c2e81b5f52688be7882f58762c18820fd2e99c4c37ea6043af8efc7f454ec44b553e00c3d356e3
+  metadata.gz: 5657c1f981918049eab6e6cd2d17d9d929309714025936dc27256f4ce0ec6b04b3c60a8bbd8839daec8eb322515425349cba06972ef888706ed44ea886cd8527
+  data.tar.gz: 1129bf0dbb9d6e31ef5a8fc50d2dd1f63aa70658c4ffdc60329c6e60fd6da3ffb7127fb32c99609ddd68da4b703f8712f0487820362081d1752d2ac983f5b079

data/lib/isodoc/base_style/all.css

@@ -1,3 +1,4 @@
+@charset "UTF-8";
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,
@@ -169,6 +170,58 @@ table.rouge-line-table pre {
   overflow-x: visible;
   font-size: 100%; }
 
+/* header § links */
+a.header {
+  color: inherit;
+  text-decoration: none; }
+
+a.header:hover {
+  color: #a53221 !important;
+  background: inherit;
+  box-shadow: none; }
+
+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; }
+
+a.anchor:hover {
+  color: #a53221;
+  background: inherit;
+  box-shadow: none; }
+
+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

@@ -1,3 +1,4 @@
+@charset "UTF-8";
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,
@@ -168,3 +169,55 @@ table.rouge-line-table pre {
   padding: 0;
   overflow-x: visible;
   font-size: 100%; }
+
+/* header § links */
+a.header {
+  color: inherit;
+  text-decoration: none; }
+
+a.header:hover {
+  color: #a53221 !important;
+  background: inherit;
+  box-shadow: none; }
+
+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; }
+
+a.anchor:hover {
+  color: #a53221;
+  background: inherit;
+  box-shadow: none; }
+
+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,27 @@ table.rouge-line-table pre {
   overflow-x: visible;
   font-size: 100%;
 }
+
+/* header § links */
+a.header{color:inherit;text-decoration:none;}
+a.header:hover{color:#a53221 !important;background:inherit;box-shadow:none;}
+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}
+a.anchor:hover{color:#a53221;background:inherit;box-shadow:none;}
+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/metadata.rb

@@ -48,6 +48,8 @@ module IsoDoc
       set(:doctype, status_print(b))
       b1 = isoxml&.at(ns("//bibdata/ext/doctype#{currlang}"))&.text || b
       set(:doctype_display, status_print(b1))
+      b = isoxml&.at(ns("//bibdata/ext/subdoctype#{NOLANG}"))&.text || return
+      set(:subdoctype, status_print(b))
     end
 
     def docstatus(xml, _out)

data/lib/isodoc/presentation_function/math.rb

@@ -79,12 +79,12 @@ module IsoDoc
 
     def parse_localize_number
       @localizenumber or return {}
-      m = %r{(?<group>[^#])?(?<groupdigits>#+0)(?<decimal>.)(?<fractdigits>#+)(?<fractgroup>[^#])?}
+      m = %r{(?<grp>[^#])?(?<grpdig>#+0)(?<decpt>.)(?<frdig>#+)(?<frgrp>[^#])?}
         .match(@localizenumber) or return {}
-      ret = { decimal: m[:decimal], group_digits: m[:groupdigits].size,
-              fraction_group_digits: m[:fractdigits].size,
-              group: m[:group] || "",
-              fraction_group: m[:fractgroup] || "" }.compact
+      ret = { decimal: m[:decpt], group_digits: m[:grpdig].size,
+              fraction_group_digits: m[:frdig].size,
+              group: m[:grp] || "",
+              fraction_group: m[:frgrp] || "" }.compact
       %i(group fraction_group).each { |x| ret[x] == " " and ret[x] = "\u00A0" }
       ret
     end

data/lib/isodoc/presentation_function/metadata.rb

@@ -3,6 +3,7 @@ module IsoDoc
     def metadata(docxml)
       toc_metadata(docxml)
       fonts_metadata(docxml)
+      attachments_extract(docxml)
       preprocess_xslt_insert(docxml)
       a = docxml.at(ns("//bibdata")) or return
       a.next =
@@ -10,6 +11,22 @@ module IsoDoc
         "</localized-strings>"
     end
 
+    def attachments_extract(docxml)
+      docxml.at(ns("//metanorma-extension/attachment")) or return
+      dir = File.join(@localdir, "_#{@outputfile}_attachments")
+      FileUtils.rm_rf(dir)
+      FileUtils.mkdir_p(dir)
+      docxml.xpath(ns("//metanorma-extension/attachment")).each do |a|
+        save_attachment(a, dir)
+      end
+    end
+
+    def save_attachment(attachment, dir)
+      n = File.join(dir, attachment["name"])
+      c = attachment.text.sub(%r{^data:[^;]+;(?:charset=[^;]+;)?base64,}, "")
+      File.open(n, "wb") { |f| f.write(Base64.strict_decode64(c)) }
+    end
+
     def extension_insert(xml, path = [])
       ins = extension_insert_pt(xml)
       path.each do |n|

data/lib/isodoc/presentation_function/refs.rb

@@ -25,7 +25,9 @@ module IsoDoc
     def hidden_items(docxml)
       docxml.xpath(ns("//references[bibitem/@hidden = 'true']")).each do |x|
         x.at(ns("./bibitem[not(@hidden = 'true')]")) and next
-        x.elements.map(&:name).any? { |n| n != "bibitem" } and next
+        x.elements.map(&:name).any? do |n|
+          !%w(title bibitem).include?(n)
+        end and next
         x["hidden"] = "true"
       end
     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/presentation_xml_convert.rb

@@ -18,10 +18,13 @@ module IsoDoc
       super
     end
 
-    def convert1(docxml, _filename, _dir)
+    def convert1(docxml, filename, dir)
+      @outputdir = dir
+      @outputfile = filename
       docid_prefixes(docxml) # feeds @xrefs.parse citation processing
       @xrefs.parse docxml
-      info docxml, nil
+      @xrefs.klass.meta = @meta
+      @xrefs.klass.info docxml, nil
       conversions(docxml)
       docxml.root["type"] = "presentation"
       docxml.to_xml.gsub("<", "<").gsub(">", ">")
@@ -120,7 +123,7 @@ module IsoDoc
     def metanorma_extension_insert_pt(xml)
       xml.at(ns("//metanorma-extension")) ||
         xml.at(ns("//bibdata"))&.after("<metanorma-extension/>")
-        &.next_element ||
+          &.next_element ||
         xml.root.elements.first.before("<metanorma-extension/>")
           .previous_element
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.10.1".freeze
+  VERSION = "2.10.3".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")

data/lib/isodoc-yaml/i18n-ja.yaml

@@ -89,7 +89,7 @@ deprecated: 推奨しない用語
 source: 出典
 and: and
 all_parts: 規格群
-edition_ordinal: "第3版{{ var1 }}版"
+edition_ordinal: "第{{ var1 }}版"
 edition: 版
 version: version
 toc_figures: List of figures

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-22 00:00:00.000000000 Z
+date: 2024-06-03 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.