coradoc 2.0.4 → 2.0.6

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

@@ -10,9 +10,8 @@ module Coradoc
             title_content = extract_title(node)
             content = treat_children_coradoc(node, state)
 
-            # Use CoreModel::Block with delimiter_type "====" for example/figure
-            Coradoc::CoreModel::Block.new(
-              delimiter_type: '====',
+            # Use CoreModel::ExampleBlock for example/figure
+            Coradoc::CoreModel::ExampleBlock.new(
               title: extract_text_from_content(title_content),
               children: content,
               id: id

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

@@ -8,7 +8,7 @@ module Coradoc
           def to_coradoc(_node, _state = {})
             Coradoc::CoreModel::Block.new(
               element_type: 'thematic_break',
-              delimiter_type: "'''"
+              block_semantic_type: :horizontal_rule
             )
           end
         end

data/coradoc-html/lib/coradoc/html/input/converters/p.rb

@@ -13,7 +13,8 @@ module Coradoc
             content = strip_fullwidth_spaces(content)
 
             Coradoc::CoreModel::Block.new(
-              delimiter_type: 'paragraph',
+              block_semantic_type: :paragraph,
+              element_type: 'paragraph',
               children: content,
               id: id
             )

data/coradoc-html/lib/coradoc/html/input/converters/pre.rb

@@ -10,16 +10,20 @@ module Coradoc
             lang = language(node)
             content = extract_text_content(node)
 
-            delimiter_type = lang ? '----' : '....'
-            element_type = lang ? 'source' : 'literal'
-
-            Coradoc::CoreModel::Block.new(
-              element_type: element_type,
-              delimiter_type: delimiter_type,
-              content: content,
-              id: id,
-              language: lang
-            )
+            if lang
+              Coradoc::CoreModel::SourceBlock.new(
+                element_type: 'source',
+                content: content,
+                id: id,
+                language: lang
+              )
+            else
+              Coradoc::CoreModel::LiteralBlock.new(
+                element_type: 'literal',
+                content: content,
+                id: id
+              )
+            end
           end
 
           private

data/coradoc-html/lib/coradoc/html/input/converters/video.rb

@@ -16,7 +16,7 @@ module Coradoc
             # with element_attributes to store video-specific data
             Coradoc::CoreModel::Block.new(
               element_type: 'video',
-              delimiter_type: 'video',
+              block_semantic_type: :video,
               content: src,
               title: title,
               id: id,

data/coradoc-html/lib/coradoc/html/renderer.rb

@@ -42,13 +42,23 @@ module Coradoc
         'Coradoc::CoreModel::BibliographyEntry' => 'bibliography_entry',
         'Coradoc::CoreModel::StructuralElement' => 'structural_element',
         'Coradoc::CoreModel::Block' => 'block',
+        'Coradoc::CoreModel::SourceBlock' => 'source_block',
+        'Coradoc::CoreModel::ExampleBlock' => 'example_block',
+        'Coradoc::CoreModel::QuoteBlock' => 'quote_block',
+        'Coradoc::CoreModel::SidebarBlock' => 'sidebar_block',
+        'Coradoc::CoreModel::LiteralBlock' => 'literal_block',
+        'Coradoc::CoreModel::PassBlock' => 'pass_block',
+        'Coradoc::CoreModel::ListingBlock' => 'listing_block',
+        'Coradoc::CoreModel::OpenBlock' => 'open_block',
+        'Coradoc::CoreModel::VerseBlock' => 'verse_block',
+        'Coradoc::CoreModel::ReviewerBlock' => 'reviewer_block',
+        'Coradoc::CoreModel::AnnotationBlock' => 'annotation_block',
         'Coradoc::CoreModel::ListBlock' => 'list_block',
         'Coradoc::CoreModel::ListItem' => 'list_item',
         'Coradoc::CoreModel::Table' => 'table',
         'Coradoc::CoreModel::TableRow' => 'table_row',
         'Coradoc::CoreModel::TableCell' => 'table_cell',
         'Coradoc::CoreModel::Image' => 'image',
-        'Coradoc::CoreModel::AnnotationBlock' => 'annotation_block',
         'Coradoc::CoreModel::InlineElement' => 'inline_element',
         'Coradoc::CoreModel::Paragraph' => 'paragraph',
         'Coradoc::CoreModel::Term' => 'term',
@@ -125,6 +135,37 @@ module Coradoc
         end
       end
 
+      # Render a CoreModel element as a complete HTML5 document
+      #
+      # Wraps the fragment output of #render in a proper HTML5 document
+      # with DOCTYPE, charset, and viewport meta tags.
+      #
+      # @param element [Coradoc::CoreModel::Base] The element to render
+      # @param options [Hash] Document-level options
+      # @option options [String] :lang Document language (default: "en")
+      # @option options [String] :title Document title (default: extracted from element)
+      # @return [String] Complete HTML5 document
+      def render_html5(element, options = {})
+        body_html = render(element)
+
+        lang = options[:lang] || 'en'
+        title = options[:title] || extract_title(element) || 'Untitled Document'
+
+        <<~HTML
+          <!DOCTYPE html>
+          <html lang="#{lang}">
+          <head>
+            <meta charset="UTF-8">
+            <meta name="viewport" content="width=device-width, initial-scale=1.0">
+            <title>#{escape_html(title)}</title>
+          </head>
+          <body>
+          #{body_html}
+          </body>
+          </html>
+        HTML
+      end
+
       # Get list of all available template names
       #
       # @return [Array<String>] List of template names (without .liquid extension)
@@ -318,7 +359,7 @@ module Coradoc
         assigns = {}
 
         # Common attributes that most CoreModel types have
-        %w[id title content children element_type language lines
+        %w[id title content children element_type block_semantic_type language lines
            delimiter_type delimiter_length metadata_entries element_attributes
            text href alt src level entries items rows cells
            anchor term definition abbreviations].each do |key|
@@ -353,6 +394,13 @@ module Coradoc
             .gsub(/"/, '&quot;')
             .gsub(/'/, '&#39;')
       end
+
+      def extract_title(element)
+        return nil unless element
+        return element.title if element.is_a?(Coradoc::CoreModel::StructuralElement) && element.title
+
+        nil
+      end
     end
 
     # Backwards compatibility alias

data/coradoc-html/lib/coradoc/html/spa.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'converter_base'
-
 module Coradoc
   module Html
+    autoload :ConverterBase, "#{__dir__}/converter_base"
+
     # SPA (Single Page Application) HTML converter
     #
     # Converts Coradoc::CoreModel::StructuralElement to a modern Vue.js + Tailwind CSS

data/coradoc-html/lib/coradoc/html/static.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'converter_base'
-
 module Coradoc
   module Html
+    autoload :ConverterBase, "#{__dir__}/converter_base"
+
     # Static HTML converter
     #
     # Converts CoreModel documents to static HTML5 output.

data/coradoc-html/lib/coradoc/html/templates/core_model/definition_list.liquid

@@ -0,0 +1,11 @@
+{%- comment -%}
+Definition list template
+{%- endcomment -%}
+<dl id="{{ id }}" class="definition-list">
+  {%- for item in items -%}
+    <dt>{{ item.term }}</dt>
+    {%- for def in item.definitions -%}
+    <dd>{{ def }}</dd>
+    {%- endfor -%}
+  {%- endfor -%}
+</dl>

data/coradoc-html/lib/coradoc/html/theme/modern/javascript_generator.rb

@@ -6,6 +6,8 @@ module Coradoc
       class ModernRenderer
         # Generate Vue.js application code
         module JavascriptGenerator
+          autoload :VueTemplates, "#{__dir__}/vue_template_generator"
+
           class << self
             # Generate Vue application
             #
@@ -17,7 +19,6 @@ module Coradoc
               templates = load_templates
 
               # Get enhanced document template
-              require_relative 'components/ui_components'
               document_template = UIComponents.enhanced_document_template(config)
 
               <<~JS
@@ -293,7 +294,6 @@ module Coradoc
             #
             # @return [Hash] Hash of templates
             def load_templates
-              require_relative 'vue_template_generator'
               {
                 paragraph: VueTemplates.template_for('paragraph'),
                 admonition: VueTemplates.template_for('admonition'),

data/coradoc-html/lib/coradoc/html/theme/modern/serializers/document_serializer.rb

@@ -128,17 +128,13 @@ module Coradoc
               # @param block [Coradoc::CoreModel::Block] Block to serialize
               # @return [Hash] Serialized block
               def serialize_core_model_block(block)
-                block_type = case block.element_type
-                             when 'paragraph' then 'paragraph'
-                             when 'block'
-                               case block.delimiter_type
-                               when '----' then 'source'
-                               when '____' then 'quote'
-                               when '====' then 'example'
-                               else 'block'
-                               end
-                             else
-                               'block'
+                semantic = block.block_semantic_type&.to_sym
+                block_type = case semantic
+                             when :paragraph then 'paragraph'
+                             when :source_code then 'source'
+                             when :quote, :verse then 'quote'
+                             when :example then 'example'
+                             else 'block'
                              end
 
                 {

data/coradoc-html/lib/coradoc/html/theme/modern_renderer.rb

@@ -13,6 +13,12 @@ module Coradoc
       # @example Generate modern HTML output
       #   html = Coradoc::Output::Html.convert_to_html5(document, theme: :modern)
       class ModernRenderer < Base
+        autoload :Serializers, "#{__dir__}/modern/serializers/document_serializer"
+        autoload :JavascriptGenerator, "#{__dir__}/modern/javascript_generator"
+        autoload :TailwindConfigBuilder, "#{__dir__}/modern/tailwind_config_builder"
+        autoload :CSSGenerator, "#{__dir__}/modern/css_generator"
+        autoload :UIComponents, "#{__dir__}/modern/components/ui_components"
+
         # Register this theme
         Registry.register(:modern, self)
 
@@ -111,7 +117,6 @@ module Coradoc
         #
         # @return [Hash] Serialized document data
         def serialize_document
-          require_relative 'modern/serializers/document_serializer'
           Serializers::DocumentSerializer.serialize(@document)
         end
 
@@ -121,7 +126,6 @@ module Coradoc
         # @param config [Hash] Theme configuration
         # @return [String] Vue application JavaScript
         def generate_vue_app(document_data, config)
-          require_relative 'modern/javascript_generator'
           JavascriptGenerator.generate(document_data, config)
         end
 
@@ -130,7 +134,6 @@ module Coradoc
         # @param config [Hash] Theme configuration
         # @return [String] Tailwind configuration script
         def generate_tailwind_config(config)
-          require_relative 'modern/tailwind_config_builder'
           TailwindConfigBuilder.build(config)
         end
 
@@ -139,10 +142,6 @@ module Coradoc
         # @param config [Hash] Theme configuration
         # @return [String] Custom CSS
         def generate_custom_css(config)
-          require_relative 'modern/css_generator'
-          require_relative 'modern/components/ui_components'
-
-          # Use enhanced CSS from UIComponents module
           UIComponents.enhanced_css(config)
         end
 

data/coradoc-html/lib/coradoc/html.rb

@@ -7,21 +7,6 @@ require 'coradoc/html/output'
 
 module Coradoc
   module Html
-    # Register HTML format with coradoc when loaded
-    def self.register_with_coradoc
-      return if @registered
-
-      # Register with the main coradoc registry
-      Coradoc.register_format(:html, self,
-                              aliases: %w[html htm],
-                              extensions: %w[.html .htm])
-
-      @registered = true
-    end
-
-    # Call registration when this module is included/required
-    register_with_coradoc
-
     module Converters
       # Autoload HTML converters - they will be loaded when accessed
       autoload :Base, 'coradoc/html/converters/base'
@@ -263,3 +248,8 @@ module Coradoc
     end
   end
 end
+
+# Register after all module methods are defined
+Coradoc.register_format(:html, Coradoc::Html,
+                        aliases: %w[html htm],
+                        extensions: %w[.html .htm])

data/coradoc-html/spec/input/converters/converters_spec.rb

@@ -123,7 +123,7 @@ RSpec.describe Coradoc::Input::Html::Converters do
         result = converter.to_coradoc(node, {})
 
         expect(result).to be_a(Coradoc::CoreModel::Block)
-        expect(result.delimiter_type).to eq('paragraph')
+        expect(result.block_semantic_type).to eq('paragraph')
       end
 
       it 'preserves id attribute' do
@@ -447,7 +447,7 @@ RSpec.describe Coradoc::Input::Html::Converters do
       result = converter_module.process_coradoc(node, {})
 
       # Extract text content from the block (use children for mixed content)
-      content = result.respond_to?(:children) && result.children.any? ? result.children : result.content
+      content = result.is_a?(Coradoc::CoreModel::Base) && result.children&.any? ? result.children : result.content
       text = extract_text_from_content(content)
       expect(text).to include('Simple text')
     end
@@ -459,7 +459,7 @@ RSpec.describe Coradoc::Input::Html::Converters do
 
       result = converter_module.process_coradoc(node, {})
 
-      content = result.respond_to?(:children) && result.children.any? ? result.children : result.content
+      content = result.is_a?(Coradoc::CoreModel::Base) && result.children&.any? ? result.children : result.content
       text = extract_text_from_content(content)
       expect(text).to include('Before')
       expect(text).to include('Bold')
@@ -477,15 +477,13 @@ RSpec.describe Coradoc::Input::Html::Converters do
       when Coradoc::CoreModel::InlineElement
         # Extract from both content and nested_elements
         text_parts = [extract_text_from_content(c.content)]
-        text_parts << extract_text_from_content(c.nested_elements) if c.respond_to?(:nested_elements) && c.nested_elements
+        text_parts << extract_text_from_content(c.nested_elements) if c.nested_elements
         text_parts.join
       when Coradoc::CoreModel::Base
-        if c.respond_to?(:children) && c.children.is_a?(Array)
+        if c.children.is_a?(Array)
           extract_text_from_content(c.children)
-        elsif c.respond_to?(:content)
-          extract_text_from_content(c.content)
         else
-          ''
+          extract_text_from_content(c.content)
         end
       when Array
         extract_text_from_content(c)

data/coradoc-markdown/lib/coradoc/markdown/model/attribute_list.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-require_relative '../parser_util'
-
 module Coradoc
   module Markdown
     # Represents an Inline Attribute List (IAL) or Attribute List Definition (ALD)

data/coradoc-markdown/lib/coradoc/markdown/model/definition_list.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'definition_term'
-require_relative 'definition_item'
-
 module Coradoc
   module Markdown
     # DefinitionList model representing a Kramdown definition list.

data/coradoc-markdown/lib/coradoc/markdown/model/extension.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module Coradoc
   module Markdown
     # Represents a kramdown extension

data/coradoc-markdown/lib/coradoc/markdown/model/highlight.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base'
 
 module Coradoc
   module Markdown

data/coradoc-markdown/lib/coradoc/markdown/model/math.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base'
 
 module Coradoc
   module Markdown

data/coradoc-markdown/lib/coradoc/markdown/model/strikethrough.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base'
 
 module Coradoc
   module Markdown

data/coradoc-markdown/lib/coradoc/markdown/parser/ast_processor.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative 'inline_parser'
-
 module Coradoc
   module Markdown
     module Parser
+      autoload :InlineParser, "#{__dir__}/inline_parser"
+
       # Post-processes the AST produced by BlockParser.
       #
       # This processor handles:

data/coradoc-markdown/lib/coradoc/markdown/parser/block_parser.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative 'parslet_extras'
-
 module Coradoc
   module Markdown
     module Parser
+      autoload :ParsletExtras, "#{__dir__}/parslet_extras"
+
       class BlockParser < Parslet::Parser
         using ParsletExtras
 

data/coradoc-markdown/lib/coradoc/markdown/parser/inline_parser.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'parslet_extras'
-require_relative 'html_entities'
-
 module Coradoc
   module Markdown
     module Parser
+      autoload :ParsletExtras, "#{__dir__}/parslet_extras"
+      autoload :HtmlEntities, "#{__dir__}/html_entities"
+
       class InlineParser < Parslet::Parser
         using ParsletExtras
 

data/coradoc-markdown/lib/coradoc/markdown/parser.rb

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'block_parser'
-require_relative 'inline_parser'
-require_relative 'ast_processor'
+module Coradoc
+  module Markdown
+    module Parser
+      autoload :BlockParser, "#{__dir__}/block_parser"
+      autoload :InlineParser, "#{__dir__}/inline_parser"
+      autoload :AstProcessor, "#{__dir__}/ast_processor"
+    end
+  end
+end

data/coradoc-markdown/lib/coradoc/markdown/toc_generator.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
-require_relative 'model/base'
-require_relative 'model/heading'
-require_relative 'model/document'
-
 module Coradoc
   module Markdown
+    module Model
+      autoload :Base, "#{__dir__}/model/base"
+      autoload :Heading, "#{__dir__}/model/heading"
+      autoload :Document, "#{__dir__}/model/document"
+    end
+
     # Table of Contents Generator
     #
     # Generates a table of contents from document headings.

data/coradoc-markdown/lib/coradoc/markdown/transform/from_core_model.rb

@@ -127,22 +127,43 @@ module Coradoc
           end
 
           def transform_delimited_block(block)
-            delimiter = block.delimiter_type
+            semantic = resolve_markdown_semantic(block)
 
-            case delimiter
-            when '```', '~'
+            case semantic
+            when :source_code, :listing
               transform_code_block(block)
-            when '>'
+            when :quote, :verse
               transform_blockquote(block)
-            when '---', '***', '___'
+            when :horizontal_rule
               transform_horizontal_rule(block)
-            when '++++'
+            when :pass
               Coradoc::Markdown::Extension.nomarkdown(block.content.to_s)
+            when :literal
+              transform_code_block(block)
             else
               transform_paragraph(block)
             end
           end
 
+          def resolve_markdown_semantic(block)
+            # Polymorphic dispatch: typed classes override semantic_type
+            semantic = block.resolve_semantic_type
+            return semantic if semantic
+
+            # Backward compat: derive from delimiter_type
+            markdown_delimiter_to_semantic(block.delimiter_type)
+          end
+
+          def markdown_delimiter_to_semantic(delimiter)
+            case delimiter
+            when '```', '~' then :source_code
+            when '>' then :quote
+            when '---', '***', '___' then :horizontal_rule
+            when '++++' then :pass
+            else nil
+            end
+          end
+
           def transform_code_block(block)
             Coradoc::Markdown::CodeBlock.new(
               code: block.content.to_s,

data/coradoc-markdown/lib/coradoc/markdown/transform/to_core_model.rb

@@ -103,18 +103,16 @@ module Coradoc
           end
 
           def transform_code_block(block)
-            Coradoc::CoreModel::Block.new(
+            Coradoc::CoreModel::SourceBlock.new(
               element_type: 'block',
-              delimiter_type: '```',
               content: block.code.to_s,
               language: block.language
             )
           end
 
           def transform_blockquote(blockquote)
-            Coradoc::CoreModel::Block.new(
+            Coradoc::CoreModel::QuoteBlock.new(
               element_type: 'block',
-              delimiter_type: '>',
               content: blockquote.content.to_s
             )
           end
@@ -184,7 +182,7 @@ module Coradoc
           def transform_horizontal_rule(_rule)
             Coradoc::CoreModel::Block.new(
               element_type: 'block',
-              delimiter_type: '---'
+              block_semantic_type: :horizontal_rule
             )
           end
 
@@ -228,9 +226,8 @@ module Coradoc
                 content: math.content.to_s
               )
             else
-              Coradoc::CoreModel::Block.new(
+              Coradoc::CoreModel::PassBlock.new(
                 element_type: 'block',
-                delimiter_type: '++++',
                 content: math.content.to_s,
                 language: 'latexmath'
               )
@@ -247,9 +244,8 @@ module Coradoc
                 content: ext.content.to_s
               )
             when :nomarkdown
-              Coradoc::CoreModel::Block.new(
+              Coradoc::CoreModel::PassBlock.new(
                 element_type: 'block',
-                delimiter_type: '++++',
                 content: ext.content.to_s
               )
             else

data/coradoc-markdown/lib/coradoc/markdown/transformer.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 require 'parslet'
-require_relative 'parser_util'
 
 module Coradoc
   module Markdown
+    autoload :ParserUtil, "#{__dir__}/parser_util"
+
     # Transformer converts Parslet AST into Markdown Document Model objects.
     #
     # This transformer takes the raw output from the BlockParser/InlineParser

data/coradoc-markdown/spec/transform/to_core_model_spec.rb

@@ -71,9 +71,8 @@ RSpec.describe Coradoc::Markdown::Transform::ToCoreModel do
         )
       end
 
-      it 'transforms to CoreModel::Block with code delimiter' do
-        expect(transform).to be_a(Coradoc::CoreModel::Block)
-        expect(transform.delimiter_type).to eq('```')
+      it 'transforms to CoreModel::SourceBlock with code content' do
+        expect(transform).to be_a(Coradoc::CoreModel::SourceBlock)
         expect(transform.content).to eq("def hello\n  puts 'world'\nend")
         expect(transform.language).to eq('ruby')
       end
@@ -84,9 +83,8 @@ RSpec.describe Coradoc::Markdown::Transform::ToCoreModel do
         Coradoc::Markdown::Blockquote.new(content: 'Quoted text')
       end
 
-      it 'transforms to CoreModel::Block with blockquote delimiter' do
-        expect(transform).to be_a(Coradoc::CoreModel::Block)
-        expect(transform.delimiter_type).to eq('>')
+      it 'transforms to CoreModel::QuoteBlock with blockquote content' do
+        expect(transform).to be_a(Coradoc::CoreModel::QuoteBlock)
         expect(transform.content).to eq('Quoted text')
       end
     end
@@ -222,9 +220,9 @@ RSpec.describe Coradoc::Markdown::Transform::ToCoreModel do
         Coradoc::Markdown::HorizontalRule.new
       end
 
-      it 'transforms to CoreModel::Block with hr delimiter' do
+      it 'transforms to CoreModel::Block with horizontal rule semantic type' do
         expect(transform).to be_a(Coradoc::CoreModel::Block)
-        expect(transform.delimiter_type).to eq('---')
+        expect(transform.block_semantic_type).to eq('horizontal_rule')
       end
     end