isodoc 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b274e56cc3339018a287a638d7aaf4942d0aef0f65462c56dbf597ef44784d16
-  data.tar.gz: bd76f31818ce3bb71a669493512fe564034bd1ef509a949d8ecdb78633b413f4
+  metadata.gz: e09ef612cbed34d00104fae8b5aa9d6d4f17898cfbf4cae3255fdbb6218f402b
+  data.tar.gz: b91758dc84682c50def94dd0904de92deb862fc1ffcd5c2af81f635fabece882
 SHA512:
-  metadata.gz: e759c0e6f239562fd36f3310493af79e53d38d56b87496be292c04a2134fb3f74cfadeadd6563949c92676f144377f06f92dae7af84cf933ec8a9d90ec302c46
-  data.tar.gz: ced123ca8ad422fcd1f62b28b1135018811d41f72fa180aca58f6f7b8fa1d00ae7dfff7b9d8d336bb032f5986c34e77d93c55aac62b7c68421fd68e172f56755
+  metadata.gz: c61751e1d304d84e32d26626b03849d26c479f6422636665352415eba04be416cc431786e05a45a88329c73e67096f10f3a27465c94c0bac73fa96caad98d3b7
+  data.tar.gz: 9c6f2492605198aad0d0548de81d69fb7cac42efcaab0d4ee9bf4c1afd0a9eef5bdf1d8317cf3df3d785d42d0e8cec69f0a480acb0c505f8bf6d1e03222eb993

data/isodoc.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mn2pdf"
   spec.add_dependency "mn-requirements", "~> 0.1.7"
   spec.add_dependency "relaton-cli"
-  spec.add_dependency "relaton-render", "~> 0.5.0"
+  spec.add_dependency "relaton-render", "~> 0.5.2"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "thread_safe"
   spec.add_dependency "twitter_cldr", ">= 6.6.0"

data/lib/isodoc/convert.rb

@@ -204,8 +204,8 @@ module IsoDoc
       filename, dir = init_file(input_filename, debug)
       docxml.root.default_namespace = ""
       convert_i18n_init(docxml)
-      metadata_init(@lang, @script, @i18n)
-      xref_init(@lang, @script, self, @i18n, {})
+      metadata_init(@lang, @script, @locale, @i18n)
+      xref_init(@lang, @script, self, @i18n, {locale: @locale})
       [docxml, filename, dir]
     end
 

data/lib/isodoc/function/inline.rb

@@ -60,14 +60,17 @@ module IsoDoc
         "#{url}##{anchor.text.strip}"
       end
 
-      def eref_url(bibitemid)
-        return nil if @bibitems.nil? || @bibitems[bibitemid].nil?
+      def eref_url(id)
+        @bibitems.nil? and return nil
 
-        url = @bibitems[bibitemid].at(ns("./uri[@type = 'citation']")) and
+        b = @bibitems[id]
+        b.nil? and return nil
+
+        url = b.at(ns("./uri[@type = 'citation'][@language = '#{@lang}']")) and
           return url.text
-        @bibitems[bibitemid]["hidden"] == "true" and
-          return @bibitems[bibitemid].at(ns("./uri"))&.text
-        "##{bibitemid}"
+        url = b.at(ns("./uri[@type = 'citation']")) and return url.text
+        b["hidden"] == "true" and return b.at(ns("./uri"))&.text
+        "##{id}"
       end
 
       def eref_parse(node, out)
@@ -101,10 +104,9 @@ module IsoDoc
 
       def stem_parse(node, out)
         ooml = case node["type"]
-               when "AsciiMath"
-                 "#{@openmathdelim}#{HTMLEntities.new.encode(node.text)}"\
-                 "#{@closemathdelim}"
-               when "MathML" then node.first_element_child.to_s
+               when "AsciiMath" then asciimath_parse(node)
+               when "MathML" then mathml_parse(node)
+               when "LaTeX" then latexmath_parse(node)
                else HTMLEntities.new.encode(node.text)
                end
         out.span **{ class: "stem" } do |span|
@@ -112,6 +114,24 @@ module IsoDoc
         end
       end
 
+      MATHML = { "m" => "http://www.w3.org/1998/Math/MathML" }.freeze
+
+      def mathml_parse(node)
+        node.at("./m:math", MATHML)&.to_xml
+      end
+
+      def asciimath_parse(node)
+        a = node.at(ns("./asciimath"))&.text || node.text
+
+        "#{@openmathdelim}#{HTMLEntities.new.encode(a)}"\
+          "#{@closemathdelim}"
+      end
+
+      def latexmath_parse(node)
+        a = node.at(ns("./latexmath"))&.text || node.text
+        HTMLEntities.new.encode(a)
+      end
+
       def image_title_parse(out, caption)
         unless caption.nil?
           out.p **{ class: "FigureTitle", style: "text-align:center;" } do |p|

data/lib/isodoc/function/references.rb

@@ -56,15 +56,14 @@ module IsoDoc
         ret.empty? and
           ret = bib.xpath(ns("./docidentifier[@primary = 'true']"))
         ret.empty? and
-          ret = bib.at(ns("./docidentifier[not(@type = 'DOI' or "\
-                          "@type = 'metanorma' "\
-                          "or @type = 'metanorma-ordinal' or "\
-                          "@type = 'ISSN' or @type = 'ISBN')]"\
-                          "[@language = '#{@lang}']")) ||
-            bib.at(ns("./docidentifier[not(@type = 'DOI' or "\
-                      "@type = 'metanorma' "\
-                      "or @type = 'metanorma-ordinal' or "\
-                      "@type = 'ISSN' or @type = 'ISBN')]"))
+          ret = bib.at(ns(<<~XPATH,
+            ./docidentifier[not(@type = 'DOI' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'ISSN' or @type = 'ISBN')][@language = '#{@lang}']
+          XPATH
+                         )) ||
+            bib.at(ns(<<~XPATH,
+              ./docidentifier[not(@type = 'DOI' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'ISSN' or @type = 'ISBN')]
+            XPATH
+                     ))
         ret
       end
 
@@ -210,7 +209,7 @@ module IsoDoc
         page_break(out)
         out.div do |div|
           div.h1 **{ class: "Section3" } do |h1|
-            f&.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
+            f.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
           end
           biblio_list(f, div, true)
         end

data/lib/isodoc/init.rb

@@ -1,7 +1,7 @@
 module IsoDoc
   class Convert < ::IsoDoc::Common
-    def metadata_init(lang, script, i18n)
-      @meta = Metadata.new(lang, script, i18n)
+    def metadata_init(lang, script, locale, i18n)
+      @meta = Metadata.new(lang, script, locale, i18n)
     end
 
     def xref_init(lang, script, _klass, i18n, options)

data/lib/isodoc/metadata.rb

@@ -15,11 +15,12 @@ module IsoDoc
       @i18n.l10n(expr, lang, script, locale)
     end
 
-    def initialize(lang, script, i18n, fonts_options = {})
+    def initialize(lang, script, locale, i18n, fonts_options = {})
       @metadata = { lang: lang, script: script }
       DATETYPES.each { |w| @metadata["#{w.gsub(/-/, '_')}date".to_sym] = "XXX" }
       @lang = lang
       @script = script
+      @locale = locale
       @c = HTMLEntities.new
       @i18n = i18n
       @labels = @i18n.get

data/lib/isodoc/presentation_function/image.rb

@@ -53,7 +53,13 @@ module IsoDoc
 
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
       prefix_name(elem, block_delim,
-                  l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
+                  l10n("#{figure_label(elem)} #{lbl}"), "name")
+    end
+
+    def figure_label(elem)
+      klass = elem["class"] || "figure"
+      klasslbl = @i18n.get[klass] || klass
+      lower2cap klasslbl
     end
 
     def eps2svg(img)

data/lib/isodoc/presentation_function/terms.rb

@@ -101,14 +101,19 @@ module IsoDoc
       pref = nil
       term.xpath(ns("./preferred[expression/name]")).each_with_index do |p, i|
         if i.zero? then pref = p
-        elsif merge_preferred_eligible?(pref, p)
-          pref.at(ns("./expression/name")) <<
-            l10n("; #{p.at(ns('./expression/name')).children.to_xml}")
-          p.remove
+        else merge_second_preferred1(pref, p)
         end
       end
     end
 
+    def merge_second_preferred1(pref, second)
+      if merge_preferred_eligible?(pref, second)
+        n1 = pref.at(ns("./expression/name"))
+        n2 = second.remove.at(ns("./expression/name"))
+        n1.children = l10n("#{n1.children.to_xml}; #{n2.children.to_xml}")
+      end
+    end
+
     def merge_preferred_eligible?(first, second)
       firstex = first.at(ns("./expression")) || {}
       secondex = second.at(ns("./expression")) || {}

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.3.0".freeze
+  VERSION = "2.3.2".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -42,8 +42,7 @@ module IsoDoc
           .gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
         @wordstylesheet = wordstylesheet_update
         Html2Doc.new(
-          filename: filename,
-          imagedir: @localdir,
+          filename: filename, imagedir: @localdir,
           stylesheet: @wordstylesheet&.path,
           header_file: header&.path, dir: dir,
           asciimathdelims: [@openmathdelim, @closemathdelim],
@@ -110,8 +109,8 @@ module IsoDoc
           t.xpath(".//tr").each_with_index do |tr, r|
             tr.xpath("./td | ./th").each_with_index do |td, _i|
               x = 0
-              rs = td&.attr("rowspan")&.to_i || 1
-              cs = td&.attr("colspan")&.to_i || 1
+              rs = td.attr("rowspan")&.to_i || 1
+              cs = td.attr("colspan")&.to_i || 1
               while cells2d[r][x]
                 x += 1
               end

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -20,22 +20,38 @@ module IsoDoc
         idx
       end
 
+      FIGURE_NO_CLASS = <<~XPATH.freeze
+        .//figure[not(@class)] | .//figure[@class = 'pseudocode'] | .//sourcecode[not(ancestor::example)]
+      XPATH
+
       def sequential_figure_names(clause)
         c = Counter.new
         j = 0
-        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
-          .noblank.each do |t|
+        clause.xpath(ns(FIGURE_NO_CLASS)).noblank.each do |t|
           j = subfigure_increment(j, c, t)
-          sequential_figure_body(j, c, t)
+          sequential_figure_body(j, c, t, "figure")
+        end
+        sequential_figure_class_names(clause)
+      end
+
+      def sequential_figure_class_names(clause)
+        c = {}
+        j = 0
+        clause.xpath(ns(".//figure[@class][not(@class = 'pseudocode')]"))
+          .each do |t|
+          c[t["class"]] ||= Counter.new
+          j = subfigure_increment(j, c[t["class"]], t)
+          sequential_figure_body(j, c[t["class"]], t, t["class"])
         end
       end
 
-      def sequential_figure_body(subfignum, counter, block)
+      def sequential_figure_body(subfignum, counter, block, klass)
         label = counter.print
         label &&= label + (subfignum.zero? ? "" : "-#{subfignum}")
 
         @anchors[block["id"]] = anchor_struct(
-          label, nil, @labels["figure"], "figure", block["unnumbered"]
+          label, nil, @labels[klass] || klass.capitalize, klass,
+          block["unnumbered"]
         )
       end
 
@@ -134,21 +150,32 @@ module IsoDoc
       def hierarchical_figure_names(clause, num)
         c = Counter.new
         j = 0
-        clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]"))
-          .noblank.each do |t|
+        clause.xpath(ns(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)
+          hierarchical_figure_body(num, j, c, t, "figure")
+        end
+        hierarchical_figure_class_names(clause, num)
+      end
+
+      def hierarchical_figure_class_names(clause, num)
+        c = {}
+        j = 0
+        clause.xpath(ns(".//figure[@class][not(@class = 'pseudocode')]"))
+          .noblank.each do |t|
+          c[t["class"]] ||= Counter.new
+          j = subfigure_increment(j, c[t["class"]], t)
+          hierarchical_figure_body(num, j, c[t["class"]], t, t["class"])
         end
       end
 
-      def hierarchical_figure_body(num, subfignum, counter, block)
+      def hierarchical_figure_body(num, subfignum, counter, block, klass)
         label = "#{num}#{hiersep}#{counter.print}" +
           (subfignum.zero? ? "" : "#{hierfigsep}#{subfignum}")
 
-        @anchors[block["id"]] = anchor_struct(label, nil, @labels["figure"],
-                                              "figure", block["unnumbered"])
+        @anchors[block["id"]] =
+          anchor_struct(label, nil, @labels[klass] || klass.capitalize,
+                        klass, block["unnumbered"])
       end
 
       def hierarchical_table_names(clause, num)

data/lib/isodoc/xref.rb

@@ -24,6 +24,7 @@ module IsoDoc
       @i18n = i18n
       @labels = @i18n.get
       @klass.i18n = @i18n
+      @locale = options[:locale]
       @reqt_models = @klass.requirements_processor
         .new({
                default: "default", lang: lang, script: script,

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

@@ -48,6 +48,7 @@ termnote: ملاحظة % للقيد
 list: قائمة
 deflist: قائمة تعريف
 figure: شكل
+diagram: رسم بياني
 formula: معادلة
 inequality: عدم مساواة
 table: جدول

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

@@ -54,6 +54,7 @@ termnote: Hinweis % zum Eintrag
 list: Liste
 deflist: Definitionsliste
 figure: Abbildung
+diagram: Diagramm
 formula: Formel
 inequality: Formel
 table: Tabelle

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

@@ -54,6 +54,7 @@ termnote: Note % to entry
 list: List
 deflist: Definition List
 figure: Figure
+diagram: Diagram
 formula: Formula
 inequality: Formula
 table: Table

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

@@ -54,6 +54,7 @@ termnote: Nota % a la entrada
 list: Lista
 deflist: Lista de definiciones
 figure: Figura
+diagram: Diagrama
 formula: Fórmula
 inequality: Fórmula
 table: Tabla

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

@@ -49,6 +49,7 @@ note: NOTE
 note_xref: Note
 termnote: Note % à l’article
 figure: Figure
+diagram: Diagramme
 formula: Formule
 inequality: Formule
 list: Liste

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

@@ -59,6 +59,7 @@ termnote: Примечание % к определению
 list: Список
 deflist: Список определений
 figure: Рисунок
+diagram: Диаграмма
 formula: Формула
 inequality: Формула
 table: Таблица

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -47,6 +47,7 @@ note: 注
 note_xref: 注
 termnote: 注%
 figure: 图
+diagram: 图表
 formula: 公式
 inequality: 公式
 list: 列项

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2022-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement