From 82f960603e3cb2b85ba3eed11f6422e354979d69 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 6 Jul 2019 20:41:10 +0000 Subject: asmejour (6jul19) git-svn-id: svn://tug.org/texlive/trunk@51567 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/asmejour/asmejour.cls | 40 +++++++++++++++++------ 1 file changed, 30 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/latex/asmejour') diff --git a/Master/texmf-dist/tex/latex/asmejour/asmejour.cls b/Master/texmf-dist/tex/latex/asmejour/asmejour.cls index 5cb23c787c9..ba356403733 100644 --- a/Master/texmf-dist/tex/latex/asmejour/asmejour.cls +++ b/Master/texmf-dist/tex/latex/asmejour/asmejour.cls @@ -6,7 +6,7 @@ %% The asmejour.cls file should be used with the files asmejour.bst (for citations) and asmejour-template.tex. %% %% -%% This file is version 1.03 dated 2019/05/26. +%% This file is version 1.04 dated 2019/07/05. %% %% Author: John H. Lienhard V %% Department of Mechanical Engineering @@ -20,7 +20,7 @@ %% The Times/Helvetica style fonts are from Michael Sharpe's excellent newtxtext and newtxmath packages. %% This class is not designed for unicode-math or fontspec. %% -%% Options for the class are described on lines 73-133. +%% Options for the class are described on lines 63-145. %% %% The class defines an environment for nomenclature. LaTeX must be run twice to align those columns. %% @@ -52,7 +52,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{asmejour}[2019/05/26 asmejour paper format] +\ProvidesClass{asmejour}[2019/07/05 asmejour paper format] \LoadClass[twoside,9pt,twocolumn]{extarticle} @@ -95,6 +95,17 @@ \setboolean{lineno}{#1} } +%%% set key [lang,lang-second,lang-third] to pass languages to babel. +\define@key{asmejour}{lang}[english]{% + \PassOptionsToPackage{#1}{babel}% +} +\define@key{asmejour}{lang-second}[english]{% + \PassOptionsToPackage{#1}{babel}% +} +\define@key{asmejour}{lang-third}[english]{% + \PassOptionsToPackage{#1}{babel}% +} + \ProcessKeyvalOptions* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -170,6 +181,7 @@ \RequirePackage{mathtools} % extends amsmath \RequirePackage[utf8]{inputenc} +\RequirePackage[]{babel} \RequirePackage[]{newtxtext} \RequirePackage[varqu,varl]{inconsolata} % sans typewriter font \RequirePackage[]{newtxmath} @@ -209,6 +221,14 @@ \newcommand*{\CondSansBold}{\renewcommand\bfdefault{b}\selectfont\fontfamily{qhvc}\selectfont\bfseries} \renewcommand\Huge{\@setfontsize\Huge{26.5}{26.5}} %... for title font only +\addto{\captionsenglish}{% + \renewcommand{\figurename}{Fig.} + \renewcommand{\tablename}{Table} +} + \providecommand{\nomname}{Nomenclature} + \providecommand{\keywordname}{Keywords} + + %%%%%%%%%%%%%%%%% LINE AND EQUATION NUMBERING %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -216,6 +236,7 @@ \RequirePackage[switch]{lineno} \renewcommand{\linenumberfont}{\normalfont\footnotesize\color{red}} \AtBeginDocument{\linenumbers} + \ClassWarningNoLine{asmejour}{Package lineno loaded, so \protect\balance\space will be disabled} }{% \RequirePackage{balance}% balance is NOT compatible with lineno } @@ -299,8 +320,8 @@ \DeclareCaptionTextFormat{boldmath}{\mathversion{sansbold}#1} -\captionsetup[figure]{name=Fig.,labelfont={sf,bf},textfont={sf,bf},textformat=boldmath,labelsep=quad} -\captionsetup[table]{name=Table,labelfont={sf,bf},textfont={sf,bf},textformat=boldmath,labelsep=quad,skip=0.5\baselineskip} +\captionsetup[figure]{labelfont={sf,bf},textfont={sf,bf},textformat=boldmath,labelsep=quad} +\captionsetup[table]{labelfont={sf,bf},textfont={sf,bf},textformat=boldmath,labelsep=quad,skip=0.5\baselineskip} %%%%%%%%%%%% SECTION HEADINGS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -329,7 +350,7 @@ \renewcommand\thesection{\Alph{section}} \setcounter{equation}{0} \renewcommand\theequation{\Alph{section}\arabic{equation}} - \titleformat{\section}[block]{\mathversion{bold}\bfseries\large\raggedright}{Appendix \thesection:}{0.5em}{}[\setcounter{equation}{0}] + \titleformat{\section}[block]{\mathversion{bold}\bfseries\large\raggedright}{\appendixname\ \thesection:}{0.5em}{}[\setcounter{equation}{0}] } % natbib's \bibsection controls section heading for References. @@ -442,7 +463,7 @@ \AtBeginDocument{\setlength{\nomenwidth}{\totvalue{savedlength}sp}} % value is the length in scaled points (sp) -\DeclareDocumentEnvironment{nomenclature}{O{\nomenwidth} O{Nomenclature}}{% +\DeclareDocumentEnvironment{nomenclature}{O{\nomenwidth} O{\nomname}}{% \setlength{\widest}{0em} \section*{#2} \raggedright @@ -528,7 +549,7 @@ \DeclareDocumentCommand{\keywords}{g}{% \IfNoValueTF{#1}{% \relax}{% - \long\def\@keywords{\par\vskip\baselineskip\noindent{Keywords:} #1}% + \long\def\@keywords{\par\vskip\baselineskip\noindent{\keywordname:} #1}% } } @@ -562,7 +583,6 @@ %%%% Flag for corresponding author (just one expected, although code supports more than one) %%%% for more than one, if including email in footnote, place in final command -\makeatletter \newif\ifCA\CAfalse \newcommand{\CAemail}[1]{\gdef\@CAemail{#1}} @@ -599,7 +619,7 @@ \footnotetext{Corresponding author\@CAsep \@CAemail} \fi } -\makeatother +%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -- cgit v1.2.3