--- a/rfpdf/lib/fpdf/chinese.rb	2011-01-25 17:50:48.000000000 -0500
+++ b/rfpdf/lib/fpdf/chinese.rb	2011-03-23 17:48:05.000000000 -0400
@@ -37,27 +37,27 @@
 
 module PDF_Chinese
 
-  Big5_widths={' '=>250,'!'=>250,'"'=>408,'#'=>668,''=>490,'%'=>875,'&'=>698,'\''=>250,
+  Big5_widths={' '=>250,'!'=>250,'"'=>408,'#'=>668,'$'=>490,'%'=>875,'&'=>698,'\''=>250,
   	'('=>240,')'=>240,'*'=>417,'+'=>667,','=>250,'-'=>313,'.'=>250,'/'=>520,'0'=>500,'1'=>500,
-  	'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>250,''=>250,
+  	'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>250,';'=>250,
   	'<'=>667,'='=>667,'>'=>667,'?'=>396,'@'=>921,'A'=>677,'B'=>615,'C'=>719,'D'=>760,'E'=>625,
   	'F'=>552,'G'=>771,'H'=>802,'I'=>354,'J'=>354,'K'=>781,'L'=>604,'M'=>927,'N'=>750,'O'=>823,
   	'P'=>563,'Q'=>823,'R'=>729,'S'=>542,'T'=>698,'U'=>771,'V'=>729,'W'=>948,'X'=>771,'Y'=>677,
   	'Z'=>635,'['=>344,'\\'=>520,']'=>344,'^'=>469,'_'=>500,'`'=>250,'a'=>469,'b'=>521,'c'=>427,
   	'd'=>521,'e'=>438,'f'=>271,'g'=>469,'h'=>531,'i'=>250,'j'=>250,'k'=>458,'l'=>240,'m'=>802,
   	'n'=>531,'o'=>500,'p'=>521,'q'=>521,'r'=>365,'s'=>333,'t'=>292,'u'=>521,'v'=>458,'w'=>677,
-  	'x'=>479,'y'=>458,'z'=>427,'{'=>480,'|'=>496,'end'=>480,'~'=>667}
+  	'x'=>479,'y'=>458,'z'=>427,'{'=>480,'|'=>496,'}'=>480,'~'=>667}
 
-  GB_widths={' '=>207,'!'=>270,'"'=>342,'#'=>467,''=>462,'%'=>797,'&'=>710,'\''=>239,
+  GB_widths={' '=>207,'!'=>270,'"'=>342,'#'=>467,'$'=>462,'%'=>797,'&'=>710,'\''=>239,
   	'('=>374,')'=>374,'*'=>423,'+'=>605,','=>238,'-'=>375,'.'=>238,'/'=>334,'0'=>462,'1'=>462,
-  	'2'=>462,'3'=>462,'4'=>462,'5'=>462,'6'=>462,'7'=>462,'8'=>462,'9'=>462,':'=>238,''=>238,
+  	'2'=>462,'3'=>462,'4'=>462,'5'=>462,'6'=>462,'7'=>462,'8'=>462,'9'=>462,':'=>238,';'=>238,
   	'<'=>605,'='=>605,'>'=>605,'?'=>344,'@'=>748,'A'=>684,'B'=>560,'C'=>695,'D'=>739,'E'=>563,
   	'F'=>511,'G'=>729,'H'=>793,'I'=>318,'J'=>312,'K'=>666,'L'=>526,'M'=>896,'N'=>758,'O'=>772,
   	'P'=>544,'Q'=>772,'R'=>628,'S'=>465,'T'=>607,'U'=>753,'V'=>711,'W'=>972,'X'=>647,'Y'=>620,
   	'Z'=>607,'['=>374,'\\'=>333,']'=>374,'^'=>606,'_'=>500,'`'=>239,'a'=>417,'b'=>503,'c'=>427,
   	'd'=>529,'e'=>415,'f'=>264,'g'=>444,'h'=>518,'i'=>241,'j'=>230,'k'=>495,'l'=>228,'m'=>793,
   	'n'=>527,'o'=>524,'p'=>524,'q'=>504,'r'=>338,'s'=>336,'t'=>277,'u'=>517,'v'=>450,'w'=>652,
-  	'x'=>466,'y'=>452,'z'=>407,'{'=>370,'|'=>258,'end'=>370,'~'=>605}
+  	'x'=>466,'y'=>452,'z'=>407,'{'=>370,'|'=>258,'}'=>370,'~'=>605}
 
   def AddCIDFont(family,style,name,cw,cMap,registry)
 #ActionController::Base::logger.debug registry.to_a.join(":").to_s
@@ -132,7 +132,7 @@
   	while(i<nb)
   		c=s[i]
   		if(c<128)
-  			l+=cw[c.chr]
+  			l+=cw[c.chr] if cw[c.chr]
   			i+=1
   		else
   			l+=1000
@@ -170,13 +170,9 @@
   			b2='LR'
   		else
   			b2=''
-  			if(border.index('L').nil?)
-  				b2+='L'
-				end
-  			if(border.index('R').nil?)
-  				b2+='R'
-				end
-  			b=border.index('T').nil? ? b2+'T' : b2
+			b2='L' unless border.to_s.index('L').nil?
+			b2=b2+'R' unless border.to_s.index('R').nil?
+  			b=(border.to_s.index('T')) ? (b2+'T') : b2
   		end
   	end
   	sep=-1
@@ -189,7 +185,7 @@
   		c=s[i]
   		#Check if ASCII or MB
   		ascii=(c<128)
-  		if(c=="\n")
+  		if(c.chr=="\n")
   			#Explicit line break
   			Cell(w,h,s[j,i-j],b,2,align,fill)
   			i+=1
@@ -205,11 +201,11 @@
   		if(!ascii)
   			sep=i
   			ls=l
-  		elsif(c==' ')
+  		elsif(c.chr==' ')
   			sep=i
   			ls=l
   		end
-  		l+=ascii ? cw[c.chr] : 1000
+  		l+=(ascii ? cw[c.chr] : 1000) || 0
   		if(l>wmax)
   			#Automatic line break
   			if(sep==-1 or i==j)
@@ -219,7 +215,7 @@
   				Cell(w,h,s[j,i-j],b,2,align,fill)
   			else
   				Cell(w,h,s[j,sep-j],b,2,align,fill)
-  				i=(s[sep]==' ') ? sep+1 : sep
+  				i=(s[sep].chr==' ') ? sep+1 : sep
   			end
   			sep=-1
   			j=i
@@ -233,7 +229,7 @@
   		end
   	end
   	#Last chunk
-  	if(border and not border.index('B').nil?)
+  	if(border and not border.to_s.index('B').nil?)
   		b+='B'
 		end
   	Cell(w,h,s[j,i-j],b,2,align,fill)
@@ -265,7 +261,7 @@
   		c=s[i]
   		#Check if ASCII or MB
   		ascii=(c<128)
-  		if(c=="\n")
+  		if(c.chr=="\n")
   			#Explicit line break
   			Cell(w,h,s[j,i-j],0,2,'',0,link)
   			i+=1
@@ -280,10 +276,10 @@
   			nl+=1
   			next
   		end
-  		if(!ascii or c==' ')
+  		if(!ascii or c.chr==' ')
   			sep=i
 			end
-  		l+=ascii ? cw[c.chr] : 1000
+  		l+=(ascii ? cw[c.chr] : 1000) || 0
   		if(l>wmax)
   			#Automatic line break
   			if(sep==-1 or i==j)
@@ -303,7 +299,7 @@
   				Cell(w,h,s[j,i-j],0,2,'',0,link)
   			else
   				Cell(w,h,s[j,sep-j],0,2,'',0,link)
-  				i=(s[sep]==' ') ? sep+1 : sep
+  				i=(s[sep].chr==' ') ? sep+1 : sep
   			end
   			sep=-1
   			j=i