asciidoctor-pdf 1.5.0.alpha.13 → 1.5.0.alpha.14

data/lib/asciidoctor-pdf/prawn_ext/images.rb

@@ -11,7 +11,6 @@ module Images
   def image file, opts = {}
     # FIXME handle case when SVG is a File or IO object
     if ::String === file && (file.downcase.end_with? '.svg')
-      opts[:at] ||= bounds.top_left
       opts[:fallback_font_name] ||= default_svg_font if respond_to? :default_svg_font
       svg (::IO.read file), opts
     else

data/lib/asciidoctor-pdf/roman_numeral.rb

@@ -48,7 +48,7 @@ class RomanNumeral
 
   def initialize initial_value, letter_case = nil
     initial_value ||= 1
-    if initial_value.is_a? ::Integer
+    if ::Integer === initial_value
       @integer_value = initial_value
     else
       @integer_value = RomanNumeral.roman_to_int initial_value

data/lib/asciidoctor-pdf/rouge_ext/formatters/prawn.rb

@@ -5,6 +5,8 @@ module Formatters
 class Prawn < Formatter
   tag 'prawn'
 
+  Tokens = ::Rouge::Token::Tokens
+
   LF = %(\n)
   NoBreakSpace = %(\u00a0)
   InnerIndent = %(\n )
@@ -13,6 +15,7 @@ class Prawn < Formatter
   BoldStyle = [:bold].to_set
   ItalicStyle = [:italic].to_set
   BoldItalicStyle = [:bold, :italic].to_set
+  UnderlineStyle = [:underline].to_set
 
   def initialize opts = {}
     unless ::Rouge::Theme === (theme = opts[:theme])
@@ -23,7 +26,12 @@ class Prawn < Formatter
     end
     @theme = theme
     @normalized_colors = {}
-    @linenum_fragment_base = (create_fragment Token['Generic.Lineno']).merge linenum: true
+    @background_colorizer = BackgroundColorizer.new line_gap: opts[:line_gap]
+    @linenum_fragment_base = (create_fragment Tokens::Generic::Lineno).merge linenum: true
+  end
+
+  def background_color
+    @background_color ||= normalize_color((@theme.style_for Tokens::Text).bg)
   end
 
   # Override format method so fragments don't get flatted to a string
@@ -43,13 +51,13 @@ class Prawn < Formatter
           fragments << { text: LF }
           fragments << (create_linenum_fragment linenum += 1)
         elsif val.include? LF
+          # NOTE we assume if the fragment ends in a line feed, the intention was to match a line-oriented form
+          line_oriented = val.end_with? LF
           base_fragment = create_fragment tok, val
           val.each_line do |line|
-            fragments << (base_fragment.merge text: line)
+            fragments << (line_oriented ? (base_fragment.merge text: line, line_oriented: true) : (base_fragment.merge text: line))
             # NOTE append linenum fragment if there's a next line; only works if source doesn't have trailing endline
-            if line.end_with? LF
-              fragments << (create_linenum_fragment linenum += 1)
-            end
+            fragments << (create_linenum_fragment linenum += 1) if line.end_with? LF
           end
         else
           fragments << (create_fragment tok, val)
@@ -76,9 +84,12 @@ class Prawn < Formatter
         else
           val[0] = GuardedIndent if start_of_line && (val.start_with? ' ')
           val.gsub! InnerIndent, GuardedInnerIndent if val.include? InnerIndent
-          start_of_line = val.end_with? LF
-          # NOTE this optimization assumes we don't support/use background colors
-          val.rstrip.empty? ? { text: val } : (create_fragment tok, val)
+          # QUESTION do we need the call to create_fragment if val contains only spaces? consider bg
+          #fragment = create_fragment tok, val
+          fragment = val.rstrip.empty? ? { text: val } : (create_fragment tok, val)
+          # NOTE we assume if the fragment ends in a line feed, the intention was to match a line-oriented form
+          fragment[:line_oriented] = true if (start_of_line = val.end_with? LF)
+          fragment
         end
       end
       # QUESTION should we strip trailing newline?
@@ -89,14 +100,26 @@ class Prawn < Formatter
   def create_fragment tok, val = nil
     fragment = val ? { text: val } : {}
     if (style_rules = @theme.style_for tok)
-      # TODO support background color
+      if (bg = normalize_color style_rules.bg) && bg != @background_color
+        fragment[:background_color] = bg
+        fragment[:callback] = @background_colorizer
+        fragment[:inline_block] = true if style_rules[:inline_block]
+        fragment[:extend] = true if style_rules[:extend]
+      end
       if (fg = normalize_color style_rules.fg)
         fragment[:color] = fg
       end
       if style_rules[:bold]
-        fragment[:styles] = style_rules[:italic] ? BoldItalicStyle : BoldStyle
+        fragment[:styles] = style_rules[:italic] ? BoldItalicStyle.dup : BoldStyle.dup
       elsif style_rules[:italic]
-        fragment[:styles] = ItalicStyle
+        fragment[:styles] = ItalicStyle.dup
+      end
+      if style_rules[:underline]
+        if fragment.key? :styles
+          fragment[:styles] << UnderlineStyle.first
+        else
+          fragment[:styles] = UnderlineStyle.dup
+        end
       end
     end
     fragment
@@ -117,5 +140,22 @@ class Prawn < Formatter
     end
   end
 end
+
+class BackgroundColorizer
+  def initialize opts = {}
+    @line_gap = opts[:line_gap] || 0
+  end
+
+  def render_behind fragment
+    pdf = fragment.document
+    data = fragment.format_state
+    prev_fill_color = pdf.fill_color
+    pdf.fill_color data[:background_color]
+    v_gap = data[:inline_block] ? @line_gap : 0
+    fragment_width = data[:line_oriented] && data[:extend] ? (pdf.bounds.width - fragment.left) : fragment.width
+    pdf.fill_rectangle [fragment.left, fragment.top + v_gap * 0.5], fragment_width, (fragment.height + v_gap)
+    pdf.fill_color prev_fill_color
+  end
+end
 end
 end

data/lib/asciidoctor-pdf/rouge_ext/themes/pastie.rb

@@ -1,61 +1,66 @@
 module Rouge
-module Themes
-# A Rouge theme that matches the pastie style from Pygments.
-# See https://bitbucket.org/birkenfeld/pygments-main/src/default/pygments/styles/pastie.py
-class Pastie < CSSTheme
-  name 'pastie' 
-
-  style Text::Whitespace,          fg: '#bbbbbb'
-
-  style Comment,                   fg: '#888888'
-  style Comment::Preproc,          fg: '#cc0000', bold: true
-  style Comment::Special,          fg: '#cc0000', bg: '#fff0f0', bold: true
-
-  style Error,                     fg: '#a61717', bg: '#e3d2d2'
-  style Generic::Error,            fg: '#aa0000'
-  style Generic::Traceback,        fg: '#aa0000'
-
-  style Generic::Deleted,          fg: '#000000', bg: '#ffdddd'
-  style Generic::Emph,             italic: true
-  style Generic::Inserted,         fg: '#000000', bg: '#ddffdd'
-  style Generic::Heading,          fg: '#333333'
-  #style Generic::Lineno,           fg: '#555555'
-  style Generic::Lineno,           fg: '#888888'
-  style Generic::Output,           fg: '#888888'
-  style Generic::Prompt,           fg: '#555555'
-  style Generic::Strong,           bold: true
-  style Generic::Subheading,       fg: '#666666'
-
-  style Keyword,                   fg: '#008800', bold: true
-  style Keyword::Pseudo,           fg: '#008800'
-  style Keyword::Type,             fg: '#888888', bold: true
-
-  style Literal::Number,           fg: '#0000dd', bold: true
-
-  style Literal::String,           fg: '#dd2200', bg: '#fff0f0'
-  style Literal::String::Escape,   fg: '#0044dd'
-  style Literal::String::Interpol, fg: '#3333bb'
-  style Literal::String::Other,    fg: '#22bb22', bg: '#f0fff0'
-  style Literal::String::Regex,    fg: '#008800', bg: '#fff0ff'
-  style Literal::String::Symbol,   fg: '#aa6600'
-
-  style Name::Attribute,           fg: '#336699'
-  style Name::Builtin,             fg: '#003388'
-  style Name::Class,               fg: '#bb0066', bold: true
-  style Name::Constant,            fg: '#003366', bold: true
-  style Name::Decorator,           fg: '#555555'
-  style Name::Exception,           fg: '#bb0066', bold: true
-  style Name::Function,            fg: '#0066bb', bold: true
-  #style Name::Label,               fg: '#336699', italic: true
-  style Name::Label,               fg: '#336699'
-  style Name::Namespace,           fg: '#bb0066', bold: true
-  style Name::Property,            fg: '#336699', bold: true
-  style Name::Tag,                 fg: '#bb0066', bold: true
-  style Name::Variable::Global,    fg: '#dd7700'
-  style Name::Variable::Instance,  fg: '#3333bb'
-  style Name::Variable,            fg: '#336699'
-
-  style Operator::Word,            fg: '#008800'
-end
-end
+  module Themes
+    # A port of the pastie style from Pygments.
+    # See https://bitbucket.org/birkenfeld/pygments-main/src/default/pygments/styles/pastie.py
+    class Pastie < CSSTheme
+      name 'pastie' 
+
+      # Deviate from pastie here since our italic is actually a thinner font
+      style Comment,                   fg: '#888888' #, italic: true
+      style Comment::Preproc,          fg: '#cc0000', bold: true
+      # Deviate from pastie here by not using a background color
+      style Comment::Special,          fg: '#cc0000', bold: true #, bg: '#fff0f0'
+
+      style Error,                     fg: '#a61717', bg: '#e3d2d2'
+      style Generic::Error,            fg: '#aa0000'
+
+      style Generic::Heading,          fg: '#333333'
+      style Generic::Subheading,       fg: '#666666'
+
+      style Generic::Deleted,          fg: '#000000', bg: '#ffdddd', inline_block: true, extend: true
+      style Generic::Inserted,         fg: '#000000', bg: '#ddffdd', inline_block: true, extend: true
+
+      style Generic::Emph,             italic: true
+      style Generic::Strong,           bold: true
+
+      style Generic::Lineno,           fg: '#888888'
+      style Generic::Output,           fg: '#888888'
+      style Generic::Prompt,           fg: '#555555'
+      style Generic::Traceback,        fg: '#aa0000'
+
+      style Keyword,                   fg: '#008800', bold: true
+      style Keyword::Pseudo,           fg: '#008800'
+      style Keyword::Type,             fg: '#888888', bold: true
+
+      style Num,                       fg: '#0000dd', bold: true
+
+      # Deviate from pastie here by not using background colors
+      style Str,                       fg: '#dd2200' #, bg: '#fff0f0'
+      style Str::Escape,               fg: '#0044dd' #, bg: '#fff0f0'
+      style Str::Interpol,             fg: '#3333bb' #, bg: '#fff0f0'
+      style Str::Other,                fg: '#22bb22' #, bg: '#f0fff0'
+      style Str::Regex,                fg: '#008800' #, bg: '#fff0ff'
+      style Str::Symbol,               fg: '#aa6600' #, bg: '#fff0f0'
+
+      style Name::Attribute,           fg: '#336699'
+      style Name::Builtin,             fg: '#003388'
+      style Name::Class,               fg: '#bb0066', bold: true
+      style Name::Constant,            fg: '#003366', bold: true
+      style Name::Decorator,           fg: '#555555'
+      style Name::Exception,           fg: '#bb0066', bold: true
+      style Name::Function,            fg: '#0066bb', bold: true
+      # Name::Label is used for built-in CSS properties in Rouge, so let's drop italics
+      style Name::Label,               fg: '#336699' #, italic: true
+      style Name::Namespace,           fg: '#bb0066', bold: true
+      style Name::Property,            fg: '#336699', bold: true
+      style Name::Tag,                 fg: '#bb0066', bold: true
+      style Name::Variable,            fg: '#336699'
+      style Name::Variable::Global,    fg: '#dd7700'
+      style Name::Variable::Instance,  fg: '#3333bb'
+
+      style Operator::Word,            fg: '#008800'
+
+      style Text,                      {}
+    end
+  end
 end

data/lib/asciidoctor-pdf/sanitizer.rb

@@ -1,3 +1,11 @@
+begin
+  require 'unicode' unless defined? Unicode::VERSION
+rescue LoadError
+  begin
+    require 'active_support/multibyte' unless defined? ActiveSupport::Multibyte
+  rescue LoadError; end
+end
+
 module Asciidoctor
 module Pdf
 module Sanitizer
@@ -8,6 +16,8 @@ module Sanitizer
   }
   BuiltInEntityCharRx = /(?:#{BuiltInEntityChars.keys * '|'})/
   BuiltInEntityCharOrTagRx = /(?:#{BuiltInEntityChars.keys * '|'}|<)/
+  InverseBuiltInEntityChars = BuiltInEntityChars.invert
+  InverseBuiltInEntityCharRx = /[#{InverseBuiltInEntityChars.keys.join}]/
   NumericCharRefRx = /&#(\d{2,6});/
   XmlSanitizeRx = /<[^>]+>/
   SegmentPcdataRx = /(?:(&[a-z]+;|<[^>]+>)|([^&<]+))/
@@ -25,12 +35,53 @@ module Sanitizer
         .gsub(BuiltInEntityCharRx, BuiltInEntityChars)
   end
 
-  def upcase_pcdata string
+  def escape_xml string
+    string.gsub InverseBuiltInEntityCharRx, InverseBuiltInEntityChars
+  end
+
+  def uppercase_pcdata string
     if BuiltInEntityCharOrTagRx =~ string
-      string.gsub(SegmentPcdataRx) { $2 ? $2.upcase : $1 }
+      string.gsub(SegmentPcdataRx) { $2 ? (uppercase_mb $2) : $1 }
     else
+      uppercase_mb string
+    end
+  end
+
+  if RUBY_VERSION >= '2.4'
+    def uppercase_mb string
+      string.upcase
+    end
+
+    def lowercase_mb string
+      string.downcase
+    end
+  # NOTE Unicode library is 4x as fast as ActiveSupport::MultiByte::Chars
+  elsif defined? ::Unicode
+    def uppercase_mb string
+      string.ascii_only? ? string.upcase : (::Unicode.upcase string)
+    end
+
+    def lowercase_mb string
+      string.ascii_only? ? string.downcase : (::Unicode.downcase string)
+    end
+  elsif defined? ::ActiveSupport::Multibyte
+    MultibyteChars = ::ActiveSupport::Multibyte::Chars
+
+    def uppercase_mb string
+      string.ascii_only? ? string.upcase : (MultibyteChars.new string).upcase.to_s
+    end
+
+    def lowercase_mb string
+      string.ascii_only? ? string.downcase : (MultibyteChars.new string).downcase.to_s
+    end
+  else
+    def uppercase_mb string
       string.upcase
     end
+
+    def lowercase_mb string
+      string.downcase
+    end
   end
 end
 end

data/lib/asciidoctor-pdf/theme_loader.rb

@@ -1,10 +1,13 @@
 require 'safe_yaml/load'
 require 'ostruct'
 require_relative 'core_ext/ostruct'
+require_relative 'measurements'
 
 module Asciidoctor
 module Pdf
 class ThemeLoader
+  include ::Asciidoctor::Pdf::Measurements
+
   DataDir = ::File.expand_path(::File.join(::File.dirname(__FILE__), '..', '..', 'data'))
   ThemesDir = ::File.join DataDir, 'themes'
   FontsDir = ::File.join DataDir, 'fonts'
@@ -14,7 +17,7 @@ class ThemeLoader
   VariableRx = /\$([a-z0-9_]+)/
   LoneVariableRx = /^\$([a-z0-9_]+)$/
   HexColorEntryRx = /^(?<k>[[:blank:]]*[[:graph:]]+): +(?!null$)(?<q>["']?)#?(?<v>\w{3,6})\k<q> *(?:#.*)?$/
-  MeasurementValueRx = /(?<=^| |\()(-?\d+(?:\.\d+)?)(in|mm|cm|pt|px)(?=$| |\))/
+  MeasurementValueRx = /(?<=^| |\()(-?\d+(?:\.\d+)?)(in|mm|cm|p[txc])(?=$| |\))/
   MultiplyDivideOpRx = /(-?\d+(?:\.\d+)?) +([*\/]) +(-?\d+(?:\.\d+)?)/
   AddSubtractOpRx = /(-?\d+(?:\.\d+)?) +([+\-]) +(-?\d+(?:\.\d+)?)/
   PrecisionFuncRx = /^(round|floor|ceil)\(/
@@ -111,7 +114,7 @@ class ThemeLoader
       # QUESTION do we need to evaluate_math in this case?
       data[key] = to_color(evaluate val, data)
     elsif %(#{key.chomp '_'}_).include? '_content_'
-      data[key] = expand_vars val, data
+      data[key] = (expand_vars val.to_s, data).to_s
     else
       data[key] = evaluate val, data
     end
@@ -144,26 +147,10 @@ class ThemeLoader
 
   def evaluate_math expr
     return expr if !(::String === expr) || ColorValue === expr
-    original = expr
-    # expand measurement values (e.g., 0.5in)
+    # resolve measurement values (e.g., 0.5in => 36)
     # QUESTION should we round the value? perhaps leave that to the precision functions
     # NOTE leave % as a string; handled by converter for now
-    expr = expr.gsub(MeasurementValueRx) {
-      # TODO extract to_pt method and use it here
-      val = $1.to_f
-      case $2
-      when 'in'
-        val * 72
-      when 'mm'
-        val * (72 / 25.4)
-      when 'cm'
-        val * (720 / 25.4)
-      when 'px'
-        val * 0.75
-      else
-        val # default unit is pt
-      end
-    }
+    expr = resolve_measurement_values(original = expr)
     while true
       result = expr.gsub(MultiplyDivideOpRx) { $1.to_f.send $2.to_sym, $3.to_f }
       unchanged = (result == expr)
@@ -230,7 +217,7 @@ class ThemeLoader
       end
     else
       # Unknown type; coerce to a string
-      value = %(#{value})
+      value = value.to_s
     end
     value = case value.size
     when 6

data/lib/asciidoctor-pdf/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
 module Pdf
-  VERSION = '1.5.0.alpha.13'
+  VERSION = '1.5.0.alpha.14'
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 1.5.0.alpha.13
+  version: 1.5.0.alpha.14
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -96,7 +96,7 @@ dependencies:
         version: 0.21.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,21 +106,21 @@ dependencies:
         version: 0.21.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0
 - !ruby/object:Gem::Dependency
   name: prawn-icon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +167,7 @@ description: 'An extension for Asciidoctor that converts AsciiDoc documents to P
   using the Prawn PDF library.
 
 '
-email: dan@opendevise.io
+email: dan@opendevise.com
 executables:
 - asciidoctor-pdf
 extensions: []
@@ -198,7 +198,6 @@ files:
 - data/fonts/notoserif-regular-subset.ttf
 - data/themes/base-theme.yml
 - data/themes/default-theme.yml
-- docs/theme-schema.json
 - docs/theming-guide.adoc
 - lib/asciidoctor-pdf.rb
 - lib/asciidoctor-pdf/asciidoctor_ext.rb
@@ -210,6 +209,7 @@ files:
 - lib/asciidoctor-pdf/core_ext.rb
 - lib/asciidoctor-pdf/core_ext/array.rb
 - lib/asciidoctor-pdf/core_ext/numeric.rb
+- lib/asciidoctor-pdf/core_ext/object.rb
 - lib/asciidoctor-pdf/core_ext/ostruct.rb
 - lib/asciidoctor-pdf/core_ext/quantifiable_stdout.rb
 - lib/asciidoctor-pdf/core_ext/string.rb
@@ -222,10 +222,16 @@ files:
 - lib/asciidoctor-pdf/formatted_text/parser.treetop
 - lib/asciidoctor-pdf/formatted_text/transform.rb
 - lib/asciidoctor-pdf/implicit_header_processor.rb
-- lib/asciidoctor-pdf/pdf_core_ext.rb
-- lib/asciidoctor-pdf/pdf_core_ext/page.rb
-- lib/asciidoctor-pdf/pdf_core_ext/pdf_object.rb
-- lib/asciidoctor-pdf/pdfmarks.rb
+- lib/asciidoctor-pdf/index_catalog.rb
+- lib/asciidoctor-pdf/measurements.rb
+- lib/asciidoctor-pdf/pdf-core_ext.rb
+- lib/asciidoctor-pdf/pdf-core_ext/page.rb
+- lib/asciidoctor-pdf/pdfmark.rb
+- lib/asciidoctor-pdf/prawn-svg_ext.rb
+- lib/asciidoctor-pdf/prawn-svg_ext/interface.rb
+- lib/asciidoctor-pdf/prawn-table_ext.rb
+- lib/asciidoctor-pdf/prawn-table_ext/cell/asciidoc.rb
+- lib/asciidoctor-pdf/prawn-table_ext/cell/text.rb
 - lib/asciidoctor-pdf/prawn_ext.rb
 - lib/asciidoctor-pdf/prawn_ext/coderay_encoder.rb
 - lib/asciidoctor-pdf/prawn_ext/extensions.rb
@@ -265,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to PDF using Prawn