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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61c778469422ef65c9ae4f3ca20cb326a61fca5fc4733eabd1eb8eb0a71f9c61
-  data.tar.gz: 8bac1f2fba3b11504dfe5a4020445fe4b2d2b9c6a01ecad1d9c1a1c45eb4ee3a
+  metadata.gz: 30d660ed4a7fc21dc01c61ae77515dbba77dd8bbbd7618e45709f7048745040c
+  data.tar.gz: f3b2d04be71c163e9ed29ae907f2a2c2ab00ecd3e6ecb329775952b5853ebf9d
 SHA512:
-  metadata.gz: b5663adeb39345f53a7e80f8f0b2ebdeb253bf70011fc1428e0322a63b9570d2ba539fa6595297e576445dc53b668f3da1dd463d9548cbcff2fca40d83fd75fe
-  data.tar.gz: 3d54e7f7ab62cd37306552267a7bd315fb6c970d185cf976912c0a57aac24b7f315386dbcd1d7e1c67afb038f66a17281e73c27c3f92ecaaa416bbddad8a0d16
+  metadata.gz: 06fb18e09b9ec33401e46168f85436c871accb1f3774b51a8f29373185ba1a538bb2f7a00663e37a43c778238b8bd55ac01883b58f8a173041b0fcb20acdea91
+  data.tar.gz: 248b718e05d9e8750dbb44117de81a04cdde271da64f96b720f145e54de61a19cf79d29e7f2dd4b2664f84b9c534c38d94ca84e6e87982839a31144c0cf0a3f2

data/CHANGELOG.adoc

@@ -5,6 +5,54 @@
 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.19 (2020-10-21) - @slonopotamus
+
+* add title and id support for literal blocks (#357)
+* fix quotes not being properly escaped in section titles (#358)
+* fix crash when encountering unsupported Asciidoctor node (#360)
+* add support for 100%-wide table (#356)
+* do not add multiple entries for same media files in book manifest (#370)
+* do not add bogus entries to manifest when `:data-uri:` attribute is set (#371)
+* add id support for listing blocks (#372)
+* stop using deprecated `epub:type` for admonitions (#373)
+* fix `epub:type` attributes for special sections (#374)
+* fix font resize not working in iBooks (#368)
+* fix visited link color in iBooks night mode (#366)
+
+== 1.5.0.alpha.18 (2020-07-27) - @slonopotamus
+
+* remove <b> from chapter subtitle (#123)
+* improve tables support: cell content alignment, column width (#350)
+* fix chapter titles to actually be chapter titles instead of document title (#343)
+* store syntax highlighter CSS in a separate file (#339)
+* initial landmarks support: appendix, bibliography, bodymatter, cover, frontmatter, glossary, index, preface, toc (#174)
+* add support for in-document table of contents via `:toc:` document attribute (#174)
+* add support for MathML (#10)
+* rescale color palette to use darker shades of gray (#338)
+* gracefully handle invalid `:front-cover-image:` value (#353)
+
+== 1.5.0.alpha.17 (2020-05-25) - @slonopotamus
+
+* support remote URLs for audio/video/image (#333, #334)
+
+== 1.5.0.alpha.16 (2020-04-26) - @slonopotamus
+
+* add basic audio and video support (#9)
+* add support for `[horizontal]` definition list (#165)
+* add proper handling of `:data-uri:` document attribute (#324)
+* add support for customizable document splitting into chapters via `epub-chapter-level` attribute (#327)
+* avoid outputting 'true' for unsupported blocks (#332)
+
+== 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
@@ -78,6 +126,7 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 * upgrade pygments.rb to 1.2.1 (#216)
 * gepub dependency is no longer locked to 1.0.2 and will use latest 1.0.x version
 * fix `-a ebook-validate` not working on Windows (#232)
+* fix crash when inline pass macro `m` contains an icon (#375)
 
 == 1.5.0.alpha.9 (2019-04-04) - @mojavelinux
 

data/Gemfile

@@ -13,13 +13,5 @@ end
 
 group :optional do
   # epubcheck-ruby might be safe to be converted into runtime dependency, but could have issues when packaged into asciidoctorj-epub3
-  gem 'epubcheck-ruby', '~> 4.2.2.0'
-  # 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
+  gem 'epubcheck-ruby', '~> 4.2.4.0'
 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.19, 2020-10-21
 // Settings:
 :experimental:
 :idprefix:
@@ -27,31 +27,30 @@ endif::[]
 :project-handle: asciidoctor-epub3
 // URIs:
 :uri-project: https://github.com/asciidoctor/{project-handle}
-:uri-gem: http://rubygems.org/gems/asciidoctor-epub3
+:uri-gem: https://rubygems.org/gems/asciidoctor-epub3
 :uri-repo: {uri-project}
 :uri-issues: {uri-repo}/issues
-:uri-ci: {uri-repo}/actions?query=workflow%3ACI
-:uri-discuss: http://discuss.asciidoctor.org
+:uri-ci: {uri-repo}/actions?query=branch%3Amaster
+:uri-discuss: https://discuss.asciidoctor.org/
 :uri-rvm: https://rvm.io
-:uri-asciidoctor: http://asciidoctor.org
+:uri-asciidoctor: https://asciidoctor.org/
 :uri-idpf: http://www.idpf.org/
 :uri-epub: http://www.idpf.org/epub/31/spec/epub-spec.html
-:uri-epubcheck: https://github.com/idpf/epubcheck
-:uri-kindlegen: http://www.amazon.com/gp/feature.html?docId=1000765211
+:uri-epubcheck: https://github.com/w3c/epubcheck
+:uri-kindlegen: https://www.amazon.com/gp/feature.html?docId=1000765211
 :uri-kf8: http://www.amazon.com/gp/feature.html?docId=1000729511
 :uri-send-to-kindle: https://www.amazon.com/gp/sendtokindle/
 :uri-metadata-elem: http://www.idpf.org/epub/30/spec/epub30-publications.html#sec-metadata-elem
-:uri-dc: http://dublincore.org/documents/2004/12/20/dces
+:uri-dc: https://www.dublincore.org/specifications/dublin-core/dces/2004-12-20/
 :uri-github-guides: https://guides.github.com
 :uri-github-guides-fork: https://github.com/opendevise/github-guides-asciidoc
-:uri-asciidoctor-i18n: http://asciidoctor.org/docs/user-manual/#builtin-attributes-i18n
+:uri-asciidoctor-i18n: https://asciidoctor.org/docs/user-manual/#builtin-attributes-i18n
 :uri-epubreadingsystem: http://www.idpf.org/epub/301/spec/epub-contentdocs.html#app-epubReadingSystem
-:uri-android-sdk: http://developer.android.com/sdk/index.html
+:uri-android-sdk: https://developer.android.com/sdk/index.html
 
 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}]
+image:{uri-repo}/workflows/CI/badge.svg?branch=master[GitHub Actions,link={uri-ci}]
 endif::[]
 
 {project-name} is a set of Asciidoctor extensions for converting AsciiDoc documents directly to the EPUB3 and KF8/MOBI e-book formats.
@@ -103,12 +102,13 @@ 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)
 * Table border settings honored
 * Support for SVG images in the content
+* Stem blocks via AsciiMath
 
 === Project Status
 
@@ -122,7 +122,7 @@ We may explore the use of fixed layout documents in the future if the need arise
 ifdef::env-github[]
 === Planned Features and Work In Progress
 
-See <<WORKLOG#,WORKLOG.adoc>>.
+See link:WORKLOG.adoc[].
 endif::[]
 
 == Converter Workflow
@@ -141,6 +141,7 @@ Like other converters, Asciidoctor EPUB3 handles this chunking task by automatic
 
 When `doctype` attribute is set to `book`, each top-level section will become a separate ebook "chapter" file.
 This includes preface, bibliography, appendix, etc.
+This behavior can be configured via `epub-chapter-level` document attribute.
 
 Otherwise, whole document is converted to a single ebook chapter.
 
@@ -160,7 +161,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 +198,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 +300,17 @@ 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._
 
+|epub-chapter-level
+|Specify the section level at which to split the EPUB into separate "chapter" files.
+This attribute only affects documents with `:doctype: book`.
+The default is to split into chapters at level-1 sections.
+This attribute only affects the internal composition of the EPUB, not the way chapters and sections are displayed to users.
+Some readers may be slow if the chapter files are too large, so for large documents with few level-1 headings, one might want to use a chapter level of 2 or 3.
+
+|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._
@@ -309,6 +322,12 @@ _Only applies to a chapter document._
 |Used to control the inclusion of special content in the generated HTML.
 If set to a value other than book, the byline information (author and avatar) is included below the chapter header and a typographic end mark is added at the end of the last paragraph.
 Suggested values include: book (default), article.
+
+|toc
+|Adds table of contents at the beginning of the book. Depth is controlled by `:toclevels:` attribute.
+
+|outlinelevels
+|Sets the depth of table of contents metadata. If not set, defaults to `:toclevels:`
 |===
 
 When using the EPUB3 converter, the `ebook-format` attribute resolves to the name of the e-book format being generated (epub3 or kf8) and the corresponding attribute `ebook-format-<name>` is defined, where `<name>` is `epub3` or `kf8`.
@@ -590,7 +609,7 @@ The theme's fonts are located in the [path]_data/fonts_ directory.
 The M+ Outline fonts are used for titles, headings, literal (monospace) text, and annotation numbers.
 The body text uses Noto Serif.
 Admonition icons and the end-of-chapter mark are from the Font Awesome icon font.
-Refer to the <<NOTICE#,NOTICE>> file for further information about the fonts.
+Refer to the link:NOTICE.adoc[] file for further information about the fonts.
 
 // TODO document command to generate the M+ 1p latin fonts
 
@@ -885,8 +904,8 @@ 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.
-Refer to the <<NOTICE#,NOTICE>> file for information about third-party Open Source software in use.
+For the full text of the license, see the link:LICENSE[] file.
+Refer to the link:NOTICE.adoc[] file for information about third-party Open Source software in use.
 
 ////
 == Additional Points of Note

data/asciidoctor-epub3.gemspec

@@ -24,18 +24,23 @@ 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 'asciimath', '~> 2.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', '~> 0.81.0'
   s.add_development_dependency 'rubocop-rspec', '~> 1.38.0'
 
   s.add_runtime_dependency 'asciidoctor', '>= 1.5.6', '< 3.0.0'
   s.add_runtime_dependency 'gepub', '~> 1.0.0'
+  s.add_runtime_dependency 'mime-types', '~> 3.0'
 end

data/data/styles/color-palette.css

@@ -1,14 +1,11 @@
 .palette-grayscale {
-  color: #191918; /* black :: literal, blockquote text */
-  color: #333332; /* off-black :: body text, heading default, chapter header background */
-  color: #4F4F4C; /* deep gray :: h4 */
-  /* what about 40403E or 4C4C4B? for h4 */
-  color: #666665; /* dark gray :: h5, visited link, list bullets, abstract, caption, open quote */
-  color: #80807F; /* medium gray :: table borders */
-  color: #B3B3B1; /* gray :: chapter title, footer subtitle, sidebar border */
-  color: #DCDCDE; /* lighter gray :: footer lines, byline text, pre border, masthead bottom line */
-  /* what about DEDEDC instead of DCDCDE? */
-  color: #F2F2F2; /* off white :: pre background, sidebar background */
+  color: #000000; /* black :: body text, heading default */
+  color: #101010; /* off-black :: code, literal, blockquote text */
+  color: #202020; /* deep gray :: h4 */
+  color: #333332; /* dark gray :: h5, visited link, list bullets, abstract, caption, open quote */
+  color: #707070; /* medium gray :: table borders */
+  color: #C8C8C8; /* gray :: footer subtitle, sidebar border */
+  color: #E0E0E0; /* off white :: pre background, sidebar background */
   color: #FFFFFF; /* white :: chapter subtitle */
 }
 

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 */
@@ -79,24 +76,6 @@ body code, body kbd, body pre, pre :not(code) {
     text-rendering: optimizeLegibility;
   }*/
 
-  /* hack line height of subtitle using floats on Kindle */
-  h1.chapter-title .subtitle {
-    margin-top: -0.2em;
-    margin-bottom: 0.3em; /* compensate for reduced line height */
-  }
-
-  /* NOTE using b instead of span since Firefox ePubReader applies immutable styles to span */
-  h1.chapter-title .subtitle > b {
-    float: left;
-    display: inline-block;
-    margin-bottom: -0.3em; /* reduce the line height */
-    padding-right: 0.2em; /* spacing between words */
-  }
-
-  h1.chapter-title .subtitle > b:last-child {
-    padding-right: 0;
-  }
-
   h1.chapter-title .subtitle::after {
     display: table;
     content: ' ';
@@ -104,40 +83,6 @@ 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) {
-  body p,
-  div.abstract > p,
-  ul, ol, li, dl, dt, dd, footer,
-  div.verse .attribution, table.table th, table.table td,
-  figcaption, caption,
-  h1, h2, h3, h4, h5 {
-    color: #000000;
-  }
-
-  body a:link,
-  div.abstract > p a:link {
-    color: #000000;
-    -webkit-text-fill-color: #000000;
-  }
-
-  body a:visited {
-    color: #333332;
-    -webkit-text-fill-color: #333332;
-  }
-
-  .chapter-header {
-    color: #191918;
-    border-bottom-color: #191918;
-  }
-  
-  h1.chapter-title .subtitle,
-  .chapter-header p.byline {
-    color: #000000;
-  }
-}
-
 .chapter-header p.byline {
   height: auto; /* Aldiko requires this value to be 0; reset it for all others */
 }

data/data/styles/epub3.css

@@ -17,7 +17,6 @@ html {
   /* set the em base (and relative em anchor) by setting the font-size on html */
   /* TODO set font-size > 100% except for Kindle */
   font-size: 100%;
-  -webkit-text-size-adjust: 100%;
 }
 
 /* don't set margin on body as that's how many readers frame reading area */
@@ -81,8 +80,8 @@ b, strong {
 
 b.button {
   font-weight: normal;
-  text-shadow: 1px 0 0 #666665;
-  color: #191918;
+  text-shadow: 1px 0 0 #333332;
+  color: #101010;
   white-space: nowrap;
 }
 
@@ -143,7 +142,7 @@ img {
 
 mark {
   background-color: #FFC14F;
-  color: #191918;
+  color: #101010;
 }
 
 small {
@@ -198,14 +197,36 @@ td, th {
   padding: 0;
 }
 
+/* We need to apply text-align to <p> too in order to override global text-align:justify */
+th.halign-left, td.halign-left, th.halign-left > p, td.halign-left > p {
+  text-align: left
+}
+
+th.halign-right, td.halign-right, th.halign-right > p, td.halign-right > p {
+  text-align: right
+}
+
+th.halign-center, td.halign-center, th.halign-center > p, td.halign-center > p {
+  text-align: center
+}
+
+th.valign-top, td.valign-top, th.valign-top > p, td.valign-top > p {
+  vertical-align: top
+}
+
+th.valign-bottom, td.valign-bottom, th.valign-bottom > p, td.valign-bottom > p {
+  vertical-align: bottom
+}
+
+th.valign-middle, td.valign-middle, th.valign-middle > p, td.valign-middle > p {
+  vertical-align: middle
+}
+
 body a:link {
-  color: #333332;
-  /* hack for font color in iBooks and Gitden (though Gitden would accept color !important too) */
-  -webkit-text-fill-color: #333332;
   /* Kindle requires the !important on text-decoration */
   /* In night mode, the only indicator of a link is the underline, so we need it or a background image */
   text-decoration: none !important;
-  border-bottom: 1px dashed #666665;
+  border-bottom: 1px dashed #333332;
   /* allow URLs to break anywhere if they don't fit on a line; but how do we know it's a URL? */
   /*
   word-break: break-all;
@@ -215,18 +236,12 @@ 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;
 }
 
-body a:visited {
-  color: #666665;
-  /* hack for font color in iBooks */
-  -webkit-text-fill-color: #666665;
-}
-
 code.literal {
   /* don't let it affect line spacing */
   /* disable since M+ 1mn won't interrupt line height */
@@ -270,7 +285,6 @@ body p,
 ul, ol, li, dl, dt, dd, footer,
 div.verse .attribution, table.table th, table.table td,
 figcaption, caption {
-  color: #333332;
   /* NOTE iBooks will forcefully override font-family of text inside div, p and span elements when font other than Original is selected */
   /* NOTE iBooks honors Original font for prose text if declared in display-options.xml */
   font-family: "Noto Serif", serif;
@@ -281,7 +295,7 @@ body p, li, dt, dd, footer {
 }
 
 code, kbd, pre {
-  color: #191918;
+  color: #101010;
   font-family: "M+ 1mn", monospace;
   -webkit-hyphens: none; /* disable hyphenation where supported (e.g., iBooks) */
 }
@@ -357,6 +371,11 @@ dl dd {
   margin-top: 0.25em;
 }
 
+td.hdlist1 {
+  font-weight: bold;
+  padding-right: 0.625em;
+}
+
 div.callout-list {
   margin-top: 0.5em;
 }
@@ -457,7 +476,7 @@ ul > li::before {
 
 ul > li::before {
   content: "\25AA"; /* small black square */
-  color: #666665;
+  color: #333332;
 }
 
 ul ul > li::before {
@@ -467,7 +486,7 @@ ul ul > li::before {
 
 ul ul ul > li::before {
   content: "\2022"; /* small black circle */
-  color: #666665;
+  color: #333332;
 }
 
 ul ul ul ul > li::before {
@@ -529,7 +548,6 @@ ul.references > li > span.principal {
 
 /* sized based on the major third modular scale (4:5, 16px, 24px) */
 h1, h2 {
-  color: #333332;
   font-size: 1.5em;
   word-spacing: -0.075em;
   margin-top: 1em; /* 1.5rem */
@@ -537,14 +555,13 @@ h1, h2 {
 }
 
 h3 {
-  color: #333332;
   font-size: 1.25em;
   margin-top: 0.84em; /* 1.05rem */
   margin-bottom: -0.5em; /* -0.625rem, 0.375rem to content */
 }
 
 h4 {
-  color: #4F4F4C;
+  color: #202020;
   font-weight: 200;
 
   font-size: 1.1em;
@@ -559,7 +576,7 @@ h4 {
 }
 
 h5 {
-  color: #666665;
+  color: #333332;
   /*
   font-size: 1em;
   text-transform: uppercase;
@@ -589,7 +606,7 @@ h5 code {
   /*padding: 0.75em 1.5em 0.25em 1.5em;*/
   padding: 0.25em 0;
   margin-bottom: 2.5em;
-  border-bottom: 1px solid #666665;
+  border-bottom: 1px solid #333332;
   /* TODO maybe what we need to get articles to start in left column
   -webkit-column-break-before: left;
   page-break-before: left;
@@ -602,7 +619,7 @@ h1.chapter-title {
   margin-top: 3.5em; /* 4.2rem - would like to use 9vh */
   margin-bottom: 0;
   padding-bottom: 0.8333em; /* 1.2rem */
-  color: #666665;
+  color: #333332;
   text-transform: uppercase; /* not supported in Adobe Digital Editions */
   word-spacing: -0.075em;
   letter-spacing: -0.01em;
@@ -610,7 +627,6 @@ h1.chapter-title {
 
 h1.chapter-title .subtitle {
   font-weight: 400;
-  color: #333332;
   display: block;
   font-size: 1.5em;
   margin: 0 0 0 0.75em; /* would like to use 2vw */
@@ -627,7 +643,6 @@ h1.chapter-title b {
 }
 
 .chapter-header p.byline {
-  color: #333332;
   /* float left and height 0 takes this line out of the flow */
   float: left;
   height: 0;
@@ -658,17 +673,11 @@ div.abstract {
 }
 
 div.abstract > p {
-  color: #666665;
+  color: #333332;
   font-size: 1.05em; /* or 1.1em? */
   line-height: 1.75;
 }
 
-div.abstract > p a:link {
-  color: #666665;
-  /* hack for font color in iBooks */
-  -webkit-text-fill-color: #666665;
-}
-
 div.abstract > p:first-child::first-line {
   font-weight: bold;
   -webkit-font-feature-settings: "kern" off;
@@ -743,7 +752,7 @@ figcaption,
 caption {
   font-size: 0.9em;
   font-style: italic;
-  color: #666665;
+  color: #333332;
   letter-spacing: -0.01em;
   line-height: 1.4;
   text-align: left;
@@ -775,10 +784,10 @@ figure.listing > figcaption + pre {
 }
 
 aside.sidebar {
-  border: 1px solid #B3B3B1;
+  border: 1px solid #C8C8C8;
   padding: 0 1.5em;
   font-size: 0.9em;
-  background-color: #F2F2F2;
+  background-color: #E0E0E0;
   text-align: right; /* aligns heading to right */
   /*
   -webkit-box-shadow: 0px 1px 1px rgba(102, 102, 101, 0.15);
@@ -806,7 +815,7 @@ aside.sidebar > h2 {
   letter-spacing: 0;
   display: inline-block;
   white-space: nowrap; /* for some reason it's wrapping prematurely */
-  border: 1px solid #B3B3B1;
+  border: 1px solid #C8C8C8;
   padding: 1.5em .75em .5em .75em;
   margin: -1em 0.5em -0.25em 0.5em;
   background-color: #FFFFFF;
@@ -843,7 +852,7 @@ div[class~="blockquote"] {
 }
 
 blockquote > p {
-  color: #191918;
+  color: #101010;
   font-style: italic;
 
   /*
@@ -860,7 +869,7 @@ blockquote > p {
 
 blockquote > p:first-of-type::before {
   display: inline-block;
-  color: #666665;
+  color: #333332;
   text-shadow: 0 1px 2px rgba(102, 102, 101, 0.3);
 
   /* using serif quote from entypo */
@@ -893,7 +902,7 @@ blockquote footer {
 blockquote footer .context {
   font-size: 0.9em;
   letter-spacing: -0.05em;
-  color: #666665;
+  color: #333332;
 }
 
 pre {
@@ -904,14 +913,10 @@ pre {
   overflow-wrap: break-word; /* break in middle of long word if no other break opportunities are available */
   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;
-  /*
-  border-top: 3px solid #DCDCDE;
-  */
-  /* QUESTION #B3B3B1? */
-  border-top: 1px solid #DCDCDE;
-  border-right: 1px solid #DCDCDE;
+  background-color: #E0E0E0;
+  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: 1px solid #C8C8C8;
+  border-right: 1px solid #C8C8C8;
 }
 
 body:first-of-type pre {
@@ -1028,8 +1033,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 +1043,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 +1053,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 +1063,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 +1073,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 {
@@ -1104,8 +1109,6 @@ table.table th,
 table.table td {
   line-height: 1.4;
   padding: 0.5em 0.5em 1em 0.1em;
-  vertical-align: top;
-  text-align: left;
   -webkit-column-break-inside: avoid;
   page-break-inside: avoid;
 }
@@ -1115,7 +1118,7 @@ table.table th {
 }
 
 table.table thead th {
-  border-bottom: 1px solid #80807F;
+  border-bottom: 1px solid #707070;
 }
 
 table.table td > p,
@@ -1123,47 +1126,43 @@ table.table div.embed > * {
   margin-top: 0;
 }
 
-table.table td > p {
-  text-align: left;
-}
-
 /* REVIEW */
 table.table td > p + p,
 table.table div.embed > * + * {
   margin-top: 1em;
 }
 
-table.table-framed {
+table.table-framed-all {
   border-width: 1px;
   border-style: solid;
-  border-color: #80807F;
+  border-color: #707070;
 }
 
 table.table-framed-topbot {
   border-width: 1px 0;
   border-style: solid;
-  border-color: #80807F;
+  border-color: #707070;
 }
 
 table.table-framed-sides {
   border-width: 0 1px;
   border-style: solid;
-  border-color: #80807F;
+  border-color: #707070;
 }
 
-table.table-grid th,
-table.table-grid td {
-  border-width: 0 1px 1px 0;
+table.table-grid-all th,
+table.table-grid-all td {
+  border-width: 1px 1px 1px 1px;
   border-style: solid;
-  border-color: #80807F;
+  border-color: #707070;
 }
 
-table.table-grid thead tr > *:last-child {
+table.table-grid-all thead tr > *:last-child {
   border-right-width: 0;
 }
 
-table.table-grid tbody tr:last-child > th,
-table.table-grid tbody tr:last-child > td {
+table.table-grid-all tbody tr:last-child > th,
+table.table-grid-all tbody tr:last-child > td {
   border-bottom-width: 0;
 }
 
@@ -1171,14 +1170,14 @@ table.table-grid-rows tbody th,
 table.table-grid-rows tbody td {
   border-width: 1px 0 0 0;
   border-style: solid;
-  border-color: #80807F;
+  border-color: #707070;
 }
 
 table.table-grid-cols th,
 table.table-grid-cols td {
   border-width: 0 1px 0 0;
   border-style: solid;
-  border-color: #80807F;
+  border-color: #707070;
 }
 
 table.table-grid-cols thead th:last-child {
@@ -1209,7 +1208,7 @@ hr.pagebreak + * {
 
 img.headshot {
   float: left;
-  border: 1px solid #80807F;
+  border: 1px solid #707070;
   padding: 1px;
   margin: 0.35em 1em 0.15em 0;
   height: 5em !important;
@@ -1247,6 +1246,11 @@ nav#toc ol {
   list-style-type: none;
 }
 
+/* Calibre doesn't hide <nav hidden="hidden"> for some reason */
+nav[hidden~="hidden"] {
+  display: none;
+}
+
 .icon {
   display: none;
 }
@@ -1257,9 +1261,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;
   }