Merge pull request #660 from notmasteryet/tree-33
Fixing #650 regression
This commit is contained in:
commit
e971e9e192
2
fonts.js
2
fonts.js
@ -441,7 +441,7 @@ 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 = name.replace(/,_/g, '-');
|
var fontName = name.replace(/[,_]/g, '-');
|
||||||
fontName = stdFontMap[fontName] || fontName;
|
fontName = stdFontMap[fontName] || fontName;
|
||||||
|
|
||||||
this.bold = (fontName.search(/bold/gi) != -1);
|
this.bold = (fontName.search(/bold/gi) != -1);
|
||||||
|
2
pdf.js
2
pdf.js
@ -4791,7 +4791,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 = {
|
||||||
|
@ -155,7 +155,7 @@
|
|||||||
"file": "pdfs/fips197.pdf",
|
"file": "pdfs/fips197.pdf",
|
||||||
"link": true,
|
"link": true,
|
||||||
"rounds": 1,
|
"rounds": 1,
|
||||||
"type": "load"
|
"type": "eq"
|
||||||
},
|
},
|
||||||
{ "id": "txt2pdf",
|
{ "id": "txt2pdf",
|
||||||
"file": "pdfs/txt2pdf.pdf",
|
"file": "pdfs/txt2pdf.pdf",
|
||||||
|
Loading…
Reference in New Issue
Block a user