From dcbd5c7d9a011c8fb1c9eb075e18534ffae61a5e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 18 Jul 2019 20:33:40 +0000 Subject: cmpj (18jul19) git-svn-id: svn://tug.org/texlive/trunk@51661 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/cmpj/cmpj2.sty | 52 +++++++++++++++++---------- Master/texmf-dist/tex/latex/cmpj/cmpj3.sty | 57 +++++++++++++++++++----------- 2 files changed, 71 insertions(+), 38 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/cmpj/cmpj2.sty b/Master/texmf-dist/tex/latex/cmpj/cmpj2.sty index ccbd9cede8b..94531994264 100644 --- a/Master/texmf-dist/tex/latex/cmpj/cmpj2.sty +++ b/Master/texmf-dist/tex/latex/cmpj/cmpj2.sty @@ -7,9 +7,9 @@ %%% http://www.icmp.lviv.ua/journal/ %%% %%% using LaTeX2e %%% %%% %%% -%%% Last time modified: May 8, 2017 %%% +%%% Last time modified: July 17, 2019 %%% %%% %%% -%%% Copyright (C) 2013 by the Institute for Condensed Matter Physics %%% +%%% Copyright (C) 2019 by the Institute for Condensed Matter Physics %%% %%% of the National Academy of Sciences of Ukraine %%% %%% all rights reserved. %%% %%% %%% @@ -22,11 +22,11 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{cmpj2} - [2017/05/08 v2.07 + [2019/07/17 v2.08 The Condensed Matter Physics journal package] \def\filename{cmpj2.sty} -\def\fileversion{2.07} -\def\filedate{2017/05/08} +\def\fileversion{2.08} +\def\filedate{2019/07/17} \immediate\write32{This is '\filename' v\fileversion \space <\filedate> ^^J% the Condensed Matter Physics journal package} @@ -83,9 +83,9 @@ \edef\_{_}% \edef\textless{\@percentchar3C}% instead of {\string<} for Apple \edef\textgreater{\@percentchar3E}% instead of {\sting>} for Apple - \edef\x{\toks1={\noexpand\href{\doiURL#1}}}% + \edef\x{\toks2={\noexpand\href{\doiURL#1}}}% \x - \edef\x{\endgroup\doitext\the\toks1 \the\toks0}% + \edef\x{\endgroup\doitext\the\toks2 \the\toks0}% \x } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -317,18 +317,34 @@ } \def\cmpj@sf@droid{ - \IfFileExists{t2afds.fd}{ - \IfFileExists{omltxmi.fd}{\RequirePackage{txfonts}}{} - \IfFileExists{fmlfutm.fd}{\RequirePackage{fourier}}{} - \IfFileExists{omltxmi.fd}{\re@DeclareMathSymbol{\varkappa}{\mathord}{AMSb}{123}}{} - \RequirePackage[default,scale=0.86]{droidserif} - \RequirePackage[defaultsans,scale=0.86]{droidsans} - \RequirePackage[defaultmono,scale=0.86]{droidmono} - \def\lat@sf{fds} - \def\cyr@sf{fds} - }{\cmpj@sf@helvet} + \IfFileExists{t2afds.fd}{ + \IfFileExists{omltxmi.fd}{\RequirePackage{txfonts}}{} + \IfFileExists{fmlfutm.fd}{\RequirePackage{fourier}}{} + \IfFileExists{omltxmi.fd}{\re@DeclareMathSymbol{\varkappa}{\mathord}{AMSb}{123}}{} + \RequirePackage[default,scale=0.86]{droidserif} + \RequirePackage[defaultsans,scale=0.86]{droidsans} + \RequirePackage[defaultmono,scale=0.86]{droidmono} + \def\lat@sf{fds} + \def\cyr@sf{fds} +% \newcommand\hmmax{0} % default 3 +% \newcommand\bmmax{0} % default 4 + }{ + \IfFileExists{T2Adroidsans.fd}{ + \IfFileExists{omltxmi.fd}{\RequirePackage{txfonts}}{} + \IfFileExists{fmlfutm.fd}{\RequirePackage{fourier}}{} + \IfFileExists{omltxmi.fd}{\re@DeclareMathSymbol{\varkappa}{\mathord}{AMSb}{123}}{} + \RequirePackage[default,scale=0.86]{droidserif} + \RequirePackage[defaultsans,scale=0.86]{droidsans} + \RequirePackage[defaultmono,scale=0.86]{droidsansmono} + \def\lat@sf{droidsans} + \def\cyr@sf{droidsans} +% \newcommand\hmmax{0} % default 3 +% \newcommand\bmmax{0} % default 4 + }{\cmpj@sf@helvet} + } } + \DeclareOption{droid}{\let\cmpj@sf\cmpj@sf@droid} \DeclareOption{helvet}{\let\cmpj@sf\cmpj@sf@helvet} @@ -438,7 +454,7 @@ \def\doinumber#1{\def\doi@number{#1}} %\def\bibdoi#1{\href{\doiURL#1}{\doitext#1}} \def\bibdoi{\doi} -\def\arxiv#1{\href{http://arxiv.org/abs/#1}{arXiv:#1}} +\def\arxiv#1{\href{https://arxiv.org/abs/#1}{arXiv:#1}} \def\archive[#1]#2{Preprint #1:#2} \def\eprint{\@ifnextchar[\archive{Preprint \arxiv}} diff --git a/Master/texmf-dist/tex/latex/cmpj/cmpj3.sty b/Master/texmf-dist/tex/latex/cmpj/cmpj3.sty index 9427633d1f3..551f1e0f6f4 100644 --- a/Master/texmf-dist/tex/latex/cmpj/cmpj3.sty +++ b/Master/texmf-dist/tex/latex/cmpj/cmpj3.sty @@ -7,9 +7,9 @@ %%% http://www.icmp.lviv.ua/journal/ %%% %%% using LaTeX2e %%% %%% %%% -%%% Last time modified: May 8, 2017 %%% +%%% Last time modified: July 17, 2019 %%% %%% %%% -%%% Copyright (C) 2017 by the Institute for Condensed Matter Physics %%% +%%% Copyright (C) 2019 by the Institute for Condensed Matter Physics %%% %%% of the National Academy of Sciences of Ukraine %%% %%% all rights reserved. %%% %%% %%% @@ -22,11 +22,11 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{cmpj3} - [2017/05/08 v3.01 + [2019/07/17 v3.02 The Condensed Matter Physics journal package] \def\filename{cmpj3.sty} -\def\fileversion{3.01} -\def\filedate{2017/05/08} +\def\fileversion{3.02} +\def\filedate{2019/07/17} \immediate\write32{This is '\filename' v\fileversion \space <\filedate> ^^J% the Condensed Matter Physics journal package} @@ -84,9 +84,9 @@ \edef\_{_}% \edef\textless{\@percentchar3C}% instead of {\string<} for Apple \edef\textgreater{\@percentchar3E}% instead of {\sting>} for Apple - \edef\x{\toks1={\noexpand\href{\doiURL#1}}}% + \edef\x{\toks2={\noexpand\href{\doiURL#1}}}% \x - \edef\x{\endgroup\doitext\the\toks1 \the\toks0}% + \edef\x{\endgroup\doitext\the\toks2 \the\toks0}% \x } %%%%%%% end doi.sty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -328,8 +328,8 @@ \def\cmpj@sf@droid{ \IfFileExists{t2afds.fd}{ - \RequirePackage{textcomp} - \RequirePackage{amsmath,amssymb} + \RequirePackage{textcomp} + \RequirePackage{amsmath,amssymb} \IfFileExists{omltxmi.fd}{\RequirePackage{txfonts}}{} \IfFileExists{fmlfutm.fd}{\RequirePackage{fourier}}{} \IfFileExists{omltxmi.fd}{\re@DeclareMathSymbol{\varkappa}{\mathord}{AMSb}{123}}{} @@ -338,22 +338,39 @@ \RequirePackage[defaultmono,scale=0.86]{droidmono} \def\lat@sf{fds} \def\cyr@sf{fds} - \def\cyr@rm{fdr} - }{\cmpj@sf@helvet} + \def\cyr@rm{fdr} +% \newcommand\hmmax{0} % default 3 +% \newcommand\bmmax{0} % default 4 + }{ + \IfFileExists{T2Adroidsans.fd}{ + \RequirePackage{textcomp} + \RequirePackage{amsmath,amssymb} + \IfFileExists{omltxmi.fd}{\RequirePackage{txfonts}}{} + \IfFileExists{fmlfutm.fd}{\RequirePackage{fourier}}{} + \IfFileExists{omltxmi.fd}{\re@DeclareMathSymbol{\varkappa}{\mathord}{AMSb}{123}}{} + \RequirePackage[default,scale=0.86]{droidserif} + \RequirePackage[defaultsans,scale=0.86]{droidsans} + \RequirePackage[defaultmono,scale=0.86]{droidsansmono} + \def\lat@sf{droidsans} + \def\cyr@sf{droidsans} + \def\cyr@rm{droidserif} +% \newcommand\hmmax{0} % default 3 +% \newcommand\bmmax{0} % default 4 + }{\cmpj@sf@helvet} + } } \def\cmpj@sf@newtx{ \IfFileExists{omlntxmi.fd}{ - \IfFileExists{t2afdr.fd}{\RequirePackage[default,scale=0.86]{droidserif}}{} + \IfFileExists{t2afdr.fd}{\RequirePackage[default,scale=0.86]{droidserif}\def\cyr@rm{fdr}}{} + \IfFileExists{T2Adroidserif.fd}{\RequirePackage[default,scale=0.86]{droidserif}\def\cyr@rm{droidserif}}{} \RequirePackage[largesc,scaled=1.03]{newtxtext} - \IfFileExists{t2afds.fd}{\RequirePackage[defaultsans,scale=0.86]{droidsans}}{} - \IfFileExists{t2afdm.fd}{\RequirePackage[defaultmono,scale=0.86]{droidmono}}{} + \IfFileExists{t2afds.fd}{\RequirePackage[defaultsans,scale=0.86]{droidsans}\def\lat@sf{fds}\def\cyr@sf{fds}}{} + \IfFileExists{T2Adroidsans.fd}{\RequirePackage[defaultsans,scale=0.86]{droidsans}\def\lat@sf{droidsans}\def\cyr@sf{droidsans}}{} + \IfFileExists{t2afdm.fd}{\RequirePackage[defaultmono,scale=0.86]{droidmono}\def\cyr@tt{fdm}}{} + \IfFileExists{T2Adroidsansmono.fd}{\RequirePackage[defaultmono,scale=0.86]{droidsansmono}\def\cyr@tt{droidsansmono}}{} \RequirePackage[upint,varg,scaled=1.03]{newtxmath} % \IfFileExists{omlntxmi.fd}{\RequirePackage[utopia,smallerops,vvarbb,timesmathacc]{newtxmath}}{} - \def\lat@sf{fds} - \def\cyr@sf{fds} - \def\cyr@rm{fdr} - \def\cyr@tt{fdm} }{\cmpj@sf@droid} } @@ -378,7 +395,7 @@ \def\cc@by@copyright{% % \def\@@copyright{\raisebox{-8pt}{\includegraphics[width=16mm]{cmpj-cc-by}\space}} \def\@@copyright{} - \authorcopyright{\raisebox{-2pt}{\includegraphics[width=16mm]{cmpj-cc-by-small}\space}\footnotesize\sf@phv This work is licensed under a \href{http://creativecommons.org/licenses/by/4.0/}{\textsl{Creative Commons Attribution 4.0 International License}}. Further distribution of this work must maintain attribution to the author(s) and the published article’s title, journal citation, and DOI.} + \authorcopyright{\raisebox{-2pt}{\includegraphics[width=16mm]{cmpj-cc-by-small}\space}\footnotesize\sf@phv This work is licensed under a \href{https://creativecommons.org/licenses/by/4.0/}{\textsl{Creative Commons Attribution 4.0 International License}}. Further distribution of this work must maintain attribution to the author(s) and the published article's title, journal citation, and DOI.} } \DeclareOption{nocopyright}{\let\print@copyright\no@copyright} @@ -484,7 +501,7 @@ \def\doinumber#1{\def\doi@number{#1}} %\def\bibdoi#1{\href{\doiURL#1}{\doitext#1}} \def\bibdoi{\doi} -\def\arxiv#1{\href{http://arxiv.org/abs/#1}{arXiv:#1}} +\def\arxiv#1{\href{https://arxiv.org/abs/#1}{arXiv:#1}} \def\archive[#1]#2{Preprint #1:#2} \def\eprint{\@ifnextchar[\archive{Preprint \arxiv}} -- cgit v1.2.3