asciidoctor-pdf 1.5.0.alpha.18 → 1.5.0.beta.1

data/lib/asciidoctor-pdf/core_ext.rb

@@ -1,5 +1,6 @@
 require_relative 'core_ext/object'
 require_relative 'core_ext/array'
+require_relative 'core_ext/hash'
 require_relative 'core_ext/numeric'
 require_relative 'core_ext/string'
 require_relative 'core_ext/regexp'

data/lib/asciidoctor-pdf/core_ext/hash.rb

@@ -0,0 +1,5 @@
+class Hash
+  def compact
+    select {|_, val| val }
+  end unless method_defined? :compact
+end

data/lib/asciidoctor-pdf/formatted_text.rb

@@ -7,3 +7,4 @@ require_relative 'formatted_text/inline_destination_marker'
 require_relative 'formatted_text/inline_image_arranger'
 require_relative 'formatted_text/inline_image_renderer'
 require_relative 'formatted_text/inline_text_aligner'
+require_relative 'formatted_text/text_background_and_border_renderer'

data/lib/asciidoctor-pdf/formatted_text/inline_image_arranger.rb

@@ -66,7 +66,9 @@ module InlineImageArranger
           svg_obj = ::Prawn::SVG::Interface.new ::File.read(image_path), doc,
               at: doc.bounds.top_left,
               width: image_w,
-              fallback_font_name: doc.default_svg_font
+              fallback_font_name: doc.default_svg_font,
+              enable_web_requests: doc.allow_uri_read,
+              enable_file_requests_with_root: (::File.dirname image_path)
           svg_size = image_w ? svg_obj.document.sizing :
               # NOTE convert intrinsic dimensions to points; constrain to content width
               (svg_obj.resize width: [(to_pt svg_obj.document.sizing.output_width, :px), available_w].min)

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

@@ -356,44 +356,44 @@ module Markup
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
-      if (match_len = has_terminal?('code', false, index))
+      if (match_len = has_terminal?('strong', false, index))
         r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
         @index += match_len
       else
-        terminal_parse_failure('code')
+        terminal_parse_failure('strong')
         r2 = nil
       end
       if r2
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        if (match_len = has_terminal?('color', false, index))
+        if (match_len = has_terminal?('em', false, index))
           r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('color')
+          terminal_parse_failure('em')
           r3 = nil
         end
         if r3
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          if (match_len = has_terminal?('del', false, index))
+          if (match_len = has_terminal?('code', false, index))
             r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
             @index += match_len
           else
-            terminal_parse_failure('del')
+            terminal_parse_failure('code')
             r4 = nil
           end
           if r4
             r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
           else
-            if (match_len = has_terminal?('em', false, index))
+            if (match_len = has_terminal?('color', false, index))
               r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
               @index += match_len
             else
-              terminal_parse_failure('em')
+              terminal_parse_failure('color')
               r5 = nil
             end
             if r5
@@ -422,11 +422,11 @@ module Markup
                   r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
                   r0 = r7
                 else
-                  if (match_len = has_terminal?('strong', false, index))
+                  if (match_len = has_terminal?('button', false, index))
                     r8 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                     @index += match_len
                   else
-                    terminal_parse_failure('strong')
+                    terminal_parse_failure('button')
                     r8 = nil
                   end
                   if r8
@@ -455,8 +455,20 @@ module Markup
                         r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
                         r0 = r10
                       else
-                        @index = i0
-                        r0 = nil
+                        if (match_len = has_terminal?('del', false, index))
+                          r11 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                          @index += match_len
+                        else
+                          terminal_parse_failure('del')
+                          r11 = nil
+                        end
+                        if r11
+                          r11 = SyntaxNode.new(input, (index-1)...index) if r11 == true
+                          r0 = r11
+                        else
+                          @index = i0
+                          r0 = nil
+                        end
                       end
                     end
                   end

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

@@ -51,7 +51,7 @@ grammar Markup
     # QUESTION faster to do regex?
     # QUESTION can we cut stuff we aren't using? what about supporting hr?
     #'a' / 'b' / 'code' / 'color' / 'del' / 'em' / 'font' / 'i' / 'img' / 'link' / 'span' / 'strikethrough' / 'strong' / 'sub' / 'sup' / 'u'
-    'a' / 'code' / 'color' / 'del' / 'em' / 'font' / 'span' / 'strong' / 'sub' / 'sup'
+    'a' / 'strong' / 'em' / 'code' / 'color' / 'font' / 'span' / 'button' / 'sub' / 'sup' / 'del'
   end
 
   rule void_tag_name

data/lib/asciidoctor-pdf/formatted_text/text_background_and_border_renderer.rb

@@ -0,0 +1,45 @@
+module Asciidoctor::Pdf::FormattedText
+module TextBackgroundAndBorderRenderer
+  module_function
+
+  # render_behind is called before the text is printed
+  def render_behind fragment
+    return if (pdf = fragment.document).scratch?
+    data = fragment.format_state
+    if (border_offset = data[:border_offset])
+      at = [fragment.left - border_offset, fragment.top + border_offset]
+      width = fragment.width + border_offset * 2
+      height = fragment.height + border_offset * 2
+    else
+      at = fragment.top_left
+      width = fragment.width
+      height = fragment.height
+    end
+    border_radius = data[:border_radius]
+    if (background_color = data[:background_color])
+      prev_fill_color = pdf.fill_color
+      pdf.fill_color background_color
+      if border_radius
+        pdf.fill_rounded_rectangle at, width, height, border_radius
+      else
+        pdf.fill_rectangle at, width, height
+      end
+      pdf.fill_color prev_fill_color
+    end
+    if (border_width = data[:border_width])
+      border_color = data[:border_color]
+      prev_stroke_color = pdf.stroke_color
+      prev_line_width = pdf.line_width
+      pdf.stroke_color border_color
+      pdf.line_width border_width
+      if border_radius
+        pdf.stroke_rounded_rectangle at, width, height, border_radius
+      else
+        pdf.stroke_rectangle at, width, height
+      end
+      pdf.stroke_color prev_stroke_color
+      pdf.line_width prev_line_width
+    end
+  end
+end
+end

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

@@ -20,21 +20,44 @@ class Transform
     @merge_adjacent_text_nodes = options[:merge_adjacent_text_nodes]
     # TODO add support for character spacing
     if (theme = options[:theme])
-      @link_font_settings = {
-        color: theme.link_font_color,
-        font: theme.link_font_family,
-        size: theme.link_font_size,
-        styles: to_styles(theme.link_font_style, theme.link_text_decoration)
-      }.select! {|_, val| val }
-      @monospaced_font_settings = {
-        color: theme.literal_font_color,
-        font: theme.literal_font_family,
-        size: theme.literal_font_size,
-        styles: to_styles(theme.literal_font_style)
-      }.select! {|_, val| val }
+      @theme_settings = {
+        button: {
+          color: theme.button_font_color,
+          font: theme.button_font_family,
+          size: theme.button_font_size,
+          styles: to_styles(theme.button_font_style),
+          background_color: (button_bg_color = theme.button_background_color),
+          border_width: (button_border_width = theme.button_border_width),
+          border_color: button_border_width && (theme.button_border_color || theme.base_border_color),
+          border_offset: (button_bg_or_border = button_bg_color || button_border_width) && theme.button_border_offset,
+          border_radius: button_bg_or_border && theme.button_border_radius,
+          callback: button_bg_or_border && [TextBackgroundAndBorderRenderer],
+        }.compact,
+        code: {
+          color: theme.literal_font_color,
+          font: theme.literal_font_family,
+          size: theme.literal_font_size,
+          styles: to_styles(theme.literal_font_style),
+          background_color: (monospaced_bg_color = theme.literal_background_color),
+          border_width: (monospaced_border_width = theme.literal_border_width),
+          border_color: monospaced_border_width && (theme.literal_border_color || theme.base_border_color),
+          border_offset: (monospaced_bg_or_border = monospaced_bg_color || monospaced_border_width) && theme.literal_border_offset,
+          border_radius: monospaced_bg_or_border && theme.literal_border_radius,
+          callback: monospaced_bg_or_border && [TextBackgroundAndBorderRenderer],
+        }.compact,
+        link: {
+          color: theme.link_font_color,
+          font: theme.link_font_family,
+          size: theme.link_font_size,
+          styles: to_styles(theme.link_font_style, theme.link_text_decoration)
+        }.compact,
+      }
     else
-      @link_font_settings = { color: '0000FF' }
-      @monospaced_font_settings = { font: 'Courier', size: 0.9 }
+      @theme_settings = {
+        button: { font: 'Courier', styles: [:bold].to_set },
+        code: { font: 'Courier', size: 0.9 },
+        link: { color: '0000FF' },
+      }
     end
   end
 
@@ -79,7 +102,7 @@ class Transform
               image_format: attributes[:format],
               # a zero-width space in the text will cause the image to be duplicated
               text: (attributes[:alt].delete ZeroWidthSpace),
-              callback: InlineImageRenderer
+              callback: [InlineImageRenderer],
             }
             if (img_w = attributes[:width])
               fragment[:image_width] = img_w
@@ -123,9 +146,9 @@ class Transform
       styles << :bold
     when :em
       styles << :italic
-    when :code
-      # NOTE prefer old value, except for styles, which should be combined
-      fragment.update(@monospaced_font_settings) {|k, old_v, new_v| k == :styles ? old_v.merge(new_v) : old_v }
+    when :code, :button
+      # NOTE prefer old value, except for styles and callback, which should be combined
+      fragment.update(@theme_settings[tag_name]) {|k, oval, nval| k == :styles ? oval.merge(nval) : (k == :callback ? oval.union(nval) : oval) }
     when :color
       if !fragment[:color]
         if (rgb = attrs[:rgb])
@@ -168,7 +191,7 @@ class Transform
         fragment[:width] = value
         if (value = attrs[:align])
           fragment[:align] = value.to_sym
-          fragment[:callback] = InlineTextAligner
+          (fragment[:callback] ||= []) << InlineTextAligner
         end
       end
       #if !fragment[:character_spacing] && (value = attrs[:character_spacing])
@@ -191,12 +214,12 @@ class Transform
           if (type = attrs[:type])
             fragment[:type] = type.to_sym
           end
-          fragment[:callback] = InlineDestinationMarker
+          (fragment[:callback] ||= []) << InlineDestinationMarker
           visible = false
         end
       end
       # NOTE prefer old value, except for styles, which should be combined
-      fragment.update(@link_font_settings) {|k, old_v, new_v| k == :styles ? old_v.merge(new_v) : old_v } if visible
+      fragment.update(@theme_settings[:link]) {|k, oval, nval| k == :styles ? oval.merge(nval) : oval } if visible
     when :sub
       styles << :subscript
     when :sup

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

@@ -39,7 +39,7 @@ module Extensions
 
   # Returns the effective (writable) width of the page
   #
-  # If inside a fixed-height bounding box, returns height of box.
+  # If inside a bounding box, returns width of box.
   #
   def effective_page_width
     reference_bounds.width
@@ -748,20 +748,18 @@ module Extensions
     nil
   end
 
-  # Create a new page for the specified image. If the
-  # canvas option is true, the image is stretched to the
-  # edges of the page (full coverage).
+  # Create a new page for the specified image. If the canvas option is true,
+  # the image is positioned relative to the boundaries of the page.
   def image_page file, options = {}
     start_new_page_discretely
-    if options[:canvas]
-      canvas do
-        image file, width: bounds.width, height: bounds.height
-      end
+    image_page_number = page_number
+    if options.delete :canvas
+      canvas { image file, ({ position: :center, vposition: :center }.merge options) }
     else
-      image file, fit: [bounds.width, bounds.height]
+      image file, (options.merge position: :center, vposition: :center, fit: [bounds.width, bounds.height])
     end
-    # FIXME shouldn't this be `go_to_page prev_page_number + 1`?
-    go_to_page page_count
+    # NOTE advance to new page just in case the image function threw off the cursor
+    go_to_page image_page_number
     nil
   end
 

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

@@ -9,10 +9,20 @@ module Images
 
   # Dispatch to suitable image method in Prawn based on file extension.
   def image file, opts = {}
-    # FIXME handle case when SVG is a File or IO object
-    if ::String === file && (file.downcase.end_with? '.svg')
-      opts[:fallback_font_name] ||= default_svg_font if respond_to? :default_svg_font
-      svg((::File.read file), opts)
+    # FIXME handle case when SVG is an IO object
+    if ::String === file && (((opts = opts.dup).delete :format) == 'svg' || (file.downcase.end_with? '.svg'))
+      #opts[:enable_file_requests_with_root] = (::File.dirname file) unless opts.key? :enable_file_requests_with_root
+      #opts[:enable_web_requests] = allow_uri_read if !(opts.key? :enable_web_requests) && (respond_to? :allow_uri_read)
+      #opts[:fallback_font_name] = default_svg_font if !(opts.key? :fallback_font_name) && (respond_to? :default_svg_font)
+      if (opts.key? :fit) && (fit = opts.delete :fit) && !opts[:width] && !opts[:height]
+        svg (::File.read file), opts do |svg_doc|
+          max_width, max_height = fit
+          svg_doc.calculate_sizing requested_width: max_width if max_width && svg_doc.sizing.output_width != max_width
+          svg_doc.calculate_sizing requested_height: max_height if max_height && svg_doc.sizing.output_height > max_height
+        end
+      else
+        svg (::File.read file), opts
+      end
     else
       _initial_image file, opts
     end
@@ -22,9 +32,9 @@ module Images
   #
   # 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 ::File.read(path), self, {}
+  def intrinsic_image_dimensions path, format
+    if format == 'svg'
+      img_obj = ::Prawn::SVG::Interface.new (::File.read path), self, {}
       img_size = img_obj.document.sizing
       { width: img_size.output_width, height: img_size.output_height }
     else
@@ -32,6 +42,7 @@ module Images
       _, img_size = ::File.open(path, 'rb') {|fd| build_image_object fd }
       { width: img_size.width, height: img_size.height }
     end
+  rescue
   end
 end
 

data/lib/asciidoctor-pdf/theme_loader.rb

@@ -19,9 +19,9 @@ class ThemeLoader
   DefaultThemePath = ::File.expand_path 'default-theme.yml', ThemesDir
   BaseThemePath = ::File.expand_path 'base-theme.yml', ThemesDir
 
-  VariableRx = /\$([a-z0-9_]+)/
-  LoneVariableRx = /^\$([a-z0-9_]+)$/
-  HexColorEntryRx = /^(?<k>[[:blank:]]*[[:graph:]]+): +(?!null$)(?<q>["']?)#?(?<v>\w{3,6})\k<q> *(?:#.*)?$/
+  VariableRx = /\$([a-z0-9_-]+)/
+  LoneVariableRx = /^\$([a-z0-9_-]+)$/
+  HexColorEntryRx = /^(?<k> *\p{Graph}+): +(?!null$)(?<q>["']?)(?<h>#)?(?<v>[a-f0-9]{3,6})\k<q> *(?:#.*)?$/
   MultiplyDivideOpRx = /(-?\d+(?:\.\d+)?) +([*\/]) +(-?\d+(?:\.\d+)?)/
   AddSubtractOpRx = /(-?\d+(?:\.\d+)?) +([+\-]) +(-?\d+(?:\.\d+)?)/
   PrecisionFuncRx = /^(round|floor|ceil)\(/
@@ -35,7 +35,7 @@ class ThemeLoader
 
   # A marker module for a normalized CMYK array
   # Prevents normalizing CMYK value more than once
-  module CmykColorValue
+  module CMYKColorValue
     include ColorValue
     def to_s
       %([#{join ', '}])
@@ -43,89 +43,89 @@ class ThemeLoader
   end
 
   def self.resolve_theme_file theme_name = nil, theme_path = nil
-    theme_name ||= 'default'
-    # if .yml extension is given, don't append -theme.yml
-    if (theme_name.end_with? '.yml')
+    # if .yml extension is given, assume it's a path (don't append -theme.yml)
+    if ((theme_name ||= 'default').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_file = ::File.expand_path theme_name, theme_path
+      theme_path ||= ::File.dirname theme_file
     else
-      # QUESTION should we append '-theme.yml' or just '.yml'?
-      ::File.expand_path %(#{theme_name}-theme.yml), (theme_path || ThemesDir)
+      theme_file = ::File.expand_path %(#{theme_name}-theme.yml), (theme_path || (theme_path = ThemesDir))
     end
+    [theme_file, theme_path]
   end
 
-  def self.resolve_theme_asset asset_path, theme_path = nil
+  def self.resolve_theme_asset asset_path, theme_path
     ::File.expand_path asset_path, (theme_path || ThemesDir)
   end
 
   # NOTE base theme is loaded "as is" (no post-processing)
   def self.load_base_theme
-    ::OpenStruct.new(::SafeYAML.load_file BaseThemePath)
+    (::OpenStruct.new ::SafeYAML.load_file BaseThemePath).tap {|theme| theme.__dir__ = ThemesDir }
   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
+  def self.load_theme theme_name = nil, theme_path = nil
+    theme_file, theme_path = resolve_theme_file theme_name, theme_path
+    if theme_file == BaseThemePath
+      load_base_theme
+    else
+      theme_data = load_file theme_file, nil, theme_path
+      unless theme_file == DefaultThemePath
+        # QUESTION should we enforce any other fallback values?
+        theme_data.base_align ||= 'left'
+        theme_data.code_font_family ||= (theme_data.literal_font_family || 'Courier')
+        theme_data.conum_font_family ||= (theme_data.literal_font_family || 'Courier')
+      end
+      theme_data.__dir__ = theme_path
+      theme_data
     end
-
-    theme_file == BaseThemePath ? theme_data : (load_file theme_file, theme_data, theme_path)
   end
 
   def self.load_file filename, theme_data = nil, theme_path = nil
-    yaml_data = ::SafeYAML.load (::File.read filename, encoding: ::Encoding::UTF_8).each_line.map {|l| l.sub HexColorEntryRx, '\k<k>: \'\k<v>\'' }.join
-    if ::Hash === yaml_data && (extend_files = yaml_data.delete 'extends')
-      [*extend_files].each do |extend_file|
-        if extend_file == 'default'
-          extend_file = resolve_theme_file extend_file, (extend_theme_path = ThemesDir)
-        elsif extend_file.start_with? './'
-          extend_file = resolve_theme_file extend_file, (extend_theme_path = (::File.dirname ::File.absolute_path filename))
-        else
-          extend_file = resolve_theme_file extend_file, (extend_theme_path = theme_path)
+    data = ::File.read filename, encoding: ::Encoding::UTF_8
+    data = data.each_line.map {|l|
+      l.sub(HexColorEntryRx) { %(#{(m = $~)[:k]}: #{m[:h] || (m[:k].end_with? 'color') ? "'#{m[:v]}'" : m[:v]}) }
+    }.join unless filename == DefaultThemePath
+    yaml_data = ::SafeYAML.load data
+    if ::Hash === yaml_data && (yaml_data.key? 'extends')
+      if (extends = yaml_data.delete 'extends')
+        [*extends].each do |extend_file|
+          if extend_file == 'base'
+            theme_data = theme_data ? (::OpenStruct.new theme_data.to_h.merge load_base_theme.to_h) : load_base_theme
+            next
+          elsif extend_file == 'default' || extend_file == 'default-with-fallback-font'
+            extend_file, extend_theme_path = resolve_theme_file extend_file
+          elsif extend_file.start_with? './'
+            extend_file, extend_theme_path = resolve_theme_file extend_file, (::File.dirname filename)
+          else
+            extend_file, extend_theme_path = resolve_theme_file extend_file, theme_path
+          end
+          theme_data = load_file extend_file, theme_data, extend_theme_path
         end
-        theme_data = load_file extend_file, theme_data, extend_theme_path
       end
+    else
+      theme_data ||= (filename == DefaultThemePath ? nil : load_base_theme)
     end
     self.new.load yaml_data, theme_data, theme_path
   end
 
   def load hash, theme_data = nil, theme_path = nil
-    theme_data ||= ::OpenStruct.new
-    return theme_data unless ::Hash === hash
-    base_code_font_family = theme_data.delete 'code_font_family'
-    base_conum_font_family = theme_data.delete 'conum_font_family'
-    hash.inject(theme_data) {|data, (key, val)| process_entry key, val, data }
-    # NOTE remap legacy running content keys (e.g., header_recto_content_left => header_recto_left_content)
-    %w(header_recto header_verso footer_recto footer_verso).each do |periphery_face|
-      %w(left center right).each do |align|
-        if (val = theme_data.delete %(#{periphery_face}_content_#{align}))
-          theme_data[%(#{periphery_face}_#{align}_content)] = val
-        end
-      end
-    end
-    theme_data.base_align ||= 'left'
-    theme_data.code_font_family ||= (theme_data.literal_font_family || base_code_font_family)
-    theme_data.conum_font_family ||= (theme_data.literal_font_family || base_conum_font_family)
-    # QUESTION should we do any other post-load calculations or defaults?
-    theme_data
+    ::Hash === hash ? hash.reduce(theme_data || ::OpenStruct.new) {|data, (key, val)| process_entry key, val, data } : (theme_data || ::OpenStruct.new)
   end
 
   private
 
   def process_entry key, val, data
-    if key.start_with? 'font_'
+    key = key.tr '-', '_' if key.include? '-'
+    if key == 'font_catalog' || key == 'font_fallbacks'
       data[key] = val
     elsif key.start_with? 'admonition_icon_'
       data[key] = (val || {}).map do |(key2, val2)|
         [key2.to_sym, (key2.end_with? '_color') ? to_color(evaluate val2, data) : (evaluate val2, data)]
       end.to_h
     elsif ::Hash === val
-      val.each do |key2, val2|
-        process_entry %(#{key}_#{key2.tr '-', '_'}), val2, data
-      end
+      val.each {|subkey, subval| process_entry %(#{key}_#{subkey}), subval, data }
     elsif key.end_with? '_color'
-      # QUESTION do we need to evaluate_math in this case?
+      # QUESTION do we really need to evaluate_math in this case?
       data[key] = to_color(evaluate val, data)
     elsif %(#{key.chomp '_'}_).include? '_content_'
       data[key] = (expand_vars val.to_s, data).to_s
@@ -150,21 +150,27 @@ class ThemeLoader
   def expand_vars expr, vars
     if (idx = (expr.index '$'))
       if idx == 0 && expr =~ LoneVariableRx
-        if vars.respond_to? $1
-          vars[$1]
+        if (key = $1).include? '-'
+          key = key.tr '-', '_'
+        end
+        if vars.respond_to? key
+          vars[key]
         else
           logger.warn %(unknown variable reference in PDF theme: $#{$1})
           expr
         end
       else
-        expr.gsub(VariableRx) {
-          if vars.respond_to? $1
-            vars[$1]
+        expr.gsub(VariableRx) do
+          if (key = $1).include? '-'
+            key = key.tr '-', '_'
+          end
+          if vars.respond_to? key
+            vars[key]
           else
             logger.warn %(unknown variable reference in PDF theme: $#{$1})
             $&
           end
-        }
+        end
       end
     else
       expr
@@ -178,16 +184,24 @@ class ThemeLoader
     # NOTE leave % as a string; handled by converter for now
     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)
-      expr = result
-      break if unchanged
+      if (expr.count '*/') > 0
+        result = expr.gsub(MultiplyDivideOpRx) { $1.to_f.send $2.to_sym, $3.to_f }
+        unchanged = (result == expr)
+        expr = result
+        break if unchanged
+      else
+        break
+      end
     end
     while true
-      result = expr.gsub(AddSubtractOpRx) { $1.to_f.send $2.to_sym, $3.to_f }
-      unchanged = (result == expr)
-      expr = result
-      break if unchanged
+      if (expr.count '+-') > 0
+        result = expr.gsub(AddSubtractOpRx) { $1.to_f.send $2.to_sym, $3.to_f }
+        unchanged = (result == expr)
+        expr = result
+        break if unchanged
+      else
+        break
+      end
     end
     if (expr.end_with? ')') && expr =~ PrecisionFuncRx
       op = $1
@@ -206,13 +220,6 @@ class ThemeLoader
     when ColorValue
       # already converted
       return value
-    when ::String
-      if value == 'transparent'
-        # FIXME should we have a TransparentColorValue class?
-        return HexColorValue.new value
-      elsif value.length == 6
-        return HexColorValue.new value.upcase
-      end
     when ::Array
       case value.length
       # CMYK value
@@ -231,7 +238,7 @@ class ThemeLoader
         when [100, 100, 100, 100]
           return HexColorValue.new '000000'
         else
-          value.extend CmykColorValue
+          value.extend CMYKColorValue
           return value
         end
       # RGB value
@@ -241,9 +248,20 @@ class ThemeLoader
       else
         value = value.join
       end
+    when ::String
+      if value == 'transparent'
+        # FIXME should we have a TransparentColorValue class?
+        return HexColorValue.new value
+      elsif value.length == 6
+        return HexColorValue.new value.upcase
+      end
+    when ::NilClass
+      return nil
     else
-      # Unknown type; coerce to a string
-      value = value.to_s
+      # Unknown type (usually Integer); coerce to String
+      if (value = value.to_s).length == 6
+        return HexColorValue.new value.upcase
+      end
     end
     value = case value.length
     when 6