Replace font LinLibertineFont with FONT_HELVETICA, ref #86, closes #272 #274 (#425)

sreichel · colinmollenhour · commit 2dafb7386bd9 · 2018-03-09T14:21:53.000-05:00
diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php
@@ -790,7 +790,7 @@ protected function _drawItem(Varien_Object $item, Zend_Pdf_Page $page, Mage_Sale
      */
     protected function _setFontRegular($object, $size = 7)
     {
-        $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir() . '/lib/LinLibertineFont/LinLibertine_Re-4.4.1.ttf');
+        $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA);
         $object->setFont($font, $size);
         return $font;
     }
@@ -804,7 +804,7 @@ protected function _setFontRegular($object, $size = 7)
      */
     protected function _setFontBold($object, $size = 7)
     {
-        $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir() . '/lib/LinLibertineFont/LinLibertine_Bd-2.8.1.ttf');
+        $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_BOLD);
         $object->setFont($font, $size);
         return $font;
     }
@@ -818,7 +818,7 @@ protected function _setFontBold($object, $size = 7)
      */
     protected function _setFontItalic($object, $size = 7)
     {
-        $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir() . '/lib/LinLibertineFont/LinLibertine_It-2.8.2.ttf');
+        $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_OBLIQUE);
         $object->setFont($font, $size);
         return $font;
     }
diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php
@@ -317,7 +317,6 @@ public function getItemOptions() {
      */
     protected function _setFontRegular($size = 7)
     {
-        // $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir() . '/lib/LinLibertineFont/LinLibertine_It-2.8.2.ttf');
         $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA);
         $this->getPage()->setFont($font, $size);
         return $font;
@@ -331,8 +330,7 @@ protected function _setFontRegular($size = 7)
      */
     protected function _setFontBold($size = 7)
     {
-        // $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir() . '/lib/LinLibertineFont/LinLibertine_Bd-2.8.1.ttf');
-        $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA);
+        $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_BOLD);
         $this->getPage()->setFont($font, $size);
         return $font;
     }
@@ -345,8 +343,7 @@ protected function _setFontBold($size = 7)
      */
     protected function _setFontItalic($size = 7)
     {
-        // $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir() . '/lib/LinLibertineFont/LinLibertine_It-2.8.2.ttf');
-        $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA);
+        $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_OBLIQUE);
         $this->getPage()->setFont($font, $size);
         return $font;
     }

Original file line number	Diff line number	Diff line change
`@@ -790,7 +790,7 @@ protected function _drawItem(Varien_Object $item, Zend_Pdf_Page $page, Mage_Sale`
`790`	`790`	`*/`
`791`	`791`	`protected function _setFontRegular($object, $size = 7)`
`792`	`792`	`{`
`793`		`- $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir() . '/lib/LinLibertineFont/LinLibertine_Re-4.4.1.ttf');`
	`793`	`+ $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA);`
`794`	`794`	`$object->setFont($font, $size);`
`795`	`795`	`return $font;`
`796`	`796`	`}`
`@@ -804,7 +804,7 @@ protected function _setFontRegular($object, $size = 7)`
`804`	`804`	`*/`
`805`	`805`	`protected function _setFontBold($object, $size = 7)`
`806`	`806`	`{`
`807`		`- $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir() . '/lib/LinLibertineFont/LinLibertine_Bd-2.8.1.ttf');`
	`807`	`+ $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_BOLD);`
`808`	`808`	`$object->setFont($font, $size);`
`809`	`809`	`return $font;`
`810`	`810`	`}`
`@@ -818,7 +818,7 @@ protected function _setFontBold($object, $size = 7)`
`818`	`818`	`*/`
`819`	`819`	`protected function _setFontItalic($object, $size = 7)`
`820`	`820`	`{`
`821`		`- $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir() . '/lib/LinLibertineFont/LinLibertine_It-2.8.2.ttf');`
	`821`	`+ $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_OBLIQUE);`
`822`	`822`	`$object->setFont($font, $size);`
`823`	`823`	`return $font;`
`824`	`824`	`}`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,6 @@ public function getItemOptions() {`
`317`	`317`	`*/`
`318`	`318`	`protected function _setFontRegular($size = 7)`
`319`	`319`	`{`
`320`		`- // $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir() . '/lib/LinLibertineFont/LinLibertine_It-2.8.2.ttf');`
`321`	`320`	`$font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA);`
`322`	`321`	`$this->getPage()->setFont($font, $size);`
`323`	`322`	`return $font;`
`@@ -331,8 +330,7 @@ protected function _setFontRegular($size = 7)`
`331`	`330`	`*/`
`332`	`331`	`protected function _setFontBold($size = 7)`
`333`	`332`	`{`
`334`		`- // $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir() . '/lib/LinLibertineFont/LinLibertine_Bd-2.8.1.ttf');`
`335`		`- $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA);`
	`333`	`+ $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_BOLD);`
`336`	`334`	`$this->getPage()->setFont($font, $size);`
`337`	`335`	`return $font;`
`338`	`336`	`}`
`@@ -345,8 +343,7 @@ protected function _setFontBold($size = 7)`
`345`	`343`	`*/`
`346`	`344`	`protected function _setFontItalic($size = 7)`
`347`	`345`	`{`
`348`		`- // $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir() . '/lib/LinLibertineFont/LinLibertine_It-2.8.2.ttf');`
`349`		`- $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA);`
	`346`	`+ $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_OBLIQUE);`
`350`	`347`	`$this->getPage()->setFont($font, $size);`
`351`	`348`	`return $font;`
`352`	`349`	`}`