coradoc-html 1.1.13 → 1.1.15

data/lib/coradoc/html/tag_mapping.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module Html
+    module TagMapping
+      ELEMENT_TO_TAG = {
+        # Sections
+        section: 'section',
+        header: 'header',
+
+        # Blocks
+        paragraph: 'p',
+        example: 'div',
+        sidebar: 'aside',
+        quote: 'blockquote',
+        verse: 'div',
+        listing: 'pre',
+        literal: 'pre',
+        source: 'pre',
+        source_code: 'pre',
+        open: 'div',
+        horizontal_rule: 'hr',
+        comment: 'div',
+        pass: 'div',
+        reviewer: 'div',
+
+        # Lists
+        ordered_list: 'ol',
+        unordered_list: 'ul',
+        list_item: 'li',
+        description_list: 'dl',
+        description_term: 'dt',
+        description_detail: 'dd',
+
+        # List marker type aliases (from ListBlock#marker_type)
+        ordered: 'ol',
+        unordered: 'ul',
+        definition: 'dl',
+
+        # Tables
+        table: 'table',
+        table_row: 'tr',
+        table_cell: 'td',
+        table_header: 'th',
+
+        # Inline formatting (symbol keys from TagMapping, string keys from format_type)
+        bold: 'strong',
+        italic: 'em',
+        monospace: 'code',
+        highlight: 'mark',
+        superscript: 'sup',
+        subscript: 'sub',
+        underline: 'u',
+        strikethrough: 'del',
+        small_caps: 'span',
+
+        # Inline format type aliases (from InlineElement#resolve_format_type)
+        link: 'a',
+        xref: 'a',
+        footnote: 'sup',
+        span: 'span',
+        term: 'span',
+        quotation: 'q',
+        small: 'small',
+        stem: 'code',
+        attribute_reference: 'span',
+
+        # Links (semantic names)
+        anchor: 'a',
+        cross_reference: 'a',
+
+        # Media
+        image: 'img',
+        video: 'video',
+        audio: 'audio',
+
+        # Other
+        break: 'hr',
+        line_break: 'br',
+        admonition: 'div'
+      }.freeze
+
+      ELEMENT_CSS_CLASS = {
+        example: 'example',
+        sidebar: 'sidebar',
+        literal: 'literal'
+      }.freeze
+
+      def self.tag_for(element_type)
+        return 'div' if element_type.nil?
+
+        key = element_type.is_a?(Symbol) ? element_type : element_type.to_sym
+        ELEMENT_TO_TAG[key] || 'div'
+      end
+
+      def self.css_class_for(element_type)
+        return nil if element_type.nil?
+
+        key = element_type.is_a?(Symbol) ? element_type : element_type.to_sym
+        ELEMENT_CSS_CLASS[key]
+      end
+    end
+  end
+end

data/lib/coradoc/html/toc_builder.rb

@@ -19,11 +19,12 @@ module Coradoc
       #
       # @param options [Hash] options with :section_number_levels, :toc_levels, :section_numbers
       # @return [TocBuilder]
-      def self.from_options(options)
-        section_number_levels = options[:section_number_levels] || 3
-        toc_levels = options[:toc_levels] || 2
+      def self.from_options(opts)
+        opts = RenderOptions.new(**opts) unless opts.is_a?(RenderOptions)
+        section_number_levels = opts.section_number_levels || 3
+        toc_levels = opts.toc_levels || 2
         max_level = [toc_levels, section_number_levels].min
-        new(max_level: max_level, numbered: options[:section_numbers] == true, section_number_levels: section_number_levels)
+        new(max_level: max_level, numbered: opts.section_numbers == true, section_number_levels: section_number_levels)
       end
 
       # Build a Toc model from a document.
@@ -31,31 +32,31 @@ module Coradoc
       # @param document [CoreModel::StructuralElement] the root document
       # @return [CoreModel::Toc] the built TOC with entries and section numbers
       def build(document)
-        entries = []
-        counters = [0]
-        collect_entries(document.children, entries, 1, counters) if document.children
-
-        CoreModel::Toc.new(
-          entries: entries,
-          min_level: 1,
-          max_level: @max_level,
-          numbered: @numbered
-        )
+        toc, = build_with_numbers(document)
+        toc
       end
 
-      # Compute a mapping of section_id => section_number_string.
-      # Always computes numbers regardless of the +numbered+ flag,
-      # since this is used for heading annotation in the body.
+      # Build TOC and section number map in a single tree walk.
       #
       # @param document [CoreModel::StructuralElement] the root document
-      # @return [Hash{String => String}] mapping of section ID to number (e.g., "2.1")
-      def section_number_map(document)
-        map = {}
+      # @return [Array(CoreModel::Toc, Hash)] tuple of TOC model and section number map
+      def build_with_numbers(document)
         entries = []
         counters = [0]
         collect_entries(document.children, entries, 1, counters, always_number: true) if document.children
+
+        map = {}
         flatten_numbers(entries, map)
-        map
+
+        strip_numbers(entries) unless @numbered
+
+        toc = CoreModel::Toc.new(
+          entries: entries,
+          min_level: 1,
+          max_level: @max_level,
+          numbered: @numbered
+        )
+        [toc, map]
       end
 
       private
@@ -93,6 +94,13 @@ module Coradoc
         end
       end
 
+      def strip_numbers(entries)
+        entries.each do |entry|
+          entry.number = nil
+          strip_numbers(entry.children) if entry.children
+        end
+      end
+
       def entry_title(section)
         TitleText.resolve(section.title)
       end

data/lib/coradoc/html/toc_serializer.rb

@@ -6,17 +6,16 @@ module Coradoc
     #
     # Used by the SPA layout to provide client-side navigation data.
     class TocSerializer
-      def build_json(document, options)
+      def build_json(document, opts)
         return { entries: [], numbered: false } unless document.is_a?(CoreModel::StructuralElement)
 
-        numbered = options[:section_numbers] == true
-        builder = TocBuilder.from_options(options)
+        opts = RenderOptions.new(**opts) unless opts.is_a?(RenderOptions)
+        numbered = opts.section_numbers == true
+        builder = TocBuilder.from_options(opts)
         toc = builder.build(document)
         { entries: serialize_entries(toc.entries), numbered: numbered }
       end
 
-      private
-
       def serialize_entries(entries)
         entries.map do |entry|
           {

data/lib/coradoc/html/transform/from_core_model.rb

@@ -10,6 +10,8 @@ module Coradoc
       # This transformer converts CoreModel to HTML strings by delegating
       # to the existing theme/renderer pipeline.
       class FromCoreModel
+        include Coradoc::Transform::Base
+
         class << self
           # Transform a CoreModel to HTML string
           #

data/lib/coradoc/html/transform/to_core_model.rb

@@ -12,6 +12,8 @@ module Coradoc
       # Nokogiri::XML::Document or Nokogiri::XML::Node objects into CoreModel
       # by delegating to the existing input converter pipeline.
       class ToCoreModel
+        include Coradoc::Transform::Base
+
         class << self
           # Transform an HTML model (Nokogiri node) to CoreModel
           #

data/lib/coradoc/html/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module Html
-    VERSION = '1.1.13'
+    VERSION = '1.1.15'
   end
 end

data/lib/coradoc/html.rb

@@ -21,16 +21,15 @@ module Coradoc
   module Html
     # Autoload HTML components
     autoload :Config, 'coradoc/html/config'
+    autoload :AssetResolver, 'coradoc/html/asset_resolver'
+    autoload :TagMapping, 'coradoc/html/tag_mapping'
     autoload :Escape, 'coradoc/html/escape'
     autoload :SectionNumberable, 'coradoc/html/section_numberable'
     autoload :TemplateCaching, 'coradoc/html/template_caching'
     autoload :TitleText, 'coradoc/html/title_text'
 
-    # Autoload Drop namespace (DropFactory loads Base + all drops)
-    module Drop
-      autoload :DropFactory, 'coradoc/html/drop/drop_factory'
-      autoload :Base, 'coradoc/html/drop/base'
-    end
+    # Drop layer — self-registering drops loaded via parent namespace file
+    require 'coradoc/html/drop'
 
     # Autoload HTML output converters
     autoload :ConverterBase, 'coradoc/html/converter_base'
@@ -42,9 +41,11 @@ module Coradoc
     autoload :Theme, 'coradoc/html/theme'
     autoload :TemplateLocator, 'coradoc/html/template_locator'
     autoload :TemplateConfig, 'coradoc/html/template_config'
-    autoload :TemplateFilters, 'coradoc/html/template_helpers'
+    # Side-effect: registers Liquid filters on load
+    require 'coradoc/html/template_helpers'
     autoload :Renderer, 'coradoc/html/renderer'
     autoload :LayoutRenderer, 'coradoc/html/layout_renderer'
+    autoload :RenderOptions, 'coradoc/html/render_options'
     autoload :TocSerializer, 'coradoc/html/toc_serializer'
 
     # CoreModel transformers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc-html
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 1.1.15
 platform: ruby
 authors:
 - Ribose Inc.
@@ -117,8 +117,10 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - lib/coradoc/html.rb
+- lib/coradoc/html/asset_resolver.rb
 - lib/coradoc/html/config.rb
 - lib/coradoc/html/converter_base.rb
+- lib/coradoc/html/drop.rb
 - lib/coradoc/html/drop/annotation_drop.rb
 - lib/coradoc/html/drop/base.rb
 - lib/coradoc/html/drop/bibliography_drop.rb
@@ -188,10 +190,12 @@ files:
 - lib/coradoc/html/input/postprocessor.rb
 - lib/coradoc/html/layout_renderer.rb
 - lib/coradoc/html/output.rb
+- lib/coradoc/html/render_options.rb
 - lib/coradoc/html/renderer.rb
 - lib/coradoc/html/section_numberable.rb
 - lib/coradoc/html/spa.rb
 - lib/coradoc/html/static.rb
+- lib/coradoc/html/tag_mapping.rb
 - lib/coradoc/html/template_caching.rb
 - lib/coradoc/html/template_config.rb
 - lib/coradoc/html/template_helpers.rb