coradoc-html 1.1.7 → 1.1.13

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

@@ -5,20 +5,22 @@ module Coradoc
     module Html
       module Converters
         class Blockquote < Base
+          INSTANCE = new
+
           def to_coradoc(node, state = {})
             id = node['id']
             cite = node['cite']
             content = treat_children_coradoc(node, state)
 
             Coradoc::CoreModel::QuoteBlock.new(
-              content: content,
+              children: content,
               id: id,
               attribution: cite
             )
           end
         end
 
-        register :blockquote, Blockquote.new
+        register :blockquote, Blockquote::INSTANCE
       end
     end
   end

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

@@ -5,14 +5,14 @@ module Coradoc
     module Html
       module Converters
         class Br < Base
+          INSTANCE = new
+
           def to_coradoc(_node, _state = {})
-            Coradoc::CoreModel::InlineElement.new(
-              format_type: 'line_break'
-            )
+            Coradoc::CoreModel::LineBreakElement.new
           end
         end
 
-        register :br, Br.new
+        register :br, Br::INSTANCE
       end
     end
   end

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

@@ -5,78 +5,79 @@ module Coradoc
     module Html
       module Converters
         class Bypass < Base
+          INSTANCE = new
+
           def to_coradoc(node, state = {})
             treat_children_coradoc(node, state)
           end
         end
 
-        register :document, Bypass.new
-        register :html,     Bypass.new
-        register :body,     Bypass.new
-        register :span,     Bypass.new
-        register :thead,    Bypass.new
-        register :tbody,    Bypass.new
-        register :tfoot,    Bypass.new
-        register :abbr, Bypass.new
-        register :acronym,    Bypass.new
-        register :address,    Bypass.new
-        register :applet, Bypass.new
-        register :map, Bypass.new
-        register :area, Bypass.new
-        register :bdi,    Bypass.new
-        register :bdo,    Bypass.new
-        register :big,    Bypass.new
-        register :button,    Bypass.new
-        register :canvas,    Bypass.new
-        register :data, Bypass.new
-        register :datalist, Bypass.new
-        register :del,    Bypass.new
-        register :ins,    Bypass.new
-        register :dfn,    Bypass.new
-        register :dialog, Bypass.new
-        register :embed, Bypass.new
-        register :fieldset, Bypass.new
-        register :font, Bypass.new
-        register :footer, Bypass.new
-        register :form, Bypass.new
-        register :frame, Bypass.new
-        register :frameset, Bypass.new
-        register :header,    Bypass.new
-        register :iframe,    Bypass.new
-        register :input,    Bypass.new
-        register :label,    Bypass.new
-        register :legend, Bypass.new
-        register :main,    Bypass.new
-        register :menu,    Bypass.new
-        register :menulist, Bypass.new
-        register :meter, Bypass.new
-        register :nav, Bypass.new
-        register :noframes,    Bypass.new
-        register :noscript,    Bypass.new
-        register :object, Bypass.new
-        register :optgroup, Bypass.new
-        register :option,    Bypass.new
-        register :output,    Bypass.new
-        register :param, Bypass.new
-        register :picture, Bypass.new
-        register :progress, Bypass.new
-        register :ruby, Bypass.new
-        register :rt,    Bypass.new
-        register :rp,    Bypass.new
-        register :s, Bypass.new
-        register :select, Bypass.new
-        register :small, Bypass.new
-        register :span, Bypass.new
-        register :strike, Bypass.new
-        register :details,    Bypass.new
-        register :section,    Bypass.new
-        register :summary,    Bypass.new
-        register :svg, Bypass.new
-        register :template,    Bypass.new
-        register :textarea,    Bypass.new
-        register :track, Bypass.new
-        register :u, Bypass.new
-        register :wbr, Bypass.new
+        register :document, Bypass::INSTANCE
+        register :html,     Bypass::INSTANCE
+        register :body,     Bypass::INSTANCE
+        register :span,     Bypass::INSTANCE
+        register :thead,    Bypass::INSTANCE
+        register :tbody,    Bypass::INSTANCE
+        register :tfoot,    Bypass::INSTANCE
+        register :abbr,     Bypass::INSTANCE
+        register :acronym,  Bypass::INSTANCE
+        register :address,  Bypass::INSTANCE
+        register :applet,   Bypass::INSTANCE
+        register :map,      Bypass::INSTANCE
+        register :area,     Bypass::INSTANCE
+        register :bdi,      Bypass::INSTANCE
+        register :bdo,      Bypass::INSTANCE
+        register :big,      Bypass::INSTANCE
+        register :button,   Bypass::INSTANCE
+        register :canvas,   Bypass::INSTANCE
+        register :data,     Bypass::INSTANCE
+        register :datalist, Bypass::INSTANCE
+        register :del,      Bypass::INSTANCE
+        register :ins,      Bypass::INSTANCE
+        register :dfn,      Bypass::INSTANCE
+        register :dialog,   Bypass::INSTANCE
+        register :embed,    Bypass::INSTANCE
+        register :fieldset, Bypass::INSTANCE
+        register :font,     Bypass::INSTANCE
+        register :footer,   Bypass::INSTANCE
+        register :form,     Bypass::INSTANCE
+        register :frame,    Bypass::INSTANCE
+        register :frameset, Bypass::INSTANCE
+        register :header,   Bypass::INSTANCE
+        register :iframe,   Bypass::INSTANCE
+        register :input,    Bypass::INSTANCE
+        register :label,    Bypass::INSTANCE
+        register :legend,   Bypass::INSTANCE
+        register :main,     Bypass::INSTANCE
+        register :menu,     Bypass::INSTANCE
+        register :menulist, Bypass::INSTANCE
+        register :meter,    Bypass::INSTANCE
+        register :nav,      Bypass::INSTANCE
+        register :noframes, Bypass::INSTANCE
+        register :noscript, Bypass::INSTANCE
+        register :object,   Bypass::INSTANCE
+        register :optgroup, Bypass::INSTANCE
+        register :option,   Bypass::INSTANCE
+        register :output,   Bypass::INSTANCE
+        register :param,    Bypass::INSTANCE
+        register :picture,  Bypass::INSTANCE
+        register :progress, Bypass::INSTANCE
+        register :ruby,     Bypass::INSTANCE
+        register :rt,       Bypass::INSTANCE
+        register :rp,       Bypass::INSTANCE
+        register :s,        Bypass::INSTANCE
+        register :select,   Bypass::INSTANCE
+        register :small,    Bypass::INSTANCE
+        register :strike,   Bypass::INSTANCE
+        register :details,  Bypass::INSTANCE
+        register :section,  Bypass::INSTANCE
+        register :summary,  Bypass::INSTANCE
+        register :svg,      Bypass::INSTANCE
+        register :template, Bypass::INSTANCE
+        register :textarea, Bypass::INSTANCE
+        register :track,    Bypass::INSTANCE
+        register :u,        Bypass::INSTANCE
+        register :wbr,      Bypass::INSTANCE
       end
     end
   end

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

@@ -5,6 +5,8 @@ module Coradoc
     module Html
       module Converters
         class Code < Markup
+          INSTANCE = new
+
           def coradoc_format_type
             'monospace'
           end
@@ -14,11 +16,11 @@ module Coradoc
           end
         end
 
-        register :code, Code.new
-        register :tt, Code.new
-        register :kbd, Code.new
-        register :samp, Code.new
-        register :var, Code.new
+        register :code, Code::INSTANCE
+        register :tt,   Code::INSTANCE
+        register :kbd,  Code::INSTANCE
+        register :samp, Code::INSTANCE
+        register :var,  Code::INSTANCE
       end
     end
   end

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

@@ -5,20 +5,20 @@ module Coradoc
     module Html
       module Converters
         class Div < Base
+          INSTANCE = new
+
           def to_coradoc(node, state = {})
             id = node['id']
             contents = treat_children_coradoc(node, state)
 
             Coradoc::CoreModel::OpenBlock.new(
-              content: contents,
+              children: contents,
               id: id
             )
           end
         end
 
-        register :div,     Div.new
-        register :article, Div.new
-        register :center,  Div.new
+        register :div, Div::INSTANCE
       end
     end
   end

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

@@ -5,6 +5,8 @@ module Coradoc
     module Html
       module Converters
         class Dl < Base
+          INSTANCE = new
+
           def to_coradoc(node, state = {})
             items = process_dl(node, state)
 
@@ -63,7 +65,6 @@ module Coradoc
           def process_dt_or_dd(groups, current, seen_dd, subnode, state = {})
             if subnode.name == 'dt'
               if seen_dd
-                # groups << current
                 current = { name: [], value: [] }
                 seen_dd = false
               end
@@ -74,32 +75,9 @@ module Coradoc
             end
             [groups, current, seen_dd]
           end
-
-          # Extract text from content array
-          def extract_text_from_content(content)
-            return content if content.is_a?(String)
-            return '' if content.nil?
-
-            content.map do |item|
-              case item
-              when String
-                item
-              when Coradoc::CoreModel::InlineElement
-                item.content.to_s
-              when Coradoc::CoreModel::Base
-                if item.content
-                  item.content.to_s
-                else
-                  ''
-                end
-              else
-                item.to_s
-              end
-            end.join
-          end
         end
 
-        register :dl, Dl.new
+        register :dl, Dl::INSTANCE
       end
     end
   end

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

@@ -4,24 +4,24 @@ module Coradoc
   module Input
     module Html
       module Converters
-        class Drop < Base
-          def to_coradoc(node, state = {})
-            convert(node, state)
-          end
+        class Skip < Base
+          INSTANCE = new
 
-          def convert(_node, _state = {})
+          def to_coradoc(_node, _state = {})
             ''
           end
         end
 
-        register :caption, Drop.new
-        register :figcaption, Drop.new
-        register :title, Drop.new
-        register :link, Drop.new
-        register :style, Drop.new
-        register :meta, Drop.new
-        register :script, Drop.new
-        register :comment, Drop.new
+        register :caption, Skip::INSTANCE
+        register :figcaption, Skip::INSTANCE
+        register :title,     Skip::INSTANCE
+        register :link,      Skip::INSTANCE
+        register :style,     Skip::INSTANCE
+        register :meta,      Skip::INSTANCE
+        register :script,    Skip::INSTANCE
+        register :comment,   Skip::INSTANCE
+        register :colgroup,  Skip::INSTANCE
+        register :col,       Skip::INSTANCE
       end
     end
   end

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

@@ -5,6 +5,8 @@ module Coradoc
     module Html
       module Converters
         class Em < Markup
+          INSTANCE = new
+
           def coradoc_format_type
             'italic'
           end
@@ -14,9 +16,9 @@ module Coradoc
           end
         end
 
-        register :em, Em.new
-        register :i,  Em.new
-        register :cite, Em.new
+        register :em,   Em::INSTANCE
+        register :i,    Em::INSTANCE
+        register :cite, Em::INSTANCE
       end
     end
   end

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

@@ -5,6 +5,8 @@ module Coradoc
     module Html
       module Converters
         class Figure < Base
+          INSTANCE = new
+
           def to_coradoc(node, state = {})
             id = node['id']
             title_content = extract_title(node)
@@ -24,34 +26,9 @@ module Coradoc
 
             treat_children_coradoc(title, {})
           end
-
-          # Extract text from content array
-          def extract_text_from_content(content)
-            return content if content.is_a?(String)
-            return '' if content.nil?
-
-            content.map do |item|
-              case item
-              when String
-                item
-              when Coradoc::CoreModel::InlineElement
-                item.content.to_s
-              when Coradoc::CoreModel::Base
-                if item.content
-                  item.content.to_s
-                elsif item.title
-                  item.title.to_s
-                else
-                  ''
-                end
-              else
-                item.to_s
-              end
-            end.join
-          end
         end
 
-        register :figure, Figure.new
+        register :figure, Figure::INSTANCE
       end
     end
   end

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

@@ -5,22 +5,21 @@ module Coradoc
     module Html
       module Converters
         class H < Base
+          INSTANCE = new
+
           def to_coradoc(node, state = {})
             id = node['id']
             internal_anchor = treat_children_anchors(node, state)
 
-            # Check if it has id attribute
             if id.to_s.empty? && internal_anchor.size.positive?
               first_model = internal_anchor.first
-              # InlineElement (anchor) has a target attribute
               id = first_model.target if first_model.is_a?(Coradoc::CoreModel::InlineElement) && first_model.target
             end
 
             level_int = node.name[/\d/].to_i
             content = treat_children_no_anchors(node, state)
 
-            Coradoc::CoreModel::StructuralElement.new(
-              element_type: 'section',
+            Coradoc::CoreModel::SectionElement.new(
               title: extract_title_text(content),
               level: level_int,
               id: id,
@@ -47,7 +46,6 @@ module Coradoc
           def extract_title_text(content)
             return '' if content.nil? || content.empty?
 
-            # Extract text from content
             if content.is_a?(Array)
               content.map do |c|
                 if c.is_a?(Coradoc::CoreModel::InlineElement)
@@ -64,12 +62,12 @@ module Coradoc
           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
+        register :h1, H::INSTANCE
+        register :h2, H::INSTANCE
+        register :h3, H::INSTANCE
+        register :h4, H::INSTANCE
+        register :h5, H::INSTANCE
+        register :h6, H::INSTANCE
       end
     end
   end

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

@@ -5,11 +5,12 @@ module Coradoc
     module Html
       module Converters
         class Head < Base
+          INSTANCE = new
+
           def to_coradoc(node, _state = {})
             title = extract_title(node)
-            # Use StructuralElement with element_type "document" for document header
-            Coradoc::CoreModel::StructuralElement.new(
-              element_type: 'document',
+            # Use DocumentElement for document header
+            Coradoc::CoreModel::DocumentElement.new(
               title: title,
               level: 0
             )
@@ -23,7 +24,7 @@ module Coradoc
           end
         end
 
-        register :head, Head.new
+        register :head, Head::INSTANCE
       end
     end
   end

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

@@ -5,15 +5,14 @@ module Coradoc
     module Html
       module Converters
         class Hr < Base
+          INSTANCE = new
+
           def to_coradoc(_node, _state = {})
-            Coradoc::CoreModel::Block.new(
-              element_type: 'thematic_break',
-              block_semantic_type: :horizontal_rule
-            )
+            Coradoc::CoreModel::HorizontalRuleBlock.new
           end
         end
 
-        register :hr, Hr.new
+        register :hr, Hr::INSTANCE
       end
     end
   end

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

@@ -11,6 +11,8 @@ module Coradoc
     module Html
       module Converters
         class Img < Base
+          INSTANCE = new
+
           def image_number
             format(
               Coradoc::Html::Input.config.image_counter_pattern,
@@ -37,13 +39,9 @@ module Coradoc
             )
             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
 
@@ -84,10 +82,7 @@ module Coradoc
 
             title = extract_title(node)
 
-            if Coradoc::Html::Input.config.external_images
-              # puts "external image conversion #{id}, #{src}"
-              src = datauri2file(src)
-            end
+            src = datauri2file(src) if Coradoc::Html::Input.config.external_images
 
             # Use CoreModel::Image
             return unless src
@@ -103,7 +98,7 @@ module Coradoc
           end
         end
 
-        register :img, Img
+        register :img, Img::INSTANCE
       end
     end
   end

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

@@ -5,6 +5,8 @@ module Coradoc
     module Html
       module Converters
         class Li < Base
+          INSTANCE = new
+
           def to_coradoc(node, state = {})
             id = node['id']
 
@@ -28,7 +30,7 @@ module Coradoc
           end
         end
 
-        register :li, Li.new
+        register :li, Li::INSTANCE
       end
     end
   end

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

@@ -5,6 +5,8 @@ module Coradoc
     module Html
       module Converters
         class Mark < Markup
+          INSTANCE = new
+
           def coradoc_format_type
             'highlight'
           end
@@ -14,7 +16,7 @@ module Coradoc
           end
         end
 
-        register :mark, Mark.new
+        register :mark, Mark::INSTANCE
       end
     end
   end

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

@@ -14,14 +14,12 @@ module Coradoc
 
             # Wrap whitespace in InlineElement so it can be processed
             leading_whitespace = if leading_ws
-                                   Coradoc::CoreModel::InlineElement.new(
-                                     format_type: 'text',
+                                   Coradoc::CoreModel::TextElement.new(
                                      content: leading_ws
                                    )
                                  end
             trailing_whitespace = if trailing_ws
-                                    Coradoc::CoreModel::InlineElement.new(
-                                      format_type: 'text',
+                                    Coradoc::CoreModel::TextElement.new(
                                       content: trailing_ws
                                     )
                                   end
@@ -33,8 +31,7 @@ module Coradoc
             elsif node.children.empty?
               # Return InlineElement wrapper for whitespace
               if leading_ws
-                Coradoc::CoreModel::InlineElement.new(
-                  format_type: 'text',
+                Coradoc::CoreModel::TextElement.new(
                   content: leading_ws
                 )
               end
@@ -46,8 +43,7 @@ module Coradoc
               text_content, nested = extract_text_and_elements(content)
 
               # Create CoreModel::InlineElement with the appropriate format type
-              inline_element = Coradoc::CoreModel::InlineElement.new(
-                format_type: coradoc_format_type,
+              inline_element = Coradoc::CoreModel::InlineElement.format_type_class(coradoc_format_type).new(
                 content: text_content,
                 nested_elements: nested.empty? ? nil : nested,
                 metadata: { unconstrained: u }

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

@@ -1,20 +1,13 @@
 # frozen_string_literal: true
 
-# Unless run with Coradoc::Input::HTML.config.mathml2asciimath,
-# this is cheating: we're injecting MathML into Asciidoctor, but
-# Asciidoctor only understands AsciiMath or LaTeX
-
 module Coradoc
   module Input
     module Html
       module Converters
         class Math < Base
-          # FIXIT
-          def to_coradoc(node, state = {})
-            convert(node, state)
-          end
+          INSTANCE = new
 
-          def convert(node, _state = {})
+          def to_coradoc(node, _state = {})
             stem = node.to_s.tr("\n", ' ')
             if Coradoc::Html::Input.config.mathml2asciimath
               require 'plurimath'
@@ -24,7 +17,6 @@ module Coradoc
             unless stem.nil?
               stem = stem.gsub('[', '\\[')
               stem = stem.gsub(']', '\\]')
-              # Handle ((...)) patterns - iterate to avoid polynomial regex
               loop do
                 new_stem = stem.gsub(/\(\(([^)]{1,100})\)\)/, '(\\1)')
                 break if new_stem == stem
@@ -33,13 +25,14 @@ module Coradoc
               end
             end
 
-            # NOTE: MathML/LaTeX conversion to AsciiDoc stem format
-            # This converts HTML math elements to AsciiDoc's stem:[] macro format
-            ' stem:[' << stem << '] '
+            Coradoc::CoreModel::StemElement.new(
+              content: stem,
+              stem_type: 'mathml'
+            )
           end
         end
 
-        register :math, Math.new
+        register :math, Math::INSTANCE
       end
     end
   end