asciidoctor-multipage 0.0.11 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37d22229b52f7ecc747f4c4f80fcfe6b3d097d49a0ba7c1e375de6f72280c950
-  data.tar.gz: 901b657b48543dc3466154c0ba5d00d82d639f1b72a747eae5bb5821cd287cb1
+  metadata.gz: 92ae4009df03264cc6ecf2dc5826234151da1125abe9e7cbb01cba9a6f53d08e
+  data.tar.gz: 855ad21500928a3d166aa360fec6fe2d332c3b4e3efdbddb5f0402c32c8ee4e2
 SHA512:
-  metadata.gz: 52c37d84631c4d9bbdd02a272fd61dd5c5cf26b6a60f2e203378ca0dc669edd731284b13bf5d9fdfae601209ae38ddf9647ad8e7091e7a46b6810cb5beb7e6a6
-  data.tar.gz: 7bf7e7e32dac50d8619ee1ac52e9bc501c2d1cb5585e391f7501ed2b6e7bd1ab67b265c7e7d1a4e2df5cc95e0077fcdd768faaf76d1b6e886894140b85669bec
+  metadata.gz: 307a0f3299bf032d2e043d0593b7b9ecba1de9958646495986a6c6462e8c47e49a1a5eadff5e3f2160a2bd8d7cd029b4d711cbc183c42dccedd55e238bcc1495
+  data.tar.gz: 22d1d18fa6e488813cf3836a1d76d085cf216a7f3bc2c5d55aeef8ad9f2d3f8c007f2c4d0896351bbf3d7ba8a8122e40fc7922c15734d1a0dc32a3642b708ea1

data/bin/asciidoctor-multipage

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+
+# This executable is based on `bin/asciidoctor-pdf` from the
+# asciidoctor/asciidoctor-pdf project. Please consult that file for
+# potential updates.
+
+require 'asciidoctor-multipage'
+require 'asciidoctor-multipage/version'
+require 'asciidoctor/cli'
+
+options = Asciidoctor::Cli::Options.new backend: 'multipage_html5'
+
+# FIXME (from asciidoctor-pdf) provide an API in Asciidoctor for sub-components to print version information
+unless ARGV != ['-v'] && (ARGV & ['-V', '--version']).empty?
+  $stdout.write %(Asciidoctor Multipage #{AsciidoctorMultipage::VERSION} using )
+  options.print_version
+  exit 0
+end
+
+# FIXME (from bespoke) This is a really bizarre API. Please make me simpler.
+if Integer === (result = options.parse! ARGV)
+  exit result
+else
+  invoker = Asciidoctor::Cli::Invoker.new options
+  GC.start
+  invoker.invoke!
+  exit invoker.code
+end

data/lib/asciidoctor-multipage/version.rb

@@ -0,0 +1,3 @@
+module AsciidoctorMultipage
+  VERSION = "0.0.15"
+end

data/lib/asciidoctor-multipage.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 
+require 'asciidoctor'
 require 'asciidoctor/converter/html5'
 
 class Asciidoctor::AbstractBlock
@@ -85,17 +86,11 @@ class Asciidoctor::Section
   # Sections. The sectnum is saved in section() below.
   def sectnum(delimiter = '.', append = nil)
     append ||= (append == false ? '' : delimiter)
-    if @level == 1
-      %(#{@numeral}#{append})
-    elsif @level > 1
-      if @parent.class == Asciidoctor::Section ||
-         (@mplevel && @parent.class == Asciidoctor::Document)
+    if @level > 1 and @parent.class == Asciidoctor::Section ||
+                      (@mplevel && @parent.class == Asciidoctor::Document)
         %(#{@parent.sectnum(delimiter)}#{@numeral}#{append})
-      else
-        %(#{@numeral}#{append})
-      end
-    else # @level == 0
-      %(#{Asciidoctor::Helpers.int_to_roman @numeral}#{append})
+    else
+      %(#{@numeral}#{append})
     end
   end
 end
@@ -268,14 +263,14 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
         # 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}>>)
+          links << %(← #{doc.attr('multipage-nav-previous-label') || "Previous"}: <<#{previous_page.id},#{previous_page.captioned_title}>>)
         end
-        links << %(↑ Up: <<#{parent_page.id}>>)
-        links << %(⌂ Home: <<#{home_page.id}>>) if home_page != parent_page
+        links << %(↑ #{doc.attr('multipage-nav-up-label') || "Up"}: <<#{parent_page.id},#{parent_page.captioned_title}>>)
+        links << %(⌂ #{doc.attr('multipage-nav-home-label') || "Home"}: <<#{home_page.id},#{home_page.captioned_title}>>) if home_page != parent_page
       end
       if page_index != pages.length-1
         next_page = pages[page_index+1]
-        links << %(Next: <<#{next_page.id}>> →)
+        links << %(#{doc.attr('multipage-nav-next-label') || "Next"}: <<#{next_page.id},#{next_page.captioned_title}>> →)
       end
       block = Asciidoctor::Block.new(parent = doc,
                                      context = :paragraph,
@@ -362,9 +357,17 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
       else
         attrs = node.role ? %( class="#{node.role}") : ''
         unless (text = node.text)
-          refid = node.attributes['refid']
-          if AbstractNode === (ref = (@refs ||= node.document.catalog[:refs])[refid])
-            text = (ref.xreftext node.attr('xrefstyle')) || %([#{refid}])
+          if AbstractNode === (ref = (@refs ||= node.document.catalog[:refs])[refid = node.attributes['refid']] || (refid.nil_or_empty? ? (top = get_root_document node) : nil))
+            if (@resolving_xref ||= (outer = true)) && outer
+              if (text = ref.xreftext node.attr 'xrefstyle', nil, true)
+                text = text.gsub DropAnchorRx, '' if text.include? '<a'
+              else
+                text = top ? '[^top]' : %([#{refid}])
+              end
+              @resolving_xref = nil
+            else
+              text = top ? '[^top]' : %([#{refid}])
+            end
           else
             text = %([#{refid}])
           end
@@ -402,7 +405,7 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
   # applicable for the current page.
   def new_outline_doc(node, new_parent:nil, for_page:nil)
     if node.class == Document
-      new_document = Document.new([])
+      new_document = Document.new([], {:doctype => node.doctype})
       new_document.mplevel = node.mplevel
       new_document.id = node.id
       new_document.update_attributes(node.attributes)
@@ -419,6 +422,7 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
                                 level = node.level,
                                 numbered = node.numbered)
       new_section.id = node.id
+      new_section.sectname = node.sectname
       new_section.caption = node.caption
       new_section.title = node.instance_variable_get(:@title)
       new_section.mplevel = node.mplevel
@@ -584,7 +588,6 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
     # Write remaining part/chapter pages
     outdir = ::File.dirname(target)
     ext = ::File.extname(target)
-    target_name = ::File.basename(target, ext)
     @pages.each do |doc|
       chapter_target = doc.id + ext
       outfile = ::File.join(outdir, chapter_target)
@@ -600,6 +603,10 @@ class MultipageHtml5CSS < Asciidoctor::Extensions::DocinfoProcessor
   at_location :head
 
   def process doc
+    # Disable this entirely if the multipage-disable-css attribute is set
+    if doc.attr('multipage-disable-css')
+      return
+    end
     css = []
     # Style Table Of Contents entry for current page
     css << %(.toc-current{font-weight: bold;})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-multipage
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.15
 platform: ruby
 authors:
 - Owen T. Heisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -89,11 +89,14 @@ dependencies:
 description: An Asciidoctor extension that generates HTML output using multiple pages
 email:
 - writer@owenh.net
-executables: []
+executables:
+- asciidoctor-multipage
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/asciidoctor-multipage
 - lib/asciidoctor-multipage.rb
+- lib/asciidoctor-multipage/version.rb
 homepage: https://github.com/owenh000/asciidoctor-multipage
 licenses:
 - MIT
@@ -116,8 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Asciidoctor multipage HTML output extension