rbpdf 1.19.0 → 1.19.1

data/test/rbpdf_dom_test.rb

@@ -1,3 +1,7 @@
+# Copyright (c) 2011-2017 NAITOH Jun
+# Released under the MIT license
+# http://www.opensource.org/licenses/MIT
+
 require 'test_helper'
 
 class RbpdfTest < Test::Unit::TestCase
@@ -18,104 +22,110 @@ class RbpdfTest < Test::Unit::TestCase
 
     # Simple Text
     dom = pdf.getHtmlDomArray('abc')
-    assert_equal 0, dom[0]['parent']  # Root
+    assert_equal 0,     dom[0]['parent'] # Root
     assert_equal false, dom[0]['tag']
     assert_equal({'tag'=>false, 'value'=>'abc', 'elkey'=>0, 'parent'=>0, 'block'=>false}, dom[1])
 
+    # Back Slash Text
+    dom = pdf.getHtmlDomArray("a\\bc")
+    assert_equal 0,     dom[0]['parent'] # Root
+    assert_equal false, dom[0]['tag']
+    assert_equal({'tag'=>false, 'value'=>"a\\bc", 'elkey'=>0, 'parent'=>0, 'block'=>false}, dom[1])
+
     # Simple Tag
     dom = pdf.getHtmlDomArray('<b>abc</b>')
-    assert_equal dom.length, 4
+    assert_equal 4,     dom.length
 
-    assert_equal 0, dom[0]['parent']  # Root
+    assert_equal 0,     dom[0]['parent']  # Root
     assert_equal false, dom[0]['tag']
-    assert_equal({}, dom[0]['attribute'])
+    assert_equal({},    dom[0]['attribute'])
 
-    assert_equal dom[1]['parent'], 0   # parent -> parent tag key
-    assert_equal dom[1]['elkey'], 0
-    assert_equal dom[1]['tag'], true
-    assert_equal dom[1]['opening'], true
-    assert_equal dom[1]['value'], 'b'
-    assert_equal dom[1]['attribute'], {}
+    assert_equal 0,     dom[1]['parent'] # parent -> parent tag key
+    assert_equal 0,     dom[1]['elkey']
+    assert_equal true,  dom[1]['tag']
+    assert_equal true,  dom[1]['opening']
+    assert_equal 'b',   dom[1]['value']
+    assert_equal({},    dom[1]['attribute'])
 
     assert_equal({'tag' => false, 'value'=>'abc', 'elkey'=>1, 'parent'=>1, 'block'=>false}, dom[2])  # parent -> open tag key
 
-    assert_equal dom[3]['parent'], 1   # parent -> open tag key
-    assert_equal dom[3]['elkey'], 2
-    assert_equal dom[3]['tag'], true
-    assert_equal dom[3]['opening'], false
-    assert_equal dom[3]['value'], 'b'
+    assert_equal 1,     dom[3]['parent'] # parent -> open tag key
+    assert_equal 2,     dom[3]['elkey']
+    assert_equal true,  dom[3]['tag']
+    assert_equal false, dom[3]['opening']
+    assert_equal 'b',   dom[3]['value']
 
     # Error Tag (doble colse tag)
     dom = pdf.getHtmlDomArray('</ul></div>')
 
-    assert_equal 0, dom[0]['parent']  # Root
+    assert_equal 0,     dom[0]['parent']  # Root
     assert_equal false, dom[0]['tag']
-    assert_equal({}, dom[0]['attribute'])
+    assert_equal({},    dom[0]['attribute'])
 
     if dom.length == 3 # for Rails 3.x/4.0/4.1 (no use Rails 4.2 later)
-      assert_equal dom[1]['parent'], 0   # parent -> Root key
-      assert_equal dom[1]['elkey'], 0
-      assert_equal dom[1]['tag'], true
-      assert_equal dom[1]['opening'], false
-      assert_equal dom[1]['value'], 'ul'
-
-      assert_equal dom[2]['parent'], 0   # parent -> Root key
-      assert_equal dom[2]['elkey'], 1
-      assert_equal dom[2]['tag'], true
-      assert_equal dom[2]['opening'], false
-      assert_equal dom[2]['value'], 'div'
+      assert_equal 0,     dom[1]['parent'] # parent -> Root key
+      assert_equal 0,     dom[1]['elkey']
+      assert_equal true,  dom[1]['tag']
+      assert_equal false, dom[1]['opening']
+      assert_equal 'ul',  dom[1]['value']
+
+      assert_equal 0,     dom[2]['parent'] # parent -> Root key
+      assert_equal 1,     dom[2]['elkey']
+      assert_equal true,  dom[2]['tag']
+      assert_equal false, dom[2]['opening']
+      assert_equal 'div', dom[2]['value']
     end
 
     # Attribute
     dom = pdf.getHtmlDomArray('<p style="text-align:justify">abc</p>')
-    assert_equal dom.length, 4
+    assert_equal 4,     dom.length
 
-    assert_equal 0, dom[0]['parent']  # Root
+    assert_equal 0,     dom[0]['parent'] # Root
     assert_equal false, dom[0]['tag']
-    assert_equal({}, dom[0]['attribute'])
+    assert_equal({},    dom[0]['attribute'])
 
-    assert_equal dom[1]['parent'], 0   # parent -> parent tag key
-    assert_equal dom[1]['elkey'], 0
-    assert_equal dom[1]['tag'], true
-    assert_equal dom[1]['opening'], true
-    assert_equal dom[1]['value'], 'p'
+    assert_equal 0,     dom[1]['parent'] # parent -> parent tag key
+    assert_equal 0,     dom[1]['elkey']
+    assert_equal true,  dom[1]['tag']
+    assert_equal true,  dom[1]['opening']
+    assert_equal 'p',   dom[1]['value']
     assert_not_nil dom[1]['attribute']
-    assert_equal dom[1]['attribute']['style'].gsub(' ', ''), 'text-align:justify;'
-    assert_equal dom[1]['align'], 'J'
+    assert_equal 'text-align:justify;', dom[1]['attribute']['style'].gsub(' ', '')
+    assert_equal 'J',   dom[1]['align']
 
     # Table border
     dom = pdf.getHtmlDomArray('<table border="1"><tr><td>abc</td></tr></table>')
     ## added marker tag (by getHtmlDomArray()) ##
     # '<table border="1"><tr><td>abc<marker style="font-size:0"/></td></tr></table>'
-    assert_equal dom.length, 9
+    assert_equal 9,             dom.length
 
-    assert_equal dom[1]['parent'], 0   # parent -> parent tag key
-    assert_equal dom[1]['elkey'], 0
-    assert_equal dom[1]['tag'], true
-    assert_equal dom[1]['opening'], true
-    assert_equal dom[1]['value'], 'table'
-    assert_equal dom[1]['attribute']['border'], '1'
+    assert_equal 0,             dom[1]['parent'] # parent -> parent tag key
+    assert_equal 0,             dom[1]['elkey']
+    assert_equal true,          dom[1]['tag']
+    assert_equal true,          dom[1]['opening']
+    assert_equal 'table',       dom[1]['value']
+    assert_equal '1',           dom[1]['attribute']['border']
 
     ## marker tag (by getHtmlDomArray())
-    assert_equal dom[5]['parent'], 3   # parent -> parent tag key
-    assert_equal dom[5]['elkey'], 4
-    assert_equal dom[5]['tag'], true
-    assert_equal dom[5]['opening'], true
-    assert_equal dom[5]['value'], 'marker'
-    assert_equal dom[5]['attribute']['style'], 'font-size:0'
+    assert_equal 3,             dom[5]['parent'] # parent -> parent tag key
+    assert_equal 4,             dom[5]['elkey']
+    assert_equal true,          dom[5]['tag']
+    assert_equal true,          dom[5]['opening']
+    assert_equal 'marker',      dom[5]['value']
+    assert_equal 'font-size:0', dom[5]['attribute']['style']
 
     # Table td Width
     dom = pdf.getHtmlDomArray('<table><tr><td width="10">abc</td></tr></table>')
     ## added marker tag (by getHtmlDomArray()) ##
     # '<table><tr><td width="10">abc<marker style="font-size:0"/></td></tr></table>'
-    assert_equal dom.length, 9
-
-    assert_equal dom[3]['parent'], 2   # parent -> parent tag key
-    assert_equal dom[3]['elkey'], 2
-    assert_equal dom[3]['tag'], true
-    assert_equal dom[3]['opening'], true
-    assert_equal dom[3]['value'], 'td'
-    assert_equal dom[3]['width'], '10'
+    assert_equal 9,    dom.length
+
+    assert_equal 2,     dom[3]['parent'] # parent -> parent tag key
+    assert_equal 2,     dom[3]['elkey']
+    assert_equal true,  dom[3]['tag']
+    assert_equal true,  dom[3]['opening']
+    assert_equal 'td',  dom[3]['value']
+    assert_equal '10',  dom[3]['width']
   end
 
   test "Dom self close tag test" do
@@ -123,40 +133,40 @@ class RbpdfTest < Test::Unit::TestCase
 
     # Simple Tag
     dom = pdf.getHtmlDomArray('<b>ab<br>c</b>')
-    assert_equal dom.length, 6
+    assert_equal 6,     dom.length
 
-    assert_equal 0, dom[0]['parent']  # Root
+    assert_equal 0,     dom[0]['parent'] # Root
     assert_equal false, dom[0]['tag']
-    assert_equal({}, dom[0]['attribute'])
+    assert_equal({},    dom[0]['attribute'])
 
     # <b>
-    assert_equal dom[1]['parent'], 0   # parent -> parent tag key
-    assert_equal dom[1]['elkey'], 0
-    assert_equal dom[1]['tag'], true
-    assert_equal dom[1]['opening'], true
-    assert_equal dom[1]['value'], 'b'
-    assert_equal dom[1]['attribute'], {}
+    assert_equal 0,     dom[1]['parent'] # parent -> parent tag key
+    assert_equal 0,     dom[1]['elkey']
+    assert_equal true,  dom[1]['tag']
+    assert_equal true,  dom[1]['opening']
+    assert_equal 'b',   dom[1]['value']
+    assert_equal({},    dom[1]['attribute'])
 
     # ab
     assert_equal({'tag' => false, 'value'=>'ab', 'elkey'=>1, 'parent'=>1, 'block'=>false}, dom[2])  # parent -> open tag key
 
     # <br>
-    assert_equal dom[3]['parent'], 1   # parent -> open tag key
-    assert_equal dom[3]['elkey'], 2
-    assert_equal dom[3]['tag'], true
-    assert_equal dom[3]['opening'], true
-    assert_equal dom[3]['value'], 'br'
-    assert_equal dom[3]['attribute'], {}
+    assert_equal 1,     dom[3]['parent'] # parent -> open tag key
+    assert_equal 2,     dom[3]['elkey']
+    assert_equal true,  dom[3]['tag']
+    assert_equal true,  dom[3]['opening']
+    assert_equal 'br',  dom[3]['value']
+    assert_equal({},    dom[3]['attribute'])
 
     # c
     assert_equal({'tag' => false, 'value'=>'c', 'elkey'=>3, 'parent'=>1, 'block'=>false}, dom[4])  # parent -> open tag key
 
     # </b>
-    assert_equal dom[5]['parent'], 1   # parent -> open tag key
-    assert_equal dom[5]['elkey'], 4
-    assert_equal dom[5]['tag'], true
-    assert_equal dom[5]['opening'], false
-    assert_equal dom[5]['value'], 'b'
+    assert_equal 1,     dom[5]['parent'] # parent -> open tag key
+    assert_equal 4,     dom[5]['elkey']
+    assert_equal true,  dom[5]['tag']
+    assert_equal false, dom[5]['opening']
+    assert_equal 'b',   dom[5]['value']
 
     dom2 = pdf.getHtmlDomArray('<b>ab<br/>c</b>')
     assert_equal dom, dom2
@@ -187,83 +197,83 @@ class RbpdfTest < Test::Unit::TestCase
     pdf = MYPDF.new
     pdf.add_page
     temprtl = pdf.get_temp_rtl
-    assert_equal temprtl, false
+    assert_equal false, temprtl
 
     # LTR, ltr
     htmlcontent = '<p dir="ltr">HTML Example</p>'
     dom = pdf.getHtmlDomArray(htmlcontent)
     dom = pdf.openHTMLTagHandler(dom, 1, false)
 
-    assert_equal dom[1]['tag'], true
-    assert_equal dom[1]['opening'], true
-    assert_equal dom[1]['value'], 'p'
-    assert_equal dom[1]['attribute']['dir'], 'ltr'
+    assert_equal true,  dom[1]['tag']
+    assert_equal true,  dom[1]['opening']
+    assert_equal 'p',   dom[1]['value']
+    assert_equal 'ltr', dom[1]['attribute']['dir']
 
     temprtl = pdf.get_temp_rtl
-    assert_equal temprtl, false
+    assert_equal false, temprtl
 
     # LTR, rtl
     htmlcontent = '<p dir="rtl">HTML Example</p>'
     dom = pdf.getHtmlDomArray(htmlcontent)
     dom = pdf.openHTMLTagHandler(dom, 1, false)
-    assert_equal dom.length, 4
+    assert_equal 4,     dom.length
 
-    assert_equal dom[1]['tag'], true
-    assert_equal dom[1]['opening'], true
-    assert_equal dom[1]['value'], 'p'
-    assert_equal dom[1]['attribute']['dir'], 'rtl'
+    assert_equal true,  dom[1]['tag']
+    assert_equal true,  dom[1]['opening']
+    assert_equal 'p',   dom[1]['value']
+    assert_equal 'rtl', dom[1]['attribute']['dir']
 
     temprtl = pdf.get_temp_rtl
-    assert_equal temprtl, 'R'
+    assert_equal 'R',   temprtl
 
     # LTR, ltr
     htmlcontent = '<p dir="ltr">HTML Example</p>'
     dom = pdf.getHtmlDomArray(htmlcontent)
     dom = pdf.openHTMLTagHandler(dom, 1, false)
 
-    assert_equal dom[1]['tag'], true
-    assert_equal dom[1]['opening'], true
-    assert_equal dom[1]['value'], 'p'
-    assert_equal dom[1]['attribute']['dir'], 'ltr'
+    assert_equal true,  dom[1]['tag']
+    assert_equal true,  dom[1]['opening']
+    assert_equal 'p',   dom[1]['value']
+    assert_equal 'ltr', dom[1]['attribute']['dir']
 
     temprtl = pdf.get_temp_rtl
-    assert_equal temprtl, false
+    assert_equal false, temprtl
   end
 
   test "Dom HTMLTagHandler DIR LTR test" do
     pdf = MYPDF.new
     pdf.add_page
     temprtl = pdf.get_temp_rtl
-    assert_equal temprtl, false
+    assert_equal false, temprtl
     pdf.set_rtl(true)
 
     # RTL, ltr
     htmlcontent = '<p dir="ltr">HTML Example</p>'
     dom = pdf.getHtmlDomArray(htmlcontent)
     dom = pdf.openHTMLTagHandler(dom, 1, false)
-    assert_equal dom.length, 4
+    assert_equal 4,     dom.length
 
-    assert_equal dom[1]['tag'], true
-    assert_equal dom[1]['opening'], true
-    assert_equal dom[1]['value'], 'p'
-    assert_equal dom[1]['attribute']['dir'], 'ltr'
+    assert_equal true,  dom[1]['tag']
+    assert_equal true,  dom[1]['opening']
+    assert_equal 'p',   dom[1]['value']
+    assert_equal 'ltr', dom[1]['attribute']['dir']
 
     temprtl = pdf.get_temp_rtl
-    assert_equal temprtl, 'L'
+    assert_equal 'L',   temprtl
 
     # RTL, rtl
     htmlcontent = '<p dir="rtl">HTML Example</p>'
     dom = pdf.getHtmlDomArray(htmlcontent)
     dom = pdf.openHTMLTagHandler(dom, 1, false)
-    assert_equal dom.length, 4
+    assert_equal 4,     dom.length
 
-    assert_equal dom[1]['tag'], true
-    assert_equal dom[1]['opening'], true
-    assert_equal dom[1]['value'], 'p'
-    assert_equal dom[1]['attribute']['dir'], 'rtl'
+    assert_equal true,  dom[1]['tag']
+    assert_equal true,  dom[1]['opening']
+    assert_equal 'p',   dom[1]['value']
+    assert_equal 'rtl', dom[1]['attribute']['dir']
 
     temprtl = pdf.get_temp_rtl
-    assert_equal temprtl, false
+    assert_equal false, temprtl
   end
 
   test "Dom HTMLTagHandler img y position with height attribute test" do
@@ -273,7 +283,7 @@ class RbpdfTest < Test::Unit::TestCase
     # Image Error HTML
     htmlcontent = '<img src="/public/ng.png" alt="test alt attribute" width="30" height="30" border="0"/>'
     dom1 = pdf.getHtmlDomArray(htmlcontent)
-    y1 = pdf.get_y
+    #y1 = pdf.get_y
 
     dom2 = pdf.openHTMLTagHandler(dom1, 1, false)
     y2 = pdf.get_y
@@ -302,7 +312,7 @@ class RbpdfTest < Test::Unit::TestCase
 
     htmlcontent = "<p>AAA '<'-BBB << <<< '</' '<//' '<///' CCC.</p>"
     dom = pdf.getHtmlDomArray(htmlcontent)
-    assert_equal dom.length, 4
+    assert_equal 4,     dom.length
 
     assert_equal 0,     dom[0]['parent']  # Root
     assert_equal false, dom[0]['tag']
@@ -332,7 +342,7 @@ class RbpdfTest < Test::Unit::TestCase
 
     pdf = MYPDF.new('P', 'mm', 'A4', true, "UTF-8", true)
     htmlcontent = 'test'.force_encoding('ASCII-8BIT')
-    dom = pdf.getHtmlDomArray(htmlcontent)
-    assert_equal htmlcontent.encoding.to_s, 'ASCII-8BIT'
+    pdf.getHtmlDomArray(htmlcontent)
+    assert_equal 'ASCII-8BIT', htmlcontent.encoding.to_s
   end
 end

data/test/rbpdf_font_func_test.rb

@@ -1,3 +1,7 @@
+# Copyright (c) 2011-2017 NAITOH Jun
+# Released under the MIT license
+# http://www.opensource.org/licenses/MIT
+
 require 'test_helper'
 
 class RbpdfFontFuncTest < Test::Unit::TestCase
@@ -34,8 +38,8 @@ class RbpdfFontFuncTest < Test::Unit::TestCase
     pdf = MYPDF.new
 
     apxo_obj_id = pdf.putAPXObject
-    assert_equal apxo_obj_id, 400001
+    assert_equal 400001, apxo_obj_id
     apxo_obj_id = pdf.putAPXObject
-    assert_equal apxo_obj_id, 400002
+    assert_equal 400002, apxo_obj_id
   end
 end

data/test/rbpdf_font_style_test.rb

@@ -1,3 +1,7 @@
+# Copyright (c) 2011-2017 NAITOH Jun
+# Released under the MIT license
+# http://www.opensource.org/licenses/MIT
+
 require 'test_helper'
 
 class RbpdfFontStyleTest < Test::Unit::TestCase
@@ -16,18 +20,18 @@ class RbpdfFontStyleTest < Test::Unit::TestCase
   test "Font dounderline function test 1" do
     pdf = MYPDF.new
     line = pdf.dounderline(10, 10, "test")
-    assert_equal line, '28.35 812.94 19.34 -0.60 re f'
+    assert_equal '28.35 812.94 19.34 -0.60 re f', line
   end
 
   test "Font dolinethrough function test 1" do
     pdf = MYPDF.new
     line = pdf.dolinethrough(10, 10, "test")
-    assert_equal line, '28.35 816.94 19.34 -0.60 re f'
+    assert_equal '28.35 816.94 19.34 -0.60 re f', line
   end
 
   test "Font dooverline function test 1" do
     pdf = MYPDF.new
     line = pdf.dooverline(10, 10, "test")
-    assert_equal line, '28.35 824.34 19.34 -0.60 re f'
+    assert_equal '28.35 824.34 19.34 -0.60 re f', line
   end
 end

data/test/rbpdf_font_test.rb

@@ -1,3 +1,7 @@
+# Copyright (c) 2011-2017 NAITOH Jun
+# Released under the MIT license
+# http://www.opensource.org/licenses/MIT
+
 require 'test_helper'
 
 class RbpdfFontTest < Test::Unit::TestCase
@@ -49,17 +53,17 @@ class RbpdfFontTest < Test::Unit::TestCase
     pdf.set_font('helvetica', 'BI', 18)
 
     font = pdf.getFontBuffer('helvetica')
-    assert_equal font['name'], 'Helvetica'
-    assert_equal font['dw'], 556
+    assert_equal 'Helvetica',             font['name']
+    assert_equal 556,                     font['dw']
     font = pdf.getFontBuffer('helveticaB')
-    assert_equal font['name'], 'Helvetica-Bold'
-    assert_equal font['dw'], 556
+    assert_equal 'Helvetica-Bold',        font['name']
+    assert_equal 556,                     font['dw']
     font = pdf.getFontBuffer('helveticaI')
-    assert_equal font['name'], 'Helvetica-Oblique'
-    assert_equal font['dw'], 556
+    assert_equal 'Helvetica-Oblique',     font['name']
+    assert_equal 556,                     font['dw']
     font = pdf.getFontBuffer('helveticaBI')
-    assert_equal font['name'], 'Helvetica-BoldOblique'
-    assert_equal font['dw'], 556
+    assert_equal 'Helvetica-BoldOblique', font['name']
+    assert_equal 556,                     font['dw']
 
     pdf.set_font('times', '', 18)
     pdf.set_font('times', 'B', 18)
@@ -67,13 +71,13 @@ class RbpdfFontTest < Test::Unit::TestCase
     pdf.set_font('times', 'BI', 18)
 
     font = pdf.getFontBuffer('times')
-    assert_equal font['name'], 'Times-Roman'
+    assert_equal 'Times-Roman',      font['name']
     font = pdf.getFontBuffer('timesB')
-    assert_equal font['name'], 'Times-Bold'
+    assert_equal 'Times-Bold',       font['name']
     font = pdf.getFontBuffer('timesI')
-    assert_equal font['name'], 'Times-Italic'
+    assert_equal 'Times-Italic',     font['name']
     font = pdf.getFontBuffer('timesBI')
-    assert_equal font['name'], 'Times-BoldItalic'
+    assert_equal 'Times-BoldItalic', font['name']
 
     pdf.set_font('courier', '', 18)
     pdf.set_font('courier', 'B', 18)
@@ -81,21 +85,21 @@ class RbpdfFontTest < Test::Unit::TestCase
     pdf.set_font('courier', 'BI', 18)
 
     font = pdf.getFontBuffer('courier')
-    assert_equal font['name'], 'Courier'
+    assert_equal 'Courier',             font['name']
     font = pdf.getFontBuffer('courierB')
-    assert_equal font['name'], 'Courier-Bold'
+    assert_equal 'Courier-Bold',        font['name']
     font = pdf.getFontBuffer('courierI')
-    assert_equal font['name'], 'Courier-Oblique'
+    assert_equal 'Courier-Oblique',     font['name']
     font = pdf.getFontBuffer('courierBI')
-    assert_equal font['name'], 'Courier-BoldOblique'
+    assert_equal 'Courier-BoldOblique', font['name']
 
     pdf.set_font('symbol', '', 18)
     font = pdf.getFontBuffer('symbol')
-    assert_equal font['name'], 'Symbol'
+    assert_equal 'Symbol',       font['name']
 
     pdf.set_font('zapfdingbats', '', 18)
     font = pdf.getFontBuffer('zapfdingbats')
-    assert_equal font['name'], 'ZapfDingbats'
+    assert_equal 'ZapfDingbats', font['name']
 
     pdf.putfonts()
   end
@@ -227,20 +231,24 @@ class RbpdfFontTest < Test::Unit::TestCase
     pdf.set_font('kozgopromedium', 'BI', 18)
 
     font = pdf.getFontBuffer('kozgopromedium')
-    assert_equal font['desc']['StemV'], 99
-    assert_equal font['desc']['ItalicAngle'], 0
+    assert_equal 99,     font['desc']['StemV']
+    assert_equal 0,      font['desc']['ItalicAngle']
+    assert_equal 'KozGoPro-Medium-Acro', font['name']
 
     font = pdf.getFontBuffer('kozgopromediumB')
-    assert_equal font['desc']['StemV'], 99 * 2
-    assert_equal font['desc']['ItalicAngle'], 0
+    assert_equal 99 * 2, font['desc']['StemV']
+    assert_equal 0,      font['desc']['ItalicAngle']
+    assert_equal 'KozGoPro-Medium-Acro,Bold', font['name']
 
     font = pdf.getFontBuffer('kozgopromediumI')
-    assert_equal font['desc']['StemV'], 99
-    assert_equal font['desc']['ItalicAngle'], -11
+    assert_equal 99,     font['desc']['StemV']
+    assert_equal(-11,    font['desc']['ItalicAngle'])
+    assert_equal 'KozGoPro-Medium-Acro,Italic', font['name']
 
     font = pdf.getFontBuffer('kozgopromediumBI')
-    assert_equal font['desc']['StemV'], 99 * 2
-    assert_equal font['desc']['ItalicAngle'], -11
+    assert_equal 99 * 2, font['desc']['StemV']
+    assert_equal(-11,    font['desc']['ItalicAngle'])
+    assert_equal 'KozGoPro-Medium-Acro,BoldItalic', font['name']
 
     pdf.set_font('kozminproregular', '', 18)
     pdf.set_font('kozminproregular', 'B', 18)
@@ -265,6 +273,15 @@ class RbpdfFontTest < Test::Unit::TestCase
     pdf.putfonts()
   end
 
+  test "Set Font fontname test" do
+    pdf = MYPDF.new
+    pdf.set_font('helvetica', '', 18, pdf.send(:getfontpath, 'helvetica.rb'))
+    pdf.set_font('helvetica', 'B', 18, pdf.send(:getfontpath, 'helveticab.rb'))
+    pdf.set_font('helvetica', 'I', 18, pdf.send(:getfontpath, 'helveticai.rb'))
+    pdf.set_font('helvetica', 'BI', 18, pdf.send(:getfontpath, 'helveticabi.rb'))
+    pdf.putfonts()
+  end
+
   test "Font Error test" do
     pdf = RBPDF.new
     RBPDF.k_path_fonts = File.join File.dirname(__FILE__)
@@ -277,7 +294,7 @@ class RbpdfFontTest < Test::Unit::TestCase
     err = assert_raises(RuntimeError) { 
       pdf.set_font('err_font1', '', 18)
     }
-    assert_match /RBPDF error: The font definition file has a bad format: .*err_font1.rb/, err.message
+    assert_match(/RBPDF error: The font definition file has a bad format: .*err_font1.rb/, err.message)
 
     err = assert_raises(RuntimeError) { 
       pdf.set_font('err_font2', '', 18)