isodoc 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18d33859f89e36a66412218c04370f02c727fe131dd91b73fd3671ab25cf228f
-  data.tar.gz: cc2996c38878a5acacf24932cf2719a1bef922cea11cf5c26411172e9a93032a
+  metadata.gz: 66420421669f651f0c898afd16ed5ccdb1fbb4114531f72ed846d179ced88d9f
+  data.tar.gz: a2f42bfa3a386d66d78a360cb57a28e29cce05d70b8f18d84acdd995704b0090
 SHA512:
-  metadata.gz: dde602b7132920dff5599dc3da2bb0de9ef027f5b3dd703fadc190adec9fab8e26901798bc208d3b3d279b57c5d19fa7ccbe885c37591da875e79f8dd5c364d4
-  data.tar.gz: 8d67a2d2518105cf854c7bb7f21a841de922785b0c77060e6002e6023c8de2b14efb8a9cbea25d140101183349b4b346287332eeb230b0c33aa5e0db3dcb3321
+  metadata.gz: ec7e84f1d6ab621b275c76e94781fc9b539bdd2e6656551efd617832de24a94f753aaaf1951a3a3fa7d42a983c5ced677e4fde1edf4477d029cafa0151a3185e
+  data.tar.gz: 9bb6ad10f0260df9f7994a94cfadd58a67cbc6b547ec17294ee09226e9a01997f9f9a2f1b744ae58338803947160155b15ca69d425848b35b6a88615ef5105fb

data/lib/isodoc/convert.rb

@@ -88,7 +88,7 @@ module IsoDoc
     def bibrenderer(options = {})
       ::Relaton::Render::IsoDoc::General
         .new(options.merge(language: @lang, script: @script,
-                           i18nhash: @i18n.get))
+                           i18nhash: @i18n.get, config: @relatonrenderconfig))
     end
 
     def convert1_namespaces(html)

data/lib/isodoc/function/inline.rb

@@ -4,9 +4,9 @@ module IsoDoc
   module Function
     module Inline
       def link_parse(node, out)
-        url = node["target"]
-        node["update-type"] == "true" and url = suffix_url(url)
-        out.a **attr_code(href: url, title: node["alt"]) do |l|
+        url = link_parse_url(node)
+        out.a **attr_code(href: url, title: node["alt"],
+                          class: node["style"]) do |l|
           if node.elements.empty? && node.text.strip.empty?
             l << @c.encode(node["target"].sub(/^mailto:/, ""), :basic,
                            :hexadecimal)
@@ -15,6 +15,12 @@ module IsoDoc
         end
       end
 
+      def link_parse_url(node)
+        url = node["target"]
+        node["update-type"] == "true" and url = suffix_url(url)
+        url
+      end
+
       # Presentation XML classes which we need not pass on to HTML or DOC
       SPAN_UNWRAP_CLASSES =
         %w[fmt-caption-label fmt-label-delim fmt-caption-delim fmt-autonum-delim
@@ -213,30 +219,6 @@ module IsoDoc
           children_parse(node, s)
         end
       end
-
-      def fmt_concept_parse(node, out)
-        children_parse(node, out)
-      end
-
-      def fmt_date_parse(node, out)
-        children_parse(node, out)
-      end
-
-      def fmt_fn_label_parse(node, out)
-        children_parse(node, out)
-      end
-
-      def fmt_footnote_container_parse(node, out)
-        children_parse(node, out)
-      end
-
-      def fmt_annotation_start_parse(node, out)
-        children_parse(node, out)
-      end
-
-      def fmt_annotation_end_parse(node, out)
-        children_parse(node, out)
-      end
     end
   end
 end

data/lib/isodoc/function/inline_simple.rb

@@ -98,6 +98,31 @@ module IsoDoc
       def semx_sourcecode_parse(node, out); end
       def annotation_note_parse(node, out); end
       def semx_source_parse(node, out); end
+
+     def fmt_concept_parse(node, out)
+        children_parse(node, out)
+      end
+
+      def fmt_date_parse(node, out)
+        children_parse(node, out)
+      end
+
+      def fmt_fn_label_parse(node, out)
+        children_parse(node, out)
+      end
+
+      def fmt_footnote_container_parse(node, out)
+        children_parse(node, out)
+      end
+
+      def fmt_annotation_start_parse(node, out)
+        children_parse(node, out)
+      end
+
+      def fmt_annotation_end_parse(node, out)
+        children_parse(node, out)
+      end
+
     end
   end
 end

data/lib/isodoc/function/setup.rb

@@ -57,6 +57,7 @@ module IsoDoc
         @meta.url isoxml, out
         @meta.keywords isoxml, out
         @meta.note isoxml, out
+        @meta.images isoxml, out
         @meta.presentation isoxml, out
         @meta.get
       end

data/lib/isodoc/init.rb

@@ -80,6 +80,7 @@ module IsoDoc
       @script = options[:script] || "Latn"
       @locale = options[:locale]
       @localizenumber = options[:localizenumber]
+      @relatonrenderconfig = options[:relatonrenderconfig]
     end
 
     def init_locations(options)
@@ -186,7 +187,7 @@ module IsoDoc
     def omit_docid_prefix(prefix)
       prefix.nil? || prefix.empty? and return true
       %w(ISO IEC IEV ITU W3C BIPM csd metanorma repository metanorma-ordinal
-         title).include? prefix
+         author-date title).include? prefix
     end
 
     def connectives_spans(text)

data/lib/isodoc/metadata.rb

@@ -9,7 +9,7 @@ module IsoDoc
       Common::ns(xpath)
     end
 
-        def l10n(expr, lang = @lang, script = @script, opt = {})
+    def l10n(expr, lang = @lang, script = @script, opt = {})
       opt[:locale] ||= @locale
       @i18n.l10n(expr, lang, script, opt)
     end
@@ -182,6 +182,9 @@ module IsoDoc
       set(:title_footnote, ret)
     end
 
+    def images(_isoxml, _out)
+    end
+
     def code_css(isoxml, _out)
       c = isoxml.at(ns("//metanorma-extension/source-highlighter-css")) or return
       set(:code_css, c.text)

data/lib/isodoc/metadata_contributor.rb

@@ -66,8 +66,8 @@ module IsoDoc
       logos = []
       agency_data(xml).each do |org|
         agency1 = org[:abbr] || org[:name]
-        org[:name] and publisher << org[:name]
-        org[:logo] and logos << org[:logo]
+        org[:name] && !org[:name].empty? and publisher << org[:name]
+        org[:logo] && !org[:logo].empty? and logos << org[:logo]
         agency = iso?(org) ? "ISO/#{agency}" : "#{agency}#{agency1}/"
       end
       [agency.sub(%r{/$}, ""), publisher, logos]

data/lib/isodoc/presentation_function/docid.rb

@@ -28,20 +28,21 @@ module IsoDoc
 
     # returns [metanorma, non-metanorma, DOI/ISSN/ISBN] identifiers
     def bibitem_ref_code(bib)
-      id, id1, id2, id3 = bibitem_ref_code_prep(bib)
-      id || id1 || id2 || id3 and return [id, id1, id2, id3]
-      bib["suppress_identifier"] == "true" and return [nil, nil, nil, nil]
+      ret = bibitem_ref_code_prep(bib)
+      ret.all?(&:nil?) or return ret
+      bib["suppress_identifier"] == "true" and return [nil, nil, nil, nil, nil]
       # [nil, no_identifier(bib), nil, nil]
-      [nil, nil, nil, nil]
+      [nil, nil, nil, nil, nil]
     end
 
     def bibitem_ref_code_prep(bib)
-      id = bib.at(ns("./docidentifier[@type = 'metanorma']")) ||
-        bib.at(ns("./docidentifier[@type = 'title']"))
+      id = bib.at(ns("./docidentifier[@type = 'metanorma']"))
       id1 = pref_ref_code(bib)
-      id2 = bib.at(ns("./docidentifier[#{SKIP_DOCID}]"))
+      id2 = bib.at(ns("./docidentifier[#{SERIAL_NUM_DOCID}]"))
       id3 = bib.at(ns("./docidentifier[@type = 'metanorma-ordinal']"))
-      [id, id1, id2, id3]
+      id4 = bib.at(ns("./docidentifier[@type = 'title']")) ||
+        bib.at(ns("./docidentifier[@type = 'author-date']"))
+      [id, id1, id2, id3, id4]
     end
 
     def no_identifier(bib)
@@ -64,6 +65,12 @@ module IsoDoc
       num
     end
 
+    def bracket(num)
+      num.nil? and return nil
+      num = xml_to_string_skip_fn(num).sub(/^\[/, "").sub(/\]$/, "")
+      "[#{num}]"
+    end
+
     def unbracket1(ident)
       ident.nil? and return nil
       ident.is_a?(String) or ident = xml_to_string_skip_fn(ident)
@@ -78,10 +85,11 @@ module IsoDoc
     end
 
     def render_identifier(ident)
-      { metanorma: bracket_if_num(ident[0]),
+      { metanorma: bracket(ident[0]),
         sdo: unbracket(ident[1]),
         doi: unbracket(ident[2]),
-        ordinal: bracket_if_num(ident[3]) }
+        ordinal: bracket(ident[3]),
+        content: unbracket(ident[4]) }
     end
   end
 end

data/lib/isodoc/presentation_function/inline.rb

@@ -93,6 +93,8 @@ module IsoDoc
       get_linkend(node)
     end
 
+    def link(xml); end
+
     # there should be no //variant in bibdata now
     def variant(xml)
       b = xml.xpath(ns("//bibdata//variant"))

data/lib/isodoc/presentation_function/refs.rb

@@ -20,10 +20,10 @@ module IsoDoc
     end
 
     def reference_name(ref)
-      ids = bibitem_ref_code(ref)
-      identifiers = render_identifier(ids)
-      reference = docid_l10n(identifiers[:metanorma] || identifiers[:sdo] ||
-                    identifiers[:ordinal] || identifiers[:doi])
+      identifiers = render_identifier(bibitem_ref_code(ref))
+      reference = docid_l10n(identifiers[:content] || identifiers[:metanorma] ||
+                             identifiers[:sdo] || identifiers[:ordinal] ||
+                             identifiers[:doi])
       @xrefs.get[ref["id"]] = { xref: esc(reference) }
     end
 
@@ -164,31 +164,31 @@ module IsoDoc
       datefn = date_note_process(bib)
       ids = bibitem_ref_code(bib)
       idents = render_identifier(ids)
-      ret = if biblio then biblio_ref_entry_code(ordinal, idents, ids,
+      ret = if biblio then biblio_ref_entry_code(ordinal, idents,
                                                  standard, datefn, bib)
-            else norm_ref_entry_code(ordinal, idents, ids, standard, datefn,
-                                     bib)
+            else norm_ref_entry_code(ordinal, idents, standard, datefn, bib)
             end
       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
+    def norm_ref_entry_code(_ordinal, ids, _standard, datefn, _bib)
+      ret = (ids[:ordinal] || ids[:content] || ids[:metanorma] || ids[:sdo]).to_s
       ret = esc(ret)
-      (idents[:ordinal] || idents[:metanorma]) && idents[:sdo] and
-        ret += ", #{esc idents[:sdo]}"
+      (ids[:ordinal] || ids[:metanorma]) && ids[:sdo] and
+        ret += ", #{esc ids[:sdo]}"
       ret += datefn
       ret.empty? and return ret
-      idents[:sdo] and ret += ","
+      ids[:sdo] and ret += ","
       ret.sub(",", "").strip.empty? and return ""
       "#{ret} "
     end
 
     # if ids is just a number, only use that ([1] Non-Standard)
     # else, use both ordinal, as prefix, and ids
-    def biblio_ref_entry_code(ordinal, ids, _id, _standard, datefn, _bib)
+    def biblio_ref_entry_code(ordinal, ids, _standard, datefn, _bib)
       # standard and id = nil
-      ret = esc(ids[:ordinal]) || esc(ids[:metanorma]) || "[#{esc ordinal.to_s}]"
+      ret = esc(ids[:ordinal]) || esc(ids[:content]) || esc(ids[:metanorma]) ||
+        "[#{esc ordinal.to_s}]"
       if ids[:sdo] && !ids[:sdo].empty?
         ret = prefix_bracketed_ref(ret)
         ret += "#{esc ids[:sdo]}#{datefn}, "
@@ -223,15 +223,16 @@ module IsoDoc
       bib["hidden"] == "true"
     end
 
-    SKIP_DOCID = <<~XPATH.strip.freeze
+    # DOI, ISSN, ISBN cover term
+    SERIAL_NUM_DOCID = <<~XPATH.strip.freeze
       @type = 'DOI' or @type = 'doi' or @type = 'ISSN' or @type = 'issn' or @type = 'ISBN' or @type = 'isbn' or starts-with(@type, 'ISSN.') or starts-with(@type, 'ISBN.') or starts-with(@type, 'issn.') or starts-with(@type, 'isbn.')
     XPATH
 
     def standard?(bib)
       ret = false
       bib.xpath(ns("./docidentifier")).each do |id|
-        id["type"].nil? ||
-          id.at(".//self::*[#{SKIP_DOCID} or @type = 'metanorma']") and next
+        id["type"].nil? || id.at(".//self::*[#{SERIAL_NUM_DOCID} or "\
+          "@type = 'metanorma']") and next
         ret = true
       end
       ret

data/lib/isodoc/presentation_xml_convert.rb

@@ -119,7 +119,8 @@ module IsoDoc
       eref docxml # feeds eref2link
       origin docxml # feeds eref2link
       concept docxml
-      eref2link docxml
+      eref2link docxml # feeds link
+      link docxml
       mathml docxml
       ruby docxml
       variant docxml

data/lib/isodoc/version.rb

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

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -162,7 +162,6 @@ module IsoDoc
         xref = labelled_autonum(@labels["clause"], num)
         label = num
         c = clause_title(clause) and title = semx(clause, c, "title")
-        #clause["id"] ||= "_#{UUIDTools::UUID.random_create}"
         @anchors[clause["id"]] =
           { label:, xref:, title:, level:, type: "clause",
             elem: @labels["clause"] }
@@ -184,7 +183,6 @@ module IsoDoc
         level == 1 && clause.name == "annex" and
           label = annex_name_lbl(clause, label)
         c = clause_title(clause) and title = semx(clause, c, "title")
-        #clause["id"] ||= "_#{UUIDTools::UUID.random_create}"
         @anchors[clause["id"]] =
           { label:, xref: labelled_autonum(@labels["annex"], num), title:,
             elem: @labels["annex"], type: "clause",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-17 00:00:00.000000000 Z
+date: 2025-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64