From f4e2da07d0c309f40d8fe138a30443f66d5636de Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 3 Nov 2022 20:06:06 +0000 Subject: hep-paper (3nov22) git-svn-id: svn://tug.org/texlive/trunk@64917 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/hep-paper/bibliography.bib | 161 ++++++++++++- .../latex/hep-paper/hep-paper-documentation.pdf | Bin 395090 -> 425016 bytes .../latex/hep-paper/hep-paper-documentation.tex | 6 +- .../latex/hep-paper/hep-paper-implementation.pdf | Bin 465831 -> 493690 bytes .../doc/latex/hep-paper/hep-paper-test-amsart.tex | 2 +- .../doc/latex/hep-paper/hep-paper-test-beamer.tex | 2 +- .../doc/latex/hep-paper/hep-paper-test-jcap.tex | 2 +- .../doc/latex/hep-paper/hep-paper-test-jhep.tex | 2 +- .../doc/latex/hep-paper/hep-paper-test-pos.tex | 2 +- .../doc/latex/hep-paper/hep-paper-test-revtex.tex | 2 +- .../latex/hep-paper/hep-paper-test-springer.tex | 2 +- .../latex/hep-paper/hep-paper-implementation.dtx | 249 ++++----------------- .../source/latex/hep-paper/hep-paper.ins | 4 +- .../texmf-dist/tex/latex/hep-paper/hep-paper.sty | 116 +++------- 14 files changed, 242 insertions(+), 308 deletions(-) diff --git a/Master/texmf-dist/doc/latex/hep-paper/bibliography.bib b/Master/texmf-dist/doc/latex/hep-paper/bibliography.bib index e5117be3d56..5b217a2aad6 100644 --- a/Master/texmf-dist/doc/latex/hep-paper/bibliography.bib +++ b/Master/texmf-dist/doc/latex/hep-paper/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-paper/hep-paper-documentation.pdf b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-documentation.pdf index 56d0a5fcd64..dd00f397d63 100644 Binary files a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-documentation.pdf and b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-documentation.pdf differ diff --git a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-documentation.tex b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-documentation.tex index d32d024c189..e271ce398e3 100644 --- a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-documentation.tex +++ b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-documentation.tex @@ -6,7 +6,7 @@ %% %% hep-paper-implementation.dtx (with options: `documentation') %% This is a generated file. -%% Copyright (C) 2019-2020 by Jan Hajer +%% Copyright (C) 2019-2022 by Jan Hajer %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.3c of this license or (at your option) any later @@ -14,7 +14,7 @@ %% http://www.latex-project.org/lppl.txt %% and version 1.3c or later is part of all distributions of %% LaTeX version 2005/12/01 or later. -\ProvidesFile{hep-paper-documentation.tex}[2021/09/01 v2.0 HEP-Paper documentation] +\ProvidesFile{hep-paper-documentation.tex}[2022/11/01 v2.1 HEP-Paper documentation] \RequirePackage[l2tabu, orthodox]{nag} \documentclass{ltxdoc} \AtBeginDocument{\DeleteShortVerb{\|}} @@ -40,7 +40,7 @@ \title{The \software{hep-paper} package\thanks{This document corresponds to \software{hep-paper}~\fileversion.}} \subtitle{Publications in high energy physics} -\author{Jan Hajer \email{jan.hajer@unibas.ch}} +\author{Jan Hajer \email{jan.hajer@tecnico.ulisboa.pt}} \date{\filedate} \begin{document} diff --git a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-implementation.pdf b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-implementation.pdf index 1e07e618031..99012f2277b 100644 Binary files a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-implementation.pdf and b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-implementation.pdf differ diff --git a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-amsart.tex b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-amsart.tex index 690627d0954..3a1831742fc 100644 --- a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-amsart.tex +++ b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-amsart.tex @@ -6,7 +6,7 @@ %% %% hep-paper-implementation.dtx (with options: `testAMSArt') %% This is a generated file. -%% Copyright (C) 2019-2020 by Jan Hajer +%% Copyright (C) 2019-2022 by Jan Hajer %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.3c of this license or (at your option) any later diff --git a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-beamer.tex b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-beamer.tex index b1ab230f61e..b61bfe87837 100644 --- a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-beamer.tex +++ b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-beamer.tex @@ -6,7 +6,7 @@ %% %% hep-paper-implementation.dtx (with options: `testBeamer') %% This is a generated file. -%% Copyright (C) 2019-2020 by Jan Hajer +%% Copyright (C) 2019-2022 by Jan Hajer %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.3c of this license or (at your option) any later diff --git a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-jcap.tex b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-jcap.tex index 0b3a4b3e58b..0241610de4f 100644 --- a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-jcap.tex +++ b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-jcap.tex @@ -6,7 +6,7 @@ %% %% hep-paper-implementation.dtx (with options: `testJCAP') %% This is a generated file. -%% Copyright (C) 2019-2020 by Jan Hajer +%% Copyright (C) 2019-2022 by Jan Hajer %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.3c of this license or (at your option) any later diff --git a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-jhep.tex b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-jhep.tex index 7be29e5541c..6e9174e7b07 100644 --- a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-jhep.tex +++ b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-jhep.tex @@ -6,7 +6,7 @@ %% %% hep-paper-implementation.dtx (with options: `testJHEP') %% This is a generated file. -%% Copyright (C) 2019-2020 by Jan Hajer +%% Copyright (C) 2019-2022 by Jan Hajer %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.3c of this license or (at your option) any later diff --git a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-pos.tex b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-pos.tex index 7791f8484f8..4ed7976307b 100644 --- a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-pos.tex +++ b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-pos.tex @@ -6,7 +6,7 @@ %% %% hep-paper-implementation.dtx (with options: `testPoS') %% This is a generated file. -%% Copyright (C) 2019-2020 by Jan Hajer +%% Copyright (C) 2019-2022 by Jan Hajer %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.3c of this license or (at your option) any later diff --git a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-revtex.tex b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-revtex.tex index 1860435251a..4f56eeb7ca3 100644 --- a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-revtex.tex +++ b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-revtex.tex @@ -6,7 +6,7 @@ %% %% hep-paper-implementation.dtx (with options: `testRevTeX') %% This is a generated file. -%% Copyright (C) 2019-2020 by Jan Hajer +%% Copyright (C) 2019-2022 by Jan Hajer %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.3c of this license or (at your option) any later diff --git a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-springer.tex b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-springer.tex index a616a3f4142..6a0b090cf2a 100644 --- a/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-springer.tex +++ b/Master/texmf-dist/doc/latex/hep-paper/hep-paper-test-springer.tex @@ -6,7 +6,7 @@ %% %% hep-paper-implementation.dtx (with options: `testSpringer') %% This is a generated file. -%% Copyright (C) 2019-2020 by Jan Hajer +%% Copyright (C) 2019-2022 by Jan Hajer %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.3c of this license or (at your option) any later diff --git a/Master/texmf-dist/source/latex/hep-paper/hep-paper-implementation.dtx b/Master/texmf-dist/source/latex/hep-paper/hep-paper-implementation.dtx index 4e0334f0695..1fe7658b0ab 100644 --- a/Master/texmf-dist/source/latex/hep-paper/hep-paper-implementation.dtx +++ b/Master/texmf-dist/source/latex/hep-paper/hep-paper-implementation.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2019 by Jan Hajer +% Copyright (C) 2019-2022 by Jan Hajer % ----------------------------------- % % This file may be distributed and/or modified under the @@ -18,8 +18,8 @@ % \iffalse % %\NeedsTeXFormat{LaTeX2e}[2005/12/01] -%\ProvidesPackage{hep-paper}[2021/09/01 v2.0 Publications in High Energy Physics] -%\ProvidesFile{hep-paper-documentation.tex}[2021/09/01 v2.0 HEP-Paper documentation] +%\ProvidesPackage{hep-paper}[2022/11/01 v2.1 Publications in High Energy Physics] +%\ProvidesFile{hep-paper-documentation.tex}[2022/11/01 v2.1 HEP-Paper documentation] % %<*documentation> % @@ -55,24 +55,6 @@ % % \fi % -% \CheckSum{609} -% -% \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 -% Lower-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 -% Digits \0\1\2\3\4\5\6\7\8\9 -% Exclamation \! Double quote \" Hash (number) \# -% Dollar \$ Percent \% Ampersand \& -% Acute accent \' Left paren \( Right paren \) -% Asterisk \* Plus \+ Comma \, -% Minus \- Point \. Solidus \/ -% Colon \: Semicolon \; Less than \< -% Equals \= Greater than \> Question mark \? -% Commercial at \@ Left bracket \[ Backslash \\ -% Right bracket \] Circumflex \^ Underscore \_ -% Grave accent \` Left brace \{ Vertical bar \| -% Right brace \} Tilde \~} -% % \changes{v1.0}{2019/01/01}{Initial version of the style file.} % \changes{v1.1}{2020/01/01}{Transition to documented \hologo{LaTeX} source file.} % \changes{v1.2}{2020/03/01}{Introduction of package options.} @@ -83,6 +65,7 @@ % \changes{v1.7}{2021/06/01}{Introduction of dedicated style file for the title, acronyms and bibliography macros. Extension of the title macros.} % \changes{v1.8}{2021/08/01}{Expand thanks to allow for reference label and fine tune the title page. Reimplement the must relevant macros from the physics package. Make mathrm produce upright Greek.} % \changes{v2.0}{2021/09/01}{Move independent logic into dedicated packages.} +% \changes{v2.1}{2022/11/01}{Bug fixes in the underlying packages.} % % \ifshort %<*documentation> @@ -92,7 +75,7 @@ \title{The \software{hep-paper} package\thanks{This document corresponds to \software{hep-paper}~\fileversion.}} \subtitle{Publications in high energy physics} -\author{Jan Hajer \email{jan.hajer@unibas.ch}} +\author{Jan Hajer \email{jan.hajer@tecnico.ulisboa.pt}} \date{\filedate} % \ifshort @@ -645,7 +628,7 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t % % \subsection{Set compatibility} % -% Set the "amsart" compatibility options. +% Set the "amsart" compatibility options using the \software{xpatch} package \cite{xpatch}. % \begin{macrocode} \@ifclassloaded{amsart}{\setkeys{hep}{amsart}}{} \ifhep@amsart @@ -719,52 +702,41 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t }{hyperref} \AtBeginDocument{\renewcommand{\foreignabbrfont}{}} \fi -% -% \section{Font} -% -% Set the whole text to sans serif if requested. -% \begin{macrocode} -\ifhep@serif\else - \renewcommand{\familydefault}{\sfdefault} +\ifhep@jhep + \hoffset 0in + \voffset 0in + \RequirePackage{geometry} + \AtBeginDocument{\newgeometry{ + textheight=.757\paperheight, + textwidth=.72\paperwidth, + }} \fi % \end{macrocode} % -% Load the hep-font package. -% \begin{macrocode} -\RequirePackage[lining=\ifhep@lining true\else false \fi]{hep-font} -% \end{macrocode} +% \section{Font} \label{sec:font} % -% \subsection{Math fonts} -% -% Load the hep-math-font package. +% Load the \software{hep-font} package \cite{hep-font}. % \begin{macrocode} -\RequirePackage[symbols=\hep@symbols]{hep-math-font} +\PassOptionsToPackage{ + size=\hep@font, + sans=\ifhep@serif false\else true\fi, + lining=\ifhep@lining true\else false\fi +}{hep-font} +\RequirePackage{hep-font} % \end{macrocode} % -% \subsection{Font size} \label{sec:font size} +% \subsection{Math fonts} % -% Undefine previously defined font sizes and load the \hologo{LaTeX} font size file corresponding to the font size option. +% Load the \software{hep-math-font} package \cite{hep-math-font}. % \begin{macrocode} -\ifhep@defaults\else - \def\hep@remove@pt#1pt{#1} - \edef\hep@pt@size{\expandafter\hep@remove@pt\hep@font} - \let\small\relax - \let\footnotesize\relax - \let\scriptsize\relax - \let\tiny\relax - \let\large\relax - \let\Large\relax - \let\LARGE\relax - \let\huge\relax - \let\Huge\relax - \input{size\hep@pt@size.clo} -\fi +\PassOptionsToPackage{symbols=\hep@symbols}{hep-math-font} +\RequirePackage{hep-math-font} % \end{macrocode} % % \section{Geometry} % % Load the \software{geometry} package \cite{geometry} and adjust the text width and height. -% This step must happen after readjusting the font size in \cref{sec:font size}. +% This step must happen after readjusting the font size in \cref{sec:font}. % \begin{macrocode} \ifhep@defaults\else \RequirePackage{geometry} @@ -805,22 +777,25 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t % % Load the \software{hep-text} package \cite{hep-text}. % \begin{macrocode} -\RequirePackage[lang=\hep@lang]{hep-text} +\PassOptionsToPackage{lang=\hep@lang}{hep-text} +\RequirePackage{hep-text} % \end{macrocode} % % \section{Math} % +% Load the \software{hep-math} package \cite{hep-math}. % \begin{macrocode} \ifhep@physics\RequirePackage{hep-math}\fi % \end{macrocode} % % \section{Floats} % -% Adjust the \hologo{LaTeX} float placement defaults +% Adjust the \hologo{LaTeX} float placement defaults using the \software{hep-float} package \cite{hep-float}. % \begin{macrocode} -\RequirePackage[ +\PassOptionsToPackage{ manualplacement=\ifhep@manualplacement true\else false \fi -]{hep-float} +}{hep-float} +\RequirePackage{hep-float} % \end{macrocode} % % \begin{macro}{\ifhep@journal} @@ -872,7 +847,7 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t % % \section{Title page} % -% Begin of "title" conditional. +% Adjust the title page using the \software{hep-title} package \cite{hep-title}. % \begin{macrocode} \ifhep@title\RequirePackage{hep-title}\fi % \end{macrocode} @@ -880,38 +855,26 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t % \section{Bibliography} % % Check if bibliography management is requested using the \software{pdftexcmds} package \cite{pdftexcmds}. +% And load the \software{hep-bibliography} package \cite{hep-bibliography} % \begin{macrocode} \RequirePackage{pdftexcmds} \ifnum\pdf@strcmp{\hep@bibliography}{false}=0\else - \RequirePackage[style=\hep@bibliography]{hep-bibliography} + \PassOptionsToPackage{style=\hep@bibliography}{hep-bibliography} + \RequirePackage{hep-bibliography} \fi % \end{macrocode} % \section{Hyperlinks, Footnotes and References} \label{sec:hyperlinks} % -% Load the \software{hyperref} package \cite{hyperref} enable Unicode encoding and hide links. +% Load the \software{hep-reference} package \cite{hep-reference}. % % \begin{macrocode} -\RequirePackage{hyperref} -\hypersetup{ - pdfencoding=auto, psdextra, - hidelinks, linktoc=all, breaklinks=true, - pdfcreator={}, pdfproducer={} -} +\ifhep@references +\RequirePackage{hep-reference} % \end{macrocode} -% Set the \PDF meta data according to the paper information and ensure that unnecessary information is suppressed. % +% Set the \PDF meta data according to the paper information and ensure that unnecessary information is suppressed. % \begin{macrocode} -\pdfstringdefDisableCommands{\def\varepsilon{\textepsilon}} -\pdfstringdefDisableCommands{\def\to{\textrightarrow}} -\AtBeginDocument{ - \pdfstringdefDisableCommands{\let\ensuremath\@gobble} - \pdfstringdefDisableCommands{\let\mathsurround\@gobble} - \pdfstringdefDisableCommands{\let\unskip\@gobble} - \pdfstringdefDisableCommands{\let\thanks\@gobble} - \pdfstringdefDisableCommands{\let\footnote\@gobble} - \pdfstringdefDisableCommands{\let\\\@gobble} -} \ifhep@revtex \AtBeginShipout{\hypersetup{pdftitle={\@title}}} \else @@ -927,143 +890,15 @@ The \software{arxiv-collector} python script \cite{arxiv-collector} alleviates t \fi \fi % \end{macrocode} - -% \subsection{Footnotes} -% -% Place a hyperlink from the footnote back to its referencing label using the \software{footnotebackref} package \cite{footnotebackref}. -% \begin{macrocode} -\def\BackrefFootnoteTag{} -\RequirePackage{footnotebackref} -% \end{macrocode} -% -% \begin{macro}{\footnote} -% Ensure that no spaces appear before the footmark or at the beginning of the footnote. -% \begin{macrocode} -\let\@foot@note\footnote -\renewcommand{\footnote}[1]{\unskip\@foot@note{\ignorespaces#1}} -% \end{macrocode} -% \end{macro} - -% \subsection{References} -% -% Begin of "references" conditional -% \begin{macrocode} -\ifhep@references -% \end{macrocode} -% -% \begin{macro}{\cref} -% Improve reference using the \software{cleveref} package \cite{cleveref}. -% -% \begin{macrocode} -\RequirePackage[noabbrev, nameinlink]{cleveref} -\newcommand{\creflastconjunction}{, and\nobreakspace} -\crefname{enumi}{point}{points} -\crefname{inlinelisti}{point}{points} -% \end{macrocode} -% \end{macro} -% -%\begin{macro}{\no@break@before} -% Define a macro able to prevent line breaks. -% \begin{macrocode} -\newcommand\no@break@before{% - \relax\ifvmode\else% - \ifhmode% - \ifdim\lastskip > 0pt% - \relax\unskip\nobreakspace% - \fi% - \fi% - \fi% -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\ref} -% Adjust "\ref"\marg{key} in order to prevent preceding line breaks. -% \begin{macrocode} -\let\hep@ref\ref -\AtBeginDocument{\renewcommand\ref{\no@break@before\hep@ref}} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\eqref} -% Adjust "\eqref"\marg{key} in order to prevent preceding line breaks. -% \begin{macrocode} -\renewcommand\eqref{\no@break@before\labelcref} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\subref} -% Adjust "\subref"\marg{key} in order to prevent preceding line breaks. -% \begin{macrocode} -\let\hep@subref\subref -\renewcommand\subref{\no@break@before\hep@subref} -\renewcommand*\subcaption@ref[2]{\begingroup% - \caption@setoptions{sub}% - \subcaption@reffmt\p@subref{\hep@ref#1{sub@#2}}% -\endgroup} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\subcref} -% Provide the "\subcref" macro. -% \begin{macrocode} -\newcommand{\subcref}[1]{\cref{sub@#1}} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\eqcrefname} -% Define the "\eqcrefname" macro for named equation types. -% \begin{macrocode} -\NewDocumentCommand{\eqcrefname}{mmo}{ - \crefname{#1}{#2}{\IfValueTF{#3}{#3}{#2s}} - \creflabelformat{#1}{(##2##1##3)} -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\labelcrefrange} -% Define the missing "\labelcrefrange"\marg{key1}\marg{key2} macro. -% \begin{macrocode} -\DeclareRobustCommand{\labelcrefrange}[2]{% - \@crefrangenostar{labelcref}{#1}{#2}% -} -% \end{macrocode} -% \end{macro} -% -% Adjust the title page -% \begin{macrocode} -\ifhep@title - \labelcrefmultiformat{affiliation}{#2#1#3}{% - \textsuperscript,#2#1#3}{\textsuperscript,#2#1#3% - }{% - \textsuperscript,#2#1#3% - } - \labelcrefrangeformat{affiliation}{#3#1#4\textsuperscript{--}#5#2#6} -% \thanksmarkseries{alph} -\fi -% \end{macrocode} % % End of "references" conditional % \begin{macrocode} \fi % \end{macrocode} -% \subsection{Citations} -% -% \begin{macro}{\cite} -% Adjust "\cite"\marg{key} in order to prevent preceding line breaks. -% \begin{macrocode} -\let\hep@cite\cite -\renewcommand\cite{\no@break@before\hep@cite} -% \end{macrocode} -% \end{macro} -% % \section{Acronyms} % % Define acronyms if not deactivated. -% \begin{macrocode} -% \end{macrocode} -% % Acronyms are implemented in the \software{hep-acronym} package \cite{hep-acronym} and must be loaded after the \software{hyperref} package in \cref{sec:hyperlinks}. % Set the abbreviation style. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/hep-paper/hep-paper.ins b/Master/texmf-dist/source/latex/hep-paper/hep-paper.ins index 03850f582ca..eddbb9aafee 100644 --- a/Master/texmf-dist/source/latex/hep-paper/hep-paper.ins +++ b/Master/texmf-dist/source/latex/hep-paper/hep-paper.ins @@ -1,4 +1,4 @@ -%% Copyright (C) 2019-2020 by Jan Hajer +%% Copyright (C) 2019-2022 by Jan Hajer %% %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -16,7 +16,7 @@ \preamble This is a generated file. -Copyright (C) 2019-2020 by Jan Hajer +Copyright (C) 2019-2022 by Jan Hajer This file may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later diff --git a/Master/texmf-dist/tex/latex/hep-paper/hep-paper.sty b/Master/texmf-dist/tex/latex/hep-paper/hep-paper.sty index c51e71fe5dc..e00fd3faab6 100644 --- a/Master/texmf-dist/tex/latex/hep-paper/hep-paper.sty +++ b/Master/texmf-dist/tex/latex/hep-paper/hep-paper.sty @@ -6,7 +6,7 @@ %% %% hep-paper-implementation.dtx (with options: `package') %% This is a generated file. -%% Copyright (C) 2019-2020 by Jan Hajer +%% Copyright (C) 2019-2022 by Jan Hajer %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.3c of this license or (at your option) any later @@ -15,7 +15,7 @@ %% and version 1.3c or later is part of all distributions of %% LaTeX version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e}[2005/12/01] -\ProvidesPackage{hep-paper}[2021/09/01 v2.0 Publications in High Energy Physics] +\ProvidesPackage{hep-paper}[2022/11/01 v2.1 Publications in High Energy Physics] \RequirePackage{kvoptions} \SetupKeyvalOptions{ @@ -108,25 +108,23 @@ }{hyperref} \AtBeginDocument{\renewcommand{\foreignabbrfont}{}} \fi -\ifhep@serif\else - \renewcommand{\familydefault}{\sfdefault} -\fi -\RequirePackage[lining=\ifhep@lining true\else false \fi]{hep-font} -\RequirePackage[symbols=\hep@symbols]{hep-math-font} -\ifhep@defaults\else - \def\hep@remove@pt#1pt{#1} - \edef\hep@pt@size{\expandafter\hep@remove@pt\hep@font} - \let\small\relax - \let\footnotesize\relax - \let\scriptsize\relax - \let\tiny\relax - \let\large\relax - \let\Large\relax - \let\LARGE\relax - \let\huge\relax - \let\Huge\relax - \input{size\hep@pt@size.clo} -\fi +\ifhep@jhep + \hoffset 0in + \voffset 0in + \RequirePackage{geometry} + \AtBeginDocument{\newgeometry{ + textheight=.757\paperheight, + textwidth=.72\paperwidth, + }} +\fi +\PassOptionsToPackage{ + size=\hep@font, + sans=\ifhep@serif false\else true\fi, + lining=\ifhep@lining true\else false\fi +}{hep-font} +\RequirePackage{hep-font} +\PassOptionsToPackage{symbols=\hep@symbols}{hep-math-font} +\RequirePackage{hep-math-font} \ifhep@defaults\else \RequirePackage{geometry} \geometry{\hep@paper paper, includeheadfoot} @@ -152,11 +150,13 @@ \fi } \fi -\RequirePackage[lang=\hep@lang]{hep-text} +\PassOptionsToPackage{lang=\hep@lang}{hep-text} +\RequirePackage{hep-text} \ifhep@physics\RequirePackage{hep-math}\fi -\RequirePackage[ +\PassOptionsToPackage{ manualplacement=\ifhep@manualplacement true\else false \fi -]{hep-float} +}{hep-float} +\RequirePackage{hep-float} \newif\ifhep@journal \ifhep@sissa\hep@journaltrue \else\ifhep@revtex\hep@journaltrue @@ -193,25 +193,12 @@ \ifhep@title\RequirePackage{hep-title}\fi \RequirePackage{pdftexcmds} \ifnum\pdf@strcmp{\hep@bibliography}{false}=0\else - \RequirePackage[style=\hep@bibliography]{hep-bibliography} + \PassOptionsToPackage{style=\hep@bibliography}{hep-bibliography} + \RequirePackage{hep-bibliography} \fi -\RequirePackage{hyperref} -\hypersetup{ - pdfencoding=auto, psdextra, - hidelinks, linktoc=all, breaklinks=true, - pdfcreator={}, pdfproducer={} -} -\pdfstringdefDisableCommands{\def\varepsilon{\textepsilon}} -\pdfstringdefDisableCommands{\def\to{\textrightarrow}} -\AtBeginDocument{ - \pdfstringdefDisableCommands{\let\ensuremath\@gobble} - \pdfstringdefDisableCommands{\let\mathsurround\@gobble} - \pdfstringdefDisableCommands{\let\unskip\@gobble} - \pdfstringdefDisableCommands{\let\thanks\@gobble} - \pdfstringdefDisableCommands{\let\footnote\@gobble} - \pdfstringdefDisableCommands{\let\\\@gobble} -} +\ifhep@references +\RequirePackage{hep-reference} \ifhep@revtex \AtBeginShipout{\hypersetup{pdftitle={\@title}}} \else @@ -226,55 +213,8 @@ \ifhep@pos\else\AtBeginDocument{\hypersetup{pdfauthor={\@author}}}\fi \fi \fi - -\def\BackrefFootnoteTag{} -\RequirePackage{footnotebackref} -\let\@foot@note\footnote -\renewcommand{\footnote}[1]{\unskip\@foot@note{\ignorespaces#1}} - -\ifhep@references -\RequirePackage[noabbrev, nameinlink]{cleveref} -\newcommand{\creflastconjunction}{, and\nobreakspace} -\crefname{enumi}{point}{points} -\crefname{inlinelisti}{point}{points} -\newcommand\no@break@before{% - \relax\ifvmode\else% - \ifhmode% - \ifdim\lastskip > 0pt% - \relax\unskip\nobreakspace% - \fi% - \fi% - \fi% -} -\let\hep@ref\ref -\AtBeginDocument{\renewcommand\ref{\no@break@before\hep@ref}} -\renewcommand\eqref{\no@break@before\labelcref} -\let\hep@subref\subref -\renewcommand\subref{\no@break@before\hep@subref} -\renewcommand*\subcaption@ref[2]{\begingroup% - \caption@setoptions{sub}% - \subcaption@reffmt\p@subref{\hep@ref#1{sub@#2}}% -\endgroup} -\newcommand{\subcref}[1]{\cref{sub@#1}} -\NewDocumentCommand{\eqcrefname}{mmo}{ - \crefname{#1}{#2}{\IfValueTF{#3}{#3}{#2s}} - \creflabelformat{#1}{(##2##1##3)} -} -\DeclareRobustCommand{\labelcrefrange}[2]{% - \@crefrangenostar{labelcref}{#1}{#2}% -} -\ifhep@title - \labelcrefmultiformat{affiliation}{#2#1#3}{% - \textsuperscript,#2#1#3}{\textsuperscript,#2#1#3% - }{% - \textsuperscript,#2#1#3% - } - \labelcrefrangeformat{affiliation}{#3#1#4\textsuperscript{--}#5#2#6} -\fi \fi -\let\hep@cite\cite -\renewcommand\cite{\no@break@before\hep@cite} \ifhep@glossaries\RequirePackage{hep-acronym}\fi \endinput -- cgit v1.2.3