asciidoctor-multipage 0.0.6 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1536862b822c7ec9f66f5f53f3b6a9bad7f6983ee5ff1f5c742e718a3cb66a76
-  data.tar.gz: f612e848167857d28c7c42f4684355e7082a45379038a5265e472797dae99b11
+  metadata.gz: 37d22229b52f7ecc747f4c4f80fcfe6b3d097d49a0ba7c1e375de6f72280c950
+  data.tar.gz: 901b657b48543dc3466154c0ba5d00d82d639f1b72a747eae5bb5821cd287cb1
 SHA512:
-  metadata.gz: c652de15f77d2c32e7574b7edf9351e49623170aada76a8c577b16ade65db6294660fb07dbebe27095b5500167c804a4a3ac70d82383d3d56a84ca9d4c1aeed8
-  data.tar.gz: 8db9f9e909ae211891384483624affd6f7c78ada48d78c27b7bb1667c5da4300ab3bc257c233912c1495505d412a7402275579f569bd3524e6f7011f1debb4f2
+  metadata.gz: 52c37d84631c4d9bbdd02a272fd61dd5c5cf26b6a60f2e203378ca0dc669edd731284b13bf5d9fdfae601209ae38ddf9647ad8e7091e7a46b6810cb5beb7e6a6
+  data.tar.gz: 7bf7e7e32dac50d8619ee1ac52e9bc501c2d1cb5585e391f7501ed2b6e7bd1ab67b265c7e7d1a4e2df5cc95e0077fcdd768faaf76d1b6e886894140b85669bec

data/lib/asciidoctor-multipage.rb

@@ -52,6 +52,14 @@ class Asciidoctor::Document
   # nodes are no longer accessible.
   attr_writer :sectnum
 
+  # A pointer to the original converter (first converter instantiated to
+  # convert the original document). As we create additional documents
+  # ourselves, AsciiDoctor will instantiate additional instances of
+  # MultipageHtml5Converter for each created document. These instances need
+  # to share state, so they can use the original converter instance
+  # for that purpose.
+  attr_accessor :mp_root
+
   # Override the AbstractBlock sections?() check to enable the Table Of
   # Contents. This extension may generate short pages that would normally have
   # no need for a TOC. However, we override the Html5Converter outline() in
@@ -101,6 +109,12 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
 
   attr_accessor :pages
 
+  # contains the entire outline of the top-level document, used
+  # as a guide-rail for creating TOC elements for documents we
+  # split off. Only expected to be set in the top-level converter
+  # (see AsciiDoctor::Document::mp_root)
+  attr_accessor :full_outline
+
   def initialize(backend, opts = {})
     @xml_mode = false
     @void_element_slash = nil
@@ -118,8 +132,29 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
     page << block
   end
 
+  # ensures that the AsciiDoctor::Document::mp_root is correctly
+  # set on the document object. The variable could have already been
+  # set if we created the document ourselves
+  # (see ::MultipageHtml5Converter::convert_section), in which case it's
+  # not changed. If the documented is "nested", then we expect the parent
+  # document to already have it set. Otherwise, this is expected to be
+  # a top-level document, and we assign ourselves as its original converter.
+  def check_root(doc)
+    unless doc.mp_root
+      if doc.nested?
+        doc.mp_root = doc.parent_document.mp_root
+      else
+        doc.mp_root = self
+      end
+    end
+  end
+
   # Process Document (either the original full document or a processed page)
   def convert_document(node)
+
+    # make sure document has original converter reference
+    check_root(node)
+
     if node.processed
       # This node (an individual page) can now be handled by
       # Html5Converter.
@@ -166,8 +201,16 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
       # Generate navigation links for all pages
       generate_nav_links(node)
 
-      # Create and save a skeleton document for generating the TOC lists.
-      @@full_outline = new_outline_doc(node)
+      # Create and save a skeleton document for generating the TOC lists,
+      # but don't attempt to create outline for nested documents.
+      unless node.nested?
+        # if the original converter has the @full_outline set already, we are about
+        # to replace it. That's not supposed to happen, and probably means we encountered
+        # a document structure we aren't prepared for. Log an error and move on.
+        logger.error "Regenerating document outline, something wrong?" if node.mp_root.full_outline
+        node.mp_root.full_outline = new_outline_doc(node)
+      end
+
       # Save the document catalog to use for each part/chapter page.
       @catalog = node.catalog
 
@@ -179,7 +222,7 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
           part = block
           part.convert
           text = %(<<#{part.id},#{part.captioned_title}>>)
-          if desc = block.attr('desc') then text << %( – #{desc}) end
+          if (desc = block.attr('desc')) then text << %( – #{desc}) end
           parts_list << Asciidoctor::ListItem.new(parts_list, text)
         end
       end
@@ -197,6 +240,8 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
   # Process Document in embeddable mode (either the original full document or a
   # processed page)
   def convert_embedded(node)
+    # make sure document has original converter reference
+    check_root(node)
     if node.processed
       # This node (an individual page) can now be handled by
       # Html5Converter.
@@ -244,7 +289,8 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
   # Generate the actual HTML outline for the TOC. This method is analogous to
   # Html5Converter convert_outline().
   def generate_outline(node, opts = {})
-    return unless node.sections?
+    # Do the same as Html5Converter convert_outline() here
+    return unless node.sections? && node.sections.length > 0
     sectnumlevels = opts[:sectnumlevels] || (node.document.attributes['sectnumlevels'] || 3).to_i
     toclevels = opts[:toclevels] || (node.document.attributes['toclevels'] || 2).to_i
     sections = node.sections
@@ -254,7 +300,17 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
       if section.caption
         stitle = section.captioned_title
       elsif section.numbered && slevel <= sectnumlevels
-        stitle = %(#{section.sectnum} #{section.title})
+        if slevel < 2 && node.document.doctype == 'book'
+          if section.sectname == 'chapter'
+            stitle =  %(#{(signifier = node.document.attributes['chapter-signifier']) ? "#{signifier} " : ''}#{section.sectnum} #{section.title})
+          elsif section.sectname == 'part'
+            stitle =  %(#{(signifier = node.document.attributes['part-signifier']) ? "#{signifier} " : ''}#{section.sectnum nil, ':'} #{section.title})
+          else
+            stitle = %(#{section.sectnum} #{section.title})
+          end
+        else
+          stitle = %(#{section.sectnum} #{section.title})
+        end
       else
         stitle = section.title
       end
@@ -339,7 +395,7 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
   end
 
   # From node, create a skeleton document that will be used to generate the
-  # TOC. This is first used to create a full skeleton (@@full_outline) from the
+  # TOC. This is first used to create a full skeleton (@full_outline) from the
   # original document (for_page=nil). Then it is used for each individual page
   # to create a second skeleton from the first. In this way, TOC entries are
   # included that are not part of the current page, or excluded if not
@@ -349,8 +405,7 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
       new_document = Document.new([])
       new_document.mplevel = node.mplevel
       new_document.id = node.id
-      new_document.set_attr('sectnumlevels', node.attr(:sectnumlevels))
-      new_document.set_attr('toclevels', node.attr(:toclevels))
+      new_document.update_attributes(node.attributes)
       new_parent = new_document
       node.sections.each do |section|
         new_outline_doc(section, new_parent: new_parent,
@@ -365,7 +420,7 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
                                 numbered = node.numbered)
       new_section.id = node.id
       new_section.caption = node.caption
-      new_section.title = node.title
+      new_section.title = node.instance_variable_get(:@title)
       new_section.mplevel = node.mplevel
       new_parent << new_section
       new_parent.sections.last.numeral = node.numeral
@@ -382,10 +437,10 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
   # outline.
   def convert_outline(node, opts = {})
     doc = node.document
-    # Find this node in the @@full_outline skeleton document
-    page_node = @@full_outline.find_by(id: node.id).first
+    # Find this node in the @full_outline skeleton document
+    page_node = doc.mp_root.full_outline.find_by(id: node.id).first
     # Create a skeleton document for this particular page
-    custom_outline_doc = new_outline_doc(@@full_outline, for_page: page_node)
+    custom_outline_doc = new_outline_doc(doc.mp_root.full_outline, for_page: page_node)
     opts[:page_id] = node.id
     # Generate an extra TOC entry for the root page. Add additional styling if
     # the current page is the root page.
@@ -445,6 +500,8 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
         page.sectnum = node.parent.sectnum
       end
 
+      page.mp_root = doc.mp_root
+
       # Process node according to mplevel
       if node.mplevel == :branch
         # Retain any part intro blocks, delete others, and add a list

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-multipage
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.11
 platform: ruby
 authors:
 - Owen T. Heisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-27 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 2.2.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 2.2.18
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement