asciidoctor-pdf 1.5.0.beta.6 → 1.5.0.beta.7

data/lib/asciidoctor/pdf/ext/rouge/formatters/prawn.rb

@@ -110,7 +110,7 @@ class Prawn < Formatter
   def create_fragment tok, val = nil
     fragment = val ? { text: val } : {}
     if (style_rules = @theme.style_for tok)
-      if (bg = normalize_color style_rules.bg) && bg != @background_color
+      if (bg = normalize_color style_rules.bg) && bg != background_color
         fragment[:background_color] = bg
         fragment[:callback] = @background_colorizer
         if LineOrientedTokens.include? tok

data/lib/asciidoctor/pdf/formatted_text/parser.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# regenerate parser.rb using `tt parser.treetop`
 # Autogenerated from a Treetop grammar. Edits may be lost.
 
 

data/lib/asciidoctor/pdf/formatted_text/parser.treetop

@@ -1,4 +1,4 @@
-# regenerate parser.rb using `tt parser.treetop`
+# frozen_string_literal: true
 module Asciidoctor
 module PDF
 module FormattedText

data/lib/asciidoctor/pdf/formatted_text/transform.rb

@@ -24,7 +24,6 @@ class Transform
     'font_color' => :color,
     'font_family' => :font,
     'font_size' => :size,
-    'font_style' => :styles,
   }
   #DummyText = ?\u0000
 
@@ -83,16 +82,22 @@ class Transform
           callback: mark_bg_color && [TextBackgroundAndBorderRenderer],
         }.compact,
       }
+      revise_roles = [].to_set
       theme.each_pair.reduce @theme_settings do |accum, (key, val)|
         if (key = key.to_s).start_with? 'role_'
           role, key = (key.slice 5, key.length).split '_', 2
           if (prop = ThemeKeyToFragmentProperty[key])
-            val = to_styles val if prop == :styles
             (accum[role] ||= {})[prop] = val
+          elsif key == 'font_style' || key == 'text_decoration'
+            revise_roles << role
           end
         end
         accum
       end
+      revise_roles.reduce @theme_settings do |accum, role|
+        (accum[role] ||= {})[:styles] = to_styles theme[%(role_#{role}_font_style)], theme[%(role_#{role}_text_decoration)]
+        accum
+      end
       unless @theme_settings.key? 'big'
         if (base_font_size_large = theme.base_font_size_large)
           @theme_settings['big'] = { size: %(#{(base_font_size_large / theme.base_font_size.to_f).round 4}em) }
@@ -354,8 +359,6 @@ class Transform
       styles = [:italic].to_set
     when 'bold_italic'
       styles = [:bold, :italic].to_set
-    else
-      styles = nil
     end
     if (style = TextDecorationTable[text_decoration])
       styles ? (styles << style) : [style].to_set

data/lib/asciidoctor/pdf/optimizer.rb

@@ -3,8 +3,16 @@ require 'rghost'
 module Asciidoctor
 module PDF
 class Optimizer
+  (QUALITY_NAMES = {
+    'default' => :default,
+    'screen' => :screen,
+    'ebook' => :ebook,
+    'printer' => :printer,
+    'prepress' => :prepress,
+  }).default = :default
+
   def initialize quality = 'default', compatibility_level = '1.4'
-    @quality = quality.empty? ? :default : quality.to_sym
+    @quality = QUALITY_NAMES[quality]
     @compatibility_level = compatibility_level
   end
 

data/lib/asciidoctor/pdf/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Asciidoctor
 module PDF
-  VERSION = '1.5.0.beta.6'
+  VERSION = '1.5.0.beta.7'
 end
 Pdf = PDF unless const_defined? :Pdf, false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 1.5.0.beta.6
+  version: 1.5.0.beta.7
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-12 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -274,6 +274,7 @@ description: An extension for Asciidoctor that converts AsciiDoc documents to PD
 email: dan@opendevise.com
 executables:
 - asciidoctor-pdf
+- asciidoctor-pdf-optimize
 extensions: []
 extra_rdoc_files: []
 files:
@@ -284,6 +285,7 @@ files:
 - README.adoc
 - asciidoctor-pdf.gemspec
 - bin/asciidoctor-pdf
+- bin/asciidoctor-pdf-optimize
 - data/fonts/ABOUT-mplus1mn-subset
 - data/fonts/ABOUT-mplus1p-subset
 - data/fonts/ABOUT-notoserif-subset