diff options
Diffstat (limited to 'macros')
64 files changed, 721 insertions, 35 deletions
diff --git a/macros/latex/contrib/asmejour/README.md b/macros/latex/contrib/asmejour/README.md index 32376dd7cf..54c16035c7 100644 --- a/macros/latex/contrib/asmejour/README.md +++ b/macros/latex/contrib/asmejour/README.md @@ -1,7 +1,7 @@ #asmejour: A template for ASME journal papers# - Version 1.17 dated 2021/12/26. + Version 1.18 dated 2022/01/10. ####Overview#### This class provides a template to format preprints in the style of journal papers published by the American Society of Mechanical Engineers. @@ -9,7 +9,7 @@ This work is not a publication of ASME. - Files in this distribution are: + Files in this distribution are: ``` README.md -- this file asmejour.cls -- the class file @@ -20,7 +20,9 @@ * sample-figure-1.pdf, sample-figure-2a.pdf, - sample-figure-2b.pdf -- figures for the example``` + sample-figure-2b.pdf -- figures for the example template + /asmewide_example -- directory includes asmewide.sty and examples of wide equations``` + The .tex and .cls files are commented and should be self-explanatory. @@ -64,6 +66,9 @@ --- ####Change log#### +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. + v1.17 (2021/12/26): - Add code to warn about obsolete LaTeX installations. TeX Live 2020 or later is recommended for the asmejour package. diff --git a/macros/latex/contrib/asmejour/asmejour-sample.bib b/macros/latex/contrib/asmejour/asmejour-sample.bib index 7f6e8d353d..e51503369b 100644 --- a/macros/latex/contrib/asmejour/asmejour-sample.bib +++ b/macros/latex/contrib/asmejour/asmejour-sample.bib @@ -1,6 +1,6 @@ %% Sample bibliography file for asmejour.bst and asmejour.cls %% -%% Revised: 22 December 2022 +%% Revised: 10 January 2022 %% Copyright John H. Lienhard, MIT %% Offered under the MIT license: https://ctan.org/license/mit @@ -276,6 +276,16 @@ urldate = {July 5, 2019}, } +@online{lienhard2022, + author = {Lienhard, V, John H.}, + title = {Wide Equations in {\texttt{asmejour.cls}}}, + version = {1.0}, + organization = {Comprehensive \TeX\ Archive Network}, + year = {2022}, + url = {https://www.ctan.org/pkg/asmejour}, + urldate = {January 10, 2022}, +} + @article{Lienhard2019c, author = {Lienhard, V, John H.}, year = {2019}, diff --git a/macros/latex/contrib/asmejour/asmejour-template.pdf b/macros/latex/contrib/asmejour/asmejour-template.pdf Binary files differindex fe57fe02e0..5c79214158 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 f1109b714b..28cebec8e2 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.17 dated 2021/12/26 +%% This file is version 1.18 dated 2022/01/10 %% %% Author: John H. Lienhard V %% Department of Mechanical Engineering @@ -73,7 +73,7 @@ %% %% LICENSE: %% -%% Copyright (c) 2021 John H. Lienhard +%% Copyright (c) 2022 John H. Lienhard %% %% Offered under the MIT license: https://ctan.org/license/mit %% @@ -344,7 +344,7 @@ such as \texttt{align}, \texttt{split}, or \texttt{multline}~\cite{amsmath}. The \end{multline} An example using \texttt{align} appears in Appendix~\ref{app:zetafunction}. -An alternative solution may be to set large equations into two-column-wide tables or figures. While a package exists for setting equations that span two columns (\texttt{widetext.sty}), that code is erratic in relation to floats and page breaks. +An alternative solution may be to set large equations into two-column-wide tables or figures. An experimental package for setting equations that span two columns, \texttt{asmewide.sty}, can be loaded as well, but that code may require hand-fitting around floats and page breaks. See the examples in~\cite{lienhard2022}. Math italics are used for Roman and lower-case Greek letters by default. If you want an upright letter in math, you can use the relevant math alphabet, e.g., \verb|\mathrm, \mathbf, \mathsf|: \begin{equation}\label{eqn:newton2} diff --git a/macros/latex/contrib/asmejour/asmejour.cls b/macros/latex/contrib/asmejour/asmejour.cls index f4ac5c2826..b91e54f914 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.17} - \def\versiondate{2021/12/26\space} + \def\versionno{1.18} + \def\versiondate{2022/01/10\space} %% %% Author: John H. Lienhard V %% Department of Mechanical Engineering @@ -27,9 +27,9 @@ %% 9. Enable various math and text features from the newtxmath, mathalfa, and newtxtext packages %% 10. Support inclusion of passages in languages other than English %% -%% This class is compatible with either pdfLaTeX or LuaLaTeX. All packages required by the class +%% This class is compatible with both pdfLaTeX and LuaLaTeX. All packages required by the class %% are in standard distributions, such as TeXLive, and are also available at CTAN (https://ctan.org/). -%% The use of an up-to-date, complete distribution is strongly recommended. +%% The use of an up-to-date (Feb. 2020 or later) and complete LaTeX distribution is strongly recommended. %% %% The title block is set by specific commands that are described in the asmejour-template.tex file. %% @@ -43,7 +43,7 @@ %% %% LICENSE: %% -%% Copyright (c) 2021 John H. Lienhard +%% Copyright (c) 2022 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, @@ -481,7 +481,7 @@ \DeclareMathSymbol{\sfrho}{\mathalpha}{lettersAB}{26} \DeclareMathSymbol{\sfsigma}{\mathalpha}{lettersAB}{27} \DeclareMathSymbol{\sftau}{\mathalpha}{lettersAB}{28} -\DeclareMathSymbol{\sfUpsilon}{\mathalpha}{lettersAB}{29} +\DeclareMathSymbol{\sfupsilon}{\mathalpha}{lettersAB}{29} \DeclareMathSymbol{\sfphi}{\mathalpha}{lettersAB}{30} \DeclareMathSymbol{\sfchi}{\mathalpha}{lettersAB}{31} 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 differnew file mode 100644 index 0000000000..5cd8ea6a86 --- /dev/null +++ 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 new file mode 100644 index 0000000000..1efd910acc --- /dev/null +++ b/macros/latex/contrib/asmejour/asmewide_example/asmejour-wide-equation-examples.tex @@ -0,0 +1,355 @@ +%% Examples of a widetext macro for setting wide equations in the asmejour class. +%% +%% Copyright (c) 2022 John H. Lienhard. Use under the MIT license: https://ctan.org/license/mit +%% +%% +%% USAGE: * \begin{widetext} ...wide material here... \end{widetext} +%% OPTIONAL ARGUMENTS: +%% * \begin{widetext[N] .. changes upper/lower separation of wide material from default 10pt 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. +%% +%% 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 asmejour! +%% +\documentclass[nocopyright,nolists,balance,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 +% +%%%% asmejour template inputs %%%% +\JourName{Applied Mechanics} +\date{Version~\AJwidetextversion. Revised \AJverdate} +% +\makeatletter + \definecolor{JAMBlue}{rgb}{0.090, 0.574, 0.637} % 23, 147, 163 - similar to JAM masthead color + \renewcommand\@ColorName{JAMBlue!80!white} +\makeatother +% +%%%% +% +\begin{filecontents}{asme-wide-equations.bib} +@online{lienhard2021, + author = {Lienhard, John H., V}, + title = {Preprint Template for {ASME} Journal Papers: \texttt{asmejour.cls}}, + organization = {Comprehensive \TeX\ Archive Network}, + version = {{\versionno}}, + year = {2021}, + url = {https://ctan.org/pkg/asmejour}, + urldate = {{\today}}, +} +@online{tolucsis1, + author = {Sigitas Tolu\v{s}is}, + year = {2021}, + title = {The \texttt{cuted} package}, + version = {2.0}, + organization = {Comprehensive \TeX\ Archive Network}, + url = {https://ctan.org/pkg/cuted}, + urldate = {Dec. 30, 2021}, +} +@online{tolucsis2, + author = {Sigitas Tolu\v{s}is}, + year = {2021}, + title = {The \texttt{sttools} collection}, + version = {3.0}, + organization = {Comprehensive \TeX\ Archive Network}, + url = {https://ctan.org/pkg/sttools}, + urldate = {Dec. 30, 2021}, +} +@book{stakgold, +author = {Ivar Stakgold}, +title = {Boundary Value Problems of Mathematical Physics}, +year = {1967}, +publisher = {Macmillan}, +address = {New York}, +} +\end{filecontents} +% +\hypersetup{% + pdfauthor={John H. Lienhard}, + pdftitle={Wide Equations in asmejour.cls}, + pdfkeywords={ASME journal paper, LaTeX template, wide equations, widetext}, + pdfsubject = {Examples of setting wide equations in the asmejour LaTeX template}, + pdfurl={https://ctan.org/pkg/asmejour}, + pdflicenseurl={https://ctan.org/pkg/asmejour}, +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\begin{document} + +\SetAuthorBlock{John H.\ Lienhard V}{% +Fellow of ASME \\ +Rohsenow Kendall Heat Transfer Laboratory, \\ +Department of Mechanical Engineering,\\ +Massachusetts Institute of Technology, \\ +Cambridge, MA 02139 USA \\ +email: lienhard@mit.edu +} + +\title{Wide Equations in asmejour.cls} +\keywords{ASME journal, paper, {\upshape\LaTeX} template, wide equations, asmejour} + +\begin{abstract} +This paper gives several examples of typesetting very wide equations with {\upshape\LaTeX} in the {\upshape\texttt{asmejour}} class~{\upshape\cite{lienhard2021}} using +{\upshape\texttt{asmewide.sty}}. The style defines is a version of the {\upshape\texttt{widetext}} enviroment built on the 2021 release of +{\upshape\texttt{cuted.sty}}~{\upshape\cite{tolucsis1}} from the +{\upshape\texttt{sttools}} bundle~{\upshape\cite{tolucsis2}}, which is available from CTAN, \href{http://ctan.org}{ctan.org}. +Significant hand-fitting around page breaks, floats, and footnotes is required to obtain good results. \textcolor{red}{Only the text +in \textbf{red} in this document meant to be read---the rest is simply filler to aid in layout.} +\end{abstract} + +\maketitle + +\section{Introduction} +\lipsum[1-3] +\section{Section} +\lipsum[4] + +%%%%%%%%%%%%%%%%% begin two column figure %%%%%%%%%%%%%%%%%%%%%%%%%%% +\begin{figure*}[t] +\begin{subfigure}[c]{0.495\textwidth} +\centering{\includegraphics{zonal-harmonic2.pdf}}% +\subcaption{\label{fig:zonal}} +\end{subfigure} +%%%%%%%% don't leave a break here +\begin{subfigure}[c]{0.495\textwidth} +\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}} +\end{figure*} +%%%%%%%%%%%%%%%%%%% end two column figure %%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\lipsum[5-8] +\section{Section} +\lipsum[9-12] + +%%%%%%%%%%%%%%%%%%%% Example WT1 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{Single Wide Equation on the Page} + +\textcolor{red}{Equation~\eqref{eqn:WT1} is an equation with a matrix that is too large to fit into one column. A multiline math environment will not help because the equation cannot be broken into parts that each fit into a column.} + +\textcolor{red}{A two-column wide figure, Fig.~\ref{fig:1}, has floated from a previous page to the top of this page, but this figure does not interfere with the \texttt{widetext} environment (a single column figure would cause problems).} + +\begin{widetext} +\begin{equation}\label{eqn:WT1} +\mathbf{WT1:}\quad +\mathfrak{W}(\bm{\Phi})= \begin{Vmatrix} +\dfrac\varphi{(\varphi_1,\varepsilon_1)} & 0 & \hdotsfor{4} & 0 & \\[\jot] +\dfrac{\varphi k_{21}}{(\varphi_2,\varepsilon_1)} & \dfrac\varphi{(\varphi_2,\varepsilon_2)} & 0 & \hdotsfor{3} & 0 \\[\jot] +\dfrac{\varphi k_{31}}{(\varphi_3,\varepsilon_1)} &\dfrac{\varphi k_{32}}{(\varphi_3,\varepsilon_2)} & \dfrac\varphi{(\varphi_3,\varepsilon_3)}& 0 & \hdotsfor{2} & 0 \\[\jot] +\vdots & & & \smash{\rotatebox{15}{$\ddots$}} & & & \vdots \\[\jot] +\dfrac{\varphi k_{n-2\, 1}}{(\varphi_{n-2},\varepsilon_1)} & +\dfrac{\varphi k_{n-2\, 2}}{(\varphi_{n-2},\varepsilon_2)} &\hdotsfor{1} & \dfrac{\varphi k_{n-2\,n-3}}{(\varphi_{n-2},\varepsilon_{n-3})} & \dfrac\varphi{(\varphi_{n-2},\varepsilon_{n-2})}& 0& 0 \\[\jot] +\dfrac{\varphi k_{n-1\, 1}}{(\varphi_{n-1},\varepsilon_1)} & \dfrac{\varphi k_{n-1\, 2}}{(\varphi_{n-1},\varepsilon_2)} &\hdotsfor{2} & +\dfrac{\varphi k_{n-1\,n-2}}{(\varphi_{n-1},\varepsilon_{n-2})}& \dfrac{\varphi}{(\varphi_{n-1},\varepsilon_{n-1})} & 0 \\[\jot] +\dfrac{\varphi k_{n1}}{(\varphi_n,\varepsilon_1)} & \dfrac{\varphi k_{n2}}{(\varphi_n,\varepsilon_2)} & \hdotsfor{3} & +\dfrac{\varphi k_{n\,n-1}}{(\varphi_n,\varepsilon_{n-1})} & \dfrac{\varphi}{(\varphi_n,\varepsilon_n)} +\end{Vmatrix} +\end{equation} +\end{widetext} + +\lipsum[12-13] + +%%%%%%%%%%%%%%%%%%%% Examples WT2 & WT3 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{Two Wide Equations on the Page} + +\lipsum[14-16] + +\begin{widetext}% +\begin{equation}\mathbf{WT2:} +\int_a^b\biggl\{\int_a^b[f(x)^2g(y)^2+f(y)^2g(x)^2] + -2f(x)g(x)f(y)g(y)\,dx\biggr\}\,dy + \ne \frac{1}{\sqrt{\int_a^b\biggl\{g(y)^2\int_a^bf^2+f(y)^2 + \int_a^b g^2-2f(y)g(y)\int_a^b fg\biggr\}\,dy}} +\end{equation} + +\textcolor{red}{In this case, we have a pair of wide equations on the same page. The \texttt{widetext} environment cannot be used twice on the same page! To resolve the conflict, we remain in single column mode between the two equations.} + +\textcolor{red}{This page also includes a single column float, Table~\ref{tab:2}. This float must come after the \texttt{widetext} environment. We use the \texttt{\textbackslash begin\{table\}[b]} option to force the table to the bottom of the column. The two column table, Table~\ref{tab:4}, floats to the top of the next page and creates no problems.} + +\begin{equation}\mathbf{WT3:} +\int_a^b\biggl\{\int_a^b[f(x)^2g(y)^2+f(y)^2g(x)^2] + -2f(x)g(x)f(y)g(y)\,dx\biggr\}\,dy + \ne \frac{1}{\sqrt{\int_a^b\biggl\{g(y)^2\int_a^bf^2+f(y)^2 + \int_a^b g^2-2f(y)g(y)\int_a^b fg\biggr\}\,dy}} +\end{equation} +\end{widetext} +\lipsum[17] + +%%%%%%%%%%%%%%% begin single column table %%%%%%%%%%%%%%%%%%%%%% +\begin{table}[b] +\caption{Table with more complicated columns}\label{tab:2}% +\centering{% +\begin{tabular}{!{\hspace*{0.5cm}} >{\raggedright\hangindent=1em} p{3cm} d{3} @{\hspace*{1cm}} d{3} !{\hspace*{0.5cm}}} +\hline\hline +\rule{0pt}{10pt} Experiment & \multicolumn{1}{c@{\hspace*{1cm}}}{$u$ [m/s]} & \multicolumn{1}{c!{\hspace*{0.5cm}}}{$T$ [\textdegree C]} \\[1pt] +\hline +The first experiment we ran this morning & 124.3 & 68.3 \rule{0pt}{10pt} \\ +The second experiment we ran this morning & 82.50 & 103.46 \\ +Our competitor's data & 72.321 & 141.384 \\[1pt] +\hline\hline +\end{tabular} +} +\end{table} +%%%%%%%%%%%%%%%% end table %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%% begin two column table %%%%%%%%%%%%%%%%%%%%%%%%% +\begin{table*}[t] +\caption{A table spanning two columns}\label{tab:4}% +\centering{% +\begin{tabular*}{0.8\textwidth}{@{\hspace*{1.5em}}@{\extracolsep{\fill}}ccc!{\hspace*{3.em}}ccc@{\hspace*{1.5em}}} +\hline\hline +\multicolumn{1}{@{\hspace*{1.5em}}c}{$x$\rule{0pt}{11pt}} & +\multicolumn{1}{c}{$\textrm{erf}(x)$} & +\multicolumn{1}{c!{\hspace*{3.em}}}{$\textrm{erfc}(x)$} & +\multicolumn{1}{c}{$x$} & +\multicolumn{1}{c}{$\textrm{erf}(x)$} & +\multicolumn{1}{c@{\hspace*{1.5em}}}{$\textrm{erfc}(x)$} \\ \hline +0.00 & 0.00000 & 1.00000 & 1.10 & 0.88021 & 0.11980\rule{0pt}{11pt} \\ +0.05 & 0.05637 & 0.94363 & 1.20 & 0.91031 & 0.08969 \\ +0.10 & 0.11246 & 0.88754 & 1.30 & 0.93401 & 0.06599 \\ +0.15 & 0.16800 & 0.83200 & 1.40 & 0.95229 & 0.04771 \\ +0.20 & 0.22270 & 0.77730 & 1.50 & 0.96611 & 0.03389 \\ +0.30 & 0.32863 & 0.67137 & 1.60 & 0.97635 & 0.02365 \\ +0.40 & 0.42839 & 0.57161 & 1.70 & 0.98379 & 0.01621 \\ +0.50 & 0.52050 & 0.47950 & 1.80 & 0.98909 & 0.01091 \\ +0.60 & 0.60386 & 0.39614 & 1.82\makebox[0pt][l]{14} & 0.99000 & 0.01000 \\ +0.70 & 0.67780 & 0.32220 & 1.90 & 0.99279 & 0.00721 \\ +0.80 & 0.74210 & 0.25790 & 2.00 & 0.99532 & 0.00468 \\ +0.90 & 0.79691 & 0.20309 & 2.50 & 0.99959 & 0.00041 \\ +1.00 & 0.84270 & 0.15730 & 3.00 & 0.99998 & 0.00002 \\[2pt] +\hline\hline +\end{tabular*} +} +\end{table*} +%%%%%%%%%%%%%%%% end table %%%%%%%%%%%%%%%%%%% + +\lipsum[18-25] +\lipsum[27] + +%%%%%%%%%%%%%%%%%%%% Examples WT4 & WT5 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{Wide Equation Pair Split Across Page Break and Followed by Wide Equation} + +\textcolor{red}{Note that the upper rule is cleared after the first use in a \texttt{widetext} environment. This means that it will not show up at the top of the next page.} + +\textcolor{red}{The \texttt{\textbackslash newpage} command may be used between the equations to force the second one onto the next page, e.g., try removing the source code line \texttt{\textbackslash lipsum[27]} with and without \texttt{\textbackslash newpage}.} + +\lipsum[26-28] + +\begin{widetext}[5]% reducing \stripsep from the default 10pt to 5pt with the option [5], to make more room below the equation number +\begin{equation}\mathbf{WT4:} +\int_a^b\biggl\{\int_a^b[f(x)^2g(y)^2+f(y)^2g(x)^2] -2f(x)g(x)f(y)g(y)\,dx\biggr\}\,dy + \ne \frac{1}{\sqrt{\int_a^b\biggl\{g(y)^2\int_a^bf^2+f(y)^2 \int_a^b g^2-2f(y)g(y)\int_a^b fg\biggr\}\,dy}} +\end{equation} +%\newpage +\begin{equation}\mathbf{WT5:} +\int_a^b\biggl\{\int_a^b[f(x)^2g(y)^2+f(y)^2g(x)^2] + -2f(x)g(x)f(y)g(y)\,dx\biggr\}\,dy + \ne \frac{1}{\sqrt{\int_a^b\biggl\{g(y)^2\int_a^bf^2+f(y)^2 + \int_a^b g^2-2f(y)g(y)\int_a^b fg\biggr\}\,dy}} +\end{equation} +\vskip 3pt % some extra space for cramped equation number + +\textcolor{red}{In this case, we again have a pair of wide equations on the same page, so we stay in single column mode +until both are done\footnotemark. The single column table, Table~\ref{tab:3}, is forced to the bottom of the page with the \texttt{[b]} option.} + +\lipsum[32-33] + +\begin{equation}\mathbf{WT6:} +\int_a^b\biggl\{\int_a^b[f(x)^2g(y)^2+f(y)^2g(x)^2] + -2f(x)g(x)f(y)g(y)\,dx\biggr\}\,dy + \ne \frac{1}{\sqrt{\int_a^b\biggl\{g^2\int_a^bf^2+f^2 + \int_a^b g^2-2fg\int_a^b fg\biggr\}\,dy}} +\end{equation} +\end{widetext} +\footnotetext{\textcolor{red}{The code from \texttt{cuted.sty} doesn't play well with footnotes, so we put a \texttt{\textbackslash footnotemark} command inside the wide environment and place a separate \texttt{\textbackslash footnotetext\{..\}} command outside the wide environment.}}% + +\lipsum[34-37] + +%%%%%%%%%%%%%%%%%%% 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} +\centering{% +\begin{tabular*}{\linewidth}{@{\extracolsep{\fill}}CCCC@{\extracolsep{\fill}}} +\hline\hline +X_{z} & X_{c} & X_{c,m} & X_{c,2}\rule{0pt}{11pt}\\ + 3.92069 & 5.70943 & 6.32429 & 7.08757\\[2pt] +\varepsilon (T_1) & \varepsilon^i (T_1) & \varepsilon^i (T_m) & \alpha (T_1, T_2)\\ +0.7258 & 0.6237 & 0.6807 & 0.7964 \\[2pt] +q_\textrm{gray} & q_\textrm{int, $T_1$} & q_\textrm{int, $T_m$} & q_\textrm{exact}\\ +400.2 & 462.1 & 371.0 & 371.8 \\[1pt] +\hline\hline +\end{tabular*} +} +\end{table} +%%%%%%%%%%%%%%%%%%%% end linewidth table %%%%%%%%%%%%%%%%%%%%%%% + +\lipsum[40-54] + +\textcolor{red}{For eqn.~\eqref{eqn:WT7}, we drop the bottom line, keeping the top line and reducing the vertical space a bit: \texttt{\textbackslash begin\{widetext\}[8][t]}.} +\begin{widetext}[8][t] +\begin{equation}\label{eqn:WT7} +\mathbf{WT7:}\quad +\cfrac{1}{1+ \cfrac{1}{abcxyz+(ax^2-by^3+cz^4)(\alpha\chi^2-\beta\upsilon^3+\kappa\zeta^4)(ax^4-by^3+cz^2)(a^2x^2-by^3+c^2z^2)}} +\end{equation} +\end{widetext} + +\lipsum[50-63] + +\textcolor{red}{In this case, we drop the top line: \texttt{\textbackslash begin\{widetext\}[][b]}.} + +\vskip 80pt% <== an extra skip to push this widetext over the edge + +\begin{widetext}[][b] +\begin{equation}\label{eqn:WT8} +\mathbf{WT8:}\quad +\mathfrak{W}(\bm{\Phi})= \begin{Vmatrix} +\dfrac\varphi{(\varphi_1,\varepsilon_1)} & 0 & \hdotsfor{4} & 0 & \\[\jot] +\dfrac{\varphi k_{21}}{(\varphi_2,\varepsilon_1)} & \dfrac\varphi{(\varphi_2,\varepsilon_2)} & 0 & \hdotsfor{3} & 0 \\[\jot] +\dfrac{\varphi k_{31}}{(\varphi_3,\varepsilon_1)} &\dfrac{\varphi k_{32}}{(\varphi_3,\varepsilon_2)} & \dfrac\varphi{(\varphi_3,\varepsilon_3)}& 0 & \hdotsfor{2} & 0 \\[\jot] +\vdots & & & \smash{\rotatebox{15}{$\ddots$}} & & & \vdots \\[\jot] +\dfrac{\varphi k_{n-2\, 1}}{(\varphi_{n-2},\varepsilon_1)} & +\dfrac{\varphi k_{n-2\, 2}}{(\varphi_{n-2},\varepsilon_2)} &\hdotsfor{1} & \dfrac{\varphi k_{n-2\,n-3}}{(\varphi_{n-2},\varepsilon_{n-3})} & \dfrac\varphi{(\varphi_{n-2},\varepsilon_{n-2})}& 0& 0 \\[\jot] +\dfrac{\varphi k_{n-1\, 1}}{(\varphi_{n-1},\varepsilon_1)} & \dfrac{\varphi k_{n-1\, 2}}{(\varphi_{n-1},\varepsilon_2)} &\hdotsfor{2} & +\dfrac{\varphi k_{n-1\,n-2}}{(\varphi_{n-1},\varepsilon_{n-2})}& \dfrac{\varphi}{(\varphi_{n-1},\varepsilon_{n-1})} & 0 \\[\jot] +\dfrac{\varphi k_{n1}}{(\varphi_n,\varepsilon_1)} & \dfrac{\varphi k_{n2}}{(\varphi_n,\varepsilon_2)} & \hdotsfor{3} & +\dfrac{\varphi k_{n\,n-1}}{(\varphi_n,\varepsilon_{n-1})} & \dfrac{\varphi}{(\varphi_n,\varepsilon_n)} +\end{Vmatrix} +\end{equation} +\end{widetext} + +\lipsum[55-56] + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\appendix +\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} +f(\theta,\phi) = \sum_{n=0}^\infty \sum_{m=-n}^n f_{m,n} Y_n^m(\theta,\phi) +\end{equation} +for $Y_n^m(\theta,\phi) = e^{i m\phi}P^{|m|}_n(\cos\theta)$, for $|m|<n$. The case $n=3$, $m=2$ (a \textit{tesseral harmonic}) is shown in Fig.~\ref{fig:tesseral}. + +These functions are orthogonal, with the normalization constant~\cite[App.~A]{stakgold}: +\begin{equation} +N_{m,n}=\int_0^{2\pi}\!\!d\phi\int_0^{\pi}\!\!d\theta \sin\theta\, \big|Y^m_n(\theta,\phi)\big|^2 = \frac{4\pi (n+|m|)!}{(2n+1)(n-|m|)!} +\end{equation} + +If $f$ is independent of the azimuthal angle $\phi$, the solution appears in ordinary Legendre polynomials, $P_n$, rather than associated Legendre polynomials, $P^m_n$ ($P^0_n = P_n$): +\begin{equation} +f(\theta) = \sum_{n=0}^\infty f_n\, P_n(\cos\theta) +\end{equation} +The terms in this series are called \textit{zonal harmonics}. + +%%%%%%%%%%%%%%%%%%%% bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\bibliographystyle{asmejour} +\bibliography{asme-wide-equations} + + +\end{document} diff --git a/macros/latex/contrib/asmejour/asmewide_example/asmewide.sty b/macros/latex/contrib/asmejour/asmewide_example/asmewide.sty new file mode 100644 index 0000000000..b0c9a481f2 --- /dev/null +++ b/macros/latex/contrib/asmejour/asmewide_example/asmewide.sty @@ -0,0 +1,128 @@ +%% +%% This file is `asmewide.sty'. +%% +%% 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) +%% +%% The original widetext environment was developed in revtex; elements of the present code have been modified revtex4-2.dtx, under LPPL1.3c. +%% The unmodified code is available at: https://ctan.org/pkg/revtex +%% This code also adopts concepts from the widetext.sty package by Anjishnu Sarkar, https://blog.pnas.org/widetext.sty. +%% 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 +%% +%% The widetext environment can only appear once per page. It clashes with floats and footnotes, requiring 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. +%% +%% 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} +\ProvidesPackage{asmewide}[\AW@versiondate\space v\AW@versionno\space ASME wide equation environment (JHL)] + +\ifdefined\NewDocumentCommand\else + \RequirePackage{xparse} +\fi +\RequirePackage{etoolbox} +\RequirePackage{cuted}[2021/10/04]%features used here were first added in the [2021/10/04] version of cuted.sty! +\@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.}% +} + +\RequirePackage{flushend}[2021/10/04] +% +% https://tex.stackexchange.com/a/43541/119566 +\def\@getcl@ss#1.cls#2\relax{\def\@currentclass{#1}} +\def\@getclass{\expandafter\@getcl@ss\@filelist\relax} +\@getclass +\typeout{Running asmewide.sty with the \@currentclass\space class.} +% +\newbox\@TopLeader +\newbox\@BottomLeader +\newlength\savparskip \setlength\savparskip{\parskip} +\newlength\@RuleWidth \AtBeginDocument{\setlength\@RuleWidth{\dimexpr(\columnwidth+0.5\columnsep-1pt)}} +\newlength\@TopSpace \setlength\@TopSpace{0ex} +\newlength\@TopCorr \setlength\@TopCorr{-5pt} +\def\@asmeindent{3.5mm} +\def\@TopRuleWeight{0.5pt} +\def\@BottomRuleWeight{0.5pt} +\def\@DSS{5}% default stripsep +% +\@ifclassloaded{asmeconf}{% + \setlength\@TopCorr{-1ex}% keep \abovedisplayskip since text could start the page + \setlength\@TopSpace{1ex}% provide space apparently lost with cuted.sty in asmeconf.cls + \def\@asmeindent{0.25in}% asmeconf +}{\relax} + +\@ifclassloaded{asmejour}{% + \AtBeginDocument{\setlength\@RuleWidth{\columnwidth}} + \setlength\@TopCorr{-9pt}% asmejour + \def\@BottomRuleWeight{1pt}% asmejour + \def\@DSS{10}% default stripsep, asmejour +}{\relax} +% +% Set ascenders and descenders 1.2 times greater than \baselineskip +\NewDocumentCommand\@SetTopLeader{}{% NB: boxes are cleared after they are used; this command is issued once with each widetext environment + \setbox\@TopLeader\vbox{% + \hbox to \@RuleWidth{% + \leaders\hrule height\@TopRuleWeight \hfil + \vrule height 1.2\baselineskip width\@TopRuleWeight} + } +} +\NewDocumentCommand\@TopLine{}{% + \vskip\@TopSpace + \dimen@\ht\@TopLeader\advance\dimen@\dp\@TopLeader + \cleaders\box\@TopLeader\vskip\dimen@ +} +\NewDocumentCommand\@SetBottomLeader{}{% + \setbox\@BottomLeader\hbox to \@RuleWidth{% + \vrule depth 1.2\baselineskip width\@BottomRuleWeight + \leaders\hrule height\@BottomRuleWeight \hfil + } +} +\NewDocumentCommand\@BottomLine{}{% + \par + \vskip 3pt% provide some space between low equation numbers and rule + \setbox\@BottomLeader\vbox{% + \hbox to \textwidth{\hfil\box\@BottomLeader}% + }% + \dimen@\ht\@BottomLeader\advance\dimen@\dp\@BottomLeader + \cleaders\box\@BottomLeader\vskip\dimen@ + \vskip -1.5pt% reduce trailing separation w.r.t. baseline when \stripsep = 0 +} +\preCutedStrip={\@TopLine} +\postCutedStrip={\@BottomLine} +\DeclareDocumentEnvironment{widetext}{O{\@DSS}o}{% + \@SetTopLeader + \@SetBottomLeader + \notblank{#1}{% + \setlength{\stripsep}{#1pt plus 5pt minus 5pt} + }{ + \setlength{\stripsep}{\@DSS pt plus 5pt minus 5pt} + } + \ifstrequal{#2}{t}{\setbox\@BottomLeader\vbox{}}{% + \ifstrequal{#2}{b}{\setbox\@TopLeader\vbox{\vskip \@TopCorr}}{%cuted inserts some additional space, we remove here + \ifstrequal{#2}{n}{\setbox\@TopLeader\vbox{\vskip \@TopCorr}\setbox\@BottomLeader\vbox{}}{\relax} + } + } + \begin{strip} + \setlength\parindent{\@asmeindent}% strip makes parindent zero; enlarge for ASME + \setlength\parskip{\savparskip}% strip makes \parskip zero w/o glue; set to match main text + }{% + \end{strip}\ignorespaces +} +%% +\endinput +%% +%% End of file `asmewide.sty'. diff --git a/macros/latex/contrib/asmejour/asmewide_example/tesseral-harmonic.pdf b/macros/latex/contrib/asmejour/asmewide_example/tesseral-harmonic.pdf Binary files differnew file mode 100644 index 0000000000..46f5268075 --- /dev/null +++ b/macros/latex/contrib/asmejour/asmewide_example/tesseral-harmonic.pdf diff --git a/macros/latex/contrib/asmejour/asmewide_example/zonal-harmonic2.pdf b/macros/latex/contrib/asmejour/asmewide_example/zonal-harmonic2.pdf Binary files differnew file mode 100644 index 0000000000..abd55c5709 --- /dev/null +++ b/macros/latex/contrib/asmejour/asmewide_example/zonal-harmonic2.pdf diff --git a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf Binary files differindex ac81f1244b..25e411bfee 100644 --- a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf +++ b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf Binary files differindex 1c27a15fb5..5508c9dee7 100644 --- a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf Binary files differindex 9d518bf0eb..bdc6f89546 100644 --- a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf Binary files differindex 4ab0e81ca9..6aa81e85f9 100644 --- a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf Binary files differindex 2eef17f864..1bbeb4fd91 100644 --- a/macros/latex/contrib/reledmac/examples/1-tabular.pdf +++ b/macros/latex/contrib/reledmac/examples/1-tabular.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf Binary files differindex e915eec0ac..157ac911ed 100644 --- a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf +++ b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf Binary files differindex 80f79e5faf..46243e854b 100644 --- a/macros/latex/contrib/reledmac/examples/1-verses.pdf +++ b/macros/latex/contrib/reledmac/examples/1-verses.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf Binary files differindex 437a76d767..5c8c304cb9 100644 --- a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf +++ b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf Binary files differindex 083daf183c..130232e15e 100644 --- a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf Binary files differindex 11452f7fe6..f7d4ebcb3a 100644 --- a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf Binary files differindex d537e33993..0f534f6f3e 100644 --- a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf +++ b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf Binary files differindex 101dc1dc01..16762558c7 100644 --- a/macros/latex/contrib/reledmac/examples/2-indexing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-indexing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf Binary files differindex fff138ef30..b6a8ec6d75 100644 --- a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf +++ b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf Binary files differindex a1f158edad..545e48c5cd 100644 --- a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf +++ b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf Binary files differindex bda461167c..44261f6be4 100644 --- a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf Binary files differindex f48f393c6f..e452cb8bcd 100644 --- a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf +++ b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf Binary files differindex 24a3360652..37dd2e0a30 100644 --- a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf +++ b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf Binary files differindex 9d7dd0d291..e12f08af62 100644 --- a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf +++ b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf Binary files differindex 8a2e7b80f8..ffc140c8e4 100644 --- a/macros/latex/contrib/reledmac/examples/2-performances.pdf +++ b/macros/latex/contrib/reledmac/examples/2-performances.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf Binary files differindex fbf973b071..0795c78465 100644 --- a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf +++ b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf Binary files differindex f3918f390f..55a65d9500 100644 --- a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf +++ b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf Binary files differindex 6acdf77eca..5e2874adb8 100644 --- a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf Binary files differindex cd52cce08a..987a5f6c15 100644 --- a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf Binary files differindex 4249605dad..5a0f3385cb 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf Binary files differindex 2d696d17f8..a8c277f77d 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf Binary files differindex a70b8c1ab2..bf1a0e6db3 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf Binary files differindex 2776b2e757..ec05bc76de 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf Binary files differindex ab06401ba7..9f72177583 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf Binary files differindex fd7ec93d6c..5585d7ce33 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf Binary files differindex d7e1015109..513c08d554 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf Binary files differindex 0fa157c478..57d0b68005 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf Binary files differindex f8ac927068..6c89b00e4c 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf Binary files differindex 569af736b2..3e2bff636a 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf Binary files differindex b0ab8eadc0..ab17873202 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf Binary files differindex 1513bf993a..497d6e385d 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf Binary files differindex d2e296556d..837f77ff7d 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf Binary files differindex 46c962e509..740a7c02c1 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf Binary files differindex c352f2fe80..a93ae66e92 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf Binary files differindex 7307550374..65a91b1bd2 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf Binary files differindex a8332eb40a..08f903586b 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf Binary files differindex 1d1bc1103e..fdc7cfc611 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf Binary files differindex a7e45281a0..8a6c262f89 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf Binary files differindex 63fc6fb5ae..499e7b28ec 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf Binary files differindex 3d38bbc50e..0b28dd10f5 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf Binary files differindex d8a06425c2..7c9ae89801 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf Binary files differindex 2444d467dc..46303da21a 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf Binary files differindex 31cc703837..da50fc071d 100644 --- a/macros/latex/contrib/reledmac/migration.pdf +++ b/macros/latex/contrib/reledmac/migration.pdf diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx index 9009f1a2ae..84f70591be 100644 --- a/macros/latex/contrib/reledmac/reledmac.dtx +++ b/macros/latex/contrib/reledmac/reledmac.dtx @@ -589,6 +589,7 @@ % \changes{v2.38.1}{2021/09/27}{Fix incompatibility between \protect\parpackage's option \protect\option{continuousnumberingwithcolumns} and lineation by page.} % \changes{v2.38.2}{2021/11/03}{Fix bug when using \protect\cs{applabel} in conjunction with \protect\package{hyperref} package.} % \changes{v2.38.2}{2021/11/03}{Fix some trouble in indentation in stanza, when switching to some language with \protect\package{polyglossia}.} +% \changes{v2.39.0}{2021/01/11}{Add \protect\cs{Xnotboxingsubline} and \protect\cs{Xendnotboxingsubline} hooks.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -2596,10 +2597,10 @@ % \DescribeMacro{\Xendinplaceofnumber} \cs{Xendinplaceofnumber}\oarg{s}\marg{l} is the same, for critical endnotes. % \subsubsection{Boxing line number and line symbol} % \DescribeMacro{\Xboxlinenum} -% It could be useful to put the line number inside a fixed box: the content of the note will be printed after this box. +% It could be useful to put the line numbers inside a fixed box: the content of the note will be printed after this box. % You can use \protect\cs{Xboxlinenum}\oarg{s}\marg{l} to do that. % To subsequently disable this feature, use \protect\cs{Xboxlinenum} with length equal to 0~pt. -% One use of this feature is to print line number in a column, and the note in an other column: +% One use of this feature is to print line numbers in a column, and the note in an other column: % \begin{verbatim} %\Xhangindent{1em} %\Xafternumber{0em} @@ -2630,18 +2631,41 @@ % \item \protect\cs{Xboxendlinenum}\oarg{s}\marg{l} will box the dash plus the end line number or the range symbol in a box of length \meta{l}. The content will be put at the left of the box. % \end{itemize} % -% With these two commands, it is possible to horizontaly align the dash of line number when using critical notes, to obtain something like: +% With these two commands, it is possible to horizontally align the dash of line number when using critical notes, to obtain something like: % \begin{verbatim} % 1 % 12-23 % 24ff. % \end{verbatim} +% +% \DescribeMacro{\Xnotboxingsubline} +% By default, for the start line number, these things are boxed: +% \begin{itemize} +% \item (start) line number annotation, if before line number; +% \item (start) page and (start) line number; +% \item (start) line flag; +% \item (start) line number annotation, if after line number; +% \item (start) subline number. +% \end{itemize} +% +% You may exclude subline number and line number annotation after line number, using \cs{Xnotboxingsubline}\oarg{s}. % \DescribeMacro{\Xendboxlinenum} % \DescribeMacro{\Xendboxlinenumalign} -% \DescribeMacro{\Xendboxstartlinenumalign} -% \DescribeMacro{\Xendboxendlinenumalign} +% \DescribeMacro{\Xendboxstartline} +% \DescribeMacro{\Xendboxendlinenum} % \changes{v1.20.0}{2015/03/22}{Add \protect\cs{Xendboxlinenum}} -% \protect\cs{Xendboxlinenum}\oarg{s}\marg{l}, \protect\cs{Xendboxlinenumalign}\oarg{s}\marg{text}, \protect\cs{Xendboxstartlinenum}\oarg{s}\marg{l}, \protect\cs{Xendboxendlinenum}\oarg{s}\marg{l} are the same as, respectively, \protect\cs{Xboxlinenum} and \protect\cs{Xboxlinenumalign}, \protect\cs{Xboxstartlinenum}, \protect\cs{Xboxendlinenum} except in endnotes. +% \protect\cs{Xendboxlinenum}\oarg{s}\marg{l}, +% \protect\cs{Xendboxlinenumalign}\oarg{s}\marg{text}, +% \protect\cs{Xendboxstartlinenum}\oarg{s}\marg{l}, +% \protect\cs{Xendnotboxingsubline}\oarg{s}, +% \protect\cs{Xendboxendlinenum}\oarg{s}\marg{l} +% are the same as, respectively, +% \protect\cs{Xboxlinenum}, +% \protect\cs{Xboxlinenumalign}, +% \protect\cs{Xboxstartlinenum}, +% \protect\cs{Xnotboxingsubline}, +% \protect\cs{Xboxendlinenum} +% except in endnotes. % % %\subsection{Separator between the lemma and the note} @@ -3608,7 +3632,7 @@ % \item\cs{Xendtwolinesonlyinsamepage} % \item\cs{Xendlinenumannotationposition} % \item\cs{Xendwraplinenumannotation} -% \item\cs{Xemdnoidenticallinenumannotation} +% \item\cs{Xendnoidenticallinenumannotation} % \end{itemize} % \paragraph{For one specific command} % @@ -4478,7 +4502,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2021/11/03 v2.38.2 typesetting critical editions]% +\ProvidesPackage{reledmac}[2022/01/11 v2.39.0 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -12786,6 +12810,7 @@ \linenumrep{#2}% \iftoggle{Xlineflag@\@currentseries}{#8}{}% }% + \iftoggle{Xnotboxingsubline@\@currentseries}{\egroup}{}%Close startline box \ifl@d@ssub% \csuse{Xsublinesep@\@currentseries}% \wrap@edcrossref{\@this@crossref@start}{\sublinenumrep{#3}}% @@ -12794,7 +12819,7 @@ \ifcsstring{Xlinenumannotationposition@\@currentseries}{after}% {\@annot@start@print}% {}% - \egroup% + \iftoggle{Xnotboxingsubline@\@currentseries}{}{\egroup}%Close startline box % \end{macrocode} % Then print the dash + end line number, or the range symbol. % \changes{v0.3.0}{2004/02/14}{Added \protect\cs{linenumr@p} and \protect\cs{sublinenumr@p} @@ -14911,6 +14936,7 @@ }% \fi% \iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% + \iftoggle{Xendnotboxingsubline@\@currentseries}{\egroup}{}%Close the box \ifl@d@Xendlinenumber% \ifl@d@ssub% \csuse{Xendsublinesep@\@currentseries}% @@ -14929,7 +14955,7 @@ % \end{macrocode} % Close the box. % \begin{macrocode} - \egroup% + \iftoggle{Xendnotboxingsubline@\@currentseries}{}{\egroup}% % \end{macrocode} % Open the box for the ending line number. % \begin{macrocode} @@ -15099,6 +15125,7 @@ \csgdef{Xboxlinenumalign@#1}{L}% \csgdef{Xboxstartlinenum@#1}{0pt}% + \newtoggle{Xnotboxingsubline@#1}% \csgdef{Xboxendlinenum@#1}{0pt}% \csgdef{Xboxsymlinenum@#1}{0pt}% @@ -15572,6 +15599,7 @@ \csgdef{Xendboxlinenumalign@#1}{L}% \csgdef{Xendboxstartlinenum@#1}{0pt}% + \newtoggle{Xendnotboxingsubline@#1}% \csgdef{Xendboxendlinenum@#1}{0pt}% \csgdef{Xendlemmaseparator@#1}{}% @@ -15941,6 +15969,7 @@ \newhookcommand@series{Xboxlinenumalign}% \newhookcommand@series{Xboxstartlinenum}% + \newhooktoggle@series{Xnotboxingsubline}% \newhookcommand@series{Xboxendlinenum}% \newhookcommand@series{Xafternote}% @@ -16024,6 +16053,7 @@ \newhookcommand@series{Xendboxlinenumalign}% \newhookcommand@series{Xendboxstartlinenum}% + \newhooktoggle@series{Xendnotboxingsubline}% \newhookcommand@series{Xendboxendlinenum}% \newhookcommand@series{Xendnotefontsize} @@ -17373,12 +17403,16 @@ \gdef\Xboxstartlinenum@appref{0pt} \gdef\Xboxstartlinenum@SEref{0pt} +\newtoggle{Xnotboxingsubline@appref}% +\newtoggle{Xnotboxingsubline@SEref}% \gdef\Xboxendlinenum@appref{0pt} \gdef\Xboxendlinenum@SEref{0pt} \gdef\Xendboxstartlinenum@apprefwithpage{0pt} \gdef\Xendboxstartlinenum@SErefwithpage{0pt} +\newtoggle{Xendnotboxingsubline@apprefwithpage}% +\newtoggle{Xendnotboxingsubline@SErefwithpage}% \gdef\Xendboxendlinenum@apprefwithpage{0pt} \gdef\Xendboxendlinenum@SErefwithpage{0pt} diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf Binary files differindex e484cbdcd3..58db8402ef 100644 --- a/macros/latex/contrib/reledmac/reledmac.pdf +++ b/macros/latex/contrib/reledmac/reledmac.pdf diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf Binary files differindex df842ae7ec..16114f12d1 100644 --- a/macros/latex/contrib/reledmac/reledpar.pdf +++ b/macros/latex/contrib/reledmac/reledpar.pdf diff --git a/macros/latex/contrib/sillypage/sillypage-example.pdf b/macros/latex/contrib/sillypage/sillypage-example.pdf Binary files differindex eeab813f57..0a2811a521 100644 --- a/macros/latex/contrib/sillypage/sillypage-example.pdf +++ b/macros/latex/contrib/sillypage/sillypage-example.pdf diff --git a/macros/latex/contrib/sillypage/sillypage.dtx b/macros/latex/contrib/sillypage/sillypage.dtx index ea015877b1..2ec5a6635b 100644 --- a/macros/latex/contrib/sillypage/sillypage.dtx +++ b/macros/latex/contrib/sillypage/sillypage.dtx @@ -17,12 +17,16 @@ % by Phelype Oleinik and Paulo Cereda. % %<*package> -\def\sillypageDate{2022-01-10} -\def\sillypageVersion{1.1} +\def\sillypageDate{2022-01-11} +\def\sillypageVersion{1.2} %</package> %<*driver> \documentclass[a4paper,full]{l3doc} +\usepackage[T1]{fontenc} +\usepackage{tgbonum} +\usepackage[scaled=.85]{beramono} \usepackage{sillypage} +\usepackage{hyperref} \begin{document} \DocInput{\jobname.dtx} \end{document} @@ -61,12 +65,48 @@ % % \section{Introduction} % +% This package is inspired by \emph{The Ministry of Silly Walks}, a famous +% sketch from Monty Python. According to the corresponding +% \href{https://bit.ly/33jKsl1}{Wikipedia article}: +% +% \begin{quotation} +% The sketch as originally depicted in the series begins with John Cleese +% playing Mr.\ Teabag, a civil servant who, after purchasing The Times +% from the newsagent in the previous sketch, walks through the streets +% of London (at the crossing of Thorpebank Road and Dunraven Road) in a +% very peculiar manner. He eventually arrives at his place of business: +% The Ministry of Silly Walks, on the northern end of Whitehall. In the +% hallway, he passes other employees all exhibiting their own silly walks +% before arriving at his office. Once there, he finds Mr Putey (Michael +% Palin) waiting for him and apologizes for the delay, explaining that +% his walk has become particularly silly of late and it takes longer for +% him to reach his destination. +% \end{quotation} +% +% So we decided to bring this masterpiece of British pop culture to +% the \TeX{} world through a silly page numbering style. Make sure to +% use this package in your thesis, it will be a success. +% +% \section{Usage} +% +% Using a silly package like this is quite straighforward! For starters, +% make sure to include it in your document preamble through +% +% \begin{verbatim} +% \usepackage{sillypage} +% \end{verbatim} +% +% \noindent and that is it! The available interface is as follows: +% % \begin{function}{\pagenumbering{silly}} % \begin{syntax} % \cs{pagenumbering}\{silly\} % \end{syntax} % Write \cs{pagenumbering}|{silly}| in you document to use the page -% numbering style defined by this package. +% numbering style defined by this package. According to Wikipedia, +% the typical silly walk gait consists of twelve specific steps to +% be performed, so page numbering will cycle through these steps, +% in an kineograph fashion. % \end{function} % % \begin{function}{\silly} @@ -74,7 +114,9 @@ % \cs{silly} \Arg{counter} % \end{syntax} % Use the macro \cs{silly} on a \LaTeX{} \meta{counter} to typeset the -% corresponding image for the value of that counter. +% corresponding image for the value of that counter. As noted above, +% the value will be mapped to an image in the silly walk cycle. Also, +% observe that this macro is applied to counters and not to integers. % \end{function} % % \begin{function}{\sillystep} @@ -82,11 +124,19 @@ % \cs{sillystep} \Arg{integer} % \end{syntax} % Prints the step number \meta{integer} from the sequence of steps. +% This macro works exactly like \cs{silly}, but on integers instead +% of counters. The integer value will be mapped to an image in the +% silly walk cycle. % \end{function} % +% \bigskip +% +% What a silly yet marvellous interface! +% % \section{A sample document} % -% A sample document is as follows: +% As a means to demonstrate how straightforward (and of course silly) our package +% is, here is a minimal working example: % % \begin{verbatim} % \documentclass{article} @@ -100,7 +150,19 @@ % \end{document} % \end{verbatim} % -% This is the complete silly walk routine: +% After compiling it, take a look at the page numbering: you will be greeted with +% the silly walk routine! To impress your supervisor, use our package in your thesis, +% print it and ask them to view those pages in quick succession, so the images appear +% to animate by simulating motion! It is known to work with thesis committees as well. +% +% \section{The silly walk routine} +% +% This is the complete silly walk routine provided by Jazeen Hollings in the +% \href{https://bit.ly/3fc9x46}{corresponding Wikipedia article}. The images +% used in this package are from that particular instruction set, licensed +% under CC BY-SA 3.0. We gathered them together for optimization purposes. +% +% \bigskip % % \makeatletter % {\centering @@ -110,13 +172,19 @@ % \number\numexpr#1+1\relax}\fi}\do{1}\par} % \makeatother % +% \bigskip +% % We also recommend Pilates. % % \end{documentation} % % \begin{implementation} % -% \section{\pkg{sillypage} Implementation} +% \section{Implementation details} +% +% The implementation is quite straightforward. Feel free to contact us for +% suggestions and criticism, code improvements and of course other silly +% walk variants. % % \begin{macrocode} %<*package> diff --git a/macros/latex/contrib/sillypage/sillypage.pdf b/macros/latex/contrib/sillypage/sillypage.pdf Binary files differindex 9922c265ab..df65d10c02 100644 --- a/macros/latex/contrib/sillypage/sillypage.pdf +++ b/macros/latex/contrib/sillypage/sillypage.pdf diff --git a/macros/texinfo/latest/htmlxref.cnf b/macros/texinfo/latest/htmlxref.cnf index b02c5fde54..663612b04f 100644 --- a/macros/texinfo/latest/htmlxref.cnf +++ b/macros/texinfo/latest/htmlxref.cnf @@ -1,8 +1,8 @@ # htmlxref.cnf - reference file for free Texinfo manuals on the web. -htmlxrefversion=2020-10-20.13; # UTC +htmlxrefversion=2022-01-10.18; # UTC -# Copyright 2010-2020 Free Software Foundation, Inc. +# Copyright 2010-2022 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright @@ -137,21 +137,33 @@ EMACS = ${GS}/emacs/manual emacs mono ${EMACS}/html_mono/emacs.html emacs node ${EMACS}/html_node/emacs/ # - ada-mode mono ${EMACS}/html_mono/ada-mode.html - ada-mode node ${EMACS}/html_node/ada-mode/ + auth mono ${EMACS}/html_mono/auth.html + auth node ${EMACS}/html_node/auth/ # autotype mono ${EMACS}/html_mono/autotype.html autotype node ${EMACS}/html_node/autotype/ # + calc mono ${EMACS}/html_mono/calc.html + calc node ${EMACS}/html_node/calc/ + # ccmode mono ${EMACS}/html_mono/ccmode.html ccmode node ${EMACS}/html_node/ccmode/ # cl mono ${EMACS}/html_mono/cl.html cl node ${EMACS}/html_node/cl/ # + dbus mono ${EMACS}/html_mono/dbus.html + dbus node ${EMACS}/html_node/dbus/ + # ebrowse mono ${EMACS}/html_mono/ebrowse.html ebrowse node ${EMACS}/html_node/ebrowse/ # + ede mono ${EMACS}/html_mono/ede.html + ede node ${EMACS}/html_node/ede/ + # + edt mono ${EMACS}/html_mono/edt.html + edt node ${EMACS}/html_node/edt/ + # ediff mono ${EMACS}/html_mono/ediff.html ediff node ${EMACS}/html_node/ediff/ # @@ -161,6 +173,12 @@ emacs node ${EMACS}/html_node/emacs/ elisp mono ${EMACS}/html_mono/elisp.html elisp node ${EMACS}/html_node/elisp/ # + emacs-gnutls mono ${EMACS}/html_mono/emacs-gnutls.html + emacs-gnutls node ${EMACS}/html_node/emacs-gnutls/ + # + emacs-mime mono ${EMACS}/html_mono/emacs-mime.html + emacs-mime node ${EMACS}/html_node/emacs-mime/ + # epa mono ${EMACS}/html_mono/epa.html epa node ${EMACS}/html_node/epa/ # @@ -170,63 +188,129 @@ emacs node ${EMACS}/html_node/emacs/ dired-x mono ${EMACS}/html_mono/dired-x.html dired-x node ${EMACS}/html_node/dired-x/ # + ert mono ${EMACS}/html_mono/ert.html + ert node ${EMACS}/html_node/ert/ + # eshell mono ${EMACS}/html_mono/eshell.html eshell node ${EMACS}/html_node/eshell/ # + eudc mono ${EMACS}/html_mono/eudc.html + eudc node ${EMACS}/html_node/eudc/ + # eww mono ${EMACS}/html_mono/eww.html eww node ${EMACS}/html_node/eww/ # + forms mono ${EMACS}/html_mono/forms.html + forms node ${EMACS}/html_node/forms/ + # flymake mono ${EMACS}/html_mono/flymake.html flymake node ${EMACS}/html_node/flymake/ # gnus mono ${EMACS}/html_mono/gnus.html gnus node ${EMACS}/html_node/gnus/ # + htmlfontify mono ${EMACS}/html_mono/htmlfontify.html + htmlfontify node ${EMACS}/html_node/htmlfontify/ + # idlwave mono ${EMACS}/html_mono/idlwave.html idlwave node ${EMACS}/html_node/idlwave/ # + ido mono ${EMACS}/html_mono/ido.html + ido node ${EMACS}/html_node/ido/ + # info mono ${EMACS}/html_mono/info.html info node ${EMACS}/html_node/info/ # + mairix mono ${EMACS}/html_mono/mairix.html + mairix node ${EMACS}/html_node/mairix-el/ + # message mono ${EMACS}/html_mono/message.html message node ${EMACS}/html_node/message/ # mh-e mono ${EMACS}/html_mono/mh-e.html mh-e node ${EMACS}/html_node/mh-e/ # + newsticker mono ${EMACS}/html_mono/newsticker.html + newsticker node ${EMACS}/html_node/newsticker/ + # nxml-mode mono ${EMACS}/html_mono/nxml-mode.html nxml-mode node ${EMACS}/html_node/nxml-mode/ # + octave-mode mono ${EMACS}/html_mono/octave-mode.html + octave-mode node ${EMACS}/html_node/octave-mode/ + # org mono ${EMACS}/html_mono/org.html org node ${EMACS}/html_node/org/ # pcl-cvs mono ${EMACS}/html_mono/pcl-cvs.html pcl-cvs node ${EMACS}/html_node/pcl-cvs/ # + pgg mono ${EMACS}/html_mono/pgg.html + pgg node ${EMACS}/html_node/pgg/ + # rcirc mono ${EMACS}/html_mono/rcirc.html rcirc node ${EMACS}/html_node/rcirc/ # + reftex mono ${EMACS}/html_mono/reftex.html + reftex node ${EMACS}/html_node/reftex/ + # + remember mono ${EMACS}/html_mono/remember.html + remember node ${EMACS}/html_node/remember/ + # + sasl mono ${EMACS}/html_mono/sasl.html + sasl node ${EMACS}/html_node/sasl/ + # semantic mono ${EMACS}/html_mono/semantic.html semantic node ${EMACS}/html_node/semantic/ # + bovine mono ${EMACS}/html_mono/bovine.html + bovine node ${EMACS}/html_node/bovine/ + # + srecode mono ${EMACS}/html_mono/srecode.html + srecode node ${EMACS}/html_node/srecode/ + # + ses mono ${EMACS}/html_mono/ses.html + ses node ${EMACS}/html_node/ses/ + # + sieve mono ${EMACS}/html_mono/sieve.html + sieve node ${EMACS}/html_node/sieve/ + # smtp mono ${EMACS}/html_mono/smtpmail.html smtp node ${EMACS}/html_node/smtpmail/ # speedbar mono ${EMACS}/html_mono/speedbar.html speedbar node ${EMACS}/html_node/speedbar/ # + sc mono ${EMACS}/html_mono/sc.html + sc node ${EMACS}/html_node/sc/ + # + todo-mode mono ${EMACS}/html_mono/todo-mode.html + todo-mode node ${EMACS}/html_node/todo-mode/ + # tramp mono ${EMACS}/html_mono/tramp.html tramp node ${EMACS}/html_node/tramp/ # + url mono ${EMACS}/html_mono/url.html + url node ${EMACS}/html_node/url/ + # + vhdl-mode mono ${EMACS}/html_mono/vhdl-mode.html + vhdl-mode node ${EMACS}/html_node/vhdl-mode/ + # vip mono ${EMACS}/html_mono/vip.html vip node ${EMACS}/html_node/vip/ # viper mono ${EMACS}/html_mono/viper.html viper node ${EMACS}/html_node/viper/ # + widget mono ${EMACS}/html_mono/widget.html + widget node ${EMACS}/html_node/widget/ + # + wisent mono ${EMACS}/html_mono/wisent.html + wisent node ${EMACS}/html_node/wisent/ + # woman mono ${EMACS}/html_mono/woman.html woman node ${EMACS}/html_node/woman/ - # (end emacs manuals) + # (end emacs manuals in EMACS) easejs mono ${GS}/easejs/manual/easejs.html easejs node ${GS}/easejs/manual/ @@ -236,6 +320,8 @@ emacs-muse node ${GS}/emacs-muse/manual/html_node/ emms node ${GS}/emms/manual/ +ada-mode mono https://elpa.gnu.org/packages/ada-mode.html + findutils mono ${GS}/findutils/manual/html_mono/find.html findutils node ${GS}/findutils/manual/html_node/find_html |