diff options
Diffstat (limited to 'lib/sisu/v2/dal_syntax.rb')
-rw-r--r-- | lib/sisu/v2/dal_syntax.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/sisu/v2/dal_syntax.rb b/lib/sisu/v2/dal_syntax.rb index dd83ef3b..59620856 100644 --- a/lib/sisu/v2/dal_syntax.rb +++ b/lib/sisu/v2/dal_syntax.rb @@ -70,11 +70,14 @@ module SiSU_Syntax url_and_stub=SiSU_Env::Info_env.new.url @output_url="#{url_and_stub.remote}" @env=SiSU_Env::Info_env.new - @emph=(@env.markup_emphasis =~/italics/) \ + emph_italics=((@env.markup_emphasis =~/italics/) \ + || (defined? @md.make.emphasis && @md.make.emphasis =~/italics/)) \ + ? true : false + @emph=emph_italics \ ? ({:o =>Mx[:fa_italics_o], :c =>Mx[:fa_italics_c] }) \ : ({:o =>Mx[:fa_bold_o], :c =>Mx[:fa_bold_c] }) @http_m=%r{\{.+?\}https?://\S+|https?:\S+|\.\.\/\S+|\S+?\.png\b|[*]~\S+|^#{Mx[:meta_o]}.+|#{Mx[:gr_o]}(?:code|group|alt|verse)(?:-end)?#{Mx[:gr_c]}|#{Mx[:fa_o]}:br#{Mx[:fa_c]}} - @manmkp_ital=(@env.markup_emphasis =~/italics/) \ + @manmkp_ital=emph_italics \ ? '[i/*]\\{.+?\\}[i/*]' \ : '[i/]\\{.+?\\}[i/]' tail_m_ital=%q{(?:\s|[.,;:?!'")]|~\^|~\\\{\s|$)} @@ -89,7 +92,7 @@ module SiSU_Syntax elsif defined? @vz.markup_make_italic[:str] /#{@http_m}|#{bold_line}|#{@manmkp_ital}#{tail_m_ital}|#{@vz.markup_make_italic[:str]}#{tail_m_ital}|\S+|\n/ end - @manmkp_bold=(@env.markup_emphasis =~/italics/) \ + @manmkp_bold=emph_italics \ ? '^!_\s.+?(?:\n|$)|[!b]\\{.+?\\}[*!b]|[*!][a-zA-Z0-9\-_]+[!]' \ : '^!_\s.+?(?:\n|$)|[*!b]\\{.+?\\}[*!b]|[*!][a-zA-Z0-9\-_]+[*!]' @line_scan_bold=if (defined? @md.make.bold[:str] \ |