diff options
| author | Ralph Amissah <ralph@amissah.com> | 2007-07-22 10:20:47 +0100 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2007-07-22 10:20:47 +0100 |
| commit | cfe5e3cbc817c3af664404c340f6726de2aea4e5 (patch) | |
| tree | 5f496518e63c365b5fe14732d98d4f8ed4a913d6 /lib/sisu | |
| parent | Updated sisu-0.55.4 (diff) | |
| parent | refinement to underscore match for single word in dal (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu')
| -rw-r--r-- | lib/sisu/v0/cgi_sql_common.rb | 4 | ||||
| -rw-r--r-- | lib/sisu/v0/dal_syntax.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v0/defaults.rb | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/lib/sisu/v0/cgi_sql_common.rb b/lib/sisu/v0/cgi_sql_common.rb index ac2958d1..73cb2342 100644 --- a/lib/sisu/v0/cgi_sql_common.rb +++ b/lib/sisu/v0/cgi_sql_common.rb @@ -593,8 +593,8 @@ module SiSU_CGI_sql software infrastructure, with the usual GPL (or OSS) suspects. <br /> - Better - "adherence to standards, performance, reliability, scalability, security & total cost of ownership" - [not to mention flexibility & choice] and it is software libre. + Better - "performance, reliability, scalability, security & total cost of ownership" + [not to mention flexibility & choice] use of and adherence to open standards (where practical and fair) and it is software libre. <br /> Get With the Future <a href="http://www.jus.uio.no/sisu/"> diff --git a/lib/sisu/v0/dal_syntax.rb b/lib/sisu/v0/dal_syntax.rb index a882a2c9..ce5fdc72 100644 --- a/lib/sisu/v0/dal_syntax.rb +++ b/lib/sisu/v0/dal_syntax.rb @@ -262,7 +262,7 @@ module Syntax line.gsub!(/(^|\s+|['"]| |\(|\>)\*(\S+?)\*/,'\1<b>\2</b>') #bold single word, watch line.gsub!(/(^|\s+|['"]| |\(|\>)\!(\S+?)\!/,'\1<b>\2</b>') #bold single word, watch line.gsub!(/(^|\s+|['"]| |\(|\>)\/([\(\)a-zA-Z0-9']+?)\/([^a-zA-Z0-9]|[ ,.;:'"~$]|$)/,'\1<i>\2</i>\3') #italics single word, watch - line.gsub!(/(^|\s+|['"]| |\(|\>)_(\S+?)_/,'\1<u>\2</u>') #underscore single word, watch + line.gsub!(/(^|\s+|['"]| |\(|\>)_(\S+?)_([.,!'")]?(?:\s|$))/,'\1<u>\2</u>\3') #underscore single word, watch (made more complicated by url decoration escape tag (_url)) line.gsub!(/(^|\s+)-([^{]\S+?)-( |$)/,'\1<del>\2</del>\3') #underscore single word, watch line.gsub!(/(^|\s+|['"]| |\(|\>|\d+)\^(\S+?)\^/,'\1<sup>\2</sup>') #superscript single word, watch digit added line.gsub!(/<[:e]\s+(.+?)!?>/,'~{ \1 }~') # not tested diff --git a/lib/sisu/v0/defaults.rb b/lib/sisu/v0/defaults.rb index 4963e882..a3a19988 100644 --- a/lib/sisu/v0/defaults.rb +++ b/lib/sisu/v0/defaults.rb @@ -1397,8 +1397,8 @@ WOK software infrastructure, with the usual GPL (or OSS) suspects. <br /> - Better - "adherence to standards, performance, reliability, scalability, security & total cost of ownership" - [not to mention flexibility & choice] and it is software libre. + Better - "performance, reliability, scalability, security & total cost of ownership" + [not to mention flexibility & choice] use of and adherence to open standards (where practical and fair) and it is software libre. <br /> Get With the Future <a href="http://www.jus.uio.no/sisu/"> @@ -1469,6 +1469,7 @@ WOK def initialize @v=SiSU_Env::Info_version.new.get_version @dir=SiSU_Env::Info_env.new + @date=SiSU_Env::Info_date.new #{@date.year} end def redirect <<WOK |