node-poppler 5.1.1 → 5.1.4

package/API.md

@@ -40,7 +40,7 @@ version of binary.</p>
 
 | Param | Type | Description |
 | --- | --- | --- |
-| [binPath] | <code>string</code> | Path of poppler-utils binaries. Useful for Linux users who have poppler-utils binaries already installed. |
+| [binPath] | <code>string</code> | Path of poppler-utils binaries. |
 
 <a name="Poppler+pdfAttach"></a>
 

package/CHANGELOG.md

@@ -2,6 +2,113 @@
 
 All notable changes to this project will be documented in this file.
 
+### [5.1.4](https://github.com/Fdawgs/node-poppler/compare/v5.1.3...v5.1.4) (2022-05-01)
+
+
+### Bug Fixes
+
+* **lib:** update poppler win32 binaries from 22.01.0 to 22.04.0 ([6e74afe](https://github.com/Fdawgs/node-poppler/commit/6e74afe9ee73511a71a14942cd14648b33ec7e2e))
+
+
+### Documentation
+
+* improve readability ([05fcda6](https://github.com/Fdawgs/node-poppler/commit/05fcda639482b687ad3ef01455dc28523ac1b4ea))
+* **readme:** remove snyk badge ([e0a743e](https://github.com/Fdawgs/node-poppler/commit/e0a743ee8462dfa7d39ac2c316cf73b8d4aa0c05))
+
+
+### Dependencies
+
+* **deps-dev:** bump dev dependencies ([3c688e4](https://github.com/Fdawgs/node-poppler/commit/3c688e44885998bfcd7af2e16007f6b6545a4d06))
+* **deps-dev:** bump eslint-plugin-jsdoc from 37.9.7 to 38.0.6 ([49b8cfc](https://github.com/Fdawgs/node-poppler/commit/49b8cfc13fac695c66898a74f939e8f1f8e646cd))
+* **deps-dev:** bump eslint-plugin-jsdoc from 38.1.6 to 39.2.9 ([#405](https://github.com/Fdawgs/node-poppler/issues/405)) ([91d5d11](https://github.com/Fdawgs/node-poppler/commit/91d5d1137463ce3cf94045cb9dfbe36ff51f3191))
+* **deps-dev:** bump glob from 7.2.0 to 8.0.1 ([#406](https://github.com/Fdawgs/node-poppler/issues/406)) ([2a9beef](https://github.com/Fdawgs/node-poppler/commit/2a9beef2531a6e10051fbad6272833f7e30aa729))
+* **deps-dev:** bump jest from 27.5.1 to 28.0.3 ([#407](https://github.com/Fdawgs/node-poppler/issues/407)) ([1894c0d](https://github.com/Fdawgs/node-poppler/commit/1894c0d3efba1595b435f20e3bc8d64e4bfc6690))
+* **deps:** bump actions/checkout from 2 to 3 ([96754d1](https://github.com/Fdawgs/node-poppler/commit/96754d1a07fce63cc2bfa5c8c388f5da4a92eaa9))
+* **deps:** bump actions/checkout from 2 to 3 ([efab6f2](https://github.com/Fdawgs/node-poppler/commit/efab6f21ca40ecd84bcc3e3e292c30cc6e785071))
+* **deps:** bump actions/upload-artifact from 2 to 3 ([#403](https://github.com/Fdawgs/node-poppler/issues/403)) ([e9c8796](https://github.com/Fdawgs/node-poppler/commit/e9c879699ac9e61223ddeee69af97d2f14c7f7d6))
+* **deps:** bump github/codeql-action from 1 to 2 ([#404](https://github.com/Fdawgs/node-poppler/issues/404)) ([073cc6b](https://github.com/Fdawgs/node-poppler/commit/073cc6bd618331604ae6000522c0cf418315da44))
+
+
+### Miscellaneous
+
+* **ci:** remove quotation marks from step name ([81d9943](https://github.com/Fdawgs/node-poppler/commit/81d994381ff75c94f0db831911354259fec28909))
+* **index:** update constructor jsdoc param tag ([#397](https://github.com/Fdawgs/node-poppler/issues/397)) ([cdc61ba](https://github.com/Fdawgs/node-poppler/commit/cdc61ba8b41777ac3132aa72d1644a46b352788e))
+* **scripts:** remove redundant gitkraken fix from prepare script ([be8b489](https://github.com/Fdawgs/node-poppler/commit/be8b4896c6dd1bf19ffc6abac406f1d6838e0742))
+* **scripts:** use shorter arg aliases; remove debugging args from jest ([eefa9cf](https://github.com/Fdawgs/node-poppler/commit/eefa9cf3272fc8f41bf106601ce9c63be17172ca))
+* use npm install alias ([8de1b7c](https://github.com/Fdawgs/node-poppler/commit/8de1b7c8b4a4d4f0fa0c3fd0053028cd48345efd))
+
+
+### Continuous Integration
+
+* add dependency-review job ([dd75f36](https://github.com/Fdawgs/node-poppler/commit/dd75f3695e4a7983d86827dc45ba1229fee07b59))
+* add job step names, workflow comments, and whitespace ([0bdd954](https://github.com/Fdawgs/node-poppler/commit/0bdd95488f6786424e7b4eab7aea20192642ad69))
+* **automerge:** squash automerge prs ([#398](https://github.com/Fdawgs/node-poppler/issues/398)) ([1390729](https://github.com/Fdawgs/node-poppler/commit/1390729aa6dff19e6ad1897884e79b80446994c9))
+* **cd:** update org name for release-please-action ([d5a5257](https://github.com/Fdawgs/node-poppler/commit/d5a5257efcbccb24824004713c7642e946fd0701))
+* **codeql-analysis:** remove unused autobuild step ([de272df](https://github.com/Fdawgs/node-poppler/commit/de272dfc59731f4870164b3633c0402f5d6e1b37))
+* **codeql:** grant minimum permissions to run; rename file ([#394](https://github.com/Fdawgs/node-poppler/issues/394)) ([d3e80e2](https://github.com/Fdawgs/node-poppler/commit/d3e80e2dcf2fd4e0855bdc645cd3bca29dec9116))
+* **link-check:** fix skip regex ([23602df](https://github.com/Fdawgs/node-poppler/commit/23602df07dd51725b89e8244b213a62bb6789e12))
+* **link-check:** replace `npx linkinator` call with github action ([8f626a7](https://github.com/Fdawgs/node-poppler/commit/8f626a79fec0858f52920b3b4d16d01a9dc66c3f))
+* only save pr number artifact for dependabot ([c5c6a7c](https://github.com/Fdawgs/node-poppler/commit/c5c6a7c8f4a04100b59867b35e3ae3509b61ac0f))
+* only trigger dependency-review on pr ([e6e7f71](https://github.com/Fdawgs/node-poppler/commit/e6e7f71f9c2007236737358d110d6752da9bbbff))
+* reduce workflow permissions to minimum ([86e7668](https://github.com/Fdawgs/node-poppler/commit/86e7668d28305454023b9b7c466e8f8764858dcf))
+* replace workflow-run-cleanup-action with github concurrency ([ac13ada](https://github.com/Fdawgs/node-poppler/commit/ac13adab01eb50b80ccd8224adbeb8f453b7c12a))
+
+### [5.1.3](https://github.com/Fdawgs/node-poppler/compare/v5.1.2...v5.1.3) (2022-02-25)
+
+
+### Bug Fixes
+
+* **index:** use `spawn` for larger stream results ([#386](https://github.com/Fdawgs/node-poppler/issues/386)) ([e437f3e](https://github.com/Fdawgs/node-poppler/commit/e437f3e9e9fa73a8e36d64a01283388e3a879e10))
+
+
+### Miscellaneous
+
+* **.github:** remove trailing whitespace ([aee8872](https://github.com/Fdawgs/node-poppler/commit/aee8872c62b5f66e83d75915a325be6bfd32ee76))
+
+
+### Dependencies
+
+* **dependabot:** ignore minor and patch commit-lint updates ([#380](https://github.com/Fdawgs/node-poppler/issues/380)) ([b5ff45f](https://github.com/Fdawgs/node-poppler/commit/b5ff45f603697b66155d488579c47dee34ad5f2f))
+* **dependabot:** major tags no longer need ignore support ([579cea2](https://github.com/Fdawgs/node-poppler/commit/579cea2c0e36d200fb5981529b0fb092e99d6c67))
+* **dependabot:** use default open-pull-requests-limit value ([eebb453](https://github.com/Fdawgs/node-poppler/commit/eebb4537a299fa6d2a01c2621db619d298c933cc))
+* **deps-dev:** bump dev dependencies ([#388](https://github.com/Fdawgs/node-poppler/issues/388)) ([06f8957](https://github.com/Fdawgs/node-poppler/commit/06f895771c639ea06f2dbeb0a61c180a3ec650b3))
+* **deps-dev:** bump eslint-plugin-jest from 25.7.0 to 26.0.0 ([321e7d0](https://github.com/Fdawgs/node-poppler/commit/321e7d0221d67be7ccf2ab12bbbb95d20c96a7a3))
+* **deps:** bump actions/github-script from 5 to 6 ([deb69a6](https://github.com/Fdawgs/node-poppler/commit/deb69a6ac7244ece7c87e3f5f02965f7d33e2c08))
+* **deps:** bump actions/setup-node from 2 to 3 ([81f52ca](https://github.com/Fdawgs/node-poppler/commit/81f52ca1f885b332e2f12be6d445418e148d9051))
+
+### [5.1.2](https://github.com/Fdawgs/node-poppler/compare/v5.1.1...v5.1.2) (2022-01-19)
+
+
+### Bug Fixes
+
+* **lib:** update poppler win32 binaries from 21.11.0 to 22.01.0 ([e76a813](https://github.com/Fdawgs/node-poppler/commit/e76a813b3ad12bb15a808ccd4d1a163016d36eec))
+
+
+### Miscellaneous
+
+* **package:** add `tif` to keywords array ([#369](https://github.com/Fdawgs/node-poppler/issues/369)) ([2929483](https://github.com/Fdawgs/node-poppler/commit/29294830056f6e8f53c82822560b840d2031f3b6))
+
+
+### Documentation
+
+* **contributing:** add mention of husky pre-commit hook ([8eb63e8](https://github.com/Fdawgs/node-poppler/commit/8eb63e8d0dac69bce76fda5032506a5171abf3e4))
+* **contributing:** add step for `lint:licenses` script ([#371](https://github.com/Fdawgs/node-poppler/issues/371)) ([5e9f7a5](https://github.com/Fdawgs/node-poppler/commit/5e9f7a510f6aa407d39a17ad24d83ade59c98f41))
+
+
+### Continuous Integration
+
+* remove spellcheck workflow ([#376](https://github.com/Fdawgs/node-poppler/issues/376)) ([56fb637](https://github.com/Fdawgs/node-poppler/commit/56fb63713171c4aed9458d48b4d2cf66a5b91419))
+
+
+### Dependencies
+
+* **deps-dev:** bump @commitlint/cli from 15.0.0 to 16.0.1 ([8ab463a](https://github.com/Fdawgs/node-poppler/commit/8ab463aa30b8bc1fd36ed40c4595f2d274d90674))
+* **deps-dev:** bump @commitlint/config-conventional ([6cda233](https://github.com/Fdawgs/node-poppler/commit/6cda233e5a29e44961c2e52d2a19d01b008e9ddc))
+* **deps-dev:** bump eslint from 7.32.0 to 8.7.0 ([73a77a5](https://github.com/Fdawgs/node-poppler/commit/73a77a5bdd250e19086ef9bd838f74b5fec2ef81))
+* **deps-dev:** bump eslint-plugin-promise from 5.2.0 to 6.0.0 ([535feb0](https://github.com/Fdawgs/node-poppler/commit/535feb08ba673a0a6812e5a3d8a4bf0e2af518f3))
+* **deps:** bump GoogleCloudPlatform/release-please-action from 2 to 3 ([e3c9d8e](https://github.com/Fdawgs/node-poppler/commit/e3c9d8e76c34d949f6d98e60a57f19dcff90a766))
+* update dependencies ([db8a76d](https://github.com/Fdawgs/node-poppler/commit/db8a76d498760e808544026183e9aade29b4c4d8))
+
 ### [5.1.1](https://www.github.com/Fdawgs/node-poppler/compare/v5.1.0...v5.1.1) (2021-12-11)
 
 

package/README.md

@@ -4,7 +4,6 @@
 [![npm version](https://img.shields.io/npm/v/node-poppler)](https://www.npmjs.com/package/node-poppler)
 ![Build Status](https://github.com/Fdawgs/node-poppler/workflows/CI/badge.svg?branch=master)
 [![Coverage Status](https://coveralls.io/repos/github/Fdawgs/node-poppler/badge.svg?branch=master)](https://coveralls.io/github/Fdawgs/node-poppler?branch=master)
-[![Known Vulnerabilities](https://snyk.io/test/github/Fdawgs/node-poppler/badge.svg)](https://snyk.io/test/github/Fdawgs/node-poppler)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat)](https://github.com/prettier/prettier)
 
 > Asynchronous node.js wrapper for the Poppler PDF rendering library
@@ -21,7 +20,7 @@ It was created out of a need for a PDF-to-HTML conversion module at [Yeovil Dist
 Install using [`npm`](https://www.npmjs.com/package/node-poppler):
 
 ```bash
-npm install node-poppler
+npm i node-poppler
 ```
 
 Or [`yarn`](https://yarnpkg.com/en/package/node-poppler):
@@ -166,7 +165,7 @@ poppler.pdfToText(file, options).then((res) => {
 
 Contributions are welcome, and any help is greatly appreciated!
 
-See [CONTRIBUTING.md](./CONTRIBUTING.md) for details on how to get started.
+See [the contributing guide](./CONTRIBUTING.md) for details on how to get started.
 Please adhere to this project's [Code of Conduct](./CODE_OF_CONDUCT.md) when contributing.
 
 ## Acknowledgements

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-poppler",
-	"version": "5.1.1",
+	"version": "5.1.4",
 	"description": "Asynchronous node.js wrapper for the Poppler PDF rendering library",
 	"keywords": [
 		"async",
@@ -27,6 +27,7 @@
 		"separate",
 		"svg",
 		"text",
+		"tif",
 		"tiff",
 		"txt",
 		"unite"
@@ -45,12 +46,12 @@
 	"scripts": {
 		"build": "tsc",
 		"doc": "tsc && jsdoc2md src/index.js > API.md && npm run lint:prettier",
-		"jest": "jest --detectOpenHandles --runInBand",
-		"jest:coverage": "jest --coverage --runInBand",
+		"jest": "jest",
+		"jest:coverage": "jest --coverage",
 		"lint": "eslint . --cache --ext js,jsx --ignore-path .gitignore",
 		"lint:licenses": "license-checker --direct --onlyAllow=\"0BSD;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;MIT;Unlicense\" --production --summary",
-		"lint:prettier": "prettier . --write --ignore-unknown",
-		"lint:prettier:ci": "prettier . --check --ignore-unknown",
+		"lint:prettier": "prettier . -w -u",
+		"lint:prettier:ci": "prettier . -c -u",
 		"prepare": "",
 		"test": "npm run lint && npm run jest"
 	},
@@ -70,27 +71,27 @@
 		"testTimeout": 60000
 	},
 	"devDependencies": {
-		"@commitlint/cli": "^15.0.0",
-		"@commitlint/config-conventional": "^15.0.0",
-		"eslint": "^7.32.0",
+		"@commitlint/cli": "^16.2.4",
+		"@commitlint/config-conventional": "^16.2.4",
+		"eslint": "^8.14.0",
 		"eslint-config-airbnb-base": "^15.0.0",
-		"eslint-config-prettier": "^8.3.0",
-		"eslint-plugin-import": "^2.25.3",
-		"eslint-plugin-jest": "^25.2.4",
-		"eslint-plugin-jsdoc": "^37.0.3",
-		"eslint-plugin-promise": "^5.1.1",
-		"eslint-plugin-security": "^1.4.0",
-		"eslint-plugin-security-node": "^1.0.14",
-		"glob": "^7.2.0",
+		"eslint-config-prettier": "^8.4.0",
+		"eslint-plugin-import": "^2.26.0",
+		"eslint-plugin-jest": "^26.1.5",
+		"eslint-plugin-jsdoc": "^39.2.9",
+		"eslint-plugin-promise": "^6.0.0",
+		"eslint-plugin-security": "^1.5.0",
+		"eslint-plugin-security-node": "^1.1.1",
+		"glob": "^8.0.1",
 		"husky": "^7.0.4",
-		"jest": "^27.3.1",
-		"jsdoc-to-markdown": "^7.1.0",
+		"jest": "^28.0.3",
+		"jsdoc-to-markdown": "^7.1.1",
 		"license-checker": "^25.0.1",
-		"prettier": "2.5.1",
-		"typescript": "^4.4.4"
+		"prettier": "^2.6.2",
+		"typescript": "^4.6.4"
 	},
 	"dependencies": {
-		"camelcase": "^6.2.0",
+		"camelcase": "^6.3.0",
 		"upath": "^2.0.1"
 	}
 }

package/src/index.d.ts

@@ -1,7 +1,6 @@
 export class Poppler {
 	/**
 	 * @param {string=} binPath - Path of poppler-utils binaries.
-	 * Useful for Linux users who have poppler-utils binaries already installed.
 	 */
 	constructor(binPath?: string | undefined);
 	popplerPath: string;

package/src/index.js

@@ -1,7 +1,7 @@
 /* eslint-disable security/detect-child-process */
 const camelCase = require("camelcase");
 const path = require("upath");
-const { execFile } = require("child_process");
+const { execFile, spawn } = require("child_process");
 const util = require("util");
 
 const execFileAsync = util.promisify(execFile);
@@ -72,7 +72,6 @@ function parseOptions(acceptedOptions, options, version) {
 class Poppler {
 	/**
 	 * @param {string=} binPath - Path of poppler-utils binaries.
-	 * Useful for Linux users who have poppler-utils binaries already installed.
 	 */
 	constructor(binPath) {
 		if (binPath) {
@@ -82,7 +81,7 @@ class Poppler {
 				__dirname,
 				"lib",
 				"win32",
-				"poppler-21.11.0",
+				"poppler-22.04.0",
 				"Library",
 				"bin"
 			);
@@ -230,7 +229,7 @@ class Poppler {
 					args.push(file);
 				}
 
-				const child = execFile(
+				const child = spawn(
 					path.joinSafe(this.popplerPath, "pdffonts"),
 					args
 				);
@@ -331,7 +330,7 @@ class Poppler {
 					args.push(outputPrefix);
 				}
 
-				const child = execFile(
+				const child = spawn(
 					path.joinSafe(this.popplerPath, "pdfimages"),
 					args
 				);
@@ -732,7 +731,7 @@ class Poppler {
 					args.push("-");
 				}
 
-				const child = execFile(
+				const child = spawn(
 					path.joinSafe(this.popplerPath, "pdftocairo"),
 					args
 				);
@@ -876,7 +875,7 @@ class Poppler {
 					args.push(outputFile);
 				}
 
-				const child = execFile(
+				const child = spawn(
 					path.joinSafe(this.popplerPath, "pdftohtml"),
 					args
 				);
@@ -1084,7 +1083,7 @@ class Poppler {
 
 				args.push(outputPath);
 
-				const child = execFile(
+				const child = spawn(
 					path.joinSafe(this.popplerPath, "pdftoppm"),
 					args
 				);
@@ -1323,7 +1322,7 @@ class Poppler {
 					args.push("-");
 				}
 
-				const child = execFile(
+				const child = spawn(
 					path.joinSafe(this.popplerPath, "pdftops"),
 					args
 				);
@@ -1474,7 +1473,7 @@ class Poppler {
 					args.push("-");
 				}
 
-				const child = execFile(
+				const child = spawn(
 					path.joinSafe(this.popplerPath, "pdftotext"),
 					args
 				);

package/src/lib/win32/{poppler-21.11.0 → poppler-22.04.0}/Library/include/poppler/Annot.h

@@ -21,7 +21,7 @@
 // Copyright (C) 2008 Hugo Mercier <hmercier31@gmail.com>
 // Copyright (C) 2008 Pino Toscano <pino@kde.org>
 // Copyright (C) 2008 Tomas Are Haavet <tomasare@gmail.com>
-// Copyright (C) 2009-2011, 2013, 2016-2021 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009-2011, 2013, 2016-2022 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
 // Copyright (C) 2012, 2015 Tobias Koenig <tokoe@kdab.com>
 // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
@@ -29,7 +29,7 @@
 // Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info@kdab.com>. Work sponsored by the LiMux project of the city of Munich
 // Copyright (C) 2018 Dileep Sankhla <sankhla.dileep96@gmail.com>
 // Copyright (C) 2018-2020 Tobias Deiminger <haxtibal@posteo.de>
-// Copyright (C) 2018, 2020 Oliver Sander <oliver.sander@tu-dresden.de>
+// Copyright (C) 2018, 2020, 2022 Oliver Sander <oliver.sander@tu-dresden.de>
 // Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de>
 // Copyright (C) 2019 Umang Malik <umang99m@gmail.com>
 // Copyright (C) 2019 João Netto <joaonetto901@gmail.com>
@@ -40,6 +40,8 @@
 // Copyright (C) 2021 Klarälvdalens Datakonsult AB, a KDAB Group company, <info@kdab.com>.
 // Copyright (C) 2021 Zachary Travis <ztravis@everlaw.com>
 // Copyright (C) 2021 Mahmoud Ahmed Khalil <mahmoudkhalil11@gmail.com>
+// Copyright (C) 2021 Georgiy Sgibnev <georgiy@sgibnev.com>. Work sponsored by lab50.net.
+// Copyright (C) 2022 Martin <martinbts@gmx.net>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -98,6 +100,13 @@ enum AnnotExternalDataType
     annotExternalDataMarkup3D // Markup3D
 };
 
+enum class VariableTextQuadding
+{
+    leftJustified,
+    centered,
+    rightJustified
+};
+
 //------------------------------------------------------------------------
 // AnnotCoord
 //------------------------------------------------------------------------
@@ -277,6 +286,7 @@ public:
     virtual AnnotBorderStyle getStyle() const { return style; }
 
     virtual Object writeToObject(XRef *xref) const = 0;
+    virtual std::unique_ptr<AnnotBorder> copy() const = 0;
 
 protected:
     AnnotBorder();
@@ -307,6 +317,8 @@ public:
     double getHorizontalCorner() const { return horizontalCorner; }
     double getVerticalCorner() const { return verticalCorner; }
 
+    std::unique_ptr<AnnotBorder> copy() const override;
+
 private:
     AnnotBorderType getType() const override { return typeArray; }
     Object writeToObject(XRef *xref) const override;
@@ -332,6 +344,8 @@ private:
 
     const char *getStyleName() const;
 
+    std::unique_ptr<AnnotBorder> copy() const override;
+
     // double width;           // W  (Default 1)   (inherited from AnnotBorder)
     // AnnotBorderStyle style; // S  (Default S)   (inherited from AnnotBorder)
     // double *dash;           // D  (Default [3]) (inherited from AnnotBorder)
@@ -385,7 +399,7 @@ public:
     double getFontPtSize() const { return fontPtSize; }
     void setFontColor(std::unique_ptr<AnnotColor> fontColorA);
     const AnnotColor *getFontColor() const { return fontColor.get(); }
-    GooString *toAppearanceString() const;
+    std::string toAppearanceString() const;
 
     DefaultAppearance(const DefaultAppearance &) = delete;
     DefaultAppearance &operator=(const DefaultAppearance &) = delete;
@@ -509,6 +523,8 @@ public:
     const AnnotIconFit *getIconFit() { return iconFit.get(); }
     AnnotAppearanceCharacsTextPos getPosition() const { return position; }
 
+    std::unique_ptr<AnnotAppearanceCharacs> copy() const;
+
 protected:
     int rotation; // R  (Default 0)
     std::unique_ptr<AnnotColor> borderColor; // BC
@@ -553,6 +569,7 @@ private:
 // AnnotAppearanceBuilder
 //------------------------------------------------------------------------
 class Matrix;
+
 class AnnotAppearanceBuilder
 {
 public:
@@ -580,7 +597,7 @@ public:
                        const GooString *appearState, XRef *xref, Dict *resourcesDict);
     static double lineEndingXShorten(AnnotLineEndingStyle endingStyle, double size);
     static double lineEndingXExtendBBox(AnnotLineEndingStyle endingStyle, double size);
-    void writeString(const GooString &str);
+    void writeString(const std::string &str);
 
     void append(const char *text);
     void appendf(const char *fmt, ...) GOOSTRING_FORMAT;
@@ -588,7 +605,16 @@ public:
     const GooString *buffer() const;
 
 private:
-    bool drawListBox(const FormFieldChoice *fieldChoice, const AnnotBorder *border, const PDFRectangle *rect, const GooString *da, const GfxResources *resources, int quadding, XRef *xref, Dict *resourcesDict);
+    enum DrawTextFlags
+    {
+        NoDrawTextFlags = 0,
+        MultilineDrawTextFlag = 1,
+        EmitMarkedContentDrawTextFlag = 2,
+        ForceZapfDingbatsDrawTextFlag = 4,
+        TurnTextToStarsDrawTextFlag = 8
+    };
+
+    bool drawListBox(const FormFieldChoice *fieldChoice, const AnnotBorder *border, const PDFRectangle *rect, const GooString *da, const GfxResources *resources, VariableTextQuadding quadding, XRef *xref, Dict *resourcesDict);
     bool drawFormFieldButton(const FormFieldButton *field, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, const GooString *appearState,
                              XRef *xref, Dict *resourcesDict);
     bool drawFormFieldText(const FormFieldText *fieldText, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, XRef *xref,
@@ -598,8 +624,8 @@ private:
     bool drawSignatureFieldText(const FormFieldSignature *field, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect,
                                 XRef *xref, Dict *resourcesDict);
     void drawSignatureFieldText(const GooString &text, const DefaultAppearance &da, const AnnotBorder *border, const PDFRectangle *rect, XRef *xref, Dict *resourcesDict, double leftMargin, bool centerVertically, bool centerHorizontally);
-    bool drawText(const GooString *text, const GooString *da, const GfxResources *resources, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, bool multiline, int comb, int quadding,
-                  bool txField, bool forceZapfDingbats, XRef *xref, bool password, Dict *resourcesDict, const char *defaultFallback = "Helvetica");
+    bool drawText(const GooString *text, const GooString *da, const GfxResources *resources, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, const VariableTextQuadding quadding, XRef *xref,
+                  Dict *resourcesDict, const int flags = NoDrawTextFlags, const int nCombs = 0);
     void drawArrowPath(double x, double y, const Matrix &m, int orientation = 1);
 
     GooString *appearBuf;
@@ -710,7 +736,7 @@ public:
 
     // Sets the annot contents to new_content
     // new_content should never be NULL
-    virtual void setContents(GooString *new_content);
+    virtual void setContents(std::unique_ptr<GooString> &&new_content);
     void setName(GooString *new_name);
     void setModified(GooString *new_modified);
     void setFlags(unsigned int new_flags);
@@ -726,7 +752,7 @@ public:
     Ref getRef() const { return ref; }
     const Object &getAnnotObj() const { return annotObj; }
     AnnotSubtype getType() const { return type; }
-    PDFRectangle *getRect() const { return rect.get(); }
+    const PDFRectangle &getRect() const { return *rect; }
     void getRect(double *x1, double *y1, double *x2, double *y2) const;
     const GooString *getContents() const { return contents.get(); }
     int getPageNum() const { return page; }
@@ -746,7 +772,7 @@ public:
     // Check if point is inside the annot rectangle.
     bool inRect(double x, double y) const;
 
-    static void layoutText(const GooString *text, GooString *outBuf, int *i, const GfxFont *font, double *width, double widthLimit, int *charCount, bool noReencode);
+    static void layoutText(const GooString *text, GooString *outBuf, int *i, const GfxFont &font, double *width, double widthLimit, int *charCount, bool noReencode);
 
 private:
     void readArrayNum(Object *pdfArray, int key, double *value);
@@ -857,7 +883,7 @@ public:
 
     // The annotation takes the ownership of new_popup
     void setPopup(std::unique_ptr<AnnotPopup> &&new_popup);
-    void setLabel(GooString *new_label);
+    void setLabel(std::unique_ptr<GooString> &&new_label);
     void setOpacity(double opacityA);
     void setDate(GooString *new_date);
 
@@ -1020,13 +1046,6 @@ protected:
 class POPPLER_PRIVATE_EXPORT AnnotFreeText : public AnnotMarkup
 {
 public:
-    enum AnnotFreeTextQuadding
-    {
-        quaddingLeftJustified, // 0
-        quaddingCentered, // 1
-        quaddingRightJustified // 2
-    };
-
     enum AnnotFreeTextIntent
     {
         intentFreeText, // FreeText
@@ -1042,17 +1061,17 @@ public:
 
     void draw(Gfx *gfx, bool printing) override;
     Object getAppearanceResDict() override;
-    void setContents(GooString *new_content) override;
+    void setContents(std::unique_ptr<GooString> &&new_content) override;
 
     void setDefaultAppearance(const DefaultAppearance &da);
-    void setQuadding(AnnotFreeTextQuadding new_quadding);
+    void setQuadding(VariableTextQuadding new_quadding);
     void setStyleString(GooString *new_string);
     void setCalloutLine(AnnotCalloutLine *line);
     void setIntent(AnnotFreeTextIntent new_intent);
 
     // getters
     std::unique_ptr<DefaultAppearance> getDefaultAppearance() const;
-    AnnotFreeTextQuadding getQuadding() const { return quadding; }
+    VariableTextQuadding getQuadding() const { return quadding; }
     // return rc
     const GooString *getStyleString() const { return styleString.get(); }
     AnnotCalloutLine *getCalloutLine() const { return calloutLine.get(); }
@@ -1069,7 +1088,7 @@ protected:
     std::unique_ptr<GooString> appearanceString; // DA
 
     // optional
-    AnnotFreeTextQuadding quadding; // Q  (Default 0)
+    VariableTextQuadding quadding; // Q  (Default 0)
     // RC
     std::unique_ptr<GooString> styleString; // DS
     std::unique_ptr<AnnotCalloutLine> calloutLine; // CL
@@ -1106,7 +1125,7 @@ public:
 
     void draw(Gfx *gfx, bool printing) override;
     Object getAppearanceResDict() override;
-    void setContents(GooString *new_content) override;
+    void setContents(std::unique_ptr<GooString> &&new_content) override;
 
     void setVertices(double x1, double y1, double x2, double y2);
     void setStartEndStyle(AnnotLineEndingStyle start, AnnotLineEndingStyle end);