From f325d429c265c8eb01cd3b572d5f96207ae8cafa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 14 Mar 2019 20:45:17 +0000 Subject: hvfloat (14mar19) git-svn-id: svn://tug.org/texlive/trunk@50386 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hvfloat/CTAN.png | Bin 0 -> 69089 bytes Master/texmf-dist/doc/latex/hvfloat/Changes | 6 +- Master/texmf-dist/doc/latex/hvfloat/README | 11 +- Master/texmf-dist/doc/latex/hvfloat/bateaux.jpg | Bin 45694 -> 0 bytes Master/texmf-dist/doc/latex/hvfloat/frose.png | Bin 0 -> 5208 bytes Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf | Bin 365500 -> 388565 bytes Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex | 1593 +++++++++++++++++++---- 7 files changed, 1350 insertions(+), 260 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/hvfloat/CTAN.png delete mode 100644 Master/texmf-dist/doc/latex/hvfloat/bateaux.jpg create mode 100644 Master/texmf-dist/doc/latex/hvfloat/frose.png (limited to 'Master/texmf-dist/doc/latex/hvfloat') diff --git a/Master/texmf-dist/doc/latex/hvfloat/CTAN.png b/Master/texmf-dist/doc/latex/hvfloat/CTAN.png new file mode 100644 index 00000000000..805ae3be95a Binary files /dev/null and b/Master/texmf-dist/doc/latex/hvfloat/CTAN.png differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes index 0893a1900fc..6a1d23d418d 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/Changes +++ b/Master/texmf-dist/doc/latex/hvfloat/Changes @@ -1,14 +1,18 @@ hvfloat.sty: +2.0 2019-03-14 - added support for wide floats, inner/outer captions, + fullpage objects for one- or twocolumn mode. 1.2b 2017-12-22 - added option all for hvfloat-fps 1.2a 2017-09-16 - new package for global float setting 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 +0.9 2003 - Rotating floating objects and captions in different ways + hvfloat.tex: the source of the documentation hvfloat-fps.sty +0.02 2017-09-20 - small changes 0.01 2017-09-16 - first CTAN version diff --git a/Master/texmf-dist/doc/latex/hvfloat/README b/Master/texmf-dist/doc/latex/hvfloat/README index a8bcb3b5746..66c38bec861 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/README +++ b/Master/texmf-dist/doc/latex/hvfloat/README @@ -1,10 +1,15 @@ hvfloat -hv-float-fps (float placement setting) +hvfloat-fps (float placement setting) +hvfloat Placing figures/tables with various options, like rotating -the image/table and/or caption. - +the image/table and/or caption. Placing object and caption +side by side in one- and twocolumn mode. Fullpage objects +with captions on the preceeding or following page in +one- and twocolumn mode. %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives %% in directory macros/latex/base/lppl.txt. + +hvoss@tug.org \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/hvfloat/bateaux.jpg b/Master/texmf-dist/doc/latex/hvfloat/bateaux.jpg deleted file mode 100644 index bbf5485f076..00000000000 Binary files a/Master/texmf-dist/doc/latex/hvfloat/bateaux.jpg and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/frose.png b/Master/texmf-dist/doc/latex/hvfloat/frose.png new file mode 100644 index 00000000000..0efe947eee4 Binary files /dev/null and b/Master/texmf-dist/doc/latex/hvfloat/frose.png differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf index ef686cd1bb7..70258f0ea51 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf and b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex index 76556e3f28c..71048a93a13 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex @@ -1,9 +1,19 @@ +%% $Id: hvfloat.tex 964 2019-03-14 11:37:36Z herbert $ \listfiles -\documentclass{scrartcl} -\usepackage[T1]{fontenc} -\usepackage{libertine} -\usepackage[scaled=0.85]{beramono} -\usepackage[utf8]{inputenc} +\errorcontextlines=100 +\documentclass[twoside,paper=a4]{scrartcl} +\usepackage{fontspec} +\usepackage{libertinus} +%\usepackage[scaled=0.85]{beramono} +\setmonofont[Scale=MatchLowercase,FakeStretch=0.9]{DejaVu Sans Mono} + +\usepackage{microtype} +\usepackage[english]{babel} + +\usepackage[automark]{scrlayer-scrpage} +\pagestyle{scrheadings} + +%\usepackage{showframe} \usepackage{listings} % \lstset{% @@ -13,38 +23,153 @@ % frame={tb},% % lineskip=-1pt,% extendedchars=true,% - basicstyle={\footnotesize\ttfamily},% - numbers=left,% - stepnumber=1,% - numberstyle=\tiny,% + basicstyle={\small\ttfamily},% +% numbers=left,% +% stepnumber=1,% +% numberstyle=\tiny,% % xleftmargin=2em,% breaklines=true} % -\usepackage[fbox]{hvfloat} -\let\hvVersion\fileversion + \usepackage{graphicx} +\usepackage{xcolor} \usepackage{url} -\usepackage{tabularx} +\usepackage{booktabs,xltabular} \usepackage{lscape} +\usepackage{varioref} \usepackage{multicol} -\usepackage[urlcolor=blue, linktocpage, a4paper, colorlinks=true]{hyperref} +\usepackage{blindtext} + +\usepackage{marginnote} + +%\usepackage{imakeidx} +\usepackage{xindex} +\makeindex + +\usepackage{hvindex} +\usepackage[all=!htb]{hvfloat-fps} +\usepackage[fbox,hyperref]{hvfloat} +\let\hvVersion\fileversion +\captionsetup{format=plain,font=sf,labelfont=sf} + + +\hypersetup{urlcolor=blue, linktocpage, colorlinks=true} +% +\makeatletter + +\def\Lfile#1{\texttt{#1}\index{#1 file@\texttt{#1} (file)}} +\def\Lext#1{\texttt{.#1}\index{#1 file extension@\texttt{.#1} (file extension)}} +\def\Ldim#1{\texttt{\textbackslash#1}\index{#1@\texttt{\textbackslash#1} (length)}} +\def\Lcs#1{\texttt{\textbackslash#1}\index{#1@\texttt{\textbackslash#1}}} +\def\nxLcs#1{\texttt{\textbackslash#1}} +\def\Lenv#1{\texttt{#1}\index{#1 environment@\texttt{#1} (environment)}} +\def\Lpack#1{\texttt{#1}\index{#1 package@\texttt{#1} (package)}} +\def\Lprog#1{\texttt{#1}\index{#1 program@\texttt{#1} (program)}} +\def\Loption#1{\texttt{#1}\index{#1@\texttt{#1} (package option)}} +\def\Lkeyword#1{\texttt{#1}\index{#1@\texttt{#1} (keyword)}} +\def\Lkeyval#1{\texttt{#1}\index{#1@\texttt{#1} (value)}} +\def\Lskip#1{\texttt{\textbackslash#1}\index{#1@\texttt{\textbackslash#1} (skip)}} +\def\Lkeyset#1{\expandafter\Lkeyset@i#1\@nil} +\def\Lkeyset@i#1=#2\@nil{\texttt{#1=#2}% + \index{#1@\texttt{#1} (keyword)}\index{Keyword!#1@\texttt{#1}} + \index{#2@\texttt{#2} (value)}\index{Value!#2@\texttt{#2}}} + + + +\newsavebox\boxdef +\newenvironment{BDef} + {\begin{lrbox}{\boxdef} + \def\arraystretch{1.0} + \begin{tabular}{@{}l@{}l@{}l@{}}} + {\end{tabular}\end{lrbox} % -\newcommand\CMD[1]{{\small\ttfamily\textbackslash{}#1}} -\newcommand\ENV[1]{{\small\ttfamily#1} Environment} +% braces around next block are needed to stop the list env checking for blank lines +% and the \aftergroups then for making sure no indentation happens ... as i said +% urg % + {\BCmd\fbox{\usebox\boxdef}\endBCmd} + \aftergroup\@afterindentfalse\aftergroup\@afterheading + } + +\newskip\BDefaboveskip +\newskip\BDefbelowskip +\newskip\BDefinlineskip +\setlength\BDefaboveskip{0pt plus 2pt}% first-level list topsep +\setlength\BDefbelowskip{10pt} +\setlength\BDefinlineskip{6pt} + +\newenvironment{BCmd}{ + \@beginparpenalty-\@lowpenalty + \topsep\BDefaboveskip + \fboxsep3pt + \flushleft} + {\@endparpenalty\@M + \@topsepadd\BDefbelowskip + \endflushleft} + +\newenvironment{BCmd*}{ + \@beginparpenalty\@M + \topsep\BDefinlineskip + \fboxsep3pt + \flushleft} + {\@endparpenalty5000 + \endflushleft} + + +\def\OptArgs{\colorbox{black!20}{\texttt{[Options]}}\kern1pt} +\def\OptArg{\@ifnextchar*\OptArg@i{\OptArg@ii*}}% star version without braces +\def\OptArg@i*#1{\colorbox{black!20}{\texttt{#1}}\kern1pt} +\def\OptArg@ii*#1{\colorbox{black!20}{\texttt{[#1]}}\kern1pt} +\def\DBS{{\ttfamily\textbackslash\textbackslash}} + + +\makeatother + +\newcommand\Larg [1]{{\normalfont\itshape#1\/}} +\newcommand\Larga[1]{$\langle$\Larg{#1}$\rangle$}% angles +\newcommand\Largb[1]{\lcb\Larg{#1}\rcb} % curly brace +\newcommand\Largs[1]{\lsb\Larg{#1}\rsb} % square brackets +\newcommand\Largr[1]{\lrb\Larg{#1}\rrb} % round brackets +\newcommand\LBEG[1]{{\normalfont\ttfamily\bs{}begin\lcb#1\rcb}\xLenv{#1}} +\newcommand\LmBEG[1]{{\normalfont\ttfamily\bs{}begin\lcb#1\rcb}\xLmenv{#1}} +\newcommand\LEND[1]{{\normalfont\ttfamily\bs{}end\lcb#1\rcb}\xLenv{#1}} +\newcommand\LmEND[1]{{\normalfont\ttfamily\bs{}end\lcb#1\rcb}\xLmenv{#1}} + +\DeclareRobustCommand\bs{{\normalfont\ttfamily\textbackslash}} % \let\bslash=\bs +\DeclareRobustCommand\lcb{{\normalfont\ttfamily\textbraceleft}} +\DeclareRobustCommand\rcb{{\normalfont\ttfamily\textbraceright}} +\DeclareRobustCommand\lsb{{\normalfont\ttfamily[}} +\DeclareRobustCommand\rsb{{\normalfont\ttfamily]}} +\DeclareRobustCommand\lrb{{\normalfont\ttfamily(}} +\DeclareRobustCommand\rrb{{\normalfont\ttfamily)}} +\DeclareRobustCommand\false{{\ttfamily false}} +\DeclareRobustCommand\true{{\ttfamily true}} + +\let\CMD\Lcs +\let\ENV\Lenv + +\newcommand\Float[1][]{\ifx\relax#1\relax\marginnote{\fbox{float}}\else + \marginnote{\fbox{\shortstack{float\\#1}}}\fi +} + + \begin{document} -\title{Package \texttt{hvfloat}\\Rotating objects and captions\\ver \hvVersion} +\title{Package \texttt{hvfloat}\\Rotating and scaling of 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. +The package \texttt{hvfloat} defines a macro to place objects and captions of floats in different +positions with different rotating angles. -All objects and captions are framed, which is only for demonstration here and has no additional sense. +All objects and captions are framed on the first pages, which is only for some demonstration here and +has no additional sense! + +To compare the place of the definition of the floating objects in the source and the output a +marginnote \fbox{float} is set into the margin. This is also only for demonstration! \end{abstract} \vfill @@ -55,7 +180,7 @@ All objects and captions are framed, which is only for demonstration here and ha objectAngle=120, capAngle=-210, objectPos=c -]{figure}{\protect\fbox{\includegraphics[scale=0.9]{rose}}}{\protect\fbox{What a nice Caption :-)}}{} +]{figure}{\protect\fbox{\includegraphics[scale=0.9]{rose}}}{\protect\fbox{What a nice Caption :-)}}{fig:title} \vspace*{\fill} @@ -71,34 +196,56 @@ All objects and captions are framed, which is only for demonstration here and ha \clearpage -\section{The Package Options} +\section{The package options} \noindent\begin{tabularx}{\textwidth}{lX} -\textbf{\small\texttt{fbox}} & The objects and captions are put into a \CMD{fbox} command, like in this documentation. This doesn't make real sense and is only for some demonstration useful. +\Loption{fbox} & The objects and captions are put into a \Lcs{fbox} command, like in +this documentation. This doesn't make real sense and is only for some demonstration useful or for locating +problems if images seems to have too much whitespace.\\ +\Loption{hyperref} & Load package \Lpack{hyperref} and also package \Lpack{hypcap}. \end{tabularx} -The length \CMD{belowcaptionskip} is set by \LaTeX{} to 0pt and changed in \texttt{hvfloat} to the same value than \CMD{abovecaptionskip}. This length can be changed to another value in the usual way with \CMD{setlength} or \CMD{addtolength}. -\section{The Macros} -The syntax for the \CMD{hvFloat} macro is -{\small\begin{verbatim} -\hvFloat[]% - {}% - {}% - []{}% - {