texlive[63814] Master/texmf-dist: asmeconf (5jul22)
commits+karl at tug.org
commits+karl at tug.org
Tue Jul 5 21:47:07 CEST 2022
Revision: 63814
http://tug.org/svn/texlive?view=revision&revision=63814
Author: karl
Date: 2022-07-05 21:47:07 +0200 (Tue, 05 Jul 2022)
Log Message:
-----------
asmeconf (5jul22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/asmeconf/README.md
trunk/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.pdf
trunk/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex
trunk/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-lualatex-ode-example.pdf
trunk/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-lualatex-ode-example.tex
trunk/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmewide.sty
trunk/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls
Modified: trunk/Master/texmf-dist/doc/latex/asmeconf/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/asmeconf/README.md 2022-07-04 23:47:27 UTC (rev 63813)
+++ trunk/Master/texmf-dist/doc/latex/asmeconf/README.md 2022-07-05 19:47:07 UTC (rev 63814)
@@ -1,7 +1,7 @@
#asmeconf: A latex template for ASME conference papers#
- Version 1.30 dated 2022/03/14.
+ Version 1.31 dated 2022/07/04.
####Overview####
This class provides a LaTeX template for ASME Conference papers formatted according to
@@ -79,6 +79,9 @@
---
####Change log####
+ 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.
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.
Modified: trunk/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex 2022-07-04 23:47:27 UTC (rev 63813)
+++ trunk/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex 2022-07-05 19:47:07 UTC (rev 63814)
@@ -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.30 dated 2022/03/14
+%% This file is version 1.31 dated 2022/07/04
%%
%% 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,19 +84,6 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 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,
-% }%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%% 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,
@@ -261,6 +248,7 @@
\begin{figure}
\centering\includegraphics[width=0.7\linewidth]{sample-figure-1.pdf}
\caption{Caption with math, eqn.~\eqref{eqn:fourier}: $z = (r,\phi)$ \cite{Lienhard2019b}\label{fig:1}}
+%\caption{Caption with math, eqn.~(\ref{eqn:fourier}): $z = (r,\phi)$ \cite{Lienhard2019b}}\label{fig:1}
\end{figure}
%%%%%%%%%%%%% end figure %%%%%%%%%%%%%%%%%%%
@@ -370,10 +358,9 @@
Landscape figures and tables may be produced at full-page size by putting \verb|\usepackage[figuresright]{rotating}| in your \texttt{.tex} file's preamble and using the \texttt{sidewaystable*} and \texttt{sidewaysfigure*} environments~\cite{fairbairns}.
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\section{Reference Formatting with \NoCaseChange{\texttt{asmeconf.bst}}\footnote{If you have text in a section heading or caption that you do not want to be capitalized, such as an SI unit, enclose it in a \texttt{\textbackslash NoCaseChange} command.}}\label{sec:references}
+\section{Reference Formatting with \NoCaseChange{\texttt{asmeconf.bst}}\footnote{To prevent capitalization of text in a section heading or caption, such as an SI unit, enclose it in a \texttt{\textbackslash NoCaseChange} command. As of the July 2022 release of \LaTeX, commands used in a heading or caption may be protected globally by putting this in the preamble: \texttt{\textbackslash AddToNoCaseChangeList\{\textbackslash MyCommand\}}.}}\label{sec:references}
The {\upshape\texttt{asmeconf.bst}} \hologo{BibTeX} style follows the reference styles shown on ASME's conference web site in 2022.\footnote{\texttt{asmeconf.bst} is intended as a replacement for the old \texttt{asmems4.bst}, which does not follow ASME's current reference formats or support DOI and URL.}
Examples for these and many other cases are given in the \texttt{asmeconf-sample.bib} file, which is part of this distribution. Citations and references are managed by the standard \texttt{natbib} package. Nevertheless, a few comments are necessary.
@@ -480,7 +467,7 @@
The \texttt{lineno} package is not compatible with the \texttt{flushend} package that makes final short columns the same height. Balancing is automatically disabled when this option is called.
-\subsection{Grid-Style Author Block} The option \texttt{[grid]} invokes ASME's grid-style arrangement of author names. Author names are recognized by the commas that separate them. (To include a comma in a name, enclose it in braces.) Line breaks (\verb|\\|) may be inserted into the address of \verb|\SetAffiliation{n}{address}| as needed.
+\subsection{Grid-Style Author Block} The option \texttt{[grid]} invokes ASME's grid-style arrangement of author names. Author names are recognized by the commas that separate them. (To include a comma in a name, enclose the name in braces.) Line breaks (\verb|\\|) may be inserted into the address of \verb|\SetAffiliation{n}{address}| as needed.
Note that ASME interprets the author order in the grid style by reading names from left-to-right in the top row, then left-to-right in each subsequent row.
@@ -499,7 +486,7 @@
\subsection{Superiors Font} The \texttt{newtxtext} package includes a superiors font (both numbers and letters) for use in footnote markers and text superscripts. To enable this font, use the option \texttt{[nodefaultsups]}.
-\subsection{Typewriter Font Options} This font is the sans-serif \texttt{inconsolata}. By default, the word spacing is variable, but option \texttt{[mono]} ends this behavior. A slashed zero is default; option \texttt{[var0]} removes the slash. Option \texttt{[hyphenate]} enables hyphenation. (The hyphenation option is not available if the \texttt{[fontspec]} option is used.)
+\subsection{Typewriter Font Options} This font is the sans-serif \texttt{inconsolata}. By default, the word spacing is variable, but option \texttt{[mono]} ends this behavior. A slashed zero is the default; option \texttt{[var0]} removes the slash. Option \texttt{[hyphenate]} enables hyphenation. (The hyphenation option is not available if the \texttt{[fontspec]} option is used.)
\subsection{Support for Other Languages} This package can be adapted to incorporate (or entirely use) languages other than English. See Appendix \ref{appendix:b} for details.
Modified: trunk/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-lualatex-ode-example.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-lualatex-ode-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-lualatex-ode-example.tex 2022-07-04 23:47:27 UTC (rev 63813)
+++ trunk/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-lualatex-ode-example.tex 2022-07-05 19:47:07 UTC (rev 63814)
@@ -4,8 +4,6 @@
%%
%% This file is an example of using asmeconf with lualatex to solve and plot an ode in a landscape figure.
%%
-%% Use of an up-to-date LaTeX distribution (after 2020) is strongly recommended.
-%%
%% Author: John H. Lienhard V
%% Department of Mechanical Engineering
%% Massachusetts Institute of Technology
@@ -15,7 +13,7 @@
%%
%% LICENSE:
%%
-%% Copyright (c) 2022 John H. Lienhard
+%% Copyright (c) 2021 John H. Lienhard
%% Offered under the MIT license: https://ctan.org/license/mit
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -29,8 +27,8 @@
}
\usepackage[figuresright]{rotating}% to use a landscape figure
-\usepackage{luacode}% for compatibility with older installations
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Now use lua code
Modified: trunk/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmewide.sty
===================================================================
--- trunk/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmewide.sty 2022-07-04 23:47:27 UTC (rev 63813)
+++ trunk/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-wide-equation-example/asmewide.sty 2022-07-05 19:47:07 UTC (rev 63814)
@@ -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,9 +12,9 @@
%% 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:
@@ -21,14 +21,22 @@
%% * \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: the strip environment from cuted is incompatible with the [lineno] option to asmeconf and asmejour!
%%
\NeedsTeXFormat{LaTeX2e}
-\def\AW at versionno{1.0}
-\def\AW at versiondate{2021/12/26\space}
+\def\AW at versionno{1.1}
+\def\AW at versiondate{2022/05/08\space}
\ProvidesPackage{asmewide}[\AW at versiondate\space v\AW at 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
Modified: trunk/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls 2022-07-04 23:47:27 UTC (rev 63813)
+++ trunk/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls 2022-07-05 19:47:07 UTC (rev 63814)
@@ -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.30}
- \def\versiondate{2022/03/14\space}
+ \def\versionno{1.31}
+ \def\versiondate{2022/07/04\space}
%%
%% Author: John H. Lienhard, V
%% Department of Mechanical Engineering
@@ -484,7 +484,12 @@
%% Needs to come before babel messes with captions, to keep uppercase text. 2021/12/25
-\RequirePackage{textcase} %% Allows uppercase titles and captions without errors from math and citations
+\ifx\AddToNoCaseChangeList\@undefined % updated July 3, see https://github.com/John02139/asmeconf/issues/5
+ \RequirePackage{textcase} %% Allows uppercase titles and captions without errors from math and citations
+ \typeout{Asmeconf is loading textcase package.}
+\else
+ \NewCommandCopy{\MakeTextUppercase}{\MakeUppercase}
+\fi
\RequirePackage[labelfont={sf,bf},hypcap=false]{caption}
\RequirePackage[hypcap=false,list=true]{subcaption}
@@ -1061,6 +1066,11 @@
\titleformat{\section}{\mathversion{sansbold}\bfseries\sffamily\raggedright}{\MakeTextUppercase{\appendixname}\ \thesection.}{0.5em}{\MakeTextUppercase}
}
+%% This patches titlesec's unprotected re-definition of \footnote. See discussion here: https://github.com/jbezos/titlesec/issues/48
+%% Without this patch, recent versions of LaTeX will require \protect\footnote in section headings.
+\patchcmd{\ttl at select}{\def\footnote}{\protected\def\footnote}{\typeout{Asmeconf.sty patched titlesec to have protected def of footnote}}{}
+
+
%%%%%%%%%% Hyperref, bookmarks, and PDF/A %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newif\if at asme@pdfmanagement% Thanks to Ulrike Fischer
@@ -1179,13 +1189,19 @@
\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
%
-\patchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\footnote}{}{}
-\patchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\eqref}{}{} %% corrected 2020/01/24
-
+\ifx\AddToNoCaseChangeList\@undefined % updated July 3, see https://github.com/John02139/asmeconf/issues/5
+ \patchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\footnote}{\typeout{Asmeconf patched textcase nonchangecase to include footnote.}}{}
+ \patchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\eqref}{\typeout{Asmeconf patched textcase nonchangecase to include eqref.}}{} %% corrected 2020/01/24
+\else
+ \AddToNoCaseChangeList{\eqref \footnote}
+\fi
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%% 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.
More information about the tex-live-commits
mailing list.