diff options
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/hep-float/bibliography.bib | 161 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/hep-float/hep-float-documentation.pdf | bin | 269291 -> 284489 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/hep-float/hep-float-documentation.tex | 8 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/hep-float/hep-float-implementation.pdf | bin | 320178 -> 348867 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/hep-float/hep-float-implementation.dtx | 68 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/hep-float/hep-float.sty | 40 |
6 files changed, 239 insertions, 38 deletions
diff --git a/Master/texmf-dist/doc/latex/hep-float/bibliography.bib b/Master/texmf-dist/doc/latex/hep-float/bibliography.bib index e5117be3d56..5b217a2aad6 100644 --- a/Master/texmf-dist/doc/latex/hep-float/bibliography.bib +++ b/Master/texmf-dist/doc/latex/hep-float/bibliography.bib @@ -21,7 +21,7 @@ subtitle = "An acronym extension for glossaries", author = "Jan Hajer", year = "2021", eprinttype = "ctan", -eprint = "hep-acronyms", +eprint = "hep-acronym", related = "hep-paper-1", } @@ -95,6 +95,24 @@ eprint = "hep-title", related = "hep-paper-1", } +@article{hep-reference, +title = "The |hep-reference| package", +subtitle = "Selection of reference improvements", +author = "Jan Hajer", +year = "2021", +eprinttype = "ctan", +eprint = "hep-reference", +related = "hep-paper-1", +} + +@article{hep-cv, +title = "The |hep-cv| package", +subtitle = "Appealing curricula vitarum", +author = "Jan Hajer", +year = "2020", +related = "hep-paper-1", +} + @article{kvoptions, title = "The |kvoptions| package", subtitle = "Key value format for package options", @@ -1053,3 +1071,144 @@ eprinttype = "ctan", eprint = "soulutf8", } +@article{moderncv, +title = "The |moderncv| package", +subtitle = "A modern curriculum vitae class", +author = "Xavier Danaux", +year = "2006", +eprinttype = "ctan", +eprint = "moderncv", +related = "moderncv-1", +} + +@article{anyfontsize, +title = "The |anyfontsize| package", +subtitle = "Select any font size in \hologo{LaTeX}", +author = "Péter Szabó", +date = "2007", +eprinttype = "ctan", +eprint = "anyfontsize", +} + +@article{array, +title = "A new implementation of \hologo{LaTeX}’s |tabular| and |array| environment", +subtitle = "Extending the |array| and |tabular| environments", +author = "Frank Mittelbach, David Carlisle", +collaboration= "\hologo{LaTeX} Team", +year = "1993", +eprinttype = "ctan", +eprint = "array", +} + +@article{dashrule, +title = "The |dashrule| package", +subtitle = "Draw dashed rules", +author = "Scott Pakin", +date = "2008", +eprinttype = "ctan", +eprint = "dashrule", +} + +@article{fancyhdr, +title = "The |fancyhdr| and |extramarks| packages", +subtitle = "Extensive control of page headers and footers in \hologo{LaTeX2e}", +author = "Piet van Oostrum", +date = "1994", +eprinttype = "ctan", +eprint = "fancyhdr", +} + +@article{lastpage, +title = "The |lastpage| package", +subtitle = "Reference last page for Page $N$ of $M$ type footers", +author = "Hans-Martin Münch and Jeffrey Goldberg", +date = "1994", +eprinttype = "ctan", +eprint = "lastpage", +} + +@article{textpos, +title = "|Textpos|: absolute positioning of text on the page", +subtitle = "Place boxes at arbitrary positions on the \hologo{LaTeX} page", +author = "Norman Gray", +date = "1999", +eprinttype = "ctan", +eprint = "textpos", +related = "textpos-1", +} + +@manual{textpos-1, +eprinttype = "bitbucket", +eprintclass = "nxg", +eprint = "textpos", +} + +@article{subfiles, +title = "The |subfiles| package: A Document Class and a Package for Handling Multi-File Projects", +subtitle = "Individual typesetting of subfiles of a \enquote{main} document", +author = "Federico Garcia and Gernot Salzer", +date = "2002", +eprinttype = "ctan", +eprint = "subfiles", +related = "subfiles-1", +} + +@manual{subfiles-1, +eprinttype = "github", +eprintclass = "gsalzer", +eprint = "subfiles", +} + +@article{titlesec, +title = "The |titlesec|, |titleps| and |titletoc| packages", +subtitle = "Select alternative section titles", +author = "Javier Bezos", +year = "1998", +eprinttype = "ctan", +eprint = "titlesec", +related = "titlesec-1", +} + +@manual{titlesec-1, +eprinttype = "github", +eprintclass = "jbezos", +eprint = "titlesec", +} + +@article{calc, +title = "The |calc| package", +subtitle = "Simple arithmetic in \hologo{LaTeX} commands", +author = "Kresten Krab Thorup and Frank Jensen", +collaboration = "\hologo{LaTeX3} Project", +year = "1992", +eprinttype = "ctan", +eprint = "calc", +} + +@article{tabulary, +title = "The |tabulary| package", +subtitle = "Tabular with variable width columns balanced", +author = "David Carlisle", +year = "1995", +eprinttype = "ctan", +eprint = "tabulary", +} + +@article{xcolor, +title = "The |xcolor| package", +subtitle = "Driver-independent color extensions for \hologo{LaTeX} and \hologo{pdfLaTeX}", +author = "Uwe Kern", +collaboration = "\hologo{LaTeX} Project", +year = "2003", +eprinttype = "ctan", +eprint = "xcolor", +} + +@article{overlays, +title = "The |overlays| package", +subtitle = "Incremental slides", +author = "Andreas Nolda", +year = "2016", +eprinttype = "ctan", +eprint = "overlays", +} diff --git a/Master/texmf-dist/doc/latex/hep-float/hep-float-documentation.pdf b/Master/texmf-dist/doc/latex/hep-float/hep-float-documentation.pdf Binary files differindex 84d31937929..bda4b095f0d 100644 --- a/Master/texmf-dist/doc/latex/hep-float/hep-float-documentation.pdf +++ b/Master/texmf-dist/doc/latex/hep-float/hep-float-documentation.pdf diff --git a/Master/texmf-dist/doc/latex/hep-float/hep-float-documentation.tex b/Master/texmf-dist/doc/latex/hep-float/hep-float-documentation.tex index c4430f05951..20a90e280a4 100644 --- a/Master/texmf-dist/doc/latex/hep-float/hep-float-documentation.tex +++ b/Master/texmf-dist/doc/latex/hep-float/hep-float-documentation.tex @@ -15,7 +15,7 @@ %% and version 1.3c or later is part of all distributions of %% LaTeX version 2005/12/01 or later. -\ProvidesFile{hep-float-documentation.tex}[2021/08/01 v1.0 hep-float documentation] +\ProvidesFile{hep-float-documentation.tex}[2022/11/01 v1.1 hep-float documentation] \RequirePackage[l2tabu, orthodox]{nag} @@ -40,7 +40,7 @@ \title{The \software{hep-float} package\thanks{This document corresponds to \software{hep-float}~\fileversion.}} \subtitle{Convenience package for float placement} -\author{Jan Hajer \email{jan.hajer@unibas.ch}} +\author{Jan Hajer \email{jan.hajer@tecnico.ulisboa.pt}} \date{\filedate} \begin{document} @@ -68,6 +68,7 @@ Automatic float placement is adjusted to place a single float at the top of page "\renewcommand{\floatpagefraction}{.8}" \hfill float pages must be full (default 0.5) The most useful float placement is usually archived by placing the float \emph{in front} of the paragraph it is referenced in first. +\DescribeMacro{manualplacement} Additionally, manual float placement can be deactivated using the "manualplacement" package option. \DescribeMacro{\raggedright} @@ -107,6 +108,9 @@ It provides sub-floats and takes as mandatory argument either the number of sub- Within the "\begin{panels}"\oarg{vertical alignment}\marg{width} environment the "\panel" macro initiates a new sub-float. In the case that the width of the first sub-float has been given as an optional argument to the "panels" environment the "\panel"\marg{width} macro takes the width of the next sub-float as mandatory argument. The example code is presented in \cref{tab:panels}. +\DescribeMacro{\panelhspace} +\DescribeMacro{\panelvspace} +The spacing between the panels can be adjusted by adjusting the "\panelvspace" in terms of a "\linewidth" fraction "\renewcommand{\panelhspace}"{fraction} and the "\panelvspace" in terms of a length "\renewcommand{\panelvspace}"\marg{length}. \DescribeEnv{tabular} The \software{booktabs} \cite{booktabs} and \software{multirow} \cite{multirow} packages are loaded enabling publication quality tabulars such as in \cref{tab:booktabs}. diff --git a/Master/texmf-dist/doc/latex/hep-float/hep-float-implementation.pdf b/Master/texmf-dist/doc/latex/hep-float/hep-float-implementation.pdf Binary files differindex db5d94f9179..6960ff85813 100644 --- a/Master/texmf-dist/doc/latex/hep-float/hep-float-implementation.pdf +++ b/Master/texmf-dist/doc/latex/hep-float/hep-float-implementation.pdf diff --git a/Master/texmf-dist/source/latex/hep-float/hep-float-implementation.dtx b/Master/texmf-dist/source/latex/hep-float/hep-float-implementation.dtx index a98e9326917..55811d9c1d4 100644 --- a/Master/texmf-dist/source/latex/hep-float/hep-float-implementation.dtx +++ b/Master/texmf-dist/source/latex/hep-float/hep-float-implementation.dtx @@ -18,8 +18,8 @@ % \iffalse %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01] -%<package>\ProvidesPackage{hep-float}[2021/08/01 v1.0 Float adjustments ] -%<documentation>\ProvidesFile{hep-float-documentation.tex}[2021/08/01 v1.0 hep-float documentation] +%<package>\ProvidesPackage{hep-float}[2022/11/01 v1.1 Float adjustments ] +%<documentation>\ProvidesFile{hep-float-documentation.tex}[2022/11/01 v1.1 hep-float documentation] % %<*documentation> @@ -53,7 +53,7 @@ % % \fi % -% \CheckSum{105} +% \CheckSum{0} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -72,6 +72,7 @@ % Right brace \} Tilde \~} % % \changes{v1.0}{2021/09/01}{Initial version of the style file.} +% \changes{v1.1}{2022/11/01}{Bug fixes.} % % \ifshort %<*documentation> @@ -81,7 +82,7 @@ \title{The \software{hep-float} package\thanks{This document corresponds to \software{hep-float}~\fileversion.}} \subtitle{Convenience package for float placement} -\author{Jan Hajer \email{jan.hajer@unibas.ch}} +\author{Jan Hajer \email{jan.hajer@tecnico.ulisboa.pt}} \date{\filedate} % \ifshort @@ -111,6 +112,7 @@ Automatic float placement is adjusted to place a single float at the top of page "\renewcommand{\floatpagefraction}{.8}" \hfill float pages must be full (default 0.5) The most useful float placement is usually archived by placing the float \emph{in front} of the paragraph it is referenced in first. +\DescribeMacro{manualplacement} Additionally, manual float placement can be deactivated using the "manualplacement" package option. \DescribeMacro{\raggedright} @@ -150,6 +152,9 @@ It provides sub-floats and takes as mandatory argument either the number of sub- Within the "\begin{panels}"\oarg{vertical alignment}\marg{width} environment the "\panel" macro initiates a new sub-float. In the case that the width of the first sub-float has been given as an optional argument to the "panels" environment the "\panel"\marg{width} macro takes the width of the next sub-float as mandatory argument. The example code is presented in \cref{tab:panels}. +\DescribeMacro{\panelhspace} +\DescribeMacro{\panelvspace} +The spacing between the panels can be adjusted by adjusting the "\panelvspace" in terms of a "\linewidth" fraction "\renewcommand{\panelhspace}"{fraction} and the "\panelvspace" in terms of a length "\renewcommand{\panelvspace}"\marg{length}. \DescribeEnv{tabular} The \software{booktabs} \cite{booktabs} and \software{multirow} \cite{multirow} packages are loaded enabling publication quality tabulars such as in \cref{tab:booktabs}. @@ -239,58 +244,77 @@ If the graphics are located in a sub-folder its path can be indicated by "\graph % % \subsection{Sub-floats} % -% \begin{macro}{\subfigure} -% \begin{macro}{\subtable} % Load the \software{subcaption} package \cite{subcaption}. -% Provide the old "\subcaption@minipage" macro. % \begin{macrocode} -\RequirePackage[subrefformat=parens]{subcaption} +\PassOptionsToPackage{subrefformat=parens}{subcaption} +\RequirePackage{subcaption} \captionsetup{font=small} \captionsetup[sub]{font=small} +% \end{macrocode} +% Provide the macros for older versions of the \software{subcaption} package using the \software{xparse} \cite{xparse} package. +% \begin{macrocode} +\RequirePackage{xparse} \providecommand*\subcaption@minipage[2]{% \minipage#1{#2}\setcaptionsubtype\relax% } +\ProvideDocumentEnvironment{subcaptionblock}{O{b}m}{% + \caption@withoptargs\subcaption@minipage[#1]{#2}% +}{\endminipage} % \end{macrocode} -% \end{macro} -% \end{macro} % \begin{environment}{panels} +% % \begin{macro}{\panel} -% Define the "panels" environment and the "\panel" macro. +% \begin{macro}{\panelhspace} +% \begin{macro}{\panelvspace} +% Define the "panels" environment and the "\panel" macro using the \software{calc} \cite{calc} and \software{etoolbox} \cite{etoolbox} packages. % \begin{macrocode} -\newcommand{\hep@panels@space}{20} +\RequirePackage{calc} +\RequirePackage{etoolbox} +\newcommand{\panelhspace}{0.0333} +\newcommand{\panelvspace}{.5\baselineskip} \newenvironment{panels}[2][b]{% + \addtolength{\belowcaptionskip}{\panelvspace}% % \end{macrocode} % Define an internal macro for global behaviour. % \begin{macrocode} \newcommand{\begin@subcaption@minipage}[2][b]{% - \caption@withoptargs\subcaption@minipage[##1]{##2}% +% \caption@withoptargs\subcaption@minipage[##1]{##2}% + \subcaptionblock[##1]{##2}% \centering\vskip 0pt% - } +% \renewcommand{\hep@panel@vspace}{\panelvspace}% + }% % \end{macrocode} % Define the "\panel" macro for the case that the number of panels is given. % \begin{macrocode} \ifdim#2pt>1pt% - \newcommand{\hep@panel@space}{% - (1-#2+\hep@panels@space)/\hep@panels@space% - }% + \newcommand{\hep@panel@space}{\panelhspace\linewidth/#2}% \newcommand{\panel}[1][b]{% \endminipage\hfill\begin@subcaption@minipage[#1]{% - \linewidth/#2*\hep@panel@space% + \linewidth/#2-\hep@panel@space% }% }% - \begin@subcaption@minipage[#1]{\linewidth/#2*\hep@panel@space}% + \begin@subcaption@minipage[#1]{\linewidth/#2-\hep@panel@space}% % \end{macrocode} % Define the "\panel" macro for the case that the width of the panel is given. % \begin{macrocode} \else% \newcommand{\panel}[2][b]{% - \endminipage\hfill\begin@subcaption@minipage[#1]{##2\linewidth}% + \endminipage\hfill\begin@subcaption@minipage[#1]{% + ##2\linewidth-##2\linewidth*\real{\panelhspace}% + }% + }% + \begin@subcaption@minipage[#1]{% + #2\linewidth-#2\linewidth*\real{\panelhspace}% }% - \begin@subcaption@minipage[#1]{#2\linewidth}% \fi% -}{\endminipage} +}{ +\endsubcaptionblock +\vspace{-\panelvspace} +} % \end{macrocode} % \end{macro} +% \end{macro} +% \end{macro} % \end{environment} % % \subsection{Tables} diff --git a/Master/texmf-dist/tex/latex/hep-float/hep-float.sty b/Master/texmf-dist/tex/latex/hep-float/hep-float.sty index db86ff4e97f..f23be0f008c 100644 --- a/Master/texmf-dist/tex/latex/hep-float/hep-float.sty +++ b/Master/texmf-dist/tex/latex/hep-float/hep-float.sty @@ -16,7 +16,7 @@ %% LaTeX version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e}[2005/12/01] -\ProvidesPackage{hep-float}[2021/08/01 v1.0 Float adjustments ] +\ProvidesPackage{hep-float}[2022/11/01 v1.1 Float adjustments ] \RequirePackage{kvoptions} \SetupKeyvalOptions{ @@ -51,35 +51,49 @@ \hep@table\centering% }{\end@hep@table} \fi% -\RequirePackage[subrefformat=parens]{subcaption} +\PassOptionsToPackage{subrefformat=parens}{subcaption} +\RequirePackage{subcaption} \captionsetup{font=small} \captionsetup[sub]{font=small} +\RequirePackage{xparse} \providecommand*\subcaption@minipage[2]{% \minipage#1{#2}\setcaptionsubtype\relax% } -\newcommand{\hep@panels@space}{20} +\ProvideDocumentEnvironment{subcaptionblock}{O{b}m}{% + \caption@withoptargs\subcaption@minipage[#1]{#2}% +}{\endminipage} +\RequirePackage{calc} +\RequirePackage{etoolbox} +\newcommand{\panelhspace}{0.0333} +\newcommand{\panelvspace}{.5\baselineskip} \newenvironment{panels}[2][b]{% + \addtolength{\belowcaptionskip}{\panelvspace}% \newcommand{\begin@subcaption@minipage}[2][b]{% - \caption@withoptargs\subcaption@minipage[##1]{##2}% + \subcaptionblock[##1]{##2}% \centering\vskip 0pt% - } + }% \ifdim#2pt>1pt% - \newcommand{\hep@panel@space}{% - (1-#2+\hep@panels@space)/\hep@panels@space% - }% + \newcommand{\hep@panel@space}{\panelhspace\linewidth/#2}% \newcommand{\panel}[1][b]{% \endminipage\hfill\begin@subcaption@minipage[#1]{% - \linewidth/#2*\hep@panel@space% + \linewidth/#2-\hep@panel@space% }% }% - \begin@subcaption@minipage[#1]{\linewidth/#2*\hep@panel@space}% + \begin@subcaption@minipage[#1]{\linewidth/#2-\hep@panel@space}% \else% \newcommand{\panel}[2][b]{% - \endminipage\hfill\begin@subcaption@minipage[#1]{##2\linewidth}% + \endminipage\hfill\begin@subcaption@minipage[#1]{% + ##2\linewidth-##2\linewidth*\real{\panelhspace}% + }% + }% + \begin@subcaption@minipage[#1]{% + #2\linewidth-#2\linewidth*\real{\panelhspace}% }% - \begin@subcaption@minipage[#1]{#2\linewidth}% \fi% -}{\endminipage} +}{ +\endsubcaptionblock +\vspace{-\panelvspace} +} \RequirePackage{booktabs} \RequirePackage{multirow} |