diff options
author | Karl Berry <karl@freefriends.org> | 2010-03-20 23:32:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-03-20 23:32:55 +0000 |
commit | 1080eb42d3947b4414c2bda84c4d0c0b809c4e16 (patch) | |
tree | d5e2f1893ee3a1f85c1b0d195db8ba0a8c28ff60 /Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx | |
parent | 6861935735f4cbecd9f2772a4123b3fb07d6ffc2 (diff) |
biblatex 0.9a (19mar10)
git-svn-id: svn://tug.org/texlive/trunk@17511 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx | 87 |
1 files changed, 37 insertions, 50 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx index b75441eb9fc..7665a9a587d 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx @@ -1,80 +1,71 @@ -% $Id: numeric.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: numeric.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{numeric.cbx} -[\abx@cbxid $Id: numeric.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: numeric.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \ExecuteBibliographyOptions{labelnumber,autocite=inline} \renewcommand*{\multicitedelim}{\addcomma\space} \providebool{bbx:subentry} \DeclareFieldFormat{entrysetcount}{\mknumalph{#1}} -\DeclareCiteCommand{\cite} - {\usebibmacro{prenote}% - \bibleftbracket} +\newbibmacro*{cite}{% + \printtext[bibhyperref]{% + \printfield{labelnumber}% + \ifbool{bbx:subentry} + {\printfield{entrysetcount}} + {}}} + +\newbibmacro*{textcite}{% + \iffieldequals{namehash}{\cbx@lasthash} + {\multicitedelim} + {\cbx@tempa + \ifnameundef{labelname} + {\printfield[citetitle]{labeltitle}} + {\printnames{labelname}}% + \addspace\bibopenbracket}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite}% + \savefield{namehash}{\cbx@lasthash}% + \gdef\cbx@tempa{\bibclosebracket\multicitedelim}} + +\DeclareCiteCommand{\cite}[\mkbibbrackets] + {\usebibmacro{prenote}} {\usebibmacro{citeindex}% - \printtext[bibhyperref]{% - \printfield{labelnumber}% - \ifbool{bbx:subentry} - {\printfield{entrysetcount}} - {}}} + \usebibmacro{cite}} {\multicitedelim} - {\usebibmacro{postnote}% - \bibrightbracket} + {\usebibmacro{postnote}} \DeclareCiteCommand{\parencite}[\mkbibbrackets] {\usebibmacro{prenote}} {\usebibmacro{citeindex}% - \printtext[bibhyperref]{% - \printfield{labelnumber}% - \ifbool{bbx:subentry} - {\printfield{entrysetcount}} - {}}} + \usebibmacro{cite}} {\multicitedelim} {\usebibmacro{postnote}} \DeclareCiteCommand{\footcite}[\mkbibfootnote] {\usebibmacro{prenote}} {\usebibmacro{citeindex}% - \printtext[bibhyperref]{% - \printfield{labelnumber}% - \ifbool{bbx:subentry} - {\printfield{entrysetcount}} - {}}} + \usebibmacro{cite}} {\multicitedelim} {\usebibmacro{postnote}} \DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext] {\usebibmacro{prenote}} {\usebibmacro{citeindex}% - \printtext[bibhyperref]{% - \printfield{labelnumber}% - \ifbool{bbx:subentry} - {\printfield{entrysetcount}} - {}}} + \usebibmacro{cite}} {\multicitedelim} {\usebibmacro{postnote}} \DeclareCiteCommand{\textcite} {\let\cbx@tempa=\empty - \undef\cbx@lasthash - \usebibmacro{prenote}} + \undef\cbx@lasthash} {\usebibmacro{citeindex}% - \iffieldequals{namehash}{\cbx@lasthash} - {\multicitedelim} - {\cbx@tempa - \ifnameundef{labelname} - {\printfield[citetitle]{labeltitle}} - {\printnames{labelname}}% - \addspace\bibleftbracket}% - \printtext[bibhyperref]{% - \printfield{labelnumber}% - \ifbool{bbx:subentry} - {\printfield{entrysetcount}} - {}}% - \savefield{namehash}{\cbx@lasthash}% - \gdef\cbx@tempa{\bibrightbracket\multicitedelim}} + \usebibmacro{textcite}} {} - {\usebibmacro{postnote}\bibrightbracket} + {\usebibmacro{postnote}% + \bibclosebracket} \DeclareCiteCommand{\supercite}[\mkbibsuperscript] {\iffieldundef{prenote} @@ -84,15 +75,11 @@ {} {\BibliographyWarning{Ignoring postnote argument}}} {\usebibmacro{citeindex}% - \printtext[bibhyperref]{% - \printfield{labelnumber}% - \ifbool{bbx:subentry} - {\printfield{entrysetcount}} - {}}} + \usebibmacro{cite}} {\supercitedelim} {} -\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim} \endinput |