composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

🎨 replace TCPPDF:SetFont calls by iTopPDF::SetFontParams

Browse Source 
This ensures that the same font is used in every caller
This commit is contained in:
Pierre Goiffon
2019-01-23 11:46:52 +01:00
parent 53d2f6320b
commit 01fbcb7044
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
application/pdfpage.class.inc.php
View File

@@ -13,18 +13,22 @@ class iTopPDF extends TCPDF
protected $sDocumentTitle;
/**
* Shortcut to set only weight and size
* Shortcut for {@link TCPDF::SetFont}, to use the font configured
*
* @param string $style
* @param int $size
* @param string $fontfile
* @param string $subset
* @param bool $out
*
* @uses \TCPDF::SetFont()
* @uses \iTopPDF::GetPdfFont()
* @since 2.7
*/
public function SetFontParams($style, $size)
public function SetFontParams($style, $size, $fontfile='', $subset='default', $out=true)
{
$siTopFont = self::GetPdfFont();
$this->SetFont($siTopFont, $style, $size);
$this->SetFont($siTopFont, $style, $size, $fontfile, $subset, $out);
}
/**
@@ -88,6 +92,7 @@ class iTopPDF extends TCPDF
}
/**
* dejavusans is a UTF-8 Unicode font. Standard PDF fonts like helvetica or times new roman are NOT UTF-8
* @return string font in the config file (export_pdf_font)
*/
public static function GetPdfFont()
@@ -121,9 +126,8 @@ class PDFPage extends WebPage
$this->oPdf->setFontSubsetting(true);
// Set font
// dejavusans is a UTF-8 Unicode font. Standard PDF fonts like helvetica or times new roman are NOT UTF-8
$this->oPdf->SetFont(iTopPDF::GetPdfFont(), '', 10, '', true);
$this->oPdf->SetFontParams('', 10, '', true);
// set auto page breaks
$this->oPdf->SetAutoPageBreak(true, 15); // 15 mm break margin at the bottom