diff options
| author | Ralph Amissah <ralph@amissah.com> | 2007-10-15 19:27:16 +0100 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2007-10-15 19:27:16 +0100 |
| commit | e1ec4bd2dad2bd22ad97cea398ae1cfcfae183a2 (patch) | |
| tree | 6ffe3ae1b2453578a032ce053934a31f980645e9 /lib/sisu/v0/wikispeak.rb | |
| parent | regex matching of images, (and rearrangement of conditionals) (diff) | |
mostly the arrangement of conditionals
Diffstat (limited to 'lib/sisu/v0/wikispeak.rb')
| -rw-r--r-- | lib/sisu/v0/wikispeak.rb | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/lib/sisu/v0/wikispeak.rb b/lib/sisu/v0/wikispeak.rb index a0ca2cd5..7fe7ac89 100644 --- a/lib/sisu/v0/wikispeak.rb +++ b/lib/sisu/v0/wikispeak.rb @@ -273,7 +273,8 @@ WOK @sto=Split_text_object.new(para).lev_segname_para_ocn ### problem in scroll, it appears tables are getting paragraph numbers m=/<~(\d+);(?:\w|[0-6]:)\d+;\w\d+><#@dp:#@dp>$/ - if para =~m and para=~/\S+/ + if para =~m \ + and para=~/\S+/ para=case @sto.format when /^(1)~(?:(\S+))?/ wiki_structure(para,$1,@sto.ocn,$2) @@ -318,11 +319,14 @@ WOK end elsif para =~/#{table_message}/ @@wiki[:body] << para << @br - elsif para =~/(Note|Endnotes?)/ and para !~/<~\d+;(?:\w|[0-6]:)\d+;\w\d+><#@dp:#@dp>$/ - elsif para =~/(MetaData)/ and para =~/<~(\d+);[um]\d+;\w\d+><#@dp:#@dp>$/ #debug 2003w46 add rc info ####suspect visit + elsif para =~/(Note|Endnotes?)/ \ + and para !~/<~\d+;(?:\w|[0-6]:)\d+;\w\d+><#@dp:#@dp>$/ + elsif para =~/(MetaData)/ \ + and para =~/<~(\d+);[um]\d+;\w\d+><#@dp:#@dp>$/ #debug 2003w46 add rc info ####suspect visit #formatMono=MonoSiSU.new('<br /><a name="metadata">MetaData</a>') #para=formatMono.bold_para - elsif para.include? 'Owner Details' and para !~/<~(\d+);(?:[oh]|[0-6]:)\d+;\w\d+><#@dp:#@dp>$/ + elsif para.include? 'Owner Details' \ + and para !~/<~(\d+);(?:[oh]|[0-6]:)\d+;\w\d+><#@dp:#@dp>$/ #formatMono=MonoSiSU.new('<br /><a name="owner.details">Owner Details</a>') #@@wiki[:owner_details]=formatMono.bold_para #para='' @@ -332,7 +336,10 @@ WOK format_text=Format_text_object.new(one,two) para=format_text.seg_no_paranum end - para='' if (para =~/<a name="n\d+">/ and para =~/^(-\{{2}~\d+|<!e[:_]\d+!>)/) # -endnote + if (para =~/<a name="n\d+">/ \ + and para =~/^(-\{{2}~\d+|<!e[:_]\d+!>)/) # -endnote + para='' + end case para when /<:i1>/ if para =~/.*<:#>.*$/ |