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

Merge pull request #650 from notmasteryet/issue-649

Browse Source 
Fixing standard font name resolution (#649)
This commit is contained in:
Artur Adib 2011-10-12 07:17:21 -07:00
commit 924a6c52cb
4 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
fonts.js
View File

@ -26,53 +26,53 @@ var kHintingEnabled = false;
*/ */
var stdFontMap = { var stdFontMap = {
'ArialNarrow': 'Helvetica', 'ArialNarrow': 'Helvetica',
'ArialNarrow_Bold': 'Helvetica-Bold', 'ArialNarrow-Bold': 'Helvetica-Bold',
'ArialNarrow_BoldItalic': 'Helvetica-BoldOblique', 'ArialNarrow-BoldItalic': 'Helvetica-BoldOblique',
'ArialNarrow_Italic': 'Helvetica-Oblique', 'ArialNarrow-Italic': 'Helvetica-Oblique',
'ArialBlack': 'Helvetica', 'ArialBlack': 'Helvetica',
'ArialBlack_Bold': 'Helvetica-Bold', 'ArialBlack-Bold': 'Helvetica-Bold',
'ArialBlack_BoldItalic': 'Helvetica-BoldOblique', 'ArialBlack-BoldItalic': 'Helvetica-BoldOblique',
'ArialBlack_Italic': 'Helvetica-Oblique', 'ArialBlack-Italic': 'Helvetica-Oblique',
'Arial': 'Helvetica', 'Arial': 'Helvetica',
'Arial_Bold': 'Helvetica-Bold', 'Arial-Bold': 'Helvetica-Bold',
'Arial_BoldItalic': 'Helvetica-BoldOblique', 'Arial-BoldItalic': 'Helvetica-BoldOblique',
'Arial_Italic': 'Helvetica-Oblique', 'Arial-Italic': 'Helvetica-Oblique',
'Arial_BoldItalicMT': 'Helvetica-BoldOblique', 'Arial-BoldItalicMT': 'Helvetica-BoldOblique',
'Arial_BoldMT': 'Helvetica-Bold', 'Arial-BoldMT': 'Helvetica-Bold',
'Arial_ItalicMT': 'Helvetica-Oblique', 'Arial-ItalicMT': 'Helvetica-Oblique',
'ArialMT': 'Helvetica', 'ArialMT': 'Helvetica',
'Courier_Bold': 'Courier-Bold', 'Courier-Bold': 'Courier-Bold',
'Courier_BoldItalic': 'Courier-BoldOblique', 'Courier-BoldItalic': 'Courier-BoldOblique',
'Courier_Italic': 'Courier-Oblique', 'Courier-Italic': 'Courier-Oblique',
'CourierNew': 'Courier', 'CourierNew': 'Courier',
'CourierNew_Bold': 'Courier-Bold', 'CourierNew-Bold': 'Courier-Bold',
'CourierNew_BoldItalic': 'Courier-BoldOblique', 'CourierNew-BoldItalic': 'Courier-BoldOblique',
'CourierNew_Italic': 'Courier-Oblique', 'CourierNew-Italic': 'Courier-Oblique',
'CourierNewPS_BoldItalicMT': 'Courier-BoldOblique', 'CourierNewPS-BoldItalicMT': 'Courier-BoldOblique',
'CourierNewPS_BoldMT': 'Courier-Bold', 'CourierNewPS-BoldMT': 'Courier-Bold',
'CourierNewPS_ItalicMT': 'Courier-Oblique', 'CourierNewPS-ItalicMT': 'Courier-Oblique',
'CourierNewPSMT': 'Courier', 'CourierNewPSMT': 'Courier',
'Helvetica_Bold': 'Helvetica-Bold', 'Helvetica-Bold': 'Helvetica-Bold',
'Helvetica_BoldItalic': 'Helvetica-BoldOblique', 'Helvetica-BoldItalic': 'Helvetica-BoldOblique',
'Helvetica_Italic': 'Helvetica-Oblique', 'Helvetica-Italic': 'Helvetica-Oblique',
'Symbol_Bold': 'Symbol', 'Symbol-Bold': 'Symbol',
'Symbol_BoldItalic': 'Symbol', 'Symbol-BoldItalic': 'Symbol',
'Symbol_Italic': 'Symbol', 'Symbol-Italic': 'Symbol',
'TimesNewRoman': 'Times-Roman', 'TimesNewRoman': 'Times-Roman',
'TimesNewRoman_Bold': 'Times-Bold', 'TimesNewRoman-Bold': 'Times-Bold',
'TimesNewRoman_BoldItalic': 'Times-BoldItalic', 'TimesNewRoman-BoldItalic': 'Times-BoldItalic',
'TimesNewRoman_Italic': 'Times-Italic', 'TimesNewRoman-Italic': 'Times-Italic',
'TimesNewRomanPS': 'Times-Roman', 'TimesNewRomanPS': 'Times-Roman',
'TimesNewRomanPS_Bold': 'Times-Bold', 'TimesNewRomanPS-Bold': 'Times-Bold',
'TimesNewRomanPS_BoldItalic': 'Times-BoldItalic', 'TimesNewRomanPS-BoldItalic': 'Times-BoldItalic',
'TimesNewRomanPS_BoldItalicMT': 'Times-BoldItalic', 'TimesNewRomanPS-BoldItalicMT': 'Times-BoldItalic',
'TimesNewRomanPS_BoldMT': 'Times-Bold', 'TimesNewRomanPS-BoldMT': 'Times-Bold',
'TimesNewRomanPS_Italic': 'Times-Italic', 'TimesNewRomanPS-Italic': 'Times-Italic',
'TimesNewRomanPS_ItalicMT': 'Times-Italic', 'TimesNewRomanPS-ItalicMT': 'Times-Italic',
'TimesNewRomanPSMT': 'Times-Roman', 'TimesNewRomanPSMT': 'Times-Roman',
'TimesNewRomanPSMT_Bold': 'Times-Bold', 'TimesNewRomanPSMT-Bold': 'Times-Bold',
'TimesNewRomanPSMT_BoldItalic': 'Times-BoldItalic', 'TimesNewRomanPSMT-BoldItalic': 'Times-BoldItalic',
'TimesNewRomanPSMT_Italic': 'Times-Italic' 'TimesNewRomanPSMT-Italic': 'Times-Italic'
}; };
var serifFonts = { var serifFonts = {
@ -441,7 +441,9 @@ var Font = (function Font() {
if (!file) { if (!file) {
// The file data is not specified. Trying to fix the font name // The file data is not specified. Trying to fix the font name
// to be used with the canvas.font. // to be used with the canvas.font.
var fontName = stdFontMap[name] || name.replace('_', '-'); var fontName = name.replace(/,_/g, '-');
fontName = stdFontMap[fontName] || fontName;
this.bold = (fontName.search(/bold/gi) != -1); this.bold = (fontName.search(/bold/gi) != -1);
this.italic = (fontName.search(/oblique/gi) != -1) || this.italic = (fontName.search(/oblique/gi) != -1) ||
(fontName.search(/italic/gi) != -1); (fontName.search(/italic/gi) != -1);

2
pdf.js
View File

@ -4783,7 +4783,7 @@ var PartialEvaluator = (function partialEvaluator() {
return null; return null;
// 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 metricsAndMap = this.getBaseFontMetricsAndMap(baseFontName); var metricsAndMap = this.getBaseFontMetricsAndMap(baseFontName);
var properties = { var properties = {

1
test/pdfs/pal-o47.pdf.link Normal file
View File

@ -0,0 +1 @@
http://www1.cpdl.org/wiki/images/sheet/pal-o47.pdf

6
test/test_manifest.json
View File

@ -199,6 +199,12 @@
"rounds": 1, "rounds": 1,
"type": "eq" "type": "eq"
}, },
{ "id": "pal-o47",
"file": "pdfs/pal-o47.pdf",
"link": true,
"rounds": 1,
"type": "eq"
},
{ "id": "simpletype3font", { "id": "simpletype3font",
"file": "pdfs/simpletype3font.pdf", "file": "pdfs/simpletype3font.pdf",
"link": false, "link": false,