font.rb in wiz_rtf-0.6.8

- old
+ new
@@ -43,40 +43,56 @@
         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}
+        {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
 