From 5de813ce85e2ea79a1db7cdccd7ed2fe2dc5171e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 18 Sep 2010 00:12:52 +0000 Subject: svg-inkscape update (23aug10) git-svn-id: svn://tug.org/texlive/trunk@19788 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/svg-inkscape/InkscapePDFLaTeX.pdf | Bin 199035 -> 204793 bytes .../doc/latex/svg-inkscape/InkscapePDFLaTeX.tex | 31 ++++++---- Master/texmf-dist/doc/latex/svg-inkscape/README | 10 ++- Master/texmf-dist/doc/latex/svg-inkscape/image.pdf | Bin 6634 -> 6641 bytes .../doc/latex/svg-inkscape/image.pdf_tex | 67 +++++++++++++++++++++ Master/texmf-dist/doc/latex/svg-inkscape/image.tex | 55 ----------------- 6 files changed, 90 insertions(+), 73 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/svg-inkscape/image.pdf_tex delete mode 100644 Master/texmf-dist/doc/latex/svg-inkscape/image.tex diff --git a/Master/texmf-dist/doc/latex/svg-inkscape/InkscapePDFLaTeX.pdf b/Master/texmf-dist/doc/latex/svg-inkscape/InkscapePDFLaTeX.pdf index a933f09010d..ac3eebcc9c7 100644 Binary files a/Master/texmf-dist/doc/latex/svg-inkscape/InkscapePDFLaTeX.pdf and b/Master/texmf-dist/doc/latex/svg-inkscape/InkscapePDFLaTeX.pdf differ diff --git a/Master/texmf-dist/doc/latex/svg-inkscape/InkscapePDFLaTeX.tex b/Master/texmf-dist/doc/latex/svg-inkscape/InkscapePDFLaTeX.tex index d49517d78fd..ccfe8cfdc45 100644 --- a/Master/texmf-dist/doc/latex/svg-inkscape/InkscapePDFLaTeX.tex +++ b/Master/texmf-dist/doc/latex/svg-inkscape/InkscapePDFLaTeX.tex @@ -1,6 +1,3 @@ -% Author: Johan B. C. Engelen, 2010 -% Version: 2010-06-10 - \documentclass[final,3p,twocolumn]{elsarticle} \usepackage{xcolor} @@ -39,7 +36,7 @@ \executeiffilenewer{#1.svg}{#1.pdf}% {inkscape -z -D --file=#1.svg % --export-pdf=#1.pdf --export-latex}% - \input{#1.tex}% + \input{#1.pdf_tex}% } \begin{document} \begin{frontmatter} @@ -64,7 +61,7 @@ Because typesetting of the text is done by \LaTeX, \LaTeX\ commands can be used %\end{keyword} \end{frontmatter} -%########################################################################### +%########################################################################## \begin{figure} \centering @@ -116,23 +113,32 @@ Note the added {\small\verb|--export-latex|} option. \section{Including the image in LaTeX} -The image should be included in the document by inputting the {\small\verb|.tex|} file created by Inkscape. It is possible to set the width of the image by defining {\small\verb|\svgwidth|}: +The image should be included in the document by inputting the {\small\verb|.pdf_tex|} file created by Inkscape. It is possible to set the width of the image by defining {\small\verb|\svgwidth|}: \begin{verbatim} \begin{figure} \centering \def\svgwidth{\columnwidth} - \input{image.tex} + \input{image.pdf_tex} \end{figure} \end{verbatim} -The {\small\verb|.tex|} file created by Inkscape contains a {\small\verb|picture|} environment, that includes the PDF exported by Inkscape and places text on top of it. The result is figure~\ref{fig:pdflatex}, note that the font exactly matches the document's font, and the link to the equation works. If no width is specified, the image will have its original width. The {\small\verb|\svgwidth|} is forgotten after including a figure, so one must redefine the width for each figure ({\small\verb|\svgwidth|} is set empty by {\small\verb|image.tex|}). +The {\small\verb|.pdf_tex|} file created by Inkscape contains a {\small\verb|picture|} environment, that includes the PDF exported by Inkscape and places text on top of it. The result is figure~\ref{fig:pdflatex}, note that the font exactly matches the document's font, and the link to the equation works. If no width is specified, the image will have its original width. The {\small\verb|\svgwidth|} is forgotten after including a figure, so one must redefine the width for each figure ({\small\verb|\svgwidth|} is set empty by {\small\verb|image.pdf_tex|}). -\subsection{When images are not in document root} +\subsection{When images are not in the document's directory} When images are not located in the document's directory, but in a sub-directory, one has to add that directory to the graphics search path (unfortunately). For example, if one's images are in sub-directory {\small\verb|images|}, add the following to the preamble: \begin{verbatim} \graphicspath{{images/}} \end{verbatim} +Alternatively, when the images are not in a sub-directory of the document, they can be accessed with the {\small\verb|import|} package, adding +\begin{verbatim} +\usepackage{import} +\end{verbatim} +to the preamble, and including the image with +\begin{verbatim} +\import{//}{.tex} +\end{verbatim} + \subsection{Automatic export} (`write18' must be enabled, see the {\small\verb|epstopdf|} package documentation. Add {\small\verb|-shell-escape|} to the command line when calling {\small\verb|pdflatex|}.) @@ -157,7 +163,7 @@ Add the following code to the preamble of your document: \executeiffilenewer{#1.svg}{#1.pdf}% {inkscape -z -D --file=#1.svg % --export-pdf=#1.pdf --export-latex}% - \input{#1.tex}% + \input{#1.pdf_tex}% } \end{verbatim} @@ -191,10 +197,11 @@ This is shown in figure~\ref{fig:otherfont}, where the same image file is includ \renewcommand{\rmdefault}{mdput}\rmfamily \section{Known bugs and limitations} -There are no bugs known to me. Do contact me if you find one! +Please report any bug you find on \url{https://bugs.launchpad.net/inkscape}. -There are some limitations. +There are some known limitations/bugs. \begin{itemize} + \item Exporting to EPS+\LaTeX{}, the bounding box is always set snugly around the drawing \emph{without} text. There is debate about whether this is a bug in Inkscape or not. This becomes a problem when text is desired `outside' the other parts of the drawing. A workaround is drawing a rectangle with zero stroke width as bounding box around the drawing. Alternatively, one can export to PS+\LaTeX{} instead and renaming the resulting {\small\verb|.ps|} file to {\small\verb|.eps|}. See \url{https://bugs.launchpad.net/inkscape/+bug/595821}. \item Flowed text is only exported for rectangular flow shapes. \item There are no other scaling options beside specifying the width. \end{itemize} diff --git a/Master/texmf-dist/doc/latex/svg-inkscape/README b/Master/texmf-dist/doc/latex/svg-inkscape/README index e8ec1e4e5c6..5423152b6db 100644 --- a/Master/texmf-dist/doc/latex/svg-inkscape/README +++ b/Master/texmf-dist/doc/latex/svg-inkscape/README @@ -11,7 +11,7 @@ PDF+LaTeX using Inkscape. ------------------------------------------------------------------- Author: Johan B. C. Engelen (goejendaagh at zonnet.nl) Copyright 2010 J.B.C. Engelen - Version 2010-06-10 + Version 2010-07-07 This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either @@ -29,9 +29,7 @@ README (this file) image.svg InkscapePDFLaTeX.tex and the derived files -image-normal.pdf (image.svg exported without PDF+LaTeX option) -image.pdf (image.svg exported with PDF+LaTeX option) -image.tex (image.svg exported with PDF+LaTeX option) +image-normal.pdf (image.svg exported without PDF+LaTeX option) +image.pdf (image.svg exported with PDF+LaTeX option) +image.pdf_tex (image.svg exported with PDF+LaTeX option) InkscapePDFLaTeX.pdf -------------------------------------------------------------------- - diff --git a/Master/texmf-dist/doc/latex/svg-inkscape/image.pdf b/Master/texmf-dist/doc/latex/svg-inkscape/image.pdf index cb580cde261..b710c16c389 100644 Binary files a/Master/texmf-dist/doc/latex/svg-inkscape/image.pdf and b/Master/texmf-dist/doc/latex/svg-inkscape/image.pdf differ diff --git a/Master/texmf-dist/doc/latex/svg-inkscape/image.pdf_tex b/Master/texmf-dist/doc/latex/svg-inkscape/image.pdf_tex new file mode 100644 index 00000000000..e27f06664e0 --- /dev/null +++ b/Master/texmf-dist/doc/latex/svg-inkscape/image.pdf_tex @@ -0,0 +1,67 @@ +%% Creator: Inkscape 0.47+devel, www.inkscape.org +%% PDF/EPS/PS + LaTeX output extension by Johan Engelen, 2010 +%% Accompanies image file 'image.pdf' (pdf, eps, ps) +%% +%% To include the image in your LaTeX document, write +%% \input{.pdf_tex} +%% instead of +%% \includegraphics{.pdf} +%% To scale the image, write +%% \def\svgwidth{} +%% \input{.pdf_tex} +%% instead of +%% \includegraphics[width=]{.pdf} +%% +%% Images with a different path to the parent latex file can +%% be accessed with the `import' package (which may need to be +%% installed) using +%% \usepackage{import} +%% in the preamble, and then including the image with +%% \import{}{.pdf_tex} +%% Alternatively, one can specify +%% \graphicspath{{/}} +%% +%% For more information, please see info/svg-inkscape on CTAN: +%% http://tug.ctan.org/tex-archive/info/svg-inkscape + +\begingroup + \makeatletter + \providecommand\color[2][]{% + \errmessage{(Inkscape) Color is used for the text in Inkscape, but the package 'color.sty' is not loaded} + \renewcommand\color[2][]{}% + } + \providecommand\transparent[1]{% + \errmessage{(Inkscape) Transparency is used (non-zero) for the text in Inkscape, but the package 'transparent.sty' is not loaded} + \renewcommand\transparent[1]{}% + } + \providecommand\rotatebox[2]{#2} + \ifx\svgwidth\undefined + \setlength{\unitlength}{212.525pt} + \else + \setlength{\unitlength}{\svgwidth} + \fi + \global\let\svgwidth\undefined + \makeatother + \begin{picture}(1,0.73650159)% + \put(0,0){\includegraphics[width=\unitlength]{image.pdf}}% + \put(0.63829642,0.6742451){\color[rgb]{0,0,0}\makebox(0,0)[lb]{\smash{\emph{Inkscape}}}}% + \put(0.84173702,0.1474823){\color[rgb]{1,0,0}\makebox(0,0)[lb]{\smash{red}}}% + \put(0.02294317,0.07460173){\color[rgb]{0,0,0}\rotatebox{45}{\makebox(0,0)[lb]{\smash{45 graden}}}}% + \put(0.69834718,0.60455928){\color[rgb]{0,0,0}\makebox(0,0)[b]{\smash{$\lim_{n \to \infty}\sum_{k=1}^n \frac{1}{k^2}$}}}% + \put(0.11403042,0.69180401){\color[rgb]{0,0,0}\makebox(0,0)[lb]{\smash{Einstein \eqref{eq:emc2}}}}% + \put(0.81701383,0.48297822){\color[rgb]{0,0,0}\makebox(0,0)[b]{\smash{ooo}}}% + \put(0.46667722,0.21504382){\color[rgb]{0,0,0}\makebox(0,0)[lt]{\begin{minipage}{0.21488139\unitlength}\tiny Flowed text also works. This is a test text to see that it \emph{does} work. \\ But, it only works for rectangular flow shapes.\end{minipage}}}% + \put(0.77784162,0.05718502){\color[rgb]{0,0,1}\makebox(0,0)[lb]{\smash{blue}}}% + \put(0.81761682,0.10755617){\color[rgb]{0,1,0}\makebox(0,0)[lb]{\smash{green}}}% + \put(0.10913692,0.04673474){\color[rgb]{0,0,0}\makebox(0,0)[lb]{\smash{aligned on baseline}}}% + \put(0.04733209,0.57343337){\color[rgb]{0,0,0}\rotatebox{-90}{\makebox(0,0)[lb]{\smash{90 degrees}}}}% + \put(0.18024362,0.37750422){\color[rgb]{0,0,0}\rotatebox{90}{\makebox(0,0)[lb]{\smash{90 degrees}}}}% + \put(0.81701383,0.52121809){\color[rgb]{0,0,0}\makebox(0,0)[lb]{\smash{ooo}}}% + \put(0.81701383,0.44838027){\color[rgb]{0,0,0}\makebox(0,0)[rb]{\smash{ooo}}}% + \put(0.51430473,0.53384586){\color[rgb]{0,0,0}\makebox(0,0)[lb]{\smash{$x$}}}% + \put(0.55894148,0.51324431){\color[rgb]{0,0,0}\makebox(0,0)[lb]{\smash{$y$}}}% + \put(0.60701188,0.48749228){\color[rgb]{0,0,0}\makebox(0,0)[lb]{\smash{$z$}}}% + \put(0.5006922,0.34645132){\color[rgb]{0,0,0}\rotatebox{-36.04952341}{\makebox(0,0)[rb]{\smash{TikZ this$\rightarrow$}}}}% + \put(0.72968311,0.2568264){\color[rgb]{0,0,1}\transparent{0.5}\makebox(0,0)[lb]{\smash{transparent}}}% + \end{picture}% +\endgroup diff --git a/Master/texmf-dist/doc/latex/svg-inkscape/image.tex b/Master/texmf-dist/doc/latex/svg-inkscape/image.tex deleted file mode 100644 index 5f88322a38f..00000000000 --- a/Master/texmf-dist/doc/latex/svg-inkscape/image.tex +++ /dev/null @@ -1,55 +0,0 @@ -%% Creator: Inkscape 0.47+devel, www.inkscape.org -%% PDF/EPS/PS + LaTeX output extension by Johan Engelen, 2010 -%% Accompanies image file 'image' (pdf, eps, ps) -%% -%% To include the image in your LaTeX document, write -%% \input{.tex} -%% instead of -%% \includegraphics{.pdf} -%% To scale the image, write -%% \def{\svgwidth}{} -%% \input{.tex} -%% instead of -%% \includegraphics[width=]{.pdf} - -\begingroup - \makeatletter - \providecommand\color[2][]{% - \errmessage{(Inkscape) Color is used for the text in Inkscape, but the package 'color.sty' is not loaded} - \renewcommand\color[2][]{}% - } - \providecommand\transparent[1]{% - \errmessage{(Inkscape) Transparency is used (non-zero) for the text in Inkscape, but the package 'transparent.sty' is not loaded} - \renewcommand\transparent[1]{}% - } - \providecommand\rotatebox[2]{#2} - \ifx\svgwidth\undefined - \setlength{\unitlength}{212.52797852pt} - \else - \setlength{\unitlength}{\svgwidth} - \fi - \global\let\svgwidth\undefined - \makeatother - \begin{picture}(1,0.7364969)% - \put(0,0){\includegraphics[width=\unitlength]{image}}% - \put(0.63831234,0.67423646){\color[rgb]{0,0,0}\makebox(0,0)[lb]{\smash{\emph{Inkscape}}}}% - \put(0.8417501,0.14748104){\color[rgb]{1,0,0}\makebox(0,0)[lb]{\smash{red}}}% - \put(0.02296771,0.07460149){\color[rgb]{0,0,0}\rotatebox{45}{\makebox(0,0)[lb]{\smash{45 graden}}}}% - \put(0.69836227,0.60455161){\color[rgb]{0,0,0}\makebox(0,0)[b]{\smash{$\lim_{n \to \infty}\sum_{k=1}^n \frac{1}{k^2}$}}}% - \put(0.11405369,0.69179512){\color[rgb]{0,0,0}\makebox(0,0)[lb]{\smash{Einstein \eqref{eq:emc2}}}}% - \put(0.81702725,0.48297226){\color[rgb]{0,0,0}\makebox(0,0)[b]{\smash{ooo}}}% - \put(0.46669555,0.21504161){\color[rgb]{0,0,0}\makebox(0,0)[lt]{\begin{minipage}{0.21487837\unitlength}\tiny Flowed text also works. This is a test text to see that it \emph{does} work. \\ But, it only works for rectangular flow shapes.\end{minipage}}}% - \put(0.77785559,0.05718503){\color[rgb]{0,0,1}\makebox(0,0)[lb]{\smash{blue}}}% - \put(0.81763023,0.10755546){\color[rgb]{0,1,0}\makebox(0,0)[lb]{\smash{green}}}% - \put(0.10916026,0.04673489){\color[rgb]{0,0,0}\makebox(0,0)[lb]{\smash{aligned on baseline}}}% - \put(0.0473563,0.57342614){\color[rgb]{0,0,0}\rotatebox{-90}{\makebox(0,0)[lb]{\smash{90 degrees}}}}% - \put(0.18026596,0.37749973){\color[rgb]{0,0,0}\rotatebox{90}{\makebox(0,0)[lb]{\smash{90 degrees}}}}% - \put(0.81702725,0.52121159){\color[rgb]{0,0,0}\makebox(0,0)[lb]{\smash{ooo}}}% - \put(0.81702725,0.44837479){\color[rgb]{0,0,0}\makebox(0,0)[rb]{\smash{ooo}}}% - \put(0.51432239,0.53383918){\color[rgb]{0,0,0}\makebox(0,0)[lb]{\smash{$x$}}}% - \put(0.55895852,0.51323792){\color[rgb]{0,0,0}\makebox(0,0)[lb]{\smash{$y$}}}% - \put(0.60702825,0.48748625){\color[rgb]{0,0,0}\makebox(0,0)[lb]{\smash{$z$}}}% - \put(0.50071006,0.34644727){\color[rgb]{0,0,0}\rotatebox{-36.04952341}{\makebox(0,0)[rb]{\smash{TikZ this$\rightarrow$}}}}% - \put(0.72969776,0.25682361){\color[rgb]{0,0,1}\transparent{0.5}\makebox(0,0)[lb]{\smash{transparent}}}% - \end{picture}% -\endgroup -- cgit v1.2.3