isodoc 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f13a3c3a1018484dfa9518b6831d188803ca83c2d89ee872ff17723994c0fae7
-  data.tar.gz: b4461e1537e949cbfbc851309cc1f29c974a38fda8728f405591dc586267943c
+  metadata.gz: 3189a7f65994e9185f29009eb40bb6589c83f579996199d34c669b44883a6548
+  data.tar.gz: 8462af8b54793cbc7dda2e98a2005a8ec11d4d17657a3fb63b3f2865950cf8c9
 SHA512:
-  metadata.gz: eb0cf999d3a0155a13913543101228f4c1d60c4705dfdd67ca76f4e21fd00e59853040e4bbe516b64d4fc11a0aaf7da3573f8932f6bf7112dd3293ccc82263a2
-  data.tar.gz: c43855701417ffcad7a7e85086b489995ac1af483752c5b9ad1f958fbf944e38a94ca5fd3b4dcf90103608cad6a2d9b6d08fa46a877dffaeef14475212e7056c
+  metadata.gz: 4cd5b57e05c214e49e703f808799195e4b1d7b158a9e07fd4e728a369b8f1406d735eb7576e182abe28ba40529dc22a70db28f50e77f2548aed08ae0ff139d5c
+  data.tar.gz: 12eb151374efdde8fd26302aeecdde46e25a7db4147f4bbf1dd54256f460f8ef5f29880bbaa170171abb5d451bf11b1d1b29ff24bbba15746d28249f5ec283f6

data/lib/isodoc/base_style/all.css

@@ -68,6 +68,12 @@ code *, pre *, tt *, kbd *, samp * {
   font-family: {{monospacefont}} !important;
   font-variant-ligatures: none; }
 
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }
@@ -79,6 +85,9 @@ table {
 h1, h2, h3, h4, h5, h6 {
   font-family: {{headerfont}}; }
 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
 blockquote, q {
   quotes: none; }
   blockquote:before, blockquote:after, q:before, q:after {

data/lib/isodoc/base_style/reset.css

@@ -68,6 +68,12 @@ code *, pre *, tt *, kbd *, samp * {
   font-family: {{monospacefont}} !important;
   font-variant-ligatures: none; }
 
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }
@@ -79,6 +85,9 @@ table {
 h1, h2, h3, h4, h5, h6 {
   font-family: {{headerfont}}; }
 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
 blockquote, q {
   quotes: none; }
   blockquote:before, blockquote:after, q:before, q:after {

data/lib/isodoc/base_style/reset.scss

@@ -74,6 +74,13 @@ code *, pre *, tt *, kbd *, samp * {
   font-variant-ligatures: none;
 }
 
+p code, dt code, li code, label code, legend code, caption code, th code, td code, 
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt, 
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd, 
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: $monospacefontsize;
+}
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block;
@@ -88,6 +95,10 @@ h1, h2, h3, h4, h5, h6 {
   font-family: $headerfont;
 }
 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: $headerfont;
+}
+
 blockquote, q {
   quotes: none;
 

data/lib/isodoc/class_utils.rb

@@ -28,25 +28,37 @@ module IsoDoc
       Liquid::Template.parse(doc)
     end
 
-    def case_strict(text, casing, script)
+    def case_strict(text, casing, script, firstonly: true)
       return text unless %w(Latn Cyrl Grek Armn).include?(script)
 
-      letters = text.chars
+      seen = false
+      text.split(/(\s+)/).map do |w|
+        letters = w.chars
+        case_strict1(letters, casing) if !seen || !firstonly
+        seen ||= /\S/.match?(w)
+        letters.join
+      end.join
+    end
+
+    def case_strict1(letters, casing)
+      return letters if letters.empty?
+
       case casing
       when "capital" then letters.first.upcase!
       when "lowercase" then letters.first.downcase!
+      when "allcaps" then letters.map(&:upcase!)
       end
-      letters.join
     end
 
-    def case_with_markup(linkend, casing, script)
+    def case_with_markup(linkend, casing, script, firstonly: true)
       seen = false
       xml = Nokogiri::XML("<root>#{linkend}</root>")
       xml.traverse do |b|
         next unless b.text? && !seen
 
-        b.replace(Common::case_strict(b.text, casing, script))
-        seen = true
+        b.replace(Common::case_strict(b.text, casing, script,
+                                      firstonly: firstonly))
+        seen = true if firstonly
       end
       xml.root.children.to_xml
     end

data/lib/isodoc/convert.rb

@@ -5,6 +5,7 @@ require "fileutils"
 require "tempfile"
 require_relative "i18n"
 require_relative "css"
+require "securerandom"
 
 module IsoDoc
   class Convert < ::IsoDoc::Common
@@ -103,10 +104,16 @@ module IsoDoc
       @fn_bookmarks = {}
       @baseassetpath = options[:baseassetpath]
       @aligncrosselements = options[:aligncrosselements]
+      @tmpimagedir_suffix = tmpimagedir_suffix
+      @tmpfilesdir_suffix = tmpfilesdir_suffix
     end
 
     def tmpimagedir_suffix
-      "_images"
+      "_#{SecureRandom.hex(8)}_images"
+    end
+
+    def tmpfilesdir_suffix
+      "_#{SecureRandom.hex(8)}_files"
     end
 
     def html_doc_path(*file)

data/lib/isodoc/function/blocks.rb

@@ -174,10 +174,13 @@ module IsoDoc
         end
       end
 
-      def para_class(_node)
+      def para_class(node)
         classtype = nil
         classtype = "MsoCommentText" if in_comment
         classtype = "Sourcecode" if @annotation
+        if node["type"] == "floating-title"
+          classtype = "h#{node['depth']}"
+        end
         classtype
       end
 

data/lib/isodoc/function/to_word_html.rb

@@ -30,7 +30,7 @@ module IsoDoc
       end
 
       def init_dir(filename, debug)
-        dir = "#{filename}_files"
+        dir = "#{filename}#{@tmpfilesdir_suffix}"
         unless debug
           Dir.mkdir(dir, 0o777) unless File.exists?(dir)
           FileUtils.rm_rf "#{dir}/*"
@@ -40,11 +40,11 @@ module IsoDoc
 
       # tmp image dir is same directory as @filename
       def tmpimagedir
-        @filename + tmpimagedir_suffix
+        @filename + @tmpimagedir_suffix
       end
 
       def rel_tmpimagedir
-        Pathname.new(@filename).basename.to_s + tmpimagedir_suffix
+        Pathname.new(@filename).basename.to_s + @tmpimagedir_suffix
       end
 
       # isodoc.css overrides any CSS injected by Html2Doc, which

data/lib/isodoc/function/utils.rb

@@ -142,9 +142,9 @@ module IsoDoc
 
       def header_strip_elem?(elem)
         elem.name == "img" ||
-          elem.name == "span" && elem["class"] == "MsoCommentReference" ||
-          elem.name == "a" && elem["class"] == "FootnoteRef" ||
-          elem.name == "span" && /mso-bookmark/.match(elem["style"])
+          (elem.name == "span" && elem["class"] == "MsoCommentReference") ||
+          (elem.name == "a" && elem["class"] == "FootnoteRef") ||
+          (elem.name == "span" && /mso-bookmark/.match(elem["style"]))
       end
 
       def liquid(doc)
@@ -192,12 +192,6 @@ module IsoDoc
           save_dataimage(img["src"], false)
         when %r{^([A-Z]:)?/}
           img["src"]
-=begin
-        if /^data:/.match? img["src"]
-          save_dataimage(img["src"], false)
-        elsif %r{^([A-Z]:)?/}.match? img["src"]
-          img["src"]
-=end
         else
           File.join(@localdir, img["src"])
         end
@@ -213,12 +207,16 @@ module IsoDoc
            application/x-msmetafile image/x-xbitmap).include? type
       end
 
-      def cleanup_entities(text)
+      def cleanup_entities(text, is_xml: true)
         c = HTMLEntities.new
-        text.split(/([<>])/).each_slice(4).map do |a|
-          a[0] = c.encode(c.decode(a[0]), :hexadecimal)
-          a
-        end.join
+        if is_xml
+          text.split(/([<>])/).each_slice(4).map do |a|
+            a[0] = c.encode(c.decode(a[0]), :hexadecimal)
+            a
+          end.join
+        else
+          c.encode(c.decode(text), :hexadecimal)
+        end
       end
 
       def external_path(path)

data/lib/isodoc/headlesshtml_convert.rb

@@ -10,7 +10,7 @@ module IsoDoc
     include HtmlFunction::Html
 
     def tmpimagedir_suffix
-      "_headlessimages"
+      "_#{SecureRandom.hex(8)}_headlessimages"
     end
 
     def initialize(options)

data/lib/isodoc/html_convert.rb

@@ -13,7 +13,7 @@ module IsoDoc
     include HtmlFunction::Html
 
     def tmpimagedir_suffix
-      "_htmlimages"
+      "_#{SecureRandom.hex(8)}_htmlimages"
     end
 
     def initialize(options)

data/lib/isodoc/i18n.rb

@@ -1,4 +1,5 @@
 require "yaml"
+require_relative "function/utils"
 
 module IsoDoc
   class I18n
@@ -17,7 +18,7 @@ module IsoDoc
         end
         ret
       when Array then ret.map { |n| normalise_hash(n) }
-      when String then ret.unicode_normalize(:nfc)
+      when String then cleanup_entities(ret.unicode_normalize(:nfc))
       else ret
       end
     end
@@ -96,8 +97,9 @@ module IsoDoc
       xml.traverse do |n|
         next unless n.text?
 
-        n.replace(n.text.gsub(/ /, "").gsub(/:/, "：").gsub(/,/, "、")
-          .gsub(/\(/, "（").gsub(/\)/, "）").gsub(/\[/, "【").gsub(/\]/, "】"))
+        n.replace(cleanup_entities(n.text.gsub(/ /, "").gsub(/:/, "：")
+          .gsub(/,/, "、").gsub(/\(/, "（").gsub(/\)/, "）")
+          .gsub(/\[/, "【").gsub(/\]/, "】"), is_xml: false))
       end
       xml.to_xml.gsub(/<b>/, "").gsub("</b>", "").gsub(/<\?[^>]+>/, "")
     end
@@ -111,6 +113,7 @@ module IsoDoc
       l10n(names[0..-2].join(", ") + " #{andword} #{names[-1]}", @lang, @script)
     end
 
+    include Function::Utils
     # module_function :l10n
   end
 end

data/lib/isodoc/pdf_convert.rb

@@ -20,7 +20,7 @@ module IsoDoc
     end
 
     def tmpimagedir_suffix
-      "_pdfimages"
+      "_#{SecureRandom.hex(8)}_pdfimages"
     end
 
     def convert(input_filename, file = nil, debug = false, output_filename = nil)

data/lib/isodoc/presentation_function/section.rb

@@ -19,6 +19,22 @@ module IsoDoc
       prefix_name(elem, "<tab/>", "#{lbl}#{clausedelim}", "title")
     end
 
+    def floattitle(docxml)
+      docxml.xpath(ns("//clause | //annex | //appendix | //introduction | "\
+                      "//foreword | //preface/abstract | //acknowledgements | "\
+                      "//terms | //definitions | //references"))
+        .each do |f|
+        floattitle1(f)
+      end
+    end
+
+    def floattitle1(elem)
+      level = @xrefs.anchor(elem["id"], :level, false) || "1"
+      elem.xpath(ns("./p[@type = 'floating-title']")).each do |p|
+        p["depth"] = level.to_i + 1
+      end
+    end
+
     def annex(docxml)
       docxml.xpath(ns("//annex")).each do |f|
         annex1(f)

data/lib/isodoc/presentation_function/terms.rb

@@ -6,35 +6,40 @@ module IsoDoc
 
     def concept1(node)
       xref = node&.at(ns("./xref/@target"))&.text or
-        return concept_render(node, ital: node["ital"] || "true",
-                                    ref: node["ref"] || "true",
-                                    linkref: node["linkref"] || "true",
-                                    linkmention: node["linkmention"] || "false")
+        return concept_render(node, ital: "true", ref: "true",
+                                    linkref: "true", linkmention: "false")
       if node.at(ns("//definitions//dt[@id = '#{xref}']"))
-        concept_render(node, ital: node["ital"] || "false",
-                             ref: node["ref"] || "false",
-                             linkref: node["linkref"] || "true",
-                             linkmention: node["linkmention"] || "false")
-      else concept_render(node, ital: node["ital"] || "true",
-                                ref: node["ref"] || "true",
-                                linkref: node["linkref"] || "true",
-                                linkmention: node["linkmention"] || "false")
+        concept_render(node, ital: "false", ref: "false",
+                             linkref: "true", linkmention: "false")
+      else concept_render(node, ital: "true", ref: "true",
+                                linkref: "true", linkmention: "false")
       end
     end
 
-    def concept_render(node, opts)
+    def concept_render(node, defaults)
+      opts, render, ref = concept_render_init(node, defaults)
       node&.at(ns("./refterm"))&.remove
-      r = node.at(ns("./renderterm"))
-      ref = node.at(ns("./xref | ./eref | ./termref"))
-      ref && opts[:ref] != "false" and r&.next = " "
-      opts[:ital] == "true" and r&.name = "em"
-      concept1_linkmention(ref, r, opts)
+      ref && opts[:ref] != "false" and render&.next = " "
+      opts[:ital] == "true" and render&.name = "em"
+      concept1_linkmention(ref, render, opts)
       concept1_ref(node, ref, opts)
+      concept1_nonital(node, opts)
+      node.replace(node.children)
+    end
+
+    def concept1_nonital(node, opts)
       if opts[:ital] == "false"
         r = node.at(ns(".//renderterm"))
         r&.replace(r&.children)
       end
-      node.replace(node.children)
+    end
+
+    def concept_render_init(node, defaults)
+      opts = %i(ital ref linkref linkmention).each_with_object({}) do |x, m|
+        m[x] = node[x.to_s] || defaults[x]
+      end
+      [opts, node.at(ns("./renderterm")),
+       node.at(ns("./xref | ./eref | ./termref"))]
     end
 
     def concept1_linkmention(ref, renderterm, opts)
@@ -221,20 +226,23 @@ module IsoDoc
     end
 
     def termsource(docxml)
+      docxml.xpath(ns("//termsource/modification")).each do |f|
+        termsource_modification(f)
+      end
       docxml.xpath(ns("//termsource")).each do |f|
         termsource1(f)
       end
     end
 
     def termsource1(elem)
-      mod = elem.at(ns("./modification")) and
-        termsource_modification(mod)
+      while elem&.next_element&.name == "termsource"
+        elem << "; #{elem.next_element.remove.children.to_xml}"
+      end
       elem.children = l10n("[#{@i18n.source}: #{elem.children.to_xml.strip}]")
-      elem&.next_element&.name == "termsource" and elem.next = "; "
     end
 
     def termsource_modification(mod)
-      mod.previous_element.next = ", #{@i18n.modified}"
+      mod.previous_element.next = l10n(", #{@i18n.modified}")
       mod.text.strip.empty? or mod.previous = " &#x2013; "
       mod.elements.size == 1 and
         mod.elements[0].replace(mod.elements[0].children)

data/lib/isodoc/presentation_xml_convert.rb

@@ -37,6 +37,7 @@ module IsoDoc
       references docxml
       index docxml
       clausetitle docxml
+      floattitle docxml
       toc docxml
       display_order docxml
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.8.3".freeze
+  VERSION = "1.8.4".freeze
 end

data/lib/isodoc/xslfo_convert.rb

@@ -33,7 +33,7 @@ module IsoDoc
     end
 
     def tmpimagedir_suffix
-      "_pdfimages"
+      "_#{SecureRandom.hex(8)}_pdfimages"
     end
 
     def pdf_stylesheet(_docxml)
@@ -58,7 +58,6 @@ module IsoDoc
       file = File.read(input_filename, encoding: "utf-8") if file.nil?
       input_filename, docxml, filename = input_xml_path(input_filename,
                                                         file, debug)
-      warn pdf_options(docxml).merge(@options)
       ::Metanorma::Output::XslfoPdf.new.convert(
         input_filename,
         output_filename || "#{filename}.#{@suffix}",

data/spec/isodoc/postproc_spec.rb

@@ -726,9 +726,9 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
-  it "moves images in HTML" do
+  it "moves images in HTML #1" do
     FileUtils.rm_f "test.html"
-    FileUtils.rm_rf "test_htmlimages"
+    FileUtils.rm_rf Dir.glob "test_*_htmlimages"
     IsoDoc::HtmlConvert.new(
       { wordstylesheet: "spec/assets/word.css",
         htmlstylesheet: "spec/assets/html.scss" },
@@ -750,8 +750,9 @@ RSpec.describe IsoDoc do
     html = File.read("test.html")
       .sub(/^.*<main class="main-section">/m, '<main class="main-section">')
       .sub(%r{</main>.*$}m, "</main>")
-    expect(`ls test_htmlimages`).to match(/\.png$/)
-    expect(xmlpp(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png")))
+    expect(`ls test_*_htmlimages`).to match(/\.png$/)
+    expect(xmlpp(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png"))
+    .gsub(/test_[^_]+_htmlimages/, "test_htmlimages"))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
                    <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
                      <br />
@@ -771,7 +772,7 @@ RSpec.describe IsoDoc do
       OUTPUT
   end
 
-  it "moves images in HTML" do
+  it "moves images in HTML #2" do
     FileUtils.rm_f "test.html"
     FileUtils.rm_rf "test_htmlimages"
     IsoDoc::HtmlConvert.new(
@@ -791,8 +792,9 @@ RSpec.describe IsoDoc do
     html = File.read("test.html")
       .sub(/^.*<main class="main-section">/m, '<main class="main-section">')
       .sub(%r{</main>.*$}m, "</main>")
-    expect(`ls test_htmlimages`).to match(/\.png$/)
-    expect(xmlpp(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png")))
+    expect(`ls test_*_htmlimages`).to match(/\.png$/)
+    expect(xmlpp(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png"))
+           .gsub(/test_[^_]+_htmlimages/, "test_htmlimages"))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
             <main class='main-section'>
           <button onclick='topFunction()' id='myBtn' title='Go to top'>Top</button>
@@ -813,7 +815,6 @@ RSpec.describe IsoDoc do
     context "when `mathvariant` attr equal to `script`" do
       it "converts mathvariant text chars into associated plain chars" do
         FileUtils.rm_f "test.html"
-        FileUtils.rm_rf "test_htmlimages"
         input = <<~INPUT
           <?xml version="1.0" encoding="UTF-8"?>
           <iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="1.5.14">
@@ -865,7 +866,6 @@ RSpec.describe IsoDoc do
     context "when complex `mathvariant` combinations" do
       it "converts mathvariant text chars into associated plain chars" do
         FileUtils.rm_f "test.html"
-        FileUtils.rm_rf "test_htmlimages"
         input = <<~INPUT
           <?xml version="1.0" encoding="UTF-8"?>
           <iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="1.5.14">
@@ -975,7 +975,7 @@ RSpec.describe IsoDoc do
 
   it "moves images in HTML with no file suffix" do
     FileUtils.rm_f "test.html"
-    FileUtils.rm_rf "test_htmlimages"
+    FileUtils.rm_rf Dir.glob "test_*_htmlimages"
     IsoDoc::HtmlConvert.new(
       { wordstylesheet: "spec/assets/word.css",
         htmlstylesheet: "spec/assets/html.scss" },
@@ -994,8 +994,9 @@ RSpec.describe IsoDoc do
     html = File.read("test.html")
       .sub(/^.*<main class="main-section">/m, '<main class="main-section">')
       .sub(%r{</main>.*$}m, "</main>")
-    expect(`ls test_htmlimages`).to match(/\.png$/)
-    expect(xmlpp(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png")))
+    expect(`ls test_*_htmlimages`).to match(/\.png$/)
+    expect(xmlpp(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png"))
+    .gsub(/test_[^_]+_htmlimages/, "test_htmlimages"))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
         <main class='main-section'>
              <button onclick='topFunction()' id='myBtn' title='Go to top'>Top</button>
@@ -1036,8 +1037,9 @@ RSpec.describe IsoDoc do
     html = File.read("spec/test.html")
       .sub(/^.*<main class="main-section">/m, '<main class="main-section">')
       .sub(%r{</main>.*$}m, "</main>")
-    expect(`ls test_htmlimages`).to match(/\.png$/)
-    expect(xmlpp(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png")))
+    expect(`ls test_*_htmlimages`).to match(/\.png$/)
+    expect(xmlpp(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png"))
+           .gsub(/test_[^_]+_htmlimages/, "test_htmlimages"))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
                    <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
                      <br />
@@ -1057,7 +1059,7 @@ RSpec.describe IsoDoc do
 
   it "encodes images in HTML as data URIs" do
     FileUtils.rm_f "test.html"
-    FileUtils.rm_rf "test_htmlimages"
+    FileUtils.rm_rf Dir.glob "test_*_htmlimages"
     IsoDoc::HtmlConvert
       .new(htmlstylesheet: "spec/assets/html.scss", datauriimage: true)
       .convert("test", <<~"INPUT", false)
@@ -1093,7 +1095,7 @@ RSpec.describe IsoDoc do
 
   it "encodes images in HTML as data URIs, using relative file location" do
     FileUtils.rm_f "spec/test.html"
-    FileUtils.rm_rf "spec/test_htmlimages"
+    FileUtils.rm_rf Dir.glob "test_*_htmlimages"
     IsoDoc::HtmlConvert
       .new({ htmlstylesheet: "assets/html.scss", datauriimage: true })
       .convert("spec/test", <<~"INPUT", false)