wizport 0.1.0 → 0.1.1

data/lib/wizport/document/Rtf/table.rb

@@ -24,14 +24,16 @@ module Wizport
         @col_offset = 1
         @right_width = 0
         cells.each do |cell|
-          add_cell "" if row_spanned?(@col_offset)
+
           add_cell cell
-          add_cell "" if row_spanned? @col_offset
+
         end
         cmd :row
       end
 
-      def add_cell(cell)
+      def add_cell(cell,merge = false)
+        p row_spanned?(@col_offset)
+        add_cell "",true if !merge && row_spanned?(@col_offset)
         if cell.is_a?(Hash)
           rowspan = cell[:rowspan]
           colspan = cell[:colspan]
@@ -41,15 +43,19 @@ module Wizport
         colspan = colspan || 1
         rowspan = rowspan || 1
         content = content || cell
-
+        p @row_spans
         cmd :celld
         if rowspan > 1
           cmd :clvmgf
         elsif row_spanned? @col_offset
           cmd :clvmrg
           @row_spans[@col_offset][:rowspan] -= 1
+          #if @row_spans[@col_offset][:rowspan] < 2
+          #    @row_spans[@col_offset].delete(:rowspan)
+          #end
           colspan = @row_spans[@col_offset][:colspan] || colspan
         end
+        p @row_spans
         colspan.times do
           @right_width += column_width(@col_offset)
           @col_offset += 1
@@ -57,6 +63,8 @@ module Wizport
         cmd :cellx, @right_width
         txt content
         cmd :cell
+
+        add_cell "",true if  row_spanned?(@col_offset)
       end
 
       def row_spanned?(offset)

data/lib/wizport/version.rb

@@ -1,3 +1,3 @@
 module Wizport
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/wizport/document/rtf/document_spec.rb

@@ -7,10 +7,10 @@ describe Wizport::Rtf::Document do
   it "a simple example of Rtf" do
       rtf = Wizport::Rtf::Document.new do
         text "学生综合素质评价"
-        #table [[1,{content:'1',colspan:2}],
-        #       [3,{content:'4',rowspan:2,colspan:2}],
-        #       [11]],column_widths:{1=>2000,2=>1000,3=>1000} do
-        #  add_row [1,1,1]
+        #table [[{content:'4',rowspan:4},1,{content:'1',colspan:2}],
+        #       [{content:'4',rowspan:3,colspan:2},8],
+        #       [11]],column_widths:1000 do
+        #  add_row [1]
         #end
 
         #table [["姓名", "person.name", "性别", {content: "{Core::Person::GENDER_TYPE[person.gender]}", colspan: 3}, "出生日期", {content: "nil}", colspan: 2}, {content: "一寸照片", colspan: 2, rowspan: 3}],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wizport
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: