summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDan Allen <dan.j.allen@gmail.com>2022-08-24 23:48:32 -0600
committerDan Allen <dan.j.allen@gmail.com>2022-08-25 01:38:43 -0600
commit84db47348998d1221907da9b656ea91e45772084 (patch)
tree3d6d41f96f9caf8443ff338bdaffec32565971a6 /lib
parent13daa5dd0142d91247f99916148a8852ff8ea2b2 (diff)
consolidate code in formatted text transform to make it easier to manage
Diffstat (limited to 'lib')
-rw-r--r--lib/asciidoctor/pdf/formatted_text/transform.rb21
1 files changed, 6 insertions, 15 deletions
diff --git a/lib/asciidoctor/pdf/formatted_text/transform.rb b/lib/asciidoctor/pdf/formatted_text/transform.rb
index 9e856be6..bf75bda9 100644
--- a/lib/asciidoctor/pdf/formatted_text/transform.rb
+++ b/lib/asciidoctor/pdf/formatted_text/transform.rb
@@ -222,11 +222,8 @@ module Asciidoctor
fragments << fragment
previous_fragment_is_text = false
else # :br
- if @merge_adjacent_text_nodes && previous_fragment_is_text
- fragments << (clone_fragment inherited, text: %(#{fragments.pop[:text]}#{LF}))
- else
- fragments << { text: LF }
- end
+ text = @merge_adjacent_text_nodes && previous_fragment_is_text ? %(#{fragments.pop[:text]}#{LF}) : LF
+ fragments << (clone_fragment inherited, text: text)
previous_fragment_is_text = true
end
end
@@ -240,18 +237,12 @@ module Asciidoctor
# FIXME: AFM fonts do not include a thin space glyph; set fallback_fonts to allow glyph to be resolved
text = [(node[:value].to_i 16)].pack 'U1'
end
- if @merge_adjacent_text_nodes && previous_fragment_is_text
- fragments << (clone_fragment inherited, text: %(#{fragments.pop[:text]}#{text}))
- else
- fragments << (clone_fragment inherited, text: text)
- end
+ text = %(#{fragments.pop[:text]}#{text}) if @merge_adjacent_text_nodes && previous_fragment_is_text
+ fragments << (clone_fragment inherited, text: text)
previous_fragment_is_text = true
else # :text
- if @merge_adjacent_text_nodes && previous_fragment_is_text
- fragments << (clone_fragment inherited, text: %(#{fragments.pop[:text]}#{node[:value]}))
- else
- fragments << (clone_fragment inherited, text: node[:value])
- end
+ text = @merge_adjacent_text_nodes && previous_fragment_is_text ? %(#{fragments.pop[:text]}#{node[:value]}) : node[:value]
+ fragments << (clone_fragment inherited, text: text)
previous_fragment_is_text = true
end
end