diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-04-30 19:52:57 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-04-30 19:52:57 -0400 |
| commit | 88029687c9ad611c1f2c70f789347605dc2041c3 (patch) | |
| tree | 946d9070e224868df464da3112a5fc94200a759c /lib/sisu/v2/dal_syntax.rb | |
| parent | markup for *{emphasis}* configurable as being either bold or italics (diff) | |
emphasis display and plaintext line wrap configurable in document or sis
* markup for *{emphasis}* configurable as being displayed either bold or
italics, the default is that emphasis output is in bold so there is no
at present unless configured, either in sisurc.yml (default: emphasis:
'italics'), or the markup source document header @make: :emphasis: 'it
[requested]
* plaintext, wrap width configurable between 20 to 200 characters, the
default width being 78, configuration eithe rin sisurc.yml (default: t
78), or the markup source document header (@make: :plaintext_wrap: 78)
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] \ |