@@ -16586,8 +16586,7 @@ By Devon Govett
16586
16586
}).call(this,_dereq_("buffer").Buffer)
16587
16587
},{"./object":63,"buffer":16,"zlib":15}],67:[function(_dereq_,module,exports){
16588
16588
// Generated by CoffeeScript 1.7.1
16589
- var UnicodeTrie,
16590
- __slice = [].slice;
16589
+ var UnicodeTrie;
16591
16590
16592
16591
UnicodeTrie = (function() {
16593
16592
var DATA_BLOCK_LENGTH, DATA_GRANULARITY, DATA_MASK, INDEX_1_OFFSET, INDEX_2_BLOCK_LENGTH, INDEX_2_BMP_LENGTH, INDEX_2_MASK, INDEX_SHIFT, LSCP_INDEX_2_LENGTH, LSCP_INDEX_2_OFFSET, OMITTED_BMP_INDEX_1_LENGTH, SHIFT_1, SHIFT_1_2, SHIFT_2, UTF8_2B_INDEX_2_LENGTH, UTF8_2B_INDEX_2_OFFSET;
@@ -16656,16 +16655,6 @@ UnicodeTrie = (function() {
16656
16655
return this.data[this.data.length - DATA_GRANULARITY];
16657
16656
};
16658
16657
16659
- UnicodeTrie.prototype.toJSON = function() {
16660
- var res;
16661
- res = {
16662
- data: __slice.call(this.data),
16663
- highStart: this.highStart,
16664
- errorValue: this.errorValue
16665
- };
16666
- return res;
16667
- };
16668
-
16669
16658
return UnicodeTrie;
16670
16659
16671
16660
})();
@@ -17434,7 +17423,8 @@ function buildColumnWidths(columns, availableWidth) {
17434
17423
starColumns = [],
17435
17424
starMaxMin = 0,
17436
17425
starMaxMax = 0,
17437
- fixedColumns = [];
17426
+ fixedColumns = [],
17427
+ initial_availableWidth = availableWidth;
17438
17428
17439
17429
columns.forEach(function(column) {
17440
17430
if (isAutoColumn(column)) {
@@ -17451,6 +17441,10 @@ function buildColumnWidths(columns, availableWidth) {
17451
17441
});
17452
17442
17453
17443
fixedColumns.forEach(function(col) {
17444
+ // width specified as %
17445
+ if (typeof col.width === 'string' && /\d+%/.test(col.width) ) {
17446
+ col.width = parseFloat(col.width)*initial_availableWidth/100;
17447
+ }
17454
17448
if (col.width < (col._minWidth) && col.elasticWidth) {
17455
17449
col._calcWidth = col._minWidth;
17456
17450
} else {
@@ -19636,7 +19630,7 @@ FontProvider.prototype.provideFont = function(familyName, bold, italics) {
19636
19630
if (cached) return cached;
19637
19631
19638
19632
var fontCache = (this.cache[familyName] = this.cache[familyName] || {});
19639
- fontCache[type] = this.pdfDoc.font(this.fonts[familyName][type])._font;
19633
+ fontCache[type] = this.pdfDoc.font(this.fonts[familyName][type], familyName )._font;
19640
19634
return fontCache[type];
19641
19635
};
19642
19636
0 commit comments