isodoc 2.10.2 → 2.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e19ba3a2fd2440b24be729cbba835907ac504ca7c762f673632de52881922f1
-  data.tar.gz: 6b3fff1e5f4feebc785588093eee4fb81a1da3dc37ff1417b2e30445e353dbcc
+  metadata.gz: df0cc3b9722ac37d5d0853fe0b483fedc476ad51655488a893dcb7c58f08b5a3
+  data.tar.gz: 8f5fe80aa471b64d274e3c8b44b87cc6c9fd5ff20bf52b9a61ee3d8ede5421e0
 SHA512:
-  metadata.gz: 8751365f532c1123f30df8480fca7021cb90122c419e963b4ba46fb6ece8bca0c4bd1593d4c3d3f987f5db5dde295012e01a59af5392929dc3db972db5bb50c9
-  data.tar.gz: '006383549c57caf4cb72ef35b51aaad6ada733981858f2188eb7515f08d8d1e964b7a27e47d723199737c6dc70cd7c379775804ee28b55757fda18a1c77dcb63'
+  metadata.gz: 2f8da1dc68e54da5f58af3ad2ca370e175cc914216ecd2148068ec745975c8229371fa87b586ab60c4701b0b21d9b676893e15d97cabc1e513cba20c5ed2ad80
+  data.tar.gz: b20e85c69fe1f89c327b22c2f0232ab751c577028de077bb6b890ae337d24c98de939a8ecb1ff8607a6d2dd9e577abec8404372572033361c4939578be4e0c99

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/class_utils.rb

@@ -67,7 +67,7 @@ module IsoDoc
 
     def nearest_block_parent(node)
       until %w(p title td th name formula li dt dd sourcecode pre quote
-               note example)
+               note example target clause annex term appendix bibdata)
           .include?(node.name)
         node = node.parent
       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

@@ -8,7 +8,10 @@ module IsoDoc
 
     def mathml(docxml)
       docxml.xpath("//m:math", MATHML).each { |f| mathml_linebreak(f) }
-      locale = twitter_cldr_localiser
+      locale = @lang.to_sym
+      @numfmt = Plurimath::NumberFormatter
+        .new(locale, localize_number: @localizenumber,
+                     localizer_symbols: twitter_cldr_localiser_symbols)
       docxml.xpath("//m:math", MATHML).each do |f| # rubocop:disable Style/CombinableLoops
         mathml1(f, locale)
       end
@@ -18,77 +21,25 @@ module IsoDoc
     # TwitterCldr::DataReaders::NumberDataReader.new(locale).symbols
     def localize_maths(node, locale)
       node.xpath(".//m:mn", MATHML).each do |x|
-        num = BigDecimal(x.text)
-        precision = /\./.match?(x.text) ? x.text.sub(/^.*\./, "").size : 0
-        x.children = localized_number(num, locale, precision)
+        x.children = @numfmt
+          .localized_number(x.text, locale: locale,
+                                    precision: num_precision(x.text))
       rescue ArgumentError
       end
     end
 
-    # By itself twitter-cldr does not support fraction part digits grouping
-    # and custom delimeter, will decorate fraction part manually
-    def localized_number(num, locale, precision)
-      localized = localized_number1(num, locale, precision)
-      twitter_cldr_reader_symbols = twitter_cldr_reader(locale)
-      return localized unless twitter_cldr_reader_symbols[:decimal]
-
-      integer, fraction = localized.split(twitter_cldr_reader_symbols[:decimal])
-      return localized if fraction.nil? || fraction.empty?
-
-      [integer, decorate_fraction_part(fraction, locale)]
-        .join(twitter_cldr_reader_symbols[:decimal])
-    end
-
-    def localized_number1(num, locale, precision)
-      if precision.zero?
-        num.localize(locale).to_s
-      else
-        num.localize(locale).to_decimal.to_s(precision: precision)
-      end
-    end
-
-    def decorate_fraction_part(fract, locale)
-      result = []
-      twitter_cldr_reader_symbols = twitter_cldr_reader(locale)
-      fract = fract.slice(0..(twitter_cldr_reader_symbols[:precision] || -1))
-      fr_group_digits = twitter_cldr_reader_symbols[:fraction_group_digits] || 1
-      until fract.empty?
-        result.push(fract.slice!(0, fr_group_digits))
-      end
-      result.join(twitter_cldr_reader_symbols[:fraction_group].to_s)
+    def num_precision(num)
+      precision = 0
+      /\./.match?(num) and precision =
+                             twitter_cldr_localiser_symbols[:precision] ||
+                             num.sub(/^.*\./, "").size
+      precision
     end
 
     def twitter_cldr_localiser_symbols
       {}
     end
 
-    def twitter_cldr_reader(locale)
-      return @twitter_cldr_reader if @twitter_cldr_reader
-
-      num = TwitterCldr::DataReaders::NumberDataReader.new(locale)
-      @twitter_cldr_reader = num.symbols.merge!(twitter_cldr_localiser_symbols)
-        .merge!(parse_localize_number)
-      @twitter_cldr_reader
-    end
-
-    def twitter_cldr_localiser
-      locale = TwitterCldr.supported_locale?(@lang.to_sym) ? @lang.to_sym : :en
-      twitter_cldr_reader(locale)
-      locale
-    end
-
-    def parse_localize_number
-      @localizenumber or return {}
-      m = %r{(?<group>[^#])?(?<groupdigits>#+0)(?<decimal>.)(?<fractdigits>#+)(?<fractgroup>[^#])?}
-        .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
-      %i(group fraction_group).each { |x| ret[x] == " " and ret[x] = "\u00A0" }
-      ret
-    end
-
     def asciimath_dup(node)
       @suppressasciimathdup || node.parent.at(ns("./asciimath")) and return
       math = node.to_xml.gsub(/ xmlns=["'][^"']+["']/, "")

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