diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-05-01 08:58:49 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-05-01 08:58:49 -0400 |
| commit | 2708d32e438edcddabdc6d62fc6898cbbe07f2a9 (patch) | |
| tree | 883f486865438c07698b4ce55a4b15e7399bd7a7 /lib/sisu/v2/dal_syntax.rb | |
| parent | reduce screen output unless some verbose flag (such as -v) is used (diff) | |
*{emphasis}* display configurable as being bold, italics or underscore
* markup for *{emphasis}* configurable as being displayed as bold, italics or
underscore, the default is that emphasis output is in bold so there is no
change unless configured, either in sisurc.yml (default: emphasis: 'bold'), or
the markup source document header @make: :emphasis: 'bold'
Diffstat (limited to 'lib/sisu/v2/dal_syntax.rb')
| -rw-r--r-- | lib/sisu/v2/dal_syntax.rb | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/lib/sisu/v2/dal_syntax.rb b/lib/sisu/v2/dal_syntax.rb index 59620856..2b1da084 100644 --- a/lib/sisu/v2/dal_syntax.rb +++ b/lib/sisu/v2/dal_syntax.rb @@ -70,12 +70,23 @@ 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_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] }) + emph_set=if defined? @md.make.emphasis \ + and not @md.make.emphasis.nil? + @md.make.emphasis + else @env.markup_emphasis + end + @emph=case emph_set + when /bold/ + emph_italics=false + {:o =>Mx[:fa_bold_o], :c =>Mx[:fa_bold_c] } + when /italics/ + emph_italics=true + {:o =>Mx[:fa_italics_o], :c =>Mx[:fa_italics_c] } + when /underscore/ + emph_italics=false + {:o =>Mx[:fa_underscore_o], :c =>Mx[:fa_underscore_c] } + else p __LINE__.to_s + '::' + __FILE__ + end @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=emph_italics \ ? '[i/*]\\{.+?\\}[i/*]' \ |