asciidoctor-multipage 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28bc704663d2731292d6cf387f3fd9875e377159767800c252c5a818ebc5145c
-  data.tar.gz: dc8c206b11f8f3e16532f627180927519be4814c461e9fe2317c7e18e69d5e4a
+  metadata.gz: d30d8cf7b55d2e9eac4264bcaf1eb908a2e82b22de1446a4003a889c482a8e56
+  data.tar.gz: 62f1b710405e4fb9fd680720a4d670069761181a369b541c65a7bda50da6733f
 SHA512:
-  metadata.gz: f498a6dfe3e7c36f96fb72b3ec156395f11d018723c90d453f250af503da73035a4e3671919fbf0bf64d52399d7fc17a8416c5f5ea9a0736a7dce0b72e4842d5
-  data.tar.gz: 22abae6135ca5fe71de43e8ef7c4f2a2dcd98861bb2bb61ddcb24e0bcb350fa0ec982a200eec79997698ecc100c4cf0a080cbebb61651ac0038dffbbab7e5536
+  metadata.gz: ec8fc0473fe24f5e10112b4aac65f28fa5a23491e8edabfa8581b54f926201dbeefb3991ec0c1bd1d8fa0f62a1806dd95b610ed0497248c27e53db26e1894f3a
+  data.tar.gz: c50107b5d4a5b5d1349b99b72da9458ddb011469146f9a5a36516fda2fc6f3667881afe942fd6465bebebaf174c883971b305fdcfb67b3424878e590ecd1e928

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,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-multipage
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - Owen T. Heisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-02-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +70,22 @@ dependencies:
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 2.0.11
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.11
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: '2.1'
 description: An Asciidoctor extension that generates HTML output using multiple pages
 email:
 - writer@owenh.net