CTAN sync 202008120303

6 files changed, 138 insertions, 44 deletions

diff --git a/macros/latex/contrib/asmejour/README.md b/macros/latex/contrib/asmejour/README.md
index ad1780a729..cdb321c070 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.12 dated 2020/04/12.
+  Version 1.13 dated 2020/08/10.
 
   ####Overview####
   This class provides a template to format preprints submitted to ASME journals. The layout and reference
@@ -37,10 +37,12 @@
 
 - use the features of the newtxtext and newtxmath font packages
 
-- support bold face, math, citations, and footnotes in section headings 
+- support bold-face math, citations, and footnotes in section headings 
 
 - provide automatic layout of author blocks for multiple addresses
 
+- support PDF/A (archival) standards if desired
+
 
   ####Author####
   
@@ -57,6 +59,8 @@
  
  ####Change log####
  
+v1.13 (2020/08/10): Add support for PDF/A archival standards (1b, 2b, 2u, 3b, 3u), as the newtx fonts have recently gained complete unicode maps; also, restore varl and varqu as default options of the inconsolata font.
+ 
 v1.12 (2020/04/12): Change subfigure \\ref labels to have parentheses around italic letters; remove space between consecutive numerical citations; add macro to adjust vertical space below abstract; edit documentation; remove varl and varqu options of inconsolata font; extensively edit/document asmejour-sample.bib file. 
 
 Many changes to asmejour.bst (v1.03) to improve consistency with ASME reference formats for collections, technical reports, and conference papers, to better manage hyperlinks, and to warn for missing fields. These includes: move venue, eventdate, and paper number to end of @inproceedings; move paper number after address of @techreport; hyperlink technical report numbers and conference numbers, and provide fallback for missing numbers; separate serial collection parenthetical layout from @incollection into new @inserialcollection; add default name for @inproceedings paper number, "Paper No.", changed by type ={} (this alternation is not backward compatible!); add oclc macro for archive field; complete the set of macros for ASME journal names.
diff --git a/macros/latex/contrib/asmejour/asmejour-sample.bib b/macros/latex/contrib/asmejour/asmejour-sample.bib
index 9dbe94e650..33ad7a1406 100644
--- a/macros/latex/contrib/asmejour/asmejour-sample.bib
+++ b/macros/latex/contrib/asmejour/asmejour-sample.bib
@@ -517,5 +517,3 @@
   note 		= {{``The Locust Years''}},
 }
 %% inbook supports these fields: author OR editor, year, title, edition, version, versiontype, series, volume OR number, doi OR url OR eprint with archive, publisher, address, note.  type={} field can change "Chap." to something else.
-
-
diff --git a/macros/latex/contrib/asmejour/asmejour-template.pdf b/macros/latex/contrib/asmejour/asmejour-template.pdf
index 53872b3977..a2e8242ecb 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 c25cf775b5..1d8bae4b5f 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 
 %%  as they are being published in 2020.
 %%
-%%  This file is version 1.12 dated 2020/04/12
+%%  This file is version 1.13 dated 2020/08/10
 %%
 %%  Author: John H. Lienhard V
 %%          Department of Mechanical Engineering
@@ -49,6 +49,9 @@
 %%          * Option to allow hyphenation of the typewriter font [hyphenate]
 %%          *    Hyphenation is normally suppressed for typewriter mode because it is often used for code.
 %%
+%%			* Options for PDF/A compliance. [pdf-a] will produce PDF/A-3u compliance with sRGB OutputIntent.
+%%			*	 [pdfapart= 1 or 2 or 3] and [pdfaconformance= b or u] allow other levels: 1b, 2b, 2u, and 3b.
+%%
 %%  For details of newtxmath and mathalfa, refer to their documentation (available on CTAN: http://ctan.org).
 %%
 %%  The use of commands defined or modified by the asmejour class is illustrated below. In particular, 
@@ -81,7 +84,7 @@
 
 
 %% Class options are described above.
-\documentclass[largesc,upint,varvw,barcolor=Red4,nocopyright,hyphenate,balance,lang-second=french,lang=english]{asmejour}
+\documentclass[largesc,upint,varvw,barcolor=Goldenrod3,nocopyright,hyphenate,balance,lang-second=french,lang=english,pdf-a]{asmejour}
 
 %%%%%  FIELDS TO BE COMPLETED FOLLOW  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -396,6 +399,12 @@ The footers are all generated with the \texttt{fancyhdr} package~\cite{oostrum},
 
 \subsection{Vertical Space on Title Page} The space between the author/title/abstract block and the main text defaults to 12.5~mm. Infrequently, a different value may be desirable.  The space can be changed using \verb|\AbstractSep{..}|, where the argument is a \LaTeX\ dimension with units (e.g., 5mm).
 
+\subsection{Archivability:~PDF/A} Compliance with PDF/A standards can be enabled using the option \texttt{[pdf-a]} 
+when running with \hologo{pdfLaTeX}. The 
+default setting is for PDF/A-3u with sRGB OutputIntent (\texttt{sRGB.icc}). If levels 1b, 2b, 2u, or 3b are preferred, use the
+options \texttt{[pdfapart=1 or 2 or 3]} and  \texttt{[pdfaconformance=b or u]}. Note that accessible 
+conformance~(\texttt{a}) is not currently possible with \LaTeX.
+
 
 %%%%%%%%%%%%%%%%%%%  begin linewidth table  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/macros/latex/contrib/asmejour/asmejour.bst b/macros/latex/contrib/asmejour/asmejour.bst
index c590f0be90..9e28479bec 100644
--- a/macros/latex/contrib/asmejour/asmejour.bst
+++ b/macros/latex/contrib/asmejour/asmejour.bst
@@ -1,32 +1,10 @@
-%%
-%% This is file `asmejour.bst', initially generated with the docstrip utility and extensively customized.
-%%
-%% *** This bibtex style follows ASME journals ***
-%%
- % The original source files for docstrip were:
- %
- % merlin.mbs  (with options: `seq-no,nm-rev,jnrlst,dt-beg,xmth,tit-qq,atit-u,thtit-a,vol-bf,volp-com,jwdpg,pp-last,num-xser,numser,ser-vol,ser-ed,pre-edn,doi,edby,edbyy,blk-com,in-x,pp,ed,abr,ednx,ord,jabr,revdata,eprint,url,url-blk,eprint,url,url-nt,em-it,nfss,')
- % ----------------------------------------
- % 
- % Copyright 1994-2011 Patrick W Daly
- % ===============================================================
- % IMPORTANT NOTICE:
- % This bibliographic style (bst) file has been generated from one or
- % more master bibliographic style (mbs) files, listed above.
- %
- % This generated file can be redistributed and/or modified under the terms
- % of the LaTeX Project Public License Distributed from CTAN
- % archives in directory macros/latex/base/lppl.txt; either
- % version 1 of the License, or any later version.
- % ===============================================================
- % Name and version information of the main mbs file:
- % \ProvidesFile{merlin.mbs}[2011/11/18 4.33 (PWD, AO, DPC)]
- %   For use with BibTeX version 0.99a or later
- %
- % ===============================================================
- %-------------------------------------------------------------------
  %%
- %% This file is asmejour.bst, version 1.03 dated 2020/04/12.
+ %% This is file `asmejour.bst', initially generated with the docstrip utility and extensively customized.
+ %%
+ %% *** This bibtex style follows ASME journals ***
+ %%
+ %%
+ %% This file is asmejour.bst, version 1.04 dated 2020/04/15.
  %%
  %% This file was generated and edited by John Lienhard.
  %% This file is a derivative work under Clause 6 of the LPPL license.
@@ -86,6 +64,12 @@
  %%					provide format.alt.link to print the hyperlink if the report number is empty. 
  %%					provide institution.address function
  %%
+ %% Modifications in v1.04 ( )
+ %%					add hdl macro as a synonym for hndl
+ %%					separate format.serial.volume from format.bvolume; 
+ %%					arrange format.bvolume to order vol and series as ", Vol. X of Series Title", which affects
+ %%					@book, @inbook, @incollection, and @proceedings.
+ %%
  %%
  %%  Author: John H. Lienhard V
  %%          Department of Mechanical Engineering
@@ -114,6 +98,28 @@
  %%
  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  %%
+ % The original source files for docstrip were:
+ %
+ % merlin.mbs  (with options: `seq-no,nm-rev,jnrlst,dt-beg,xmth,tit-qq,atit-u,thtit-a,vol-bf,volp-com,jwdpg,pp-last,num-xser,numser,ser-vol,ser-ed,pre-edn,doi,edby,edbyy,blk-com,in-x,pp,ed,abr,ednx,ord,jabr,revdata,eprint,url,url-blk,eprint,url,url-nt,em-it,nfss,')
+ % ----------------------------------------
+ % 
+ % Copyright 1994-2011 Patrick W Daly
+ % ===============================================================
+ % IMPORTANT NOTICE:
+ % This bibliographic style (bst) file has been generated from one or
+ % more master bibliographic style (mbs) files, listed above.
+ %
+ % This generated file can be redistributed and/or modified under the terms
+ % of the LaTeX Project Public License Distributed from CTAN
+ % archives in directory macros/latex/base/lppl.txt; either
+ % version 1 of the License, or any later version.
+ % ===============================================================
+ % Name and version information of the main mbs file:
+ % \ProvidesFile{merlin.mbs}[2011/11/18 4.33 (PWD, AO, DPC)]
+ %   For use with BibTeX version 0.99a or later
+ %
+ % ===============================================================
+ %-------------------------------------------------------------------
  %-------------------------------------------------------------------
  % This bibliography style file is intended for texts in ENGLISH
  % This is a numerical citation style, and as such is standard LaTeX.
@@ -483,6 +489,7 @@ MACRO {arxiv} {"https://arxiv.org/abs/"}
 
 MACRO {googlebooks} {"http://books.google.com/books?id="}
 
+MACRO {hdl} {"http://hdl.handle.net/"}
 MACRO {hndl} {"http://hdl.handle.net/"}
 
 MACRO {jstor} {"http://www.jstor.org/stable/"}
@@ -961,17 +968,29 @@ FUNCTION {either.or.check}
 FUNCTION {format.bvolume}
 { volume empty$
     { "" }
+    { bbl.volume volume tie.or.space.prefix "volume" bibinfo.check * *
+      series "series" bibinfo.check
+      duplicate$ empty$ 'pop$
+        { swap$ bbl.of space.word * swap$
+          * }
+      if$
+      "volume and number" number either.or.check
+    }
+  if$
+}
+FUNCTION {format.pvolume}
+{ volume empty$
+    { "" }
     { bbl.volume volume tie.or.space.prefix
       "volume" bibinfo.check * *
       series "series" bibinfo.check
       duplicate$ empty$ 'pop$
         { ", " * swap$ *}
       if$
-      "volume and number" number either.or.check
     }
   if$
 }
-FUNCTION {format.pvolume}
+FUNCTION {format.serial.volume}
 { volume empty$
     { "" }
     { bbl.volume volume tie.or.space.prefix
@@ -980,6 +999,7 @@ FUNCTION {format.pvolume}
       duplicate$ empty$ 'pop$
         { ", " * swap$ *}
       if$
+      "volume and number" number either.or.check
     }
   if$
 }
@@ -1245,7 +1265,7 @@ FUNCTION {format.in.ed.proctitle}
 FUNCTION {format.in.ed.serialtitle}
 { format.doi.booktitle duplicate$ empty$ 'skip$
     {
-      format.bvolume duplicate$ empty$ 'pop$
+      format.serial.volume duplicate$ empty$ 'pop$
         { " (" swap$ * * ")" *}                    
       if$
       format.edition duplicate$ empty$ 'pop$
diff --git a/macros/latex/contrib/asmejour/asmejour.cls b/macros/latex/contrib/asmejour/asmejour.cls
index 2f2ff1f999..4aec9de24f 100644
--- a/macros/latex/contrib/asmejour/asmejour.cls
+++ b/macros/latex/contrib/asmejour/asmejour.cls
@@ -6,9 +6,9 @@
 %%  The asmejour.cls file should be used with the files asmejour.bst (for citations) and asmejour-template.tex.
 %%
 %%
-%%  This file is version 1.12 dated 2020/04/12.
-		\def\versionno{1.12}
-		\def\versiondate{2020/04/12\space}
+%%  This file is version 1.13 dated 2020/08/10.
+		\def\versionno{1.13}
+		\def\versiondate{2020/08/10\space}
 %%
 %%  Author: John H. Lienhard V
 %%          Department of Mechanical Engineering
@@ -61,6 +61,7 @@
 %%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \RequirePackage{ifthen}
+\RequirePackage{iftex} % check whether pdftex or another engine is used
 
 \newboolean{DefaultSups}
 \setboolean{DefaultSups}{true}
@@ -74,11 +75,19 @@
 \newboolean{lists}
 \setboolean{lists}{true}
 
+\newboolean{setpdfa}
+\setboolean{setpdfa}{false}
+\newboolean{pdfaone}
+\setboolean{pdfaone}{false}
+
+
 \RequirePackage{kvoptions}
 %\RequirePackage{kvsetkeys} %<== this package is called by kvoptions
 \SetupKeyvalOptions{
   family=asmejour,
   prefix=asmejour@,
+  family=pdfaopt,
+  prefix=pdafopt@,
   setkeys=\kvsetkeys,
 }
 
@@ -128,7 +137,31 @@
       \setboolean{lists}{#1}
 }
 
-\ProcessKeyvalOptions*
+\ProcessKeyvalOptions{asmejour}
+
+
+
+\ifpdftex %% PDF/A compliance has only been configured for pdflatex
+%
+%%% set key [pdfa] to activate pdf/a compliance (default is pdf/A-3u)
+	\define@key{pdfaopt}{pdf-a}[true]{%
+      \setboolean{setpdfa}{#1}%
+      \PassOptionsToPackage{pdfa,pdfapart=3,pdfaconformance=u}{hyperref}%
+}
+%%% to select part 1, 2 or 3 
+	\define@key{pdfaopt}{pdfapart}[3]{%
+      \PassOptionsToPackage{pdfapart=#1}{hyperref}%
+	  \ifthenelse{\equal{#1}{1}}{\setboolean{pdfaone}{true}}{\relax}%
+}
+%% to select conformance b or u.  NB: a is not possible with pdfLaTeX, and u is not possible with 1.
+	\define@key{pdfaopt}{pdfaconformance}[u]{%
+      \PassOptionsToPackage{pdfaconformance=#1}{hyperref}%
+}
+	\ProcessKeyvalOptions{pdfaopt}
+\else
+	\ClassWarningNoLine{asmejour}{PDF/A compliance option requires pdfLaTeX engine}%
+\fi
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -171,6 +204,10 @@
 	\ClassWarningNoLine{asmejour}{Allowing hyphenation of typewriter font}%
 }
 
+%%% Option to activate pdf/a-3u compliance [pdfa] (requires hyperxmp package)
+%\ifthenelse{\boolean{setpdfa}}{%
+%	\PassOptionsToPackage{pdfa,pdfapart=3,pdfaconformance=u}{hyperref}}{\relax}%
+
 %% Suppress warnings about mathalfa keys as unused global options
 \DeclareOption*{}
 
@@ -212,9 +249,11 @@
 
 \RequirePackage[T1]{fontenc}
 
-\RequirePackage{iftex} % check whether pdftex or another engine is used
 \ifpdftex
-  \pdfminorversion=7 % This selection is not required.
+	\ifthenelse{\boolean{pdfaone}}{
+		\pdfminorversion=4}{% for pdf/a-1 need version 4, not 7
+  		\pdfminorversion=7  % this selection is not really required.
+	}
   \RequirePackage[utf8]{inputenc} % for backward compatibility with pre-2018 distributions
 \else
   \relax
@@ -223,7 +262,7 @@
 \RequirePackage{mathtools} % extends amsmath
 \RequirePackage[]{babel}
 \RequirePackage[]{newtxtext} 
-\RequirePackage[]{inconsolata} % sans typewriter font % removed varl, varqu 2020/04/08 for unicode compatibility
+\RequirePackage[varl,varqu]{inconsolata} % sans typewriter font; restored varl, varqu 2020/08/10 
 \RequirePackage[]{newtxmath}
 
 %% override \textsu if using default superiors
@@ -476,8 +515,32 @@
 \setlist[enumerate,1]{label = (\arabic*), ref = (\arabic*),labelindent=3mm, leftmargin=*,noitemsep}
 %% I have no examples of sublists...
 
+
 %%%%%%%%%%%%%%%%%  Hyperref  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+\ifthenelse{\boolean{setpdfa}}{%
+%
+	%%% to assist with unicode glyph mapping, following M. Sharpe's recommendation in newtx documentation.
+	\pdfgentounicode=1  							%% enable CMaps
+	\input glyphtounicode.tex 						%% lists of mappings
+	\InputIfFileExists{glyphtounicode-cmr.tex}{}{} 	%% additional mappings
+	\InputIfFileExists{glyphtounicode-ntx.tex}{}{} 	%% additional mappings
+%
+%%% a fairly generic RGB color profile, aimed at on-screen rendering (not print production)
+\immediate\pdfobj stream attr{/N 3} file{sRGB.icc}
+\pdfcatalog{%
+  /OutputIntents [
+    <<
+      /Type /OutputIntent
+      /S /GTS_PDFA1
+      /DestOutputProfile \the\pdflastobj\space 0 R
+      /OutputConditionIdentifier (sRGB)
+      /Info (sRGB)
+    >>
+  ]
+}%
+}{\relax}
+
 \RequirePackage{hyperxmp} %% to fix transfer of metadata to Acrobat pdf 
 
 \RequirePackage[%