From 92df70634c796daf81679360e2cc092d28cb6edc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 17 Mar 2019 21:38:40 +0000 Subject: icite (17mar19) git-svn-id: svn://tug.org/texlive/trunk@50429 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/icite/icite.sty | 30 ++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex/icite') diff --git a/Master/texmf-dist/tex/latex/icite/icite.sty b/Master/texmf-dist/tex/latex/icite/icite.sty index cf0dd1a23e5..8c31e46a24c 100644 --- a/Master/texmf-dist/tex/latex/icite/icite.sty +++ b/Master/texmf-dist/tex/latex/icite/icite.sty @@ -32,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{icite} - [2019/03/12 v1.1 Make Indices locorum citatorum] + [2019/03/17 v1.2 Make Indices locorum citatorum] \RequirePackage{xkeyval} \DeclareOptionX{citecmd}[cite]{\def\ic@dfltcit{#1}} \newif\ifdefault@index @@ -55,6 +55,7 @@ \RequirePackage{xparse} \RequirePackage{datatool} \RequirePackage{usebib} +\NewDocumentCommand{\ic@nullcmd}{O{}O{}m}{} \define@reuse@key{author} \define@reuse@key{indexauthor} \define@reuse@key{sortname} @@ -78,7 +79,20 @@ \RenewDocumentCommand{\TitleStyle}{m}{#1} } \@onlypreamble\SetTitleStyle +\def\ic@authtitdelim{, } +\NewDocumentCommand{\AuthorTitleDelim}{m}{% + \def\ic@authtitdelim{#1} +} +\@onlypreamble\AuthorTitleDelim +\def\ic@titpgdelim{, } +\NewDocumentCommand{\TitlePageDelim}{m}{% + \def\ic@titpgdelim{#1} +} +\@onlypreamble\TitlePageDelim \NewDocumentCommand{\icite}{o o m O{\ic@dfltcit}}{% + \edef\ic@argiv{#4}% + \edef\ic@null{ic@nullcmd}% + \ifno@bibengine\let\ic@argiv\ic@null\else\fi% \edef\@shorthand{\get@bibentry{#3}{shorthand}}% \edef\@subtype{\get@bibentry{#3}{entrysubtype}}% \edef\@author{\get@bibentry{#3}{author}}% @@ -136,13 +150,13 @@ \fi}} \ifno@bibengine \ifx\@shorthand\empty% - \@useauthor, \TitleStyle{\@usetitle}% + \@useauthor\ic@authtitdelim\TitleStyle{\@usetitle}% \else% \@shorthand% \fi% \else% - \csname #4\endcsname{#3}% \fi% + \csname\ic@argiv\endcsname{#3}% } {\IfNoValueTF{#2}% {\DTLifdbempty{icite@indices}{% @@ -168,13 +182,14 @@ \fi}}% \ifno@bibengine \ifx\@shorthand\empty% - \@useauthor, \TitleStyle{\@usetitle}, {#1}% + \@useauthor\ic@authtitdelim\TitleStyle{\@usetitle}% + \ic@titpgdelim{#1}% \else% \@shorthand, {#1}% \fi% \else% - \csname #4\endcsname[{#1}]{#3}% \fi% + \csname\ic@argiv\endcsname[{#1}]{#3}% } {\DTLifdbempty{icite@indices}{% \ifno@index\else @@ -199,13 +214,14 @@ \fi}}% \ifno@bibengine \ifx\@shorthand\empty% - #1 \@useauthor, \TitleStyle{\@usetitle}, {#2}% + #1 \@useauthor\ic@authtitdelim\TitleStyle{\@usetitle}% + \ic@titpgdelim{#2}% \else% #1 \@shorthand, {#2}% \fi \else% - \csname #4\endcsname[#1][{#2}]{#3}% \fi% + \csname\ic@argiv\endcsname[#1][{#2}]{#3}% }% }% } -- cgit v1.2.3