metanorma-standoc 1.10.3 → 1.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a43a3db1e4ef2ae43a1b2c7ecd980384cac2ee645668e414c73fd8e53dee3859
-  data.tar.gz: 6f026c1bd2e1d0c5f2f327cdc345af6635ff1c1454479fd42709b9d18fda5e60
+  metadata.gz: dd98ba81df1c144552167e677b04d6152d838de0ea2d539a6bc7bde2a4b7f235
+  data.tar.gz: 68d9afff164047bf12f97ac23735cc1d61503172ae8656795393314d127223b6
 SHA512:
-  metadata.gz: 7b20738029106d832a852db8eabf340058cdcbf75d8ce16def000478733c3633ad1144ac1aa2f736a637423c19f90491429fbec591987bc2f4af58bb3c8df087
-  data.tar.gz: 69f3e40acdca71435cda97dbcd33e862ffbacbb4eeaff97e543b971ec2744c72227115013ef2ac3ee88552c64bf413a36c060adf3af58e6ebb86c6b85997b070
+  metadata.gz: 611ba153c4160486b0ea51eb1564e09cd81d02f6ca6d5a075e3f38cf321321f2e019ba538341786bd4fe01eac9ef53e71ddc5cc19fdccb4e69189d9e7a720955
+  data.tar.gz: 0acb358132209888abe3a276c16abcfdf142570fd271712960e64e02db487df9bb39081a1f4e08da7347777a71240b57b2d8f6dda7d980523981efe5a838495c

data/lib/asciidoctor/standoc/base.rb

@@ -53,6 +53,7 @@ module Asciidoctor
           htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
           doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
           break_up_urls_in_tables: node.attr("break-up-urls-in-tables"),
+          suppressasciimathdup: node.attr("suppress-asciimath-dup"),
           bare: node.attr("bare"),
           sectionsplit: node.attr("sectionsplit"),
         }
@@ -62,6 +63,12 @@ module Asciidoctor
         IsoDoc::HtmlConvert.new(html_extract_attributes(node))
       end
 
+      def pdf_converter(node)
+        return nil if node.attr("no-pdf")
+
+        IsoDoc::Standoc::PdfConvert.new(doc_extract_attributes(node))
+      end
+
       def doc_extract_attributes(node)
         attrs = {
           script: node.attr("script"),
@@ -81,6 +88,7 @@ module Asciidoctor
           htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
           doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
           break_up_urls_in_tables: node.attr("break-up-urls-in-tables"),
+          suppressasciimathdup: node.attr("suppress-asciimath-dup"),
           bare: node.attr("bare"),
         }
 
@@ -114,11 +122,11 @@ module Asciidoctor
           node.attr("mn-keep-asciimath") != "false"
         @fontheader = default_fonts(node)
         @files_to_delete = []
-        if node.attr("docfile")
-          @filename = File.basename(node.attr("docfile"))&.gsub(/\.adoc$/, "")
-        else
-          @filename = ""
-        end
+        @filename = if node.attr("docfile")
+                      File.basename(node.attr("docfile"))&.gsub(/\.adoc$/, "")
+                    else
+                      ""
+                    end
         @localdir = Metanorma::Utils::localdir(node)
         @output_dir = outputdir node
         @no_isobib_cache = node.attr("no-isobib-cache")
@@ -156,6 +164,8 @@ module Asciidoctor
                                      nil, false, "#{@filename}.html")
         doc_converter(node).convert("#{@filename}.presentation.xml",
                                     nil, false, "#{@filename}.doc")
+        pdf_converter(node)&.convert("#{@filename}.presentation.xml",
+                                     nil, false, "#{@filename}.pdf")
       end
 
       def document(node)

data/lib/asciidoctor/standoc/blocks.rb

@@ -10,15 +10,17 @@ module Asciidoctor
       end
 
       def id_unnum_attrs(node)
-        attr_code( id: Metanorma::Utils::anchor_or_uuid(node),
+        attr_code(id: Metanorma::Utils::anchor_or_uuid(node),
                   unnumbered: node.option?("unnumbered") ? "true" : nil,
                   number: node.attr("number"),
-                  subsequence: node.attr("subsequence") )
+                  subsequence: node.attr("subsequence"))
       end
 
       def formula_attrs(node)
-        attr_code(id_unnum_attrs(node).merge(keep_attrs(node).merge(
-          inequality: node.option?("inequality") ? "true" : nil)))
+        attr_code(id_unnum_attrs(node)
+          .merge(keep_attrs(node).merge(
+                   inequality: node.option?("inequality") ? "true" : nil,
+                 )))
       end
 
       def keep_attrs(node)
@@ -58,8 +60,8 @@ module Asciidoctor
           xml.figure **literal_attrs(node) do |f|
             figure_title(node, f)
             f.pre node.lines.join("\n"),
-              **attr_code(id: Metanorma::Utils::anchor_or_uuid,
-                          alt: node.attr("alt"))
+                  **attr_code(id: Metanorma::Utils::anchor_or_uuid,
+                              alt: node.attr("alt"))
           end
         end
       end
@@ -95,20 +97,21 @@ module Asciidoctor
       end
 
       def svgmap_attrs(node)
-        attr_code( { id: node.id,
-                     unnumbered: node.option?("unnumbered") ? "true" : nil,
-                     number: node.attr("number"),
-                     subsequence: node.attr("subsequence") }.
-        merge(keep_attrs(node)))
+        attr_code({ id: node.id,
+                    unnumbered: node.option?("unnumbered") ? "true" : nil,
+                    number: node.attr("number"),
+                    subsequence: node.attr("subsequence") }
+        .merge(keep_attrs(node)))
       end
 
       def svgmap_example(node)
         noko do |xml|
           xml.svgmap **attr_code(svgmap_attrs(node).merge(
-            src: node.attr("src"), alt: node.attr("alt"))) do |ex|
-              figure_title(node, ex)
-              ex << node.content
-            end
+                                   src: node.attr("src"), alt: node.attr("alt"),
+                                 )) do |ex|
+            figure_title(node, ex)
+            ex << node.content
+          end
         end.join("\n")
       end
 
@@ -136,9 +139,10 @@ module Asciidoctor
         end.join("\n")
       end
 
-      def figure_title(node, f)
+      def figure_title(node, out)
         return if node.title.nil?
-        f.name { |name| name << node.title }
+
+        out.name { |name| name << node.title }
       end
 
       def figure_attrs(node)
@@ -149,15 +153,17 @@ module Asciidoctor
         noko do |xml|
           xml.figure **figure_attrs(node) do |f|
             figure_title(node, f)
-            f.image **(image_attributes(node))
+            f.image **image_attributes(node)
           end
         end
       end
 
       def para_attrs(node)
         attr_code(keep_attrs(node)
-          .merge(align: node.attr("align"), 
-        id: Metanorma::Utils::anchor_or_uuid(node)))
+          .merge(align: node.attr("align"),
+                 variant_title: node.role == "variant-title" ? true : nil,
+                 type: node.attr("type"),
+                 id: Metanorma::Utils::anchor_or_uuid(node)))
       end
 
       def paragraph(node)
@@ -172,8 +178,8 @@ module Asciidoctor
 
       def quote_attrs(node)
         attr_code(keep_attrs(node)
-          .merge(align: node.attr("align"), 
-        id: Metanorma::Utils::anchor_or_uuid(node)))
+          .merge(align: node.attr("align"),
+                 id: Metanorma::Utils::anchor_or_uuid(node)))
       end
 
       def quote_attribution(node, out)
@@ -189,7 +195,7 @@ module Asciidoctor
 
       def quote(node)
         noko do |xml|
-          xml.quote **(quote_attrs(node)) do |q|
+          xml.quote **quote_attrs(node) do |q|
             quote_attribution(node, q)
             wrap_in_para(node, q)
           end
@@ -197,18 +203,18 @@ module Asciidoctor
       end
 
       def listing_attrs(node)
-        attr_code(keep_attrs(node).
-                  merge(lang: node.attr("language"),
-                        id: Metanorma::Utils::anchor_or_uuid(node),
-                        unnumbered: node.option?("unnumbered") ? "true" : nil,
-                        number: node.attr("number"),
-                        filename: node.attr("filename")))
+        attr_code(keep_attrs(node)
+                  .merge(lang: node.attr("language"),
+                         id: Metanorma::Utils::anchor_or_uuid(node),
+                         unnumbered: node.option?("unnumbered") ? "true" : nil,
+                         number: node.attr("number"),
+                         filename: node.attr("filename")))
       end
 
       # NOTE: html escaping is performed by Nokogiri
       def listing(node)
         fragment = ::Nokogiri::XML::Builder.new do |xml|
-          xml.sourcecode **(listing_attrs(node)) do |s|
+          xml.sourcecode **listing_attrs(node) do |s|
             figure_title(node, s)
             s << node.content
           end
@@ -219,7 +225,7 @@ module Asciidoctor
 
       def pass(node)
         noko do |xml|
-          xml.passthrough **attr_code(formats: 
+          xml.passthrough **attr_code(formats:
                                       node.attr("format") || "metanorma") do |p|
             p << HTMLEntities.new.encode(node.content, :basic, :hexadecimal)
           end

data/lib/asciidoctor/standoc/cleanup.rb

@@ -13,19 +13,12 @@ require_relative "./cleanup_amend"
 require_relative "./cleanup_maths"
 require_relative "./cleanup_image"
 require_relative "./cleanup_reqt"
+require_relative "./cleanup_text"
 require "relaton_iev"
 
 module Asciidoctor
   module Standoc
     module Cleanup
-      def textcleanup(result)
-        text = result.flatten.map { |l| l.sub(/\s*$/, "") } * "\n"
-        !@keepasciimath and text = asciimath2mathml(text)
-        text = text.gsub(/\s+<fn /, "<fn ")
-        text.gsub(%r{<passthrough\s+formats="metanorma">([^<]*)
-                  </passthrough>}mx) { HTMLEntities.new.decode($1) }
-      end
-
       def cleanup(xmldoc)
         element_name_cleanup(xmldoc)
         sections_cleanup(xmldoc)
@@ -72,62 +65,6 @@ module Asciidoctor
         xmldoc
       end
 
-      IGNORE_DUMBQUOTES = "//pre | //pre//* | //tt | //tt//* | "\
-        "//sourcecode | //sourcecode//* | //bibdata//* | //stem | "\
-        "//stem//* | //figure[@class = 'pseudocode'] | "\
-        "//figure[@class = 'pseudocode']//*".freeze
-
-      def smartquotes_cleanup(xmldoc)
-        xmldoc.xpath("//date").each { |d| Metanorma::Utils::endash_date(d) }
-        if @smartquotes then smartquotes_cleanup1(xmldoc)
-        else dumbquote_cleanup(xmldoc)
-        end
-      end
-
-      def smartquotes_cleanup1(xmldoc)
-        uninterrupt_quotes_around_xml(xmldoc)
-        dumb2smart_quotes(xmldoc)
-      end
-
-      # "abc<tag/>", def => "abc",<tag/> def
-      def uninterrupt_quotes_around_xml(xmldoc)
-        xmldoc.xpath("//*[following::text()[1]"\
-                     "[starts-with(., '\"') or starts-with(., \"'\")]]")
-          .each do |x|
-          uninterrupt_quotes_around_xml1(x)
-        end
-      end
-
-      def uninterrupt_quotes_around_xml1(elem)
-        prev = elem.at(".//preceding::text()[1]") or return
-        /\S$/.match?(prev.text) or return
-        foll = elem.at(".//following::text()[1]")
-        m = /^(["'][[:punct:]]*)(\s|$)/.match(foll&.text) or return
-        foll.content = foll.text.sub(/^(["'][[:punct:]]*)/, "")
-        prev.content = "#{prev.text}#{m[1]}"
-      end
-
-      def dumb2smart_quotes(xmldoc)
-        (xmldoc.xpath("//*[child::text()]") - xmldoc.xpath(IGNORE_DUMBQUOTES))
-          .each do |x|
-          x.children.each do |n|
-            next unless n.text?
-
-            /[-'"(<>]|\.\.|\dx/.match(n) or next
-
-            n.replace(Metanorma::Utils::smartformat(n.text))
-          end
-        end
-      end
-
-      def dumbquote_cleanup(xmldoc)
-        xmldoc.traverse do |n|
-          next unless n.text?
-
-          n.replace(n.text.gsub(/(?<=\p{Alnum})\u2019(?=\p{Alpha})/, "'")) # .
-        end
-      end
-
       def docidentifier_cleanup(xmldoc); end
 
       TEXT_ELEMS =
@@ -171,8 +108,8 @@ module Asciidoctor
 
           c.xpath("./variant").each do |n|
             if n.at_xpath("preceding-sibling::node()"\
-                "[not(self::text()[not(normalize-space())])][1]"\
-                "[self::variantwrap]")
+                          "[not(self::text()[not(normalize-space())])][1]"\
+                          "[self::variantwrap]")
               n.previous_element << n
             else
               n.replace("<variantwrap/>").first << n
@@ -202,11 +139,11 @@ module Asciidoctor
       end
 
       def toc_index(toc, xmldoc)
-        depths = toc.xpath("./toc-xpath").each_with_object({}) do |x, m|
-          m[x.text] = x["depth"]
-        end
+        depths = toc_index_depths(toc)
         depths.keys.each_with_object([]) do |key, arr|
           xmldoc.xpath(key).each do |x|
+            t = x.at("./following-sibling::variant-title[@type = 'toc']") and
+              x = t
             arr << { text: x.children.to_xml, depth: depths[key].to_i,
                      target: x.xpath("(./ancestor-or-self::*/@id)[last()]")[0].text,
                      line: x.line }
@@ -214,6 +151,12 @@ module Asciidoctor
         end.sort_by { |a| a[:line] }
       end
 
+      def toc_index_depths(toc)
+        toc.xpath("./toc-xpath").each_with_object({}) do |x, m|
+          m[x.text] = x["depth"]
+        end
+      end
+
       def toc_cleanup1(toc, xmldoc)
         depth = 1
         ret = ""

data/lib/asciidoctor/standoc/cleanup_block.rb

@@ -7,8 +7,11 @@ module Asciidoctor
       def para_cleanup(xmldoc)
         ["//p[not(ancestor::bibdata)]", "//ol[not(ancestor::bibdata)]",
          "//ul[not(ancestor::bibdata)]", "//quote[not(ancestor::bibdata)]",
-         "//note[not(ancestor::bibitem or ancestor::table or ancestor::bibdata)]"
-        ].each { |w| inject_id(xmldoc, w) }
+         "//note[not(ancestor::bibitem or ancestor::table or ancestor::bibdata)]"].each do |w|
+          inject_id(
+            xmldoc, w
+          )
+        end
       end
 
       def inject_id(xmldoc, path)
@@ -205,7 +208,7 @@ module Asciidoctor
       def safe_noko(text, doc)
         Nokogiri::XML::Text.new(text, doc).to_xml(
           encoding: "US-ASCII",
-          save_with: Nokogiri::XML::Node::SaveOptions::NO_DECLARATION
+          save_with: Nokogiri::XML::Node::SaveOptions::NO_DECLARATION,
         )
       end
 

data/lib/asciidoctor/standoc/cleanup_maths.rb

@@ -29,19 +29,19 @@ module Asciidoctor
         x.to_xml
       end
 
-      def xml_unescape_mathml(x)
-        return if x.children.any? { |y| y.element? }
+      def xml_unescape_mathml(xml)
+        return if xml.children.any? { |y| y.element? }
 
-        math = x.text.gsub(/&lt;/, "<").gsub(/&gt;/, ">")
+        math = xml.text.gsub(/&lt;/, "<").gsub(/&gt;/, ">")
           .gsub(/&quot;/, '"').gsub(/&apos;/, "'").gsub(/&amp;/, "&")
           .gsub(/<[^: \r\n\t\/]+:/, "<").gsub(/<\/[^ \r\n\t:]+:/, "</")
-        x.children = math
+        xml.children = math
       end
 
       MATHML_NS = "http://www.w3.org/1998/Math/MathML".freeze
 
-      def mathml_preserve_space(m)
-        m.xpath(".//m:mtext", "m" => MATHML_NS).each do |x|
+      def mathml_preserve_space(math)
+        math.xpath(".//m:mtext", "m" => MATHML_NS).each do |x|
           x.children = x.children.to_xml
             .gsub(/^\s/, "&#xA0;").gsub(/\s$/, "&#xA0;")
         end
@@ -57,23 +57,23 @@ module Asciidoctor
       end
 
       # presuppose multichar mi upright, singlechar mi MathML default italic
-      def mathml_italicise(x)
-        x.xpath(".//m:mi[not(ancestor::*[@mathvariant])]",
-                "m" => MATHML_NS).each do |i|
+      def mathml_italicise(xml)
+        xml.xpath(".//m:mi[not(ancestor::*[@mathvariant])]",
+                  "m" => MATHML_NS).each do |i|
           char = HTMLEntities.new.decode(i.text)
           i["mathvariant"] = "normal" if mi_italicise?(char)
         end
       end
 
-      def mi_italicise?(c)
-        return false if c.length > 1
+      def mi_italicise?(char)
+        return false if char.length > 1
 
-        if /\p{Greek}/.match?(c)
-          /\p{Lower}/.match(c) && !mathml_mi_italics[:lowergreek] ||
-            /\p{Upper}/.match(c) && !mathml_mi_italics[:uppergreek]
-        elsif /\p{Latin}/.match?(c)
-          /\p{Lower}/.match(c) && !mathml_mi_italics[:lowerroman] ||
-            /\p{Upper}/.match(c) && !mathml_mi_italics[:upperroman]
+        if /\p{Greek}/.match?(char)
+          /\p{Lower}/.match(char) && !mathml_mi_italics[:lowergreek] ||
+            /\p{Upper}/.match(char) && !mathml_mi_italics[:uppergreek]
+        elsif /\p{Latin}/.match?(char)
+          /\p{Lower}/.match(char) && !mathml_mi_italics[:lowerroman] ||
+            /\p{Upper}/.match(char) && !mathml_mi_italics[:upperroman]
         else
           false
         end
@@ -100,14 +100,14 @@ module Asciidoctor
         end
       end
 
-      def gather_unitsml(unitsml, xmldoc, t)
-        tags = xmldoc.xpath(".//m:#{t}", "m" => UNITSML_NS)
+      def gather_unitsml(unitsml, xmldoc, tag)
+        tags = xmldoc.xpath(".//m:#{tag}", "m" => UNITSML_NS)
           .each_with_object({}) do |x, m|
           m[x["id"]] = x.remove
         end
         return if tags.empty?
 
-        set = unitsml.add_child("<#{t}Set/>").first
+        set = unitsml.add_child("<#{tag}Set/>").first
         tags.each_value { |v| set << v }
       end
 
@@ -115,14 +115,106 @@ module Asciidoctor
         { multiplier: :space }
       end
 
+      def mathvariant_override(inner, outer)
+        case outer
+        when "bold"
+          case inner
+          when "normal" then "bold"
+          when "italic" then "bold-italic"
+          when "fraktur" then "bold-fraktur"
+          when "script" then "bold-script"
+          when "sans-serif" then "bold-sans-serif"
+          when "sans-serif-italic" then "sans-serif-bold-italic"
+          else inner
+          end
+        when "italic"
+          case inner
+          when "normal" then "italic"
+          when "bold" then "bold-italic"
+          when "sans-serif" then "sans-serif-italic"
+          when "bold-sans-serif" then "sans-serif-bold-italic"
+          else inner
+          end
+        when "bold-italic"
+          case inner
+          when "normal", "bold", "italic" then "bold-italic"
+          when "sans-serif", "bold-sans-serif", "sans-serif-italic"
+            "sans-serif-bold-italic"
+          else inner
+          end
+        when "fraktur"
+          case inner
+          when "normal" then "fraktur"
+          when "bold" then "bold-fraktur"
+          else inner
+          end
+        when "bold-fraktur"
+          case inner
+          when "normal", "fraktur" then "bold-fraktur"
+          else inner
+          end
+        when "script"
+          case inner
+          when "normal" then "script"
+          when "bold" then "bold-script"
+          else inner
+          end
+        when "bold-script"
+          case inner
+          when "normal", "script" then "bold-script"
+          else inner
+          end
+        when "sans-serif"
+          case inner
+          when "normal" then "sans-serif"
+          when "bold" then "bold-sans-serif"
+          when "italic" then "sans-serif-italic"
+          when "bold-italic" then "sans-serif-bold-italic"
+          else inner
+          end
+        when "bold-sans-serif"
+          case inner
+          when "normal", "bold", "sans-serif" then "bold-sans-serif"
+          when "italic", "bold-italic", "sans-serif-italic"
+            "sans-serif-bold-italic"
+          else inner
+          end
+        when "sans-serif-italic"
+          case inner
+          when "normal", "italic", "sans-serif" then "sans-serif-italic"
+          when "bold", "bold-italic", "sans-serif-bold"
+            "sans-serif-bold-italic"
+          else inner
+          end
+        when "sans-serif-bold-italic"
+          case inner
+          when "normal", "italic", "sans-serif", "sans-serif-italic",
+          "bold", "bold-italic", "sans-serif-bold"
+            "sans-serif-bold-italic"
+          else inner
+          end
+        else inner
+        end
+      end
+
+      def mathml_mathvariant(math)
+        math.xpath(".//*[@mathvariant]").each do |outer|
+          outer.xpath(".//*[@mathvariant]").each do |inner|
+            inner["mathvariant"] =
+              mathvariant_override(outer["mathvariant"], inner["mathvariant"])
+          end
+        end
+      end
+
       def mathml_cleanup(xmldoc)
         unitsml = Asciimath2UnitsML::Conv.new(asciimath2unitsml_options)
         xmldoc.xpath("//stem[@type = 'MathML']").each do |x|
           xml_unescape_mathml(x)
           mathml_namespace(x)
           mathml_preserve_space(x)
-          mathml_italicise(x)
           unitsml.MathML2UnitsML(x)
+          mathml_mathvariant(x)
+          mathml_italicise(x)
         end
         mathml_unitsML(xmldoc)
       end