metanorma-iso 2.9.2 → 2.9.4

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -1,6 +1,5 @@
 require_relative "init"
 require "isodoc"
-require_relative "index"
 require_relative "presentation_xref"
 require_relative "presentation_bibdata"
 require_relative "presentation_terms"
@@ -298,6 +297,10 @@ module IsoDoc
         end
       end
 
+      def enable_indexsect
+        true
+      end
+
       include Init
     end
   end

data/lib/metanorma/iso/biblio.rng

@@ -267,11 +267,11 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
           <a:documentation>An identifier of the person according to an international identifier scheme</a:documentation>
         </ref>
       </zeroOrMore>
-      <zeroOrMore>
+      <optional>
         <ref name="contact">
           <a:documentation>Contact information for the person, including URI, address, phone number, and email</a:documentation>
         </ref>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="fullname">
@@ -454,11 +454,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
         <a:documentation>An identifier of the organization according to an international identifier scheme</a:documentation>
       </ref>
     </zeroOrMore>
-    <zeroOrMore>
+    <optional>
       <ref name="contact">
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
-    </zeroOrMore>
+    </optional>
     <optional>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
@@ -540,12 +540,18 @@ real names (if the person is named with a pseudonym or user name); previous lega
   <!-- TODO may change -->
   <define name="contact">
     <a:documentation>Contact information for a person or organization</a:documentation>
-    <choice>
+    <zeroOrMore>
       <ref name="address"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="phone"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="email"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="uri"/>
-    </choice>
+    </zeroOrMore>
   </define>
   <define name="phone">
     <a:documentation>The phone number associated with a person or organization</a:documentation>

data/lib/metanorma/iso/front.rb

@@ -22,6 +22,7 @@ module Metanorma
           xml.updates_document_type a
         a = node.attr("fast-track") and xml.send "fast-track", a != "false"
         a = node.attr("price-code") and xml.price_code a
+        node.attr("iso-cen-parallel") and xml.iso_cen_parallel true
       end
 
       STAGE_ERROR = [Pubid::Core::Errors::HarmonizedStageCodeInvalidError,

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "2.9.2".freeze
+    VERSION = "2.9.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.9.4
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-10 00:00:00.000000000 Z
+date: 2025-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -331,7 +331,6 @@ files:
 - lib/isodoc/iso/i18n-ru.yaml
 - lib/isodoc/iso/i18n-zh-Hans.yaml
 - lib/isodoc/iso/i18n.rb
-- lib/isodoc/iso/index.rb
 - lib/isodoc/iso/init.rb
 - lib/isodoc/iso/iso.amendment.xsl
 - lib/isodoc/iso/iso.international-standard.xsl
@@ -393,7 +392,7 @@ homepage: https://github.com/metanorma/metanorma-iso
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -409,7 +408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: metanorma-iso lets you write ISO standards in AsciiDoc.
 test_files: []

data/lib/isodoc/iso/index.rb

@@ -1,173 +0,0 @@
-module IsoDoc
-  module Iso
-    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
-      def add_id
-        %(id="_#{UUIDTools::UUID.random_create}")
-      end
-
-      def index(xml)
-        if xml.at(ns("//index"))
-          i = xml.at(ns("//indexsect")) ||
-            xml.root.add_child("<indexsect #{add_id}><title>#{@i18n.index}" \
-                               "</title></indexsect>").first
-          index = sort_indexterms(xml.xpath(ns("//index")),
-                                  xml.xpath(ns("//index-xref[@also = 'false']")),
-                                  xml.xpath(ns("//index-xref[@also = 'true']")))
-          index1(xml, i, index)
-        else xml.xpath(ns("//indexsect")).each(&:remove)
-        end
-      end
-
-      def index1(docxml, indexsect, index)
-        c = indexsect.add_child("<ul></ul>").first
-        index.keys.sort.each do |k|
-          words = index[k].keys.each_with_object({}) do |w, v|
-            v[sortable(w).downcase] = w
-          end
-          words.keys.localize(@lang.to_sym).sort.to_a.each do |w|
-            c.add_child index_entries(words, index[k], w)
-          end
-        end
-        index1_cleanup(docxml)
-      end
-
-      def index1_cleanup(docxml)
-        docxml.xpath(ns("//indexsect//xref")).each do |x|
-          x.children.remove
-        end
-        @xrefs.bookmark_anchor_names(docxml)
-      end
-
-      def sortable(str)
-        HTMLEntities.new.decode(Nokogiri::XML.fragment(str).text)
-      end
-
-      def index_entries_opt
-        { xref_lbl: ", ", see_lbl: ", #{see_lbl}", also_lbl: ", #{also_lbl}" }
-      end
-
-      def index_entries(words, index, primary)
-        ret = index_entries_head(words[primary],
-                                 index.dig(words[primary], nil, nil),
-                                 index_entries_opt)
-        words2 = index[words[primary]]&.keys&.compact
-          &.each_with_object({}) { |w, v| v[w.downcase] = w }
-        unless words2.empty?
-          ret += "<ul>"
-          words2.keys.localize(@lang.to_sym).sort.to_a.each do |w|
-            ret += index_entries2(words2, index[words[primary]], w)
-          end
-          ret += "</ul>"
-        end
-        "#{ret}</li>"
-      end
-
-      def index_entries2(words, index, secondary)
-        ret = index_entries_head(words[secondary],
-                                 index.dig(words[secondary], nil),
-                                 index_entries_opt)
-        words3 = index[words[secondary]]&.keys&.compact
-          &.each_with_object({}) { |w, v| v[w.downcase] = w }
-        unless words3.empty?
-          ret += "<ul>"
-          words3.keys.localize(@lang.to_sym).sort.to_a.each do |w|
-            ret += (index_entries_head(words3[w],
-                                       index[words[secondary]][words3[w]],
-                                       index_entries_opt) + "</li>")
-          end
-          ret += "</ul>"
-        end
-        "#{ret}</li>"
-      end
-
-      def index_entries_head(head, entries, opt)
-        ret = "<li>#{head}"
-        xref = entries&.dig(:xref)&.join(", ")
-        see = index_entries_see(entries, :see)
-        also = index_entries_see(entries, :also)
-        ret += "#{opt[:xref_lbl]} #{xref}" if xref
-        ret += "#{opt[:see_lbl]} #{see}" if see
-        ret += "#{opt[:also_lbl]} #{also}" if also
-        ret
-      end
-
-      def index_entries_see(entries, label)
-        see_sort = entries&.dig(label) or return nil
-
-        x = see_sort.each_with_object({}) do |w, v|
-          v[sortable(w).downcase] = w
-        end
-        x.keys.localize(@lang.to_sym).sort.to_a.map do |k|
-          # see_sort[k]
-          x[k]
-        end.join(", ")
-      end
-
-      def see_lbl
-        @lang == "en" ? @i18n.see : "<em>#{@i18n.see}</em>"
-      end
-
-      def also_lbl
-        @lang == "en" ? @i18n.see_also : "<em>#{@i18n.see_also}</em>"
-      end
-
-      def sort_indexterms(terms, see, also)
-        index = extract_indexterms(terms)
-        index = extract_indexsee(index, see, :see)
-        index = extract_indexsee(index, also, :also)
-        index.keys.sort.each_with_object({}) do |k, v|
-          v[sortable(k)[0].upcase.transliterate] ||= {}
-          v[sortable(k)[0].upcase.transliterate][k] = index[k]
-        end
-      end
-
-      def extract_indexsee(val, terms, label)
-        terms.each_with_object(val) do |t, v|
-          term, term2, term3 = extract_indexterms_init(t)
-          term_hash_init(v, term, term2, term3, label)
-          v[term][term2][term3][label] << to_xml(t.at(ns("./target"))&.children)
-          t.remove
-        end
-      end
-
-      def xml_encode_attr(str)
-        HTMLEntities.new.encode(str, :basic, :hexadecimal)
-          .gsub(/&#x([^;]+);/) do |_x|
-          "&#x#{$1.upcase};"
-        end
-      end
-
-      # attributes are decoded into UTF-8,
-      # elements in extract_indexsee are still in entities
-      def extract_indexterms(terms)
-        terms.each_with_object({}) do |t, v|
-          term, term2, term3 = extract_indexterms_init(t)
-          index2bookmark(t)
-          term_hash_init(v, term, term2, term3, :xref)
-          to = t["to"] ? "to='#{t['to']}' " : ""
-          v[term][term2][term3][:xref] << "<xref target='#{t['id']}' " \
-                                          "#{to}pagenumber='true'/>"
-        end
-      end
-
-      def extract_indexterms_init(term)
-        %w(primary secondary tertiary).each_with_object([]) do |x, m|
-          m << to_xml(term.at(ns("./#{x}"))&.children)
-        end
-      end
-
-      def term_hash_init(hash, term, term2, term3, label)
-        hash[term] ||= {}
-        hash[term][term2] ||= {}
-        hash[term][term2][term3] ||= {}
-        hash[term][term2][term3][label] ||= []
-      end
-
-      def index2bookmark(node)
-        node.name = "bookmark"
-        node.children.each(&:remove)
-        node["id"] = "_#{UUIDTools::UUID.random_create}"
-      end
-    end
-  end
-end