asciidoctor-lists-extended 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a31187262d6b0b69f19786b57e05023e174e4aef336538624260d18e57af748
-  data.tar.gz: 335046829304d4f70054535a11cb247313347dda9a048f8b5ac9076e83fcbf69
+  metadata.gz: 20b4b4c3fb341f36f3b9dd69840f85583edaed9f6096fd98c5efc3e157b0ce48
+  data.tar.gz: 64bd1d98f9bdc723e89201273322ce6e956377fd38279cfad2f8aa9cd0689b8e
 SHA512:
-  metadata.gz: 2850824a15b099050d2f49ad77fc3152732c8490361c9c406519a3424a27dce7bd240baff4e0ac46dce0b5f1e9ed285f1043bd82ef917bd9aa88c9090e1edda1
-  data.tar.gz: f19b9819b2b074e7f0c7af333696eb88f212de7620b87007994904279288199867bce593175220c4b060bcb07602a35e3c8f8feece1bfd6320a716c5ded745b8
+  metadata.gz: d4be7d908d7e8c87b414114aca35859a3c7b398e0108b8621546792a14d246cb230f706e2f001fc0d2fcb4935c640c300765f5eb05ae781e0e93970acdf60bf2
+  data.tar.gz: 80feadacf0d0fa247540de19d98f308e6693fbd29e3e4073bb51ee11103596bfd117f7b4339fdade68ac9472b8743ce715e36d65620adf69660eac795de52e64

data/lib/asciidoctor-lists-extended/pdf_converter.rb

@@ -38,6 +38,9 @@ module Asciidoctor
         @list_entry_indent             = nil
         @list_first_entry_margin       = nil
         @list_toc_insert_idx           = 0
+        @virtual_list_sections         = []   # list-of:: virtual sections, kept for running content
+        @virtual_section_indices       = {}   # section → original index in parent.blocks
+        @toc_only_extent               = nil  # extent of the real ToC pages, without list-of pages
       end
 
       # -----------------------------------------------------------------------
@@ -68,6 +71,20 @@ module Asciidoctor
         mark_empty_list_sections doc
         result = super
         collect_and_allocate_lists doc, num_levels, toc_start_cursor, break_after_toc
+        # The extent stored as @toc_extent must cover the list-of pages inserted
+        # after the ToC, otherwise page-numbering-start-at/running-content-start-at
+        # 'after-toc' and the PDF page labels treat those pages as body content.
+        # Keep the unextended extent so ink_running_content can hand core the real
+        # ToC page range (core stamps the toc-title on every page of @toc_extent).
+        @toc_only_extent = result
+        if result && !@list_extents.empty?
+          last_to = @list_extents.values.map(&:to).max_by { |pos| [pos.page, -(pos.cursor || 0)] }
+          if last_to.page > result.to.page ||
+              (last_to.page == result.to.page && (last_to.cursor || 0) < (result.to.cursor || 0))
+            result = result.dup
+            result.to = last_to.dup
+          end
+        end
         result
       end
 
@@ -82,6 +99,7 @@ module Asciidoctor
       def ink_toc(doc, num_levels, toc_page_number, start_cursor, num_front_matter_pages = 0)
         @inline_num_front_matter_pages = num_front_matter_pages
         @list_toc_insert_idx = 0
+        @virtual_list_sections = []
 
         # toc-in-toc: insert the Table of Contents itself as the first entry in
         # the PDF ToC, before any list-of:: sections.  Excluded from the bookmark
@@ -111,10 +129,13 @@ module Asciidoctor
           # Bare macros (no parent section and no title= attribute) have no
           # meaningful label for the ToC or outline — skip the virtual section.
           unless list_title.nil_or_empty?
-            insert_list_into_toc_section doc, list_title, list_page_nums, list_id, @list_toc_insert_idx,
+            virtual_section = insert_list_into_toc_section doc, list_title, list_page_nums, list_id, @list_toc_insert_idx,
               pdf_dest:             @last_list_dest || dest_top(list_page_nums.first),
               exclude_from_toc:     resolve_exclude_from_toc(config),
               exclude_from_outline: resolve_exclude_from_outline(config)
+            # Retain a reference so running content can show the list title on its
+            # own pages; the section itself is purged from the tree below.
+            @virtual_list_sections << virtual_section
             @list_toc_insert_idx += 1
           end
         end
@@ -159,6 +180,64 @@ module Asciidoctor
         purge_virtual_sections doc
       end
 
+      # -----------------------------------------------------------------------
+      # ink_running_content override
+      # -----------------------------------------------------------------------
+      # asciidoctor-pdf builds its per-page running-content title map from
+      # doc.find_by(context: :section), keyed by each section's pdf-page-start.
+      # Our list-of:: virtual sections carry both a title and a pdf-page-start,
+      # but they were purged in ink_toc's ensure (which runs before this), so the
+      # list-of pages fall back to the preface/chapter title.  Re-insert them for
+      # the duration of the indexing pass, then purge again so they cannot leak
+      # into the scratch/final document tree.
+      def ink_running_content(periphery, doc, *args)
+        # Core stamps the toc-title on every page covered by @toc_extent, which
+        # now also spans the list-of pages (see allocate_toc).  Swap in the
+        # ToC-only extent so the list-of pages keep their own running titles
+        # (supplied by the reinserted virtual sections below).
+        widened_toc_extent = @toc_extent
+        @toc_extent = @toc_only_extent if @toc_only_extent
+        reinsert_virtual_list_sections doc
+        super
+      ensure
+        @toc_extent = widened_toc_extent
+        purge_virtual_sections doc
+      end
+
+      # -----------------------------------------------------------------------
+      # add_outline override
+      # -----------------------------------------------------------------------
+      # asciidoctor-pdf builds the PDF bookmark outline from doc.sections after
+      # ink_toc has returned, i.e. after ink_toc's ensure already purged the
+      # list-of:: virtual sections.  Re-insert them for the duration of the
+      # outline build (same compensating pattern as ink_running_content), then
+      # purge again.  add_outline_level's list-exclude-from-outline filter
+      # still applies to the reinserted sections.
+      def add_outline(doc, *args)
+        reinsert_virtual_list_sections doc
+        super
+      ensure
+        purge_virtual_sections doc
+      end
+
+      # Restore the retained list-of:: virtual sections into their original
+      # parent so doc.find_by(context: :section) can see them again.  Each
+      # section goes back to the block index recorded by purge_virtual_sections;
+      # position matters because doc.sections (derived from blocks order) drives
+      # the PDF bookmark outline order in add_outline.
+      def reinsert_virtual_list_sections(doc)
+        @virtual_list_sections.each do |sect|
+          parent = sect.parent || doc
+          next unless parent.respond_to?(:blocks) && !(parent.blocks.include? sect)
+          idx = @virtual_section_indices[sect]
+          if idx && idx <= parent.blocks.size
+            parent.blocks.insert idx, sect
+          else
+            parent.blocks << sect
+          end
+        end
+      end
+
       # -----------------------------------------------------------------------
       # get_entries_for_toc override
       # -----------------------------------------------------------------------
@@ -300,12 +379,20 @@ module Asciidoctor
       # they cannot leak into subsequent passes or downstream section processing.
       def purge_virtual_sections(doc)
         return unless doc
-        doc.find_by(context: :section).each do |sect|
-          next unless sect.attr? 'list-virtual-section'
+        virtuals = doc.find_by(context: :section).select { |sect| sect.attr? 'list-virtual-section' }
+        # Record each section's block index before any deletion shifts the
+        # indices; reinsert_virtual_list_sections uses them to restore the
+        # sections at their original positions.
+        virtuals.each do |sect|
+          parent = sect.parent
+          next unless parent.respond_to? :blocks
+          idx = parent.blocks.index sect
+          @virtual_section_indices[sect] = idx if idx
+        end
+        virtuals.each do |sect|
           parent = sect.parent
           next unless parent
           parent.blocks.delete sect if parent.respond_to? :blocks
-          parent.sections.delete sect if parent.respond_to? :sections
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-lists-extended
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - 白一百 baiyibai