summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/incgraph/CHANGES9
-rw-r--r--Master/texmf-dist/doc/latex/incgraph/README4
-rw-r--r--Master/texmf-dist/doc/latex/incgraph/incgraph-example-a.pdfbin88917 -> 88924 bytes
-rw-r--r--Master/texmf-dist/doc/latex/incgraph/incgraph-example-b.pdfbin99408 -> 99409 bytes
-rw-r--r--Master/texmf-dist/doc/latex/incgraph/incgraph-example-c.pdfbin92275 -> 92262 bytes
-rw-r--r--Master/texmf-dist/doc/latex/incgraph/incgraph.pdfbin715498 -> 716645 bytes
-rw-r--r--Master/texmf-dist/doc/latex/incgraph/incgraph.tex27
-rw-r--r--Master/texmf-dist/tex/latex/incgraph/incgraph.sty20
8 files changed, 42 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/incgraph/CHANGES b/Master/texmf-dist/doc/latex/incgraph/CHANGES
index aa213cf9c7e..044101a53e6 100644
--- a/Master/texmf-dist/doc/latex/incgraph/CHANGES
+++ b/Master/texmf-dist/doc/latex/incgraph/CHANGES
@@ -1,7 +1,7 @@
-%% The LaTeX package incgraph - version 1.10 (2012/09/28)
+%% The LaTeX package incgraph - version 1.11 (2013/01/16)
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2012 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2012-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -49,3 +49,8 @@ version 1.10 (2012/09/28):
- new keys 'currentpaper', 'graphicspaper' and 'documentpaper'
to replace the deprecated keys 'page' and 'center'
- various internal code changes
+
+version 1.11 (2013/01/16):
+- bug fixed: positioning on even pages for twosided documents
+- bug fixed: option 'paper=document' could not be used inside the preamble
+- added clearpage at begin of inctext
diff --git a/Master/texmf-dist/doc/latex/incgraph/README b/Master/texmf-dist/doc/latex/incgraph/README
index 7bdc701b68f..8246e028056 100644
--- a/Master/texmf-dist/doc/latex/incgraph/README
+++ b/Master/texmf-dist/doc/latex/incgraph/README
@@ -1,7 +1,7 @@
-%% The LaTeX package incgraph - version 1.10 (2012/09/28)
+%% The LaTeX package incgraph - version 1.11 (2013/01/16)
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2012 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2012-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/doc/latex/incgraph/incgraph-example-a.pdf b/Master/texmf-dist/doc/latex/incgraph/incgraph-example-a.pdf
index b9f63200f8f..b8c4ff5b839 100644
--- a/Master/texmf-dist/doc/latex/incgraph/incgraph-example-a.pdf
+++ b/Master/texmf-dist/doc/latex/incgraph/incgraph-example-a.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/incgraph/incgraph-example-b.pdf b/Master/texmf-dist/doc/latex/incgraph/incgraph-example-b.pdf
index 704e9048782..362d9c7b87d 100644
--- a/Master/texmf-dist/doc/latex/incgraph/incgraph-example-b.pdf
+++ b/Master/texmf-dist/doc/latex/incgraph/incgraph-example-b.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/incgraph/incgraph-example-c.pdf b/Master/texmf-dist/doc/latex/incgraph/incgraph-example-c.pdf
index 3b830d85298..59ee0ff66ba 100644
--- a/Master/texmf-dist/doc/latex/incgraph/incgraph-example-c.pdf
+++ b/Master/texmf-dist/doc/latex/incgraph/incgraph-example-c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/incgraph/incgraph.pdf b/Master/texmf-dist/doc/latex/incgraph/incgraph.pdf
index c5c6e4a629f..7f952b25679 100644
--- a/Master/texmf-dist/doc/latex/incgraph/incgraph.pdf
+++ b/Master/texmf-dist/doc/latex/incgraph/incgraph.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/incgraph/incgraph.tex b/Master/texmf-dist/doc/latex/incgraph/incgraph.tex
index 40236bc1d7b..f98a8b82a34 100644
--- a/Master/texmf-dist/doc/latex/incgraph/incgraph.tex
+++ b/Master/texmf-dist/doc/latex/incgraph/incgraph.tex
@@ -1,9 +1,9 @@
% \LaTeX-Main\
-%% The LaTeX package incgraph - version 1.10 (2012/09/28)
+%% The LaTeX package incgraph - version 1.11 (2013/01/16)
%% incgraph.sty: Manual
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2012 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2012-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -61,8 +61,8 @@
pdfkeywords={graphics inclusion page}
}
-\def\version{1.10}%
-\def\datum{2012/09/28}%
+\def\version{1.11}%
+\def\datum{2013/01/16}%
\makeindex
@@ -113,7 +113,18 @@
\tableofcontents
-\clearpage
+\begin{inctext}[paper=graphics]
+ \begin{tcolorbox}[title={Caveat\hfill --- Page \thepage\ ---},
+ colframe=red!65!black,colback=red!10!white,fonttitle=\Large\bfseries,
+ fontupper=\large,arc=0mm]
+ This documentation contains a lot of effects which can only be seen
+ when viewed on a computer screen. If you read this text on paper, you
+ will not notice the paper resizing and the bookmarks. Also, pages in landscape may probably
+ be rotated by your printer.
+ \end{tcolorbox}
+\end{inctext}
+
+
%--------------------------------------
\section{Introduction}
\subsection{Motivation}
@@ -333,7 +344,7 @@ the package |graphicx| \cite{carlisle:1999a}.
\end{docIgrKey}
\begin{docIgrKey}{paper}{=\meta{name}}{no default}
- The paper sized is chosen according to the given \meta{name}.
+ The paper size is chosen according to the given \meta{name}.
Feasible values for the \meta{name} are
|current|, |document|, |graphics|,
|a0|, |a1|, |a2|, |a3|, |a4|, |a5|, |a6|, |a7|, |a8|, |a9|, |a10|,
@@ -640,7 +651,7 @@ see page~\pageref{exarotated.listing}.
In this scenario, we have some scans (or images from whatever source) which
should be combined to a PDF document for our paperless office.
The paper size of the PDF document is set to a standard paper (here: letter size)
-if the document has to be printed.
+to allow the document to be printed.
The following Example \ref{somescans} is a complete template for such a document.
Here, the images |example.jpg|,
@@ -749,7 +760,7 @@ See the result on the following page.
In Example \ref{fullpaperdrawing2}, nearly the same |tikzpicture| is drawn.
-This time, the whole environment is put inside an \refCom{igrcenter} macro which puts the drawing
+This time, the current paper size is used which puts the drawing
on a separate page but without resizing the paper.
To draw seamlessly, the document paper size of 21cm to 29.7cm is used
directly inside the |tikzpicture|.
diff --git a/Master/texmf-dist/tex/latex/incgraph/incgraph.sty b/Master/texmf-dist/tex/latex/incgraph/incgraph.sty
index 5020e69c43f..040db66ac46 100644
--- a/Master/texmf-dist/tex/latex/incgraph/incgraph.sty
+++ b/Master/texmf-dist/tex/latex/incgraph/incgraph.sty
@@ -1,8 +1,8 @@
-%% The LaTeX package incgraph - version 1.10 (2012/09/28)
+%% The LaTeX package incgraph - version 1.11 (2013/01/16)
%% incgraph.sty: Graphics inclusion page
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2012 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2012-2013 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{incgraph}[2012/09/28 version 1.10 LaTeX special graphics inclusion]
+\ProvidesPackage{incgraph}[2013/01/16 version 1.11 LaTeX special graphics inclusion]
\DeclareOption{pgf}{\def\igrreq@pgf{\RequirePackage{pgf}[2008/01/15]\RequirePackage{pgffor}}}%
\DeclareOption{nopgf}{\def\igrreq@pgf{}}%
@@ -104,7 +104,15 @@
%
\igr@length=-1in%
\advance\igr@length by -\hoffset%
- \advance\igr@length by -\@themargin%
+ \if@twoside
+ \ifodd\c@page
+ \advance\igr@length by -\oddsidemargin%
+ \else
+ \advance\igr@length by -\evensidemargin%
+ \fi
+ \else
+ \advance\igr@length by -\oddsidemargin%
+ \fi%
\edef\igr@offx@left{\the\igr@length}%
%
\igr@length=\pdfpagewidth%
@@ -273,7 +281,7 @@
\igrset{#1}%
\igr@match@hook%
\igr@nextAutoTarget%
- \begin{lrbox}{\igrbox}%
+ \clearpage\begin{lrbox}{\igrbox}%
}{%
\unskip\ifx\igr@label@text\igr@empty\else\label{\igr@label@text}\fi\end{lrbox}%
\igr@length=\wd\igrbox%
@@ -380,7 +388,7 @@
no overlay/.code={\let\igr@overlay=\igr@overlay@off},
portrait/.code={\def\igr@turn{port}},
landscape/.code={\def\igr@turn{land}},
- paper size/.code args={#1:#2}{\edef\igr@target@width{#1}\edef\igr@target@height{#2}\let\igr@output=\igr@out@center@fit},
+ paper size/.code args={#1:#2}{\def\igr@target@width{#1}\def\igr@target@height{#2}\let\igr@output=\igr@out@center@fit},
a0paper/.style={paper size=841mm:1189mm},
a1paper/.style={paper size=594mm:841mm},
a2paper/.style={paper size=420mm:594mm},