Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing getBaseFontMetricsAndMap function name

Browse Source
This commit is contained in:
notmasteryet 2011-09-21 21:53:36 -05:00
parent ed21c8590c
commit fc5ae0f875
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pdf.js
View File

@ -4490,9 +4490,9 @@ var PartialEvaluator = (function partialEvaluator() {
return glyphs; return glyphs;
}, },
getBaseFontMetrics: function(baseFontName) { getBaseFontMetricsAndMap: function getBaseFontMetricsAndMap(name) {
var map = {}; var map = {};
if (/^Symbol(-?(Bold|Italic))*$/.test(baseFontName)) { if (/^Symbol(-?(Bold|Italic))*$/.test(name)) {
// special case for symbols // special case for symbols
var encoding = Encodings.symbolsEncoding; var encoding = Encodings.symbolsEncoding;
for (var i = 0, n = encoding.length, j; i < n; i++) { for (var i = 0, n = encoding.length, j; i < n; i++) {
@ -4503,7 +4503,7 @@ var PartialEvaluator = (function partialEvaluator() {
} }
var defaultWidth = 0; var defaultWidth = 0;
var widths = Metrics[stdFontMap[baseFontName] || baseFontName]; var widths = Metrics[stdFontMap[name] || name];
if (IsNum(widths)) { if (IsNum(widths)) {
defaultWidth = widths; defaultWidth = widths;
widths = null; widths = null;
@ -4553,14 +4553,14 @@ var PartialEvaluator = (function partialEvaluator() {
// Using base font name as a font name. // Using base font name as a font name.
baseFontName = baseFontName.name.replace(/,/g, '_'); baseFontName = baseFontName.name.replace(/,/g, '_');
var metrics = this.getBaseFontMetrics(baseFontName); var metricsAndMap = this.getBaseFontMetricsAndMap(baseFontName);
var properties = { var properties = {
type: type.name, type: type.name,
encoding: metrics.map, encoding: metricsAndMap.map,
differences: [], differences: [],
widths: metrics.widths, widths: metricsAndMap.widths,
defaultWidth: metrics.defaultWidth, defaultWidth: metricsAndMap.defaultWidth,
firstChar: 0, firstChar: 0,
lastChar: 256 lastChar: 256
}; };
@ -4592,11 +4592,11 @@ var PartialEvaluator = (function partialEvaluator() {
// Trying get the BaseFont metrics (see comment above). // Trying get the BaseFont metrics (see comment above).
var baseFontName = dict.get('BaseFont'); var baseFontName = dict.get('BaseFont');
if (IsName(baseFontName)) { if (IsName(baseFontName)) {
var metrics = this.getBaseFontMetrics(baseFontName.name); var metricsAndMap = this.getBaseFontMetricsAndMap(baseFontName.name);
glyphWidths = metrics.widths; glyphWidths = metricsAndMap.widths;
defaultWidth = metrics.defaultWidth; defaultWidth = metricsAndMap.defaultWidth;
encoding = metrics.map; encoding = metricsAndMap.map;
} }
} }