isodoc 3.3.4 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b99322fd21e6bc86de1bfad69007298374e43c72150f01c78d26a5d103484bb5
-  data.tar.gz: 7831171649ae4524663d22fd82ee5268e5850013a0b38076667e2696ab826683
+  metadata.gz: 18d33859f89e36a66412218c04370f02c727fe131dd91b73fd3671ab25cf228f
+  data.tar.gz: cc2996c38878a5acacf24932cf2719a1bef922cea11cf5c26411172e9a93032a
 SHA512:
-  metadata.gz: 7e63a3b279f16b1a2d268e5525907f66a77e35d6f6eca9e99ab64574f0bb209df146b3494620cc4c0fdaf00fb3e2c8e6e29b059657a1576e1ea2d2033326d62e
-  data.tar.gz: eebf15ef8301fff98338e1cb273fe69eaee8c3b18e7bce58a7430f3d8f944abfab1cead5d0a8d69c6982671272b475a4acd630407bb062d89e1482e9db9868c3
+  metadata.gz: dde602b7132920dff5599dc3da2bb0de9ef027f5b3dd703fadc190adec9fab8e26901798bc208d3b3d279b57c5d19fa7ccbe885c37591da875e79f8dd5c364d4
+  data.tar.gz: 8d67a2d2518105cf854c7bb7f21a841de922785b0c77060e6002e6023c8de2b14efb8a9cbea25d140101183349b4b346287332eeb230b0c33aa5e0db3dcb3321

data/isodoc.gemspec

@@ -36,8 +36,7 @@ Gem::Specification.new do |spec|
   # spec.add_dependency "metanorma-utils", "~> 1.5.0" # already in isodoc-i18n
   spec.add_dependency "mn2pdf", ">= 2.13"
   spec.add_dependency "mn-requirements", "~> 0.5.0"
-
-  spec.add_dependency "relaton-render", "~> 0.10.0"
+  spec.add_dependency "relaton-render", "~> 1.0.0"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "rouge", "~> 4.0"
   spec.add_dependency "thread_safe"
@@ -57,5 +56,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "canon" , "= 0.1.3"
+  spec.add_development_dependency "openssl"
   # spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/isodoc/function/inline.rb

@@ -44,12 +44,16 @@ module IsoDoc
       end
 
       def xref_parse(node, out)
-        target = if node["target"].include?("#")
-                   node["target"].sub("#", ".html#")
-                 else
-                   "##{node['target']}"
-                 end
-        out.a(href: target) { |l| no_locality_parse(node, l) }
+        if %w(short full).include?(node["style"])
+          no_locality_parse(node, out)
+        else
+          target = if node["target"].include?("#")
+                     node["target"].sub("#", ".html#")
+                   else
+                     "##{node['target']}"
+                   end
+          out.a(href: target) { |l| no_locality_parse(node, l) }
+        end
       end
 
       def suffix_url(url)
@@ -109,7 +113,7 @@ module IsoDoc
       def asciimath_parse(node)
         a = node.at(ns("./asciimath"))&.text || node.text
         ["#{@openmathdelim}#{HTMLEntities.new.encode(a)}" \
-          "#{@closemathdelim}", /^[[0-9,.+-]]*$/.match?(a)]
+         "#{@closemathdelim}", /^[[0-9,.+-]]*$/.match?(a)]
       end
 
       def latexmath_parse(node)

data/lib/isodoc/html_function/postprocess_cover.rb

@@ -10,28 +10,29 @@ module IsoDoc
           .gsub(%r{\]\]>\s*</script>}, "</script>")
           .gsub(%r{<!\[CDATA\[\s*<script([^<>]*)>}m, "<script\\1>")
           .gsub(%r{</script>\s*\]\]>}, "</script>")
+          .gsub(%r{<style([^<>]*)>\s*<!\[CDATA\[}m, "<style\\1>")
+          .gsub(%r{\]\]>\s*</style>}, "</style>")
+          .gsub(%r{<!\[CDATA\[\s*<style([^<>]*)>}m, "<style\\1>")
+          .gsub(%r{</style>\s*\]\]>}, "</style>")
       end
 
       def htmlstylesheet(file)
         file.nil? and return
         file.open if file.is_a?(Tempfile)
         stylesheet = file.read
-        xml = Nokogiri::XML("<style/>")
-        xml.children.first << Nokogiri::XML::Comment
-          .new(xml, "\n#{stylesheet}\n")
         file.close
         file.unlink if file.is_a?(Tempfile)
-        xml.root.to_s
+        stylesheet
       end
 
       def htmlstyle(docxml)
         @htmlstylesheet or return docxml
         head = docxml.at("//*[local-name() = 'head']")
-        head << htmlstylesheet(@htmlstylesheet)
-        s = htmlstylesheet(@htmlstylesheet_override) and head << s
+        head << Nokogiri::HTML.fragment("<style>#{htmlstylesheet(@htmlstylesheet)}</style>")
+        s = htmlstylesheet(@htmlstylesheet_override) and head << Nokogiri::HTML.fragment("<style>#{s}</style>")
         s = @meta.get[:code_css] and
-          head << "<style><!--#{s.gsub(/sourcecode/,
-                                       'pre.sourcecode')}--></style>"
+          head << Nokogiri::HTML.fragment("<style>#{s.gsub(/sourcecode/,
+                                                           'pre.sourcecode')}</style>")
         @bare and
           head << "<style>body {margin-left: 2em; margin-right: 2em;}</style>"
         docxml

data/lib/isodoc/init.rb

@@ -58,6 +58,20 @@ module IsoDoc
       @bare = options[:bare]
       @semantic_xml_insert = options[:semanticxmlinsert] != "false"
       @log = options[:log]
+      @log&.add_msg(log_messages)
+    end
+
+    def log_messages
+      # rubocop:disable Naming/VariableNumber
+      {
+        "STANDOC_36": { category: "Anchors",
+                        error: "ID %s has already been used at line %s",
+                        severity: 0 },
+        "ISODOC_1": { category: "Crossreferences",
+                      error: "Anchor %s pointed to by %s " \
+             "is not defined in the document", severity: 1 },
+      }
+      # rubocop:enable Naming/VariableNumber
     end
 
     def init_i18n(options)

data/lib/isodoc/presentation_function/autonum.rb

@@ -118,7 +118,7 @@ module IsoDoc
         prefix_container_fmt_xref_label(container_container,
                                         @xrefs.anchor(container, :xref, false))
       l10n(connectives_spans(@i18n.nested_xref
-        .sub("%1", "<span class='fmt-xref-container'><esc>#{container_label}</esc></span>")
+        .sub("%1", "<span class='fmt-xref-container'>#{esc container_label}</span>")
         .sub("%2", xref)))
     end
 
@@ -155,5 +155,10 @@ module IsoDoc
       elsif label then label
       end
     end
+
+    def esc(text)
+      text.nil? || text.empty? and return text
+      "<esc>#{text}</esc>"
+    end
   end
 end

data/lib/isodoc/presentation_function/block.rb

@@ -192,9 +192,12 @@ module IsoDoc
     def source1(elem, ancestor)
       source_elems = source1_gather(elem)
       source_elems.each do |e|
+        e.xpath(ns(".//origin")).each do |origin|
+          origin.wrap("<esc></esc>")
+        end
         elem << "#{source_join_delim(elem)}#{to_xml(e.remove.children).strip}"
       end
-      source1_label(elem, to_xml(elem.children).strip, ancestor)
+      source1_label(elem, @i18n.l10n(to_xml(elem.children).strip), ancestor)
     end
 
     def source1_gather(elem)
@@ -211,7 +214,7 @@ module IsoDoc
     end
 
     def source1_label(elem, sources, _ancestor)
-      elem.children = l10n("[#{@i18n.source}: #{sources}]")
+      elem.children = l10n("[#{@i18n.source}: #{esc sources}]")
     end
 
     def source_modification(mod)

data/lib/isodoc/presentation_function/erefs.rb

@@ -56,7 +56,7 @@ module IsoDoc
         if XREF_CONNECTIVES.include?(x) || [", ", " ", ""].include?(x)
           x
         else
-          "<esc>#{x}</esc>"
+          esc x
         end
       end
     end
@@ -103,7 +103,8 @@ module IsoDoc
         sem_xml_descendant?(e) and next
         href = eref_target(e) or next
         e.xpath(ns("./locality | ./localityStack")).each(&:remove)
-        if href[:type] == :anchor then eref2xref(e)
+        if href[:type] == :anchor || %w(full short).include?(e["style"])
+            eref2xref(e)
         else eref2link1(e, href)
         end
       end

data/lib/isodoc/presentation_function/erefs_locality.rb

@@ -2,7 +2,7 @@ module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def eref_localities(refs, target, node)
       if can_conflate_eref_rendering?(refs)
-        l10n(", <esc>#{eref_localities_conflated(refs, target, node)}</esc>"
+        l10n(", #{esc(eref_localities_conflated(refs, target, node))}"
           .gsub(/\s+/, " "), @lang, @script, { prev: target })
       else
         ret = resolve_eref_connectives(eref_locality_stacks(refs, target, node))
@@ -81,8 +81,8 @@ module IsoDoc
     end
 
     def eref_localities1_zh(opt)
-      ret = "第<esc>#{opt[:from]}</esc>" if opt[:from]
-      ret += "&#x2013;<esc>#{opt[:upto]}</esc>" if opt[:upto]
+      ret = "第#{esc opt[:from]}" if opt[:from]
+      ret += "&#x2013;#{esc opt[:upto]}" if opt[:upto]
       loc = eref_locality_populate(opt[:type], opt[:node], "sg")
       ret += " #{loc}" unless opt[:node]["droploc"] == "true"
       ret

data/lib/isodoc/presentation_function/ids.rb

@@ -30,9 +30,8 @@ module IsoDoc
 
     def repeat_id_validate1(elem)
       if @doc_ids[elem["id"]]
-        @log&.add("Anchors", elem,
-                  "Anchor #{elem['id']} has already been " \
-                  "used at line #{@doc_ids[elem['id']]}", severity: 0)
+        @log&.add("STANDOC_36", elem,
+                  params: [elem["id"], @doc_ids[elem["id"]]])
       end
       @doc_ids[elem["id"]] = elem.line
     end
@@ -71,9 +70,7 @@ module IsoDoc
       node[attr].strip.empty? and return
       @doc_ids[node[attr]] and return
       @doc_orig_ids[node[attr]] and return
-      @log.add("Anchors", node,
-               "Anchor #{node[attr]} pointed to by #{node.name} " \
-               "is not defined in the document", severity: 1)
+      @log.add("ISODOC_1", node, params: [node[attr], node.name])
     end
 
     def provide_ids(docxml)

data/lib/isodoc/presentation_function/image.rb

@@ -25,6 +25,10 @@ module IsoDoc
 
     def svgmap_extract(elem)
       if elem.at(ns("./figure"))
+        if n1 = elem.next_element
+          n1.name == "semx" && n1["element"] == "svgmap" and return
+        end
+
         n = semx_fmt_dup(elem)
         n.xpath(ns("./target")).each(&:remove)
         elem.next = n

data/lib/isodoc/presentation_function/refs.rb

@@ -24,7 +24,7 @@ module IsoDoc
       identifiers = render_identifier(ids)
       reference = docid_l10n(identifiers[:metanorma] || identifiers[:sdo] ||
                     identifiers[:ordinal] || identifiers[:doi])
-      @xrefs.get[ref["id"]] = { xref: reference }
+      @xrefs.get[ref["id"]] = { xref: esc(reference) }
     end
 
     def move_norm_ref_to_sections(docxml)
@@ -61,8 +61,7 @@ module IsoDoc
         prep_for_rendering(b)
         m << to_xml(b)
       end.join
-      @bibrender.render_all("<references>#{refs}</references>",
-                            type: citestyle)
+      @bibrender.render_all("<references>#{refs}</references>")
     end
 
     def prep_for_rendering(bib)
@@ -97,10 +96,6 @@ module IsoDoc
       end
     end
 
-    def citestyle
-      nil
-    end
-
     def bibliography_bibitem_number_skip(bibitem)
       implicit_reference(bibitem) ||
         bibitem.at(ns(".//docidentifier[@type = 'metanorma']")) ||
@@ -174,13 +169,14 @@ module IsoDoc
             else norm_ref_entry_code(ordinal, idents, ids, standard, datefn,
                                      bib)
             end
-      bib.add_first_child("<biblio-tag>#{ret}</biblio-tag>")
+      bib.add_first_child("<biblio-tag>#{@i18n.l10n(ret)}</biblio-tag>")
     end
 
     def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn, _bib)
       ret = (idents[:ordinal] || idents[:metanorma] || idents[:sdo]).to_s
+      ret = esc(ret)
       (idents[:ordinal] || idents[:metanorma]) && idents[:sdo] and
-        ret += ", #{idents[:sdo]}"
+        ret += ", #{esc idents[:sdo]}"
       ret += datefn
       ret.empty? and return ret
       idents[:sdo] and ret += ","
@@ -192,10 +188,10 @@ module IsoDoc
     # else, use both ordinal, as prefix, and ids
     def biblio_ref_entry_code(ordinal, ids, _id, _standard, datefn, _bib)
       # standard and id = nil
-      ret = ids[:ordinal] || ids[:metanorma] || "[#{ordinal}]"
+      ret = esc(ids[:ordinal]) || esc(ids[:metanorma]) || "[#{esc ordinal.to_s}]"
       if ids[:sdo] && !ids[:sdo].empty?
         ret = prefix_bracketed_ref(ret)
-        ret += "#{ids[:sdo]}#{datefn}, "
+        ret += "#{esc ids[:sdo]}#{datefn}, "
       else
         ret = prefix_bracketed_ref("#{ret}#{datefn}")
       end

data/lib/isodoc/presentation_function/terms.rb

@@ -148,7 +148,8 @@ module IsoDoc
       m1.replace("<modification>#{to_xml(new_m1)}</modification>")
     end
 
-    # concatenate sources. localise the concatenation, escaping the concatenands
+    # concatenate sources. localise the concatenation, escaping the docids
+    # within the concatenands
     # from punctuation localisation: l10n(<esc>A</esc>, <esc>B</esc>)
     # pass the result to termsource_label, where it will be appended after
     # "SOURCE: ", and therefore again needs to be escaped
@@ -157,9 +158,14 @@ module IsoDoc
       while elem.next_element&.name == "source"
         ret << semx_fmt_dup(elem.next_element.remove)
       end
-      s = ret.map { |x| to_xml(x) }.map(&:strip).map { |x| "<esc>#{x}</esc>" }
+      ret.each do |element|
+        element.xpath(ns(".//origin")).each do |origin|
+          origin.wrap("<esc></esc>")
+        end
+      end
+      s = ret.map { |x| to_xml(x) }.map(&:strip)
         .join(termsource_join_delim(elem))
-      termsource_label(elem, "<esc>#{@i18n.l10n s}</esc>")
+      termsource_label(elem, @i18n.l10n(s))
     end
 
     def termsource_join_delim(_elem)
@@ -167,7 +173,7 @@ module IsoDoc
     end
 
     def termsource_label(elem, sources)
-      elem.replace(l10n("[#{@i18n.source}: <esc>#{sources}</esc>]"))
+      elem.replace(l10n("[#{@i18n.source}: #{esc sources}]"))
     end
 
     def termsource_modification(elem)
@@ -179,13 +185,17 @@ module IsoDoc
       termsource_add_modification_text(mod)
     end
 
+    def termsource_mod_text_delim(_elem)
+      " &#x2014; "
+    end
+
     def termsource_add_modification_text(mod)
       mod or return
       if mod.text.strip.empty?
         mod.remove
         return
       end
-      mod.previous = " &#x2014; "
+      mod.previous = termsource_mod_text_delim(mod)
       c = mod.at(ns("./semx")) || mod
       c.elements.size == 1 and c.children = to_xml(c.elements[0].children)
       mod.replace(mod.children)

data/lib/isodoc/presentation_function/xrefs.rb

@@ -21,8 +21,8 @@ module IsoDoc
                          anchor_xref(node, container, container: true),
                          node, target)
       l10n(connectives_spans(@i18n.nested_xref
-        .sub("%1", "<span class='fmt-xref-container'><esc>#{container_label}</esc></span>")
-        .sub("%2", "<esc>#{linkend}</esc>")))
+        .sub("%1", "<span class='fmt-xref-container'>#{esc container_label}</span>")
+        .sub("%2", esc(linkend))))
     end
 
     def anchor_value(id)
@@ -33,6 +33,9 @@ module IsoDoc
     def anchor_linkend(node, linkend)
       node["style"] == "id" and
         return anchor_id_postproc(node)
+      node["style"] && x = @ref_renderings&.dig(node["bibitemid"], :citation,
+                                                node["style"].to_sym) and
+        return x.strip
       node["citeas"].nil? && node["bibitemid"] and
         return citeas_cleanup(@xrefs.anchor(node["bibitemid"], :xref)) || "???"
       node.at(ns("./location")) and
@@ -70,7 +73,7 @@ module IsoDoc
     def anchor_xref_short(node, target, container)
       if (l = node["label"]) && !container
         v = anchor_value(target)
-        @i18n.l10n(%[<span class="fmt-element-name">#{l}</span> <esc>#{v}</esc>])
+        @i18n.l10n(%[<span class="fmt-element-name">#{l}</span> #{esc v}])
       else @xrefs.anchor(target, :xref)
       end
     end
@@ -94,7 +97,7 @@ module IsoDoc
                   combine_conflated_xref_locations(locs)
                 else
                   out = locs.each do |l|
-                    l[:label] = "<esc>#{anchor_linkend1(l[:node])}</esc>"
+                    l[:label] = esc(anchor_linkend1(l[:node]))
                   end
                   l10n(combine_conn(out))
                 end
@@ -116,7 +119,7 @@ module IsoDoc
     def conflate_xref_locations(locs)
       out = locs.each { |l| l[:label] = anchor_value(l[:target]) }
       label = @i18n.inflect(locs.first[:elem], number: "pl")
-      out[0][:label] = l10n("#{label} <esc>#{out[0][:label]}</esc>").strip
+      out[0][:label] = l10n("#{label} #{esc out[0][:label]}").strip
       out
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.3.4".freeze
+  VERSION = "3.4.1".freeze
 end

data/lib/isodoc/word_function/lists.rb

@@ -63,18 +63,20 @@ module IsoDoc
 
       def dl_table_attrs(node)
         { id: node["id"],
-          align: node["class"] == "formula_dl" ? "left" : nil,
+          style: node["class"] == "formula_dl" ? "text-align:left;" : nil,
           class: node["class"] || "dl" }
       end
 
       def dl_parse_table(node, out)
-        list_title_parse(node, out)
-        out.table **attr_code(dl_table_attrs(node)) do |v|
-          node.elements.select { |n| dt_dd?(n) }
-            .each_slice(2) do |dt, dd|
-            dl_parse_table1(v, dt, dd)
+        out.div **attr_code(align: "left") do |div|
+          list_title_parse(node, div)
+          div.table **attr_code(dl_table_attrs(node)) do |v|
+            node.elements.select { |n| dt_dd?(n) }
+              .each_slice(2) do |dt, dd|
+              dl_parse_table1(v, dt, dd)
+            end
+            dl_parse_table_notes(node, v)
           end
-          dl_parse_table_notes(node, v)
         end
       end
 

data/lib/isodoc/word_function/table.rb

@@ -72,18 +72,29 @@ module IsoDoc
       end
 
       def table_attrs(node)
-        c = node["class"]
-        style = node["style"] || node["plain"] == "true" ? "" : "border-spacing:0;border-width:1px;"
-        (%w(modspec).include?(c) || !c) or style = nil
-        ret =
-          { summary: node["summary"], width: node["width"],
-            style: "mso-table-anchor-horizontal:column;mso-table-overlap:never;" \
-                 "#{style}#{keep_style(node)}",
-            class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable") }
+        style = table_border_css(node)
+        ret = { summary: node["summary"], width: node["width"],
+                class: table_class(node),
+                style: "mso-table-anchor-horizontal:column;" \
+                "mso-table-overlap:never;#{style}#{keep_style(node)}" }
         style or ret.delete(:class)
         super.merge(attr_code(ret))
       end
 
+      def table_border_css(node)
+        c = node["class"]
+        style = "border-spacing:0;border-width:1px;"
+        node["style"] || node["plain"] == "true" and style = ""
+        (%w(modspec).include?(c) || !c) or style = nil
+        node["plain"] == "true" and style = ""
+        style
+      end
+
+      def table_class(node)
+        node["plain"] == "true" and return "MsoNormalTable"
+        node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable"
+      end
+
       def colgroup(node, table)
         colgroup = node.at(ns("./colgroup")) or return
         table.colgroup do |cg|

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

@@ -205,3 +205,26 @@ inflection:
   الطبعة؜:
     grammar:
       gender: f
+punct:
+  colon: ":"
+  comma: ","
+  enum-comma: ","
+  semicolon: ";"
+  period: "."
+  close-paren: ")"
+  open-paren: "("
+  close-bracket: "]"
+  open-bracket: "["
+  question-mark: "?"
+  exclamation-mark: "!"
+  emphasis-mark: ""
+  em-dash: —
+  en-dash: –
+  number-en-dash: –
+  open-quote: '“'
+  close-quote: '”'
+  open-nested-quote: '‘'
+  close-nested-quote: '’'
+  ellipse: …
+  cjk-latin-separator: ""
+

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

@@ -217,3 +217,26 @@ inflection:
   Auflage:
     grammar:
       gender: f
+punct:
+  colon: ":"
+  comma: ","
+  enum-comma: ","
+  semicolon: ";"
+  period: "."
+  close-paren: ")"
+  open-paren: "("
+  close-bracket: "]"
+  open-bracket: "["
+  question-mark: "?"
+  exclamation-mark: "!"
+  emphasis-mark: ""
+  em-dash: —
+  en-dash: –
+  number-en-dash: –
+  open-quote: '„'
+  close-quote: '“'
+  open-nested-quote: '‚'
+  close-nested-quote: '‘'
+  ellipse: …
+  cjk-latin-separator: ""
+

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

@@ -214,3 +214,25 @@ inflection:
   Page:
     sg: Page
     pl: Pages
+punct:
+  colon: ":"
+  comma: ","
+  enum-comma: ","
+  semicolon: ";"
+  period: "."
+  close-paren: ")"
+  open-paren: "("
+  close-bracket: "]"
+  open-bracket: "["
+  question-mark: "?"
+  exclamation-mark: "!"
+  emphasis-mark: ""
+  em-dash: —
+  en-dash: –
+  number-en-dash: –
+  open-quote: '“'
+  close-quote: '”'
+  open-nested-quote: '‘'
+  close-nested-quote: '’'
+  ellipse: …
+  cjk-latin-separator: ""

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

@@ -215,3 +215,26 @@ inflection:
   edición:
     grammar:
       gender: f
+punct:
+  colon: ":"
+  comma: ","
+  enum-comma: ","
+  semicolon: ";"
+  period: "."
+  close-paren: ")"
+  open-paren: "("
+  close-bracket: "]"
+  open-bracket: "["
+  question-mark: "?"
+  exclamation-mark: "!"
+  emphasis-mark: ""
+  em-dash: —
+  en-dash: –
+  number-en-dash: –
+  open-quote: '«'
+  close-quote: '»'
+  open-nested-quote: '“'
+  close-nested-quote: '”'
+  ellipse: …
+  cjk-latin-separator: ""
+

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

@@ -213,3 +213,26 @@ inflection:
   édition:
     grammar:
       gender: f
+punct:
+  colon: ":"
+  comma: ","
+  enum-comma: ","
+  semicolon: ";"
+  period: "."
+  close-paren: ")"
+  open-paren: "("
+  close-bracket: "]"
+  open-bracket: "["
+  question-mark: "?"
+  exclamation-mark: "!"
+  emphasis-mark: ""
+  em-dash: —
+  en-dash: –
+  number-en-dash: –
+  open-quote: '«'
+  close-quote: '»'
+  open-nested-quote: '“'
+  close-nested-quote: '”'
+  ellipse: …
+  cjk-latin-separator: ""
+

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

@@ -87,7 +87,7 @@ wholeoftext: Whole of text
 draft_label: draft
 inform_annex: 参考
 norm_annex: 規定
-modified: 修正された
+modified: を変更
 adapted: 適合しました
 deprecated: 推奨しない用語
 source: 出典
@@ -96,6 +96,7 @@ no_identifier: (識別子なし)
 all_parts: 規格群
 edition_ordinal: "第{{ var1 }}版"
 edition: 版
+version: 版
 toc_figures: List of figures
 toc_tables: List of tables
 toc_recommendations: List of recommendations
@@ -247,3 +248,4 @@ punct:
   ellipse: ⋯⋯
   cjk-latin-separator: " "
 
+

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

@@ -279,3 +279,26 @@ inflection:
   издание:
     grammar:
       gender: n
+punct:
+  colon: ":"
+  comma: ","
+  enum-comma: ","
+  semicolon: ";"
+  period: "."
+  close-paren: ")"
+  open-paren: "("
+  close-bracket: "]"
+  open-bracket: "["
+  question-mark: "?"
+  exclamation-mark: "!"
+  emphasis-mark: ""
+  em-dash: —
+  en-dash: –
+  number-en-dash: –
+  open-quote: '«'
+  close-quote: '»'
+  open-nested-quote: '„'
+  close-nested-quote: '“'
+  ellipse: …
+  cjk-latin-separator: ""
+

data/lib/relaton/render-isodoc/config.yml

@@ -1,4 +1,4 @@
 template:
   # skip authoritative identifier, it is inserted in front of formattedref within metanorma
-  standard: "{% if creatornames %}{{ creatornames }} ({{ role}}){%else%}{{publisher}}{%endif%} . <em>{{ title }}</em> . {{ medium | capitalize }}. {{ edition | capitalize_first }}. {{date}}. {{place}}: {%if  creatornames %}{{publisher}}{% endif %} . {{size}}. {{ extent }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  standard: "{% if creatornames %}{{ creatornames }} ({{ role}}){%else%}{{publisher}}{%endif%} $$$ <em>{{ title }}</em> $$$ {{ medium | capitalize }}$$$ {{ edition | capitalize_first }}$$$ {{date}}$$$ {{place}}: {%if  creatornames %}{{publisher}}{% endif %} $$$ {{size}}$$$ {{ extent }}$$$ {{ uri }}$$$ {{ labels['at'] | capitalize}}:_{{ access_location }}$$$ [{{ labels['viewed'] }}:_{{date_accessed}}]"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.4.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-13 00:00:00.000000000 Z
+date: 2025-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement
@@ -346,6 +346,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   isodoc converts documents in the IsoDoc document model into
   Microsoft Word and HTML.