summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx87
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