diff options
| author | Ralph Amissah <ralph@amissah.com> | 2007-09-03 21:47:05 +0100 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2007-09-03 21:47:05 +0100 |
| commit | 97d41053a2ef2c2402524e1e73edfa2784efff1f (patch) | |
| tree | 013697d5746f437df3387ef19d765961d3b30fed /lib/sisu/v0/dal_syntax.rb | |
| parent | Updated sisu-0.57.0 (diff) | |
| parent | sisu-0.58 work towards making it possible to describe sisu and sisu markup wi... (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/dal_syntax.rb')
| -rw-r--r-- | lib/sisu/v0/dal_syntax.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sisu/v0/dal_syntax.rb b/lib/sisu/v0/dal_syntax.rb index 703d9f1b..292f7343 100644 --- a/lib/sisu/v0/dal_syntax.rb +++ b/lib/sisu/v0/dal_syntax.rb @@ -191,7 +191,7 @@ module Syntax # # #numbered (list) level 1 # _# #numbered (list) level 2 line=line.dup - if line !~/^0~|<:codeline>|<:code-end>/ + unless line =~/^0~|<:codeline>|<:code-end>/ #special characters: ~ { } < > - _ / also used : ^ ! # line_array=[] line.gsub!(/^%{1,4} .+/mi,'') #remove comments @@ -288,7 +288,7 @@ module Syntax else #code blocks line.gsub!(/(^|\s)(https?:\/\/\S+)/,'\1_\2') #line.gsub!(/(^|\s)(http:\/\/\S+)/,"\\1\\\\\\2") #escape urls line.gsub!(/(^|\s)<(https?:\/\/\S+)>([\s,.]|$)/,'\1\2\3') #clean/unescape urls with decoration, re-apply decoration later - line.gsub!(/<:codeline>/,"\n") + line.gsub!(/<:codeline>/,"\n ") #temporary fix, prefer: #line.gsub!(/<:codeline>/,"\n") end line end |