diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/pdfpages')
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty | 27 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def (renamed from Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def) | 73 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppdvips.def | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppluatex.def | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppnull.def | 23 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/pppdftex.def | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppvtex.def | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppxetex.def | 6 |
8 files changed, 86 insertions, 69 deletions
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty index 164f84c2aff..76526f3f44f 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty +++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty @@ -24,22 +24,25 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4y} +\def\AM@fileversion{v0.5a} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2015-06-15 20:08:28 +0200 $ -\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $ +\AM@Git@Date@process$Date: 2015-07-19 17:18:25 +0200 $ +\AM@Git@SHA@process$SHA-1: e79a333f7b4030269da1c5f48fa2c8d07b41b058 $ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfpages} [\AM@Git@Date\space\AM@fileversion\space Insert pages of external PDF documents (AM)] \newif\ifAM@pkg@draft \AM@pkg@draftfalse -\newif\ifAM@pkg@survey \AM@pkg@surveyfalse \DeclareOption{draft}{\AM@pkg@drafttrue} \DeclareOption{final}{\AM@pkg@draftfalse} +\newif\ifAM@pkg@survey \AM@pkg@surveyfalse \DeclareOption{enable-survey}{\AM@pkg@surveytrue} \DeclareOption{disable-survey}{\AM@pkg@surveyfalse} +\newif\ifAM@pkg@demo \AM@pkg@demofalse +\DeclareOption{demo}{\AM@pkg@demotrue} +\DeclareOption{nodemo}{\AM@pkg@demofalse} \def\AM@ifdriverlater{\@ifl@ter{def}} \InputIfFileExists{pdfpages.cfg}{% \PackageInfo{pdfpages}{Loading configuration file `pdfpages.cfg'}}{} @@ -48,24 +51,27 @@ \DeclareOption{vtex}{\def\AM@driver{vtex}} \DeclareOption{xetex}{\def\AM@driver{xetex}} \DeclareOption{dvips}{\def\AM@driver{dvips}} -\DeclareOption{dvipdfm}{\def\AM@driver{dvipdfm}} +\DeclareOption{dvipdfmx}{\def\AM@driver{dvipdfmx}} \DeclareOption{null}{\def\AM@driver{null}} \ProcessOptions +\ifAM@pkg@demo + \def\AM@driver{null} +\fi \@ifundefined{AM@driver}{ \begingroup \@ifundefined{luatexversion}{% \@ifundefined{pdftexversion}{% \@ifundefined{XeTeXversion}{% \@ifundefined{OpMode}{% - \def\AM@driver{null} - }{\gdef\AM@driver{vtex}}% + \gdef\AM@driver{null} + }{\gedf\AM@driver{vtex}}% }{\gdef\AM@driver{xetex}}% }{\gdef\AM@driver{pdftex}}% }{\gdef\AM@driver{luatex}}% \endgroup }{} \RequirePackage{ifthen, calc, eso-pic} -\RequirePackage{graphicx} + \RequirePackage{graphicx}% \newif\ifAM@DVIoutput\AM@DVIoutputfalse \newdimen\AM@pagewidth \newdimen\AM@pageheight @@ -77,6 +83,7 @@ \AddToShipoutPicture{\AM@setanchor}% \fi \RequirePackage{pdflscape} +\let\AM@Ginclude@graphics\Ginclude@graphics \@ifpackagelater{eso-pic}{2001/07/20} {\def\AM@AddToShipoutPicture{\AddToShipoutPicture*}% \def\AM@ClearShipoutPicture{\relax}} @@ -141,6 +148,10 @@ } \endgroup \newcommand*{\AM@findfile@i}[2]{% + \ifAM@pkg@demo + \else + \let\Ginclude@graphics\AM@Ginclude@graphics + \fi \let\AM@currentdocname\relax \AM@IfFileExists{#1.#2}{\edef\AM@currentdocname{#1.#2}}{% \AM@IfFileExists{#1}{\edef\AM@currentdocname{#1}}{% diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def index 0f2174e3dfb..a0e605e9be8 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def @@ -1,10 +1,10 @@ %% -%% This is file `ppdvipdfm.def', +%% This is file `ppdvipdfmx.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% pdfpages.dtx (with options: `ppdvipdfmdef') +%% pdfpages.dtx (with options: `ppdvipdfmxdef') %% %% This file is part of the pdfpages package. %% @@ -24,50 +24,58 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4y} +\def\AM@fileversion{v0.5a} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2015-06-15 20:08:28 +0200 $ -\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $ -\ProvidesFile{ppdvipdfm.def} +\AM@Git@Date@process$Date: 2015-07-19 17:18:25 +0200 $ +\AM@Git@SHA@process$SHA-1: e79a333f7b4030269da1c5f48fa2c8d07b41b058 $ +\ProvidesFile{ppdvipdfmx.def} [\AM@Git@Date\space\AM@fileversion\space - Pdfpages driver for dvipdfm (AM)] -\def\AM@tmp{dvipdfm.def} + Pdfpages driver for dvipdfmx (AM)] +\def\AM@tmp{dvipdfmx.def} \ifx\Gin@driver\AM@tmp\else \PackageWarningNoLine{pdfpages}{% - Graphicx not loaded with driver `dvipdfm'.\MessageBreak - Please, load graphicx explicitely before pdfpages,\MessageBreak + Graphicx.sty not loaded with driver `dvipdfmx'.\MessageBreak + Please, specify the driver as a class option\MessageBreak + \@spaces \string\documentclass[dvipdfmx]{...}\MessageBreak + or load graphicx explicitely before pdfpages,\MessageBreak e.g.:\MessageBreak - \@spaces \string\usepackage[dvipdfm]{graphicx}\MessageBreak - \@spaces \string\usepackage[dvipdfm]{pdfpages}\MessageBreak - This time I will try to load `dvipdfm.def' which \MessageBreak - will overwrite `Gin@driver'. Let's hope for the best}% - \input{dvipdfm.def}% + \@spaces \string\usepackage[dvipdfmx]{graphicx}\MessageBreak + \@spaces \string\usepackage[dvipdfmx]{pdfpages}\MessageBreak + This time I will try to load `dvipdfmx.def' which \MessageBreak + will overwrite `\string\Gin@driver'.\MessageBreak + Let's hope for the best}% + \input{dvipdfmx.def}% \fi -\def\AM@notsupported#1{% - \PackageWarning{pdfpages}{#1 not supported by driver dvipdfm}} +\PackageInfo{pdfpages}{% + Driver `dvipdfmx' cannot detect the total number\MessageBreak + of pages of a PDF. Use option `lastpage' to give\MessageBreak + me a hint} \def\AM@getpagecount{% \ifx\AM@pagecount\AM@undefined - \AM@notsupported{Page selection} \def\AM@pagecount{1}% - \gdef\AM@getpagecount{% - \def\AM@pagecount{1}% - }% \fi } +\newcommand*{\AM@checkpagenumber}[1]{} \def\AM@getpagedimen{% \AM@pagewidth=\paperwidth \AM@pageheight=\paperheight } \def\AM@setpagedimen{% - \paperwidth\AM@pagewidth - \paperheight\AM@pageheight + \special{pdf:pagesize width \the\AM@pagewidth\space height \the\AM@pageheight\space} } -\let\AM@pagesize@boogie\relax -\def\AM@setRotate{\AM@notsupported{Page rotation}} +\def\AM@pagesize@boogie{% + \ifdim\AM@pagewidth=\z@ + \ifdim\AM@pageheight=\z@ + \let\AM@pagewidth\paperwidth + \let\AM@pageheight\paperheight + \fi + \fi +} +\def\AM@setRotate{\special{pdf: put @thispage <</Rotate 90>>}}% \def\AM@resetRotate{} -\def\AM@fitpaper@special{\AM@notsupported{Option fitpaper}} +\let\AM@fitpaper@special\relax \def\AM@findfile#1{% \AM@findfile@i{#1}{pdf}% \AM@findfile@ii{#1}% @@ -141,7 +149,7 @@ \ifx\x\tag \gdef\AM@view{/XYZ @xpos @ypos null}% \PackageWarningNoLine{pdfpages}{% - `linkfit=Region' is not supported by dvipdfm.}% + `linkfit=Region' is not supported by dvipdfmx.}% \else \gdef\AM@view{/Fit}% \fi @@ -156,15 +164,6 @@ } \def\AM@region@calc{} \let\AM@disable@includegraphics\relax -\@ifundefined{KV@Gin@page}{% - \define@key{Gin}{page}{% - \ifnum#1=1 % - \else - \PackageError{pdfpages}{% - Multipage images are not supported by driver dvipdfm% - }\@ehc - \fi - }}{} \endinput %% -%% End of file `ppdvipdfm.def'. +%% End of file `ppdvipdfmx.def'. diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def index 5bd0969e0c2..6afb6b2f9ad 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4y} +\def\AM@fileversion{v0.5a} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2015-06-15 20:08:28 +0200 $ -\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $ +\AM@Git@Date@process$Date: 2015-07-19 17:18:25 +0200 $ +\AM@Git@SHA@process$SHA-1: e79a333f7b4030269da1c5f48fa2c8d07b41b058 $ \ProvidesFile{ppdvips.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for dvips (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def index 65028a453a7..b5dff5a6e56 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def @@ -24,15 +24,15 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4y} +\def\AM@fileversion{v0.5a} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2015-06-15 20:08:28 +0200 $ -\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $ +\AM@Git@Date@process$Date: 2015-07-19 17:18:25 +0200 $ +\AM@Git@SHA@process$SHA-1: e79a333f7b4030269da1c5f48fa2c8d07b41b058 $ \ProvidesFile{ppluatex.def} [\AM@Git@Date\space\AM@fileversion\space - Pdfpages driver for luaTeX (AM)] + Pdfpages driver for LuaTeX (AM)] \ifcase\pdfoutput \input{ppnull.def} \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def index 16df34ef404..83b08ef9dbd 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def @@ -24,20 +24,23 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4y} +\def\AM@fileversion{v0.5a} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2015-06-15 20:08:28 +0200 $ -\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $ +\AM@Git@Date@process$Date: 2015-07-19 17:18:25 +0200 $ +\AM@Git@SHA@process$SHA-1: e79a333f7b4030269da1c5f48fa2c8d07b41b058 $ \ProvidesFile{ppnull.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages dummy driver (AM)] \AM@DVIoutputtrue \PackageWarningNoLine{pdfpages}{% - I will use a dummy \string\includepdf\space command\MessageBreak - which will NOT insert any pages, because\MessageBreak - you are producing DVI output} + I will use a dummy \string\includepdf\space command which\MessageBreak + will insert empty pages instead of the actual PDF,\MessageBreak + because we are running in + \ifAM@pkg@demo `demo' mode% + \else DVI mode or with\MessageBreak dvips driver% + \fi} \def\AM@findfile#1{% \def\AM@currentdocname{#1}% } @@ -46,8 +49,12 @@ \ifx\AM@pagecount\AM@undefined \PackageWarningNoLine{pdfpages}{% I cannot determine the number of pages of the\MessageBreak - included document, while being in DVI mode. You\MessageBreak - can use the option `lastpage' to give me a hint}% + included document, because we are running in\MessageBreak + \ifAM@pkg@demo `demo' mode. + \else DVI mode. + \fi + \MessageBreak + You can use the option `lastpage' to give me a hint}% \edef\AM@pagecount{1}% \fi } diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def index f867ffe3e23..8963c4b4dc7 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4y} +\def\AM@fileversion{v0.5a} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2015-06-15 20:08:28 +0200 $ -\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $ +\AM@Git@Date@process$Date: 2015-07-19 17:18:25 +0200 $ +\AM@Git@SHA@process$SHA-1: e79a333f7b4030269da1c5f48fa2c8d07b41b058 $ \ProvidesFile{pppdftex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for pdfTeX (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def index c37988fa12c..9a7afda381d 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4y} +\def\AM@fileversion{v0.5a} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2015-06-15 20:08:28 +0200 $ -\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $ +\AM@Git@Date@process$Date: 2015-07-19 17:18:25 +0200 $ +\AM@Git@SHA@process$SHA-1: e79a333f7b4030269da1c5f48fa2c8d07b41b058 $ \ProvidesFile{ppvtex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for VTeX (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def index 9fad5dceef1..9769ffaaa67 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4y} +\def\AM@fileversion{v0.5a} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2015-06-15 20:08:28 +0200 $ -\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $ +\AM@Git@Date@process$Date: 2015-07-19 17:18:25 +0200 $ +\AM@Git@SHA@process$SHA-1: e79a333f7b4030269da1c5f48fa2c8d07b41b058 $ \ProvidesFile{ppxetex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for XeTeX (AM)] |