asciidoctor-pdf 1.5.0.alpha.8 → 1.5.0.alpha.9

data/lib/asciidoctor-pdf/prawn_ext/formatted_text/fragment.rb

@@ -23,7 +23,7 @@ module Fragment
 end
 
 class ::Prawn::Text::Formatted::Fragment
-  if ::RUBY_MIN_VERSION_2
+  if respond_to? :prepend
     prepend Fragment
   else
     # NOTE it's necessary to remove the accessor methods or else they won't get replaced

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

@@ -17,6 +17,22 @@ module Images
       _initial_image file, opts
     end
   end
+
+  # Retrieve the intrinsic image dimensions for the specified path.
+  #
+  # Returns a Hash containing :width and :height keys that map to the image's
+  # intrinsic width and height values (in pixels)
+  def intrinsic_image_dimensions path
+    if path.end_with? '.svg'
+      img_obj = ::Prawn::Svg::Interface.new ::IO.read(path), self, {}
+      img_size = img_obj.document.sizing
+      { width: img_size.output_width, height: img_size.output_height }
+    else
+      # NOTE build_image_object caches image data previously loaded
+      _, img_size = build_image_object path
+      { width: img_size.width, height: img_size.height }
+    end
+  end
 end
 
 ::Prawn::Document.extensions << Images

data/lib/asciidoctor-pdf/rouge_ext.rb

@@ -0,0 +1,4 @@
+require 'rouge'
+require_relative 'rouge_ext/formatters/prawn'
+require_relative 'rouge_ext/css_theme'
+require_relative 'rouge_ext/themes/pastie'

data/lib/asciidoctor-pdf/rouge_ext/css_theme.rb

@@ -0,0 +1,14 @@
+module Rouge
+class CSSTheme
+  # Patch style_for to return most specific style first
+  # See https://github.com/jneen/rouge/issues/280 (fix pending)
+  def style_for token
+    token.token_chain.reverse_each do |t|
+      if (s = styles[t])
+        return s
+      end
+    end
+    nil
+  end
+end
+end

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

@@ -0,0 +1,121 @@
+module Rouge
+module Formatters
+# Transforms a token stream into an array of 
+# formatted text fragments for use with Prawn.
+class Prawn < Formatter
+  tag 'prawn'
+
+  EOL = %(\n)
+  NoBreakSpace = %(\u00a0)
+  InnerIndent = %(\n )
+  GuardedIndent = %(\u00a0)
+  GuardedInnerIndent = %(\n\u00a0)
+  BoldStyle = [:bold].to_set
+  ItalicStyle = [:italic].to_set
+  BoldItalicStyle = [:bold, :italic].to_set
+
+  def initialize opts = {}
+    unless ::Rouge::Theme === (theme = opts[:theme])
+      unless theme && (theme = ::Rouge::Theme.find theme)
+        theme = ::Rouge::Themes::Pastie
+      end
+      theme = theme.new
+    end
+    @theme = theme
+    @normalized_colors = {}
+    @linenum_fragment_base = (create_fragment Token['Generic.Lineno']).merge linenum: true
+  end
+
+  # Override format method so fragments don't get flatted to a string
+  # and to add an options Hash.
+  def format tokens, opts = {}
+    stream tokens, opts
+  end
+
+  def stream tokens, opts = {}
+    if opts[:line_numbers]
+      # TODO implement line number start (offset)
+      linenum = 0
+      fragments = []
+      fragments << (create_linenum_fragment linenum += 1)
+      tokens.each do |tok, val|
+        if val == EOL
+          fragments << { text: EOL }
+          fragments << (create_linenum_fragment linenum += 1)
+        elsif val.include? EOL
+          base_fragment = create_fragment tok, val
+          val.each_line do |line|
+            fragments << (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? EOL
+              fragments << (create_linenum_fragment linenum += 1)
+            end
+          end
+        else
+          fragments << (create_fragment tok, val)
+        end
+      end
+      # NOTE drop orphaned linenum fragment (due to trailing endline in source)
+      fragments.pop if (last_fragment = fragments[-1]) && last_fragment[:linenum]
+      # NOTE pad numbers that have less digits than the largest line number
+      if (linenum_w = (linenum / 10) + 1) > 1
+        # NOTE extra column is the trailing space after the line number
+        linenum_w += 1
+        fragments.each do |fragment|
+          fragment[:text] = %(#{fragment[:text].rjust linenum_w, NoBreakSpace}) if fragment[:linenum]
+        end
+      end
+      fragments
+    else
+      start_of_line = true
+      tokens.map do |tok, val|
+        # match one or more consecutive endlines
+        if val == EOL || (val == (EOL * val.length))
+          start_of_line = true
+          { text: val }
+        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? EOL
+          # NOTE this optimization assumes we don't support/use background colors
+          val.rstrip.empty? ? { text: val } : (create_fragment tok, val)
+        end
+      end
+      # QUESTION should we strip trailing newline?
+    end
+  end
+
+  # TODO method could still be optimized (for instance, check if val is EOL or empty)
+  def create_fragment tok, val = nil
+    fragment = val ? { text: val } : {}
+    if (style_rules = @theme.style_for tok)
+      # TODO support background color
+      if (fg = normalize_color style_rules.fg)
+        fragment[:color] = fg
+      end
+      if style_rules[:bold]
+        fragment[:styles] = style_rules[:italic] ? BoldItalicStyle : BoldStyle
+      elsif style_rules[:italic]
+        fragment[:styles] = ItalicStyle
+      end
+    end
+    fragment
+  end
+
+  def create_linenum_fragment linenum
+    @linenum_fragment_base.merge text: %(#{linenum} )
+  end
+
+  def normalize_color raw
+    return unless raw
+    if (normalized = @normalized_colors[raw])
+      normalized
+    else
+      normalized = (raw.start_with? '#') ? raw[1..-1] : raw
+      normalized = normalized.each_char.map {|c| c * 2 }.join if normalized.size == 3
+      @normalized_colors[raw] = normalized
+    end
+  end
+end
+end
+end

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

@@ -0,0 +1,61 @@
+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
+end

data/lib/asciidoctor-pdf/theme_loader.rb

@@ -8,6 +8,8 @@ class ThemeLoader
   DataDir = ::File.expand_path(::File.join(::File.dirname(__FILE__), '..', '..', 'data'))
   ThemesDir = ::File.join DataDir, 'themes'
   FontsDir = ::File.join DataDir, 'fonts'
+  DefaultThemePath = ::File.expand_path 'default-theme.yml', ThemesDir
+  BaseThemePath = ::File.expand_path 'base-theme.yml', ThemesDir
 
   VariableRx = /\$([a-z0-9_]+)/
   LoneVariableRx = /^\$([a-z0-9_]+)$/
@@ -39,32 +41,48 @@ class ThemeLoader
     if (theme_name.end_with? '.yml')
       # FIXME restrict to jail!
       # QUESTION why are we not using expand_path in this case?
-      theme_path ? ::File.join(theme_path, theme_name) : theme_name
+      theme_path ? (::File.join theme_path, theme_name) : theme_name
     else
       # QUESTION should we append '-theme.yml' or just '.yml'?
-      ::File.expand_path(%(#{theme_name}-theme.yml), (theme_path || ThemesDir))
+      ::File.expand_path %(#{theme_name}-theme.yml), (theme_path || ThemesDir)
     end
   end
 
   def self.resolve_theme_asset asset_path, theme_path = nil
-    ::File.expand_path(asset_path, (theme_path || ThemesDir))
+    ::File.expand_path asset_path, (theme_path || ThemesDir)
   end
 
-  def self.load_theme theme_name = nil, theme_path = nil
-    load_file(resolve_theme_file theme_name, theme_path)
+  # NOTE base theme is loaded "as is" (no post-processing)
+  def self.load_base_theme
+    ::OpenStruct.new(::SafeYAML.load_file BaseThemePath)
   end
 
-  def self.load_file filename
-    data = ::IO.read(filename).each_line.map {|l| l.sub HexColorValueRx, '_color: \'\k<value>\'' }.join
-    self.new.load(::SafeYAML.load data)
-  end
+  def self.load_theme theme_name = nil, theme_path = nil, opts = {}
+    if (theme_file = resolve_theme_file theme_name, theme_path) == BaseThemePath ||
+        (theme_file != DefaultThemePath && (opts.fetch :apply_base_theme, true))
+      theme_data = load_base_theme
+    else
+      theme_data = nil
+    end
 
-  def load hash
-    hash.inject(::OpenStruct.new) do |data, (key, val)|
-      process_entry key, val, data
+    if theme_file == BaseThemePath
+      theme_data
+    else
+      # QUESTION should we do any post-load calculations or defaults?
+      load_file theme_file, theme_data
     end
   end
 
+  def self.load_file filename, theme_data = nil
+    raw_data = (::IO.read filename).each_line.map {|l| l.sub HexColorValueRx, '_color: \'\k<value>\'' }.join
+    self.new.load((::SafeYAML.load raw_data), theme_data)
+  end
+
+  def load hash, theme_data = nil
+    theme_data ||= ::OpenStruct.new
+    hash.inject(theme_data) {|data, (key, val)| process_entry key, val, data }
+  end
+
   private
 
   def process_entry key, val, data
@@ -92,7 +110,7 @@ class ThemeLoader
   # NOTE we assume expr is a String
   def expand_vars expr, vars
     if (idx = (expr.index '$'))
-      if idx == 0 && LoneVariableRx =~ expr
+      if idx == 0 && expr =~ LoneVariableRx
         vars[$1]
       else
         expr.gsub(VariableRx) { vars[$1] }
@@ -137,7 +155,7 @@ class ThemeLoader
       expr = result
       break if unchanged
     end
-    if (expr.end_with? ')') && PrecisionFuncRx =~ expr
+    if (expr.end_with? ')') && expr =~ PrecisionFuncRx
       op = $1
       offset = op.length + 1
       expr = expr[offset...-1].to_f.send op.to_sym

data/lib/asciidoctor-pdf/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 1.5.0.alpha.8
+  version: 1.5.0.alpha.9
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -65,14 +65,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: prawn-templates
   requirement: !ruby/object:Gem::Requirement
@@ -93,14 +93,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: prawn-icon
   requirement: !ruby/object:Gem::Requirement
@@ -135,14 +135,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -175,16 +175,17 @@ files:
 - bin/asciidoctor-pdf
 - bin/optimize-pdf
 - data/fonts/LICENSE-mplus-testflight-58
-- data/fonts/LICENSE-noto-fonts-2014-11-17
+- data/fonts/LICENSE-noto-2015-06-05
 - data/fonts/mplus1mn-bold-ascii.ttf
-- data/fonts/mplus1mn-bolditalic-ascii.ttf
+- data/fonts/mplus1mn-bold_italic-ascii.ttf
 - data/fonts/mplus1mn-italic-ascii.ttf
 - data/fonts/mplus1mn-regular-ascii-conums.ttf
-- data/fonts/mplus1p-regular-multilingual.ttf
-- data/fonts/notoserif-bold-latin.ttf
-- data/fonts/notoserif-bolditalic-latin.ttf
-- data/fonts/notoserif-italic-latin.ttf
-- data/fonts/notoserif-regular-latin.ttf
+- data/fonts/mplus1p-regular-fallback.ttf
+- data/fonts/notoserif-bold-subset.ttf
+- data/fonts/notoserif-bold_italic-subset.ttf
+- data/fonts/notoserif-italic-subset.ttf
+- data/fonts/notoserif-regular-subset.ttf
+- data/themes/base-theme.yml
 - data/themes/default-theme.yml
 - docs/theme-schema.json
 - docs/theming-guide.adoc
@@ -199,6 +200,7 @@ files:
 - lib/asciidoctor-pdf/core_ext/array.rb
 - lib/asciidoctor-pdf/core_ext/numeric.rb
 - lib/asciidoctor-pdf/core_ext/ostruct.rb
+- lib/asciidoctor-pdf/core_ext/quantifiable_stdout.rb
 - lib/asciidoctor-pdf/formatted_text.rb
 - lib/asciidoctor-pdf/formatted_text/formatter.rb
 - lib/asciidoctor-pdf/formatted_text/inline_destination_marker.rb
@@ -209,14 +211,20 @@ files:
 - 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/prawn_ext.rb
 - lib/asciidoctor-pdf/prawn_ext/coderay_encoder.rb
 - lib/asciidoctor-pdf/prawn_ext/extensions.rb
+- lib/asciidoctor-pdf/prawn_ext/font/afm.rb
 - lib/asciidoctor-pdf/prawn_ext/formatted_text/fragment.rb
 - lib/asciidoctor-pdf/prawn_ext/images.rb
 - lib/asciidoctor-pdf/roman_numeral.rb
+- lib/asciidoctor-pdf/rouge_ext.rb
+- lib/asciidoctor-pdf/rouge_ext/css_theme.rb
+- lib/asciidoctor-pdf/rouge_ext/formatters/prawn.rb
+- lib/asciidoctor-pdf/rouge_ext/themes/pastie.rb
 - lib/asciidoctor-pdf/sanitizer.rb
 - lib/asciidoctor-pdf/temporary_path.rb
 - lib/asciidoctor-pdf/theme_loader.rb