metanorma 2.1.4 → 2.2.0

data/lib/metanorma/collection/sectionsplit/sectionsplit.rb

@@ -19,6 +19,7 @@ module Metanorma
         @fileslookup = opts[:fileslookup]
         @ident = opts[:ident]
         @isodoc = opts[:isodoc]
+        @isodoc_presxml = opts[:isodoc_presxml]
         @document_suffix = opts[:document_suffix]
       end
 
@@ -32,18 +33,19 @@ module Metanorma
          ["//bibliography/*[not(@hidden = 'true')]", "bibliography"],
          ["//indexsect", nil], ["//colophon", nil]].freeze
 
-      # Input XML is Semantic
+      # Input XML is Semantic XML
       def sectionsplit
         xml = sectionsplit_prep(File.read(@input_filename), @base, @dir)
         @key = Metanorma::Collection::XrefProcess::xref_preprocess(xml, @isodoc)
         empty = empty_doc(xml)
         empty1 = empty_attachments(empty)
         @mutex = Mutex.new
-        #@pool = Concurrent::FixedThreadPool.new(4)
+        # @pool = Concurrent::FixedThreadPool.new(4)
         @pool = Concurrent::FixedThreadPool.new(1)
         sectionsplit1(xml, empty, empty1, 0)
       end
 
+      # xml is Presentation XML
       def sectionsplit1(xml, empty, empty1, idx)
         ret = SPLITSECTIONS.each_with_object([]) do |n, m|
           conflate_floatingtitles(xml.xpath(ns(n[0]))).each do |s|
@@ -59,12 +61,14 @@ module Metanorma
 
       def sectionsplit2(xml, empty, chunks, parentnode, opt)
         @pool.post do
+          warn "#{@base}.#{opt[:idx]}"
           a = sectionfile(xml, empty, "#{@base}.#{opt[:idx]}", chunks,
                           parentnode)
           @mutex.synchronize { opt[:acc] << a }
         end
       end
 
+      # TODO move to metanorma-utils
       def block?(node)
         %w(p table formula admonition ol ul dl figure quote sourcecode example
            pre note pagebreak hr bookmark requirement recommendation permission
@@ -86,7 +90,6 @@ module Metanorma
         xml, type = sectionsplit_preprocess_semxml(file, filename)
         flags = { format: :asciidoc, extension_keys: [:presentation],
                   type: type }.merge(@compile_opts)
-        #require "debug"; binding.b
         Compile.new.compile(xml, flags)
         f = File.open(xml.sub(/\.xml$/, ".presentation.xml"), encoding: "utf-8")
         r = Nokogiri::XML(f, &:huge)
@@ -109,7 +112,6 @@ module Metanorma
         if c = @fileslookup&.parent
           n = c.nested
           c.nested = true # so unresolved erefs are not deleted
-        #require "debug"; binding.b
           c.update_xrefs(xml, @ident, {})
           c.nested = n
           xml.xpath("//xmlns:svgmap").each { |x| x.name = "svgmap1" }
@@ -125,35 +127,19 @@ module Metanorma
         outname
       end
 
-      def emptydoc(xml, ordinal)
-        out = xml.dup
-        out.xpath(
-          ns("//preface | //sections | //annex | //bibliography/clause | " \
-             "//bibliography/references[not(@hidden = 'true')] | " \
-             "//indexsect | //colophon"),
-        ).each(&:remove)
-        ordinal.zero? or out.xpath(ns("//metanorma-ext//attachment | " \
-                                      "//semantic__metanorma-ext//semantic__attachment"))
-          .each(&:remove) # keep only one copy of attachments
-        out
-      end
-
       def empty_doc(xml)
         out = xml.dup
         out.xpath(
-          ns("//preface | //sections | //annex | //bibliography/clause | " \
-             "//bibliography/references[not(@hidden = 'true')] | " \
-             "//indexsect | //colophon"),
+          ns("//preface | //sections | //annex | " \
+          "//references/bibitem[not(@hidden = 'true')] | " \
+          "//indexsect | //colophon"),
         ).each(&:remove)
+        ::Metanorma::Collection::Util::hide_refs(out)
         out
       end
 
       def empty_attachments(xml)
-        out = xml.dup
-        out.xpath(ns("//metanorma-ext//attachment | " \
-                     "//semantic__metanorma-ext//semantic__attachment"))
-          .each(&:remove) # keep only one copy of attachments
-        out
+        xml.dup
       end
 
       def sectionfile(fulldoc, xml, file, chunks, parentnode)
@@ -164,11 +150,10 @@ module Metanorma
 
       def create_sectionfile(xml, out, file, chunks, parentnode)
         ins = out.at(ns("//metanorma-extension")) || out.at(ns("//bibdata"))
-        #require "debug"; binding.b
         sectionfile_insert(ins, chunks, parentnode)
+        sectionfile_fn_filter(sectionfile_review_filter(out))
         Metanorma::Collection::XrefProcess::xref_process(out, xml, @key,
                                                          @ident, @isodoc, true)
-        #truncate_semxml(out, chunks)
         outname = "#{file}.xml"
         File.open(File.join(@splitdir, outname), "w:UTF-8") do |f|
           f.write(out)
@@ -176,36 +161,86 @@ module Metanorma
         outname
       end
 
-      # KILL
-      def semantic_xml_ids_gather(out)
-        out.at(ns("//semantic__bibdata")) or return
-        SPLITSECTIONS.each_with_object({}) do |s, m|
-          out.xpath(ns(s[0].sub("//", "//semantic__"))).each do |x|
-            x["id"] or next
-            m[x["id"].sub(/^semantic__/, "")] = x
+      def sectionfile_insert(ins, chunks, parentnode)
+        if parentnode
+          ins.next = "<#{parentnode}/>"
+          chunks.each { |c| ins.next.add_child(c.dup) }
+        else chunks.each { |c| ins.next = c.dup }
+        end
+      end
+
+      def sectionfile_fn_filter(xml)
+        ids = sectionfile_fn_filter_prep(xml)
+        xml.root.xpath(ns("./fmt-footnote-container/fmt-fn-body")).each do |f|
+          ids.has_key?(f["id"]) or f.remove
+        end
+        seen = {}
+        xml.root.xpath(ns("/fmt-footnote-container/fmt-fn-body"))
+          .each_with_index do |fnbody, i|
+            sectionfile_fn_filter_renumber(fnbody, i, ids, seen)
           end
+        xml
+      end
+
+      # map fmt-fn-body/@id = fn/@target to fn
+      def sectionfile_fn_filter_prep(xml)
+        xml.xpath(ns("//fn")).each_with_object({}) do |f, m|
+          m[f["target"]] ||= []
+          m[f["target"]] << f
         end
       end
 
-      # KILL
-      def semxml_presxml_nodes_match(nodes, chunks)
-        chunks.each do |x|
-          nodes[x["id"]] and nodes.delete(x["id"])
+      FN_CAPTIONS = ".//fmt-fn-label/span[@class = 'fmt-caption-label']".freeze
+
+      def sectionfile_fn_filter_renumber(fnbody, idx, ids, seen)
+        sectionfile_fn_filter_fn_renumber(fnbody, idx, ids, seen)
+        sectionfile_fn_filter_fnbody_renumber(fnbody, idx, ids)
+      end
+
+      def sectionfile_fn_filter_fn_renumber(fnbody, idx, ids, seen)
+        ids[fnbody["id"]].each do |f|
+          @isodoc_presxml.renumber_document_footnote(f, idx, seen)
+          fnlabel = f.at(ns(FN_CAPTIONS)) and
+            fnlabel.children = @isodoc_presxml.fn_ref_label(f)
         end
       end
 
-      # KILL
-      def truncate_semxml(out, chunks)
-        nodes = semantic_xml_ids_gather(out) or return
-        semxml_presxml_nodes_match(nodes, chunks)
-        nodes.each_value(&:remove)
+      def sectionfile_fn_filter_fnbody_renumber(fnbody, _idx, ids)
+        fnlabel = fnbody.at(ns(FN_CAPTIONS)) or return
+        fnbody["reference"] = ids[fnbody["id"]].first["reference"]
+        fnlabel.children = @isodoc_presxml.fn_body_label(fnbody)
       end
 
-      def sectionfile_insert(ins, chunks, parentnode)
-        if parentnode
-          ins.next = "<#{parentnode}/>"
-          chunks.each { |c| ins.next.add_child(c.dup) }
-        else chunks.each { |c| ins.next = c.dup }
+      # map fmt-review-body/@id = fmt-review-{start/end}/@target
+      # to fmt-review-{stary/end}
+      def sectionfile_review_filter_prep(xml)
+        xml.xpath(ns("//fmt-review-start | //fmt-review-end"))
+          .each_with_object({}) do |f, m|
+            m[f["target"]] ||= []
+            m[f["target"]] << f
+          end
+      end
+
+      def sectionfile_review_filter(xml)
+        ids = sectionfile_review_filter_prep(xml)
+        xml.root.xpath(ns("./review-container/fmt-review-body")).each do |f|
+          ids.has_key?(f["id"]) or f.remove
+        end
+        xml.root.xpath(ns("./review-container/fmt-review-body"))
+          .each_with_index do |fnbody, i|
+            sectionfile_review_filter_renumber(fnbody, i, ids)
+          end
+        xml
+      end
+
+      def sectionfile_review_filter_renumber(fnbody, _idx, ids)
+        ids[fnbody["id"]].each do |f|
+          case f.name
+          when "fmt-review-start"
+            f.children = @isodoc_presxml.comment_bookmark_start_label(f)
+          when "fmt-review-end"
+            f.children = @isodoc_presxml.comment_bookmark_end_label(f)
+          end
         end
       end
 
@@ -214,7 +249,7 @@ module Metanorma
         t = title.dup
         t.xpath(ns(".//tab | .//br")).each { |x| x.replace(" ") }
         t.xpath(ns(".//bookmark")).each(&:remove)
-        t.xpath('.//text()').map(&:text).join
+        t.xpath(".//text()").map(&:text).join
       end
     end
   end

data/lib/metanorma/collection/util/util.rb

@@ -2,6 +2,11 @@ module Metanorma
   class Collection
     module Util
       class << self
+        def anchor_id_attributes
+          Metanorma::Utils::anchor_attributes(presxml: true) +
+            [%w(* id), %w(* anchor), %w(link bibitemid), %w(fmt-link bibitemid)]
+        end
+
         def gather_bibitems(xml)
           xml.xpath("//xmlns:bibitem[@id]").each_with_object({}) do |b, m|
             if m[b["id"]]
@@ -16,7 +21,6 @@ module Metanorma
 
         def gather_bibitemids(xml, presxml)
           xml.xpath("//*[@bibitemid]").each_with_object({}) do |e, m|
-            #/^semantic__/.match?(e.name) and next
             presxml && %w(xref eref link).include?(e.name) and next
             m[e["bibitemid"]] ||= []
             m[e["bibitemid"]] << e
@@ -25,7 +29,6 @@ module Metanorma
 
         def gather_citeases(xml, presxml)
           xml.xpath("//*[@citeas]").each_with_object({}) do |e, m|
-            #/^semantic__/.match?(e.name) and next
             presxml && %w(xref eref link).include?(e.name) and next
             k = key(e["citeas"])
             m[k] ||= []
@@ -36,6 +39,8 @@ module Metanorma
         def add_suffix_to_attrs(doc, suffix, tag_name, attr_name, isodoc)
           (suffix.nil? || suffix.empty?) and return
           doc.xpath(isodoc.ns("//#{tag_name}[@#{attr_name}]")).each do |elem|
+            #warn "#{tag_name} : #{elem.name}" if attr_name == "bibitemid"
+            #require 'debug'; binding.b if attr_name == "bibitemid" && #!%w(eref fmt-eref link fmt-link).include?(elem.name)
             a = elem.attributes[attr_name].value
             /_#{suffix}$/.match?(a) or
               elem.attributes[attr_name].value = "#{a}_#{suffix}"
@@ -55,6 +60,14 @@ module Metanorma
           p.absolute? ? path : File.join(dir, path)
         end
 
+        def hide_refs(docxml)
+          p = "//xmlns:references[xmlns:bibitem]"\
+            "[not(./xmlns:bibitem[not(@hidden) or @hidden = 'false'])]"
+          docxml.xpath(p).each do |f|
+            f["hidden"] = "true"
+          end
+        end
+
         def key(ident)
           @c ||= HTMLEntities.new
           @c.decode(ident).gsub(/(\p{Zs})+/, " ")
@@ -67,20 +80,20 @@ module Metanorma
         def load_isodoc(flavor, presxml: false)
           x = Asciidoctor.load nil, backend: flavor.to_sym
           if presxml
-          x.converter.presentation_xml_converter(Dummy.new)
+            x.converter.presentation_xml_converter(Dummy.new)
           else
-          x.converter.html_converter(Dummy.new) # to obtain Isodoc class
+            x.converter.html_converter(Dummy.new) # to obtain Isodoc class
           end
         end
 
         def isodoc_create(flavor, lang, script, xml, presxml: false)
-        isodoc = Util::load_isodoc(flavor, presxml: presxml)
-        isodoc.i18n_init(lang, script, nil) # read in internationalisation
-        # TODO locale?
-        isodoc.metadata_init(lang, script, nil, isodoc.i18n)
-        isodoc.info(xml, nil)
-        isodoc
-      end
+          isodoc = Util::load_isodoc(flavor, presxml: presxml)
+          isodoc.i18n_init(lang, script, nil) # read in internationalisation
+          # TODO locale?
+          isodoc.metadata_init(lang, script, nil, isodoc.i18n)
+          isodoc.info(xml, nil)
+          isodoc
+        end
       end
     end
   end

data/lib/metanorma/collection/xrefprocess/xrefprocess.rb

@@ -10,8 +10,7 @@ module Metanorma
           @isodoc = isodoc
           key = (0...8).map { rand(65..90).chr }.join # random string
           xml.root["type"] = key
-          Metanorma::Utils::anchor_attributes
-            .each do |(tag_name, attr_name)|
+          Util::anchor_id_attributes.each do |(tag_name, attr_name)|
               #tag_name == "xref" and tag_name = "fmt-xref"
             ::Metanorma::Collection::Util::add_suffix_to_attrs(
               xml, xml.root["document_suffix"], tag_name, attr_name, isodoc
@@ -225,7 +224,7 @@ module Metanorma
 
         def new_indirect_bibitem(ident, prefix)
           <<~BIBENTRY
-            <bibitem id="#{ident}" type="internal">
+            <bibitem id="#{ident}" anchor="#{ident}" type="internal">
             <docidentifier type="repository">#{ident.sub(/^#{prefix}_/, "#{prefix}/")}</docidentifier>
             </bibitem>
           BIBENTRY

data/lib/metanorma/compile/assets/icc-boilerplate.adoc

@@ -0,0 +1,41 @@
+== copyright-statement
+=== Copyright notice
+
+Copyright © 1994-{{docyear}} International Color Consortium®
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+the Specification and associated documentation files (the “Specification”) to
+deal in the Specification without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, and/or sublicense
+copies of the Specification, and to permit persons to whom the Specification is
+furnished to do so, subject to the following conditions.
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Specification.
+
+The Specification is provided "as is", without warranty of any kind, express,
+implied, or otherwise, including but not limited to the warranties of
+merchantability, fitness for a particular purpose and noninfringement. In no
+event shall the International Color Consortium be liable for any claim, damages
+or other liability, whether in an action of contract, tort or otherwise, arising
+from, out of, or in connection with the Specification or the use or other
+dealings in the Specification.
+
+Except as contained in this notice, the name of the International Color
+Consortium shall not be used in advertising or otherwise to promote the use or
+other dealings in this Specification without prior written authorization from
+the International Color Consortium.
+
+== license-statement
+=== Licenses and trademarks
+
+International Color Consortium and the ICC logo are registered trademarks of the
+International Color Consortium. Rather than put a trademark symbol in every
+occurrence of other trademarked names, we state that we are using the names only
+in an editorial fashion, and to the benefit of the trademark owner, with no
+intention of infringement of the trademark.
+
+== feedback-statement
+=== For additional information on the ICC
+
+Visit the ICC Web site: http://www.color.org