From 2dfd6df5d1db270dc874c6c319d51eed43defb91 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 26 Feb 2020 03:01:01 +0000 Subject: CTAN sync 202002260301 --- macros/latex/contrib/els-cas-templates/README | 5 ++- .../latex/contrib/els-cas-templates/cas-common.sty | 50 +++++++++++++++------- .../contrib/els-cas-templates/cas-dc-template.tex | 2 +- macros/latex/contrib/els-cas-templates/cas-dc.cls | 6 +-- .../contrib/els-cas-templates/cas-model2-names.bst | 8 ++-- .../contrib/els-cas-templates/cas-sc-template.tex | 2 +- macros/latex/contrib/els-cas-templates/cas-sc.cls | 6 +-- .../contrib/els-cas-templates/doc/elsdoc-cas.tex | 4 +- .../latex/contrib/els-cas-templates/doc/makefile | 6 +-- .../latex/contrib/els-cas-templates/doc/rvdtx.sty | 2 +- .../latex/contrib/els-cas-templates/manifest.txt | 14 +++--- 11 files changed, 61 insertions(+), 44 deletions(-) (limited to 'macros/latex/contrib/els-cas-templates') diff --git a/macros/latex/contrib/els-cas-templates/README b/macros/latex/contrib/els-cas-templates/README index 71a1540b66..b097d0b412 100644 --- a/macros/latex/contrib/els-cas-templates/README +++ b/macros/latex/contrib/els-cas-templates/README @@ -16,8 +16,9 @@ elsarticle-cas bundle. The following are the main files available: - cas-dc-template.pdf, PDF of the cas-ddc-template.tex - cas-common.sty, additional macro package for formatting model2-names.bst, BibTeX style file -- twitter.jpeg, linkedin.jpeg, url.jpeg, gplus.jpeg, facebook.jpeg, - email.jpeg - thumbnail images of social networking sites +- cas-twitter.jpeg, cas-linkedin.jpeg, cas-url.jpeg, cas-gplus.jpeg, + cas-facebook.jpeg, cas-email.jpeg - thumbnail images of social + networking sites The documentation file is elsdoc-cas.tex in the doc directory. To compile it: diff --git a/macros/latex/contrib/els-cas-templates/cas-common.sty b/macros/latex/contrib/els-cas-templates/cas-common.sty index cbb226fd3f..7d74d5a76d 100644 --- a/macros/latex/contrib/els-cas-templates/cas-common.sty +++ b/macros/latex/contrib/els-cas-templates/cas-common.sty @@ -15,11 +15,11 @@ %% given in the file `manifest.txt'. %% -% $Id: cas-common.sty 12 2019-03-19 06:03:53Z rishi $ +% $Id: cas-common.sty 38 2020-02-25 09:10:36Z rishi $ \def\RCSfile{cas-common}% - \def\RCSversion{1.0}% - \def\RCSdate{2019/02/11}% + \def\RCSversion{1.2}% + \def\RCSdate{2020/02/24}% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ExplSyntaxOn @@ -32,6 +32,8 @@ % Usage of those macros and methods are gratefully acknowledged. % +\tl_set:Nn \l_stm_title_color_tl { black } + \keys_define:nn { stm / title } { mode .choice: , @@ -143,7 +145,7 @@ \l_stm_title_shape_tl \l_stm_title_weight_tl \color { \l_stm_title_color_tl } - #2 + \noindent \unskip \ignorespaces #2 \tl_set:Nn \l_tmpa_tl { title } \tl_if_eq:NNTF \l_stm_title_type_tl \l_tmpa_tl { \processTmarks } { } @@ -460,7 +462,7 @@ { \int_set:Nn \l_tmpa_int { 0 } \clist_map_inline:nn { #1 } { -% \msg_term:n { ##1 .. [\cs:w X@##1:\cs_end:] } +% \iow_term:n { ##1 .. [\cs:w X@##1:\cs_end:] } \cs_if_free:cTF { X@##1: } { \csdef{X@##1:}{0} } { @@ -482,7 +484,7 @@ { \tl_if_head_eq_catcode:nNTF { #1 } a { - \msg_term:n { [TNOTE:~alpha] }% +% \iow_term:n { [TNOTE:~alpha] }% \seq_gput_right:Nn \g_stm_tnote_seq { \int_incr:N \g_stm_tnote_int \str_set:Nx \@currentlabel { \int_use:N \g_stm_tnote_int } @@ -499,7 +501,7 @@ } } { - \msg_term:n { [TNOTE:~Number] } +% \iow_term:n { [TNOTE:~Number] } \seq_gput_right:Nn \g_stm_tnote_seq { \int_set:Nn \l_tmpa_int { #1 } @@ -540,7 +542,7 @@ { \tl_if_head_eq_catcode:nNTF { #1 } a { - \msg_term:n { [FN:~alpha] }% +% \iow_term:n { [FN:~alpha] }% \seq_gput_right:Nn \g_stm_fnote_seq { \int_incr:N \g_stm_fnote_int \str_set:Nx \@currentlabel { \int_use:N \g_stm_fnote_int } @@ -550,7 +552,7 @@ } } { - \msg_term:n { [FN:~Number] } +% \iow_term:n { [FN:~Number] } \seq_gput_right:Nn \g_stm_fnote_seq { \int_set:Nn \l_tmpa_int { #1 } @@ -569,7 +571,7 @@ { \tl_if_head_eq_catcode:nNTF { #1 } a { - \msg_term:n { [COR:~alpha] }% +% \iow_term:n { [COR:~alpha] }% \seq_gput_right:Nn \g_stm_cor_seq { \int_incr:N \g_stm_cor_int \str_set:Nx \@currentlabel { \int_use:N \g_stm_cor_int } @@ -586,7 +588,7 @@ } } { - \msg_term:n { [COR:~Number] } +% \iow_term:n { [COR:~Number] } \seq_gput_right:Nn \g_stm_cor_seq { \int_set:Nn \l_tmpa_int { #1 } @@ -896,13 +898,13 @@ \tl_if_empty:NF \l_stm_au_prefix { \l_stm_au_prefix_tl \c_space_token } \str_if_eq:VnTF \l_stm_au_style_tl { chinese } - { %\msg_term:n {STYLE~T=\l_stm_au_style_tl........} + { %\iow_term:n {STYLE~T=\l_stm_au_style_tl........} \invparsename { #2 } \textcolor{\l_stm_augroup_color_tl}{\surname} \no_break_space: \textcolor{\l_stm_augroup_color_tl !50}{\firstname} } - { %\msg_term:n {STYLE~F=\l_stm_au_style_tl........} + { %\iow_term:n {STYLE~F=\l_stm_au_style_tl........} \parsename { #2 } \textcolor{\l_stm_augroup_color_tl !50}{\firstname} \no_break_space: @@ -1215,7 +1217,7 @@ \seq_new:c {g_stm_aff\int_use:N \g_stm_augr_int _seq} \seq_new:c {g_stm_collab\int_use:N \g_stm_augr_int _seq} \seq_new:c {g_stm_clau\int_use:N \g_stm_augr_int _seq} - \msg_term:n { AUGR:~\int_use:N \g_stm_augr_int ... } +% \iow_term:n { AUGR:~\int_use:N \g_stm_augr_int ... } } { \seq_gput_right:Nn \g_stm_augr_seq @@ -1247,7 +1249,7 @@ \seq_use:cn { g_stm_aff\int_use:N \g_stm_aaugr_int _seq } { \par \smallskip } \par\vskip\l_stm_aff_after_dim - \msg_term:n { AAUGR:~\int_use:N \g_stm_aaugr_int ... } +% \iow_term:n { AAUGR:~\int_use:N \g_stm_aaugr_int ... } \group_end: % \group_begin: @@ -1862,6 +1864,15 @@ abovetbl .skip_set:N = \l_tbl_abovetbl_skip , belowtbl .skip_set:N = \l_tbl_belowtbl_skip , full .bool_gset:N = \g_tbl_full_bool , + unknown .code:n = { + \ifstrempty { #1 } + { + \tl_set:Nn \l_fig_pos_tl { \l_keys_key_tl } + } + { + \l_keys_key_tl=#1 + } + } } \cs_set:Npn \__reset_tbl: @@ -1938,6 +1949,15 @@ abovefig .skip_set:N = \l_fig_abovefig_skip , belowfig .skip_set:N = \l_fig_belowfig_skip , full .bool_gset:N = \g_fig_full_bool , + unknown .code:n = { + \ifstrempty { #1 } + { + \tl_set:Nn \l_fig_pos_tl { \l_keys_key_tl }, + } + { + \l_keys_key_tl=#1 + } + } } \cs_set:Npn \__reset_fig: diff --git a/macros/latex/contrib/els-cas-templates/cas-dc-template.tex b/macros/latex/contrib/els-cas-templates/cas-dc-template.tex index 7e9a446ff3..de0f8dceed 100644 --- a/macros/latex/contrib/els-cas-templates/cas-dc-template.tex +++ b/macros/latex/contrib/els-cas-templates/cas-dc-template.tex @@ -1,5 +1,5 @@ %% -%% Copyright 2019 Elsevier Ltd +%% Copyright 2019-2020 Elsevier Ltd %% %% This file is part of the 'CAS Bundle'. %% -------------------------------------- diff --git a/macros/latex/contrib/els-cas-templates/cas-dc.cls b/macros/latex/contrib/els-cas-templates/cas-dc.cls index 82352b5db6..719c0928be 100644 --- a/macros/latex/contrib/els-cas-templates/cas-dc.cls +++ b/macros/latex/contrib/els-cas-templates/cas-dc.cls @@ -15,11 +15,11 @@ %% given in the file `manifest.txt'. %% -%% $Id: cas-dc.cls 7 2019-02-13 12:02:17Z apu.v $ +%% $Id: cas-dc.cls 42 2020-02-25 09:50:39Z rishi $ \def\RCSfile{cas-dc}% - \def\RCSversion{1.0}% - \def\RCSdate{2019/02/11}% + \def\RCSversion{1.2}% + \def\RCSdate{2020/02/25}% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{\RCSfile}[\RCSdate, \RCSversion: Formatting class for CAS double column articles] diff --git a/macros/latex/contrib/els-cas-templates/cas-model2-names.bst b/macros/latex/contrib/els-cas-templates/cas-model2-names.bst index 95e0526096..420018de16 100644 --- a/macros/latex/contrib/els-cas-templates/cas-model2-names.bst +++ b/macros/latex/contrib/els-cas-templates/cas-model2-names.bst @@ -1,7 +1,7 @@ %% -%% This is file `model2-names.bst' (Version 2.0), +%% This is file `cas-model2-names.bst' (Version 2.0), %% -%% Copyright 2009-2013 Elsevier Ltd +%% Copyright 2009-2019 Elsevier Ltd %% %% This file is part of the 'Elsarticle Bundle'. %% --------------------------------------------- @@ -13,9 +13,9 @@ %% and version 1.2 or later is part of all distributions of LaTeX %% version 1999/12/01 or later. %% -%% $Id: model2-names.bst 217 2013-03-13 11:50:49Z rishi $ +%% $Id: cas-model2-names.bst 23 2019-04-05 10:17:39Z rishi $ %% -%% $URL: http://lenova.river-valley.com/svn/elsbst/trunk/New-Model-2/model2-names.bst $ +%% $URL: https://lenova.river-valley.com/svn/elscastemplates/trunk/cas-model2-names.bst $ %% ENTRY diff --git a/macros/latex/contrib/els-cas-templates/cas-sc-template.tex b/macros/latex/contrib/els-cas-templates/cas-sc-template.tex index 3e461592a8..15454c904c 100644 --- a/macros/latex/contrib/els-cas-templates/cas-sc-template.tex +++ b/macros/latex/contrib/els-cas-templates/cas-sc-template.tex @@ -1,5 +1,5 @@ %% -%% Copyright 2019 Elsevier Ltd +%% Copyright 2019-2020 Elsevier Ltd %% %% This file is part of the 'CAS Bundle'. %% -------------------------------------- diff --git a/macros/latex/contrib/els-cas-templates/cas-sc.cls b/macros/latex/contrib/els-cas-templates/cas-sc.cls index 3345e1c398..1cf68c20ed 100644 --- a/macros/latex/contrib/els-cas-templates/cas-sc.cls +++ b/macros/latex/contrib/els-cas-templates/cas-sc.cls @@ -15,11 +15,11 @@ %% given in the file `manifest.txt'. %% -%% $Id: cas-sc.cls 7 2019-02-13 12:02:17Z apu.v $ +%% $Id: cas-sc.cls 39 2020-02-25 09:13:49Z rishi $ \def\RCSfile{cas-sc}% - \def\RCSversion{1.0}% - \def\RCSdate{2018/09/22}% + \def\RCSversion{1.2}% + \def\RCSdate{2020/02/25}% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{\RCSfile}[\RCSdate, \RCSversion: Formatting class for CAS single column articles] diff --git a/macros/latex/contrib/els-cas-templates/doc/elsdoc-cas.tex b/macros/latex/contrib/els-cas-templates/doc/elsdoc-cas.tex index 3aeb8470ac..6195103d4f 100644 --- a/macros/latex/contrib/els-cas-templates/doc/elsdoc-cas.tex +++ b/macros/latex/contrib/els-cas-templates/doc/elsdoc-cas.tex @@ -1,5 +1,5 @@ %% -%% Copyright 2019 Elsevier Ltd +%% Copyright 2019-2020 Elsevier Ltd %% %% This file is part of the 'CAS Bundle'. %% --------------------------------------------- @@ -14,7 +14,7 @@ %% The list of all files belonging to the 'CAS Bundle' is %% given in the file `manifest.txt'. %% -%% $Id: elsdoc-cas.tex 4 2019-02-11 10:03:00Z rishi $ +%% $Id: elsdoc-cas.tex 35 2020-02-25 09:04:59Z rishi $ %% \documentclass[a4paper,12pt]{article} diff --git a/macros/latex/contrib/els-cas-templates/doc/makefile b/macros/latex/contrib/els-cas-templates/doc/makefile index 6a34191b71..0742fa1845 100644 --- a/macros/latex/contrib/els-cas-templates/doc/makefile +++ b/macros/latex/contrib/els-cas-templates/doc/makefile @@ -1,4 +1,4 @@ -# $Id: makefile 5 2019-02-11 10:03:21Z rishi $ +# $Id: makefile 37 2020-02-25 09:06:02Z rishi $ file=elsdoc-cas @@ -34,7 +34,3 @@ diff: copy: cp $(file).sty ../ - - - - diff --git a/macros/latex/contrib/els-cas-templates/doc/rvdtx.sty b/macros/latex/contrib/els-cas-templates/doc/rvdtx.sty index 3f16af7196..fa3de07930 100644 --- a/macros/latex/contrib/els-cas-templates/doc/rvdtx.sty +++ b/macros/latex/contrib/els-cas-templates/doc/rvdtx.sty @@ -4,7 +4,7 @@ % % Auxiliary package to format *.dtx documents. % -% Copyright (c) 2008-2019 CV Radhakrishnan , +% Copyright (c) 2008-2020 CV Radhakrishnan , % % This file may be distributed and/or modified under the conditions % of the LaTeX Project Public License, either version 1.2 of this diff --git a/macros/latex/contrib/els-cas-templates/manifest.txt b/macros/latex/contrib/els-cas-templates/manifest.txt index 8932a2f958..542099e0e6 100644 --- a/macros/latex/contrib/els-cas-templates/manifest.txt +++ b/macros/latex/contrib/els-cas-templates/manifest.txt @@ -1,4 +1,4 @@ -% Copyright 2019 Elsevier Ltd +% Copyright 2019-2020 Elsevier Ltd % % This file is part of the 'CAS Bundle'. % -------------------------------------- @@ -62,12 +62,12 @@ Directory thumbnails/ Contains thumbnail images which will be included in the typeset PDF. - email.jpeg - facebook.jpeg - gplus.jpeg - linkedin.jpeg - twitter.jpeg - url.jpeg + cas-email.jpeg + cas-facebook.jpeg + cas-gplus.jpeg + cas-linkedin.jpeg + cas-twitter.jpeg + cas-url.jpeg Directory figs/ -- cgit v1.2.3