diff options
Diffstat (limited to 'macros/latex/contrib/asmejour')
-rw-r--r-- | macros/latex/contrib/asmejour/README.md | 11 | ||||
-rw-r--r-- | macros/latex/contrib/asmejour/asmejour-template.pdf | bin | 628626 -> 628945 bytes | |||
-rw-r--r-- | macros/latex/contrib/asmejour/asmejour-template.tex | 15 | ||||
-rw-r--r-- | macros/latex/contrib/asmejour/asmejour.cls | 45 | ||||
-rw-r--r-- | macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf | bin | 2978593 -> 3048771 bytes | |||
-rw-r--r-- | macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.tex | 8 | ||||
-rw-r--r-- | macros/latex/contrib/asmejour/asmewide_example/asmewide.sty | 23 |
7 files changed, 78 insertions, 24 deletions
diff --git a/macros/latex/contrib/asmejour/README.md b/macros/latex/contrib/asmejour/README.md index 54c16035c7..4a7ab4d6a5 100644 --- a/macros/latex/contrib/asmejour/README.md +++ b/macros/latex/contrib/asmejour/README.md @@ -1,11 +1,11 @@ #asmejour: A template for ASME journal papers# - Version 1.18 dated 2022/01/10. + Version 1.19 dated 2022/06/26. ####Overview#### This class provides a template to format preprints in the style of journal papers published by the American Society of Mechanical Engineers. - The layout and reference formats follow the style of published papers in 2021. + The layout and reference formats follow the style of published papers in 2022. This work is not a publication of ASME. @@ -66,6 +66,13 @@ --- ####Change log#### +v1.19 (2022/06/26) + - Correct typo in asmejour.cls (line 359): \\protec should be \\protect + - Force T1 encoding of qhvc font under LuaLaTeX (for title and author blocks) + - Update code for Inconsolata and Helvetica fonts under LuaLaTeX to ensure T1 encoding. Adjust scale factors. + - Scale Helvetica font to 0.91, to better match roman font. + - Add option to asmewide.sty to suppress final page column balancing, [raggedend], expand error message text. + v1.18 (2022/01/10) - Introduce asmewide.sty, an experimental package for setting page-width equations in a two column format. A document with examples of use is included. diff --git a/macros/latex/contrib/asmejour/asmejour-template.pdf b/macros/latex/contrib/asmejour/asmejour-template.pdf Binary files differindex 5c79214158..ba72975507 100644 --- a/macros/latex/contrib/asmejour/asmejour-template.pdf +++ b/macros/latex/contrib/asmejour/asmejour-template.pdf diff --git a/macros/latex/contrib/asmejour/asmejour-template.tex b/macros/latex/contrib/asmejour/asmejour-template.tex index 28cebec8e2..df439b43fe 100644 --- a/macros/latex/contrib/asmejour/asmejour-template.tex +++ b/macros/latex/contrib/asmejour/asmejour-template.tex @@ -3,7 +3,7 @@ %% %% This file is asmejour-template.tex, a template to format papers in the style of ASME journal papers. %% -%% This file is version 1.18 dated 2022/01/10 +%% This file is version 1.19 dated 2022/06/22 %% %% Author: John H. Lienhard V %% Department of Mechanical Engineering @@ -79,6 +79,17 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% New pdf management code (June 2021); with this, the class options for pdf-a can be omitted. +%% This change to the LaTeX kernel is being phased-in by the LaTeX3 team. Can delete if it gives you trouble. +%% Under LuaLaTeX, choose pdfstandard=A-3b. + +%\RequirePackage{pdfmanagement-testphase}% +% \DocumentMetadata{% +% pdfstandard=A-3b,% A-2b, A-2u, A-3b, or A-3u +% }% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %% Class options are described above. \documentclass[subscriptcorrection,upint,varvw,barcolor=Goldenrod3,mathalfa=cal=euler,balance,hyphenate,french,pdf-a]{asmejour} % @@ -209,7 +220,7 @@ If you wish to override the default math format in a heading or caption, put \ve Single-sentence captions should not end with a period. Multi-sentence captions do include periods. \subsection{Subsection Headings} -Section, subsection, and subsubsection headings should be in title case (first letter of primary words capitalized). ASME does not use \verb|\paragraph|, so the class file equates this command to \verb|\subsubsection|. +Section, subsection, and subsubsection headings should be in title case (first letter of primary words capitalized). ASME does not use \verb|\paragraph|, so the class file equates this command to \verb|\subsubsection|. \textsf{Try some text for size scaling.} Try some text for size scaling. %%%%%%%%%%%%% begin figure %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/macros/latex/contrib/asmejour/asmejour.cls b/macros/latex/contrib/asmejour/asmejour.cls index b91e54f914..13b1c2a560 100644 --- a/macros/latex/contrib/asmejour/asmejour.cls +++ b/macros/latex/contrib/asmejour/asmejour.cls @@ -6,8 +6,8 @@ %% %% %% This file's version and date are: - \def\versionno{1.18} - \def\versiondate{2022/01/10\space} + \def\versionno{1.19} + \def\versiondate{2022/06/22\space} %% %% Author: John H. Lienhard V %% Department of Mechanical Engineering @@ -355,8 +355,8 @@ \RequirePackage[utf8]{inputenc}% for backward compatibility with pre-2018 LaTeX distributions \else \ifaj@setpdfa\ClassWarningNoLine{asmejour}{pdf-a option requires pdfLaTeX engine. Under LuaLaTeX, use % - \protec\RequirePackage{pdfmanagement-testphase} % - \protect\DeclareDocumentMetadata{pdfstandard=A-3b} before \protect\documentclass[..]{asmejour}}\fi% + \protect\RequirePackage{pdfmanagement-testphase} % + \protect\DocumentMetadata{pdfstandard=A-3b} before \protect\documentclass[..]{asmejour}}\fi% \ifluatex \directlua{ if pdf.getminorversion() \string~= 7 then @@ -377,9 +377,30 @@ \RequirePackage{mathtools}% loads and extends amsmath \RequirePackage[]{babel} -\RequirePackage[]{newtxtext} -\RequirePackage[varl,varqu]{inconsolata}% sans typewriter font; restored varl, varqu 2020/08/10 -\RequirePackage[]{newtxmath} +\ifpdftex + \RequirePackage[helvratio=0.91]{newtxtext}% add this scaling 2022/06/26 + \RequirePackage[varl,varqu]{inconsolata}% sans typewriter font; restored varl, varqu 2020/08/10 + \RequirePackage[]{newtxmath} +\else % use lualatex without font support for other languages (easier set-up and still enables luacode for numerics). Added 2022/06/26. + \renewcommand*\rmdefault{ntxtlf} % roman font for math + \RequirePackage[T1]{fontenc} % qhv and zi4 are not TU encoded, 2021/12/24 + \DeclareFontFamily{T1}{\sfdefault}{} % sf for math + \DeclareFontShape{T1}{\sfdefault}{m}{n}{<-> s*[0.94] ec-qhvr}{} %% see t1qhv.fd; 0.9-->0.94 2022/01/15 + \DeclareFontFamily{T1}{zi4}{}% typewriter (Inconsolata) + \DeclareFontShape{T1}{zi4}{m}{n}{<-> s*[1.0] t1-zi4r-5}{}% with options varl and var qu + \DeclareFontShape{T1}{zi4}{b}{n}{<-> s*[1.0] t1-zi4b-5}{} + \DeclareFontShape{T1}{zi4}{bx}{n}{<-> s*[1.0] t1-zi4b-5}{} + \RequirePackage[]{newtxmath} % options will be as passed from newtx + \RequirePackage[type1text,nofontspec,helvratio=0.91]{newtxtext}% will lose some accented characters this way ... better to use fontspec + \@ifpackagelater{newtxtext}{2022/02/28}{\relax}{% + \ClassWarning{asmeconf}{Your copy of the newtxtext package is older than 2022/02/28, so you will see error messages about unknown options 'type1text' and 'nofontspec'. You can click through these for now, but I recommend you update your LaTeX installation for best results.} + } + \providecommand*{\DeclareFontFamilySubstitution}[3]{\relax}% folks with old latex formats will get a different typewriter font... + \AtBeginDocument{% + \DeclareFontFamilySubstitution{T1}{\ttdefault}{zi4} + } +\fi + %% override \textsu if using default superiors \ifthenelse{\boolean{DefaultSups}}{\let\textsu\textsuperscript}{\relax} @@ -406,9 +427,15 @@ \emergencystretch 3em %% TeX Gyre Heros Condensed is qhvc (regular is qhv). -\newcommand*{\CondSans}{\selectfont\fontfamily{qhvc}\selectfont} +\ifluatex % 2022/05/08 + \RequirePackage[T1]{fontenc} % qhvc is not TU encoded + \DeclareFontFamily{T1}{qhvc}{} + \DeclareFontShape{T1}{qhvc}{m}{n}{<-> s*[0.94] ec-qhvcr}{} %% see t1qhvc.fd; 0.9-->0.94 2022/01/15 + \DeclareFontShape{T1}{qhvc}{b}{n}{<-> s*[0.94] ec-qhvcb}{} %% see t1qhvc.fd; 0.9-->0.94 2022/01/15 +\fi +\newcommand*{\CondSans}{\fontencoding{T1}\selectfont\fontfamily{qhvc}\selectfont} \renewcommand\huge{\@setfontsize\huge{14}{14}} %... for author names only -\newcommand*{\CondSansBold}{\renewcommand\bfdefault{b}\selectfont\fontfamily{qhvc}\selectfont\bfseries} +\newcommand*{\CondSansBold}{\renewcommand\bfdefault{b}\fontencoding{T1}\fontfamily{qhvc}\selectfont\bfseries} \renewcommand\Huge{\@setfontsize\Huge{26.5}{26.5}} %... for title font only \RequirePackage{metalogo,hologo}% Access to various LaTeX logos (for use in the documentation) diff --git a/macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf b/macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf Binary files differindex 5cd8ea6a86..278e3f0896 100644 --- a/macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf +++ b/macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf diff --git a/macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.tex b/macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.tex index 1efd910acc..63e91cf262 100644 --- a/macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.tex +++ b/macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.tex @@ -12,14 +12,14 @@ %% %% NB: the strip environment from cuted is incompatible with the [lineno] option to asmejour! %% -\documentclass[nocopyright,nolists,balance,pdf-a]{asmejour} +\documentclass[nocopyright,nolists,pdf-a]{asmejour} %% This file's version and date are: \def\AJwidetextversion{1.0} \def\AJverdate{January 10, 2022} % \usepackage{asmewide} -\usepackage{lipsum}% Latin filler text +\usepackage{lipsum}% Latin filler text (lipsum generates a message about 'unused global options' - this can be ignored) % %%%% asmejour template inputs %%%% \JourName{Applied Mechanics} @@ -34,7 +34,7 @@ % \begin{filecontents}{asme-wide-equations.bib} @online{lienhard2021, - author = {Lienhard, John H., V}, + author = {Lienhard, V, John H.}, title = {Preprint Template for {ASME} Journal Papers: \texttt{asmejour.cls}}, organization = {Comprehensive \TeX\ Archive Network}, version = {{\versionno}}, @@ -103,7 +103,7 @@ in \textbf{red} in this document meant to be read---the rest is simply filler to \end{abstract} \maketitle - + \section{Introduction} \lipsum[1-3] \section{Section} diff --git a/macros/latex/contrib/asmejour/asmewide_example/asmewide.sty b/macros/latex/contrib/asmejour/asmewide_example/asmewide.sty index b0c9a481f2..949da71852 100644 --- a/macros/latex/contrib/asmejour/asmewide_example/asmewide.sty +++ b/macros/latex/contrib/asmejour/asmewide_example/asmewide.sty @@ -1,7 +1,7 @@ %% -%% This file is `asmewide.sty'. +%% This file is `asmewide.sty'. %% -%% Copyright (c) 2022 John H. Lienhard. Use under the MIT license: https://ctan.org/license/mit +%% Copyright (c) 2022 John H. Lienhard. Use under the MIT license: https://ctan.org/license/mit %% %% Defines a widetext environment within ASME dimensions %% Use for material spanning both columns (i.e., for wide equations) @@ -12,23 +12,32 @@ %% The modifications made were: follow ASME dimensions; remove revtex-specific macros; update/rework commands; adapt to most recent cuted.sty %% (Leaders don't vanish at pagebreaks, as in revtex, evidently related to how cuted.sty handles strip construction. Have coded around this.) %% -%% Required packages: cuted.sty v2.0 and flushend.sty v4.0 [2021/10/04] or later; asmeconf.cls w/its required packages, esp. etoolbox, xparse +%% Required packages: cuted.sty v2.0 and flushend.sty v4.0 [2021/10/04] or later; asmeconf.cls or asmejour.cls w/their required packages, esp. etoolbox, xparse %% -%% The widetext environment can only appear once per page. It clashes with floats and footnotes, requiring some hand-fitting of page layouts. +%% The widetext environment can only appear once per page. It clashes with floats and footnotes, and often requires some hand-fitting of page layouts. %% %% USAGE: * \begin{widetext} ...wide material here... \end{widetext} %% OPTIONAL ARGUMENTS: %% * \begin{widetext[N] .. changes upper/lower separation of wide material from default Xpt to Npt (X = 5pt asmeconf.cls; X = 10pt asmejour.cls) %% * \begin{widetext}[][tbn]: t = top line only; b = bottom line only; n = no lines. BOTH arguments are REQUIRED, even if first is left empty. %% +%% asmewide,sty supports one option, [raggedend], which suppresses final page column balancing: \usepackage[raggedend]{asmewide} +%% NB: remove the option [balance] when using [raggedend]! +%% %% NB: the strip environment from cuted is incompatible with the [lineno] option to asmeconf and asmejour! %% \NeedsTeXFormat{LaTeX2e} -\def\AW@versionno{1.0} -\def\AW@versiondate{2021/12/26\space} +\def\AW@versionno{1.1} +\def\AW@versiondate{2022/06/26\space} \ProvidesPackage{asmewide}[\AW@versiondate\space v\AW@versionno\space ASME wide equation environment (JHL)] +\DeclareOption{raggedend}{% Added 2022/05/08, to suppressed flushend on last page, if desired + \AfterEndPreamble{\raggedend} +} +\DeclareOption*{} +\ProcessOptions \relax + \ifdefined\NewDocumentCommand\else \RequirePackage{xparse} \fi @@ -37,7 +46,7 @@ \@ifpackagelater{cuted}{2021/10/04}{% \relax }{% - \PackageError{asmewide}{Your version of cuted.sty is too old. You can get an update at https://ctan.org/pkg/cuted}{You need an up-to-date version of cuted.sty to run asmewide.sty.}% + \PackageError{asmewide}{The asmewide package has detected that the version of cuted.sty you are using is too old to be compatible. You can get an update at https://ctan.org/pkg/sttools}{You need at least v2.0 of cuted.sty to run asmewide.sty. Without it, you will get more errors. See discussion of installation process here: https://github.com/John02139/asmeconf/issues/4}% } \RequirePackage{flushend}[2021/10/04] |