icite (13mar19)

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

1 files changed, 76 insertions, 19 deletions

diff --git a/Master/texmf-dist/source/latex/icite/icite.dtx b/Master/texmf-dist/source/latex/icite/icite.dtx
index d3dbd2fee24..64152276433 100644
--- a/Master/texmf-dist/source/latex/icite/icite.dtx
+++ b/Master/texmf-dist/source/latex/icite/icite.dtx
@@ -15,7 +15,7 @@ Overview
 
 `icite` is designed to produce from BibTeX or BibLaTeX bibliographical
 databases the different indices of authors and works cited which are
-called \emph{indices locorum citatorum}. It relies on a specific
+called _indices locorum citatorum_. It relies on a specific
 `\icite` command and can operate with either BibTeX or BibLaTeX.
 
 License and disclamer
@@ -46,7 +46,7 @@ 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/>.
+with this program. If not, see <http://www.gnu.org/licenses/>.
 
 This release of icite consists of the following source files:
 
@@ -188,7 +188,7 @@ Running "make install" installs the files in the local TeX tree.
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{icite}
 %<*package>
-    [2019/03/07 v1.00 Make Indices locorum citatorum]
+    [2019/03/12 v1.1 Make Indices locorum citatorum]
 %</package>
 %<*driver>
 \documentclass{ltxdoc}
@@ -341,10 +341,11 @@ Running "make install" installs the files in the local TeX tree.
 \IndexSubtypeAs{classical}{primary}
 \bibinput{icite}
 \usepackage[nonewpage,xindy]{imakeidx}
-\indexsetup{level=\subsubsection*}
+\newcommand{\donothing}[1]{}
+\indexsetup{level=\donothing}
 \makeindex
-\makeindex[name=loccit, title=Index of Passages Cited (modern authors)]
-\makeindex[name=primary, title=\emph{Index locorum citatorum}]
+\makeindex[name=loccit]
+\makeindex[name=primary]
 \usepackage{tabto}
 \usepackage{classics}
 \newclassic{iau}{\classicsRoman{#1}|, #1|.#1}
@@ -404,6 +405,7 @@ Running "make install" installs the files in the local TeX tree.
 \begin{document}
  \DocInput{\jobname.dtx}
  \PrintChanges
+ \section{Index}
  \indexprologue{Numbers written in italic refer to the page where the
    corresponding entry is described; numbers underlined refer to the
    code line of the definition; numbers in roman refer to the code
@@ -414,7 +416,7 @@ Running "make install" installs the files in the local TeX tree.
 %</driver>
 % \fi
 %
-% \CheckSum{269}
+% \CheckSum{316}
 %
 % \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
@@ -451,6 +453,10 @@ Running "make install" installs the files in the local TeX tree.
 %
 % \GetFileInfo{\jobname.dtx}
 % \DoNotIndex{\newcommand,\newenvironment}
+% 
+% \newcommand*{\NEWfeature}[1]{%
+%     \hskip 1sp \marginpar{\small\sffamily\raggedright
+%     New feature\\#1}}
 %
 % \title{\tcbox[colframe=black, enhanced, tikznode, drop lifted
 % shadow, colback=white, boxrule=.25mm]{%
@@ -469,11 +475,11 @@ Running "make install" installs the files in the local TeX tree.
 % \icitetableofcontents
 % \normalsize
 %
-%\changes{v1.00}{2019/03/07}{First public release}
+% \changes{v1.00}{2019/03/07}{First public release}
 %
 % \begin{abstract}
 %   \package{icite} is designed to produce from \hologo{BibTeX} or
-%   Bib\LaTeX\ bibliographic databases the different indices of
+%   Bib\LaTeX\ bibliographical databases the different indices of
 %   authors and works cited which are called \emph{indices locorum
 %   citatorum}. It relies on a specific \cs{icite} command and can
 %   operate with either \hologo{BibTeX} or Bib\LaTeX.
@@ -553,7 +559,7 @@ Running "make install" installs the files in the local TeX tree.
 % not require Bib\LaTeX. Instead, \hologo{BibTeX} can be used as
 % \package{icite} uses the \package{usebib}
 % package\footnote{\cite{usebib}} to build the indices by drawing
-% directly from the bibliographic database.
+% directly from the bibliographical database.
 %
 %
 % \section[The \package{icite} package]{The \textsf{icite} package}
@@ -592,7 +598,24 @@ Running "make install" installs the files in the local TeX tree.
 % to |loccit| if it is used alone. This is an easy way to have all
 % passages cited indexed in a separate index named |loccit|.
 %
-% \paragraph{Bibliographic database}
+% \DescribeOption{nobibengine}\NEWfeature{v1.1}
+% \changes{v1.1}{2019/03/12}{New global option \texttt{nobibengine}}%
+% |nobibengine|$=$|true|\verb+|+|false|\hfill%
+% \tcboxverb{Default: not set}\\
+% This named argument does not need a value as it defaults to |true|
+% if it is used. When this option is activated, \package{icite} does
+% not use \hologo{BibTeX} or Bib\LaTeX\ to insert the citations in the
+% body text---even if either is loaded in the preamble---and pulls the
+% necessary information directly from the bibliographical
+% database. For this reason, \cs{bibinput} described below is of
+% course still required.  The citations inserted consist of the
+% elements described below \vref{sec:entry-fields}
+% \vpageref{sec:entry-fields}. However, it must be noted that if the
+% entry field |shorthand| of any author/work be set in the database,
+% it takes precedence over the fields used to define author names and
+% titles.
+%
+% \paragraph{Bibliographical database}
 % \DescribeMacro{\bibinput} Once \package{icite} is loaded, it must be
 % connected to at least one bibliographic |.bib| file. To that end,
 % \package{icite} uses the same \cs{bibinput} command as
@@ -607,7 +630,7 @@ Running "make install" installs the files in the local TeX tree.
   % passages in a separate index named 'loccit':
   \usepackage[citecmd=autocite, defaultindex]{icite}
   % note that the .bib file must be stripped of its extension:
-  \usebib{bibliography} % that is: load bibliography.bib
+  \bibinput{bibliography} % that is: load bibliography.bib
 \end{code}
 % \iffalse
 %</example>
@@ -633,6 +656,7 @@ Running "make install" installs the files in the local TeX tree.
 % command.
 %
 % \subsection{Entry fields}
+% \label{sec:entry-fields}
 % \subsubsection{Author names}
 % To process author names, \package{icite} uses the following entry
 % fields:
@@ -713,7 +737,7 @@ Running "make install" installs the files in the local TeX tree.
   % passages in a separate index named 'loccit':
   \usepackage[citecmd=autocite, defaultindex]{icite}
   % load bibliography.bib
-  \usebib{bibliography}
+  \bibinput{bibliography}
 
  % load biblatex (with oxnotes, \autocite acts as \footcite)
  \usepackage[style=oxnotes]{biblatex}
@@ -958,7 +982,9 @@ Running "make install" installs the files in the local TeX tree.
 %
 % \subsection{Indices}
 % \label{ref:indices}
+% \subsubsection{Index of Passages Cited (modern authors)}
 % \printindex[loccit]
+% \subsubsection{\emph{Index locorum citatorum}}
 % \printindex[primary]
 % 
 % \subsection{\texorpdfstring{\hologo{BibTeX}
@@ -990,6 +1016,9 @@ Running "make install" installs the files in the local TeX tree.
   \def\ic@dfltind{#1}
   \fi
 }
+\newif\ifno@bibengine
+\define@boolkey{icite.sty}[@pkg@]{nobibengine}[true]{%
+  \if@pkg@nobibengine\no@bibenginetrue\else\fi}
 \ExecuteOptionsX{citecmd}
 \ProcessOptionsX\relax
 %    \end{macrocode}
@@ -1009,6 +1038,7 @@ Running "make install" installs the files in the local TeX tree.
 \define@reuse@key{indextitle}
 \define@reuse@key{indexsorttitle}
 \define@reuse@key{entrysubtype}
+\define@reuse@key{shorthand}
 %    \end{macrocode}
 % This is the same as \cs{usebibentry} from \package{ebib}, but it
 % does not return an error if the entry field is not found:
@@ -1056,6 +1086,7 @@ Running "make install" installs the files in the local TeX tree.
 % qualified citation lists or so-called \enquote*{multicite} commands.
 %    \begin{macrocode}
 \NewDocumentCommand{\icite}{o o m O{\ic@dfltcit}}{%
+  \edef\@shorthand{\get@bibentry{#3}{shorthand}}%
   \edef\@subtype{\get@bibentry{#3}{entrysubtype}}%
   \edef\@author{\get@bibentry{#3}{author}}%
   \edef\@indexauthor{\get@bibentry{#3}{indexauthor}}%
@@ -1070,10 +1101,10 @@ Running "make install" installs the files in the local TeX tree.
       \def\@useauthor{\@indexauthor}%
     \fi
   \ifx\@sortname\empty
-    \def\@sortedauthor{\@useauthor}%
-  \else
-    \def\@sortedauthor{{\@sortname}@\@useauthor}%
-  \fi
+      \def\@sortedauthor{\@useauthor}%
+    \else
+      \def\@sortedauthor{{\@sortname}@\@useauthor}%
+    \fi
   \ifx\@indextitle\empty
     \ifx\@shorttitle\empty
       \def\@usetitle{\@title}%
@@ -1110,7 +1141,15 @@ Running "make install" installs the files in the local TeX tree.
         \index{\@sortedauthor!\@sortedtitle}%
         \fi\fi%
         \fi}}
+    \ifno@bibengine
+    \ifx\@shorthand\empty%
+    \@useauthor, \TitleStyle{\@usetitle}%
+    \else%
+    \@shorthand%
+    \fi%
+    \else%
     \csname #4\endcsname{#3}%
+    \fi%
   }
   {\IfNoValueTF{#2}%
     {\DTLifdbempty{icite@indices}{%
@@ -1134,7 +1173,16 @@ Running "make install" installs the files in the local TeX tree.
           \index{\@sortedauthor!\@sortedtitle!#1}%
           \fi\fi%
           \fi}}%
-      \csname #4\endcsname[{#1}]{#3}}
+      \ifno@bibengine
+      \ifx\@shorthand\empty%
+      \@useauthor, \TitleStyle{\@usetitle}, {#1}%
+      \else%
+      \@shorthand, {#1}%
+      \fi%
+      \else%
+      \csname #4\endcsname[{#1}]{#3}%
+      \fi%
+    }
     {\DTLifdbempty{icite@indices}{%
         \ifno@index\else
         \ifdefault@index%
@@ -1156,7 +1204,16 @@ Running "make install" installs the files in the local TeX tree.
           \index{\@sortedauthor!\@sortedtitle!#2}%
           \fi\fi%
           \fi}}%
-      \csname #4\endcsname[#1][{#2}]{#3}}%
+      \ifno@bibengine
+      \ifx\@shorthand\empty%
+      #1 \@useauthor, \TitleStyle{\@usetitle}, {#2}%
+      \else%
+      #1 \@shorthand, {#2}%
+      \fi
+      \else%
+      \csname #4\endcsname[#1][{#2}]{#3}%
+      \fi%
+    }%
   }%
 }
 %    \end{macrocode}