cmpj (18jul19)

git-svn-id: svn://tug.org/texlive/trunk@51661 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 99 insertions, 61 deletions

diff --git a/Master/texmf-dist/doc/latex/cmpj/README b/Master/texmf-dist/doc/latex/cmpj/README
index ec739421948..7dcb2effaf7 100644
--- a/Master/texmf-dist/doc/latex/cmpj/README
+++ b/Master/texmf-dist/doc/latex/cmpj/README
@@ -85,6 +85,10 @@ the LaTeX Project Public License (lppl).
 
 CHANGES
 
+RELEASE NOTES FOR VERSION 3.02:
+
+* cmpj3.sty and cmpj2.sty use new 'droid' font families names.
+
 RELEASE NOTES FOR VERSION 3.01:
 
 * New cmpj3.sty using 'newtx' fonts for text and math and 
diff --git a/Master/texmf-dist/doc/latex/cmpj/cmpjxampl.bib b/Master/texmf-dist/doc/latex/cmpj/cmpjxampl.bib
index 766b1fa988b..87d533779e9 100644
--- a/Master/texmf-dist/doc/latex/cmpj/cmpjxampl.bib
+++ b/Master/texmf-dist/doc/latex/cmpj/cmpjxampl.bib
@@ -34,7 +34,7 @@ numpages =     {489},
 	abstract="We propose a microscopic approach for investigating the behavior of a symmetric binary fluid mixture in the vicinity of the vapor-liquid critical point. The problem can be reduced to calculating the partition function of a 3D Ising model in an external field. For a square-well symmetric binary mixture, we express the parameters of the critical point as functions of the microscopic parameter r measuring the relative strength of interactions between the particles of dissimilar and similar species. The calculations are performed at intermediate ($\lambda$=1.5) and moderately long ($\lambda$=2) intermolecular potential ranges. The obtained results agree well with the results of computer simulations.",
 	issn="1573-9333",
 	doi="10.1007/BF02551084",
-	OPTurl="http://dx.doi.org/10.1007/BF02551084",
+	OPTurl="https://doi.org/10.1007/BF02551084",
    note = {[Teor. Mat. Fiz., 2000, \textbf{124}, No.~2, 339--352 (in Russian), \bibdoi{10.4213/tmf643}]},
 }
 
@@ -86,7 +86,7 @@ doi = {10.5488/CMP.14.13004},
 	abstract="A desirable goal of scientific management is to introduce, if it exists, a simple and reliable way to measure the scientific excellence of publicly funded research institutions and universities to serve as a basis for their ranking and financing. While citation-based indicators and metrics are easily accessible, they are far from being universally accepted as way to automate or inform evaluation processes or to replace evaluations based on peer review. Here we consider absolute measurements of research excellence at an amalgamated, institutional level and specific measures of research excellence as performance per head. Using biology research institutions in the UK as a test case, we examine the correlations between peer review-based and citation-based measures of research excellence on these two scales. We find that citation-based indicators are very highly correlated with peer-evaluated measures of group strength, but are poorly correlated with group quality. Thus, and almost paradoxically, our analysis indicates that citation counts could possibly form a basis for deciding on, how to fund research institutions, but they should not be used as a basis for ranking them in terms of quality.",
 	issn="1588-2861",
 	doi="10.1007/s11192-012-0874-7",
-	OPTurl="http://dx.doi.org/10.1007/s11192-012-0874-7",
+	OPTurl="https://doi.org/10.1007/s11192-012-0874-7",
 	note="(in press)",
 }
 
@@ -142,7 +142,7 @@ pages = {355-434},
 	OPTyear = {year},
 	OPTnote = {note},
 	OPTannote = {annote},
-	url={http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,50.75,62.14453125&products=baselayers.VIIRS_CityLights_2012~overlays.sedac_bound&switch=geographic},
+	url={https://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,50.75,62.14453125&products=baselayers.VIIRS_CityLights_2012~overlays.sedac_bound&switch=geographic},
 }
 
 @misc{han12,
diff --git a/Master/texmf-dist/doc/latex/cmpj/template.pdf b/Master/texmf-dist/doc/latex/cmpj/template.pdf
index c60ab3bbc2d..99d01ba9c54 100644
--- a/Master/texmf-dist/doc/latex/cmpj/template.pdf
+++ b/Master/texmf-dist/doc/latex/cmpj/template.pdf
diff --git a/Master/texmf-dist/doc/latex/cmpj/template.tex b/Master/texmf-dist/doc/latex/cmpj/template.tex
index fe40950a189..41eba09b43c 100644
--- a/Master/texmf-dist/doc/latex/cmpj/template.tex
+++ b/Master/texmf-dist/doc/latex/cmpj/template.tex
@@ -6,9 +6,9 @@
 %%%    in the Condensed Matter Physics journal <cmp@icmp.lviv.ua>        %%%
 %%%    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  %%%
 %%%                                                                      %%%
 %%%    This file can be redistributed and/or modified under the terms    %%%
@@ -106,7 +106,7 @@ abbreviations.
 %
 \keywords Up to six keywords (\href{https://physh.aps.org/browse}{Physics Subject Headings})
 %
-\pacs Up to six PACS numbers
+\pacs Up to six \href{https://journals.aps.org/PACS}{PACS} numbers
 \end{abstract}
 
 
@@ -149,7 +149,7 @@ preferably using the CMP journal style available at the journal Web page
 \\ [1ex]
 or from the Comprehensive \TeX\ Archive Network (CTAN)
 \nopagebreak\\ [1ex]
-\centerline{\texttt{\url{http://www.ctan.org/pkg/cmpj}}.}
+\centerline{\texttt{\url{https://www.ctan.org/pkg/cmpj}}.}
 
 \smallskip
 
@@ -224,7 +224,7 @@ article to a reader. PACS numbers (up to six classification codes)
 Please use the full classification system which
 is available online at
 \\ [1ex]
-\centerline{\texttt{\url{http://journals.aps.org/PACS/}}}
+\centerline{\texttt{\url{https://journals.aps.org/PACS}}}
 \\ [1ex]
 There should be no more than six numbers, the principal number
 should be placed first, and the check characters should always be
@@ -649,8 +649,8 @@ Year of publication, \textbf{Vol.}, starting page (comments:
 e.g. in Ukrainian, unpublished, private communication, in press) \cite{Bus89,Mel00,Mry94,Sta11}.
 For journals without volume numbers place the issue number instead as in reference~\cite{Mry94}.
 The names of all authors of cited papers should be given.
-Title of journal should be abbreviated according to the ISO~4 ``\href{http://www.issn.org/services/online-services/access-to-the-ltwa/}{List of Title Word Abbreviations}'' standard (see, \texttt{\url{http://woodward.library.ubc.ca/research-help/journal-abbreviations/}} or \texttt{\url{http://cassi.cas.org/search.jsp}} for the ready for use lists of journal titles). 
-Please supply \href{http://www.crossref.org/guestquery/}{DOI} for 
+Title of journal should be abbreviated according to the ISO~4 ``\href{https://www.issn.org/services/online-services/access-to-the-ltwa/}{List of Title Word Abbreviations}'' standard (see, \texttt{\url{https://woodward.library.ubc.ca/research-help/journal-abbreviations/}} or \texttt{\url{https://cassi.cas.org/search.jsp}} for the ready for use lists of journal titles). 
+Please supply \href{https://www.crossref.org/guestquery/}{DOI} for 
 e-version of the papers if available \cite{Bus89,Mel00,Mry94,Sta11,Scient2012}.
 
 For books, the following order is required (skip irrelevant information):
@@ -664,14 +664,14 @@ Please add language of publication for materials which are not written
 in English \cite{Mel00,Sta04,Yuk87}. Indicate materials accepted for 
 publications by adding ``(in press)'' \cite{Scient2012}. If a preprint 
 exists of the paper not yet accepted for publication, give the e-print 
-\href{http://arxiv.org}{arXiv} number \cite{Shv04}. 
+\href{https://arxiv.org}{arXiv} number \cite{Shv04}. 
 Any web resources should be cited as references \cite{url2}. 
 Please avoid references to unpublished materials, private communication 
 and web pages \cite{han12,url2}.
 
 It is important to confirm the accuracy of bibliographic information 
 in references. This has become more important now that the journal 
-is online. To ensure that the \href{http://www.crossref.org/}{CrossRef} 
+is online. To ensure that the \href{https://www.crossref.org/}{CrossRef} 
 facility can hyper-link to the articles quoted in the bibliography, 
 \textbf{multiple references must not be used}. I.e., a list of 
 references under the same number is not allowed: each reference has 
@@ -691,7 +691,7 @@ A typical numerical reference list might be
    \textbf{39}, 207--214, \doi{10.1103/PhysRevB.39.207}.
 \bibitem{Mel00} Melnyk R.S., Patsahan O.V., Theor. Math. Phys., 2000, \textbf{124}, No.~2, 
    1145--1156, \doi{10.1007/BF02551084}, [Teor. Mat. Fiz., 2000, \textbf{124}, No.~2, 
-   339--352 (in Russian), \bibdoi{10.4213/tmf643}].
+   339--352 (in Russian), \doi{10.4213/tmf643}].
 \bibitem{Mry94} Mryglod I.M., Tokarchuk M.V., Condens. Matter Phys., 1994, \textbf{3}, 
    116--133, \doi{10.5488/CMP.3.116}.
 \bibitem{Sta11} Stasyuk I.V., Velychko O.V., Condens. Matter Phys., 2011, \textbf{14}, 
@@ -713,7 +713,7 @@ A typical numerical reference list might be
 \bibitem{Shv04} Shvaika A.M., Vorobyov O., Freericks J.K., Devereaux T.P.,Preprint
    \arxiv{cond-mat/0408400}, 2004.
 \bibitem{url2} {EOSDIS} {W}orldview. {C}ity {L}ights,
-   URL~\url{http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,50.75,62.14453125&products=baselayers.VIIRS_CityLights_2012~overlays.sedac_bound&switch=geographic}.
+   URL~\url{https://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,50.75,62.14453125&products=baselayers.VIIRS_CityLights_2012~overlays.sedac_bound&switch=geographic}.
 \bibitem{han12} Han Y., Kida T., Ikeda M., Hagiwara M., Stre\v{c}ka J., Honda Z., 
    (unpublished).
 \end{thebibliography}
@@ -742,20 +742,20 @@ brilliant tool becomes useless without necessary level of knowledge.
 A lot of useful (and free) information one can find at 
 ``\TeX{} Users Group'' web site
 \\ [1ex]
-\centerline{\texttt{\url{http://www.tug.org/}}.}
+\centerline{\texttt{\url{https://www.tug.org/}}.}
 
 \smallskip
 
 ``The Not So Short Introduction to \LaTeXe{}'' by Tobias Oetiker is an
 absolutely necessary book for beginners:
 \\ [1ex]
-\centerline{\texttt{\url{http://ctan.org/tex-archive/info/lshort/}}}
+\centerline{\texttt{\url{https://ctan.org/pkg/lshort}}}
 \\ [1ex]
 (available in a variety of languages including Ukrainian). Ukrainian 
 \TeX{}nicians will find a plenty of language-specific information 
 at Andrij Shvaika's ``\TeX{} \& Ukrainian'' Web-page
 \\ [1ex]
-\centerline{\texttt{\url{http://ph.icmp.lviv.ua/~ashv/tex/TeXandUkrainian.win.html}}.}
+\centerline{\texttt{\url{http://ph.icmp.lviv.ua/~ashv/tex/TeXandUkrainian.html}}.}
 
 \smallskip
 
@@ -771,15 +771,15 @@ little knowledge how to write a good looking article. As
 comprehensive (and free) tutorials on the subject one can mention
 %``IOP Style Guide''
 %\\ [1ex]
-%\centerline{\texttt{\url{http://www.iop.org/websupport/file_53266.pdf}},}
+%\centerline{\texttt{\url{https://www.iop.org/websupport/file_53266.pdf}},}
 %\\ [1ex]
 ``Physical Review Style and Notation Guide''
 \\ [1ex]
-\centerline{\texttt{\url{http://publish.aps.org/files/styleguide-pr.pdf}},}
+\centerline{\texttt{\url{https://publish.aps.org/files/styleguide-pr.pdf}},}
 \\ [1ex]
 and ``Reviews of Modern Physics Style Guide''
 \\ [1ex]
-\centerline{\texttt{\url{http://rmp.aps.org/files/rmpguide.pdf}}}
+\centerline{\texttt{\url{https://rmp.aps.org/files/rmpguide.pdf}}}
 \\ [1ex]
 Remember: ``\textit{Ignorantia non est argumentum}'' and
 ``\textit{Scientia potentia est}''!
@@ -798,7 +798,7 @@ Remember: ``\textit{Ignorantia non est argumentum}'' and
         207--214, \doi{10.1103/PhysRevB.39.207}.
 \bibitem{Mel00} Melnyk R.S., Patsahan O.V., Theor. Math. Phys., 2000, \textbf{124}, No.~2, 
         1145--1156, \doi{10.1007/BF02551084}, [Teor. Mat. Fiz., 2000, \textbf{124}, No.~2, 
-        339--352 (in Russian), \bibdoi{10.4213/tmf643}].
+        339--352 (in Russian), \doi{10.4213/tmf643}].
 \bibitem{Mry94} Mryglod I.M., Tokarchuk M.V., Condens. Matter Phys., 1994, \textbf{3}, 
         116--133, \doi{10.5488/CMP.3.116}.
 \bibitem{Sta11} Stasyuk I.V., Velychko O.V., Condens. Matter Phys., 2011, \textbf{14}, 
@@ -820,7 +820,7 @@ Remember: ``\textit{Ignorantia non est argumentum}'' and
 \bibitem{Shv04} Shvaika A.M., Vorobyov O., Freericks J.K., Devereaux T.P., Preprint
         \arxiv{cond-mat/0408400}, 2004.
 \bibitem{url2} {EOSDIS} {W}orldview. {C}ity {L}ights,
-        URL~\url{http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,50.75,62.14453125&products=baselayers.VIIRS_CityLights_2012~overlays.sedac_bound&switch=geographic}.
+        URL~\url{https://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,50.75,62.14453125&products=baselayers.VIIRS_CityLights_2012~overlays.sedac_bound&switch=geographic}.
 \bibitem{han12} Han Y., Kida T., Ikeda M., Hagiwara M., Stre\v{c}ka J., Honda Z., (unpublished).
 \end{thebibliography}
 
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}}
 
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index a8fa9231386..097dbefad61 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -476,6 +476,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'fitr',        "die 'skipping, per author (dpstory) request'",
  'fixocgx',     "die 'skipping, replaced by ocgx2'",
  'fldigigal',   "die 'skipping, per author request'",
+ 'flowframtk',	"die 'skipping, requires install step'",
  'fltpage',     "die 'skipping, unclear license'",
  'fnlineno',    "die 'skipping, use lineno'",
  'foiltex',     "die 'skipping, nosell license'",
@@ -617,7 +618,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'jkthesis',    "die 'skipping, probably nonfree license, ca.2002'",
  'jmakepdfx',   "die 'skipping, non-self-locating java?'",
  'joy-of-tex',	"die 'skipping, nonfree'",
- 'jpgfdraw',    "die 'skipping, requires java'",
+ 'jpgfdraw',    "die 'skipping, replaced by flowframtk'",
  'jpicedt',	"die 'skipping, ancient program'",
  'junicode',    "&MAKEflatten",
  'kalendar',    "die 'skipping, noinfo license'",