isodoc 2.1.2 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28ac8ba37e46dab584c5c8b31b651a3c35554c48a286edbe27380837d8cf2bcb
-  data.tar.gz: b8aa34af74f5ea34f01a8e80e5c9d3d9d1c8f04623e490efcd4ef405fa3d9d89
+  metadata.gz: 214cd3cfadc0aeca476766aff0722c06a46b5410beedbb9a49fd47ed15249850
+  data.tar.gz: f0e79db9f9dd1b456da5ba4eda163e7189509236e45f688faa92fcf821c158de
 SHA512:
-  metadata.gz: 48b4097c940f272ce85bb6ccce887df0640525d90176246b00772f2b858daf1a8a3710ccd06766048a2c57030abbed6a72f122dddd084717604e30d08290b01d
-  data.tar.gz: 21cc6a5137d95431098706c1f0a71f2ce759da10fdd892bb8cf7fcbc7a74dbc671a5d8bb90d7e1ec072d7eb3a3aa618112dade4dda0a3944a4a9e95455bd1748
+  metadata.gz: 2e57a7551ccebc9fedc40520a1ff96d87d25de8f4c3501400d9cfdac41d4e0014f25e9b5a7d0eb9c03c6c3cf0c0a0dd3a992327591ecfcb474c6c7c369377e15
+  data.tar.gz: 630fb8c95eccafb843d2f25459494705087dde8c4fe857be5183fdab62eb71da7fb9211d2bbe2dc30c67a87e4ce199c200c9a53eabf5ba90a74e249005f8d997

data/lib/isodoc/class_utils.rb

@@ -62,5 +62,21 @@ module IsoDoc
       end
       xml.root.children.to_xml
     end
+
+    def nearest_block_parent(node)
+      until %w(p title td th name formula li dt dd sourcecode pre quote
+               note example)
+          .include?(node.name)
+        node = node.parent
+      end
+      node
+    end
+
+    # node is at the start of sentence in a Metanorma XML context
+    def start_of_sentence(node)
+      prec = nearest_block_parent(node).xpath("./descendant-or-self::text()") &
+        node.xpath("./preceding::text()")
+      prec.empty? || /(?!<[^.].)\.\s+$/.match(prec.map(&:text).join)
+    end
   end
 end

data/lib/isodoc/function/references.rb

@@ -19,7 +19,8 @@ module IsoDoc
             ref << (idents[:ordinal] || idents[:metanorma] || idents[:sdo]).to_s
             ref << ", #{idents[sdo]}" if idents[:ordinal] && idents[:sdo]
           end
-          ref << ", " unless biblio && !idents[:sdo]
+          ref << "," if idents[:sdo]
+          ref << " "
           reference_format(bib, ref)
         end
       end
@@ -34,7 +35,8 @@ module IsoDoc
                                           idents[:metanorma]) && idents[:sdo]
           end
           date_note_process(bib, ref)
-          ref << ", " unless biblio && !idents[:sdo]
+          ref << "," if idents[:sdo]
+          ref << " "
           reference_format(bib, ref)
         end
       end
@@ -48,13 +50,21 @@ module IsoDoc
       end
 
       def pref_ref_code(bib)
-        ret = bib.xpath(ns("./docidentifier[@primary = 'true']"))
+        return nil if bib["suppress_identifier"] == "true"
+
+        ret = bib.xpath(ns("./docidentifier[@primary = 'true'][@language = '#{@lang}']"))
+        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' or "\
-                          "@type = 'rfc-anchor')]"))
+                          "@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
       end
 
@@ -66,6 +76,7 @@ module IsoDoc
                         "@type = 'ISBN']"))
         id3 = bib.at(ns("./docidentifier[@type = 'metanorma-ordinal']"))
         return [id, id1, id2, id3] if id || id1 || id2 || id3
+        return [nil, nil, nil, nil] if bib["suppress_identifier"] == "true"
 
         id = Nokogiri::XML::Node.new("docidentifier", bib.document)
         id << "(NO ID)"

data/lib/isodoc/function/utils.rb

@@ -11,6 +11,10 @@ module IsoDoc
         self.class.ns(xpath)
       end
 
+      def start_of_sentence(node)
+        self.class.start_of_sentence(node)
+      end
+
       def insert_tab(out, count)
         tab = %w(Hans Hant).include?(@script) ? "　" : "  "
         [1..count].each { out << tab }

data/lib/isodoc/presentation_function/block.rb

@@ -8,6 +8,10 @@ module IsoDoc
       text.capitalize
     end
 
+    def block_delim
+      " — "
+    end
+
     def prefix_name(node, delim, number, elem)
       return if number.nil? || number.empty?
 
@@ -16,8 +20,8 @@ module IsoDoc
           node.children.first.previous = "<#{elem}></#{elem}>"
         name = node.children.first
       end
-      if name.children.empty? then name.add_child(cleanup_entities(number))
-      else (name.children.first.previous = "#{number}#{delim}")
+      if name.children.empty? then name.add_child(cleanup_entities(number.strip))
+      else (name.children.first.previous = "#{number.strip}#{delim}")
       end
     end
 
@@ -31,7 +35,7 @@ module IsoDoc
       return if labelled_ancestor(elem)
 
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
-      prefix_name(elem, "&#xa0;&#x2014; ",
+      prefix_name(elem, block_delim,
                   l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
 
@@ -60,7 +64,7 @@ module IsoDoc
             else
               l10n("#{@i18n.example} #{n[:label]}")
             end
-      prefix_name(elem, "&#xa0;&#x2014; ", lbl, "name")
+      prefix_name(elem, block_delim, lbl, "name")
     end
 
     def note(docxml)
@@ -130,7 +134,7 @@ module IsoDoc
       return if elem["unnumbered"] && !elem.at(ns("./name"))
 
       n = @xrefs.anchor(elem["id"], :label, false)
-      prefix_name(elem, "&#xa0;&#x2014; ", l10n("#{lower2cap @i18n.table} #{n}"),
+      prefix_name(elem, block_delim, l10n("#{lower2cap @i18n.table} #{n}"),
                   "name")
     end
 

data/lib/isodoc/presentation_function/image.rb

@@ -32,7 +32,7 @@ module IsoDoc
       return if elem.at(ns("./figure")) && !elem.at(ns("./name"))
 
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
-      prefix_name(elem, " — ",
+      prefix_name(elem, block_delim,
                   l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
 

data/lib/isodoc/presentation_function/inline.rb

@@ -3,14 +3,6 @@ require_relative "xrefs"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
-    def nearest_block_parent(node)
-      until %w(p title td th name formula li dt dd sourcecode pre)
-          .include?(node.name)
-        node = node.parent
-      end
-      node
-    end
-
     def non_locality_elems(node)
       node.children.reject do |c|
         %w{locality localityStack location}.include? c.name

data/lib/isodoc/presentation_function/section.rb

@@ -11,7 +11,8 @@ module IsoDoc
     end
 
     def clause1(elem)
-      level = @xrefs.anchor(elem["id"], :level, false) || "1"
+      level = @xrefs.anchor(elem["id"], :level, false) ||
+        (elem.ancestors("clause, annex").size + 1)
       t = elem.at(ns("./title")) and t["depth"] = level
       return if !elem.ancestors("boilerplate").empty? ||
         @suppressheadingnumbers || elem["unnumbered"]
@@ -91,15 +92,26 @@ module IsoDoc
 
     def bibrender(xml)
       if f = xml.at(ns("./formattedref"))
-        code = render_identifier(bibitem_ref_code(xml))
-        f << " [#{code[:sdo]}] " if code[:sdo]
-      else
-        xml.children =
-          "#{bibrenderer.render(xml.to_xml)}"\
-          "#{xml.xpath(ns('./docidentifier | ./uri | ./note')).to_xml}"
+        bibrender_formattedref(f, xml)
+      else bibrender_relaton(xml)
       end
     end
 
+    def bibrender_formattedref(formattedref, xml)
+      code = render_identifier(bibitem_ref_code(xml))
+      (code[:sdo] && xml["suppress_identifier"] != "true") and
+        formattedref << " [#{code[:sdo]}] "
+    end
+
+    def bibrender_relaton(xml)
+      bib = xml.dup
+      bib["suppress_identifier"] == true and
+        bib.xpath(ns("./docidentifier")).each(&:remove)
+      xml.children =
+        "#{bibrenderer.render(bib.to_xml)}"\
+        "#{xml.xpath(ns('./docidentifier | ./uri | ./note')).to_xml}"
+    end
+
     def bibrenderer
       ::Relaton::Render::IsoDoc::General.new(language: @lang)
     end
@@ -177,7 +189,7 @@ module IsoDoc
 
     def toc(docxml)
       docxml.xpath(ns("//toc//xref[text()]")).each do |x|
-        lbl = @xrefs.get[x["target"]][:label] or next
+        lbl = @xrefs.anchor(x["target"], :label) or next
         x.children.first.previous = "#{lbl}<tab/>"
       end
     end

data/lib/isodoc/presentation_function/xrefs.rb

@@ -105,9 +105,7 @@ module IsoDoc
     end
 
     def capitalise_xref1(node, linkend)
-      prec = nearest_block_parent(node).xpath("./descendant-or-self::text()") &
-        node.xpath("./preceding::text()")
-      if prec.empty? || /(?!<[^.].)\.\s+$/.match(prec.map(&:text).join)
+      if start_of_sentence(node)
         Common::case_with_markup(linkend, "capital", @script)
       else linkend
       end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.1.2".freeze
+  VERSION = "2.1.4".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -176,7 +176,7 @@ module IsoDoc
           div.p **{ class: "Note" } do |p|
             if name
               name.children.each { |n| parse(n, p) }
-              p << l10n(": ")
+              p << termnote_delim
             end
             para_then_remainder(node.first_element_child, node, p, div)
           end

data/lib/isodoc/word_function/inline.rb

@@ -1,9 +1,14 @@
 module IsoDoc
   module WordFunction
     module Body
-      def section_break(body)
+      def section_break(body, continuous: false)
         body.p do |p|
-          p.br **{ clear: "all", class: "section" }
+          if continuous
+            p.br **{ clear: "all", style: "page-break-before:auto;"\
+                                          "mso-break-type:section-break" }
+          else
+            p.br **{ clear: "all", class: "section" }
+          end
         end
       end
 

data/lib/isodoc/word_function/postprocess.rb

@@ -88,11 +88,20 @@ module IsoDoc
         word_pseudocode_cleanup(docxml)
         word_image_caption(docxml)
         word_section_breaks(docxml)
+        word_tab_clean(docxml)
         authority_cleanup(docxml)
         word_footnote_format(docxml)
         docxml
       end
 
+      def word_tab_clean(docxml)
+        docxml.xpath("//p[@class='Biblio']//span[@style='mso-tab-count:1']")
+          .each do |s|
+          s.next.text? or next
+          s.next.replace(s.next.text.sub(/^\s+/, ""))
+        end
+      end
+
       def word_colgroup(docxml)
         cells2d = {}
         docxml.xpath("//table[colgroup]").each do |t|

data/lib/isodoc/xref/xref_gen.rb

@@ -151,8 +151,8 @@ module IsoDoc
           label = "#{prev_label}) #{label}" unless prev_label.empty?
           label = "#{list_anchor[:xref]} #{label}" if refer_list
           li["id"] and @anchors[li["id"]] =
-                         { xref: "#{label})", type: "listitem",
-                           container: list_anchor[:container] }
+                         { xref: "#{label})", type: "listitem", refer_list:
+                           refer_list, container: list_anchor[:container] }
           (li.xpath(ns(".//ol")) - li.xpath(ns(".//ol//ol"))).each do |ol|
             list_item_anchor_names(ol, list_anchor, depth + 1, label, false)
           end

data/lib/isodoc/xref.rb

@@ -52,7 +52,7 @@ module IsoDoc
 
     # extract names for all anchors, xref and label
     def parse(docxml)
-      amend_preprocess(docxml) if  @parse_settings.empty?
+      amend_preprocess(docxml) if @parse_settings.empty?
       initial_anchor_names(docxml)
       back_anchor_names(docxml)
       # preempt clause notes with all other types of note (ISO default)

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

@@ -94,6 +94,7 @@ admonition:
   caution: حذر
   important: مهم
   safety precautions: احتياطات السلامة
+  editorial: ملاحظة تحريرية
 locality:
   section: قسم
   clause: فقرة
@@ -132,6 +133,7 @@ relatedterms:
   contrast: مضاد
   # تباين
   see: انظر
+  seealso: انظر أيضا
 inflection:
   فقرة:
     sg: فقرة

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

@@ -99,7 +99,8 @@ admonition: {
   warning: Warnung,
   caution: Vorsicht,
   important: Wichtig,
-  safety precautions: Sicherheitsvorkehrungen
+  safety precautions: Sicherheitsvorkehrungen,
+  editorial: Redaktioneller Hinweis
 }
 locality: {
   section: Abschnitt,
@@ -138,6 +139,7 @@ relatedterms:
   compare: vergleiche
   contrast: dagegen
   see: siehe
+  seealso: siehe auch
 inflection:
   Klausel:
     sg: Klausel

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

@@ -99,7 +99,8 @@ admonition: {
   warning: Warning,
   caution: Caution,
   important: Important,
-  safety precautions: Safety Precautions
+  safety precautions: Safety Precautions,
+  editorial: Editorial Note
 }
 locality: {
                       section: Section,
@@ -138,6 +139,7 @@ relatedterms:
   compare: compare
   contrast: contrast
   see: see
+  seealso: see also
 inflection:
   Clause:
     sg: Clause

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

@@ -99,7 +99,8 @@ admonition: {
   warning: Advertencia,
   caution: Precaución,
   important: Importante,
-  safety precautions: Precauciones de seguridad
+  safety precautions: Precauciones de seguridad,
+  editorial: Note editorial
 }
 locality: {
                       section: Sección,
@@ -138,6 +139,7 @@ relatedterms:
   compare: relacionado
   contrast: difiere
   see: véase
+  seealso: véase tambien
 inflection:
   Cláusula:
     sg: Cláusula

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

@@ -98,6 +98,7 @@ admonition: {
   caution: Attention,
   important: Important,
   safety precautions: Précautions de Sécurité,
+  editorial: Note éditoriale
 }
 locality: {
                       section: Section,
@@ -136,6 +137,7 @@ relatedterms:
   compare: comparez
   contrast: contrastez
   see: voir
+  seealso: voir aussi
 inflection:
   Clause:
     sg: Article

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

@@ -104,7 +104,8 @@ admonition: {
   warning: Предупреждение,
   caution: Предостережение,
   important: Важно,
-  safety precautions: Меры безопасности
+  safety precautions: Меры безопасности,
+  editorial: Редакционная Заметка
 }
 locality: {
                       section: Раздел,
@@ -143,6 +144,7 @@ relatedterms:
   compare: наравне
   contrast: противоположный
   see: см.
+  seealso: см. также
 inflection:
   Пункт:
     sg: Пункт

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

@@ -95,6 +95,7 @@ admonition: {
   caution: 注意,
   important: 重要,
   safety precautions: 安全须知,
+  editorial: 编辑说明
 }
 locality: {
   section: 条,
@@ -132,4 +133,5 @@ relatedterms:
   compare: 比较
   contrast: 对比
   see: 见
+  seealso: 参见
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -504,7 +504,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.16
 signing_key:
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.