summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-29 22:32:19 +0000
committerKarl Berry <karl@freefriends.org>2017-01-29 22:32:19 +0000
commit687ffbc778abf7b367ab1c6ed91c016e8138c2ad (patch)
tree98768d84ac615469355497157eaaca149ccebd63
parentb23b02a3137e6430337ced526eb6394b260901d7 (diff)
hvfloat (29jan17)
git-svn-id: svn://tug.org/texlive/trunk@43083 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/Changes9
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/README9
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/doc/bateaux.jpg (renamed from Master/texmf-dist/doc/latex/hvfloat/bateaux.jpg)bin45694 -> 45694 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/doc/hvfloat.pdfbin0 -> 364629 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/doc/hvfloat.tex (renamed from Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex)49
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/doc/rose.png (renamed from Master/texmf-dist/doc/latex/hvfloat/rose.png)bin2493 -> 2493 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdfbin330767 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/latex/hvfloat.sty (renamed from Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty)34
8 files changed, 58 insertions, 43 deletions
diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes
new file mode 100644
index 00000000000..bc82c78999f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/Changes
@@ -0,0 +1,9 @@
+hvfloat.sty:
+1.2 2017-04-28 - fix bug with caption (no entry in lof)
+1.1 2012-03-04 - added environment hvFloatEnv
+ - don't load package ifthen
+ - load package caption by default
+0.9 2003 Rotating floating objects and captions in different ways
+
+hvfloat.tex: the source of the documentation
+
diff --git a/Master/texmf-dist/doc/latex/hvfloat/README b/Master/texmf-dist/doc/latex/hvfloat/README
index 7bcfd0f9254..e7110daa55c 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/README
+++ b/Master/texmf-dist/doc/latex/hvfloat/README
@@ -1,8 +1,5 @@
-hvfloat.sty:
-1.1 2012-03-04 - added environment hvFloatEnv
- - don't load package ifthen
- - load package caption by default
-0.9 2003 Rotating floating objects and captions in different ways
+hvfloat
-hvfloat.tex: the source of the documentation
+Placing figures/tables with various options, like rotating
+the image/table and/or caption.
diff --git a/Master/texmf-dist/doc/latex/hvfloat/bateaux.jpg b/Master/texmf-dist/doc/latex/hvfloat/doc/bateaux.jpg
index bbf5485f076..bbf5485f076 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/bateaux.jpg
+++ b/Master/texmf-dist/doc/latex/hvfloat/doc/bateaux.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/doc/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/doc/hvfloat.pdf
new file mode 100644
index 00000000000..8203da1d3bb
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/doc/hvfloat.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex b/Master/texmf-dist/doc/latex/hvfloat/doc/hvfloat.tex
index 65bbf3882a4..96be0774592 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/doc/hvfloat.tex
@@ -1,11 +1,9 @@
\listfiles
-\documentclass{article}
+\documentclass{scrartcl}
\usepackage[T1]{fontenc}
-\usepackage[latin1]{inputenc}
-%\usepackage{mathptmx}
-%\usepackage[scaled=0.92]{helvet}
-\usepackage{courier}
-\usepackage{comment}
+\usepackage{libertine}
+\usepackage[scaled=0.88]{beramono}
+\usepackage[utf8]{inputenc}
\usepackage{listings}
%
\lstset{%
@@ -23,22 +21,26 @@
breaklines=true}
%
\usepackage[fbox]{hvfloat}
+\let\hvVersion\fileversion
\usepackage{graphicx}
\usepackage{url}
\usepackage{tabularx}
\usepackage{lscape}
\usepackage{multicol}
-\usepackage[pdftitle={hvfloat - Rotating Objects and Captions}, pdfauthor={Herbert Voß}, urlcolor=blue, linktocpage, a4paper, colorlinks=true]{hyperref}
+\usepackage[urlcolor=blue, linktocpage, a4paper, colorlinks=true]{hyperref}
%
\newcommand\CMD[1]{{\small\ttfamily\textbackslash{}#1}}
\newcommand\ENV[1]{{\small\ttfamily#1} Environment}
%
\begin{document}
-\title{Package \texttt{hvfloat}\\Rotating objects and captions\\ver 1.1}
-\author{Herbert Voß\thanks{\protect\url{voss@perce.de}}}
+\title{Package \texttt{hvfloat}\\Rotating objects and captions\\ver \hvVersion}
+\author{Herbert Voß\thanks{\protect\url{hvoss@tug.org}}}
\date{\today}
\maketitle
+
+
+
\begin{abstract}
This \texttt{hvfloat.sty} defines a macro to place objects and captions of floats in different positions with different rotating angles.
@@ -47,13 +49,13 @@ All objects and captions are framed, which is only for demonstration here and ha
\vfill
\hvFloat[%
- nonFloat=true,%
- capWidth=0.5,%
- capPos=r,%
- objectAngle=120,%
- capAngle=-210,%
- objectPos=c%
-]{figure}{\fbox{\includegraphics[scale=0.9]{rose}}}{\fbox{What a nice Caption :-)}}{}
+ nonFloat=true,
+ capWidth=0.5,
+ capPos=r,
+ objectAngle=120,
+ capAngle=-210,
+ objectPos=c
+]{figure}{\protect\fbox{\includegraphics[scale=0.9]{rose}}}{\protect\fbox{What a nice Caption :-)}}{}
\vspace*{\fill}
@@ -61,8 +63,13 @@ All objects and captions are framed, which is only for demonstration here and ha
\tableofcontents
+
+\clearpage
+
+\listoftables
\listoffigures
+
\clearpage
\section{The Package Options}
@@ -575,12 +582,12 @@ L & C & R \\\hline
\end{lstlisting}
+%\appendix
+%\section{Problems}
+%\begin{itemize}
+%\item[] With the \texttt{nonfloat} option all objects are left aligned, \verb|\centering| doesn't work here. Only God knows why ...\hfill \textbf{solved!}
+%\end{itemize}
-\appendix
-\section{Problems}
-\begin{itemize}
-\item[] With the \texttt{nonfloat} option all objects are left aligned, \verb|\centering| doesn't work here. Only God knows why ...\hfill \textbf{solved!}
-\end{itemize}
\section{The Package Source}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/rose.png b/Master/texmf-dist/doc/latex/hvfloat/doc/rose.png
index 3bbb2e85fdb..3bbb2e85fdb 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/rose.png
+++ b/Master/texmf-dist/doc/latex/hvfloat/doc/rose.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
deleted file mode 100644
index a4e680bf4a3..00000000000
--- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/doc/latex/hvfloat/latex/hvfloat.sty
index f9f778a7f6f..d3fcaf319df 100644
--- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
+++ b/Master/texmf-dist/doc/latex/hvfloat/latex/hvfloat.sty
@@ -6,7 +6,7 @@
%% This is file `hvfloat.sty',
%%
%% Herbert Voss <voss@perce.de>
-%% march 04, 2012
+%% march 04, 2017
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -15,8 +15,8 @@
%% DESCRIPTION:
%% `hvfloat' offers rotating of captions and objects for floats
%%
-\def\fileversion{1.1}
-\def\filedate{2012/03/04}
+\def\fileversion{1.2}
+\def\filedate{2017/01/28}
\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
%
\newif\ifhv@fbox \hv@fboxfalse
@@ -121,7 +121,7 @@
%
\def\hvFloat{\@ifnextchar[{\do@hvFloat}{\do@hvFloat[]}}
\def\do@hvFloat[#1]#2#3{%
- \setDefaults%
+ \setDefaults
\ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi%
\gdef\hv@floatType{#2}%
\ifx\relax#2\relax \setkeys{hvSet}{nonFloat=true}\fi%
@@ -181,40 +181,42 @@
\def\fps@figure{\hvSet@floatPos}
\ifhv@nonFloat\begingroup% Start the nonfloat part
\else \begin{\hv@floatType}% Start the floating environment
- \fi%
+ \fi
\saveCaptionSkip% we put this space ourselve
\ifx\hvSet@capAngle\hv@Width % need rotation?
\sbox{\hvCaptionBox}{%
\begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation
- \ifhv@nonFloat%
- \ifhv@onlyText#2%
- \else%
+ \ifhv@nonFloat
+ \ifhv@onlyText#2
+ \else
\ifx\hv@floatType\hv@figure
\ifx\relax#1\relax \figcaption{#2}\else\figcaption[#1]{#2}\fi
\else
\ifx\relax#1\relax \tabcaption{#2}\else\tabcaption[#1]{#2}\fi%
\fi
\fi
- \else\ifx\relax\hv@shortCap\relax\caption{#2}\else\caption[#1]{#2}\fi%
- \fi%
+ \else
+ \expandafter\ifx\expandafter\relax\hv@shortCap\relax \caption{#2}\else\caption[#1]{#2}\fi
+ \fi
\label{#3}%
\end{minipage}%
}%
- \else%
+ \else
\sbox{\hvCaptionBox}{%
\rotatebox{\hvSet@capAngle}{%
\begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation
- \ifhv@nonFloat%
- \ifhv@onlyText#2%
- \else%
+ \ifhv@nonFloat
+ \ifhv@onlyText#2
+ \else
\ifx\hv@floatType\hv@figure
\ifx\relax#1\relax \figcaption{#2}\else\figcaption[#1]{#2}\fi
\else
\ifx\relax#1\relax \tabcaption{#2}\else\tabcaption[#1]{#2}\fi%
\fi
\fi
- \else\ifx\relax\hv@shortCap\relax\caption{#2}\else\caption[#1]{#2}\fi%
- \fi%
+ \else
+ \expandafter\ifx\expandafter\relax\hv@shortCap\relax \caption{#2}\else\caption[#1]{#2}\fi%
+ \fi
\label{#3}%
\end{minipage}%
}%