Lazify Metrics

This commit is contained in:
Yury Delendik 2016-01-21 16:29:05 -06:00
parent 55a201d92d
commit 1de90454b7
2 changed files with 2947 additions and 2945 deletions

View File

@ -89,7 +89,7 @@ var Pattern = corePattern.Pattern;
var getTilingPatternIR = corePattern.getTilingPatternIR; var getTilingPatternIR = corePattern.getTilingPatternIR;
var CMapFactory = coreCMap.CMapFactory; var CMapFactory = coreCMap.CMapFactory;
var IdentityCMap = coreCMap.IdentityCMap; var IdentityCMap = coreCMap.IdentityCMap;
var Metrics = coreMetrics.Metrics; var getMetrics = coreMetrics.getMetrics;
var bidi = coreBidi.bidi; var bidi = coreBidi.bidi;
var WinAnsiEncoding = coreEncodings.WinAnsiEncoding; var WinAnsiEncoding = coreEncodings.WinAnsiEncoding;
var StandardEncoding = coreEncodings.StandardEncoding; var StandardEncoding = coreEncodings.StandardEncoding;
@ -1784,6 +1784,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
var monospace = false; var monospace = false;
var stdFontMap = getStdFontMap(); var stdFontMap = getStdFontMap();
var lookupName = (stdFontMap[name] || name); var lookupName = (stdFontMap[name] || name);
var Metrics = getMetrics();
if (!(lookupName in Metrics)) { if (!(lookupName in Metrics)) {
// Use default fonts for looking up font metrics if the passed // Use default fonts for looking up font metrics if the passed
@ -1800,7 +1801,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
defaultWidth = glyphWidths; defaultWidth = glyphWidths;
monospace = true; monospace = true;
} else { } else {
widths = glyphWidths; widths = glyphWidths(); // expand lazy widths array
} }
return { return {

File diff suppressed because it is too large Load Diff