diff --git a/src/jspdf.js b/src/jspdf.js index a887774db..66ff8ec26 100644 --- a/src/jspdf.js +++ b/src/jspdf.js @@ -4935,6 +4935,19 @@ function jsPDF(options) { }; var lineWidth = options.lineWidth || 0.200025; // 2mm + /** + * Gets the line width, default: 0.200025. + * + * @function + * @instance + * @returns {number} lineWidth + * @memberof jsPDF# + * @name getLineWidth + */ + var getLineWidth = (API.__private__.getLineWidth = API.getLineWidth = function() { + return lineWidth; + }); + /** * Sets line width for upcoming lines. * @@ -4948,6 +4961,7 @@ function jsPDF(options) { var setLineWidth = (API.__private__.setLineWidth = API.setLineWidth = function( width ) { + lineWidth = width; out(hpf(scale(width)) + " w"); return this; }); @@ -5943,6 +5957,7 @@ function jsPDF(options) { getTextColor: getTextColor, getLineHeight: getLineHeight, getLineHeightFactor: getLineHeightFactor, + getLineWidth: getLineWidth, write: write, getHorizontalCoordinate: getHorizontalCoordinate, getVerticalCoordinate: getVerticalCoordinate, diff --git a/test/reference/autoPaging10Pages.pdf b/test/reference/autoPaging10Pages.pdf index e4b983a16..432b1f549 100644 Binary files a/test/reference/autoPaging10Pages.pdf and b/test/reference/autoPaging10Pages.pdf differ diff --git a/test/reference/html-font-faces.pdf b/test/reference/html-font-faces.pdf index e4824e1e7..8734ae10a 100644 Binary files a/test/reference/html-font-faces.pdf and b/test/reference/html-font-faces.pdf differ diff --git a/test/reference/html-margin-page-break-slice.pdf b/test/reference/html-margin-page-break-slice.pdf index c63b2b140..bddee5693 100644 Binary files a/test/reference/html-margin-page-break-slice.pdf and b/test/reference/html-margin-page-break-slice.pdf differ diff --git a/test/reference/html-margin-page-break-text.pdf b/test/reference/html-margin-page-break-text.pdf index bc1cf4145..0ed26c68a 100644 Binary files a/test/reference/html-margin-page-break-text.pdf and b/test/reference/html-margin-page-break-text.pdf differ diff --git a/test/reference/html-margin-page-break.pdf b/test/reference/html-margin-page-break.pdf index b33794de7..21cd55b98 100644 Binary files a/test/reference/html-margin-page-break.pdf and b/test/reference/html-margin-page-break.pdf differ diff --git a/test/specs/context2d.pageoverlap.spec.js b/test/specs/context2d.pageoverlap.spec.js index c01f6b6a3..3328d0351 100644 --- a/test/specs/context2d.pageoverlap.spec.js +++ b/test/specs/context2d.pageoverlap.spec.js @@ -27,14 +27,14 @@ describe("Module: Context2D autoPaging", () => { "0 J", "1. w", "0 j", - "0.2 w", + "1. w", "1. 0. 0. RG", "0. 0. 0. rg", "1. 0. 0. RG", "0 J", "1. w", "0 j", - "0.2 w", + "1. w", "1. 0. 0. RG", "0. 0. 0. rg", "1. 0. 0. RG", diff --git a/test/specs/jspdf.unit.spec.js b/test/specs/jspdf.unit.spec.js index b24dc2064..651cf8eff 100644 --- a/test/specs/jspdf.unit.spec.js +++ b/test/specs/jspdf.unit.spec.js @@ -894,11 +894,9 @@ describe("Core: Unit Tests", () => { it("jsPDF private function getLineWidth", () => { const doc = jsPDF({ floatPrecision: 2 }); - var writeArray = []; - doc.__private__.setCustomOutputDestination(writeArray); doc.__private__.setLineWidth(595.28); - expect(writeArray).toEqual(["1687.41 w"]); + expect(doc.__private__.getLineWidth()).toEqual(595.28); }); it("jsPDF private function setLineDash", () => { @@ -2536,7 +2534,7 @@ This is a test too.`, doc2.text('Some text', 10, 10, { lineHeightFactor: 1.5, baseline: 'middle' }); expect(writeArray1).toEqual(writeArray2); -}); + }); it("jsPDF private function setLineCap", () => { var doc = jsPDF({ floatPrecision: 2 }); diff --git a/types/index.d.ts b/types/index.d.ts index fd45e9e1f..8a9553073 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -789,6 +789,7 @@ declare module "jspdf" { getFormObject(key: any): any; getLineHeight(): number; getLineHeightFactor(): number; + getLineWidth(): number; getNumberOfPages(): number; getPageInfo(pageNumberOneBased: number): PageInfo; getR2L(): boolean; @@ -810,9 +811,7 @@ declare module "jspdf" { style?: string | null, closed?: boolean ): jsPDF; - clip(): jsPDF; clipEvenOdd(): jsPDF; - discardPath(): jsPDF; close(): jsPDF; stroke(): jsPDF; fill(pattern?: PatternData): jsPDF;