From 231dbd9437553b69b7de2117d6b2087fcdb443a4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 30 Mar 2018 21:16:39 +0000 Subject: easyfig (30mar18) git-svn-id: svn://tug.org/texlive/trunk@47193 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/easyfig/easyfig.dtx | 32 ++++++++++++++-------- 1 file changed, 21 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/source/latex') diff --git a/Master/texmf-dist/source/latex/easyfig/easyfig.dtx b/Master/texmf-dist/source/latex/easyfig/easyfig.dtx index 6bc9372e14d..7581db0de4a 100644 --- a/Master/texmf-dist/source/latex/easyfig/easyfig.dtx +++ b/Master/texmf-dist/source/latex/easyfig/easyfig.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment %<=*COPYRIGHT> -%% Copyright (C) 2011-2012 by Martin Scharrer +%% Copyright (C) 2011-2018 by Martin Scharrer %% ---------------------------------------------------------------------- %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -24,10 +24,10 @@ %<*driver> \ProvidesFile{easyfig.dtx}[% %<=*DATE> - 2012/05/15 + 2018/03/30 %<=/DATE> %<=*VERSION> - v1.2 + v1.2a %<=/VERSION> Easily include images as figures] \documentclass{ydoc} @@ -41,6 +41,8 @@ \RecordChanges \OnlyDescription \optionaloff +\def\textfraction{0.2} +\def\bottomfraction{0.8} \begin{document} \DocInput{\jobname.dtx} \PrintChanges @@ -70,12 +72,14 @@ % % \changes{v1.0}{2011/10/31}{Initial release.} % \changes{v1.1}{2012/05/06}{Fix of "placement" key and non-e-TeX fallback code.} +% \changes{v1.2}{2012/05/15}{Added "here" key.} +% \changes{v1.2a}{2018/03/30}{Updated manual to mentioned \pkg{adjustbox} as alternative.} % % \DoNotIndex{\newcommand,\newenvironment} % % \GetFileInfo{easyfig.dtx} % \author{Martin Scharrer} -% \email{martin@scharrer.me} +% \email{martin@scharrer-online.de} % \ifdefined\repository % \repository{https://bitbucket.org/martin_scharrer/easyfig} % \fi @@ -85,12 +89,15 @@ % \begin{abstract}\noindent % This package aims to simplify the most common usage of \env{figure} environments % to include a single image with a caption and label. +% +% Current versions of the \pkg{adjustbox} package now provide keys for turning an image or other content into a +% float or non-float inclusive a caption. This makes this package quite redundant. % \end{abstract} % % \section{Introduction} % A very high percentage of all \LaTeX\ figures aim to simply display a simple image with a caption and label. % A common way to code this is: -% \begin{lstlisting}[gobble=4,numbers=none] +% \begin{lstlisting}[gobble=4,numbers=none,language={[latex]tex}] % \begin{figure} % \centering % \includegraphics[]{} @@ -205,26 +212,29 @@ % This key can be used to add a margin (white space) around the image. % % +% \clearpage % \section{Examples} % % \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} +% \Macro\Figure['width=10cm,caption={An image}']{image} +% \Figure[width=10cm,caption={An image}]{image} % +% \clearpage % \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} +% \Macro\Figure['width=10cm,caption={Second image},label=fig:myimage']{image} +% \Figure[width=10cm,caption={Second image},label=fig:myimage]{image} % +% \clearpage % \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 -% \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} +% \Macro\Figure['width=10cm,angle=10,position=tb,caption={Another image},frame']{image} +% \Figure[width=10cm,angle=10,placement=tb,caption={Another image},frame]{image} % % \StopEventually{} % \clearpage -- cgit v1.2.3