dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
lLefevre
2012-06-26 13:01:18 +00:00
parent dce1d84e26
commit 7362dcebc1
5 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/pdf/PDFGenerator.php
+2
View File
@@ -95,6 +95,8 @@ class PDFGeneratorCore extends TCPDF
public function setFontForLang($iso_lang) public function setFontForLang($iso_lang)
{ {
$this->font = PDFGenerator::DEFAULT_FONT; $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)) if (array_key_exists($iso_lang, $this->font_by_lang))
$this->font = $this->font_by_lang[$iso_lang]; $this->font = $this->font_by_lang[$iso_lang];
tools/tcpdf/fonts/freeserif.ctg.z
BIN
View File
Binary file not shown.
tools/tcpdf/fonts/freeserif.php
+15
View File
File diff suppressed because one or more lines are too long
tools/tcpdf/fonts/freeserif.z
BIN
View File
Binary file not shown.
tools/tcpdf/tcpdf.php
+2 -1
View File
@@ -9409,7 +9409,8 @@ class TCPDF {
$nextk = -1; $nextk = -1;
$prevint = false; $prevint = false;
foreach ($range as $k => $ws) { 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'])) { if (isset($range[$k]['interval'])) {
unset($range[$k]['interval']); unset($range[$k]['interval']);
} }