isodoc 2.10.2 → 2.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e19ba3a2fd2440b24be729cbba835907ac504ca7c762f673632de52881922f1
-  data.tar.gz: 6b3fff1e5f4feebc785588093eee4fb81a1da3dc37ff1417b2e30445e353dbcc
+  metadata.gz: d57eb699105f5f1b40c5b31cf51259a1bd60b458ac2b6ab0326beaa915c63750
+  data.tar.gz: 99b2d95988e2f1bb989f0779a60298c57fe08e69127bc07f063bd813403e5858
 SHA512:
-  metadata.gz: 8751365f532c1123f30df8480fca7021cb90122c419e963b4ba46fb6ece8bca0c4bd1593d4c3d3f987f5db5dde295012e01a59af5392929dc3db972db5bb50c9
-  data.tar.gz: '006383549c57caf4cb72ef35b51aaad6ada733981858f2188eb7515f08d8d1e964b7a27e47d723199737c6dc70cd7c379775804ee28b55757fda18a1c77dcb63'
+  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,12 +170,15 @@ 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; }
+  color: #a53221 !important;
+  background: inherit;
+  box-shadow: none; }
 
 a.header:visited {
   color: inherit;
@@ -197,6 +201,11 @@ a.anchor::before {
   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,

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,
@@ -169,12 +170,15 @@ 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; }
+  color: #a53221 !important;
+  background: inherit;
+  box-shadow: none; }
 
 a.header:visited {
   color: inherit;
@@ -197,6 +201,11 @@ a.anchor::before {
   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,

data/lib/isodoc/base_style/reset.scss

@@ -200,11 +200,13 @@ table.rouge-line-table pre {
   font-size: 100%;
 }
 
-a.header{color:inherit;text-decoration:none}
-a.header:hover{color:#a53221}
-a.header:visited{color:inherit;text-decoration:none}
+/* 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,

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_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.2".freeze
+  VERSION = "2.10.3".freeze
 end

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.2
+  version: 2.10.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-06 00:00:00.000000000 Z
+date: 2024-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc