Fixing some issues found in tests before the first demo

This commit is contained in:
Julio Cesar Laura Avendaño
2020-09-02 22:16:47 +00:00
parent 50d8013786
commit 001b04fa00
2 changed files with 27 additions and 12 deletions

View File

@@ -1455,7 +1455,6 @@ function documents_add_font($args, $options)
$fontFriendlyName = $args[1] ?? '';
$fontProperties = $args[2] ?? '';
$fontType = $options['font_type'] ?? 'TrueType';
$name = '';
// Check fonts path
OutputDocument::checkTcPdfFontsPath();
@@ -1481,22 +1480,13 @@ function documents_add_font($args, $options)
}
// Convert TTF file to the format required by TCPDF library
$tcPdfFont = TCPDF_FONTS::addTTFfont(PATH_DATA . 'fonts' . PATH_SEP . $fontFileName, $fontType);
$fontFamilyName = TCPDF_FONTS::addTTFfont(PATH_DATA . 'fonts' . PATH_SEP . $fontFileName, $fontType);
// Check if the conversion was successful
if ($tcPdfFont === false) {
if ($fontFamilyName === false) {
throw new Exception("The font file '{$fontFileName}' cannot be converted.");
}
// Include font definition, in order to use the variable $name
require_once K_PATH_FONTS . $tcPdfFont . '.php';
// Build the font family name to be used in the styles
$fontFamilyName = strtolower($name);
$fontFamilyName = str_replace('-', ' ', $fontFamilyName);
$fontFamilyName = str_replace(['bold', 'oblique', 'italic', 'regular'], '', $fontFamilyName);
$fontFamilyName = trim($fontFamilyName);
// Add new font
$font = [
'fileName' => $fontFileName,