wiz_rtf 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 665ba51cf6271ff694ce0efb2f216fc003b4b4e0
-  data.tar.gz: 9d7ccf728f5a4a48b407ae140753361fef56bacd
+  metadata.gz: ac771b35f8a2481049d6d3903d414cf682efe9dc
+  data.tar.gz: 0abedded749171f1f81d71c9da0dcedf23477f20
 SHA512:
-  metadata.gz: cdc6e1fa527e59e1587cb55de522b1fe0d78d8ebe14280c1af463c7280480c63213464863101f7ac1cb18da1f126c2330991169d8cb980cbe7646af576434971
-  data.tar.gz: 8256f04da52d810bd1a2b0094679227e7f5e8acce6b5c11431b65236d838df03b8fd4897bc80cd12780c915242f8137d0d15ab13dd95e05af72187b1d15f91b3
+  metadata.gz: e34a0f6a7a53dee404b7968223edfdb0d5761aa53bb6f6db8f0aed809a0b83619ae9eec4252566514dfe28e1a253669610e8c9b05fc612754c630425a7e71905
+  data.tar.gz: ffd7b8bdc8b6e8d81b92193296977a35cb0794216d6139f82a94a66eebcddc22fc1df578df17ffb9ad3cb7b7ce150f44966b2f95769f93a039ee542b47af6297

data/lib/wiz_rtf/color.rb

@@ -23,6 +23,8 @@ module WizRtf
     GRAY = '#808080'
     BLACK = '#000000'
 
+    attr_reader :red, :green, :blue
+
     def initialize(*rgb)
       case rgb.size
         when 1
@@ -50,13 +52,5 @@ module WizRtf
       "#" + to_rgb.map {|c| "%02X" % c }.join
     end
 
-    def render(io)
-      io.delimit do
-        io.cmd :red, @red
-        io.cmd :green, @green
-        io.cmd :blue, @blue
-      end
-    end
-
   end
 end

data/lib/wiz_rtf/document.rb

@@ -9,7 +9,7 @@ module WizRtf
   #
   # Creates a new Rtf document specifing the format of the pages.
   # == Example:
-  #
+  # ```ruby
   # doc = WizRtf::Document.new do
   #   text "A Example of Rtf Document", 'text-align' => :center, 'font-family' => 'Microsoft YaHei', 'font-size' => 48, 'font-bold' => true, 'font-italic' => true, 'font-underline' => true
   #   image('h:\eahey.png')
@@ -21,7 +21,7 @@ module WizRtf
   #   end
   # end
   # doc.save('c:\text.rtf')
-  #
+  # ```
   class Document
     def initialize(options = {}, &block)
       @fonts = []
@@ -41,15 +41,28 @@ module WizRtf
         io.cmd :deff, 0
         io.group do
           io.cmd :fonttbl
-          @fonts.each do |font|
-            font.render(io)
+          @fonts.each_with_index do |font, index|
+            io.group do
+              io.delimit do
+                io.cmd :f, index
+                io.cmd font.family
+                io.cmd :fprq, font.pitch
+                io.cmd :fcharset, font.character_set
+                io.write ' '
+                io.write font.name
+              end
+            end
           end
         end
         io.group do
           io.cmd :colortbl
           io.delimit
           @colors.each do |color|
-            color.render(io)
+            io.delimit do
+              io.cmd :red, color.red
+              io.cmd :green, color.green
+              io.cmd :blue, color.blue
+            end
           end
         end
         @parts.each do |part|
@@ -69,11 +82,15 @@ module WizRtf
     end
 
     # Sets the Font for the text.
-    def font(name, family = nil,  character_set = 0, prq = 2)
+    def font(name, family = nil,  character_set = 0, pitch = 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])
+        if opts
+          @fonts << WizRtf::Font.new(opts[:name], opts[:family], opts[:character], opts[:pitch])
+        else
+          @fonts << WizRtf::Font.new(name, family, character_set, pitch)
+        end
       end
       index
     end
@@ -94,7 +111,11 @@ module WizRtf
     # current drawing position.
     # == Styles:
     # * +text-align+ - sets the horizontal alignment of the text. optional values: +:left+, +:center+, +:right+
-    # * +font-family+ - set the font family of the text. optional values:
+    # * +font-family+ - set the font family of the text. optional values: 'Arial', 'Arial Black', 'Arial Narrow','Bitstream Vera Sans Mono',
+    #                   'Bitstream Vera Sans','Bitstream Vera Serif','Book Antiqua','Bookman Old Style','Castellar','Century Gothic',
+    #                   'Comic Sans MS','Courier New','Franklin Gothic Medium','Garamond','Georgia','Haettenschweiler','Impact','Lucida Console'
+    #                   'Lucida Sans Unicode','Microsoft Sans Serif','Monotype Corsiva','Palatino Linotype','Papyrus','Sylfaen','Symbol'
+    #                   'Tahoma','Times New Roman','Trebuchet MS','Verdana'.
     # * +font-size+ - set font size of the text.
     # * +font-bold+ - setting the value true for bold of the text.
     # * +font-italic+ - setting the value true for italic of the text.
@@ -121,14 +142,14 @@ module WizRtf
     # == Options:
     # * +column_widths+ - sets the widths of the Columns.
     # == Example:
-    #
+    # ```ruby
     # 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
-    #
+    # ```
     def table(rows = [],options = {}, &block)
       @parts << WizRtf::Table.new(rows, options, &block)
     end

data/lib/wiz_rtf/font.rb

@@ -45,38 +45,54 @@ module WizRtf
     }
 
     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}
+        {name:'Arial', family:'fswiss', character:0, pitch:2, panose:'020b0604020202020204'},
+        {name:'Arial Black', family:'swiss', character:0, pitch:2, panose:'020b0a04020102020204'},
+        {name:'Arial Narrow', family:'swiss', character:0, pitch:2, panose:'020b0506020202030204'},
+        {name:'Bitstream Vera Sans Mono', family:'modern', character:0, pitch:1, panose:'020b0609030804020204'},
+        {name:'Bitstream Vera Sans', family:'swiss', character:0, pitch:2, panose:'020b0603030804020204'},
+        {name:'Bitstream Vera Serif', family:'roman', character:0, pitch:2, panose:'02060603050605020204'},
+        {name:'Book Antiqua', family:'roman', character:0, pitch:2, panose:'02040602050305030304'},
+        {name:'Bookman Old Style', family:'roman', character:0, pitch:2, panose:'02050604050505020204'},
+        {name:'Castellar', family:'roman', character:0, pitch:2, panose:'020a0402060406010301'},
+        {name:'Century Gothic', family:'swiss', character:0, pitch:2, panose:'020b0502020202020204'},
+        {name:'Comic Sans MS', family:'script', charater:0, pitch:2, panose:'030f0702030302020204'},
+        {name:'Courier New', family:'froman', character:0, pitch:1, panose:'02070309020205020404'},
+        {name:'Franklin Gothic Medium', family:'swiss', character:0, picth:2, panose:'020b0603020102020204'},
+        {name:'Garamond', family:'roman' , character:0, pitch:2, panose:'02020404030301010803'},
+        {name:'Georgia', family:'roman', character:0, pitch:2, panose:'02040502050405020303'},
+        {name:'Haettenschweiler', family:'swiss', character:0, pitch:2, panose:'020b0706040902060204'},
+        {name:'Impact', family:'swiss', character:0, pitch:2, panose:'020b0806030902050204'},
+        {name:'Lucida Console', family:'modern', character:0, pitch:1, panose:'020b0609040504020204'},
+        {name:'Lucida Sans Unicode', family:'swiss' , character:0, pitch:2, panose:'020b0602030504020204'},
+        {name:'Microsoft Sans Serif', family:'swiss', character:0, pitch:2, panose:'020b0604020202020204'},
+        {name:'Monotype Corsiva', family:'script', character:0, pitch:2, panose:'03010101010201010101'},
+        {name:'Palatino Linotype', family:'roman', character:0, pitch:2, panose:'02040502050505030304'},
+        {name:'Papyrus', family:'script', character:0, pitch:2, panose:'03070502060502030205'},
+        {name:'Sylfaen', family:'roman', character:0, pitch:2, panose:'010a0502050306030303'},
+        {name:'Symbol', family:'roman', character:2, pitch:2, panose:'05050102010706020507'},
+        {name:'Tahoma', family:'swiss', character:0, pitch:2, panose:'020b0604030504040204'},
+        {name:'Times New Roman', family:'froman', character:0, pitch:2, panose:'02020603050405020304'},
+        {name:'Trebuchet MS', family:'swiss', character:0, pitch:2, panose:'020b0603020202020204'},
+        {name:'Verdana', family:'swiss', character:0, pitch:2, panose:'020b0604030504040204'},
+        {name:'SimSun', family:'fnil', character:134, pitch:2},
+        {name:'KaiTi', family:'fmodern', character:134, pitch:1},
+        {name:'FangSong', family:'fnil', character:134, pitch:1},
+        {name:'SimHei', family:'fmodern', character:134, pitch:1},
+        {name:'NSimSun', family:'fmodern', character:134, pitch:1},
+        {name:'Microsoft YaHei', family:'fswiss', character:134, pitch:2}
     ]
 
-    attr_accessor :name, :num
-    def initialize(num, name, family = 'fnil', character_set = 0, prq = 2)
-      @num = num
-      @family = family if family
+    attr_accessor :name, :family, :character_set, :pitch, :panose, :alternate
+
+    def initialize(name, family = 'fnil', character_set = 0, pitch = nil, panose = nil, alternate = nil)
       @name = name
+      @family = family
       @character_set = character_set
-      @prq = prq
+      @pitch = pitch
+      @panose = panose
+      @alternate = alternate
     end
 
-    def render(io)
-      io.group do
-        io.delimit do
-          io.cmd :f, @num
-          io.cmd @family
-          io.cmd :fprq, @prq
-          io.cmd :fcharset, @character_set
-          io.write ' '
-          io.write @name
-        end
-      end
-    end
   end
 end
 

data/lib/wiz_rtf/text.rb

@@ -13,7 +13,11 @@ module WizRtf
     # creates a text of +str+ to the document.
     # == Styles:
     # * +text-align+ - sets the horizontal alignment of the text. optional values: +:left+, +:center+, +:right+
-    # * +font-family+ - set the font family of the text. optional values:
+    # * +font-family+ - set the font family of the text. optional values: 'Arial', 'Arial Black', 'Arial Narrow','Bitstream Vera Sans Mono',
+    #                   'Bitstream Vera Sans','Bitstream Vera Serif','Book Antiqua','Bookman Old Style','Castellar','Century Gothic',
+    #                   'Comic Sans MS','Courier New','Franklin Gothic Medium','Garamond','Georgia','Haettenschweiler','Impact','Lucida Console'
+    #                   'Lucida Sans Unicode','Microsoft Sans Serif','Monotype Corsiva','Palatino Linotype','Papyrus','Sylfaen','Symbol'
+    #                   'Tahoma','Times New Roman','Trebuchet MS','Verdana'.
     # * +font-size+ - set font size of the text.
     # * +font-bold+ - setting the value true for bold of the text.
     # * +font-italic+ - setting the value true for italic of the text.

data/lib/wiz_rtf/version.rb

@@ -1,3 +1,3 @@
 module WizRtf
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

data/wiz_rtf.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["songgz"]
   spec.email         = ["sgzhe@163.com"]
 
-  spec.summary       = %q{A gem for exporting Word Documents in ruby using the Microsoft Rich Text Format (RTF) Specification.}
-  spec.description   = %q{A gem for rtf.}
+  spec.summary       = %q{A gem for creating RTF document.}
+  spec.description   = %q{A gem for exporting Word Documents in ruby using the Microsoft Rich Text Format (RTF) Specification.}
   spec.homepage      = "https://github.com/songgz/wiz_rtf"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wiz_rtf
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - songgz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,7 +38,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: A gem for rtf.
+description: A gem for exporting Word Documents in ruby using the Microsoft Rich Text
+  Format (RTF) Specification.
 email:
 - sgzhe@163.com
 executables: []
@@ -93,6 +94,5 @@ rubyforge_project:
 rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
-summary: A gem for exporting Word Documents in ruby using the Microsoft Rich Text
-  Format (RTF) Specification.
+summary: A gem for creating RTF document.
 test_files: []