coradoc 2.0.5 → 2.0.6

data/lib/coradoc/core_model/builder/block_builder.rb

@@ -16,7 +16,7 @@ module Coradoc
           AnnotationBlock.new(
             annotation_type: annotation_type,
             annotation_label: extract_annotation_label(ast),
-            delimiter_type: ast[:delimiter]&.to_s,
+            block_semantic_type: :annotation,
             delimiter_length: ast[:delimiter]&.to_s&.length || 4,
             content: extract_block_content(ast),
             lines: extract_block_lines(ast),
@@ -28,8 +28,10 @@ module Coradoc
 
         # Build generic block
         def build_generic_block(ast)
+          semantic_type = delimiter_to_semantic_type(ast[:delimiter]&.to_s)
+
           Block.new(
-            delimiter_type: ast[:delimiter]&.to_s,
+            block_semantic_type: semantic_type,
             delimiter_length: ast[:delimiter]&.to_s&.length || 4,
             content: extract_block_content(ast),
             lines: extract_block_lines(ast),
@@ -39,6 +41,22 @@ module Coradoc
           )
         end
 
+        # Map delimiter character to semantic type
+        def delimiter_to_semantic_type(delimiter)
+          return nil unless delimiter && !delimiter.empty?
+
+          char = delimiter[0]
+          case char
+          when '-' then :source_code
+          when '=' then :example
+          when '_' then :quote
+          when '*' then :sidebar
+          when '.' then :literal
+          when '+' then :pass
+          else nil
+          end
+        end
+
         # Extract block content from various AST formats
         def extract_block_content(ast)
           return ast[:content] if ast[:content]

data/lib/coradoc/core_model/builder/detection.rb

@@ -38,9 +38,6 @@ module Coradoc
         def detect_block_type(ast)
           return :annotation if extract_annotation_type(ast)
 
-          delimiter = ast[:delimiter]&.to_s
-          return :annotation if delimiter && annotation_delimiters.include?(delimiter[0])
-
           return :list if ast[:marker] && list_markers.include?(ast[:marker].to_s)
 
           :generic
@@ -172,11 +169,6 @@ module Coradoc
           %w[note warning caution important tip reviewer sidebar]
         end
 
-        # List of annotation delimiters (first character)
-        def annotation_delimiters
-          %w[* / =]
-        end
-
         # List of list markers
         def list_markers
           %w[* - . :: numbered]

data/lib/coradoc/core_model/builder.rb

@@ -2,13 +2,6 @@
 
 require 'logger'
 
-# Load builder modules
-require_relative 'builder/detection'
-require_relative 'builder/list_builder'
-require_relative 'builder/block_builder'
-require_relative 'builder/text_builder'
-require_relative 'builder/element_builder'
-
 module Coradoc
   module CoreModel
     # Builds CoreModel objects from generic AST
@@ -45,6 +38,12 @@ module Coradoc
     #   }
     #   block = CoreModel::Builder.new.build_block(block_ast)
     class Builder
+      autoload :Detection, "#{__dir__}/builder/detection"
+      autoload :ListBuilder, "#{__dir__}/builder/list_builder"
+      autoload :BlockBuilder, "#{__dir__}/builder/block_builder"
+      autoload :TextBuilder, "#{__dir__}/builder/text_builder"
+      autoload :ElementBuilder, "#{__dir__}/builder/element_builder"
+
       include Detection
       include ListBuilder
       include BlockBuilder

data/lib/coradoc/core_model/example_block.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Example block — a delimited block for examples
+    class ExampleBlock < Block
+      def self.semantic_type = :example
+
+      attribute :block_semantic_type, :string, default: -> { 'example' }
+    end
+  end
+end

data/lib/coradoc/core_model/listing_block.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Listing block — a delimited block for listing/content without source language
+    #
+    # Distinct from SourceBlock: a listing has no language annotation.
+    # When a language is present, SourceBlock should be used instead.
+    class ListingBlock < Block
+      def self.semantic_type = :listing
+
+      attribute :block_semantic_type, :string, default: -> { 'listing' }
+    end
+  end
+end

data/lib/coradoc/core_model/literal_block.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Literal block — a delimited block for preformatted literal text
+    class LiteralBlock < Block
+      def self.semantic_type = :literal
+
+      attribute :block_semantic_type, :string, default: -> { 'literal' }
+    end
+  end
+end

data/lib/coradoc/core_model/open_block.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Open block — a generic container block with no special rendering
+    class OpenBlock < Block
+      def self.semantic_type = :open
+
+      attribute :block_semantic_type, :string, default: -> { 'open' }
+    end
+  end
+end

data/lib/coradoc/core_model/pass_block.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Pass-through block — raw content passed through without processing
+    class PassBlock < Block
+      def self.semantic_type = :pass
+
+      attribute :block_semantic_type, :string, default: -> { 'pass' }
+    end
+  end
+end

data/lib/coradoc/core_model/quote_block.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Quote block — a delimited block for quotations
+    class QuoteBlock < Block
+      def self.semantic_type = :quote
+
+      attribute :block_semantic_type, :string, default: -> { 'quote' }
+
+      attribute :attribution, :string
+    end
+  end
+end

data/lib/coradoc/core_model/reviewer_block.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Reviewer comment block — a block for reviewer annotations
+    class ReviewerBlock < AnnotationBlock
+      def self.semantic_type = :reviewer
+
+      attribute :block_semantic_type, :string, default: -> { 'reviewer' }
+    end
+  end
+end

data/lib/coradoc/core_model/sidebar_block.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Sidebar block — a delimited block for sidebars
+    class SidebarBlock < Block
+      def self.semantic_type = :sidebar
+
+      attribute :block_semantic_type, :string, default: -> { 'sidebar' }
+    end
+  end
+end

data/lib/coradoc/core_model/source_block.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Specialized block for source code listings
+    #
+    # Represents a source code block with optional language annotation.
+    # This is a first-class model type rather than a generic Block with
+    # a delimiter_type tag.
+    #
+    # @example Creating a source code block
+    #   block = CoreModel::SourceBlock.new(
+    #     content: "puts 'Hello, World!'",
+    #     language: "ruby"
+    #   )
+    class SourceBlock < Block
+      def self.semantic_type = :source_code
+
+      attribute :block_semantic_type, :string, default: -> { 'source_code' }
+    end
+  end
+end

data/lib/coradoc/core_model/verse_block.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module CoreModel
+    # Verse block — a block for verse/poetry with optional attribution
+    class VerseBlock < Block
+      def self.semantic_type = :verse
+
+      attribute :block_semantic_type, :string, default: -> { 'verse' }
+
+      attribute :attribution, :string
+    end
+  end
+end

data/lib/coradoc/core_model.rb

@@ -42,5 +42,15 @@ module Coradoc
     autoload :TocGenerator, "#{__dir__}/core_model/toc_generator"
     autoload :Bibliography, "#{__dir__}/core_model/bibliography"
     autoload :BibliographyEntry, "#{__dir__}/core_model/bibliography_entry"
+    autoload :SourceBlock, "#{__dir__}/core_model/source_block"
+    autoload :ExampleBlock, "#{__dir__}/core_model/example_block"
+    autoload :QuoteBlock, "#{__dir__}/core_model/quote_block"
+    autoload :SidebarBlock, "#{__dir__}/core_model/sidebar_block"
+    autoload :LiteralBlock, "#{__dir__}/core_model/literal_block"
+    autoload :PassBlock, "#{__dir__}/core_model/pass_block"
+    autoload :ListingBlock, "#{__dir__}/core_model/listing_block"
+    autoload :OpenBlock, "#{__dir__}/core_model/open_block"
+    autoload :VerseBlock, "#{__dir__}/core_model/verse_block"
+    autoload :ReviewerBlock, "#{__dir__}/core_model/reviewer_block"
   end
 end

data/lib/coradoc/processor_registry.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'registry'
-
 module Coradoc
   # Module adapter that gives a module Registry-backed processor methods.
   #

data/lib/coradoc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coradoc
-  VERSION = '2.0.5'
+  VERSION = '2.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Ribose Inc.
@@ -521,6 +521,7 @@ files:
 - coradoc-html/lib/coradoc/html/templates/core_model/bibliography.liquid
 - coradoc-html/lib/coradoc/html/templates/core_model/bibliography_entry.liquid
 - coradoc-html/lib/coradoc/html/templates/core_model/block.liquid
+- coradoc-html/lib/coradoc/html/templates/core_model/definition_list.liquid
 - coradoc-html/lib/coradoc/html/templates/core_model/image.liquid
 - coradoc-html/lib/coradoc/html/templates/core_model/inline_element.liquid
 - coradoc-html/lib/coradoc/html/templates/core_model/list_block.liquid
@@ -572,39 +573,6 @@ files:
 - coradoc-markdown/LICENSE.txt
 - coradoc-markdown/Rakefile
 - coradoc-markdown/coradoc-markdown.gemspec
-- coradoc-markdown/coverage/.last_run.json
-- coradoc-markdown/coverage/.resultset.json
-- coradoc-markdown/coverage/.resultset.json.lock
-- coradoc-markdown/coverage/assets/0.13.2/DataTables-1.10.20/images/sort_asc.png
-- coradoc-markdown/coverage/assets/0.13.2/DataTables-1.10.20/images/sort_asc_disabled.png
-- coradoc-markdown/coverage/assets/0.13.2/DataTables-1.10.20/images/sort_both.png
-- coradoc-markdown/coverage/assets/0.13.2/DataTables-1.10.20/images/sort_desc.png
-- coradoc-markdown/coverage/assets/0.13.2/DataTables-1.10.20/images/sort_desc_disabled.png
-- coradoc-markdown/coverage/assets/0.13.2/application.css
-- coradoc-markdown/coverage/assets/0.13.2/application.js
-- coradoc-markdown/coverage/assets/0.13.2/colorbox/border.png
-- coradoc-markdown/coverage/assets/0.13.2/colorbox/controls.png
-- coradoc-markdown/coverage/assets/0.13.2/colorbox/loading.gif
-- coradoc-markdown/coverage/assets/0.13.2/colorbox/loading_background.png
-- coradoc-markdown/coverage/assets/0.13.2/favicon_green.png
-- coradoc-markdown/coverage/assets/0.13.2/favicon_red.png
-- coradoc-markdown/coverage/assets/0.13.2/favicon_yellow.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-bg_flat_0_aaaaaa_40x100.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-bg_flat_75_ffffff_40x100.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-bg_glass_55_fbf9ee_1x400.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-bg_glass_65_ffffff_1x400.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-bg_glass_75_dadada_1x400.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-bg_glass_75_e6e6e6_1x400.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-bg_glass_95_fef1ec_1x400.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-icons_222222_256x240.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-icons_2e83ff_256x240.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-icons_454545_256x240.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-icons_888888_256x240.png
-- coradoc-markdown/coverage/assets/0.13.2/images/ui-icons_cd0a0a_256x240.png
-- coradoc-markdown/coverage/assets/0.13.2/loading.gif
-- coradoc-markdown/coverage/assets/0.13.2/magnify.png
-- coradoc-markdown/coverage/index.html
 - coradoc-markdown/lib/coradoc/markdown.rb
 - coradoc-markdown/lib/coradoc/markdown/errors.rb
 - coradoc-markdown/lib/coradoc/markdown/model/abbreviation.rb
@@ -1250,17 +1218,27 @@ files:
 - lib/coradoc/core_model/definition_item.rb
 - lib/coradoc/core_model/definition_list.rb
 - lib/coradoc/core_model/element_attribute.rb
+- lib/coradoc/core_model/example_block.rb
 - lib/coradoc/core_model/footnote.rb
 - lib/coradoc/core_model/image.rb
 - lib/coradoc/core_model/inline_element.rb
 - lib/coradoc/core_model/list_block.rb
 - lib/coradoc/core_model/list_item.rb
+- lib/coradoc/core_model/listing_block.rb
+- lib/coradoc/core_model/literal_block.rb
 - lib/coradoc/core_model/metadata.rb
+- lib/coradoc/core_model/open_block.rb
+- lib/coradoc/core_model/pass_block.rb
+- lib/coradoc/core_model/quote_block.rb
+- lib/coradoc/core_model/reviewer_block.rb
+- lib/coradoc/core_model/sidebar_block.rb
+- lib/coradoc/core_model/source_block.rb
 - lib/coradoc/core_model/structural_element.rb
 - lib/coradoc/core_model/table.rb
 - lib/coradoc/core_model/term.rb
 - lib/coradoc/core_model/toc.rb
 - lib/coradoc/core_model/toc_generator.rb
+- lib/coradoc/core_model/verse_block.rb
 - lib/coradoc/document_builder.rb
 - lib/coradoc/document_manipulator.rb
 - lib/coradoc/errors.rb

data/coradoc-markdown/coverage/.last_run.json

@@ -1,5 +0,0 @@
-{
-  "result": {
-    "line": 83.06
-  }
-}