diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/easyfig/README | 3 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/easyfig/easyfig.pdf | bin | 186936 -> 158744 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/easyfig/easyfig.dtx | 35 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/easyfig/easyfig.sty | 17 |
4 files changed, 29 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/latex/easyfig/README b/Master/texmf-dist/doc/latex/easyfig/README index ca55ae25a64..603a56a7576 100644 --- a/Master/texmf-dist/doc/latex/easyfig/README +++ b/Master/texmf-dist/doc/latex/easyfig/README @@ -1,7 +1,6 @@ LaTeX package 'easyfig' ~~~~~~~~~~~~~~~~~~~~~~~ -Copyright (c) 2011 by Martin Scharrer <martin@scharrer.me> -WWW: http://latex.scharrer.me/ +Copyright (c) 2011-2012 by Martin Scharrer <martin@scharrer-online.de> CTAN: http://www.ctan.org/pkg/easyfig Code repository: https://bitbucket.org/martin_scharrer/easyfig diff --git a/Master/texmf-dist/doc/latex/easyfig/easyfig.pdf b/Master/texmf-dist/doc/latex/easyfig/easyfig.pdf Binary files differindex e82cfdcb8f7..4e1c83c03aa 100644 --- a/Master/texmf-dist/doc/latex/easyfig/easyfig.pdf +++ b/Master/texmf-dist/doc/latex/easyfig/easyfig.pdf diff --git a/Master/texmf-dist/source/latex/easyfig/easyfig.dtx b/Master/texmf-dist/source/latex/easyfig/easyfig.dtx index 02576e385b5..eecb3431ef5 100644 --- a/Master/texmf-dist/source/latex/easyfig/easyfig.dtx +++ b/Master/texmf-dist/source/latex/easyfig/easyfig.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment %<=*COPYRIGHT> -%% Copyright (C) 2011 by Martin Scharrer <martin@scharrer.me> -%% --------------------------------------------------------------------------- +%% Copyright (C) 2011-2012 by Martin Scharrer <martin@scharrer-online.de> +%% ---------------------------------------------------------------------- %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 %% of this license or (at your option) any later version. @@ -24,10 +24,10 @@ %<*driver> \ProvidesFile{easyfig.dtx}[% %<=*DATE> - 2011/10/31 + 2012/05/06 %<=/DATE> %<=*VERSION> - v1.0 + v1.1 %<=/VERSION> Easily include images as figures] \documentclass{ydoc} @@ -66,7 +66,8 @@ % Right brace \} Tilde \~} % % -% \changes{<+version+>}{<+date+>}{<+log+>} +% \changes{v1.0}{2011/10/31}{Initial release.} +% \changes{v1.1}{2012/05/06}{Fix of "placement" key and non-e-TeX fallback code.} % % \DoNotIndex{\newcommand,\newenvironment} % @@ -201,22 +202,23 @@ % \section{Examples} % % \subsubsection{Simple figure with an image and caption, automated label} -% A default label `|fig:tiger|' is used here. +% A default label `|fig:image|' is used here. % \par\smallskip\noindent -% \Macro\Figure['width=5cm,caption={A tiger}']{tiger} -% \Figure[width=5cm,caption={A tiger}]{tiger} +% \Macro\Figure['width=5cm,caption={An image}']{image} +% \Figure[width=5cm,caption={An image}]{image} % % \subsubsection{Simple figure with an image and caption, manual label} % Normal usage with a manual label. % \par\smallskip\noindent -% \Macro\Figure['width=5cm,caption={Second tiger},label=fig:mytiger']{tiger} -% \Figure[width=5cm,caption={Second tiger},label=fig:mytiger]{tiger} +% \Macro\Figure['width=5cm,caption={Second image},label=fig:myimage']{image} +% \Figure[width=5cm,caption={Second image},label=fig:myimage]{image} % % \subsubsection{Usage of other keys} % Adds a frame around the image which is rotated a little. +% The placement is fixed to top or bottom. % \par\smallskip\noindent -% \Macro\Figure['width=5cm,angle=10,caption={Another tiger},frame']{tiger} -% \Figure[width=5cm,angle=10,caption={Another tiger},frame]{tiger} +% \Macro\Figure['width=5cm,angle=10,position=tb,caption={Another image},frame']{image} +% \Figure[width=5cm,angle=10,placement=tb,caption={Another image},frame]{image} % % \StopEventually{} % \clearpage @@ -380,10 +382,11 @@ \unexpanded{#1},% \easyfig@expandonce\easyfig@default@end }% + }% + \@tempa + \edef\@tempa{% \noexpand\begin\easyfig@env% - \ifx\easyfig@placement\@empty\else - [\easyfig@placement]% - \fi + \easyfig@placement }% \@tempa \easyfig@captionabove{#2}% @@ -412,7 +415,7 @@ \expandafter\expandafter\expandafter\toks@ \expandafter\expandafter\expandafter{\expandafter\the\expandafter\toks@\expandafter,\easyfig@default@end}% \expandafter\@tempa\expandafter{\the\toks@} - \edef\@tempa{\noexpand\begin{\easyfig@env}}% + \edef\@tempa{\noexpand\begin\easyfig@env}% \expandafter\@tempa\easyfig@placement \easyfig@captionabove{#2}% \def\@tempa{\begin{adjustbox}}% diff --git a/Master/texmf-dist/tex/latex/easyfig/easyfig.sty b/Master/texmf-dist/tex/latex/easyfig/easyfig.sty index cdd34a5978e..b7bf73c694c 100644 --- a/Master/texmf-dist/tex/latex/easyfig/easyfig.sty +++ b/Master/texmf-dist/tex/latex/easyfig/easyfig.sty @@ -1,5 +1,5 @@ -%% Copyright (C) 2011 by Martin Scharrer <martin@scharrer.me> -%% --------------------------------------------------------------------------- +%% Copyright (C) 2011-2012 by Martin Scharrer <martin@scharrer-online.de> +%% ---------------------------------------------------------------------- %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 %% of this license or (at your option) any later version. @@ -16,8 +16,8 @@ %% and the derived filebase easyfig.sty. %% \ProvidesPackage{easyfig}[% - 2011/10/31 - v1.0 + 2012/05/06 + v1.1 Easy way to include figures] \RequirePackage{adjustbox} \RequirePackage{xkeyval} @@ -93,10 +93,11 @@ \unexpanded{#1},% \easyfig@expandonce\easyfig@default@end }% + }% + \@tempa + \edef\@tempa{% \noexpand\begin\easyfig@env% - \ifx\easyfig@placement\@empty\else - [\easyfig@placement]% - \fi + \easyfig@placement }% \@tempa \easyfig@captionabove{#2}% @@ -115,7 +116,7 @@ \expandafter\expandafter\expandafter\toks@ \expandafter\expandafter\expandafter{\expandafter\the\expandafter\toks@\expandafter,\easyfig@default@end}% \expandafter\@tempa\expandafter{\the\toks@} - \edef\@tempa{\noexpand\begin{\easyfig@env}}% + \edef\@tempa{\noexpand\begin\easyfig@env}% \expandafter\@tempa\easyfig@placement \easyfig@captionabove{#2}% \def\@tempa{\begin{adjustbox}}% |