Merge branch 'master' into font

diff --cc fonts.js
index ec510a7d129f8e285cb0446d70ba795ecada469a,f33cab9c366071eafe053b5ccb393923962424e3..57e974e12ad7b5cef4ff7f126c87aa63d1422f37
--- 1/fonts.js
--- 2/fonts.js
+++ b/fonts.js
@@@ -416,11 -379,9 +385,10 @@@ var Font = (function() 
          warn('Font ' + properties.type + ' is not supported');
          break;
      }
 +
      this.data = data;
      this.type = properties.type;
-     this.id = Fonts.registerFont(name, data, properties);
-     this.loadedName = 'pdfFont' + this.id;
+     this.loadedName = getUniqueName();
      this.compositeFont = properties.compositeFont;
    };
  

diff --cc pdf.js
Simple merge