isodoc 2.9.2 → 2.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6490ec54ec083e91ab1ccc941676b95d52d3cef3f9b7675e2900e47c1763e47a
-  data.tar.gz: f5190668941e4f42990f024a3852007f3d2a6accfef80e6d242208c814ffe0d0
+  metadata.gz: fa1b06e38f973ba312a0f2d90d306c7ffb34e377f2fcc4a59c42775ba9f2a927
+  data.tar.gz: b74dcbe6b71b90da2ec4f205754bb08028d5bd1d45f085f7e35d6c3c47dc55cc
 SHA512:
-  metadata.gz: fb67b78f6de41bcf847ff4bf5846261b54dc9eed3e6ac755d2b13186ee70c4dc78a1c23f4804a47c147ffcc3076fd9845986043a242c3ad60194bd4c4c1435ca
-  data.tar.gz: 694543df44379a3fdde8eebbfefcf13a1d805ae0efbc02743219b7797ca2c5f81171667c3930549e4962fa149f5a8ac518475787489730fb1de3f39f27724abe
+  metadata.gz: 9cbe711521cc25e29f1879fa47ca42347a5ecfc0f94526166a4acb73f5787d5a5d577d68e3fe756cedce0c862b4aebfb54022fea51f296cbbeeff173e2ad5521
+  data.tar.gz: a07f6c1bdd5457be3cad8fececa4974de6bc95a952c73e31b718e22606a6d4c6807293729a784d55655a4419e10486c7de171dd1630ceb2f275605b263955e5d

data/lib/isodoc/convert.rb

@@ -10,7 +10,7 @@ require "mn-requirements"
 module IsoDoc
   class Convert < ::IsoDoc::Common
     attr_accessor :options, :i18n, :meta, :xrefs, :reqt_models,
-                  :requirements_processor, :doctype
+                  :requirements_processor, :doctype, :bibrender
 
     # htmlstylesheet: Generic stylesheet for HTML
     # htmlstylesheet_override: Override stylesheet for HTML
@@ -86,7 +86,7 @@ module IsoDoc
 
     def bibrenderer(options = {})
       ::Relaton::Render::IsoDoc::General.new(options.merge(language: @lang,
-                                                          i18nhash: @i18n.get))
+                                                           i18nhash: @i18n.get))
     end
 
     def convert1(docxml, filename, dir)
@@ -108,7 +108,8 @@ module IsoDoc
       docxml.root.default_namespace = ""
       convert_i18n_init(docxml)
       metadata_init(@lang, @script, @locale, @i18n)
-      xref_init(@lang, @script, self, @i18n, { locale: @locale })
+      xref_init(@lang, @script, self, @i18n,
+                { locale: @locale, bibrender: @bibrender })
       docxml = preprocess_xslt(docxml)
       toc_init(docxml)
       [docxml, filename, dir]
@@ -121,7 +122,8 @@ module IsoDoc
       end
       docxml
     rescue ::Error => e
-      require "debug"; binding.b
+      require "debug"
+      binding.b
     end
 
     def extract_preprocess_xslt(docxml)
@@ -136,6 +138,7 @@ module IsoDoc
     def convert_i18n_init(docxml)
       convert_i18n_init1(docxml)
       i18n_init(@lang, @script, @locale)
+      @bibrender ||= bibrenderer
       @reqt_models = requirements_processor
         .new({ default: "default", lang: @lang, script: @script,
                locale: @locale, labels: @i18n.get,

data/lib/isodoc/function/blocks_example_note.rb

@@ -58,7 +58,7 @@ module IsoDoc
       end
 
       def note_p_parse(node, div)
-        name = node&.at(ns("./name"))&.remove
+        name = node.at(ns("./name"))&.remove
         div.p do |p|
           name and p.span class: "note_label" do |s|
             name.children.each { |n| parse(n, s) }
@@ -71,10 +71,9 @@ module IsoDoc
       end
 
       def note_parse1(node, div)
-        name = node.at(ns("./name"))&.remove
-        name and div.p do |p|
+        name = node.at(ns("./name")) and div.p do |p|
           p.span class: "note_label" do |s|
-            name.children.each { |n| parse(n, s) }
+            name.remove.children.each { |n| parse(n, s) }
             s << note_delim
           end
           insert_tab(p, 1)
@@ -84,6 +83,7 @@ module IsoDoc
 
       def keep_style(node)
         ret = ""
+        node["style"] and ret += "#{node['style']};"
         node["keep-with-next"] == "true" and
           ret += "page-break-after: avoid;"
         node["keep-lines-together"] == "true" and

data/lib/isodoc/function/inline.rb

@@ -118,10 +118,14 @@ module IsoDoc
                   width: node["width"] || "auto",
                   title: node["title"],
                   alt: node["alt"] }
-        out.img **attr_code(attrs)
+        image_body_parse(node, attrs, out)
         image_title_parse(out, caption)
       end
 
+      def image_body_parse(_node, attrs, out)
+        out.img **attr_code(attrs)
+      end
+
       def smallcap_parse(node, xml)
         xml.span style: "font-variant:small-caps;" do |s|
           node.children.each { |n| parse(n, s) }

data/lib/isodoc/function/references.rb

@@ -32,8 +32,18 @@ module IsoDoc
 
       def pref_ref_code(bib)
         bib["suppress_identifier"] == "true" and return nil
-        @bibrenderer ||= bibrenderer
-        data, = @bibrenderer.parse(bib)
+        ret = bib.xpath(ns("./docidentifier[@scope = 'biblio-tag']"))
+        ret.empty? or return ret.map(&:text)
+        ret = pref_ref_code_parse(bib) or return nil
+        ins = bib.at(ns("./docidentifier[last()]"))
+        ret.reverse.each do |r|
+          ins.next = "<docidentifier scope='biblio-tag'>#{docid_l10n(r)}</docidentifier>"
+        end
+        ret
+      end
+
+      def pref_ref_code_parse(bib)
+        data, = @bibrender.parse(bib)
         ret = data[:authoritative_identifier] or return nil
         ret.empty? and return nil
         ret
@@ -142,7 +152,7 @@ module IsoDoc
         "//bibliography/references[@normative = 'true'] | " \
           "//bibliography/clause[.//references[@normative = 'true']] | " \
           "//sections/references[@normative = 'true'] | " \
-          "//sections/clause[.//references[@normative = 'true']]"
+          "//sections/clause[not(@type)][.//references[@normative = 'true']]"
       end
 
       def norm_ref(node, out)

data/lib/isodoc/function/utils.rb

@@ -204,6 +204,7 @@ module IsoDoc
         case img["src"]
         when /^data:/ then save_dataimage(img["src"], false)
         when %r{^([A-Z]:)?/} then img["src"]
+        when nil then nil
         else File.join(@localdir, img["src"])
         end
       end
@@ -213,7 +214,6 @@ module IsoDoc
            note table figure sourcecode).freeze
 
       def labelled_ancestor(elem)
-        #require  "debug"; binding.b
         #!elem.path.gsub(/\[\d+\]/, "").split(%r{/})[1..-1]
         !elem.ancestors.map(&:name)
           .intersection(LABELLED_ANCESTOR_ELEMENTS).empty?

data/lib/isodoc/html_function/html.rb

@@ -16,7 +16,6 @@ module IsoDoc
       end
 
       def preprocess_xslt(docxml)
-
         super
       end
 
@@ -103,12 +102,15 @@ module IsoDoc
         ret
       end
 
-      def image_parse(node, out, caption)
+      def image_body_parse(node, attrs, out)
         if svg = node.at("./m:svg", "m" => "http://www.w3.org/2000/svg")
-          svg_parse(svg, out)
-          return
+          %i(height width).each do |k|
+            v = attrs[k] and v != "auto" and !v.empty? and
+              svg[k.to_s] = v
+          end
+          out.parent.add_child(svg)
+        else super
         end
-        super
       end
     end
   end

data/lib/isodoc/html_function/postprocess.rb

@@ -66,8 +66,9 @@ module IsoDoc
       def resize_images(docxml)
         docxml.xpath("//*[local-name() = 'img' or local-name() = 'svg']")
           .each do |i|
+          loc = image_localfile(i) or next
           i["width"], i["height"] = Vectory::ImageResize.new
-            .call(i, image_localfile(i), @maxheight, @maxwidth)
+            .call(i, loc, @maxheight, @maxwidth)
         end
         docxml
       end
@@ -76,7 +77,7 @@ module IsoDoc
       def move_images(docxml)
         FileUtils.rm_rf tmpimagedir
         FileUtils.mkdir tmpimagedir
-        docxml.xpath("//*[local-name() = 'img']").each do |i|
+        docxml.xpath("//*[local-name() = 'img'][@src]").each do |i|
           /^data:/.match? i["src"] and next
           @datauriimage ? datauri(i) : move_image1(i)
         end

data/lib/isodoc/presentation_function/bibdata.rb

@@ -3,7 +3,6 @@ require "csv"
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def bibdata(docxml)
-      docid_prefixes(docxml)
       a = bibdata_current(docxml) or return
       address_precompose(a)
       bibdata_i18n(a)

data/lib/isodoc/presentation_function/erefs.rb

@@ -2,6 +2,13 @@ require "metanorma-utils"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
+    def citeas(xmldoc)
+      xmldoc.xpath(ns("//eref | //origin | //quote/source")).each do |e|
+        e["bibitemid"] && e["citeas"] or next
+        a = @xrefs.anchor(e["bibitemid"], :xref, false) and e["citeas"] = a
+      end
+    end
+
     def expand_citeas(text)
       text.nil? and return text
       HTMLEntities.new.decode(text.gsub("&amp;#x", "&#"))
@@ -40,7 +47,6 @@ module IsoDoc
       (refs.size > 1 &&
         refs.all? { |r| r.name == "localityStack" } &&
         refs.all? { |r| r.xpath(ns("./locality")).size == 1 }) or return false
-
       first = refs.first.at(ns("./locality/@type")).text
       refs.all? do |r|
         r.at(ns("./locality/@type")).text == first
@@ -97,8 +103,7 @@ module IsoDoc
         added = eref_locality_stack(r, i, target, node)
         added.empty? and next
         added.each { |a| m << a }
-        next if i == refs.size - 1
-
+        i == refs.size - 1 and next
         m << eref_locality_delimiter(r)
       end
       ret.empty? ? ret : [", "] + ret
@@ -156,8 +161,7 @@ module IsoDoc
 
     # def eref_localities1(target, type, from, upto, node, lang = "en")
     def eref_localities1(opt)
-      return nil if opt[:type] == "anchor"
-
+      opt[:type] == "anchor" and return nil
       opt[:lang] == "zh" and
         # return l10n(eref_localities1_zh(target, type, from, upto, node))
         return l10n(eref_localities1_zh(opt))
@@ -168,8 +172,7 @@ module IsoDoc
     end
 
     def eref_locality_populate(type, node, number)
-      return "" if node["droploc"] == "true"
-
+      node["droploc"] == "true" and return ""
       loc = type.sub(/^locality:/, "")
       ret = @i18n.locality[loc] || loc
       number == "pl" and ret = @i18n.inflect(ret, number: "pl")
@@ -206,9 +209,8 @@ module IsoDoc
     end
 
     def suffix_url(url)
-      return url if url.nil? || %r{^https?://|^#}.match?(url)
-      return url unless File.extname(url).empty?
-
+      url.nil? || %r{^https?://|^#}.match?(url) and return url
+      File.extname(url).empty? or return url
       url.sub(/#{File.extname(url)}$/, ".html")
     end
 
@@ -221,10 +223,10 @@ module IsoDoc
     end
 
     def eref_url(id)
-      @bibitems.nil? and return nil
-      b = @bibitems[id] or return nil
-      url = (b.at(ns("./uri[@type = 'citation'][@language = '#{@lang}']")) ||
-      b.at(ns("./uri[@type = 'citation']"))) and return url.text
+      @bibitem_lookup.nil? and return nil
+      b = @bibitem_lookup[id] or return nil
+      url = b.at(ns("./uri[@type = 'citation'][@language = '#{@lang}']")) ||
+        b.at(ns("./uri[@type = 'citation']")) and return url.text
       b["hidden"] == "true" and return b.at(ns("./uri"))&.text
       "##{id}"
     end

data/lib/isodoc/presentation_function/refs.rb

@@ -37,8 +37,8 @@ module IsoDoc
         prep_for_rendering(b)
         m << to_xml(b)
       end.join
-      @xrefs.klass.bibrenderer.render_all("<references>#{refs}</references>",
-                             type: citestyle)
+      @bibrender.render_all("<references>#{refs}</references>",
+                            type: citestyle)
     end
 
     def prep_for_rendering(bib)
@@ -49,10 +49,10 @@ module IsoDoc
 
     def bibitem(xml, renderings)
       @xrefs.klass.implicit_reference(xml) and xml["hidden"] = "true"
-      bibrender(xml, renderings)
+      bibrender_item(xml, renderings)
     end
 
-    def bibrender(xml, renderings)
+    def bibrender_item(xml, renderings)
       if (f = xml.at(ns("./formattedref"))) && xml.at(ns("./title")).nil?
         bibrender_formattedref(f, xml)
       else bibrender_relaton(xml, renderings)

data/lib/isodoc/presentation_function/terms.rb

@@ -164,7 +164,7 @@ module IsoDoc
 
     def termsource_add_modification_text(mod)
       mod or return
-      mod.text.strip.empty? or mod.previous = " – "
+      mod.text.strip.empty? or mod.previous = " — "
       mod.elements.size == 1 and
         mod.elements[0].replace(mod.elements[0].children)
       mod.replace(mod.children)

data/lib/isodoc/presentation_function/xrefs.rb

@@ -4,7 +4,8 @@ module IsoDoc
       prefix_container?(container, node) or return linkend
       container_container = @xrefs.anchor(container, :container, false)
       container_label =
-        prefix_container(container_container, anchor_xref(node, container),
+        prefix_container(container_container,
+                         anchor_xref(node, container, container: true),
                          node, target)
       l10n(@i18n.nested_xref.sub("%1", container_label)
         .sub("%2", linkend))
@@ -40,8 +41,8 @@ module IsoDoc
       capitalise_xref(node, linkend, anchor_value(node["target"]))
     end
 
-    def anchor_xref(node, target)
-      x = @xrefs.anchor(target, :xref)
+    def anchor_xref(node, target, container: false)
+      x = anchor_xref_short(node, target, container)
       t = @xrefs.anchor(target, :title)
       ret = case node["style"]
             when "basic" then t
@@ -52,9 +53,15 @@ module IsoDoc
       ret || x
     end
 
+    def anchor_xref_short(node, target, container)
+      if (l = node["label"]) && !container
+        @i18n.l10n("#{l} #{anchor_value(target)}")
+      else @xrefs.anchor(target, :xref)
+      end
+    end
+
     def anchor_xref_full(num, title)
       (!title.nil? && !title.empty?) or return nil
-
       l10n("#{num}, #{title}")
     end
 
@@ -77,7 +84,8 @@ module IsoDoc
       capitalise_xref(node, linkend, anchor_value(node["target"]))
     end
 
-    # Note % to entry and Note % to entry: cannot conflate as Note % to entry 1 and 2
+    # Note % to entry and Note % to entry:
+    # cannot conflate as Note % to entry 1 and 2
     # So Notes 1 and 3, but Note 1 to entry and Note 3 to entry
     def combine_conflated_xref_locations(locs)
       out = if locs.any? { |l| l[:elem]&.include?("%") }
@@ -123,8 +131,7 @@ module IsoDoc
     end
 
     def combine_conn(list)
-      return list.first[:label] if list.size == 1
-
+      list.size == 1 and list.first[:label]
       if list[1..-1].all? { |l| l[:conn] == "and" }
         @i18n.boolean_conj(list.map { |l| loc2xref(l) }, "and")
       elsif list[1..-1].all? { |l| l[:conn] == "or" }
@@ -154,7 +161,6 @@ module IsoDoc
         linktext[0, 1].match?(/\p{Upper}/) and return linkend
       node["case"] and
         return Common::case_with_markup(linkend, node["case"], @script)
-
       capitalise_xref1(node, linkend)
     end
 

data/lib/isodoc/presentation_xml_convert.rb

@@ -19,8 +19,8 @@ module IsoDoc
     end
 
     def convert1(docxml, _filename, _dir)
+      docid_prefixes(docxml) # feeds @xrefs.parse citation processing
       @xrefs.parse docxml
-      bibitem_lookup(docxml)
       info docxml, nil
       conversions(docxml)
       docxml.root["type"] = "presentation"
@@ -28,7 +28,7 @@ module IsoDoc
     end
 
     def bibitem_lookup(docxml)
-      @bibitems = docxml.xpath(ns("//references/bibitem"))
+      @bibitem_lookup ||= docxml.xpath(ns("//references/bibitem"))
         .each_with_object({}) do |b, m|
         m[b["id"]] = b
       end
@@ -82,10 +82,12 @@ module IsoDoc
     end
 
     def inline(docxml)
+      bibitem_lookup(docxml) # feeds citeas
+      citeas docxml # feeds xref, eref, origin, quotesource
       xref docxml
-      eref docxml # feeds docxml
-      origin docxml # feeds docxml
-      quotesource docxml # feeds docxml
+      eref docxml # feeds eref2link
+      origin docxml # feeds eref2link
+      quotesource docxml # feeds eref2link
       eref2link docxml
       mathml docxml
       ruby docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.9.2".freeze
+  VERSION = "2.9.4".freeze
 end

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -88,8 +88,7 @@ module IsoDoc
       end
 
       def generate_header(filename, _dir)
-        return nil unless @header
-
+        @header or return nil
         template = IsoDoc::Common.liquid(File.read(@header, encoding: "UTF-8"))
         meta = @meta.get.merge(@labels ? { labels: @labels } : {})
           .merge(@meta.labels ? { labels: @meta.labels } : {})

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -42,7 +42,9 @@ module IsoDoc
           annex_anchor_names(xml)
           back_clauses_anchor_names(xml)
         end
-        references(xml) if @parse_settings.empty? || @parse_settings[:refs]
+        if @klass.bibrender && (@parse_settings.empty? || @parse_settings[:refs])
+          references(xml)
+        end
       end
 
       def annex_anchor_names(xml)
@@ -98,7 +100,7 @@ module IsoDoc
 
       # preempt clause notes with all other types of note (ISO default)
       def asset_anchor_names(doc)
-        @parse_settings.empty? or return
+        (@parse_settings.empty? || @parse_settings[:assets]) or return
         middle_section_asset_names(doc)
         termnote_anchor_names(doc)
         termexample_anchor_names(doc)

data/lib/isodoc/xref.rb

@@ -15,6 +15,7 @@ module IsoDoc
 
     attr_reader :klass
 
+    # Note: if bibrender is no passed in, do not parse references
     def initialize(lang, script, klass, i18n, options = {})
       @anchors = {}
       @lang = lang
@@ -24,6 +25,7 @@ module IsoDoc
       @i18n = i18n
       @labels = @i18n.get
       @klass.i18n = @i18n
+      @klass.bibrender ||= options[:bibrender]
       @locale = options[:locale]
       @reqt_models = @klass.requirements_processor
         .new({
@@ -39,7 +41,7 @@ module IsoDoc
     end
 
     # parse only the elements set, if any are set
-    # defined are: clause: true, refs: true
+    # defined are: clause: true, refs: true, assets: true
     def parse_inclusions(options)
       @parse_settings.merge!(options)
       self

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

@@ -5,6 +5,7 @@ abbrev: الاختصارات
 symbols: الرموز
 table_of_contents: جدول المحتويات
 introduction: مقدمة
+section: قسم
 foreword: تمهيد
 abstract: ملخص
 acknowledgements: شكر

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

@@ -4,6 +4,7 @@ symbolsabbrev: Symbole und abgekürzte Begriffe
 abbrev: Abgekürzte Begriffe
 symbols: Symbole
 table_of_contents: Inhaltsübersicht
+section: Abschnitt
 introduction: Einführung
 foreword: Vorwort
 abstract: Abstrakt

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

@@ -15,6 +15,7 @@ termsdefabbrev: Terms, definitions and abbreviated terms
 normref: Normative references
 bibliography: Bibliography
 preface: Preface
+section: Section
 clause: Clause
 annex: Annex
 appendix: Appendix

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

@@ -14,6 +14,7 @@ termsdefsymbols: Términos, definiciones y símbolos
 termsdefabbrev: Términos, definiciones y términos abreviados
 normref: Referencias normativas
 bibliography: Bibliografía
+section: Sección
 clause: Cláusula
 annex: Anexo
 appendix: Apéndice

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

@@ -15,6 +15,7 @@ termsdefabbrev: Termes, définitions et termes abrégés
 normref: Références normatives
 bibliography: Bibliographie
 preface: Préface
+section: Section
 clause: Article
 annex: Annexe
 appendix: Appendice

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

@@ -15,6 +15,7 @@ termsdefabbrev: 用語及び定義並びに略語
 normref: 引用規格
 bibliography: 参考文献
 preface: Preface
+section: Section
 clause: 箇条
 annex: 附属書
 appendix: Appendix

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

@@ -14,6 +14,7 @@ termsdefsymbols: Термины, определения и символы
 termsdefabbrev: Термины, определения и сокращенные термины
 normref: Нормативные ссылки
 bibliography: Библиография
+section: Раздел
 clause: Пункт
 annex: Дополнение
 appendix: Приложение

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

@@ -15,6 +15,7 @@ termsdefabbrev: 术语、定义、符号和缩略语
 normref: 规范性引用文件
 bibliography: 参考文献
 preface: 序言
+section: 条
 clause: 条
 annex: 附件
 appendix: 附录

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.9.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-04 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc