wiz_rtf 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bdfb9f57957a4df13b3a1868ebae1e08fffb311
-  data.tar.gz: b9c674c3b322a70f1cbeb4e9edf2bb2f8a8d1ffa
+  metadata.gz: 750294995f94f17825b1d378fdad60a6adb2bfaf
+  data.tar.gz: e1cddfe7fb6e8365ef0d32e03749c2efcd4e3e98
 SHA512:
-  metadata.gz: 47a68b671a2a4b6d1ea99286bf0b2fdfbc5b10940739f0a6341ceaa84c0017219086044b82a929caf124874ce02e875c54aa68c23b0ef9aaf44c62aee475942c
-  data.tar.gz: 54ffa1244939ebce8a17ed3da0053a0e1162ae7ba7963965433b97273b7a3567d2e1e797960b0b985c34a3b73f7c11b0980ae6b7102fe8b922a9055df3244042
+  metadata.gz: ca22e903392cf22fb1c17fe9ac2e44e8701f1e7850d71a6d7a6f8202659521c67bb19884083387d5693203e2b644da5e520b955e0c8f8bea7bdd40f7af98a962
+  data.tar.gz: 721f1d84373e322543bc94ec831c6ca616c81293fad2fcb99e340d72e3e64afb2bb52ab2fc58ea6098fe732d384eff708b1054923ad2f21812f48ada0e7311ce

data/README.md

@@ -21,11 +21,11 @@ Or install it yourself as:
 ## Usage
 ```ruby
     doc = WizRtf::Document.new do
-      text "学生综合素质报告", :align => :center, 'font-size' => 48
+      text "学生综合素质报告", 'text-align' => :center, 'font-family' => 'Microsoft YaHei', 'font-size' => 48, 'font-bold' => true, 'font-italic' => true, 'font-underline' => true
       image('h:\eahey.png')
       page_break
-      text "A Table Demo"
-      table [[{content:'e',rowspan:4},{content:'4',rowspan:4},1,{content:'1',colspan:2}],
+      text "A Table Demo", 'foreground-color' => WizRtf::Color::RED, 'background-color' => '#0f00ff'
+      table [[{content: WizRtf::Image.new('h:\eahey.png'),rowspan:4},{content:'4',rowspan:4},1,{content:'1',colspan:2}],
              [{content:'4',rowspan:3,colspan:2},8],[11]], column_widths:{1=>100,2 => 100,3 => 50,4 => 50,5 => 50} do
         add_row [1]
       end

data/lib/wiz_rtf/color.rb

@@ -7,10 +7,48 @@
 module WizRtf
   class Color
 
-    def initialize(red, green, blue)
-      @red = red
-      @green = green
-      @blue = blue
+    RED = '#FF0000'
+    YELLOW = '#FFFF00'
+    LIME = '#00FF00'
+    CYAN = '#00FFFF'
+    BLUE = '#0000FF'
+    MAGENTA = '#FF00FF'
+    MAROON = '#800000'
+    OLIVE = '#808000'
+    GREEN = '#008000'
+    TEAL = '#008080'
+    NAVY = '#000080'
+    PURPLE = '#800080'
+    WHITE = '#FFFFFF'
+    SILVER = '#C0C0C0'
+    GRAY = '#808080'
+    BLACK = '#000000'
+
+    def initialize(*rgb)
+      case rgb.size
+        when 1
+          from_rgb_hex(rgb.first)
+        when 3
+          from_rgb(*rgb)
+      end
+    end
+
+    def from_rgb_hex(color)
+      color = '#%.6x' % color if color.is_a? Integer
+      rgb = color[1,7].scan(/.{2}/).map{ |c| c.to_i(16) }
+      from_rgb(*rgb)
+    end
+
+    def from_rgb(*rgb)
+      @red, @green, @blue = rgb
+    end
+
+    def to_rgb
+      [@red, @green, @blue]
+    end
+
+    def to_rgb_hex
+      "#" + to_rgb.map {|c| "%02X" % c }.join
     end
 
     def render(io)
@@ -20,5 +58,6 @@ module WizRtf
         io.cmd :blue, @blue
       end
     end
+
   end
 end

data/lib/wiz_rtf/document.rb

@@ -10,28 +10,38 @@ module WizRtf
       @fonts = []
       @colors = []
       @parts = []
-      font 0, 'fswiss', 'Arial', 0, 2
-      font 1, 'fmodern', 'Courier New', 0, 1
-      font 2, 'fnil', '宋体', 2, 2
-      color 0, 0, 0
-      color 255, 0, 0
-      color 255, 0, 255
+      font 'Courier New'
       block.arity<1 ? self.instance_eval(&block) : block.call(self) if block_given?
     end
 
-    def head
-
+    def head(&block)
+      block.arity<1 ? self.instance_eval(&block) : block.call(self) if block_given?
     end
 
-    def font(num, family, name, character_set = 0, prq = 2)
-      @fonts << WizRtf::Font.new(num, family, name, character_set, prq)
+    def font(name, family = nil,  character_set = 0, prq = 2)
+      unless index = @fonts.index {|f| f.name == name}
+        index = @fonts.size
+        opts = WizRtf::Font::FONTS.detect {|f| f[:name] == name}
+        @fonts << WizRtf::Font.new(index, opts[:name], opts[:family], opts[:character], opts[:prq])
+      end
+      index
     end
 
-    def color(red, green, blue)
-      @colors << WizRtf::Color.new(red, green, blue)
+    def color(*rgb)
+      color = WizRtf::Color.new(*rgb)
+      if index = @colors.index {|c| c.to_rgb_hex == color.to_rgb_hex}
+        index += 1
+      else
+        @colors << color
+        index = @colors.size
+      end
+      index
     end
 
-    def text(str, styles = {:align => :left})
+    def text(str, styles = {})
+      styles['foreground-color'] = color(styles['foreground-color']) if styles['foreground-color']
+      styles['background-color'] = color(styles['background-color']) if styles['background-color']
+      styles['font-family'] = font(styles['font-family']) if styles['font-family']
       @parts << WizRtf::Text.new(str, styles)
     end
 

data/lib/wiz_rtf/font.rb

@@ -6,9 +6,60 @@
 
 module WizRtf
   class Font
-    def initialize(num, family, name, character_set = 0, prq = 2)
+    FAMILIES = {
+        default: 'fnil',
+        roman: 'froman',
+        swiss: 'fswiss',
+        fixed_pitch: 'fmodern',
+        script: 'fscript',
+        decorative: 'fdecor',
+        technical: 'ftech',
+        bidirectional: 'fbidi'
+    }
+
+    CHARACTER_SET = {
+        ansi: 0,
+        default: 1,
+        symbol: 2,
+        invalid: 3,
+        mac: 77,
+        shiftJis: 128,
+        hangul: 129,
+        johab: 130,
+        gb2312: 134,
+        big5: 136,
+        greek: 161,
+        turkish: 162,
+        vietnamese: 163,
+        hebrew: 177,
+        arabic: 178,
+        arabicTraditional: 179,
+        arabic_user: 180,
+        hebrew_user: 181,
+        baltic: 186,
+        russian: 204,
+        thai: 222,
+        eastern_european: 238,
+        pc437: 254,
+        oem: 255
+    }
+
+    FONTS = [
+        {family:'fswiss', name:'Arial', character:0, prq:2},
+        {family:'froman', name:'Courier New', character:0, prq:1},
+        {family:'froman', name:'Times New Roman', character:0, prq:2},
+        {family:'fnil', name:'SimSun', character:134, prq:2},
+        {family:'fmodern', name:'KaiTi', character:134, prq:1},
+        {family:'fnil', name:'FangSong', character:134, prq:1},
+        {family:'fmodern', name:'SimHei', character:134, prq:1},
+        {family:'fmodern', name:'NSimSun', character:134, prq:1},
+        {family:'fswiss', name:'Microsoft YaHei', character:134, prq:2}
+    ]
+
+    attr_accessor :name, :num
+    def initialize(num, name, family = 'fnil', character_set = 0, prq = 2)
       @num = num
-      @family = family
+      @family = family if family
       @name = name
       @character_set = character_set
       @prq = prq

data/lib/wiz_rtf/text.rb

@@ -10,13 +10,14 @@ module WizRtf
 
     def initialize(str = '', styles = {})
       @str = str
-      @styles = {'text-align' => :left, 'font-size' => 24, 'font-bold' => false, 'font-italic' => false, 'font-underline' => false, 'foreground-color' => 1, 'background-color' => 0 }.merge(styles)
+      @styles = {'text-align' => :left, 'font-family' => 0, 'font-size' => 24, 'font-bold' => false, 'font-italic' => false, 'font-underline' => false, 'foreground-color' => 0, 'background-color' => 0 }.merge(styles)
     end
 
     def render(io)
       io.group do
         io.cmd :pard
         io.cmd TEXT_ALIGN_MAP[@styles['text-align']]
+        io.cmd :f, @styles['font-family']
         io.cmd :fs, @styles['font-size']
         io.cmd @styles['font-bold'] ? 'b' : 'b0'
         io.cmd @styles['font-italic'] ? 'i' : 'i0'

data/lib/wiz_rtf/version.rb

@@ -1,3 +1,3 @@
 module WizRtf
-  VERSION = "0.5.5"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wiz_rtf
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - songgz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler