Compare commits

...

373 Commits

Author SHA1 Message Date
Trent Petersen 6f85c88b1d
Merge pull request #156 from ViliusSutkus89/background-image
Fix out of bounds read in SplashBackgroundRenderer
2024-02-01 09:12:42 -06:00
Trent Petersen 1fabed18de
Merge pull request #154 from ViliusSutkus89/master
Update Poppler to 23.12.0 and Fontforge to 20230101 (based on #145)
2024-02-01 09:12:28 -06:00
Vilius Sutkus '89 5727b6dcf4 Upgrade Poppler to 24.01.0 2024-01-13 20:07:15 +02:00
Vilius Sutkus '89 904e068384 Update comment about Poppler-data version 2024-01-13 20:03:20 +02:00
Vilius Sutkus '89 3f0f523ed9 Remove dump_image from SplashBackgroundRenderer, let Poppler handle it 2023-12-27 06:18:49 +02:00
Vilius Sutkus '89 0a2478f6dc Add poppler-23.12.0 support 2023-12-18 13:30:57 +02:00
Pablo González L b0e3529ac8 Update poppler data to 0.4.12 2023-05-14 15:39:57 -04:00
Pablo González L f82a725eb7 Add test in github 2023-05-14 15:08:46 -04:00
Pablo González L 1d3e577440 Update poppler to 21.02.0 and fontforge to 0230101 2023-05-14 15:05:51 -04:00
Pablo González L ed6528859b FindProgDir is FindProgRoot in fontforge 20230101 2023-05-14 15:02:48 -04:00
Trent Petersen 56db76d1ab
Merge pull request #130 from NNSTH/master
FontForge 20220308
2023-03-13 07:08:22 -05:00
NNNSTH 571ee11d27 remove required by FF libs, install them manually 2022-03-31 15:25:41 +03:00
NNNSTH f3ffc40256 upgrade FontForge to 20220308 release 2022-03-31 11:56:12 +03:00
Trent Petersen 7c9086b958
Merge pull request #96 from gtryf/in-doc-links
Fix in-document links (supersedes #95)
2020-12-23 21:36:09 -06:00
Trent Petersen c3dbdead14
Merge pull request #88 from scrouthtv/master
Build script for Arch Linux
2020-12-23 21:34:29 -06:00
George Tryfonas 200083d154 Fix in-document links 2020-10-20 09:11:24 +03:00
Trent Petersen e902d82c3c
Merge pull request #89 from brollb/patch-1 2020-09-04 12:28:56 -05:00
Brian Broll 696c98ede9
Fix typo 2020-09-04 12:27:00 -05:00
scrouthtv 22e9201448
Build script for Arch Linux
To use the `PKGBUILD` for Arch Linux (and Manjaro, Artix, etc.) one has to open a shell, `cd` into the folder containing the `PKGBUILD` and run `makepkg -si`.
2020-08-24 17:23:57 +02:00
stephengaito 4d6f611444
Allow test directory in all source archives 2020-08-21 16:01:28 +01:00
stephengaito a68c708f22
Merge pull request #86 from stephengaito/master
adding DNF for use in Fedora and friends
2020-08-19 21:43:25 +01:00
Stephen Gaito 571ab01fb6 bumped version 2020-08-19 19:47:13 +01:00
Stephen Gaito eeedd92cd7 turn off the creation of docker containers as we now do this locally 2020-08-19 19:43:33 +01:00
Stephen Gaito c2ec4ca548 fixed problems with linuxdeploy which were stopping normal testing 2020-08-19 09:46:43 +00:00
Stephen Gaito 06a8f7b3c6 added DNF version of test installAutomaticTestSoftware 2020-07-23 18:12:15 +00:00
Stephen Gaito f9c1bcee66 added dnf buildscripts for fedora and friends 2020-07-23 12:43:10 +00:00
Stephen Gaito 3f930d3212 added BUILD_OS to reportEnvs 2020-07-22 12:51:56 +01:00
Stephen Gaito 9fc875bbd1 implementing PR 2020-07-22 12:29:18 +01:00
Stephen Gaito 5cde162633 rename docker to container or podman in build scripts 2020-07-07 19:01:43 +01:00
Trent Petersen 942c170bb2
Update README.md 2020-07-02 13:31:18 -05:00
stephengaito 87220638ff
Merge pull request #72 from stephengaito/master
fixed various issues - preparing for 0.18.8 release
Multiple small fixes
add fixes for pdf2htmlEX/pdf2htmlEX issues 70, 69, 68, 66, and 65
tested and corrected pdf2htmlEX/pdf2htmlEX issue 68 and 66
Adds `--turn-off-ligatures` command line switch to explicitly tell browsers not to use ligatures
2020-06-30 10:55:17 +01:00
stephengaito 0573a78bb6
Merge pull request #33 from stephengaito/multipleSmallFixes
Multiple small fixes
add fixes for pdf2htmlEX/pdf2htmlEX issues 70, 69, 68, 66, and 65
tested and corrected pdf2htmlEX/pdf2htmlEX issue 68 and 66
2020-06-30 10:40:45 +01:00
Stephen Gaito 33d2a5e176 tested and corrected issue 68 and 66 2020-06-29 12:23:01 +00:00
Stephen Gaito 89c74c7b21 add fixes for issues 70, g9, 68, 66, and 65 2020-06-29 11:39:52 +00:00
stephengaito a865e23b4a
Merge pull request #32 from pdf2htmlEX/master
pull recent small changed from pdf2htmlEX/pdf2htmlEX
2020-06-29 08:08:44 +01:00
Stephen Gaito 5b4dce62b9 yet another correction to build of alpine docker image 2020-06-23 13:03:30 +01:00
Stephen Gaito be8034236b corrected creation of alpine docker image 2020-06-23 10:52:49 +01:00
Stephen Gaito c40c9889d7 another correction to alpine docker file 2020-06-23 09:46:22 +01:00
Stephen Gaito 397b88121b corrected creation of alpine docker image 2020-06-23 05:15:28 +01:00
Stephen Gaito 21bb84c5da add explicit delays to allow Xvfb time to stablize 2020-06-22 23:08:56 +01:00
Stephen Gaito 4d95701ffa fixed typo in alpine docker creation as well as turn warnings back on in browser tests 2020-06-22 22:53:45 +01:00
stephengaito 92a9ee8eac
Merge pull request #30 from pdf2htmlEX/master
Merge pull request #61 from stephengaito/master
2020-06-22 12:32:41 +01:00
stephengaito e45dfe95a0
Merge pull request #61 from stephengaito/master
Update to most recent Poppler/FontForge and improved build scripts

**Update to Poppler 0.89.0**

**Update to Fontforge 20200314**

**Update build scripts:**

Major refactor of build scripts to ensure we can build pdf2htmlEX with statically linked versions of poppler and fontforge. These changes allow us to build Debian archives which will not break existing installations of poppler or fontforge on a user's machine.

Added an "experimental" build based on Alpine to produce an Alpine based docker image. NOTE: the Alpine iconv is not sufficient for all fonts required for pdf2htmlEX/poppler. This image may or may not work for your PDFs.

Fully tested using the associated Laminar scripts in stephengaito/laminar-scripts and stephengaito/pdf2htmlex-laminar-scripts
2020-06-22 12:08:37 +01:00
stephengaito 9a988599ef
Merge pull request #29 from stephengaito/updateBuildScripts
Update build scripts

Major refactor of build scripts to ensure we can build pdf2htmlEX with staticly linked versions of poppler and fontforge.

Added an "experimental" build based on Alpine to produce an Alpine based docker image. NOTE: the Alpine iconv is not sufficient for all fonts required for pdf2htmlEX/poppler. This image may or may not work for your PDFs.

Fully tested using the associated Laminar scripts in stephengaito/laminar-scripts and stephengaito/pdf2htmlex-laminar-scripts
2020-06-22 10:26:39 +01:00
Stephen Gaito 71eb7d969c corrected alpine image creation 2020-06-21 14:02:44 +01:00
Stephen Gaito 0d2c5048b0 refactored Alpine image creation 2020-06-21 12:00:27 +01:00
Stephen Gaito f340abb31e updated names of created images add gnu-libiconv-dev to alpine build 2020-06-21 07:12:05 +01:00
Stephen Gaito e4f34fdc0e added gnu-libiconv runtime dependencies of pdf2htmlEX inside Alpine linux 2020-06-20 19:46:28 +01:00
Stephen Gaito 6913b970d7 added additional runtime dependencies of pdf2htmlEX inside Alpine linux 2020-06-20 19:22:42 +01:00
Stephen Gaito 8455d458ec corrected alpine docker image creation scripts 2020-06-20 17:22:46 +01:00
Stephen Gaito e302947e48 added cairo-dev to alpine build 2020-06-20 16:54:37 +01:00
Stephen Gaito 3d5eb63486 added glib-dev to alpine build 2020-06-20 16:38:46 +01:00
Stephen Gaito 83b12315b3 added gettext-dev to alpine build 2020-06-20 16:17:03 +01:00
Stephen Gaito e777c6ef4b added fontconfig-dev to alpine build 2020-06-20 16:09:23 +01:00
Stephen Gaito 1dab7509c4 added freetype-dev to alpine build 2020-06-20 16:05:01 +01:00
Stephen Gaito c235a6ba7d continued corrections of travis build and test 2020-06-20 13:12:53 +01:00
Stephen Gaito 8f19c49a7a corrected travis error 2020-06-20 13:04:56 +01:00
Stephen Gaito 310bbccfe1 corrected installation of automaice test software 2020-06-20 12:29:01 +01:00
Stephen Gaito c09362078d continued work on making ubuntu and alpine builds distinct 2020-06-20 11:52:17 +01:00
Stephen Gaito 98acb27bfe begun to explicitly name apt and ubuntu buildScripts 2020-06-20 10:31:35 +01:00
Stephen Gaito 8a04d6a192 added browser_tests SUCCESS if dff_bbox is not None but basefilename is test_fail 2020-06-20 10:13:26 +01:00
Stephen Gaito f1abed5a1f first attempt at integration of build on Alpine Linx 2020-06-20 09:11:30 +00:00
Stephen Gaito 32f37576d5 removed old createDockerImages added explicit words SUCCESS and FAILURE in browser_tests 2020-06-19 17:20:53 +01:00
Stephen Gaito 658b064604 attempt docker build from deb using travisTGclwBM 2020-06-19 12:55:06 +01:00
Stephen Gaito b671343757 corrected docker build from debian archive 2020-06-19 12:54:04 +01:00
Stephen Gaito a9d178ea0b another attempt to solve dpkg-deb invalid characters in version problem 2020-06-19 12:17:14 +01:00
Stephen Gaito ccfe780b80 corrected PDF2HTMLEX_VERSION 2020-06-19 11:37:25 +01:00
Stephen Gaito 2b51b0e62d attempt to build docker image from deb archive 2020-06-19 11:32:45 +01:00
Stephen Gaito 8f58db5f7f travis fix 3 2020-06-19 11:19:43 +01:00
Stephen Gaito 2cbbd3beb7 fix travis 2 2020-06-19 10:24:16 +01:00
Stephen Gaito d3550d5ea8 first attempt to fix docker outside ldconfig problem and correct travis script 2020-06-19 09:34:51 +01:00
Stephen Gaito a5dd4865ae corrected test.py.in from failing with appImages complex PATH and ARGS 2020-06-17 19:56:35 +01:00
Stephen Gaito cb00d5a5d2 attempt to debug appImage problems 2020-06-17 16:14:24 +01:00
Stephen Gaito 27df8a4262 corrected produceHtmlForBrowserTests 2020-06-17 14:14:55 +01:00
Stephen Gaito eb63aa06a4 corrected setup of data directory for tests 2020-06-17 11:32:06 +01:00
Stephen Gaito 402273ff2a second attempt to fix test.py.in 2020-06-16 16:38:40 +01:00
Stephen Gaito 7d2c5df9d7 corrected runTests to use pdf2htmlEX/test/runLocalTestsBash 2020-06-16 16:26:19 +01:00
Stephen Gaito 7f2bb46407 explitictly split PDF2HTMLEX_PATH in test.py.in to allow for arguments in path 2020-06-16 15:48:01 +01:00
Stephen Gaito 16c88c49c4 browser_tests now use pre computed html 2020-06-15 14:27:28 +01:00
Stephen Gaito df62ee7f21 renamed runLocalTests 2020-06-14 17:07:34 +01:00
Stephen Gaito 2853b9e36b refactored existing python3 test_output.py tests to use only bash and pdf2htmlEX so we do not need to load extra fonts by accident 2020-06-14 16:46:05 +01:00
Stephen Gaito 4171aef19e added explicit install of wget in installAutomaticTests 2020-06-14 10:35:20 +01:00
Stephen Gaito f48822d816 corrected printing of error messages in test.py.in 2020-06-13 19:38:51 +01:00
Stephen Gaito d373e10218 corrected createImages 2020-06-12 14:53:44 +01:00
Stephen Gaito bf924dca2d explicitly split createDockerImage into an inside and an outside docker container parts 2020-06-12 14:50:49 +01:00
Stephen Gaito 501b73b489 exploring create image permissions problems 2020-06-11 09:27:47 +01:00
Stephen Gaito c10efe8ece updated createAppImage to understand permissions problems 2020-06-11 09:05:14 +01:00
Stephen Gaito d327b43a43 ensure files copied into AppImage Debian archive and Docker image are readable added sudo as a build tool 2020-06-11 06:37:23 +01:00
Stephen Gaito 174f28a21a updated required build tools 2020-06-09 12:52:18 +01:00
Stephen Gaito d5fd346ba0 corrected documentation 2020-06-06 13:09:54 +01:00
Stephen Gaito 87bc1ba525 updated release message 2020-06-06 12:53:21 +01:00
Stephen Gaito aaa7f53c58 corrected appimage creation 2020-06-06 12:31:17 +01:00
Stephen Gaito 8f86e21b8f test travis 2020-06-06 11:52:52 +01:00
Stephen Gaito a3b712d893 added creation and upload of test results 2020-06-06 10:39:36 +00:00
Stephen Gaito 570421d04a corrected travis release scripts 2020-06-06 09:59:52 +01:00
Stephen Gaito 76bd542ae5 test travis 3 2020-06-06 09:40:24 +01:00
Stephen Gaito c69a56f41e test travis 2 2020-06-06 09:37:55 +01:00
Stephen Gaito cee878e667 test travis 2020-06-06 09:34:34 +01:00
Stephen Gaito 5165d5d6e7 fixed versionEnvs 2020-06-06 09:29:55 +01:00
Stephen Gaito 5ddc84e7f8 fixed reportEnvs 2020-06-06 09:25:50 +01:00
Stephen Gaito 1cb016fd14 enable releases on multiple ubuntu distributions reattempt travis 2020-06-06 09:22:08 +01:00
Stephen Gaito 6028a9d280 enable releases on multiple ubuntu distributions 2020-06-06 09:15:01 +01:00
Stephen Gaito d456ae4412 start multiple releases via travis 2020-06-06 09:00:07 +01:00
Stephen Gaito 6b11b0133e added upload of deb pakcage to githubTGclwBM 2020-06-06 08:21:31 +01:00
Stephen Gaito 7417038308 added upload of deb pakcage to github 2020-06-06 08:18:44 +01:00
Stephen Gaito f3e7e60ed2 corrected docker image creation and added additional build documentation 2020-06-06 07:50:22 +01:00
Stephen Gaito 2faa2c022a corrected travis build 2020-06-06 07:03:26 +01:00
Stephen Gaito 0d5d7ad721 corrected travis configuration 2020-06-06 06:33:45 +01:00
Stephen Gaito a5209ace82 turned on simple tests and upload from travis 2020-06-06 06:18:14 +01:00
Stephen Gaito 49712c9ec2 minor corrections 2020-06-05 12:06:51 +01:00
Stephen Gaito d4c172d8ce minor corrections 2020-06-05 11:55:54 +01:00
Stephen Gaito d49260afe7 corrected table of contents 2020-06-05 11:47:46 +01:00
Stephen Gaito 3f45343ba4 added more comprehensive documentation for the build scripts 2020-06-05 11:44:33 +01:00
stephengaito 6f38dfffeb
Merge pull request #28 from stephengaito/travisLocalTests
Travis local tests
Partial work on using travis to perform local browser tests... which fail in way different to local browser tests on a local machine.... so we need a strategy to allow failures on travis AND to automatically upload the results to the github releases page...
BUT we will overhaul and document the buildScripts before fixing this issue.
2020-06-05 08:18:55 +01:00
Stephen Gaito 8358679784 test creating images inside travis 2020-06-03 19:25:05 +01:00
Stephen Gaito f584f9196e attempt local browser tests with travis 2020-06-03 18:55:37 +01:00
Stephen Gaito 68ce207809 updated tests 2020-06-03 15:13:29 +01:00
Stephen Gaito a2b2e9dbc4 updated tests 2020-06-03 15:10:37 +01:00
Stephen Gaito 7745c3ba85 updated tests 2020-06-03 15:06:05 +01:00
Stephen Gaito 939075cc3a added testScript to run local tests 2020-06-03 14:54:10 +01:00
stephengaito fbf06c21f8
Merge pull request #27 from stephengaito/updateTests
updated local tests and added bash scripts to help automate testing.
updated local tests (currently ignoring remote browser tests)
currently the browser_tests/text_visibility fails because of clipping issues (probably actually layering interactions with clipping)
added bash scripts to help install run and check the test outputs, as well as regenerate tests which fail simply due to slight layout changes.
2020-06-03 14:42:54 +01:00
Stephen Gaito d2e869f05c updated local tests and added bash scripts to help automate testing. 2020-06-03 12:17:44 +00:00
stephengaito 0b0d14afd9
Merge pull request #26 from stephengaito/updateTravis
Update travis
Sorted out building on Travis-Linux (Ubuntu 18.04) now working but need tests and upload
Attempted (and failed) to get Travis-MacOS working. Since I have no MacOS machines locally and the cost of a cloud MacOS instance is too high, I am unable to understand how to fix HomeBrew build.
ABANDONED HomeBrew for MacOS.
2020-06-03 05:19:31 +01:00
Stephen Gaito d7da59ba12 cleaned up references to apt build scripts 2020-06-02 18:45:29 +00:00
Stephen Gaito f33ec28d89 removed all brew related build scripts as well as install poppler and fontforge 2020-06-02 18:41:10 +00:00
Stephen Gaito 91c1163721 begun cleaning up buildScripts to remove brew 2020-06-02 15:54:32 +00:00
Stephen Gaito 3f6d39e71f move brew install into .travis.yml 2020-06-02 14:02:30 +00:00
Stephen Gaito 5941fb40c4 corrected brew installs for travis homebrew 2020-06-02 13:45:26 +00:00
Stephen Gaito 2904663ad2 started work on macos travis builds 2020-06-02 13:28:36 +00:00
Stephen Gaito 3e835a38e2 refactored use of set ev 2020-06-02 11:58:27 +00:00
Stephen Gaito f1828789f6 ensure important buildScripts have set ev 2020-06-02 11:34:11 +00:00
Stephen Gaito aaf512d418 updated buildPopper to explicitly enable or disable graphics packages used by pdf2htmlEX 2020-06-02 11:19:52 +00:00
Stephen Gaito f922bf7b88 test travis 1 2020-06-02 10:47:40 +00:00
stephengaito ec281e3b70
Merge pull request #25 from stephengaito/linuxBrew
initial changes to suit linuxBrew
Fixed pdf2htmlEX/CMakeLists.txt to only use the CAIRO_LIBRARY_DIRS if NOT USING_BREW
Brought buildScripts/*Brew uptodate with the *Apt versions
2020-06-02 10:44:28 +01:00
stephengaito 33e5a0e3de
Merge branch 'master' into linuxBrew 2020-06-02 10:44:02 +01:00
Stephen Gaito 9a13676801 initial changes to suit linuxBrew 2020-06-02 04:14:34 +00:00
stephengaito 9a2ba163e1
Merge pull request #24 from stephengaito/debianPackaging
Debian packaging
Added scripts to automatically build Debian archive packages of pdf2htmlEX
2020-06-01 17:49:28 +01:00
Stephen Gaito cf48cf54c1 removed dependence on lsb_release and ensured dpkg-architecture is installed 2020-06-01 16:12:22 +00:00
Stephen Gaito ed2f9db9cb added createDebianPackage into createImages added Licenses corrected install of poppler-data 2020-06-01 11:06:06 +00:00
Stephen Gaito 82aeeac8c7 corrected debian dependencies for lack of libglib-2.0 2020-06-01 11:28:38 +01:00
Stephen Gaito a73211fb9b provisional commit of scripts to build debian package 2020-06-01 07:49:30 +00:00
Stephen Gaito 1b7bab3e2d begun rearranging poppler-data-dir 2020-05-31 18:34:48 +00:00
Stephen Gaito 30ffdeeea4 initial work on packaging debian old script too complex and does not work with new build system 2020-05-31 15:18:57 +00:00
Stephen Gaito 040037ad3a begun work on reintroducing building debian packages 2020-05-31 13:58:56 +01:00
stephengaito 3fcd0a6674
Merge pull request #23 from stephengaito/cleanUpBuild
Clean up build
Turned off unused options for both Poppler (0.89.0) and FontForge (20200314)
Removed unused (apt) pacakges
Proved that we can build on xenial (16.04), bionic(18.04), focal(20.04) (and probably eoan (19.10))
2020-05-31 13:48:08 +01:00
Stephen Gaito 2d293d2b61 corrected required packages and worked on pdf2htmlEX library list 2020-05-31 08:28:39 +00:00
Stephen Gaito 576d2b71d9 begun removing un-used libraries 2020-05-31 08:03:43 +00:00
Stephen Gaito 465d2f0f32 updated build options for fontforge and poppler to a minimum 2020-05-31 07:57:12 +00:00
Stephen Gaito d27f7d3a8b recorded cmake build options for fontforge and poppler turn off options not used by pdf2htmlEX 2020-05-31 07:18:54 +00:00
stephengaito 436d672649
Merge pull request #22 from stephengaito/poppler-0.89.0
updated to poppler-0.89.0 with no obvious changes
2020-05-30 22:22:15 +01:00
Stephen Gaito 53005f5e5c updated to poppler-0.89.0 with no obvious changes 2020-05-30 21:19:25 +00:00
stephengaito 06a47baaeb
Merge pull request #21 from stephengaito/poppler-0.88.0
updated to poppler-0.88.0 no obvious changes
2020-05-30 20:10:46 +01:00
Stephen Gaito 091f8b3828 updated to poppler-0.88.0 no obvious changes 2020-05-30 19:07:04 +00:00
stephengaito 91afc433cd
Merge pull request #20 from stephengaito/poppler-0.87.0
update to poppler 0.87.0 with no obvious changes
2020-05-30 19:50:21 +01:00
Stephen Gaito 5cb2553bc6 update to poppler 0.87.0 with no obvious changes 2020-05-30 18:48:06 +00:00
stephengaito ae063c3a44
Merge pull request #19 from stephengaito/poppler-0.86.1
Update to poppler-0.86.1
findDest now returns stg::unique_ptr and getURI no longer returns GooString but simply std::string
2020-05-30 19:20:43 +01:00
Stephen Gaito 0217c93418 findDest now returns stg::unique_ptr and getURI no longer returns GOOString but simpley std::string 2020-05-30 15:26:11 +00:00
stephengaito beabf6dfdd
Merge pull request #18 from stephengaito/poppler-0.85.0
updated to poppler-0.85.0 no obvious changes
Updated to poppler 0.85.0
There were NO obvious changes needed in the code.
There were NO obvious differences in the various PDFs tested.
2020-05-30 13:46:29 +01:00
Stephen Gaito 0544f79f52 updated to poppler-0.85.0 no obvious changes 2020-05-30 12:44:57 +00:00
stephengaito 169a1744ab
Merge pull request #17 from stephengaito/poppler-0.84.0
Poppler 0.84.0
Updated to poppler-0.84.0
Poppler 0.84.0 removed the ModRegion tracking.
We now use the bitmap's width and height (ie the whole bitmap).
This might increase the processing time as well as the output image sizes.
2020-05-30 13:24:27 +01:00
Stephen Gaito e60bd3819e tidied up previous changes 2020-05-30 11:21:22 +00:00
Stephen Gaito be1d2079ac poppler 0.84.0 removed ModRegion tracking 2020-05-30 09:55:35 +00:00
stephengaito 1f717346b6
Merge pull request #16 from stephengaito/fontforge20200314
Fontforge20200314
Updated FontForge dependency to the most recent version (20200314)
2020-05-30 08:50:28 +01:00
Stephen Gaito e4c666b4bf corrected ill advised copy of libfontconfig into appImage 2020-05-30 07:46:22 +00:00
Stephen Gaito 930915df34 removed fontforge git version as it is not a stable representation of 20200314 version 2020-05-30 06:59:21 +00:00
Stephen Gaito 7b5780ea83 updated fontforge to 20200314 2020-05-30 06:20:37 +00:00
stephengaito ece34e216f
Merge pull request #15 from stephengaito/staticBuild
Static build
Remove the FontForge and Poppler Cairo sources from the main pdf2htmlEX source tree.
Build both FontForge and Poppler statically and then link into pdf2htmlEX so there is no longer any need to locally install versions of FontForge or Poppler which are compatible with pdf2htmlEX (and so we reduce conflicts with any FontForge or Poppler libraries installed by the user).
2020-05-29 19:45:31 +01:00
Stephen Gaito d42b1c1a2e removed poppler Cairo source copies inside pdf2htmlEX source tree 2020-05-29 18:16:50 +00:00
Stephen Gaito 83ec96f0e3 initial attempt at building poppler and fontforge statically and linking into pdf2html 2020-05-29 15:48:42 +00:00
Stephen Gaito 0cfb9720ab added new poppler and fontforge release targets 2020-05-29 06:58:52 +01:00
Stephen Gaito 6ff6689d9f minor correction to createDockerImage 2020-05-28 11:42:35 +00:00
Stephen Gaito 124cae5d21 updated createAppImage and createDockerImage scripts to be able to work inside a docker container 2020-05-28 10:59:27 +00:00
stephengaito 1456c255bf
updated .gitignore to ignore imageBuild poppler-data and reSourceVersionEvns buildScript 2020-05-28 08:11:20 +01:00
stephengaito ae62ce9762
Merge pull request #14 from stephengaito/update-poppler
Update poppler to 0.83.0

Updated poppler dependency to poppler-0.83.0 as well as some minor build script refactoring (alas we can still not build on homebrew)
2019-12-18 10:07:57 +00:00
Stephen Gaito 8d6e9636ad updated image creation for poppler-data 2019-12-17 17:45:56 +00:00
Stephen Gaito b4df602953 continued work on the use of prefix 2019-12-17 17:24:05 +00:00
Stephen Gaito 64531afdda refactored build prefix 2019-12-17 16:48:24 +00:00
Stephen Gaito f7295b7388 put pdf2htmlex_prefix into reSourceVersionEnvs 2019-12-17 16:44:24 +00:00
Stephen Gaito 8f496afa8b refactored install directory to PDF2HTMLEX_PREFIX 2019-12-17 16:23:39 +00:00
Stephen Gaito c46d2ad733 create getPdf2htmlEXBrew for home/linux brew users 2019-12-17 16:06:00 +00:00
Stephen Gaito 45e6d8e80b updated how poppler-data in built 2019-12-17 16:01:02 +00:00
Stephen Gaito 5fc7d42a16 added get tools and libraries using both apt and brew 2019-12-17 06:15:03 +00:00
Stephen Gaito 23830c24f0 corrected travis homebrew to remove python 2 2019-12-13 21:54:01 +00:00
Stephen Gaito 34da5a01a0 pushed again to force travis 2019-12-13 14:33:16 +00:00
Stephen Gaito c75471f131 turned travis back on 2019-12-13 14:26:05 +00:00
Stephen Gaito 99fc35b8b5 corrected font forge build 2019-12-13 13:44:50 +00:00
Stephen Gaito 4007aa64e5 corrected 3rdParty poppler files 2019-12-13 12:06:45 +00:00
Stephen Gaito 1d29159ecb added build script to list files by change times 2019-12-13 11:44:20 +00:00
Stephen Gaito a8323f1c16 initial pass at updating pdf2htmlEX to use poppler-0.83.0 2019-12-13 11:27:54 +00:00
Stephen Gaito 59dcc07638 bumped poppler version 2019-12-13 09:24:01 +00:00
Stephen Gaito 53bba3d3e7 begun work on updating pdf2htmlEX to poppler-0.83.0 2019-12-13 09:20:31 +00:00
stephengaito 7b6f22f636
Merge pull request #13 from stephengaito/fontforge-update
Fontforge update (update pdf2htmlEX's dependence upon fontforge to fontforge version 20190801) in the pdf2htmlEX development repository
2019-12-13 09:12:42 +00:00
Stephen Gaito 0344f5121d allowed uploadImages to be executed by all local users 2019-12-13 09:05:16 +00:00
Stephen Gaito e5e9b9933f updated comments for fontforge-20190801 include files 2019-12-13 08:05:14 +00:00
Stephen Gaito 7eea4d601d corrected missplaced argv0 2019-12-11 17:23:14 +00:00
Stephen Gaito 76c64a3c2a now use argv0 to initialize ffw 2019-12-11 10:06:31 +00:00
Stephen Gaito 1e7355f6fc added gutils lib 2019-12-10 18:49:12 +00:00
Stephen Gaito 6eba02cfc2 added an explicity FintProgDir to ffw_init 2019-12-10 07:35:52 +00:00
Stephen Gaito ae281bc87a moved forward t python3 2019-12-10 06:08:49 +00:00
Stephen Gaito 7e20d11b0a updated fontforge build script to not build xwindows ui 2019-12-10 05:37:56 +00:00
Stephen Gaito 4a0a48cf69 initial update to fontforge 20190801 2019-12-09 10:45:13 +00:00
Stephen Gaito 4a0d08822b updated work from newBuildSystem to fontforge-update 2019-12-09 07:45:53 +00:00
stephengaito cca9ac94ce
Merge pull request #12 from stephengaito/newBuildSystem
merge New build system into master to enable work on bringing fontforge uptodate
2019-12-09 07:37:08 +00:00
Stephen Gaito d6ac2b4a6a turned travis off for the moment 2019-12-09 07:35:00 +00:00
Stephen Gaito ac9a469ca8 try tool to extract brew info versions 7 2019-12-06 19:54:43 +00:00
Stephen Gaito 3e5082566f try tool to extract brew info versions 6 2019-12-06 19:15:50 +00:00
Stephen Gaito ab09224d8b try tool to extract brew info versions 5 2019-12-06 18:36:39 +00:00
Stephen Gaito 8e5b3ab0c8 try tool to extract brew info versions 4 2019-12-06 17:52:05 +00:00
Stephen Gaito f70211f8c9 try tool to extract brew info versions 4 2019-12-06 17:39:22 +00:00
Stephen Gaito b9998d6ef2 try tool to extract brew info versions 3 2019-12-06 17:32:16 +00:00
Stephen Gaito 1a7ac1f7b7 try tool to extract brew info versions 2 2019-12-06 17:21:37 +00:00
Stephen Gaito 5b1a711514 try tool to extract brew info versions 1 2019-12-06 17:17:47 +00:00
Stephen Gaito 741e6fdd5d try tool to extract brew info versions 2019-12-06 17:12:59 +00:00
Stephen Gaito f20eaa4aae attempt to force python v2.7 2 2019-12-06 15:44:19 +00:00
Stephen Gaito 282f4bf531 attempt to force python v2.7 2019-12-06 14:50:02 +00:00
Stephen Gaito 79e3d55f47 updated homebrew script to provide more detail 2019-12-05 08:42:24 +00:00
Stephen Gaito 345e931073 updated homebrew script to provide more detail 2019-12-05 07:57:51 +00:00
Stephen Gaito 76a12d3a07 updated osx_image in travis 2019-12-05 07:55:00 +00:00
Stephen Gaito 45836b7ab4 corrected homebrew scripts 2019-12-04 22:12:13 +00:00
Stephen Gaito ac797cb2d9 updated brew scripts 2019-12-04 17:49:50 +00:00
Stephen Gaito d5ec2a38ea updated linuxbrew script 2019-12-04 14:11:58 +00:00
Stephen Gaito e9ec374455 updated homeBrew script 2019-12-04 13:34:04 +00:00
Stephen Gaito c8fb950ae8 updated travis homebrew build script 2019-12-04 13:26:26 +00:00
Stephen Gaito 3522bea042 correcte OSx script 2019-12-04 12:08:47 +00:00
Stephen Gaito 39b667404b refactored travis build scripts for linux and osx work 2019-12-04 12:06:17 +00:00
Stephen Gaito 96fd4c90d6 retry osx travis build 3 2019-12-03 21:27:59 +00:00
Stephen Gaito ede3cd8961 retry osx travis build 2 2019-12-03 21:27:24 +00:00
Stephen Gaito e022417d67 retry osx travis build 1 2019-12-03 21:09:00 +00:00
Stephen Gaito a45238f91f retry osx travis build 2019-12-03 19:39:47 +00:00
Stephen Gaito 385108fceb corrected upload scripts 2019-12-03 19:15:21 +00:00
Stephen Gaito b0c06bcfff build on osx using homebrew 2019-12-03 18:36:56 +00:00
Stephen Gaito 75f8a94d70 updated gitignore as part of work on homeBrew formula 2019-12-03 06:34:35 +00:00
Stephen Gaito 8d4b348688 updated uploadGitHub scripts 2019-11-29 12:35:49 +00:00
Stephen Gaito af9c57800c corrected scripts 2019-11-29 12:11:03 +00:00
Stephen Gaito cbcbc879c9 refactored overall bulid process scripts 2019-11-29 09:57:32 +00:00
Stephen Gaito f2e7a432ba corrected doItAllLocally 2019-11-29 09:43:57 +00:00
Stephen Gaito c50bc7ecfa refactored upload scripts 2019-11-29 09:43:07 +00:00
Stephen Gaito b207b8ea48 refactored to provide build stage headers and improved the upload function 2019-11-29 09:11:32 +00:00
Stephen Gaito 41e8218f65 refactored upload process 2019-11-29 07:28:23 +00:00
Stephen Gaito cd88751cf3 corrected release upload 2019-11-28 19:13:40 +00:00
Stephen Gaito ce93fa036d corrected build scripts 2019-11-28 18:27:43 +00:00
Stephen Gaito 69b18fdab3 updated documentation for uploadReleaseTool 2019-11-28 17:30:45 +00:00
Stephen Gaito b17931b4fc attempting to use new github upload tool 2019-11-28 17:23:26 +00:00
Stephen Gaito e00def0bb6 correded createDockerImage 2019-11-28 14:07:07 +00:00
Stephen Gaito 1000742831 corrected build and upload 2019-11-28 13:49:35 +00:00
Stephen Gaito 8fe76e3086 penultimage build tools 2019-11-28 13:04:03 +00:00
Stephen Gaito 99ff9da2d9 corrected reSourceVersionEnvs 2019-11-28 12:21:58 +00:00
Stephen Gaito bf9fe5cfc1 started using reSourceVersionEnvs 2019-11-28 12:04:22 +00:00
Stephen Gaito a693e3d33c corrected versionEnvs 2019-11-28 10:34:38 +00:00
Stephen Gaito d640bd83f0 corrected versionEnvs 2019-11-28 10:32:42 +00:00
Stephen Gaito 24631e31ab begun refactoring travis for tests as well as builds 2019-11-28 10:28:03 +00:00
Stephen Gaito 3de9280d0a corrected doItAll 2019-11-28 09:15:56 +00:00
Stephen Gaito 7f4f72fb05 refactored upload 2019-11-28 09:07:49 +00:00
Stephen Gaito 4006c6ebc9 travis full test 6 2019-11-27 17:34:24 +00:00
Stephen Gaito c5d5799b13 travis full test 5 2019-11-27 17:33:15 +00:00
Stephen Gaito acb14e9900 travis full test 4 2019-11-27 16:44:08 +00:00
Stephen Gaito 606d8a9879 travis full test 3 2019-11-27 15:41:47 +00:00
Stephen Gaito c52278a8fb travis full test 2 2019-11-27 15:22:02 +00:00
Stephen Gaito 633b67144b travis full test 1 2019-11-27 12:53:22 +00:00
Stephen Gaito 72dc72625d travis full test 2019-11-27 12:24:03 +00:00
Stephen Gaito aedf075ebf test travisci 8 2019-11-27 10:01:51 +00:00
Stephen Gaito 6b44ed7471 test travisci 7 2019-11-27 09:20:07 +00:00
Stephen Gaito 14f63e0153 test travisci 6 2019-11-27 09:05:46 +00:00
Stephen Gaito 50b1981931 test travisci 5 2019-11-27 09:02:22 +00:00
Stephen Gaito eaa4358676 test travisci 4 2019-11-27 09:00:20 +00:00
Stephen Gaito f849507a9f test travisci 3 2019-11-27 08:56:21 +00:00
Stephen Gaito cb0e2e8d08 test travisci 2 2019-11-27 08:53:28 +00:00
Stephen Gaito 891900c99d test travisci 1 2019-11-27 08:50:34 +00:00
Stephen Gaito db644bd1a8 travis test of release appImage 2 2019-11-26 19:43:56 +00:00
Stephen Gaito 342a7569cc travis test release of appImage 2019-11-26 17:13:58 +00:00
Stephen Gaito 7b68265845 corrected travis 28 2019-11-26 13:41:13 +00:00
Stephen Gaito 73408eab6a corrected travis 27 2019-11-26 13:18:21 +00:00
Stephen Gaito aa66683277 corrected travis 26 2019-11-26 13:10:52 +00:00
Stephen Gaito d65e6ff66e corrected travis 25 2019-11-26 12:55:53 +00:00
Stephen Gaito 0792e570a5 corrected travis 24 2019-11-26 12:36:10 +00:00
Stephen Gaito ec7d6d9379 corrected travis 23 2019-11-26 12:13:27 +00:00
Stephen Gaito 34d53bdb75 corrected travis 22 2019-11-26 12:03:23 +00:00
Stephen Gaito 73f0eb7191 corrected travis 21 2019-11-26 11:45:58 +00:00
Stephen Gaito de1be14b03 corrected travis 20 2019-11-26 11:33:53 +00:00
Stephen Gaito 7a74250679 corrected travis 19 2019-11-26 11:19:49 +00:00
Stephen Gaito d22652e5ba corrected travis 18 2019-11-26 10:54:21 +00:00
Stephen Gaito d6420613d9 corrected travis 17 2019-11-26 10:49:39 +00:00
Stephen Gaito df1f265592 corrected travis 16 2019-11-26 10:18:08 +00:00
Stephen Gaito 23d9686096 corrected travis 15 2019-11-26 10:13:40 +00:00
Stephen Gaito 67db9afabf corrected travis 14 2019-11-26 09:55:05 +00:00
Stephen Gaito 948e523201 corrected travis 13 2019-11-26 09:54:05 +00:00
Stephen Gaito 496e7f26d7 corrected travis 12 2019-11-26 09:45:56 +00:00
Stephen Gaito 0fdb4212c7 corrected travis 11 2019-11-26 09:44:53 +00:00
Stephen Gaito 6e44db6518 corrected travis 10 2019-11-26 09:07:03 +00:00
Stephen Gaito dd449967bd corrected travis 9 2019-11-26 08:43:41 +00:00
Stephen Gaito ca690632e9 check for existing docker commands before trying to create docker 2019-11-26 07:52:30 +00:00
Stephen Gaito c4a7a9fb03 corrected travis 8 2019-11-26 07:20:17 +00:00
Stephen Gaito be3ebe2ddd corrected travis 7 2019-11-25 22:17:08 +00:00
Stephen Gaito 7155ed25cc corrected travis 6 2019-11-25 22:06:17 +00:00
Stephen Gaito 1f25183b4c corrected tarvis 5 2019-11-25 20:04:24 +00:00
Stephen Gaito 8f177e198d corrected tarvis 4 2019-11-25 19:57:11 +00:00
Stephen Gaito a8346a4204 corrected tarvis 3 2019-11-25 19:31:00 +00:00
Stephen Gaito fe21113090 corrected tarvis 2 2019-11-25 19:28:50 +00:00
Stephen Gaito 93ed653ba9 corrected tarvis 2019-11-25 19:27:09 +00:00
Stephen Gaito 58bdd22293 final correction and first travis build 2019-11-25 18:53:01 +00:00
Stephen Gaito 4d78893209 corrected build scripts 2019-11-25 18:06:04 +00:00
Stephen Gaito c5ab4f4f9e corrected build scripts 2019-11-25 16:46:14 +00:00
Stephen Gaito 1bf3eadbdc added image creation to doItAll 2019-11-25 16:10:34 +00:00
Stephen Gaito dd3596432b tidied build scripts 2019-11-25 16:04:50 +00:00
Stephen Gaito 817db7592a initial working draft of building docker image 2019-11-25 11:19:44 +00:00
Stephen Gaito 071904fd83 updated doItAll 2019-11-23 17:49:43 +00:00
Stephen Gaito b6813a98f5 corrected spelling 2019-11-23 10:28:43 +00:00
Stephen Gaito 2be9837422 continued work on image creation 2019-11-23 10:25:09 +00:00
Stephen Gaito 1580ce3e53 added version information to AppImage 2019-11-23 07:05:50 +00:00
Stephen Gaito 51ea338524 added patch to fix the FONTFORGE_GIT_VERSION for our use 2019-11-23 06:41:05 +00:00
Stephen Gaito f7aa5f3b48 rearrange fontforge patches 2019-11-23 06:23:30 +00:00
Stephen Gaito 019db4e635 added signal handler code 2019-11-22 17:43:56 +00:00
Stephen Gaito 7e270ab497 force libfontconfig into appimage 2019-11-22 17:25:05 +00:00
Stephen Gaito 0bc60ce726 corrected doItAll 2019-11-22 12:27:33 +00:00
Stephen Gaito d70cf0aceb corrected doItAll 2019-11-22 12:20:08 +00:00
Stephen Gaito 65e674db42 alpha version of build scripts 2019-11-22 12:08:20 +00:00
Stephen Gaito 73d379e407 begun work on assembling images 2019-11-21 20:34:17 +00:00
Stephen Gaito 0b8bcf565c added patches 2019-11-21 19:06:46 +00:00
Stephen Gaito 0eecbed932 corrected build scripts to reflect those on virtual machine 2019-11-21 18:43:26 +00:00
Stephen Gaito 5a1a090a5e corrected getFontForge 2019-11-21 16:38:40 +00:00
Stephen Gaito 03bdc9bda7 continued correcting buildscripts 2019-11-21 16:33:24 +00:00
Stephen Gaito 9f48bcd107 updated build scripts 2019-11-21 16:03:35 +00:00
Stephen Gaito f82e1cbd58 corrected the apt get scripts 2019-11-21 15:54:21 +00:00
Stephen Gaito 2e618dbac4 turned travis off for the moment 2019-11-21 15:45:52 +00:00
Stephen Gaito 42244c55b7 added getPdf2htmlEX 2019-11-21 15:42:49 +00:00
Stephen Gaito 1bf18efff9 added apt based get scripts 2019-11-21 15:37:18 +00:00
Stephen Gaito 4a29b8bc15 added apt based get scripts 2019-11-21 15:36:04 +00:00
Stephen Gaito 4a6f578e55 updated getFontForge to simply get the source 2019-11-21 14:24:29 +00:00
Stephen Gaito 3f943cddeb updated getFontForge 2019-11-21 14:13:14 +00:00
Stephen Gaito 87ecadd589 added buildScripts 2019-11-21 13:31:28 +00:00
Stephen Gaito 4e4f152828 initial restructure of directories 2019-11-21 12:35:10 +00:00
stephengaito e4ba125385
Merge pull request #11 from pdf2htmlEX/master
update development project from master project
2019-11-21 10:51:52 +00:00
Trent Petersen 152a096d1a
Create FUNDING.yml 2019-11-07 07:40:02 -06:00
Stephen Gaito 39acaf40d7 corrected location of scripts for build 2019-09-30 12:12:42 +01:00
Stephen Gaito 7a0ac67cee added important old releases to tarvisCI build matrix 2019-09-30 12:05:16 +01:00
Stephen Gaito ae5b29c871 corrected installed location of pdf2htmlEX 2019-09-30 11:15:08 +01:00
Stephen Gaito 1fc810a266 corrected installation of pdf2htmlEX for use in travisCI with no user input 2019-09-30 11:05:33 +01:00
Stephen Gaito d2d186b912 corrected installPoppler 2019-09-30 10:54:53 +01:00
Stephen Gaito 784158cb23 continued attempt to install poppler from cd directory 2019-09-30 10:46:36 +01:00
Stephen Gaito 7f58caabbb determine where installPoppler.sh is when it fails 2019-09-30 10:32:39 +01:00
Stephen Gaito 0119f53e28 corrected spelling of .travisScripts 2019-09-30 10:23:37 +01:00
Stephen Gaito a6af412398 restart travis 2019-09-30 10:19:17 +01:00
Stephen Gaito eab1d35837 initial attempt at updating travis.yml 2019-09-30 10:15:59 +01:00
stephengaito b69b800048
Merge pull request #36 from stephengaito/master
development changes required for poppler-0.81.0
2019-09-27 13:43:55 +01:00
Stephen Gaito 1bdd3cd404 initial update for poppler-0.81.0 2019-09-27 13:25:13 +01:00
stephengaito f8ad1008a8
update for poppler-0.81.0 2019-09-27 13:22:04 +01:00
stephengaito d4ec42eb3b
bumped patch version for poppler-0.81.0 2019-09-27 13:21:19 +01:00
stephengaito e7853ec6d9
Merge pull request #10 from pdf2htmlEX/master
pull master back to development for poppler-0.81.0
2019-09-27 13:20:43 +01:00
stephengaito 583b18b887
Merge pull request #35 from stephengaito/master
update master for use with poppler-0.80.0
2019-09-27 12:46:13 +01:00
stephengaito b12c4cd524
update for poppler-0.80.0 2019-09-27 12:30:53 +01:00
stephengaito c5a0d5221e
bumped patch version for poppler-0.80.0 2019-09-27 12:30:14 +01:00
stephengaito 193990209e
Merge pull request #9 from pdf2htmlEX/master
pull master to development for poppler-0.80.0
2019-09-27 12:26:25 +01:00
stephengaito db4cc40d13
Merge pull request #34 from stephengaito/master
update for poppler-0.79.0
2019-09-27 09:54:11 +01:00
stephengaito 712a40325b
update for poppler-0.79.0 2019-09-27 09:32:21 +01:00
stephengaito 5c75187eaf
bumpd patch version for poppler-0.79.0 2019-09-27 09:31:38 +01:00
stephengaito 24d9fdda5c
Merge pull request #8 from pdf2htmlEX/master
pull master back to development for poppler-0.79.0
2019-09-27 09:29:26 +01:00
stephengaito 34bacbbff5
Merge pull request #33 from stephengaito/master
update pdf2htmlEX source to work with poppler-0.78.0
2019-09-27 08:36:45 +01:00
stephengaito b4df4fd57c
updated for poppler-0.78.0 2019-09-27 08:24:44 +01:00
stephengaito 82a49b6384
bumped patch version for poppler-0.78.0 2019-09-27 08:23:58 +01:00
stephengaito 02eb34ac05
Merge pull request #7 from pdf2htmlEX/master
pull recent changes from v0.18.3
2019-09-27 08:20:18 +01:00
stephengaito 7f575faae8
updated for poppler-0.77.0 2019-09-27 08:18:17 +01:00
stephengaito 43057abb68
updated for poppler-0.77.0 2019-09-27 08:15:54 +01:00
Stephen Gaito 89cfef32de initial copy of poppler-0.78.0 Cairo files 2019-09-27 08:10:04 +01:00
stephengaito 7ed1914bf0
bumped patch version for poppler-0.77.0 2019-09-26 18:42:56 +01:00
stephengaito 4c3038ad40
Merge pull request #6 from pdf2htmlEX/master
pull v0.18.2-poppler-0.76.0 release back into dev repo
2019-09-26 16:52:15 +01:00
stephengaito a4d846279a
updated for v0.18.2-poppler-0.76.0 2019-09-26 16:50:15 +01:00
stephengaito a501d1604e
bumped patch version number for poppler-0.76.0 2019-09-26 16:33:56 +01:00
stephengaito a37f755caf
Merge pull request #32 from stephengaito/master
update pdf2htmlEX source to work with poppler-0.76.0
2019-09-26 16:19:01 +01:00
Stephen Gaito 319cae5588 commiting changes required to compile with poppler-0.76.0 2019-09-26 16:00:11 +01:00
Stephen Gaito 12d1af344f Merge branch 'master' of github.com:stephengaito/pdf2htmlEX 2019-09-26 14:41:48 +01:00
Stephen Gaito c4c4a9c068 initial copy of poppler-0.76.0 Cairo files 2019-09-26 14:41:38 +01:00
stephengaito 892d086a29
Merge pull request #5 from pdf2htmlEX/master
pull main pdf2htmlEX v0.18.1-poppler-0.75.0
2019-09-26 14:04:42 +01:00
stephengaito 8c97c529d2
update for v0.18.1-poppler-0.75.0 release 2019-09-26 14:03:06 +01:00
221 changed files with 6016 additions and 10702 deletions

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
# test export-ignore

3
.github/FUNDING.yml vendored Normal file
View File

@ -0,0 +1,3 @@
# These are supported funding model platforms
github: [stephengaito]

19
.github/workflows/build.yml vendored Normal file
View File

@ -0,0 +1,19 @@
name: Build the project
on: [push]
jobs:
build:
runs-on: ubuntu-20.04
steps:
- name: Checkout Code
uses: actions/checkout@v3
- name: Build project with APT
run: './buildScripts/buildInstallLocallyApt'
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: my-artifact
path: pdf2htmlEX/build

31
.gitignore vendored
View File

@ -1,3 +1,10 @@
imageBuild
poppler-data
buildScripts/reSourceVersionEnvs
brewFormula
fontforge
*.tar.*
poppler
build
compile_commands.json
CMakeCache.txt
@ -7,19 +14,19 @@ CTestTestfile.cmake
gmon.out
install_manifest.txt
Makefile
pdf2htmlEX
pdf2htmlEX.1
pdf2htmlEX/build
pdf2htmlEX/pdf2htmlEX.1
*.pyc
share/base.css
share/base.min.css
share/fancy.css
share/fancy.min.css
share/pdf2htmlEX.js
share/pdf2htmlEX.min.js
src/pdf2htmlEX-config.h
src/util/css_const.h
test export-ignore
pdf2htmlEX/share/base.css
pdf2htmlEX/share/base.min.css
pdf2htmlEX/share/fancy.css
pdf2htmlEX/share/fancy.min.css
pdf2htmlEX/share/pdf2htmlEX.js
pdf2htmlEX/share/pdf2htmlEX.min.js
pdf2htmlEX/src/pdf2htmlEX-config.h
pdf2htmlEX/src/util/css_const.h
Testing/*
DartConfiguration.tcl
test/test.py
pdf2htmlEX/test/test.py
pdf2htmlEX/test/geckodriver.log
*.swp

View File

@ -1,130 +1,28 @@
language: cpp
sudo: true
os:
- linux
- osx
env:
global:
- POPPLER_NAME="poppler-0.63.0"
- POPPLER_SOURCE="https://gitlab.freedesktop.org/poppler/poppler.git"
- FONTFORGE_SOURCE="https://github.com/fontforge/fontforge.git"
- LIBUNINAMESLIST_SOURCE="https://github.com/fontforge/libuninameslist.git"
# NOTE: Since we do not have direct access to either MacOS or Windows
# machines on which to develop WE DO NOT support building on MacOS or
# Windows.
# For Windows, it is known that the more recent Windows 10 versions are
# able to use either the debian archive OR AppImage (as Windows 10 now
# allows FUSE).
compiler: gcc
addons:
apt:
update: true
packages:
- build-essential
- autoconf
- gcc
- pkg-config
- git
- cmake
- ca-certificates
- libfreetype6-dev
# Poppler-specific packages
- libfontconfig1-dev
- libjpeg-dev
- libnss3-dev
# libuninameslist-specific packages
- automake
- libtool
# fontforge-specific packages
- libltdl-dev
- python-dev
- libglib2.0-dev
- libxml2-dev
- libspiro-dev
- gettext
# pdf2htmlEX-specific packages
- default-jre
- libcairo2-dev
- libpango1.0-dev
homebrew:
packages:
- autoconf
- pkg-config
- git
- cmake
- freetype
# Poppler-specific packages
- fontconfig
- jpeg
- nss
# libuninameslist-specific packages
- automake
- libtool
# fontforge-specific packages
- python
- glib
- xml2
- libspiro
- gettext
# pdf2htmlEX-specific packages
- cairo
- pango
sauce_connect: true
branches:
except: # do not build tags that we create using the upload.sh script
- /^(?i:continuous.*)$/
matrix:
jobs:
fast_finish: true
allow_failures:
- os: osx # Until the build passes, then re-enable.
before_install:
# Clone and build poppler
- git clone ${POPPLER_SOURCE}
- cd poppler;
git checkout tags/${POPPLER_NAME} -b poppler-local;
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr -DENABLE_XPDF_HEADERS=ON -DENABLE_LIBOPENJPEG=none .;
make;
make install
- cd ${TRAVIS_BUILD_DIR}
# Install libuninameslist
- git clone ${LIBUNINAMESLIST_SOURCE}
- cd libuninameslist;
git checkout tags/20180701 -b libuninameslist-local;
autoreconf -i;
automake;
./configure --prefix=${TRAVIS_BUILD_DIR}/usr;
make;
make install
- cd ${TRAVIS_BUILD_DIR}
# Install fontforge
- git clone ${FONTFORGE_SOURCE}
- cd fontforge;
git checkout tags/20170731 -b fontforge-local;
./bootstrap;
./configure --disable-programs --disable-python-extension --disable-python-scripting --prefix=${TRAVIS_BUILD_DIR}/usr;
make;
make install;
sudo ldconfig
- cd ${TRAVIS_BUILD_DIR}
# Test setup
- pip install --user Pillow selenium sauceclient
- export DISPLAY=:99.0
- test/start_xvfb.sh
- pushd /
- python -m SimpleHTTPServer 8000 >/dev/null 2>&1 &
- popd
- sleep 5
before_script:
- export LD_LIBRARY_PATH=${TRAVIS_BUILD_DIR}/usr/lib:$LD_LIBRARY_PATH
- export PKG_CONFIG_PATH=${TRAVIS_BUILD_DIR}/usr/lib/pkgconfig:$PKG_CONFIG_PATH
- patch < CMakeLists.txt.patch
- mkdir build && cd build && cmake -DENABLE_SVG=ON -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/usr ..
script:
- make
- P2H_TEST_REMOTE=1 ctest --output-on-failure --verbose
- make install
- ${TRAVIS_BUILD_DIR}/usr/bin/pdf2htmlEX -v
include:
- os: linux
dist: bionic
env: CONTAINER_FROM="ubuntu:18.04"
services:
- docker
addons:
firefox: latest
script:
- ./buildScripts/travisLinuxDoItAll

View File

@ -1,674 +0,0 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.

View File

@ -1,856 +0,0 @@
//========================================================================
//
// CairoFontEngine.cc
//
// Copyright 2003 Glyph & Cog, LLC
// Copyright 2004 Red Hat, Inc
//
//========================================================================
//========================================================================
//
// Modified under the Poppler project - http://poppler.freedesktop.org
//
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
// Copyright (C) 2005-2007 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
// Copyright (C) 2005, 2009, 2012, 2013, 2015, 2017, 2018 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006, 2007, 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2007 Koji Otani <sho@bbr.jp>
// Copyright (C) 2008, 2009 Chris Wilson <chris@chris-wilson.co.uk>
// Copyright (C) 2008, 2012, 2014, 2016, 2017 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2009 Darren Kenny <darren.kenny@sun.com>
// Copyright (C) 2010 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
// Copyright (C) 2010 Jan Kümmel <jan+freedesktop@snorc.org>
// Copyright (C) 2012 Hib Eris <hib@hiberis.nl>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2015, 2016 Jason Crain <jason@aquaticape.us>
// Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de>
// Copyright (C) 2019 Christian Persch <chpe@src.gnome.org>
//
// 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
//
//========================================================================
#include <poppler-config.h>
#include <string.h>
#include "CairoFontEngine.h"
#include "CairoOutputDev.h"
#include "GlobalParams.h"
#include <fofi/FoFiTrueType.h>
#include <fofi/FoFiType1C.h>
#include "goo/gfile.h"
#include "Error.h"
#include "XRef.h"
#include "Gfx.h"
#include "Page.h"
#if defined(HAVE_FCNTL_H) && defined(HAVE_SYS_MMAN_H) && defined(HAVE_SYS_STAT_H)
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/mman.h>
#define CAN_CHECK_OPEN_FACES 1
#endif
//------------------------------------------------------------------------
// CairoFont
//------------------------------------------------------------------------
CairoFont::CairoFont(Ref refA,
cairo_font_face_t *cairo_font_faceA,
int *codeToGIDA,
unsigned int codeToGIDLenA,
bool substituteA,
bool printingA) : ref(refA),
cairo_font_face(cairo_font_faceA),
codeToGID(codeToGIDA),
codeToGIDLen(codeToGIDLenA),
substitute(substituteA),
printing(printingA) { }
CairoFont::~CairoFont() {
cairo_font_face_destroy (cairo_font_face);
gfree(codeToGID);
}
bool
CairoFont::matches(Ref &other, bool printingA) {
return (other.num == ref.num && other.gen == ref.gen);
}
cairo_font_face_t *
CairoFont::getFontFace(void) {
return cairo_font_face;
}
unsigned long
CairoFont::getGlyph(CharCode code,
Unicode *u, int uLen) {
FT_UInt gid;
if (codeToGID && code < codeToGIDLen) {
gid = (FT_UInt)codeToGID[code];
} else {
gid = (FT_UInt)code;
}
return gid;
}
double
CairoFont::getSubstitutionCorrection(GfxFont *gfxFont)
{
double w1, w2, w3;
CharCode code;
const char *name;
// for substituted fonts: adjust the font matrix -- compare the
// width of 'm' in the original font and the substituted font
if (isSubstitute() && !gfxFont->isCIDFont()) {
for (code = 0; code < 256; ++code) {
if ((name = ((Gfx8BitFont *)gfxFont)->getCharName(code)) &&
name[0] == 'm' && name[1] == '\0') {
break;
}
}
if (code < 256) {
w1 = ((Gfx8BitFont *)gfxFont)->getWidth(code);
{
cairo_matrix_t m;
cairo_matrix_init_identity(&m);
cairo_font_options_t *options = cairo_font_options_create();
cairo_font_options_set_hint_style(options, CAIRO_HINT_STYLE_NONE);
cairo_font_options_set_hint_metrics(options, CAIRO_HINT_METRICS_OFF);
cairo_scaled_font_t *scaled_font = cairo_scaled_font_create(cairo_font_face, &m, &m, options);
cairo_text_extents_t extents;
cairo_scaled_font_text_extents(scaled_font, "m", &extents);
cairo_scaled_font_destroy(scaled_font);
cairo_font_options_destroy(options);
w2 = extents.x_advance;
}
w3 = ((Gfx8BitFont *)gfxFont)->getWidth(0);
if (!gfxFont->isSymbolic() && w2 > 0 && w1 > w3) {
// if real font is substantially narrower than substituted
// font, reduce the font size accordingly
if (w1 > 0.01 && w1 < 0.9 * w2) {
w1 /= w2;
return w1;
}
}
}
}
return 1.0;
}
//------------------------------------------------------------------------
// CairoFreeTypeFont
//------------------------------------------------------------------------
static cairo_user_data_key_t _ft_cairo_key;
static void
_ft_done_face_uncached (void *closure)
{
FT_Face face = (FT_Face) closure;
FT_Done_Face (face);
}
static bool
_ft_new_face_uncached (FT_Library lib,
const char *filename,
char *font_data,
int font_data_len,
FT_Face *face_out,
cairo_font_face_t **font_face_out)
{
FT_Face face;
cairo_font_face_t *font_face;
if (font_data == nullptr) {
if (FT_New_Face (lib, filename, 0, &face))
return false;
} else {
if (FT_New_Memory_Face (lib, (unsigned char *)font_data, font_data_len, 0, &face))
return false;
}
font_face = cairo_ft_font_face_create_for_ft_face (face,
FT_LOAD_NO_HINTING |
FT_LOAD_NO_BITMAP);
if (cairo_font_face_set_user_data (font_face,
&_ft_cairo_key,
face,
_ft_done_face_uncached))
{
_ft_done_face_uncached (face);
cairo_font_face_destroy (font_face);
return false;
}
*face_out = face;
*font_face_out = font_face;
return true;
}
#ifdef CAN_CHECK_OPEN_FACES
static struct _ft_face_data {
struct _ft_face_data *prev, *next, **head;
int fd;
unsigned long hash;
size_t size;
unsigned char *bytes;
FT_Library lib;
FT_Face face;
cairo_font_face_t *font_face;
} *_ft_open_faces;
static unsigned long
_djb_hash (const unsigned char *bytes, size_t len)
{
unsigned long hash = 5381;
while (len--) {
unsigned char c = *bytes++;
hash *= 33;
hash ^= c;
}
return hash;
}
static bool
_ft_face_data_equal (struct _ft_face_data *a, struct _ft_face_data *b)
{
if (a->lib != b->lib)
return false;
if (a->size != b->size)
return false;
if (a->hash != b->hash)
return false;
return memcmp (a->bytes, b->bytes, a->size) == 0;
}
static void
_ft_done_face (void *closure)
{
struct _ft_face_data *data = (struct _ft_face_data *) closure;
if (data->next)
data->next->prev = data->prev;
if (data->prev)
data->prev->next = data->next;
else
_ft_open_faces = data->next;
if (data->fd != -1) {
#if defined(__SUNPRO_CC) && defined(__sun) && defined(__SVR4)
munmap ((char*)data->bytes, data->size);
#else
munmap (data->bytes, data->size);
#endif
close (data->fd);
} else {
gfree (data->bytes);
}
FT_Done_Face (data->face);
gfree (data);
}
static bool
_ft_new_face (FT_Library lib,
const char *filename,
char *font_data,
int font_data_len,
FT_Face *face_out,
cairo_font_face_t **font_face_out)
{
struct _ft_face_data *l;
struct stat st;
struct _ft_face_data tmpl;
tmpl.fd = -1;
if (font_data == nullptr) {
/* if we fail to mmap the file, just pass it to FreeType instead */
tmpl.fd = openFileDescriptor (filename, O_RDONLY);
if (tmpl.fd == -1)
return _ft_new_face_uncached (lib, filename, font_data, font_data_len, face_out, font_face_out);
if (fstat (tmpl.fd, &st) == -1) {
close (tmpl.fd);
return _ft_new_face_uncached (lib, filename, font_data, font_data_len, face_out, font_face_out);
}
tmpl.bytes = (unsigned char *) mmap (nullptr, st.st_size,
PROT_READ, MAP_PRIVATE,
tmpl.fd, 0);
if (tmpl.bytes == MAP_FAILED) {
close (tmpl.fd);
return _ft_new_face_uncached (lib, filename, font_data, font_data_len, face_out, font_face_out);
}
tmpl.size = st.st_size;
} else {
tmpl.bytes = (unsigned char*) font_data;
tmpl.size = font_data_len;
}
/* check to see if this is a duplicate of any of the currently open fonts */
tmpl.lib = lib;
tmpl.hash = _djb_hash (tmpl.bytes, tmpl.size);
for (l = _ft_open_faces; l; l = l->next) {
if (_ft_face_data_equal (l, &tmpl)) {
if (tmpl.fd != -1) {
#if defined(__SUNPRO_CC) && defined(__sun) && defined(__SVR4)
munmap ((char*)tmpl.bytes, tmpl.size);
#else
munmap (tmpl.bytes, tmpl.size);
#endif
close (tmpl.fd);
} else {
gfree (tmpl.bytes);
}
*face_out = l->face;
*font_face_out = cairo_font_face_reference (l->font_face);
return true;
}
}
/* not a dup, open and insert into list */
if (FT_New_Memory_Face (lib,
(FT_Byte *) tmpl.bytes, tmpl.size,
0, &tmpl.face))
{
if (tmpl.fd != -1) {
#if defined(__SUNPRO_CC) && defined(__sun) && defined(__SVR4)
munmap ((char*)tmpl.bytes, tmpl.size);
#else
munmap (tmpl.bytes, tmpl.size);
#endif
close (tmpl.fd);
}
return false;
}
l = (struct _ft_face_data *) gmallocn (1, sizeof (struct _ft_face_data));
*l = tmpl;
l->prev = nullptr;
l->next = _ft_open_faces;
if (_ft_open_faces)
_ft_open_faces->prev = l;
_ft_open_faces = l;
l->font_face = cairo_ft_font_face_create_for_ft_face (tmpl.face,
FT_LOAD_NO_HINTING |
FT_LOAD_NO_BITMAP);
if (cairo_font_face_set_user_data (l->font_face,
&_ft_cairo_key,
l,
_ft_done_face))
{
cairo_font_face_destroy (l->font_face);
_ft_done_face (l);
return false;
}
*face_out = l->face;
*font_face_out = l->font_face;
return true;
}
#else
#define _ft_new_face _ft_new_face_uncached
#endif
CairoFreeTypeFont::CairoFreeTypeFont(Ref refA,
cairo_font_face_t *cairo_font_faceA,
int *codeToGIDA,
unsigned int codeToGIDLenA,
bool substituteA) : CairoFont(refA,
cairo_font_faceA,
codeToGIDA,
codeToGIDLenA,
substituteA,
true) { }
CairoFreeTypeFont::~CairoFreeTypeFont() { }
CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
FT_Library lib, bool useCIDs) {
GooString *fileName;
const char *fileNameC;
char *font_data;
int font_data_len;
int i, n;
GfxFontType fontType;
GfxFontLoc *fontLoc;
char **enc;
const char *name;
FoFiTrueType *ff;
FoFiType1C *ff1c;
Ref ref;
FT_Face face;
cairo_font_face_t *font_face;
int *codeToGID;
unsigned int codeToGIDLen;
codeToGID = nullptr;
codeToGIDLen = 0;
font_data = nullptr;
font_data_len = 0;
fileName = nullptr;
fileNameC = nullptr;
bool substitute = false;
ref = *gfxFont->getID();
fontType = gfxFont->getType();
if (!(fontLoc = gfxFont->locateFont(xref, nullptr))) {
error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
gfxFont->getName() ? gfxFont->getName()->c_str()
: "(unnamed)");
goto err2;
}
// embedded font
if (fontLoc->locType == gfxFontLocEmbedded) {
font_data = gfxFont->readEmbFontFile(xref, &font_data_len);
if (nullptr == font_data)
goto err2;
// external font
} else { // gfxFontLocExternal
fileName = fontLoc->path;
fontType = fontLoc->fontType;
substitute = true;
}
if (fileName != nullptr) {
fileNameC = fileName->c_str();
}
switch (fontType) {
case fontType1:
case fontType1C:
case fontType1COT:
if (! _ft_new_face (lib, fileNameC, font_data, font_data_len, &face, &font_face)) {
error(errSyntaxError, -1, "could not create type1 face");
goto err2;
}
enc = ((Gfx8BitFont *)gfxFont)->getEncoding();
codeToGID = (int *)gmallocn(256, sizeof(int));
codeToGIDLen = 256;
for (i = 0; i < 256; ++i) {
codeToGID[i] = 0;
if ((name = enc[i])) {
codeToGID[i] = FT_Get_Name_Index(face, (char*)name);
if (codeToGID[i] == 0) {
Unicode u;
u = globalParams->mapNameToUnicodeText (name);
codeToGID[i] = FT_Get_Char_Index (face, u);
}
if (codeToGID[i] == 0) {
name = GfxFont::getAlternateName(name);
if (name) {
codeToGID[i] = FT_Get_Name_Index(face, (char*)name);
}
}
}
}
break;
case fontCIDType2:
case fontCIDType2OT:
codeToGID = nullptr;
n = 0;
if (((GfxCIDFont *)gfxFont)->getCIDToGID()) {
n = ((GfxCIDFont *)gfxFont)->getCIDToGIDLen();
if (n) {
codeToGID = (int *)gmallocn(n, sizeof(int));
memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(),
n * sizeof(int));
}
} else {
if (font_data != nullptr) {
ff = FoFiTrueType::make(font_data, font_data_len);
} else {
ff = FoFiTrueType::load(fileNameC);
}
if (! ff)
goto err2;
codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n);
delete ff;
}
codeToGIDLen = n;
/* Fall through */
case fontTrueType:
case fontTrueTypeOT:
if (font_data != nullptr) {
ff = FoFiTrueType::make(font_data, font_data_len);
} else {
ff = FoFiTrueType::load(fileNameC);
}
if (! ff) {
error(errSyntaxError, -1, "failed to load truetype font\n");
goto err2;
}
/* This might be set already for the CIDType2 case */
if (fontType == fontTrueType || fontType == fontTrueTypeOT) {
codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff);
codeToGIDLen = 256;
}
delete ff;
if (! _ft_new_face (lib, fileNameC, font_data, font_data_len, &face, &font_face)) {
error(errSyntaxError, -1, "could not create truetype face\n");
goto err2;
}
break;
case fontCIDType0:
case fontCIDType0C:
codeToGID = nullptr;
codeToGIDLen = 0;
if (!useCIDs)
{
if (font_data != nullptr) {
ff1c = FoFiType1C::make(font_data, font_data_len);
} else {
ff1c = FoFiType1C::load(fileNameC);
}
if (ff1c) {
codeToGID = ff1c->getCIDToGIDMap((int *)&codeToGIDLen);
delete ff1c;
}
}
if (! _ft_new_face (lib, fileNameC, font_data, font_data_len, &face, &font_face)) {
error(errSyntaxError, -1, "could not create cid face\n");
goto err2;
}
break;
case fontCIDType0COT:
codeToGID = nullptr;
n = 0;
if (((GfxCIDFont *)gfxFont)->getCIDToGID()) {
n = ((GfxCIDFont *)gfxFont)->getCIDToGIDLen();
if (n) {
codeToGID = (int *)gmallocn(n, sizeof(int));
memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(),
n * sizeof(int));
}
}
codeToGIDLen = n;
if (!codeToGID) {
if (!useCIDs) {
if (font_data != nullptr) {
ff = FoFiTrueType::make(font_data, font_data_len);
} else {
ff = FoFiTrueType::load(fileNameC);
}
if (ff) {
if (ff->isOpenTypeCFF()) {
codeToGID = ff->getCIDToGIDMap((int *)&codeToGIDLen);
}
delete ff;
}
}
}
if (! _ft_new_face (lib, fileNameC, font_data, font_data_len, &face, &font_face)) {
error(errSyntaxError, -1, "could not create cid (OT) face\n");
goto err2;
}
break;
default:
fprintf (stderr, "font type %d not handled\n", (int)fontType);
goto err2;
break;
}
delete fontLoc;
return new CairoFreeTypeFont(ref,
font_face,
codeToGID, codeToGIDLen,
substitute);
err2:
/* hmm? */
delete fontLoc;
gfree (codeToGID);
gfree (font_data);
fprintf (stderr, "some font thing failed\n");
return nullptr;
}
//------------------------------------------------------------------------
// CairoType3Font
//------------------------------------------------------------------------
static const cairo_user_data_key_t type3_font_key = {0};
typedef struct _type3_font_info {
GfxFont *font;
PDFDoc *doc;
CairoFontEngine *fontEngine;
bool printing;
XRef *xref;
} type3_font_info_t;
static void
_free_type3_font_info(void *closure)
{
type3_font_info_t *info = (type3_font_info_t *) closure;
info->font->decRefCnt();
free (info);
}
static cairo_status_t
_init_type3_glyph (cairo_scaled_font_t *scaled_font,
cairo_t *cr,
cairo_font_extents_t *extents)
{
type3_font_info_t *info;
GfxFont *font;
info = (type3_font_info_t *)
cairo_font_face_get_user_data (cairo_scaled_font_get_font_face (scaled_font),
&type3_font_key);
font = info->font;
const double *mat = font->getFontBBox();
extents->ascent = mat[3]; /* y2 */
extents->descent = -mat[3]; /* -y1 */
extents->height = extents->ascent + extents->descent;
extents->max_x_advance = mat[2] - mat[1]; /* x2 - x1 */
extents->max_y_advance = 0;
return CAIRO_STATUS_SUCCESS;
}
static cairo_status_t
_render_type3_glyph (cairo_scaled_font_t *scaled_font,
unsigned long glyph,
cairo_t *cr,
cairo_text_extents_t *metrics)
{
Dict *charProcs;
Object charProc;
CairoOutputDev *output_dev;
cairo_matrix_t matrix, invert_y_axis;
const double *mat;
double wx, wy;
PDFRectangle box;
type3_font_info_t *info;
GfxFont *font;
Dict *resDict;
Gfx *gfx;
info = (type3_font_info_t *)
cairo_font_face_get_user_data (cairo_scaled_font_get_font_face (scaled_font),
&type3_font_key);
font = info->font;
resDict = ((Gfx8BitFont *)font)->getResources();
charProcs = ((Gfx8BitFont *)(info->font))->getCharProcs();
if (!charProcs)
return CAIRO_STATUS_USER_FONT_ERROR;
if ((int)glyph >= charProcs->getLength())
return CAIRO_STATUS_USER_FONT_ERROR;
mat = font->getFontMatrix();
matrix.xx = mat[0];
matrix.yx = mat[1];
matrix.xy = mat[2];
matrix.yy = mat[3];
matrix.x0 = mat[4];
matrix.y0 = mat[5];
cairo_matrix_init_scale (&invert_y_axis, 1, -1);
cairo_matrix_multiply (&matrix, &matrix, &invert_y_axis);
cairo_transform (cr, &matrix);
output_dev = new CairoOutputDev();
output_dev->setCairo(cr);
output_dev->setPrinting(info->printing);
mat = font->getFontBBox();
box.x1 = mat[0];
box.y1 = mat[1];
box.x2 = mat[2];
box.y2 = mat[3];
gfx = new Gfx(info->doc, output_dev, resDict, &box, nullptr);
output_dev->startDoc(info->doc, info->fontEngine);
output_dev->startPage (1, gfx->getState(), gfx->getXRef());
output_dev->setInType3Char(true);
charProc = charProcs->getVal(glyph);
gfx->display(&charProc);
output_dev->getType3GlyphWidth (&wx, &wy);
cairo_matrix_transform_distance (&matrix, &wx, &wy);
metrics->x_advance = wx;
metrics->y_advance = wy;
if (output_dev->hasType3GlyphBBox()) {
double *bbox = output_dev->getType3GlyphBBox();
cairo_matrix_transform_point (&matrix, &bbox[0], &bbox[1]);
cairo_matrix_transform_point (&matrix, &bbox[2], &bbox[3]);
metrics->x_bearing = bbox[0];
metrics->y_bearing = bbox[1];
metrics->width = bbox[2] - bbox[0];
metrics->height = bbox[3] - bbox[1];
}
delete gfx;
delete output_dev;
return CAIRO_STATUS_SUCCESS;
}
CairoType3Font *CairoType3Font::create(GfxFont *gfxFont, PDFDoc *doc,
CairoFontEngine *fontEngine,
bool printing, XRef *xref) {
type3_font_info_t *info;
cairo_font_face_t *font_face;
Ref ref;
int *codeToGID;
unsigned int codeToGIDLen;
int i, j;
char **enc;
Dict *charProcs;
char *name;
charProcs = ((Gfx8BitFont *)gfxFont)->getCharProcs();
info = (type3_font_info_t *) malloc(sizeof(*info));
ref = *gfxFont->getID();
font_face = cairo_user_font_face_create();
cairo_user_font_face_set_init_func (font_face, _init_type3_glyph);
cairo_user_font_face_set_render_glyph_func (font_face, _render_type3_glyph);
gfxFont->incRefCnt();
info->font = gfxFont;
info->doc = doc;
info->fontEngine = fontEngine;
info->printing = printing;
info->xref = xref;
cairo_font_face_set_user_data (font_face, &type3_font_key, (void *) info, _free_type3_font_info);
enc = ((Gfx8BitFont *)gfxFont)->getEncoding();
codeToGID = (int *)gmallocn(256, sizeof(int));
codeToGIDLen = 256;
for (i = 0; i < 256; ++i) {
codeToGID[i] = 0;
if (charProcs && (name = enc[i])) {
for (j = 0; j < charProcs->getLength(); j++) {
if (strcmp(name, charProcs->getKey(j)) == 0) {
codeToGID[i] = j;
}
}
}
}
return new CairoType3Font(ref, font_face, codeToGID, codeToGIDLen, printing, xref);
}
CairoType3Font::CairoType3Font(Ref refA,
cairo_font_face_t *cairo_font_faceA,
int *codeToGIDA,
unsigned int codeToGIDLenA,
bool printingA, XRef *xref) : CairoFont(refA,
cairo_font_faceA,
codeToGIDA,
codeToGIDLenA,
false,
printingA)
{ }
CairoType3Font::~CairoType3Font() { }
bool
CairoType3Font::matches(Ref &other, bool printingA) {
return (other.num == ref.num && other.gen == ref.gen && printing == printingA);
}
//------------------------------------------------------------------------
// CairoFontEngine
//------------------------------------------------------------------------
#define fontEngineLocker() std::unique_lock<std::recursive_mutex> locker(mutex)
CairoFontEngine::CairoFontEngine(FT_Library libA) {
int i;
lib = libA;
for (i = 0; i < cairoFontCacheSize; ++i) {
fontCache[i] = nullptr;
}
FT_Int major, minor, patch;
// as of FT 2.1.8, CID fonts are indexed by CID instead of GID
FT_Library_Version(lib, &major, &minor, &patch);
useCIDs = major > 2 ||
(major == 2 && (minor > 1 || (minor == 1 && patch > 7)));
}
CairoFontEngine::~CairoFontEngine() {
int i;
for (i = 0; i < cairoFontCacheSize; ++i) {
if (fontCache[i])
delete fontCache[i];
}
}
CairoFont *
CairoFontEngine::getFont(GfxFont *gfxFont, PDFDoc *doc, bool printing, XRef *xref) {
int i, j;
Ref ref;
CairoFont *font;
GfxFontType fontType;
fontEngineLocker();
ref = *gfxFont->getID();
for (i = 0; i < cairoFontCacheSize; ++i) {
font = fontCache[i];
if (font && font->matches(ref, printing)) {
for (j = i; j > 0; --j) {
fontCache[j] = fontCache[j-1];
}
fontCache[0] = font;
return font;
}
}
fontType = gfxFont->getType();
if (fontType == fontType3)
font = CairoType3Font::create (gfxFont, doc, this, printing, xref);
else
font = CairoFreeTypeFont::create (gfxFont, xref, lib, useCIDs);
//XXX: if font is null should we still insert it into the cache?
if (fontCache[cairoFontCacheSize - 1]) {
delete fontCache[cairoFontCacheSize - 1];
}
for (j = cairoFontCacheSize - 1; j > 0; --j) {
fontCache[j] = fontCache[j-1];
}
fontCache[0] = font;
return font;
}

View File

@ -1,128 +0,0 @@
//========================================================================
//
// CairoFontEngine.h
//
// Copyright 2003 Glyph & Cog, LLC
// Copyright 2004 Red Hat, Inc
//
//========================================================================
//========================================================================
//
// Modified under the Poppler project - http://poppler.freedesktop.org
//
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2005, 2018 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006, 2007 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2006, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2008, 2017 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de>
//
// 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
//
//========================================================================
#ifndef CAIROFONTENGINE_H
#define CAIROFONTENGINE_H
#include <mutex>
#include "poppler-config.h"
#include <cairo-ft.h>
#include "GfxFont.h"
#include "PDFDoc.h"
class CairoFontEngine;
class CairoFont {
public:
CairoFont(Ref ref,
cairo_font_face_t *face,
int *codeToGID,
unsigned int codeToGIDLen,
bool substitute,
bool printing);
virtual ~CairoFont();
CairoFont(const CairoFont &) = delete;
CairoFont& operator=(const CairoFont &other) = delete;
virtual bool matches(Ref &other, bool printing);
cairo_font_face_t *getFontFace(void);
unsigned long getGlyph(CharCode code, Unicode *u, int uLen);
double getSubstitutionCorrection(GfxFont *gfxFont);
bool isSubstitute() { return substitute; }
protected:
Ref ref;
cairo_font_face_t *cairo_font_face;
int *codeToGID;
unsigned int codeToGIDLen;
bool substitute;
bool printing;
};
//------------------------------------------------------------------------
class CairoFreeTypeFont : public CairoFont {
public:
static CairoFreeTypeFont *create(GfxFont *gfxFont, XRef *xref, FT_Library lib, bool useCIDs);
~CairoFreeTypeFont();
private:
CairoFreeTypeFont(Ref ref, cairo_font_face_t *cairo_font_face,
int *codeToGID, unsigned int codeToGIDLen, bool substitute);
};
//------------------------------------------------------------------------
class CairoType3Font : public CairoFont {
public:
static CairoType3Font *create(GfxFont *gfxFont, PDFDoc *doc,
CairoFontEngine *fontEngine,
bool printing, XRef *xref);
~CairoType3Font();
bool matches(Ref &other, bool printing) override;
private:
CairoType3Font(Ref ref,
cairo_font_face_t *cairo_font_face,
int *codeToGID, unsigned int codeToGIDLen,
bool printing, XRef *xref);
};
//------------------------------------------------------------------------
#define cairoFontCacheSize 64
//------------------------------------------------------------------------
// CairoFontEngine
//------------------------------------------------------------------------
class CairoFontEngine {
public:
// Create a font engine.
CairoFontEngine(FT_Library libA);
~CairoFontEngine();
CairoFontEngine(const CairoFontEngine &) = delete;
CairoFontEngine& operator=(const CairoFontEngine &other) = delete;
CairoFont *getFont(GfxFont *gfxFont, PDFDoc *doc, bool printing, XRef *xref);
private:
CairoFont *fontCache[cairoFontCacheSize];
FT_Library lib;
bool useCIDs;
mutable std::recursive_mutex mutex;
};
#endif

File diff suppressed because it is too large Load Diff

View File

@ -1,525 +0,0 @@
//========================================================================
//
// CairoOutputDev.h
//
// Copyright 2003 Glyph & Cog, LLC
// Copyright 2004 Red Hat, INC
//
//========================================================================
//========================================================================
//
// Modified under the Poppler project - http://poppler.freedesktop.org
//
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
// Copyright (C) 2005-2008 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
// Copyright (C) 2006-2011, 2013 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2008, 2009, 2011-2017 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
// Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
// Copyright (C) 2016 Jason Crain <jason@aquaticape.us>
// Copyright (C) 2018 Albert Astals Cid <aacid@kde.org>
// 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
//
// 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
//
//========================================================================
#ifndef CAIROOUTPUTDEV_H
#define CAIROOUTPUTDEV_H
#include <cairo-ft.h>
#include "OutputDev.h"
#include "TextOutputDev.h"
#include "GfxState.h"
class PDFDoc;
class GfxState;
class GfxPath;
class Gfx8BitFont;
struct GfxRGB;
class CairoFontEngine;
class CairoFont;
//------------------------------------------------------------------------
//------------------------------------------------------------------------
// CairoImage
//------------------------------------------------------------------------
class CairoImage {
public:
// Constructor.
CairoImage (double x1, double y1, double x2, double y2);
// Destructor.
~CairoImage ();
CairoImage(const CairoImage &) = delete;
CairoImage& operator=(const CairoImage &) = delete;
// Set the image cairo surface
void setImage (cairo_surface_t *image);
// Get the image cairo surface
cairo_surface_t *getImage () const { return image; }
// Get the image rectangle
void getRect (double *xa1, double *ya1, double *xa2, double *ya2)
{ *xa1 = x1; *ya1 = y1; *xa2 = x2; *ya2 = y2; }
private:
cairo_surface_t *image; // image cairo surface
double x1, y1; // upper left corner
double x2, y2; // lower right corner
};
//------------------------------------------------------------------------
// CairoOutputDev
//------------------------------------------------------------------------
class CairoOutputDev: public OutputDev {
public:
// Constructor.
CairoOutputDev();
// Destructor.
virtual ~CairoOutputDev();
//----- get info about output device
// Does this device use upside-down coordinates?
// (Upside-down means (0,0) is the top left corner of the page.)
bool upsideDown() override { return true; }
// Does this device use drawChar() or drawString()?
bool useDrawChar() override { return true; }
// Does this device use tilingPatternFill()? If this returns false,
// tiling pattern fills will be reduced to a series of other drawing
// operations.
bool useTilingPatternFill() override { return true; }
// Does this device use functionShadedFill(), axialShadedFill(), and
// radialShadedFill()? If this returns false, these shaded fills
// will be reduced to a series of other drawing operations.
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
bool useShadedFills(int type) override { return type <= 7; }
#else
bool useShadedFills(int type) override { return type > 1 && type < 4; }
#endif
// Does this device use FillColorStop()?
bool useFillColorStop() override { return true; }
// Does this device use beginType3Char/endType3Char? Otherwise,
// text in Type 3 fonts will be drawn with drawChar/drawString.
bool interpretType3Chars() override { return false; }
// Does this device need to clip pages to the crop box even when the
// box is the crop box?
bool needClipToCropBox() override { return true; }
//----- initialization and control
// Start a page.
void startPage(int pageNum, GfxState *state, XRef *xref) override;
// End a page.
void endPage() override;
//----- save/restore graphics state
void saveState(GfxState *state) override;
void restoreState(GfxState *state) override;
//----- update graphics state
void updateAll(GfxState *state) override;
void setDefaultCTM(const double *ctm) override;
void updateCTM(GfxState *state, double m11, double m12,
double m21, double m22, double m31, double m32) override;
void updateLineDash(GfxState *state) override;
void updateFlatness(GfxState *state) override;
void updateLineJoin(GfxState *state) override;
void updateLineCap(GfxState *state) override;
void updateMiterLimit(GfxState *state) override;
void updateLineWidth(GfxState *state) override;
void updateFillColor(GfxState *state) override;
void updateStrokeColor(GfxState *state) override;
void updateFillOpacity(GfxState *state) override;
void updateStrokeOpacity(GfxState *state) override;
void updateFillColorStop(GfxState *state, double offset) override;
void updateBlendMode(GfxState *state) override;
//----- update text state
void updateFont(GfxState *state) override;
//----- path painting
void stroke(GfxState *state) override;
void fill(GfxState *state) override;
void eoFill(GfxState *state) override;
void clipToStrokePath(GfxState *state) override;
bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str,
const double *pmat, int paintType, int tilingType, Dict *resDict,
const double *mat, const double *bbox,
int x0, int y0, int x1, int y1,
double xStep, double yStep) override;
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
bool functionShadedFill(GfxState *state, GfxFunctionShading *shading) override;
#endif
bool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override;
bool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) override;
bool radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax) override;
bool radialShadedSupportExtend(GfxState *state, GfxRadialShading *shading) override;
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
bool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading) override;
bool patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading) override;
#endif
//----- path clipping
void clip(GfxState *state) override;
void eoClip(GfxState *state) override;
//----- text drawing
void beginString(GfxState *state, const GooString *s) override;
void endString(GfxState *state) override;
void drawChar(GfxState *state, double x, double y,
double dx, double dy,
double originX, double originY,
CharCode code, int nBytes, Unicode *u, int uLen) override;
void beginActualText(GfxState *state, const GooString *text) override;
void endActualText(GfxState *state) override;
bool beginType3Char(GfxState *state, double x, double y,
double dx, double dy,
CharCode code, Unicode *u, int uLen) override;
void endType3Char(GfxState *state) override;
void beginTextObject(GfxState *state) override;
void endTextObject(GfxState *state) override;
//----- image drawing
void drawImageMask(GfxState *state, Object *ref, Stream *str,
int width, int height, bool invert, bool interpolate,
bool inlineImg) override;
void setSoftMaskFromImageMask(GfxState *state,
Object *ref, Stream *str,
int width, int height, bool invert,
bool inlineImg, double *baseMatrix) override;
void unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix) override;
void drawImageMaskPrescaled(GfxState *state, Object *ref, Stream *str,
int width, int height, bool invert, bool interpolate,
bool inlineImg);
void drawImageMaskRegular(GfxState *state, Object *ref, Stream *str,
int width, int height, bool invert, bool interpolate,
bool inlineImg);
void drawImage(GfxState *state, Object *ref, Stream *str,
int width, int height, GfxImageColorMap *colorMap,
bool interpolate, int *maskColors, bool inlineImg) override;
void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
int width, int height,
GfxImageColorMap *colorMap,
bool interpolate,
Stream *maskStr,
int maskWidth, int maskHeight,
GfxImageColorMap *maskColorMap,
bool maskInterpolate) override;
void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
int width, int height,
GfxImageColorMap *colorMap,
bool interpolate,
Stream *maskStr,
int maskWidth, int maskHeight,
bool maskInvert, bool maskInterpolate) override;
//----- transparency groups and soft masks
void beginTransparencyGroup(GfxState * /*state*/, const double * /*bbox*/,
GfxColorSpace * /*blendingColorSpace*/,
bool /*isolated*/, bool /*knockout*/,
bool /*forSoftMask*/) override;
void endTransparencyGroup(GfxState * /*state*/) override;
void popTransparencyGroup();
void paintTransparencyGroup(GfxState * /*state*/, const double * /*bbox*/) override;
void setSoftMask(GfxState * /*state*/, const double * /*bbox*/, bool /*alpha*/,
Function * /*transferFunc*/, GfxColor * /*backdropColor*/) override;
void clearSoftMask(GfxState * /*state*/) override;
//----- Type 3 font operators
void type3D0(GfxState *state, double wx, double wy) override;
void type3D1(GfxState *state, double wx, double wy,
double llx, double lly, double urx, double ury) override;
//----- special access
// Called to indicate that a new PDF document has been loaded.
void startDoc(PDFDoc *docA, CairoFontEngine *fontEngine = nullptr);
bool isReverseVideo() { return false; }
void setCairo (cairo_t *cr);
void setTextPage (TextPage *text);
void setPrinting (bool printingA) { printing = printingA; needFontUpdate = true; }
void setAntialias(cairo_antialias_t antialias);
void setInType3Char(bool inType3CharA) { inType3Char = inType3CharA; }
void getType3GlyphWidth (double *wx, double *wy) { *wx = t3_glyph_wx; *wy = t3_glyph_wy; }
bool hasType3GlyphBBox () { return t3_glyph_has_bbox; }
double *getType3GlyphBBox () { return t3_glyph_bbox; }
protected:
void doPath(cairo_t *cairo, GfxState *state, GfxPath *path);
cairo_surface_t *downscaleSurface(cairo_surface_t *orig_surface);
void getScaledSize(const cairo_matrix_t *matrix,
int orig_width, int orig_height,
int *scaledWidth, int *scaledHeight);
cairo_filter_t getFilterForSurface(cairo_surface_t *image,
bool interpolate);
bool getStreamData (Stream *str, char **buffer, int *length);
void setMimeData(GfxState *state, Stream *str, Object *ref,
GfxImageColorMap *colorMap, cairo_surface_t *image, int height);
void fillToStrokePathClip(GfxState *state);
void alignStrokeCoords(GfxSubpath *subpath, int i, double *x, double *y);
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
bool setMimeDataForJBIG2Globals (Stream *str, cairo_surface_t *image);
#endif
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 15, 10)
bool setMimeDataForCCITTParams(Stream *str, cairo_surface_t *image, int height);
#endif
static void setContextAntialias(cairo_t *cr, cairo_antialias_t antialias);
GfxRGB fill_color, stroke_color;
cairo_pattern_t *fill_pattern, *stroke_pattern;
double fill_opacity;
double stroke_opacity;
bool stroke_adjust;
bool adjusted_stroke_width;
bool align_stroke_coords;
CairoFont *currentFont;
XRef *xref;
struct StrokePathClip {
GfxPath *path;
cairo_matrix_t ctm;
double line_width;
double *dashes;
int dash_count;
double dash_offset;
cairo_line_cap_t cap;
cairo_line_join_t join;
double miter;
int ref_count;
} *strokePathClip;
PDFDoc *doc; // the current document
static FT_Library ft_lib;
static bool ft_lib_initialized;
CairoFontEngine *fontEngine;
bool fontEngine_owner;
cairo_t *cairo;
cairo_matrix_t orig_matrix;
bool needFontUpdate; // set when the font needs to be updated
bool printing;
bool use_show_text_glyphs;
bool text_matrix_valid;
cairo_glyph_t *glyphs;
int glyphCount;
cairo_text_cluster_t *clusters;
int clusterCount;
char *utf8;
int utf8Count;
int utf8Max;
cairo_path_t *textClipPath;
bool inUncoloredPattern; // inside a uncolored pattern (PaintType = 2)
bool inType3Char; // inside a Type 3 CharProc
double t3_glyph_wx, t3_glyph_wy;
bool t3_glyph_has_bbox;
double t3_glyph_bbox[4];
cairo_antialias_t antialias;
bool prescaleImages;
TextPage *text; // text for the current page
ActualText *actualText;
cairo_pattern_t *group;
cairo_pattern_t *shape;
cairo_pattern_t *mask;
cairo_matrix_t mask_matrix;
cairo_t *cairo_shape;
int knockoutCount;
struct ColorSpaceStack {
bool knockout;
GfxColorSpace *cs;
cairo_matrix_t group_matrix;
struct ColorSpaceStack *next;
} * groupColorSpaceStack;
struct MaskStack {
cairo_pattern_t *mask;
cairo_matrix_t mask_matrix;
struct MaskStack *next;
} *maskStack;
};
//------------------------------------------------------------------------
// CairoImageOutputDev
//------------------------------------------------------------------------
//XXX: this should ideally not inherit from CairoOutputDev but use it instead perhaps
class CairoImageOutputDev: public CairoOutputDev {
public:
// Constructor.
CairoImageOutputDev();
// Destructor.
virtual ~CairoImageOutputDev();
//----- get info about output device
// Does this device use upside-down coordinates?
// (Upside-down means (0,0) is the top left corner of the page.)
bool upsideDown() override { return true; }
// Does this device use drawChar() or drawString()?
bool useDrawChar() override { return false; }
// Does this device use tilingPatternFill()? If this returns false,
// tiling pattern fills will be reduced to a series of other drawing
// operations.
bool useTilingPatternFill() override { return true; }
// Does this device use functionShadedFill(), axialShadedFill(), and
// radialShadedFill()? If this returns false, these shaded fills
// will be reduced to a series of other drawing operations.
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2)
bool useShadedFills(int type) override { return type <= 7; }
#else
bool useShadedFills(int type) override { return type < 4; }
#endif
// Does this device use FillColorStop()?
bool useFillColorStop() override { return false; }
// Does this device use beginType3Char/endType3Char? Otherwise,
// text in Type 3 fonts will be drawn with drawChar/drawString.
bool interpretType3Chars() override { return false; }
// Does this device need non-text content?
bool needNonText() override { return true; }
//----- save/restore graphics state
void saveState(GfxState *state) override { }
void restoreState(GfxState *state) override { }
//----- update graphics state
void updateAll(GfxState *state) override { }
void setDefaultCTM(const double *ctm) override { }
void updateCTM(GfxState *state, double m11, double m12,
double m21, double m22, double m31, double m32) override { }
void updateLineDash(GfxState *state) override { }
void updateFlatness(GfxState *state) override { }
void updateLineJoin(GfxState *state) override { }
void updateLineCap(GfxState *state) override { }
void updateMiterLimit(GfxState *state) override { }
void updateLineWidth(GfxState *state) override { }
void updateFillColor(GfxState *state) override { }
void updateStrokeColor(GfxState *state) override { }
void updateFillOpacity(GfxState *state) override { }
void updateStrokeOpacity(GfxState *state) override { }
void updateBlendMode(GfxState *state) override { }
//----- update text state
void updateFont(GfxState *state) override { }
//----- path painting
void stroke(GfxState *state) override { }
void fill(GfxState *state) override { }
void eoFill(GfxState *state) override { }
void clipToStrokePath(GfxState *state) override { }
bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str,
const double *pmat, int paintType, int tilingType, Dict *resDict,
const double *mat, const double *bbox,
int x0, int y0, int x1, int y1,
double xStep, double yStep) override { return true; }
bool axialShadedFill(GfxState *state,
GfxAxialShading *shading,
double tMin, double tMax) override { return true; }
bool radialShadedFill(GfxState *state,
GfxRadialShading *shading,
double sMin, double sMax) override { return true; }
//----- path clipping
void clip(GfxState *state) override { }
void eoClip(GfxState *state) override { }
//----- image drawing
void drawImageMask(GfxState *state, Object *ref, Stream *str,
int width, int height, bool invert,
bool interpolate, bool inlineImg) override;
void drawImage(GfxState *state, Object *ref, Stream *str,
int width, int height, GfxImageColorMap *colorMap,
bool interpolate, int *maskColors, bool inlineImg) override;
void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
int width, int height,
GfxImageColorMap *colorMap,
bool interpolate,
Stream *maskStr,
int maskWidth, int maskHeight,
GfxImageColorMap *maskColorMap,
bool maskInterpolate) override;
void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
int width, int height,
GfxImageColorMap *colorMap,
bool interpolate,
Stream *maskStr,
int maskWidth, int maskHeight,
bool maskInvert, bool maskInterpolate) override;
void setSoftMaskFromImageMask(GfxState *state, Object *ref, Stream *str,
int width, int height, bool invert,
bool inlineImg, double *baseMatrix) override;
void unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix) override {}
//----- transparency groups and soft masks
void beginTransparencyGroup(GfxState * /*state*/, const double * /*bbox*/,
GfxColorSpace * /*blendingColorSpace*/,
bool /*isolated*/, bool /*knockout*/,
bool /*forSoftMask*/) override {}
void endTransparencyGroup(GfxState * /*state*/) override {}
void paintTransparencyGroup(GfxState * /*state*/, const double * /*bbox*/) override {}
void setSoftMask(GfxState * /*state*/, const double * /*bbox*/, bool /*alpha*/,
Function * /*transferFunc*/, GfxColor * /*backdropColor*/) override {}
void clearSoftMask(GfxState * /*state*/) override {}
//----- Image list
// By default images are not rendred
void setImageDrawDecideCbk(bool (*cbk)(int img_id, void *data),
void *data) { imgDrawCbk = cbk; imgDrawCbkData = data; }
// Iterate through list of images.
int getNumImages() const { return numImages; }
CairoImage *getImage(int i) const { return images[i]; }
private:
void saveImage(CairoImage *image);
void getBBox(GfxState *state, int width, int height,
double *x1, double *y1, double *x2, double *y2);
CairoImage **images;
int numImages;
int size;
bool (*imgDrawCbk)(int img_id, void *data);
void *imgDrawCbkData;
};
#endif

View File

@ -1,378 +0,0 @@
/* -*- Mode: c; c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t; -*- */
/*
* Copyright © 2009 Mozilla Corporation
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation, and that the name of Mozilla Corporation not be used in
* advertising or publicity pertaining to distribution of the software without
* specific, written prior permission. Mozilla Corporation makes no
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
*
* MOZILLA CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT
* SHALL MOZILLA CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*
* Author: Jeff Muizelaar, Mozilla Corp.
*/
//========================================================================
//
// Modified under the Poppler project - http://poppler.freedesktop.org
//
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
// Copyright (C) 2012 Hib Eris <hib@hiberis.nl>
// Copyright (C) 2012, 2017 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de>
// Copyright (C) 2019 Albert Astals Cid <aacid@kde.org>
//
// 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
//
//========================================================================
/* This implements a box filter that supports non-integer box sizes */
#include <poppler-config.h>
#include <cstdint>
#include <stdint.h>
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
#include <math.h>
#include "goo/gmem.h"
#include "CairoRescaleBox.h"
/* we work in fixed point where 1. == 1 << 24 */
#define FIXED_SHIFT 24
static void downsample_row_box_filter (
int start, int width,
uint32_t *src, uint32_t *dest,
int coverage[], int pixel_coverage)
{
/* we need an array of the pixel contribution of each destination pixel on the boundaries.
* we invert the value to get the value on the other size of the box */
/*
value = a * contribution * 1/box_size
value += a * 1/box_size
value += a * 1/box_size
value += a * 1/box_size
value += a * (1 - contribution) * 1/box_size
a * (1/box_size - contribution * 1/box_size)
box size is constant
value = a * contribution_a * 1/box_size + b * contribution_b * 1/box_size
contribution_b = (1 - contribution_a)
= (1 - contribution_a_next)
*/
/* box size = ceil(src_width/dest_width) */
int x = 0;
/* skip to start */
/* XXX: it might be possible to do this directly instead of iteratively, however
* the iterative solution is simple */
while (x < start)
{
int box = 1 << FIXED_SHIFT;
int start_coverage = coverage[x];
box -= start_coverage;
src++;
while (box >= pixel_coverage)
{
src++;
box -= pixel_coverage;
}
x++;
}
while (x < start + width)
{
uint32_t a = 0;
uint32_t r = 0;
uint32_t g = 0;
uint32_t b = 0;
int box = 1 << FIXED_SHIFT;
int start_coverage = coverage[x];
a = ((*src >> 24) & 0xff) * start_coverage;
r = ((*src >> 16) & 0xff) * start_coverage;
g = ((*src >> 8) & 0xff) * start_coverage;
b = ((*src >> 0) & 0xff) * start_coverage;
src++;
x++;
box -= start_coverage;
while (box >= pixel_coverage)
{
a += ((*src >> 24) & 0xff) * pixel_coverage;
r += ((*src >> 16) & 0xff) * pixel_coverage;
g += ((*src >> 8) & 0xff) * pixel_coverage;
b += ((*src >> 0) & 0xff) * pixel_coverage;
src++;
box -= pixel_coverage;
}
/* multiply by whatever is leftover
* this ensures that we don't bias down.
* i.e. start_coverage + n*pixel_coverage + box == 1 << 24 */
if (box > 0)
{
a += ((*src >> 24) & 0xff) * box;
r += ((*src >> 16) & 0xff) * box;
g += ((*src >> 8) & 0xff) * box;
b += ((*src >> 0) & 0xff) * box;
}
a >>= FIXED_SHIFT;
r >>= FIXED_SHIFT;
g >>= FIXED_SHIFT;
b >>= FIXED_SHIFT;
*dest = (a << 24) | (r << 16) | (g << 8) | b;
dest++;
}
}
static void downsample_columns_box_filter (
int n,
int start_coverage,
int pixel_coverage,
uint32_t *src, uint32_t *dest)
{
int stride = n;
while (n--) {
uint32_t a = 0;
uint32_t r = 0;
uint32_t g = 0;
uint32_t b = 0;
uint32_t *column_src = src;
int box = 1 << FIXED_SHIFT;
a = ((*column_src >> 24) & 0xff) * start_coverage;
r = ((*column_src >> 16) & 0xff) * start_coverage;
g = ((*column_src >> 8) & 0xff) * start_coverage;
b = ((*column_src >> 0) & 0xff) * start_coverage;
column_src += stride;
box -= start_coverage;
while (box >= pixel_coverage)
{
a += ((*column_src >> 24) & 0xff) * pixel_coverage;
r += ((*column_src >> 16) & 0xff) * pixel_coverage;
g += ((*column_src >> 8) & 0xff) * pixel_coverage;
b += ((*column_src >> 0) & 0xff) * pixel_coverage;
column_src += stride;
box -= pixel_coverage;
}
if (box > 0) {
a += ((*column_src >> 24) & 0xff) * box;
r += ((*column_src >> 16) & 0xff) * box;
g += ((*column_src >> 8) & 0xff) * box;
b += ((*column_src >> 0) & 0xff) * box;
}
a >>= FIXED_SHIFT;
r >>= FIXED_SHIFT;
g >>= FIXED_SHIFT;
b >>= FIXED_SHIFT;
*dest = (a << 24) | (r << 16) | (g << 8) | b;
dest++;
src++;
}
}
static int compute_coverage (int coverage[], int src_length, int dest_length)
{
int i;
/* num = src_length/dest_length
total = sum(pixel) / num
pixel * 1/num == pixel * dest_length / src_length
*/
/* the average contribution of each source pixel */
int ratio = ((1 << 24)*(long long int)dest_length)/src_length;
/* because ((1 << 24)*(long long int)dest_length) won't always be divisible by src_length
* we'll need someplace to put the other bits.
*
* We want to ensure a + n*ratio < 1<<24
*
* 1<<24
* */
double scale = (double)src_length/dest_length;
/* for each destination pixel compute the coverage of the left most pixel included in the box */
/* I have a proof of this, which this margin is too narrow to contain */
for (i=0; i<dest_length; i++)
{
float left_side = i*scale;
float right_side = (i+1)*scale;
float right_fract = right_side - floor (right_side);
float left_fract = ceil (left_side) - left_side;
int overage;
/* find out how many source pixels will be used to fill the box */
int count = floor (right_side) - ceil (left_side);
/* what's the maximum value this expression can become?
floor((i+1)*scale) - ceil(i*scale)
(i+1)*scale - i*scale == scale
since floor((i+1)*scale) <= (i+1)*scale
and ceil(i*scale) >= i*scale
floor((i+1)*scale) - ceil(i*scale) <= scale
further since: floor((i+1)*scale) - ceil(i*scale) is an integer
therefore:
floor((i+1)*scale) - ceil(i*scale) <= floor(scale)
*/
if (left_fract == 0.)
count--;
/* compute how much the right-most pixel contributes */
overage = ratio*(right_fract);
/* the remainder is the amount that the left-most pixel
* contributes */
coverage[i] = (1<<24) - (count * ratio + overage);
}
return ratio;
}
bool CairoRescaleBox::downScaleImage(unsigned orig_width, unsigned orig_height,
signed scaled_width, signed scaled_height,
unsigned short int start_column, unsigned short int start_row,
unsigned short int width, unsigned short int height,
cairo_surface_t *dest_surface) {
int pixel_coverage_x, pixel_coverage_y;
int dest_y;
int src_y = 0;
uint32_t *scanline;
int *x_coverage = nullptr;
int *y_coverage = nullptr;
uint32_t *temp_buf = nullptr;
bool retval = false;
unsigned int *dest;
int dst_stride;
dest = reinterpret_cast<unsigned int *>(cairo_image_surface_get_data (dest_surface));
dst_stride = cairo_image_surface_get_stride (dest_surface);
scanline = (uint32_t*)gmallocn (orig_width, sizeof(int));
x_coverage = (int *)gmallocn (orig_width, sizeof(int));
y_coverage = (int *)gmallocn (orig_height, sizeof(int));
/* we need to allocate enough room for ceil(src_height/dest_height)+1
Example:
src_height = 140
dest_height = 50
src_height/dest_height = 2.8
|-------------| 2.8 pixels
|----|----|----|----| 4 pixels
need to sample 3 pixels
|-------------| 2.8 pixels
|----|----|----|----| 4 pixels
need to sample 4 pixels
*/
temp_buf = (uint32_t *)gmallocn3 ((orig_height + scaled_height-1)/scaled_height+1, scaled_width, sizeof(uint32_t));
if (!x_coverage || !y_coverage || !scanline || !temp_buf)
goto cleanup;
pixel_coverage_x = compute_coverage (x_coverage, orig_width, scaled_width);
pixel_coverage_y = compute_coverage (y_coverage, orig_height, scaled_height);
assert (width + start_column <= scaled_width);
/* skip the rows at the beginning */
for (dest_y = 0; dest_y < start_row; dest_y++)
{
int box = 1 << FIXED_SHIFT;
int start_coverage_y = y_coverage[dest_y];
box -= start_coverage_y;
src_y++;
while (box >= pixel_coverage_y)
{
box -= pixel_coverage_y;
src_y++;
}
}
for (; dest_y < start_row + height; dest_y++)
{
int columns = 0;
int box = 1 << FIXED_SHIFT;
int start_coverage_y = y_coverage[dest_y];
getRow(src_y, scanline);
downsample_row_box_filter (start_column, width, scanline, temp_buf + width * columns, x_coverage, pixel_coverage_x);
columns++;
src_y++;
box -= start_coverage_y;
while (box >= pixel_coverage_y)
{
getRow(src_y, scanline);
downsample_row_box_filter (start_column, width, scanline, temp_buf + width * columns, x_coverage, pixel_coverage_x);
columns++;
src_y++;
box -= pixel_coverage_y;
}
/* downsample any leftovers */
if (box > 0)
{
getRow(src_y, scanline);
downsample_row_box_filter (start_column, width, scanline, temp_buf + width * columns, x_coverage, pixel_coverage_x);
columns++;
}
/* now scale the rows we just downsampled in the y direction */
downsample_columns_box_filter (width, start_coverage_y, pixel_coverage_y, temp_buf, dest);
dest += dst_stride / 4;
// assert(width*columns <= ((orig_height + scaled_height-1)/scaled_height+1) * width);
}
// assert (src_y<=orig_height);
retval = true;
cleanup:
free (x_coverage);
free (y_coverage);
free (temp_buf);
free (scanline);
return retval;
}

View File

@ -1,64 +0,0 @@
/*
* Copyright © 2009 Mozilla Corporation
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation, and that the name of Mozilla Corporation not be used in
* advertising or publicity pertaining to distribution of the software without
* specific, written prior permission. Mozilla Corporation makes no
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
*
* MOZILLA CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT
* SHALL MOZILLA CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*
* Author: Jeff Muizelaar, Mozilla Corp.
*/
//========================================================================
//
// Modified under the Poppler project - http://poppler.freedesktop.org
//
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
// Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2018 Albert Astals Cid <aacid@kde.org>
//
// 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
//
//========================================================================
#ifndef CAIRO_RESCALE_BOX_H
#define CAIRO_RESCALE_BOX_H
#include <cairo.h>
class CairoRescaleBox {
public:
CairoRescaleBox() {};
virtual ~CairoRescaleBox() {};
CairoRescaleBox(const CairoRescaleBox &) = delete;
CairoRescaleBox& operator=(const CairoRescaleBox &) = delete;
virtual bool downScaleImage(unsigned orig_width, unsigned orig_height,
signed scaled_width, signed scaled_height,
unsigned short int start_column, unsigned short int start_row,
unsigned short int width, unsigned short int height,
cairo_surface_t *dest_surface);
virtual void getRow(int row_num, uint32_t *row_data) = 0;
};
#endif /* CAIRO_RESCALE_BOX_H */

View File

@ -1,12 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 135e02f..97c7035 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
option(ENABLE_SVG "Enable SVG support, for generating SVG background images and converting Type 3 fonts" ON)
+include_directories(${CMAKE_INSTALL_PREFIX}/include)
include_directories(${CMAKE_SOURCE_DIR}/src)
set(PDF2HTMLEX_VERSION "0.15.0")

View File

@ -23,7 +23,7 @@ A few channels are available to reach the developers, please find the most prope
### The Issue Tracker
The [Issue Tracker](https://github.com/coolwanglu/pdf2htmlEX/issues)
The [Issue Tracker](https://github.com/pdf2htmlEX/pdf2htmlEX/issues)
is the best way for
[bug reports](#bug-reports),
[features requests](#feature-requests)
@ -54,7 +54,7 @@ However do not report issues or submit patches there, since it's terrible to kee
pdf2htmlEX is mostly written and maintained by 王璐 (Lu Wang).
His email and twitter account can be found in
[README.md](https://github.com/coolwanglu/pdf2htmlEX/blob/master/README.md).
[README.md](https://github.com/pdf2htmlEX/pdf2htmlEX/blob/master/README.md).
Please post only messages that do not fit into the above channels, otherwise
note that he no longer replies with _Please post your question to the mailing list_ or _Please file an issue at GitHub_, consider your message already replied.
@ -73,7 +73,7 @@ follow the following steps to get it resolved as fast as possible:
First of all, did you realize that your question might have been already answered in one of the following places?
- [pdf2htmlEX Wiki](https://github.com/coolwanglu/pdf2htmlEX/wiki)
- [pdf2htmlEX Wiki](https://github.com/pdf2htmlEX/pdf2htmlEX/wiki)
- The manpage (run `man pdf2htmlEX`)
- Old posts in the [mailing list](#the-mailing-list) or the [issue tracker](#the-issue-tracker)
- [Google](http://www.google.com/)
@ -93,7 +93,7 @@ Bugs should always be reported to [the Issue Tracker](#the-issue-tracker).
Before you report any bug:
- Use the latest git version of pdf2htmlEX, since the issue may have been already fixed.
- Search for previous issues (open or closed), to make sure that the issue has not been reported before.
- If pdf2htmlEX crashed, take a look at [this article](https://github.com/coolwanglu/pdf2htmlEX/wiki/Troubleshooting-Crashes).
- If pdf2htmlEX crashed, take a look at [this article](https://github.com/pdf2htmlEX/pdf2htmlEX/wiki/Troubleshooting-Crashes).
A good bug report shouldn't leave others needing to chase you up for more information.
The developers may be very familiar with the code base of pdf2htmlEX,
@ -110,7 +110,7 @@ If you are not sure, please try to answer the following questions:
- What steps will reproduce the issue? &mdash; please try to remove unnecessary steps
- What's the result and what did you expect? &mdash; e.g. you can post screenshots
- What error messages did you see?
- What's the affected PDF file and which pages are causing the issue? Create a pull request on [this repo](https://github.com/coolwanglu/pdf2htmlEX-testcase).
- What's the affected PDF file and which pages are causing the issue? Create a pull request on [this repo](https://github.com/pdf2htmlEX/pdf2htmlEX-testcase).
Especially for issues regarding building pdf2htmlEX:
- Which compiler are you using?

View File

@ -1,3 +1,3 @@
For instructions of building the source code, visit:
https://github.com/coolwanglu/pdf2htmlEX/wiki/Building
https://github.com/pdf2htmlEX/pdf2htmlEX/wiki/Building

30
LICENSE
View File

@ -1,23 +1,25 @@
pdf2htmlEX (https://github.com/coolwanglu/pdf2htmlEX)
pdf2htmlEX (https://github.com/pdf2htmlEX/pdf2htmlEX)
Copyright (c) 2012-2014 Lu Wang <coolwanglu@gmail.com> and other contributors
pdf2htmlEX, as a whole package, is licensed under GPLv3 (or any later version).
pdf2htmlEX, as a whole package, is licensed under GPLv3 (or any later
version).
Files in share/ and logo/ are released under relaxed licenses,
read the respective `LICENSE` file in the folders for details.
Files in pdf2htmlEX/share/ pdf2htmlEX/logo/ and pdf2htmlEX/brewFormual are
released under relaxed licenses, read the respective `LICENSE` file in
these folders for details.
-----
GPLv3
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
Software Foundation, either version 3 of the License, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU General Public License along
with this program. If not, see <http://www.gnu.org/licenses/>.

View File

@ -5,13 +5,13 @@ This table lists the (recent) pdf2htmlEX releases which work for a given
| poppler | pdf2htmlEX |
|----------------|------------|
| poppler-0.81.0 | unknown |
| poppler-0.80.0 | unknown |
| poppler-0.79.0 | unknown |
| poppler-0.78.0 | unknown |
| poppler-0.77.0 | unknown |
| poppler-0.76.0 | unknown |
| poppler-0.75.0 | unknown |
| poppler-0.81.0 | v0.18.7-poppler-0.81.0 |
| poppler-0.80.0 | v0.18.6-poppler-0.80.0 |
| poppler-0.79.0 | v0.18.5-poppler-0.79.0 |
| poppler-0.78.0 | v0.18.4-poppler-0.78.0 |
| poppler-0.77.0 | v0.18.3-poppler-0.77.0 |
| poppler-0.76.0 | v0.18.2-poppler-0.76.0 |
| poppler-0.75.0 | v0.18.1-poppler-0.75.0 |
| poppler-0.74.0 | v0.18.0-poppler-0.74.0-ubuntu-19.04 |
| poppler-0.73.0 | unknown |
| poppler-0.72.0 | unknown |

View File

@ -2,9 +2,9 @@
[![Build Status](https://travis-ci.org/pdf2htmlEX/pdf2htmlEX.svg?branch=master)](https://travis-ci.org/pdf2htmlEX/pdf2htmlEX)
# Differences from upstream pdf2htmlEX:
# Differences from upstream pdf2htmlEX:
This is my branch of pdf2htmlEX which aims to allow an open collaboration to help keep the project active. A number of changes and improvements have been incorperated from other forks:
This is my branch of pdf2htmlEX which aims to allow an open collaboration to help keep the project active. A number of changes and improvements have been incorporated from other forks:
* Lots of bugs fixes, mostly of edge cases
* Integration of latest Cairo code
@ -69,6 +69,8 @@ pdf2htmlEX is made possible thanks to the following projects:
* [poppler](http://poppler.freedesktop.org/)
* [Fontforge](http://fontforge.org/)
[![Testing Powered By SauceLabs](https://saucelabs.github.io/images/opensauce/powered-by-saucelabs-badge-gray.png?sanitize=true "Testing Powered By SauceLabs")](https://saucelabs.com)
pdf2htmlEX is inspired by the following projects:
* pdftohtml from poppler

178
archive/createDebianPackage Executable file
View File

@ -0,0 +1,178 @@
#!/usr/bin/env python
"""
Dirty script for building package for PPA
by WangLu
2011.01.13
modified for pdf2htmlEX
2012.08.28
modified for general git repo
2013.05.30
"""
# CONSIDER PORTING to either BASH or PERL (as used by dpkg-buldpackage)
# CONSIDER BINARY ONLY PACKAGE based on appDir or docerDir
#
# See: https://blog.serverdensity.com/how-to-create-a-debian-deb-package/
# See: http://www.sj-vs.net/creating-a-simple-debian-deb-package-based-on-a-directory-structure/
# See: https://unix.stackexchange.com/questions/30303/how-to-create-a-deb-file-manually
# See: https://askubuntu.com/questions/1130558/how-to-build-deb-package-for-ubuntu-18-04
# See: https://blog.knoldus.com/create-a-debian-package-using-dpkg-deb-tool/
# See: http://www.tldp.org/HOWTO/html_single/Debian-Binary-Package-Building-HOWTO/
# See: https://coderwall.com/p/urkybq/how-to-create-debian-package-from-source
#
# NOTES:
# 1. Should use something to force update of changelog
# 2. How best to compute dpkg version
# 3. Distribute only binary package (no source package -- link to main github repo)
# 4. Use ppa: https://launchpad.net/~pdf2htmlex/+archive/ubuntu/pdf2htmlex
# 5. Rename poppler-data destination to poppler-pdf2htmlEX
# 6. Ensure source code location of poppler-data has been updated
import os
import sys
import re
import time
package='pdf2htmlex'
ppa_name='ppa:pdf2htmlex/pdf2htmlex'
supported_distributions=('disco',)
dist_pattern=re.compile('|'.join(['\\) '+i for i in supported_distributions]))
archive_cmd='cd pdf2htmlEX/build && (rm CMakeCache.txt || true) && cmake .. && make dist'
archive_suffix='.tar.bz2'
#if os.path.exists('imageBuild/debianDir'):
# sys.stdout.write('Build area already exists, delete to continue?(y/n)')
# sys.stdout.flush()
# ans = raw_input().lower()
# while ans not in ['y', 'n']:
# sys.stdout.write('I don\'t understand, enter \'y\' or \'n\':')
# ans = raw_input().lower()
#
# if ans == 'n':
# print 'Skipped.'
# sys.exit(0)
#
if os.system('rm -rf imageBuild/debianDir') != 0:
print 'Failed to clean up old build directory'
sys.exit(-1)
print 'Generating version...'
try:
version = re.findall(
r'set\(PDF2HTMLEX_VERSION\s*"([^"]*)"\)',
open('pdf2htmlEX/CMakeLists.txt').read()
)[0]
except:
print 'Cannot get package name and version number'
sys.exit(-1)
try:
rev = open('.git/refs/heads/master').read()[:5]
except:
print 'Cannot get revision number'
sys.exit(-1)
projectdir=os.getcwd()
today_timestr = time.strftime('%Y%m%d')
deb_version = version+'-1~git'+today_timestr+'r'+rev
full_deb_version = deb_version+'-0ubuntu1'
print 'Version: %s' % (version,)
print 'Full Version: %s' % (full_deb_version,)
#check if we need to update debian/changelog
with open('debian/changelog') as f:
if re.findall(r'\(([^)]+)\)', f.readline())[0] == full_deb_version:
print
print 'No need to update debian/changelog, skipping'
else:
print
print 'Writing debian/changelog'
if os.system('dch -v "%s"' % (full_deb_version,)) != 0:
print 'Failed when updating debian/changelog'
sys.exit(-1)
# changelog may have been updated, reopen it
with open('debian/changelog') as f:
#check dist mark of changelog
changelog = f.read()
m = dist_pattern.search(changelog)
if m is None or m.pos >= changelog.find('\n'):
print 'Cannot locate the dist name in the first line of changelog'
sys.exit(-1)
print
print 'Preparing build ...'
# handling files
if os.system(archive_cmd) != 0:
print 'Failed in creating tarball'
sys.exit(-1)
orig_tar_filename = package+'-'+version+archive_suffix
os.mkdir('imageBuild/debianDir')
if os.system('test -e pdf2htmlEX/build/%s && cp pdf2htmlEX/build/%s imageBuild/debianDir/' % (orig_tar_filename, orig_tar_filename)) != 0:
print 'Cannot copy tarball file to build area'
sys.exit(-1)
deb_orig_tar_filename = package+'_'+deb_version+'.orig'+archive_suffix
try:
os.chdir('imageBuild/debianDir')
except:
print 'Cannot find imageBuild/debianDir'
sys.exit(-1)
# remove old dir
os.system('rm -rf %s' % (package+'-'+version,))
if os.system('mv %s %s && tar -xvf %s' % (orig_tar_filename, deb_orig_tar_filename, deb_orig_tar_filename)) != 0:
print 'Cannot extract tarball'
sys.exit(-1)
try:
os.chdir(package+'-'+version)
except:
print 'Cannot enter project dir'
sys.exit(-1)
os.system('cp -r %s/debian .' % (projectdir,))
for cur_dist in supported_distributions:
print
print 'Building for ' + cur_dist + ' ...'
# substitute distribution name
with open('debian/changelog', 'w') as f:
f.write(dist_pattern.sub('~%s1) %s' % (cur_dist, cur_dist), changelog, 1))
# No PPA Orginization set up, only building dpkg
# # building for ppa
# if os.system('debuild -S -sa') != 0:
# print 'Failed in debuild'
# sys.exit(-1)
#
# print
# sys.stdout.write('Everything seems to be good so far, upload?(y/n)')
# sys.stdout.flush()
# ans = raw_input().lower()
# while ans not in ['y', 'n']:
# sys.stdout.write('I don\'t understand, enter \'y\' or \'n\':')
# ans = raw_input().lower()
#
# if ans == 'n':
# print 'Skipped.'
# sys.exit(0)
#
# print 'Uploading'
# if os.system('dput %s ../%s' % (ppa_name, package+'_'+full_deb_version+'~'+cur_dist+'1_source.changes')) != 0:
# print 'Failed in uploading by dput'
# sys.exit(-1)
# building for dpkg
if os.system('dpkg-buildpackage -b --no-sign') != 0:
print 'Failed in dpkg-buildpackage'
sys.exit(-1)
print 'Build area not cleaned.'
print 'All done. Cool!'

317
archive/debian/changelog Normal file
View File

@ -0,0 +1,317 @@
pdf2htmlex (0.18.7-1~git20200531r3fcd0-0ubuntu1) UNRELEASED; urgency=medium
* test packaging
-- Stephen Gaito <dev@pDev> Sun, 31 May 2020 13:38:59 +0000
pdf2htmlex (0.18.7-1~git20190927rb69b8-0ubuntu1) disco; urgency=low
* Package for poppler-0.81.0
-- Stephen Gaito <stephen@perceptisys.co.uk> Fri, 27 Sep 2019 12:55:39 +0000
pdf2htmlex (0.18.6-1~git20190927r583b1-0ubuntu1) disco; urgency=low
* Package for poppler-0.80.0
-- Stephen Gaito <stephen@perceptisys.co.uk> Fri, 27 Sep 2019 11:58:57 +0000
pdf2htmlex (0.18.5-1~git20190927rdb4cc-0ubuntu1) disco; urgency=low
* Package for poppler-0.79.0
-- Stephen Gaito <stephen@perceptisys.co.uk> Fri, 27 Sep 2019 09:12:53 +0000
pdf2htmlex (0.18.4-1~git20190927r34bac-0ubuntu1) disco; urgency=low
* Package for poppler-0.78.0
-- Stephen Gaito <stephen@perceptisys.co.uk> Fri, 27 Sep 2019 07:46:26 +0000
pdf2htmlex (0.18.3-1~git20190926r7ed19-0ubuntu1) disco; urgency=low
* Package for poppler-0.77.0
-- Stephen Gaito <stephen@perceptisys.co.uk> Thu, 26 Sep 2019 17:56:51 +0000
pdf2htmlex (0.18.2-1~git20190926ra37f7-0ubuntu1) disco; urgency=low
* Package for poppler-0.76.0
-- Stephen Gaito <stephen@perceptisys.co.uk> Thu, 26 Sep 2019 15:29:27 +0000
pdf2htmlex (0.18.1-1~git20190926r11e2a-0ubuntu1) disco; urgency=low
* Package for poppler-0.75.0
-- Stephen Gaito <stephen@perceptisys.co.uk> Thu, 26 Sep 2019 10:59:59 +0000
pdf2htmlex (0.18.0-1~git20190924r37921-0ubuntu1) disco; urgency=medium
* Package for Ubuntu 19.04 (poppler-0.74.0)
-- Stephen Gaito <stephen@perceptisys.co.uk> Tue, 24 Sep 2019 14:56:03 +0000
pdf2htmlex (0.17.0-1~git20190924r37921-0ubuntu1) cosmic; urgency=low
* Package for 18.10 (poppler-0.68.0)
-- Stephen Gaito <stephen@perceptisys.co.uk> Tue, 24 Sep 2019 10:32:08 +0000
pdf2htmlex (0.16.0-1~git20190920r21a9f-0ubuntu1) bionic; urgency=low
* Package for 18.04
-- Trent Petersen <trentpetersen.523@gmail.com> Thu, 19 Sep 2019 10:33:35 -0500
pdf2htmlex (0.11-1~git201311150048r23755-0ubuntu1) saucy; urgency=low
* Fix packaging
-- WANG Lu <coolwanglu@gmail.com> Fri, 15 Nov 2013 00:48:06 +0800
pdf2htmlex (0.11-1~git201311042119refddc-0ubuntu1) saucy; urgency=low
* Packaging for 13.10
-- WANG Lu <coolwanglu@gmail.com> Mon, 04 Nov 2013 21:19:41 +0800
pdf2htmlex (0.11-1~git201310172203re1b11-0ubuntu1) raring; urgency=low
* Fix typo in dependencies
-- WANG Lu <coolwanglu@gmail.com> Thu, 17 Oct 2013 22:03:42 +0800
pdf2htmlex (0.10-1~git201310171220rc344e-0ubuntu1) raring; urgency=low
* Fix build
-- WANG Lu <coolwanglu@gmail.com> Thu, 17 Oct 2013 12:20:59 +0800
pdf2htmlex (0.10-1~git201310171209rdc970-0ubuntu1) raring; urgency=low
* v0.10 released, see Changelog
-- WANG Lu <coolwanglu@gmail.com> Thu, 17 Oct 2013 12:09:01 +0800
pdf2htmlex (0.9-1~git201309161133rd60eb-0ubuntu1) raring; urgency=low
* fix cmake test for packaging
-- WANG Lu <coolwanglu@gmail.com> Mon, 16 Sep 2013 11:33:11 +0800
pdf2htmlex (0.9-1~git201309161021rf2993-0ubuntu1) raring; urgency=low
* v0.9 released, see Changelog
-- WANG Lu <coolwanglu@gmail.com> Mon, 16 Sep 2013 10:21:05 +0800
pdf2htmlex (0.9-1~git201305291247rf655a-0ubuntu1) raring; urgency=low
* Regular upload
-- WANG Lu <coolwanglu@gmail.com> Wed, 29 May 2013 12:47:16 +0800
pdf2htmlex (0.8-1~git201305051429r92eab-0ubuntu1) raring; urgency=low
* v0.8 released, see Changelog
-- WANG Lu <coolwanglu@gmail.com> Sun, 05 May 2013 14:29:07 +0800
pdf2htmlex (0.8-1~git201304281550rd5f9c-0ubuntu1) raring; urgency=low
* Test packaging for multiple distributions
* Fix crashing with --split-pages
-- WANG Lu <coolwanglu@gmail.com> Sun, 28 Apr 2013 15:39:34 +0800
pdf2htmlex (0.8-1~git201304151420r1da9b-0ubuntu1) quantal; urgency=low
* HTML optimization
* New options: --optimize-text, --fallabck
* See more in Changelog
-- WANG Lu <coolwanglu@gmail.com> Mon, 15 Apr 2013 14:20:22 +0800
pdf2htmlex (0.8-1~git201303011406r3bc73-0ubuntu1) quantal; urgency=low
* Experimental printing support
* New version
-- WANG Lu <coolwanglu@gmail.com> Fri, 01 Mar 2013 14:06:42 +0800
pdf2htmlex (0.7-1~git201302282259r3bc73-0ubuntu1) quantal; urgency=low
* suggests ttfautohint
-- WANG Lu <coolwanglu@gmail.com> Thu, 28 Feb 2013 22:59:45 +0800
pdf2htmlex (0.7-1~git201302271054r3bc73-0ubuntu1) precise; urgency=low
* Packaging for 12.04
-- WANG Lu <coolwanglu@gmail.com> Wed, 27 Feb 2013 10:54:12 +0800
pdf2htmlex (0.7-1~git201302271053r3bc73-0ubuntu1) quantal; urgency=low
* Fix packpage dependency
-- WANG Lu <coolwanglu@gmail.com> Wed, 27 Feb 2013 10:52:17 +0800
pdf2htmlex (0.7-1~git201302270111r3bc73-0ubuntu1) quantal; urgency=low
* Regular upload
-- WANG Lu <coolwanglu@gmail.com> Wed, 27 Feb 2013 01:11:56 +0800
pdf2htmlex (0.7-1~git201302182049r3bc73-0ubuntu1) quantal; urgency=low
* New parameter: process-outline
-- WANG Lu <coolwanglu@gmail.com> Mon, 18 Feb 2013 20:49:57 +0800
pdf2htmlex (0.7-1~git201301292229r2595c-0ubuntu1) quantal; urgency=low
* Fixed a CSS issue
-- WANG Lu <coolwanglu@gmail.com> Tue, 29 Jan 2013 22:29:21 +0800
pdf2htmlex (0.7-1~git201301282229r2595c-0ubuntu1) quantal; urgency=low
* Process PDF Outline
-- WANG Lu <coolwanglu@gmail.com> Mon, 28 Jan 2013 22:29:35 +0800
pdf2htmlex (0.7-1~git201301261427r2595c-0ubuntu1) quantal; urgency=low
* New version, see Changelog for changelog
-- WANG Lu <coolwanglu@gmail.com> Sat, 26 Jan 2013 14:27:18 +0800
pdf2htmlex (0.6-1~git201212182148rd76af-0ubuntu1) quantal; urgency=low
* fix dependency of poppler for quantal
-- WANG Lu <coolwanglu@gmail.com> Tue, 18 Dec 2012 21:48:35 +0800
pdf2htmlex (0.6-1~git201212111844rd76af-0ubuntu1) quantal; urgency=low
* Package for quantal
-- WANG Lu <coolwanglu@gmail.com> Tue, 11 Dec 2012 18:44:44 +0800
pdf2htmlex (0.6-1~git201210070052rcb9a8-0ubuntu1) precise; urgency=low
* New version
-- WANG Lu <coolwanglu@gmail.com> Sun, 07 Oct 2012 00:52:42 +0800
pdf2htmlex (0.5-1~git201210051800rbaa37-0ubuntu1) precise; urgency=low
* Regularly re-packing.
-- WANG Lu <coolwanglu@gmail.com> Fri, 05 Oct 2012 18:00:48 +0800
pdf2htmlex (0.5-1~git201209270317r6fa14-0ubuntu1) precise; urgency=low
* Regularly re-packing.
-- WANG Lu <coolwanglu@gmail.com> Thu, 27 Sep 2012 03:17:02 +0800
pdf2htmlex (0.5-1~git201209261622r170a0-0ubuntu1) precise; urgency=low
* new version
-- WANG Lu <coolwanglu@gmail.com> Wed, 26 Sep 2012 16:22:50 +0800
pdf2htmlex (0.4-1~git201209241628r30aee-0ubuntu1) precise; urgency=low
* Regularly re-packing.
-- WANG Lu <coolwanglu@gmail.com> Mon, 24 Sep 2012 16:28:18 +0800
pdf2htmlex (0.4-1~git201209170124r8b4ec-0ubuntu1) precise; urgency=low
* Regularly re-packing.
-- WANG Lu <coolwanglu@gmail.com> Mon, 17 Sep 2012 01:24:29 +0800
pdf2htmlex (0.4-1~git201209162328r8b4ec-0ubuntu1) precise; urgency=low
* Regularly re-packing.
-- WANG Lu <coolwanglu@gmail.com> Sun, 16 Sep 2012 23:28:03 +0800
pdf2htmlex (0.3-1~git201209152353rf02e1-0ubuntu1) precise; urgency=low
* Regularly re-packing.
-- WANG Lu <coolwanglu@gmail.com> Sat, 15 Sep 2012 23:53:43 +0800
pdf2htmlex (0.3-1~git201209071504ra0de6-0ubuntu1) precise; urgency=low
* fix build
* 0.3 comes with more bug fixed
-- WANG Lu <coolwanglu@gmail.com> Fri, 07 Sep 2012 15:04:09 +0800
pdf2htmlex (0.2-3~git201209052329rbc256-0ubuntu1) precise; urgency=low
* Change dependency of fontforge
-- WANG Lu <coolwanglu@gmail.com> Wed, 05 Sep 2012 23:29:49 +0800
pdf2htmlex (0.2-3~git201209030158r926cf-0ubuntu1) precise; urgency=low
* Fix dependency of libpoppler27
-- WANG Lu <coolwanglu@gmail.com> Mon, 03 Sep 2012 01:58:42 +0800
pdf2htmlex (0.2-3~git201209010002rfe7b3-0ubuntu1) precise; urgency=low
* update license
-- WANG Lu <coolwanglu@gmail.com> Sat, 01 Sep 2012 00:02:23 +0800
pdf2htmlex (0.2-3~git201208312351rd12b8-0ubuntu1) precise; urgency=low
* 0.2dev, many bugs fixed
-- WANG Lu <coolwanglu@gmail.com> Fri, 31 Aug 2012 23:51:57 +0800
pdf2htmlex (0.1-3~git201208281638r1addb-0ubuntu1) precise; urgency=low
* Add debian files
-- WANG Lu <coolwanglu@gmail.com> Tue, 28 Aug 2012 16:38:19 +0800
pdf2htmlex (0.1-3~git201208281523r80dc3-0ubuntu1) precise; urgency=low
* Add dependency libpng
-- WANG Lu <coolwanglu@gmail.com> Tue, 28 Aug 2012 15:22:22 +0800
pdf2htmlex (0.1-3~git201208281431r383b1-0ubuntu1) precise; urgency=low
* Updated CMakeList.txt
-- WANG Lu <coolwanglu@gmail.com> Tue, 28 Aug 2012 14:29:43 +0800
pdf2htmlex (0.1-3~git201208281420rc53d7-0ubuntu1) precise; urgency=low
* Added config.h.in
-- WANG Lu <coolwanglu@gmail.com> Tue, 28 Aug 2012 14:06:22 +0800
pdf2htmlex (0.1-3~git201208281356r5731e-0ubuntu1) precise; urgency=low
* Fix version for package
-- WANG Lu <coolwanglu@gmail.com> Tue, 28 Aug 2012 13:46:09 +0800
pdf2htmlex (0.1-1~git20120828rf083f-0ubuntu1) precise; urgency=low
* Initial release.
-- WANG Lu <coolwanglu@gmail.com> Tue, 28 Aug 2012 01:26:33 +0800

1
archive/debian/compat Normal file
View File

@ -0,0 +1 @@
10

14
archive/debian/control Normal file
View File

@ -0,0 +1,14 @@
Source: pdf2htmlex
Section: universe/web
Priority: extra
Maintainer: Trent Petersen <trentpetersen.523@gmail.com>
Build-Depends: cmake (>= 2.6.0), pkg-config, debhelper (>= 10), libpng-dev, libjpeg-dev, openjdk-8-jre-headless
Standards-Version: 3.9.3
Homepage: http://github.com/pdf2htmlEX/pdf2htmlEX
Package: pdf2htmlex
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: ttfautohint
Description: Converts PDF to HTML without losing format
pdf2htmlEX converts PDF to HTML while retaining text, format & style as much as possible

23
archive/debian/copyright Normal file
View File

@ -0,0 +1,23 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: pdf2htmlEX
Upstream-Contact: WANG Lu <coolwanglu@gmail.com>.
Source: http://github.com/pdf2htmlEX/pdf2htmlEX
Files: *
Copyright: 2012 WANG Lu <coolwanglu@gmail.com>
License: GPL-3+
License: GPL-3
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

1
archive/debian/dirs Normal file
View File

@ -0,0 +1 @@
usr/bin

View File

@ -0,0 +1 @@
README.md

View File

14
archive/debian/rules Executable file
View File

@ -0,0 +1,14 @@
#!/usr/bin/make -f
%:
dh $@
override_dh_auto_test:
dh_auto_test || true
# The following override is required when creating a Debian package
# associated with a version of poppler which has NO debian package (ie when
# poppler has been compiled and installed from source).
#
override_dh_shlibdeps:
dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info

View File

@ -0,0 +1,2 @@
3.0 (quilt)

71
buildScripts/PKGBUILD Normal file
View File

@ -0,0 +1,71 @@
# Maintainer: Leonard von Hagen <lennivh24 at gmail dot com>
# Contributor: Francois Boulogne <fboulogne at april dot org>
pkgname=pdf2htmlex
_p2hname=pdf2htmlEX
pkgver=continuous
pkgrel=2
_popplerver=0.89.0
_popplerurl="https://poppler.freedesktop.org/poppler"
_popplerdataver=0.4.9
_popplerdataurl="https://poppler.freedesktop.org/poppler-data"
_fontforgever=20220308
_fontforgeurl="https://github.com/fontforge/fontforge/archive"
pkgdesc="Convert PDF to HTML without losing text or format."
arch=('x86_64')
url="https://github.com/pdf2htmlEX/pdf2htmlEX"
license=('GPL3')
depends=('fontconfig' 'freetype2' 'libjpeg-turbo' 'cairo' 'python3' 'libxml2')
# gnu-libiconv-dev libpng-dev glib-dev libxml2-dev
makedepends=('cmake' 'git')
# pkgconfig ruby openjdk8 jq
optdepends=('ttfautohint: Provides automated hinting process for web fonts')
source=("$_p2hname-poppler-$_popplerver.tar.xz::$_popplerurl-$_popplerver.tar.xz"
"$_p2hname-poppler-data-$_popplerdataver.tar.gz::$_popplerdataurl-$_popplerdataver.tar.gz"
"$_p2hname-fontforge-$_fontforgever.tar.gz::$_fontforgeurl/$_fontforgever.tar.gz"
"$_p2hname-$pkgver.tar.gz::$url/archive/continuous.tar.gz"
"50-disable-pdf2htmlex-tests.patch"
"popplerFlags" "fontforgeFlags")
sha256sums=('fba230364537782cc5d43b08d693ef69c36586286349683c7b127156a8ef9b5c'
'1f9c7e7de9ecd0db6ab287349e31bf815ca108a5a175cf906a90163bdbe32012'
'ad0eb017379c6f7489aa8e2d7c160f19140d1ac6351f20df1d9857d9428efcf2'
'e5af2d0831c80f0fe40eb5470190ce7731f03154044c993add124a1496e352ce'
'28d81fc2344dc3a612886e2e159d8bdd0da8de62b28cb2ef16a45b1ccf364af4'
# above: 50.patch -- below: popplerFlags
'55558182468c5b96a0c0ed0c3ce7d936c906d1cf3ec232d0a37735cdd8190a10'
'35e431f050037d653a61654f9d9d3a13fe790178f4803ce045964fed4d9b7228')
prepare() {
cd "$_p2hname-$pkgver"
patch "pdf2htmlEX/CMakeLists.txt" "${srcdir}/50-disable-pdf2htmlex-tests.patch"
rm -rf "poppler/" "poppler-data/" "fontforge/"
mv "../poppler-$_popplerver/" "poppler/"
mv "../poppler-data-$_popplerdataver/" "poppler-data/"
mv "../fontforge-$_fontforgever/" "fontforge/"
rm -rf "pdf2htmlEX/build"
mkdir "poppler/build/" "fontforge/build/" "pdf2htmlEX/build"
}
build() {
cd "$_p2hname-$pkgver/poppler/build/"
# ignore the commented flags using grep
cmake $(grep -v "^#" ${srcdir}/popplerFlags) ..
make
cd ../../
cd "fontforge/build/"
cmake $(grep -v "^#" ${srcdir}/fontforgeFlags) ..
make
cd ../../
cd "pdf2htmlEX/build/"
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ..
make
}
package() {
cd "$srcdir/pdf2htmlEX-${pkgver}/pdf2htmlEX/build/"
make DESTDIR="${pkgdir}/" install
#install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${_p2hname}/LICENSE"
# don't need the license as it's bundled with the common licenses package
}

336
buildScripts/Readme.md Normal file
View File

@ -0,0 +1,336 @@
# Building pdf2htmlEX
Because of its intimate use of *specific* versions of both Poppler and
FontForge, cleanly building `pdf2htmlEX` is rather more complex than
normal.
The (shell) scripts in this directory help automate this mutli-stage
process.
For all but the most experienced programmers, we *strongly* encourage you
to use these scripts to build `pdf2htmlEX`.
---
**Table of contents**
- [TL;DR ...](#tldr-)
- [Downloading precompiled versions](#downloading-precompiled-versions-downloads)
- [Building yourself](#building-yourself)
- [The problem](#the-problem)
- [Our solution](#our-solution)
- [The gory details ...](#the-gory-details-)
- [Top-level scripts](#top-level-scripts)
- [Individual steps](#individual-steps)
- [Helper files and scripts](#helper-files-and-scripts)
- [Yet more details?](#yet-more-details)
---
## TL;DR ...
### Downloading precompiled versions
For most users, you probably really want to simply download one of the
[precompiled versions of
`pdf2htmlEX`](https://github.com/pdf2htmlEX/pdf2htmlEX/releases):
- [Debian archive](https://en.wikipedia.org/wiki/Dpkg) : Download,
[apt](https://en.wikipedia.org/wiki/APT_(software)) install locally,
and run...
This will work on any [Debian](https://www.debian.org/) based and most
recent Windows 10 machines.
Experienced users of Linux, may be able to repackage the `*.deb` we
provide for use with their favourite package management tool.
- [AppImage](https://appimage.org/) : Download, make executable, and
run...
This will work on most Linuxes, and most recent Windows 10.
(It will not currently work on MacOS or Alpine based machines).
- [OCI](https://opencontainers.org/) Image from the [`pdf2htmlEX` Docker
hub](https://hub.docker.com/orgs/pdf2htmlex/repositories).
This will work on any machine with an OCI Container system (such as
Docker, Podman, CRI-O, Kubernetes) installed.
(Note: that *advanced* use of `pdf2htmlEX` requires careful attention to
the configuration of various tools, such as fontconfig, iconv and your
locally available fonts use by the poppler and fontforge libraries. The
OCI container images created by the pdf2htmlEX team might not be as well
configured for *your needs* as an OCI container created and configured
by you)
### Building yourself
To build `pdf2htmlEX` on a Debian/Apt related machine, inside the root
directory of a fresh clone of the
[pdf2htmlEX/pdf2htmlEX](https://github.com/pdf2htmlEX/pdf2htmlEX)
repository, type:
```
./buildScripts/buildInstallLocallyApt
```
This will automatically install all required development tools and
libraries, and then proceed to download and statically compile the
required versions of both Poppler and FontForge before compiling and
installing `pdf2htmlEX` into /usr/local/bin.
**NOTE:** at the moment this will **only** work on machines with a
[Debian](https://www.debian.org/) based distribution. such as
[Ubuntu](https://ubuntu.com/), [Linux Mint](https://linuxmint.com/), etc.
**NOTE:** there is currently an *experimental* build script,
`./buildScripts/buildInstallLocallyAlpine`, for builds in Alpine
environments.
## The problem
To provide its full functionality, the `pdf2htmlEX` sources make direct
use of source code and unexposed methods from both the Poppler and
FontForge projects. Unfortunately the source code in the Poppler and
FontForge projects that the `pdf2htmlEX` uses changes regularly.
This means that the `pdf2htmlEX` souce code *must* be updated regularly to
match *specific releases* of both Poppler and FontForge.
Unfortunately, the installed versions of both Poppler and FontForge in
most Linux distributions, lag the official releases of both of these
projects. Even worse few distributions install the same versions.
This means that it is nearly impossible for the `pdf2htmlEX` code to
'predict' which version of Poppler or FontForge will be installed on a
given user's machine.
## Our solution
While we *could* keep multiple versions of the `pdf2htmlEX` source code,
each version matched to a particular distribution's installed versions of
Poppler and FontForge, this would be a logistic and testing 'nightmare'.
Instead, when building `pdf2htmlEX`, we download specific versions of both
the Poppler and FontForge sources (usually the most recent), and then
compile *static* versions of the Poppler and FontForge libraries which are
then *statically* linked into the `pdf2htmlEX` binary.
This means that the `pdf2htmlEX` binary is completely independent of any
locally installed versions of either Poppler or FontForge.
However, to get the matched versions of Poppler and FontForge and then
compile them statically, *our* build process becomes much more complex
than a "simple", `configure, make, make install` cycle.
Hence this directory has a large number of shell scripts each of which
automate one simple step in the overall our build process.
## The gory details ...
The shell scripts in this directory automate the download, build, install,
test and upload steps required to provide a complete build/test/release
cycle of `pdf2htmlEX`.
Each script can be used individually to re-run a particular step if needed.
### Top-level scripts
Typically, most users, will run one of the following "top-level" scripts:
1. **`buildInstallLocallyApt`** (**`buildInstallLocallyAlpine`**)
This will automate:
1. the installation of all required development tools
and libraries,
2. download and statically compile the required versions of both
Poppler and FontForge,
3. compile and install `pdf2htmlEX`.
The `*Apt` script will build on any machine which uses the
`apt`/`apt-get` command.
The `*Alpine` script will build on any machine which uses the
`apk` command (Alpine).
2. **`createImagesApt`** (**`createImagesAlpine`**)
Following a successful `buildInstallLocallyApt`, the `createImagesApt`
shell script will create the following images:
1. AppImage
2. OCI Container image
3. Debian archive
Following a successful `buildInstallLocallyAlpine`, the
`createImagesAlpine` shell script will create the following images:
1. Alpine tar file
2. OCI Container image
3. **`runTests`**
Following a successful `buildInstallLocallyApt` (or
`buildInstallLocallyAlpine` ), the `runTests` shell script will run the
various 'local' tests reporting errors as they occur.
When run in [Travis-ci](https://travis-ci.org/), failing browser tests
will *not* fail the overall Travis build, but will instead upload the
test results to the GitHub Release page for later review.
4. **`uploadImages`**
Following successful `buildInstallLocally`, `createImages` and
`runTests`, this will automate the upload of the various artefacts to
the `pdf2htmlEX` releases page, and docker hub repository.
**Note** that this step requires the user to enter passwords for each
of the respective services. *Most* users will not need (or be able) to
run this step.
5. **`travisLinuxDoItAll`**
This script is used by the `.travis.yml` configuration to build, test
and upload a complete `pdf2htmlEX` release cycle. It is essentially a
compendium of all of the build scripts in the correct order.
### Individual steps
- **`buildFontforge`**: Compiles a *static* version of `libfontforge` for
use by `pdf2htmlEX`.
Statically linking `libfontforge` into `phd2htmlEX` ensures that any
versions of FontForge already installed by the user, are not broken by
the user's installation of `pdf2htmlEX`.
- **`buildPdf2htmlEX`**: Compiles and links `pdf2htmlEX`.
- **`buildPoppler`**: Compiles a *static* version of `libpoppler` and
`libpopper-glib` for use by `pdf2htmlEX`.
Statically linking `libpoppler` and `libpoppler-glib` into `phd2htmlEX`
ensures that any versions of Poppler already installed by the user, are
not broken by the user's installation of `pdf2htmlEX`.
- **`createAlpineTarFile`**: Using an already compiled version of `pdf2htmlEX`,
installs it and `popper-data` into a tar file suitable for use in any
Alpine environment.
- **`createAppImage`**: Using an already compiled version of `pdf2htmlEX`,
installs it and `popper-data` into an AppImage.
- **`createDebianPackage`**: Using an already compiled version of
`pdf2htmlEX`, installs it and `poppler-data` into a Debian archive
(`*.deb`).
- **`createContainerAlpineImageFromTarFile`**: Installs the Alpine tar file
archive of `pdf2htmlEX` created by `createAlpineTarFile` into an Alpine
Container.
- **`createContainerUbuntuImageFromDeb`**: Installs the Debian archive of
`pdf2htmlEX` created by `createDebianPackage` into a Container.
- **`getBuildToolsAlpine`**: Locally `apk` installs all development
*tools* required to build `pdf2htmlEX`.
- **`getBuildToolsApt`**: Locally `apt` installs all development *tools*
required to build `pdf2htmlEX`.
- **`getDevLibrariesAlpine`**: Locally `apk` installs all development
*libraries* required to build `pdf2htmlEX`.
- **`getDevLibrariesApt`**: Locally `apt` installs all development
*libraries* required to build `pdf2htmlEX`.
This script provides a definitive list of all libraries required to run
`pdf2htmlEX`.
This script provides a definitive list of all libraries required to run
`pdf2htmlEX`.
- **`getFontforge`**: Downloads and unpacks the version of FontForge specified in the
`FONTFORGE_VERSION` environment variable into the
`pdf2htmlEX/fontoforge` directory.
The `FONTFORGE_VERSION` variable is specified in the `versionEnvs`
script.
- **`getPoppler`**: Downloads and unpacks the version of Poppler specified in the
`POPPLER_VERSION` environment variable into the `pdf2htmlEX/poppler`
directory.
The `POPPLER_VERSION` variable is specified in the `versionEnvs` script.
The `getPoppler` script also downloads and unpacks the most recent
version of `poppler-data`. Since `poppler-data` does not change very
often, the correct version of `poppler-data` is specified in the
`getPoppler` script itself.
- **`installPdf2htmlEX`**: Installs an already compiled version of
`pdf2htmlEX` and `poppler-data` into the location specified by the
`PDF2HTMLEX_PREFIX` environment variable.
The `PDF2HTMLEX_PREFIX` variable is specified in the `versionEnvs`
script.
- **`runTests`**: Runs the tests located in the
`pdf2htmlEX/pdf2htmlEX/test` directory. See the
`pdf2htmlEX/pdf2htmlEx/test` directory's Readme file for details.
- **`uploadContainerImage`**: Upload the `pdf2htmlEX` Container image to
Docker hub repository associated to the docker hub users specified in
the `DOCKER_HUB_USERNAME` environement variable.
Unless the `DOCKER_HUB_USERNAME` and `DOCKER_HUB_PASSWORD` environment
variables are pre-defined, this script will prompt the user for the
respective values.
- **`uploadGitHubRelease`**: Upload the `pdf2htmlEX` artefacts (AppImage,
Debian archive, test results, etc) to the *continuous* section of the
release page associated with the `TRAVIS_REPO_SLUG` (user/project)
environment variable.
Unless the `GITHUB_USERNAME`, `GITHUB_TOKEN`, and `TRAVIS_REPO_SLUG`
(user/project) environment variables are pre-defined, this script will
prompt the user for the respective values.
### Helper files and scripts
- **`versionEnvs`**: Specifies all of the evnironment variables required
for a standard build of `pdf2htmlEX`. Changes in this script effect
*all* of the other build scripts.
- **`reSourceVersionEnvs`**: This shell script is automatically generated
by the build scripts as they are run. It records the values of all
important environment variables required by the buildScripts. It is
typcically `source`d by each script before it preforms any actions.
- **`reportEnvs`**: Echos all important enviroment variables to the
console. This script is used by the top-level scripts to ensure the
current environment variables are listed before each build.
- **`uploadGitHubReleaseDSL`**: A collection of shell functions used by the
`uploadGitHubRelease` script to automate the upload of release artefacts.
- **`uploadGitHubReleaseMessage`**: The contents of this *text* file is
used by the `uploadGitHubRelease` script as the contents of the release
message, as visible to the user, for the 'continuous' release section.
- **`listFilesByChangeTime`**: A simple shell script which lists the files
in the buildScripts directory by most recently changed files first.
- **`Readme.md`**: This read me file.
## Yet more details?
The various shell script files are meant to be fairly readable. They
contain additional comments about what each step is meant to be doing.

92
buildScripts/buildFontforge Executable file
View File

@ -0,0 +1,92 @@
#!/bin/sh
# This shell script build FontForge
# source buildScripts/reSourceVersionEnvs
. buildScripts/reSourceVersionEnvs
echo ""
echo "-------------------------------------------------------------------"
echo "BUILDING FontForge (using CMake)"
echo "-------------------------------------------------------------------"
echo ""
set -ev
cd fontforge
mkdir build
cd build
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$PDF2HTMLEX_PREFIX \
-DBUILD_SHARED_LIBS:BOOL=OFF \
-DENABLE_GUI:BOOL=OFF \
-DENABLE_X11:BOOL=OFF \
-DENABLE_NATIVE_SCRIPTING:BOOL=ON \
-DENABLE_PYTHON_SCRIPTING:BOOL=OFF \
-DENABLE_PYTHON_EXTENSION:AUTO=OFF \
-DENABLE_LIBSPIRO:BOOL=OFF \
-DENABLE_LIBUNINAMESLIST:BOOL=OFF \
-DENABLE_LIBGIF:AUTO=OFF \
-DENABLE_LIBJPEG:AUTO=ON \
-DENABLE_LIBPNG:AUTO=ON \
-DENABLE_LIBREADLINE:AUTO=OFF \
-DENABLE_LIBTIFF:AUTO=OFF \
-DENABLE_WOFF2:AUTO=OFF \
-DENABLE_DOCS:AUTO=OFF \
-DENABLE_CODE_COVERAGE:BOOL=OFF \
-DENABLE_DEBUG_RAW_POINTS:BOOL=OFF \
-DENABLE_FONTFORGE_EXTRAS:BOOL=OFF \
-DENABLE_MAINTAINER_TOOLS:BOOL=OFF \
-DENABLE_TILE_PATH:BOOL=OFF \
-DENABLE_WRITE_PFM:BOOL=OFF \
-DENABLE_SANITIZER:ENUM="none" \
-DENABLE_FREETYPE_DEBUGGER:PATH="" \
-DSPHINX_USE_VENV:BOOL=OFF \
-DREAL_TYPE:ENUM="double" \
-DTHEME:ENUM="tango" \
..
# Apply any patches required for fontforge raw sources before we make
#
#for APATCHFILE in $(ls ../patches/fontforge-$FONTFORGE_VERSION-*)
#do
# echo "patching fontforge using [$APATCHFILE]"
# patch -p 1 < $APATCHFILE
#done
make $MAKE_PARALLEL
##########################################################
# FontForge CMakeLists.txt build options (2020/05/31):
# BUILD_SHARED_LIBS:BOOL=OFF "Build libfontforge as a shared library")
# ENABLE_GUI:BOOL=OFF "Build FontForge with GUI support")
# ENABLE_X11:BOOL=OFF "Build the GUI using the X backend INSTEAD of the GDK backend" "ENABLE_GUI")
# ENABLE_NATIVE_SCRIPTING:BOOL=ON "Enables FontForge's native scripting support")
# ENABLE_PYTHON_SCRIPTING:BOOL=OFF "Enables FontForge's Python scripting support")
# ENABLE_PYTHON_EXTENSION:AUTO=OFF "Builds the Python models for use with system python")
# ENABLE_LIBSPIRO:BOOL=ON "Enables libspiro support")
# ENABLE_LIBUNINAMESLIST:BOOL=ON "Enables libuninameslist support")
# ENABLE_LIBGIF:AUTO=OFF "Enables GIF support")
# ENABLE_LIBJPEG:AUTO=ON "Enables JPEG support")
# ENABLE_LIBPNG:AUTO=ON "Enables PNG support")
# ENABLE_LIBREADLINE:AUTO=OFF "Enables Readline support")
# ENABLE_LIBTIFF:AUTO=OFF "Enables TIFF support")
# ENABLE_WOFF2:AUTO=OFF "Enables WOFF2 support")
# ENABLE_DOCS:AUTO=OFF "Enables building and installing documentation. Sphinx is required to build it.")
# ENABLE_CODE_COVERAGE:BOOL=OFF "Build with code coverage support")
# ENABLE_DEBUG_RAW_POINTS:BOOL=OFF "Add a raw mode to the points window of the debugger")
# ENABLE_FONTFORGE_EXTRAS:BOOL=OFF "Builds programs from the contrib directory")
# ENABLE_MAINTAINER_TOOLS:BOOL=OFF "Build programs normally only used by FontForge maintainers and developers")
# ENABLE_TILE_PATH:BOOL=OFF "Enable a 'tile path' command (a variant of 'expand stroke')")
# ENABLE_WRITE_PFM:BOOL=OFF "Add the ability to save a PFM file without creating the associated font file")
# ENABLE_SANITIZER:ENUM="none" "Enables a sanitizer. Requires support from the compiler."
# ENABLE_FREETYPE_DEBUGGER:PATH="" "Use FreeTypes internal debugger within FontForge."
# SPHINX_USE_VENV:BOOL=OFF "If building documentation and Sphinx is not installed, try to install and use it from a python3 venv."
# REAL_TYPE:ENUM="double" "Sets the floating point type used." "double" "float")
# THEME:ENUM="tango" "Sets the GUI theme." "tango" "2012")

View File

@ -0,0 +1,49 @@
#!/bin/sh
# This shell script builds the complete pdf2htmlEX application LOCALLY
# (It does not create the AppImage or Container images)
# Adjust the following two environment variables to suit your needs
#
export UNATTENDED="--assume-yes"
export MAKE_PARALLEL="-j $(nproc)"
# choose one of the following...
#
# export PDF2HTMLEX_BRANCH="<<YourTagHereWithNoSpaces>>"
export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
# The following environment variable determines where the poppler,
# poppler-data, fontforge and pdf2htmlEX packages are installed.
# CHANGE IT TO SUIT YOUR NEEDS:
#
export PDF2HTMLEX_PREFIX=/usr/local
# Ensure all Apt packages are installed with no user interaction
#
export DEBIAN_FRONTEND=noninteractive
set -ev
################
# do the build
./buildScripts/versionEnvs
./buildScripts/reportEnvs
./buildScripts/getBuildToolsAlpine
./buildScripts/getDevLibrariesAlpine
./buildScripts/getPoppler
./buildScripts/buildPoppler
./buildScripts/getFontforge
./buildScripts/buildFontforge
./buildScripts/buildPdf2htmlEX
./buildScripts/installPdf2htmlEX

View File

@ -0,0 +1,49 @@
#!/bin/sh
# This shell script builds the complete pdf2htmlEX application LOCALLY
# (It does not create the AppImage or Container images)
# Adjust the following two environment variables to suit your needs
#
export UNATTENDED="--assume-yes"
export MAKE_PARALLEL="-j $(nproc)"
# choose one of the following...
#
# export PDF2HTMLEX_BRANCH="<<YourTagHereWithNoSpaces>>"
export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
# The following environment variable determines where the poppler,
# poppler-data, fontforge and pdf2htmlEX packages are installed.
# CHANGE IT TO SUIT YOUR NEEDS:
#
export PDF2HTMLEX_PREFIX=/usr/local
# Ensure all Apt packages are installed with no user interaction
#
export DEBIAN_FRONTEND=noninteractive
set -ev
################
# do the build
./buildScripts/versionEnvs
./buildScripts/reportEnvs
./buildScripts/getBuildToolsApt
./buildScripts/getDevLibrariesApt
./buildScripts/getPoppler
./buildScripts/buildPoppler
./buildScripts/getFontforge
./buildScripts/buildFontforge
./buildScripts/buildPdf2htmlEX
./buildScripts/installPdf2htmlEX

View File

@ -0,0 +1,49 @@
#!/bin/sh
# This shell script builds the complete pdf2htmlEX application LOCALLY
# (It does not create the AppImage or Container images)
# Adjust the following two environment variables to suit your needs
#
export UNATTENDED="-y --setopt=install_weak_deps=False"
export MAKE_PARALLEL="-j $(nproc)"
# choose one of the following...
#
# export PDF2HTMLEX_BRANCH="<<YourTagHereWithNoSpaces>>"
export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
# The following environment variable determines where the poppler,
# poppler-data, fontforge and pdf2htmlEX packages are installed.
# CHANGE IT TO SUIT YOUR NEEDS:
#
export PDF2HTMLEX_PREFIX=/usr/local
# Ensure all Apt packages are installed with no user interaction
#
export DEBIAN_FRONTEND=noninteractive
set -ev
################
# do the build
./buildScripts/versionEnvs
./buildScripts/reportEnvs
./buildScripts/getBuildToolsDnf
./buildScripts/getDevLibrariesDnf
./buildScripts/getPoppler
./buildScripts/buildPoppler
./buildScripts/getFontforge
./buildScripts/buildFontforge
./buildScripts/buildPdf2htmlEX
./buildScripts/installPdf2htmlEX

23
buildScripts/buildPdf2htmlEX Executable file
View File

@ -0,0 +1,23 @@
#!/bin/sh
# This shell script builds pdf2htmlEX
# source ./buildScripts/reSourceVersionEnvs
. ./buildScripts/reSourceVersionEnvs
echo ""
echo "-------------------------------------------------------------------"
echo "BUILDING pdf2htmlEX (using gcc)"
echo " PDF2HTMLEX_VERSION = [$PDF2HTMLEX_VERSION]"
echo "-------------------------------------------------------------------"
echo ""
set -ev
cd pdf2htmlEX
rm -rf build
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PDF2HTMLEX_PREFIX ..
make $MAKE_PARALLEL

111
buildScripts/buildPoppler Executable file
View File

@ -0,0 +1,111 @@
#!/bin/sh
# This shell script builds the latest poppler
echo ""
echo "-------------------------------------------------------------------"
echo "BUILDING Poppler (using CMake)"
echo "-------------------------------------------------------------------"
echo ""
set -ev
cd poppler
mkdir build
cd build
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$PDF2HTMLEX_PREFIX \
-DENABLE_UNSTABLE_API_ABI_HEADERS=OFF \
-DBUILD_GTK_TESTS=OFF \
-DBUILD_QT5_TESTS=OFF \
-DBUILD_QT6_TESTS=OFF \
-DBUILD_CPP_TESTS=OFF \
-DBUILD_MANUAL_TESTS=OFF \
-DENABLE_BOOST=OFF \
-DENABLE_SPLASH=ON \
-DENABLE_UTILS=OFF \
-DENABLE_CPP=OFF \
-DENABLE_GLIB=ON \
-DENABLE_GOBJECT_INTROSPECTION=OFF \
-DENABLE_GTK_DOC=OFF \
-DENABLE_QT5=OFF \
-DENABLE_QT6=OFF \
-DENABLE_LIBOPENJPEG="none" \
-DENABLE_DCTDECODER="libjpeg" \
-DENABLE_CMS="none" \
-DENABLE_LCMS=OFF \
-DENABLE_LIBCURL=OFF \
-DENABLE_LIBTIFF=OFF \
-DWITH_TIFF=OFF \
-DWITH_NSS3=OFF \
-DENABLE_NSS3=OFF \
-DENABLE_GPGME=OFF \
-DENABLE_ZLIB=ON \
-DENABLE_ZLIB_UNCOMPRESS=OFF \
-DUSE_FLOAT=OFF \
-DBUILD_SHARED_LIBS=OFF \
-DRUN_GPERF_IF_PRESENT=OFF \
-DEXTRA_WARN=OFF \
-DWITH_JPEG=ON \
-DWITH_PNG=ON \
-DWITH_Cairo=ON \
..
make $MAKE_PARALLEL
###############################################################
# Poppler CMakeLists.text build options (2020/05/31):
# ENABLE_UNSTABLE_API_ABI_HEADERS=OFF "Install API/ABI unstable xpdf headers."
# BUILD_GTK_TESTS=OFF "Whether to compile the GTK+ test programs."
# BUILD_QT5_TESTS=OFF "Whether to compile the Qt5 test programs."
# BUILD_CPP_TESTS=OFF "Whether to compile the CPP test programs."
# ENABLE_SPLASH=ON "Build the Splash graphics backend."
# ENABLE_UTILS=OFF "Compile poppler command line utils."
# ENABLE_CPP=ON "Compile poppler cpp wrapper."
# ENABLE_GLIB=ON "Compile poppler glib wrapper."
# ENABLE_GOBJECT_INTROSPECTION=ON "Whether to generate GObject introspection."
# ENABLE_GTK_DOC=OFF "Whether to generate glib API documentation."
# ENABLE_QT5=OFF "Compile poppler qt5 wrapper."
#
# ENABLE_LIBOPENJPEG="none"
#
# "Use libopenjpeg for JPX streams. Possible values: openjpeg2,
# unmaintained, none. 'unmaintained' gives you the internal unmaintained
# decoder. Use at your own risk. 'none' compiles no JPX decoder at all.
# Default: openjpeg2"
#
# ENABLE_CMS="lcms2"
#
# "Use color management system. Possible values: lcms2, none. 'none'
# disables color management system."
#
# ENABLE_DCTDECODER="libjpeg"
#
# "Use libjpeg for DCT streams. Possible values: libjpeg, unmaintained,
# none. will use libjpeg if available or fail if not. 'unmaintained' gives
# you the internal unmaintained decoder. Use at your own risk. 'none'
# compiles no DCT decoder at all. Default: libjpeg"
#
# ENABLE_LIBCURL=OFF "Build libcurl based HTTP support."
# ENABLE_ZLIB=ON "Build with zlib."
# ENABLE_ZLIB_UNCOMPRESS=OFF "Use zlib to uncompress flate streams (not totally safe)."
# USE_FLOAT=OFF "Use single precision arithmetic in the Splash backend"
# BUILD_SHARED_LIBS=OFF "Build poppler as a shared library"
# RUN_GPERF_IF_PRESENT=OFF "Run gperf if it is found"
# EXTRA_WARN=OFF "Enable extra compile warnings"
# The following packages are optional and only used if found:
# JPEG is required by pdf2htmlEX
# PNG is required by pdf2htmlEX
# TIFF is not used by pdf2htmlEX
# NSS3 is not used by pdf2htmlEX?
# CAIRO is required by pdf2htmlEX
# GLIB is requrired by pdf2htmlEX
# GObjectIntrospection is not needed by pdf2htmlEX?
# Iconv is only used if ENABLE_CPP
#
# They can be explicitly DISABLED using ENABLE_XXXX:BOOL=OFF where XXXX is
# the package name

View File

@ -0,0 +1,81 @@
#!/bin/sh
# This shell script creates a tar file which can use used to create an OCI
# container from an existing pdf2htmlEX.
#
# This is the part which can run *inside* an OCI container.
echo ""
echo "-------------------------------------------------------------------"
echo "CREATING pdf2htmlEX Container Image (run inside an OCI container)"
echo " (based on Alpine linux $BUILD_DIST)"
echo "-------------------------------------------------------------------"
echo ""
# Collect everything that will be needed...
# source buildScripts/reSourceVersionEnvs
. buildScripts/reSourceVersionEnvs
export ALPINE_NAME="pdf2htmlEX-$PDF2HTMLEX_NAME"
echo "export ALPINE_NAME=\"$ALPINE_NAME\"" >> buildScripts/reSourceVersionEnvs
set -ev
mkdir -p imageBuild/alpineTarDir
cd pdf2htmlEX/build
sudo rm -rf install_manifest.txt
make install DESTDIR=../../imageBuild/alpineTarDir
cd ../../poppler-data
make install \
prefix=$PDF2HTMLEX_PREFIX \
datadir=$PDF2HTMLEX_PREFIX/share/pdf2htmlEX \
DESTDIR=../imageBuild/alpineTarDir
cd ../imageBuild/alpineTarDir
tar czvf ../$ALPINE_NAME.tar.gz --owner=root --group=root *
cd ..
cat <<ALPINE_INSTALL > $ALPINE_NAME.install
#!/bin/sh
# This (alpine) shell script installs a locally existing tar.gz file of
# the pdf2htmlEX binaries compiled on Alpine $DIST.
#
# You MUST have root/sudo privileges to run this file.
#
# We start by installing all of the (known) required runtime dependencies
#
apk update
#
apk add --no-cache \
tar \
libstdc++ \
libgcc \
gnu-libiconv \
gettext \
glib \
freetype \
fontconfig \
cairo \
libpng \
libjpeg-turbo \
libxml2
# Now we install the (Alpine $DIST) compiled pdf2htmlEX binaries and
# configuration files.
#
tar xvf $ALPINE_NAME.tar.gz -C /
ALPINE_INSTALL
chmod a+r $ALPINE_NAME.tar.gz

81
buildScripts/createAppImage Executable file
View File

@ -0,0 +1,81 @@
#!/bin/sh
# This shell script creates an AppImage for pdf2htmlEX
# source ./buildScripts/reSourceVersionEnvs
. ./buildScripts/reSourceVersionEnvs
echo ""
echo "-------------------------------------------------------------------"
echo "CREATING pdf2htmlEX AppImage"
echo "-------------------------------------------------------------------"
echo ""
set -ev
# For appimage output plugin
#
#export VERSION="$PDF2HTMLEX_BRANCH-$BUILD_TIME"
export APPIMAGE_NAME="pdf2htmlEX-$PDF2HTMLEX_NAME.AppImage"
echo "export APPIMAGE_NAME=\"$APPIMAGE_NAME\"" >> buildScripts/reSourceVersionEnvs
mkdir -p imageBuild/appDir/usr/lib/
cd pdf2htmlEX/build
sudo rm -rf install_manifest.txt
make install DESTDIR=../../imageBuild/appDir
cd ../../poppler-data
make install \
prefix=$PDF2HTMLEX_PREFIX \
datadir=$PDF2HTMLEX_PREFIX/share/pdf2htmlEX \
DESTDIR=../imageBuild/appDir
cd ../imageBuild
# Make sure directories can be traversed by nobody
#
#find appDir -type d -exec chmod 755 {} \;
#
# Make sure files can be read by nobody
#
#find appDir -type f -exec chmod 644 {} \;
# force libfontconfig into AppImage (linuxdeploy blacklists libfontconfig)
# (turned off since libfontconfig needs to be matched to the underlying
# OS's collection of fonts and /etc/fonts configuration files)
#
#cp /usr/lib/x86_64-linux-gnu/libfontconfig.so.1 appDir/usr/lib/
LINUX_DEPLOY_APP_IMAGE=linuxdeploy-$MACHINE_ARCH.AppImage
wget $LINUX_DEPLOY_URL/$LINUX_DEPLOY_APP_IMAGE
chmod a+x $LINUX_DEPLOY_APP_IMAGE
if [ ! -w /dev/fuse ] ; then
# We are in an environment in which FUSE is not useable...
#
# We explicilty extract the appimage to a squashfs to allow it to be used
# even if FUSE is not available.
#
./$LINUX_DEPLOY_APP_IMAGE --appimage-extract
#
LINUX_DEPLOY_APP_IMAGE=squashfs-root/AppRun
fi
export VERBOSE=1
export OUTPUT=$APPIMAGE_NAME
./$LINUX_DEPLOY_APP_IMAGE \
-e appDir/$PDF2HTMLEX_PREFIX/bin/pdf2htmlEX \
--create-desktop-file \
-i ../pdf2htmlEX/logo/pdf2htmlEX.svg \
--appdir=appDir \
--output appimage

View File

@ -0,0 +1,77 @@
#!/bin/sh
# This shell script creates a container image from an existing pdf2htmlEX
#
# This is the part which must be run *outside* of any OCI container.
echo ""
echo "-------------------------------------------------------------------"
echo "CREATING pdf2htmlEX Container Image (run outside any OCI container)"
echo " (based on Alpine linux $BUILD_DIST)"
echo "-------------------------------------------------------------------"
echo ""
# Collect everything that will be needed...
# source buildScripts/reSourceVersionEnvs
. buildScripts/reSourceVersionEnvs
set -ev
mkdir -p imageBuild/containerDir
cd imageBuild/containerDir
cp ../$ALPINE_NAME.* .
if [ -z "$CONTAINER_FROM" ]; then
echo ""
read -p "Enter the container image for the 'from' base: " CONTAINER_FROM
echo ""
if [ -z "$CONTAINER_FROM" ]; then
echo "CONTAINER_FROM not set... so we can not build the container image"
exit 1
fi
fi
if [ -z "$DOCKER_HUB_USERNAME" ]; then
echo ""
read -p "Enter a docker hub username: " DOCKER_HUB_USERNAME
echo ""
if [ -z "$DOCKER_HUB_USERNAME" ]; then
echo "DOCKER_HUB_USERNAME not set... so we can not build the container image"
exit 1
fi
fi
if [ -x "$(which podman)" ]; then
alias docker=podman
fi
export CONTAINER_NAME="$DOCKER_HUB_USERNAME/pdf2htmlex:$PDF2HTMLEX_NAME"
echo "export CONTAINER_FROM=\"$CONTAINER_FROM\"" >> ../../buildScripts/reSourceVersionEnvs
echo "export DOCKER_HUB_USERNAME=\"$DOCKER_HUB_USERNAME\"" >> ../../buildScripts/reSourceVersionEnvs
echo "export CONTAINER_NAME=\"$CONTAINER_NAME\"" >> ../../buildScripts/reSourceVersionEnvs
cat > Dockerfile <<DOCKERFILE_HERE_DOC
FROM $CONTAINER_FROM
COPY ./$ALPINE_NAME.* /root/
WORKDIR /root
RUN chmod a+x $ALPINE_NAME.install && \
./$ALPINE_NAME.install
# make the /pdf directory the default working directory for any run of
# pdf2htmlEX
#
WORKDIR /pdf
ENTRYPOINT ["$PDF2HTMLEX_PREFIX/bin/pdf2htmlEX"]
DOCKERFILE_HERE_DOC
cd ..
docker build -t $CONTAINER_NAME containerDir

View File

@ -0,0 +1,78 @@
#!/bin/sh
# This shell script creates an OCI container from an existing pdf2htmlEX
#
# This is the part which must be run *outside* of any OCI container.
echo ""
echo "-------------------------------------------------------------------"
echo "CREATING pdf2htmlEX OCI Container Image (from deb archive)"
echo "-------------------------------------------------------------------"
echo ""
# Collect everything that will be needed...
# source buildScripts/reSourceVersionEnvs
. buildScripts/reSourceVersionEnvs
set -ev
cd imageBuild
mkdir -p containerDir
cp $DPKG_NAME containerDir
cd containerDir
if [ -z "$CONTAINER_FROM" ]; then
echo ""
read -p "Enter the container image for the 'from' base: " CONTAINER_FROM
echo ""
if [ -z "$CONTAINER_FROM" ]; then
echo "CONTAINER_FROM not set... so we can not build the container image"
exit 1
fi
fi
if [ -z "$DOCKER_HUB_USERNAME" ]; then
echo ""
read -p "Enter a docker hub username: " DOCKER_HUB_USERNAME
echo ""
if [ -z "$DOCKER_HUB_USERNAME" ]; then
echo "DOCKER_HUB_USERNAME not set... so we can not build the container image"
exit 1
fi
fi
if [ -x "$(which podman)" ]; then
alias docker=podman
fi
export CONTAINER_NAME="$DOCKER_HUB_USERNAME/pdf2htmlex:$PDF2HTMLEX_NAME"
echo "export CONTAINER_FROM=\"$CONTAINER_FROM\"" >> ../../buildScripts/reSourceVersionEnvs
echo "export DOCKER_HUB_USERNAME=\"$DOCKER_HUB_USERNAME\"" >> ../../buildScripts/reSourceVersionEnvs
echo "export CONTAINER_NAME=\"$CONTAINER_NAME\"" >> ../../buildScripts/reSourceVersionEnvs
cat > Dockerfile <<DOCKERFILE_HERE_DOC
FROM $CONTAINER_FROM
COPY ./$DPKG_NAME /root
RUN apt update && \
apt -y upgrade && \
apt -y --no-install-recommends install \
/root/$DPKG_NAME
# make the /pdf directory the default working directory for any run of
# pdf2htmlEX
#
WORKDIR /pdf
ENTRYPOINT ["$PDF2HTMLEX_PREFIX/bin/pdf2htmlEX"]
DOCKERFILE_HERE_DOC
cd ..
docker build -t $CONTAINER_NAME containerDir

112
buildScripts/createDebianPackage Executable file
View File

@ -0,0 +1,112 @@
#!/bin/sh
# This shell script creates a (binary) Debian Package Archive for pdf2htmlEX
# source ./buildScripts/reSourceVersionEnvs
. ./buildScripts/reSourceVersionEnvs
echo ""
echo "-------------------------------------------------------------------"
echo "CREATING pdf2htmlEX (binary) Debian package"
echo "-------------------------------------------------------------------"
echo ""
set -ev
export DPKG_NAME="pdf2htmlEX-$PDF2HTMLEX_NAME.deb"
echo "export DPKG_NAME=\"$DPKG_NAME\"" >> buildScripts/reSourceVersionEnvs
# Adapted from: https://blog.serverdensity.com/how-to-create-a-debian-deb-package/
# and: http://www.sj-vs.net/creating-a-simple-debian-deb-package-based-on-a-directory-structure/
DEBDIR=imageBuild/debianDir
DOCDIR=$DEBDIR/usr/local/share/doc/pdf2htmlEX
sudo rm -rf $DEBDIR
mkdir -p $DOCDIR
# Install pdf2htmlEX
#
cd pdf2htmlEX/build
#
make install DESTDIR=../../$DEBDIR
# Install a copy of poppler-data for pdf2htmlEX's exclusive use
#
cd ../../poppler-data
#
make install \
prefix=$PDF2HTMLEX_PREFIX \
datadir=$PDF2HTMLEX_PREFIX/share/pdf2htmlEX \
DESTDIR=../$DEBDIR
cd ..
# Create a 'useful' changelog
#
git log --format="%cd %h %d %n %s%n" --date=short > $DOCDIR/gitLog
# Ensure the license and readme details are embedded in the debian archive
#
cp LICENSE $DOCDIR
cp LICENSE_GPLv3 $DOCDIR
cp README.md $DOCDIR
########################################
# setup the DEBIAN package files
controlFile=$DEBDIR/DEBIAN/control
conffilesFile=$DEBDIR/DEBIAN/conffiles
md5sumsFile=$DEBDIR/DEBIAN/md5sums
mkdir -p $DEBDIR/DEBIAN
# Create the md5sums file
#
find $DEBDIR -type f | xargs md5sum > $md5sumsFile
# Accumulate the control file information
#
versionValue=$PDF2HTMLEX_VERSION.$PDF2HTMLEX_BRANCH.$BUILD_DIST.$BUILD_DATE
architectureValue=$(dpkg-architecture -q DEB_BUILD_ARCH_CPU)
maintainerValue="$(git config --get user.name) <$(git config --get user.email)>"
# Now create the control file
#
echo "Package: pdf2htmlEX" > $controlFile
echo "Version: 0:0.$versionValue-0" >> $controlFile
echo "Distribution: $BUILD_DIST" >> $controlFile
echo "Architecture: $architectureValue" >> $controlFile
echo "Section: universe/web" >> $controlFile
echo "Priority: optional" >> $controlFile
echo "Essential: no" >> $controlFile
echo "Depends: libglib2.0-0, libfreetype6, libfontconfig1, libcairo2, libpng16-16, libjpeg-turbo8, libxml2" >> $controlFile
echo "Maintainer: $maintainerValue" >> $controlFile
echo "Homepage: http://github.com/pdf2htmlEX/pdf2htmlEX" >> $controlFile
echo "Description: Converts PDF to HTML without losing format" >> $controlFile
echo " pdf2htmlEX converts PDF to HTML while retaining text, format & style as much as possible" >> $controlFile
# Create the (empty) conffiles
#
touch $conffilesFile
# Finally create the debian archive
#
cd imageBuild
#
# Make sure directories can be traversed by nobody
#
#find debianDir -type d -exec chmod 755 {} \;
#
# Make sure files can be read by nobody
#
#find debianDir -type f -exec chmod 644 {} \;
#
# Make sure root:root owns all files
#
sudo chown -R root:root debianDir
#
# Build the package
#
dpkg --build debianDir $DPKG_NAME

16
buildScripts/createImagesAlpine Executable file
View File

@ -0,0 +1,16 @@
#!/bin/sh
set -ev
# This shell script creates the pdf2htmlEX AppImage and Container Images
#################
# do the creation
./buildScripts/reportEnvs
./buildScripts/createAlpineTarFile
if [ -x "$(which docker)" -o -x "$(which podman)" ]; then
./buildScripts/createContainerAlpineImageFromTarFile
fi

18
buildScripts/createImagesApt Executable file
View File

@ -0,0 +1,18 @@
#!/bin/sh
set -ev
# This shell script creates the pdf2htmlEX AppImage and Container Images
#################
# do the creation
./buildScripts/reportEnvs
./buildScripts/createAppImage
./buildScripts/createDebianPackage
if [ -x "$(which docker)" -o -x "$(which podman)" ]; then
./buildScripts/createContainerUbuntuImageFromDeb
fi

View File

@ -0,0 +1,31 @@
#!/bin/sh
# This shell script automates getting the required build tools (apt install)
# set the shell environment variable 'UNATTENDED' to '--assume-yes' for
# unattended use (for example in the .travis.yml script)
echo ""
echo "-------------------------------------------------------------------"
echo "INSTALLING Build Tools (using APK / Alpine)"
echo "-------------------------------------------------------------------"
echo ""
set -ev
sudo apk update
sudo apk add \
sudo \
tar \
wget \
git \
pkgconfig \
ruby \
cmake \
make \
gcc \
g++ \
gettext \
openjdk8 \
jq

35
buildScripts/getBuildToolsApt Executable file
View File

@ -0,0 +1,35 @@
#!/bin/sh
# This shell script automates getting the required build tools (apt install)
# set the shell environment variable 'UNATTENDED' to '--assume-yes' for
# unattended use (for example in the .travis.yml script)
echo ""
echo "-------------------------------------------------------------------"
echo "INSTALLING Build Tools (using APT)"
echo " (UNATTENDED: [$UNATTENDED])"
echo "-------------------------------------------------------------------"
echo ""
set -ev
sudo apt-get update
sudo apt-get $UNATTENDED install \
sudo \
wget \
git \
pkg-config \
ruby \
autoconf \
libtool \
cmake \
make \
gcc \
g++ \
dpkg \
dpkg-dev \
gettext \
openjdk-8-jre-headless \
jq

35
buildScripts/getBuildToolsDnf Executable file
View File

@ -0,0 +1,35 @@
#!/bin/sh
# This shell script automates getting the required build tools (dnf install)
# set the shell environment variable 'UNATTENDED' to
# '--setopt=install_weak_deps=False' for unattended use (for example in
# the .travis.yml script)
echo ""
echo "-------------------------------------------------------------------"
echo "INSTALLING Build Tools (using DNF)"
echo " (UNATTENDED: [$UNATTENDED])"
echo "-------------------------------------------------------------------"
echo ""
set -ev
sudo dnf $UNATTENDED install \
sudo \
wget \
git \
pkg-config \
ruby \
autoconf \
libtool \
cmake \
make \
gcc \
g++ \
dpkg \
dpkg-dev \
gettext \
java-1.8.0-openjdk-headless \
jq

View File

@ -0,0 +1,28 @@
#!/bin/sh
# This shell script automates getting the development libraries required to
# build poppler and fontforge
# set the shell environment variable 'UNATTENDED' to '--assume-yes' for
# unattended use (for example in the .travis.yml script)
echo ""
echo "-------------------------------------------------------------------"
echo "INSTALLING development libraries (using APK on Alpine)"
echo "-------------------------------------------------------------------"
echo ""
set -ev
sudo apk update
sudo apk add \
gettext \
gnu-libiconv-dev \
cairo-dev \
libpng-dev \
freetype-dev \
gettext-dev \
glib-dev \
fontconfig-dev \
libjpeg-turbo-dev \
libxml2-dev

23
buildScripts/getDevLibrariesApt Executable file
View File

@ -0,0 +1,23 @@
#!/bin/sh
# This shell script automates getting the development libraries required to
# build poppler and fontforge
# set the shell environment variable 'UNATTENDED' to '--assume-yes' for
# unattended use (for example in the .travis.yml script)
echo ""
echo "-------------------------------------------------------------------"
echo "INSTALLING development libraries (using APT)"
echo " (UNATTENDED: [$UNATTENDED])"
echo "-------------------------------------------------------------------"
echo ""
set -ev
sudo apt-get update
sudo apt-get $UNATTENDED install \
libcairo-dev \
libpng-dev \
libjpeg-dev \
libxml2-dev \

23
buildScripts/getDevLibrariesDnf Executable file
View File

@ -0,0 +1,23 @@
#!/bin/sh
# This shell script automates getting the development libraries required to
# build poppler and fontforge
# set the shell environment variable 'UNATTENDED' to
# '--setopt=install_weak_deps=False' for unattended use (for example in
# the .travis.yml script)
echo ""
echo "-------------------------------------------------------------------"
echo "INSTALLING development libraries (using DNF)"
echo " (UNATTENDED: [$UNATTENDED])"
echo "-------------------------------------------------------------------"
echo ""
set -ev
sudo dnf $UNATTENDED install \
cairo-devel \
libpng-devel \
libjpeg-turbo-devel \
libxml2-devel

26
buildScripts/getFontforge Executable file
View File

@ -0,0 +1,26 @@
#!/bin/sh
# This shell script gets and unpacks the latest fontforge AppImage
# source buildScripts/reSourceVersionEnvs
. buildScripts/reSourceVersionEnvs
echo ""
echo "-------------------------------------------------------------------"
echo "GETTING FontForge sources (using wget)"
echo " (FONTFORGE_VERSION: [$FONTFORGE_VERSION])"
echo "-------------------------------------------------------------------"
echo ""
set -ev
FONTFORGE_SRC=$FONTFORGE_VERSION.tar.gz
rm -rf $FONTFORGE_SRC
rm -rf fontforge
wget https://github.com/fontforge/fontforge/archive/$FONTFORGE_SRC
tar xvf $FONTFORGE_SRC
mv fontforge-$FONTFORGE_VERSION fontforge

37
buildScripts/getPoppler Executable file
View File

@ -0,0 +1,37 @@
#!/bin/sh
# This shell script gets and unpacks the latest Poppler source code
# source buildScripts/reSourceVersionEnvs
. buildScripts/reSourceVersionEnvs
echo ""
echo "-------------------------------------------------------------------"
echo "GETTING Poppler source code (using wget)"
echo " (POPPLER_VERSION: [$POPPLER_VERSION])"
echo "-------------------------------------------------------------------"
echo ""
echo "Getting poppler version: $POPPLER_VERSION"
rm -rf $POPPLER_VERSION.tar.xz
rm -rf poppler
rm -rf poppler-data-0.4.12.tar.gz
rm -rf poppler-data
set -ev
wget https://poppler.freedesktop.org/$POPPLER_VERSION.tar.xz
tar xvf $POPPLER_VERSION.tar.xz
echo "Getting poppler-data version: 0.4.12"
mv $POPPLER_VERSION poppler
wget https://poppler.freedesktop.org/poppler-data-0.4.12.tar.gz
tar xvf poppler-data-0.4.12.tar.gz
mv poppler-data-0.4.12 poppler-data

32
buildScripts/installPdf2htmlEX Executable file
View File

@ -0,0 +1,32 @@
#!/bin/sh
echo ""
echo "-------------------------------------------------------------------"
echo "INSTALLING pdf2htmlEX locally"
echo " (UNATTENDED: [$UNATTENDED])"
echo "-------------------------------------------------------------------"
echo ""
if [ -z "$UNATTENDED" ] ; then
echo "This installation assumes you have 'sudo' privileges"
echo ""
echo "Type ctrl-c now if DO NOT want to continue"
read -p "Type anything else to continue: "
fi
set -ev
cd pdf2htmlEX/build
sudo make install
## NEED to install poppler-data!!!
#
cd ../../poppler-data
sudo make install \
prefix=$PDF2HTMLEX_PREFIX \
datadir=$PDF2HTMLEX_PREFIX/share/pdf2htmlEX

View File

@ -0,0 +1,9 @@
#!/bin/sh
# see:https://stackoverflow.com/a/7448828
find . -type f -print0 | \
xargs -0 stat --format '%Y :%y %n' | \
sort -nr | \
grep -v build | \
cut -d: -f2-

43
buildScripts/reportEnvs Executable file
View File

@ -0,0 +1,43 @@
#!/bin/sh
# This shell script reports the more important TRAVIS environment variables
# source ./buildScripts/reSourceVersionEnvs
. ./buildScripts/reSourceVersionEnvs
echo ""
echo "TravisCI env:"
echo " dist: [$TRAVIS_DIST]"
echo " tag: [$TRAVIS_TAG]"
echo " branch: [$TRAVIS_BRANCH]"
echo " commit: [$TRAVIS_COMMIT]"
echo " build dir: [$TRAVIS_BUILD_DIR]"
echo " repo slug: [$TRAVIS_REPO_SLUG]"
echo ""
echo "Build env:"
echo " prefix: [$PDF2HTMLEX_PREFIX]"
echo " unattended: [$UNATTENDED]"
echo " make parallel: [$MAKE_PARALLEL]"
echo " OS: [$BUILD_OS]"
echo " distribution: [$BUILD_DIST]"
echo " linuxdeploy url: [$LINUX_DEPLOY_URL]"
echo ""
echo "pdf2htmlEX env:"
echo " version: [$PDF2HTMLEX_VERSION]"
echo " poppler: [$POPPLER_VERSION]"
echo " fontforge: [$FONTFORGE_VERSION]"
echo " pdf2htmlEX: [$PDF2HTMLEX_BRANCH]"
echo " machine arch: [$MACHINE_ARCH]"
echo ""
echo "release env:"
echo " build date: [$BUILD_DATE]"
echo " build time: [$BUILD_TIME]"
echo " container from: [$CONTAINER_FROM]"
echo " container name: [$CONTAINER_NAME]"
echo " appImage name: [$APPIMAGE_NAME]"
echo " dpkg name: [$DPKG_NAME]"
echo "uploadTool suffix: [$UPLOADTOOL_SUFFIX]"
echo ""

33
buildScripts/runTests Executable file
View File

@ -0,0 +1,33 @@
#!/bin/sh
# source ./buildScripts/reSourceVersionEnvs
. ./buildScripts/reSourceVersionEnvs
echo ""
echo "-------------------------------------------------------------------"
echo "RUNNING pdf2htmlEX tests"
echo "-------------------------------------------------------------------"
echo ""
export TEST_RESULTS_NAME="pdf2htmlEX-$PDF2HTMLEX_BRANCH-$BUILD_TIME-$BUILD_DIST-$MACHINE_ARCH-testResults.zip"
echo "export TEST_RESULTS_NAME=\"$TEST_RESULTS_NAME\"" >> buildScripts/reSourceVersionEnvs
set -ev
# This shell script runs the pdf2htmlEX tests
cd pdf2htmlEX/test
# The following is only needed for the local browser tests
#
./installAutomaticTestSoftwareApt
./runLocalTestsShell
./runLocalBrowserTests
cd ../..
mkdir -p imageBuild
zip -r imageBuild/$TEST_RESULTS_NAME /tmp/pdf2htmlEX/html /tmp/pdf2htmlEX/png

39
buildScripts/travisLinuxDoItAll Executable file
View File

@ -0,0 +1,39 @@
#!/bin/sh
# This shell script builds everyting on an TravisCI Linux (Ubunutu) worker
set -ev
export UNATTENDED="--assume-yes"
export MAKE_PARALLEL="-j $(nproc)"
export PDF2HTMLEX_BRANCH=$TRAVIS_BRANCH
export PDF2HTMLEX_PREFIX=/usr/local
export PDF2HTMLEX_PATH=/usr/local/bin/pdf2htmlEX
# Ensure all Apt packages are installed with no user interaction
#
export DEBIAN_FRONTEND=noninteractive
################
# do the build
./buildScripts/versionEnvs
./buildScripts/reportEnvs
./buildScripts/getBuildToolsApt
./buildScripts/getDevLibrariesApt
./buildScripts/getPoppler
./buildScripts/buildPoppler
./buildScripts/getFontforge
./buildScripts/buildFontforge
./buildScripts/buildPdf2htmlEX
./buildScripts/installPdf2htmlEX
# ./buildScripts/runTests
# ./buildScripts/createAppImage
# ./buildScripts/createDebianPackage
#./buildScripts/createContainerUbuntuImageFromDeb
#./buildScripts/uploadGitHubRelease
#./buildScripts/uploadContainerImage

View File

@ -0,0 +1,53 @@
#!/bin/sh
# This shell script uploads the pdf2htmlEX container image to docker hub
#
# We EXPECT the following environment variables to be set:
# DOCKER_HUB_USERNAME
#
# You can OPTIONALLY set the following environment variables:
# DOCKER_HUB_PASSWORD (if not set you will be asked for your password)
#
# source ./buildScripts/reSourceVersionEnvs
. ./buildScripts/reSourceVersionEnvs
echo ""
echo "-------------------------------------------------------------------"
echo "UPLOADING pdf2htmlEX Container Image to Docker Hub"
echo "-------------------------------------------------------------------"
echo ""
##################################
# push container image
#
if [ -x "$(which docker)" -o -x "$(which podman)" ]; then
if [ ! -x "$(which docker)"]; then
alias docker=podman
fi
if [ -z "$DOCKER_HUB_USERNAME" ]; then
echo ""
read -p "Enter the Docker hub usernane): " DOCKER_HUB_USERNAME
echo ""
if [ -z "$DOCKER_HUB_USERNAME" ]; then
echo "DOCKER_HUB_USERNAME not set... so we do not know where to push image."
exit 1
fi
fi
if [ -z "$DOCKER_HUB_PASSWORD" ]; then
echo ""
echo "Please type your the Docker hub password"
docker login -u "$DOCKER_HUB_USERNAME"
else
echo "$DOCKER_HUB_PASSWORD" | docker login -u "$DOCKER_HUB_USERNAME" --password-stdin
fi
docker push $DOCKER_USERNAME/pdf2htmlex
else
echo "Neither Docker nor Podman are installed... skipping upload of container image."
fi

View File

@ -0,0 +1,92 @@
#!/bin/sh
# This shell script uploads the pdf2htmlEX release artefacts
#
# We EXPECT the following environment variables to be set:
# GITHUB_TOKEN
# DOCKER_HUB_USERNAME
#
# You can OPTIONALLY set the following environment variables:
# DOCKER_HUB_PASSWORD (if not set you will be asked for your password)
#
# source ./buildScripts/reSourceVersionEnvs
. ./buildScripts/reSourceVersionEnvs
cp ./buildScripts/reSourceVersionEnvs imageBuild/buildInfo.sh
. ./buildScripts/uploadGitHubReleaseDSL
# source ./buildScripts/uploadGitHubReleaseDSL
echo ""
echo "-------------------------------------------------------------------"
echo "UPLOADING pdf2htmlEX AppImage and Container Images"
echo "-------------------------------------------------------------------"
echo ""
##################################
# upload github release artefacts
#
# begin by gathering the required environment variables
#
if [ -z "$GITHUB_USERNAME" ]; then
echo ""
read -p "Enter the GitHub upload username: " GITHUB_USERNAME
echo ""
if [ -z "$GITHUB_USERNAME" ]; then
echo "GITHUB_USERNAME not set... so we can not upload release artefacts."
exit 1
fi
fi
if [ -z "$GITHUB_TOKEN" ]; then
echo ""
read -p "Enter the GitHub upload token/password: " GITHUB_TOKEN
echo ""
if [ -z "$GITHUB_TOKEN" ]; then
echo "GITHUB_TOKEN not set... so we can not upload release artefacts."
exit 1
fi
fi
if [ -z "$TRAVIS_REPO_SLUG" ]; then
echo ""
read -p "Enter the GitHub repository (user/proj): " TRAVIS_REPO_SLUG
echo ""
if [ -z "$TRAVIS_REPO_SLUG" ]; then
echo "TRAVIS_REPO_SLUG (Github repository) not set... so we can not upload release artefacts."
exit 1
fi
fi
cd imageBuild
ls -la
echo "machine api.github.com" > $HOME/.netrc
echo " login $GITHUB_USERNAME" >> $HOME/.netrc
echo " password $GITHUB_TOKEN" >> $HOME/.netrc
echo "machine uploads.github.com" >> $HOME/.netrc
echo " login $GITHUB_USERNAME" >> $HOME/.netrc
echo " password $GITHUB_TOKEN" >> $HOME/.netrc
echo $APPIMAGE_NAME > appImageName.txt
echo $CONTAINER_NAME > containerImageName.txt
echo $DPKG_NAME > debianArchiveName.txt
echo $TEST_RESULTS_NAME > testResultsName.txt
deleteReleaseByTag "$TRAVIS_REPO_SLUG" "continuous-$BUILD_DIST"
createNewRelease "$TRAVIS_REPO_SLUG" "continuous-$BUILD_DIST" "Latest $BUILD_DIST release" \
../buildScripts/uploadGitHubReleaseMessage
uploadAnAsset $upload_url "appImageName.txt" "text/plain"
uploadAnAsset $upload_url "testResultsName.txt" "text/plain"
uploadAnAsset $upload_url "buildInfo.sh" "text/plain"
uploadAnAsset $upload_url "containerImageName.txt" "text/plain"
uploadAnAsset $upload_url "debianArchiveName.txt" "text/plain"
uploadAnAsset $upload_url $APPIMAGE_NAME "application/zip"
uploadAnAsset $upload_url $TEST_RESULTS_NAME "application/zip"
uploadAnAsset $upload_url $DPKG_NAME "application/x-debian-package"

View File

@ -0,0 +1,208 @@
#!/usr/bin/env sh
# This shell script is a collection of functions to interact with the GitHub
# release and git/tag APIs. It essentially provides a shell script based DSL
# for uploading GitHub release artefacts.
# NOTE-1: These functions make use of your ".netrc" file to authenticate
# with GitHub. In order to use these functions, make sure you have **both**
# "api.github.com" and "upload.github.com" in this file. For example:
#
# machine api.github.com
# login foca
# password <an access token>
# machine uploads.github.com
# login foca
# password <an access token>
#
# You can generate the required access token at
# https://github.com/settings/tokens
# Make sure this access token has access to the "repo" scope.
#
# NOTE-2: These functions require the "jq" library to parse the JSON
# returned by the GitHub APIs.
#############################
function deleteReleaseByTag {
[ -n "$1" ] || (echo "deleteReleaseByTag: missing repository"; exit 1);
[ -n "$2" ] || (echo "deleteReleaseByTag: missing releaseTag"; exit 1);
REPO=$1
releaseTag=$2
echo ""
echo "deleting the release tagged $releaseTag"
echo " from the repository $REPO"
echo ""
echo "looking for an existing '$releaseTag' release in the repo $REPO"
response=$(
curl --fail \
--netrc \
--silent \
--location \
--request "GET" \
"https://api.github.com/repos/${REPO}/releases"
)
releaseID=$(echo $response | \
jq --arg releaseTag $releaseTag \
'.[] | select(.tag_name == $releaseTag) | .id')
echo ""
echo "releaseID(s): $releaseID"
echo ""
if [ -n "$releaseID" ] ; then
for aReleaseID in $releaseID
do
echo "deleting an existing '$releaseTag'($aReleaseID) release in the repo $REPO"
response=$(
curl --fail \
--netrc \
--silent \
--location \
--request "DELETE" \
"https://api.github.com/repos/${REPO}/releases/$aReleaseID"
)
done
echo ""
fi
echo "looking for an existing '$releaseTag' git/tag in the repo $REPO"
response=$(
curl --fail \
--netrc \
--silent \
--location \
--request "GET" \
"https://api.github.com/repos/${REPO}/git/matching-refs/tags/$releaseTag"
)
tagURL=$(echo $response | jq '.[].url')
tagURL="${tagURL%\"}"
tagURL="${tagURL#\"}"
if [ -n "$tagURL" ]; then
echo "deleting an existing '$releaseTag' git/tag in the repo $REPO"
response=$(
curl --fail \
--netrc \
--silent \
--location \
--request "DELETE" \
$tagURL
)
fi
}
###########################
function createNewRelease {
# returns: upload_url (envVar)
[ -n "$1" ] || (echo "createNewRelease: missing repository"; exit 1);
[ -n "$2" ] || (echo "createNewRelease: missing releaseTag"; exit 1);
[ -n "$3" ] || (echo "createNewRelease: missing release name"; exit 1);
[ -n "$4" ] || (echo "createNewRelease: missing release description filename"; exit 1);
REPO=$1
TAG=$2
NAME=$3
BODY=$(cat $4)
echo ""
echo "Creating a new release in the repository $REPO"
echo " with tag $TAG"
echo " and name $NAME"
echo " using the message in the file $4"
echo "--------------------------------------------------------------"
echo $BODY
echo "--------------------------------------------------------------"
payload=$(
jq --null-input \
--arg tag "$TAG" \
--arg name "$NAME" \
--arg body "$BODY" \
'{ tag_name: $tag, name: $name, body: $body, draft: false, prerelease: true }'
)
response=$(
curl --fail \
--netrc \
--silent \
--location \
--data "$payload" \
"https://api.github.com/repos/${REPO}/releases"
)
upload_url="$(echo "$response" | \
jq -r .upload_url | sed -e "s/{?name,label}//")"
echo ""
echo "upload_url:"
echo $upload_url
}
########################
function uploadAnAsset {
[ -n "$1" ] || (echo "uploadAnAsset: missing upload url"; exit 1);
[ -n "$2" ] || (echo "uploadAnAsset: missing file name"; exit 1);
[ -n "$3" ] || (echo "uploadAnAsset: missing file type"; exit 1);
upload_url=$1
file=$2
fileType=$3
echo ""
echo "uploading the asset $file"
echo " of type $fileType"
curl --netrc \
--silent \
--header "Content-Type:$fileType" \
--data-binary "@$file" \
"$upload_url?name=$(basename "$file")"
echo ""
}
# The above has been heavily modified into a collection of shell functions
# by Stephen Gaito working on the pdf2htmlEX project.
#
# It has been based upon the code in:
# https://gist.github.com/foca/38d82e93e32610f5241709f8d5720156
# on 2019-11-28
#
# The relevant GitHub API can be found at:
# https://developer.github.com/v3/git/refs/
# https://developer.github.com/v3/repos/releases/
#
# The original code has been used under the following (MIT-like) license:
# Copyright (c) 2016 Nicolas Sanguinetti <hi@nicolassanguinetti.info>
#
# Permission is hereby granted, free of charge, to any person
# obtaining a copy of this software and associated documentation
# files (the "Software"), to deal in the Software without
# restriction, including without limitation the rights to use,
# copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following
# conditions:
#
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE.

View File

@ -0,0 +1,35 @@
This is the most recent release of the pdf2htmlEX project.
We release three types of binary objects:
1. The file *.AppImage on this release page is an AppImage
You can download the AppImage, make it executable and then 'just run
it'.
See: https://appimage.org/ for details
2. The file *.deb is a Debian Archive
You can download the Debian Archive and install it locally using:
sudo apt install <<releativePathToDebFile>>
While the Debian archive is built on a specific Ubuntu release, it can
usually be used on any more recent Ubuntu releases.
3. You can alternatively get pdf2htmlEX Container images from Docker Hub in
either of the repositories:
pdf2htmlEX/pdf2htmlEX (offical release)
or
stephengaito/pdf2htmlEX (development releases)
We also release a zip archive of the browser test results in the
*-testResults.zip file.
Finally, the various *.txt and *buildInfo.sh files have well known
(unchanging) names which can be used by automatic scripts to identifiy the
current full names of the corresponding binary artifacts.

17
buildScripts/uploadImages Executable file
View File

@ -0,0 +1,17 @@
#!/bin/sh
# This shell script uploads already existing pdf2htmlEX AppImage and Container
# Images
################
# do the uploads
set -ev
./buildScripts/reportEnvs || { echo 'reportEnvs FAILED' ; exit 1 ; }
./buildScripts/uploadGitHubRelease || { echo 'uploadGitHubRelease FAILED' ; exit 1 ; }
./buildScripts/uploadContainerImage || { echo 'uploadContainerImage FAILED' ; exit 1 ; }

104
buildScripts/versionEnvs Executable file
View File

@ -0,0 +1,104 @@
#!/bin/sh
# This shell script exports environment variables for the latest software
# versions
# see: https://poppler.freedesktop.org/releases.html
# current working: 24.01.0
export PDF2HTMLEX_VERSION=0.18.8.rc2
export POPPLER_VERSION=poppler-24.01.0
#export POPPLER_VERSION=poppler-23.12.0
#export POPPLER_VERSION=poppler-21.02.0
#export POPPLER_VERSION=poppler-0.89.0
#export POPPLER_VERSION=poppler-0.88.0
#export POPPLER_VERSION=poppler-0.87.0
#export POPPLER_VERSION=poppler-0.86.1
#export POPPLER_VERSION=poppler-0.86.0
#export POPPLER_VERSION=poppler-0.85.0
#export POPPLER_VERSION=poppler-0.84.0
#export POPPLER_VERSION=poppler-0.83.0
#export POPPLER_VERSION=poppler-0.82.0
#export POPPLER_VERSION=poppler-0.81.0
# see: https://github.com/fontforge/fontforge/releases
# current working: 20230101
export FONTFORGE_VERSION=20230101
#export FONTFORGE_VERSION=20220308
#export FONTFORGE_VERSION=20190801
#export FONTFORGE_VERSION=20190413
#export FONTFORGE_VERSION=20190413
#export FONTFORGE_VERSION=20190317
#export FONTFORGE_VERSION=20170731
##################################################################
# Specify a working version of linuxDeploy to build the appImage
#
# see: https://github.com/linuxdeploy/linuxdeploy/issues/142#issuecomment-669910999
#
# The following is the most up to date version of linuxdeploy:
#
#export LINUX_DEPLOY_URL=https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous
#
# The following is a recent known to work version of linuxdeploy from 2020/Aug/05
#
export LINUX_DEPLOY_URL=https://artifacts.assassinate-you.net/artifactory/list/linuxdeploy/travis-456
###################################################################
if [ -z "$PDF2HTMLEX_BRANCH" ]; then
export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
if [ -z "$PDF2HTMLEX_BRANCH" ]; then
echo ""
read -p "Enter the pdf2htmlEX branch or version: " PDF2HTMLEX_BRANCH
echo ""
if [ -z "$PDF2HTMLEX_BRANCH" ]; then
echo "PDF2HTMLEX_BRANCH not set... so we can not build anything."
exit 1
fi
fi
fi
# Following @ViliusSutkus89's suggestion in
# PR https://github.com/pdf2htmlEX/pdf2htmlEX/pull/77
# We have replaced the use of lsb-release/alpine-release
# with the freedesktop.org's os-release based system to
# obtain the distribution release information....
#
# See: https://www.freedesktop.org/software/systemd/man/os-release.html
#
if test -r /etc/os-release ; then
cat /etc/os-release
export BUILD_OS=$(grep '^ID=' /etc/os-release | cut -d'=' -f2)
export BUILD_DIST=$(grep '^VERSION_ID=' /etc/os-release | cut -d'=' -f2)
elif test -r /usr/lib/os-release ; then
cat /usr/lib/os-release
export BUILD_OS=$(grep '^ID=' /usr/lib/os-release | cut -d'=' -f2)
export BUILD_DIST=$(grep '^VERSION_ID=' /usr/lib/os-release | cut -d'=' -f2)
else
echo "FAILURE: could not determine release"
exit -1
fi
export BUILD_DATE="$(date +%Y%m%d)"
export BUILD_TIME="$(date +%Y_%m_%d-%H_%M_%S)"
export MACHINE_ARCH="$(uname -m)"
export PDF2HTMLEX_NAME=$PDF2HTMLEX_VERSION-$PDF2HTMLEX_BRANCH-$BUILD_DATE-$BUILD_OS-$BUILD_DIST-$MACHINE_ARCH
echo "export PDF2HTMLEX_NAME=\"$PDF2HTMLEX_NAME\"" > buildScripts/reSourceVersionEnvs
echo "export PDF2HTMLEX_VERSION=\"$PDF2HTMLEX_VERSION\"" >> buildScripts/reSourceVersionEnvs
echo "export POPPLER_VERSION=\"$POPPLER_VERSION\"" >> buildScripts/reSourceVersionEnvs
echo "export FONTFORGE_VERSION=\"$FONTFORGE_VERSION\"" >> buildScripts/reSourceVersionEnvs
echo "export PDF2HTMLEX_BRANCH=\"$PDF2HTMLEX_BRANCH\"" >> buildScripts/reSourceVersionEnvs
echo "export MACHINE_ARCH=\"$MACHINE_ARCH\"" >> buildScripts/reSourceVersionEnvs
echo "export BUILD_OS=\"$BUILD_OS\"" >> buildScripts/reSourceVersionEnvs
echo "export BUILD_DIST=\"$BUILD_DIST\"" >> buildScripts/reSourceVersionEnvs
echo "export BUILD_DATE=\"$BUILD_DATE\"" >> buildScripts/reSourceVersionEnvs
echo "export BUILD_TIME=\"$BUILD_TIME\"" >> buildScripts/reSourceVersionEnvs
echo "export PDF2HTMLEX_PREFIX=\"$PDF2HTMLEX_PREFIX\"" >> buildScripts/reSourceVersionEnvs
echo "export LINUX_DEPLOY_URL=\"$LINUX_DEPLOY_URL\"" >> buildScripts/reSourceVersionEnvs

View File

@ -1,4 +0,0 @@
mkdir build
cd build
cmake ..
make

View File

@ -1,4 +0,0 @@
mkdir build
cd build
CC=clang CXX=clang++ cmake ..
make

View File

@ -1 +0,0 @@
rm -rf build pdf2htmlEX.1 share/*.css share/*.js share/*.min.* src/pdf2htmlEX-config.h src/util/css_const.h

View File

@ -1,8 +0,0 @@
#!/bin/bash
echo "This installation assumes you have 'sudo' privileges"
echo "Type ctrl-c now if DO NOT want to continue"
read -p "Type anything else to continue: "
cd build
sudo make install

View File

@ -0,0 +1,32 @@
diff --git a/gdraw/drawboxborder.c b/gdraw/drawboxborder.c
index 629968608..0b00e9dd5 100644
--- a/gdraw/drawboxborder.c
+++ b/gdraw/drawboxborder.c
@@ -24,6 +24,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <fontforge-config.h>
#include <math.h>
#include <gdraw.h>
#include <ggadget.h>
diff --git a/gdraw/gpsdraw.c b/gdraw/gpsdraw.c
index 5e58b6208..099e41bbd 100644
--- a/gdraw/gpsdraw.c
+++ b/gdraw/gpsdraw.c
@@ -24,6 +24,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "fontforge-config.h"
#include <stdio.h>
#include <math.h>
#include <time.h>
@@ -31,7 +32,6 @@
#if !defined(__MINGW32__)
#include <sys/wait.h>
#endif
-#include "fontforge-config.h"
#include <unistd.h>
#include "gpsdrawP.h"

View File

@ -0,0 +1,13 @@
fontforge-config.h
--- a/inc/fontforge-config.h 2019-11-23 06:38:36.632042953 +0000
+++ b/inc/fontforge-config.h 2019-11-23 06:38:47.424229496 +0000
@@ -67,7 +67,7 @@
/* #undef FONTFORGE_DEBUG */
/* "git hash that source are built from" */
-#define FONTFORGE_GIT_VERSION ""
+#define FONTFORGE_GIT_VERSION "20170731"
/* ExeLibFontForge Major Version */
#define FONTFORGE_LIBFFE_VERSION_MAJOR 2

View File

@ -10,7 +10,11 @@ option(ENABLE_SVG "Enable SVG support, for generating SVG background images and
include_directories(${CMAKE_SOURCE_DIR}/src)
set(PDF2HTMLEX_VERSION "0.18.1")
# Read/Set Cmake's PDF2HTMLEX_VERSION directly from the shell environment
# variable PDF2HTMLEX_VERSION
#
set(PDF2HTMLEX_VERSION $ENV{PDF2HTMLEX_VERSION})
#
set(ARCHIVE_NAME pdf2htmlex-${PDF2HTMLEX_VERSION})
add_custom_target(dist
COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD
@ -20,30 +24,38 @@ add_custom_target(dist
find_package(PkgConfig)
pkg_check_modules(POPPLER REQUIRED poppler>=0.25.0)
include_directories(${POPPLER_INCLUDE_DIRS})
link_directories(${POPPLER_LIBRARY_DIRS})
set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${POPPLER_LIBRARIES})
# SINCE we have a very intimate relationship with a particular version of
# poppler... we explicitly describe the poppler include and library
# paths.
#
include_directories(
../poppler/build/poppler
../poppler/build
../poppler/poppler
../poppler
)
#
# The following order is critical as the glib functions use functions
# located in the main poppler library
#
set(POPPLER_LIBRARIES ${POPPLER_LIBRARIES}
${CMAKE_SOURCE_DIR}/../poppler/build/glib/libpoppler-glib.a
${CMAKE_SOURCE_DIR}/../poppler/build/libpoppler.a
)
if(ENABLE_SVG)
pkg_check_modules(CAIRO REQUIRED cairo>=1.10.0)
message("Trying to locate cairo-svg...")
message("-- Trying to locate cairo-svg...")
find_path(CAIRO_SVG_INCLUDE_PATH cairo-svg.h PATHS ${CAIRO_INCLUDE_DIRS} NO_DEFAULT_PATH)
if(CAIRO_SVG_INCLUDE_PATH)
message("-- found cairo-svg...")
include_directories(${CAIRO_INCLUDE_DIRS})
link_directories(${CAIRO_LIBRARY_DIRS})
set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${CAIRO_LIBRARIES})
if(NOT DEFINED ENV{USING_BREW})
link_directories(${CAIRO_LIBRARY_DIRS})
set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${CAIRO_LIBRARIES})
endif()
set(ENABLE_SVG 1)
set(CAIROOUTPUTDEV_PATH 3rdparty/poppler/git)
include_directories(${CAIROOUTPUTDEV_PATH})
set(PDF2HTMLEX_SRC ${PDF2HTMLEX_SRC}
${CAIROOUTPUTDEV_PATH}/CairoFontEngine.h
${CAIROOUTPUTDEV_PATH}/CairoFontEngine.cc
${CAIROOUTPUTDEV_PATH}/CairoRescaleBox.h
${CAIROOUTPUTDEV_PATH}/CairoRescaleBox.cc
${CAIROOUTPUTDEV_PATH}/CairoOutputDev.h
${CAIROOUTPUTDEV_PATH}/CairoOutputDev.cc
)
else()
message(FATAL_ERROR "Error: no SVG support found in Cairo")
endif()
@ -51,14 +63,50 @@ if(ENABLE_SVG)
find_package(Freetype REQUIRED)
include_directories(${FREETYPE_INCLUDE_DIRS})
link_directories(${FREETYPE_LIBRARY_DIRS})
set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${FREETYPE_LIBRARIES})
# set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${FREETYPE_LIBRARIES})
endif()
# fontforge starts using pkg-config 'correctly' since 2.0.0
pkg_check_modules(FONTFORGE REQUIRED libfontforge>=2.0.0)
# SINCE we have a very intimate relationship with a particular version of
# fontforge... we explicitly describe the fontforge include and library
# paths.
#
include_directories(
../fontforge/fontforge
../fontforge
../fontforge/build/inc
../fontforge/inc
)
#
include_directories(${FONTFORGE_INCLUDE_DIRS})
link_directories(${FONTFORGE_LIBRARY_DIRS})
set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${FONTFORGE_LIBRARIES})
set(FONTFORGE_LIBRARIES ${FONTFORGE_LIBRARIES}
${CMAKE_SOURCE_DIR}/../fontforge/build/lib/libfontforge.a
)
# If we are using Alpine Linux then we need to add -lintl
#
if (EXISTS /usr/lib/libintl.so )
set(LIB_INTL_LIBRARIES -lintl )
else ()
set(LIB_INTL_LIBRARIES "" )
endif()
set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS}
${POPPLER_LIBRARIES}
${FONTFORGE_LIBRARIES}
${LIB_INTL_LIBRARIES}
${CAIRO_LIBRARIES}
-ljpeg
-lpng
-lfontconfig
-lfreetype
-lxml2
-lglib-2.0
-lgio-2.0
-lgobject-2.0
-lz
-lm
)
# debug build flags (overwrite default cmake debug flags)
set(CMAKE_C_FLAGS_DEBUG "-ggdb -pg")
@ -73,35 +121,17 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual")
# clang compiler need c++11 flag
#if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
#endif()
# CYGWIN or GCC 4.5.x bug
if(CYGWIN)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -pthread")
set(CMAKE_THREAD_PREFER_PTHREAD ON)
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} Threads::Threads)
# Poppler-23.12.0 requires CXX17
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(NOT CYGWIN)
set(CMAKE_CXX_EXTENSIONS OFF)
endif()
# check the C++11 features we need
include(CheckCXXSourceCompiles)
check_cxx_source_compiles("
#include <vector>
int main()
{
char * ptr = nullptr;
std::vector<int> v;
auto f = [&](){ for(auto & i : v) ++i; };
f();
}
" CXX0X_SUPPORT)
if(NOT CXX0X_SUPPORT)
message(FATAL_ERROR "Error: your compiler does not support C++0x/C++11, please update it.")
endif()
configure_file (${CMAKE_SOURCE_DIR}/src/pdf2htmlEX-config.h.in ${CMAKE_SOURCE_DIR}/src/pdf2htmlEX-config.h)
configure_file (${CMAKE_SOURCE_DIR}/pdf2htmlEX.1.in ${CMAKE_SOURCE_DIR}/pdf2htmlEX.1)
@ -149,6 +179,8 @@ set(PDF2HTMLEX_SRC ${PDF2HTMLEX_SRC}
src/util/unicode.cc
src/util/mingw.h
src/util/mingw.cc
src/util/SignalHandler.h
src/util/SignalHandler.cc
src/ArgParser.h
src/ArgParser.cc
src/Base64Stream.h
@ -223,6 +255,7 @@ set(PDF2HTMLEX_TMPDIR /tmp/pdf2htmlEX/tmp)
set(PDF2HTMLEX_DATDIR /tmp/pdf2htmlEX/dat)
set(PDF2HTMLEX_PNGDIR /tmp/pdf2htmlEX/png)
set(PDF2HTMLEX_OUTDIR /tmp/pdf2htmlEX/out)
set(PDF2HTMLEX_HTMDIR /tmp/pdf2htmlEX/html)
file(MAKE_DIRECTORY ${PDF2HTMLEX_TMPDIR})
file(MAKE_DIRECTORY ${PDF2HTMLEX_DATDIR})
file(MAKE_DIRECTORY ${PDF2HTMLEX_PNGDIR})

View File

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 52 KiB

View File

Before

Width:  |  Height:  |  Size: 152 KiB

After

Width:  |  Height:  |  Size: 152 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -174,6 +174,10 @@ Specify the format of fonts extracted from the PDF file.
.B \-\-decompose\-ligature <0|1> (Default: 0)
Decompose ligatures. For example 'fi' \-> 'f''i'.
.TP
.B \-\-turn\-off\-ligatures <0|1> (Default: 0)
Explicitly tell browsers not to use ligatures.
.TP
.B \-\-auto\-hint <0|1> (Default: 0)
If set to 1, hints will be generated for the fonts using FontForge.
@ -359,7 +363,7 @@ pdf2htmlEX is written by Lu Wang <coolwanglu@gmail.com>
.SH SEE ALSO
.TP
Home page
https://github.com/coolwanglu/pdf2htmlEX
https://github.com/pdf2htmlEX/pdf2htmlEX
.TP
pdf2htmlEX Wiki
https://github.com/coolwanglu/pdf2htmlEX/wiki
https://github.com/pdf2htmlEX/pdf2htmlEX/wiki

View File

@ -2,7 +2,7 @@
/*!
* Base CSS for pdf2htmlEX
* Copyright 2012,2013 Lu Wang <coolwanglu@gmail.com>
* https://github.com/coolwanglu/pdf2htmlEX/blob/master/share/LICENSE
* https://github.com/pdf2htmlEX/pdf2htmlEX/blob/master/share/LICENSE
*/
/* Part 1: Web Page Layout: Free to modify, except for a few of them which are required by pdf2htmlEX.js, see the comments */
#sidebar { /* Sidebar */

View File

@ -2,7 +2,7 @@
/*!
* Fancy styles for pdf2htmlEX
* Copyright 2012,2013 Lu Wang <coolwanglu@gmail.com>
* https://github.com/coolwanglu/pdf2htmlEX/blob/master/share/LICENSE
* https://github.com/pdf2htmlEX/pdf2htmlEX/blob/master/share/LICENSE
*/
@keyframes fadein { from { opacity:0;} to { opacity:1;} }
@-webkit-keyframes fadein { from { opacity:0;} to { opacity:1;} }

View File

@ -17,7 +17,7 @@
# Declaration - Do not modify
"""
<!DOCTYPE html>
<!-- Created by pdf2htmlEX (https://github.com/coolwanglu/pdf2htmlex) -->
<!-- Created by pdf2htmlEX (https://github.com/pdf2htmlEX/pdf2htmlEX) -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8"/>

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@ -2,7 +2,7 @@
/**
* @license pdf2htmlEX.js: Core UI functions for pdf2htmlEX
* Copyright 2012,2013 Lu Wang <coolwanglu@gmail.com> and other contributors
* https://github.com/coolwanglu/pdf2htmlEX/blob/master/share/LICENSE
* https://github.com/pdf2htmlEX/pdf2htmlEX/blob/master/share/LICENSE
*/
/*
@ -329,7 +329,7 @@ Viewer.prototype = {
}, false);
// handle links
[this.container, this.outline].forEach(function(ele) {
[this.outline].concat(Array.from(this.container.querySelectorAll('a.l'))).forEach(function(ele) {
ele.addEventListener('click', self.link_handler.bind(self), false);
});
@ -804,6 +804,10 @@ Viewer.prototype = {
link_handler : function (e) {
var target = /** @type{Node} */(e.target);
var detail_str = /** @type{string} */ (target.getAttribute('data-dest-detail'));
if (!detail_str) {
target = /** @type{Node} */(e.currentTarget);
detail_str = /** @type{string} */ (target.getAttribute('data-dest-detail'));
}
if (!detail_str) return;
if (this.config['view_history_handler']) {

Some files were not shown because too many files have changed in this diff Show More