summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-11-02 22:05:52 +0000
committerKarl Berry <karl@freefriends.org>2022-11-02 22:05:52 +0000
commitb43fcdaac99bae15cb64026a7e7691c009b644c8 (patch)
tree6ea891b60c048a14e89938f91852418f3755b913
parent18fbee36c0d052aa11e25eab9c557b409c2ee8e7 (diff)
hep-text (2nov22)
git-svn-id: svn://tug.org/texlive/trunk@64906 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/hep-text/bibliography.bib161
-rw-r--r--Master/texmf-dist/doc/latex/hep-text/hep-text-documentation.pdfbin284308 -> 301540 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hep-text/hep-text-documentation.tex7
-rw-r--r--Master/texmf-dist/doc/latex/hep-text/hep-text-implementation.pdfbin334724 -> 355711 bytes
-rw-r--r--Master/texmf-dist/source/latex/hep-text/hep-text-implementation.dtx73
-rw-r--r--Master/texmf-dist/tex/latex/hep-text/hep-text.sty45
6 files changed, 244 insertions, 42 deletions
diff --git a/Master/texmf-dist/doc/latex/hep-text/bibliography.bib b/Master/texmf-dist/doc/latex/hep-text/bibliography.bib
index e5117be3d56..5b217a2aad6 100644
--- a/Master/texmf-dist/doc/latex/hep-text/bibliography.bib
+++ b/Master/texmf-dist/doc/latex/hep-text/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-text/hep-text-documentation.pdf b/Master/texmf-dist/doc/latex/hep-text/hep-text-documentation.pdf
index f265ebfabf0..42b92285692 100644
--- a/Master/texmf-dist/doc/latex/hep-text/hep-text-documentation.pdf
+++ b/Master/texmf-dist/doc/latex/hep-text/hep-text-documentation.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hep-text/hep-text-documentation.tex b/Master/texmf-dist/doc/latex/hep-text/hep-text-documentation.tex
index ba9274ab2f8..bc8cc41f794 100644
--- a/Master/texmf-dist/doc/latex/hep-text/hep-text-documentation.tex
+++ b/Master/texmf-dist/doc/latex/hep-text/hep-text-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-text-documentation.tex}[2021/09/01 v1.0 HEP-Text documentation]
+\ProvidesFile{hep-text-documentation.tex}[2022/11/01 v1.1 HEP-Text documentation]
\RequirePackage[l2tabu, orthodox]{nag}
@@ -53,7 +53,7 @@
\title{The \software{hep-text} package\thanks{This document corresponds to \software{hep-text}~\fileversion.}}
\subtitle{List and text extensions}
-\author{Jan Hajer \email{jan.hajer@unibas.ch}}
+\author{Jan Hajer \email{jan.hajer@tecnico.ulisboa.pt}}
\date{\filedate}
\begin{document}
@@ -78,7 +78,8 @@ It provides the convenient macros "\enquote"\marg{text} and "\MakeOuterQuote{}"
\DescribeMacro{\eg}
\DescribeMacro{\vs}
-The \software{foreign} package \cite{foreign} defines macros such as "\eg", "\ie", "\cf", and "\vs" which are typeset as \eg, \ie, \cf, and \vs.
+The \software{foreign} package \cite{foreign} defines macros such as "\eg", "\ie", "\cf", and "\vs" which are typeset as \eg, \ie, \cf, and \vs with the appropriate spacing.
+Issuing "\renewcommand\foreignabbrfont{\itshape}" these abbreviations are typeset in italic.
\DescribeMacro{\no}
The "\no"\marg{number} macro is typeset as \no{123}.
diff --git a/Master/texmf-dist/doc/latex/hep-text/hep-text-implementation.pdf b/Master/texmf-dist/doc/latex/hep-text/hep-text-implementation.pdf
index b46dff176b1..f117bdf3228 100644
--- a/Master/texmf-dist/doc/latex/hep-text/hep-text-implementation.pdf
+++ b/Master/texmf-dist/doc/latex/hep-text/hep-text-implementation.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/hep-text/hep-text-implementation.dtx b/Master/texmf-dist/source/latex/hep-text/hep-text-implementation.dtx
index 6821c13e773..cb1228d9fad 100644
--- a/Master/texmf-dist/source/latex/hep-text/hep-text-implementation.dtx
+++ b/Master/texmf-dist/source/latex/hep-text/hep-text-implementation.dtx
@@ -18,8 +18,8 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-%<package>\ProvidesPackage{hep-text}[2021/09/01 v1.0 Some text macros]
-%<documentation>\ProvidesFile{hep-text-documentation.tex}[2021/09/01 v1.0 HEP-Text documentation]
+%<package>\ProvidesPackage{hep-text}[2022/11/01 v1.1 Some text macros]
+%<documentation>\ProvidesFile{hep-text-documentation.tex}[2022/11/01 v1.1 HEP-Text documentation]
%
%<*documentation>
@@ -66,7 +66,7 @@
%
% \fi
%
-% \CheckSum{98}
+% \CheckSum{129}
%
% \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
@@ -85,6 +85,7 @@
% Right brace \} Tilde \~}
%
% \changes{v1.0}{2019/01/01}{Initial version of the style file.}
+% \changes{v1.1}{2022/11/01}{Bug fixes.}
%
% \ifshort
%<*documentation>
@@ -94,7 +95,7 @@
\title{The \software{hep-text} package\thanks{This document corresponds to \software{hep-text}~\fileversion.}}
\subtitle{List and text extensions}
-\author{Jan Hajer \email{jan.hajer@unibas.ch}}
+\author{Jan Hajer \email{jan.hajer@tecnico.ulisboa.pt}}
\date{\filedate}
% \ifshort
@@ -121,7 +122,8 @@ It provides the convenient macros "\enquote"\marg{text} and "\MakeOuterQuote{}"
\DescribeMacro{\eg}
\DescribeMacro{\vs}
-The \software{foreign} package \cite{foreign} defines macros such as "\eg", "\ie", "\cf", and "\vs" which are typeset as \eg, \ie, \cf, and \vs.
+The \software{foreign} package \cite{foreign} defines macros such as "\eg", "\ie", "\cf", and "\vs" which are typeset as \eg, \ie, \cf, and \vs with the appropriate spacing.
+Issuing "\renewcommand\foreignabbrfont{\itshape}" these abbreviations are typeset in italic.
\DescribeMacro{\no}
The "\no"\marg{number} macro is typeset as \no{123}.
@@ -215,8 +217,10 @@ The "\underline" macro is redefined to allow line-breaks using the \software{sou
%
% Load the \software{babel} package \cite{babel} for hyphenation and the recommended \software{csquotes} package \cite{csquotes}.
% \begin{macrocode}
-\RequirePackage[\heptext@lang]{babel}
-\RequirePackage[autostyle]{csquotes}
+\PassOptionsToPackage{\heptext@lang}{babel}
+\RequirePackage{babel}
+\PassOptionsToPackage{autostyle}{csquotes}
+\RequirePackage{csquotes}
% \end{macrocode}
%
% \begin{macro}{\underline}
@@ -227,9 +231,7 @@ The "\underline" macro is redefined to allow line-breaks using the \software{sou
% \end{macrocode}
% \end{macro}
%
-%\begin{macro}{\vs}
-% Load the \software{foreign} package \cite{foreign} in order to highlight abbreviations and vocabularies from foreign languages.
-% Add the missing "\vs" command.
+% Check the "lang" option using the \software{pdftexcmds} package \cite{pdftexcmds}.
% \begin{macrocode}
\RequirePackage{pdftexcmds}
\ifnum\pdf@strcmp{\heptext@lang}{american}=0
@@ -241,7 +243,15 @@ The "\underline" macro is redefined to allow line-breaks using the \software{sou
\newcommand{\heptext@lang@foreign}{british}
\fi
\fi
-\RequirePackage[all, \heptext@lang@foreign]{foreign}
+% \end{macrocode}
+%
+%\begin{macro}{\vs}
+% Load the \software{foreign} package \cite{foreign} in order to highlight abbreviations and vocabularies from foreign languages.
+% Add the missing "\vs" command.
+% \begin{macrocode}
+\PassOptionsToPackage{all, \heptext@lang@foreign}{foreign}
+\RequirePackage{foreign}
+\renewcommand\foreignabbrfont{}
\DeclareRobustCommand\vs{\xperiodafter{{\foreignabbrfont{vs}}}}
% \end{macrocode}
% \end{macro}
@@ -260,12 +270,17 @@ The "\underline" macro is redefined to allow line-breaks using the \software{sou
% \end{macro}
%
%\begin{macro}{\software}
-% Define a macro for software with optional version information "\software"\linebreak[1]\oarg{version}\linebreak[1]\marg{name}, using the \software{relsize} package \cite{relsize}.
+% Define a macro for software with optional version information "\software"\linebreak[1]\oarg{version}\linebreak[1]\marg{name}, using the \software{relsize} \cite{relsize} and \software{xparse} \cite{xparse} packages.
% \begin{macrocode}
\RequirePackage{relsize}
\newcommand{\software}[2][\hspace{-\fontdimen2\font}]{%
{\smaller[.5]\textsc{#2}~#1}%
}
+\RequirePackage{xparse}
+\NewExpandableDocumentCommand\hep@gobble@opt@arg{om}{#2}
+\AtBeginDocument{\@ifpackageloaded{hyperref}{%
+ \pdfstringdefDisableCommands{\let\software\hep@gobble@opt@arg}%
+}{}}
% \end{macrocode}
% \end{macro}
%
@@ -278,9 +293,8 @@ The "\underline" macro is redefined to allow line-breaks using the \software{sou
\providecommand{\hep@email}[1]{\online{mailto:#1}{#1}}
\providecommand\email{\hep@email}
\AtBeginDocument{\@ifpackageloaded{hyperref}{%
- \renewcommand{\online}[2]{\href{#1}{\nolinkurl{#2}}}%
- }{}
-}
+ \renewcommand{\online}[2]{\href{#1}{\nolinkurl{#2}}}%
+}{}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -292,11 +306,23 @@ The "\underline" macro is redefined to allow line-breaks using the \software{sou
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\subsubparagraph}
+% Define the "\subsubparagraph" macro starting a new paragraph with the same spacing as the paragraph macro but without title.
+% \begin{macrocode}
+\newcommand\subsubparagraph{%
+ \@tempskipa 3.25ex \@plus 1ex \@minus .2ex\relax%
+ \addpenalty\@secpenalty\addvspace\@tempskipa%
+ \everypar{\setbox\z@\lastbox\everypar{}}%
+}
+% \end{macrocode}
+% \end{macro}
+%
% \subsection{Lists}
%
% Load the \software{enumitem} package \cite{enumitem}.
% \begin{macrocode}
-\RequirePackage[inline]{enumitem}
+\PassOptionsToPackage{inline}{enumitem}
+\RequirePackage{enumitem}
% \end{macrocode}
%
% \begin{environment}{inlinelist}
@@ -312,16 +338,17 @@ The "\underline" macro is redefined to allow line-breaks using the \software{sou
% \begin{environment}{enumdescript}
% Define an enumdescript list environment.
% \begin{macrocode}
-\newlist{enum@descript}{enumerate}{2}
-\setlist[enum@descript]{label=\arabic*.}
+\newlist{enumdesc}{enumerate}{2}
+\setlist[enumdesc]{label=\arabic*.}
\newenvironment{enumdescript}[1][]{
-\begin{enum@descript}[#1]
+\begin{enumdesc}[#1]
\let\hep@item\item
- \renewcommand{\item}[2][]{
- \ifx&##1&\hep@item\else\hep@item[##1]\fi
- \textbf{##2}\ifx##2\empty\else~\fi\@ifnextchar\par\@gobble\relax
+ \renewcommand{\item}[2][]{%
+ \ifx&##1&\hep@item\else\hep@item[##1]\fi%
+ \textbf{##2}\ifx##2\empty\else\hspace{1em}\fi%
+ \@ifnextchar\par\@gobble\relax%
}
-}{\end{enum@descript}}
+}{\end{enumdesc}}
% \end{macrocode}
% \end{environment}
%
diff --git a/Master/texmf-dist/tex/latex/hep-text/hep-text.sty b/Master/texmf-dist/tex/latex/hep-text/hep-text.sty
index 692f6244f99..ba774e7d899 100644
--- a/Master/texmf-dist/tex/latex/hep-text/hep-text.sty
+++ b/Master/texmf-dist/tex/latex/hep-text/hep-text.sty
@@ -16,7 +16,7 @@
%% LaTeX version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{hep-text}[2021/09/01 v1.0 Some text macros]
+\ProvidesPackage{hep-text}[2022/11/01 v1.1 Some text macros]
\RequirePackage{kvoptions}
\SetupKeyvalOptions{
@@ -25,8 +25,10 @@
}
\DeclareStringOption[british]{lang}
\ProcessKeyvalOptions*
-\RequirePackage[\heptext@lang]{babel}
-\RequirePackage[autostyle]{csquotes}
+\PassOptionsToPackage{\heptext@lang}{babel}
+\RequirePackage{babel}
+\PassOptionsToPackage{autostyle}{csquotes}
+\RequirePackage{csquotes}
\RequirePackage{soulutf8}
\let\underline\textul
\RequirePackage{pdftexcmds}
@@ -39,7 +41,9 @@
\newcommand{\heptext@lang@foreign}{british}
\fi
\fi
-\RequirePackage[all, \heptext@lang@foreign]{foreign}
+\PassOptionsToPackage{all, \heptext@lang@foreign}{foreign}
+\RequirePackage{foreign}
+\renewcommand\foreignabbrfont{}
\DeclareRobustCommand\vs{\xperiodafter{{\foreignabbrfont{vs}}}}
\xspaceaddexceptions{\csq@qclose@i}
\newcommand{\no}[1]{\textnumero~#1}
@@ -47,29 +51,40 @@
\newcommand{\software}[2][\hspace{-\fontdimen2\font}]{%
{\smaller[.5]\textsc{#2}~#1}%
}
+\RequirePackage{xparse}
+\NewExpandableDocumentCommand\hep@gobble@opt@arg{om}{#2}
+\AtBeginDocument{\@ifpackageloaded{hyperref}{%
+ \pdfstringdefDisableCommands{\let\software\hep@gobble@opt@arg}%
+}{}}
\providecommand{\online}[2]{\texttt{#2}}%
\providecommand{\hep@email}[1]{\online{mailto:#1}{#1}}
\providecommand\email{\hep@email}
\AtBeginDocument{\@ifpackageloaded{hyperref}{%
- \renewcommand{\online}[2]{\href{#1}{\nolinkurl{#2}}}%
- }{}
-}
+ \renewcommand{\online}[2]{\href{#1}{\nolinkurl{#2}}}%
+}{}}
\newcommand{\prefix}[2]{(#1\mbox{-)}\allowbreak #2}
-\RequirePackage[inline]{enumitem}
+\newcommand\subsubparagraph{%
+ \@tempskipa 3.25ex \@plus 1ex \@minus .2ex\relax%
+ \addpenalty\@secpenalty\addvspace\@tempskipa%
+ \everypar{\setbox\z@\lastbox\everypar{}}%
+}
+\PassOptionsToPackage{inline}{enumitem}
+\RequirePackage{enumitem}
\newlist{inlinelist}{enumerate*}{1}
\setlist*[inlinelist,1]{%
label=\roman*), itemjoin={,\ }, itemjoin*={, and\ }, after=.%
}
-\newlist{enum@descript}{enumerate}{2}
-\setlist[enum@descript]{label=\arabic*.}
+\newlist{enumdesc}{enumerate}{2}
+\setlist[enumdesc]{label=\arabic*.}
\newenvironment{enumdescript}[1][]{
-\begin{enum@descript}[#1]
+\begin{enumdesc}[#1]
\let\hep@item\item
- \renewcommand{\item}[2][]{
- \ifx&##1&\hep@item\else\hep@item[##1]\fi
- \textbf{##2}\ifx##2\empty\else~\fi\@ifnextchar\par\@gobble\relax
+ \renewcommand{\item}[2][]{%
+ \ifx&##1&\hep@item\else\hep@item[##1]\fi%
+ \textbf{##2}\ifx##2\empty\else\hspace{1em}\fi%
+ \@ifnextchar\par\@gobble\relax%
}
-}{\end{enum@descript}}
+}{\end{enumdesc}}
\endinput
%%