From 8a5513026f7211045d0f6e358c4d64b77ee45410 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 15 May 2012 23:33:03 +0000 Subject: easyfig 1.2 (14may12) git-svn-id: svn://tug.org/texlive/trunk@26424 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/easyfig/easyfig.pdf | Bin 158744 -> 245387 bytes Master/texmf-dist/source/latex/easyfig/easyfig.dtx | 40 +++++++++++++++++---- Master/texmf-dist/tex/latex/easyfig/easyfig.sty | 14 ++++++-- 3 files changed, 46 insertions(+), 8 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/easyfig/easyfig.pdf b/Master/texmf-dist/doc/latex/easyfig/easyfig.pdf index 4e1c83c03aa..f3240dc3ac3 100644 Binary files a/Master/texmf-dist/doc/latex/easyfig/easyfig.pdf and b/Master/texmf-dist/doc/latex/easyfig/easyfig.pdf differ diff --git a/Master/texmf-dist/source/latex/easyfig/easyfig.dtx b/Master/texmf-dist/source/latex/easyfig/easyfig.dtx index eecb3431ef5..6bc9372e14d 100644 --- a/Master/texmf-dist/source/latex/easyfig/easyfig.dtx +++ b/Master/texmf-dist/source/latex/easyfig/easyfig.dtx @@ -24,16 +24,18 @@ %<*driver> \ProvidesFile{easyfig.dtx}[% %<=*DATE> - 2012/05/06 + 2012/05/15 %<=/DATE> %<=*VERSION> - v1.1 + v1.2 %<=/VERSION> Easily include images as figures] \documentclass{ydoc} \GetFileInfo{easyfig.dtx} \usepackage{easyfig}[\filedate] \usepackage{flafter} +%\usepackage{mwe} +\graphicspath{{example-}} \EnableCrossrefs \CodelineIndex \RecordChanges @@ -47,7 +49,7 @@ % % \fi % -% \CheckSum{0} +% \CheckSum{207} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -156,6 +158,10 @@ % This key defines the requested placement of the figure. The value is then passed to the optional argument of \env{figure} or \env{figure*}. % Valid positioning characters are `|p|' (page), `|t|' (top), `|b|' (bottom), `|h|' (here) and `|!|' (force) and any additional characters defined by packages (like `|H|'). % +% \DescribeKey{here} +% Using this key the figure is placed at the current position and not using a \env{figure} float. Any \Key{placement} +% key will be ignored. Note that this key is overwritten by any following \Key{twocolumn} key. +% % \DescribeKey{twocolumn} % \DescribeKey{twocolumn}'=true|false' % This boolean key will use the \env{figure*} environment which make the figure span over both columns in a \opt{twocolumn} document. It has the same effect as using \Macro\Figure*, but allows @@ -201,19 +207,19 @@ % % \section{Examples} % -% \subsubsection{Simple figure with an image and caption, automated label} +% \subsection{Simple figure with an image and caption, automated label} % A default label `|fig:image|' is used here. % \par\smallskip\noindent % \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} +% \subsection{Simple figure with an image and caption, manual label} % Normal usage with a manual label. % \par\smallskip\noindent % \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} +% \subsection{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 @@ -330,6 +336,28 @@ % \end{macrocode} % \end{key} % +% \begin{key}{easyfig}{here} +% \begin{macrocode} +\define@key{easyfig}{here}[]{% + \def\easyfig@env{{easyfighere}}% +} +% \end{macrocode} +% \end{key} +% +% +% \begin{environment}{easyfighere} +% \begin{macrocode} +\newenvironment{easyfighere}{% + \trivlist + \def\@captype{figure}% + \item\relax +}{% + \endtrivlist +} +% \end{macrocode} +% \end{environment} +% +% % \begin{key}{easyfig}{twocolumn} % \begin{macrocode} \define@key{easyfig}{twocolumn}[true]{% diff --git a/Master/texmf-dist/tex/latex/easyfig/easyfig.sty b/Master/texmf-dist/tex/latex/easyfig/easyfig.sty index b7bf73c694c..9f19aad4935 100644 --- a/Master/texmf-dist/tex/latex/easyfig/easyfig.sty +++ b/Master/texmf-dist/tex/latex/easyfig/easyfig.sty @@ -16,8 +16,8 @@ %% and the derived filebase easyfig.sty. %% \ProvidesPackage{easyfig}[% - 2012/05/06 - v1.1 + 2012/05/15 + v1.2 Easy way to include figures] \RequirePackage{adjustbox} \RequirePackage{xkeyval} @@ -64,6 +64,16 @@ \define@key{easyfig}{placement}{% \def\easyfig@placement{[#1]}% } +\define@key{easyfig}{here}[]{% + \def\easyfig@env{{easyfighere}}% +} +\newenvironment{easyfighere}{% + \trivlist + \def\@captype{figure}% + \item\relax +}{% + \endtrivlist +} \define@key{easyfig}{twocolumn}[true]{% \begingroup \def\@tempa{#1}% -- cgit v1.2.3