wizport 0.0.7 → 0.0.8

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

@@ -26,8 +26,8 @@ module Wizport
         Wizport::Rtf::Text.new(self, str, styles)
       end
 
-      def table(rows = [], &block)
-        Wizport::Rtf::Table.new(self, rows, &block)
+      def table(rows = [],options = {}, &block)
+        Wizport::Rtf::Table.new(self, rows, options, &block)
       end
 
 

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

@@ -10,6 +10,7 @@ module Wizport
       def initialize(rtf, rows = [], options = {}, &block)
         super(rtf)
         @row_spans = {}
+        @column_widths = options[:column_widths] || 800
         rows.each_index do |index|
           add_row rows[index]
         end
@@ -21,6 +22,7 @@ module Wizport
         cmd :trautofit1
         cmd :intbl
         @col_offset = 1
+        @right_width = 0
         cells.each do |cell|
           if row_spanned? @col_offset
             add_cell ""
@@ -49,17 +51,18 @@ module Wizport
         cmd :celld
         if rowspan > 1
           cmd :clvmgf
-          @col_offset += colspan
         elsif row_spanned? @col_offset
           cmd :clvmrg
           @row_spans[@col_offset][:rowspan] -= 1
-          @col_offset += row_spans_with_colspan
-        else
-          @col_offset += colspan
+          colspan = @row_spans[@col_offset][:colspan]
         end
-        cmd :cellx, (@col_offset - 1)* 2000
+        colspan.times do |i|
+          @right_width += column_width(@col_offset + i)
+        end
+        cmd :cellx, @right_width
         txt content
         cmd :cell
+        @col_offset += colspan
       end
 
       def row_spanned?(offset)
@@ -70,6 +73,11 @@ module Wizport
         return @row_spans[@col_offset][:colspan] || 1
       end
 
+      def column_width(offset)
+        return @column_widths[offset] || 800 if @column_widths.is_a?(Hash)
+        @column_widths
+      end
+
     end
   end
 end

data/lib/wizport/version.rb

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

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

@@ -7,7 +7,7 @@ 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]] do
+        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
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wizport
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000 Z
+date: 2012-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec