diff options
author | Karl Berry <karl@freefriends.org> | 2021-06-07 20:03:38 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-06-07 20:03:38 +0000 |
commit | 4f7cae33fb83f7ef8ae632b3e8f756731d280db6 (patch) | |
tree | 0170b7d7b763dfbbae1de876992de26b299d7ab8 /Master/texmf-dist/doc | |
parent | 723f761e34ecd654c30c516a525cc99db2b0c47f (diff) |
hvfloat (7jun21)
git-svn-id: svn://tug.org/texlive/trunk@59506 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc')
-rw-r--r-- | Master/texmf-dist/doc/latex/hvfloat/Changes | 3 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/hvfloat/capPos.inc | 129 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/hvfloat/capPos.ltx | 34 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/hvfloat/capPos.tex | 147 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/hvfloat/capVPos.inc | 133 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf | bin | 7111003 -> 7113219 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex | 5 |
7 files changed, 302 insertions, 149 deletions
diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes index 90d8f75e715..18e87aded38 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/Changes +++ b/Master/texmf-dist/doc/latex/hvfloat/Changes @@ -1,4 +1,7 @@ hvfloat.sty: +2.27 2021-06-07 - added \tabcaptionbelow + - fix bug with vertical alignment for top captions + - fix for local caption and subcaption setting 2.26 2021-05-31 - allow option wide in twocolumn mode - allow a stretched minipage for multifloat and multisubfloat by using diff --git a/Master/texmf-dist/doc/latex/hvfloat/capPos.inc b/Master/texmf-dist/doc/latex/hvfloat/capPos.inc new file mode 100644 index 00000000000..0acdf34bf05 --- /dev/null +++ b/Master/texmf-dist/doc/latex/hvfloat/capPos.inc @@ -0,0 +1,129 @@ + +\subsection{\texttt{default}} +\blindtext + +\begin{lstlisting} +\hvFloat{figure}{\includegraphics{frose}}{\capShortText}{} +\end{lstlisting} + +\hvFloat{figure}{\includegraphics{frose}}{\capShortText}{} + +\blindtext + +\begin{lstlisting} +\hvFloat{figure}{\includegraphics{frose}}{\capLongText}{} +\end{lstlisting} + +\hvFloat{figure}{\includegraphics{frose}}{\capLongText}{} + +\blindtext + +\NewColumn + + + +%----------------------top----------------------------------- +\subsection{\texttt{capPos=top}} + +\begin{lstlisting} +\hvFloat[capPos=top]{figure}{\includegraphics{frose}}{\capShortText}{} +\end{lstlisting} + +\hvFloat[capPos=top]{figure}{\includegraphics{frose}}{\capShortText}{} + +\blindtext + +\begin{lstlisting} +\hvFloat[capPos=top]{figure}{\includegraphics{frose}}{\capLongText}{} +\end{lstlisting} + +\hvFloat[capPos=top]{figure}{\includegraphics{frose}}{\capLongText}{} + +\blindtext + +\NewColumn + +%----------------------before----------------------------------- +\subsection{\texttt{capPos=before}, same as \texttt{capPos=left}} + +\begin{lstlisting} +\hvFloat[capPos=before]{figure}{\includegraphics{frose}}{\capShortText}{} +\end{lstlisting} + +\hvFloat[capPos=before]{figure}{\includegraphics{frose}}{\capShortText}{} + +\blindtext + +\begin{lstlisting} +\hvFloat[capPos=before]{figure}{\includegraphics{frose}}{\capLongText}{} +\end{lstlisting} + +\hvFloat[capPos=before]{figure}{\includegraphics{frose}}{\capLongText}{} + +\blindtext +\NewColumn + +%----------------------after----------------------------------- +\subsection{\texttt{capPos=after}, same as \texttt{capPos=right}} + +\begin{lstlisting} +\hvFloat[capPos=after]{figure}{\includegraphics{frose}}{\capShortText}{} +\end{lstlisting} + +\hvFloat[capPos=after]{figure}{\includegraphics{frose}}{\capShortText}{} + +\blindtext + +\begin{lstlisting} +\hvFloat[capPos=after]{figure}{\includegraphics{frose}}{\capLongText}{} +\end{lstlisting} + +\hvFloat[capPos=after]{figure}{\includegraphics{frose}}{\capLongText}{} + +\blindtext + +\NewColumn + +%----------------------inner----------------------------------- +\subsection{\texttt{capPos=inner}} + +\begin{lstlisting} +\hvFloat[capPos=inner]{figure}{\includegraphics{frose}}{\capShortText}{} +\end{lstlisting} + +\hvFloat[capPos=inner]{figure}{\includegraphics{frose}}{\capShortText}{} + +\blindtext + +\begin{lstlisting} +\hvFloat[capPos=inner]{figure}{\includegraphics{frose}}{\capLongText}{} +\end{lstlisting} + +\hvFloat[capPos=inner]{figure}{\includegraphics{frose}}{\capLongText}{} + +\blindtext + +\NewColumn + + +%----------------------outer----------------------------------- +\subsection{\texttt{capPos=outer}} + +\begin{lstlisting} +\hvFloat[capPos=outer]{figure}{\includegraphics{frose}}{\capShortText}{} +\end{lstlisting} + +\hvFloat[capPos=outer]{figure}{\includegraphics{frose}}{\capShortText}{} + +\blindtext + +\begin{lstlisting} +\hvFloat[capPos=outer]{figure}{\includegraphics{frose}}{\capLongText}{} +\end{lstlisting} + +\hvFloat[capPos=outer]{figure}{\includegraphics{frose}}{\capLongText}{} + +\blindtext + +\NewColumn + diff --git a/Master/texmf-dist/doc/latex/hvfloat/capPos.ltx b/Master/texmf-dist/doc/latex/hvfloat/capPos.ltx deleted file mode 100644 index 9fcd593abbe..00000000000 --- a/Master/texmf-dist/doc/latex/hvfloat/capPos.ltx +++ /dev/null @@ -1,34 +0,0 @@ -\documentclass[twoside,DIV=11]{scrartcl} -%% $Id: capPos.ltx 72 2021-05-02 11:40:10Z herbert $ - -\input{preamble.ltx} -\usepackage{multicol} -\usepackage[all=!htb]{hvfloat-fps} - -\setlength\columnseprule{0.4pt} -\def\capShortText{A short caption} -\def\capLongText{Here comes a caption to show the justification of the text relative to the object. It refers to -the optional argument \texttt{capPos}.} - -\let\OrigBlindtext\blindtext -\def\blindtext{\TeX\ is a typesetting language. Instead of visually formatting your text, you enter y -our manuscript text intertwined with \TeX\ commands in a plain text file. You then run \TeX\ to -produce formatted output, such as a PDF file. %Thus, in contrast to standard word processors, -%your document is a separate file that does not pretend to be a representation of the final -%typeset output, and so can be easily edited and manipulated. -} - - - -\begin{document} -\part{Examples for \texttt{capPos} and onecolumn mode}\clearpage -\let\NewColumn\clearpage -\input{capPos} - -\twocolumn[\part{Examples for \texttt{capPos} and twocolumn mode}] -\def\blindtext{\OrigBlindtext} -\let\NewColumn\columnbreak -\input{capPos} - - -\end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/hvfloat/capPos.tex b/Master/texmf-dist/doc/latex/hvfloat/capPos.tex index db2e889f6ee..3887dfd06e4 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/capPos.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/capPos.tex @@ -1,129 +1,50 @@ +\documentclass[twoside,DIV=13]{scrartcl} +%% $Id: capPos.tex 103 2021-05-31 12:37:11Z herbert $ -\section{\texttt{default}} -\blindtext +\input{preamble.ltx} +\usepackage{multicol} +\usepackage[all=!htb]{hvfloat-fps} -\begin{lstlisting} -\hvFloat{figure}{\includegraphics{frose}}{\capShortText}{} -\end{lstlisting} +\setlength\columnseprule{0.4pt} +\def\capShortText{A short caption} +\def\capLongText{Here comes a caption to show the justification of the text relative to the object. It refers to +the optional argument \texttt{capPos}.} -\hvFloat{figure}{\includegraphics{frose}}{\capShortText}{} +\let\OrigBlindtext\blindtext +\def\myblindtext{\TeX\ is a typesetting language. Instead of visually formatting your text, you enter y +our manuscript text intertwined with \TeX\ commands in a plain text file. You then run \TeX\ to +produce formatted output, such as a PDF file. %Thus, in contrast to standard word processors, +%your document is a separate file that does not pretend to be a representation of the final +%typeset output, and so can be easily edited and manipulated. +} -\blindtext -\begin{lstlisting} -\hvFloat{figure}{\includegraphics{frose}}{\capLongText}{} -\end{lstlisting} -\hvFloat{figure}{\includegraphics{frose}}{\capLongText}{} +\begin{document} -\blindtext +\tableofcontents -\NewColumn +\newpage +\section{Examples for \texttt{capPos} and onecolumn mode} +\let\NewColumn\clearpage +\let\blindtext\myblindtext +\input{capPos.inc} +\section{Examples for \texttt{capVPos} and onecolumn mode } +Horizontal alignment with the optional arguments from package \texttt{caption}, e.g. \texttt{singlelinecheck=off} for short captions. -%----------------------top----------------------------------- -\section{\texttt{capPos=top}} +\input{capVPos.inc} -\begin{lstlisting} -\hvFloat[capPos=top]{figure}{\includegraphics{frose}}{\capShortText}{} -\end{lstlisting} -\hvFloat[capPos=top]{figure}{\includegraphics{frose}}{\capShortText}{} +\twocolumn[\section{Examples for \texttt{capPos} and twocolumn mode}] +\let\NewColumn\columnbreak +\input{capPos.inc} -\blindtext +\let\blindtext\OrigBlindtext +\section{Examples for \texttt{capVPos} and twocolumn mode (\texttt{capPos=right})} +\let\NewColumn\columnbreak +\input{capVPos.inc} -\begin{lstlisting} -\hvFloat[capPos=top]{figure}{\includegraphics{frose}}{\capLongText}{} -\end{lstlisting} - -\hvFloat[capPos=top]{figure}{\includegraphics{frose}}{\capLongText}{} - -\blindtext - -\NewColumn - -%----------------------before----------------------------------- -\section{\texttt{capPos=before}, same as \texttt{capPos=left}} - -\begin{lstlisting} -\hvFloat[capPos=before]{figure}{\includegraphics{frose}}{\capShortText}{} -\end{lstlisting} - -\hvFloat[capPos=before]{figure}{\includegraphics{frose}}{\capShortText}{} - -\blindtext - -\begin{lstlisting} -\hvFloat[capPos=before]{figure}{\includegraphics{frose}}{\capLongText}{} -\end{lstlisting} - -\hvFloat[capPos=before]{figure}{\includegraphics{frose}}{\capLongText}{} - -\blindtext -\NewColumn - -%----------------------after----------------------------------- -\section{\texttt{capPos=after}, same as \texttt{capPos=right}} - -\begin{lstlisting} -\hvFloat[capPos=after]{figure}{\includegraphics{frose}}{\capShortText}{} -\end{lstlisting} - -\hvFloat[capPos=after]{figure}{\includegraphics{frose}}{\capShortText}{} - -\blindtext - -\begin{lstlisting} -\hvFloat[capPos=after]{figure}{\includegraphics{frose}}{\capLongText}{} -\end{lstlisting} - -\hvFloat[capPos=after]{figure}{\includegraphics{frose}}{\capLongText}{} - -\blindtext - -\NewColumn - -%----------------------inner----------------------------------- -\section{\texttt{capPos=inner}} - -\begin{lstlisting} -\hvFloat[capPos=inner]{figure}{\includegraphics{frose}}{\capShortText}{} -\end{lstlisting} - -\hvFloat[capPos=inner]{figure}{\includegraphics{frose}}{\capShortText}{} - -\blindtext - -\begin{lstlisting} -\hvFloat[capPos=inner]{figure}{\includegraphics{frose}}{\capLongText}{} -\end{lstlisting} - -\hvFloat[capPos=inner]{figure}{\includegraphics{frose}}{\capLongText}{} - -\blindtext - -\NewColumn - - -%----------------------outer----------------------------------- -\section{\texttt{capPos=outer}} - -\begin{lstlisting} -\hvFloat[capPos=outer]{figure}{\includegraphics{frose}}{\capShortText}{} -\end{lstlisting} - -\hvFloat[capPos=outer]{figure}{\includegraphics{frose}}{\capShortText}{} - -\blindtext - -\begin{lstlisting} -\hvFloat[capPos=outer]{figure}{\includegraphics{frose}}{\capLongText}{} -\end{lstlisting} - -\hvFloat[capPos=outer]{figure}{\includegraphics{frose}}{\capLongText}{} - -\blindtext - -\NewColumn +\end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/hvfloat/capVPos.inc b/Master/texmf-dist/doc/latex/hvfloat/capVPos.inc new file mode 100644 index 00000000000..10ef70e88c0 --- /dev/null +++ b/Master/texmf-dist/doc/latex/hvfloat/capVPos.inc @@ -0,0 +1,133 @@ +%\define@choicekey*+{hvSet}{capVPos}[\val\nr]{bottom,center,top}[center]{% + + +\iffalse +justification= + justified + centering + centerlast + centerfirst + raggedright + RaggedRight + raggedleft +\fi + +\subsection{\texttt{default}, same as \texttt{center}} +\blindtext + +\begin{lstlisting} +\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capShortText}{} +\end{lstlisting} + +\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capShortText}{} + +\blindtext + +\begin{lstlisting} +\hvFloat[capPos=right,capFormat={singlelinecheck=off}]{figure}{\includegraphics{frose}}{\capShortText}{} +\end{lstlisting} + +\hvFloat[capPos=right,capFormat={singlelinecheck=off}]{figure}{\includegraphics{frose}}{\capShortText}{} + +\blindtext + +\begin{lstlisting} +\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capLongText}{} +\end{lstlisting} + +\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capLongText}{} + +\blindtext + +\NewColumn + + + +%----------------------top----------------------------------- +\subsection{\texttt{capVPos=top}} + +\begin{lstlisting} +\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capShortText}{} +\end{lstlisting} + +\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capShortText}{} + +\blindtext + + +\begin{lstlisting} +\hvFloat[capPos=right,capFormat={singlelinecheck=off},capVPos=top]{figure}{\includegraphics{frose}}{\capShortText}{} +\end{lstlisting} + +\hvFloat[capPos=right,capFormat={singlelinecheck=off},capVPos=top]{figure}{\includegraphics{frose}}{\capShortText}{} + +\blindtext + + +\begin{lstlisting} +\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capLongText}{} +\end{lstlisting} + +\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capLongText}{} + +\blindtext + +\NewColumn + +%----------------------bottom----------------------------------- +\subsection{\texttt{capVPos=bottom}} + +\begin{lstlisting} +\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{} +\end{lstlisting} + +\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{} + +\blindtext + + +\begin{lstlisting} +\hvFloat[capPos=right,capFormat={singlelinecheck=off},capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{} +\end{lstlisting} + +\hvFloat[capPos=right,capFormat={singlelinecheck=off},capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{} + +\blindtext + +\begin{lstlisting} +\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capLongText}{} +\end{lstlisting} + +\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capLongText}{} + +\blindtext +\NewColumn + +%----------------------center----------------------------------- +\subsection{\texttt{capPos=center}} + +\begin{lstlisting} +\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{} +\end{lstlisting} + +\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{} + +\blindtext + +\begin{lstlisting} +\hvFloat[capPos=right,capFormat={singlelinecheck=off},capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{} +\end{lstlisting} + +\hvFloat[capPos=right,capFormat={singlelinecheck=off},capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{} + +\blindtext + +\begin{lstlisting} +\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capLongText}{} +\end{lstlisting} + +\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capLongText}{} + +\blindtext + +\NewColumn diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf Binary files differindex 981f685c0a9..ce628eaf57e 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex index 807a63415e4..df1729be272 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex @@ -1,4 +1,4 @@ -%% $Id: hvfloat.tex 103 2021-05-31 12:37:11Z herbert $ +%% $Id: hvfloat.tex 105 2021-06-07 07:30:15Z herbert $ \listfiles \errorcontextlines=100 \documentclass[twoside,paper=a4,]{scrartcl} @@ -261,7 +261,8 @@ be used for own purposes. \begin{BDef} \Lcs{figcaption}\OptArg{short caption text}\Largb{caption text}\\ -\Lcs{tabcaption}\OptArg{short caption text}\Largb{caption text} +\Lcs{tabcaption}\OptArg{short caption text}\Largb{caption text}\\ +\Lcs{tabcaptionbelow}\OptArg{short caption text}\Largb{caption text}\\ \end{BDef} They are used for the \Lkeyword{nonFloat} keyword, where these macros write captions in the same way but outside of |