Skip to content

Commit

Permalink
resolves #956 ignore style when resolving icon font (PR #964)
Browse files Browse the repository at this point in the history
  • Loading branch information
mojavelinux authored Nov 22, 2018
1 parent 0a80537 commit 9ae227d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
* guard against pygments returning nil (#884)
* only look for the start attribute on the code block itself when highlighting with rouge
* apply block styling to background for line-oriented tokens in rouge by default
* ignore style when resolving icon font (#956)
* remove correct width method when overloading Prawn::Text::Formatted::Fragment
* remove ZWSP from alt text of image to prevent fragment from being duplicated (#958)
* avoid call to super in prepended module to fix Ruby 1.9.3
Expand Down
5 changes: 4 additions & 1 deletion lib/asciidoctor-pdf/prawn_ext/extensions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,11 @@ def register_font data
#
def font name = nil, options = {}
if name
::Prawn::Icon::FontData.load self, name if IconSets.include? name
options = { size: options } if ::Numeric === options
if IconSets.include? name
::Prawn::Icon::FontData.load self, name
options = options.reject {|k| k == :style } if options.key? :style
end
end
super name, options
end
Expand Down

0 comments on commit 9ae227d

Please sign in to comment.