asciidoctor-multipage 0.0.4 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d073da07d5707fe438e99dc7b836e44921837b9f961184e9dd2084d890a8f3c3
-  data.tar.gz: 23a0c68821990b1e4fb6b0309049902c9c24ff506eef9c7fbb94292a400ddaa6
+  metadata.gz: b61bac9f5757d7dd1864896ce026ba9459f05a4b2860b8fcc04087b02f6d99e4
+  data.tar.gz: 80e39a0c29b8a125f4001cd290e3d2b8494b51b67f0a4e96f3a3951ffccde583
 SHA512:
-  metadata.gz: 9430f25299c02ce84b7b9f8911cd1affe670e451d2ef0a199d7977781fc7b1f9e473e3f256000b081d52a73a0f2e4690dc9216c446a8659e87d29f6e6ac9eecb
-  data.tar.gz: 80e1aeb5de2107e1b1bfb1db662e82d05156f1599a9d62c9d0b1a5a8383729b8bf051ff2319bdfaee31413099bdeeb6c910ef8b148899f304350df0d5daaaf8e
+  metadata.gz: 921880fa69d16485028b378017b680ea7cab5f30376361da442cdf3f7c53d144e67d7a8af76dc0134bb0cff41a66b00242e82519878bf2a91c748ba98931adc3
+  data.tar.gz: 2430e67e5d8992737a9b77f7d0512853b4ae7a8771b44e57347cf9547930f91860acb70acb3acbd0161ff0dc3c1b69fb968f5c1d96b2785db699aca2129f0f9f

data/lib/asciidoctor-multipage.rb

@@ -17,6 +17,7 @@ class Asciidoctor::AbstractNode
       node_tree << current
       current = current.parent
     end
+    node_tree << current
     if node_tree.include?(self) ||
        node_tree.include?(self.parent)
       return true
@@ -120,7 +121,8 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
   # Process Document (either the original full document or a processed page)
   def convert_document(node)
     if node.processed
-      # This node can now be handled by Html5Converter.
+      # This node (an individual page) can now be handled by
+      # Html5Converter.
       super
     else
       # This node is the original full document which has not yet been
@@ -146,6 +148,7 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
       # Set multipage chunk types
       set_multipage_attrs(node)
 
+      # FIXME: This can result in a duplicate ID without a warning.
       # Set the "id" attribute for the Document, using the "docname", which is
       # based on the file name. Then register the document ID using the
       # document title. This allows cross-references to refer to (1) the
@@ -195,12 +198,13 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
   # processed page)
   def convert_embedded(node)
     if node.processed
-      # This node can now be handled by Html5Converter.
+      # This node (an individual page) can now be handled by
+      # Html5Converter.
       super
     else
       # This node is the original full document which has not yet been
-      # processed; it can be handled by document().
-      document(node)
+      # processed; it can be handled by convert_document().
+      convert_document(node)
     end
   end
 
@@ -216,7 +220,8 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
         previous_page = pages[page_index-1]
         parent_page = page.parent
         home_page = doc
-        # NOTE, there are some non-breaking spaces (U+00A0) below.
+        # NOTE: There are some non-breaking spaces (U+00A0) below, in
+        # the "links <<" lines and "links.join" line.
         if previous_page != parent_page
           links << %(← Previous: <<#{previous_page.id}>>)
         end
@@ -237,12 +242,12 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
   end
 
   # Generate the actual HTML outline for the TOC. This method is analogous to
-  # Html5Converter outline().
+  # Html5Converter convert_outline().
   def generate_outline(node, opts = {})
-    # This is the same as Html5Converter outline()
+    # Do the same as Html5Converter convert_outline() here
     return unless node.sections?
-    sectnumlevels = opts[:sectnumlevels] || (node.document.attr 'sectnumlevels', 3).to_i
-    toclevels = opts[:toclevels] || (node.document.attr 'toclevels', 2).to_i
+    sectnumlevels = opts[:sectnumlevels] || (node.document.attributes['sectnumlevels'] || 3).to_i
+    toclevels = opts[:toclevels] || (node.document.attributes['toclevels'] || 2).to_i
     sections = node.sections
     result = [%(<ul class="sectlevel#{sections[0].level}">)]
     sections.each do |section|
@@ -250,7 +255,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
@@ -277,12 +292,12 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
       end
       result << %(<li><a href="#{link}">#{stitle}</a>)
 
-      # Finish in a manner similar to Html5Converter outline()
+      # Finish in a manner similar to Html5Converter convert_outline()
       if slevel < toclevels &&
          (child_toc_level = generate_outline section,
-                                        :toclevels => toclevels,
-                                        :secnumlevels => sectnumlevels,
-                                        :page_id => opts[:page_id])
+                                             toclevels: toclevels,
+                                             secnumlevels: sectnumlevels,
+                                             page_id: opts[:page_id])
         result << child_toc_level
       end
       result << '</li>'
@@ -345,8 +360,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,
@@ -361,7 +375,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
@@ -374,7 +388,8 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
     return new_document
   end
 
-  # Override Html5Converter outline() to return a custom TOC outline
+  # Override Html5Converter convert_outline() to return a custom TOC
+  # outline.
   def convert_outline(node, opts = {})
     doc = node.document
     # Find this node in the @@full_outline skeleton document
@@ -495,7 +510,7 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
                     %(section cannot be less than the parent section value)
         section.set_attr('multipage-level', nil)
       end
-      # Propogate custom multipage-level value to child node
+      # Propagate custom multipage-level value to child node
       if !section.attr?('multipage-level', nil, false) &&
          node.attr('multipage-level') != doc.attr('multipage-level')
         section.set_attr('multipage-level', node.attr('multipage-level'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-multipage
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.9
 platform: ruby
 authors:
 - Owen T. Heisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal