asciidoctor-lists-extended 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f7291c0cf61e02d8b708696ff9f0ef2ef2a0375ede9c43967ef5871b0d2f57a
-  data.tar.gz: 4ce851476223d5e3c532420f7849476edae9096ab0699deb8e120d4bc137a936
+  metadata.gz: 2695e2cdf6dd6a40fcffa22e128746ddb7486187aa38c850b50db829f8843a6a
+  data.tar.gz: ad50e9b6ac7434b98a8c04ffe7351847ffbedf9cb5161274c30c618289e29a26
 SHA512:
-  metadata.gz: 8f940f72d95a2e4ba1450467c3276e02f6bb0e915bee689b48e7dceebf6c6a88a3318a436b529a2235bf60e26100a61c4a5215e11ece017d8bce8e957571a510
-  data.tar.gz: ff8c701fb655fdffb3aee51eebc49a98cb9aaf5a892c6f434d0cda02a0a6822f397ef905820b9bd6921014b037dc68282543ad6eae931498e1b715eac163aaed
+  metadata.gz: 47279a6a39951b24054144ee43e0aa803290d77a2258bc165107d47142df24ff390ed9700aaf6eef6f18fecf5ba459f021674750a724b1dcd698daf56d90529e
+  data.tar.gz: e8f12e04b08cac32b2420177fef005668fba67e4ead2afddac82199c10b98eb74b7b9560faf579b3e42145d8acf28c9c5884d3ba5828c0429cf85f909abe1763

data/README.adoc

@@ -222,8 +222,11 @@ In PDF mode the extension hooks into `asciidoctor-pdf`'s ToC allocation/renderin
 Document-wide lists (macros inside a top-level `== …` section) are placed in the *front matter* (directly after the ToC) regardless of where in the source the `list-of::` macros appear.
 The macro order in the source determines the order of the lists in the front matter.
 
-When the top-level section that contains a `list-of::` macro also has other content — admonitions, paragraphs, or other blocks — those blocks are moved to the front matter too and rendered between the list heading and the first entry.
-The enclosing section is then removed from the body so it does not appear twice.
+Blocks placed *before* the `list-of::` macro in the same section (admonitions, notes, paragraphs) are moved to the front matter and rendered between the list heading and the first entry.
+
+Blocks placed *after* the macro in the same section — for example a sidebar or admonition following a `<<<` page break — are re-inserted into the document body at the section's former position and rendered there, not in the front matter.
+
+The enclosing section is removed from the body so it does not appear twice.
 
 You can place `list-of::` macros inside any subsection to generate *section-scoped* lists.
 The scope is determined automatically from where the macro appears in the document hierarchy:

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

@@ -86,6 +86,7 @@ module Asciidoctor
           toc_entry_title = doc.attr('toc-title') || 'Table of Contents'
           insert_list_into_toc_section doc, toc_entry_title, @toc_extent.page_range,
             '_toc_in_toc', @list_toc_insert_idx,
+            pdf_dest: dest_top(@toc_extent.page_range.first),
             exclude_from_outline: true
           @list_toc_insert_idx += 1
         end
@@ -103,6 +104,7 @@ module Asciidoctor
           # 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,
+              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)
             @list_toc_insert_idx += 1
@@ -317,16 +319,39 @@ module Asciidoctor
             # rendered in the front matter alongside the list rather than left
             # as orphaned content in the body.
             section_title = (parent.context == :section) ? parent.title : nil
-            section_body  = parent.context == :section ?
-              parent.blocks.reject { |b| b.object_id == block.object_id } : []
-            # Page-break blocks (<<<) must be deleted from the section but must NOT
-            # be rendered in front matter — they only existed to separate list sections
-            # from body chapters.
-            extra_blocks  = section_body.reject { |b| b.context == :page_break }
+
+            # Split sibling blocks around the macro position:
+            #   pre_body  — before the macro → rendered in front matter (notes, admonitions)
+            #   post_body — after the macro  → re-inserted into the document body so they
+            #               are not lost (e.g. a sidebar or admonition the author placed
+            #               after the list-of:: call, possibly preceded by a <<<)
+            if parent.context == :section
+              macro_idx    = parent.blocks.index(block)
+              pre_body     = macro_idx > 0 ? parent.blocks[0, macro_idx] : []
+              post_body    = parent.blocks[(macro_idx + 1)..] || []
+              # Page-break blocks in pre_body are deleted but not rendered in front matter.
+              extra_blocks = pre_body.reject { |b| b.context == :page_break }
+            else
+              pre_body = post_body = extra_blocks = []
+            end
 
             parent.blocks.delete(block)
-            section_body.each { |b| parent.blocks.delete(b) }
-            parent.parent&.blocks&.delete(parent) if parent.context == :section && parent.blocks.empty?
+            pre_body.each  { |b| parent.blocks.delete(b) }
+            post_body.each { |b| parent.blocks.delete(b) }
+
+            if parent.context == :section && parent.blocks.empty?
+              grandparent = parent.parent
+              if grandparent
+                section_idx = grandparent.blocks.index(parent)
+                grandparent.blocks.delete(parent)
+                # Re-insert post-macro blocks into the grandparent at the section's
+                # former position so they survive in the document body.
+                post_body.each_with_index do |b, i|
+                  b.parent = grandparent
+                  grandparent.blocks.insert(section_idx + i, b)
+                end
+              end
+            end
 
             next if entries.empty?
 
@@ -344,11 +369,15 @@ module Asciidoctor
           end
         end
 
-        # Strip leading page-break blocks left over after list sections were
-        # removed.  A `<<<` placed between the last list section and the first
-        # chapter now sits orphaned at the document level; without this cleanup
-        # it renders as a blank page before Chapter 1.
-        doc.blocks.shift while doc.blocks.first&.context == :page_break
+        # Strip leading page-break blocks left orphaned at the document level
+        # after list section removal — but only when the immediately following
+        # block is a section (chapter heading).  A page-break before non-section
+        # body content (sidebar, admonition, etc.) was re-inserted intentionally
+        # from a post-macro position and must be preserved.
+        while doc.blocks.first&.context == :page_break &&
+              doc.blocks[1]&.context == :section
+          doc.blocks.shift
+        end
       end
 
       # -----------------------------------------------------------------------

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

@@ -42,6 +42,7 @@ module Asciidoctor
               outdent: true,
               role:    theme_key_sym
             add_dest_for_block doc, id: dest_id, y: (at_page_top? ? page_height : nil)
+            @last_list_dest = doc.attr('pdf-destination') unless scratch?
           end
         end
 
@@ -91,7 +92,13 @@ module Asciidoctor
       #
       # insert_idx is the 0-based position among sibling list sections being inserted,
       # which preserves document order in the ToC.
-      def insert_list_into_toc_section(doc, list_title, list_page_nums, list_id, insert_idx, exclude_from_toc: false, exclude_from_outline: false)
+      # pdf_dest: when nil (the default for regular lists), the outline falls back to
+      # get_dest(dest_name_for_id(list_id)) which resolves to the exact heading Y
+      # position registered by add_dest_for_block in ink_list_content.
+      # Pass an explicit dest_top value only for entries that have no add_dest_for_block
+      # call (e.g. toc-in-toc).
+      def insert_list_into_toc_section(doc, list_title, list_page_nums, list_id, insert_idx,
+          pdf_dest: nil, exclude_from_toc: false, exclude_from_outline: false)
         if (doc.attr? 'toc-placement', 'macro') && (toc_node = (doc.find_by context: :toc)[0])
           if (parent_section = toc_node.parent).context == :section
             grandparent_section = parent_section.parent
@@ -102,19 +109,14 @@ module Asciidoctor
             toc_level           = doc.sections[0]&.level || 1
             base_idx            = 0
           end
-          # NOTE: do NOT use toc_node.attr('pdf-destination') — that is the ToC
-          # page's own destination, which would make every list bookmark navigate
-          # back to the ToC page instead of the actual list page.
-          toc_dest = dest_top list_page_nums.first
         else
           grandparent_section = doc
           toc_level           = doc.sections[0]&.level || 1
           base_idx            = 0
-          toc_dest            = dest_top list_page_nums.first
         end
 
-        list_section       = Asciidoctor::Section.new grandparent_section, toc_level, false,
-          attributes: { 'pdf-destination' => toc_dest }
+        list_section       = Asciidoctor::Section.new grandparent_section, toc_level, false
+        list_section.set_attr 'pdf-destination', pdf_dest if pdf_dest
         list_section.title = list_title
         list_section.id    = list_id
         list_section.set_attr 'pdf-page-start', list_page_nums.first

metadata

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