asciidoctor-epub3 1.5.0.alpha.14 → 1.5.0.alpha.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61c778469422ef65c9ae4f3ca20cb326a61fca5fc4733eabd1eb8eb0a71f9c61
-  data.tar.gz: 8bac1f2fba3b11504dfe5a4020445fe4b2d2b9c6a01ecad1d9c1a1c45eb4ee3a
+  metadata.gz: 4404201f6335840b7c6bb344eed4870654ae7132a3a63309d3a3f64536da62f2
+  data.tar.gz: 252e5083cc9a5e1d589181ee0b141414f7182867ba763a1927271d72779ab4e2
 SHA512:
-  metadata.gz: b5663adeb39345f53a7e80f8f0b2ebdeb253bf70011fc1428e0322a63b9570d2ba539fa6595297e576445dc53b668f3da1dd463d9548cbcff2fca40d83fd75fe
-  data.tar.gz: 3d54e7f7ab62cd37306552267a7bd315fb6c970d185cf976912c0a57aac24b7f315386dbcd1d7e1c67afb038f66a17281e73c27c3f92ecaaa416bbddad8a0d16
+  metadata.gz: e85119f2680e17c119d1997e9272e14630c64caae39c27a2055ec60cf617399d95154e1cf3de41f2eedebc9b73a373f2028c3c854cb1d779da3adfde3c79c0f8
+  data.tar.gz: ef099d1233ad69d99e0985ba6f9580d99f80ccdc824d036505f5507adf18fad79a8643684f111665d086147558a41eec4513db95be5d93d6e4d1bf46d35a3dba

data/CHANGELOG.adoc

@@ -5,6 +5,16 @@
 This document provides a high-level view of the changes to the {project-name} by release.
 For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
 
+== 1.5.0.alpha.15 (2020-03-11) - @slonopotamus
+
+* support section numbering and captions (#20)
+* fix `\<<anchor,link text>>` to show link text (#317)
+* add xref ids to paragraphs (#317)
+* support syntax highlighting with CodeRay and Rouge (#262)
+* pygments.rb is no longer auto-activated
+* add series metadata (#307)
+* fix Sony Reader crash (#152)
+
 == 1.5.0.alpha.14 (2020-02-29) - @slonopotamus
 
 * support conversion of article documents to a single-chapter file

data/Gemfile

@@ -17,9 +17,4 @@ group :optional do
   # We would like to make kindlegen a runtime dependency, but can't because of the way asciidoctorj-epub3 packaging works
   # See https://github.com/asciidoctor/asciidoctor-epub3/issues/288
   gem 'kindlegen', '~> 3.0.3'
-  gem 'pygments.rb', '1.2.1'
-end
-
-group :docs do
-  gem 'yard', require: false
 end

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2014-2020 OpenDevise Inc. and the Asciidoctor Project
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.

data/README.adoc

@@ -1,6 +1,6 @@
 = {project-name}: A _native_ EPUB3 converter for AsciiDoc
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v1.5.0.alpha.14, 2020-02-29
+v1.5.0.alpha.15, 2020-03-11
 // Settings:
 :experimental:
 :idprefix:
@@ -50,7 +50,6 @@ endif::[]
 
 ifdef::status[]
 image:https://img.shields.io/gem/v/asciidoctor-epub3.svg[Latest Release,link={uri-gem}]
-image:https://img.shields.io/badge/license-MIT-blue.svg[MIT License,link=#copyright]
 image:{uri-repo}/workflows/CI/badge.svg[GitHub Actions,link={uri-ci}]
 endif::[]
 
@@ -103,7 +102,7 @@ Of course, there's always room for improvement, so we'll continue to work with y
 * EPUB3 metadata, manifest and spine (assembled by Gepub)
 * Document metadata (title, authors, subject, keywords, etc.)
 * Internal cross reference links
-* Syntax highlighting with CodeRay or Pygments (must use inline styles)
+* Syntax highlighting with Rouge, CodeRay or Pygments
 * Unicode callout numbers
 * Page breaks avoided in block content (so much as it's supported by the e-reader)
 * Orphan section titles avoided (so much as it's supported by the e-reader)
@@ -160,7 +159,6 @@ Here's an example showing the structure of a book:
 Author Name
 :doctype: book
 :imagesdir: images
-\ifndef::ebook-format[:leveloffset: 1]
 //...and so on
 
 == Chapter One
@@ -198,26 +196,28 @@ You can install the published gem using the following command:
 This optional environment variable tells the gem installer to link against the C libraries on the system, if available, instead of compiling the libraries from scratch.
 This speeds up the installation of Nokogiri considerably.
 
-If you want to syntax highlight source listings, you'll also want to install CodeRay or Pygments.
+If you want to syntax highlight source listings, you'll also want to install Rouge, CodeRay or Pygments.
 Choose one (or more) of the following:
 
+.Rouge
+ $ gem install rouge
+
 .CodeRay
  $ gem install coderay
 
 .Pygments
  $ gem install pygments.rb
 
-You then activate syntax highlighting for a given document by adding the `source-highlighter` attribute to the document header (CodeRay shown):
+You then activate syntax highlighting for a given document by adding the `source-highlighter` attribute to the document header (Rouge shown):
 
 [source,asciidoc]
 ----
-:source-highlighter: coderay
+:source-highlighter: rouge
 ----
 
-NOTE: At the moment, Pygments is automatically used if it's available.
-If a style is not specified, the black and white theme (i.e., bw) is used.
-This default is used so that the syntax highlighting is legibile regardless of which reading mode the reader selects (white, black, sepia, etc).
-To override this default, you must pass a valid Pygments style name to the `pygments-style` attribute when invoking the `asciidoctor-epub3` script (e.g., `-a pygments-style=pastie`).
+NOTE: If a style is not specified, the black and white theme (i.e., bw) is used.
+This default is used so that the syntax highlighting is legible regardless of which reading mode the reader selects (white, black, sepia, etc).
+To override this default, you must set `<highlighter>-style` document header attribute to a valid highlighter style name (e.g., `:rouge-style: pastie`).
 
 Assuming all the required gems install properly, verify you can run the `asciidoctor-epub3` script:
 
@@ -298,6 +298,10 @@ The recommended practice is to identify the referenced resource by means of a st
 |An optional override of the properties attribute for this document's item in the manifest.
 _Only applies to a chapter document._
 
+|series-name, series-volume, series-id
+|Populates the series statements (`belongs-to-collection`) in the package metadata.
+Volume is a number, ID probably a UUID that is constant for all volumes in the series.
+
 |epub3-frontmatterdir
 |The path to a directory that contains frontmatter files. The file names must match `front-matter*.html` and will be included in alphabetic order. The files are expected to be valid EPUB HTML files. _If only one front matter page is
  required, the default 'front-matter.html' file can be used instead._
@@ -885,7 +889,7 @@ endif::[]
 Copyright (C) 2014-2019 OpenDevise Inc. and the Asciidoctor Project.
 Free use of this software is granted under the terms of the MIT License.
 
-For the full text of the license, see the <<LICENSE#,LICENSE>> file.
+For the full text of the license, see the link:LICENSE[] file.
 Refer to the <<NOTICE#,NOTICE>> file for information about third-party Open Source software in use.
 
 ////

data/asciidoctor-epub3.gemspec

@@ -24,14 +24,17 @@ An extension for Asciidoctor that converts AsciiDoc documents to EPUB3 and KF8/M
   rescue
     Dir['**/*']
   end
-  s.files = files.grep %r/^(?:(?:data\/(?:fonts|images|styles)|lib)\/.+|Gemfile|Rakefile|(?:CHANGELOG|LICENSE|NOTICE|README)\.adoc|\.yardopts|#{s.name}\.gemspec)$/
+  s.files = files.grep %r/^(?:(?:data\/(?:fonts|images|styles)|lib)\/.+|Gemfile|Rakefile|LICENSE|(?:CHANGELOG|NOTICE|README)\.adoc|\.yardopts|#{s.name}\.gemspec)$/
   s.executables = %w(asciidoctor-epub3 adb-push-ebook)
   s.test_files = s.files.grep(/^(?:test|spec|feature)\/.*$/)
 
   s.require_paths = ['lib']
 
   s.add_development_dependency 'asciidoctor-diagram', '>= 1.5.0', '< 3.0.0'
+  s.add_development_dependency 'coderay', '~> 1.1.0'
+  s.add_development_dependency 'pygments.rb', '~> 1.2.0'
   s.add_development_dependency 'rake', '~> 13.0.0'
+  s.add_development_dependency 'rouge', '~> 3.0'
   s.add_development_dependency 'rspec', '~> 3.9.0'
   s.add_development_dependency 'rubocop', '~> 0.80.0'
   s.add_development_dependency 'rubocop-rspec', '~> 1.38.0'

data/data/styles/epub3-css3-only.css

@@ -28,8 +28,7 @@ body.gitden-reader {
 }*/
 
 /* Use tighter margins and smaller font (18px) on phones (Nexus 4 and smaller) */
-@media only screen and (max-device-width: 768px) and (max-device-height: 1280px),
-only screen and (max-device-width: 1280px) and (max-device-height: 768px) {
+@media only screen and (max-device-width: 768px) and (max-device-height: 1280px), only screen and (max-device-width: 1280px) and (max-device-height: 768px) {
   body.gitden-reader,
   body.namo-epub-library {
     font-size: 112.5%;
@@ -38,7 +37,6 @@ only screen and (max-device-width: 1280px) and (max-device-height: 768px) {
   /*body.gitden-reader {
     margin: 0 5pt !important;
   }*/
-
   /*body.namo-epub-library > section.chapter {
     margin: 0 5pt;
   }*/
@@ -69,7 +67,6 @@ body code, body kbd, body pre, pre :not(code) {
   /*body {
     margin: 0 !important;
   }*/
-
   /* text-rendering is the only way to enable kerning in Kindle (and Calibre, though it seems to kern automatically) */
   /* personally, I think Kindle overdoes kerning, but we're running with it for now */
   /* text-rendering: optimizeLegibility kills certain Kindle eInk devices */
@@ -78,7 +75,6 @@ body code, body kbd, body pre, pre :not(code) {
   th, td, figcaption, caption {
     text-rendering: optimizeLegibility;
   }*/
-
   /* hack line height of subtitle using floats on Kindle */
   h1.chapter-title .subtitle {
     margin-top: -0.2em;
@@ -105,8 +101,7 @@ body code, body kbd, body pre, pre :not(code) {
 }
 
 /* Use darker font colors on Kindle Paperwhite */
-@media amzn-kf8 and (device-height: 1024px) and (device-width: 758px),
-    amzn-kf8 and (device-height:  758px) and (device-width: 1024px) {
+@media amzn-kf8 and (device-height: 1024px) and (device-width: 758px), amzn-kf8 and (device-height: 758px) and (device-width: 1024px) {
   body p,
   div.abstract > p,
   ul, ol, li, dl, dt, dd, footer,
@@ -131,7 +126,7 @@ body code, body kbd, body pre, pre :not(code) {
     color: #191918;
     border-bottom-color: #191918;
   }
-  
+
   h1.chapter-title .subtitle,
   .chapter-header p.byline {
     color: #000000;

data/data/styles/epub3.css

@@ -215,8 +215,8 @@ body a:link {
 body:first-of-type a:link {
   border-bottom: none;
   background-repeat: no-repeat;
-  background-image: -webkit-linear-gradient(left, rgba(255,255,255,0) 0%, #666665 5%, #666665 95%, rgba(255,255,255,0) 100%);
-  background-image: linear-gradient(to right, rgba(255,255,255,0) 0%, #666665 5%, #666665 95%, rgba(255,255,255,0) 100%);
+  background-image: -webkit-linear-gradient(left, rgba(255, 255, 255, 0) 0%, #666665 5%, #666665 95%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, #666665 5%, #666665 95%, rgba(255, 255, 255, 0) 100%);
   background-size: 100% 1px;
   background-position: 0 1.2em;
 }
@@ -905,7 +905,7 @@ pre {
   font-size: 0.85em;
   line-height: 1.4; /* matches what Kindle uses and can't go less */
   background-color: #F2F2F2;
-  padding: 0.5rem 0.75rem;
+  padding: 0.6em 0.9em; /* this is supposed to be '0.5rem 0.75rem' but Sony Readers crash when see that (at least, PRS-350, PRS-505, PRS-T1) */
   /*
   border-top: 3px solid #DCDCDE;
   */
@@ -1028,8 +1028,8 @@ aside.note::before {
 }
 
 aside[class~="note"] > div[class~="content"] {
-  background-image: -webkit-linear-gradient(left, rgba(255,255,255,0) 42.5%, #FFC14F 45%, #FFC14F 55%, rgba(255,255,255,0) 57.5%);
-  background-image: linear-gradient(to right, rgba(255,255,255,0) 42.5%, #FFC14F 45%, #FFC14F 55%, rgba(255,255,255,0) 57.5%);
+  background-image: -webkit-linear-gradient(left, rgba(255, 255, 255, 0) 42.5%, #FFC14F 45%, #FFC14F 55%, rgba(255, 255, 255, 0) 57.5%);
+  background-image: linear-gradient(to right, rgba(255, 255, 255, 0) 42.5%, #FFC14F 45%, #FFC14F 55%, rgba(255, 255, 255, 0) 57.5%);
 }
 
 aside.tip::before {
@@ -1038,8 +1038,8 @@ aside.tip::before {
 }
 
 aside[class~="tip"] > div[class~="content"] {
-  background-image: -webkit-linear-gradient(left, rgba(255,255,255,0) 42.5%, #40403E 45%, #40403E 55%, rgba(255,255,255,0) 57.5%);
-  background-image: linear-gradient(to right, rgba(255,255,255,0) 42.5%, #40403E 45%, #40403E 55%, rgba(255,255,255,0) 57.5%);
+  background-image: -webkit-linear-gradient(left, rgba(255, 255, 255, 0) 42.5%, #40403E 45%, #40403E 55%, rgba(255, 255, 255, 0) 57.5%);
+  background-image: linear-gradient(to right, rgba(255, 255, 255, 0) 42.5%, #40403E 45%, #40403E 55%, rgba(255, 255, 255, 0) 57.5%);
 }
 
 aside.caution::before {
@@ -1048,8 +1048,8 @@ aside.caution::before {
 }
 
 aside[class~="caution"] > div[class~="content"] {
-  background-image: -webkit-linear-gradient(left, rgba(255,255,255,0) 42.5%, #7F7F7D 45%, #7F7F7D 55%, rgba(255,255,255,0) 57.5%);
-  background-image: linear-gradient(to right, rgba(255,255,255,0) 42.5%, #7F7F7D 45%, #7F7F7D 55%, rgba(255,255,255,0) 57.5%);
+  background-image: -webkit-linear-gradient(left, rgba(255, 255, 255, 0) 42.5%, #7F7F7D 45%, #7F7F7D 55%, rgba(255, 255, 255, 0) 57.5%);
+  background-image: linear-gradient(to right, rgba(255, 255, 255, 0) 42.5%, #7F7F7D 45%, #7F7F7D 55%, rgba(255, 255, 255, 0) 57.5%);
 }
 
 aside.warning::before {
@@ -1058,8 +1058,8 @@ aside.warning::before {
 }
 
 aside[class~="warning"] > div[class~="content"] {
-  background-image: -webkit-linear-gradient(left, rgba(255,255,255,0) 42.5%, #C83737 45%, #C83737 55%, rgba(255,255,255,0) 57.5%);
-  background-image: linear-gradient(to right, rgba(255,255,255,0) 42.5%, #C83737 45%, #C83737 55%, rgba(255,255,255,0) 57.5%);
+  background-image: -webkit-linear-gradient(left, rgba(255, 255, 255, 0) 42.5%, #C83737 45%, #C83737 55%, rgba(255, 255, 255, 0) 57.5%);
+  background-image: linear-gradient(to right, rgba(255, 255, 255, 0) 42.5%, #C83737 45%, #C83737 55%, rgba(255, 255, 255, 0) 57.5%);
 }
 
 aside.important::before {
@@ -1068,8 +1068,8 @@ aside.important::before {
 }
 
 aside[class~="important"] > div[class~="content"] {
-  background-image: -webkit-linear-gradient(left, rgba(255,255,255,0) 42.5%, #F2642A 45%, #F2642A 55%, rgba(255,255,255,0) 57.5%);
-  background-image: linear-gradient(to right, rgba(255,255,255,0) 42.5%, #F2642A 45%, #F2642A 55%, rgba(255,255,255,0) 57.5%);
+  background-image: -webkit-linear-gradient(left, rgba(255, 255, 255, 0) 42.5%, #F2642A 45%, #F2642A 55%, rgba(255, 255, 255, 0) 57.5%);
+  background-image: linear-gradient(to right, rgba(255, 255, 255, 0) 42.5%, #F2642A 45%, #F2642A 55%, rgba(255, 255, 255, 0) 57.5%);
 }
 
 aside.admonition > h2 {
@@ -1257,9 +1257,11 @@ nav#toc ol {
   table.table th, table.table td, div.verse .attribution {
     font-family: serif;
   }
+
   h1, h2, h3, h4, h5, h6 {
     font-family: sans-serif;
   }
+
   code, kbd, pre, i.conum {
     font-family: monospace;
   }

data/lib/asciidoctor-epub3/converter.rb

@@ -111,12 +111,35 @@ module Asciidoctor
       # See https://asciidoctor.org/docs/user-manual/#book-parts-and-chapters
       def get_chapter_name node
         if node.document.doctype != 'book'
-          return Asciidoctor::Document === node ? node.attr('docname') : nil
+          return Asciidoctor::Document === node ? node.attr('docname') || node.id : nil
         end
         return (node.id || 'preamble') if node.context == :preamble && node.level == 0
         Asciidoctor::Section === node && node.level <= 1 ? node.id : nil
       end
 
+      def get_numbered_title node
+        doc_attrs = node.document.attributes
+        level = node.level
+        if node.caption
+          title = node.captioned_title
+        elsif node.respond_to?(:numbered) && node.numbered && level <= (doc_attrs['sectnumlevels'] || 3).to_i
+          if level < 2 && node.document.doctype == 'book'
+            if node.sectname == 'chapter'
+              title = %(#{(signifier = doc_attrs['chapter-signifier']) ? "#{signifier} " : ''}#{node.sectnum} #{node.title})
+            elsif node.sectname == 'part'
+              title = %(#{(signifier = doc_attrs['part-signifier']) ? "#{signifier} " : ''}#{node.sectnum nil, ':'} #{node.title})
+            else
+              title = %(#{node.sectnum} #{node.title})
+            end
+          else
+            title = %(#{node.sectnum} #{node.title})
+          end
+        else
+          title = node.title
+        end
+        title
+      end
+
       def convert_document node
         @format = node.attr('ebook-format').to_sym
 
@@ -182,6 +205,18 @@ module Asciidoctor
           @book.metadata.add_metadata 'subject', s
         end
 
+        if node.attr? 'series-name'
+          series_name = node.attr 'series-name'
+          series_volume = node.attr 'series-volume', 1
+          series_id = node.attr 'series-id'
+
+          series_meta = @book.metadata.add_metadata 'meta', series_name, id: 'pub-collection', group_position: series_volume
+          series_meta['property'] = 'belongs-to-collection'
+          series_meta.refine 'dcterms:identifier', series_id unless series_id.nil?
+          # Calibre only understands 'series'
+          series_meta.refine 'collection-type', 'series'
+        end
+
         add_cover_image node
         add_front_matter_page node
 
@@ -273,7 +308,7 @@ module Asciidoctor
         elsif node.title
           # HACK: until we get proper handling of title-only in CSS
           title = ''
-          subtitle = node.title
+          subtitle = get_numbered_title node
         else
           title = nil
           subtitle = nil
@@ -321,6 +356,9 @@ module Asciidoctor
 </div>
 </header>) : ''
 
+        # TODO : support writing code highlighter CSS to a separate file
+        linkcss = false
+
         # NOTE kindlegen seems to mangle the <header> element, so we wrap its content in a div
         lines = [%(<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="#{lang = node.document.attr 'lang', 'en'}" lang="#{lang}">
@@ -337,12 +375,17 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
   }
   document.body.setAttribute('class', reader.name.toLowerCase().replace(/ /g, '-'));
 });
-]]></script>
-</head>
+]]></script>)]
+
+        if self.class.supports_highlighter_docinfo? && (syntax_hl = node.document.syntax_highlighter) && (syntax_hl.docinfo? :head)
+          lines << (syntax_hl.docinfo :head, node, linkcss: linkcss, self_closing_tag_slash: '/')
+        end
+
+        lines << %(</head>
 <body>
 <section class="chapter" title="#{doctitle_sanitized.gsub '"', '&quot;'}" epub:type="chapter" id="#{docid}">
 #{header}
-#{content})]
+        #{content})
 
         unless (fns = node.document.footnotes - @footnotes).empty?
           @footnotes += fns
@@ -361,8 +404,11 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
 </footer>'
         end
 
-        lines << '</section>
-</body>
+        lines << '</section>'
+
+        lines << (syntax_hl.docinfo :footer, node.document, linkcss: linkcss, self_closing_tag_slash: '/') if syntax_hl && (syntax_hl.docinfo? :footer)
+
+        lines << '</body>
 </html>'
 
         chapter_item.add_content postprocess_xhtml lines * LF
@@ -380,7 +426,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
           hlevel = node.level
           epub_type_attr = node.special ? %( epub:type="#{node.sectname}") : ''
           div_classes = [%(sect#{node.level}), node.role].compact
-          title = node.title
+          title = get_numbered_title node
           title_sanitized = xml_sanitize title
           %(<section class="#{div_classes * ' '}" title="#{title_sanitized}"#{epub_type_attr}>
 <h#{hlevel} id="#{node.id}">#{title}</h#{hlevel}>#{(content = node.content).empty? ? '' : %(
@@ -427,15 +473,16 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
       end
 
       def convert_paragraph node
+        id_attr = node.id ? %( id="#{node.id}") : ''
         role = node.role
         # stack-head is the alternative to the default, inline-head (where inline means "run-in")
         head_stop = node.attr 'head-stop', (role && (node.has_role? 'stack-head') ? nil : '.')
         head = node.title? ? %(<strong class="head">#{title = node.title}#{head_stop && title !~ TrailingPunctRx ? head_stop : ''}</strong> ) : ''
         if role
           node.set_option 'hardbreaks' if node.has_role? 'signature'
-          %(<p class="#{role}">#{head}#{node.content}</p>)
+          %(<p#{id_attr} class="#{role}">#{head}#{node.content}</p>)
         else
-          %(<p>#{head}#{node.content}</p>)
+          %(<p#{id_attr}>#{head}#{node.content}</p>)
         end
       end
 
@@ -498,13 +545,29 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
       end
 
       def convert_listing node
+        nowrap = (node.option? 'nowrap') || !(node.document.attr? 'prewrap')
+        if node.style == 'source'
+          lang = node.attr 'language'
+          if self.class.supports_highlighter_docinfo? && (syntax_hl = node.document.syntax_highlighter)
+            opts = syntax_hl.highlight? ? {
+              css_mode: ((doc_attrs = node.document.attributes)[%(#{syntax_hl.name}-css)] || :class).to_sym,
+              style: doc_attrs[%(#{syntax_hl.name}-style)],
+            } : {}
+            opts[:nowrap] = nowrap
+          else
+            pre_open = %(<pre class="highlight#{nowrap ? ' nowrap' : ''}"><code#{lang ? %( class="language-#{lang}" data-lang="#{lang}") : ''}>)
+            pre_close = '</code></pre>'
+          end
+        else
+          pre_open = %(<pre#{nowrap ? ' class="nowrap"' : ''}>)
+          pre_close = '</pre>'
+          syntax_hl = nil
+        end
         figure_classes = ['listing']
         figure_classes << 'coalesce' if node.option? 'unbreakable'
-        pre_classes = node.style == 'source' ? ['source', %(language-#{node.attr 'language'})] : ['screen']
-        title_div = node.title? ? %(<figcaption>#{node.captioned_title}</figcaption>
-) : ''
-        %(<figure class="#{figure_classes * ' '}">
-#{title_div}<pre class="#{pre_classes * ' '}"><code>#{node.content}</code></pre>
+        title_div = node.title? ? %(<figcaption>#{get_numbered_title node}</figcaption>) : ''
+        %(<figure class="#{figure_classes * ' '}">#{title_div}
+        #{syntax_hl ? (syntax_hl.format node, lang, opts) : pre_open + (node.content || '') + pre_close}
 </figure>)
       end
 
@@ -901,7 +964,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
               end
 
               id_attr = '' unless @xrefs_seen.add? refid
-              text = (ref.xreftext node.attr('xrefstyle', nil, true))
+              text ||= (ref.xreftext node.attr('xrefstyle', nil, true))
             else
               logger.warn %(#{::File.basename doc.attr('docfile')}: invalid reference to unknown anchor: #{refid})
             end
@@ -1266,14 +1329,14 @@ body > svg {
         items.each do |item|
           #index = (state[:index] = (state.fetch :index, 0) + 1)
           if (chapter_name = get_chapter_name item).nil?
-            item_label = sanitize_xml item.title, :pcdata
+            item_label = sanitize_xml get_numbered_title(item), :pcdata
             item_href = %(#{state[:content_doc_href]}##{item.id})
           else
             # NOTE we sanitize the chapter titles because we use formatting to control layout
             if item.context == :document
               item_label = sanitize_doctitle_xml item, :cdata
             else
-              item_label = sanitize_xml item.title, :cdata
+              item_label = sanitize_xml get_numbered_title(item), :cdata
             end
             item_href = (state[:content_doc_href] = %(#{chapter_name}.xhtml))
           end
@@ -1316,13 +1379,13 @@ body > svg {
           index = (state[:index] = (state.fetch :index, 0) + 1)
           item_id = %(nav_#{index})
           if (chapter_name = get_chapter_name item).nil?
-            item_label = sanitize_xml item.title, :cdata
+            item_label = sanitize_xml get_numbered_title(item), :cdata
             item_href = %(#{state[:content_doc_href]}##{item.id})
           else
             if item.context == :document
               item_label = sanitize_doctitle_xml item, :cdata
             else
-              item_label = sanitize_xml item.title, :cdata
+              item_label = sanitize_xml get_numbered_title(item), :cdata
             end
             item_href = (state[:content_doc_href] = %(#{chapter_name}.xhtml))
           end
@@ -1498,6 +1561,14 @@ body > svg {
       def role_valid_class? role
         role.is_a? String
       end
+
+      class << self
+        def supports_highlighter_docinfo?
+          # Asciidoctor only got pluggable syntax highlighters since 2.0:
+          # https://github.com/asciidoctor/asciidoctor/commit/23ddbaed6818025cbe74365fec7e8101f34eadca
+          Asciidoctor::Document.method_defined? :syntax_highlighter
+        end
+      end
     end
 
     class DocumentIdGenerator
@@ -1561,13 +1632,16 @@ body > svg {
     Extensions.register do
       if (document = @document).backend == 'epub3'
         document.set_attribute 'listing-caption', 'Listing'
-        # pygments.rb hangs on JRuby for Windows, see https://github.com/asciidoctor/asciidoctor-epub3/issues/253
-        if !(::RUBY_ENGINE == 'jruby' && Gem.win_platform?) && (Gem.try_activate 'pygments.rb')
-          if document.set_attribute 'source-highlighter', 'pygments'
-            document.set_attribute 'pygments-css', 'style'
-            document.set_attribute 'pygments-style', 'bw'
-          end
+
+        # TODO: bw theme for CodeRay
+        document.set_attribute 'pygments-style', 'bw' unless document.attr? 'pygments-style'
+        document.set_attribute 'rouge-style', 'bw' unless document.attr? 'rouge-style'
+        unless Converter.supports_highlighter_docinfo?
+          document.set_attribute 'coderay-css', 'style'
+          document.set_attribute 'pygments-css', 'style'
+          document.set_attribute 'rouge-css', 'style'
         end
+
         case (ebook_format = document.attributes['ebook-format'])
         when 'epub3', 'kf8'
           # all good

data/lib/asciidoctor-epub3/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Epub3
-    VERSION = '1.5.0.alpha.14'
+    VERSION = '1.5.0.alpha.15'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-epub3
 version: !ruby/object:Gem::Version
-  version: 1.5.0.alpha.14
+  version: 1.5.0.alpha.15
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-29 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor-diagram
@@ -31,6 +31,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: pygments.rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +73,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 13.0.0
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -132,10 +174,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".yardopts"
 - CHANGELOG.adoc
 - Gemfile
-- LICENSE.adoc
+- LICENSE
 - NOTICE.adoc
 - README.adoc
 - Rakefile

data/.yardopts

@@ -1,12 +0,0 @@
---charset UTF-8
---readme README.adoc
---no-private
---hide-api private
---title "Asciidoctor EPUB3 API Docs"
---output-dir apidoc
---exclude /ext(?:\.rb$|/)
-lib/**/*.rb
--
-CHANGELOG.adoc
-LICENSE.adoc
-NOTICE.adoc

data/LICENSE.adoc

@@ -1,25 +0,0 @@
-[[LICENSE]]
-= LICENSE
-
-.The MIT License
-....
-Copyright (C) 2014-2019 OpenDevise Inc. and the Asciidoctor Project
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-....