From 85ec6bab386b1e9b1ccbcab1fd97e6529b020032 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 2 Dec 2013 23:16:24 -0500 Subject: v5: minor code related to line-breaks --- lib/sisu/v5/odf_format.rb | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'lib/sisu/v5/odf_format.rb') diff --git a/lib/sisu/v5/odf_format.rb b/lib/sisu/v5/odf_format.rb index 28c69c44..3d40f943 100644 --- a/lib/sisu/v5/odf_format.rb +++ b/lib/sisu/v5/odf_format.rb @@ -170,6 +170,10 @@ module SiSU_ODF_Format @@fns=@md.fns end end + def break_line + (@md.opt.act[:maintenance][:set]==:on) \ + ? "\n" : '' + end def table_head_open(count) type=(@dob.head_) \ ? 1 @@ -192,8 +196,8 @@ module SiSU_ODF_Format else 'D' end tag=SiSU_ODF_Format::Tags.new.set_bookmark_tag(@dob) - %{#{@p_num[:set_ref]}#{tag}#{@br}} + - %{#{@br}} + %{#{@p_num[:set_ref]}#{tag}#{break_line}} + + %{#{break_line}} end def table_close(tablefoot='') '' \ @@ -206,16 +210,16 @@ module SiSU_ODF_Format else 'P_table_cell' end str=str.gsub(/^~$/,'') # tilde / empty cell - %{#{@br}} + - %{#{@br}} + + %{#{break_line}} + + %{#{break_line}} + %{#{str}} + - %{#{@br}} + - %{#{@br}} + %{#{break_line}} + + %{#{break_line}} end def table_tag_row(str,i) - %{#{@br}} + + %{#{break_line}} + %{#{str}} + - %{#{@br}} + %{#{break_line}} end def table_tag_row_dump(str,i) txt_name_row=if i==0 \ @@ -223,13 +227,13 @@ module SiSU_ODF_Format 'Table_Heading' else 'P_table_cell' end - %{#{@br}} + - %{#{@br}} + - %{#{@br}} + + %{#{break_line}} + + %{#{break_line}} + + %{#{break_line}} + %{#{str}} + - %{#{@br}} + - %{#{@br}} + - %{#{@br}} + %{#{break_line}} + + %{#{break_line}} + + %{#{break_line}} end def table_row(row,i) row='' if row =~/^