asciidoctor-multipage 0.0.3 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a5ff94840e2e4523863cb2af46b47b5aceff1c29134981ad340bedf7a4f7a98
-  data.tar.gz: '09b697ab1f70e465671a91a9ec5c3298a46b09d2dab339e11480fd2ef8c77b9a'
+  metadata.gz: 3435558e6b1ec2f99470f6a67d9a027065b468f3748d56e56a46a96277c321dc
+  data.tar.gz: f29752bc09d665574e6611a6fa1bd12b267b01aecd3f9e9d7d0221ebde712a90
 SHA512:
-  metadata.gz: 3ef5c6fb1342caf81d3d5de94df89618ef511642832e1b95103ac7d1058fb7e4339f01b6e3e684f2a2c996dcc958d76aac0e087eec5cf46a08c71888f38593ce
-  data.tar.gz: 7c87db46a76d677f09d96b6dfcde997f37e4ea08aea5467e130a5511a25b81626bed2c5d312d2dfc270ad3dc6fe2eba7f33cb258dfdee36236dc8c65872b1a28
+  metadata.gz: dac5c572a56aa2583f64c9082cb9d849a32cb0fc89125e169d18bf49cae5b0a77652a324d1dedae2948d1904fca8a8eb91161c274400bf3308d4d572e4b84c05
+  data.tar.gz: 4b0c20879b47c5eafde65125f7fba029e15f0c4f5fea708ef6e8199ce98ee761586b588801b48fce481f3bc3fbdbd2f6d35beb4619d839c645933f6956c811aa

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>'
@@ -361,7 +376,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 +389,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
@@ -486,7 +502,8 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
     doc = node.document
     node.mplevel = :root if node.class == Asciidoctor::Document
     node.sections.each do |section|
-      # Check custom multipage-level attribute on section
+      # Check custom multipage-level attribute on section; warn and
+      # discard if invalid
       if section.attr?('multipage-level', nil, false) &&
          section.attr('multipage-level').to_i <
          node.attr('multipage-level').to_i
@@ -494,15 +511,15 @@ 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'))
       end
       # Set section type
-      if section.level < section.attr('multipage-level').to_i
+      if section.level < section.attr('multipage-level', nil, true).to_i
         section.mplevel = :branch
-      elsif section.level == section.attr('multipage-level').to_i
+      elsif section.level == section.attr('multipage-level', nil, true).to_i
         section.mplevel = :leaf
       else
         section.mplevel = :content

metadata

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