CTAN sync 202003010301

8 files changed, 56 insertions, 110 deletions

diff --git a/macros/latex/contrib/icite/Makefile b/macros/latex/contrib/icite/Makefile
index 35bf3e4a63..e06046ec57 100644
--- a/macros/latex/contrib/icite/Makefile
+++ b/macros/latex/contrib/icite/Makefile
@@ -95,7 +95,7 @@ zip: all
 
 package: distclean all
 	mkdir $(NAME)/
-	cp Makefile README.md $(NAME).{dtx,ins,pdf} $(NAME)/
+	cp Makefile README.md $(NAME).{dtx,pdf} $(NAME)/
 	cp -r samples/ $(NAME)/
 	mkdir -p tex/latex/$(NAME)/
 	cp $(NAME).sty tex/latex/$(NAME)/
diff --git a/macros/latex/contrib/icite/README.md b/macros/latex/contrib/icite/README.md
index 05846e536a..a96df41d83 100644
--- a/macros/latex/contrib/icite/README.md
+++ b/macros/latex/contrib/icite/README.md
@@ -17,7 +17,7 @@ License and disclamer
 
 icite – Indices locorum citatorum
 
-Copyright ⓒ 2019 Robert Alessi
+Copyright ⓒ 2019--2020 Robert Alessi
 
 Please send error reports and suggestions for improvements to Robert
 Alessi:
@@ -46,14 +46,16 @@ This release of icite consists of the following source files:
 
 -   `icite.dtx`
 
--   `icite.ins`
+-   `icite.ins` (As this file can be generated from `icite.dtx`, it is
+    not included in CTAN repository, but it is included in the git
+    repository mentioned below for easier installation.)
 
 -   `Makefile`
 
 License applicable to the documentation
 ---------------------------------------
 
-Copyright ⓒ 2019 Robert Alessi
+Copyright ⓒ 2019--2020 Robert Alessi
 
 The documentation file `icite.pdf` that is generated from the
 `icite.dtx` source file is licensed under the Creative Commons
@@ -64,8 +66,11 @@ a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
 Installation
 ============
 
-1.  Run `'latex icite.ins'` to produce the `icite.sty`
-    file;
+1.  If `icite` was downloaded from CTAN, run `'lualatex --shell-escape
+    icite.dtx'` to produce the `icite.sty` file.
+
+    If `icite` was downloaded from the git repository mentioned above,
+    Run `'latex icite.ins'` to produce the `icite.sty` file.
 
 2.  To finish the installation you have to move the `icite.sty` file into
     a directory where LaTeX can find them. See the FAQ on `texfaq.org`
diff --git a/macros/latex/contrib/icite/icite.dtx b/macros/latex/contrib/icite/icite.dtx
index 1e61a15d9c..d89d01299d 100644
--- a/macros/latex/contrib/icite/icite.dtx
+++ b/macros/latex/contrib/icite/icite.dtx
@@ -23,7 +23,7 @@ License and disclamer
 
 icite – Indices locorum citatorum
 
-Copyright ⓒ 2019 Robert Alessi
+Copyright ⓒ 2019--2020 Robert Alessi
 
 Please send error reports and suggestions for improvements to Robert
 Alessi:
@@ -52,14 +52,16 @@ This release of icite consists of the following source files:
 
 -   `icite.dtx`
 
--   `icite.ins`
+-   `icite.ins` (As this file can be generated from `icite.dtx`, it is
+    not included in CTAN repository, but it is included in the git
+    repository mentioned below for easier installation.)
 
 -   `Makefile`
 
 License applicable to the documentation 
 ---------------------------------------
 
-Copyright ⓒ 2019 Robert Alessi
+Copyright ⓒ 2019--2020 Robert Alessi
 
 The documentation file `icite.pdf` that is generated from the
 `icite.dtx` source file is licensed under the Creative Commons
@@ -70,8 +72,11 @@ a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
 Installation 
 ============
 
-1.  Run `'latex icite.ins'` to produce the `icite.sty`
-    file;
+1.  If `icite` was downloaded from CTAN, run `'lualatex --shell-escape
+    icite.dtx'` to produce the `icite.sty` file.
+
+    If `icite` was downloaded from the git repository mentioned above,
+    Run `'latex icite.ins'` to produce the `icite.sty` file.
 
 2.  To finish the installation you have to move the `icite.sty` file into
     a directory where LaTeX can find them. See the FAQ on `texfaq.org`
@@ -131,7 +136,7 @@ be able to make whatever changes you like to.
 \askforoverwritefalse
 \preamble
 
-Copyright (C) 2019 by Robert Alessi <alessi@robertalessi.net>
+Copyright (C) 2019-2020 by Robert Alessi <alessi@robertalessi.net>
 
 Please send error reports and suggestions for improvements to Robert
 Alessi <alessi@robertalessi.net>
@@ -188,7 +193,7 @@ Running "make install" installs the files in the local TeX tree.
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{icite}
 %<*package>
-    [2019/03/17 v1.2 Make Indices locorum citatorum]
+    [2020/02/29 v1.3 Make Indices locorum citatorum]
 %</package>
 %<*driver>
 \documentclass{ltxdoc}
@@ -258,7 +263,7 @@ Running "make install" installs the files in the local TeX tree.
 }
 
 @Book{IAUMuller,
-  sortname =	 {Ibn abi Usaybia},
+  sortname =	 {{ibn abi usaybia}},
   editor =	 {Müller, August},
   author =	 {\prname{ibn 'abI 'u.saybi`aT}},
   shorteditor =	 {Müller},
@@ -289,7 +294,7 @@ Running "make install" installs the files in the local TeX tree.
   title =	 {\arb[trans]{\uc{k}itAb al-^sukUk `al_A
                   \uc{^g}AlInUs}},
   indextitle =	 {\arb[trans]{\uc{^s}ukUk}},
-  sortname =	 {Razi},
+  sortname =	 {razi},
   date =	 1993,
   shorthand =	 {\prname{al-rAziyy}, \arb[trans]{\uc{^s}ukUk}},
   editor =	 {Mehdi Mohaghegh},
@@ -310,7 +315,7 @@ Running "make install" installs the files in the local TeX tree.
 @MVBook{al-Nadim,
   author =	 {\prname{ibn al-nadIm}},
   title =	 {\arb[trans]{\uc{f}ihrist}},
-  sortname =	 {Ibn al-Nadim},
+  sortname =	 {{ibn al-nadim}},
   date =	 {1871/1872},
   shorthand =	 {\arb[trans]{\uc{f}ihrist}},
   editor =	 {Flügel, Gustav},
@@ -320,7 +325,7 @@ Running "make install" installs the files in the local TeX tree.
 }
 
 @Book{al-Qifti,
-  sortname =	 {Ibn al-Qifti},
+  sortname =	 {{ibn al-qifti}},
   entrysubtype = {classical},
   shorthand =	 {\prname{al-qif.tiyy}, \arb[trans]{\uc{t}a'rI_h}},
   location =	 {Leipzig},
@@ -340,25 +345,25 @@ Running "make install" installs the files in the local TeX tree.
   version =	 {1.0a}
 }
 \end{filecontents*}
+\usepackage{fontspec}
 \usepackage[english]{babel}
 \usepackage[letterpaper,margin=25mm,left=50mm,nohead]{geometry}
-\usepackage{fontspec}
-\setmainfont{Old Standard}[RawFeature={+ss05;+ss06}]
-\usepackage{newunicodechar}
-\newunicodechar{ǧ}{ǧ} % Old Standard does not include ǧ/Ǧ
-\newunicodechar{Ǧ}{Ǧ} %
+\babelfont{rm}{Old Standard}
+\babelfont{sf}{NewComputerModern Sans}
+\babelfont{tt}{NewComputerModern Mono}
 \usepackage{arabluatex}
 \SetTranslitConvention{loc}
 \usepackage{xurl}
 \usepackage{uri}
 \usepackage{hyperxmp}
 \usepackage{varioref}
+\usepackage{latexcolors}
 \usepackage[numbered]{hypdoc}
-\hypersetup{unicode=true, colorlinks, allcolors=blue,
+\hypersetup{unicode=true, colorlinks, allcolors=cinnamon,
   linktocpage=true, pdfauthor={Robert Alessi}, pdftitle={The
     icite package}, pdfcontactemail={alessi@robertalessi.net},
   pdfcontacturl={http://www.robertalessi.net/icite},
-  pdfcopyright={Copyright (C) 2019 Robert Alessi
+  pdfcopyright={Copyright (C) 2019--2020 Robert Alessi
     <alessi@robertalessi.net>. This document is licensed under the
     Creative Commons Attribution-ShareAlike 4.0 International
     License. To view a copy of this license, visit
@@ -408,7 +413,7 @@ Running "make install" installs the files in the local TeX tree.
 \newcommand{\package}[1]{\textsf{#1}\index{#1=#1 (package)}}
 \usepackage{tikz}
 \usepackage[breakable, skins, xparse, minted]{tcolorbox}
-\tcbset{colback=white, boxrule=.15mm, colframe=red!50!white,
+\tcbset{colback=white, boxrule=.15mm, colframe=cinnamon,
   breakable}
 \newtcblisting{example}{minted options={linenos, numbersep=0mm}}
 \newtcblisting{code}{minted options={linenos, numbersep=0mm}, listing
@@ -451,7 +456,7 @@ Running "make install" installs the files in the local TeX tree.
 %</driver>
 % \fi
 %
-% \CheckSum{352}
+% \CheckSum{360}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -526,7 +531,7 @@ Running "make install" installs the files in the local TeX tree.
 % \label{sec:license-software}
 %
 % \package{icite} --- \emph{Indices locorum citatorum}\\
-% Copyright \textcopyright\ 2019  Robert Alessi
+% Copyright \textcopyright\ 2019--2020  Robert Alessi
 %
 % Please send error reports and suggestions for improvements to Robert
 % Alessi:
@@ -563,7 +568,7 @@ Running "make install" installs the files in the local TeX tree.
 % 
 % \subsection*{License applicable to this document}
 % \label{sec:documentation-license}
-% Copyright \textcopyright\ 2019  Robert Alessi
+% Copyright \textcopyright\ 2019--2020  Robert Alessi
 %
 % \ccbysa\marginpar{\texttt{CC BY-SA 4.0}}
 % This document is licensed under the Creative Commons
@@ -609,7 +614,7 @@ Running "make install" installs the files in the local TeX tree.
 %</example>
 % \fi
 %
-% \package{icite} may be loaded with two optional \enquote*{named
+% \package{icite} may be loaded with three optional \enquote*{named
 % arguments} either of which is set using the syntax
 % \meta{key}$=$\meta{value}. The description of the optional arguments
 % follows:---
@@ -626,7 +631,7 @@ Running "make install" installs the files in the local TeX tree.
 % \tcboxverb{Default: not set}\\
 % \meta{index\_name} is the name of the index in which all passages
 % cited with the \cs{icite} command are to be found by default. As
-% this option is not initally set, \cs{icite} naturally inserts cited
+% this option is not initially set, \cs{icite} naturally inserts cited
 % passages in the default general index, unless |defaultindex| is set
 % to the value |none|, in which case indexing is disabled. It must be
 % noted that this named argument does not need a value as it defaults
@@ -717,8 +722,9 @@ Running "make install" installs the files in the local TeX tree.
 % is satisfactory in most cases.
 % \item[indexauthor] This field is not set by Bib\LaTeX. However, it
 % may be used as a fallback field for multiple or complex names.
-% \item[sortname] This standard Bib\LaTeX\ which is never printed may
-% be used to modify the sorting order of the index entries.
+% \item[sortname] This standard Bib\LaTeX\ field which is never
+%   printed may be used to modify the sorting order of the index
+%   entries.
 % \end{description}
 %
 % \paragraph{Example}
@@ -733,7 +739,7 @@ Running "make install" installs the files in the local TeX tree.
 % But in the end, the |sortname| field is also needed because the
 % diacritics must be discarded so that the name be sorted
 % properly:\\[1ex]%
-% |sortname = {|Hunayn ibn Ishaq|}|
+% |sortname = {{|Hunayn ibn Ishaq|}}|
 %
 % \subsection{Titles}
 % To process titles, \package{icite} uses the following entry fields:
@@ -1111,7 +1117,7 @@ Running "make install" installs the files in the local TeX tree.
 \begin{code}
   % preamble:
   \usepackage[xindy]{imakeidx}
-  \makeindex[name=loccit, options=-M icite.sty]
+  \makeindex[name=loccit, options=-M icite.xdy]
   % document:
   \printindex[loccit]
 \end{code}
@@ -1320,6 +1326,7 @@ Running "make install" installs the files in the local TeX tree.
       \index{\@sortedauthor!\@sortedtitle}%
       \fi\fi%
     }{%
+      \bgroup%
       \DTLforeach*{icite@indices}{%
         \icite@subtype=subtype,\icite@index=index}{%
         \ifx\@subtype\icite@subtype%
@@ -1332,7 +1339,8 @@ Running "make install" installs the files in the local TeX tree.
         \else%
         \index{\@sortedauthor!\@sortedtitle}%
         \fi\fi%
-        \fi}}
+        \fi}%
+      \egroup}%
     \ifno@bibengine
     \ifx\@shorthand\empty%
     \@useauthor\ic@authtitdelim\TitleStyle{\@usetitle}%
@@ -1352,6 +1360,7 @@ Running "make install" installs the files in the local TeX tree.
         \index{\@sortedauthor!\@sortedtitle!#1}%
         \fi\fi%
       }{%
+        \bgroup%
         \DTLforeach*{icite@indices}{%
           \icite@subtype=subtype,\icite@index=index}{%
           \ifx\@subtype\icite@subtype%
@@ -1364,13 +1373,14 @@ Running "make install" installs the files in the local TeX tree.
           \else%
           \index{\@sortedauthor!\@sortedtitle!#1}%
           \fi\fi%
-          \fi}}%
+          \fi}%
+        \egroup}%
       \ifno@bibengine
       \ifx\@shorthand\empty%
       \@useauthor\ic@authtitdelim\TitleStyle{\@usetitle}%
          \ic@titpgdelim{#1}%
       \else%
-      \@shorthand, {#1}%
+      \@shorthand\ic@titpgdelim{#1}%
       \fi%
       \else%
       \fi%
@@ -1384,6 +1394,7 @@ Running "make install" installs the files in the local TeX tree.
         \index{\@sortedauthor!\@sortedtitle!#2}%
         \fi\fi%
       }{%
+        \bgroup%
         \DTLforeach*{icite@indices}{%
           \icite@subtype=subtype,\icite@index=index}{%
           \ifx\@subtype\icite@subtype%
@@ -1396,13 +1407,14 @@ Running "make install" installs the files in the local TeX tree.
           \else%
           \index{\@sortedauthor!\@sortedtitle!#2}%
           \fi\fi%
-          \fi}}%
+          \fi}%
+        \egroup}%
       \ifno@bibengine
       \ifx\@shorthand\empty%
       #1 \@useauthor\ic@authtitdelim\TitleStyle{\@usetitle}%
          \ic@titpgdelim{#2}%
       \else%
-      #1 \@shorthand, {#2}%
+      #1 \@shorthand\ic@titpgdelim{#2}%
       \fi
       \else%
       \fi%
diff --git a/macros/latex/contrib/icite/icite.ins b/macros/latex/contrib/icite/icite.ins
deleted file mode 100644
index 176b1fd700..0000000000
--- a/macros/latex/contrib/icite/icite.ins
+++ /dev/null
@@ -1,71 +0,0 @@
-%%
-%% This is file `icite.ins',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% icite.dtx  (with options: `install')
-%% 
-%% Copyright (C) 2019 by Robert Alessi <alessi@robertalessi.net>
-%% 
-%% Please send error reports and suggestions for improvements to Robert
-%% Alessi <alessi@robertalessi.net>
-%% 
-%% This program is free software: you can redistribute it and/or modify
-%% it under the terms of the GNU General Public License as published by
-%% the Free Software Foundation, either version 3 of the License, or
-%% (at your option) any later version.
-%% 
-%% This program is distributed in the hope that it will be useful, but
-%% WITHOUT ANY WARRANTY; without even the implied warranty of
-%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%% General Public License for more details.
-%% 
-%% You should have received a copy of the GNU General Public License
-%% along with this program.  If not, see
-%% <http://www.gnu.org/licenses/>.
-%% 
-%% This work consists of the file icite.dtx, icite.ins and a Makefile.
-%% Running "make" generates the derived files README.md, icite.pdf and icite.sty.
-%% Running "make inst" installs the files in the user's TeX tree.
-%% Running "make install" installs the files in the local TeX tree.
-%% 
-\input docstrip.tex
-\keepsilent
-\askforoverwritefalse
-\preamble
-
-Copyright (C) 2019 by Robert Alessi <alessi@robertalessi.net>
-
-Please send error reports and suggestions for improvements to Robert
-Alessi <alessi@robertalessi.net>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see
-<http://www.gnu.org/licenses/>.
-
-This work consists of the file icite.dtx, icite.ins and a Makefile.
-Running "make" generates the derived files README.md, icite.pdf and icite.sty.
-Running "make inst" installs the files in the user's TeX tree.
-Running "make install" installs the files in the local TeX tree.
-
-\endpreamble
-
-\usedir{tex/latex/icite}
-\generate{
-  \file{\jobname.sty}{\from{\jobname.dtx}{package}}
-}
-\endbatchfile
-\endinput
-%%
-%% End of file `icite.ins'.
diff --git a/macros/latex/contrib/icite/icite.pdf b/macros/latex/contrib/icite/icite.pdf
index c492cb5e31..a39837d7c0 100644
--- a/macros/latex/contrib/icite/icite.pdf
+++ b/macros/latex/contrib/icite/icite.pdf
diff --git a/macros/latex/contrib/icite/samples/icite-biblatex.pdf b/macros/latex/contrib/icite/samples/icite-biblatex.pdf
index f19d15473c..54154eb06f 100644
--- a/macros/latex/contrib/icite/samples/icite-biblatex.pdf
+++ b/macros/latex/contrib/icite/samples/icite-biblatex.pdf
diff --git a/macros/latex/contrib/icite/samples/icite-minimal.pdf b/macros/latex/contrib/icite/samples/icite-minimal.pdf
index e010128479..13b201c4d8 100644
--- a/macros/latex/contrib/icite/samples/icite-minimal.pdf
+++ b/macros/latex/contrib/icite/samples/icite-minimal.pdf
diff --git a/macros/latex/contrib/icite/samples/icite-nobiblatex.pdf b/macros/latex/contrib/icite/samples/icite-nobiblatex.pdf
index ae93aa9deb..7f524bb7ec 100644
--- a/macros/latex/contrib/icite/samples/icite-nobiblatex.pdf
+++ b/macros/latex/contrib/icite/samples/icite-nobiblatex.pdf