diff -Nru pdf2djvu-0.9.3/configure pdf2djvu-0.9.4/configure --- pdf2djvu-0.9.3/configure 2015-11-20 18:28:43.000000000 +0000 +++ pdf2djvu-0.9.4/configure 2016-02-24 17:35:03.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pdf2djvu 0.9.3. +# Generated by GNU Autoconf 2.69 for pdf2djvu 0.9.4. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='pdf2djvu' PACKAGE_TARNAME='pdf2djvu' -PACKAGE_VERSION='0.9.3' -PACKAGE_STRING='pdf2djvu 0.9.3' +PACKAGE_VERSION='0.9.4' +PACKAGE_STRING='pdf2djvu 0.9.4' PACKAGE_BUGREPORT='https://bitbucket.org/jwilk/pdf2djvu/issues' PACKAGE_URL='http://jwilk.net/software/pdf2djvu' @@ -1277,7 +1277,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pdf2djvu 0.9.3 to adapt to many kinds of systems. +\`configure' configures pdf2djvu 0.9.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1343,7 +1343,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pdf2djvu 0.9.3:";; + short | recursive ) echo "Configuration of pdf2djvu 0.9.4:";; esac cat <<\_ACEOF @@ -1471,7 +1471,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pdf2djvu configure 0.9.3 +pdf2djvu configure 0.9.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1689,7 +1689,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pdf2djvu $as_me 0.9.3, which was +It was created by pdf2djvu $as_me 0.9.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -7836,7 +7836,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pdf2djvu $as_me 0.9.3, which was +This file was extended by pdf2djvu $as_me 0.9.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7903,7 +7903,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pdf2djvu config.status 0.9.3 +pdf2djvu config.status 0.9.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -8762,7 +8762,7 @@ WARNING: Parallel page rendering will be disabled. Please consider using a compiler with OpenMP support to enable this -functionality. +feature. _ACEOF fi @@ -8772,7 +8772,7 @@ INFO: Color quantization using GraphicsMagick will be disabled. Please consider installing the GraphicsMagick++ library to enable this -functionality. +feature. _ACEOF fi @@ -8782,7 +8782,7 @@ WARNING: Updating XMP metadata will be disabled. Please consider installing the Exiv2 and libuuid libraries to enable this -functionality. +feature. _ACEOF fi diff -Nru pdf2djvu-0.9.3/configure.ac pdf2djvu-0.9.4/configure.ac --- pdf2djvu-0.9.3/configure.ac 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/configure.ac 2016-02-24 17:34:51.000000000 +0000 @@ -12,7 +12,7 @@ dnl | General Public License for more details. AC_PREREQ(2.62) -AC_INIT([pdf2djvu], [0.9.3], [https://bitbucket.org/jwilk/pdf2djvu/issues], [pdf2djvu], [http://jwilk.net/software/pdf2djvu]) +AC_INIT([pdf2djvu], [0.9.4], [https://bitbucket.org/jwilk/pdf2djvu/issues], [pdf2djvu], [http://jwilk.net/software/pdf2djvu]) AC_CONFIG_AUX_DIR([tools]) AC_CONFIG_MACRO_DIR([m4]) AC_LANG([C++]) @@ -181,7 +181,7 @@ WARNING: Parallel page rendering will be disabled. Please consider using a compiler with OpenMP support to enable this -functionality. +feature. _ACEOF fi @@ -191,7 +191,7 @@ INFO: Color quantization using GraphicsMagick will be disabled. Please consider installing the GraphicsMagick++ library to enable this -functionality. +feature. _ACEOF fi @@ -201,7 +201,7 @@ WARNING: Updating XMP metadata will be disabled. Please consider installing the Exiv2 and libuuid libraries to enable this -functionality. +feature. _ACEOF fi diff -Nru pdf2djvu-0.9.3/debian/changelog pdf2djvu-0.9.4/debian/changelog --- pdf2djvu-0.9.3/debian/changelog 2016-02-29 09:49:15.000000000 +0000 +++ pdf2djvu-0.9.4/debian/changelog 2016-03-16 20:47:49.000000000 +0000 @@ -1,14 +1,13 @@ -pdf2djvu (0.9.3-1build2) xenial; urgency=medium +pdf2djvu (0.9.4-1) unstable; urgency=medium - * No change rebuild with the new poppler soname + * New upstream release (Closes: #812007). + * deb/control: + + updated maintainer email address. + + bumped standards to 3.9.7 (no changes needed). + * deb/copyright: updated, cosmetics. + * deb/rules: added DEB_BUILD_MAINT_OPTIONS with hardening=+all. - -- Sebastien Bacher Mon, 29 Feb 2016 10:49:10 +0100 - -pdf2djvu (0.9.3-1build1) xenial; urgency=high - - * Rebuild against libpoppler57/s390x. - - -- Dimitri John Ledkov Tue, 08 Dec 2015 21:12:23 +0000 + -- Daniel Stender Wed, 16 Mar 2016 21:46:59 +0100 pdf2djvu (0.9.3-1) unstable; urgency=medium diff -Nru pdf2djvu-0.9.3/debian/control pdf2djvu-0.9.4/debian/control --- pdf2djvu-0.9.3/debian/control 2015-12-01 21:06:09.000000000 +0000 +++ pdf2djvu-0.9.4/debian/control 2016-03-16 20:44:28.000000000 +0000 @@ -1,7 +1,7 @@ Source: pdf2djvu Section: text Priority: optional -Maintainer: Daniel Stender +Maintainer: Daniel Stender Build-Depends: autotools-dev, debhelper (>= 9), @@ -18,7 +18,7 @@ locales Build-Conflicts: locales-all -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Homepage: http://jwilk.net/software/pdf2djvu Testsuite: autopkgtest diff -Nru pdf2djvu-0.9.3/debian/copyright pdf2djvu-0.9.4/debian/copyright --- pdf2djvu-0.9.3/debian/copyright 2015-05-04 07:01:49.000000000 +0000 +++ pdf2djvu-0.9.4/debian/copyright 2016-03-16 20:36:15.000000000 +0000 @@ -4,15 +4,15 @@ Source: https://bitbucket.org/jwilk/pdf2djvu Files: * -Copyright: 2007-2015 Jakub Wilk - 2009 Mateusz Turcza +Copyright: 2007-2016 Jakub Wilk + 2009 Mateusz Turcza License: GPL-2 Files: debian/* -Copyright: 2008 Steve Stalcup - 2009 Luca Bruno - 2010 Jakub Wilk - 2010-2015 Daniel Stender +Copyright: 2008 Steve Stalcup + 2009 Luca Bruno + 2010 Jakub Wilk + 2010-2016 Daniel Stender License: GPL-2 License: GPL-2 diff -Nru pdf2djvu-0.9.3/debian/rules pdf2djvu-0.9.4/debian/rules --- pdf2djvu-0.9.3/debian/rules 2015-10-25 12:17:24.000000000 +0000 +++ pdf2djvu-0.9.4/debian/rules 2016-03-16 20:45:37.000000000 +0000 @@ -2,6 +2,7 @@ #export DH_VERBOSE=1 #export DEB_BUILD_OPTIONS=nocheck export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ --with autotools_dev --parallel diff -Nru pdf2djvu-0.9.3/djvu-const.hh pdf2djvu-0.9.4/djvu-const.hh --- pdf2djvu-0.9.3/djvu-const.hh 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/djvu-const.hh 2016-02-24 17:34:51.000000000 +0000 @@ -22,7 +22,7 @@ /* ``djvumake`` used to require dpi ≥ 72. * The library itself enforces dpi ≤ 6000. * - * See http://sourceforge.net/p/djvu/bugs/103/ for details. + * See https://sourceforge.net/p/djvu/bugs/103/ for details. */ static const unsigned int max_fg_colors = 4080; diff -Nru pdf2djvu-0.9.3/djvu-outline.hh pdf2djvu-0.9.4/djvu-outline.hh --- pdf2djvu-0.9.3/djvu-outline.hh 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/djvu-outline.hh 2016-02-24 17:34:51.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright © 2015 Jakub Wilk +/* Copyright © 2015-2016 Jakub Wilk * * This file is part of pdf2djvu. * @@ -69,6 +69,9 @@ friend std::ostream &operator<<(std::ostream &, const Outline &); }; + std::ostream &operator<<(std::ostream &, const OutlineItem &); + std::ostream &operator<<(std::ostream &, const Outline &); + } #endif diff -Nru pdf2djvu-0.9.3/doc/build-reqs.txt pdf2djvu-0.9.4/doc/build-reqs.txt --- pdf2djvu-0.9.3/doc/build-reqs.txt 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/doc/build-reqs.txt 2016-02-24 17:34:51.000000000 +0000 @@ -8,7 +8,7 @@ Poppler must be compiled with the ``--enable-xpdf-headers`` configuration option enabled. Alternatively, you may use the ``tools/install-poppler-h-files`` - script to install the missing headers afterwards. + script to install the missing headers afterward. The following software is recommended: @@ -29,9 +29,9 @@ .. _DjVuLibre: http://djvu.sourceforge.net/ .. _poppler: - http://poppler.freedesktop.org/ + https://poppler.freedesktop.org/ .. _pkg-config: - https://wiki.freedesktop.org/www/Software/pkg-config/ + https://www.freedesktop.org/wiki/Software/pkg-config/ .. _gettext: https://www.gnu.org/software/gettext/ .. _Exiv2: diff -Nru pdf2djvu-0.9.3/doc/changelog pdf2djvu-0.9.4/doc/changelog --- pdf2djvu-0.9.3/doc/changelog 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/doc/changelog 2016-02-24 17:34:51.000000000 +0000 @@ -1,3 +1,36 @@ +pdf2djvu (0.9.4) unstable; urgency=low + + [ Jakub Wilk ] + * Standardize on American spelling in the manual page. + * Document that bugs can be reported to the mailing list. + * Fix build failure with GCC 6. + Thanks to Martin Michlmayr for the bug report. + https://bugs.debian.org/812007 + * Improve warning message when a link with an unsupported + action type is encountered. + Thanks to Janusz S. Bień for the bug report. + https://groups.io/g/pdf2djvu/message/26 + * Improve error handling in out-of-memory situations. + Thanks to Daniel Stender for the bug report. + https://bitbucket.org/jwilk/pdf2djvu/issue/107 + * Use HTTPS for sourceforge.net and freedesktop.org URLs. + * Improve the test suite. + * Update the Polish translation. + + [ Chris Leick ] + * Update the German translation. + + [ Américo Monteiro ] + * Update the Portuguese translation. + + [ Kyrill Detinov ] + * Update the Russian translation. + + [ Jean-Paul Guillonneau ] + * Update the French translation of the manual page. + + -- Jakub Wilk Wed, 24 Feb 2016 18:34:05 +0100 + pdf2djvu (0.9.3) unstable; urgency=low * Fix rendering some vector elements that should go to the foreground layer. @@ -309,7 +342,7 @@ [ Jakub Wilk ] * Fix resolution detection. - * Windows: honour console output encoding. + * Windows: honor console output encoding. https://bitbucket.org/jwilk/pdf2djvu/issue/64 * Build with “-Werror=overloaded-virtual”. @@ -426,7 +459,7 @@ https://bitbucket.org/jwilk/pdf2djvu/issue/45 * Fix crash with GraphicMagick ≥ 1.3.8. https://bitbucket.org/jwilk/pdf2djvu/issue/47 - http://sourceforge.net/mailarchive/message.php?msg_id=24439342 + https://sourceforge.net/p/graphicsmagick/mailman/message/24439342/ * Override number of threads set by GraphicsMagick. -- Jakub Wilk Sat, 01 May 2010 23:52:23 +0200 @@ -667,7 +700,7 @@ pdf2djvu (0.4.4) unstable; urgency=low - * Fix an undefined behaviour which led to rendering bugs. + * Fix an undefined behavior which led to rendering bugs. Thanks to Janusz S. Bień and Krzysztof Szafran for bug reports. -- Jakub Wilk Tue, 05 Feb 2008 23:13:23 +0100 @@ -718,7 +751,7 @@ * Fix a bug which caused (sometimes) foreground colors to be discarded. * Proper support for non-white background. - * Fix a file descriptior leak. + * Fix a file descriptor leak. Thanks to Victor Ivrii for the report. * Fix a regression with locating hyperlinks. * Fix hyperlinks extraction (Poppler 0.6 only). diff -Nru pdf2djvu-0.9.3/doc/cjk.txt pdf2djvu-0.9.4/doc/cjk.txt --- pdf2djvu-0.9.3/doc/cjk.txt 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/doc/cjk.txt 2016-02-24 17:34:51.000000000 +0000 @@ -2,7 +2,7 @@ languages, the poppler-data_ package has to be installed. .. _poppler-data: - http://poppler.freedesktop.org/poppler-data-0.4.7.tar.gz + https://poppler.freedesktop.org/poppler-data-0.4.7.tar.gz For the Windows port: diff -Nru pdf2djvu-0.9.3/doc/djvudigital.txt pdf2djvu-0.9.4/doc/djvudigital.txt --- pdf2djvu-0.9.3/doc/djvudigital.txt 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/doc/djvudigital.txt 2016-02-24 17:34:51.000000000 +0000 @@ -48,6 +48,6 @@ http://djvu.sourceforge.net/gsdjvu.html .. _bug report: - http://sourceforge.net/p/djvu/bugs/109/ + https://sourceforge.net/p/djvu/bugs/109/ .. vim:ft=rst ts=3 sts=3 sw=3 et tw=72 diff -Nru pdf2djvu-0.9.3/doc/manpage.xml pdf2djvu-0.9.4/doc/manpage.xml --- pdf2djvu-0.9.3/doc/manpage.xml 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/doc/manpage.xml 2016-02-24 17:34:51.000000000 +0000 @@ -2,7 +2,7 @@ - + ]> @@ -550,7 +550,7 @@ OMP_* - Details of runtime behaviour with respect to parallelism can be controlled by several environment variables. + Details of runtime behavior with respect to parallelism can be controlled by several environment variables. Please refer to the OpenMP API specification for details. @@ -577,7 +577,7 @@ Template syntax - The template language is roughly modelled on the Python string formatting syntax. @@ -645,7 +645,7 @@ Layer separation algorithm Unless the option is on, - &p; uses the following naïve layer separation algorithm: + &p; uses the following naive layer separation algorithm: @@ -694,8 +694,9 @@ Bug reports - If you find a bug in &p;, please report it at the issue tracker. + If you find a bug in &p;, please report it + at the issue tracker + or to the mailing list. diff -Nru pdf2djvu-0.9.3/doc/pdf2djvu.1 pdf2djvu-0.9.4/doc/pdf2djvu.1 --- pdf2djvu-0.9.3/doc/pdf2djvu.1 2015-11-20 18:28:45.000000000 +0000 +++ pdf2djvu-0.9.4/doc/pdf2djvu.1 2016-02-24 17:35:06.000000000 +0000 @@ -1,13 +1,13 @@ '\" t .\" Title: pdf2djvu .\" Author: Jakub Wilk -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 11/20/2015 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 02/24/2016 .\" Manual: pdf2djvu manual -.\" Source: pdf2djvu 0.9.3 +.\" Source: pdf2djvu 0.9.4 .\" Language: English .\" -.TH "PDF2DJVU" "1" "11/20/2015" "pdf2djvu 0\&.9\&.3" "pdf2djvu manual" +.TH "PDF2DJVU" "1" "02/24/2016" "pdf2djvu 0\&.9\&.4" "pdf2djvu manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -424,7 +424,7 @@ .PP \fIOMP_\fR\fI\fI*\fR\fR .RS 4 -Details of runtime behaviour with respect to parallelism can be controlled by several environment variables\&. Please refer to the +Details of runtime behavior with respect to parallelism can be controlled by several environment variables\&. Please refer to the \m[blue]\fBOpenMP API specification\fR\m[]\&\s-2\u[4]\d\s+2 for details\&. .RE @@ -438,7 +438,7 @@ .SH "TEMPLATE LANGUAGE" .SS "Template syntax" .PP -The template language is roughly modelled on the +The template language is roughly modeled on the \m[blue]\fBPython string formatting syntax\fR\m[]\&\s-2\u[5]\d\s+2\&. .PP A template is a piece of text which contains @@ -489,7 +489,7 @@ .PP Unless the \fB\-\-monochrome\fR -option is on, pdf2djvu uses the following na\(:ive layer separation algorithm: +option is on, pdf2djvu uses the following naive layer separation algorithm: .sp .RS 4 .ie n \{\ @@ -596,7 +596,9 @@ .SH "BUG REPORTS" .PP If you find a bug in pdf2djvu, please report it at -\m[blue]\fBthe issue tracker\fR\m[]\&\s-2\u[6]\d\s+2\&. +\m[blue]\fBthe issue tracker\fR\m[]\&\s-2\u[6]\d\s+2 +or to +\m[blue]\fBthe mailing list\fR\m[]\&\s-2\u[7]\d\s+2\&. .SH "SEE ALSO" .PP \fBdjvu\fR(1), @@ -639,3 +641,8 @@ .RS 4 \%https://bitbucket.org/jwilk/pdf2djvu/issues .RE +.IP " 7." 4 +the mailing list +.RS 4 +\%https://groups.io/g/pdf2djvu +.RE diff -Nru pdf2djvu-0.9.3/doc/po/de.po pdf2djvu-0.9.4/doc/po/de.po --- pdf2djvu-0.9.3/doc/po/de.po 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/de.po 2016-02-24 17:34:51.000000000 +0000 @@ -1,13 +1,13 @@ -# Copyright © 2011-2015 Chris Leick +# Copyright © 2011-2016 Chris Leick # # This file is distributed under the same license as the pdf2djvu package. # msgid "" msgstr "" -"Project-Id-Version: pdf2djvu 0.9.3\n" +"Project-Id-Version: pdf2djvu 0.9.4\n" "Report-Msgid-Bugs-To: https://bitbucket.org/jwilk/pdf2djvu/issues\n" -"POT-Creation-Date: 2015-09-15 22:57+0200\n" -"PO-Revision-Date: 2015-09-22 23:19+0200\n" +"POT-Creation-Date: 2016-01-04 11:40+0100\n" +"PO-Revision-Date: 2016-02-06 15:54+0100\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" "Language: de\n" @@ -21,8 +21,8 @@ msgstr "pdf2djvu" #. type: Content of the version entity -msgid "0.9.3" -msgstr "0.9.3" +msgid "0.9.4" +msgstr "0.9.4" #. type: Attribute 'lang' of: msgid "en" @@ -410,7 +410,7 @@ msgid "" msgstr "" -# http://de.wikipedia.org/wiki/Unicodeblock_Alphabetische_Präsentationsformen +# https://de.wikipedia.org/wiki/Unicodeblock_Alphabetische_Präsentationsformen #. type: Content of: msgid "Do not apply NFKC normalization on the text, except for characters from the Alphabetic Presentation Forms block (U+FB00–U+FB4F), which are normalized unconditionally." msgstr "Wenden Sie NFKC nicht an, um den Text in Normalform zu bringen, außer für Zeichen des Unicodeblock Alphabetische Präsentationsformen (U+FB00–U+FB4F), die bedingungslos normalisiert werden." @@ -532,7 +532,7 @@ msgstr "OMP_*" #. type: Content of: -msgid "Details of runtime behaviour with respect to parallelism can be controlled by several environment variables. Please refer to the OpenMP API specification for details." +msgid "Details of runtime behavior with respect to parallelism can be controlled by several environment variables. Please refer to the OpenMP API specification for details." msgstr "Einzelheiten des Verhaltens zur Laufzeit, die Parallelisierung berücksichtigen, können durch mehrere Umgebungsvariablen gesteuert werden. Bitte sehen Sie in die OpenMP-API-Spezifikation, um Einzelheiten zu erfahren." #. type: Content of: @@ -556,7 +556,7 @@ msgstr "Schablonensyntax" #. type: Content of: -msgid "The template language is roughly modelled on the Python string formatting syntax." +msgid "The template language is roughly modeled on the Python string formatting syntax." msgstr "Die Schablonensprache ist ungefähr wie die Phyton-Zeichenkettenformatierungssyntax aufgebaut." #. type: Content of: @@ -669,7 +669,7 @@ msgstr "für jede Seite das Folgende tun: " #. type: Content of: -msgid "Unless the option is on, &p; uses the following naïve layer separation algorithm: " +msgid "Unless the option is on, &p; uses the following naive layer separation algorithm: " msgstr "Außer wenn die Option aktiviert ist, benutzt &p; den folgenden naiven Ebenen-Aufteilungsalgorithmus: " #. type: Content of: @@ -677,8 +677,8 @@ msgstr "Fehlerberichte" #. type: Content of: <refentry><refsection><para> -msgid "If you find a bug in &p;, please report it at <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>the issue tracker</ulink>." -msgstr "Falls Sie einen Fehler in &p; finden, berichten Sie ihn bitte auf Englisch an <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>die Problemverfolgung</ulink>." +msgid "If you find a bug in &p;, please report it at <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>the issue tracker</ulink> or to <ulink url='https://groups.io/g/pdf2djvu'>the mailing list</ulink>." +msgstr "Falls Sie einen Fehler in &p; finden, berichten Sie ihn bitte auf Englisch an <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>die Problemverfolgung</ulink> oder an <ulink url='https://groups.io/g/pdf2djvu'>die Maillingliste</ulink>." #. type: Content of: <refentry><refsection><title> msgid "See also" diff -Nru pdf2djvu-0.9.3/doc/po/de.xml pdf2djvu-0.9.4/doc/po/de.xml --- pdf2djvu-0.9.3/doc/po/de.xml 2015-11-20 18:28:54.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/de.xml 2016-02-24 17:35:15.000000000 +0000 @@ -2,7 +2,7 @@ <!DOCTYPE refentry PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN' 'http://www.docbook.org/xml/4.5/docbookx.dtd' [ <!ENTITY p 'pdf2djvu'> - <!ENTITY version '0.9.3'> + <!ENTITY version '0.9.4'> ]> <refentry lang='de'> @@ -702,7 +702,8 @@ <para> Falls Sie einen Fehler in &p; finden, berichten Sie ihn bitte auf Englisch an <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>die -Problemverfolgung</ulink>. +Problemverfolgung</ulink> oder an <ulink +url='https://groups.io/g/pdf2djvu'>die Maillingliste</ulink>. </para> </refsection> diff -Nru pdf2djvu-0.9.3/doc/po/fr.po pdf2djvu-0.9.4/doc/po/fr.po --- pdf2djvu-0.9.3/doc/po/fr.po 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/fr.po 2016-02-24 17:34:51.000000000 +0000 @@ -1,13 +1,13 @@ # This file is distributed under the same license as the pdf2djvu package. # Original translation MAJID Redouane <red.maj22@gmail.com>, 2014. -# translator 2014-2015 Jean/Paul Guillonneau - +# translator 2014-2016 Jean-Paul Guillonneau +# msgid "" msgstr "" -"Project-Id-Version: pdf2djvu 0.9.3\n" +"Project-Id-Version: pdf2djvu 0.9.4\n" "Report-Msgid-Bugs-To: https://bitbucket.org/jwilk/pdf2djvu/issues\n" -"POT-Creation-Date: 2015-09-15 22:57+0200\n" -"PO-Revision-Date: 2015-09-20 14:17+0200\n" +"POT-Creation-Date: 2016-01-04 11:40+0100\n" +"PO-Revision-Date: 2016-02-16 09:50+0100\n" "Last-Translator: Jean-Paul Guillonneau <guillonneau.jeanpaul@free.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "Language: fr\n" @@ -21,8 +21,8 @@ msgstr "pdf2djvu" #. type: Content of the version entity -msgid "0.9.3" -msgstr "0.9.3" +msgid "0.9.4" +msgstr "0.9.4" #. type: Attribute 'lang' of: <refentry> msgid "en" @@ -530,7 +530,7 @@ msgstr "<varname>OMP_<replaceable>*</replaceable></varname>" #. type: Content of: <refentry><refsection><para><variablelist><varlistentry><listitem><para> -msgid "Details of runtime behaviour with respect to parallelism can be controlled by several environment variables. Please refer to the <ulink url='http://openmp.org/wp/openmp-specifications/'>OpenMP API specification</ulink> for details." +msgid "Details of runtime behavior with respect to parallelism can be controlled by several environment variables. Please refer to the <ulink url='http://openmp.org/wp/openmp-specifications/'>OpenMP API specification</ulink> for details." msgstr "Les détails du comportement d’exécution concernant le parallélisme peuvent être contrôlés par plusieurs variables d’environnement. Se référer à la <ulink url='http://openmp.org/wp/openmp-specifications/'>spécification de l’interface de programmation (API) OpenMP</ulink> pour plus de détails." #. type: Content of: <refentry><refsection><para><variablelist><varlistentry><term> @@ -554,7 +554,7 @@ msgstr "Syntaxe de modèle" #. type: Content of: <refentry><refsection><refsection><para> -msgid "The template language is roughly modelled on the <ulink url='https://docs.python.org/library/string.html#format-string-syntax'>Python string formatting syntax</ulink>." +msgid "The template language is roughly modeled on the <ulink url='https://docs.python.org/library/string.html#format-string-syntax'>Python string formatting syntax</ulink>." msgstr "Le mise en forme du modèle est plus ou moins calquée sur la <ulink url='https://docs.python.org/library/string.html#format-string-syntax'>syntaxe de formatage de chaîne en Python</ulink>." #. type: Content of: <refentry><refsection><refsection><para> @@ -666,7 +666,7 @@ msgstr "Pour chaque page, procéder comme suit : <placeholder type=\"orderedlist\" id=\"0\"/>" #. type: Content of: <refentry><refsection><refsection><para> -msgid "Unless the <option>--monochrome</option> option is on, &p; uses the following naïve layer separation algorithm: <placeholder type=\"orderedlist\" id=\"0\"/>" +msgid "Unless the <option>--monochrome</option> option is on, &p; uses the following naive layer separation algorithm: <placeholder type=\"orderedlist\" id=\"0\"/>" msgstr "À moins que l’option <option>--monochrome</option> soit activée, &p; utilise le simple algorithme de séparation de calques suivant : <placeholder type=\"orderedlist\" id=\"0\"/>" #. type: Content of: <refentry><refsection><title> @@ -674,8 +674,8 @@ msgstr "Rapports de bogue" #. type: Content of: <refentry><refsection><para> -msgid "If you find a bug in &p;, please report it at <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>the issue tracker</ulink>." -msgstr "Si vous trouvez un bogue dans &p;, veuillez le signaler au <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>système de suivi des bogues</ulink>." +msgid "If you find a bug in &p;, please report it at <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>the issue tracker</ulink> or to <ulink url='https://groups.io/g/pdf2djvu'>the mailing list</ulink>." +msgstr "Si vous trouvez un bogue dans &p;, veuillez le signaler au <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>système de suivi des bogues</ulink> ou à la <ulink url='https://groups.io/g/pdf2djvu'>liste de diffusion</ulink>." #. type: Content of: <refentry><refsection><title> msgid "See also" diff -Nru pdf2djvu-0.9.3/doc/po/fr.xml pdf2djvu-0.9.4/doc/po/fr.xml --- pdf2djvu-0.9.3/doc/po/fr.xml 2015-11-20 18:28:52.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/fr.xml 2016-02-24 17:35:13.000000000 +0000 @@ -2,7 +2,7 @@ <!DOCTYPE refentry PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN' 'http://www.docbook.org/xml/4.5/docbookx.dtd' [ <!ENTITY p 'pdf2djvu'> - <!ENTITY version '0.9.3'> + <!ENTITY version '0.9.4'> ]> <refentry lang='fr'> @@ -707,7 +707,8 @@ <para> Si vous trouvez un bogue dans &p;, veuillez le signaler au <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>système de suivi des -bogues</ulink>. +bogues</ulink> ou à la <ulink url='https://groups.io/g/pdf2djvu'>liste de +diffusion</ulink>. </para> </refsection> diff -Nru pdf2djvu-0.9.3/doc/po/Makefile pdf2djvu-0.9.4/doc/po/Makefile --- pdf2djvu-0.9.3/doc/po/Makefile 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/Makefile 2016-02-24 17:34:51.000000000 +0000 @@ -64,6 +64,7 @@ $(po_files): %.po: $(source) $(po4a-update-po) -m $(<) -p $(@) + sed -i -e 's/^\([#][.]\) *\([^ ].*[^ ]\) *$$/\1 \2/' $(@) touch $(@) %.xml: %.po diff -Nru pdf2djvu-0.9.3/doc/po/manpage.pot pdf2djvu-0.9.4/doc/po/manpage.pot --- pdf2djvu-0.9.3/doc/po/manpage.pot 2015-11-20 18:28:57.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/manpage.pot 2016-02-24 17:35:18.000000000 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: pdf2djvu 0.9.3\n" +"Project-Id-Version: pdf2djvu 0.9.4\n" "Report-Msgid-Bugs-To: https://bitbucket.org/jwilk/pdf2djvu/issues\n" -"POT-Creation-Date: 2015-11-20 19:28+0100\n" +"POT-Creation-Date: 2016-02-24 18:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -24,7 +24,7 @@ #. type: Content of the version entity #: ../manpage.xml:5 -msgid "0.9.3" +msgid "0.9.4" msgstr "" #. type: Attribute 'lang' of: <refentry> @@ -760,8 +760,8 @@ #. type: Content of: <refentry><refsection><para><variablelist><varlistentry><listitem><para> #: ../manpage.xml:553 msgid "" -"Details of runtime behaviour with respect to parallelism can be controlled " -"by several environment variables. Please refer to the <ulink " +"Details of runtime behavior with respect to parallelism can be controlled by " +"several environment variables. Please refer to the <ulink " "url='http://openmp.org/wp/openmp-specifications/'>OpenMP API " "specification</ulink> for details." msgstr "" @@ -799,7 +799,7 @@ #. type: Content of: <refentry><refsection><refsection><para> #: ../manpage.xml:580 msgid "" -"The template language is roughly modelled on the <ulink " +"The template language is roughly modeled on the <ulink " "url='https://docs.python.org/library/string.html#format-string-syntax'>Python " "string formatting syntax</ulink>." msgstr "" @@ -968,7 +968,7 @@ #: ../manpage.xml:647 msgid "" "Unless the <option>--monochrome</option> option is on, &p; uses the " -"following naïve layer separation algorithm: <placeholder " +"following naive layer separation algorithm: <placeholder " "type=\"orderedlist\" id=\"0\"/>" msgstr "" @@ -981,16 +981,17 @@ #: ../manpage.xml:697 msgid "" "If you find a bug in &p;, please report it at <ulink " -"url='https://bitbucket.org/jwilk/pdf2djvu/issues'>the issue tracker</ulink>." +"url='https://bitbucket.org/jwilk/pdf2djvu/issues'>the issue tracker</ulink> " +"or to <ulink url='https://groups.io/g/pdf2djvu'>the mailing list</ulink>." msgstr "" #. type: Content of: <refentry><refsection><title> -#: ../manpage.xml:703 +#: ../manpage.xml:704 msgid "See also" msgstr "" #. type: Content of: <refentry><refsection><para> -#: ../manpage.xml:705 +#: ../manpage.xml:706 msgid "" "<citerefentry> <refentrytitle>djvu</refentrytitle> <manvolnum>1</manvolnum> " "</citerefentry>, <citerefentry> <refentrytitle>djvudigital</refentrytitle> " diff -Nru pdf2djvu-0.9.3/doc/po/pdf2djvu.de.1 pdf2djvu-0.9.4/doc/po/pdf2djvu.de.1 --- pdf2djvu-0.9.3/doc/po/pdf2djvu.de.1 2015-11-20 18:28:55.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/pdf2djvu.de.1 2016-02-24 17:35:17.000000000 +0000 @@ -1,13 +1,13 @@ '\" t .\" Title: pdf2djvu .\" Author: Jakub Wilk <jwilk@jwilk.net> -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 20.11.2015 +.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> +.\" Date: 24.02.2016 .\" Manual: pdf2djvu Handbuch -.\" Source: pdf2djvu 0.9.3 +.\" Source: pdf2djvu 0.9.4 .\" Language: German .\" -.TH "PDF2DJVU" "1" "20.11.2015" "pdf2djvu 0\&.9\&.3" "pdf2djvu Handbuch" +.TH "PDF2DJVU" "1" "24.02.2016" "pdf2djvu 0\&.9\&.4" "pdf2djvu Handbuch" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -603,7 +603,9 @@ .SH "FEHLERBERICHTE" .PP Falls Sie einen Fehler in pdf2djvu finden, berichten Sie ihn bitte auf Englisch an -\m[blue]\fBdie Problemverfolgung\fR\m[]\&\s-2\u[6]\d\s+2\&. +\m[blue]\fBdie Problemverfolgung\fR\m[]\&\s-2\u[6]\d\s+2 +oder an +\m[blue]\fBdie Maillingliste\fR\m[]\&\s-2\u[7]\d\s+2\&. .SH "SIEHE AUCH" .PP \fBdjvu\fR(1), @@ -646,3 +648,8 @@ .RS 4 \%https://bitbucket.org/jwilk/pdf2djvu/issues .RE +.IP " 7." 4 +die Maillingliste +.RS 4 +\%https://groups.io/g/pdf2djvu +.RE diff -Nru pdf2djvu-0.9.3/doc/po/pdf2djvu.fr.1 pdf2djvu-0.9.4/doc/po/pdf2djvu.fr.1 --- pdf2djvu-0.9.3/doc/po/pdf2djvu.fr.1 2015-11-20 18:28:53.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/pdf2djvu.fr.1 2016-02-24 17:35:15.000000000 +0000 @@ -1,13 +1,13 @@ '\" t .\" Title: pdf2djvu .\" Author: Jakub Wilk <jwilk@jwilk.net> -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 20/11/2015 +.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> +.\" Date: 24/02/2016 .\" Manual: pdf2djvu Manual -.\" Source: pdf2djvu 0.9.3 +.\" Source: pdf2djvu 0.9.4 .\" Language: French .\" -.TH "PDF2DJVU" "1" "20/11/2015" "pdf2djvu 0\&.9\&.3" "pdf2djvu Manual" +.TH "PDF2DJVU" "1" "24/02/2016" "pdf2djvu 0\&.9\&.4" "pdf2djvu Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -591,7 +591,9 @@ .SH "RAPPORTS DE BOGUE" .PP Si vous trouvez un bogue dans pdf2djvu, veuillez le signaler au -\m[blue]\fBsyst\(`eme de suivi des bogues\fR\m[]\&\s-2\u[6]\d\s+2\&. +\m[blue]\fBsyst\(`eme de suivi des bogues\fR\m[]\&\s-2\u[6]\d\s+2 +ou \(`a la +\m[blue]\fBliste de diffusion\fR\m[]\&\s-2\u[7]\d\s+2\&. .SH "VOIR AUSSI" .PP \fBdjvu\fR(1), @@ -634,3 +636,8 @@ .RS 4 \%https://bitbucket.org/jwilk/pdf2djvu/issues .RE +.IP " 7." 4 +liste de diffusion +.RS 4 +\%https://groups.io/g/pdf2djvu +.RE diff -Nru pdf2djvu-0.9.3/doc/po/pdf2djvu.pl.1 pdf2djvu-0.9.4/doc/po/pdf2djvu.pl.1 --- pdf2djvu-0.9.3/doc/po/pdf2djvu.pl.1 2015-11-20 18:28:49.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/pdf2djvu.pl.1 2016-02-24 17:35:10.000000000 +0000 @@ -1,13 +1,13 @@ '\" t .\" Title: pdf2djvu .\" Author: Jakub Wilk <jwilk@jwilk.net> -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 11/20/2015 +.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> +.\" Date: 02/24/2016 .\" Manual: podręcznik pdf2djvu -.\" Source: pdf2djvu 0.9.3 +.\" Source: pdf2djvu 0.9.4 .\" Language: Polish .\" -.TH "PDF2DJVU" "1" "11/20/2015" "pdf2djvu 0\&.9\&.3" "podręcznik pdf2djvu" +.TH "PDF2DJVU" "1" "02/24/2016" "pdf2djvu 0\&.9\&.4" "podręcznik pdf2djvu" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -586,7 +586,9 @@ .SH "RAPORTY O B\(/LĘDACH" .PP B\(/lędy znalezione w pdf2djvu proszę zg\(/laszać w -\m[blue]\fBsystemie śledzenia problem\('ow\fR\m[]\&\s-2\u[6]\d\s+2\&. +\m[blue]\fBsystemie śledzenia problem\('ow\fR\m[]\&\s-2\u[6]\d\s+2 +lub na +\m[blue]\fBliście dyskusyjnej\fR\m[]\&\s-2\u[7]\d\s+2\&. .SH "ZOBACZ TEŻ" .PP \fBdjvu\fR(1), @@ -629,3 +631,8 @@ .RS 4 \%https://bitbucket.org/jwilk/pdf2djvu/issues .RE +.IP " 7." 4 +liście dyskusyjnej +.RS 4 +\%https://groups.io/g/pdf2djvu +.RE diff -Nru pdf2djvu-0.9.3/doc/po/pdf2djvu.pt.1 pdf2djvu-0.9.4/doc/po/pdf2djvu.pt.1 --- pdf2djvu-0.9.3/doc/po/pdf2djvu.pt.1 2015-11-20 18:28:51.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/pdf2djvu.pt.1 2016-02-24 17:35:12.000000000 +0000 @@ -1,13 +1,13 @@ '\" t .\" Title: pdf2djvu .\" Author: Jakub Wilk <jwilk@jwilk.net> -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 20/11/2015 +.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> +.\" Date: 24/02/2016 .\" Manual: Manual do pdf2djvu -.\" Source: pdf2djvu 0.9.3 +.\" Source: pdf2djvu 0.9.4 .\" Language: Portuguese .\" -.TH "PDF2DJVU" "1" "20/11/2015" "pdf2djvu 0\&.9\&.3" "Manual do pdf2djvu" +.TH "PDF2DJVU" "1" "24/02/2016" "pdf2djvu 0\&.9\&.4" "Manual do pdf2djvu" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -594,7 +594,9 @@ .SH "RELAT\('ORIOS DE BUGS" .PP Se voc\(^e encontrar um bug em pdf2djvu, por favor reporte\-o no -\m[blue]\fBAcompanhamento de problemas\fR\m[]\&\s-2\u[6]\d\s+2\&. +\m[blue]\fBAcompanhamento de problemas\fR\m[]\&\s-2\u[6]\d\s+2 +ou para +\m[blue]\fBa lista de mail\fR\m[]\&\s-2\u[7]\d\s+2\&. .SH "VEJA TAMB\('EM" .PP \fBdjvu\fR(1), @@ -637,3 +639,8 @@ .RS 4 \%https://bitbucket.org/jwilk/pdf2djvu/issues .RE +.IP " 7." 4 +a lista de mail +.RS 4 +\%https://groups.io/g/pdf2djvu +.RE diff -Nru pdf2djvu-0.9.3/doc/po/pdf2djvu.ru.1 pdf2djvu-0.9.4/doc/po/pdf2djvu.ru.1 --- pdf2djvu-0.9.3/doc/po/pdf2djvu.ru.1 2015-11-20 18:28:47.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/pdf2djvu.ru.1 2016-02-24 17:35:08.000000000 +0000 @@ -1,13 +1,13 @@ '\" t .\" Title: pdf2djvu .\" Author: Jakub Wilk <jwilk@jwilk.net> -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 11/20/2015 +.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> +.\" Date: 02/24/2016 .\" Manual: руководство по pdf2djvu -.\" Source: pdf2djvu 0.9.3 +.\" Source: pdf2djvu 0.9.4 .\" Language: Russian .\" -.TH "pdf2djvu" "1" "11/20/2015" "pdf2djvu 0\&.9\&.3" "руководство по pdf2djvu" +.TH "pdf2djvu" "1" "02/24/2016" "pdf2djvu 0\&.9\&.4" "руководство по pdf2djvu" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -589,7 +589,9 @@ .SH "СООБЩЕНИЯ ОБ ОШИБКАХ" .PP Если вы нашли ошибку в pdf2djvu, сообщите о ней в -\m[blue]\fBбаг\-трекер\fR\m[]\&\s-2\u[6]\d\s+2\&. +\m[blue]\fBбаг\-трекер\fR\m[]\&\s-2\u[6]\d\s+2 +или в +\m[blue]\fBсписок рассылки\fR\m[]\&\s-2\u[7]\d\s+2\&. .SH "СМОТРИТЕ ТАКЖЕ" .PP \fBdjvu\fR(1), @@ -632,3 +634,8 @@ .RS 4 \%https://bitbucket.org/jwilk/pdf2djvu/issues .RE +.IP " 7." 4 +список рассылки +.RS 4 +\%https://groups.io/g/pdf2djvu +.RE diff -Nru pdf2djvu-0.9.3/doc/po/pl.po pdf2djvu-0.9.4/doc/po/pl.po --- pdf2djvu-0.9.3/doc/po/pl.po 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/pl.po 2016-02-24 17:34:51.000000000 +0000 @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: pdf2djvu 0.9.3\n" +"Project-Id-Version: pdf2djvu 0.9.4\n" "Report-Msgid-Bugs-To: https://bitbucket.org/jwilk/pdf2djvu/issues\n" -"POT-Creation-Date: 2015-09-15 22:57+0200\n" +"POT-Creation-Date: 2016-01-04 11:40+0100\n" "PO-Revision-Date: 2015-05-25 16:43+0200\n" "Last-Translator: Jakub Wilk <jwilk@jwilk.net>\n" "Language-Team: none\n" @@ -21,8 +21,8 @@ msgstr "pdf2djvu" #. type: Content of the version entity -msgid "0.9.3" -msgstr "0.9.3" +msgid "0.9.4" +msgstr "0.9.4" #. type: Attribute 'lang' of: <refentry> msgid "en" @@ -530,7 +530,7 @@ msgstr "<varname>OMP_<replaceable>*</replaceable></varname>" #. type: Content of: <refentry><refsection><para><variablelist><varlistentry><listitem><para> -msgid "Details of runtime behaviour with respect to parallelism can be controlled by several environment variables. Please refer to the <ulink url='http://openmp.org/wp/openmp-specifications/'>OpenMP API specification</ulink> for details." +msgid "Details of runtime behavior with respect to parallelism can be controlled by several environment variables. Please refer to the <ulink url='http://openmp.org/wp/openmp-specifications/'>OpenMP API specification</ulink> for details." msgstr "Zachowanie programu pod względem współbieżności można kontrolować za pomocą kilku zmiennych środowiskowych. Szczegóły opisane są w <ulink url='http://openmp.org/wp/openmp-specifications/'>specyfikacji API OpenMP</ulink>." #. type: Content of: <refentry><refsection><para><variablelist><varlistentry><term> @@ -554,7 +554,7 @@ msgstr "Składnia szablonów" #. type: Content of: <refentry><refsection><refsection><para> -msgid "The template language is roughly modelled on the <ulink url='https://docs.python.org/library/string.html#format-string-syntax'>Python string formatting syntax</ulink>." +msgid "The template language is roughly modeled on the <ulink url='https://docs.python.org/library/string.html#format-string-syntax'>Python string formatting syntax</ulink>." msgstr "Język szablonów jest z grubsza wzorowany na <ulink url='https://docs.python.org/library/string.html#format-string-syntax'>składni formatowania napisów w języku Python</ulink>." #. type: Content of: <refentry><refsection><refsection><para> @@ -666,7 +666,7 @@ msgstr "Dla każdej strony wykonaj co następuje: <placeholder type=\"orderedlist\" id=\"0\"/>" #. type: Content of: <refentry><refsection><refsection><para> -msgid "Unless the <option>--monochrome</option> option is on, &p; uses the following naïve layer separation algorithm: <placeholder type=\"orderedlist\" id=\"0\"/>" +msgid "Unless the <option>--monochrome</option> option is on, &p; uses the following naive layer separation algorithm: <placeholder type=\"orderedlist\" id=\"0\"/>" msgstr "Jeżeli nie użyto opcji <option>--monochrome</option>, &p; używa następującego naiwnego algorytmu separacji warstw: <placeholder type=\"orderedlist\" id=\"0\"/>" #. type: Content of: <refentry><refsection><title> @@ -674,8 +674,8 @@ msgstr "Raporty o błędach" #. type: Content of: <refentry><refsection><para> -msgid "If you find a bug in &p;, please report it at <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>the issue tracker</ulink>." -msgstr "Błędy znalezione w &p; proszę zgłaszać w <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>systemie śledzenia problemów</ulink>." +msgid "If you find a bug in &p;, please report it at <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>the issue tracker</ulink> or to <ulink url='https://groups.io/g/pdf2djvu'>the mailing list</ulink>." +msgstr "Błędy znalezione w &p; proszę zgłaszać w <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>systemie śledzenia problemów</ulink> lub na <ulink url='https://groups.io/g/pdf2djvu'>liście dyskusyjnej</ulink>." #. type: Content of: <refentry><refsection><title> msgid "See also" diff -Nru pdf2djvu-0.9.3/doc/po/pl.xml pdf2djvu-0.9.4/doc/po/pl.xml --- pdf2djvu-0.9.3/doc/po/pl.xml 2015-11-20 18:28:48.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/pl.xml 2016-02-24 17:35:09.000000000 +0000 @@ -2,7 +2,7 @@ <!DOCTYPE refentry PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN' 'http://www.docbook.org/xml/4.5/docbookx.dtd' [ <!ENTITY p 'pdf2djvu'> - <!ENTITY version '0.9.3'> + <!ENTITY version '0.9.4'> ]> <refentry lang='pl'> @@ -694,7 +694,8 @@ <para> Błędy znalezione w &p; proszę zgłaszać w <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>systemie śledzenia -problemów</ulink>. +problemów</ulink> lub na <ulink url='https://groups.io/g/pdf2djvu'>liście +dyskusyjnej</ulink>. </para> </refsection> diff -Nru pdf2djvu-0.9.3/doc/po/pt.po pdf2djvu-0.9.4/doc/po/pt.po --- pdf2djvu-0.9.3/doc/po/pt.po 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/pt.po 2016-02-24 17:34:51.000000000 +0000 @@ -1,13 +1,13 @@ -# Copyright © 2014-2015 Américo Monteiro <a_monteiro@gmx.com> +# Copyright © 2014-2016 Américo Monteiro <a_monteiro@gmx.com> # # This file is distributed under the same license as the pdf2djvu package. # msgid "" msgstr "" -"Project-Id-Version: pdf2djvu 0.9.3\n" +"Project-Id-Version: pdf2djvu 0.9.4\n" "Report-Msgid-Bugs-To: https://bitbucket.org/jwilk/pdf2djvu/issues\n" -"POT-Creation-Date: 2015-09-15 22:57+0200\n" -"PO-Revision-Date: 2015-09-17 23:52+0100\n" +"POT-Creation-Date: 2016-01-04 11:40+0100\n" +"PO-Revision-Date: 2016-02-06 16:38+0000\n" "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" "Language: pt\n" @@ -21,8 +21,8 @@ msgstr "pdf2djvu" #. type: Content of the version entity -msgid "0.9.3" -msgstr "0.9.3" +msgid "0.9.4" +msgstr "0.9.4" #. type: Attribute 'lang' of: <refentry> msgid "en" @@ -530,7 +530,7 @@ msgstr "<varname>OMP_<replaceable>*</replaceable></varname>" #. type: Content of: <refentry><refsection><para><variablelist><varlistentry><listitem><para> -msgid "Details of runtime behaviour with respect to parallelism can be controlled by several environment variables. Please refer to the <ulink url='http://openmp.org/wp/openmp-specifications/'>OpenMP API specification</ulink> for details." +msgid "Details of runtime behavior with respect to parallelism can be controlled by several environment variables. Please refer to the <ulink url='http://openmp.org/wp/openmp-specifications/'>OpenMP API specification</ulink> for details." msgstr "Detalhes no comportamento em tempo de execução com respeito a paralelismo podem ser controlados por várias variáveis de ambiente. Por favor use a <ulink url='http://openmp.org/wp/openmp-specifications/'>especificação OpenMP API</ulink> como referência para detalhes." #. type: Content of: <refentry><refsection><para><variablelist><varlistentry><term> @@ -554,7 +554,7 @@ msgstr "Sintaxe de modelo" #. type: Content of: <refentry><refsection><refsection><para> -msgid "The template language is roughly modelled on the <ulink url='https://docs.python.org/library/string.html#format-string-syntax'>Python string formatting syntax</ulink>." +msgid "The template language is roughly modeled on the <ulink url='https://docs.python.org/library/string.html#format-string-syntax'>Python string formatting syntax</ulink>." msgstr "A linguagem de modelo é mais ou menos modelada na <ulink url='https://docs.python.org/library/string.html#format-string-syntax'>Sintaxe de formatação de strings de Python</ulink>." #. type: Content of: <refentry><refsection><refsection><para> @@ -666,7 +666,7 @@ msgstr "Para cada página, faz o seguinte: <placeholder type=\"orderedlist\" id=\"0\"/>" #. type: Content of: <refentry><refsection><refsection><para> -msgid "Unless the <option>--monochrome</option> option is on, &p; uses the following naïve layer separation algorithm: <placeholder type=\"orderedlist\" id=\"0\"/>" +msgid "Unless the <option>--monochrome</option> option is on, &p; uses the following naive layer separation algorithm: <placeholder type=\"orderedlist\" id=\"0\"/>" msgstr "A menos que a opção <option>--monochrome</option> seja usada, o &p; usa o seguinte algoritmo de separação de camadas nativas: <placeholder type=\"orderedlist\" id=\"0\"/>" #. type: Content of: <refentry><refsection><title> @@ -674,8 +674,8 @@ msgstr "Relatórios de bugs" #. type: Content of: <refentry><refsection><para> -msgid "If you find a bug in &p;, please report it at <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>the issue tracker</ulink>." -msgstr "Se você encontrar um bug em &p;, por favor reporte-o no <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>Acompanhamento de problemas</ulink>." +msgid "If you find a bug in &p;, please report it at <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>the issue tracker</ulink> or to <ulink url='https://groups.io/g/pdf2djvu'>the mailing list</ulink>." +msgstr "Se você encontrar um bug em &p;, por favor reporte-o no <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>Acompanhamento de problemas</ulink> ou para <ulink url='https://groups.io/g/pdf2djvu'>a lista de mail</ulink>." #. type: Content of: <refentry><refsection><title> msgid "See also" diff -Nru pdf2djvu-0.9.3/doc/po/pt.xml pdf2djvu-0.9.4/doc/po/pt.xml --- pdf2djvu-0.9.3/doc/po/pt.xml 2015-11-20 18:28:50.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/pt.xml 2016-02-24 17:35:11.000000000 +0000 @@ -2,7 +2,7 @@ <!DOCTYPE refentry PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN' 'http://www.docbook.org/xml/4.5/docbookx.dtd' [ <!ENTITY p 'pdf2djvu'> - <!ENTITY version '0.9.3'> + <!ENTITY version '0.9.4'> ]> <refentry lang='pt'> @@ -700,7 +700,8 @@ <para> Se você encontrar um bug em &p;, por favor reporte-o no <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>Acompanhamento de -problemas</ulink>. +problemas</ulink> ou para <ulink url='https://groups.io/g/pdf2djvu'>a lista +de mail</ulink>. </para> </refsection> diff -Nru pdf2djvu-0.9.3/doc/po/ru.po pdf2djvu-0.9.4/doc/po/ru.po --- pdf2djvu-0.9.3/doc/po/ru.po 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/ru.po 2016-02-24 17:34:51.000000000 +0000 @@ -1,13 +1,13 @@ -# Copyright © 2011-2015 Kyrill Detinov +# Copyright © 2011-2016 Kyrill Detinov # # This file is distributed under the same license as the pdf2djvu package. # msgid "" msgstr "" -"Project-Id-Version: pdf2djvu 0.9.3\n" +"Project-Id-Version: pdf2djvu 0.9.4\n" "Report-Msgid-Bugs-To: https://bitbucket.org/jwilk/pdf2djvu/issues\n" -"POT-Creation-Date: 2015-09-15 22:57+0200\n" -"PO-Revision-Date: 2015-09-27 11:07+0300\n" +"POT-Creation-Date: 2016-01-04 11:41+0100\n" +"PO-Revision-Date: 2016-02-08 11:42+0300\n" "Last-Translator: Kyrill Detinov <lazy.kent@opensuse.org>\n" "Language-Team: openSUSE Translation Team\n" "Language: ru\n" @@ -21,8 +21,8 @@ msgstr "pdf2djvu" #. type: Content of the version entity -msgid "0.9.3" -msgstr "0.9.3" +msgid "0.9.4" +msgstr "0.9.4" #. type: Attribute 'lang' of: <refentry> msgid "en" @@ -530,7 +530,7 @@ msgstr "<varname>OMP_<replaceable>*</replaceable></varname>" #. type: Content of: <refentry><refsection><para><variablelist><varlistentry><listitem><para> -msgid "Details of runtime behaviour with respect to parallelism can be controlled by several environment variables. Please refer to the <ulink url='http://openmp.org/wp/openmp-specifications/'>OpenMP API specification</ulink> for details." +msgid "Details of runtime behavior with respect to parallelism can be controlled by several environment variables. Please refer to the <ulink url='http://openmp.org/wp/openmp-specifications/'>OpenMP API specification</ulink> for details." msgstr "Поведением, с точки зрения распараллеливания, можно управлять с помощью нескольких переменных окружения. За деталями обратитесь к <ulink url='http://openmp.org/wp/openmp-specifications/'>спецификации OpenMP API</ulink>." #. type: Content of: <refentry><refsection><para><variablelist><varlistentry><term> @@ -554,7 +554,7 @@ msgstr "Синтаксис шаблонов" #. type: Content of: <refentry><refsection><refsection><para> -msgid "The template language is roughly modelled on the <ulink url='https://docs.python.org/library/string.html#format-string-syntax'>Python string formatting syntax</ulink>." +msgid "The template language is roughly modeled on the <ulink url='https://docs.python.org/library/string.html#format-string-syntax'>Python string formatting syntax</ulink>." msgstr "Язык шаблонов использует как образец <ulink url='https://docs.python.org/library/string.html#format-string-syntax'>синтаксис форматирования строк в Python</ulink>." #. type: Content of: <refentry><refsection><refsection><para> @@ -666,7 +666,7 @@ msgstr "Для каждой страницы сделать следующее: <placeholder type=\"orderedlist\" id=\"0\"/>" #. type: Content of: <refentry><refsection><refsection><para> -msgid "Unless the <option>--monochrome</option> option is on, &p; uses the following naïve layer separation algorithm: <placeholder type=\"orderedlist\" id=\"0\"/>" +msgid "Unless the <option>--monochrome</option> option is on, &p; uses the following naive layer separation algorithm: <placeholder type=\"orderedlist\" id=\"0\"/>" msgstr "Если не используется параметр <option>--monochrome</option>, &p; использует следующий простой алгоритм: <placeholder type=\"orderedlist\" id=\"0\"/>" #. type: Content of: <refentry><refsection><title> @@ -674,8 +674,8 @@ msgstr "Сообщения об ошибках" #. type: Content of: <refentry><refsection><para> -msgid "If you find a bug in &p;, please report it at <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>the issue tracker</ulink>." -msgstr "Если вы нашли ошибку в &p;, сообщите о ней в <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>баг-трекер</ulink>." +msgid "If you find a bug in &p;, please report it at <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>the issue tracker</ulink> or to <ulink url='https://groups.io/g/pdf2djvu'>the mailing list</ulink>." +msgstr "Если вы нашли ошибку в &p;, сообщите о ней в <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>баг-трекер</ulink> или в <ulink url='https://groups.io/g/pdf2djvu'>список рассылки</ulink>." #. type: Content of: <refentry><refsection><title> msgid "See also" diff -Nru pdf2djvu-0.9.3/doc/po/ru.xml pdf2djvu-0.9.4/doc/po/ru.xml --- pdf2djvu-0.9.3/doc/po/ru.xml 2015-11-20 18:28:46.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/ru.xml 2016-02-24 17:35:07.000000000 +0000 @@ -2,7 +2,7 @@ <!DOCTYPE refentry PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN' 'http://www.docbook.org/xml/4.5/docbookx.dtd' [ <!ENTITY p 'pdf2djvu'> - <!ENTITY version '0.9.3'> + <!ENTITY version '0.9.4'> ]> <refentry lang='ru'> @@ -692,7 +692,8 @@ <title>Сообщения об ошибках Если вы нашли ошибку в &p;, сообщите о ней в баг-трекер. +url='https://bitbucket.org/jwilk/pdf2djvu/issues'>баг-трекер или в +список рассылки. diff -Nru pdf2djvu-0.9.3/doc/po/uk.po pdf2djvu-0.9.4/doc/po/uk.po --- pdf2djvu-0.9.3/doc/po/uk.po 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/doc/po/uk.po 2016-02-24 17:34:51.000000000 +0000 @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: pdf2djvu 0.9.3\n" +"Project-Id-Version: pdf2djvu 0.9.4\n" "Report-Msgid-Bugs-To: https://bitbucket.org/jwilk/pdf2djvu/issues\n" -"POT-Creation-Date: 2015-09-15 22:57+0200\n" +"POT-Creation-Date: 2016-01-04 11:40+0100\n" "PO-Revision-Date: 2012-05-31 11:57+0300\n" "Last-Translator: Serhij Dubyk \n" "Language-Team: Ukrainian Linux Team \n" @@ -21,8 +21,8 @@ msgstr "pdf2djvu" #. type: Content of the version entity -msgid "0.9.3" -msgstr "0.9.3" +msgid "0.9.4" +msgstr "0.9.4" #. type: Attribute 'lang' of: msgid "en" @@ -539,7 +539,7 @@ msgstr "OMP_*" #. type: Content of: -msgid "Details of runtime behaviour with respect to parallelism can be controlled by several environment variables. Please refer to the OpenMP API specification for details." +msgid "Details of runtime behavior with respect to parallelism can be controlled by several environment variables. Please refer to the OpenMP API specification for details." msgstr "Поведінкою, з точки зору розпаралелювання, можна керувати за допомогою кількох змінних оточення. За деталями зверніться до специфікації OpenMP API." #. type: Content of: @@ -563,7 +563,7 @@ msgstr "Синтаксис шаблонів" #. type: Content of: -msgid "The template language is roughly modelled on the Python string formatting syntax." +msgid "The template language is roughly modeled on the Python string formatting syntax." msgstr "Мова шаблонів використовує як зразок синтаксис форматування рядків у Python-і." #. type: Content of: @@ -679,7 +679,7 @@ msgstr "Для кожної сторінки зробити наступне: " #. type: Content of: -msgid "Unless the option is on, &p; uses the following naïve layer separation algorithm: " +msgid "Unless the option is on, &p; uses the following naive layer separation algorithm: " msgstr "Якщо не використовується параметр , &p; використовує наступний простий алгоритм: " #. type: Content of: @@ -687,7 +687,9 @@ msgstr "Повідомлення про помилки" #. type: Content of: <refentry><refsection><para> -msgid "If you find a bug in &p;, please report it at <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>the issue tracker</ulink>." +#, fuzzy +#| msgid "If you find a bug in &p;, please report it at <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>the issue tracker</ulink>." +msgid "If you find a bug in &p;, please report it at <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>the issue tracker</ulink> or to <ulink url='https://groups.io/g/pdf2djvu'>the mailing list</ulink>." msgstr "Якщо Ви знайшли помилку у &p;, повідомте про неї на <ulink url='https://bitbucket.org/jwilk/pdf2djvu/issues'>баг-трекер</ulink>." #. type: Content of: <refentry><refsection><title> diff -Nru pdf2djvu-0.9.3/m4/gettext.m4 pdf2djvu-0.9.4/m4/gettext.m4 --- pdf2djvu-0.9.3/m4/gettext.m4 2015-11-20 18:28:38.000000000 +0000 +++ pdf2djvu-0.9.4/m4/gettext.m4 2016-02-24 17:34:58.000000000 +0000 @@ -4,13 +4,13 @@ dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -dnl This file can can be used in projects which are not available under +dnl This file can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. +dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: diff -Nru pdf2djvu-0.9.3/m4/intlmacosx.m4 pdf2djvu-0.9.4/m4/intlmacosx.m4 --- pdf2djvu-0.9.3/m4/intlmacosx.m4 2015-11-20 18:28:38.000000000 +0000 +++ pdf2djvu-0.9.4/m4/intlmacosx.m4 2016-02-24 17:34:58.000000000 +0000 @@ -4,13 +4,13 @@ dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -dnl This file can can be used in projects which are not available under +dnl This file can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. +dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Checks for special options needed on Mac OS X. diff -Nru pdf2djvu-0.9.3/m4/nls.m4 pdf2djvu-0.9.4/m4/nls.m4 --- pdf2djvu-0.9.3/m4/nls.m4 2015-11-20 18:28:38.000000000 +0000 +++ pdf2djvu-0.9.4/m4/nls.m4 2016-02-24 17:34:58.000000000 +0000 @@ -5,13 +5,13 @@ dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -dnl This file can can be used in projects which are not available under +dnl This file can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. +dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: diff -Nru pdf2djvu-0.9.3/m4/po.m4 pdf2djvu-0.9.4/m4/po.m4 --- pdf2djvu-0.9.3/m4/po.m4 2015-11-20 18:28:38.000000000 +0000 +++ pdf2djvu-0.9.4/m4/po.m4 2016-02-24 17:34:58.000000000 +0000 @@ -4,13 +4,13 @@ dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -dnl This file can can be used in projects which are not available under +dnl This file can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. +dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: diff -Nru pdf2djvu-0.9.3/m4/progtest.m4 pdf2djvu-0.9.4/m4/progtest.m4 --- pdf2djvu-0.9.3/m4/progtest.m4 2015-11-20 18:28:38.000000000 +0000 +++ pdf2djvu-0.9.4/m4/progtest.m4 2016-02-24 17:34:58.000000000 +0000 @@ -4,13 +4,13 @@ dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -dnl This file can can be used in projects which are not available under +dnl This file can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. +dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: diff -Nru pdf2djvu-0.9.3/Makefile pdf2djvu-0.9.4/Makefile --- pdf2djvu-0.9.3/Makefile 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/Makefile 2016-02-24 17:34:51.000000000 +0000 @@ -64,6 +64,18 @@ distclean: clean rm -f autoconf.hh autoconf.mk config.status config.log +.PHONY: vcs-clean +vcs-clean: + $(MAKE) -C tests/ vcs-clean + $(MAKE) -C po clean + $(MAKE) -C doc clean + $(MAKE) -C doc/po clean + rm -rf autoconf.hh autoconf.hh.in config.log config.status configure + rm -rf autom4te.cache + rm -rf aclocal.m4 m4 + rm -f tools/config.* tools/install-sh + $(MAKE) distclean + .PHONY: test test: $(exe) $(MAKE) -C tests/ diff -Nru pdf2djvu-0.9.3/pdf2djvu.cc pdf2djvu-0.9.4/pdf2djvu.cc --- pdf2djvu-0.9.3/pdf2djvu.cc 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/pdf2djvu.cc 2016-02-24 17:34:51.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright © 2007-2015 Jakub Wilk <jwilk@jwilk.net> +/* Copyright © 2007-2016 Jakub Wilk <jwilk@jwilk.net> * Copyright © 2009 Mateusz Turcza * * This file is part of pdf2djvu. @@ -15,6 +15,7 @@ #include <algorithm> #include <cassert> +#include <cerrno> #include <cstddef> #include <cstdlib> #include <iomanip> @@ -69,7 +70,7 @@ { } }; -static int get_page_for_LinkGoTo(pdf::link::GoTo *goto_link, pdf::Catalog *catalog) +static int get_page_for_goto_link(pdf::link::GoTo *goto_link, pdf::Catalog *catalog) { std::auto_ptr<pdf::link::Destination> dest; dest.reset(goto_link->getDest()); @@ -455,7 +456,7 @@ int page; try { - page = get_page_for_LinkGoTo(dynamic_cast<pdf::link::GoTo*>(link_action), this->catalog); + page = get_page_for_goto_link(dynamic_cast<pdf::link::GoTo*>(link_action), this->catalog); } catch (NoLinkDestination &ex) { @@ -473,6 +474,23 @@ case actionNamed: debug(1) << _("Warning: Unable to convert link with a named action") << std::endl; return; + case actionLaunch: + debug(1) << _("Warning: Unable to convert link with a launch action") << std::endl; + return; + case actionMovie: + case actionSound: + case actionRendition: + debug(1) << _("Warning: Unable to convert link with a multimedia action") << std::endl; + return; + case actionJavaScript: + debug(1) << _("Warning: Unable to convert link with a JavaScript action") << std::endl; + return; +#if POPPLER_VERSION >= 1302 + case actionOCGState: + // L10N: OCG stands for “Optional Content Group” (see PDF Reference v1.7, §4.10.1) + debug(1) << _("Warning: Unable to convert link with a set-OCG-state action") << std::endl; + return; +#endif default: debug(1) << _("Warning: Unknown link action") << std::endl; return; @@ -675,7 +693,7 @@ throw NoPageForBookmark(); try { - page = get_page_for_LinkGoTo( + page = get_page_for_goto_link( dynamic_cast<pdf::link::GoTo*>(link_action.get()), catalog ); @@ -840,7 +858,7 @@ }; void remember(const Component &component); public: - virtual void add(const Component &compontent) = 0; + virtual void add(const Component &component) = 0; virtual void commit() = 0; DjVm &operator <<(const Component &component) { @@ -940,7 +958,7 @@ { /* Using ``djvused`` to add shared annotations to a indirect multi-page * document could be unacceptably slow: - * http://sourceforge.net/p/djvu/bugs/100/ + * https://sourceforge.net/p/djvu/bugs/100/ * * We need to work around this bug. */ @@ -1180,7 +1198,7 @@ * This functions satisfies all these equations by decreasing ratio if * necessary. * - * See http://sourceforge.net/p/djvu/bugs/106/ for details. + * See https://sourceforge.net/p/djvu/bugs/106/ for details. */ while (true) { @@ -1409,6 +1427,16 @@ doc->display_page(outm.get(), m, dpi, dpi, crop, true); int width = outm->getBitmapWidth(); int height = outm->getBitmapHeight(); + if (width == 1 && height == 1 && page_width * dpi >= 2) + { + /* When the Splash backend runs out of memory, + * it produces a 1x1 bitmap without signalling an error in any way + * (other than printing “Out of memory” on stderr). + * https://bitbucket.org/jwilk/pdf2djvu/issue/107 + */ + errno = ENOMEM; + throw_posix_error(""); + } n_pixels += width * height; debug(2) << string_printf(_("image size: %dx%d"), width, height) << std::endl; if (!config.no_render && outm->has_skipped_elements()) diff -Nru pdf2djvu-0.9.3/pdf-document-map.cc pdf2djvu-0.9.4/pdf-document-map.cc --- pdf2djvu-0.9.3/pdf-document-map.cc 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/pdf-document-map.cc 2016-02-24 17:34:51.000000000 +0000 @@ -33,7 +33,7 @@ #if POPPLER_VERSION < 1903 // Prior to 0.19.3, Poppler incorrectly adds trailing // NULL character to Unicode labels: - // http://cgit.freedesktop.org/poppler/poppler/commit/?id=cef6ac0ebbf8 + // https://cgit.freedesktop.org/poppler/poppler/commit/?id=cef6ac0ebbf8 // Let's strip it. if (str.length() > 0 && str.end()[-1] == '\0') str.erase(str.end() - 1); Binary files /tmp/tmp3dHlfx/OWrjEdlmGP/pdf2djvu-0.9.3/po/de.mo and /tmp/tmp3dHlfx/SRJfO5Nu8Y/pdf2djvu-0.9.4/po/de.mo differ diff -Nru pdf2djvu-0.9.3/po/de.po pdf2djvu-0.9.4/po/de.po --- pdf2djvu-0.9.3/po/de.po 2015-11-20 18:28:43.000000000 +0000 +++ pdf2djvu-0.9.4/po/de.po 2016-02-24 17:35:03.000000000 +0000 @@ -1,13 +1,13 @@ -# Copyright © 2011-2015 Chris Leick <c.leick@vollbio.de> +# Copyright © 2011-2016 Chris Leick <c.leick@vollbio.de> # # This file is distributed under the same license as the pdf2djvu package. # msgid "" msgstr "" -"Project-Id-Version: pdf2djvu 0.9.3\n" +"Project-Id-Version: pdf2djvu 0.9.4\n" "Report-Msgid-Bugs-To: https://bitbucket.org/jwilk/pdf2djvu/issues\n" -"POT-Creation-Date: 2015-09-28 23:14+0200\n" -"PO-Revision-Date: 2015-10-20 22:15+0200\n" +"POT-Creation-Date: 2016-02-02 12:08+0100\n" +"PO-Revision-Date: 2016-02-06 15:41+0200\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "Language: de\n" @@ -567,6 +567,18 @@ msgstr "Warnung: %s" #: pdf2djvu.cc +msgid "Warning: Unable to convert link with a JavaScript action" +msgstr "Warnung: Verweis mit einer JavaScript-Aktion kann nicht umgewandelt werden" + +#: pdf2djvu.cc +msgid "Warning: Unable to convert link with a launch action" +msgstr "Warnung: Verweis mit einer Start-Aktion kann nicht umgewandelt werden" + +#: pdf2djvu.cc +msgid "Warning: Unable to convert link with a multimedia action" +msgstr "Warnung: Verweis mit einer Multimedia-Aktion kann nicht umgewandelt werden" + +#: pdf2djvu.cc msgid "Warning: Unable to convert link with a named action" msgstr "Warnung: Verweis mit einer benannten Aktion kann nicht umgewandelt werden" @@ -574,6 +586,11 @@ msgid "Warning: Unable to convert link with a remote go-to action" msgstr "Warnung: Verweis mit einem fernen Sprungbefehl kann nicht umgewandelt werden" +#. L10N: OCG stands for “Optional Content Group” (see PDF Reference v1.7, §4.10.1) +#: pdf2djvu.cc +msgid "Warning: Unable to convert link with a set-OCG-state action" +msgstr "Warnung: Verweis mit einer Aktion zum Setzen des OGC-Status kann nicht umgewandelt werden" + #: pdf2djvu.cc msgid "Warning: Unable to convert link without an action" msgstr "Warnung: Verweis ohne Aktion kann nicht umgewandelt werden" diff -Nru pdf2djvu-0.9.3/po/Makefile pdf2djvu-0.9.4/po/Makefile --- pdf2djvu-0.9.3/po/Makefile 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/po/Makefile 2016-02-24 17:34:51.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright © 2009-2013 Jakub Wilk <jwilk@jwilk.net> +# Copyright © 2009-2016 Jakub Wilk <jwilk@jwilk.net> # # This file is part of pdf2djvu. # @@ -25,6 +25,7 @@ xgettext = $(XGETTEXT) \ $(gettext-common-options) \ + --from-code=UTF-8 \ --language=C++ \ --keyword=_ --keyword=N_ \ --package-name=pdf2djvu \ diff -Nru pdf2djvu-0.9.3/po/pdf2djvu.pot pdf2djvu-0.9.4/po/pdf2djvu.pot --- pdf2djvu-0.9.3/po/pdf2djvu.pot 2015-11-20 18:28:43.000000000 +0000 +++ pdf2djvu-0.9.4/po/pdf2djvu.pot 2016-02-24 17:35:03.000000000 +0000 @@ -14,9 +14,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: pdf2djvu 0.9.3\n" +"Project-Id-Version: pdf2djvu 0.9.4\n" "Report-Msgid-Bugs-To: https://bitbucket.org/jwilk/pdf2djvu/issues\n" -"POT-Creation-Date: 2015-11-20 19:28+0100\n" +"POT-Creation-Date: 2016-02-24 18:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -577,6 +577,18 @@ msgstr "" #: pdf2djvu.cc +msgid "Warning: Unable to convert link with a JavaScript action" +msgstr "" + +#: pdf2djvu.cc +msgid "Warning: Unable to convert link with a launch action" +msgstr "" + +#: pdf2djvu.cc +msgid "Warning: Unable to convert link with a multimedia action" +msgstr "" + +#: pdf2djvu.cc msgid "Warning: Unable to convert link with a named action" msgstr "" @@ -584,6 +596,11 @@ msgid "Warning: Unable to convert link with a remote go-to action" msgstr "" +#. L10N: OCG stands for “Optional Content Group” (see PDF Reference v1.7, §4.10.1) +#: pdf2djvu.cc +msgid "Warning: Unable to convert link with a set-OCG-state action" +msgstr "" + #: pdf2djvu.cc msgid "Warning: Unable to convert link without an action" msgstr "" Binary files /tmp/tmp3dHlfx/OWrjEdlmGP/pdf2djvu-0.9.3/po/pl.mo and /tmp/tmp3dHlfx/SRJfO5Nu8Y/pdf2djvu-0.9.4/po/pl.mo differ diff -Nru pdf2djvu-0.9.3/po/pl.po pdf2djvu-0.9.4/po/pl.po --- pdf2djvu-0.9.3/po/pl.po 2015-11-20 18:28:43.000000000 +0000 +++ pdf2djvu-0.9.4/po/pl.po 2016-02-24 17:35:03.000000000 +0000 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: pdf2djvu 0.9.3\n" +"Project-Id-Version: pdf2djvu 0.9.4\n" "Report-Msgid-Bugs-To: https://bitbucket.org/jwilk/pdf2djvu/issues\n" -"POT-Creation-Date: 2015-09-28 23:14+0200\n" -"PO-Revision-Date: 2015-09-28 23:18+0200\n" +"POT-Creation-Date: 2016-02-02 12:08+0100\n" +"PO-Revision-Date: 2016-02-02 12:15+0100\n" "Last-Translator: Jakub Wilk <jwilk@jwilk.net>\n" "Language-Team: none\n" "Language: pl\n" @@ -569,6 +569,18 @@ msgstr "Ostrzeżenie: %s" #: pdf2djvu.cc +msgid "Warning: Unable to convert link with a JavaScript action" +msgstr "Ostrzeżenie: Nie można przekonwertować łącza z akcją JavaScript" + +#: pdf2djvu.cc +msgid "Warning: Unable to convert link with a launch action" +msgstr "Ostrzeżenie: Nie można przekonwertować łącza z akcją uruchamiającą" + +#: pdf2djvu.cc +msgid "Warning: Unable to convert link with a multimedia action" +msgstr "Ostrzeżenie: Nie można przekonwertować łącza z akcją multimedialną" + +#: pdf2djvu.cc msgid "Warning: Unable to convert link with a named action" msgstr "Ostrzeżenie: Nie można przekonwertować łącza z nazwaną akcją" @@ -576,6 +588,11 @@ msgid "Warning: Unable to convert link with a remote go-to action" msgstr "Ostrzeżenie: Nie można przekonwertować łącza ze zdalną akcją idź-do" +#. L10N: OCG stands for “Optional Content Group” (see PDF Reference v1.7, §4.10.1) +#: pdf2djvu.cc +msgid "Warning: Unable to convert link with a set-OCG-state action" +msgstr "Ostrzeżenie: Nie można przekonwertować łącza z akcją ustawienia stanu grupy treści opcjonalnych" + #: pdf2djvu.cc msgid "Warning: Unable to convert link without an action" msgstr "Ostrzeżenie: Nie można przekonwertować łącza bez akcji" Binary files /tmp/tmp3dHlfx/OWrjEdlmGP/pdf2djvu-0.9.3/po/pt.mo and /tmp/tmp3dHlfx/SRJfO5Nu8Y/pdf2djvu-0.9.4/po/pt.mo differ diff -Nru pdf2djvu-0.9.3/po/pt.po pdf2djvu-0.9.4/po/pt.po --- pdf2djvu-0.9.3/po/pt.po 2015-11-20 18:28:43.000000000 +0000 +++ pdf2djvu-0.9.4/po/pt.po 2016-02-24 17:35:03.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright © 2014, 2015 Américo Monteiro <a_monteiro@gmx.com> +# Copyright © 2014-2016 Américo Monteiro <a_monteiro@gmx.com> # # This file is part of pdf2djvu. # @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: pdf2djvu 0.9.3\n" +"Project-Id-Version: pdf2djvu 0.9.4\n" "Report-Msgid-Bugs-To: https://bitbucket.org/jwilk/pdf2djvu/issues\n" -"POT-Creation-Date: 2015-09-28 23:14+0200\n" -"PO-Revision-Date: 2015-10-20 22:05+0100\n" +"POT-Creation-Date: 2016-02-02 12:08+0100\n" +"PO-Revision-Date: 2016-02-06 16:35+0000\n" "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" "Language: pt\n" @@ -576,6 +576,18 @@ msgstr "Aviso: %s" #: pdf2djvu.cc +msgid "Warning: Unable to convert link with a JavaScript action" +msgstr "Aviso: Incapaz de converter ligação com uma acção de JavaScript" + +#: pdf2djvu.cc +msgid "Warning: Unable to convert link with a launch action" +msgstr "Aviso: Incapaz de converter ligação com uma acção de lançamento" + +#: pdf2djvu.cc +msgid "Warning: Unable to convert link with a multimedia action" +msgstr "Aviso: Incapaz de converter ligação com uma acção multimedia" + +#: pdf2djvu.cc msgid "Warning: Unable to convert link with a named action" msgstr "Aviso: Incapaz de converter ligação com uma acção nomeada" @@ -583,6 +595,11 @@ msgid "Warning: Unable to convert link with a remote go-to action" msgstr "Aviso: Incapaz de converter ligação com uma acção go-to remota" +#. L10N: OCG stands for “Optional Content Group” (see PDF Reference v1.7, §4.10.1) +#: pdf2djvu.cc +msgid "Warning: Unable to convert link with a set-OCG-state action" +msgstr "Aviso: Incapaz de converter ligação com uma acção \"definir-estado-OCG\"" + #: pdf2djvu.cc msgid "Warning: Unable to convert link without an action" msgstr "Aviso: Incapaz de converter ligação sem uma acção" Binary files /tmp/tmp3dHlfx/OWrjEdlmGP/pdf2djvu-0.9.3/po/ru.mo and /tmp/tmp3dHlfx/SRJfO5Nu8Y/pdf2djvu-0.9.4/po/ru.mo differ diff -Nru pdf2djvu-0.9.3/po/ru.po pdf2djvu-0.9.4/po/ru.po --- pdf2djvu-0.9.3/po/ru.po 2015-11-20 18:28:43.000000000 +0000 +++ pdf2djvu-0.9.4/po/ru.po 2016-02-24 17:35:03.000000000 +0000 @@ -1,12 +1,12 @@ -# Copyright © 2011, 2012, 2013, 2014, 2015 Kyrill Detinov +# Copyright © 2011, 2012, 2013, 2014, 2015, 2016 Kyrill Detinov # This file is distributed under the same license as the pdf2djvu package. # msgid "" msgstr "" -"Project-Id-Version: pdf2djvu 0.9.3\n" +"Project-Id-Version: pdf2djvu 0.9.4\n" "Report-Msgid-Bugs-To: https://bitbucket.org/jwilk/pdf2djvu/issues\n" -"POT-Creation-Date: 2015-09-28 23:14+0200\n" -"PO-Revision-Date: 2015-10-22 02:11+0300\n" +"POT-Creation-Date: 2016-02-02 12:08+0100\n" +"PO-Revision-Date: 2016-02-08 11:35+0300\n" "Last-Translator: Kyrill Detinov <lazy.kent@opensuse.org>\n" "Language-Team: none\n" "Language: ru\n" @@ -567,6 +567,18 @@ msgstr "Предупреждение: %s" #: pdf2djvu.cc +msgid "Warning: Unable to convert link with a JavaScript action" +msgstr "Предупреждение: невозможно преобразовать ссылку с выполнением JavaScript" + +#: pdf2djvu.cc +msgid "Warning: Unable to convert link with a launch action" +msgstr "Предупреждение: невозможно преобразовать ссылку с действием запуска" + +#: pdf2djvu.cc +msgid "Warning: Unable to convert link with a multimedia action" +msgstr "Предупреждение: невозможно преобразовать ссылку с мультимедийным действием" + +#: pdf2djvu.cc msgid "Warning: Unable to convert link with a named action" msgstr "Предупреждение: невозможно преобразовать ссылку с действием" @@ -574,6 +586,11 @@ msgid "Warning: Unable to convert link with a remote go-to action" msgstr "Предупреждение: невозможно преобразовать ссылку на внешний документ" +#. L10N: OCG stands for “Optional Content Group” (see PDF Reference v1.7, §4.10.1) +#: pdf2djvu.cc +msgid "Warning: Unable to convert link with a set-OCG-state action" +msgstr "Предупреждение: невозможно преобразовать ссылку с действием OCG" + #: pdf2djvu.cc msgid "Warning: Unable to convert link without an action" msgstr "Предупреждение: невозможно преобразовать ссылку без действия" Binary files /tmp/tmp3dHlfx/OWrjEdlmGP/pdf2djvu-0.9.3/po/uk.mo and /tmp/tmp3dHlfx/SRJfO5Nu8Y/pdf2djvu-0.9.4/po/uk.mo differ diff -Nru pdf2djvu-0.9.3/po/uk.po pdf2djvu-0.9.4/po/uk.po --- pdf2djvu-0.9.3/po/uk.po 2015-11-20 18:28:43.000000000 +0000 +++ pdf2djvu-0.9.4/po/uk.po 2016-02-24 17:35:03.000000000 +0000 @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: pdf2djvu 0.9.3\n" +"Project-Id-Version: pdf2djvu 0.9.4\n" "Report-Msgid-Bugs-To: https://bitbucket.org/jwilk/pdf2djvu/issues\n" -"POT-Creation-Date: 2015-09-28 23:14+0200\n" +"POT-Creation-Date: 2016-02-02 12:08+0100\n" "PO-Revision-Date: 2015-03-26 15:30+0300\n" "Last-Translator: Serhij Dubyk <serhijdubyk@gmail.com>\n" "Language-Team: Ukrainian Linux Team <translation@linux.org.ua>\n" @@ -574,6 +574,21 @@ msgstr "Попередження: %s" #: pdf2djvu.cc +#, fuzzy +msgid "Warning: Unable to convert link with a JavaScript action" +msgstr "Попередження: неможливо перетворити посилання з дією" + +#: pdf2djvu.cc +#, fuzzy +msgid "Warning: Unable to convert link with a launch action" +msgstr "Попередження: неможливо перетворити посилання з дією" + +#: pdf2djvu.cc +#, fuzzy +msgid "Warning: Unable to convert link with a multimedia action" +msgstr "Попередження: неможливо перетворити посилання з дією" + +#: pdf2djvu.cc msgid "Warning: Unable to convert link with a named action" msgstr "Попередження: неможливо перетворити посилання з дією" @@ -581,6 +596,12 @@ msgid "Warning: Unable to convert link with a remote go-to action" msgstr "Попередження: неможливо перетворити посилання на зовнішній документ" +#. L10N: OCG stands for “Optional Content Group” (see PDF Reference v1.7, §4.10.1) +#: pdf2djvu.cc +#, fuzzy +msgid "Warning: Unable to convert link with a set-OCG-state action" +msgstr "Попередження: неможливо перетворити посилання з дією" + #: pdf2djvu.cc msgid "Warning: Unable to convert link without an action" msgstr "Попередження: неможливо перетворити посилання без дії" diff -Nru pdf2djvu-0.9.3/private/autogen pdf2djvu-0.9.4/private/autogen --- pdf2djvu-0.9.3/private/autogen 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/private/autogen 2016-02-24 17:34:51.000000000 +0000 @@ -3,10 +3,15 @@ stat configure.ac > /dev/null PS4='$ ' set -x +for subdir in config build-aux +do + build_aux="/usr/share/libtool/$subdir" + [ -d "$build_aux" ] && break +done for file in install-sh config.sub config.guess do rm -f tools/$file - cp /usr/share/libtool/config/$file tools/ + cp "$build_aux/$file" tools/ done rm -f tools/config.rpath cp /usr/share/gettext/config.rpath tools/ diff -Nru pdf2djvu-0.9.3/private/request-translations pdf2djvu-0.9.4/private/request-translations --- pdf2djvu-0.9.3/private/request-translations 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/private/request-translations 2016-02-24 17:34:51.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright © 2015 Jakub Wilk <jwilk@jwilk.net> +# Copyright © 2015-2016 Jakub Wilk <jwilk@jwilk.net> # # This file is part of pdf2djvu. # @@ -18,6 +18,11 @@ srcdir=$(dirname "$0")/.. pofiles='' translators='' +if [ $# -eq 0 ] +then + printf 'Usage: %s <po-file>...\n' "$0" >&2 + exit 1 +fi for po in "$@" do m1=$(msgattrib --only-fuzzy "$po") diff -Nru pdf2djvu-0.9.3/sexpr.hh pdf2djvu-0.9.4/sexpr.hh --- pdf2djvu-0.9.3/sexpr.hh 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/sexpr.hh 2016-02-24 17:34:51.000000000 +0000 @@ -50,7 +50,7 @@ class GCLock /* Having a live `sexpr::GCLock` object disables garbage-collecting of S-expressions. * The purpose is to work around a nasty bug in old DjVuLibre releases: - * http://sourceforge.net/p/djvu/bugs/96/ + * https://sourceforge.net/p/djvu/bugs/96/ */ { public: diff -Nru pdf2djvu-0.9.3/tests/test-1px-font.pdf pdf2djvu-0.9.4/tests/test-1px-font.pdf --- pdf2djvu-0.9.3/tests/test-1px-font.pdf 2015-11-20 18:29:01.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-1px-font.pdf 2016-02-24 17:35:24.000000000 +0000 @@ -78,8 +78,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192901+01'00') -/ModDate (D:20151120192901+01'00') +/CreationDate (D:20160224183524+01'00') +/ModDate (D:20160224183524+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -101,7 +101,7 @@ << /Size 11 /Root 9 0 R /Info 10 0 R -/ID [<CDEDF434EB10EE9C05029582B968C75C> <CDEDF434EB10EE9C05029582B968C75C>] >> +/ID [<F5BF90D9FB132A1FB9C963F075D33B2B> <F5BF90D9FB132A1FB9C963F075D33B2B>] >> startxref 1538 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-antialias-off.pdf pdf2djvu-0.9.4/tests/test-antialias-off.pdf --- pdf2djvu-0.9.3/tests/test-antialias-off.pdf 2015-11-20 18:29:01.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-antialias-off.pdf 2016-02-24 17:35:25.000000000 +0000 @@ -78,8 +78,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192901+01'00') -/ModDate (D:20151120192901+01'00') +/CreationDate (D:20160224183525+01'00') +/ModDate (D:20160224183525+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -101,7 +101,7 @@ << /Size 11 /Root 9 0 R /Info 10 0 R -/ID [<02D50F503AFFCCD7ED8C60B66550C8C4> <02D50F503AFFCCD7ED8C60B66550C8C4>] >> +/ID [<1F3B43EE4A03B572E7DCB5A606FCA739> <1F3B43EE4A03B572E7DCB5A606FCA739>] >> startxref 1297 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-antialias-on.pdf pdf2djvu-0.9.4/tests/test-antialias-on.pdf --- pdf2djvu-0.9.3/tests/test-antialias-on.pdf 2015-11-20 18:29:01.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-antialias-on.pdf 2016-02-24 17:35:24.000000000 +0000 @@ -78,8 +78,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192901+01'00') -/ModDate (D:20151120192901+01'00') +/CreationDate (D:20160224183524+01'00') +/ModDate (D:20160224183524+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -101,7 +101,7 @@ << /Size 11 /Root 9 0 R /Info 10 0 R -/ID [<5FC574122672315F6A6EF76B99F8ECAA> <5FC574122672315F6A6EF76B99F8ECAA>] >> +/ID [<A1FF529326C098A05B3BB5717B2B3C55> <A1FF529326C098A05B3BB5717B2B3C55>] >> startxref 1297 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-broken-hyperlinks.pdf pdf2djvu-0.9.4/tests/test-broken-hyperlinks.pdf --- pdf2djvu-0.9.3/tests/test-broken-hyperlinks.pdf 1970-01-01 00:00:00.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-broken-hyperlinks.pdf 2016-02-24 17:35:24.000000000 +0000 @@ -0,0 +1,524 @@ +%PDF-1.5 +% +4 0 obj +<< +/Length 63 +>> +stream +BT +/F51 11.9552 Tf 2.989 2.989 Td [(missing)-250(action)]TJ +ET + +endstream +endobj +3 0 obj +<< +/Type /Page +/Contents 4 0 R +/Resources 2 0 R +/MediaBox [0 0 100.623 12.951] +/Parent 6 0 R +/Annots [ 1 0 R ] +>> +endobj +1 0 obj +<< +/Type /Annot +/Rect [0 0.401 75.388 11.094] +/Subtype/Link +>> +endobj +2 0 obj +<< +/Font << /F51 5 0 R >> +/ProcSet [ /PDF /Text ] +>> +endobj +10 0 obj +<< +/Length 70 +>> +stream +BT +/F51 11.9552 Tf 2.989 2.989 Td [(non-e)15(xistent)-250(dest)]TJ +ET + +endstream +endobj +9 0 obj +<< +/Type /Page +/Contents 10 0 R +/Resources 8 0 R +/MediaBox [0 0 100.623 12.951] +/Parent 6 0 R +/Annots [ 7 0 R ] +>> +endobj +7 0 obj +<< +/Type /Annot +/Rect [0 2.905 87.152 11.094] +/Subtype/Link /A<</S/GoTo/D(D1)>> +>> +endobj +8 0 obj +<< +/Font << /F51 5 0 R >> +/ProcSet [ /PDF /Text ] +>> +endobj +14 0 obj +<< +/Length 73 +>> +stream +BT +/F51 11.9552 Tf 2.989 2.989 Td [(remote)-250(go-to)-250(action)]TJ +ET + +endstream +endobj +13 0 obj +<< +/Type /Page +/Contents 14 0 R +/Resources 12 0 R +/MediaBox [0 0 100.623 12.951] +/Parent 6 0 R +/Annots [ 11 0 R ] +>> +endobj +11 0 obj +<< +/Type /Annot +/Rect [0 0.401 99.609 11.094] +/Subtype/Link /A<</S/GoToR/F(example.pdf)/D(D1)>> +>> +endobj +12 0 obj +<< +/Font << /F51 5 0 R >> +/ProcSet [ /PDF /Text ] +>> +endobj +18 0 obj +<< +/Length 61 +>> +stream +BT +/F51 11.9552 Tf 2.989 2.989 Td [(named)-250(action)]TJ +ET + +endstream +endobj +17 0 obj +<< +/Type /Page +/Contents 18 0 R +/Resources 16 0 R +/MediaBox [0 0 100.623 12.951] +/Parent 6 0 R +/Annots [ 15 0 R ] +>> +endobj +15 0 obj +<< +/Type /Annot +/Rect [0 2.905 70.057 11.094] +/Subtype/Link /A<</S/Named/N/Find>> +>> +endobj +16 0 obj +<< +/Font << /F51 5 0 R >> +/ProcSet [ /PDF /Text ] +>> +endobj +22 0 obj +<< +/Length 62 +>> +stream +BT +/F51 11.9552 Tf 2.989 2.989 Td [(launch)-250(action)]TJ +ET + +endstream +endobj +21 0 obj +<< +/Type /Page +/Contents 22 0 R +/Resources 20 0 R +/MediaBox [0 0 100.623 12.951] +/Parent 6 0 R +/Annots [ 19 0 R ] +>> +endobj +19 0 obj +<< +/Type /Annot +/Rect [0 2.905 70.057 11.094] +/Subtype/Link /A<</S/Launch/F(example.pdf)>> +>> +endobj +20 0 obj +<< +/Font << /F51 5 0 R >> +/ProcSet [ /PDF /Text ] +>> +endobj +26 0 obj +<< +/Length 65 +>> +stream +BT +/F51 11.9552 Tf 2.989 2.989 Td [(mo)15(vie)-250(action)]TJ +ET + +endstream +endobj +25 0 obj +<< +/Type /Page +/Contents 26 0 R +/Resources 24 0 R +/MediaBox [0 0 100.623 12.951] +/Parent 6 0 R +/Annots [ 23 0 R ] +>> +endobj +23 0 obj +<< +/Type /Annot +/Rect [0 2.905 67.893 11.094] +/Subtype/Link /A<</S/Movie/T()>> +>> +endobj +24 0 obj +<< +/Font << /F51 5 0 R >> +/ProcSet [ /PDF /Text ] +>> +endobj +27 0 obj +<< +/Type/Sound /R 22050 +/Length 0 +>> +stream + +endstream +endobj +31 0 obj +<< +/Length 61 +>> +stream +BT +/F51 11.9552 Tf 2.989 2.989 Td [(sound)-250(action)]TJ +ET + +endstream +endobj +30 0 obj +<< +/Type /Page +/Contents 31 0 R +/Resources 29 0 R +/MediaBox [0 0 100.623 12.951] +/Parent 32 0 R +/Annots [ 28 0 R ] +>> +endobj +28 0 obj +<< +/Type /Annot +/Rect [0 2.905 66.745 11.094] +/Subtype/Link /A<</S/Sound/Sound 27 0 R>> +>> +endobj +29 0 obj +<< +/Font << /F51 5 0 R >> +/ProcSet [ /PDF /Text ] +>> +endobj +36 0 obj +<< +/Length 64 +>> +stream +BT +/F51 11.9552 Tf 2.989 2.989 Td [(renditon)-250(action)]TJ +ET + +endstream +endobj +35 0 obj +<< +/Type /Page +/Contents 36 0 R +/Resources 34 0 R +/MediaBox [0 0 100.623 12.951] +/Parent 32 0 R +/Annots [ 33 0 R ] +>> +endobj +33 0 obj +<< +/Type /Annot +/Rect [0 2.905 78.031 11.094] +/Subtype/Link /A<</S/Rendition/JS()>> +>> +endobj +34 0 obj +<< +/Font << /F51 5 0 R >> +/ProcSet [ /PDF /Text ] +>> +endobj +40 0 obj +<< +/Length 74 +>> +stream +BT +/F51 11.9552 Tf 2.989 2.989 Td [(Ja)20(v)25(aScript)-250(action)]TJ +ET + +endstream +endobj +39 0 obj +<< +/Type /Page +/Contents 40 0 R +/Resources 38 0 R +/MediaBox [0 0 100.623 12.951] +/Parent 32 0 R +/Annots [ 37 0 R ] +>> +endobj +37 0 obj +<< +/Type /Annot +/Rect [0 0.401 87.451 11.094] +/Subtype/Link /A<</S/JavaScript/JS()>> +>> +endobj +38 0 obj +<< +/Font << /F51 5 0 R >> +/ProcSet [ /PDF /Text ] +>> +endobj +44 0 obj +<< +/Length 57 +>> +stream +BT +/F51 11.9552 Tf 2.989 2.989 Td [(set-OCG-state)]TJ +ET + +endstream +endobj +43 0 obj +<< +/Type /Page +/Contents 44 0 R +/Resources 42 0 R +/MediaBox [0 0 100.623 12.951] +/Parent 32 0 R +/Annots [ 41 0 R ] +>> +endobj +41 0 obj +<< +/Type /Annot +/Rect [0 2.905 74.372 11.094] +/Subtype/Link /A<</S/SetOCGState/State[]>> +>> +endobj +42 0 obj +<< +/Font << /F51 5 0 R >> +/ProcSet [ /PDF /Text ] +>> +endobj +48 0 obj +<< +/Length 67 +>> +stream +BT +/F51 11.9552 Tf 2.989 2.989 Td [(unkno)25(wn)-250(action)]TJ +ET + +endstream +endobj +47 0 obj +<< +/Type /Page +/Contents 48 0 R +/Resources 46 0 R +/MediaBox [0 0 100.623 12.951] +/Parent 32 0 R +/Annots [ 45 0 R ] +>> +endobj +45 0 obj +<< +/Type /Annot +/Rect [0 2.905 82.383 11.094] +/Subtype/Link /A<</S/FIXME>> +>> +endobj +46 0 obj +<< +/Font << /F51 5 0 R >> +/ProcSet [ /PDF /Text ] +>> +endobj +50 0 obj +[333 250 278 500 500 500 500 500 500 500 500 500 500 278 278 564 564 564 444 921 722 667 667 722 611 556 722 722 333 389 722 611 889 722 722 556 722 667 556 611 722 722 944 722 722 611 333 278 333 469 500 333 444 500 444 500 444 333 500 500 278 278 500 278 778 500 500 500 500 333 389 278 500 500 722 500] +endobj +51 0 obj +<< +/Type /FontDescriptor +/FontName /Times-Roman +/Flags 34 +/FontBBox [0 -216 1000 678] +/Ascent 678 +/CapHeight 651 +/Descent -216 +/ItalicAngle 0 +/StemV 83 +/XHeight 450 +>> +endobj +49 0 obj +<< +/Type /Encoding +/Differences [45/hyphen 67/C 71/G 74/J 79/O 83/S 97/a 99/c/d/e 103/g/h/i 107/k/l/m/n/o/p 114/r/s/t/u/v/w/x] +>> +endobj +5 0 obj +<< +/Type /Font +/Subtype /Type1 +/BaseFont /Times-Roman +/FontDescriptor 51 0 R +/FirstChar 45 +/LastChar 120 +/Widths 50 0 R +/Encoding 49 0 R +>> +endobj +6 0 obj +<< +/Type /Pages +/Count 6 +/Parent 52 0 R +/Kids [3 0 R 9 0 R 13 0 R 17 0 R 21 0 R 25 0 R] +>> +endobj +32 0 obj +<< +/Type /Pages +/Count 5 +/Parent 52 0 R +/Kids [30 0 R 35 0 R 39 0 R 43 0 R 47 0 R] +>> +endobj +52 0 obj +<< +/Type /Pages +/Count 11 +/Kids [6 0 R 32 0 R] +>> +endobj +53 0 obj +<< +/Type /Catalog +/Pages 52 0 R +>> +endobj +54 0 obj +<< +/Producer (pdfTeX-1.40.16) +/Creator (TeX) +/CreationDate (D:20160224183524+01'00') +/ModDate (D:20160224183524+01'00') +/Trapped /False +/PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) +>> +endobj +xref +0 55 +0000000000 65535 f +0000000265 00000 n +0000000343 00000 n +0000000136 00000 n +0000000015 00000 n +0000005446 00000 n +0000005601 00000 n +0000000670 00000 n +0000000768 00000 n +0000000540 00000 n +0000000411 00000 n +0000001101 00000 n +0000001216 00000 n +0000000968 00000 n +0000000836 00000 n +0000001538 00000 n +0000001639 00000 n +0000001405 00000 n +0000001285 00000 n +0000001962 00000 n +0000002072 00000 n +0000001829 00000 n +0000001708 00000 n +0000002398 00000 n +0000002496 00000 n +0000002265 00000 n +0000002141 00000 n +0000002565 00000 n +0000002899 00000 n +0000003006 00000 n +0000002765 00000 n +0000002645 00000 n +0000005707 00000 n +0000003332 00000 n +0000003435 00000 n +0000003198 00000 n +0000003075 00000 n +0000003771 00000 n +0000003875 00000 n +0000003637 00000 n +0000003504 00000 n +0000004194 00000 n +0000004302 00000 n +0000004060 00000 n +0000003944 00000 n +0000004631 00000 n +0000004725 00000 n +0000004497 00000 n +0000004371 00000 n +0000005300 00000 n +0000004794 00000 n +0000005116 00000 n +0000005809 00000 n +0000005875 00000 n +0000005926 00000 n +trailer +<< /Size 55 +/Root 53 0 R +/Info 54 0 R +/ID [<F16CC4597F670A0F73D683DD57734AF1> <F16CC4597F670A0F73D683DD57734AF1>] >> +startxref +6193 +%%EOF diff -Nru pdf2djvu-0.9.3/tests/test-broken-hyperlinks.py pdf2djvu-0.9.4/tests/test-broken-hyperlinks.py --- pdf2djvu-0.9.3/tests/test-broken-hyperlinks.py 1970-01-01 00:00:00.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-broken-hyperlinks.py 2016-02-24 17:34:51.000000000 +0000 @@ -0,0 +1,71 @@ +# encoding=UTF-8 + +# Copyright © 2016 Jakub Wilk <jwilk@jwilk.net> +# +# This file is part of pdf2djvu. +# +# pdf2djvu is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# pdf2djvu 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. + +from tools import ( + case, + re, +) + +class test(case): + + def t(self, page, message, empty_stdout=True): + r = self.pdf2djvu('-p', str(page), quiet=False) + kwargs = dict( + stderr=re('- Warning: {warn}\n'.format(warn=re.escape(message))) + ) + if not empty_stdout: + kwargs.update( + stdout=re('') + ) + r.assert_(**kwargs) + + def test_no_action(self): + self.require_poppler(0, 17) + self.t(1, 'Unable to convert link without an action') + + def test_lookup_error(self): + self.t(2, 'Cannot find link destination', + empty_stdout=False # https://bugs.freedesktop.org/show_bug.cgi?id=81513 + ) + + def test_remote_goto_action(self): + self.t(3, 'Unable to convert link with a remote go-to action') + + def test_named_action(self): + self.t(4, 'Unable to convert link with a named action') + + def test_launch_action(self): + self.t(5, 'Unable to convert link with a launch action') + + def test_movie_action(self): + self.t(6, 'Unable to convert link with a multimedia action') + + def test_sound_action(self): + self.t(7, 'Unable to convert link with a multimedia action') + + def test_rendition_action(self): + self.t(8, 'Unable to convert link with a multimedia action') + + def test_js_action(self): + self.t(9, 'Unable to convert link with a JavaScript action') + + def test_set_ocg_state_action(self): + self.require_poppler(0, 13, 2) + self.t(10, 'Unable to convert link with a set-OCG-state action') + + def test_unknown_action(self): + self.t(11, 'Unknown link action') + +# vim:ts=4 sts=4 sw=4 et diff -Nru pdf2djvu-0.9.3/tests/test-broken-hyperlinks.tex pdf2djvu-0.9.4/tests/test-broken-hyperlinks.tex --- pdf2djvu-0.9.3/tests/test-broken-hyperlinks.tex 1970-01-01 00:00:00.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-broken-hyperlinks.tex 2016-02-24 17:34:51.000000000 +0000 @@ -0,0 +1,109 @@ +% Copyright © 2016 Jakub Wilk <jwilk@jwilk.net> +% +% This file is part of pdf2djvu. +% +% pdf2djvu is free software; you can redistribute it and/or modify +% it under the terms of the GNU General Public License version 2 as +% published by the Free Software Foundation. +% +% pdf2djvu 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. + +\input common + +\pdfpagewidth 101pt +\pdfpageheight 13pt + +\leavevmode +\pdfstartlink +user {/Subtype/Link} +missing action +\pdfendlink + +\eject + +\leavevmode +\pdfstartlink +user {/Subtype/Link /A<</S/GoTo/D(D1)>>} +non-existent dest +\pdfendlink + +\eject + +\leavevmode +\pdfstartlink +user {/Subtype/Link /A<</S/GoToR/F(example.pdf)/D(D1)>>} +remote go-to action +\pdfendlink + +\eject + +\leavevmode +\pdfstartlink +user {/Subtype/Link /A<</S/Named/N/Find>>} +named action +\pdfendlink + +\eject + +\leavevmode +\pdfstartlink +user {/Subtype/Link /A<</S/Launch/F(example.pdf)>>} +launch action +\pdfendlink + +\eject + +\leavevmode +\pdfstartlink +user {/Subtype/Link /A<</S/Movie/T()>>} +movie action +\pdfendlink + +\eject + +\immediate\pdfobj +stream +attr {/Type/Sound /R 22050} +{} +\leavevmode +\pdfstartlink +user {/Subtype/Link /A<</S/Sound/Sound \the\pdflastobj\space 0 R>>} +sound action +\pdfendlink + +\eject + +\leavevmode +\pdfstartlink +user {/Subtype/Link /A<</S/Rendition/JS()>>} +renditon action +\pdfendlink + +\eject + +\leavevmode +\pdfstartlink +user {/Subtype/Link /A<</S/JavaScript/JS()>>} +JavaScript action +\pdfendlink + +\eject + +\leavevmode +\pdfstartlink +user {/Subtype/Link /A<</S/SetOCGState/State[]>>} +set-OCG-state +\pdfendlink + +\eject + +\leavevmode +\pdfstartlink +user {/Subtype/Link /A<</S/FIXME>>} +unknown action +\pdfendlink + +\end diff -Nru pdf2djvu-0.9.3/tests/test-broken-outline.pdf pdf2djvu-0.9.4/tests/test-broken-outline.pdf --- pdf2djvu-0.9.3/tests/test-broken-outline.pdf 2015-11-20 18:29:01.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-broken-outline.pdf 2016-02-24 17:35:24.000000000 +0000 @@ -83,8 +83,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192901+01'00') -/ModDate (D:20151120192901+01'00') +/CreationDate (D:20160224183524+01'00') +/ModDate (D:20160224183524+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -109,7 +109,7 @@ << /Size 14 /Root 12 0 R /Info 13 0 R -/ID [<2F868C516FECFA774D20EC2F1566BE29> <2F868C516FECFA774D20EC2F1566BE29>] >> +/ID [<574EBD92288A684E25B4F1892995A703> <574EBD92288A684E25B4F1892995A703>] >> startxref 1021 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-crop-text.pdf pdf2djvu-0.9.4/tests/test-crop-text.pdf --- pdf2djvu-0.9.3/tests/test-crop-text.pdf 2015-11-20 18:29:01.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-crop-text.pdf 2016-02-24 17:35:24.000000000 +0000 @@ -78,8 +78,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192901+01'00') -/ModDate (D:20151120192901+01'00') +/CreationDate (D:20160224183524+01'00') +/ModDate (D:20160224183524+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -101,7 +101,7 @@ << /Size 11 /Root 9 0 R /Info 10 0 R -/ID [<4B2D2D011E2942464DBFDBCC683A43F7> <4B2D2D011E2942464DBFDBCC683A43F7>] >> +/ID [<A8C039AF94B42B7E83722F7703608D02> <A8C039AF94B42B7E83722F7703608D02>] >> startxref 1297 %%EOF Binary files /tmp/tmp3dHlfx/OWrjEdlmGP/pdf2djvu-0.9.3/tests/test-dpi-detection.pdf and /tmp/tmp3dHlfx/SRJfO5Nu8Y/pdf2djvu-0.9.4/tests/test-dpi-detection.pdf differ diff -Nru pdf2djvu-0.9.3/tests/test-duplicate-pages.pdf pdf2djvu-0.9.4/tests/test-duplicate-pages.pdf --- pdf2djvu-0.9.3/tests/test-duplicate-pages.pdf 2015-11-20 18:29:01.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-duplicate-pages.pdf 2016-02-24 17:35:23.000000000 +0000 @@ -39,8 +39,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192901+01'00') -/ModDate (D:20151120192901+01'00') +/CreationDate (D:20160224183523+01'00') +/ModDate (D:20160224183523+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -58,7 +58,7 @@ << /Size 7 /Root 5 0 R /Info 6 0 R -/ID [<90AE4DA640F5A538641C00168F1D772F> <90AE4DA640F5A538641C00168F1D772F>] >> +/ID [<309F0ECADBD3D38B3118B494C442CC06> <309F0ECADBD3D38B3118B494C442CC06>] >> startxref 592 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-empty-outline.pdf pdf2djvu-0.9.4/tests/test-empty-outline.pdf --- pdf2djvu-0.9.3/tests/test-empty-outline.pdf 2015-11-20 18:29:02.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-empty-outline.pdf 2016-02-24 17:35:25.000000000 +0000 @@ -82,8 +82,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192902+01'00') -/ModDate (D:20151120192902+01'00') +/CreationDate (D:20160224183525+01'00') +/ModDate (D:20160224183525+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -106,7 +106,7 @@ << /Size 12 /Root 10 0 R /Info 11 0 R -/ID [<70701595669B81BFE6B57BC7D06324C2> <70701595669B81BFE6B57BC7D06324C2>] >> +/ID [<BD9CDCBF6608A079E4FFA6C3B3DD9255> <BD9CDCBF6608A079E4FFA6C3B3DD9255>] >> startxref 1143 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-fg-colors-gm.pdf pdf2djvu-0.9.4/tests/test-fg-colors-gm.pdf --- pdf2djvu-0.9.3/tests/test-fg-colors-gm.pdf 2015-11-20 18:29:00.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-fg-colors-gm.pdf 2016-02-24 17:35:24.000000000 +0000 @@ -2991,8 +2991,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192900+01'00') -/ModDate (D:20151120192900+01'00') +/CreationDate (D:20160224183524+01'00') +/ModDate (D:20160224183524+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -3014,7 +3014,7 @@ << /Size 11 /Root 9 0 R /Info 10 0 R -/ID [<4CE4A9452A92712B448FA7258507B630> <4CE4A9452A92712B448FA7258507B630>] >> +/ID [<843142EA3515D6F9E0E21CAF2408BE3B> <843142EA3515D6F9E0E21CAF2408BE3B>] >> startxref 38410 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-fg-colors.pdf pdf2djvu-0.9.4/tests/test-fg-colors.pdf --- pdf2djvu-0.9.3/tests/test-fg-colors.pdf 2015-11-20 18:29:02.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-fg-colors.pdf 2016-02-24 17:35:25.000000000 +0000 @@ -2991,8 +2991,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192902+01'00') -/ModDate (D:20151120192902+01'00') +/CreationDate (D:20160224183525+01'00') +/ModDate (D:20160224183525+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -3014,7 +3014,7 @@ << /Size 11 /Root 9 0 R /Info 10 0 R -/ID [<7D818D2FD83401434027FD5FD9B69B36> <7D818D2FD83401434027FD5FD9B69B36>] >> +/ID [<D3AAB519968B086A273466B333129F16> <D3AAB519968B086A273466B333129F16>] >> startxref 38410 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-filter-text.pdf pdf2djvu-0.9.4/tests/test-filter-text.pdf --- pdf2djvu-0.9.3/tests/test-filter-text.pdf 2015-11-20 18:29:02.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-filter-text.pdf 2016-02-24 17:35:25.000000000 +0000 @@ -78,8 +78,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192902+01'00') -/ModDate (D:20151120192902+01'00') +/CreationDate (D:20160224183525+01'00') +/ModDate (D:20160224183525+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -101,7 +101,7 @@ << /Size 11 /Root 9 0 R /Info 10 0 R -/ID [<B862854CDED7EFC12E471D03952D816E> <B862854CDED7EFC12E471D03952D816E>] >> +/ID [<F84CD39EF717538DF59CF0556307A90F> <F84CD39EF717538DF59CF0556307A90F>] >> startxref 1297 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-hyperlinks.pdf pdf2djvu-0.9.4/tests/test-hyperlinks.pdf --- pdf2djvu-0.9.3/tests/test-hyperlinks.pdf 2015-11-20 18:29:02.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-hyperlinks.pdf 2016-02-24 17:35:25.000000000 +0000 @@ -16,7 +16,7 @@ /Type /Page /Contents 4 0 R /Resources 2 0 R -/MediaBox [0 0 99.626 12.951] +/MediaBox [0 0 31.88 12.951] /Parent 7 0 R /Annots [ 1 0 R ] >> @@ -56,7 +56,7 @@ /Type /Page /Contents 12 0 R /Resources 10 0 R -/MediaBox [0 0 99.626 12.951] +/MediaBox [0 0 31.88 12.951] /Parent 7 0 R /Annots [ 9 0 R ] >> @@ -81,10 +81,44 @@ /ProcSet [ /PDF /Text ] >> endobj +16 0 obj +<< +/Length 49 +>> +stream +BT +/F51 11.9552 Tf 2.989 2.989 Td [(dolor)]TJ +ET + +endstream +endobj +15 0 obj +<< +/Type /Page +/Contents 16 0 R +/Resources 14 0 R +/MediaBox [0 0 31.88 12.951] +/Parent 7 0 R +/Annots [ 13 0 R ] +>> +endobj +13 0 obj +<< +/Type /Annot +/Rect [0 2.905 31.215 11.094] +/Subtype/Link/A<</S/URI/URI(http://www.example.org/)>> +>> +endobj 14 0 obj +<< +/Font << /F51 6 0 R >> +/ProcSet [ /PDF /Text ] +>> +endobj +18 0 obj [611 889 722 722 556 722 667 556 611 722 722 944 722 722 611 333 278 333 469 500 333 444 500 444 500 444 333 500 500 278 278 500 278 778 500 500 500 500 333 389 278 500] endobj -15 0 obj +19 0 obj << /Type /FontDescriptor /FontName /Times-Roman @@ -98,10 +132,10 @@ /XHeight 450 >> endobj -13 0 obj +17 0 obj << /Type /Encoding -/Differences [76/L 101/e 105/i 109/m 111/o/p 114/r/s 117/u] +/Differences [76/L 100/d/e 105/i 108/l/m 111/o/p 114/r/s 117/u] >> endobj 6 0 obj @@ -109,75 +143,79 @@ /Type /Font /Subtype /Type1 /BaseFont /Times-Roman -/FontDescriptor 15 0 R +/FontDescriptor 19 0 R /FirstChar 76 /LastChar 117 -/Widths 14 0 R -/Encoding 13 0 R +/Widths 18 0 R +/Encoding 17 0 R >> endobj 7 0 obj << /Type /Pages -/Count 2 -/Kids [3 0 R 11 0 R] +/Count 3 +/Kids [3 0 R 11 0 R 15 0 R] >> endobj -16 0 obj +20 0 obj << /Names [(P1) 5 0 R (P2) 8 0 R] /Limits [(P1) (P2)] >> endobj -17 0 obj +21 0 obj << -/Dests 16 0 R +/Dests 20 0 R >> endobj -18 0 obj +22 0 obj << /Type /Catalog /Pages 7 0 R -/Names 17 0 R +/Names 21 0 R >> endobj -19 0 obj +23 0 obj << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192902+01'00') -/ModDate (D:20151120192902+01'00') +/CreationDate (D:20160224183525+01'00') +/ModDate (D:20160224183525+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> endobj xref -0 20 +0 24 0000000000 65535 f -0000000246 00000 n -0000000388 00000 n +0000000245 00000 n +0000000387 00000 n 0000000118 00000 n 0000000015 00000 n -0000000351 00000 n -0000001401 00000 n -0000001556 00000 n -0000000826 00000 n -0000000691 00000 n -0000000864 00000 n -0000000560 00000 n -0000000456 00000 n -0000001303 00000 n -0000000933 00000 n -0000001119 00000 n -0000001620 00000 n -0000001693 00000 n +0000000350 00000 n +0000001831 00000 n +0000001986 00000 n +0000000824 00000 n +0000000689 00000 n +0000000862 00000 n +0000000559 00000 n +0000000455 00000 n +0000001170 00000 n +0000001290 00000 n +0000001039 00000 n +0000000931 00000 n 0000001729 00000 n -0000001793 00000 n +0000001359 00000 n +0000001545 00000 n +0000002057 00000 n +0000002130 00000 n +0000002166 00000 n +0000002230 00000 n trailer -<< /Size 20 -/Root 18 0 R -/Info 19 0 R -/ID [<780A501E9EC78F0B68B8187EB90DBA5B> <780A501E9EC78F0B68B8187EB90DBA5B>] >> +<< /Size 24 +/Root 22 0 R +/Info 23 0 R +/ID [<23ACCAAFAA4CF8A1FA27CA40210682E6> <23ACCAAFAA4CF8A1FA27CA40210682E6>] >> startxref -2060 +2497 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-hyperlinks.py pdf2djvu-0.9.4/tests/test-hyperlinks.py --- pdf2djvu-0.9.3/tests/test-hyperlinks.py 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-hyperlinks.py 2016-02-24 17:34:51.000000000 +0000 @@ -1,6 +1,6 @@ # encoding=UTF-8 -# Copyright © 2009-2015 Jakub Wilk <jwilk@jwilk.net> +# Copyright © 2009-2016 Jakub Wilk <jwilk@jwilk.net> # # This file is part of pdf2djvu. # @@ -20,50 +20,44 @@ class test(case): + def t(self, page, url, border='(xor)'): + result = self.print_ant(page=page) + template = '(maparea "{url}" "" (rect NNN NNN NNN NNN) {border})'.format( + url=url, + border=border, + ) + regex = re.escape(template).replace('NNN', '[0-9]+') + result.assert_(stdout=re(regex)) + def test(self): # Bug: https://bitbucket.org/jwilk/pdf2djvu/issue/3 # + fixed in 0.4.10 [a244b65e0661] # + fixed in 0.4.12 [2e5ab20f8a07] self.pdf2djvu().assert_() - r = self.print_ant(page=1) - r.assert_(stdout=re( - r'^[(]maparea "#p0002[.]djvu" "" [(]rect [0-9]+ [0-9]+ [0-9]+ [0-9]+[)] [(]xor[)][)]$', - )) - r = self.print_ant(page=2) - r.assert_(stdout=re( - r'^[(]maparea "#p0001[.]djvu" "" [(]rect [0-9]+ [0-9]+ [0-9]+ [0-9]+[)] [(]border #ff7f00[)][)]$', - )) + self.t(1, '#p0002.djvu') + self.t(2, '#p0001.djvu', '(border #ff7f00)') + self.t(3, 'http://www.example.org/') def test_border_avis(self): def t(*args): self.pdf2djvu(*args).assert_() - r = self.print_ant(page=1) - r.assert_(stdout=re( - r'^[(]maparea "#p0002[.]djvu" "" [(]rect [0-9]+ [0-9]+ [0-9]+ [0-9]+[)] [(]xor[)] [(]border_avis[)][)]$', - )) - r = self.print_ant(page=2) - r.assert_(stdout=re( - r'^[(]maparea "#p0001[.]djvu" "" [(]rect [0-9]+ [0-9]+ [0-9]+ [0-9]+[)] [(]border #ff7f00[)] [(]border_avis[)][)]$', - )) + self.t(1, '#p0002.djvu', '(xor) (border_avis)') + self.t(2, '#p0001.djvu', '(border #ff7f00) (border_avis)') + self.t(3, 'http://www.example.org/', '(xor) (border_avis)') t('--hyperlinks', 'border-avis') t('--hyperlinks', 'border_avis') def test_border_color(self): self.pdf2djvu('--hyperlinks', '#3742ff').assert_() - r = self.print_ant(page=1) - r.assert_(stdout=re( - r'^[(]maparea "#p0002[.]djvu" "" [(]rect [0-9]+ [0-9]+ [0-9]+ [0-9]+[)] [(]border #3742ff[)][)]$', - )) - r = self.print_ant(page=2) - r.assert_(stdout=re( - r'^[(]maparea "#p0001[.]djvu" "" [(]rect [0-9]+ [0-9]+ [0-9]+ [0-9]+[)] [(]border #3742ff[)][)]$', - )) + self.t(1, '#p0002.djvu', '(border #3742ff)') + self.t(2, '#p0001.djvu', '(border #3742ff)') + self.t(3, 'http://www.example.org/', '(border #3742ff)') def test_none(self): def t(*args): self.pdf2djvu(*args).assert_() - for n in (1, 2): - r = self.print_ant(page=n) + for n in range(3): + r = self.print_ant(page=(n + 1)) r.assert_(stdout='') t('--hyperlinks', 'none') t('--no-hyperlinks') diff -Nru pdf2djvu-0.9.3/tests/test-hyperlinks.tex pdf2djvu-0.9.4/tests/test-hyperlinks.tex --- pdf2djvu-0.9.3/tests/test-hyperlinks.tex 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-hyperlinks.tex 2016-02-24 17:34:51.000000000 +0000 @@ -1,4 +1,4 @@ -% Copyright © 2009 Jakub Wilk <jwilk@jwilk.net> +% Copyright © 2009-2016 Jakub Wilk <jwilk@jwilk.net> % % This file is part of pdf2djvu. % @@ -13,7 +13,7 @@ \input common -\pdfpagewidth 100pt +\pdfpagewidth 32pt \pdfpageheight 13pt \pdfdest name {P1} fit @@ -35,4 +35,12 @@ {ipsum} \pdfendlink +\eject + +\leavevmode +\pdfstartlink +user{/Subtype/Link/A<</S/URI/URI(http://www.example.org/)>>} +dolor +\pdfendlink + \end Binary files /tmp/tmp3dHlfx/OWrjEdlmGP/pdf2djvu-0.9.3/tests/test-interpolation.pdf and /tmp/tmp3dHlfx/SRJfO5Nu8Y/pdf2djvu-0.9.4/tests/test-interpolation.pdf differ diff -Nru pdf2djvu-0.9.3/tests/test-labels-null.pdf pdf2djvu-0.9.4/tests/test-labels-null.pdf --- pdf2djvu-0.9.3/tests/test-labels-null.pdf 2015-11-20 18:29:01.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-labels-null.pdf 2016-02-24 17:35:23.000000000 +0000 @@ -62,8 +62,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192901+01'00') -/ModDate (D:20151120192901+01'00') +/CreationDate (D:20160224183523+01'00') +/ModDate (D:20160224183523+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -84,7 +84,7 @@ << /Size 10 /Root 8 0 R /Info 9 0 R -/ID [<23F79395F152BE8C51B76B96C2CCE01B> <23F79395F152BE8C51B76B96C2CCE01B>] >> +/ID [<DFF4B634932DB31A9524B5E2E394343D> <DFF4B634932DB31A9524B5E2E394343D>] >> startxref 876 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-labels.pdf pdf2djvu-0.9.4/tests/test-labels.pdf --- pdf2djvu-0.9.3/tests/test-labels.pdf 2015-11-20 18:29:01.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-labels.pdf 2016-02-24 17:35:24.000000000 +0000 @@ -106,8 +106,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192901+01'00') -/ModDate (D:20151120192901+01'00') +/CreationDate (D:20160224183524+01'00') +/ModDate (D:20160224183524+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -134,7 +134,7 @@ << /Size 16 /Root 14 0 R /Info 15 0 R -/ID [<A2C0DAA841953B3E3C530AD98F46F9F5> <A2C0DAA841953B3E3C530AD98F46F9F5>] >> +/ID [<46324DE97C5C0DB91464D41E003A9F1C> <46324DE97C5C0DB91464D41E003A9F1C>] >> startxref 1309 %%EOF Binary files /tmp/tmp3dHlfx/OWrjEdlmGP/pdf2djvu-0.9.3/tests/test-monochrome.pdf and /tmp/tmp3dHlfx/SRJfO5Nu8Y/pdf2djvu-0.9.4/tests/test-monochrome.pdf differ diff -Nru pdf2djvu-0.9.3/tests/test-multipage.pdf pdf2djvu-0.9.4/tests/test-multipage.pdf --- pdf2djvu-0.9.3/tests/test-multipage.pdf 2015-11-20 18:29:01.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-multipage.pdf 2016-02-24 17:35:23.000000000 +0000 @@ -104,8 +104,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192901+01'00') -/ModDate (D:20151120192901+01'00') +/CreationDate (D:20160224183523+01'00') +/ModDate (D:20160224183523+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -130,7 +130,7 @@ << /Size 14 /Root 12 0 R /Info 13 0 R -/ID [<904A026B7B7BA6018BA4D1B456ED6A2B> <904A026B7B7BA6018BA4D1B456ED6A2B>] >> +/ID [<42C4ECE7FA22780795ED419654DF781F> <42C4ECE7FA22780795ED419654DF781F>] >> startxref 1578 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-nfkc-apf.pdf pdf2djvu-0.9.4/tests/test-nfkc-apf.pdf --- pdf2djvu-0.9.3/tests/test-nfkc-apf.pdf 2015-11-20 18:29:01.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-nfkc-apf.pdf 2016-02-24 17:35:24.000000000 +0000 @@ -78,8 +78,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192901+01'00') -/ModDate (D:20151120192901+01'00') +/CreationDate (D:20160224183524+01'00') +/ModDate (D:20160224183524+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -101,7 +101,7 @@ << /Size 11 /Root 9 0 R /Info 10 0 R -/ID [<EF5D13EABB46C8E5FE3EE1F49EEACBC8> <EF5D13EABB46C8E5FE3EE1F49EEACBC8>] >> +/ID [<358548AD799CC308F267DD3B7970158F> <358548AD799CC308F267DD3B7970158F>] >> startxref 1556 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-nfkc.pdf pdf2djvu-0.9.4/tests/test-nfkc.pdf --- pdf2djvu-0.9.3/tests/test-nfkc.pdf 2015-11-20 18:29:02.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-nfkc.pdf 2016-02-24 17:35:24.000000000 +0000 @@ -78,8 +78,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192902+01'00') -/ModDate (D:20151120192902+01'00') +/CreationDate (D:20160224183524+01'00') +/ModDate (D:20160224183524+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -101,7 +101,7 @@ << /Size 11 /Root 9 0 R /Info 10 0 R -/ID [<6AE906997282D81AF040AC86A80189E9> <6AE906997282D81AF040AC86A80189E9>] >> +/ID [<430B6BD53D9EB2CF4F620CD56650A2AD> <430B6BD53D9EB2CF4F620CD56650A2AD>] >> startxref 1094 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-no-meta.pdf pdf2djvu-0.9.4/tests/test-no-meta.pdf --- pdf2djvu-0.9.3/tests/test-no-meta.pdf 2015-11-20 18:29:01.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-no-meta.pdf 2016-02-24 17:35:23.000000000 +0000 @@ -39,8 +39,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192900+01'00') -/ModDate (D:20151120192900+01'00') +/CreationDate (D:20160224183523+01'00') +/ModDate (D:20160224183523+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -58,7 +58,7 @@ << /Size 7 /Root 5 0 R /Info 6 0 R -/ID [<D59589C682E0A137C1F44EB8D874858E> <D59589C682E0A137C1F44EB8D874858E>] >> +/ID [<09990CD8591812883FEE2B8D248F24A3> <09990CD8591812883FEE2B8D248F24A3>] >> startxref 592 %%EOF Binary files /tmp/tmp3dHlfx/OWrjEdlmGP/pdf2djvu-0.9.3/tests/test-oom.pdf and /tmp/tmp3dHlfx/SRJfO5Nu8Y/pdf2djvu-0.9.4/tests/test-oom.pdf differ diff -Nru pdf2djvu-0.9.3/tests/test-oom.py pdf2djvu-0.9.4/tests/test-oom.py --- pdf2djvu-0.9.3/tests/test-oom.py 1970-01-01 00:00:00.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-oom.py 2016-02-24 17:34:51.000000000 +0000 @@ -0,0 +1,48 @@ +# encoding=UTF-8 + +# Copyright © 2016 Jakub Wilk <jwilk@jwilk.net> +# +# This file is part of pdf2djvu. +# +# pdf2djvu is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# pdf2djvu 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. + +import contextlib +import resource + +from tools import ( + case, + re, +) + +@contextlib.contextmanager +def vm_limit(limit): + [lim_soft, lim_hard] = resource.getrlimit(resource.RLIMIT_AS) + if lim_hard != resource.RLIM_INFINITY and lim_hard < limit: + limit = lim_hard + resource.setrlimit(resource.RLIMIT_AS, (limit, lim_hard)) + try: + yield + finally: + resource.setrlimit(resource.RLIMIT_AS, (lim_soft, lim_hard)) + +class test(case): + # Bug: https://bitbucket.org/jwilk/pdf2djvu/issue/107 + # + fixed in 0.9.4 [87708193290f] + + def test(self): + # Before Poppler 0.24, the Splash backend would just segfault on OOM. + # https://cgit.freedesktop.org/poppler/poppler/commit/?id=e04287f2682e + self.require_poppler(0, 24) + [lim_soft, lim_hard] = resource.getrlimit(resource.RLIMIT_AS) + with vm_limit(1 << 30): # 1 GiB virtual memory limit + r = self.pdf2djvu() + r.assert_(stderr=re('Out of memory\n'), rc=1) + +# vim:ts=4 sts=4 sw=4 et diff -Nru pdf2djvu-0.9.3/tests/test-oom.tex pdf2djvu-0.9.4/tests/test-oom.tex --- pdf2djvu-0.9.3/tests/test-oom.tex 1970-01-01 00:00:00.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-oom.tex 2016-02-24 17:34:51.000000000 +0000 @@ -0,0 +1,22 @@ +% Copyright © 2016 Jakub Wilk <jwilk@jwilk.net> +% +% This file is part of pdf2djvu. +% +% pdf2djvu is free software; you can redistribute it and/or modify +% it under the terms of the GNU General Public License version 2 as +% published by the Free Software Foundation. +% +% pdf2djvu 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. + +\pdfpagewidth 72in +\pdfpageheight 72in + +\null +\vfil\break +\null +\end + +% vim:ts=4 sts=4 sw=4 et diff -Nru pdf2djvu-0.9.3/tests/test-outline.pdf pdf2djvu-0.9.4/tests/test-outline.pdf --- pdf2djvu-0.9.3/tests/test-outline.pdf 2015-11-20 18:29:02.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-outline.pdf 2016-02-24 17:35:25.000000000 +0000 @@ -203,8 +203,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192902+01'00') -/ModDate (D:20151120192902+01'00') +/CreationDate (D:20160224183525+01'00') +/ModDate (D:20160224183525+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -253,7 +253,7 @@ << /Size 38 /Root 36 0 R /Info 37 0 R -/ID [<662B0345695F1CDCD9314E821448254E> <662B0345695F1CDCD9314E821448254E>] >> +/ID [<4650915F7D8B7D49C82CB42738BCAFAA> <4650915F7D8B7D49C82CB42738BCAFAA>] >> startxref 2228 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-overwrite.pdf pdf2djvu-0.9.4/tests/test-overwrite.pdf --- pdf2djvu-0.9.3/tests/test-overwrite.pdf 2015-11-20 18:29:01.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-overwrite.pdf 2016-02-24 17:35:24.000000000 +0000 @@ -39,8 +39,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192901+01'00') -/ModDate (D:20151120192901+01'00') +/CreationDate (D:20160224183524+01'00') +/ModDate (D:20160224183524+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -58,7 +58,7 @@ << /Size 7 /Root 5 0 R /Info 6 0 R -/ID [<9B96A0021AE16CB72C39410FBF502740> <9B96A0021AE16CB72C39410FBF502740>] >> +/ID [<75A168171E5F2AA0B636F660B435BCDA> <75A168171E5F2AA0B636F660B435BCDA>] >> startxref 592 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-page-id.pdf pdf2djvu-0.9.4/tests/test-page-id.pdf --- pdf2djvu-0.9.3/tests/test-page-id.pdf 2015-11-20 18:29:01.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-page-id.pdf 2016-02-24 17:35:24.000000000 +0000 @@ -61,8 +61,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192901+01'00') -/ModDate (D:20151120192901+01'00') +/CreationDate (D:20160224183524+01'00') +/ModDate (D:20160224183524+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -83,7 +83,7 @@ << /Size 10 /Root 8 0 R /Info 9 0 R -/ID [<3179C82061860BF9CC2FFCED4076C853> <3179C82061860BF9CC2FFCED4076C853>] >> +/ID [<D6E367F85FCB940486CB0C7EC5FA76A5> <D6E367F85FCB940486CB0C7EC5FA76A5>] >> startxref 803 %%EOF Binary files /tmp/tmp3dHlfx/OWrjEdlmGP/pdf2djvu-0.9.3/tests/test-rotated-page.pdf and /tmp/tmp3dHlfx/SRJfO5Nu8Y/pdf2djvu-0.9.4/tests/test-rotated-page.pdf differ diff -Nru pdf2djvu-0.9.3/tests/test-solid-nonwhite-background.pdf pdf2djvu-0.9.4/tests/test-solid-nonwhite-background.pdf --- pdf2djvu-0.9.3/tests/test-solid-nonwhite-background.pdf 2015-11-20 18:29:02.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-solid-nonwhite-background.pdf 2016-02-24 17:35:25.000000000 +0000 @@ -79,8 +79,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192902+01'00') -/ModDate (D:20151120192902+01'00') +/CreationDate (D:20160224183525+01'00') +/ModDate (D:20160224183525+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -102,7 +102,7 @@ << /Size 11 /Root 9 0 R /Info 10 0 R -/ID [<37759F19B9782214FC1ADBE39749BA3F> <37759F19B9782214FC1ADBE39749BA3F>] >> +/ID [<97EE6CC9500186846A99E17CE6AFCDAD> <97EE6CC9500186846A99E17CE6AFCDAD>] >> startxref 1323 %%EOF Binary files /tmp/tmp3dHlfx/OWrjEdlmGP/pdf2djvu-0.9.3/tests/test-subsample.pdf and /tmp/tmp3dHlfx/SRJfO5Nu8Y/pdf2djvu-0.9.4/tests/test-subsample.pdf differ diff -Nru pdf2djvu-0.9.3/tests/test-subsample.py pdf2djvu-0.9.4/tests/test-subsample.py --- pdf2djvu-0.9.3/tests/test-subsample.py 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-subsample.py 2016-02-24 17:34:51.000000000 +0000 @@ -21,14 +21,14 @@ class test(case): def test_11(self): - # Bug: http://sourceforge.net/p/djvu/bugs/106/ + # Bug: https://sourceforge.net/p/djvu/bugs/106/ # + fixed in 0.4.11 [5e3937296514] self.pdf2djvu('--bg-subsample=11', '--dpi=72').assert_() r = self.djvudump() r.assert_(stdout=re('BG44.* 10x11$', re.M)) def test_12(self): - # Bug: https://bugs.debian/458211 + # Bug: https://bugs.debian.org/458211 # # Prior to pdf2djvu 0.5.0, subsample ratio 12 was not allowed. # Now we require a fixed version of DjVuLibre. diff -Nru pdf2djvu-0.9.3/tests/test-title.pdf pdf2djvu-0.9.4/tests/test-title.pdf --- pdf2djvu-0.9.3/tests/test-title.pdf 2015-11-20 18:29:02.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-title.pdf 2016-02-24 17:35:25.000000000 +0000 @@ -61,8 +61,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192902+01'00') -/ModDate (D:20151120192902+01'00') +/CreationDate (D:20160224183525+01'00') +/ModDate (D:20160224183525+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -83,7 +83,7 @@ << /Size 10 /Root 8 0 R /Info 9 0 R -/ID [<5B96AADAD1E28D46E4AB435692C69288> <5B96AADAD1E28D46E4AB435692C69288>] >> +/ID [<45F6B202E9FA5BA5FB12D450211A0459> <45F6B202E9FA5BA5FB12D450211A0459>] >> startxref 803 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-utf16-meta.pdf pdf2djvu-0.9.4/tests/test-utf16-meta.pdf --- pdf2djvu-0.9.3/tests/test-utf16-meta.pdf 2015-11-20 18:29:02.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-utf16-meta.pdf 2016-02-24 17:35:25.000000000 +0000 @@ -40,8 +40,8 @@ /Producer (pdfTeX-1.40.16) /Title (\376\377\003\232\003\311\003\264\003\271\003\272\003\277\003\300\003\277\003\257\003\267\003\303\003\267\000\040\003\307\003\261\003\301\003\261\003\272\003\304\003\256\003\301\003\311\003\275) /Creator (TeX) -/CreationDate (D:20151120192902+01'00') -/ModDate (D:20151120192902+01'00') +/CreationDate (D:20160224183525+01'00') +/ModDate (D:20160224183525+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -59,7 +59,7 @@ << /Size 7 /Root 5 0 R /Info 6 0 R -/ID [<342368894F0BE7A67082AAD9B2C52C48> <342368894F0BE7A67082AAD9B2C52C48>] >> +/ID [<03EFC4E507BCD375EF07EEFA776A01B7> <03EFC4E507BCD375EF07EEFA776A01B7>] >> startxref 795 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-vector-fg.pdf pdf2djvu-0.9.4/tests/test-vector-fg.pdf --- pdf2djvu-0.9.3/tests/test-vector-fg.pdf 2015-11-20 18:29:02.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-vector-fg.pdf 2016-02-24 17:35:25.000000000 +0000 @@ -40,8 +40,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192902+01'00') -/ModDate (D:20151120192902+01'00') +/CreationDate (D:20160224183525+01'00') +/ModDate (D:20160224183525+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -59,7 +59,7 @@ << /Size 7 /Root 5 0 R /Info 6 0 R -/ID [<41D9A3AEBD9CA6B5C8653F8191B52562> <41D9A3AEBD9CA6B5C8653F8191B52562>] >> +/ID [<EAE66AD5903995669D32728D23B0EEDD> <EAE66AD5903995669D32728D23B0EEDD>] >> startxref 613 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-xmp-broken.pdf pdf2djvu-0.9.4/tests/test-xmp-broken.pdf --- pdf2djvu-0.9.3/tests/test-xmp-broken.pdf 2015-11-20 18:29:01.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-xmp-broken.pdf 2016-02-24 17:35:24.000000000 +0000 @@ -57,8 +57,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192901+01'00') -/ModDate (D:20151120192901+01'00') +/CreationDate (D:20160224183524+01'00') +/ModDate (D:20160224183524+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -78,7 +78,7 @@ << /Size 9 /Root 7 0 R /Info 8 0 R -/ID [<58B5F8FFC8CF6B61E12E6AA3A003B5CC> <58B5F8FFC8CF6B61E12E6AA3A003B5CC>] >> +/ID [<83A53691852024E14A8B2261352CF84E> <83A53691852024E14A8B2261352CF84E>] >> startxref 886 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-xmp-mediatype.pdf pdf2djvu-0.9.4/tests/test-xmp-mediatype.pdf --- pdf2djvu-0.9.3/tests/test-xmp-mediatype.pdf 2015-11-20 18:29:01.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-xmp-mediatype.pdf 2016-02-24 17:35:23.000000000 +0000 @@ -57,8 +57,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192901+01'00') -/ModDate (D:20151120192901+01'00') +/CreationDate (D:20160224183523+01'00') +/ModDate (D:20160224183523+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -78,7 +78,7 @@ << /Size 9 /Root 7 0 R /Info 8 0 R -/ID [<E7268AD653E161387DC2C7082EFD44D1> <E7268AD653E161387DC2C7082EFD44D1>] >> +/ID [<1D66C8F1466860DAC87A8CE4A91FA4C0> <1D66C8F1466860DAC87A8CE4A91FA4C0>] >> startxref 1088 %%EOF diff -Nru pdf2djvu-0.9.3/tests/test-xmp-recreate.pdf pdf2djvu-0.9.4/tests/test-xmp-recreate.pdf --- pdf2djvu-0.9.3/tests/test-xmp-recreate.pdf 2015-11-20 18:29:01.000000000 +0000 +++ pdf2djvu-0.9.4/tests/test-xmp-recreate.pdf 2016-02-24 17:35:24.000000000 +0000 @@ -39,8 +39,8 @@ << /Producer (pdfTeX-1.40.16) /Creator (TeX) -/CreationDate (D:20151120192901+01'00') -/ModDate (D:20151120192901+01'00') +/CreationDate (D:20160224183524+01'00') +/ModDate (D:20160224183524+01'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) kpathsea version 6.2.1) >> @@ -58,7 +58,7 @@ << /Size 7 /Root 5 0 R /Info 6 0 R -/ID [<DB4071980A5E43987F89262528040CE3> <DB4071980A5E43987F89262528040CE3>] >> +/ID [<EB8040E9CA7EC8C5433065AA83B7AE88> <EB8040E9CA7EC8C5433065AA83B7AE88>] >> startxref 592 %%EOF diff -Nru pdf2djvu-0.9.3/tests/tools.py pdf2djvu-0.9.4/tests/tools.py --- pdf2djvu-0.9.3/tests/tools.py 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/tests/tools.py 2016-02-24 17:34:51.000000000 +0000 @@ -1,6 +1,6 @@ # encoding=UTF-8 -# Copyright © 2009-2015 Jakub Wilk <jwilk@jwilk.net> +# Copyright © 2009-2016 Jakub Wilk <jwilk@jwilk.net> # # This file is part of pdf2djvu. # @@ -26,6 +26,7 @@ import subprocess as ipc import sys +re.compile.escape = re.escape re.compile.M = re.M re.compile.DOTALL = re.DOTALL re = re.compile @@ -145,6 +146,7 @@ _pdf2djvu_command = os.getenv('pdf2djvu') or 'pdf2djvu' _feature_cache = {} + _poppler_version = None def get_pdf2djvu_command(self): if re(r'\A[[a-zA-Z0-9_+/=.,:%-]+\Z').match(self._pdf2djvu_command): @@ -191,7 +193,8 @@ return ipc_result(stdout, stderr, child.returncode) def _pdf2djvu(self, *args, **kwargs): - args = self.get_pdf2djvu_command() + ('-q', self.get_pdf_path()) + args + quiet = ('-q',) if kwargs.pop('quiet', True) else () + args = self.get_pdf2djvu_command() + quiet + (self.get_pdf_path(),) + args result = self.run(*args, **kwargs) if os.getenv('pdf2djvu_win32'): result.stderr = result.stderr.replace('\r\n', '\n') @@ -259,6 +262,17 @@ xmp = eval(xmp) return xmp + def require_poppler(self, *version): + if self._poppler_version is None: + r = self.pdf2djvu('--version') + r.assert_(stderr=re('^pdf2djvu '), rc=0) + print(repr(r.stderr)) + match = re('^[+] Poppler ([0-9.]+)$', re.M).search(r.stderr) + self._poppler_version = tuple(int(x) for x in match.group(1).split('.')) + if self._poppler_version < version: + str_version = '.'.join(str(v) for v in version) + raise SkipTest('Poppler >= {ver} is required'.format(ver=str_version)) + def require_feature(self, feature): try: feature_enabled = self._feature_cache[feature] diff -Nru pdf2djvu-0.9.3/tools/install-sh pdf2djvu-0.9.4/tools/install-sh --- pdf2djvu-0.9.3/tools/install-sh 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/tools/install-sh 2016-02-24 17:34:51.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2014-09-12.12; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,81 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + # $RANDOM is not portable (e.g. dash); use it when possible to + # lower collision chance + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # As "mkdir -p" follows symlinks and we work in /tmp possibly; so + # create the $tmpdir first (and fail if unsuccessful) to make sure + # that nobody tries to guess the $tmpdir name. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +377,51 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +456,12 @@ # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +474,24 @@ # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff -Nru pdf2djvu-0.9.3/win32/doc/COPYING.libs.txt pdf2djvu-0.9.4/win32/doc/COPYING.libs.txt --- pdf2djvu-0.9.3/win32/doc/COPYING.libs.txt 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/win32/doc/COPYING.libs.txt 2016-02-24 17:34:51.000000000 +0000 @@ -19,7 +19,7 @@ ================= | Copyright © 1996-2004 Glyph & Cog, LLC -| Copyright © 2005-2011 `The Poppler Developers <http://poppler.freedesktop.org>`_ +| Copyright © 2005-2011 `The Poppler Developers <https://poppler.freedesktop.org>`_ 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 diff -Nru pdf2djvu-0.9.3/win32/Makefile pdf2djvu-0.9.4/win32/Makefile --- pdf2djvu-0.9.3/win32/Makefile 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/win32/Makefile 2016-02-24 17:34:51.000000000 +0000 @@ -175,7 +175,7 @@ src/poppler/source-stamp: mkdir -p $(dir $@) - $(wget) http://poppler.freedesktop.org/poppler-0.18.4.tar.gz + $(wget) https://poppler.freedesktop.org/poppler-0.18.4.tar.gz echo '33421148cdc8e043da291dece2cce1cea6220d49a50c00c56d56d6435501d42e dcache/poppler-0.18.4.tar.gz' | sha256sum -c $(untar) dcache/poppler-*.tar.gz -C $(dir $@) cd $(dir $@) && QUILT_PATCHES=../../patches/poppler quilt push -a @@ -216,7 +216,7 @@ src/djvulibre/source-stamp: mkdir -p $(dir $@) - $(wget) http://downloads.sourceforge.net/project/djvu/DjVuLibre/3.5.27/djvulibre-3.5.27.tar.gz + $(wget) https://downloads.sourceforge.net/project/djvu/DjVuLibre/3.5.27/djvulibre-3.5.27.tar.gz echo 'e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f dcache/djvulibre-3.5.27.tar.gz' | sha256sum -c $(untar) dcache/djvulibre-*.tar.gz -C $(dir $@) sed -i -e 's/[A-Z]\+_EXPORT/DLL_EXPORT/' $(dir $@)/libdjvu/*.h @@ -305,7 +305,7 @@ src/expat/source-stamp: mkdir -p $(dir $@) - $(wget) http://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz + $(wget) https://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz echo '823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86 dcache/expat-2.1.0.tar.gz' | sha256sum -c $(untar) dcache/expat-*.tar.gz -C $(dir $@) touch $(@) @@ -385,7 +385,7 @@ src/fontconfig/source-stamp: mkdir -p $(dir $@) - $(wget) http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.11.1.tar.bz2 + $(wget) https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.11.1.tar.bz2 echo 'dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99 dcache/fontconfig-2.11.1.tar.bz2' | sha256sum -c $(untar) dcache/fontconfig-2.11.1.tar.bz2 -C $(dir $@) cd $(dir $@) && autoreconf -vfi @@ -418,7 +418,7 @@ src/gettext/source-stamp: mkdir -p $(dir $@) - $(wget) http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz + $(wget) https://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz echo '93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9 dcache/gettext-0.18.1.1.tar.gz' | sha256sum -c $(untar) dcache/gettext-*.tar.gz --exclude='gettext-tools' -C $(dir $@) sed -r -i -e '/(#undef|#define|extern .*) (v?sn?printf|[*]?setlocale)/d' $(dir $@)/gettext-runtime/intl/libgnuintl.h.in diff -Nru pdf2djvu-0.9.3/win32-version.rc pdf2djvu-0.9.4/win32-version.rc --- pdf2djvu-0.9.3/win32-version.rc 2015-11-20 18:28:30.000000000 +0000 +++ pdf2djvu-0.9.4/win32-version.rc 2016-02-24 17:34:51.000000000 +0000 @@ -2,8 +2,8 @@ #include "autoconf.hh" VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,3 - PRODUCTVERSION 0,9,3 + FILEVERSION 0,9,4 + PRODUCTVERSION 0,9,4 BEGIN BLOCK "StringFileInfo" BEGIN @@ -12,7 +12,7 @@ VALUE "ProductName", PACKAGE_STRING VALUE "FileDescription", "PDF to DjVu converter\0" VALUE "FileVersion", PACKAGE_VERSION - VALUE "LegalCopyright", "Copyright © 2007-2015 Jakub Wilk <jwilk@jwilk.net>\0" + VALUE "LegalCopyright", "Copyright © 2007-2016 Jakub Wilk <jwilk@jwilk.net>\0" VALUE "Comments", "pdf2djvu is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation.\0" END END