diff options
author | Ralph Amissah <ralph@amissah.com> | 2013-08-25 01:25:49 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2013-08-25 01:25:49 -0400 |
commit | 77cae1945ed4d01100f42705801cfd12fb8be941 (patch) | |
tree | 35bb5e6bd8e03df63af45226d0198d7a522d08ea /lib/sisu/v5/dal_misc_arrange.rb | |
parent | debian/changelog (4.1.12-1) (diff) | |
parent | v4 v5: vim syntax, sisu.vim, improve grouped text match, for blocks using tics (diff) |
Merge tag 'sisu_4.2.0' into debian/sid
SiSU 4.2.0
Diffstat (limited to 'lib/sisu/v5/dal_misc_arrange.rb')
-rw-r--r-- | lib/sisu/v5/dal_misc_arrange.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/sisu/v5/dal_misc_arrange.rb b/lib/sisu/v5/dal_misc_arrange.rb index c1751360..ab4f3ea4 100644 --- a/lib/sisu/v5/dal_misc_arrange.rb +++ b/lib/sisu/v5/dal_misc_arrange.rb @@ -76,20 +76,20 @@ module SiSU_DAL_MiscArrangeText def code_blocks(para) def ticks(para) block_open,block_close,text=nil,nil,nil - if para =~/\A(``` .+?)\n(.+?)\n(```(?: [~-][#])?)\s*\Z/m - block_open,text,block_close=/\A(``` .+?)\n(.+?)\n(```(?: [~-][#])?)\s*\Z/m.match(para)[1..3] + if para =~/\A[`]{3}\s+.+?\n.+?\n[`]{3}(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*\Z/m + block_open,text,block_close=/\A([`]{3}\s+.+?)\n(.+?)\n([`]{3}(\s+[~-][#]|\s+\~\{.+?\}\~)?)\s*\Z/m.match(para)[1..3] para=[] para << block_open << text << block_close - elsif para =~/\A(``` .+?)\n(.*?)\Z/m #look at, study - block_open,text=/\A(```(?: .+?))\n(.*?)\Z/m.match(para)[1,2] + elsif para =~/\A[`]{3}\s+.+?\n.*?\Z/m #look at, study + block_open,text=/\A([`]{3}(?:\s+.+?))\n(.*?)\Z/m.match(para)[1,2] para=[] if not text.to_s.empty? para << block_open << text else para << block_open end - elsif para =~/\A(.+?)\n(```(?:\s*[~-][#])?)\s*\Z/m - text,block_close=/\A(.+?)\n(```(?: [~-][#])?)\s*\Z/m.match(para)[1,2] + elsif para =~/\A.+?\n[`]{3}(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*\Z/m + text,block_close=/\A(.+?)\n([`]{3}(?:\s+[~-][#]|\s+\~\{.+?\}\~)?)\s*\Z/m.match(para)[1,2] para=[] if not text.to_s.empty? para << text.to_s << block_close |