summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/asmeconf
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-03 23:04:16 +0000
committerKarl Berry <karl@freefriends.org>2020-03-03 23:04:16 +0000
commit6b3dc30f8175be67b1c491c9aae07dda841d7ff9 (patch)
tree54d272d842b49e020531a0506edd4f217ab14003 /Master/texmf-dist/tex/latex/asmeconf
parent8eeb83db3cf46b359b67b0ab567d0d1ec39045b4 (diff)
asmeconf (1mar20)
git-svn-id: svn://tug.org/texlive/trunk@54048 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/asmeconf')
-rw-r--r--Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls86
1 files changed, 51 insertions, 35 deletions
diff --git a/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls b/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls
index 0eda4a27013..11cf01aba57 100644
--- a/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls
+++ b/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls
@@ -5,9 +5,9 @@
%%
%% Please note that ASME's journals follow specifications different from ASME conference papers.
%%
-%% This file is version 1.15 dated 2020/01/24.
- \def\versionno{1.15}
- \def\versiondate{2020/01/24\space}
+%% This file is version 1.17 dated 2020/02/29.
+ \def\versionno{1.17}
+ \def\versiondate{2020/02/29\space}
%%
%% Author: John H. Lienhard V
%% Department of Mechanical Engineering
@@ -49,7 +49,7 @@
%%
%% LICENSE:
%%
-%% Copyright (c) 2019 John H. Lienhard
+%% Copyright (c) 2020 John H. Lienhard
%%
%% Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
%% associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -89,7 +89,7 @@
\RequirePackage{kvoptions}
-%\RequirePackage{kvsetkeys}
+%\RequirePackage{kvsetkeys} % already loaded by kvoptions
\SetupKeyvalOptions{
family=asmeconf,
prefix=asmeconf@,
@@ -190,7 +190,7 @@
\RequirePackage{graphicx}
\RequirePackage[hyperref,fixpdftex,dvipsnames,svgnames,x11names]{xcolor}
\RequirePackage{xparse}
-\RequirePackage{comment}
+\RequirePackage{metalogo,hologo} % Access various LaTeX logos if needed
%%%%%%%%%%%%%%%%%%%%%%%%
@@ -202,8 +202,18 @@
%%%% FONT related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\RequirePackage{mathtools} % extends amsmath
-\RequirePackage[utf8]{inputenc}
+\RequirePackage[T1]{fontenc}
+
+\RequirePackage{iftex} % check whether pdfTeX or a different engine is used
+\ifpdftex
+ \pdfminorversion=7 % This selection is not required.
+ \RequirePackage[utf8]{inputenc} % for backward compatibility with pre-2018 distributions
+\else
+ \relax
+\fi
+
+\RequirePackage{mathtools} % loads and extends amsmath
+
\RequirePackage[]{babel}
\RequirePackage[]{newtxtext}
\RequirePackage[varqu,varl]{inconsolata} % sans typewriter font
@@ -213,8 +223,8 @@
%% override \textsu if using default superiors
\ifthenelse{\boolean{DefaultSups}}{\let\textsu\textsuperscript}{\relax}
-\RequirePackage[]{mathalfa} % load optional fonts for Calligraphy, Script, etc.
-% See package documentation for capabilities of this package.
+\RequirePackage[]{mathalfa} % load optional fonts for Calligraphy, Script, Fraktur
+% See mathalfa package documentation for capabilities of this package.
% Option format: mathalfa=cal=euler (etc.)
\RequirePackage{bm} % load after all math to give access to bold math
@@ -243,7 +253,7 @@
%% This provides sans serif italic and sans serif bold italic math.
-%% It's intended only for use in the figure captions and section heading (recommend \bm{..} elsewhere).
+%% It's intended only for use in the figure captions and section headings (recommend \bm{..} elsewhere).
\DeclareMathVersion{sansbold}
\SetSymbolFont{letters}{sansbold}{OML}{ntxsfmi}{b}{it}
\SetSymbolFont{lettersA}{sansbold}{U}{ntxsfmia}{b}{it}
@@ -360,16 +370,22 @@
\urlstyle{same} % don't switch to typewriter font
-\RequirePackage{doi} % provides hyperlinks for doi in bibliography
+\RequirePackage{doi} % supports the nasty characters in some doi's
\renewcommand{\doitext}{DOI } % change the default value, {doi:}, to this per ASME specification
\RequirePackage{bookmark} % improves handling of pdf bookmarks
%% Since \bm may be useful in headings, this fix will reduce frequency with which
-%% alternate pdfstrings must be given in revised section command as \section[pdfstring]{texstring}
+%% alternate pdfstrings must be given in revised section command as \section[pdfstring]{texstring}
\pdfstringdefDisableCommands{%
\def\bm#1#{\relax}%
}
+%% Let's disable \( and \) in pdf bookmarks, 28/2/20
+\pdfstringdefDisableCommands{%
+ \def\({\relax}%
+ \def\){\relax}%
+}
+
%% Let's also make sure \NoCaseChange in section headings won't break pdf bookmarks
\pdfstringdefDisableCommands{%
\let\NoCaseChange\relax%
@@ -383,35 +399,35 @@
%% Let's make sure footnotes in section headings don't break pdf bookmarks.
\RequirePackage{etoolbox}
\robustify{\footnote}
+% \patchcmd{\section}{\sectionmark}{\let\footnote\@gobble\sectionmark}{}{} <== not really needed in this context 28/2/20
\pdfstringdefDisableCommands{%
\def\footnote#1{}%
}
-
%% Let's also add \footnote to the \TextUppercase exception list, so that footnote text won't be capitalized
%% if given in section headings. Ditto for \eqref
-\RequirePackage{xpatch}
-\xpatchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\footnote}{}{}
-\xpatchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\eqref}{}{} %% correct 24 Jan 2020
+%
+\patchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\footnote}{}{}
+\patchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\eqref}{}{} %% corrected 24 Jan 2020
%%% Create an optional argument for unnumbered sections and set pdf bookmark (thru \addcontentsline).
%%% The optional argument will manually set the pdf bookmark for that section; can be used to avoid hyperref
%%% errors when macros are in section titles.
-%%% There should not be errors for $$, \cite, \ref, \label, \footnote, or \bm with current construction.
+%%% There should not be errors for $, \cite, \ref, \eqref, \label, \footnote, \NoCaseChange, or \bm with current constructions.
\let\svsection\section
\RenewDocumentCommand{\section}{s o m}{%
\IfBooleanTF {#1}
- {\svsection*{#3}\phantomsection
+ {\svsection*{#3}\phantomsection%
{\IfNoValueTF {#2}
- {\addcontentsline{toc}{section}{#3} }
- {\addcontentsline{toc}{section}{#2} }
- }
- }
+ {\addcontentsline{toc}{section}{#3}}
+ {\addcontentsline{toc}{section}{#2}}% removed trailing space 28/2/20
+ }%
+ }%
{\IfNoValueTF {#2}
{\svsection{#3}}
- {\svsection[#2]{#3}}
- }
+ {\svsection[#2]{#3}}%
+ }%
}
%%%%%%%%%%%%% Line numbering and balancing columns on last page %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -482,7 +498,7 @@
}{%
\item[#1\hfill]#2%
\@itempenalty=-\@lowpenalty%
- }
+ }%
}
\DeclareDocumentEnvironment{nomenclature}{O{2em} O{\nomname}}{%
@@ -491,13 +507,13 @@
\section*{#2}
\raggedright
\begin{list}{}{%
- \setlength{\itemsep}{0pt}
- \setlength{\parsep}{\itemsep}
+ \setlength{\itemsep}{0pt}%
+ \setlength{\parsep}{\itemsep}%
\setlength{\labelsep}{1em}%
\setlength{\labelwidth}{\nomenwidth}%
\setlength{\leftmargin}{\labelwidth}%
\addtolength{\leftmargin}{\labelsep}%
- \setlength\savitemsep\itemsep
+ \setlength\savitemsep\itemsep%
}%
}{\end{list}}
@@ -637,13 +653,13 @@
\DeclareDocumentCommand{\CorrespondingAuthor}{m g}{%
\global\CAtrue%
\IfNoValueTF{#2}{%
- \gdef\@CAsep{\relax}
- \gdef\@CAemail{\relax}
+ \gdef\@CAsep{\relax}%
+ \gdef\@CAemail{\relax}%
}{%
- \gdef\@CAsep{:\space}
- \gdef\@CAemail{#2}
- }
- \renewcommand*{\thefootnote}{\fnsymbol{footnote}}
+ \gdef\@CAsep{:\space}%
+ \gdef\@CAemail{#2}%
+ }%
+ \renewcommand*{\thefootnote}{\fnsymbol{footnote}}%
\ignorespaces#1\ignorespaces\footnotemark[1]%
}