isodoc 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bf48bda8bc7d17d20a766f93c30bcf9f6e7e597497f8663f2c96ff292ada4f5
-  data.tar.gz: 7efd7f5c3aff9ee37fc631eecd1a564213ab56f92780807d1dff2b17e05c402b
+  metadata.gz: c60f8eb9fcf49c289d99f64d901511387ae9d928a93c20ec81c011eb536f8a6a
+  data.tar.gz: f4c33c72526c543b3d7c4929a20dfaa2413e9d007b8d2315aed424e156ad4061
 SHA512:
-  metadata.gz: 449d645dc7a4caaf2cd778dedfa4bb995344c3c83b076abbe4ea971b32d6fc9515ee7ae1140d76dfbc5f2c01220513979ea239c095fc2037b84263996a728e4f
-  data.tar.gz: 2031af0175ba1ba995fe3cca887180fa0e0d097dcfd6e2afb51eb7dc60ad8934bfbf4fc17dd9f91f1f2fba8e63e46efd8cee7a2fb2e9693d3f3f804ef432f662
+  metadata.gz: bd64d2a35ac86b7b70d46b4ea3631070291b32ee014199d1bc395c5bf33c130d41527afcce573fddd49dc96a4f97d77a6e21a81ed45afec325ce2da61ad4c6ed
+  data.tar.gz: 758249109707c1a6132311e2706f9b791799960f063546cdc8d125f36919845e03bfc5546d2a68d47c30f782fd20b3de1143e66e88a53b5b5bb766e52407a2a7

data/lib/isodoc/class_utils.rb

@@ -15,8 +15,8 @@ module IsoDoc
     def ns(xpath)
       xpath.gsub(%r{/([a-zA-z])}, "/xmlns:\\1")
         .gsub(%r{::([a-zA-z])}, "::xmlns:\\1")
-        .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]* ?=)}, "[xmlns:\\1")
-        .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]*[/\]])}, "[xmlns:\\1")
+        .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/-]* ?=)}, "[xmlns:\\1")
+        .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/-]*[/\[\]])}, "[xmlns:\\1")
     end
 
     def liquid(doc)

data/lib/isodoc/function/inline.rb

@@ -17,7 +17,13 @@ module IsoDoc
       def location_parse(node, out); end
 
       def span_parse(node, out)
-        node.children.each { |n| parse(n, out) }
+        if node["style"]
+          out.span **{ style: node["style"] } do |s|
+            node.children.each { |n| parse(n, s) }
+          end
+        else
+          node.children.each { |n| parse(n, out) }
+        end
       end
 
       def callout_parse(node, out)
@@ -57,12 +63,11 @@ module IsoDoc
       def eref_url(bibitemid)
         return nil if @bibitems.nil? || @bibitems[bibitemid].nil?
 
-        if url = @bibitems[bibitemid].at(ns("./uri[@type = 'citation']"))
-          url.text
-        elsif @bibitems[bibitemid]["hidden"] == "true"
-          @bibitems[bibitemid]&.at(ns("./uri"))&.text
-        else "##{bibitemid}"
-        end
+        url = @bibitems[bibitemid].at(ns("./uri[@type = 'citation']")) and
+          return url.text
+        @bibitems[bibitemid]["hidden"] == "true" and
+          return @bibitems[bibitemid].at(ns("./uri"))&.text
+        "##{bibitemid}"
       end
 
       def eref_parse(node, out)

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/section_titles.rb

@@ -5,15 +5,15 @@ module IsoDoc
         "."
       end
 
-      def clausedelimspace(out)
+      def clausedelimspace(_node, out)
         insert_tab(out, 1)
       end
 
-      def inline_header_title(out, _node, title)
+      def inline_header_title(out, node, title)
         out.span **{ class: "zzMoveToFollowing" } do |s|
           s.b do |b|
             title&.children&.each { |c2| parse(c2, b) }
-            clausedelimspace(out) if /\S/.match?(title&.text)
+            clausedelimspace(node, out) if /\S/.match?(title&.text)
           end
         end
       end

data/lib/isodoc/function/to_word_html.rb

@@ -218,7 +218,7 @@ module IsoDoc
           when "feedback-statement" then feedback_parse(node, out)
           when "passthrough" then passthrough_parse(node, out)
           when "amend" then amend_parse(node, out)
-          when "tab" then clausedelimspace(out) # in Presentation XML only
+          when "tab" then clausedelimspace(node, out) # in Presentation XML only
           when "svg" then svg_parse(node, out) # in Presentation XML only
           when "add" then add_parse(node, out)
           when "del" then del_parse(node, out)

data/lib/isodoc/presentation_function/block.rb

@@ -20,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
 

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"]
@@ -80,6 +81,10 @@ module IsoDoc
       docxml.xpath(ns("//references/bibitem")).each do |x|
         bibitem(x)
       end
+      docxml.xpath(ns("//references[bibitem/@hidden = 'true']")).each do |x|
+        x.at(ns("./bibitem[not(@hidden = 'true')]")) and next
+        x["hidden"] = "true"
+      end
       @xrefs.parse_inclusions(refs: true).parse(docxml)
     end
 
@@ -91,15 +96,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

data/lib/isodoc/presentation_function/terms.rb

@@ -82,8 +82,13 @@ module IsoDoc
       p = node.at(ns("./preferred"))
       ref = node.at(ns("./xref | ./eref | ./termref"))
       label = @i18n.relatedterms[node["type"]].upcase
-      node.replace(l10n("<p><strong>#{label}:</strong> "\
-                        "<em>#{p.to_xml}</em> (#{ref.to_xml})</p>"))
+      if p && ref
+        node.replace(l10n("<p><strong>#{label}:</strong> "\
+                          "<em>#{p.to_xml}</em> (#{ref.to_xml})</p>"))
+      else
+        node.replace(l10n("<p><strong>#{label}:</strong> "\
+                          "<strong>**RELATED TERM NOT FOUND**</strong></p>"))
+      end
     end
 
     def designation(docxml)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.1.3".freeze
+  VERSION = "2.2.0".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/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(@c.encode(s.next.text.sub(/^\s+/, ""), :hexadecimal))
+        end
+      end
+
       def word_colgroup(docxml)
         cells2d = {}
         docxml.xpath("//table[colgroup]").each do |t|

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

@@ -94,6 +94,7 @@ admonition:
   caution: حذر
   important: مهم
   safety precautions: احتياطات السلامة
+  editorial: ملاحظة تحريرية
 locality:
   section: قسم
   clause: فقرة

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,

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,

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,

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,

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

@@ -104,7 +104,8 @@ admonition: {
   warning: Предупреждение,
   caution: Предостережение,
   important: Важно,
-  safety precautions: Меры безопасности
+  safety precautions: Меры безопасности,
+  editorial: Редакционная Заметка
 }
 locality: {
                       section: Раздел,

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

@@ -95,6 +95,7 @@ admonition: {
   caution: 注意,
   important: 重要,
   safety precautions: 安全须知,
+  editorial: 编辑说明
 }
 locality: {
   section: 条,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2022-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath