Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
618 changes: 595 additions & 23 deletions build/pdfmake.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/pdfmake.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/pdfmake.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/pdfmake.min.js.map

Large diffs are not rendered by default.

11 changes: 10 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pdfmake",
"version": "0.2.0",
"version": "0.2.1-fork207B",
"description": "Client/server side PDF printing in pure JavaScript",
"main": "src/printer.js",
"browser": "build/pdfmake.js",
Expand Down Expand Up @@ -42,6 +42,15 @@
"webpack": "^5.42.0",
"webpack-cli": "^4.7.2"
},
"files": [
"build/*.js*",
"src",
"build-vfs.js",
"CHANGELOG.md",
"LICENSE",
"package.json",
"README.md"
],
"engines": {
"node": ">=12"
},
Expand Down
8 changes: 7 additions & 1 deletion src/layoutBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,13 @@ LayoutBuilder.prototype.processNode = function (node) {
}

if (unbreakable) {
self.writer.commitUnbreakableBlock();
try {
self.writer.commitUnbreakableBlock();
} catch (e) {
e.node = node;
throw e;
}

}
});

Expand Down
10 changes: 6 additions & 4 deletions src/pageElementWriter.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ function fitOnPage(self, addFct) {
if (!position) {
self.moveToNextPage();
position = addFct(self);
if (!position) {
throw new Error('unable to add it to page');
}
}
return position;
}
Expand Down Expand Up @@ -69,10 +72,9 @@ PageElementWriter.prototype.alignCanvas = function (node) {
};

PageElementWriter.prototype.addFragment = function (fragment, useBlockXOffset, useBlockYOffset, dontUpdateContextPosition) {
if (!this.writer.addFragment(fragment, useBlockXOffset, useBlockYOffset, dontUpdateContextPosition)) {
this.moveToNextPage();
this.writer.addFragment(fragment, useBlockXOffset, useBlockYOffset, dontUpdateContextPosition);
}
fitOnPage(this, function (self) {
return self.writer.addFragment(fragment, useBlockXOffset, useBlockYOffset, dontUpdateContextPosition);
});
};

PageElementWriter.prototype.moveToNextPage = function (pageOrientation) {
Expand Down
8 changes: 8 additions & 0 deletions tests/pageElementWriter.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,14 @@ describe('PageElementWriter', function () {
assert.deepEqual(position, { pageNumber: 2, left: MARGINS.left, top: MARGINS.top, verticalRatio: 0, horizontalRatio: 0, pageOrientation: 'portrait', pageInnerHeight: 1000, pageInnerWidth: 500 });
});

it('should throw an error if not fit in page', function () {
var lineHeight = 1800;

assert.throws(() => {
pew.addLine(buildLine(lineHeight));
});
});

it('should write into the current page if it\'s a large image and nothing else exists on the page', function () {
var position = pew.addImage(buildImage(2000));

Expand Down