From 87e6276d9f4bbcdef5324384737356208621356a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 6 Jul 2009 00:20:06 +0000 Subject: gcite update (4jul09) git-svn-id: svn://tug.org/texlive/trunk@14138 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/gcite/gcite.sty | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/latex/gcite') diff --git a/Master/texmf-dist/tex/latex/gcite/gcite.sty b/Master/texmf-dist/tex/latex/gcite/gcite.sty index 35b4ad85426..a810e35490d 100644 --- a/Master/texmf-dist/tex/latex/gcite/gcite.sty +++ b/Master/texmf-dist/tex/latex/gcite/gcite.sty @@ -7,7 +7,7 @@ %% gcite.dtx (with options: `gcite.sty,package') %% %% gcite.dtx -%% Copyright 2007 Matthew Tylee Atkinson and Iain Phillips +%% Copyright 2009 Matthew Tylee Atkinson and Iain Phillips %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{gcite} +\ProvidesPackage{gcite}[2009/07/03 1.0.1] \RequirePackage{biblatex} \newif\ifgcite@normalcite \gcite@normalcitefalse @@ -53,22 +53,19 @@ \def\gcite@foot@presep{---} \def\gcite@foot@postsep{} \def\gcite@one#1{\citeauthor{#1}, \citetitle{#1}, \citeyear{#1}} -\def\gcite@core#1{% +\def\gcite@core#1#2{% \newif\ifgcite@nfirst \gcite@nfirstfalse% \@for\@c:=#1\do{% \ifgcite@nfirst{\gcite@itemsep}\else\gcite@nfirsttrue\fi% - \gcite@one\@c} \origcite{#1}} + \gcite@one\@c}~\origcite[#2]{#1}} \ifgcite@normalcite% - \renewcommand{\cite}[1]{% - ~\origcite{#1}% - } \else% - \renewcommand{\cite}[1]{% + \renewcommand{\cite}[2][]{% \ifnum\interlinepenalty=\interfootnotelinepenalty% - \gcite@foot@presep\gcite@core{#1}\gcite@foot@postsep% + \gcite@foot@presep\gcite@core{#2}{#1}\gcite@foot@postsep% \else% - \footnote{\gcite@core{#1}}% +\unskip\footnote{\gcite@core{#2}{#1}}% \fi% } \fi -- cgit v1.2.3