From 3e6b25207e86f8109b30b08f8b7498e932832ca7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 14 Jan 2013 23:33:07 +0000 Subject: tikzscale (14jan13) git-svn-id: svn://tug.org/texlive/trunk@28834 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/tikzscale/test-tikzscale.pdf | Bin 147196 -> 149001 bytes .../doc/latex/tikzscale/test-tikzscale.tex | 78 ++++++++++++--------- .../texmf-dist/doc/latex/tikzscale/tikzscale.pdf | Bin 358999 -> 359330 bytes 3 files changed, 45 insertions(+), 33 deletions(-) (limited to 'Master/texmf-dist/doc/latex') diff --git a/Master/texmf-dist/doc/latex/tikzscale/test-tikzscale.pdf b/Master/texmf-dist/doc/latex/tikzscale/test-tikzscale.pdf index 00b3ea4853e..b6e760fcfcb 100644 Binary files a/Master/texmf-dist/doc/latex/tikzscale/test-tikzscale.pdf and b/Master/texmf-dist/doc/latex/tikzscale/test-tikzscale.pdf differ diff --git a/Master/texmf-dist/doc/latex/tikzscale/test-tikzscale.tex b/Master/texmf-dist/doc/latex/tikzscale/test-tikzscale.tex index 91c3f4518ad..df683a957f8 100644 --- a/Master/texmf-dist/doc/latex/tikzscale/test-tikzscale.tex +++ b/Master/texmf-dist/doc/latex/tikzscale/test-tikzscale.tex @@ -6,18 +6,25 @@ \usepackage{pgfplots} \usepackage{currfile} \usepackage{lmodern} +% Use the package ifpdf to share one test document between pdflatex and latex +\usepackage{ifpdf} % Load the MWE package, although its functionality is not needed. The loading highlights, that some graphics used below are part of the MWE package. \usepackage{mwe} \usetikzlibrary{external} \tikzexternalize % \tikzexternalize[mode=list and make] +\ifpdf +\else + \tikzset{external/system call={latex \tikzexternalcheckshellescape -halt-on-error -interaction=batchmode -jobname "\image" "\texsource"; dvips -o "\image".ps "\image".dvi}} +\fi \begin{document} \section*{Tests} \begin{itemize} \item Test that with externalization, no picture is generated multiple times. - \item Test that there are no warnings without using externalization. + \item Test that there are no warnings with and without using externalization. + \item Test with \texttt{pdflatex} and \texttt{latex} and do not forget to use \texttt{dvips}. \item Normal input command\\% \input{testRectangle.tikz}% \item Use includegraphics with file ending\\% @@ -30,22 +37,8 @@ \includegraphics[width=5cm]{testRectangle}% \item Use includegraphics with scaling while having column width already\\% \includegraphics[width=\linewidth]{linewidth}% - \item Use includegraphics with jpg\\% - \includegraphics{example-grid-100x100bp.jpg}% - \item Use includegraphics with pdf\\% - \includegraphics{example-grid-100x100bp.pdf}% - \item Use includegraphics with png\\% - \includegraphics{example-grid-100x100bp.png}% -% \item Use includegraphics with eps% -% \includegraphics{example-grid-100x100bp.eps}% - \item Use includegraphics with pdf and scaling\\% - \includegraphics[width=0.3\linewidth]{example-grid-100x100bp.pdf}% - \item Use includegraphics with column width\\% - \includegraphics[width=\linewidth]{example-grid-100x100bp.jpg}% \item Use \texttt{input} with pgfplots\\% \input{pgfplots-test.tikz}% - \item Input a 2D pgfplots\\ - \input{testgraphic2D.tikz}% \item Use pgfplots without optional parameter\\% \includegraphics{pgfplots-test}% \item Use pgfplots with given width and height\\% @@ -54,24 +47,43 @@ \includegraphics{testNode.tikz}% % \item Use includegraphics with scaling only a node results in an error\\% % \includegraphics[width=\linewidth]{testNode.tikz}% - \item Use includegraphics with a two dimensional plot\\% - \includegraphics{testgraphic2D.tikz}% - \item Use includegraphics with a scaled two dimensional plot with line width and an axis ratio of 1\\% - \includegraphics[width=\linewidth,axisratio=1]{testgraphic2D.tikz}% - \item Use includegraphics with a scaled two dimensional plot with given height and an axis ratio of 0.5\\% - \includegraphics[height=\linewidth,axisratio=0.5]{testgraphic2D.tikz}% - \item Use includegraphics with a scaled two dimensional plot with given height and an axis ratio of 0.5 and temporarily deactivated externalization\\% - \tikzexternaldisable - \includegraphics[height=\linewidth,axisratio=0.5]{testgraphic2D.tikz}% - \tikzexternalenable - \item Use includegraphics with a scaled two dimensional plot with given height and an axis ratio of 0.5 again\\% - \includegraphics[height=\linewidth,axisratio=0.5]{testgraphic2D.tikz}% - \item Use includegraphics with a scaled two dimensional plot with line width and a default axis ratio\\% - \includegraphics[width=\linewidth]{testgraphic2D.tikz}% - \item Input a two dimensional plot with a tight frame with width \newlength{\mylen}\settowidth{\mylen}{\frame{\input{testgraphic2D.tikz}}}\the\mylen\\% - \frame{\input{testgraphic2D.tikz}} - \item Use a two dimensional plot with a tight frame with width \settowidth{\mylen}{\frame{\includegraphics{testgraphic2D.tikz}}}\the\mylen\\% - \frame{\includegraphics{testgraphic2D.tikz}} + \ifpdf + \item Use includegraphics with jpg\\% + \includegraphics{example-grid-100x100bp.jpg}% + \item Use includegraphics with pdf\\% + \includegraphics{example-grid-100x100bp.pdf}% + \item Use includegraphics with png\\% + \includegraphics{example-grid-100x100bp.png}% + \item Use includegraphics with pdf and scaling\\% + \includegraphics[width=0.3\linewidth]{example-grid-100x100bp.pdf}% + \item Use includegraphics with column width\\% + \includegraphics[width=\linewidth]{example-grid-100x100bp.jpg}% + \item Input a 2D pgfplots\\ + \input{testgraphic2D.tikz}% + \item Use includegraphics with a two dimensional plot\\% + \includegraphics{testgraphic2D.tikz}% + \item Use includegraphics with a scaled two dimensional plot with line width and an axis ratio of 1\\% + \includegraphics[width=\linewidth,axisratio=1]{testgraphic2D.tikz}% + \item Use includegraphics with a scaled two dimensional plot with given height and an axis ratio of 0.5\\% + \includegraphics[height=\linewidth,axisratio=0.5]{testgraphic2D.tikz}% + \item Use includegraphics with a scaled two dimensional plot with given height and an axis ratio of 0.5 and temporarily deactivated externalization\\% + \tikzexternaldisable + \includegraphics[height=\linewidth,axisratio=0.5]{testgraphic2D.tikz}% + \tikzexternalenable + \item Use includegraphics with a scaled two dimensional plot with given height and an axis ratio of 0.5 again\\% + \includegraphics[height=\linewidth,axisratio=0.5]{testgraphic2D.tikz}% + \item Use includegraphics with a scaled two dimensional plot with line width and a default axis ratio\\% + \includegraphics[width=\linewidth]{testgraphic2D.tikz}% + \item Input a two dimensional plot with a tight frame with width \newlength{\mylen}\settowidth{\mylen}{\frame{\input{testgraphic2D.tikz}}}\the\mylen\\% + \frame{\input{testgraphic2D.tikz}} + \item Use a two dimensional plot with a tight frame with width \settowidth{\mylen}{\frame{\includegraphics{testgraphic2D.tikz}}}\the\mylen\\% + \frame{\includegraphics{testgraphic2D.tikz}} + \else + \item Use includegraphics with eps (this is not found within dvi, even without tikzscale)\\% + \includegraphics{example-grid-100x100bp.eps}% + \item Use includegraphics with eps and full path (this is not shown, even without tikzscale)\\% + \includegraphics{/usr/share/texlive/texmf-dist/tex/latex/mwe/example-grid-100x100bp.eps}% + \fi \item Use includegraphics with a histogram of a normal distribution\\% \includegraphics[width=\linewidth,height=0.5\linewidth]{histogramNormal}% \end{itemize} diff --git a/Master/texmf-dist/doc/latex/tikzscale/tikzscale.pdf b/Master/texmf-dist/doc/latex/tikzscale/tikzscale.pdf index 816f99c8608..a66ac1cde97 100644 Binary files a/Master/texmf-dist/doc/latex/tikzscale/tikzscale.pdf and b/Master/texmf-dist/doc/latex/tikzscale/tikzscale.pdf differ -- cgit v1.2.3