isodoc 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23f98744bc0bb65ad60168ed537e14fe7c42222751d9beb5889ef3f6774c5b2a
-  data.tar.gz: 126d7531a7f6dee506d40ec9495de1cbff43efbd8699c9913e3564698bce3b1e
+  metadata.gz: 35414cac7eab8ae893d39af33b9f3ecf591c33bd5013ea6340b13b26c23e73e1
+  data.tar.gz: b4820f7236dc69a3fadf213dcd7fef2eadddebbf85dc02a4ec7364c688baa4da
 SHA512:
-  metadata.gz: 70045efc243c466f1ad330ce1d3a5cdb4a0ec76d5575913c47ab3043b1242d4b8fbb319fe7993db211dd7ff1c8d3cce9e501bf745ee9e861330c9e793a35ba1f
-  data.tar.gz: bfba85e2ac12b48cc5f255a4f983201c6042f506590ac34300da79107892532a0266a6507eb93ca8c247c047ada4e3049f1ddfd410af0e521596d3341a6dcfc9
+  metadata.gz: 902033f59dc11d6f097e7477aa8ea44cc7eb199e085778a3eee2cfa771d7a40a85869176ff0c57e0cad88d1c270546a7d9419da2119fb3a6d435c629aeea6acc
+  data.tar.gz: 0f346f7277f8aab99189f29d2e1a35a6d36c593cfd52628d37f9245acb39e7ea0aa8761f6797e18dbb1b1069812ffbf2c2563f97e472cfa628047c6e84df0eb0

data/isodoc.gemspec

@@ -29,10 +29,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "html2doc", "~> 1.5.0"
+  spec.add_dependency "html2doc", "~> 1.5.3"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   # spec.add_dependency "isodoc-i18n", "~> 1.1.0" # already in relaton-render and mn-requirements
-  spec.add_dependency "liquid", "~> 4"
+  spec.add_dependency "liquid", "~> 5"
   spec.add_dependency "emf2svg"
   spec.add_dependency "plurimath"
   spec.add_dependency "relaton-cli"

data/lib/isodoc/convert.rb

@@ -63,109 +63,6 @@ module IsoDoc
       init_arrangement(@options)
     end
 
-    def options_preprocess(options)
-      options.merge!(default_fonts(options)) do |_, old, new|
-        old || new
-      end.merge!(default_file_locations(options)) do |_, old, new|
-        old || new
-      end
-      options
-    end
-
-    def init_rendering(options)
-      @ulstyle = options[:ulstyle]
-      @olstyle = options[:olstyle]
-      @datauriimage = options[:datauriimage]
-      @suppressheadingnumbers = options[:suppressheadingnumbers]
-      @break_up_urls_in_tables = options[:breakupurlsintables]
-      @suppressasciimathdup = options[:suppressasciimathdup]
-      @aligncrosselements = options[:aligncrosselements]
-      @modspecidentifierbase = options[:modspecidentifierbase]
-      @sourcehighlighter = options[:sourcehighlighter]
-    end
-
-    def init_arrangement(options)
-      @sectionsplit = options[:sectionsplit] == "true"
-      @bare = options[:bare]
-      @semantic_xml_insert = options[:semanticxmlinsert] != "false"
-    end
-
-    def init_i18n(options)
-      @i18nyaml = options[:i18nyaml]
-      @lang = options[:language] || "en"
-      @script = options[:script] || "Latn"
-      @locale = options[:locale]
-      @localizenumber = options[:localizenumber]
-    end
-
-    def init_locations(options)
-      @libdir ||= File.dirname(__FILE__)
-      @baseassetpath = options[:baseassetpath]
-      @tmpimagedir_suffix = tmpimagedir_suffix
-      @tmpfilesdir_suffix = tmpfilesdir_suffix
-      @sourcefilename = options[:sourcefilename]
-      @files_to_delete = []
-      @tempfile_cache = []
-    end
-
-    def init_processing
-      @termdomain = ""
-      @termexample = false
-      @note = false
-      @sourcecode = false
-      @footnotes = []
-      @comments = []
-      @in_footnote = false
-      @in_comment = false
-      @in_table = false
-      @in_figure = false
-      @seen_footnote = Set.new
-      @c = HTMLEntities.new
-      @openmathdelim = "`"
-      @closemathdelim = "`"
-      @maxwidth = 1200
-      @maxheight = 800
-      @bookmarks_allocated = { "X" => true }
-      @fn_bookmarks = {}
-    end
-
-    def init_fonts(options)
-      @normalfontsize = options[:normalfontsize]
-      @smallerfontsize = options[:smallerfontsize]
-      @monospacefontsize = options[:monospacefontsize]
-      @footnotefontsize = options[:footnotefontsize]
-      @fontist_fonts = options[:fonts]
-      @fontlicenseagreement = options[:fontlicenseagreement]
-    end
-
-    def init_covers(options)
-      @header = options[:header]
-      @htmlcoverpage = options[:htmlcoverpage]
-      @wordcoverpage = options[:wordcoverpage]
-      @htmlintropage = options[:htmlintropage]
-      @wordintropage = options[:wordintropage]
-      @scripts = options[:scripts] ||
-        File.join(File.dirname(__FILE__), "base_style", "scripts.html")
-      @scripts_pdf = options[:scripts_pdf]
-      @scripts_override = options[:scripts_override]
-    end
-
-    def init_stylesheets(options)
-      @htmlstylesheet_name = options[:htmlstylesheet]
-      @wordstylesheet_name = options[:wordstylesheet]
-      @htmlstylesheet_override_name = options[:htmlstylesheet_override]
-      @wordstylesheet_override_name = options[:wordstylesheet_override]
-      @standardstylesheet_name = options[:standardstylesheet]
-    end
-
-    def init_toc(options)
-      @htmlToClevels = 2
-      @wordToClevels = 2
-      @tocfigures = options[:tocfigures]
-      @toctables = options[:toctables]
-      @tocrecommendations = options[:tocrecommendations]
-    end
-
     def tmpimagedir_suffix
       "_#{SecureRandom.hex(8)}_images"
     end
@@ -214,10 +111,27 @@ module IsoDoc
       convert_i18n_init(docxml)
       metadata_init(@lang, @script, @locale, @i18n)
       xref_init(@lang, @script, self, @i18n, { locale: @locale })
+      docxml = preprocess_xslt(docxml)
       toc_init(docxml)
       [docxml, filename, dir]
     end
 
+    def preprocess_xslt(docxml)
+      extract_preprocess_xslt(docxml).each do |x|
+        docxml = Nokogiri::XSLT(x).transform(docxml)
+      end
+      docxml
+    end
+
+    def extract_preprocess_xslt(docxml)
+      docxml.xpath(ns("//metanorma-extension/render/preprocess-xslt"))
+        .each_with_object([]) do |x, m|
+          formats = x["format"]&.split(",") || []
+          !formats.empty? && !formats.include?(@format.to_s) and next
+          m << x.children.to_xml
+        end
+    end
+
     def convert_i18n_init(docxml)
       convert_i18n_init1(docxml)
       i18n_init(@lang, @script, @locale)
@@ -242,8 +156,7 @@ module IsoDoc
       @openmathdelim, @closemathdelim = extract_delims(file)
       docxml, filename, dir = convert_init(file, input_filename, debug)
       result = convert1(docxml, filename, dir)
-      return result if debug
-
+      debug and return result
       output_filename ||= "#{filename}.#{@suffix}"
       postprocess(result, output_filename, dir)
       FileUtils.rm_rf dir

data/lib/isodoc/function/blocks.rb

@@ -76,6 +76,7 @@ module IsoDoc
         out.p **sourcecode_attrs(node) do |div|
           sourcecode_parse1(node, div)
         end
+        annotation_parse(node, out)
         sourcecode_name_parse(node, out, name)
       end
 
@@ -84,9 +85,10 @@ module IsoDoc
         node.at(ns(".//table[@class = 'rouge-line-table']")) ||
           node.at("./ancestor::xmlns:table[@class = 'rouge-line-table']") and
           @sourcecode = "table"
-        # !node.ancestors("table").empty? and
-        # @sourcecode = "table"
-        node.children.each { |n| parse(n, div) unless n.name == "name" }
+        node.children.each do |n|
+          %w(name dl).include?(n.name) and next
+          parse(n, div)
+        end
         @sourcecode = false
       end
 
@@ -95,17 +97,12 @@ module IsoDoc
       end
 
       def annotation_parse(node, out)
+        dl = node.at(ns("./dl")) or return
         @sourcecode = false
-        @annotation = true
+        # @annotation = true
         out.div class: "annotation" do |div|
-          # node.at("./preceding-sibling::*[local-name() = 'annotation']") or
-          #  div << "<br/>"
-          callout = node.at(ns("//callout[@target='#{node['id']}']"))
-          div << "<span class='c'>&lt;#{callout.text}&gt;</span> "
-          div << "<span class='c'>#{node.children&.text&.strip}</span>"
-          node.at("./following-sibling::*[local-name() = 'annotation']") and
-            div << "<br/>"
-          @annotation = false
+          parse(dl, div)
+          # @annotation = false
         end
       end
 
@@ -203,6 +200,14 @@ module IsoDoc
           node.children.each { |n| parse(n, div) }
         end
       end
+
+      def source_parse(node, out)
+        out.div class: "BlockSource" do |d|
+          d.p do |p|
+            node.children.each { |n| parse(n, p) }
+          end
+        end
+      end
     end
   end
 end

data/lib/isodoc/function/cleanup.rb

@@ -194,11 +194,12 @@ module IsoDoc
       end
 
       def table_note_cleanup(docxml)
-        docxml.xpath("//table[div[@class = 'Note' or " \
-                     "@class = 'TableFootnote']]").each do |t|
+        docxml.xpath("//table[dl or div[@class = 'Note' or @class = 'BlockSource' " \
+                     "or @class = 'TableFootnote']]").each do |t|
           tfoot = table_get_or_make_tfoot(t)
           insert_here = new_fullcolspan_row(t, tfoot)
-          t.xpath("div[@class = 'Note' or @class = 'TableFootnote']")
+          t.xpath("dl | div[@class = 'Note' or @class = 'BlockSource' or " \
+                  "@class = 'TableFootnote']")
             .each do |d|
             d.parent = insert_here
           end

data/lib/isodoc/function/reqt.rb

@@ -4,7 +4,7 @@ module IsoDoc
       def recommendation_name(name, out)
         return if name.nil?
 
-        out.p **{ class: "RecommendationTitle" } do |p|
+        out.p class: "RecommendationTitle" do |p|
           name.children.each { |n| parse(n, p) }
         end
       end

data/lib/isodoc/function/section.rb

@@ -38,8 +38,7 @@ module IsoDoc
           out.div **attr_code(annex_attrs(c)) do |s|
             c.elements.each do |c1|
               if c1.name == "title" then annex_name(c, c1, s)
-              else
-                parse(c1, s)
+              else parse(c1, s)
               end
             end
           end

data/lib/isodoc/function/table.rb

@@ -20,10 +20,11 @@ module IsoDoc
       end
 
       def tbody_parse(node, table)
-        tbody = node.at(ns("./tbody")) || return
+        tbody = node.at(ns("./tbody")) or return
+        rowcount = tbody.xpath(ns("./tr")).size
         table.tbody do |h|
           tbody.element_children.each_with_index do |n, i|
-            tr_parse(n, h, i, tbody.xpath(ns("./tr")).size, false)
+            tr_parse(n, h, i, rowcount, false)
           end
         end
       end
@@ -76,12 +77,17 @@ module IsoDoc
         table_title_parse(node, out)
         out.table **table_attrs(node) do |t|
           table_parse_core(node, t)
-          (dl = node.at(ns("./dl"))) && parse(dl, out)
-          node.xpath(ns("./note")).each { |n| parse(n, out) }
+          table_parse_tail(node, t)
         end
         @in_table = false
       end
 
+      def table_parse_tail(node, out)
+        (dl = node.at(ns("./dl"))) && parse(dl, out)
+        node.xpath(ns("./source")).each { |n| parse(n, out) }
+        node.xpath(ns("./note")).each { |n| parse(n, out) }
+      end
+
       def table_parse_core(node, out)
         tcaption(node, out)
         colgroup(node, out)

data/lib/isodoc/function/terms.rb

@@ -12,7 +12,6 @@ module IsoDoc
 
       def deprecated_term_parse(node, out)
         out.p class: "DeprecatedTerms", style: "text-align:left;" do |p|
-          p << l10n("#{@i18n.deprecated}: ")
           node.children.each { |c| parse(c, p) }
         end
       end

data/lib/isodoc/function/to_word_html.rb

@@ -176,6 +176,7 @@ module IsoDoc
           when "fn" then footnote_parse(node, out)
           when "p" then para_parse(node, out)
           when "quote" then quote_parse(node, out)
+          when "source" then source_parse(node, out)
           when "tr" then tr_parse(node, out)
           when "note" then note_parse(node, out)
           when "review" then review_note_parse(node, out)
@@ -205,11 +206,6 @@ module IsoDoc
           when "recommendation" then recommendation_parse(node, out)
           when "permission" then permission_parse(node, out)
           when "div" then div_parse(node, out)
-          # when "subject", "classification"
-          #  requirement_skip_parse(node, out)
-          # when "inherit", "description", "specification", "measurement-target",
-          # "verification", "import", "component"
-          # requirement_component_parse(node, out)
           when "index" then index_parse(node, out)
           when "index-xref" then index_xref_parse(node, out)
           when "termref" then termrefelem_parse(node, out)

data/lib/isodoc/html_function/html.rb

@@ -96,6 +96,7 @@ module IsoDoc
         out.send tag, **attr do |div|
           sourcecode_parse1(node, div)
         end
+        annotation_parse(node, out)
         sourcecode_name_parse(node, out, name)
       end
 

data/lib/isodoc/init.rb

@@ -26,5 +26,108 @@ module IsoDoc
       n = docxml.at(ns(x.sub(/TOC/, "HTML TOC"))) and
         @htmlToClevels = n.text.to_i
     end
+
+    def options_preprocess(options)
+      options.merge!(default_fonts(options)) do |_, old, new|
+        old || new
+      end.merge!(default_file_locations(options)) do |_, old, new|
+        old || new
+      end
+      options
+    end
+
+    def init_rendering(options)
+      @ulstyle = options[:ulstyle]
+      @olstyle = options[:olstyle]
+      @datauriimage = options[:datauriimage]
+      @suppressheadingnumbers = options[:suppressheadingnumbers]
+      @break_up_urls_in_tables = options[:breakupurlsintables]
+      @suppressasciimathdup = options[:suppressasciimathdup]
+      @aligncrosselements = options[:aligncrosselements]
+      @modspecidentifierbase = options[:modspecidentifierbase]
+      @sourcehighlighter = options[:sourcehighlighter]
+    end
+
+    def init_arrangement(options)
+      @sectionsplit = options[:sectionsplit] == "true"
+      @bare = options[:bare]
+      @semantic_xml_insert = options[:semanticxmlinsert] != "false"
+    end
+
+    def init_i18n(options)
+      @i18nyaml = options[:i18nyaml]
+      @lang = options[:language] || "en"
+      @script = options[:script] || "Latn"
+      @locale = options[:locale]
+      @localizenumber = options[:localizenumber]
+    end
+
+    def init_locations(options)
+      @libdir ||= File.dirname(__FILE__)
+      @baseassetpath = options[:baseassetpath]
+      @tmpimagedir_suffix = tmpimagedir_suffix
+      @tmpfilesdir_suffix = tmpfilesdir_suffix
+      @sourcefilename = options[:sourcefilename]
+      @files_to_delete = []
+      @tempfile_cache = []
+    end
+
+    def init_processing
+      @termdomain = ""
+      @termexample = false
+      @note = false
+      @sourcecode = false
+      @footnotes = []
+      @comments = []
+      @in_footnote = false
+      @in_comment = false
+      @in_table = false
+      @in_figure = false
+      @seen_footnote = Set.new
+      @c = HTMLEntities.new
+      @openmathdelim = "`"
+      @closemathdelim = "`"
+      @maxwidth = 1200
+      @maxheight = 800
+      @bookmarks_allocated = { "X" => true }
+      @fn_bookmarks = {}
+    end
+
+        def init_fonts(options)
+      @normalfontsize = options[:normalfontsize]
+      @smallerfontsize = options[:smallerfontsize]
+      @monospacefontsize = options[:monospacefontsize]
+      @footnotefontsize = options[:footnotefontsize]
+      @fontist_fonts = options[:fonts]
+      @fontlicenseagreement = options[:fontlicenseagreement]
+    end
+
+    def init_covers(options)
+      @header = options[:header]
+      @htmlcoverpage = options[:htmlcoverpage]
+      @wordcoverpage = options[:wordcoverpage]
+      @htmlintropage = options[:htmlintropage]
+      @wordintropage = options[:wordintropage]
+      @scripts = options[:scripts] ||
+        File.join(File.dirname(__FILE__), "base_style", "scripts.html")
+      @scripts_pdf = options[:scripts_pdf]
+      @scripts_override = options[:scripts_override]
+    end
+
+    def init_stylesheets(options)
+      @htmlstylesheet_name = options[:htmlstylesheet]
+      @wordstylesheet_name = options[:wordstylesheet]
+      @htmlstylesheet_override_name = options[:htmlstylesheet_override]
+      @wordstylesheet_override_name = options[:wordstylesheet_override]
+      @standardstylesheet_name = options[:standardstylesheet]
+    end
+
+    def init_toc(options)
+      @htmlToClevels = 2
+      @wordToClevels = 2
+      @tocfigures = options[:tocfigures]
+      @toctables = options[:toctables]
+      @tocrecommendations = options[:tocrecommendations]
+    end
   end
 end

data/lib/isodoc/presentation_function/bibdata.rb

@@ -5,6 +5,7 @@ module IsoDoc
     def bibdata(docxml)
       toc_metadata(docxml)
       fonts_metadata(docxml)
+      preprocess_xslt_insert(docxml)
       docid_prefixes(docxml)
       a = bibdata_current(docxml) or return
       address_precompose(a)
@@ -14,11 +15,30 @@ module IsoDoc
         "</localized-strings>"
     end
 
+    def extension_insert(docxml, path = [])
+      ins = docxml.at(ns("//metanorma-extension")) ||
+        docxml.at(ns("//bibdata")).after("<metanorma-extension/>").next_element
+      path.each do |n|
+        ins = ins.at(ns("./#{n}")) || ins.add_child("<#{n}/>").first
+      end
+      ins
+    end
+
+    def preprocess_xslt_insert(docxml)
+      content = preprocess_xslt_read or return
+      ins = extension_insert(docxml, %w(render))
+      ins << File.read(content)
+    end
+
+    # read in from file, but with `<preprocess-xslt @format="">` wrapper
+    def preprocess_xslt_read
+      html_doc_path("preprocess.xslt")
+    end
+
     def toc_metadata(docxml)
       return unless @tocfigures || @toctables || @tocrecommendations
 
-      ins = docxml.at(ns("//metanorma-extension"))  ||
-        docxml.at(ns("//bibdata")).after("<metanorma-extension/>").next_element
+      ins = extension_insert(docxml)
       @tocfigures and
         ins << "<toc type='figure'><title>#{@i18n.toc_figures}</title></toc>"
       @toctables and

data/lib/isodoc/presentation_function/block.rb

@@ -178,5 +178,32 @@ module IsoDoc
       node.replace(@reqt_models.model(node["model"])
         .requirement_render1(node))
     end
+
+    def source(docxml)
+      docxml.xpath(ns("//source/modification")).each do |f|
+        source_modification(f)
+      end
+      docxml.xpath(ns("//table/source")).each { |f| tablesource(f) }
+      docxml.xpath(ns("//figure/source")).each { |f| figuresource(f) }
+    end
+
+    def tablesource(elem)
+      source1(elem)
+    end
+
+    def figuresource(elem)
+      source1(elem)
+    end
+
+    def source1(elem)
+      while elem&.next_element&.name == "source"
+        elem << "; #{to_xml(elem.next_element.remove.children)}"
+      end
+      elem.children = l10n("[#{@i18n.source}: #{to_xml(elem.children).strip}]")
+    end
+
+    def source_modification(mod)
+      termsource_modification(mod)
+    end
   end
 end

data/lib/isodoc/presentation_function/sourcecode.rb

@@ -3,23 +3,26 @@ module IsoDoc
     def sourcehighlighter_css(docxml)
       ret = custom_css(docxml)
       ret.empty? and return
-      ins = docxml.at(ns("//metanorma-extension")) ||
-        docxml.at(ns("//bibdata")).after("<metanorma-extension/>").next_element
+      ins = extension_insert(docxml)
       ins << "<source-highlighter-css>#{ret}" \
              "</source-highlighter-css>"
     end
 
     def custom_css(docxml)
       ret = ""
-      @sourcehighlighter and
-        ret += File.read(File.join(File.dirname(__FILE__), "..", "base_style",
-                                   "rouge.css"))
+      @sourcehighlighter and ret += rouge_css_location
       a = docxml.at(ns("//metanorma-extension/" \
                        "clause[title = 'user-css']/sourcecode")) and
         ret += "\n#{to_xml(a.children)}"
       ret
     end
 
+    # replace in local gem rather than specify overrides of default
+    def rouge_css_location
+      File.read(File.join(File.dirname(__FILE__), "..", "base_style",
+                          "rouge.css"))
+    end
+
     def sourcehighlighter
       @sourcehighlighter or return
       Rouge::Formatter.enable_escape!
@@ -29,9 +32,16 @@ module IsoDoc
       { formatter: f, formatter_line: f1 }
     end
 
+    def callouts(elem)
+      elem.xpath(ns(".//callout")).each do |c|
+        @callouts[c["target"]] = c.children.to_xml
+      end
+    end
+
     def sourcecode(docxml)
       sourcehighlighter_css(docxml)
       @highlighter = sourcehighlighter
+      @callouts = {}
       docxml.xpath(ns("//sourcecode")).each do |f|
         sourcecode1(f)
       end
@@ -40,6 +50,21 @@ module IsoDoc
     def sourcecode1(elem)
       source_highlight(elem)
       source_label(elem)
+      callouts(elem)
+      annotations(elem)
+    end
+
+    def annotations(elem)
+      elem.at(ns("./annotation")) or return
+      ret = ""
+      elem.xpath(ns("./annotation")).each do |a|
+        a.remove
+        ret += <<~OUT
+          <dt id='#{a['id']}'><span class='c'>#{@callouts[a['id']]}</span></dt>
+          <dd>#{a.children.to_xml}</dd>
+        OUT
+      end
+      elem << "<dl><name>#{@i18n.key}</name>#{ret}</dl>"
     end
 
     def source_highlight(elem)
@@ -65,7 +90,7 @@ module IsoDoc
     def source_remove_annotations(ret, elem)
       ret[:ann] = elem.xpath(ns("./annotation")).each(&:remove)
       ret[:call] = elem.xpath(ns("./callout")).each_with_object([]) do |c, m|
-        m << { xml: c.remove.to_xml, line: c.line - elem.line }
+        m << { xml: c.remove, line: c.line - elem.line }
       end
       ret
     end
@@ -85,7 +110,7 @@ module IsoDoc
       text = to_xml(code)
       text.split(/[\n\r]/).each_with_index do |c, i|
         while !callouts.empty? && callouts[0][:line] == i
-          c.sub!(/\s+$/, " <span class='c'>#{callouts[0][:xml]}</span> ")
+          c.sub!(/\s+$/, " #{reinsert_callout(callouts[0][:xml])} ")
           callouts.shift
         end
       end.join("\n")
@@ -95,12 +120,16 @@ module IsoDoc
       table.xpath(".//td[@class = 'rouge-code']/sourcecode")
         .each_with_index do |c, i|
         while !callouts.empty? && callouts[0][:line] == i
-          c << " <span class='c'>#{callouts[0][:xml]}</span> "
+          c << " #{reinsert_callout(callouts[0][:xml])} "
           callouts.shift
         end
       end
     end
 
+    def reinsert_callout(xml)
+      "<span class='c'>#{to_xml(xml)}</span>"
+    end
+
     def sourcecode_table_to_elem(elem, tokens)
       r = Nokogiri::XML(@highlighter[:formatter_line].format(tokens)).root
       r.xpath(".//td[@class = 'rouge-code']/pre").each do |pre|

data/lib/isodoc/presentation_function/terms.rb

@@ -38,16 +38,13 @@ module IsoDoc
 
     def concept_render_init(node, defaults)
       opts = %i(bold ital ref linkref linkmention)
-        .each_with_object({}) do |x, m|
-        m[x] = node[x.to_s] || defaults[x]
-      end
+        .each_with_object({}) { |x, m| m[x] = node[x.to_s] || defaults[x] }
       [opts, node.at(ns("./renderterm")),
        node.at(ns("./xref | ./eref | ./termref"))]
     end
 
     def concept1_linkmention(ref, renderterm, opts)
-      (opts[:linkmention] == "true" &&
-        !renderterm.nil? && !ref.nil?) or return
+      (opts[:linkmention] == "true" && !renderterm.nil? && !ref.nil?) or return
       ref2 = ref.clone
       r2 = renderterm.clone
       renderterm.replace(ref2).children = r2
@@ -65,11 +62,10 @@ module IsoDoc
     def concept1_ref_content(ref)
       prev = "["
       foll = "]"
-      if non_locality_elems(ref).select do |c|
-           !c.text? || /\S/.match(c)
-         end.empty?
-        prev, foll = @i18n.term_defined_in.split("%")
-      end
+      non_locality_elems(ref).select do |c|
+        !c.text? || /\S/.match(c)
+      end.empty? and
+        (prev, foll = @i18n.term_defined_in.split("%"))
       ref.previous = prev
       ref.next = foll
     end
@@ -95,14 +91,20 @@ module IsoDoc
       docxml.xpath(ns("//term")).each { |t| merge_second_preferred(t) }
       docxml.xpath(ns("//preferred | //admitted | //deprecates"))
         .each { |p| designation1(p) }
+      docxml.xpath(ns("//deprecates")).each { |d| deprecates(d) }
+      docxml.xpath(ns("//admitted")).each { |d| admits(d) }
+    end
+
+    def deprecates(elem)
+      elem.children.first.previous = @i18n.l10n("#{@i18n.deprecated}: ")
     end
 
+    def admits(elem); end
+
     def merge_second_preferred(term)
       pref = nil
       term.xpath(ns("./preferred[expression/name]")).each_with_index do |p, i|
-        if i.zero? then pref = p
-        else merge_second_preferred1(pref, p)
-        end
+        (i.zero? and pref = p) or merge_second_preferred1(pref, p)
       end
     end
 
@@ -226,9 +228,7 @@ module IsoDoc
       docxml.xpath(ns("//termsource/modification")).each do |f|
         termsource_modification(f)
       end
-      docxml.xpath(ns("//termsource")).each do |f|
-        termsource1(f)
-      end
+      docxml.xpath(ns("//termsource")).each { |f| termsource1(f) }
     end
 
     def termsource1(elem)

data/lib/isodoc/presentation_xml_convert.rb

@@ -58,6 +58,7 @@ module IsoDoc
       example docxml
       note docxml
       admonition docxml
+      source docxml
       ol docxml
       permission docxml
       requirement docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.5.1".freeze
+  VERSION = "2.5.2".freeze
 end

data/lib/isodoc/word_function/table.rb

@@ -43,14 +43,21 @@ module IsoDoc
         "#{ret}page-break-after:#{pb};"
       end
 
-      def keep_rows_together(cell, rowmax, totalrows, opt)
+      def keep_rows_together(_cell, rowmax, totalrows, opt)
         opt[:header] and return true
-        table_line_count(cell.parent.parent) > 15 and return false
+        @table_line_count > 15 and return false
         (totalrows <= 10 && rowmax < totalrows)
       end
 
+      def tbody_parse(node, table)
+        tbody = node.at(ns("./tbody")) or return
+        @table_line_count = table_line_count(tbody)
+        super
+      end
+
       def table_line_count(tbody)
         sum = 0
+        tbody.xpath(ns(".//tr")).size > 15 and return 16 # short-circuit
         tbody.xpath(ns(".//tr")).each do |r|
           i = 1
           r.xpath(ns(".//td | .//th")).each do |c|
@@ -70,7 +77,8 @@ module IsoDoc
           summary: node["summary"], width: node["width"],
           style: "mso-table-anchor-horizontal:column;mso-table-overlap:never;" \
                  "#{bordered}#{keep_style(node)}",
-          class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable") }
+          class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable")
+        }
         bordered or ret.delete(:class)
         super.merge(attr_code(ret))
       end
@@ -89,9 +97,8 @@ module IsoDoc
         table_title_parse(node, out)
         out.div align: "center", class: "table_container" do |div|
           div.table **table_attrs(node) do |t|
-            table_parse_core(node, out)
-            (dl = node.at(ns("./dl"))) && parse(dl, out)
-            node.xpath(ns("./note")).each { |n| parse(n, out) }
+            table_parse_core(node, t)
+            table_parse_tail(node, t)
           end
         end
         @in_table = false

data/lib/isodoc/xref/xref_gen.rb

@@ -172,8 +172,8 @@ refer_list)
         c = Counter.new(list["start"] ? list["start"].to_i - 1 : 0)
         list.xpath(ns("./li")).each do |li|
           label = c.increment(li).listlabel(list, depth)
-          label = "#{prev_label}) #{label}" unless prev_label.empty?
-          label = "#{list_anchor[:xref]} #{label}" if refer_list
+          label = list_item_anchor_label(label, list_anchor, prev_label,
+                                         refer_list)
           li["id"] and @anchors[li["id"]] =
                          { xref: "#{label})", type: "listitem", refer_list:
                            refer_list, container: list_anchor[:container] }
@@ -183,6 +183,16 @@ refer_list)
         end
       end
 
+      def list_item_anchor_label(label, list_anchor, prev_label, refer_list)
+        prev_label.empty? or
+          label = @i18n.list_nested_xref.sub(/%1/, "#{prev_label})")
+            .sub(/%2/, label)
+        refer_list and
+          label = @i18n.list_nested_xref.sub(/%1/, list_anchor[:xref])
+            .sub(/%2/, label)
+        label
+      end
+
       def deflist_anchor_names(sections)
         sections.each do |s|
           notes = s.xpath(ns(".//dl")) - s.xpath(ns(".//clause//dl")) -

data/lib/isodoc/xslfo_convert.rb

@@ -51,35 +51,40 @@ module IsoDoc
       ret.merge(@pdf_cmd_options)
     end
 
-    def convert(input_filename, file = nil, debug = false,
-                output_filename = nil)
-      file = File.read(input_filename, encoding: "utf-8") if file.nil?
-      input_filename, docxml, filename = input_xml_path(input_filename,
-                                                        file, debug)
+    # input_file: keep-alive tempfile
+    def convert(input_fname, file = nil, debug = false,
+                output_fname = nil)
+      file = File.read(input_fname, encoding: "utf-8") if file.nil?
+      input_file, docxml, filename =
+        input_xml_path(input_fname, file, debug)
       ::Metanorma::Output::XslfoPdf.new.convert(
-        input_filename,
-        output_filename || "#{filename}.#{@suffix}",
+        filename,
+        output_fname || output_filename(input_fname),
         File.join(@libdir, pdf_stylesheet(docxml)),
         pdf_options(docxml),
       )
     end
 
+    def output_filename(input_fname)
+      out = input_fname.sub(/\.presentation\.xml$/, ".xml")
+      File.join(File.dirname(input_fname),
+                "#{File.basename(out, '.*')}.#{@suffix}")
+    end
+
     def xref_parse(node, out)
-      out.a(**{ href: target_pdf(node) }) { |l| l << get_linkend(node) }
+      out.a(href: target_pdf(node)) { |l| l << get_linkend(node) }
     end
 
     def input_xml_path(input_filename, xml_file, debug)
       docxml, filename, dir = convert_init(xml_file, input_filename, debug)
-      unless /\.xml$/.match?(input_filename)
-        input_filename = Tempfile.open([filename, ".xml"],
-                                       encoding: "utf-8") do |f|
-          f.write xml_file
-          f.path
-        end
+      input_filename = Tempfile.open([File.basename(filename), ".xml"],
+                                     encoding: "utf-8") do |f|
+        f.write xml_file
+        f
       end
       FileUtils.rm_rf dir
 
-      [input_filename, docxml, filename]
+      [input_filename, docxml, input_filename.path]
     end
   end
 end

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

@@ -39,6 +39,7 @@ chain_or: "%1 او %2"
 chain_from: "%1 %من 2"
 chain_to: "من %1 إلى %2"
 nested_xref: "%1, %2"
+list_nested_xref: "%1 %2"
 ordinal_keys: [gender]
 SpelloutRules:
   f: spellout-ordinal-feminine

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

@@ -41,6 +41,7 @@ chain_or: "%1 oder %2"
 chain_from: "%1 von %2"
 chain_to: "%1 bis %2"
 nested_xref: "%1, %2"
+list_nested_xref: "%1 %2"
 ordinal_keys: [gender,number]
 SpelloutRules:
   m.sg: spellout-ordinal-r

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

@@ -47,6 +47,7 @@ chain_or: "%1 or %2"
 chain_from: "%1 from %2"
 chain_to: "%1 to %2"
 nested_xref: "%1, %2"
+list_nested_xref: "%1 %2"
 ordinal_keys: []
 SpelloutRules: spellout-ordinal
 note: NOTE

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

@@ -43,6 +43,7 @@ chain_or: "%1 o %2"
 chain_from: "%1 del %2"
 chain_to: "%1 al %2"
 nested_xref: "%1, %2"
+list_nested_xref: "%1 %2"
 ordinal_keys: [gender,number]
 SpelloutRules:
   m.sg: spellout-ordinal-masculine

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

@@ -40,6 +40,7 @@ chain_or: "%1 ou %2"
 chain_from: "%1 de %2"
 chain_to: "%1 à %2"
 nested_xref: "%1, %2"
+list_nested_xref: "%1 %2"
 ordinal_keys: [gender,number]
 SpelloutRules:
   m.sg: spellout-ordinal-masculine

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

@@ -40,12 +40,13 @@ chain_or: "%1 or %2"
 chain_from: "%1 from %2"
 chain_to: "%1 to %2"
 nested_xref: "%1の%2"
+list_nested_xref: "%1の%2"
 ordinal_keys: []
 SpelloutRules: spellout-ordinal
 note: 注記
 note_xref: 注記
 termnote: 注釈%
-list: List
+list: リスト
 deflist: Definition List
 figure: 図
 diagram: Diagram
@@ -116,7 +117,7 @@ locality: {
                       part: 部,
                       paragraph: 段落,
                       chapter: Chapter,
-                      page: Page,
+                      page: ページ,
                       table: 表,
                       annex: 附属書,
                       figure: 図,

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

@@ -46,6 +46,7 @@ chain_or: "%1 или %2"
 chain_from: "%1 от %2"
 chain_to: "%1 до %2"
 nested_xref: "%1, %2"
+list_nested_xref: "%1 %2"
 ordinal_keys: [gender,number]
 SpelloutRules:
   m.sg: spellout-ordinal-masculine

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

@@ -42,6 +42,7 @@ chain_or: "%1或%2"
 chain_from: "%1从%2"
 chain_to: "%1到%2"
 nested_xref: "%1, %2"
+list_nested_xref: "%1 %2"
 ordinal_keys: []
 SpelloutRules: spellout-ordinal
 note: 注

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: emf2svg
   requirement: !ruby/object:Gem::Requirement