From 404a949ca90543a6ac8830d4f2273700066109dd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 18 Sep 2022 20:12:20 +0000 Subject: asmeconf git-svn-id: svn://tug.org/texlive/trunk@64435 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/bibtex/bst/asmeconf/asmeconf.bst | 19 ++++++++++++++---- Master/texmf-dist/doc/latex/asmeconf/README.md | 9 +++++++-- .../doc/latex/asmeconf/asmeconf-template.pdf | Bin 271758 -> 599902 bytes .../doc/latex/asmeconf/asmeconf-template.tex | 22 ++++++++++++++++----- .../asmeconf-template-widetext.pdf | Bin 2930107 -> 2930072 bytes .../asmeconf-template-widetext.tex | 10 ++++++---- Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls | 20 ++++++++++++++++--- 7 files changed, 62 insertions(+), 18 deletions(-) diff --git a/Master/texmf-dist/bibtex/bst/asmeconf/asmeconf.bst b/Master/texmf-dist/bibtex/bst/asmeconf/asmeconf.bst index 0e378d305d0..8884ca5f21c 100644 --- a/Master/texmf-dist/bibtex/bst/asmeconf/asmeconf.bst +++ b/Master/texmf-dist/bibtex/bst/asmeconf/asmeconf.bst @@ -4,7 +4,7 @@ %%%%% *** https://www.asme.org/publications-submissions/proceedings/author-guidelines/elements-of-a-paper/references *** %%%%% *** The examples given by ASME do *not* cover all possibilities *** %%%%% -%%%%% This file is version 1.13 dated 2021/12/02 (and checked 2022/02/14) +%%%%% This file is version 1.14 dated 2022/09/13 %%%%% %%%%% Author: John H. Lienhard V %%%%% Department of Mechanical Engineering @@ -26,6 +26,9 @@ %%%%% Added: urlprefix = {}, format.web.urldate, bbl.urldate; urltype field changes "accessed" to something else. %%%%% Added: venue and eventdate to @inproceedings %%%%% +%%%%% Edits in version 1.14, 2022/09/13 +%%%%% Add code to format.journal.pages to deal with empty pages +%%%%% %%%%% Edits in version 1.13, 2021/12/02 %%%%% Switched remaining http:// prefixes to https:// %%%%% Replace \href{}{} in \eprint by \url @@ -1036,8 +1039,16 @@ FUNCTION {format.pages} } FUNCTION {format.journal.pages} -{ pages duplicate$ empty$ 'pop$ - { swap$ duplicate$ empty$ +{ pages duplicate$ empty$ + { "empty pages in " cite$ * warning$ } + 'skip$ + if$ + duplicate$ empty$ + { pop$ + " " * + format.year * + } + { swap$ duplicate$ empty$ { pop$ pop$ format.pages } { " " * @@ -1054,7 +1065,7 @@ FUNCTION {format.journal.pages} * } if$ - } + } if$ } FUNCTION {format.journal.eid} diff --git a/Master/texmf-dist/doc/latex/asmeconf/README.md b/Master/texmf-dist/doc/latex/asmeconf/README.md index e140c90277b..ed1fece635d 100644 --- a/Master/texmf-dist/doc/latex/asmeconf/README.md +++ b/Master/texmf-dist/doc/latex/asmeconf/README.md @@ -1,7 +1,7 @@ #asmeconf: A latex template for ASME conference papers# - Version 1.31 dated 2022/07/04. + Version 1.32 dated 2022/09/14. ####Overview#### This class provides a LaTeX template for ASME Conference papers formatted according to @@ -79,9 +79,14 @@ --- ####Change log#### + v1.32 (2022/09/14) + - Incorporate patch to correct bug in hyperxmp that had impaired pdf/a compliance. + - Add code to asmeconf.bst for empty page field in @article. + v1.31 (2022/07/04) - Minor updates to address changes in the June 2022 release of LaTeX (PL 4) and the textcase package. -- Add option to asmewide.sty to suppress final page column balancing, [raggedend], expand error message text. +- Add option to asmewide.sty to suppress final page column balancing, \[raggedend\], expand error message text. + v1.30 (2022/03/14) - Edit code loading fonts for Greek, Vietnamese, and cyrillic languages under pdflatex, to ensure compatibility with newtx v1.71. These options now require LaTeX distributions 2020/02/02 or later. - Edit font loading for the case when luaLaTeX is called without fontspec. diff --git a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.pdf b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.pdf index 00c82e854ce..59379fb80ef 100644 Binary files a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.pdf and b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.pdf differ diff --git a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex index 8b65781b7f6..3788a13de49 100644 --- a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex +++ b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex @@ -4,7 +4,7 @@ %% This file is asmeconf-template.tex, a LaTeX template to format ASME Conference papers according to %% the requirements on ASME's conference web pages, and including hypertext support for the pdf. %% -%% This file is version 1.31 dated 2022/07/04 +%% This file is version 1.32 dated 2022/09/14 %% %% As of version 1.11, this template defaults to ASME's newer conference guidelines first posted July 2019. %% Those guidelines changed the requested author block formatting to be inline. @@ -84,6 +84,21 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% New pdf management code (June 2021); with this, the class option [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 (and be cautious when loading extra fonts) + +%\RequirePackage{pdfmanagement-testphase}% +% \DocumentMetadata{% +% pdfstandard=A-3b,% A-2b, A-2u, A-3b, or A-3u +% pdfversion=1.7, +% lang=en-US, +% }% + % 6 July 2022: this is breaking \hrefurl and \url. Not sure why, conflict with other parts of my code. + % \renewcommand\hrefurl[2]{{#1}{#2}} \renewcommand\url[1]{#1} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %% Class options are described above. Change these options as desired. %% If you are not using the language options, remove them (together with Appendices B and C) %% Remove the [colorlinks] option before *final* submission to ASME, to get black text for printing, @@ -94,7 +109,7 @@ %%%%% pdf metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \hypersetup{% - pdfauthor={John H. Lienhard}, % <=== change to YOUR name[s]! + pdfauthor={John H. Lienhard}, pdftitle={ASME Conference Paper LaTeX Template}, % <=== change to YOUR pdf file title pdfkeywords={ASME conference paper, LaTeX template, BibTeX style},% <=== change to YOUR pdf keywords pdfsubject = {Describes the asmeconf LaTeX template}, % <=== change to YOUR subject @@ -156,7 +171,6 @@ %%% \date{..} calls the same command. \versionfootnote{Documentation for \texttt{asmeconf.cls}: Version~\versionno, \today.}% <=== Delete before final submission. - %%% Change these to your keywords. Keywords are automatically printed at the end of the abstract. %%% This command MUST COME BEFORE the end of the abstract. %%% If you don't want keywords, leave the argument of \keywords{} empty (or use the abstract* environment) @@ -199,7 +213,6 @@ This paper is an example of and a {\upshape\LaTeX} template for typesetting ASM \entry{$\infty$}{free stream value} \end{nomenclature} - %%%%%%%%% BODY OF PAPER %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{Introduction} @@ -222,7 +235,6 @@ After setting up the headers, authors, and title, issue the \verb|\maketitle| c The abstract text must be placed into \verb|\begin{abstract}| \ldots \verb|\end{abstract}|. The abstract will automatically be italicized. Keywords may be included using the \verb|\keywords{..}| command. The \texttt{keyword} command \textit{must} be issued before the abstract environment. - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{Referring to Citations, Figures, and Equations} diff --git a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmeconf-template-widetext.pdf b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmeconf-template-widetext.pdf index cf119cdbdee..de1e14c24aa 100644 Binary files a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmeconf-template-widetext.pdf and b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmeconf-template-widetext.pdf differ diff --git a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmeconf-template-widetext.tex b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmeconf-template-widetext.tex index 2456b0266d6..a0f58488e4a 100644 --- a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmeconf-template-widetext.tex +++ b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmeconf-template-widetext.tex @@ -7,6 +7,8 @@ %% * \begin{widetext[N] .. changes upper/lower separation of wide material from default 5pt to Npt %% * \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} +%% %% The widetext environment can only appear once per page. It clashes with floats and footnotes, as discussed herein. %% %% NB: the strip environment from cuted is incompatible with the [lineno] option to asmeconf! @@ -14,7 +16,7 @@ \documentclass[nofoot,colorlinks,balance,pdf-acolorlinks,balance,pdf-a]{asmeconf} \def\ACwidetextversion{1.1} -\def\ACwidetextdate{February 15, 2022} +\def\ACwidetextdate{September 14, 2022} \usepackage{lipsum}% Latin filler text \usepackage{asmewide} @@ -114,7 +116,7 @@ to be read---the rest is simply filler to aid in layout.} \centering{\includegraphics{tesseral-harmonic.pdf}}% \subcaption{\label{fig:tesseral}}% \end{subfigure}% -\caption{A figure with two subfigures: (a) Zonal harmonic $n=1, m=0$, (b) Tesseral harmonic $n=2, m=3$. See Appendix~\ref{sec:sph-har}.\label{fig:1}} +\caption{A figure with two subfigures: (a) Zonal harmonic $n=1, m=0$, (b) Tesseral harmonic $n=2, m=3$. See Appendix~\ref{sec:sph-har}.}\label{fig:1} \end{figure*} %%%%%%%%%%%%%%%%%%% end two column figure %%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -265,7 +267,7 @@ until both are done\footnotemark. The single column table, Table~\ref{tab:3}, is %%%%%%%%%%%%%%%%%%% begin linewidth table %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{table}[b] \newcolumntype{C}{>{$}c<{$}} % math-mode version of "c" column type, from array package -\caption{\label{tab:3}Table at full column width with columns in math mode} +\caption{Table at full column width with columns in math mode}\label{tab:3} \centering{% \begin{tabular*}{\linewidth}{@{\extracolsep{\fill}}CCCC@{\extracolsep{\fill}}} \hline\hline @@ -320,7 +322,7 @@ q_\textrm{gray} & q_\textrm{int, $T_1$} & q_\textrm{int, $T_m$} & q_\textrm{exa %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \appendix -\section{Spherical harmonics\label{sec:sph-har}} +\section{Spherical harmonics}\label{sec:sph-har} Without getting into the details, a regular function $f(\theta,\phi)$ on the surface of the unit sphere may be written \begin{equation} diff --git a/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls b/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls index 97b2ce84048..c078785e012 100644 --- a/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls +++ b/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls @@ -5,8 +5,8 @@ %% ASME conference requirements as represented on ASME's conference web pages in 2022. %% %% This file's version and date: - \def\versionno{1.31} - \def\versiondate{2022/07/04\space} + \def\versionno{1.32} + \def\versiondate{2022/09/14\space} %% %% Author: John H. Lienhard, V %% Department of Mechanical Engineering @@ -1129,9 +1129,23 @@ \RequirePackage{hyperxmp}% improve transfer of metadata to pdf +% Patch bug in hyperxmp, unless a more recent version is used. +\ifdefined\hyxmp@no@bad@parts% \hyxmp@no@bad@parts is not def'd in TeX Live 2019 or older + \@ifpackagelater{hyperxmp}{2022/09/14}{% no new version at present, still 2020/11/22 + \relax + }{% + \newcount\hypxmp@tempcnt + \define@key{Hyp}{pdfapart}{% + \afterassignment\hyxmp@no@bad@parts\hypxmp@tempcnt=0#1\relax + \hyxmp@pdfstringdef\@pdfapart{\the\hypxmp@tempcnt}% + } + } +\else + \relax +\fi + \RequirePackage[psdextra]{hyperref} % recent kernel transition suggests providing most hyperref options via \hypersetup, % but setting psdextra here (for additional math support in bookmarks) 2021/12/01 - \hypersetup{% unicode, % Unicode encoded PDF strings pdfborder={0 0 0},% -- cgit v1.2.3