coradoc 1.1.5 → 1.1.7

data/lib/coradoc/input/html/converters/em.rb

@@ -1,17 +1,21 @@
-module Coradoc::Input::HTML
-  module Converters
-    class Em < Markup
-      def coradoc_class
-        Coradoc::Element::Inline::Italic
-      end
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Em < Markup
+          def coradoc_class
+            Coradoc::Element::Inline::Italic
+          end
+
+          def markup_ancestor_tag_names
+            %w[em i cite]
+          end
+        end
 
-      def markup_ancestor_tag_names
-        %w[em i cite]
+        register :em, Em.new
+        register :i,  Em.new
+        register :cite, Em.new
       end
     end
-
-    register :em, Em.new
-    register :i,  Em.new
-    register :cite, Em.new
   end
 end

data/lib/coradoc/input/html/converters/figure.rb

@@ -1,21 +1,25 @@
-module Coradoc::Input::HTML
-  module Converters
-    class Figure < Base
-      def to_coradoc(node, state = {})
-        id = node["id"]
-        title = extract_title(node)
-        content = treat_children_coradoc(node, state)
-        Coradoc::Element::Block::Example.new(title, lines: content, id: id)
-      end
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Figure < Base
+          def to_coradoc(node, state = {})
+            id = node["id"]
+            title = extract_title(node)
+            content = treat_children_coradoc(node, state)
+            Coradoc::Element::Block::Example.new(title, lines: content, id: id)
+          end
+
+          def extract_title(node)
+            title = node.at("./figcaption")
+            return "" if title.nil?
 
-      def extract_title(node)
-        title = node.at("./figcaption")
-        return "" if title.nil?
+            treat_children_coradoc(title, {})
+          end
+        end
 
-        treat_children_coradoc(title, {})
+        register :figure, Figure.new
       end
     end
-
-    register :figure, Figure.new
   end
 end

data/lib/coradoc/input/html/converters/h.rb

@@ -1,40 +1,42 @@
-module Coradoc::Input::HTML
-  module Converters
-    class H < Base
-      def to_coradoc(node, state = {})
-        id = node["id"]
-        internal_anchor = treat_children_anchors(node, state)
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class H < Base
+          def to_coradoc(node, state = {})
+            id = node["id"]
+            internal_anchor = treat_children_anchors(node, state)
 
-        if id.to_s.empty? && internal_anchor.size.positive?
-          if internal_anchor.first.respond_to? :id
-            id = internal_anchor.first.id
-          end
-        end
+            if id.to_s.empty? && internal_anchor.size.positive? && internal_anchor.first.respond_to?(:id)
+              id = internal_anchor.first.id
+            end
 
-        level = node.name[/\d/].to_i
-        content = treat_children_no_anchors(node, state)
+            level = node.name[/\d/].to_i
+            content = treat_children_no_anchors(node, state)
 
-        Coradoc::Element::Title.new(content, level, id: id)
-      end
+            Coradoc::Element::Title.new(content, level, id: id)
+          end
 
-      def treat_children_no_anchors(node, state)
-        node.children.reject { |a| a.name == "a" }.map do |child|
-          treat_coradoc(child, state)
-        end
-      end
+          def treat_children_no_anchors(node, state)
+            node.children.reject { |a| a.name == "a" }.map do |child|
+              treat_coradoc(child, state)
+            end
+          end
 
-      def treat_children_anchors(node, state)
-        node.children.select { |a| a.name == "a" }.map do |child|
-          treat_coradoc(child, state)
+          def treat_children_anchors(node, state)
+            node.children.select { |a| a.name == "a" }.map do |child|
+              treat_coradoc(child, state)
+            end
+          end
         end
+
+        register :h1, H.new
+        register :h2, H.new
+        register :h3, H.new
+        register :h4, H.new
+        register :h5, H.new
+        register :h6, H.new
       end
     end
-
-    register :h1, H.new
-    register :h2, H.new
-    register :h3, H.new
-    register :h4, H.new
-    register :h5, H.new
-    register :h6, H.new
   end
 end

data/lib/coradoc/input/html/converters/head.rb

@@ -1,19 +1,23 @@
-module Coradoc::Input::HTML
-  module Converters
-    class Head < Base
-      def to_coradoc(node, _state = {})
-        title = extract_title(node)
-        Coradoc::Element::Header.new(title)
-      end
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Head < Base
+          def to_coradoc(node, _state = {})
+            title = extract_title(node)
+            Coradoc::Element::Header.new(title)
+          end
+
+          def extract_title(node)
+            title = node.at("./title")
+            return "(???)" if title.nil?
 
-      def extract_title(node)
-        title = node.at("./title")
-        return "(???)" if title.nil?
+            title.text
+          end
+        end
 
-        title.text
+        register :head, Head.new
       end
     end
-
-    register :head, Head.new
   end
 end

data/lib/coradoc/input/html/converters/hr.rb

@@ -1,11 +1,15 @@
-module Coradoc::Input::HTML
-  module Converters
-    class Hr < Base
-      def to_coradoc(_node, _state = {})
-        Coradoc::Element::Break::ThematicBreak.new
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Hr < Base
+          def to_coradoc(_node, _state = {})
+            Coradoc::Element::Break::ThematicBreak.new
+          end
+        end
+
+        register :hr, Hr.new
       end
     end
-
-    register :hr, Hr.new
   end
 end

data/lib/coradoc/input/html/converters/ignore.rb

@@ -1,16 +1,20 @@
-module Coradoc::Input::HTML
-  module Converters
-    class Ignore < Base
-      def to_coradoc(node, state = {})
-        convert(node, state)
-      end
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Ignore < Base
+          def to_coradoc(node, state = {})
+            convert(node, state)
+          end
+
+          def convert(_node, _state = {})
+            "" # noop
+          end
+        end
 
-      def convert(_node, _state = {})
-        "" # noop
+        register :colgroup, Ignore.new
+        register :col,      Ignore.new
       end
     end
-
-    register :colgroup, Ignore.new
-    register :col,      Ignore.new
   end
 end

data/lib/coradoc/input/html/converters/img.rb

@@ -4,102 +4,107 @@ require "tempfile"
 require "base64"
 require "marcel"
 
-module Coradoc::Input::HTML
-  module Converters
-    class Img < Base
-      def image_number
-        sprintf(
-          Coradoc::Input::HTML.config.image_counter_pattern,
-          Coradoc::Input::HTML.config.image_counter,
-        )
-      end
-
-      def image_number_increment
-        Coradoc::Input::HTML.config.image_counter += 1
-      end
-
-      def datauri2file(src)
-        return unless src
-
-        %r{^data:image/(?:[^;]+);base64,(?<imgdata>.+)$} =~ src
-
-        dest_dir = Pathname.new(Coradoc::Input::HTML.config.destination).dirname
-        images_dir = dest_dir.join("images")
-        FileUtils.mkdir_p(images_dir)
-
-        ext, image_src_path, tempfile = determine_image_src_path(src, imgdata)
-        image_dest_path = images_dir + "#{image_number}.#{ext}"
-
-        # puts "image_dest_path: #{image_dest_path.to_s}"
-        # puts "image_src_path: #{image_src_path.to_s}"
-
-        if File.exist?(image_src_path)
-          FileUtils.cp(image_src_path, image_dest_path)
-        else
-          @annotate_missing = image_src_path
-          Kernel.warn "Image #{image_src_path} does not exist"
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Img < Base
+          def image_number
+            sprintf(
+              Coradoc::Input::Html.config.image_counter_pattern,
+              Coradoc::Input::Html.config.image_counter,
+            )
+          end
+
+          def image_number_increment
+            Coradoc::Input::Html.config.image_counter += 1
+          end
+
+          def datauri2file(src)
+            return unless src
+
+            %r{^data:image/(?:[^;]+);base64,(?<imgdata>.+)$} =~ src
+
+            dest_dir = Pathname.new(Coradoc::Input::Html.config.destination).dirname
+            images_dir = dest_dir.join("images")
+            FileUtils.mkdir_p(images_dir)
+
+            ext, image_src_path, tempfile = determine_image_src_path(src,
+                                                                     imgdata)
+            image_dest_path = images_dir + "#{image_number}.#{ext}"
+
+            # puts "image_dest_path: #{image_dest_path.to_s}"
+            # puts "image_src_path: #{image_src_path.to_s}"
+
+            if File.exist?(image_src_path)
+              FileUtils.cp(image_src_path, image_dest_path)
+            else
+              @annotate_missing = image_src_path
+              Kernel.warn "Image #{image_src_path} does not exist"
+            end
+
+            image_number_increment
+
+            image_dest_path.relative_path_from(dest_dir)
+          ensure
+            tempfile&.close!
+          end
+
+          def determine_image_src_path(src, imgdata)
+            return copy_temp_file(imgdata) if imgdata
+
+            ext = File.extname(src).strip.downcase[1..]
+            [ext, Pathname.new(Coradoc::Input::Html.config.sourcedir).join(src)]
+          end
+
+          def copy_temp_file(imgdata)
+            f = Tempfile.open(["radoc", ".jpg"])
+            f.binmode
+            f.write(Base64.strict_decode64(imgdata))
+            f.rewind
+            ext = Marcel::MimeType.for(f).sub(%r{^[^/]+/}, "")
+            ext = "svg" if ext == "svg+xml"
+            [ext, f.path, f]
+          end
+
+          def to_coradoc(node, _state = {})
+            id = node["id"]
+            alt   = node["alt"]
+            src   = node["src"]
+            width = node["width"]
+            height = node["height"]
+
+            width = width.to_i if width&.match?(/\A\d+\z/)
+            height = height.to_i if height&.match?(/\A\d+\z/)
+
+            title = extract_title(node)
+
+            if Coradoc::Input::Html.config.external_images
+              # puts "external image conversion #{id}, #{src}"
+              src = datauri2file(src)
+            end
+
+            attributes = Coradoc::Element::AttributeList.new
+            # attributes.add_named("id", id) if id
+            if alt # && !alt.to_s.empty?
+              attributes.add_positional(alt)
+            elsif width || height
+              attributes.add_positional(nil)
+            end
+            attributes.add_named("title", title) if title && !title.empty?
+            attributes.add_positional(width) if width
+            attributes.add_positional(height) if height
+
+            if src
+              Coradoc::Element::Image::BlockImage.new(title, id, src,
+                                                      attributes: attributes,
+                                                      annotate_missing: @annotate_missing)
+            end
+          end
         end
 
-        image_number_increment
-
-        image_dest_path.relative_path_from(dest_dir)
-      ensure
-        tempfile&.close!
-      end
-
-      def determine_image_src_path(src, imgdata)
-        return copy_temp_file(imgdata) if imgdata
-
-        ext = File.extname(src).strip.downcase[1..-1]
-        [ext, Pathname.new(Coradoc::Input::HTML.config.sourcedir).join(src)]
-      end
-
-      def copy_temp_file(imgdata)
-        f = Tempfile.open(["radoc", ".jpg"])
-        f.binmode
-        f.write(Base64.strict_decode64(imgdata))
-        f.rewind
-        ext = Marcel::MimeType.for(f).sub(%r{^[^/]+/}, "")
-        ext = "svg" if ext == "svg+xml"
-        [ext, f.path, f]
-      end
-
-      def to_coradoc(node, _state = {})
-        id = node["id"]
-        alt   = node["alt"]
-        src   = node["src"]
-        width = node["width"]
-        height = node["height"]
-
-        width = width.to_i if width&.match?(/\A\d+\z/)
-        height = height.to_i if height&.match?(/\A\d+\z/)
-
-        title = extract_title(node)
-
-        if Coradoc::Input::HTML.config.external_images
-          # puts "external image conversion #{id}, #{src}"
-          src = datauri2file(src)
-        end
-
-        attributes = Coradoc::Element::AttributeList.new
-        # attributes.add_named("id", id) if id
-        if alt # && !alt.to_s.empty?
-          attributes.add_positional(alt)
-        elsif width || height
-          attributes.add_positional(nil)
-        end
-        attributes.add_named("title", title) if title && !title.empty?
-        attributes.add_positional(width) if width
-        attributes.add_positional(height) if height
-
-        if src
-          Coradoc::Element::Image::BlockImage.new(title, id, src,
-                                                  attributes: attributes,
-                                                  annotate_missing: @annotate_missing)
-        end
+        register :img, Img
       end
     end
-
-    register :img, Img
   end
 end

data/lib/coradoc/input/html/converters/li.rb

@@ -1,13 +1,17 @@
-module Coradoc::Input::HTML
-  module Converters
-    class Li < Base
-      def to_coradoc(node, state = {})
-        id = node["id"]
-        content = treat_children_coradoc(node, state)
-        Coradoc::Element::ListItem.new(content, id: id)
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Li < Base
+          def to_coradoc(node, state = {})
+            id = node["id"]
+            content = treat_children_coradoc(node, state)
+            Coradoc::Element::ListItem.new(content, id: id)
+          end
+        end
+
+        register :li, Li.new
       end
     end
-
-    register :li, Li.new
   end
 end

data/lib/coradoc/input/html/converters/mark.rb

@@ -1,15 +1,19 @@
-module Coradoc::Input::HTML
-  module Converters
-    class Mark < Markup
-      def coradoc_class
-        Coradoc::Element::Inline::Highlight
-      end
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Mark < Markup
+          def coradoc_class
+            Coradoc::Element::Inline::Highlight
+          end
+
+          def markup_ancestor_tag_names
+            %w[mark]
+          end
+        end
 
-      def markup_ancestor_tag_names
-        %w[mark]
+        register :mark, Mark.new
       end
     end
-
-    register :mark, Mark.new
   end
 end

data/lib/coradoc/input/html/converters/markup.rb

@@ -1,25 +1,29 @@
-module Coradoc::Input::HTML
-  module Converters
-    class Markup < Base
-      def to_coradoc(node, state = {})
-        u_before = unconstrained_before?(node)
-        u_after = unconstrained_after?(node)
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Markup < Base
+          def to_coradoc(node, state = {})
+            u_before = unconstrained_before?(node)
+            u_after = unconstrained_after?(node)
 
-        leading_whitespace, trailing_whitespace =
-          extract_leading_trailing_whitespace(node)
+            leading_whitespace, trailing_whitespace =
+              extract_leading_trailing_whitespace(node)
 
-        content = treat_children_coradoc(node, state)
+            content = treat_children_coradoc(node, state)
 
-        if node_has_ancestor?(node, markup_ancestor_tag_names)
-          content
-        elsif node.children.empty?
-          leading_whitespace.to_s
-        else
-          u = (u_before && leading_whitespace.nil?) ||
-            (u_after && trailing_whitespace.nil?)
+            if node_has_ancestor?(node, markup_ancestor_tag_names)
+              content
+            elsif node.children.empty?
+              leading_whitespace.to_s
+            else
+              u = (u_before && leading_whitespace.nil?) ||
+                (u_after && trailing_whitespace.nil?)
 
-          e = coradoc_class.new(content, unconstrained: u)
-          [leading_whitespace, e, trailing_whitespace]
+              e = coradoc_class.new(content, unconstrained: u)
+              [leading_whitespace, e, trailing_whitespace]
+            end
+          end
         end
       end
     end

data/lib/coradoc/input/html/converters/math.rb

@@ -2,30 +2,37 @@
 # this is cheating: we're injecting MathML into Asciidoctor, but
 # Asciidoctor only understands AsciiMath or LaTeX
 
-require "mathml2asciimath"
+require "plurimath"
 
-module Coradoc::Input::HTML
-  module Converters
-    class Math < Base
-      # FIXIT
-      def to_coradoc(node, state = {})
-        convert(node, state)
-      end
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Math < Base
+          # FIXIT
+          def to_coradoc(node, state = {})
+            convert(node, state)
+          end
+
+          def convert(node, _state = {})
+            stem = node.to_s.tr("\n", " ")
+            if Coradoc::Input::Html.config.mathml2asciimath
+              stem = Plurimath::Math.parse(stem, :mathml).to_asciimath
+            end
 
-      def convert(node, _state = {})
-        stem = node.to_s.gsub(/\n/, " ")
-        stem = MathML2AsciiMath.m2a(stem) if Coradoc::Input::HTML.config.mathml2asciimath
-        unless stem.nil?
-          stem = stem.gsub(/\[/, "\\[").gsub(/\]/, "\\]").gsub(
-            /\(\(([^\)]+)\)\)/, "(\\1)"
-          )
+            unless stem.nil?
+              stem = stem.gsub(/\[/, "\\[").gsub(/\]/, "\\]").gsub(
+                /\(\(([^\)]+)\)\)/, "(\\1)"
+              )
+            end
+
+            # TODO: This is to be done in Coradoc
+            " stem:[" << stem << "] "
+          end
         end
 
-        # TODO: This is to be done in Coradoc
-        " stem:[" << stem << "] "
+        register :math, Math.new
       end
     end
-
-    register :math, Math.new
   end
 end