asciidoctor-dot-leader 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9a25c3ac68e342ade564fce5f6ae421fb3ba5da8ebec4584682cf6b5c2f0202
-  data.tar.gz: 3883b7986da82e541f1a7dcdf029dc077489906a3ad303e33140ca2f98696d1a
+  metadata.gz: cafcd588c3080dba97a8b811c9a230f83623fa27e1d1449f471d6f93428ef6f9
+  data.tar.gz: 2b784579fa0453fef3dc0fd1d1d735e31889f9dce3227294225da08064de3300
 SHA512:
-  metadata.gz: 671510acec6229d3d54dfb4b9255c307a9141e70d307e3db369ca40773ac4d1f5bc880def7f0d3bc506251a42886956660e5a7535b0743e7e42d98adffaf0e96
-  data.tar.gz: 4a21802b05620af76b340504cd1d9951430a0502c4e1f77769c04a76cafc7ee86b26b1163e91fc4525082e2cc74e9223dd0f8bb30780a74a41d2084c16d4772b
+  metadata.gz: 78bb767ee1ea9560346744da1285c95ba72f26f8787f6843b10e046d9ccc575ef607c29d556bc2c7f53ff4bc0b38ed965aa93ab6164d9a597cc811fe1e6de34f
+  data.tar.gz: c7c1e40de2398e37458e1da098fa669b2fb8881a2505ad821a0fbe75d65f0a1591661d9f0333d79ab0e877d09c3a18314a6a590d0e2c9ba3861bf546480c80cc

data/CHANGELOG.adoc

@@ -0,0 +1,37 @@
+= Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on https://keepachangelog.com/en/1.0.0/[Keep a Changelog],
+and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Versioning].
+
+== [1.1.0] - 2025-10-31
+
+=== Fixed
+
+This release fixes alignment and width calculation issues for the pdf version:
+
+* All positioning uses a universal grid based on absolute page coordinates which ensures all dot leaders align vertically across all block types
+* Fixed width calculation for roles, such as `.small` and `.big`, by using fragment-specific font sizes
+
+== [1.0.0] - 2025-07-20
+
+=== Added
+
+Initial release of the asciidoctor-dot-leader extension with these features:
+
+* Initial release of the asciidoctor-dot-leader extension
+* Supports the PDF backend via asciidoctor-pdf
+* Supports the HTML5 backend
+* Inline macro syntax: `dot:leader["left", "right"]`
+* Supports formatted text in left and right fragments
+* Handles inline images, superscript, and subscript
+
+=== Features
+
+Key capabilities of the extension:
+
+* Dot leader generation between left and right text
+* Configurable dot leader appearance via theme
+* Support for complex inline formatting
+* Compatible with multiple Asciidoctor backends

data/README.adoc

@@ -1,14 +1,16 @@
-= AsciiDoctor Dot Leader Inline Macro
+= Asciidoctor Dot Leader Inline Macro
 
 This project provides an inline macro which `pass:[dot:leader["left", "right"]]` which inserts leaders between the values.
 
 Dot . . . . . . . . . . . . . . . . . . . . . . . . Leaders
 
+**Current Version:** 1.1.0 | link:CHANGELOG.adoc[View Changelog]
+
 It currently supports three backends:
 
-* AsciiDoctor (Ruby) - `backend-html5`
-* AsciiDoctor-PDF (Ruby) - `backend-pdf`
-* AsciiDoctor.js - `backend-webview-html5` - See <<asciidoctor-js-dot-leader>>
+* Asciidoctor (Ruby) - `backend-html5`
+* Asciidoctor-PDF (Ruby) - `backend-pdf`
+* Asciidoctor.js - `backend-webview-html5` - See <<asciidoctor-js-dot-leader>>
 
 .PDF
 image:resources/images/example-pdf-adoc-formatted.png[]
@@ -16,7 +18,7 @@ image:resources/images/example-pdf-adoc-formatted.png[]
 .HTML5
 image:resources/images/example-html5-roles.png[]
 
-.AsciiDoctor.js
+.Asciidoctor.js
 image:resources/images/example-webview-html5-inline-passthroughs.png[]
 
 == Markup And Usage _Manual_ 
@@ -27,26 +29,52 @@ Markup examples, rendered output examples, and extensive compatibility informati
 * link:dot_leader_example.html[] 
 * Or clone the project and open the link:dot_leader_example.adoc[] file with Visual Studio Code's Asciidoc's preview window.
 
-== Todo
+== Asciidoctor and Asciidoctor-PDF (Ruby) Installation and Usage
 
-There are a few items which need fixing:
+The asciidoctor-dot-leader is available as a Ruby Gem.
 
-* PDF
-** [ ] Upload gem to rubygems.org
-* HTML5
-** [ ] Include .css automatically?
-* webview-html5 (Asciidoctor.js) for Microsoft Visual Studio Code and possibly others
-** [ ] Release on npm
+https://rubygems.org/gems/asciidoctor-dot-leader[^]
+
+Complete these steps to use:
+
+. Install the required Gems:
++
+[source]
+----
+gem install asciidoctor
+gem install asciidoctor-dot-leader
+----
++
+. Render the document:
++
+[source]
+----
+asciidoctor -r asciidoctor-dot-leader dot_leader_example.adoc
+----
++
+. [For PDF] Install Asciidoctor-PDF:
++
+[source]
+----
+gem install asciidoctor-pdf
+----
++
+. [For PDF] Render the PDF:
++
+[source]
+----
+asciidoctor-pdf -r asciidoctor-dot-leader dot_leader_example.adoc
+----
 
-== Ruby GEM Build Instructions (for 白一百 baiyibai)
+=== Ruby GEM Build Instructions (for 白一百 baiyibai)
 
 ```
 gem build asciidoctor-dot-leader.gemspec 
-gem install ./asciidoctor-dot-leader-1.0.0.gem
+gem install ./asciidoctor-dot-leader-1.1.0.gem
 ```
 
 [#asciidoctor-js-dot-leader]
-== AsciiDoctor.js Dot Leader Inline Macro
+== Asciidoctor.js Dot Leader Inline Macro
 
 This project provides an inline macro, `pass:[dot:leader["left", "right"]]`, which inserts dot leaders between the provided values. 
 
@@ -83,6 +111,14 @@ module.exports = require('../../asciidoctorjs-extension/dot_leader.js')
 .. Enable the Asciidoc > Extensions: *Register Workspace Extensions* option.
 . Open a document containing `pass:[dot:leader[]]` inline macros, and press the _Preview_ button.
 
+== Todo
+
+There are a few items which need fixing:
+
+* HTML5
+** [ ] Include .css automatically?
+* webview-html5 (Asciidoctor.js) for Microsoft Visual Studio Code and possibly others
+** [ ] Release on npm
 
 == Copyright
 

data/lib/asciidoctor/dot_leader/dot_leader_pdf.rb

@@ -1,6 +1,6 @@
 # dot_leader_pdf.rb 2025-07-20 白一百 baiyibai
 # https://gitlab.com/baiyibai/asciidoctor-pdf-dot-leader
-# This inline macro uses AsciiDoctor-PDF's ToC generation code as a jumping off point, but departs from it.
+# This inline macro uses Asciidoctor-PDF's ToC generation code as a jumping off point, but departs from it.
 # Use '':dot-leader-scale: 0.6' to set the document-wide factor
 require 'asciidoctor-pdf' unless defined? ::Asciidoctor::Converter::PdfConverter
 class DotLeader < (Asciidoctor::Converter.for 'pdf')
@@ -9,7 +9,8 @@ class DotLeader < (Asciidoctor::Converter.for 'pdf')
   def rendered_width_of_fragments(fragments, scale, roles = [])
       fragments.sum do |fragment|
       styles = fragment[:styles] || Set.new
-      size = font_size
+      # Use fragment's size if specified (for roles like .small, .big), otherwise use current font size
+      size = fragment[:size] || font_size
       size *= scale if styles.include?(:subscript) || styles.include?(:superscript)
       font_style = if styles.include?(:bold) && styles.include?(:italic)
         :bold_italic
@@ -152,19 +153,76 @@ class DotLeader < (Asciidoctor::Converter.for 'pdf')
         # NOTE: the same font is used for dot leaders throughout toc
         set_font toc_font_info[:font], dot_leader[:font_size]
         font_style dot_leader[:font_style]
-        # 2025-07-17 BYB: Add support for Multiple Columns https://asciidoctor.zulipchat.com/#narrow/channel/288690-users.2Fasciidoctor-pdf/topic/Implicit.20page.20break.20after.20column_box
-        if node.parent.parent.attributes['columns']
-          start_dots = start_dots - bounds.left
-        end
-        num_dots = [((bounds.width - start_dots - dot_leader[:spacer_width] - right_side_width) / dot_leader[:width]).floor, 0].max
-        # FIXME: dots don't line up in columns if width of page numbers differ # BYB: Original
+        # For true vertical alignment, dots must be at consistent absolute positions across all lines
+        # Calculate the absolute position from page margin for universal grid alignment
+        # This ensures dots align across tables, lists, and other indented contexts
+        
+        # Get the absolute position where dots will start
+        # start_dots is in local bounds coordinates, convert to absolute page coordinates
+        start_dots_absolute = start_dots + bounds.absolute_left
+        
+        # Use the page's left margin as the grid origin for universal alignment
+        # In a normal flow at the top level, bounds.absolute_left equals the page margin
+        # Use a reference from the document's margin settings
+        page_margin_left = page.margins[:left]
+        
+        # Calculate the position relative to the page margin for grid alignment
+        start_dots_from_page_margin = start_dots_absolute - page_margin_left
+        
+        # Find the first grid position after the left text ends
+        # Grid positions are at multiples of dot_leader[:width] from the page margin
+        first_dot_grid_index = (start_dots_from_page_margin / dot_leader[:width]).ceil
+        first_dot_position_absolute = page_margin_left + (first_dot_grid_index * dot_leader[:width])
+        
+        # Convert back to the local bounds coordinate system for rendering
+        first_dot_position = first_dot_position_absolute - bounds.absolute_left
+        
+        # Check if the first dot is too close to the left text
+        # Calculate the actual left text width for precise spacing check
+        left_text_width = rendered_width_of_fragments left_side_fragments, scale, node.roles.to_a
+        space_after_left_text = first_dot_position - left_text_width
+        
+        dot_stripped = dot_leader[:text].rstrip
+        dot_stripped_width = rendered_width_of_string dot_stripped
+        
+        # Calculate where the right text will start (in absolute coordinates)
+        right_text_start_local = bounds.width - right_side_width - dot_leader[:spacer_width]
+        right_text_start_absolute = right_text_start_local + bounds.absolute_left
+        
+        # Find the last grid position before the right text starts (using global grid)
+        # Ensure the COMPLETE dot (start + width) fits before right text
+        right_text_from_page_margin = right_text_start_absolute - page_margin_left
+        
+        # Calculate the last grid index where a complete dot would fit
+        # A dot at position N has its right edge at N + dot_leader[:width]
+        # The target: (last_dot_grid_index * dot_leader[:width]) + dot_leader[:width] <= right_text_from_page_margin
+        # Simplified: last_dot_grid_index <= (right_text_from_page_margin / dot_leader[:width]) - 1
+        # Add some buffer space to ensure the dot does not touch the right text
+        last_possible_dot_end = right_text_from_page_margin - (1.0 * dot_stripped_width)
+        last_dot_grid_index = (last_possible_dot_end / dot_leader[:width]).floor
+        
+        # Calculate the number of dots that fit on the grid between left and right text
+        num_dots = [last_dot_grid_index - first_dot_grid_index + 1, 0].max
+        
+        # Calculate the indent to position the first dot at the correct grid position
+        dot_indent = first_dot_position
+        
         fragment_positions = []
         right_side_fragments.each do |fragment|
           fragment_positions << (fragment_position = ::Asciidoctor::PDF::FormattedText::FragmentPositionRenderer.new)
           (fragment[:callback] ||= []) << fragment_position
         end
+        
+        # Render the dots with a proper indent to align to the grid
+        indent dot_indent, 0 do
+          typeset_formatted_text [
+            { text: dot_leader[:text] * num_dots, color: dot_leader[:font_color] }
+          ], line_metrics, align: :left
+        end
+        
+        # Move cursor back to render right text
+        move_cursor_to start_cursor
         typeset_formatted_text [
-        { text: dot_leader[:text] * num_dots, color: dot_leader[:font_color] },
         dot_leader[:spacer],
         *right_side_fragments.map { |fragment|
           fragment.dup.tap do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-dot-leader
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - 白一百 baiyibai
@@ -30,6 +30,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.adoc
 - LICENSE
 - README.adoc
 - lib/asciidoctor-dot-leader.rb