coradoc-html 1.1.19 → 1.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 011622bc6889a0af8aadea9d1a13e4cd4e322b808f5afe95b5da4a785a4b720f
-  data.tar.gz: ffe601423e5ab805e854e150744983336c49d217858a9f4d5aa660ced64d9f9b
+  metadata.gz: 78a6409c37e529e753bea5a39adc627dc5c2c059970feac19f0026fd3faf640b
+  data.tar.gz: e3edeb7c93d81f268f52919a36960061c9ea3c56c8aa31f0095d3c18708a6585
 SHA512:
-  metadata.gz: 0225afbdd3e517cb260bad9edc7a469605918937faebcc5a425b202e61ac36a6e66d96304defbca5562aa49421fdb20d436c0d47241ab272a0c19344ae839940
-  data.tar.gz: c2847f907efb900fb4ccef551254e808cc042c7aa5d8af2c0439a493fa560b58e07ed55d643a9c915d4cd6f765b1c7d6cff498e6408fee1e8f242b4833b40ff5
+  metadata.gz: a522853052a688ed9342752416eecb09118250e3c175191a8e3a88baa0ae1e4976f17446a5daddf82e849a9b34c6313258a6926e1f8efc2aa93725dcd086d275
+  data.tar.gz: addbcb3a1a19879f4dc4f83b68ae2f34cd5687488fa017d31a1367d847f2c693c7dcc639bdeb3445d4437ccfa9d958cf21d67428c8ec8992d4d8ab9aed854d31

data/lib/coradoc/html/config.rb

@@ -118,7 +118,10 @@ module Coradoc
           attrs = {}
           attrs[:class] = "language-#{language}" if language && !language.empty?
 
-          attrs[:class] = [attrs[:class], 'line-numbers'].compact.join(' ') if options[:linenums] || options[:line_numbers]
+          if options[:linenums] || options[:line_numbers]
+            attrs[:class] =
+              [attrs[:class], 'line-numbers'].compact.join(' ')
+          end
 
           attrs
         end

data/lib/coradoc/html/converters.rb

@@ -96,7 +96,7 @@ module Coradoc
         else
           raise Errors::InvalidConfigurationError,
                 "unknown value #{Html.input_config.unknown_tags.inspect} " \
-                  'for Coradoc::Html.input_config.unknown_tags'
+                'for Coradoc::Html.input_config.unknown_tags'
         end
       end
     end

data/lib/coradoc/html/drop/definition_item_drop.rb

@@ -8,6 +8,17 @@ module Coradoc
           Escape.escape_html(stripped_term)
         end
 
+        # All terms on this `<dt>`, escaped and id-stripped. Multi-term
+        # `<dt>`'s (AsciiDoc `term1::\nterm2::`) carry multiple entries;
+        # templates iterate this collection to emit one `<dt>` per term.
+        # Falls back to `[term]` for legacy callers that only set the
+        # singular `term` accessor.
+        def terms
+          raw = @model.terms
+          collection = raw.nil? || raw.empty? ? [@model.term.to_s] : raw.map(&:to_s)
+          collection.map { |t| Escape.escape_html(strip_term_id(t)) }
+        end
+
         def term_id
           match = term_text.match(/\A\[\[([^\]]+)\]\]/)
           match&.[](1)
@@ -36,6 +47,12 @@ module Coradoc
         def stripped_term
           term_text.sub(/\A\[\[[^\]]+\]\]/, '')
         end
+
+        # Strip a leading `[[id]]` anchor from a term string. Shared by
+        # `terms` (per-entry) and `stripped_term` (primary term).
+        def strip_term_id(text)
+          text.to_s.sub(/\A\[\[[^\]]+\]\]/, '')
+        end
       end
 
       DropFactory.register(CoreModel::DefinitionItem, DefinitionItemDrop)

data/lib/coradoc/html/reference_materializers/link.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module Html
+    module ReferenceMaterializers
+      # Render a hyperlink edge as a LinkElement with the URL as target.
+      # The catalog is not consulted — links are external by definition.
+      class Link < Coradoc::Reference::Materializer::Base
+        class << self
+          def kind
+            :link
+          end
+
+          def presentation
+            :any
+          end
+
+          def format
+            :html
+          end
+        end
+
+        def materialize(edge:, **)
+          text = display_text(edge)
+          Coradoc::CoreModel::LinkElement.new(
+            target: edge.address.to_s,
+            content: text,
+            children: [
+              Coradoc::CoreModel::TextElement.new(content: text)
+            ]
+          )
+        end
+
+        private
+
+        def display_text(edge)
+          return edge.label if edge.label && !edge.label.empty?
+
+          edge.address.to_s
+        end
+      end
+    end
+  end
+end

data/lib/coradoc/html/reference_materializers/navigation.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module Html
+    module ReferenceMaterializers
+      # Render a navigation edge (:navigation kind) as an HTML-shaped
+      # CoreModel::LinkElement. The href is computed by asking the
+      # Presentation where the target lives (so the same edge renders
+      # to different hrefs under different presentations). Edges whose
+      # target lives on another page get a page-prefixed href.
+      class Navigation < Coradoc::Reference::Materializer::Base
+        class << self
+          def kind
+            :navigation
+          end
+
+          def presentation
+            :any
+          end
+
+          def format
+            :html
+          end
+        end
+
+        def materialize(edge:, result:, node:, presentation:, pages:)
+          href = href_for(edge, result, node, presentation, pages)
+          text = display_text(edge, result)
+          Coradoc::CoreModel::LinkElement.new(
+            target: href,
+            content: text,
+            children: [
+              Coradoc::CoreModel::TextElement.new(content: text)
+            ]
+          )
+        end
+
+        private
+
+        def href_for(edge, result, node, presentation, pages)
+          return edge.address.to_s unless result.is_a?(Coradoc::Reference::Result::Resolved)
+          return edge.address.to_s unless presentation && pages
+
+          target_page = presentation.locate_page(edge, result.target, pages: pages)
+          return edge.address.to_s unless target_page
+
+          source_page = node && presentation.locate_page(edge, node, pages: pages)
+          build_href(target_page, source_page, result.target)
+        end
+
+        def build_href(target_page, source_page, target)
+          anchor = anchor_for(target)
+          cross_page = source_page && !source_page.equal?(target_page)
+          prefix = cross_page ? page_path(target_page) : ''
+          return "#{prefix}##{anchor}" if anchor
+
+          page_path(target_page)
+        end
+
+        def page_path(page)
+          page.id || '#'
+        end
+
+        def anchor_for(target)
+          target.id if target.is_a?(Coradoc::CoreModel::Base) && target.id
+        end
+
+        def display_text(edge, result)
+          return edge.label if edge.label && !edge.label.empty?
+          return result.target.title if result.is_a?(Coradoc::Reference::Result::Resolved) && result.target&.title
+
+          edge.address.to_s
+        end
+      end
+    end
+  end
+end

data/lib/coradoc/html/reference_materializers.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Coradoc
+  module Html
+    # Materializers rendering resolved reference Edges into
+    # HTML-shaped CoreModel nodes. They live in the format gem (not
+    # coradoc core) so format knowledge stays at the spoke of the
+    # hub-and-spoke architecture; registration is a load-time side
+    # effect via the Materializer registry's global extension point.
+    module ReferenceMaterializers
+      autoload :Navigation, 'coradoc/html/reference_materializers/navigation'
+      autoload :Link, 'coradoc/html/reference_materializers/link'
+    end
+  end
+end
+
+Coradoc::Reference::Materializer::Registry.register_global(
+  Coradoc::Html::ReferenceMaterializers::Navigation
+)
+Coradoc::Reference::Materializer::Registry.register_global(
+  Coradoc::Html::ReferenceMaterializers::Link
+)

data/lib/coradoc/html/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module Html
-    VERSION = '1.1.19'
+    VERSION = '1.1.21'
   end
 end

data/lib/coradoc/html.rb

@@ -237,3 +237,7 @@ end
 Coradoc.register_format(:html, Coradoc::Html,
                         aliases: %w[html htm],
                         extensions: %w[.html .htm])
+
+# Reference materializers for format: :html. Required (not autoloaded)
+# because registration is a load-time side effect, like register_format.
+require 'coradoc/html/reference_materializers'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc-html
 version: !ruby/object:Gem::Version
-  version: 1.1.19
+  version: 1.1.21
 platform: ruby
 authors:
 - Ribose Inc.
@@ -190,6 +190,9 @@ files:
 - lib/coradoc/html/plugin.rb
 - lib/coradoc/html/plugins/plateau.rb
 - lib/coradoc/html/postprocessor.rb
+- lib/coradoc/html/reference_materializers.rb
+- lib/coradoc/html/reference_materializers/link.rb
+- lib/coradoc/html/reference_materializers/navigation.rb
 - lib/coradoc/html/render_options.rb
 - lib/coradoc/html/renderer.rb
 - lib/coradoc/html/section_numberable.rb