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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22493470e3006991e099beb8ddeb65c08eb033c0
-  data.tar.gz: c90d7a56f0140153feda21773e7875758b86e020
+  metadata.gz: 03d9ab43813f8db41152d4b2d0004aaa5c6fdf08
+  data.tar.gz: 85f3a33dd273be7f2a3c96e57970243d28c6c3eb
 SHA512:
-  metadata.gz: c7d1c228af54e9c88d796a5b9b75631e850b30cc2cafead887ee5309338bfe9cf488c211f3058aa98b6dd1153f996c409939df0b80510287971174390bcd25ef
-  data.tar.gz: 96010a61d4c6d16502e4d0418923a96cb917e5d0bbcd714826c567c060f997749f8349254df5c1c696ae4a2a453b9cff37488490e5769ba58f837ad4a389a42e
+  metadata.gz: e6fb7d474c712cc68dc57d9a7bd1e6f6c6e0804d42d53a90a4f452a4ce6da40b12f74ef50db6b88a62aa1b1649210ad6a7f7f8685235c3304765bceac4adaecb
+  data.tar.gz: 4b8d0b17b2ab5d015b586a8f2d1754c6ca97c4f7beee7645e343667e5adad634bb3b3d66592a87ce89448861c45817c37ec4825beeef927297c3ab9cc37d1fee

data/LICENSE.adoc

@@ -1,6 +1,6 @@
 .The MIT License
 ....
-Copyright (C) 2014 OpenDevise Inc. and the Asciidoctor Project
+Copyright (C) 2014-2015 OpenDevise Inc. and the Asciidoctor Project
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NOTICE.adoc

@@ -1,7 +1,7 @@
 = Asciidoctor PDF
 OpenDevise Inc.; Asciidoctor Project
 
-Copyright (C) 2014 OpenDevise Inc. and the Asciidoctor Project.
+Copyright (C) 2014-2015 OpenDevise Inc. and the Asciidoctor Project.
 
 Please visit the Asciidoctor project site for more information:
 
@@ -71,6 +71,6 @@ PrawnCodeRayEncoder class::
   - https://github.com/prawnpdf/prawn
 
 Bootstrap (v3.0.3)::
-  The default theme is based on Bootstrap 3.0.3.
+  The default theme is inspired by Bootstrap 3.0.3.
 
   - http://getbootstrap.com

data/README.adoc

@@ -1,20 +1,22 @@
 = Asciidoctor PDF: A native PDF converter for AsciiDoc
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
+v1.5.0.alpha.10, 2015-11-01
 // Settings:
 :compat-mode!:
 :experimental:
 :idprefix:
 :idseparator: -
 :icons: font
+ifdef::env-github,env-browser[:outfilesuffix: .adoc]
 :pagenums:
-ifdef::env-github[:relfileprefix: /blob/master]
-ifdef::env-browser[:toc: preamble]
 //:pdf-page-size: [8.25in, 11.69in]
 //:pdf-page-size: A4
+ifdef::env-browser[:toc: preamble]
 // Aliases:
 :project-name: Asciidoctor PDF
 :project-handle: asciidoctor-pdf
 // URIs:
+//ifdef::env-github[:relfileprefix: /blob/master/]
 :uri-project: https://github.com/asciidoctor/asciidoctor-pdf
 :uri-project-repo: {uri-project}
 :uri-project-issues: {uri-project-repo}/issues
@@ -23,10 +25,6 @@ ifdef::env-browser[:toc: preamble]
 :uri-rvm: http://rvm.io
 :uri-asciidoctor: http://asciidoctor.org
 
-// FIXME See last line; Asciidoctor should only be using outfilesuffix defined in header
-:original-outfilesuffix: {outfilesuffix}
-:outfilesuffix: .adoc
-
 _Lo and behold_, a native PDF converter for AsciiDoc built with {uri-asciidoctor}[Asciidoctor] and {uri-prawn}[Prawn]! +
 _No more middleman._ +
 _No more DocBook toolchain._ +
@@ -43,7 +41,7 @@ See the milestone v1.5.0 in the {uri-project-issues}[issue tracker] for details.
 And what a gem it is!
 
 {uri-prawn}[Prawn] is a nimble PDF writer for Ruby.
-More important, it's a hackable platform that offers both high level APIs for the most common needs and low level APIs for bending the document model to accomodate special circumstances.
+More important, it's a hackable platform that offers both high level APIs for the most common needs and low level APIs for bending the document model to accommodate special circumstances.
 
 With Prawn, you can write text, draw lines and shapes and place images _anywhere_ on the page and add as much color as you like.
 In addition, it brings a fluent API and aggressive code re-use to the printable document space.
@@ -84,7 +82,7 @@ Picking up from there, {project-name} takes the pain out of creating PDF documen
 * “Keep together” blocks (i.e., page breaks avoided in certain block content)
 * Orphan section titles avoided
 * Table border settings honored
-* Font-based icons (currently admonition blocks only)
+* Font-based icons
 * Custom fonts
 
 === Missing features
@@ -131,6 +129,13 @@ Choose one (or more) of the following:
 
 .Pygments
  $ gem install pygments.rb
+ 
+You then activate syntax highlighting for a given document by adding the following attribute to the document header (CodeRay shown):
+
+[source,asciidoc]
+----
+:source-highlighter: coderay 
+----
 
 Assuming all the required gems install properly, verify you can run the `asciidoctor-pdf` script:
 
@@ -159,7 +164,7 @@ It's time to convert the AsciiDoc document directly to PDF.
 
 === Convert AsciiDoc to PDF
 
-IMPORTANT: You'll need to the `coderay` gem installed to run this example since it uses the `source-highlighter` attribute with the value of `coderay`.
+IMPORTANT: You'll need the `coderay` gem installed to run this example since it uses the `source-highlighter` attribute with the value of `coderay`.
 
 Converting to PDF is a simple as running the `asciidoctor-pdf` script using Ruby and passing our AsciiDoc document as the first argument.
 
@@ -185,6 +190,58 @@ The layout and styling of the PDF is driven by a YAML configuration file.
 To learn how the theming system works and how to create and apply custom themes, refer to the <<docs/theming-guide.adoc#,Asciidoctor PDF Theme Guide>>.
 You can use the built-in theme files, which you can find in the [file]_data/themes_ directory, as examples.
 
+== Font-based Icons
+
+You can use icons in your PDF document using any of the following icon sets:
+
+* *fa* - https://fortawesome.github.io/Font-Awesome/[Font Awesome^] (default)
+* *octicon* - https://octicons.github.com/[Octicons^]
+* *fi* - http://zurb.com/playground/foundation-icon-fonts-3[Foundation Icons^]
+* *pf* - http://paymentfont.io/[Payment font^]
+
+You can enable font-based icons by setting the following attribute in the header of your document:
+
+[source,asciidoc]
+----
+:icons: font
+----
+
+If you want to override the font set globally, also set the `icon-set` attribute:
+
+[source,asciidoc]
+----
+:icons: font
+:icon-set: pf
+----
+
+Here's an example that shows how to use the Amazon icon from the payment font (pf) icon set in a sentence:
+
+[source,asciidoc]
+----
+Available now at icon:amazon[].
+----
+
+You can use the `set` attribute on the icon macro to override the icon set for a given icon.
+
+[source,asciidoc]
+----
+Available now at icon:amazon[set=pf].
+----
+
+In addition to the sizes supported in the HTML backend (lg, 1x, 2x, etc), you can enter any relative value in the size attribute (e.g., 1.5em, 150%, etc).
+
+[source,asciidoc]
+----
+icon:android[size=40em]
+----
+
+You can enable use of fonts during PDF generation (instead of in the document header) by passing the `icons` attribute to the `asciidoctor-pdf` command.
+
+ $ asciidoctor-pdf -a icons=font -a icon-set=octicon sample.adoc
+
+Icon-based fonts are handled by the `prawn-icon` gem.
+To find a complete list of available icons, consult the https://github.com/jessedoyle/prawn-icon/tree/master/data/fonts[prawn-icon] repository.
+
 == Optional scripts
 
 {project-name} also provides a shell script that invokes GhostScript (`gs`) to optimize and compress the generated PDF with minimal impact on quality.
@@ -295,11 +352,8 @@ For best results, be sure to always use `bundle exec` whenever invoking the `./b
 
 == Copyright
 
-Copyright (C) 2014 OpenDevise Inc. and the Asciidoctor Project.
+Copyright (C) 2014-2015 OpenDevise Inc. and the Asciidoctor Project.
 Free use of this software is granted under the terms of the MIT License.
 
 For the full text of the license, see the <<LICENSE.adoc#,LICENSE>> file.
 Refer to the <<NOTICE.adoc#,NOTICE>> file for information about third-party Open Source software in use.
-
-// FIXME Asciidoctor should be using outfilesuffix defined in header
-:outfilesuffix: {original-outfilesuffix}

data/docs/theming-guide.adoc

@@ -459,7 +459,7 @@ title_page:
 
 == Fonts
 
-You can select from <<built-in-fonts,built-in PDF fonts>>, <<bundled-fonts,fonts bundled with Asciidoctor PDF>> or <<custom-fonts,custom fonts>> loaded from TrueType font (TTF) files.
+You can select from <<built-in-afm-fonts,built-in PDF fonts>>, <<bundled-fonts,fonts bundled with Asciidoctor PDF>> or <<custom-fonts,custom fonts>> loaded from TrueType font (TTF) files.
 If you want to use custom fonts, you must first declare them in your theme file.
 
 === Built-in (AFM) fonts
@@ -676,7 +676,7 @@ TBW
 
 |page_background_image
 |path (absolute or relative to pdf-stylesdir)
-|background_image: \image:watermark.png[]
+|+background_image: image:watermark.png[]+
 
 |page_layout
 |portrait, landscape +
@@ -885,7 +885,7 @@ The literal key is used for inline monospaced text in prose and table cells.
 
 |title_page_background_image
 |path (absolute or relative to pdf-stylesdir)
-|background_image: \image:title.png[]
+|+background_image: image:title.png[]+
 
 |title_page_logo_align
 |left, center, right
@@ -893,7 +893,7 @@ The literal key is used for inline monospaced text in prose and table cells.
 
 |title_page_logo_image
 |inline image macro
-|logo_image: \image:logo.png[scaledwidth=25%]
+|+logo_image: image:logo.png[scaledwidth=25%]+
 
 |title_page_logo_top
 |percentage
@@ -1135,6 +1135,14 @@ Block styles are applied to the following block types:
 |<<colors,color>>
 |background_color: #eeeeee
 
+|sidebar_padding
+|<<measurement-units,measurement>>, <<measurement-units,measurement array [4]>>
+|padding: [12, 15, 0, 15]
+
+|sidebar_title_align
+|left, center, right, justify
+|title_align: center
+
 |sidebar_title_font_color
 |<<colors,color>>
 |title_font_color: #333333
@@ -1150,10 +1158,6 @@ Block styles are applied to the following block types:
 |sidebar_title_font_style
 |normal, italic, bold, bold_italic
 |title_font_style: bold
-
-|sidebar_title_align
-|left, center, right, justify
-|title_align: center
 |===
 
 === Example
@@ -1192,8 +1196,25 @@ Block styles are applied to the following block types:
 |admonition_border_width
 |<<values,number>>
 |border_width: 0.5
+
+|admonition_icon_<name>_name^[1]^
+|string^[2]^
+|admonition_icon_tip_name: fa-fire
+
+|admonition_icon_<name>_stroke_color
+|<<colors,color>>
+|admonition_icon_tip_stroke_color: ff0000
+
+|admonition_icon_<name>_size
+|<<values,number>> +
+(default: 24)
+|admonition_icon_tip_size: 24
 |===
 
+^[1]^ `<name>` can be `note`, `tip`, `warning`, `important` or `caution`. +
+^[2]^ See the `.yml` files in the https://github.com/jessedoyle/prawn-icon/tree/master/data/fonts[prawn-icon repository] for a list of valid names.
+The prefix (e.g., `fa-`) determines which font set to use.
+
 === Image
 
 [cols="3,3,5m"]
@@ -1544,9 +1565,10 @@ NOTE: If content is not specified for the running footer, the page number (i.e.,
 NOTE: The background color spans the width of the page.
 When a background color is specified, the border also spans the width of the page.
 
-==== Implicit attributes
+==== Attribute references
 
-In addition to the document-level attributes defined in the AsciiDoc document, the following attributes are available when defining the content keys in the footer:
+You can use _any_ attribute defined in your AsciiDoc document in the content of the running header and footer.
+In addition, the following attributes are also available when defining the content keys in the footer:
 
 * page-count
 * page-number
@@ -1556,10 +1578,17 @@ In addition to the document-level attributes defined in the AsciiDoc document, t
 * section-title
 * section-or-chapter-title
 
-Here's an example that shows how these attributes can be used in the running footer:
+Here's an example that shows how attributes can be used in the running footer:
 
 [source,yaml]
 ----
+header:
+  height: 0.75in
+  line_height: 1
+  recto_content:
+    center: 'v{revnumber}, {docdate}'
+  verso_content:
+    center: $header_recto_content
 footer:
   height: 0.75in
   line_height: 1

data/lib/asciidoctor-pdf/asciidoctor_ext/list.rb

@@ -5,5 +5,5 @@ class Asciidoctor::List
   # Return true if this list is an outline list. Otherwise, return false.
   def outline?
     @context == :ulist || @context == :olist
-  end
+  end unless respond_to? :outline?
 end

data/lib/asciidoctor-pdf/asciidoctor_ext/list_item.rb

@@ -5,12 +5,12 @@ class Asciidoctor::ListItem
   # Return false if the list item contains no blocks or it contains a nested outline list. Otherwise, return true.
   def complex?
     !simple?
-  end
+  end unless respond_to? :complex?
 
   # Check whether this list item has simple content (i.e., no nested blocks aside from an outline list).
   #
   # Return true if the list item contains no blocks or it contains a nested outline list. Otherwise, return false.
   def simple?
     @blocks.empty? || (@blocks.size == 1 && ::Asciidoctor::List === (blk = @blocks[0]) && blk.outline?)
-  end
+  end unless respond_to? :simple?
 end

data/lib/asciidoctor-pdf/converter.rb

@@ -33,13 +33,14 @@ class Converter < ::Prawn::Document
 
   AsciidoctorVersion = ::Gem::Version.create ::Asciidoctor::VERSION
   AdmonitionIcons = {
-    caution:   { key: 'fa-fire', color: 'BF3400' },
-    important: { key: 'fa-exclamation-circle', color: 'BF0000' },
-    note:      { key: 'fa-info-circle', color: '19407C' },
-    tip:       { key: 'fa-lightbulb-o', color: '111111' },
-    warning:   { key: 'fa-exclamation-triangle', color: 'BF6900' }
+    caution:   { name: 'fa-fire', stroke_color: 'BF3400', size: 24 },
+    important: { name: 'fa-exclamation-circle', stroke_color: 'BF0000', size: 24 },
+    note:      { name: 'fa-info-circle', stroke_color: '19407C', size: 24 },
+    tip:       { name: 'fa-lightbulb-o', stroke_color: '111111', size: 24 },
+    warning:   { name: 'fa-exclamation-triangle', stroke_color: 'BF6900', size: 24 }
   }
   Alignments = [:left, :center, :right]
+  AlignmentNames = ['left', 'center', 'right']
   EOL = %(\n)
   TAB = %(\t)
   InnerIndent = %(\n )
@@ -172,16 +173,18 @@ class Converter < ::Prawn::Document
       (0..-1)
     end
 
-    layout_running_content :header, doc, skip: num_front_matter_pages unless doc.noheader
-    layout_running_content :footer, doc, skip: num_front_matter_pages unless doc.nofooter
+    if page_count > num_front_matter_pages
+      layout_running_content :header, doc, skip: num_front_matter_pages unless doc.noheader
+      layout_running_content :footer, doc, skip: num_front_matter_pages unless doc.nofooter
+    end
 
     add_outline doc, num_toc_levels, toc_page_nums, num_front_matter_pages
-    catalog.data[:ViewerPreferences] = [:FitWindow]
+    # TODO allow document (or theme) to override initial view magnification
+    # NOTE add 1 to page height to force initial scroll to 0; a nil value also seems to work
+    catalog.data[:OpenAction] = dest_fit_horizontally (page_height + 1), state.pages[0] if state.pages.size > 0
+    catalog.data[:ViewerPreferences] = { DisplayDocTitle: true }
 
     layout_cover_page :back, doc
-
-    # NOTE we have to init pdfmarks here while we have a reference to the doc
-    @pdfmarks = Pdfmarks.new doc
   end
 
   # NOTE embedded only makes sense if perhaps we are building
@@ -208,6 +211,8 @@ class Converter < ::Prawn::Document
     @font_color = theme.base_font_color
     @text_transform = nil
     @stamps = {}
+    # NOTE we have to init pdfmarks here while we have a reference to the doc
+    @pdfmarks = (doc.attr? 'pdfmarks') ? (Pdfmarks.new doc) : nil
     init_scratch_prototype
     self
   end
@@ -430,8 +435,13 @@ class Converter < ::Prawn::Document
                 # FIXME HACK make title in this location look right
                 label_margin_top = node.title? ? @theme.caption_margin_inside : 0
                 if icons
-                  admon_icon_data = AdmonitionIcons[label]
-                  icon admon_icon_data[:key], valign: :center, align: :center, color: admon_icon_data[:color], size: (admonition_icon_size node)
+                  icon_data = admonition_icon_data label
+                  icon icon_data[:name], {
+                    valign: :center,
+                    align: :center,
+                    color: icon_data[:stroke_color],
+                    size: (fit_icon_size node, icon_data[:size])
+                  }
                 else
                   layout_prose label, valign: :center, style: :bold, line_height: 1, margin_top: label_margin_top, margin_bottom: 0
                 end
@@ -603,6 +613,11 @@ class Converter < ::Prawn::Document
 
   def convert_dlist node
     add_dest_for_block node if node.id
+
+    # TODO check if we're within one line of the bottom of the page
+    # and advance to the next page if so (similar to logic for section titles)
+    layout_caption node.title if node.title?
+
     node.items.each do |terms, desc|
       terms = [*terms]
       # NOTE don't orphan the terms, allow for at least one line of content
@@ -677,6 +692,10 @@ class Converter < ::Prawn::Document
   end
 
   def convert_outline_list node
+    # TODO check if we're within one line of the bottom of the page
+    # and advance to the next page if so (similar to logic for section titles)
+    layout_caption node.title if node.title?
+
     line_metrics = calc_line_metrics @theme.base_line_height
     complex = false
     # ...or if we want to give all items in the list the same treatment
@@ -847,6 +866,7 @@ class Converter < ::Prawn::Document
             rendered_h = available_height
             # FIXME workaround to fix Prawn not adding fill and stroke commands
             # on page that only has an image; breakage occurs when line numbers are added
+            # NOTE this no longer seems to be an issue
             fill_color self.fill_color
             stroke_color self.stroke_color
           end
@@ -1074,7 +1094,7 @@ class Converter < ::Prawn::Document
   end
 
   # Adds guards to preserve indentation
-  def guard_indentation fragments 
+  def guard_indentation fragments
     start_of_line = true
     fragments.each do |fragment|
       next if (text = fragment[:text]).empty?
@@ -1216,11 +1236,20 @@ class Converter < ::Prawn::Document
       column_widths = []
     else
       table_width = bounds.width * ((node.attr 'tablepcwidth') / 100.0)
-      column_widths = node.columns.map {|col| ((col.attr 'colpcwidth') * table_width) / 100.0 }
+      even_column_pct = 100.0 / node.columns.size
+      column_widths = node.columns.map {|col| ((col.attr 'colpcwidth', even_column_pct) * table_width) / 100.0 }
+    end
+
+    if ((position = node.attr 'align') && (AlignmentNames.include? position)) ||
+        (position = (node.roles & AlignmentNames).last)
+      position = position.to_sym
+    else
+      position = :left
     end
 
     table_settings = {
       header: table_header,
+      position: position,
       cell_style: {
         padding: theme.table_cell_padding,
         border_width: 0,
@@ -1583,7 +1612,7 @@ class Converter < ::Prawn::Document
       go_to_page page_count if position == :back
       if cover_image.downcase.end_with? '.pdf'
         # NOTE import_page automatically advances to next page afterwards
-        import_page cover_image
+        import_page cover_image, advance: position != :back
       else
         image_page cover_image, canvas: true
       end
@@ -1685,6 +1714,7 @@ class Converter < ::Prawn::Document
 
   def layout_toc doc, num_levels = 2, toc_page_number = 2, num_front_matter_pages = 0
     go_to_page toc_page_number unless (page_number == toc_page_number) || scratch?
+    start_page_number = page_number
     theme_font :heading, level: 2 do
       layout_heading doc.attr('toc-title')
     end
@@ -1698,7 +1728,8 @@ class Converter < ::Prawn::Document
       end
       layout_toc_level doc.sections, num_levels, line_metrics, dot_width, num_front_matter_pages
     end
-    toc_page_numbers = (toc_page_number..page_number)
+    # NOTE range must be calculated relative to toc_page_number; absolute page number in scratch document is arbitrary
+    toc_page_numbers = (toc_page_number..(toc_page_number + (page_number - start_page_number)))
     go_to_page page_count - 1 unless scratch?
     toc_page_numbers
   end
@@ -1746,9 +1777,16 @@ class Converter < ::Prawn::Document
 
   # Reduce icon size to fit inside bounds.height. Icons will not render
   # properly if they are larger than the current bounds.height.
-  def admonition_icon_size node, max_size = 24
-    min_height = bounds.height.floor
-    min_height < max_size ? min_height : max_size
+  def fit_icon_size node, max_size = 24
+    (min_height = bounds.height.floor) < max_size ? min_height : max_size
+  end
+
+  def admonition_icon_data key
+    if (icon_data = @theme[%(admonition_icon_#{key})])
+      AdmonitionIcons[key].merge icon_data
+    else
+      AdmonitionIcons[key]
+    end
   end
 
   # TODO delegate to layout_page_header and layout_page_footer per page

data/lib/asciidoctor-pdf/pdfmarks.rb

@@ -27,6 +27,7 @@ class Pdfmarks
   end
 
   def generate_file pdf_file
+    # QUESTION should we use the extension pdfmeta to be more clear?
     ::IO.write %(#{pdf_file}marks), generate
   end
 end

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

@@ -86,7 +86,8 @@ class CodeRayEncoder < ::CodeRay::Encoders::Encoder
     if text == EOL
       @out << { text: text }
       @start_of_line = true
-    else
+    # NOTE text is nil and kind is :error when CodeRay ends parsing on an error
+    elsif text
       # NOTE add guard character to prevent Prawn from trimming indentation
       text[0] = GuardedIndent if @start_of_line && (text.start_with? ' ')
       text.gsub! InnerIndent, GuardedInnerIndent if text.include? InnerIndent

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

@@ -602,7 +602,10 @@ module Extensions
 
   # Import the specified page into the current document.
   #
-  def import_page file
+  # By default, advance to the subsequent page, creating one if necessary.
+  # This behavior can be disabled by passing the option `advance: false`.
+  #
+  def import_page file, opts = {}
     prev_page_layout = page.layout
     prev_page_size = page.size
     state.compress = false if state.compress # can't use compression if using template
@@ -611,13 +614,15 @@ module Extensions
     start_new_page_discretely template: file
     # prawn-templates sets text_rendering_mode to :unknown, which breaks running content; revert
     @text_rendering_mode = prev_text_rendering_mode
-    if last_page?
-      # NOTE set page size & layout explicitly in case imported page differs
-      # I'm not sure it's right to start a new page here, but unfortunately there's no other
-      # way atm to prevent the size & layout of the imported page from affecting subsequent pages
-      start_new_page size: prev_page_size, layout: prev_page_layout
-    else
-      go_to_page page_number + 1
+    if opts.fetch :advance, true
+      if last_page?
+        # NOTE set page size & layout explicitly in case imported page differs
+        # I'm not sure it's right to start a new page here, but unfortunately there's no other
+        # way atm to prevent the size & layout of the imported page from affecting subsequent pages
+        start_new_page size: prev_page_size, layout: prev_page_layout
+      else
+        go_to_page page_number + 1
+      end
     end
     nil
   end

data/lib/asciidoctor-pdf/theme_loader.rb

@@ -86,7 +86,12 @@ class ThemeLoader
   private
 
   def process_entry key, val, data
-    if key != 'font_catalog' && ::Hash === val
+    if key.start_with? 'admonition_icon_'
+      data[key] = (val || {}).map do |(key2, val2)|
+        static_val2 = evaluate val2, data
+        [key2.to_sym, (key2.end_with? '_color') ? to_color(static_val2) : static_val2]
+      end.to_h
+    elsif key != 'font_catalog' && ::Hash === val
       val.each do |key2, val2|
         process_entry %(#{key}_#{key2.tr '-', '_'}), val2, data
       end
@@ -106,7 +111,7 @@ class ThemeLoader
       expr
     end
   end
-  
+
   # NOTE we assume expr is a String
   def expand_vars expr, vars
     if (idx = (expr.index '$'))
@@ -119,7 +124,7 @@ class ThemeLoader
       expr
     end
   end
-  
+
   def evaluate_math expr
     return expr if !(::String === expr) || ColorValue === expr
     original = expr

data/lib/asciidoctor-pdf/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 1.5.0.alpha.9
+  version: 1.5.0.alpha.10
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -107,40 +107,40 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.5
 - !ruby/object:Gem::Dependency
@@ -250,8 +250,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to PDF using Prawn
 test_files: []
+has_rdoc: true