Merge pull request #4093 from yurydelendik/issue4068
Fixes fips regression from #4068
This commit is contained in:
commit
455265474a
@ -986,10 +986,10 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
|||||||
Encodings.WinAnsiEncoding :
|
Encodings.WinAnsiEncoding :
|
||||||
Encodings.StandardEncoding;
|
Encodings.StandardEncoding;
|
||||||
// The Symbolic attribute can be misused for regular fonts
|
// The Symbolic attribute can be misused for regular fonts
|
||||||
// Heuristic: we have to check if the font is a standard one or
|
// Heuristic: we have to check if the font is a standard one and has
|
||||||
// toUnicode is provided
|
// Symbolic font name
|
||||||
if (!!(flags & FontFlags.Symbolic)) {
|
if (!!(flags & FontFlags.Symbolic)) {
|
||||||
baseEncoding = !properties.file && !properties.toUnicode ?
|
baseEncoding = !properties.file && /Symbol/i.test(properties.name) ?
|
||||||
Encodings.SymbolSetEncoding : Encodings.MacRomanEncoding;
|
Encodings.SymbolSetEncoding : Encodings.MacRomanEncoding;
|
||||||
}
|
}
|
||||||
if (dict.has('Encoding')) {
|
if (dict.has('Encoding')) {
|
||||||
@ -1258,6 +1258,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
|||||||
|
|
||||||
var properties = {
|
var properties = {
|
||||||
type: type.name,
|
type: type.name,
|
||||||
|
name: baseFontName,
|
||||||
widths: metrics.widths,
|
widths: metrics.widths,
|
||||||
defaultWidth: metrics.defaultWidth,
|
defaultWidth: metrics.defaultWidth,
|
||||||
flags: flags,
|
flags: flags,
|
||||||
@ -1316,6 +1317,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
|||||||
|
|
||||||
var properties = {
|
var properties = {
|
||||||
type: type.name,
|
type: type.name,
|
||||||
|
name: fontName.name,
|
||||||
subtype: subtype,
|
subtype: subtype,
|
||||||
file: fontFile,
|
file: fontFile,
|
||||||
length1: length1,
|
length1: length1,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user