mirror of
https://github.com/vdm-io/tcpdf.git
synced 2024-12-01 16:43:53 +00:00
5.9.068
This commit is contained in:
parent
b52780fe62
commit
5828c0d805
26
tcpdf.php
26
tcpdf.php
@ -4891,8 +4891,22 @@ class TCPDF {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
++$this->numfonts;
|
++$this->numfonts;
|
||||||
|
if ($type == 'core') {
|
||||||
|
$name = $this->CoreFonts[$fontkey];
|
||||||
|
$subset = false;
|
||||||
|
} elseif (($type == 'TrueType') OR ($type == 'Type1')) {
|
||||||
|
$subset = false;
|
||||||
|
} elseif ($type == 'TrueTypeUnicode') {
|
||||||
|
$enc = 'Identity-H';
|
||||||
|
} elseif ($type != 'cidfont0') {
|
||||||
|
$this->Error('Unknow font type: '.$type.'');
|
||||||
|
}
|
||||||
|
// set name if unset
|
||||||
|
if (!isset($name) OR empty($name)) {
|
||||||
|
$name = $fontkey;
|
||||||
|
}
|
||||||
// create artificial font style variations if missing (only works with non-embedded fonts)
|
// create artificial font style variations if missing (only works with non-embedded fonts)
|
||||||
if ($missing_style) {
|
if (($type != 'core') AND $missing_style) {
|
||||||
// style variations
|
// style variations
|
||||||
$styles = array('' => '', 'B' => ',Bold', 'I' => ',Italic', 'BI' => ',BoldItalic');
|
$styles = array('' => '', 'B' => ',Bold', 'I' => ',Italic', 'BI' => ',BoldItalic');
|
||||||
$name .= $styles[$bistyle];
|
$name .= $styles[$bistyle];
|
||||||
@ -4918,16 +4932,6 @@ class TCPDF {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($type == 'core') {
|
|
||||||
$name = $this->CoreFonts[$fontkey];
|
|
||||||
$subset = false;
|
|
||||||
} elseif (($type == 'TrueType') OR ($type == 'Type1')) {
|
|
||||||
$subset = false;
|
|
||||||
} elseif ($type == 'TrueTypeUnicode') {
|
|
||||||
$enc = 'Identity-H';
|
|
||||||
} elseif ($type != 'cidfont0') {
|
|
||||||
$this->Error('Unknow font type: '.$type.'');
|
|
||||||
}
|
|
||||||
// initialize subsetchars to contain default ASCII values (0-255)
|
// initialize subsetchars to contain default ASCII values (0-255)
|
||||||
$subsetchars = array_fill(0, 256, true);
|
$subsetchars = array_fill(0, 256, true);
|
||||||
$this->setFontBuffer($fontkey, array('fontkey' => $fontkey, 'i' => $this->numfonts, 'type' => $type, 'name' => $name, 'desc' => $desc, 'up' => $up, 'ut' => $ut, 'cw' => $cw, 'dw' => $dw, 'enc' => $enc, 'cidinfo' => $cidinfo, 'file' => $file, 'ctg' => $ctg, 'subset' => $subset, 'subsetchars' => $subsetchars));
|
$this->setFontBuffer($fontkey, array('fontkey' => $fontkey, 'i' => $this->numfonts, 'type' => $type, 'name' => $name, 'desc' => $desc, 'up' => $up, 'ut' => $ut, 'cw' => $cw, 'dw' => $dw, 'enc' => $enc, 'cidinfo' => $cidinfo, 'file' => $file, 'ctg' => $ctg, 'subset' => $subset, 'subsetchars' => $subsetchars));
|
||||||
|
Loading…
Reference in New Issue
Block a user