diff -Nru xpdf-3.04+git20211021/configure.ac xpdf-3.04+git20220201/configure.ac --- xpdf-3.04+git20211021/configure.ac 2021-10-21 00:09:24.000000000 +0000 +++ xpdf-3.04+git20220201/configure.ac 2022-02-01 23:40:36.000000000 +0000 @@ -46,6 +46,10 @@ PKG_CHECK_EXISTS([poppler >= 20.12.0], [ AC_DEFINE([GLOBALPARAMS_NO_PSLEVEL]) ]) +PKG_CHECK_EXISTS([poppler >= 21.11.0], [ + AC_DEFINE([PDFDOC_GETLINKS_UNIQUE_PTR]) + AC_DEFINE([GLOBALPARAMS_NO_EXPAND_SHRINK_OVERPRINT]) +]) AC_SEARCH_LIBS([XmDropDownGetArrow], [Xm], [], [ AC_MSG_ERROR([Motif >= 2.3 is required]) diff -Nru xpdf-3.04+git20211021/debian/changelog xpdf-3.04+git20220201/debian/changelog --- xpdf-3.04+git20211021/debian/changelog 2022-02-04 17:43:49.000000000 +0000 +++ xpdf-3.04+git20220201/debian/changelog 2022-02-08 14:04:11.000000000 +0000 @@ -1,14 +1,8 @@ -xpdf (3.04+git20211021-1ubuntu2) jammy; urgency=medium +xpdf (3.04+git20220201-1) unstable; urgency=medium - * No-change rebuild against latest poppler + * Import new upstream version 3.04+git20220201 - -- Jeremy Bicha Fri, 04 Feb 2022 12:43:49 -0500 - -xpdf (3.04+git20211021-1ubuntu1) jammy; urgency=medium - - * Fix build failure with Poppler ≥ 21.11 - - -- Rico Tzschichholz Fri, 12 Nov 2021 12:49:25 +0100 + -- Florian Schlichting Tue, 08 Feb 2022 22:04:11 +0800 xpdf (3.04+git20211021-1) unstable; urgency=medium diff -Nru xpdf-3.04+git20211021/debian/control xpdf-3.04+git20220201/debian/control --- xpdf-3.04+git20211021/debian/control 2021-11-12 11:49:25.000000000 +0000 +++ xpdf-3.04+git20220201/debian/control 2022-02-08 08:06:48.000000000 +0000 @@ -1,8 +1,7 @@ Source: xpdf Section: text Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Florian Schlichting +Maintainer: Florian Schlichting Standards-Version: 4.6.0 Build-Depends: debhelper-compat (= 13), diff -Nru xpdf-3.04+git20211021/debian/patches/fix_poppler_21_api_change.diff xpdf-3.04+git20220201/debian/patches/fix_poppler_21_api_change.diff --- xpdf-3.04+git20211021/debian/patches/fix_poppler_21_api_change.diff 2021-11-12 11:49:25.000000000 +0000 +++ xpdf-3.04+git20220201/debian/patches/fix_poppler_21_api_change.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,229 +0,0 @@ -Description: Adapt to poppler 21.11.0 API changes -Author: Rico Tzschichholz - -Index: b/xpdf/XPDFParams.cc -=================================================================== ---- a/xpdf/XPDFParams.cc -+++ b/xpdf/XPDFParams.cc -@@ -390,10 +390,10 @@ - } else if (cmd == "psCrop") { - parseYesNo("psCrop", xpdfParam(setPSCrop), tokens, fileName, line); - } else if (cmd == "psExpandSmaller") { -- parseYesNo("psExpandSmaller", globalParam(setPSExpandSmaller), -+ parseYesNo("psExpandSmaller", xpdfParam(setPSExpandSmaller), - tokens, fileName, line); - } else if (cmd == "psShrinkLarger") { -- parseYesNo("psShrinkLarger", globalParam(setPSShrinkLarger), -+ parseYesNo("psShrinkLarger", xpdfParam(setPSShrinkLarger), - tokens, fileName, line); - } else if (cmd == "psDuplex") { - parseYesNo("psDuplex", xpdfParam(setPSDuplex), tokens, fileName, line); -@@ -408,7 +408,7 @@ - parseYesNo("continuousView", xpdfParam(setContinuousView), - tokens, fileName, line); - } else if (cmd == "overprintPreview") { -- parseYesNo("overprintPreview", globalParam(setOverprintPreview), -+ parseYesNo("overprintPreview", xpdfParam(setOverprintPreview), - tokens, fileName, line); - } else if (cmd == "pageCommand") { - parseCommand("pageCommand", pageCommand, tokens, fileName, line); -@@ -974,6 +974,15 @@ - return d; - } - -+bool XPDFParams::getPSExpandSmaller() { -+ bool e; -+ -+ lockXPDFParams; -+ e = psExpandSmaller; -+ unlockXPDFParams; -+ return e; -+} -+ - PSLevel XPDFParams::getPSLevel() { - PSLevel level; - -@@ -983,6 +992,15 @@ - return level; - } - -+bool XPDFParams::getPSShrinkLarger() { -+ bool e; -+ -+ lockXPDFParams; -+ e = psShrinkLarger; -+ unlockXPDFParams; -+ return e; -+} -+ - std::string XPDFParams::getInitialZoom() { - std::string s; - -@@ -1001,6 +1019,15 @@ - return f; - } - -+bool XPDFParams::getOverprintPreview() { -+ bool e; -+ -+ lockXPDFParams; -+ e = overprintPreview; -+ unlockXPDFParams; -+ return e; -+} -+ - const StringList &XPDFParams::getKeyBinding(int code, int mods, int context) { - int modMask; - -@@ -1086,12 +1113,24 @@ - unlockXPDFParams; - } - -+void XPDFParams::setPSExpandSmaller(bool expand) { -+ lockXPDFParams; -+ psExpandSmaller = expand; -+ unlockXPDFParams; -+} -+ - void XPDFParams::setPSLevel(PSLevel level) { - lockXPDFParams; - psLevel = level; - unlockXPDFParams; - } - -+void XPDFParams::setPSShrinkLarger(bool shrink) { -+ lockXPDFParams; -+ psShrinkLarger = shrink; -+ unlockXPDFParams; -+} -+ - void XPDFParams::setInitialZoom(const std::string& s) { - lockXPDFParams; - initialZoom = s; -@@ -1104,6 +1143,12 @@ - unlockXPDFParams; - } - -+void XPDFParams::setOverprintPreview(bool preview) { -+ lockXPDFParams; -+ overprintPreview = preview; -+ unlockXPDFParams; -+} -+ - void XPDFParams::setPageCommand(const std::string& cmd) { - lockXPDFParams; - pageCommand = cmd; -Index: b/xpdf/XPDFParams.h -=================================================================== ---- a/xpdf/XPDFParams.h -+++ b/xpdf/XPDFParams.h -@@ -140,9 +140,12 @@ - void getPSImageableArea(int *llx, int *lly, int *urx, int *ury); - bool getPSDuplex(); - bool getPSCrop(); -+ bool getPSExpandSmaller(); - PSLevel getPSLevel(); -+ bool getPSShrinkLarger(); - std::string getInitialZoom(); - bool getContinuousView(); -+ bool getOverprintPreview(); - const std::string& getPageCommand() { return pageCommand; } - const std::string& getLaunchCommand() { return launchCommand; } - const std::string& getURLCommand() { return urlCommand; } -@@ -157,9 +160,12 @@ - void setPSPaperHeight(int height); - void setPSDuplex(bool duplex); - void setPSCrop(bool crop); -+ void setPSExpandSmaller(bool expand); - void setPSLevel(PSLevel level); -+ void setPSShrinkLarger(bool shrink); - void setInitialZoom(const std::string& s); - void setContinuousView(bool cont); -+ void setOverprintPreview(bool preview); - void setPageCommand(const std::string& cmd); - - private: -@@ -220,9 +226,12 @@ - psImageableURY; - bool psCrop; // crop PS output to CropBox - bool psDuplex; // enable duplexing in PostScript? -+ bool psExpandSmaller; -+ bool psShrinkLarger; - PSLevel psLevel; // PostScript level to generate - std::string initialZoom; // initial zoom level - bool continuousView; // continuous view mode -+ bool overprintPreview; - std::string pageCommand; // command executed on page change - std::string launchCommand; // command executed for 'launch' links - std::string urlCommand; // command executed for URL links -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -46,6 +46,10 @@ - PKG_CHECK_EXISTS([poppler >= 20.12.0], [ - AC_DEFINE([GLOBALPARAMS_NO_PSLEVEL]) - ]) -+PKG_CHECK_EXISTS([poppler >= 21.11.0], [ -+ AC_DEFINE([GLOBALPARAMS_NO_PSEXPANDSMALLER]) -+ AC_DEFINE([GETLINKS_UNIQUE_PTR]) -+]) - - AC_SEARCH_LIBS([XmDropDownGetArrow], [Xm], [], [ - AC_MSG_ERROR([Motif >= 2.3 is required]) -Index: b/xpdf/XPDFViewer.cc -=================================================================== ---- a/xpdf/XPDFViewer.cc -+++ b/xpdf/XPDFViewer.cc -@@ -3514,6 +3514,11 @@ - #ifndef GLOBALPARAMS_NO_PSLEVEL - globalParams->setPSLevel(xpdfParams->getPSLevel()); - #endif -+#ifndef GLOBALPARAMS_NO_PSEXPANDSMALLER -+ globalParams->setPSExpandSmaller(xpdfParams->getPSExpandSmaller()); -+ globalParams->setPSShrinkLarger(xpdfParams->getPSShrinkLarger()); -+ globalParams->setOverprintPreview(xpdfParams->getOverprintPreview()); -+#endif - - #ifdef PSOUTPUTDEV_PAGE_LIST - std::vector pages; -@@ -3598,6 +3603,11 @@ - { - psOut = makePSOutputDev(psFileName, doc, firstPage, lastPage); - if (psOut->isOk()) { -+#ifdef GLOBALPARAMS_NO_PSEXPANDSMALLER -+ psOut->setPSExpandSmaller(xpdfParams->getPSExpandSmaller()); -+ psOut->setPSShrinkLarger(xpdfParams->getPSShrinkLarger()); -+ psOut->setOverprintPreview(xpdfParams->getOverprintPreview()); -+#endif - doc->displayPages(psOut, firstPage, lastPage, 72, 72, - 0, true, xpdfParams->getPSCrop(), false); - } -@@ -3642,6 +3652,11 @@ - { - psOut = makePSOutputDev(psFileName, doc, i, i); - if (psOut->isOk()) { -+#ifdef GLOBALPARAMS_NO_PSEXPANDSMALLER -+ psOut->setPSExpandSmaller(xpdfParams->getPSExpandSmaller()); -+ psOut->setPSShrinkLarger(xpdfParams->getPSShrinkLarger()); -+ psOut->setOverprintPreview(xpdfParams->getOverprintPreview()); -+#endif - doc->displayPages(psOut, i, i, 72, 72, - 0, true, xpdfParams->getPSCrop(), false); - } -Index: b/xpdf/PDFCore.cc -=================================================================== ---- a/xpdf/PDFCore.cc -+++ b/xpdf/PDFCore.cc -@@ -865,7 +865,11 @@ - memcpy(tile->ctm, out->getDefCTM(), 6 * sizeof(double)); - memcpy(tile->ictm, out->getDefICTM(), 6 * sizeof(double)); - if (!page->links) { -+#if GETLINKS_UNIQUE_PTR -+ page->links = doc->getLinks(page->page); -+#else - page->links.reset(doc->getLinks(page->page)); -+#endif - } - if (!page->text) { - if ((textOut = new TextOutputDev(NULL, true, 0, false, false))) { diff -Nru xpdf-3.04+git20211021/debian/patches/series xpdf-3.04+git20220201/debian/patches/series --- xpdf-3.04+git20211021/debian/patches/series 2021-11-12 09:52:00.000000000 +0000 +++ xpdf-3.04+git20220201/debian/patches/series 2022-02-08 08:06:48.000000000 +0000 @@ -1,3 +1,2 @@ wrapper-options-manpage.patch acute-accent-in-manpage.patch -fix_poppler_21_api_change.diff diff -Nru xpdf-3.04+git20211021/doc/xpdf.1 xpdf-3.04+git20220201/doc/xpdf.1 --- xpdf-3.04+git20211021/doc/xpdf.1 2021-10-21 00:09:24.000000000 +0000 +++ xpdf-3.04+git20220201/doc/xpdf.1 2022-02-01 23:40:36.000000000 +0000 @@ -1,6 +1,6 @@ .\" Copyright 1996-2014 Glyph & Cog, LLC .\" Copyright 2014-2021 Adam Sampson -.TH xpdf 1 "26 Sep 2021" +.TH xpdf 1 "01 Dec 2021" .SH NAME xpdf \- Portable Document Format (PDF) file viewer for X (xpopple) .SH SYNOPSIS @@ -215,9 +215,14 @@ .RB "[X resource: " xpdf*Background ] .TP .BI \-font " font" +Override the fonts used for the user interface. +This uses a single X core font for all user interface elements, +which is not ideal; see the +.B USER INTERFACE FONTS +section below for better approaches. .RB ( \-fn is equivalent.) -.RB "[X resource: " xpdf*fontList ] +.RB "[X resource: " xpdf*font ] .PP The color and font options only affect the user interface elements, not the PDF display (the 'paper'). @@ -919,6 +924,52 @@ specified with or without a file name and page number. .PP The \-quit option tells the server to close its window and exit. +.SH USER INTERFACE FONTS +In order to support international text in user interface elements, xpdf uses +the support for UTF-8 and Xft fonts that was introduced in OpenMotif 2.3. +.PP +The user interface makes use of four fonts which are specified using Motif +Render Tables: +.B default +for most text, +.B mono +for text in a monospaced font, and +.B helpHuge +and +.B helpBig +for headings in the About dialog. +The fonts used can be customised using X resources. By default, they are +configured as follows: +.nf + + Xpdf*renderTable.default.fontType: FONT_IS_XFT + Xpdf*renderTable.default.fontName: Sans-Serif + Xpdf*renderTable.default.fontSize: 12 + Xpdf*renderTable.default.fontEncoding: iso10646-1 + Xpdf*renderTable.helpHuge.fontType: FONT_IS_XFT + Xpdf*renderTable.helpHuge.fontName: Serif + Xpdf*renderTable.helpHuge.fontStyle: bold + Xpdf*renderTable.helpHuge.fontSize: 20 + Xpdf*renderTable.helpHuge.fontEncoding: iso10646-1 + Xpdf*renderTable.helpBig.fontType: FONT_IS_XFT + Xpdf*renderTable.helpBig.fontName: Serif + Xpdf*renderTable.helpBig.fontSize: 16 + Xpdf*renderTable.helpBig.fontEncoding: iso10646-1 + Xpdf*renderTable.mono.fontType: FONT_IS_XFT + Xpdf*renderTable.mono.fontName: Monospace + Xpdf*renderTable.mono.fontSize: 12 + Xpdf*renderTable.mono.fontEncoding: iso10646-1 + +.fi +If you prefer to use X core fonts, as in earlier versions of xpdf, you can +specify these using conventional resources, provided that you use fonts with +the "iso10646-1" Unicode charset: +.nf + + Xpdf*font: -*-helvetica-medium-r-normal-*-12-*-*-*-*-*-iso10646-1 + Xpdf*XmTextField.font: -*-courier-medium-r-normal-*-12-*-*-*-*-*-iso10646-1 + +.fi .SH EXIT CODES Xpdf uses the following exit codes: .TP diff -Nru xpdf-3.04+git20211021/test-builds xpdf-3.04+git20220201/test-builds --- xpdf-3.04+git20211021/test-builds 2021-10-21 00:09:24.000000000 +0000 +++ xpdf-3.04+git20220201/test-builds 2022-02-01 23:40:36.000000000 +0000 @@ -211,6 +211,10 @@ 21.08.0 21.09.0 21.10.0 + 21.11.0 + 21.12.0 + 22.01.0 + 22.02.0 " if [ "$#" -gt 0 ]; then poppler_versions="$*" diff -Nru xpdf-3.04+git20211021/xpdf/PDFCore.cc xpdf-3.04+git20220201/xpdf/PDFCore.cc --- xpdf-3.04+git20211021/xpdf/PDFCore.cc 2021-10-21 00:09:24.000000000 +0000 +++ xpdf-3.04+git20220201/xpdf/PDFCore.cc 2022-02-01 23:40:36.000000000 +0000 @@ -865,7 +865,11 @@ memcpy(tile->ctm, out->getDefCTM(), 6 * sizeof(double)); memcpy(tile->ictm, out->getDefICTM(), 6 * sizeof(double)); if (!page->links) { +#ifdef PDFDOC_GETLINKS_UNIQUE_PTR + page->links = doc->getLinks(page->page); +#else page->links.reset(doc->getLinks(page->page)); +#endif } if (!page->text) { if ((textOut = new TextOutputDev(NULL, true, 0, false, false))) { diff -Nru xpdf-3.04+git20211021/xpdf/XPDFApp.cc xpdf-3.04+git20220201/xpdf/XPDFApp.cc --- xpdf-3.04+git20211021/xpdf/XPDFApp.cc 2021-10-21 00:09:24.000000000 +0000 +++ xpdf-3.04+git20220201/xpdf/XPDFApp.cc 2022-02-01 23:40:36.000000000 +0000 @@ -80,8 +80,8 @@ {"-bg", "*Background", XrmoptionSepArg, NULL}, {"-geometry", ".geometry", XrmoptionSepArg, NULL}, {"-g", ".geometry", XrmoptionSepArg, NULL}, - {"-font", "*.fontList", XrmoptionSepArg, NULL}, - {"-fn", "*.fontList", XrmoptionSepArg, NULL}, + {"-font", "*.font", XrmoptionSepArg, NULL}, + {"-fn", "*.font", XrmoptionSepArg, NULL}, {"-title", ".title", XrmoptionSepArg, NULL}, {"-cmap", ".installCmap", XrmoptionNoArg, (XPointer)"on"}, {"-rgb", ".rgbCubeSize", XrmoptionSepArg, NULL}, diff -Nru xpdf-3.04+git20211021/xpdf/XPDFParams.cc xpdf-3.04+git20220201/xpdf/XPDFParams.cc --- xpdf-3.04+git20211021/xpdf/XPDFParams.cc 2021-10-21 00:09:24.000000000 +0000 +++ xpdf-3.04+git20220201/xpdf/XPDFParams.cc 2022-02-01 23:40:36.000000000 +0000 @@ -390,10 +390,10 @@ } else if (cmd == "psCrop") { parseYesNo("psCrop", xpdfParam(setPSCrop), tokens, fileName, line); } else if (cmd == "psExpandSmaller") { - parseYesNo("psExpandSmaller", globalParam(setPSExpandSmaller), + parseYesNo("psExpandSmaller", xpdfParam(setPSExpandSmaller), tokens, fileName, line); } else if (cmd == "psShrinkLarger") { - parseYesNo("psShrinkLarger", globalParam(setPSShrinkLarger), + parseYesNo("psShrinkLarger", xpdfParam(setPSShrinkLarger), tokens, fileName, line); } else if (cmd == "psDuplex") { parseYesNo("psDuplex", xpdfParam(setPSDuplex), tokens, fileName, line); @@ -408,7 +408,7 @@ parseYesNo("continuousView", xpdfParam(setContinuousView), tokens, fileName, line); } else if (cmd == "overprintPreview") { - parseYesNo("overprintPreview", globalParam(setOverprintPreview), + parseYesNo("overprintPreview", xpdfParam(setOverprintPreview), tokens, fileName, line); } else if (cmd == "pageCommand") { parseCommand("pageCommand", pageCommand, tokens, fileName, line); @@ -929,6 +929,24 @@ return s; } +bool XPDFParams::getPSExpandSmaller() { + bool f; + + lockXPDFParams; + f = psExpandSmaller; + unlockXPDFParams; + return f; +} + +bool XPDFParams::getPSShrinkLarger() { + bool f; + + lockXPDFParams; + f = psShrinkLarger; + unlockXPDFParams; + return f; +} + int XPDFParams::getPSPaperWidth() { int w; @@ -1001,6 +1019,15 @@ return f; } +bool XPDFParams::getOverprintPreview() { + bool f; + + lockXPDFParams; + f = overprintPreview; + unlockXPDFParams; + return f; +} + const StringList &XPDFParams::getKeyBinding(int code, int mods, int context) { int modMask; @@ -1080,6 +1107,18 @@ unlockXPDFParams; } +void XPDFParams::setPSExpandSmaller(bool expand) { + lockXPDFParams; + psExpandSmaller = expand; + unlockXPDFParams; +} + +void XPDFParams::setPSShrinkLarger(bool shrink) { + lockXPDFParams; + psShrinkLarger = shrink; + unlockXPDFParams; +} + void XPDFParams::setPSDuplex(bool duplex) { lockXPDFParams; psDuplex = duplex; @@ -1104,6 +1143,12 @@ unlockXPDFParams; } +void XPDFParams::setOverprintPreview(bool preview) { + lockXPDFParams; + overprintPreview = preview; + unlockXPDFParams; +} + void XPDFParams::setPageCommand(const std::string& cmd) { lockXPDFParams; pageCommand = cmd; diff -Nru xpdf-3.04+git20211021/xpdf/XPDFParams.h xpdf-3.04+git20220201/xpdf/XPDFParams.h --- xpdf-3.04+git20211021/xpdf/XPDFParams.h 2021-10-21 00:09:24.000000000 +0000 +++ xpdf-3.04+git20220201/xpdf/XPDFParams.h 2022-02-01 23:40:36.000000000 +0000 @@ -4,7 +4,7 @@ // // Copyright 2001-2003 Glyph & Cog, LLC // Copyright 2013 Dmitry Shachnev -// Copyright 2014-2020 Adam Sampson +// Copyright 2014-2021 Adam Sampson // // This class is a subset of GlobalParams from the original xpdf, containing // the settings and config file parser that aren't in Poppler's GlobalParams. @@ -140,9 +140,12 @@ void getPSImageableArea(int *llx, int *lly, int *urx, int *ury); bool getPSDuplex(); bool getPSCrop(); + bool getPSExpandSmaller(); + bool getPSShrinkLarger(); PSLevel getPSLevel(); std::string getInitialZoom(); bool getContinuousView(); + bool getOverprintPreview(); const std::string& getPageCommand() { return pageCommand; } const std::string& getLaunchCommand() { return launchCommand; } const std::string& getURLCommand() { return urlCommand; } @@ -157,9 +160,12 @@ void setPSPaperHeight(int height); void setPSDuplex(bool duplex); void setPSCrop(bool crop); + void setPSExpandSmaller(bool expand); + void setPSShrinkLarger(bool shrink); void setPSLevel(PSLevel level); void setInitialZoom(const std::string& s); void setContinuousView(bool cont); + void setOverprintPreview(bool preview); void setPageCommand(const std::string& cmd); private: @@ -219,10 +225,13 @@ psImageableURX, psImageableURY; bool psCrop; // crop PS output to CropBox + bool psExpandSmaller; // expand smaller pages to fill paper + bool psShrinkLarger; // shrink larger pages to fit paper bool psDuplex; // enable duplexing in PostScript? PSLevel psLevel; // PostScript level to generate std::string initialZoom; // initial zoom level bool continuousView; // continuous view mode + bool overprintPreview; // enable overprint preview std::string pageCommand; // command executed on page change std::string launchCommand; // command executed for 'launch' links std::string urlCommand; // command executed for URL links diff -Nru xpdf-3.04+git20211021/xpdf/XPDFViewer.cc xpdf-3.04+git20220201/xpdf/XPDFViewer.cc --- xpdf-3.04+git20211021/xpdf/XPDFViewer.cc 2021-10-21 00:09:24.000000000 +0000 +++ xpdf-3.04+git20220201/xpdf/XPDFViewer.cc 2022-02-01 23:40:36.000000000 +0000 @@ -3515,6 +3515,12 @@ globalParams->setPSLevel(xpdfParams->getPSLevel()); #endif +#ifndef GLOBALPARAMS_NO_EXPAND_SHRINK_OVERPRINT + globalParams->setPSExpandSmaller(xpdfParams->getPSExpandSmaller()); + globalParams->setPSShrinkLarger(xpdfParams->getPSShrinkLarger()); + globalParams->setOverprintPreview(xpdfParams->getOverprintPreview()); +#endif + #ifdef PSOUTPUTDEV_PAGE_LIST std::vector pages; for (int i=firstPage; i<=lastPage; i++) { @@ -3522,7 +3528,7 @@ } #endif - return new PSOutputDev(psFileName.c_str(), doc, + PSOutputDev *dev = new PSOutputDev(psFileName.c_str(), doc, NULL, #ifdef PSOUTPUTDEV_PAGE_LIST pages, @@ -3546,6 +3552,14 @@ , xpdfParams->getPSLevel() #endif ); + +#ifdef GLOBALPARAMS_NO_EXPAND_SHRINK_OVERPRINT + dev->setPSExpandSmaller(xpdfParams->getPSExpandSmaller()); + dev->setPSShrinkLarger(xpdfParams->getPSShrinkLarger()); + dev->setOverprintPreview(xpdfParams->getOverprintPreview()); +#endif + + return dev; } void XPDFViewer::printPrintCbk(Widget widget, XtPointer ptr,