diff options
Diffstat (limited to 'lib/sisu/v0/dal_doc_str_tables.rb')
| -rw-r--r-- | lib/sisu/v0/dal_doc_str_tables.rb | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/lib/sisu/v0/dal_doc_str_tables.rb b/lib/sisu/v0/dal_doc_str_tables.rb index 7289543e..fd5d6fe4 100644 --- a/lib/sisu/v0/dal_doc_str_tables.rb +++ b/lib/sisu/v0/dal_doc_str_tables.rb @@ -96,9 +96,9 @@ module SiSU_document_structure_tables w=widths.split(/;/) tuned_file=[] tuned_file << if para =~/\{(?:t|table)~h(?:\sc\d+;)?[\d; ]*\}/ - "<!Th¡ c#{@row[2].length}; #{widths}!>" + "<!Th#{TS1} c#{@row[2].length}; #{widths}!>" elsif para =~/\{(?:t|table)(?:\sc\d+;)?[\d; ]*\}/ - "<!T¡ c#{@row[2].length}; #{widths}!>" + "<!T#{TS1} c#{@row[2].length}; #{widths}!>" end @row.each do |l| l << '' if l.length == (@row[1].length - 1) @@ -109,9 +109,9 @@ module SiSU_document_structure_tables l.each do |c| n +=1 #'<td>' + c + '</td>' table << if c =~/\A(?:\n)?\s*\Z/ - "¡¡#{w[n]}¡" + ' ' + "#{TS1}#{TS1}#{w[n]}#{TS1}" + ' ' else - "¡¡#{w[n]}¡" + c.strip + "#{TS1}#{TS1}#{w[n]}#{TS1}" + c.strip end end table << '!>' #'</tr>' @@ -140,8 +140,8 @@ module SiSU_document_structure_tables instructions=$1 @@column=instructions.split(/;\s*/) @@columns=@@column[0] - para.gsub!(/^table\{~h\s+(c\d+?;.+?)$/,'<!Th¡ \1!>') - para.gsub!(/^table\{\s+(c\d+?;.+?)$/,'<!T¡ \1!>') + para.gsub!(/^table\{~h\s+(c\d+?;.+?)$/,"<!Th#{TS1} \\1!>") + para.gsub!(/^table\{\s+(c\d+?;.+?)$/,"<!T#{TS1} \\1!>") @@flag['table_to']=true end if @@flag['table_to'] \ @@ -160,10 +160,10 @@ module SiSU_document_structure_tables and para =~/\S/ @@counter=1 sub_array=para.dup - @@line_mode=sub_array.scan(/.+/) + @@line_mode=sub_array.scan(/.+/u) Tables.new(@md,@@line_mode).tr_td para=@@line_mode.join - para.gsub!(/(.*\S+.*)\Z/m,'<!\1!>') unless para =~/<!Th?¡/ + para.gsub!(/(.*\S+.*)\Z/m,'<!\1!>') unless para =~/<!Th?#{TS1}/u end para.gsub!(/\n/,' ') para.strip! @@ -182,7 +182,10 @@ module SiSU_document_structure_tables data.each do |line| if @@counter <= @@columns.to_i \ and line !~/(\}T\s*$|<:table[-_](close|end)>|<!TZ!>)/ - line.gsub!(/(.+)/,"¡¡#{@@column[@@counter]}¡\\1") unless line =~/<!Th?¡/ + #if line.encoding.inspect =~/Encoding:ASCII-8BIT/ + # line=line.force_encoding('utf-8') + #end + line.gsub!(/(.+)/,"#{TS1}#{TS1}#{@@column[@@counter]}#{TS1}\\1") unless line =~/<!Th?#{TS1}/u @@counter+=1 end end @@ -191,3 +194,6 @@ module SiSU_document_structure_tables end end __END__ +#p line.encoding +@data.each {|x| p x.encoding } +p para if para.encoding.inspect =~/Encoding:ASCII-8BIT/ |