diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-05-13 08:45:39 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-05-13 08:45:39 -0400 |
| commit | 0b620c42667441df46350d35b3f2ad1d130653c4 (patch) | |
| tree | a9e86cfb49eebae87339f566626b869d29a823fe /lib/sisu/v2/dal_syntax.rb | |
| parent | debian/changelog (2.3.3-1) (diff) | |
| parent | urls, screen output control (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v2/dal_syntax.rb')
| -rw-r--r-- | lib/sisu/v2/dal_syntax.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sisu/v2/dal_syntax.rb b/lib/sisu/v2/dal_syntax.rb index 2b1da084..c34104c7 100644 --- a/lib/sisu/v2/dal_syntax.rb +++ b/lib/sisu/v2/dal_syntax.rb @@ -358,7 +358,7 @@ module SiSU_Syntax "\\1#{@emph[:o]}\\2#{@emph[:c]}") #emphasis dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\>)!\{(.+?)\}!/, "\\1#{Mx[:fa_bold_o]}\\2#{Mx[:fa_bold_c]}") #bold - dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[]|\(|\>)\/\{(.+?)\}\//, + dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\(|\>)\/\{(.+?)\}\//, "\\1#{Mx[:fa_italics_o]}\\2#{Mx[:fa_italics_c]}") #italics dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\>)_\{(.+?)\}_/, "\\1#{Mx[:fa_underscore_o]}\\2#{Mx[:fa_underscore_c]}") #underscore |