diff options
author | Ralph Amissah <ralph@amissah.com> | 2007-10-15 19:27:27 +0100 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2007-10-15 19:27:27 +0100 |
commit | 7330cf6ae4fa17e3f6d9914ead719655ebbe590b (patch) | |
tree | 1f7253a22872ca2501d7aefc2a48b9b2df65f7f4 /lib/sisu/v0/shared_txt.rb | |
parent | debian/control add depends on rsync (diff) | |
parent | mostly the arrangement of conditionals (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/shared_txt.rb')
-rw-r--r-- | lib/sisu/v0/shared_txt.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/sisu/v0/shared_txt.rb b/lib/sisu/v0/shared_txt.rb index 6af436b0..e5acf36d 100644 --- a/lib/sisu/v0/shared_txt.rb +++ b/lib/sisu/v0/shared_txt.rb @@ -81,15 +81,18 @@ module SiSU_text_utils word="\n" @n_char_max_extend = @n_char_max + out[line].length line=line - elsif (out[line].length + word.length) > (@n_char_max_extend - @n_indent) and out[line] =~/\S+/ + elsif (out[line].length + word.length) > (@n_char_max_extend - @n_indent) \ + and out[line] =~/\S+/ @n_char_max_extend = @n_char_max out[line].squeeze!(' ') line += 1 end if word - out[line]=if out[line] and out[line] !~/\S+$/m + out[line]=if out[line] \ + and out[line] !~/\S+$/m "#{out[line]}#{word}" - elsif out[line] and out[line] =~/\S+/ + elsif out[line] \ + and out[line] =~/\S+/ "#{out[line]} #{word}" else "#{word.strip}" end @@ -114,7 +117,8 @@ module SiSU_text_utils @md,@p=md,para end def extract(tag,tag_content,type,attrib) - dc=if dc_tag and dc_content + dc=if dc_tag \ + and dc_content [dc_tag,dc_content,{dc_tag=>dc_content}] else nil end |