mirror_php/TCPDF
1
0
Fork 0
mirror of https://github.com/tecnickcom/TCPDF.git synced 2025-01-17 06:08:28 +01:00
Code Issues Projects Releases Wiki Activity

Add some addTTFfont fixes from tc-lib-pdf-font

Browse Source
This commit is contained in:
nicolaasuni 2024-12-23 12:43:22 +00:00
parent aab43ab0a8
commit a0a02efe48
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.TXT
View File

@ -3,6 +3,7 @@
- Escape error message. - Escape error message.
- Use strict time-constant function to compare TCPDF-tag hashes. - Use strict time-constant function to compare TCPDF-tag hashes.
- Add K_CURLOPTS config array to set custom cURL options (NOTE: some defaults have changed). - Add K_CURLOPTS config array to set custom cURL options (NOTE: some defaults have changed).
- Add some addTTFfont fixes from tc-lib-pdf-font.
6.7.8 (2024-12-13) 6.7.8 (2024-12-13)

43
include/tcpdf_fonts.php
View File

@ -1,13 +1,13 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf_fonts.php // File name : tcpdf_fonts.php
// Version : 1.1.0 // Version : 1.1.1
// Begin : 2008-01-01 // Begin : 2008-01-01
// Last Update : 2014-12-10 // Last Update : 2024-12-23
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Copyright (C) 2008-2014 Nicola Asuni - Tecnick.com LTD // Copyright (C) 2008-2024 Nicola Asuni - Tecnick.com LTD
// //
// This file is part of TCPDF software library. // This file is part of TCPDF software library.
// //
@ -42,7 +42,7 @@
* @class TCPDF_FONTS * @class TCPDF_FONTS
* Font methods for TCPDF library. * Font methods for TCPDF library.
* @package com.tecnick.tcpdf * @package com.tecnick.tcpdf
* @version 1.1.0 * @version 1.1.1
* @author Nicola Asuni - info@tecnick.com * @author Nicola Asuni - info@tecnick.com
*/ */
class TCPDF_FONTS { class TCPDF_FONTS {
@ -191,29 +191,30 @@ class TCPDF_FONTS {
fclose($fp); fclose($fp);
// get font info // get font info
$fmetric['Flags'] = $flags; $fmetric['Flags'] = $flags;
preg_match ('#/FullName[\s]*\(([^\)]*)#', $font, $matches); preg_match ('#/FullName[\s]*+\(([^\)]*+)#', $font, $matches);
$fmetric['name'] = preg_replace('/[^a-zA-Z0-9_\-]/', '', $matches[1]); $fmetric['name'] = preg_replace('/[^a-zA-Z0-9_\-]/', '', $matches[1]);
preg_match('#/FontBBox[\s]*{([^}]*)#', $font, $matches); preg_match('#/FontBBox[\s]*+{([^}]*+)#', $font, $matches);
$fmetric['bbox'] = trim($matches[1]); $rawbvl = explode(' ', trim($matches[1]));
$bv = explode(' ', $fmetric['bbox']); $bvl = [(int) $rawbvl[0], (int) $rawbvl[1], (int) $rawbvl[2], (int) $rawbvl[3]];
$fmetric['Ascent'] = intval($bv[3]); $fmetric['bbox'] = implode(' ', $bvl);
$fmetric['Descent'] = intval($bv[1]); $fmetric['Ascent'] = $bvl[3];
preg_match('#/ItalicAngle[\s]*([0-9\+\-]*)#', $font, $matches); $fmetric['Descent'] = $bvl[1];
preg_match('#/ItalicAngle[\s]*+([0-9\+\-]*+)#', $font, $matches);
$fmetric['italicAngle'] = intval($matches[1]); $fmetric['italicAngle'] = intval($matches[1]);
if ($fmetric['italicAngle'] != 0) { if ($fmetric['italicAngle'] != 0) {
$fmetric['Flags'] |= 64; $fmetric['Flags'] |= 64;
} }
preg_match('#/UnderlinePosition[\s]*([0-9\+\-]*)#', $font, $matches); preg_match('#/UnderlinePosition[\s]*+([0-9\+\-]*+)#', $font, $matches);
$fmetric['underlinePosition'] = intval($matches[1]); $fmetric['underlinePosition'] = intval($matches[1]);
preg_match('#/UnderlineThickness[\s]*([0-9\+\-]*)#', $font, $matches); preg_match('#/UnderlineThickness[\s]*+([0-9\+\-]*+)#', $font, $matches);
$fmetric['underlineThickness'] = intval($matches[1]); $fmetric['underlineThickness'] = intval($matches[1]);
preg_match('#/isFixedPitch[\s]*([^\s]*)#', $font, $matches); preg_match('#/isFixedPitch[\s]*+([^\s]*+)#', $font, $matches);
if ($matches[1] == 'true') { if ($matches[1] == 'true') {
$fmetric['Flags'] |= 1; $fmetric['Flags'] |= 1;
} }
// get internal map // get internal map
$imap = array(); $imap = array();
if (preg_match_all('#dup[\s]([0-9]+)[\s]*/([^\s]*)[\s]put#sU', $font, $fmap, PREG_SET_ORDER) > 0) { if (preg_match_all('#dup[\s]([0-9]+)[\s]*+/([^\s]*+)[\s]put#sU', $font, $fmap, PREG_SET_ORDER) > 0) {
foreach ($fmap as $v) { foreach ($fmap as $v) {
$imap[$v[2]] = $v[1]; $imap[$v[2]] = $v[1];
} }
@ -229,22 +230,22 @@ class TCPDF_FONTS {
$eplain .= chr($chr ^ ($r >> 8)); $eplain .= chr($chr ^ ($r >> 8));
$r = ((($chr + $r) * $c1 + $c2) % 65536); $r = ((($chr + $r) * $c1 + $c2) % 65536);
} }
if (preg_match('#/ForceBold[\s]*([^\s]*)#', $eplain, $matches) > 0) { if (preg_match('#/ForceBold[\s]*+([^\s]*+)#', $eplain, $matches) > 0) {
if ($matches[1] == 'true') { if ($matches[1] == 'true') {
$fmetric['Flags'] |= 0x40000; $fmetric['Flags'] |= 0x40000;
} }
} }
if (preg_match('#/StdVW[\s]*\[([^\]]*)#', $eplain, $matches) > 0) { if (preg_match('#/StdVW[\s]*+\[([^\]]*+)#', $eplain, $matches) > 0) {
$fmetric['StemV'] = intval($matches[1]); $fmetric['StemV'] = intval($matches[1]);
} else { } else {
$fmetric['StemV'] = 70; $fmetric['StemV'] = 70;
} }
if (preg_match('#/StdHW[\s]*\[([^\]]*)#', $eplain, $matches) > 0) { if (preg_match('#/StdHW[\s]*+\[([^\]]*+)#', $eplain, $matches) > 0) {
$fmetric['StemH'] = intval($matches[1]); $fmetric['StemH'] = intval($matches[1]);
} else { } else {
$fmetric['StemH'] = 30; $fmetric['StemH'] = 30;
} }
if (preg_match('#/BlueValues[\s]*\[([^\]]*)#', $eplain, $matches) > 0) { if (preg_match('#/BlueValues[\s]*+\[([^\]]*+)#', $eplain, $matches) > 0) {
$bv = explode(' ', $matches[1]); $bv = explode(' ', $matches[1]);
if (count($bv) >= 6) { if (count($bv) >= 6) {
$v1 = intval($bv[2]); $v1 = intval($bv[2]);
@ -265,7 +266,7 @@ class TCPDF_FONTS {
$fmetric['CapHeight'] = 700; $fmetric['CapHeight'] = 700;
} }
// get the number of random bytes at the beginning of charstrings // get the number of random bytes at the beginning of charstrings
if (preg_match('#/lenIV[\s]*([0-9]*)#', $eplain, $matches) > 0) { if (preg_match('#/lenIV[\s]*+([\d]*+)#', $eplain, $matches) > 0) {
$lenIV = intval($matches[1]); $lenIV = intval($matches[1]);
} else { } else {
$lenIV = 4; $lenIV = 4;
@ -273,7 +274,7 @@ class TCPDF_FONTS {
$fmetric['Leading'] = 0; $fmetric['Leading'] = 0;
// get charstring data // get charstring data
$eplain = substr($eplain, (strpos($eplain, '/CharStrings') + 1)); $eplain = substr($eplain, (strpos($eplain, '/CharStrings') + 1));
preg_match_all('#/([A-Za-z0-9\.]*)[\s][0-9]+[\s]RD[\s](.*)[\s]ND#sU', $eplain, $matches, PREG_SET_ORDER); preg_match_all('#/([A-Za-z0-9\.]*+)[\s][0-9]+[\s]RD[\s](.*)[\s]ND#sU', $eplain, $matches, PREG_SET_ORDER);
if (!empty($enc) AND isset(TCPDF_FONT_DATA::$encmap[$enc])) { if (!empty($enc) AND isset(TCPDF_FONT_DATA::$encmap[$enc])) {
$enc_map = TCPDF_FONT_DATA::$encmap[$enc]; $enc_map = TCPDF_FONT_DATA::$encmap[$enc];
} else { } else {