Skip to content

Jspdf/boxes #2155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 19, 2018
Merged

Jspdf/boxes #2155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
203f51f
Update jspdf.js
Uzlopak Dec 18, 2018
61c79f7
Update jspdf.js
Uzlopak Dec 18, 2018
8be7f65
Update jspdf.unit.spec.js
Uzlopak Dec 19, 2018
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
77 changes: 51 additions & 26 deletions src/jspdf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,21 +813,37 @@ var jsPDF = (function (global) {
};

var putPage = API.__private__.putPage = function (page) {
var dimensions = page.dimensions;
var mediaBox = page.mediaBox;
var pageNumber = page.number;
var data = page.data;
var pageObjectNumber = page.objId;
var pageContentsObjId = page.contentsObjId;

newObjectDeferredBegin(pageObjectNumber, true);
var wPt = dimensions.width;
var hPt = dimensions.height;
var wPt = pagesContext[currentPage].mediaBox.topRightX - pagesContext[currentPage].mediaBox.bottomLeftX;
var hPt = pagesContext[currentPage].mediaBox.topRightY - pagesContext[currentPage].mediaBox.bottomLeftY;
out('<</Type /Page');
out('/Parent ' + page.rootDictionaryObjId + ' 0 R');
out('/Resources ' + page.resourceDictionaryObjId + ' 0 R');
out('/MediaBox [0 0 ' + f2(wPt) + ' ' + f2(hPt) + ']');
if (typeof dimensions.userUnit === "number" && dimensions.userUnit !== 1.0) {
out('/UserUnit ' + dimensions.userUnit);
out('/MediaBox [' + parseFloat(f2(page.mediaBox.bottomLeftX)) + ' ' + parseFloat(f2(page.mediaBox.bottomLeftY)) + ' ' + f2(pagesContext[currentPage].mediaBox.topRightX) + ' ' + f2(pagesContext[currentPage].mediaBox.topRightY) + ']');
if (page.cropBox !== null) {
out('/CropBox [' + f2(page.cropBox.bottomLeftX) + ' ' + f2(page.cropBox.bottomLeftY) + ' ' + f2(page.cropBox.topRightX) + ' ' + f2(page.cropBox.topRightY) + ']');
}

if (page.bleedBox !== null) {
out('/BleedBox [' + f2(page.bleedBox.bottomLeftX) + ' ' + f2(page.bleedBox.bottomLeftY) + ' ' + f2(page.bleedBox.topRightX) + ' ' + f2(page.bleedBox.topRightY) + ']');
}

if (page.trimBox !== null) {
out('/TrimBox [' + f2(page.trimBox.bottomLeftX) + ' ' + f2(page.trimBox.bottomLeftY) + ' ' + f2(page.trimBox.topRightX) + ' ' + f2(page.trimBox.topRightY) + ']');
}

if (page.artBox !== null) {
out('/ArtBox [' + f2(page.artBox.bottomLeftX) + ' ' + f2(page.artBox.bottomLeftY) + ' ' + f2(page.artBox.topRightX) + ' ' + f2(page.artBox.topRightY) + ']');
}

if (typeof page.userUnit === "number" && page.userUnit !== 1.0) {
out('/UserUnit ' + page.userUnit);
}

events.publish('putPage', {
Expand Down Expand Up @@ -863,7 +879,12 @@ var jsPDF = (function (global) {
data: pages[n],
objId: pagesContext[n].objId,
contentsObjId: pagesContext[n].contentsObjId,
dimensions: pagesContext[n].dimensions,
mediaBox: pagesContext[n].mediaBox,
cropBox: pagesContext[n].cropBox,
bleedBox: pagesContext[n].bleedBox,
trimBox: pagesContext[n].trimBox,
artBox: pagesContext[n].artBox,
userUnit: pagesContext[n].userUnit,
rootDictionaryObjId: rootDictionaryObjId,
resourceDictionaryObjId: resourceDictionaryObjId
}));
Expand Down Expand Up @@ -1234,10 +1255,16 @@ var jsPDF = (function (global) {
pagesContext[page] = {
objId: 0,
contentsObjId: 0,
dimensions: {
width: Number(width),
height: Number(height),
userUnit : Number(userUnit)
userUnit : Number(userUnit),
artBox: null,
bleedBox: null,
cropBox: null,
trimBox: null,
mediaBox: {
bottomLeftX: 0,
bottomLeftY: 0,
topRightX: Number(width),
topRightY: Number(height)
}
};
_setPage(page);
Expand Down Expand Up @@ -1274,12 +1301,10 @@ var jsPDF = (function (global) {
var _setPage = function (n) {
if (n > 0 && n <= page) {
currentPage = n;
pagesContext[currentPage].dimensions.width;
pagesContext[currentPage].dimensions.height;
}
};

var getNumberOfPages = API.__private__.getNumberOfPages = function () {
var getNumberOfPages = API.__private__.getNumberOfPages = API.getNumberOfPages = function () {
return pages.length - 1;
}
/**
Expand Down Expand Up @@ -1587,7 +1612,7 @@ var jsPDF = (function (global) {

//---------------------------------------
// Public API

var getPageInfo = API.__private__.getPageInfo = function (pageNumberOneBased) {
if (isNaN(pageNumberOneBased) || (pageNumberOneBased % 1 !== 0)) {
throw new Error('Invalid argument passed to jsPDF.getPageInfo');
Expand All @@ -1599,7 +1624,7 @@ var jsPDF = (function (global) {
pageContext: pagesContext[pageNumberOneBased]
};
};

var getPageInfoByObjId = API.__private__.getPageInfoByObjId = function (objId) {
var pageNumberWithObjId;
for (var pageNumber in pagesContext) {
Expand Down Expand Up @@ -2782,15 +2807,15 @@ var jsPDF = (function (global) {
};

var getVerticalCoordinate = API.__private__.getVerticalCoordinate = function (value) {
return pagesContext[currentPage].dimensions.height - (value * k);
return pagesContext[currentPage].mediaBox.topRightY - pagesContext[currentPage].mediaBox.bottomLeftY - (value * k);
};

var getHorizontalCoordinateString = API.__private__.getHorizontalCoordinateString = function (value) {
return f2(value * k);
};

var getVerticalCoordinateString = API.__private__.getVerticalCoordinateString = function (value) {
return f2(pagesContext[currentPage].dimensions.height - (value * k));
return f2(pagesContext[currentPage].mediaBox.topRightY - pagesContext[currentPage].mediaBox.bottomLeftY - (value * k));
};

var strokeColor = options.strokeColor || '0 G';
Expand Down Expand Up @@ -3212,16 +3237,16 @@ var jsPDF = (function (global) {
'scaleFactor': k,
'pageSize': {
getWidth: function () {
return pagesContext[currentPage].dimensions.width / k;
return (pagesContext[currentPage].mediaBox.topRightX - pagesContext[currentPage].mediaBox.bottomLeftX) / k;
},
setWidth: function (value) {
pagesContext[currentPage].dimensions.width = value * k;
pagesContext[currentPage].mediaBox.topRightX = (value * k) + pagesContext[currentPage].mediaBox.bottomLeftX;
},
getHeight: function () {
return pagesContext[currentPage].dimensions.height / k;
return (pagesContext[currentPage].mediaBox.topRightY - pagesContext[currentPage].mediaBox.bottomLeftY) / k;
},
setHeight: function (value) {
pagesContext[currentPage].dimensions.height = value * k;
pagesContext[currentPage].mediaBox.topRightY = (value * k) + pagesContext[currentPage].mediaBox.bottomLeftY;
},
},
'output': output,
Expand All @@ -3239,20 +3264,20 @@ var jsPDF = (function (global) {

Object.defineProperty(API.internal.pageSize, 'width', {
get: function () {
return pagesContext[currentPage].dimensions.width / k;
return (pagesContext[currentPage].mediaBox.topRightX - pagesContext[currentPage].mediaBox.bottomLeftX) / k;
},
set: function (value) {
pagesContext[currentPage].dimensions.width = value * k;
pagesContext[currentPage].mediaBox.topRightX = (value * k) + pagesContext[currentPage].mediaBox.bottomLeftX;
},
enumerable: true,
configurable: true
});
Object.defineProperty(API.internal.pageSize, 'height', {
get: function () {
return pagesContext[currentPage].dimensions.height / k;
return (pagesContext[currentPage].mediaBox.topRightY - pagesContext[currentPage].mediaBox.bottomLeftY) / k;
},
set: function (value) {
pagesContext[currentPage].dimensions.height = value * k;
pagesContext[currentPage].mediaBox.topRightY = (value * k) + pagesContext[currentPage].mediaBox.bottomLeftY;
},
enumerable: true,
configurable: true
Expand Down
25 changes: 6 additions & 19 deletions tests/init/jspdf.unit.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,32 +319,19 @@ describe('jsPDF unit tests', () => {
const doc = jsPDF()
doc.addPage();
doc.addPage();
expect(doc.internal.getPageInfo(1)).toEqual({ objId: 0, pageNumber: 1, pageContext: {dimensions: { width: 595.28, height: 841.89, userUnit: 1.0 }, objId: 0, contentsObjId: 0, annotations: []} });
expect(doc.internal.getPageInfo(2)).toEqual({ objId: 0, pageNumber: 2, pageContext: {dimensions: { width: 595.28, height: 841.89, userUnit: 1.0 }, objId: 0, contentsObjId: 0, annotations: []} });
expect(doc.internal.getPageInfo(3)).toEqual({ objId: 0, pageNumber: 3, pageContext: {dimensions: { width: 595.28, height: 841.89, userUnit: 1.0 }, objId: 0, contentsObjId: 0, annotations: []} });
expect(doc.internal.getPageInfo(1)).toEqual({ objId: 0, pageNumber: 1, pageContext: {mediaBox: { bottomLeftX: 0, bottomLeftY: 0, topRightX: 595.28, topRightY: 841.89 }, artBox: null, bleedBox: null, cropBox: null, trimBox: null, userUnit: 1.0, objId: 0, contentsObjId: 0, annotations: []} });
expect(doc.internal.getPageInfo(2)).toEqual({ objId: 0, pageNumber: 2, pageContext: {mediaBox: { bottomLeftX: 0, bottomLeftY: 0, topRightX: 595.28, topRightY: 841.89 }, artBox: null, bleedBox: null, cropBox: null, trimBox: null, userUnit: 1.0, objId: 0, contentsObjId: 0, annotations: []} });
expect(doc.internal.getPageInfo(3)).toEqual({ objId: 0, pageNumber: 3, pageContext: {mediaBox: { bottomLeftX: 0, bottomLeftY: 0, topRightX: 595.28, topRightY: 841.89 }, artBox: null, bleedBox: null, cropBox: null, trimBox: null, userUnit: 1.0, objId: 0, contentsObjId: 0, annotations: []} });

expect(function() {doc.internal.getPageInfo('invalid');}).toThrow(new Error('Invalid argument passed to jsPDF.getPageInfo'));
expect(function() {doc.internal.getPageInfo(3.14);}).toThrow(new Error('Invalid argument passed to jsPDF.getPageInfo'));
});


it('jsPDF private function getPageInfo', () => {
const doc = jsPDF()
doc.addPage();
doc.addPage();
expect(doc.__private__.getPageInfo(1)).toEqual({ objId: 0, pageNumber: 1, pageContext: {dimensions: { width: 595.28, height: 841.89, userUnit: 1.0 }, objId: 0, contentsObjId: 0, annotations: []} });
expect(doc.__private__.getPageInfo(2)).toEqual({ objId: 0, pageNumber: 2, pageContext: {dimensions: { width: 595.28, height: 841.89, userUnit: 1.0 }, objId: 0, contentsObjId: 0, annotations: []} });
expect(doc.__private__.getPageInfo(3)).toEqual({ objId: 0, pageNumber: 3, pageContext: {dimensions: { width: 595.28, height: 841.89, userUnit: 1.0 }, objId: 0, contentsObjId: 0, annotations: []} });

expect(function() {doc.__private__.getPageInfo('invalid');}).toThrow(new Error('Invalid argument passed to jsPDF.getPageInfo'));
expect(function() {doc.__private__.getPageInfo(3.14);}).toThrow(new Error('Invalid argument passed to jsPDF.getPageInfo'));
});


it('jsPDF private function getCurrentPageInfo', () => {
const doc = jsPDF()
doc.addPage();
doc.addPage();
expect(doc.__private__.getCurrentPageInfo()).toEqual({ objId: 0, pageNumber: 3, pageContext: {dimensions: { width: 595.28, height: 841.89, userUnit: 1.0 }, objId: 0, contentsObjId: 0, annotations: []} });
expect(doc.__private__.getCurrentPageInfo()).toEqual({ objId: 0, pageNumber: 3, pageContext: {mediaBox: { bottomLeftX: 0, bottomLeftY: 0, topRightX: 595.28, topRightY: 841.89 }, artBox: null, bleedBox: null, cropBox: null, trimBox: null, userUnit: 1.0, objId: 0, contentsObjId: 0, annotations: []} });
});

it('jsPDF private function getArrayBuffer', () => {
Expand Down Expand Up @@ -1411,7 +1398,7 @@ break`, 10, 10, {scope: doc});
doc = jsPDF();
writeArray = [];
doc.__private__.setCustomOutputDestination(writeArray);
doc.__private__.putPage({number: 1, data:['streamData'], dimensions: {width: 595.28, height: 841.89}, resourceDictionaryObjId: 2, rootDictionaryObjId: 1, objId: 3, contentsObjId: 4});
doc.__private__.putPage({number: 1, data:['streamData'], mediaBox: { bottomLeftX: 0, bottomLeftY: 0, topRightX: 595.28, topRightY: 841.89 }, artBox: null, bleedBox: null, cropBox: null, trimBox: null, userUnit: 1.0, resourceDictionaryObjId: 2, rootDictionaryObjId: 1, objId: 3, contentsObjId: 4});
expect(writeArray).toEqual(["3 0 obj","<</Type /Page","/Parent 1 0 R","/Resources 2 0 R","/MediaBox [0 0 595.28 841.89]","/Contents 4 0 R",">>","endobj","4 0 obj","<<","/Length 10",">>","stream","streamData","endstream","endobj"]);
})

Expand Down