[-] PDF : #PSCFV-2795 : Add font : freeserif and fix bug in tcpdf.php

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16134 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-06-26 13:01:18 +00:00
parent 07007e3a02
commit 8a1bf45ae0
5 changed files with 19 additions and 1 deletions
+2
View File
@@ -95,6 +95,8 @@ class PDFGeneratorCore extends TCPDF
public function setFontForLang($iso_lang)
{
$this->font = PDFGenerator::DEFAULT_FONT;
$this->setHeaderFont(array(PDFGenerator::DEFAULT_FONT, '', PDF_FONT_SIZE_MAIN));
$this->setFooterFont(array(PDFGenerator::DEFAULT_FONT, '', PDF_FONT_SIZE_MAIN));
if (array_key_exists($iso_lang, $this->font_by_lang))
$this->font = $this->font_by_lang[$iso_lang];
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
+2 -1
View File
@@ -9409,7 +9409,8 @@ class TCPDF {
$nextk = -1;
$prevint = false;
foreach ($range as $k => $ws) {
if (($k == $nextk) AND (!$prevint) AND ((!isset($ws['interval'])) OR (count($ws) < 4))) {
$cws = count($ws);
if (($k == $nextk) AND (!$prevint) AND ((!isset($ws['interval'])) OR ($cws < 4))) {
if (isset($range[$k]['interval'])) {
unset($range[$k]['interval']);
}