asciidoctor-pdf 1.5.0.beta.1 → 1.5.0

data/asciidoctor-pdf.gemspec

@@ -29,28 +29,29 @@ Gem::Specification.new do |s|
     files = Dir['**/*']
   end
   s.files = files.grep %r/^(?:(?:data|lib)\/.+|docs\/theming-guide\.adoc|(?:CHANGELOG|LICENSE|NOTICE|README)\.adoc|\.yardopts|#{s.name}\.gemspec)$/
-  # FIXME optimize-pdf is currently a shell script, so listing it here won't work
-  #s.executables = (files.grep %r/^bin\//).map {|f| File.basename f }
-  s.executables = ['asciidoctor-pdf']
+  s.executables = (files.grep %r/^bin\//).map {|f| File.basename f }
   s.require_paths = ['lib']
   #s.test_files = files.grep %r/^(?:test|spec|feature)\/.*$/
 
   s.add_runtime_dependency 'asciidoctor', '>= 1.5.3', '< 3.0.0'
   s.add_runtime_dependency 'prawn', '~> 2.2.0'
+  # NOTE ttfunk 1.6 generates TT instructions ghostscript cannot process, so lock the version of ttfunk
+  s.add_runtime_dependency 'ttfunk', ['~> 1.5.0'], ['>= 1.5.1']
+  # NOTE must use prawn-table from master branch (defined in Gemfile) for full functionality
   s.add_runtime_dependency 'prawn-table', '~> 0.2.0'
   s.add_runtime_dependency 'prawn-templates', '~> 0.1.0'
-  s.add_runtime_dependency 'prawn-svg', '~> 0.29.0'
-  s.add_runtime_dependency 'prawn-icon', '~> 2.3.0'
+  s.add_runtime_dependency 'prawn-svg', '~> 0.30.0'
+  s.add_runtime_dependency 'prawn-icon', '~> 2.5.0'
   s.add_runtime_dependency 'safe_yaml', '~> 1.0.0'
   s.add_runtime_dependency 'thread_safe', '~> 0.3.0'
   s.add_runtime_dependency 'concurrent-ruby', '~> 1.1.0'
-  # For our usage, treetop 1.6 is slower than treetop 1.5
-  s.add_runtime_dependency 'treetop', '~> 1.5.0'
+  s.add_runtime_dependency 'treetop', '~> 1.6.0'
 
-  s.add_development_dependency 'rake', '~> 12.3.0'
-  # Asciidoctor PDF supports Rouge >= 2; Rouge 3.4.1 emits a superfluous warning in verbose mode
-  s.add_development_dependency 'rouge', '~> 3.4.0', '!= 3.4.1'
-  s.add_development_dependency 'rspec', '~> 3.8.0'
+  s.add_development_dependency 'rake', '~> 13.0.0'
+  s.add_development_dependency 'rspec', '~> 3.9.0'
   s.add_development_dependency 'pdf-inspector', '~> 1.3.0'
+  # Asciidoctor PDF supports Rouge >= 2 (verified in CI build using 2.0.0)
+  s.add_development_dependency 'rouge', '~> 3.0'
+  s.add_development_dependency 'coderay', '~> 1.1.0'
   s.add_development_dependency 'chunky_png', '~> 1.3.0'
 end

data/bin/asciidoctor-pdf

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 if File.file?(asciidoctor_pdf = (File.expand_path '../../lib/asciidoctor/pdf.rb', __FILE__))
   require asciidoctor_pdf
@@ -12,12 +13,7 @@ options = Asciidoctor::Cli::Options.new backend: 'pdf', header_footer: true
 # FIXME provide an API in Asciidoctor for sub-components to print version information
 unless ARGV != ['-v'] && (ARGV & ['-V', '--version']).empty?
   $stdout.write %(Asciidoctor PDF #{Asciidoctor::PDF::VERSION} using )
-  # NOTE the print_version method was added in Asciidoctor 1.5.2
-  if options.respond_to? :print_version
-    options.print_version
-  else
-    puts %(Asciidoctor #{::Asciidoctor::VERSION} [http://asciidoctor.org])
-  end
+  options.print_version
   exit 0
 end
 

data/bin/asciidoctor-pdf-optimize

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+optimizer = File.absolute_path '../lib/asciidoctor/pdf/optimizer.rb', __dir__
+if File.exist? optimizer
+  require optimizer
+else
+  require 'asciidoctor/pdf/optimizer'
+end
+
+args = ARGV.dup
+
+unless (filename = args.pop)
+  warn 'asciidoctor-pdf-optimize: Please specify a PDF file to optimize.'
+  exit 1
+end
+
+quality = args[0] == '--quality' ? args[1].to_s : ''
+
+(Asciidoctor::PDF::Optimizer.new quality).generate_file filename

data/data/fonts/ABOUT-mplus1mn-subset

@@ -0,0 +1,26 @@
+M+ fonts are generated from the M+ outline fonts TESTFLIGHT 63a retrieved from http://mplus-fonts.osdn.jp/mplus-outline-fonts/download/index-en.html.
+
+The following changes were made using fontforge to produce mplus1mn-*-ascii.ttf fonts:
+
+* Subsetted to include (ascii variant):
+ ** Non-visible Characters (U+00a0)
+ ** Basic Latin (U+0020–U+007e)
+ ** Enclosed Numbers (U+2460–U+2473, U+2776–U+277f, U+24eb–U+24f4) (M+ 1mn Regular only)
+ ** Box Drawing Symbols (U+2500–U+257f)
+ ** .notdef glyph
+* Subsetted to include (subset variant):
+ ** Non-visible Characters (U+00a0)
+ ** Basic Latin (U+0020–U+007e)
+ ** Latin-1 Supplement (U+00a0–U+00fd)
+ ** Latin Extended-A (U+0100–U+017f)
+ ** Greek Alphabet (U+0391–U+03c9)
+ ** Cyrillic (U+0400–U+04ff)
+ ** Assorted Symbols (U+20ac)
+ ** Enclosed Numbers (U+2460–U+2473, U+2776–U+277f, U+24eb–U+24f4) (mplus1mn-regular only)
+ ** Box Drawing Symbols (U+2500–U+257f)
+ ** .notdef glyph
+* Added BOM (U+feff) and line feed (U+000a) characters (from blank)
+* Generated old-style kern table (neither Apple or OpenType) (required to make kerning work in Prawn) (flags: 0x90)
+* Removed Truetype instructions (information not used by Prawn) (flags: 0x08)
+* Generated with PS Glyph Names option enabled (didn't use 0x04 flag)
+* Generate flags used, in total: 0x90 + 0x08

data/data/fonts/ABOUT-mplus1p-subset

@@ -0,0 +1,26 @@
+M+ fonts are generated from the M+ outline fonts TESTFLIGHT 63a retrieved from http://mplus-fonts.osdn.jp/mplus-outline-fonts/download/index-en.html.
+
+The following changes were made using fontforge to produce mplus1p-regular-fallback.ttf font:
+
+* Subsetted to include:
+ ** Non-visible Characters (U+00a0)
+ ** Basic Latin (U+0020–U+007e)
+ ** Latin-1 Supplement (U+00a0–U+00fd)
+ ** Latin Extended-A (U+0100–U+017f)
+ ** Latin Extended-B (U+0180–U+024f)
+ ** IPA (U+0259, U+02b0–U+02ff)
+ ** Greek (U+0370–U+03ff)
+ ** Cyrillic (U+0400–U+04ff)
+ ** Vietnamese (U+01a0–U01b0, U+1ea0–U1ef9)
+ ** CJK (U+4e00–U+9fff, U+3000–U+303f) (mostly Japanese, limited selection based on what M+ supports)
+ ** Mathematical Operators (U+2200–U+22ff)
+ ** General Punctuation (U+2000–U203a)
+ ** Geometric Shapes (U+25a0–U25ff)
+ ** Assorted Symbols (U+20ac, U+2122, U+21d0–U+21d5, U+2190–U+2195, U+2610–U+2611, U+2713)
+ ** .notdef glyph
+* Added BOM (U+feff), hair space (U+200a), zero-width space (U+200b) and line feed (U+000a) characters (from blank)
+* Manually added non-breaking hyphen (U+2011) from hyphen (U+002d)
+* Generated old-style kern table (neither Apple or OpenType) (required to make kerning work in Prawn) (flags: 0x90)
+* Removed Truetype instructions (information not used by Prawn) (flags: 0x08)
+* Generated with PS Glyph Names option enabled (didn't use 0x04 flag)
+* Generate flags used, in total: 0x90 + 0x08

data/data/fonts/ABOUT-notoemoji-subset

@@ -0,0 +1,3 @@
+Noto Emoji font is generated from the google-noto-emoji-fonts (commit 16151a2312a1f8a7d79e91789d3cfe24559d61f7).
+
+Some glyphs have been removed that conflict with the other built-in fonts to produce the notoemoji-subset.ttf font.

data/data/fonts/ABOUT-notoserif-subset

@@ -0,0 +1,26 @@
+Noto Serif fonts are generated from the google-noto-serif-fonts-20161022 Fedora RPM package (commit 86b2e553c3e3e4d6614dadd1fa0a7a6dafd74552).
+
+The following changes were made using fontforge to produce the notoserif-*-subset.ttf fonts:
+
+* Mapped single arrows <- (U+2190) and -> (U+2192) to double arrows <= (U+21d0) and => (U+21d2)
+* Manually added non-breaking hyphen (U+2011) from hyphen (U+002d)
+* Moved arrows (U+21d0, U+21d2, U+2190, U+2192) up in line to align with middle of X
+* Subsetted to include:
+ ** Non-visible Characters (U+feff, U+00a0)
+ ** Basic Latin (U+0020–U+007e)
+ ** Latin-1 Supplement (U+00a0–U+00fd)
+ ** Latin Extended-A (U+0100–U+017f)
+ ** Greek (U+0370–U+03ff)
+ ** Cyrillic (U+0400–U+04ff)
+ ** Vietnamese (U+01a0–U01b0, U+1ea0–U1ef9)
+ ** Mathematical Operators (U+2200–U+22ff)
+ ** General Punctuation (U+2000–U203a)
+ ** Geometric Shapes (U+25a0–U25ff)
+ ** Assorted Symbols (U+20ac, U+2122, U+21d0, U+21d2, U+2190, U+2192)
+ ** .notdef glyph
+* Imported ballot boxes from Font Awesome (U+2610, U+2611) (Noto Serif Regular only)
+* Added line feed character (U+000a)
+* Generated old-style kern table (neither Apple or OpenType) (required to make kerning work in Prawn) (flags: 0x90)
+* Removed Truetype instructions (information not used by Prawn)
+* Generated with PS Glyph Names option enabled (didn't use 0x04 flag)
+* Generate flags used, in total: 0x90 + 0x08

data/data/fonts/{LICENSE-mplus-testflight-58 → LICENSE-mplus}

@@ -1,4 +1,4 @@
-M+ FONTS                                Copyright (C) 2002-2014 M+ FONTS PROJECT
+M+ FONTS                                Copyright (C) 2002-2019 M+ FONTS PROJECT
 
 -
 
@@ -13,4 +13,4 @@ or without modification, either commercially or noncommercially.
 THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY.
 
 
-http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/
+http://mplus-fonts.osdn.jp

data/data/themes/base-theme.yml

@@ -3,6 +3,7 @@
 vertical_spacing: 12
 page_background_color: 'FFFFFF'
 page_layout: portrait
+page_initial_zoom: FitH
 # 36 is equivalent to 0.5in
 page_margin: 36
 page_margin_inner: 48
@@ -15,15 +16,23 @@ base_font_color: '000000'
 base_font_family: Helvetica
 base_font_size: 12
 # QUESTION should we rename to min_font_size?
-base_font_size_min: 9
+base_font_size_min: 6
 base_font_style: normal
 base_line_height: 1.15
-base_line_height_length: 13.8
 base_border_color: 'EEEEEE'
 base_border_width: 0.5
+role_line-through_text_decoration: line-through
+role_underline_text_decoration: underline
+role_big_font_size: 14
+role_small_font_size: 10
+role_subtitle_font_size: 0.8em
 button_content: '[%s]'
 button_font_family: Courier
 button_font_style: bold
+key_font_family: Courier
+key_font_style: italic
+mark_background_color: ffff00
+mark_border_offset: 1
 link_font_color: '0000EE'
 literal_font_family: Courier
 heading_font_style: bold
@@ -36,6 +45,7 @@ heading_h6_font_size: 10
 heading_line_height: 1.15
 heading_margin_top: 4
 heading_margin_bottom: 12
+heading_min_height_after: 20
 title_page_align: center
 title_page_line_height: 1.15
 title_page_logo_top: 10%
@@ -65,15 +75,19 @@ admonition_padding: [0, 12, 0, 12]
 admonition_label_font_style: bold
 admonition_label_text_transform: uppercase
 blockquote_border_color: 'EEEEEE'
-blockquote_border_width: 4
+blockquote_border_left_width: 4
 blockquote_padding: [6, 12, -6, 14]
+verse_border_color: 'EEEEEE'
+verse_border_left_width: 4
+verse_padding: [6, 12, -6, 14]
 code_font_family: Courier
-code_font_size: 10.5
+code_font_size: 10.8
 code_line_height: 1.2
 code_padding: 9
 code_border_color: 'EEEEEE'
 code_border_width: 0.5
 conum_line_height: 1.15
+conum_glyphs: circled
 example_background_color: 'FFFFFF'
 example_border_color: 'EEEEEE'
 example_border_width: 0.5
@@ -101,3 +115,7 @@ thematic_break_border_style: solid
 thematic_break_border_width: 0.5
 toc_indent: 15
 toc_line_height: 1.4
+footnotes_font_size: 9
+footnotes_item_space: 3
+footer_recto_right_content: '{page-number}'
+footer_verso_left_content: '{page-number}'

data/data/themes/default-theme.yml

@@ -8,13 +8,14 @@ font:
       bold_italic: notoserif-bold_italic-subset.ttf
     # M+ 1mn supports ASCII and the circled numbers used for conums
     M+ 1mn:
-      normal: mplus1mn-regular-ascii-conums.ttf
-      bold: mplus1mn-bold-ascii.ttf
-      italic: mplus1mn-italic-ascii.ttf
-      bold_italic: mplus1mn-bold_italic-ascii.ttf
+      normal: mplus1mn-regular-subset.ttf
+      bold: mplus1mn-bold-subset.ttf
+      italic: mplus1mn-italic-subset.ttf
+      bold_italic: mplus1mn-bold_italic-subset.ttf
 page:
-  background_color: ffffff
+  background_color: FFFFFF
   layout: portrait
+  initial_zoom: FitH
   margin: [0.5in, 0.67in, 0.67in, 0.67in]
   # margin_inner and margin_outer keys are used for recto/verso print margins when media=prepress
   margin_inner: 0.75in
@@ -48,9 +49,21 @@ base:
   font_size_small: round($base_font_size * 0.85)
   font_size_min: $base_font_size * 0.75
   font_style: normal
-  border_color: eeeeee
+  border_color: EEEEEE
   border_radius: 4
   border_width: 0.5
+role:
+  line-through:
+    text_decoration: line-through
+  underline:
+    text_decoration: underline
+  big:
+    font_size: $base_font_size_large
+  small:
+    font_size: $base_font_size_small
+  subtitle:
+    font_size: 0.8em
+    font_color: 999999
 # FIXME vertical_rhythm is weird; we should think in terms of ems
 #vertical_rhythm: $base_line_height_length * 2 / 3
 # correct line height for Noto Serif metrics (comes with built-in line height)
@@ -58,22 +71,31 @@ vertical_rhythm: $base_line_height_length
 horizontal_rhythm: $base_line_height_length
 # QUESTION should vertical_spacing be block_spacing instead?
 vertical_spacing: $vertical_rhythm
-button:
-  content: "[\u2009%s\u2009]"
-  font_style: bold
 link:
-  font_color: 428bca
+  font_color: 428BCA
 # literal is currently used for inline monospaced in prose and table cells
 literal:
-  font_color: b12146
+  font_color: B12146
   font_family: M+ 1mn
+button:
+  content: "[\u2009%s\u2009]"
+  font_style: bold
+key:
+  background_color: F5F5F5
+  border_color: CCCCCC
+  border_offset: 2
+  border_radius: 2
+  border_width: 0.5
+  font_family: $literal_font_family
+  separator: "\u202f+\u202f"
+mark:
+  background_color: FFFF00
+  border_offset: 1
 menu:
   caret_content: " <font size=\"1.15em\"><color rgb=\"b12146\">\u203a</color></font> "
 heading:
   align: left
-  #font_color: 181818
   font_color: $base_font_color
-  font_family: $base_font_family
   font_style: bold
   # h1 is used for part titles (book doctype) or the doctitle (article doctype)
   h1_font_size: floor($base_font_size * 2.6)
@@ -88,6 +110,7 @@ heading:
   line_height: 1
   margin_top: $vertical_rhythm * 0.4
   margin_bottom: $vertical_rhythm * 0.9
+  min_height_after: $base_line_height_length * 1.5
 title_page:
   align: right
   logo:
@@ -122,7 +145,7 @@ lead:
   font_size: $base_font_size_large
   line_height: 1.4
 abstract:
-  font_color: 5c6266
+  font_color: 5C6266
   font_size: $lead_font_size
   line_height: $lead_line_height
   font_style: italic
@@ -130,7 +153,6 @@ abstract:
   title:
     align: center
     font_color: $heading_font_color
-    font_family: $heading_font_family
     font_size: $heading_h4_font_size
     font_style: $heading_font_style
 admonition:
@@ -146,14 +168,22 @@ admonition:
     text_transform: uppercase
     font_style: bold
 blockquote:
-  font_color: $base_font_color
   font_size: $base_font_size_large
   border_color: $base_border_color
-  border_width: 5
+  border_width: 0
+  border_left_width: 5
   # FIXME disable negative padding bottom once margin collapsing is implemented
-  padding: [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_width / 2]
+  padding: [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_left_width / 2]
   cite_font_size: $base_font_size_small
   cite_font_color: 999999
+verse:
+  font_size: $blockquote_font_size
+  border_color: $blockquote_border_color
+  border_width: $blockquote_border_width
+  border_left_width: $blockquote_border_left_width
+  padding: $blockquote_padding
+  cite_font_size: $blockquote_cite_font_size
+  cite_font_color: $blockquote_cite_font_color
 # code is used for source blocks (perhaps change to source or listing?)
 code:
   font_color: $base_font_color
@@ -163,8 +193,8 @@ code:
   line_height: 1.25
   # line_gap is an experimental property to control how a background color is applied to an inline block element
   line_gap: 3.8
-  background_color: f5f5f5
-  border_color: cccccc
+  background_color: F5F5F5
+  border_color: CCCCCC
   border_radius: $base_border_radius
   border_width: 0.75
 conum:
@@ -172,11 +202,12 @@ conum:
   font_color: $literal_font_color
   font_size: $base_font_size
   line_height: 4 / 3
+  glyphs: circled
 example:
   border_color: $base_border_color
   border_radius: $base_border_radius
   border_width: 0.75
-  background_color: ffffff
+  background_color: $page-background-color
   # FIXME reenable padding bottom once margin collapsing is implemented
   padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm]
 image:
@@ -185,8 +216,8 @@ prose:
   margin_top: $block_margin_top
   margin_bottom: $block_margin_bottom
 sidebar:
-  background_color: eeeeee
-  border_color: e1e1e1
+  background_color: EEEEEE
+  border_color: E1E1E1
   border_radius: $base_border_radius
   border_width: $base_border_width
   # FIXME reenable padding bottom once margin collapsing is implemented
@@ -194,7 +225,6 @@ sidebar:
   title:
     align: center
     font_color: $heading_font_color
-    font_family: $heading_font_family
     font_size: $heading_h4_font_size
     font_style: $heading_font_style
 thematic_break:
@@ -214,22 +244,22 @@ outline_list:
   item_spacing: $vertical_rhythm / 2
 table:
   background_color: $page_background_color
-  border_color: dddddd
+  border_color: DDDDDD
   border_width: $base_border_width
   cell_padding: 3
   head:
     font_style: bold
     border_bottom_width: $base_border_width * 2.5
   body:
-    stripe_background_color: f9f9f9
+    stripe_background_color: F9F9F9
   foot:
-    background_color: f0f0f0
+    background_color: F0F0F0
 toc:
   indent: $horizontal_rhythm
   line_height: 1.4
   dot_leader:
     #content: ". "
-    font_color: a9a9a9
+    font_color: A9A9A9
     #levels: 2 3
 footnotes:
   font_size: round($base_font_size * 0.75)
@@ -241,7 +271,7 @@ header:
 footer:
   font_size: $base_font_size_small
   # NOTE if background_color is set, background and border will span width of page
-  border_color: dddddd
+  border_color: DDDDDD
   border_width: 0.25
   height: $base_line_height_length * 2.5
   line_height: 1

data/data/themes/default-with-fallback-font-theme.yml

@@ -1,22 +1,9 @@
 extends: default
 font:
   catalog:
-    Noto Serif:
-      normal: notoserif-regular-subset.ttf
-      bold: notoserif-bold-subset.ttf
-      italic: notoserif-italic-subset.ttf
-      bold_italic: notoserif-bold_italic-subset.ttf
-    M+ 1mn:
-      normal: mplus1mn-regular-ascii-conums.ttf
-      bold: mplus1mn-bold-ascii.ttf
-      italic: mplus1mn-italic-ascii.ttf
-      bold_italic: mplus1mn-bold_italic-ascii.ttf
+    merge: true
     # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols
     # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font
-    M+ 1p Fallback:
-      normal: mplus1p-regular-fallback.ttf
-      bold: mplus1p-regular-fallback.ttf
-      italic: mplus1p-regular-fallback.ttf
-      bold_italic: mplus1p-regular-fallback.ttf
-  fallbacks:
-  - M+ 1p Fallback
+    M+ 1p Fallback: mplus1p-regular-fallback.ttf
+    Noto Emoji: notoemoji-subset.ttf
+  fallbacks: [M+ 1p Fallback, Noto Emoji]