diff options
| author | Ralph Amissah <ralph@amissah.com> | 2008-02-05 23:50:34 +0000 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2008-02-05 23:50:34 +0000 |
| commit | ad21750ba3c44303d0c2ad91269771605612a8e6 (patch) | |
| tree | fb1c5ce2737a1cf04069e409563e20540dcea9ff /lib/sisu/v0/odf_format.rb | |
| parent | Updated sisu-0.64.2 (diff) | |
| parent | version rolled back, not ready to open ruby 1.9 some libraries not yet available (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/odf_format.rb')
| -rw-r--r-- | lib/sisu/v0/odf_format.rb | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/sisu/v0/odf_format.rb b/lib/sisu/v0/odf_format.rb index 05d1aefa..f704ea45 100644 --- a/lib/sisu/v0/odf_format.rb +++ b/lib/sisu/v0/odf_format.rb @@ -181,10 +181,10 @@ module OD_format m=@parablock[/<!f(.+?)!>/,1] @@tablefoot << m if m @parablock.gsub!(/<!f.+?!>/,'') - @@tablehead=1 if @parablock =~/<!Th¡/ - @@table_counter+=1 if @parablock =~/<!Th?¡/ - if @parablock =~/<!Th¡\s+c(\d+).+?!~\d+;\w\d+;\w\d+>/; @parablock=table_head(@@table_counter,$1,true) - elsif @parablock =~/<!T¡\s+c(\d+).+?!~\d+;\w\d+;\w\d+>/; @parablock=table_head(@@table_counter,$1) + @@tablehead=1 if @parablock =~/<!Th¡/u + @@table_counter+=1 if @parablock =~/<!Th?¡/u + if @parablock =~/<!Th¡\s+c(\d+).+?!~\d+;\w\d+;\w\d+>/u; @parablock=table_head(@@table_counter,$1,true) + elsif @parablock =~/<!T¡\s+c(\d+).+?!~\d+;\w\d+;\w\d+>/u; @parablock=table_head(@@table_counter,$1) end if @parablock =~/<!TZ!>/ tablefoot=[] @@ -194,12 +194,12 @@ module OD_format end end if @@tablehead == 1 - if @parablock =~/¡¡/ - if @parablock =~/<!¡¡(\d+?)¡/ - @parablock.gsub!(/<!¡¡(\d+?)¡/,table_row($1,true)) + if @parablock =~/¡¡/u + if @parablock =~/<!¡¡(\d+?)¡/u + @parablock.gsub!(/<!¡¡(\d+?)¡/u,table_row($1,true)) end - if @parablock =~/¡¡(\d+?)¡/ - @parablock.gsub!(/¡¡(\d+?)¡/,table_cell($1,true)) + if @parablock =~/¡¡(\d+?)¡/u + @parablock.gsub!(/¡¡(\d+?)¡/u,table_cell($1,true)) end if @parablock =~/!>/ @parablock.gsub!(/!>/,table_row_close(true)) @@ -208,11 +208,11 @@ module OD_format end @parablock else - if @parablock =~/<!¡¡(\d+?)¡/ - @parablock.gsub!(/<!¡¡(\d+?)¡/,table_row($1)) + if @parablock =~/<!¡¡(\d+?)¡/u + @parablock.gsub!(/<!¡¡(\d+?)¡/u,table_row($1)) end - if @parablock =~/¡¡(\d+?)¡/ - @parablock.gsub!(/¡¡(\d+?)¡/,table_cell($1)) + if @parablock =~/¡¡(\d+?)¡/u + @parablock.gsub!(/¡¡(\d+?)¡/u,table_cell($1)) end if @parablock =~/!>/ @parablock.gsub!(/!>/,table_row_close) |