Skip to content

Commit

Permalink
Merge branch 'release/1.7.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
Frazer Smith committed Jun 29, 2020
2 parents 1896416 + fbe9181 commit 0301444
Show file tree
Hide file tree
Showing 6 changed files with 229 additions and 237 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
## <small>1.7.4 (2020-06-29)</small>

- chore: add missing jsdoc tags for test function ([770109e](https://github.com/Fdawgs/node-poppler/commit/770109e))
- chore: create code_of_conduct.md ([9a3a264](https://github.com/Fdawgs/node-poppler/commit/9a3a264))
- chore(eslint): convert from json to js file format ([a6e7f04](https://github.com/Fdawgs/node-poppler/commit/a6e7f04))
- chore(eslint): move inline eslint rules into config file ([99fe5be](https://github.com/Fdawgs/node-poppler/commit/99fe5be))
- chore(eslint): reorder rules ([96f561b](https://github.com/Fdawgs/node-poppler/commit/96f561b))
- chore(index): add jsdoc descriptions for params to parseoptions function ([3915895](https://github.com/Fdawgs/node-poppler/commit/3915895))
- chore(scripts): remove prettier ignore-path option ([e65419c](https://github.com/Fdawgs/node-poppler/commit/e65419c))
- build(deps-dev): bump @commitlint/config-conventional ([6821f42](https://github.com/Fdawgs/node-poppler/commit/6821f42))
- build(deps-dev): bump eslint from 7.2.0 to 7.3.1 ([cda023a](https://github.com/Fdawgs/node-poppler/commit/cda023a))
- build(deps-dev): bump eslint-plugin-jest from 23.13.2 to 23.17.1 ([c8ab3f7](https://github.com/Fdawgs/node-poppler/commit/c8ab3f7))
- build(deps-dev): bump eslint-plugin-jsdoc from 27.0.7 to 28.5.1 ([87ca360](https://github.com/Fdawgs/node-poppler/commit/87ca360))
- build(deps-dev): bump jest from 26.0.1 to 26.1.0 ([c7868dc](https://github.com/Fdawgs/node-poppler/commit/c7868dc))
- Create Dependabot config file ([0dff433](https://github.com/Fdawgs/node-poppler/commit/0dff433))
- refactor: replace promise syntax with async await ([5e6c1e4](https://github.com/Fdawgs/node-poppler/commit/5e6c1e4))
- refactor(index): move args array inside parseoptions function ([41c44ef](https://github.com/Fdawgs/node-poppler/commit/41c44ef))

## <small>1.7.3 (2020-06-15)</small>

The MacOS/Darwin Poppler binaries included have been updated from 0.66.0 to 0.89.0 by @chetanism,
Expand Down
26 changes: 13 additions & 13 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ appearance, race, religion, or sexual identity and orientation.
Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
- The use of sexualized language or imagery and unwelcome sexual attention or
advances
- Trolling, insulting/derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or electronic
address, without explicit permission
- Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# node-poppler

[![GitHub Release](https://img.shields.io/github/release/Fdawgs/node-poppler.svg)](https://github.com/Fdawgs/node-poppler/releases/latest/) [![npm version](https://img.shields.io/npm/v/node-poppler)](https://www.npmjs.com/package/node-poppler)
[![Build Status](https://travis-ci.org/Fdawgs/node-poppler.svg?branch=master)](https://travis-ci.org/Fdawgs/node-poppler) [![Coverage Status](https://coveralls.io/repos/github/Fdawgs/node-poppler/badge.svg?branch=master)](https://coveralls.io/github/Fdawgs/node-poppler?branch=master) [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&identifier=214626138)](https://dependabot.com) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
[![Build Status](https://travis-ci.org/Fdawgs/node-poppler.svg?branch=master)](https://travis-ci.org/Fdawgs/node-poppler) [![Coverage Status](https://coveralls.io/repos/github/Fdawgs/node-poppler/badge.svg?branch=master)](https://coveralls.io/github/Fdawgs/node-poppler?branch=master) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)

> Asynchronous node.js wrapper for the Poppler PDF rendering library
Expand Down
16 changes: 9 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"name": "node-poppler",
"version": "1.7.3",
"version": "1.7.4",
"description": "Node.js wrapper for the Poppler PDF rendering library",
"keywords": [
"poppler",
"async",
"pdf",
"pdf-converter",
"pdf-to-html"
"pdf-to-html",
"pdf-to-image",
"poppler"
],
"main": "src/index.js",
"repository": "git+https://github.com/Fdawgs/node-poppler.git",
Expand Down Expand Up @@ -46,16 +48,16 @@
"conventional-changelog-cli": "^2.0.34",
"coveralls": "^3.1.0",
"cross-env": "^7.0.2",
"eslint": "^7.2.0",
"eslint": "^7.3.1",
"eslint-config-airbnb-base": "^14.2.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-import": "^2.21.2",
"eslint-plugin-jest": "^23.13.2",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jest": "^23.17.1",
"eslint-plugin-jsdoc": "^28.5.1",
"eslint-plugin-json": "^2.1.1",
"eslint-plugin-promise": "^4.2.1",
"glob": "^7.1.6",
"jest": "^26.0.1",
"jest": "^26.1.0",
"jsdoc-to-markdown": "^6.0.1",
"jsinspect": "^0.12.7",
"prettier": "2.0.5",
Expand Down
67 changes: 33 additions & 34 deletions src/lib/darwin/poppler-0.89.0/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
Poppler, a PDF rendering library
================================
# Poppler, a PDF rendering library

This is Poppler, a library for rendering PDF files, and examining or
modifying their structure. Poppler originally came from the XPDF
modifying their structure. Poppler originally came from the XPDF
sources; please see the file [README-XPDF](README-XPDF) for the
original xpdf-3.03 README.

Expand All @@ -14,7 +13,7 @@ licensing](#history-and-gpl-licensing) for more information.
# Source code

Poppler's source code is maintained as a Git repository in
[`gitlab.freedesktop.org`][gitlab]. You can fork that repository and
[`gitlab.freedesktop.org`][gitlab]. You can fork that repository and
submit merge requests.

[gitlab]: https://gitlab.freedesktop.org/poppler/poppler
Expand All @@ -26,9 +25,9 @@ https://gitlab.freedesktop.org/poppler/poppler/issues

If you want to report a rendering or parsing bug, or a missing PDF
feature, please provide an example PDF file as an attachment to your
bug report. It really helps if you can minimize the PDF to only the
bug report. It really helps if you can minimize the PDF to only the
items required to reproduce the bug or the missing feature, but it is
not absolutely required. **Please be careful** of publishing PDF
not absolutely required. **Please be careful** of publishing PDF
files that you don't want other people to see, or files whose
copyright does not allow redistribution; the bug tracker is a public
resource and attachments are visible to everyone.
Expand All @@ -45,62 +44,62 @@ https://gitlab.freedesktop.org/poppler/poppler/issues
# Stable and unstable APIs

Poppler provides stable, public APIs for its various front-ends, and
an unstable API for Poppler's own internal use. The following
an unstable API for Poppler's own internal use. The following
directories in Poppler's source tree have the **stable APIs**:

* [cpp](cpp) - Stable C++ API for examining the structure of a PDF
file and rendering it to a raster image.
- [cpp](cpp) - Stable C++ API for examining the structure of a PDF
file and rendering it to a raster image.

* [glib](glib) - Stable C API with Glib/GObject idioms, to examine the
structure of a PDF file, and to render its pages to [Cairo]
contexts.
- [glib](glib) - Stable C API with Glib/GObject idioms, to examine the
structure of a PDF file, and to render its pages to [Cairo]
contexts.

* [qt5](qt5) - Stable C++ API with [Qt5] idioms, to examine the
structure of a PDF file, and to render its pages to `QPainter` or
`QImage` objects.
- [qt5](qt5) - Stable C++ API with [Qt5] idioms, to examine the
structure of a PDF file, and to render its pages to `QPainter` or
`QImage` objects.

**WARNING:** Poppler also provides direct access to its internals,
since various tools historically use the C++ header files that came
from XPDF and which became the basis for Poppler.

* [poppler](poppler) - **UNSTABLE, INTERNAL C++ API** to operate
directly on Poppler's internal representation of PDF files. *If you
use this API, you are on your own*. This API may change at any
time, even among minor versions of Poppler!
- [poppler](poppler) - **UNSTABLE, INTERNAL C++ API** to operate
directly on Poppler's internal representation of PDF files. _If you
use this API, you are on your own_. This API may change at any
time, even among minor versions of Poppler!

[Cairo]: https://www.cairographics.org/
[Qt5]: https://www.qt.io/
[cairo]: https://www.cairographics.org/
[qt5]: https://www.qt.io/

# History and GPL licensing

Poppler is a fork of the xpdf PDF viewer developed by Derek Noonburg
of Glyph and Cog, LLC. The purpose of forking xpdf is twofold.
of Glyph and Cog, LLC. The purpose of forking xpdf is twofold.
First, we want to provide PDF rendering functionality as a shared
library, to centralize the maintenance effort. Today a number of
library, to centralize the maintenance effort. Today a number of
applications incorporate the xpdf code base, and whenever a security
issue is discovered, all these applications exchange patches and put
out new releases. In turn, all distributions must package and release
new version of these xpdf based viewers. It's safe to say that
there's a lot of duplicated effort with the current situation. Even if
out new releases. In turn, all distributions must package and release
new version of these xpdf based viewers. It's safe to say that
there's a lot of duplicated effort with the current situation. Even if
poppler in the short term introduces yet another xpdf derived code
base to the world, we hope that over time these applications will
adopt poppler. After all, we only need one application to use poppler
adopt poppler. After all, we only need one application to use poppler
to break even.

Second, we would like to move libpoppler forward in a number of areas
that don't fit within the goals of xpdf. By design, xpdf depends on
very few libraries and runs a wide range of X based platforms. This
is a strong feature and reasonable design goal. However, with poppler
that don't fit within the goals of xpdf. By design, xpdf depends on
very few libraries and runs a wide range of X based platforms. This
is a strong feature and reasonable design goal. However, with poppler
we would like to replace parts of xpdf that are now available as
standard components of modern Unix desktop environments. One such
standard components of modern Unix desktop environments. One such
example is fontconfig, which solves the problem of matching and
locating fonts on the system, in a standardized and well understood
way. Another example is cairo, which provides high quality 2D
way. Another example is cairo, which provides high quality 2D
rendering.

Please note that xpdf, and thus poppler, is licensed under the GPL,
not the LGPL. Consequently, any application using poppler must also
be licensed under the GPL. If you want to incorporate Xpdf based PDF
not the LGPL. Consequently, any application using poppler must also
be licensed under the GPL. If you want to incorporate Xpdf based PDF
rendering in a closed source product, please contact Glyph & Cog
(www.glyphandcog.com) for commercial licensing options. Note that
this only allows you to use xpdf in a closed source product,
Expand Down
Loading

0 comments on commit 0301444

Please sign in to comment.