isodoc 1.6.7.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17e14b978b65a7667074ab1dff17bd5dc76a58e6baf7ace593407dc921ddf558
-  data.tar.gz: 3622549bc44570ec6e8de62fb55a62af937e32306ccc444bfaf0a1063caae511
+  metadata.gz: e07a78782a0c09a2c70525f1d7d4b8f5d34ea8d731c3dbc5860b7386250c1e56
+  data.tar.gz: bb3ddf0e119c8cf4b4d25c70ba381dba043020c132edd13fc4934bb08871594e
 SHA512:
-  metadata.gz: 2cffca2a878c9bc3e05d26b85edb21be9ff27a75b8fd6e9ab7b31cdb861915b41baeb9e4b4027fb5f8f5e751879143dd55ea7cc35d46d6feb507d2a83632ff2b
-  data.tar.gz: 5146c2a8457a5f41232b6176acb3bf5fd77bfb75941b9030f6c015463cfe7646e6a3df153423229a3c9a17e0aa6c02529062bffdd1e98ad116fb91f1d61f6306
+  metadata.gz: ba808db07e817492e8ceb891771ec1df67f8d4dfab34896eb2eca9accd45ccf110745a5844276e52f1f20c6542cf1d33fdaad816ea3ce0ff264465bd4f4c8d4c
+  data.tar.gz: 0124e13883ab5d0c5f0561c62b924920ae0d73bc4980024f77336a4aed919d175c0f51a464e3574f910ea77ba15bccbf0d86c7e14707a6f4b7bf038ff7f1d80a

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

@@ -18,29 +18,23 @@ clause: فقرة
 annex: ملحق
 appendix: تذييل
 no_terms_boilerplate: |
-  <p>No terms and definitions are listed in this document.</p>
+  <p>لم يتم سرد أي مصطلحات وتعريفات في هذا المستند.</p>
 internal_terms_boilerplate: |
-  <p>For the purposes of this document,
-            the following terms and definitions apply.</p>
+  <p>لأغراض هذا المستند، تنطبق المصطلحات والتعريفات التالية.</p>
 norm_with_refs_pref:
-  The following documents are referred to in the text in such a way
-      that some or all of their content constitutes requirements of this
-      document. For dated references, only the edition cited applies.
-      For undated references, the latest edition of the referenced
-      document (including any amendments) applies.
+  تتم الإشارة إلى المستندات التالية في النص بحيث يشكل بعض أو كل محتوياتها متطلبات هذا المستند. للحصول على مراجع مؤرخة، تطبق النسخة المشار إليها فقط. بالنسبة للمراجع غير المؤرخة ، تنطبق أحدث طبعة من الوثيقة المشار إليها (بما في ذلك أي تعديلات).
 norm_empty_pref:
-  There are no normative references in this document.
+  لا توجد مراجع معيارية في هذه الوثيقة.
 external_terms_boilerplate: |
-  <p>For the purposes of this document,
-    the terms and definitions given in % apply.</p>
+  <p> لأغراض هذا المستند ، تنطبق المصطلحات والتعريفات الواردة في%. </ p>
 internal_external_terms_boilerplate: |
-  <p>For the purposes of this document, the terms and definitions
-    given in % and the following apply.</p>
-term_defined_in: "[term defined in %]"
+  <p>لأغراض هذه الوثيقة ،تنطبق المصطلحات والتعاريف الواردة في % وما يلي.</p>
+term_defined_in: "[المصطلح المحدد في %]"
 note: ملاحظة
 note_xref: ملاحظة
-termnote: Note % to entry
+termnote: ملاحظة % للقيد
 list: قائمة
+deflist: قائمة تعريف
 figure: شكل
 formula: معادلة
 inequality: عدم مساواة
@@ -48,16 +42,16 @@ table: جدول
 requirement: مطلب
 recommendation: توصية
 permission: إذن
-key: Key
+key: مفتاح
 example: مثال
 example_xref: مثال
 where: حيث
 wholeoftext: كامل النص
-draft_label: draft
-inform_annex: informative
-norm_annex: normative
+draft_label: مسودة
+inform_annex: إخباري
+norm_annex: مقياسي
 modified: معدلة
-deprecated: DEPRECATED
+deprecated: مهمل
 source: مصدر
 and: و
 all_parts: كل الأجزاء
@@ -78,8 +72,8 @@ subject: موضوع
 inherits: يرث
 admonition:
   danger: خطر
-  warning: Warning
-  caution: Caution
+  warning: تحذير
+  caution: حذر
   important: مهم
   safety precautions: احتياطات السلامة
 locality:
@@ -108,9 +102,9 @@ inflection:
   ملاحظة:
     sg: ملاحظة
     pl: ملاحظات
-  "Note % to entry":
-    sg: Note % to entry
-    pl: Notes % to entry
+  "ملاحظة % للقيد":
+    sg: ملاحظة % للقيد
+    pl: ملاحظات % للقيد
   قائمة:
     sg: قائمة
     pl: قوائم

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

@@ -36,6 +36,7 @@ note: HINWEIS
 note_xref: Hinweis
 termnote: Hinweis % zum Eintrag
 list: Liste
+deflist: Definitionsliste
 figure: Abbildung
 formula: Formel
 inequality: Formel

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

@@ -42,6 +42,7 @@ note: NOTE
 note_xref: Note
 termnote: Note % to entry
 list: List
+deflist: Definition List
 figure: Figure
 formula: Formula
 inequality: Formula

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

@@ -38,6 +38,7 @@ note: NOTA
 note_xref: Nota
 termnote: Nota % a la entrada
 list: Lista
+deflist: Lista de definiciones
 figure: Figura
 formula: Fórmula
 inequality: Fórmula

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

@@ -38,6 +38,7 @@ figure: Figure
 formula: Formule
 inequality: Formule
 list: Liste
+deflist: Liste de définitions
 table: Tableau
 requirement: Exigence
 recommendation: Recommandation

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

@@ -41,6 +41,7 @@ note: ПРИМЕЧАНИЕ
 note_xref: Примечание
 termnote: Примечание % к определению
 list: Список
+deflist: Список определений
 figure: Рисунок
 formula: Формула
 inequality: Формула

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

@@ -40,6 +40,7 @@ figure: 图
 formula: 公式
 inequality: 公式
 list: 列项
+deflist: 定义列表
 table: 表
 requirement: 要求
 recommendation: 建议

data/lib/isodoc/convert.rb

@@ -145,7 +145,7 @@ module IsoDoc
     end
 
     def convert_init(file, input_filename, debug)
-      docxml = Nokogiri::XML(file)
+      docxml = Nokogiri::XML(file) { |config| config.huge }
       filename, dir = init_file(input_filename, debug)
       docxml.root.default_namespace = ""
       lang = docxml&.at(ns("//bibdata/language"))&.text and @lang = lang

data/lib/isodoc/function/blocks.rb

@@ -225,7 +225,7 @@ module IsoDoc::Function
     end
 
     def svg_parse(node, out)
-      out << node.to_xml
+      out.parent.add_child(node)
     end
   end
 end

data/lib/isodoc/html_function/postprocess.rb

@@ -19,7 +19,6 @@ module IsoDoc
 
       def toHTML(result, filename)
         result = from_xhtml(html_cleanup(to_xhtml(result)))
-        # result = populate_template(result, :html)
         result = from_xhtml(move_images(to_xhtml(result)))
         result = html5(script_cdata(inject_script(result)))
         File.open(filename, "w:UTF-8") { |f| f.write(result) }
@@ -33,7 +32,14 @@ module IsoDoc
       def html_cleanup(html)
         html = term_header(html_footnote_filter(html_preface(htmlstyle(html))))
         html = footnote_format(footnote_backlinks(html_toc(html)))
-        mathml(html_list_clean(html))
+        mathml(html_list_clean(remove_placeholder_paras(html)))
+      end
+
+      def remove_placeholder_paras(html)
+        %w(title-section prefatory-section).each do |s|
+          html&.at("//div[@class = '#{s}']/p[last()]")&.remove
+        end
+        html
       end
 
       def html_list_clean(html)
@@ -99,7 +105,6 @@ module IsoDoc
       def html_cover(docxml)
         doc = to_xhtml_fragment(File.read(@htmlcoverpage, encoding: "UTF-8"))
         d = docxml.at('//div[@class="title-section"]')
-        # d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
         d.children.first.add_previous_sibling(
           populate_template(doc.to_xml(encoding: "US-ASCII"), :html),
         )
@@ -108,7 +113,6 @@ module IsoDoc
       def html_intro(docxml)
         doc = to_xhtml_fragment(File.read(@htmlintropage, encoding: "UTF-8"))
         d = docxml.at('//div[@class="prefatory-section"]')
-        # d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
         d.children.first.add_previous_sibling(
           populate_template(doc.to_xml(encoding: "US-ASCII"), :html),
         )

data/lib/isodoc/html_function/sectionsplit.rb

@@ -99,7 +99,9 @@ module IsoDoc::HtmlFunction
       refs = eref_to_internal_eref(xml, key)
       refs += xref_to_internal_eref(xml, key)
       xml.root["type"] = key # to force recognition of internal refs
-      insert_indirect_biblio(xml, refs, key)
+      ins = new_hidden_ref(xml)
+      copy_repo_items_biblio(ins, xml)
+      insert_indirect_biblio(ins, refs, key)
     end
 
     def svg_preprocess(xml)
@@ -164,15 +166,27 @@ module IsoDoc::HtmlFunction
     def eref_to_internal_eref_select(xml)
       refs = xml.xpath(("//*/@bibitemid")).map { |x| x.text } # rubocop:disable Style/SymbolProc
       refs.uniq.reject do |x|
-        xml.at(ns("//bibitem[@id = '#{x}'][@type = 'internal']"))
+        xml.at(ns("//bibitem[@id = '#{x}'][@type = 'internal']")) ||
+          xml.at(ns("//bibitem[@id = '#{x}']"\
+                    "[docidentifier/@type = 'repository']"))
       end
     end
 
     # from standoc
-    def insert_indirect_biblio(xmldoc, refs, prefix)
+    def new_hidden_ref(xmldoc)
       ins = xmldoc.at("bibliography") or
         xmldoc.root << "<bibliography/>" and ins = xmldoc.at("bibliography")
-      ins = ins.add_child("<references hidden='true' normative='false'/>").first
+      ins.add_child("<references hidden='true' normative='false'/>").first
+    end
+
+    def copy_repo_items_biblio(ins, xml)
+      xml.xpath(ns("//references/bibitem[docidentifier/@type = 'repository']"))
+        .each do |b|
+        ins << b.dup
+      end
+    end
+
+    def insert_indirect_biblio(ins, refs, prefix)
       refs.each do |x|
         ins << <<~BIBENTRY
           <bibitem id="#{x}" type="internal">

data/lib/isodoc/presentation_function/block.rb

@@ -19,12 +19,15 @@ module IsoDoc
       end
     end
 
-    def svg_extract(f)
-      return unless %r{^data:image/svg\+xml;base64,}.match?(f["src"])
+    def svg_extract(elem)
+      return unless %r{^data:image/svg\+xml;base64,}.match?(elem["src"])
 
-      svg = Base64.strict_decode64(f["src"]
+      svg = Base64.strict_decode64(elem["src"]
         .sub(%r{^data:image/svg\+xml;base64,}, ""))
-      f.replace(svg.sub(/<\?xml[^>]*>/, ""))
+      x = Nokogiri::XML.fragment(svg.sub(/<\?xml[^>]*>/, "")) do |config|
+        config.huge
+      end
+      elem.replace(x)
     end
 
     def figure1(f)

data/lib/isodoc/presentation_function/inline.rb

@@ -129,10 +129,8 @@ module IsoDoc
 
       loc = @i18n.locality[type] || type.sub(/^locality:/, "")
       loc = case node["case"]
-            when "capital" then loc.capitalize
             when "lowercase" then loc.downcase
-            else
-              loc.capitalize
+            else loc.capitalize
             end
       " #{loc}"
     end
@@ -162,15 +160,12 @@ module IsoDoc
     end
 
     def concept1(node)
-      content = node.first_element_child.children.reject do |c|
-        %w{locality localityStack}.include? c.name
-      end.select { |c| !c.text? || /\S/.match(c) }
-      n = if content.empty?
-            @i18n.term_defined_in.sub(/%/, node.first_element_child.to_xml)
-          else
-            "<em>#{node.children.to_xml}</em>"
-          end
-      node.replace(n)
+      node&.at(ns("./refterm"))&.remove
+      d = node&.at(ns("./renderterm"))
+      d&.name = "em"
+      r = node.at(ns("./xref | ./eref | ./termref"))
+      r.replace(@i18n.term_defined_in.sub(/%/, r.to_xml))
+      node.replace(node.children)
     end
 
     def variant(docxml)

data/lib/isodoc/presentation_xml_convert.rb

@@ -29,12 +29,12 @@ module IsoDoc
     end
 
     def section(docxml)
-      display_order docxml
       clause docxml
       annex docxml
       term docxml
       references docxml
       index docxml
+      display_order docxml
     end
 
     def block(docxml)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.6.7.1".freeze
+  VERSION = "1.7.0".freeze
 end

data/lib/isodoc/xref.rb

@@ -28,16 +28,16 @@ module IsoDoc
       @anchors
     end
 
-    def anchor(id, lbl, warning = true)
-      return nil if id.nil? || id.empty?
+    def anchor(ident, lbl, warning = true)
+      return nil if ident.nil? || ident.empty?
 
-      if warning && !@anchors[id]
+      if warning && !@anchors[ident]
         @seen ||= Seen_Anchor.instance
-        @seen.seen(id) or warn "No label has been processed for ID #{id}"
-        @seen.add(id)
-        return "[#{id}]"
+        @seen.seen(ident) or warn "No label has been processed for ID #{ident}"
+        @seen.add(ident)
+        return "[#{ident}]"
       end
-      @anchors.dig(id, lbl)
+      @anchors.dig(ident, lbl)
     end
 
     # extract names for all anchors, xref and label
@@ -50,6 +50,7 @@ module IsoDoc
       note_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
       example_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
       list_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
+      deflist_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
       bookmark_anchor_names(docxml)
     end
 

data/lib/isodoc/xref/xref_anchor.rb

@@ -1,61 +1,62 @@
 require "singleton"
 
-module IsoDoc::XrefGen
-  module Anchor
-    class Seen_Anchor
-      include Singleton
+module IsoDoc
+  module XrefGen
+    module Anchor
+      class Seen_Anchor
+        include Singleton
+
+        def initialize
+          @seen = {}
+        end
+
+        def seen(elem)
+          @seen.has_key?(elem)
+        end
+
+        def add(elem)
+          @seen[elem] = true
+        end
+      end
 
       def initialize
-        @seen = {}
+        @anchors = {}
       end
 
-      def seen(x)
-        @seen.has_key?(x)
+      def get_anchors
+        @anchors
       end
 
-      def add(x)
-        @seen[x] = true
+      def anchor_struct_label(lbl, elem)
+        case elem
+        when @labels["appendix"] then l10n("#{elem} #{lbl}")
+        else
+          lbl.to_s
+        end
       end
-    end
-
-    def initialize()
-      @anchors = {}
-    end
-
-    def get_anchors
-      @anchors
-    end
 
-    def anchor_struct_label(lbl, elem)
-      case elem
-      when @labels["appendix"] then l10n("#{elem} #{lbl}")
-      else
-        lbl.to_s
+      def anchor_struct_xref(lbl, elem)
+        l10n("#{elem} #{anchor_struct_value(lbl, elem)}")
       end
-    end
-
-    def anchor_struct_xref(lbl, elem)
-      l10n("#{elem} #{anchor_struct_value(lbl, elem)}")
-    end
 
-    def anchor_struct_value(lbl, elem)
-      case elem
-      when @labels["formula"] then "(#{lbl})"
-      when @labels["inequality"] then "(#{lbl})"
-      else
-        lbl
+      def anchor_struct_value(lbl, elem)
+        case elem
+        when @labels["formula"], @labels["inequality"] then "(#{lbl})"
+        else
+          lbl
+        end
       end
-    end
 
-    def anchor_struct(lbl, container, elem, type, unnumbered = false)
-      ret = {}
-      ret[:label] = unnumbered == "true" ? nil : anchor_struct_label(lbl, elem)
-      ret[:xref] = anchor_struct_xref(unnumbered == "true" ? "(??)" : lbl, elem)
-      ret[:xref].gsub!(/ $/, "")
-      ret[:container] = @klass.get_clause_id(container) unless container.nil?
-      ret[:type] = type
-      ret[:value] = anchor_struct_value(lbl, elem)
-      ret
+      def anchor_struct(lbl, container, elem, type, unnumb = false)
+        ret = {}
+        ret[:label] = unnumb == "true" ? nil : anchor_struct_label(lbl, elem)
+        ret[:xref] = anchor_struct_xref(unnumb == "true" ? "(??)" : lbl, elem)
+        ret[:xref].gsub!(/ $/, "")
+        ret[:container] = @klass.get_clause_id(container) unless container.nil?
+        ret[:type] = type
+        ret[:value] = anchor_struct_value(lbl, elem)
+        ret
+      end
     end
   end
 end