diff options
author | Karl Berry <karl@freefriends.org> | 2009-06-24 16:36:04 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-06-24 16:36:04 +0000 |
commit | f1fef055879de5641d7a1fcfab20d36da85686b2 (patch) | |
tree | 723c74d97a0528b89d48a1c4cb7ede2128d9673a /Master/texmf-dist/doc/latex/floatrow/fr-sample.tex | |
parent | d73a503687f31a927aea191ec9ed3cf1c950fd8f (diff) |
floatrow 0.3a (22jun09)
git-svn-id: svn://tug.org/texlive/trunk@13942 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/floatrow/fr-sample.tex')
-rw-r--r-- | Master/texmf-dist/doc/latex/floatrow/fr-sample.tex | 113 |
1 files changed, 58 insertions, 55 deletions
diff --git a/Master/texmf-dist/doc/latex/floatrow/fr-sample.tex b/Master/texmf-dist/doc/latex/floatrow/fr-sample.tex index 3caa275502a..4dc221db5cf 100644 --- a/Master/texmf-dist/doc/latex/floatrow/fr-sample.tex +++ b/Master/texmf-dist/doc/latex/floatrow/fr-sample.tex @@ -140,51 +140,51 @@ width of graphics. \text }\label{floatbox:FB:fig}} \Text -\ifLoadSubfig - -\clearpage -Example of float with beside caption (see text box~\ref{floatbox:subfloat:text}). -with two subboxes~\subref{subtext:A} and \subref{subtext:B}. -These subfloats are placed inside \env{subfloatrow} environment, left subafloat has width 5\,cm, -second---occupies the rest width of row. -\begin{verbatim} -\floatsetup{subfloatrowsep=qquad} -\begin{textbox} -\ttextbox -{\FRifFBOX\vspace{-\topskip}\fi%for boxed styles -\begin{subfloatrow} -\subfloat[First ...\label{...}]% -{\vbox{\hsize4.5cm...}} - -\subfloat[Second ...\label{...}]% -{\vbox{\hsize\Xhsize...}} -\end{subfloatrow}} -{\caption{The ...}\label{...}} -\end{textbox} -\end{verbatim} - -Since the \verb|\subfloat| macro uses \verb|\vtop| during subfloat building, for -float styles which use boxes you may ought to put before \env{subfloatrow} -environment the compensated space like this: -\begin{verbatim} -\vspace{-\topskip} -\end{verbatim} - -\begin{textbox}[!t] -\ttextbox -{\FRifFBOX\vspace{-\topskip}\fi%for boxed styles -\begin{subfloatrow} -\subfloat[First text box\label{subtext:A}]% -{\vbox{\hsize4.5cm\TEXTBOX}} - -\subfloat[Second text box with long long text\label{subtext:B}]% -{\vbox{\hsize\Xhsize\TEXTBOX}}% -\end{subfloatrow}} -{\caption{The \env{textbox} environment with subfloats. \text}% -\label{floatbox:subfloat:text}} -\end{textbox} - -\text. +\iffalse%LoadSubfig + +%\clearpage +%Example of float with beside caption (see text box~\ref{floatbox:subfloat:text}). +%with two subboxes~\subref{subtext:A} and \subref{subtext:B}. +%These subfloats are placed inside \env{subfloatrow} environment, left subafloat has width 5\,cm, +%second---occupies the rest width of row. +%\begin{verbatim} +%\floatsetup{subfloatrowsep=qquad} +%\begin{textbox} +%\ttextbox +%{\FRifFBOX\vspace{-\topskip}\fi%for boxed styles +%\begin{subfloatrow} +%\subfloat[First ...\label{...}]% +%{\vbox{\hsize4.5cm...}} +% +%\subfloat[Second ...\label{...}]% +%{\vbox{\hsize\Xhsize...}} +%\end{subfloatrow}} +%{\caption{The ...}\label{...}} +%\end{textbox} +%\end{verbatim} +% +%Since the \verb|\subfloat| macro uses \verb|\vtop| during subfloat building, for +%float styles which use boxes you may ought to put before \env{subfloatrow} +%environment the compensated space like this: +%\begin{verbatim} +%\vspace{-\topskip} +%\end{verbatim} +% +%\begin{textbox}[!t] +%\ttextbox +%{\FRifFBOX\vspace{-\topskip}\fi%for boxed styles +%\begin{subfloatrow} +%\subfloat[First text box\label{subtext:A}]% +%{\vbox{\hsize4.5cm\TEXTBOX}} +% +%\subfloat[Second text box with long long text\label{subtext:B}]% +%{\vbox{\hsize\Xhsize\TEXTBOX}}% +%\end{subfloatrow}} +%{\caption{The \env{textbox} environment with subfloats. \text}% +%\label{floatbox:subfloat:text}} +%\end{textbox} +% +%\text. \fi @@ -885,9 +885,11 @@ figure~\ref{fig:wrapfig:WcatII}). \fi\fi +\ifLoadSubcaption \begingroup \providecommand*\subcaption{\captionsetup{subtype*}\caption} \captionsetup[subfloat]{textfont=md,labelfont=up} +\floatsetup[subfloat]{style=plain,framearound=none} \makeatletter \newseparatedlabel\Flabel{\@captype}{sub\@captype} \makeatother @@ -895,18 +897,18 @@ figure~\ref{fig:wrapfig:WcatII}). \clearpage -The small testing example (figures \ref{fig:subrows} and \ref{fig:beside:subrows}) +The small testing example (figures \ref{fig:subrows} and \ref{fig:beside:subrows}) uses both \env{floatrow} and \env{subfloatrow} environment. -For the row of the graphic parts \Fref{sfig:subrows:I} and \Fref{sfig:subrows:II} +For the row of the graphic parts \Fref{sfig:subrows:I} and \Fref{sfig:subrows:II} here is used the starred variant---\env{subfloatrow*}. \begin{figure}% \begin{floatrow}% -\ffigbox{}{\begin{subfloatrow*} +\ffigbox[1.2\hsize]{}{\begin{subfloatrow} \ffigbox{}{\input{Cat.picture}\caption{}\Flabel{sfig:subrows:I}} \ffigbox{}{\input{TheCat.picture}\caption{}\Flabel{sfig:subrows:II}} -\end{subfloatrow*}% +\end{subfloatrow}% \caption{}\label{fig:subrows}}\qquad -\ffigbox{}{\input{BlackCat.picture}\caption{}\label{fig:beside:subrows}} +\ffigbox[.8\hsize-4\fboxsep-4\fboxrule-.5em]{}{\input{BlackCat.picture}\caption{}\label{fig:beside:subrows}} \end{floatrow}% \end{figure}% @@ -916,15 +918,15 @@ here is used the starred variant---\env{subfloatrow*}. The small testing example (figures \ref{fig:subcap} and \ref{fig:beside:subcap}) uses both \env{floatrow} and \env{subfloatrow} environment. For captions of the graphic parts \Fref{sfig:subcap:I} and \Fref{sfig:subcap:II} -is used the |\subcaption| command. +is used the \verb|\subcaption| command. \begin{figure}% \begin{floatrow}% -\ffigbox{}{\begin{subfloatrow} -\ffigbox{}{\input{Cat.picture}\subcaption{}\Flabel{sfig:subcap:I}} -\ffigbox{}{\input{TheCat.picture}\subcaption{}\Flabel{sfig:subcap:II}} +\ffigbox[\FBwidth]{}{\begin{subfloatrow} +\ffigbox[\FBwidth]{}{\input{Cat.picture}\subcaption{}\Flabel{sfig:subcap:I}} +\ffigbox[\FBwidth]{}{\input{TheCat.picture}\subcaption{}\Flabel{sfig:subcap:II}} \end{subfloatrow}% \caption{}\label{fig:subcap}}\qquad -\ffigbox{}{\input{BlackCat.picture}\caption{}\label{fig:beside:subcap}} +\ffigbox[\Xhsize-4\fboxsep-4\fboxrule-.5em]{}{\input{BlackCat.picture}\caption{}\label{fig:beside:subcap}} \end{floatrow}% \end{figure}% @@ -932,4 +934,5 @@ is used the |\subcaption| command. \Text \endgroup +\fi \endinput |