wizport 0.0.8 → 0.0.9

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

@@ -24,15 +24,9 @@ module Wizport
         @col_offset = 1
         @right_width = 0
         cells.each do |cell|
-          if row_spanned? @col_offset
-            add_cell ""
-            add_cell cell
-          elsif row_spanned? @col_offset + 1
-            add_cell cell
-            add_cell ""
-          else
-            add_cell cell
-          end
+          add_cell "" if row_spanned?(@col_offset)
+          add_cell cell
+          add_cell "" if row_spanned? @col_offset
         end
         cmd :row
       end
@@ -56,13 +50,13 @@ module Wizport
           @row_spans[@col_offset][:rowspan] -= 1
           colspan = @row_spans[@col_offset][:colspan]
         end
-        colspan.times do |i|
-          @right_width += column_width(@col_offset + i)
+        colspan.times do
+          @right_width += column_width(@col_offset)
+          @col_offset += 1
         end
         cmd :cellx, @right_width
         txt content
         cmd :cell
-        @col_offset += colspan
       end
 
       def row_spanned?(offset)

data/lib/wizport/version.rb

@@ -1,3 +1,3 @@
 module Wizport
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

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

@@ -7,9 +7,16 @@ 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]
-        end
+        #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]
+        #end
+
+        table [["姓名", "person.name", "性别", {content: "{Core::Person::GENDER_TYPE[person.gender]}", colspan: 3}, "出生日期", {content: "nil}", colspan: 2}, {content: "一寸照片", colspan: 2, rowspan: 3}],
+              ["民族", {content: "{Core}", colspan: 2}, "入队(团)时间", {content: '', colspan: 5}],
+              ["家庭住址", {content: "person", colspan: 8}]]
+
       end
 
       rtf.save('c:/r.rtf')

metadata

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