table, (xhtml, odf): empty cell (single tilde to indicate); allow line breaks

2 files changed, 3 insertions, 0 deletions

diff --git a/lib/sisu/v2/odf_format.rb b/lib/sisu/v2/odf_format.rb
index f0163f81..384b46b7 100644
--- a/lib/sisu/v2/odf_format.rb
+++ b/lib/sisu/v2/odf_format.rb
@@ -147,6 +147,7 @@ module SiSU_ODF_format
         'Table_20_Heading'
       else 'P7'
       end
+      str.gsub!(/^~$/,'') # tilde / empty cell
       %{<table:table-cell office:value-type="string">#{@br}} +
       %{<text:p text:style-name="#{txt_name_cell}">#{@br}} +
       %{#{str}} +
diff --git a/lib/sisu/v2/xhtml_table.rb b/lib/sisu/v2/xhtml_table.rb
index 2b0cb5e7..25db60c8 100644
--- a/lib/sisu/v2/xhtml_table.rb
+++ b/lib/sisu/v2/xhtml_table.rb
@@ -78,6 +78,8 @@ module SiSU_XHTML_table
         table_row_with_columns=table_row.split(Mx[:tc_p])
         trc,nc=[],0
         table_row_with_columns.each do |c|
+          c.gsub!(/^~$/,'') # tilde / empty cell
+          c.gsub!(/<:br>/,'<br />')
           trc <<= if table_obj.head_ and nr==0; %{<th width="#{table_obj.widths[nc]}%">#{c}</th>}
           else %{<td width="#{table_obj.widths[nc]}%">#{c}</td>}
           end