Merge pull request #660 from notmasteryet/tree-33

Fixing #650 regression

fonts.js

@@ -441,7 +441,7 @@ var Font = (function Font() {
     if (!file) {
       // The file data is not specified. Trying to fix the font name
       // to be used with the canvas.font.
-      var fontName = name.replace(/,_/g, '-');
+      var fontName = name.replace(/[,_]/g, '-');
       fontName = stdFontMap[fontName] || fontName;
 
       this.bold = (fontName.search(/bold/gi) != -1);

pdf.js

@@ -4791,7 +4791,7 @@ var PartialEvaluator = (function partialEvaluator() {
             return null;
 
           // Using base font name as a font name.
-          baseFontName = baseFontName.name.replace(/,_/g, '-');
+          baseFontName = baseFontName.name.replace(/[,_]/g, '-');
           var metricsAndMap = this.getBaseFontMetricsAndMap(baseFontName);
 
           var properties = {

test/test_manifest.json

@@ -155,7 +155,7 @@
        "file": "pdfs/fips197.pdf",
        "link": true,
        "rounds": 1,
-       "type": "load"
+       "type": "eq"
     },
     {  "id": "txt2pdf",
        "file": "pdfs/txt2pdf.pdf",