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 | |
| 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')
41 files changed, 2151 insertions, 1091 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx index b74e27ec051..d81006e7790 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx @@ -1,7 +1,7 @@ -% $Id: alphabetic.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: alphabetic.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{alphabetic.bbx} -[\abx@bbxid $Id: alphabetic.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@bbxid $Id: alphabetic.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \RequireBibliographyStyle{standard} \ExecuteBibliographyOptions{labelalpha,sorting=anyt} @@ -12,10 +12,8 @@ \DeclareFieldFormat{labelalphawidth}{\mkbibbrackets{#1}} \DeclareFieldFormat{shorthandwidth}{\mkbibbrackets{#1}} -\renewcommand*{\thebibitem}{\item} -\renewcommand*{\thelositem}{\item} -\renewenvironment*{thebibliography} +\defbibenvironment{bibliography} {\list {\printtext[labelalphawidth]{% \printfield{labelalpha}% @@ -28,8 +26,9 @@ \setlength{\parsep}{\bibparsep}}% \renewcommand*{\makelabel}[1]{##1\hss}} {\endlist} + {\item} -\renewenvironment*{theshorthands} +\defbibenvironment{shorthands} {\list {\printfield[shorthandwidth]{shorthand}} {\setlength{\labelwidth}{\shorthandwidth}% @@ -40,5 +39,6 @@ \setlength{\parsep}{\bibparsep}% \renewcommand*{\makelabel}[1]{##1\hss}}} {\endlist} + {\item} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx index 5ec753f314c..ac08c959d7e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx @@ -1,7 +1,7 @@ -% $Id: authortitle.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: authortitle.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{authortitle.bbx} -[\abx@bbxid $Id: authortitle.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@bbxid $Id: authortitle.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \RequireBibliographyStyle{standard} \ExecuteBibliographyOptions{pagetracker} @@ -14,15 +14,13 @@ \renewbibmacro*{bbx:savehash}{}}} \DeclareFieldFormat{shorthandwidth}{#1} -\renewcommand*{\thebibitem}{\item} -\renewcommand*{\thelositem}{\item} \setlength{\bibitemsep}{0pt} \DeclareNameAlias{author}{sortname} \DeclareNameAlias{editor}{sortname} \DeclareNameAlias{translator}{sortname} -\renewenvironment*{thebibliography} +\defbibenvironment{bibliography} {\list {} {\setlength{\leftmargin}{\bibhang}% @@ -30,8 +28,9 @@ \setlength{\itemsep}{\bibitemsep}% \setlength{\parsep}{\bibparsep}}} {\endlist} + {\item} -\renewenvironment*{theshorthands} +\defbibenvironment{shorthands} {\list {\printfield[shorthandwidth]{shorthand}} {\setlength{\labelwidth}{\shorthandwidth}% @@ -42,6 +41,7 @@ \setlength{\parsep}{\bibparsep}% \renewcommand*{\makelabel}[1]{##1\hss}}} {\endlist} + {\item} \InitializeBibliographyStyle{% \global\undef\bbx@lasthash} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx index 5429cf55f80..a00b58e13b8 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx @@ -1,7 +1,7 @@ -% $Id: authoryear.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: authoryear.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{authoryear.bbx} -[\abx@bbxid $Id: authoryear.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@bbxid $Id: authoryear.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \RequireBibliographyStyle{standard} \ExecuteBibliographyOptions{labelyear,sorting=nyt,pagetracker} @@ -14,15 +14,13 @@ \renewbibmacro*{bbx:savehash}{}}} \DeclareFieldFormat{shorthandwidth}{#1} -\renewcommand*{\thebibitem}{\item} -\renewcommand*{\thelositem}{\item} \setlength{\bibitemsep}{0pt} \DeclareNameAlias{author}{sortname} \DeclareNameAlias{editor}{sortname} \DeclareNameAlias{translator}{sortname} -\renewenvironment*{thebibliography} +\defbibenvironment{bibliography} {\list {} {\setlength{\leftmargin}{\bibhang}% @@ -30,8 +28,9 @@ \setlength{\itemsep}{\bibitemsep}% \setlength{\parsep}{\bibparsep}}} {\endlist} + {\item} -\renewenvironment*{theshorthands} +\defbibenvironment{shorthands} {\list {\printfield[shorthandwidth]{shorthand}} {\setlength{\labelwidth}{\shorthandwidth}% @@ -42,6 +41,7 @@ \setlength{\parsep}{\bibparsep}% \renewcommand*{\makelabel}[1]{##1\hss}}} {\endlist} + {\item} \InitializeBibliographyStyle{% \global\undef\bbx@lasthash} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx index 73eec79d1f6..0bbdd2aa878 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx @@ -1,15 +1,13 @@ -% $Id: debug.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: debug.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{debug.bbx} -[\abx@bbxid $Id: debug.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@bbxid $Id: debug.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \ExecuteBibliographyOptions{sorting=debug} \DeclareFieldFormat{entrykey}{\ttfamily[#1]} \DeclareFieldFormat{shorthandwidth}{#1} -\renewcommand*{\thebibitem}{\item} -\renewcommand*{\thelositem}{\item} -\renewenvironment*{thebibliography} +\defbibenvironment{bibliography} {\list {} {\setlength{\leftmargin}{8em}% @@ -21,8 +19,9 @@ \frenchspacing \normalfont\footnotesize}} {\endlist} + {\item} -\renewenvironment*{theshorthands} +\defbibenvironment{shorthands} {\list {\printfield[shorthandwidth]{shorthand}} {\setlength{\labelwidth}{8em}% @@ -36,6 +35,7 @@ \frenchspacing \normalfont\footnotesize}} {\endlist} + {\item} \DeclareNameFormat{debug}{% \bbx@mklabel{\currentname}% @@ -63,7 +63,7 @@ \detokenize{#1}} \newcommand*{\bbx@mklabel}[1]{% - \thebibitem + \item \makebox[\leftmargin][l]{\ttfamily [#1]}} \newcommand*{\bbx@mksublabel}[1]{% diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx index 9f40ccbb005..d3a913fd255 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx @@ -1,7 +1,7 @@ -% $Id: draft.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: draft.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{draft.bbx} -[\abx@bbxid $Id: draft.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@bbxid $Id: draft.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \RequireBibliographyStyle{standard} \ExecuteBibliographyOptions{sorting=debug} @@ -11,10 +11,8 @@ \DeclareNameAlias{translator}{default} \DeclareFieldFormat{shorthandwidth}{#1} -\renewcommand*{\thebibitem}{\item} -\renewcommand*{\thelositem}{\item} -\renewenvironment*{thebibliography} +\defbibenvironment{bibliography} {\list {\printfield{entrykey}} {\setlength{\labelwidth}{0pt}% @@ -24,8 +22,9 @@ \renewcommand*{\makelabel}[1]{% \hspace\labelsep\bfseries##1}}} {\endlist} + {\item} -\renewenvironment*{theshorthands} +\defbibenvironment{shorthands} {\list {\printfield[shorthandwidth]{shorthand}} {\setlength{\labelwidth}{\shorthandwidth}% @@ -36,5 +35,6 @@ \setlength{\parsep}{\bibparsep}% \renewcommand*{\makelabel}[1]{##1\hss}}} {\endlist} + {\item} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx index 3ff85cf53aa..5aca28eb5b8 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx @@ -1,7 +1,7 @@ -% $Id: numeric.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: numeric.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{numeric.bbx} -[\abx@bbxid $Id: numeric.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@bbxid $Id: numeric.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \RequireBibliographyStyle{standard} \ExecuteBibliographyOptions{labelnumber} @@ -18,10 +18,8 @@ \DeclareFieldFormat{bibentrysetcount}{\mkbibparens{\mknumalph{#1}}} \DeclareFieldFormat{labelnumberwidth}{\mkbibbrackets{#1}} \DeclareFieldFormat{shorthandwidth}{\mkbibbrackets{#1}} -\renewcommand*{\thebibitem}{\item} -\renewcommand*{\thelositem}{\item} -\renewenvironment*{thebibliography} +\defbibenvironment{bibliography} {\list {\printfield[labelnumberwidth]{labelnumber}} {\setlength{\labelwidth}{\labelnumberwidth}% @@ -32,8 +30,9 @@ \setlength{\parsep}{\bibparsep}}% \renewcommand*{\makelabel}[1]{\hss##1}} {\endlist} + {\item} -\renewenvironment*{theshorthands} +\defbibenvironment{shorthands} {\list {\printfield[shorthandwidth]{shorthand}} {\setlength{\labelwidth}{\shorthandwidth}% @@ -44,7 +43,7 @@ \setlength{\parsep}{\bibparsep}% \renewcommand*{\makelabel}[1]{\hss##1}}} {\endlist} - + {\item} \DeclareBibliographyDriver{set}{% \ifbool{bbx:subentry} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx index 25e3099fde6..1accffc4fcb 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx @@ -1,7 +1,7 @@ -% $Id: reading.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: reading.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{reading.bbx} -[\abx@bbxid $Id: reading.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@bbxid $Id: reading.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \RequireBibliographyStyle{standard} @@ -22,7 +22,7 @@ \setlength{\bibitemsep}{0.5\baselineskip} \setlength{\bibparsep}{0pt} -\renewenvironment*{thebibliography} +\defbibenvironment{bibliography} {\list {} {\setlength{\leftmargin}{0pt}% @@ -30,10 +30,9 @@ \setlength{\itemsep}{\bibitemsep}% \setlength{\parsep}{\bibparsep}}} {\endlist} + {\bbx@item} -\renewcommand*{\thelositem}{\item} - -\renewenvironment*{theshorthands} +\defbibenvironment{shorthands} {\list {\printfield[shorthandwidth]{shorthand}} {\setlength{\labelwidth}{\shorthandwidth}% @@ -44,16 +43,17 @@ \setlength{\parsep}{\bibparsep}% \renewcommand*{\makelabel}[1]{##1\hss}}} {\endlist} + {\item} -\def\bbx@bibitem@false{% +\def\bbx@item@false{% \itemsep2\bibitemsep \item\relax \itemsep\bibitemsep} -\def\bbx@bibitem@true{% - \bbx@bibitem@full} +\def\bbx@item@true{% + \bbx@item@full} -\def\bbx@bibitem@full{% +\def\bbx@item@full{% \itemsep2\bibitemsep \@itempenalty\z@ \item\relax @@ -80,9 +80,9 @@ \item\strut \@itempenalty\z@} -\def\bbx@bibitem@name{% +\def\bbx@item@name{% \iffieldequals{fullhash}{\bbx@lasthash} - {\bbx@bibitem@false} + {\bbx@item@false} {\itemsep2\bibitemsep \@itempenalty\z@ \item\relax @@ -105,8 +105,8 @@ \newbool{bbx:file} \DeclareBibliographyOption{entryhead}[true]{% - \ifcsdef{bbx@bibitem@#1} - {\letcs\thebibitem{bbx@bibitem@#1}} + \ifcsdef{bbx@item@#1} + {\letcs\bbx@item{bbx@item@#1}} {\PackageError{biblatex} {Invalid option 'header=#1'} {Valid values: header=true, false, full, name.}}} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx index 0d994f10d5e..40e8b728c27 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx @@ -1,7 +1,7 @@ -% $Id: standard.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: standard.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{standard.bbx} -[\abx@bbxid $Id: standard.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@bbxid $Id: standard.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \newtoggle{bbx:isbn} \newtoggle{bbx:url} @@ -622,10 +622,6 @@ \DeclareBibliographyAlias{suppperiodical}{article} \DeclareBibliographyAlias{*}{misc} -\newbibmacro*{in:}{% - \bibstring{in}\addcolon - \setunit{\space}} - \newbibmacro*{maintitle+title}{% \iffieldsequal{maintitle}{title} {\clearfield{maintitle}% diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def index 02a63a4fe74..d93c45ac12e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def @@ -1,7 +1,7 @@ -% $Id: biblatex.def,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: biblatex.def,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{biblatex.def} -[\abx@rcsid $Id: biblatex.def,v 0.9 2010/02/14 15:42:33 lehman beta $ +[\abx@rcsid $Id: biblatex.def,v 0.9a 2010/03/19 19:52:15 lehman beta $ biblatex generic definitions] % ------------------------------------------------------------------ @@ -39,7 +39,7 @@ \newcommand*{\multicitedelim}{\addsemicolon\space} \newcommand*{\compcitedelim}{\addcomma\space} \newcommand*{\supercitedelim}{\addcomma} -\newcommand*{\prenotedelim}{\addspace\midsentence} +\newcommand*{\prenotedelim}{\addspace} \newcommand*{\postnotedelim}{\addcomma\space} \newcommand*{\nameyeardelim}{\addspace} @@ -50,6 +50,7 @@ \newcommand*{\finentrypunct}{\addperiod} \newcommand*{\labelnamepunct}{\newunitpunct} \newcommand*{\subtitlepunct}{\newunitpunct} +\newcommand*{\intitlepunct}{\addcolon\space} \newcommand*{\bibpagespunct}{\addcomma\space} \newcommand*{\bibnamedash}{% \ifdimless{\leftmargin}{0.75em} @@ -978,14 +979,14 @@ \defbibheading{losnumbered}[\losname]{% \chapter{#1}% \if@twoside\markright{\MakeUppercase{#1}}\fi} - \defbibheading{subbibliography}[\bibname]{% + \defbibheading{subbibliography}[\refname]{% \section*{#1}% \if@twoside\markright{\MakeUppercase{#1}}\fi} - \defbibheading{subbibintoc}[\bibname]{% + \defbibheading{subbibintoc}[\refname]{% \section*{#1}% \addcontentsline{toc}{section}{#1}% \if@twoside\markright{\MakeUppercase{#1}}\fi} - \defbibheading{subbibnumbered}[\bibname]{% + \defbibheading{subbibnumbered}[\refname]{% \section{#1}} \or % scrartcl @@ -1050,13 +1051,13 @@ \defbibheading{losnumbered}[\losname]{% \chapter{#1}% \markboth{\chaptermarkformat#1}{\chaptermarkformat#1}} - \defbibheading{subbibliography}[\bibname]{% + \defbibheading{subbibliography}[\refname]{% \section*{#1}% \if@twoside\markright{\sectionmarkformat#1}\fi} - \defbibheading{subbibintoc}[\bibname]{% + \defbibheading{subbibintoc}[\refname]{% \addsec{#1}% \markboth{#1}{#1}} - \defbibheading{subbibnumbered}[\bibname]{% + \defbibheading{subbibnumbered}[\refname]{% \section{#1}} \or % memoir (article) @@ -1134,19 +1135,19 @@ \defbibheading{losnumbered}[\losname]{% \chapter{#1}% \if@twoside\markright{\MakeUppercase{#1}}\fi} - \defbibheading{subbibliography}[\bibname]{% + \defbibheading{subbibliography}[\refname]{% \section*{#1}% \ifmemoirbibintoc {\phantomsection \addcontentsline{toc}{section}{#1}} {}% \if@twoside\markright{\MakeUppercase{#1}}\fi} - \defbibheading{subbibintoc}[\bibname]{% + \defbibheading{subbibintoc}[\refname]{% \section*{#1}% \phantomsection \addcontentsline{toc}{section}{#1}% \if@twoside\markright{\MakeUppercase{#1}}\fi} - \defbibheading{subbibnumbered}[\bibname]{% + \defbibheading{subbibnumbered}[\refname]{% \section{#1}} \fi @@ -1315,12 +1316,12 @@ \iffieldundef{prenote} {} {\printfield{prenote}% - \prenotedelim}} + \setunit{\prenotedelim}}} \newbibmacro*{postnote}{% \iffieldundef{postnote} {} - {\postnotedelim + {\setunit{\postnotedelim}% \printfield{postnote}}} % multicite commands @@ -1439,33 +1440,38 @@ {\bibstring{\thefield{editortype}}}}} \newbibmacro*{editor+othersstrg}{% - \ifthenelse{\iffieldundef{editortype}\OR - \iffieldequalstr{editortype}{editor}} + \iffieldundef{editortype} {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}} {\def\abx@tempa{editors}} - {\def\abx@tempa{editor}}% - \ifnamesequal{editor}{translator} - {\appto\abx@tempa{tr}% - \clearname{translator}} - {}% - \ifnamesequal{editor}{commentator} - {\appto\abx@tempa{co}% - \clearname{commentator}} - {\ifnamesequal{editor}{annotator} - {\appto\abx@tempa{an}% - \clearname{annotator}} - {}}% - \ifnamesequal{editor}{introduction} - {\appto\abx@tempa{in}% - \clearname{introduction}} - {\ifnamesequal{editor}{foreword} - {\appto\abx@tempa{fo}% - \clearname{foreword}} - {\ifnamesequal{editor}{afterword} - {\appto\abx@tempa{af}% - \clearname{afterword}} - {}}}% - \bibstring{\abx@tempa}} + {\def\abx@tempa{editor}}} + {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}} + {\edef\abx@tempa{\thefield{editortype}s}} + {\edef\abx@tempa{\thefield{editortype}}}}% + \let\abx@tempb=\empty + \ifnamesequal{editor}{translator} + {\appto\abx@tempa{tr}% + \appto\abx@tempb{\clearname{translator}}} + {}% + \ifnamesequal{editor}{commentator} + {\appto\abx@tempa{co}% + \appto\abx@tempb{\clearname{commentator}}} + {\ifnamesequal{editor}{annotator} + {\appto\abx@tempa{an}% + \appto\abx@tempb{\clearname{annotator}}} + {}}% + \ifnamesequal{editor}{introduction} + {\appto\abx@tempa{in}% + \appto\abx@tempb{\clearname{introduction}}} + {\ifnamesequal{editor}{foreword} + {\appto\abx@tempa{fo}% + \appto\abx@tempb{\clearname{foreword}}} + {\ifnamesequal{editor}{afterword} + {\appto\abx@tempa{af}% + \appto\abx@tempb{\clearname{afterword}}} + {}}}% + \ifbibxstring{\abx@tempa} + {\bibstring{\abx@tempa}% + \abx@tempb} {\usebibmacro{editorstrg}}} \newbibmacro*{translatorstrg}{% @@ -1496,11 +1502,6 @@ {}}}% \bibstring{\abx@tempa}} -\newbibmacro*{bytypestrg}[2]{% - \iffieldundef{#1type} - {\bibstring{by#2}} - {\bibstring{by\thefield{#1type}}}} - \newbibmacro*{byauthor}{% \ifthenelse{\ifuseauthor\OR\ifnameundef{author}} {} @@ -1552,6 +1553,84 @@ \newbibmacro*{byholder}{% \printnames{holder}} +\newbibmacro*{byeditor+others}{% + \ifnameundef{editor} + {} + {\usebibmacro{byeditor+othersstrg}% + \setunit{\addspace}% + \printnames[byeditor]{editor}% + \clearname{editor}% + \newunit}% + \usebibmacro{byeditorx}% + \usebibmacro{bytranslator+others}} + +\newbibmacro*{bytranslator+others}{% + \ifnameundef{translator} + {} + {\usebibmacro{bytranslator+othersstrg}% + \setunit{\addspace}% + \printnames[bytranslator]{translator}% + \clearname{translator}% + \newunit}% + \usebibmacro{withothers}} + +\newbibmacro*{bytypestrg}[2]{% + \iffieldundef{#1type} + {\bibstring{by#2}} + {\bibstring{by\thefield{#1type}}}} + +\newbibmacro*{byeditor+othersstrg}{% + \iffieldundef{editortype} + {\def\abx@tempa{byeditor}} + {\edef\abx@tempa{by\thefield{editortype}}}% + \let\abx@tempb=\empty + \ifnamesequal{editor}{translator} + {\appto\abx@tempa{tr}% + \appto\abx@tempb{\clearname{translator}}} + {}% + \ifnamesequal{editor}{commentator} + {\appto\abx@tempa{co}% + \appto\abx@tempb{\clearname{commentator}}} + {\ifnamesequal{editor}{annotator} + {\appto\abx@tempa{an}% + \appto\abx@tempb{\clearname{annotator}}} + {}}% + \ifnamesequal{editor}{introduction} + {\appto\abx@tempa{in}% + \appto\abx@tempb{\clearname{introduction}}} + {\ifnamesequal{editor}{foreword} + {\appto\abx@tempa{fo}% + \appto\abx@tempb{\clearname{foreword}}} + {\ifnamesequal{editor}{afterword} + {\appto\abx@tempa{af}% + \appto\abx@tempb{\clearname{afterword}}} + {}}}% + \ifbibxstring{\abx@tempa} + {\bibstring{\abx@tempa}% + \abx@tempb} + {\usebibmacro{bytypestrg}{editor}{editor}}} + +\newbibmacro*{bytranslator+othersstrg}{% + \def\abx@tempa{bytranslator}% + \ifnamesequal{translator}{commentator} + {\appto\abx@tempa{co}% + \clearname{commentator}} + {\ifnamesequal{translator}{annotator} + {\appto\abx@tempa{an}% + \clearname{annotator}} + {}}% + \ifnamesequal{translator}{introduction} + {\appto\abx@tempa{in}% + \clearname{introduction}} + {\ifnamesequal{translator}{foreword} + {\appto\abx@tempa{fo}% + \clearname{foreword}} + {\ifnamesequal{translator}{afterword} + {\appto\abx@tempa{af}% + \clearname{afterword}} + {}}}% + \bibstring{\abx@tempa}} + \newbibmacro*{withcommentator}{% \ifnameundef{commentator} {} @@ -1587,69 +1666,6 @@ \setunit{\addspace}% \printnames[withafterword]{afterword}}} -\newbibmacro*{byeditor+others}{% - \ifthenelse{\NOT\ifnameundef{editor}\AND - \(\iffieldundef{editortype}\OR - \iffieldequalstr{editortype}{editor}\)} - {\def\abx@tempa{byeditor}% - \ifnamesequal{editor}{translator} - {\appto\abx@tempa{tr}% - \clearname{translator}} - {}% - \ifnamesequal{editor}{commentator} - {\appto\abx@tempa{co}% - \clearname{commentator}} - {\ifnamesequal{editor}{annotator} - {\appto\abx@tempa{an}% - \clearname{annotator}} - {}}% - \ifnamesequal{editor}{introduction} - {\appto\abx@tempa{in}% - \clearname{introduction}} - {\ifnamesequal{editor}{foreword} - {\appto\abx@tempa{fo}% - \clearname{foreword}} - {\ifnamesequal{editor}{afterword} - {\appto\abx@tempa{af}% - \clearname{afterword}} - {}}}% - \bibstring{\abx@tempa}% - \setunit{\addspace}% - \printnames[byeditor]{editor}% - \clearname{editor}% - \newunit - \usebibmacro{byeditorx}}% - {\usebibmacro{byeditor}} - \usebibmacro{bytranslator+others}} - -\newbibmacro*{bytranslator+others}{% - \ifnameundef{translator} - {} - {\def\abx@tempa{bytranslator}% - \ifnamesequal{translator}{commentator} - {\appto\abx@tempa{co}% - \clearname{commentator}} - {\ifnamesequal{translator}{annotator} - {\appto\abx@tempa{an}% - \clearname{annotator}} - {}}% - \ifnamesequal{translator}{introduction} - {\appto\abx@tempa{in}% - \clearname{introduction}} - {\ifnamesequal{translator}{foreword} - {\appto\abx@tempa{fo}% - \clearname{foreword}} - {\ifnamesequal{translator}{afterword} - {\appto\abx@tempa{af}% - \clearname{afterword}} - {}}}% - \bibstring{\abx@tempa}% - \setunit{\addspace}% - \printnames[bytranslator]{translator}% - \clearname{translator}% - \newunit}% - \usebibmacro{withothers}} - \newbibmacro*{withothers}{% \usebibmacro{withcommentator}% \clearname{commentator}% @@ -1720,6 +1736,10 @@ \setunit{\subtitlepunct}% \printfield[titlecase]{issuesubtitle}}}} +\newbibmacro*{in:}{% + \printtext{% + \bibstring{in}\intitlepunct}} + \newbibmacro*{date}{\printdate} \newbibmacro*{url+urldate}{% @@ -1733,10 +1753,9 @@ \iflistundef{pageref} {} {\printtext[parens]{% - \bibstring{see}\space \ifnumgreater{\value{pageref}}{1} - {\bibstring{pages}\ppspace} - {\bibstring{page}\ppspace}% + {\bibstring{backrefpages}\ppspace} + {\bibstring{backrefpage}\ppspace}% \printlist[pageref][-\value{listtotal}]{pageref}}}} \newbibmacro*{eprint}{% diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty index 62452d3e8c8..ce5dc41d4a4 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty @@ -1,4 +1,4 @@ -% $Id: biblatex.sty,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: biblatex.sty,v 0.9a 2010/03/19 19:52:15 lehman beta $ % Copyright (c) 2006-2010 Philipp Lehman. % @@ -21,7 +21,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{biblatex} -[\abx@rcsid $Id: biblatex.sty,v 0.9 2010/02/14 15:42:33 lehman beta $ +[\abx@rcsid $Id: biblatex.sty,v 0.9a 2010/03/19 19:52:15 lehman beta $ programmable bibliographies] \def\blx@version$#1: #2 ${#2} @@ -249,35 +249,6 @@ % trick showkeys into believing we're havard \let\HAR@checkdef\@empty -% koma-script -\newcommand{\ifkomabibtotoc}[2]{#2} -\newcommand{\ifkomabibtotocnumbered}[2]{#2} -\ifdef\ds@bibtotoc - {\DeclareOption{bibtotoc}{% - \let\ifkomabibtotoc\@firstoftwo} - \DeclareOption{bibtotocnumbered}{% - \let\ifkomabibtotoc\@firstoftwo - \let\ifkomabibtotocnumbered\@firstoftwo} - \DeclareOption{bibliography=nottotoc}{% - \let\ifkomabibtotoc\@secondoftwo - \let\ifkomabibtotocnumbered\@secondoftwo} - \DeclareOption{bibliography=totoc}{% - \let\ifkomabibtotoc\@firstoftwo} - \DeclareOption{bibliography=totocnumbered}{% - \let\ifkomabibtotoc\@firstoftwo - \let\ifkomabibtotocnumbered\@firstoftwo}} - {} - -% memoir -\@ifclassloaded{memoir} - {\newcommand*{\ifmemoirbibintoc}{% - \ifnobibintoc - \expandafter\@secondoftwo - \else - \expandafter\@firstoftwo - \fi}} - {\newcommand{\ifmemoirbibintoc}[2]{#2}} - %% Category codes \def\blx@docatcodes{% @@ -342,12 +313,18 @@ \def\thehighnamepenalty{\the\c@highnamepenalty} \newcounter{lownamepenalty} \def\thelownamepenalty{\the\c@lownamepenalty} +\newcounter{maxparens} +\def\themaxparens{\the\c@maxparens} +\newcounter{parenlevel} +\def\theparenlevel{\the\c@parenlevel} \newcount\blx@tempcnta \newcount\blx@tempcntb \newcount\blx@maxsection \newcount\blx@maxsegment \newcount\blx@notetype +\newcount\blx@parenlevel@text +\newcount\blx@parenlevel@foot \newlength{\labelnumberwidth} \newlength{\labelalphawidth} @@ -678,9 +655,9 @@ \PackageWarning{biblatex}{#1\@gobble}% \endgroup} \protected\def\blx@warning@entry#1{% - \ifundef\abx@field@entrykey - {\blx@warning{#1}} - {\blx@warning{#1\MessageBreak at entry '\abx@field@entrykey'}}} + \ifdef\abx@field@entrykey + {\blx@warning{#1\MessageBreak at entry '\abx@field@entrykey'}} + {\blx@warning{#1}}} \protected\def\blx@info#1{% \begingroup @@ -701,6 +678,9 @@ \def\blx@missing#1{% \mbox{\reset@font\bfseries#1}} +\protected\def\blx@errormark{% + \rule[0.25ex]{1.25ex}{1.25ex}} + \def\blx@err@patch#1{% \blx@error {Patching #1 failed} @@ -714,23 +694,35 @@ {Language '#1' not found} {The localization module for '#1' could not be found}} -\def\blx@err@invarg#1{% +\def\blx@err@invarg#1#2{% \blx@error {Argument '#1' invalid} - {The argument you have supplied is invalid.\MessageBreak - See the biblatex manual for details}} + {\ifblank{#2} + {The argument you have supplied is invalid.\MessageBreak + See the biblatex manual for details} + {#2}}} -\def\blx@err@invopt#1{% +\def\blx@err@invopt#1#2{% \blx@error {Option '#1' invalid} - {The option you have supplied is invalid.\MessageBreak - See the biblatex manual for valid option keys and - possible values}} + {\ifblank{#2} + {The option you have supplied is invalid.\MessageBreak + See the biblatex manual for valid option keys and + possible values} + {#2}}} -\def\blx@err@confopt#1{% +\def\blx@err@confopt#1#2{% + \blx@error + {Conflicting options\ifblank{#1}{}{ (#1)}} + {\ifblank{#2} + {The option you have supplied conflicts with another one.\MessageBreak + See the biblatex manual for valid option keys and possible values} + {#2}}} + +\def\blx@err@optdef#1{% \blx@error {Conflicting options} - {#1}} + {The option '#1' is already defined}} \def\blx@err@nodocdiv#1{% \blx@error @@ -779,6 +771,23 @@ If you continue, I will fall back to '\string#1'}% #1} +\def\blx@err@matchparen#1{% + \blx@error + {Unbalanced parentheses or brackets} + {\iftoggle{blx@footnote}{#1 in foot or endnote}{#1}.\MessageBreak + This error is triggered if \string\bibopenparen\space and + \string\bibcloseparen\MessageBreak or + \string\bibopenbracket\space and \string\bibclosebracket\space + are unbalanced\MessageBreak or mismatched}} + +\def\blx@err@nestparen#1{% + \blx@error + {Too deeply nested parentheses or brackets} + {#1 nested too deeply% + \iftoggle{blx@footnote}{\space in foot or endnote}{}.\MessageBreak + This error may also be triggered if \string\mkbibparens\MessageBreak + or \string\mkbibbrackets\space are nested too deeply}} + \def\blx@warn@nohyph#1{% \blx@warning{No hyphenation patterns for '#1'}} @@ -1150,12 +1159,12 @@ \expandafter\blx@defpunctpairs \expandafter{\the\csname blx@sf@\detokenize{#1}\endcsname}{#2}% \else - \blx@err@invarg{\detokenize{#1}}% + \blx@err@invarg{\detokenize{#1}{}}% \fi \else - \blx@err@invarg{\detokenize{#1}}% + \blx@err@invarg{\detokenize{#1}{}}% \fi} - {\blx@err@invarg{\detokenize{#1}}}} + {\blx@err@invarg{\detokenize{#1}{}}}} \def\blx@defpunctpairs#1#2{% \blx@undefpair{#1}{\the\blx@sf@dot}% @@ -1183,10 +1192,10 @@ \eappto\blx@tempb{% \cslet{blx@pp@\blx@tempa @\the\sfcode`#1}\noexpand\@empty}% \else - \blx@err@invarg{#1}% + \blx@err@invarg{#1}{}% \fi \else - \blx@err@invarg{#1}% + \blx@err@invarg{#1}{}% \fi \expandafter\blx@defpair \fi} @@ -1314,22 +1323,14 @@ \fi \csuse{blx@pq@#1}} -\newrobustcmd*{\unspace}{% - \ifhmode - \expandafter\blx@unspace - \fi} - -\def\blx@unspace{% - \ifdim\lastskip>\z@ - \unskip - \expandafter\blx@unspace - \else - \ifnum\lastpenalty>\z@ - \unpenalty - \expandafter\expandafter - \expandafter\blx@unspace - \fi - \fi} +\providerobustcmd*{\unspace}{% + \ifbool{hmode} + {\ifdimgreater\lastskip\z@ + {\unskip\unspace} + {\ifnumgreater\lastpenalty\z@ + {\unpenalty\unspace} + {}}} + {}} \newrobustcmd*{\bibsentence}{% \leavevmode\spacefactor\blx@sf@par @@ -1490,8 +1491,22 @@ {\ifblank{#2} {\define@key{blx@opt@pre}{#1}{#3}} {\define@key{blx@opt@pre}{#1}[#2]{#3}}} - {\blx@err@confopt{The package option '#1' already exists}}} - {\blx@err@confopt{The package option '#1' already exists}}} + {\blx@err@optdef{#1}}} + {\blx@err@optdef{#1}}} + +% {<key>}[<value>]{<code>} + +\newrobustcmd*{\DeclareTypeOption}[1]{% + \@ifnextchar[%] + {\blx@deftypeopt{#1}} + {\blx@deftypeopt{#1}[]}} + +\long\def\blx@deftypeopt#1[#2]#3{% + \ifcsundef{KV@blx@opt@typ@#1} + {\ifblank{#2} + {\define@key{blx@opt@typ}{#1}{#3}} + {\define@key{blx@opt@typ}{#1}[#2]{#3}}} + {\blx@err@optdef{#1}}} % {<key>}[<value>]{<code>} @@ -1501,11 +1516,11 @@ {\blx@defentryopt{#1}[]}} \long\def\blx@defentryopt#1[#2]#3{% - \ifcsundef{KV@blx@opt@bib@#1} + \ifcsundef{KV@blx@opt@ent@#1} {\ifblank{#2} - {\define@key{blx@opt@bib}{#1}{#3}} - {\define@key{blx@opt@bib}{#1}[#2]{#3}}} - {\blx@err@confopt{The entry option '#1' already exists}}} + {\define@key{blx@opt@ent}{#1}{#3}} + {\define@key{blx@opt@ent}{#1}[#2]{#3}}} + {\blx@err@optdef{#1}}} %% Auxiliary commands @@ -1562,6 +1577,9 @@ \newrobustcmd*{\renewbibmacro}{% \@star@or@long{\blx@defbibmacro\renew@command}} +\newrobustcmd*{\providebibmacro}{% + \@star@or@long{\blx@defbibmacro\provide@command}} + \def\blx@defbibmacro#1#2{% \expandafter#1\csname abx@macro@\detokenize{#2}\endcsname} @@ -1896,12 +1914,16 @@ % {<true>}{<false>} \protected\def\blx@ifciteseen@global{% - \expandafter\blx@ifseen@global - \expandafter{\abx@field@entrykey}} + \ifdef\abx@field@entrykey + {\expandafter\blx@ifseen@global + \expandafter{\abx@field@entrykey}} + {\@secondoftwo}} \protected\def\blx@ifciteseen@context{% - \expandafter\blx@ifseen@context - \expandafter{\abx@field@entrykey}} + \ifdef\abx@field@entrykey + {\expandafter\blx@ifseen@context + \expandafter{\abx@field@entrykey}} + {\@secondoftwo}} % {<entrykey>}{<true>}{<false>} @@ -2530,6 +2552,7 @@ \newblock \newunit \setunit \finentry} \appto\blx@blxinit{% + \def\ifnatbibmode{\iftoggle{blx@natbib}}% \def\ifcitation{\iftoggle{blx@citation}}% \def\ifbibliography{\iftoggle{blx@bibliography}}% \def\ifciteindex{\iftoggle{blx@citeindex}}% @@ -2921,15 +2944,20 @@ \c@liststart#1\relax \fi}% \ifblank{#2} - {\ifnum\c@listtotal>\c@maxnames - \c@liststop\c@minnames - \else - \c@liststop\c@listtotal + {\c@liststop\c@listtotal + \ifnum\c@listtotal>\c@maxnames + \ifnum\c@listtotal>\c@minnames + \c@liststop\c@minnames + \fi \fi} {\ifnum#2>\c@listtotal \c@liststop\c@listtotal \else - \c@liststop#2\relax + \ifnum#2<\@ne + \c@liststop\@ne + \else + \c@liststop#2\relax + \fi \fi}% \def\currentname{#3}% \letcs\blx@thedata{abx@name@#3}% @@ -3003,15 +3031,20 @@ \c@liststart#1\relax \fi}% \ifblank{#2} - {\ifnum\c@listtotal>\c@maxitems - \c@liststop\c@minitems - \else - \c@liststop\c@listtotal + {\c@liststop\c@listtotal + \ifnum\c@listtotal>\c@maxitems + \ifnum\c@listtotal>\c@minitems + \c@liststop\c@minitems + \fi \fi} {\ifnum#2>\c@listtotal \c@liststop\c@listtotal \else - \c@liststop#2\relax + \ifnum#2<\@ne + \c@liststop\@ne + \else + \c@liststop#2\relax + \fi \fi}% \def\currentlist{#3}% \letcs\blx@thedata{abx@list@#3}} @@ -3062,7 +3095,8 @@ \blx@resetdata \blx@getdata{#1}% \blx@entrysetcount - \blx@options + \blx@setoptions@type\abx@field@entrytype + \blx@setoptions@entry \addtocounter{instcount}\@ne \blx@execute \blx@beglang#2\blx@endlang @@ -3411,6 +3445,8 @@ \do{passim}% \do{see}% \do{seealso}% + \do{backrefpage}% + \do{backrefpages}% \do{thiscite}% \do{january}% \do{february}% @@ -3891,6 +3927,7 @@ \def\abx@dofields{% \do{entrykey}% + \do{childentrykey}% \do{entrytype}% \do{entrysubtype}% \do{entryset}% @@ -4057,9 +4094,9 @@ BibTeX \fi reported the following issues% - \ifundef\abx@field@entrykey - {} - {\MessageBreak with '\abx@field@entrykey'}% + \ifdef\abx@field@entrykey + {\MessageBreak with '\abx@field@entrykey'} + {}% :#1}% \blx@warning@noline{\blx@tempa}% \endgroup} @@ -4215,7 +4252,7 @@ \long\def\blx@bbl@options@i#1{\blx@bbl@options@ii#1==&} \long\def\blx@bbl@options@ii#1=#2=#3&{% - \ifcsundef{KV@blx@opt@bib@#1} + \ifcsundef{KV@blx@opt@ent@#1} {\blx@warning@noline{% Ignoring undefined option '#1'\MessageBreak at entry '\abx@field@entrykey'}} @@ -4270,26 +4307,38 @@ \ifcsdef{blx@setc@\the\c@refsection @#1} {\expandafter\expandafter\expandafter\blx@getdata \expandafter\expandafter\expandafter{% - \csname blx@setc@\the\c@refsection @#1\endcsname}} + \csname blx@setc@\the\c@refsection @#1\endcsname}% + \blx@ifdata{#1} + {\def\abx@field@childentrykey{#1}% + \begingroup + \blx@getdata{#1}% + \edef\blx@tempa{\endgroup + \def\noexpand\abx@field@childentrytype{\abx@field@entrytype}}% + \blx@tempa} + {}} {\blx@getdata{#1}}% \ifcsdef{blx@seti@\the\c@refsection @#1} {\letcs\abx@field@entrysetcount{blx@seti@\the\c@refsection @#1}} {}} -\def\blx@getdata@cite@i#1#2{% - \blx@getdata{#1}% - \def\abx@field@entrysetcount{#2}} - \def\blx@execute{% \blx@imc@thefield{execute}} -\def\blx@options{% +\def\blx@setoptions@entry{% \blx@imc@iffieldundef{options} {} {\begingroup - \def\blx@tempa{\endgroup\setkeys{blx@opt@bib}}% - \expandafter\blx@tempa - \expandafter{\abx@field@options}}} + \edef\blx@tempa{\endgroup + \noexpand\setkeys{blx@opt@ent}{\abx@field@options}}% + \blx@tempa}} + +\def\blx@setoptions@type#1{% + \ifcsdef{blx@opts@type@#1} + {\begingroup + \edef\blx@tempa{\endgroup + \noexpand\setkeys{blx@opt@typ}{\csuse{blx@opts@type@#1}}}% + \blx@tempa} + {}} \def\blx@entrysetcount{% \ifdef\abx@field@entrykey @@ -4299,12 +4348,14 @@ {}} {}} -% {<entrykey>}{<type>}{<options>} +% {<entrykey>}{<entrytype>}{<options>} \protected\def\blx@bbl@entry#1#2#3{% \begingroup \edef\abx@field@entrykey{\detokenize{#1}}% - \blx@bbl@options{#3}\blx@options + \blx@setoptions@type{#2}% + \blx@bbl@options{#3}% + \blx@setoptions@entry \edef\blx@bbl@data{blx@data@\the\c@refsection @\abx@field@entrykey}% \csuse\blx@bbl@data \cslet\blx@bbl@data\@empty @@ -4523,7 +4574,7 @@ \def\blx@bblstart{% \let\preamble\blx@bbl@preamble - \let\warn\blx@bbl@warn + \let\warn\blx@bbl@thewarn \let\entry\blx@bbl@entry \let\endentry\blx@bbl@endentry \let\lossort\blx@bbl@lossort @@ -4679,6 +4730,34 @@ %% Bibliography +% {<name>}{<start code>}[<end code>]{<item code>} + +\newrobustcmd*{\defbibenvironment}[4]{% + \long\csdef{blx@env@#1}{#2}% + \long\csdef{blx@endenv@#1}{#3}% + \long\csdef{blx@item@#1}{#4}} + +\defbibenvironment{bibliography} + {\list{}{% + \leftmargin\bibhang + \itemindent-\leftmargin + \itemsep\bibitemsep + \parsep\bibparsep}} + {\endlist} + {\item} + +\defbibenvironment{shorthands} + {\list{\thefield{shorthand}}{% + \labelwidth\shorthandwidth + \labelsep\biblabelsep + \leftmargin\labelwidth + \advance\leftmargin\labelsep + \itemsep\bibitemsep + \parsep\bibparsep + \def\makelabel##1{##1\hss}}} + {\endlist} + {\item} + % {<name>}[<default>]{<code>} \newrobustcmd*{\defbibheading}[1]{% @@ -4858,11 +4937,11 @@ \define@key{blx@bbc}{maxnames}{\blx@key@maxnames{#1}} \def\blx@key@maxnames#1{% \ifnum#1<\c@maxnames - \blx@error - {'maxnames=#1' invalid} - {The value may not be smaller than the global setting}% + \blx@err@confopt{maxnames}{% + The value may not be smaller than the + global 'maxnames' (=\the\c@maxnames)}% \else - \c@maxnames#1\relax + \blx@setmaxnames{#1}% \fi} \define@key{blx@bib}{minnames}{\blx@key@minnames{#1}} @@ -4872,25 +4951,26 @@ \define@key{blx@bbc}{minnames}{\blx@key@minnames{#1}} \def\blx@key@minnames#1{% \ifnum#1<\c@minnames - \blx@error - {'minnames=#1' invalid} - {The value may not be smaller than the global setting}% + \blx@err@confopt{minnames}{% + The value may not be smaller than the + global 'minnames' (=\the\c@minnames)}% \else - \c@minnames#1\relax + \blx@setminnames{#1}% \fi} -\define@key{blx@bib}{maxitems}{\c@maxitems#1\relax} -\define@key{blx@los}{maxitems}{\c@maxitems#1\relax} -\define@key{blx@bbs}{maxitems}{\c@maxitems#1\relax} -\define@key{blx@bbg}{maxitems}{\c@maxitems#1\relax} -\define@key{blx@bbc}{maxitems}{\c@maxitems#1\relax} +\define@key{blx@bib}{maxitems}{\blx@setmaxitems{#1}} +\define@key{blx@los}{maxitems}{\blx@setmaxitems{#1}} +\define@key{blx@bbs}{maxitems}{\blx@setmaxitems{#1}} +\define@key{blx@bbg}{maxitems}{\blx@setmaxitems{#1}} +\define@key{blx@bbc}{maxitems}{\blx@setmaxitems{#1}} -\define@key{blx@bib}{minitems}{\c@minitems#1\relax} -\define@key{blx@los}{minitems}{\c@minitems#1\relax} -\define@key{blx@bbs}{minitems}{\c@minitems#1\relax} -\define@key{blx@bbg}{minitems}{\c@minitems#1\relax} -\define@key{blx@bbc}{minitems}{\c@minitems#1\relax} +\define@key{blx@bib}{minitems}{\blx@setminitems{#1}} +\define@key{blx@los}{minitems}{\blx@setminitems{#1}} +\define@key{blx@bbs}{minitems}{\blx@setminitems{#1}} +\define@key{blx@bbg}{minitems}{\blx@setminitems{#1}} +\define@key{blx@bbc}{minitems}{\blx@setminitems{#1}} +\define@key{blx@bhd}{heading}{\blx@key@heading{#1}} \define@key{blx@bib}{heading}{\blx@key@heading{#1}} \define@key{blx@los}{heading}{\blx@key@heading{#1}} \define@key{blx@bbs}{heading}{\blx@key@heading{#1}} @@ -4900,11 +4980,23 @@ {\blx@error {Heading '#1' undefined} {Use \string\defbibheading\space to define it}} - {\def\blx@tempb{#1}}} + {\def\blx@theheading{#1}}} + +\define@key{blx@bib}{env}{\blx@key@env{#1}} +\define@key{blx@los}{env}{\blx@key@env{#1}} +\define@key{blx@bbs}{env}{\blx@key@env{#1}} +\define@key{blx@bbg}{env}{\blx@key@env{#1}} +\define@key{blx@bbc}{env}{\blx@key@env{#1}} +\def\blx@key@env#1{% + \ifcsundef{blx@env@#1} + {\blx@error + {Environment '#1' undefined} + {Use \string\defbibenvironment\space to define it}} + {\def\blx@theenv{#1}}} -\define@key{blx@bib}{title}{\blx@key@title{#1}} -\define@key{blx@los}{title}{\blx@key@title{#1}} -\def\blx@key@title{\long\def\blx@tempe} +\define@key{blx@bhd}{title}{\long\def\blx@thetitle{#1}} +\define@key{blx@bib}{title}{\long\def\blx@thetitle{#1}} +\define@key{blx@los}{title}{\long\def\blx@thetitle{#1}} \define@key{blx@bib}{prenote}{\blx@key@prenote{#1}} \define@key{blx@los}{prenote}{\blx@key@prenote{#1}} @@ -4916,7 +5008,7 @@ {\blx@error {Note '#1' undefined} {Use \string\defbibnote\space to define it}} - {\def\blx@tempc{#1}}} + {\def\blx@theprenote{#1}}} \define@key{blx@bib}{postnote}{\blx@key@postnote{#1}} \define@key{blx@los}{postnote}{\blx@key@postnote{#1}} @@ -4928,7 +5020,28 @@ {\blx@error {Note '#1' undefined} {Use \string\defbibnote\space to define it}} - {\def\blx@tempd{#1}}} + {\def\blx@thepostnote{#1}}} + +% [<options>] + +\newrobustcmd*{\printbibheading}{% + \begingroup + \edef\on@line{\on@line}% + \@ifnextchar[%] + {\blx@printbibheading} + {\blx@printbibheading[]}} + +\def\blx@printbibheading[#1]{% + \def\blx@theheading{bibliography}% + \let\blx@thetitle\@empty + \blx@safe@actives + \setkeys{blx@bhd}{#1}% + \blx@rest@actives + \edef\blx@tempa{\endgroup + \noexpand\blx@bibheading + {\expandonce\blx@theheading} + {\expandonce\blx@thetitle}}% + \blx@tempa} % [<options>] @@ -4943,10 +5056,11 @@ \toggletrue{blx@tempa}% \toggletrue{blx@tempb}% \letcs\blx@tempa{blx@sbib@\the\c@refsection}% - \def\blx@tempb{bibliography}% - \let\blx@tempc\@empty - \let\blx@tempd\@empty - \let\blx@tempe\@empty + \def\blx@theheading{bibliography}% + \def\blx@theenv{bibliography}% + \let\blx@theprenote\@empty + \let\blx@thepostnote\@empty + \let\blx@thetitle\@empty \blx@safe@actives \setkeys{blx@bib}{#1}% \blx@rest@actives @@ -4967,10 +5081,11 @@ {\blx@bibbysection[]}} \def\blx@bibbysection[#1]{% - \def\blx@tempb{bibliography}% - \let\blx@tempc\@empty - \let\blx@tempd\@empty - \let\blx@tempe\@empty + \def\blx@theheading{bibliography}% + \def\blx@theenv{bibliography}% + \let\blx@theprenote\@empty + \let\blx@thepostnote\@empty + \let\blx@thetitle\@empty \c@refsection\@ne \blx@safe@actives \setkeys{blx@bbs}{#1}% @@ -5005,10 +5120,11 @@ {\blx@bibbysegment[]}} \def\blx@bibbysegment[#1]{% - \def\blx@tempb{bibliography}% - \let\blx@tempc\@empty - \let\blx@tempd\@empty - \let\blx@tempe\@empty + \def\blx@theheading{bibliography}% + \def\blx@theenv{bibliography}% + \let\blx@theprenote\@empty + \let\blx@thepostnote\@empty + \let\blx@thetitle\@empty \c@refsection\z@ \c@refsegment\@ne \blx@safe@actives @@ -5046,10 +5162,11 @@ {\blx@bibbycategory[]}} \def\blx@bibbycategory[#1]{% - \def\blx@tempb{bibliography}% - \let\blx@tempc\@empty - \let\blx@tempd\@empty - \let\blx@tempe\@empty + \def\blx@theheading{bibliography}% + \def\blx@theenv{bibliography}% + \let\blx@theprenote\@empty + \let\blx@thepostnote\@empty + \let\blx@thetitle\@empty \c@refsection\z@ \blx@safe@actives \setkeys{blx@bbc}{#1}% @@ -5076,8 +5193,8 @@ % {<entrykey>,...} \def\blx@bibliography{% - \blx@bibheading\blx@tempb\blx@tempe - \blx@bibnote\blx@tempc + \blx@bibheading\blx@theheading\blx@thetitle + \blx@bibnote\blx@theprenote \begingroup \blx@bibinit \let\@noitemerr\@empty @@ -5088,24 +5205,25 @@ \ifnum\bibnamesep=\z@ \let\blx@namesep\relax \fi - \thebibliography\relax + \csuse{blx@env@\blx@theenv}% \csuse{blx@hook@bibinit}% \let\blx@do\blx@bibitem \let\blx@done\blx@endbibliography \blx@listloop} \def\blx@endbibliography{% - \endthebibliography + \csuse{blx@endenv@\blx@theenv}% \par\nobreak \blx@noitem \endgroup - \blx@bibnote\blx@tempd + \blx@bibnote\blx@thepostnote \endgroup} \def\blx@bibheading#1#2{% \let\newrefsection\relax \let\newrefsegment\relax - \ifdefempty#2 + \expandafter\ifblank + \expandafter{#2} {\csuse{blx@head@#1}} {\csuse{blx@head@#1}[#2]}% \let\newrefsection\blx@newrefsection @@ -5139,10 +5257,11 @@ \begingroup \blx@getdata{#1}% \blx@ifdriver{\abx@field@entrytype} - {\blx@options + {\blx@setoptions@type\abx@field@entrytype + \blx@setoptions@entry \blx@thelabelnumber \addtocounter{instcount}\@ne - \thebibitem\relax + \csuse{blx@item@\blx@theenv}\relax \blx@initsep \blx@namesep \csuse{blx@hook@bibitem}% @@ -5178,15 +5297,6 @@ \fi \global\let\blx@prevhash\abx@field@fullhash} -\providecommand*{\thebibliography}{} -\renewenvironment*{thebibliography} - {\list{}{% - \leftmargin\bibhang - \itemindent-\leftmargin - \itemsep\bibitemsep - \parsep\bibparsep}} - {\endlist} -\newcommand*{\thebibitem}{\item} \newrobustcmd*{\AtBeginBibliography}{\gappto\blx@hook@bibinit} \newrobustcmd*{\AtEveryBibitem}{\gappto\blx@hook@bibitem} \@onlypreamble\AtBeginBibliography @@ -5266,10 +5376,11 @@ \toggletrue{blx@tempa}% \toggletrue{blx@tempb}% \letcs\blx@tempa{blx@losh@\the\c@refsection}% - \def\blx@tempb{shorthands}% - \let\blx@tempc\@empty - \let\blx@tempd\@empty - \let\blx@tempe\@empty + \def\blx@theheading{shorthands}% + \def\blx@theenv{shorthands}% + \let\blx@theprenote\@empty + \let\blx@thepostnote\@empty + \let\blx@thetitle\@empty \let\blx@printbibchecks\relax \blx@safe@actives \setkeys{blx@los}{#1}% @@ -5294,38 +5405,27 @@ \else \@restonecolfalse \fi - \blx@bibheading\blx@tempb\blx@tempe - \blx@bibnote\blx@tempc + \blx@bibheading\blx@theheading\blx@thetitle + \blx@bibnote\blx@theprenote \begingroup \blx@bibinit \let\@noitemerr\@empty \let\blx@noitem\blx@warn@losempty - \theshorthands\relax + \csuse{blx@env@\blx@theenv}% \csuse{blx@hook@losinit}% \let\blx@do\blx@lositem \let\blx@done\blx@endshorthands \blx@listloop} \def\blx@endshorthands{% - \endtheshorthands + \csuse{blx@endenv@\blx@theenv}% \par\nobreak \blx@noitem \endgroup - \blx@bibnote\blx@tempd + \blx@bibnote\blx@thepostnote \endgroup \if@restonecol\twocolumn\fi} -\newcommand*{\thelositem}{\item} -\newenvironment*{theshorthands} - {\list{\thefield{shorthand}}{% - \labelwidth\shorthandwidth - \labelsep\biblabelsep - \leftmargin\labelwidth - \advance\leftmargin\labelsep - \itemsep\bibitemsep - \parsep\bibparsep - \def\makelabel##1{##1\hss}}} - {\endlist} \newrobustcmd*{\AtBeginShorthands}{\gappto\blx@hook@losinit} \newrobustcmd*{\AtEveryLositem}{\gappto\blx@hook@lositem} \@onlypreamble\AtBeginShorthands @@ -5338,9 +5438,10 @@ {\let\blx@noitem\@empty \begingroup \blx@getdata{#1}% - \blx@options + \blx@setoptions@type\abx@field@entrytype + \blx@setoptions@entry \addtocounter{instcount}\@ne - \thelositem\relax + \csuse{blx@item@\blx@theenv}\relax \csuse{blx@hook@lositem}% \blx@execute \blx@initunit @@ -5499,7 +5600,7 @@ \AtEndDocument{\let\abx@aux@category\@gobbletwo} -%% Legacy commands +% Database \renewrobustcmd*{\bibliography}[1]{% \ifx\blx@bibfiles\@empty @@ -5509,21 +5610,6 @@ \fi} \let\blx@bibfiles\@empty -\AtBeginDocument{% - \protected\def\bibliography#1{% - \blx@error - {'\string\bibliography' invalid at this point} - {'\string\bibliography' must be given in the - preamble.\MessageBreak I'm ignoring the command}}} - -\renewrobustcmd*{\bibliographystyle}[1]{% - \blx@error - {'\string\bibliographystyle' invalid} - {'\string\bibliographystyle' is not supported. - Use the package\MessageBreak option 'style' or - the options 'bibstyle' and 'citestyle'.\MessageBreak - I'm ignoring the command}} - %% Citations \newrobustcmd*{\AtEveryCite}{\gappto\blx@hook@cite} @@ -5716,7 +5802,8 @@ \blx@getdata@cite{#1}% \fi \blx@entrysetcount - \blx@options + \blx@setoptions@type\abx@field@entrytype + \blx@setoptions@entry \blx@backref \blx@pagetracker \csuse{blx@hook@citekey}% @@ -6524,7 +6611,7 @@ \ifblank{#1} {\let\blx@thecheckpunct\blx@nocheckpunct} {\let\blx@thecheckpunct\blx@checkpunct - \edef\blx@autopunct{#1}}} + \edef\blx@autopunct{\detokenize{#1}}}} % [<prenote>][<postnote>]{<entrykey>,...}[<format>]{<namelist>}<punct> @@ -6674,6 +6761,7 @@ \def\iffieldnums#1{\blx@TE{\blx@imc@iffieldnums{#1}}}% \def\ifbibstring#1{\blx@TE{\blx@imc@ifbibstring{#1}}}% \def\iffieldbibstring#1{\blx@TE{\blx@imc@iffieldbibstring{#1}}}% + \def\ifnatbibmode{\blx@TE{\iftoggle{blx@natbib}}}% \def\ifcitation{\blx@TE{\iftoggle{blx@citation}}}% \def\ifbibliography{\blx@TE{\iftoggle{blx@bibliography}}}% \def\ifciteindex{\blx@TE{\iftoggle{blx@citeindex}}}% @@ -6804,38 +6892,125 @@ \newcommand*{\bibleftbracket}{\blx@postpunct[} \newcommand*{\bibrightbracket}{\blx@postpunct]\midsentence} -\newrobustcmd{\mkbibparens}[1]{% +\def\blx@parenlevel{% + \iftoggle{blx@footnote} + {\blx@parenlevel@foot} + {\blx@parenlevel@text}} + +\newrobustcmd*{\blx@bibopenparen}{% + \blx@opencheck\bibopenparen + \blx@postpunct + \ifnum\blx@parenlevel=\z@ + \global\blx@parenlevel\@ne + \global\c@parenlevel\@ne + \expandafter\bibleftparen + \else + \expandafter\blx@openparen + \fi} + +\newrobustcmd*{\blx@bibopenbracket}{% + \blx@opencheck\bibopenbracket \blx@postpunct + \ifnum\blx@parenlevel=\z@ + \global\blx@parenlevel1002 + \global\c@parenlevel\@ne + \expandafter\bibleftbracket + \else + \expandafter\blx@openparen + \fi} + +\newrobustcmd*{\blx@bibcloseparen}{% + \blx@closecheck\bibcloseparen + \blx@postpunct\blx@closeparen} + +\newrobustcmd*{\blx@bibclosebracket}{% + \blx@closecheck\bibclosebracket + \blx@postpunct\blx@closeparen} + +\def\blx@openparen{% + \ifodd\blx@parenlevel + \global\advance\blx@parenlevel\@ne + \global\advance\c@parenlevel\@ne + \expandafter\bibleftbracket + \else + \global\advance\blx@parenlevel\@ne + \global\advance\c@parenlevel\@ne + \expandafter\bibleftparen + \fi} + +\def\blx@closeparen{% + \ifodd\blx@parenlevel + \blx@closeparen@i + \expandafter\bibrightparen + \else + \blx@closeparen@i + \expandafter\bibrightbracket + \fi} + +\def\blx@closeparen@i{% + \ifnum\blx@parenlevel=1002 + \global\blx@parenlevel\z@ + \global\c@parenlevel\z@ + \else + \global\advance\blx@parenlevel\m@ne + \global\advance\c@parenlevel\m@ne + \fi} + +\def\blx@opencheck#1{% + \ifnum\numexpr\blx@parenlevel+\@ne + \ifnum\blx@parenlevel>\@m -1001\fi + >\c@maxparens + \blx@err@nestparen{\string#1}% + \blx@errormark + \fi} + +\def\blx@closecheck#1{% + \ifnum\numexpr\blx@parenlevel + \ifnum\blx@parenlevel>\@m -1001\fi + >\c@maxparens + \blx@err@nestparen{\string#1}% + \blx@errormark + \fi + \ifnum\blx@parenlevel<\@ne + \blx@err@matchparen{Unmatched \string#1}% + \blx@errormark + \fi} + +\AtEndDocument{% + \unless\ifnum\blx@parenlevel@text=\z@ + \blx@err@matchparen{% + Unbalanced parentheses or brackets in the document body}% + \fi + \unless\ifnum\blx@parenlevel@foot=\z@ + \blx@err@matchparen{% + Unbalanced parentheses or brackets in a foot or endnote}% + \fi} + +\newrobustcmd{\mkbibparens}[1]{% \begingroup - \let\mkbibparens\blx@noparens - \bibleftparen#1\blx@postpunct\bibrightparen + \blx@blxinit + \blx@setsfcodes + \bibopenparen#1\bibcloseparen \endgroup} -\long\def\blx@noparens#1{% - \blx@warning{Nested parentheses}% - \mkbibbrackets{#1}} - \newrobustcmd{\mkbibbrackets}[1]{% - \blx@postpunct \begingroup - \let\mkbibbrackets\blx@nobrackets - \bibleftbracket#1\blx@postpunct\bibrightbracket + \blx@blxinit + \blx@setsfcodes + \bibopenbracket#1\bibclosebracket \endgroup} -\long\def\blx@nobrackets#1{% - \blx@warning{Nested brackets}% - <#1\blx@postpunct>} +\newrobustcmd*{\parentext}{\mkbibparens} +\newrobustcmd*{\brackettext}{\mkbibbrackets} \newrobustcmd{\mkbibsuperscript}[1]{% \unspace\allowhyphens\textsuperscript{% \begingroup - \let\mkbibsuperscript\blx@nosuperscript + \protected\long\def\mkbibsuperscript##1{% + \blx@warning{Nested superscript}% + \mkbibbrackets{##1}}% #1\endgroup}} -\long\def\blx@nosuperscript#1{% - \blx@warning{Nested superscripts}% - \mkbibbrackets{#1}} - \newrobustcmd{\mkbibfootnote}{\blx@mkbibfootnote{}} \newrobustcmd{\mkbibfootnotetext}{\blx@mkbibfootnote{text}} \newrobustcmd{\blx@mkbibfootnote}[2]{% @@ -6950,9 +7125,17 @@ %% Package options -% {<options>} +% [<entrytype>]{<options>} -\newrobustcmd*{\ExecuteBibliographyOptions}{\setkeys{blx@opt@pre}} +\newrobustcmd*{\ExecuteBibliographyOptions}[2][]{% + \ifblank{#1} + {\setkeys{blx@opt@pre}{#2}} + {\ifdef\blx@opts@type + {\ifinlist{#1}{\blx@opts@type} + {} + {\listadd\blx@opts@type{#1}}} + {\listadd\blx@opts@type{#1}}% + \csappto{blx@opts@type@#1}{#2}}} \@onlypreamble\ExecuteBibliographyOptions % load-time only @@ -6978,7 +7161,7 @@ \DeclareBibliographyOption{backend}{% \ifcsdef{blx@backend@#1} {\letcs\blx@backend{blx@backend@#1}} - {\blx@err@invopt{backend=#1}}} + {\blx@err@invopt{backend=#1}{}}} \chardef\blx@backend@bibtex=0 \expandafter\chardef\csname blx@backend@bibtex8\endcsname=1 \chardef\blx@backend@biber=2 @@ -7011,7 +7194,7 @@ \DeclareBibliographyOption{sorting}{% \ifcsdef{blx@opt@sorting@#1} {\def\blx@sorting{#1}} - {\blx@err@invopt{sorting=#1}}} + {\blx@err@invopt{sorting=#1}{}}} \def\blx@opt@sorting@none{0} \def\blx@opt@sorting@nty{1} \def\blx@opt@sorting@nyt{2} @@ -7025,36 +7208,64 @@ \DeclareBibliographyOption{sortlos}{% \ifcsdef{blx@opt@sortlos@#1} {\letcs\blx@sortlos{blx@opt@sortlos@#1}} - {\blx@err@invopt{sortlos=#1}}} + {\blx@err@invopt{sortlos=#1}{}}} \def\blx@opt@sortlos@bib{0} \def\blx@opt@sortlos@los{1} -\DeclareBibliographyOption{maxnames}{% +\DeclareBibliographyOption{maxnames}{\blx@setmaxnames{#1}} +\def\blx@setmaxnames#1{% \ifnum#1<\@ne - \c@maxnames\@ne + \blx@err@invopt{maxnames=#1} + {'maxnames' must be greater than zero}% \else - \c@maxnames#1\relax + \ifnum#1<\c@minnames + \blx@err@confopt{maxnames/minnames} + {'maxnames' must be greater than or equal to 'minnames'}% + \else + \c@maxnames#1\relax + \fi \fi} -\DeclareBibliographyOption{minnames}{% +\DeclareBibliographyOption{minnames}{\blx@setminnames{#1}} +\def\blx@setminnames#1{% \ifnum#1<\@ne - \c@minnames\@ne + \blx@err@invopt{minnames=#1} + {'minnames' must be greater than zero}% \else - \c@minnames#1\relax + \ifnum#1>\c@maxnames + \blx@err@confopt{maxnames/minnames} + {'minnames' must be less than or equal to 'maxnames'}% + \else + \c@minnames#1\relax + \fi \fi} -\DeclareBibliographyOption{maxitems}{% +\DeclareBibliographyOption{maxitems}{\blx@setmaxitems{#1}} +\def\blx@setmaxitems#1{% \ifnum#1<\@ne - \c@maxitems\@ne + \blx@err@invopt{maxitems=#1} + {'maxitems' must be greater than zero}% \else - \c@maxitems#1\relax + \ifnum#1<\c@minitems + \blx@err@confopt{maxitems/minitems} + {'maxitems' must be greater than or equal to 'minitems'}% + \else + \c@maxitems#1\relax + \fi \fi} -\DeclareBibliographyOption{minitems}{% +\DeclareBibliographyOption{minitems}{\blx@setminitems{#1}} +\def\blx@setminitems#1{% \ifnum#1<\@ne - \c@minitems\@ne + \blx@err@invopt{minitems=#1} + {'minitems' must be greater than zero}% \else - \c@minitems#1\relax + \ifnum#1>\c@maxitems + \blx@err@confopt{maxitems/minitems} + {'minitems' must be less than or equal to 'maxitems'}% + \else + \c@minitems#1\relax + \fi \fi} \DeclareBibliographyOption{maxline}{% @@ -7093,7 +7304,7 @@ \DeclareBibliographyOption{babel}{% \ifcsdef{blx@opt@babel@#1} {\csuse{blx@opt@babel@#1}} - {\blx@err@invopt{babel=#1}}} + {\blx@err@invopt{babel=#1}{}}} \def\blx@opt@babel@none{% \undef\blx@thelangenv \let\blx@hook@endlang\@empty} @@ -7110,7 +7321,7 @@ \DeclareBibliographyOption{indexing}[true]{% \ifcsdef{blx@opt@index@#1} {\csuse{blx@opt@index@#1}} - {\blx@err@invopt{indexing=#1}}} + {\blx@err@invopt{indexing=#1}{}}} \def\blx@opt@index@true{% \toggletrue{blx@citeindex}% \toggletrue{blx@bibindex}} @@ -7134,7 +7345,7 @@ \DeclareBibliographyOption{hyperref}[true]{% \ifcsdef{blx@opt@hyperref@#1} {\letcs\blx@hyperref{blx@opt@hyperref@#1}} - {\blx@err@invopt{hyperref=#1}}} + {\blx@err@invopt{hyperref=#1}{}}} \def\blx@opt@hyperref@false{0} \def\blx@opt@hyperref@true{1} \def\blx@opt@hyperref@auto{2} @@ -7163,7 +7374,7 @@ \DeclareBibliographyOption{block}{% \ifcsdef{blx@opt@block@#1} {\csuse{blx@opt@block@#1}} - {\blx@err@invopt{block=#1}}} + {\blx@err@invopt{block=#1}{}}} \def\blx@opt@block@none{% \let\blx@bibsetup\@empty \let\newblockpunct\@empty} @@ -7188,7 +7399,7 @@ \DeclareBibliographyOption{pagetracker}[true]{% \ifcsdef{blx@opt@pagetracker@#1} {\csuse{blx@opt@pagetracker@#1}} - {\blx@err@invopt{pagetracker=#1}}} + {\blx@err@invopt{pagetracker=#1}{}}} \def\blx@opt@pagetracker@true{% \if@twoside \blx@opt@pagetracker@spread @@ -7221,7 +7432,7 @@ \DeclareBibliographyOption{citetracker}[true]{% \ifcsdef{blx@opt@citetracker@#1} {\csuse{blx@opt@citetracker@#1}} - {\blx@err@invopt{citetracker=#1}}} + {\blx@err@invopt{citetracker=#1}{}}} \def\blx@opt@citetracker@true{% \let\blx@imc@ifciteseen\blx@ifciteseen@global \let\blx@imc@ifentryseen\blx@ifentryseen@global @@ -7252,7 +7463,7 @@ \DeclareBibliographyOption{ibidtracker}[true]{% \ifcsdef{blx@opt@ibidtracker@#1} {\csuse{blx@opt@ibidtracker@#1}} - {\blx@err@invopt{ibidtracker=#1}}} + {\blx@err@invopt{ibidtracker=#1}{}}} \def\blx@opt@ibidtracker@true{% \let\blx@imc@ifciteibid\blx@ifciteibid@global \let\blx@ibidtracker\blx@ibidtracker@gobal @@ -7281,7 +7492,7 @@ \DeclareBibliographyOption{idemtracker}[true]{% \ifcsdef{blx@opt@idemtracker@#1} {\csuse{blx@opt@idemtracker@#1}} - {\blx@err@invopt{idemtracker=#1}}} + {\blx@err@invopt{idemtracker=#1}{}}} \def\blx@opt@idemtracker@true{% \let\blx@imc@ifciteidem\blx@ifciteidem@global \let\blx@idemtracker\blx@idemtracker@gobal @@ -7310,7 +7521,7 @@ \DeclareBibliographyOption{opcittracker}[true]{% \ifcsdef{blx@opt@opcittracker@#1} {\csuse{blx@opt@opcittracker@#1}} - {\blx@err@invopt{opcittracker=#1}}} + {\blx@err@invopt{opcittracker=#1}{}}} \def\blx@opt@opcittracker@true{% \let\blx@imc@ifopcit\blx@ifopcit@global \let\blx@opcittracker\blx@opcittracker@gobal @@ -7339,7 +7550,7 @@ \DeclareBibliographyOption{loccittracker}[true]{% \ifcsdef{blx@opt@loccittracker@#1} {\csuse{blx@opt@loccittracker@#1}} - {\blx@err@invopt{loccittracker=#1}}} + {\blx@err@invopt{loccittracker=#1}{}}} \def\blx@opt@loccittracker@true{% \let\blx@imc@ifloccit\blx@ifloccit@global \let\blx@loccittracker\blx@loccittracker@gobal @@ -7365,25 +7576,41 @@ \let\blx@loccitreset\blx@loccitreset@context \booltrue{citetracker}} +\DeclareBibliographyOption{parentracker}[true]{% + \ifstrequal{#1}{true} + {\let\bibopenparen\blx@bibopenparen + \let\bibcloseparen\blx@bibcloseparen + \let\bibopenbracket\blx@bibopenbracket + \let\bibclosebracket\blx@bibclosebracket} + {\protected\def\bibopenparen{\bibleftparen}% + \protected\def\bibcloseparen{\bibrightparen}% + \protected\def\bibopenbracket{\bibleftbracket}% + \protected\def\bibclosebracket{\bibrightbracket}}} + +\DeclareBibliographyOption{maxparens}{% + \ifnumless{#1}{1} + {\blx@err@invopt{maxparens=#1}{}} + {\setcounter{maxparens}{#1}}} + \DeclareBibliographyOption{date}{% \ifcsundef{mkbibrange#1} - {\blx@err@invopt{date=#1}} + {\blx@err@invopt{date=#1}{}} {\protected\def\blx@imc@printdate{\csuse{mkbibrange#1}{}}% \protected\def\blx@imc@printdateextra{\csuse{mkbibrange#1extra}{}}}} \DeclareBibliographyOption{urldate}{% \ifcsundef{mkbibrange#1} - {\blx@err@invopt{urldate=#1}} + {\blx@err@invopt{urldate=#1}{}} {\protected\def\blx@imc@printurldate{\csuse{mkbibrange#1}{url}}}} \DeclareBibliographyOption{eventdate}{% \ifcsundef{mkbibrange#1} - {\blx@err@invopt{eventdate=#1}} + {\blx@err@invopt{eventdate=#1}{}} {\protected\def\blx@imc@printeventdate{\csuse{mkbibrange#1}{event}}}} \DeclareBibliographyOption{origdate}{% \ifcsundef{mkbibrange#1} - {\blx@err@invopt{origdate=#1}} + {\blx@err@invopt{origdate=#1}{}} {\protected\def\blx@imc@printorigdate{\csuse{mkbibrange#1}{orig}}}} \DeclareBibliographyOption{alldates}{% @@ -7406,7 +7633,7 @@ \DeclareBibliographyOption{notetype}{% \ifcsdef{blx@opt@notetype@#1} {\blx@notetype\csuse{blx@opt@notetype@#1}} - {\blx@err@invopt{notetype=#1}}} + {\blx@err@invopt{notetype=#1}{}}} \cslet{blx@opt@notetype@foot+end}\z@ \let\blx@opt@notetype@footonly\@ne \let\blx@opt@notetype@endonly\tw@ @@ -7426,23 +7653,35 @@ \iftoggle{blx@labelnumber} {} {\KV@blx@opt@pre@defernums{false}}} +\DeclareTypeOption{labelnumber}[true]{% FIXME: per-type check + \settoggle{blx@labelnumber}{#1}} \DeclareBibliographyOption{labelalpha}[true]{% \settoggle{blx@labelalpha}{#1}} +\DeclareTypeOption{labelalpha}[true]{% + \settoggle{blx@labelalpha}{#1}} \DeclareBibliographyOption{labelyear}[true]{% \settoggle{blx@labelyear}{#1}} +\DeclareTypeOption{labelyear}[true]{% + \settoggle{blx@labelyear}{#1}} \DeclareBibliographyOption{uniquename}[true]{% \ifcsdef{blx@opt@uniquename@#1} {\letcs\blx@uniquename{blx@opt@uniquename@#1}} - {\blx@err@invopt{uniquename=#1}}} + {\blx@err@invopt{uniquename=#1}{}}} +\DeclareTypeOption{uniquename}[true]{% + \ifcsdef{blx@opt@uniquename@#1} + {\letcs\blx@uniquename{blx@opt@uniquename@#1}} + {\blx@err@invopt{uniquename=#1}{}}} \def\blx@opt@uniquename@false{0} -\def\blx@opt@uniquename@true{1} -\def\blx@opt@uniquename@init{2} +\def\blx@opt@uniquename@init{1} +\def\blx@opt@uniquename@true{2} \DeclareBibliographyOption{singletitle}[true]{% \settoggle{blx@singletitle}{#1}} +\DeclareTypeOption{singletitle}[true]{% + \settoggle{blx@singletitle}{#1}} \DeclareBibliographyOption{defernums}[true]{% \settoggle{blx@defernums}{#1}% @@ -7456,7 +7695,7 @@ \DeclareBibliographyOption{refsection}{% \ifcsdef{blx@opt@refsection@#1} {\letcs\blx@refhook@section{blx@opt@refsection@#1}} - {\blx@err@invopt{refsection=#1}}} + {\blx@err@invopt{refsection=#1}{}}} \def\blx@opt@refsection@none{0} \def\blx@opt@refsection@part{1} \def\blx@opt@refsection@chapter{2} @@ -7466,7 +7705,7 @@ \DeclareBibliographyOption{refsegment}{% \ifcsdef{blx@opt@refsegment@#1} {\letcs\blx@refhook@segment{blx@opt@refsegment@#1}} - {\blx@err@invopt{refsegment=#1}}} + {\blx@err@invopt{refsegment=#1}{}}} \def\blx@opt@refsegment@none{0} \def\blx@opt@refsegment@part{1} \def\blx@opt@refsegment@chapter{2} @@ -7476,55 +7715,72 @@ \DeclareBibliographyOption{citereset}{% \ifcsdef{blx@opt@citereset@#1} {\letcs\blx@resethook{blx@opt@citereset@#1}} - {\blx@err@invopt{citereset=#1}}} + {\blx@err@invopt{citereset=#1}{}}} \def\blx@opt@citereset@none{0} \def\blx@opt@citereset@part{1} \def\blx@opt@citereset@chapter{2} \def\blx@opt@citereset@section{3} \def\blx@opt@citereset@subsection{4} +\DeclareBibliographyOption{bibwarn}[true]{% + \ifstrequal{#1}{true} + {\let\blx@bbl@thewarn\blx@bbl@warn} + {\let\blx@bbl@thewarn\@gobble}} + % Entry options \DeclareBibliographyOption{useprefix}[true]{% \settoggle{blx@useprefix}{#1}} +\DeclareTypeOption{useprefix}[true]{% + \settoggle{blx@useprefix}{#1}} \DeclareEntryOption{useprefix}[true]{% \settoggle{blx@useprefix}{#1}} \DeclareBibliographyOption{useauthor}[true]{% \settoggle{blx@useauthor}{#1}} +\DeclareTypeOption{useauthor}[true]{% + \settoggle{blx@useauthor}{#1}} \DeclareEntryOption{useauthor}[true]{% \settoggle{blx@useauthor}{#1}} \DeclareBibliographyOption{useeditor}[true]{% \settoggle{blx@useeditor}{#1}} +\DeclareTypeOption{useeditor}[true]{% + \settoggle{blx@useeditor}{#1}} \DeclareEntryOption{useeditor}[true]{% \settoggle{blx@useeditor}{#1}} \DeclareBibliographyOption{usetranslator}[true]{% \settoggle{blx@usetranslator}{#1}} +\DeclareTypeOption{usetranslator}[true]{% + \settoggle{blx@usetranslator}{#1}} \DeclareEntryOption{usetranslator}[true]{% \settoggle{blx@usetranslator}{#1}} +\DeclareTypeOption{skipbib}[true]{% + \settoggle{blx@skipbib}{#1}} \DeclareEntryOption{skipbib}[true]{% \settoggle{blx@skipbib}{#1}} + +\DeclareTypeOption{skiplos}[true]{% + \settoggle{blx@skiplos}{#1}} \DeclareEntryOption{skiplos}[true]{% \settoggle{blx@skiplos}{#1}} + +\DeclareTypeOption{skiplab}[true]{% + \settoggle{blx@skiplab}{#1}} \DeclareEntryOption{skiplab}[true]{% \settoggle{blx@skiplab}{#1}} + +\DeclareTypeOption{dataonly}[true]{% + \settoggle{blx@skipbib}{#1}% + \settoggle{blx@skiplos}{#1}% + \settoggle{blx@skiplab}{#1}} \DeclareEntryOption{dataonly}[true]{% \settoggle{blx@skipbib}{#1}% \settoggle{blx@skiplos}{#1}% \settoggle{blx@skiplab}{#1}} -% Legacy options - -\DeclareBibliographyOption{bibtex8}[true]{% - \ifstrequal{#1}{true} - {\letcs\blx@backend{blx@backend@bibtex8}} - {\letcs\blx@backend{blx@backend@bibtex}}} - -\DeclareOption{openbib}{\setkeys{blx@opt@pre}{block=par}} - % Option processor/scheduler \DeclareOption*{% @@ -7559,7 +7815,11 @@ language=auto,babel=none,date=comp,origdate=comp,eventdate=comp, urldate=short,autopunct=true,punctfont=false,defernums=false, refsection=none,refsegment=none,citereset=none,hyperref=auto, - maxline=79} + maxline=79,parentracker,maxparens=3,bibwarn} + +% Load compatibility code + +\input{blx-compat.def} % Process load-time options @@ -7577,7 +7837,7 @@ \input{biblatex.def} \iftoggle{blx@natbib} - {\blx@inputonce{bibnatex.def}{natbib compatibility}{}{}{}{}} + {\blx@inputonce{blx-natbib.def}{natbib compatibility}{}{}{}{}} {} \RequireBibliographyStyle{\blx@bbxfile} \RequireCitationStyle{\blx@cbxfile} @@ -7609,10 +7869,11 @@ \ifnum\blx@refhook@segment>\z@ \ifnum\blx@refhook@segment>\blx@refhook@section\relax \else - \blx@err@confopt{% - The 'refsegment' option must point to a - lower-level\MessageBreak document division - than 'refsection'}% + \blx@err@confopt + {refsegment/refsection} + {The 'refsegment' option must point to a + lower-level\MessageBreak document division + than 'refsection'}% \def\blx@refhook@segment{0}% \fi \fi @@ -7694,18 +7955,6 @@ {} {\blx@err@patch{\string\part}}}% \fi - \ifnum\c@minnames>\c@maxnames - \blx@err@confopt{% - The value of 'minnames' must be smaller than\MessageBreak - or equal to the value of 'maxnames'}% - \c@minnames\c@maxnames - \fi - \ifnum\c@minitems>\c@maxitems - \blx@err@confopt{% - The value of 'minitems' must be smaller than\MessageBreak - or equal to the value of 'maxitems'}% - \c@minitems\c@maxitems - \fi \@ifpackageloaded{inputenc} {\ifundef\inputencodingname % inputenc 2006/05/05 v1.1b {\begingroup @@ -7757,13 +8006,6 @@ ~~~~<bcf:option type="#1">\blx@nl #2% ~~~~</bcf:option>\blx@nl} -\xdef\blx@bcf@keyvalue#1#2{% - ~~~~~~<bcf:key>#1</bcf:key>\blx@nl - ~~~~~~<bcf:value>#2</bcf:value>\blx@nl -} -\xdef\blx@bcf@keymulti#1#2{% - ~~~~~~<bcf:key>#1</bcf:key>\blx@nl - #2} \xdef\blx@bcf@ordered#1#2{% ~~~~~~<bcf:value order="#1">#2</bcf:value>\blx@nl} \xdef\blx@bcf@sorting#1#2{% @@ -7776,17 +8018,106 @@ ~~~~</bcf:sort>\blx@nl} \xdef\blx@bcf@sortitem#1#2{% ~~~~~~<bcf:sortitem #1>#2</bcf:sortitem>\blx@nl} +\xdef\blx@bcf@svalue#1#2{% + \blx@bcf@option{singlevalued}{% + ~~~~~~<bcf:key>#1</bcf:key>\blx@nl + ~~~~~~<bcf:value>#2</bcf:value>\blx@nl + }% +} +\xdef\blx@bcf@mvalue#1#2{% + \blx@bcf@option{multivalued}{% + ~~~~~~<bcf:key>#1</bcf:key>\blx@nl + #2}% +} +\xdef\blx@bcf@toggle#1{% + \blx@bcf@svalue{#1}{\noexpand\iftoggle{blx@#1}{1}{0}}} \endgroup -\newrobustcmd*{\DeclareSortingScheme}[2]{% +\def\blx@bcf@options@global{% + \blx@bcf@comment{global}% + \blx@bcf@options{biblatex}{global}{% + \blx@bcf@svalue{alphaothers}{\detokenize\expandafter{\labelalphaothers}}% + \blx@bcf@toggle{labelalpha}% + \blx@bcf@mvalue{labelname}{\blx@bcf@labelname@global}% + \iftoggle{blx@labelyear} + {\blx@bcf@mvalue{labelyear}{\blx@bcf@labelyear@global}} + {}% + \blx@bcf@svalue{maxitems}{\the\c@maxitems}% + \blx@bcf@svalue{maxnames}{\the\c@maxnames}% + \blx@bcf@svalue{minitems}{\the\c@minitems}% + \blx@bcf@svalue{minnames}{\the\c@minnames}% + \blx@bcf@toggle{singletitle}% + \blx@bcf@svalue{sortalphaothers}{\detokenize\expandafter{\labelalphaothers}}% + \blx@bcf@svalue{sortlos}{\blx@sortlos}% + \blx@bcf@toggle{terseinits}% + \blx@bcf@svalue{uniquename}{\blx@uniquename}% + \blx@bcf@toggle{useauthor}% + \blx@bcf@toggle{useeditor}% + \blx@bcf@toggle{useprefix}% + \blx@bcf@toggle{usetranslator}% + }% +} + +\def\blx@bcf@options@type#1{% + \blx@bcf@comment{#1}% + \blx@bcf@options{biblatex}{#1}{% + \blx@bcf@toggle{labelalpha}% + \ifcsdef{blx@bcf@labelname@#1} + {\blx@bcf@mvalue{labelname}{\csuse{blx@bcf@labelname@#1}}} + {}% + \iftoggle{blx@labelyear} + {\ifcsdef{blx@bcf@labelyear@#1} + {\blx@bcf@mvalue{labelyear}{\csuse{blx@bcf@labelyear@#1}}} + {}} + {}% + \blx@bcf@toggle{singletitle}% + \blx@bcf@toggle{skipbib}% + \blx@bcf@toggle{skiplab}% + \blx@bcf@toggle{skiplos}% + \blx@bcf@svalue{uniquename}{\blx@uniquename}% + \blx@bcf@toggle{useauthor}% + \blx@bcf@toggle{useeditor}% + \blx@bcf@toggle{useprefix}% + \blx@bcf@toggle{usetranslator}% + }% +} + +\AtEndPreamble{% + \xdef\blx@biber@options{\blx@bcf@options@global}% + \begingroup + \def\do#1{% + \blx@setoptions@type{#1}% + \xappto\blx@biber@options{\blx@bcf@options@type{#1}}}% + \ifdef\blx@opts@type + {\dolistloop\blx@opts@type} + {}% + \def\do#1{% + \ifcsdef{blx@biber@sorting@\blx@sorting @#1}% + {\blx@bcf@comment{#1}% + \csuse{blx@biber@sorting@\blx@sorting @#1}} + {}}% + \xdef\blx@biber@sorting{% + \ifcsdef{blx@biber@sorting@\blx@sorting} + {\dolistcsloop{blx@biber@sorting@\blx@sorting}} + {}}% + \endgroup} + +% [<entrytype>]{<name>}{<spec>} + +\newrobustcmd*{\DeclareSortingScheme}[3][global]{% \begingroup \let\item\blx@sortdef@item \let\field\blx@sortdef@field \let\literal\blx@sortdef@literal \blx@tempcnta\z@ \let\blx@tempa\@empty - #2% - \csxdef{blx@bcf@scheme@#1}{\blx@bcf@sorting{global}{\blx@tempa}}% + #3% + \csxdef{blx@biber@sorting@#2@#1}{\blx@bcf@sorting{#1}{\blx@tempa}}% + \ifcsdef{blx@biber@sorting@#2} + {\ifinlistcs{#1}{blx@biber@sorting@#2} + {} + {\listcsgadd{blx@biber@sorting@#2}{#1}}} + {\listcsgadd{blx@biber@sorting@#2}{#1}}% \endgroup} \@onlypreamble\DeclareSortingScheme @@ -7988,12 +8319,16 @@ \docsvlist{#2}% \endgroup} -\newrobustcmd*{\DeclareLabelname}{% - \blx@deflabel\blx@bcf@labelname@global} +% [<entrytype>] + +\newrobustcmd*{\DeclareLabelname}[1][global]{% + \expandafter\blx@deflabel\csname blx@bcf@labelname@#1\endcsname} \@onlypreamble\DeclareLabelname -\newrobustcmd*{\DeclareLabelyear}{% - \blx@deflabel\blx@bcf@labelyear@global} +% [<entrytype>] + +\newrobustcmd*{\DeclareLabelyear}[1][global]{% + \expandafter\blx@deflabel\csname blx@bcf@labelyear@#1\endcsname} \@onlypreamble\Declarelabelyear \DeclareLabelname{% @@ -8041,80 +8376,17 @@ \def\blx@ctrl@biber{% \blx@bcf@file{% - \blx@bcf@comment{options: biber}% + \blx@bcf@comment{BIBER OPTIONS}% \blx@bcf@options{biber}{global}{% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{bibencoding}{\ifdef\blx@bibencoding{\blx@bibencoding}{ascii}}% - }% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{debug}{\iftoggle{blx@debug}{1}{0}}% - }% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{inputenc}{\ifdef\blx@inputenc{\blx@inputenc}{ascii}}% - }% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{mincrossrefs}{\blx@mincrossrefs}% - }% - }% - \blx@bcf@comment{options: biblatex}% - \blx@bcf@options{biblatex}{global}{% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{alphaothers}{\detokenize\expandafter{\labelalphaothers}}% - }% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{labelalpha}{\iftoggle{blx@labelalpha}{1}{0}}% - }% - \blx@bcf@option{multivalued}{% - \blx@bcf@keymulti{labelname}{\blx@bcf@labelname@global}% - }% - \iftoggle{blx@labelyear} - {\blx@bcf@option{multivalued}{% - \blx@bcf@keymulti{labelyear}{\blx@bcf@labelyear@global}% - }% - } - {}% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{maxitems}{\the\c@maxitems}% - }% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{maxnames}{\the\c@maxnames}% - }% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{minitems}{\the\c@minitems}% - }% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{minnames}{\the\c@minnames}% - }% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{singletitle}{\iftoggle{blx@singletitle}{1}{0}}% - }% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{sortalphaothers}{\detokenize\expandafter{\labelalphaothers}}% - }% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{sortlos}{\blx@sortlos}% - }% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{terseinits}{\iftoggle{blx@terseinits}{1}{0}}% - }% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{uniquename}{\blx@uniquename}% - }% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{useauthor}{\iftoggle{blx@useauthor}{1}{0}}% - }% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{useeditor}{\iftoggle{blx@useeditor}{1}{0}}% - }% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{useprefix}{\iftoggle{blx@useprefix}{1}{0}}% - }% - \blx@bcf@option{singlevalued}{% - \blx@bcf@keyvalue{usetranslator}{\iftoggle{blx@usetranslator}{1}{0}}% - }% + \blx@bcf@svalue{bibencoding}{\ifdef\blx@bibencoding{\blx@bibencoding}{ascii}}% + \blx@bcf@toggle{debug}% + \blx@bcf@svalue{inputenc}{\ifdef\blx@inputenc{\blx@inputenc}{ascii}}% + \blx@bcf@svalue{mincrossrefs}{\blx@mincrossrefs}% }% - \blx@bcf@comment{sorting}% - \csuse{blx@bcf@scheme@\blx@sorting}% + \blx@bcf@comment{BIBLATEX OPTIONS}% + \csuse{blx@biber@options}% + \blx@bcf@comment{SORTING SPEC}% + \csuse{blx@biber@sorting}% }% } diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def new file mode 100644 index 00000000000..aff3b4c7cb9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def @@ -0,0 +1,118 @@ +% $Id: blx-compat.def,v 0.9a 2010/03/19 19:52:15 lehman beta $ + +\ProvidesFile{blx-compat.def} +[\abx@rcsid $Id: blx-compat.def,v 0.9a 2010/03/19 19:52:15 lehman beta $ + biblatex generic compatibility] + +% LaTeX + +\AtBeginDocument{% + \renewrobustcmd*{\bibliography}[1]{% + \blx@error + {'\string\bibliography' invalid at this point} + {'\string\bibliography' must be given in the + preamble.\MessageBreak I'm ignoring the command}}} + +\renewrobustcmd*{\bibliographystyle}[1]{% + \blx@error + {'\string\bibliographystyle' invalid} + {Use the package option 'style' instead.\MessageBreak + I'm ignoring the command}} + +% LaTeX, biblatex <0.9a + +\providecommand*{\thebibliography}{} +\renewenvironment*{thebibliography} + {\list{}{% + \leftmargin\bibhang + \itemindent-\leftmargin + \itemsep\bibitemsep + \parsep\bibparsep}} + {\endlist} +\newcommand*{\thebibitem}{\item} + +\defbibenvironment{bibliography} + {\thebibliography} + {\endthebibliography} + {\thebibitem} + +\newenvironment*{theshorthands} + {\list{\thefield{shorthand}}{% + \labelwidth\shorthandwidth + \labelsep\biblabelsep + \leftmargin\labelwidth + \advance\leftmargin\labelsep + \itemsep\bibitemsep + \parsep\bibparsep + \def\makelabel##1{##1\hss}}} + {\endlist} +\newcommand*{\thelositem}{\item} + +\defbibenvironment{shorthands} + {\theshorthands} + {\endtheshorthands} + {\thelositem} + +% Standard classes + +\DeclareOption{openbib}{\ExecuteBibliographyOptions{block=par}} + +% Biblatex <0.8d + +\DeclareBibliographyOption{bibtex8}[true]{% + \ifstrequal{#1}{true} + {\ExecuteBibliographyOptions{backend=bibtex8}} + {\ExecuteBibliographyOptions{backend=bibtex}}} + +% memoir + +\ifdef\ifnobibintoc + {\newcommand*{\ifmemoirbibintoc}{\notbool{nobibintoc}}} + {\newcommand{\ifmemoirbibintoc}[2]{#2}} + +% KOMA-Script + +\newcommand{\ifkomabibtotoc}[2]{#2} +\newcommand{\ifkomabibtotocnumbered}[2]{#2} + +\ifdef\ds@bibtotoc + {\DeclareOption{bibtotoc}{% + \let\ifkomabibtotoc=\@firstoftwo + \let\ifkomabibtotocnumbered=\@secondoftwo} + \DeclareOption{bibtotocnumbered}{% + \let\ifkomabibtotoc=\@firstoftwo + \let\ifkomabibtotocnumbered=\@firstoftwo}% + \DeclareOption{bibliography=totoc}{% + \let\ifkomabibtotoc=\@firstoftwo + \let\ifkomabibtotocnumbered=\@secondoftwo} + \DeclareOption{bibliography=nottotoc}{% + \let\ifkomabibtotoc=\@secondoftwo + \let\ifkomabibtotocnumbered=\@secondoftwo} + \DeclareOption{bibliography=totocnumbered}{% + \let\ifkomabibtotoc=\@firstoftwo + \let\ifkomabibtotocnumbered=\@firstoftwo}% + \DeclareOption{bibliography=oldstyle}{% + \ExecuteBibliographyOptions{block=space}}% + \DeclareOption{bibliography=openstyle}{% + \ExecuteBibliographyOptions{block=par}}% + \DeclareOption{toc=bib}{% + \let\ifkomabibtotoc=\@firstoftwo + \let\ifkomabibtotocnumbered=\@secondoftwo}% + \DeclareOption{toc=bibliography}{% + \let\ifkomabibtotoc=\@firstoftwo + \let\ifkomabibtotocnumbered=\@secondoftwo}% + \DeclareOption{toc=bibnumbered}{% + \let\ifkomabibtotoc=\@firstoftwo + \let\ifkomabibtotocnumbered=\@firstoftwo}% + \DeclareOption{toc=numberedbib}{% + \let\ifkomabibtotoc=\@firstoftwo + \let\ifkomabibtotocnumbered=\@firstoftwo}% + \DeclareOption{toc=bibliographynumbered}{% + \let\ifkomabibtotoc=\@firstoftwo + \let\ifkomabibtotocnumbered=\@firstoftwo}% + \DeclareOption{toc=numberedbibliography}{% + \let\ifkomabibtotoc=\@firstoftwo + \let\ifkomabibtotocnumbered=\@firstoftwo}} + {} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/bibnatex.def b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def index d74254a209c..5a3cb219fa1 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bibnatex.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def @@ -1,7 +1,7 @@ -% $Id: bibnatex.def,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: blx-natbib.def,v 0.9a 2010/03/19 19:52:15 lehman beta $ -\ProvidesFile{bibnatex.def} -[\abx@rcsid $Id: bibnatex.def,v 0.9 2010/02/14 15:42:33 lehman beta $ +\ProvidesFile{blx-natbib.def} +[\abx@rcsid $Id: blx-natbib.def,v 0.9a 2010/03/19 19:52:15 lehman beta $ biblatex natbib compatibility] \renewcommand*{\nameyeardelim}{\addcomma\space} @@ -57,7 +57,7 @@ \newrobustcmd*{\Citealp}{\bibsentence\citealp} \newrobustcmd*{\citefullauthor}{\citeauthor*} \newrobustcmd*{\Citefullauthor}{\bibsentence\citeauthor*} -\newrobustcmd*{\citetext}{\mkbibparens} +\newrobustcmd*{\citetext}{\parentext} \newrobustcmd*{\defcitealias}[2]{% \ifcsdef{abx@alias@\detokenize{#1}} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx index 3913951e372..881927c0371 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx @@ -1,60 +1,65 @@ -% $Id: alphabetic-verb.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: alphabetic-verb.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{alphabetic-verb.cbx} -[\abx@cbxid $Id: alphabetic-verb.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: alphabetic-verb.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \ExecuteBibliographyOptions{labelalpha,autocite=inline} +\newbibmacro*{cite}{% + \printtext[bibhyperref]{% + \printfield{labelalpha}% + \printfield{extraalpha}}} + +\newbibmacro*{textcite}{% + \ifnameundef{labelname} + {} + {\printnames{labelname}\space}% + \bibopenbracket + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite}} + \DeclareCiteCommand{\cite} - {\usebibmacro{prenote}} + {\bibopenbracket + \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \bibleftbracket - \printtext[bibhyperref]{% - \printfield{labelalpha}% - \printfield{extraalpha}}} - {\bibrightbracket\multicitedelim} + \ifnumgreater{\value{citecount}}{1} + {\bibopenbracket} + {}% + \usebibmacro{cite}} + {\bibclosebracket\multicitedelim} {\usebibmacro{postnote}% - \bibrightbracket} + \bibclosebracket} \DeclareCiteCommand{\parencite}[\mkbibbrackets] {\usebibmacro{prenote}} {\usebibmacro{citeindex}% - \printtext[bibhyperref]{% - \printfield{labelalpha}% - \printfield{extraalpha}}} + \usebibmacro{cite}} {\multicitedelim} {\usebibmacro{postnote}} \DeclareCiteCommand{\footcite}[\mkbibfootnote] {\usebibmacro{prenote}} {\usebibmacro{citeindex}% - \printtext[bibhyperref]{% - \printfield{labelalpha}% - \printfield{extraalpha}}} + \usebibmacro{cite}} {\multicitedelim} {\usebibmacro{postnote}} \DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext] {\usebibmacro{prenote}} {\usebibmacro{citeindex}% - \printtext[bibhyperref]{% - \printfield{labelalpha}% - \printfield{extraalpha}}} + \usebibmacro{cite}} {\multicitedelim} {\usebibmacro{postnote}} \DeclareCiteCommand{\textcite} - {\usebibmacro{prenote}} + {} {\usebibmacro{citeindex}% - \ifnameundef{labelname} - {} - {\printnames{labelname}\space}% - \bibleftbracket - \printtext[bibhyperref]{% - \printfield{labelalpha}% - \printfield{extraalpha}}} - {\bibrightbracket\multicitedelim} - {\usebibmacro{postnote}\bibrightbracket} + \usebibmacro{textcite}} + {\bibclosebracket\multicitedelim} + {\usebibmacro{postnote}% + \bibclosebracket} \DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx index 859c52bf783..1d3f605eef1 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx @@ -1,67 +1,68 @@ -% $Id: alphabetic.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: alphabetic.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{alphabetic.cbx} -[\abx@cbxid $Id: alphabetic.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: alphabetic.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \ExecuteBibliographyOptions{labelalpha,autocite=inline} -\DeclareCiteCommand{\cite} - {\usebibmacro{prenote}\bibleftbracket} +\newbibmacro*{cite}{% + \printtext[bibhyperref]{% + \printfield{labelalpha}% + \printfield{extraalpha}}} + +\newbibmacro*{textcite}{% + \iffieldequals{namehash}{\cbx@lasthash} + {\multicitedelim} + {\cbx@tempa + \ifnameundef{labelname} + {} + {\printnames{labelname}\space}% + \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{labelalpha}% - \printfield{extraalpha}}} + \usebibmacro{cite}} {\multicitedelim} - {\usebibmacro{postnote}\bibrightbracket} + {\usebibmacro{postnote}} \DeclareCiteCommand{\parencite}[\mkbibbrackets] {\usebibmacro{prenote}} {\usebibmacro{citeindex}% - \printtext[bibhyperref]{% - \printfield{labelalpha}% - \printfield{extraalpha}}} + \usebibmacro{cite}} {\multicitedelim} {\usebibmacro{postnote}} \DeclareCiteCommand{\footcite}[\mkbibfootnote] {\usebibmacro{prenote}} {\usebibmacro{citeindex}% - \printtext[bibhyperref]{% - \printfield{labelalpha}% - \printfield{extraalpha}}} + \usebibmacro{cite}} {\multicitedelim} {\usebibmacro{postnote}} \DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext] {\usebibmacro{prenote}} {\usebibmacro{citeindex}% - \printtext[bibhyperref]{% - \printfield{labelalpha}% - \printfield{extraalpha}}} + \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} - {} - {\printnames{labelname}\space}% - \bibleftbracket}% - \printtext[bibhyperref]{% - \printfield{labelalpha}% - \printfield{extraalpha}}% - \savefield{namehash}{\cbx@lasthash}% - \gdef\cbx@tempa{\bibrightbracket\multicitedelim}} + \usebibmacro{textcite}} {} - {\usebibmacro{postnote}\bibrightbracket} + {\usebibmacro{postnote}% + \bibclosebracket} -\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx index ca1b376ae11..d1b51b8f5fa 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx @@ -1,7 +1,7 @@ -% $Id: authortitle-comp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: authortitle-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{authortitle-comp.cbx} -[\abx@cbxid $Id: authortitle-comp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: authortitle-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \ExecuteBibliographyOptions{sortcites,autocite=footnote} \newbool{cbx:parens} @@ -45,14 +45,17 @@ {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}}% + \addspace\bibopenparen}}% \savefield{namehash}{\cbx@lasthash}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \iffieldundef{shorthand} {\usebibmacro{cite:title}}% {\usebibmacro{cite:shorthand}}% \setunit{% \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \multicitedelim}} @@ -62,28 +65,22 @@ \newbibmacro*{cite:shorthand}{% \printtext[bibhyperref]{\printfield{shorthand}}} -\newbibmacro*{cite:postnote}{% - \iffieldundef{postnote} - {} - {\setunit{\postnotedelim} - \printfield{postnote}}} - \newbibmacro*{textcite:postnote}{% \ifnameundef{labelname} {\setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}} + \addspace\bibopenparen}} {\setunit{\postnotedelim}}% \printfield{postnote}% \ifthenelse{\value{multicitecount}=\value{multicitetotal}} {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}}} {\setunit{% \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \multicitedelim}}} @@ -93,7 +90,7 @@ {\usebibmacro{citeindex}% \usebibmacro{cite}} {} - {\usebibmacro{cite:postnote}} + {\usebibmacro{postnote}} \DeclareCiteCommand*{\cite} {\usebibmacro{cite:init}% @@ -101,7 +98,7 @@ {\usebibmacro{citeindex}% \usebibmacro{citetitle}} {} - {\usebibmacro{cite:postnote}} + {\usebibmacro{postnote}} \DeclareCiteCommand{\parencite}[\mkbibparens] {\usebibmacro{cite:init}% @@ -109,7 +106,7 @@ {\usebibmacro{citeindex}% \usebibmacro{cite}} {} - {\usebibmacro{cite:postnote}} + {\usebibmacro{postnote}} \DeclareCiteCommand*{\parencite}[\mkbibparens] {\usebibmacro{cite:init}% @@ -117,7 +114,7 @@ {\usebibmacro{citeindex}% \usebibmacro{citetitle}} {} - {\usebibmacro{cite:postnote}} + {\usebibmacro{postnote}} \DeclareCiteCommand{\footcite}[\mkbibfootnote] {\usebibmacro{cite:init}% @@ -125,7 +122,7 @@ {\usebibmacro{citeindex}% \usebibmacro{cite}} {} - {\usebibmacro{cite:postnote}} + {\usebibmacro{postnote}} \DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext] {\usebibmacro{cite:init}% @@ -133,11 +130,10 @@ {\usebibmacro{citeindex}% \usebibmacro{cite}} {} - {\usebibmacro{cite:postnote}} + {\usebibmacro{postnote}} \DeclareCiteCommand{\textcite} - {\usebibmacro{cite:init}% - \usebibmacro{prenote}} + {\usebibmacro{cite:init}} {\usebibmacro{citeindex}% \usebibmacro{textcite}} {} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx index bec2c0dfb5d..c8f5d47b719 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx @@ -1,7 +1,7 @@ -% $Id: authortitle-ibid.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: authortitle-ibid.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{authortitle-ibid.cbx} -[\abx@cbxid $Id: authortitle-ibid.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: authortitle-ibid.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,autocite=footnote} \providecommand*{\mkibid}[1]{#1} @@ -40,7 +40,10 @@ {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}}% + \addspace\bibopenparen}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \iffieldundef{shorthand} {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} @@ -68,12 +71,12 @@ \newbibmacro*{textcite:postnote}{% \ifthenelse{\iffieldundef{postnote}\OR\boolean{cbx:loccit}} {\ifbool{cbx:parens} - {\bibrightparen} + {\bibcloseparen} {}} {\ifbool{cbx:parens} {\postnotedelim} - {\addspace\bibleftparen}% - \printfield{postnote}\bibrightparen}} + {\addspace\bibopenparen}% + \printfield{postnote}\bibcloseparen}} \DeclareCiteCommand{\cite} {\usebibmacro{prenote}} @@ -118,12 +121,11 @@ {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\textcite} - {\boolfalse{cbx:parens}% - \usebibmacro{prenote}} + {\boolfalse{cbx:parens}} {\usebibmacro{citeindex}% \usebibmacro{textcite}} {\ifbool{cbx:parens} - {\bibrightparen\boolfalse{cbx:parens}} + {\bibcloseparen\boolfalse{cbx:parens}} {}% \multicitedelim} {\usebibmacro{textcite:postnote}} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx index 9260c929379..3a79d7b222e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx @@ -1,7 +1,7 @@ -% $Id: authortitle-icomp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: authortitle-icomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{authortitle-icomp.cbx} -[\abx@cbxid $Id: authortitle-icomp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: authortitle-icomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \ExecuteBibliographyOptions{ibidtracker=constrict,pagetracker,sortcites,autocite=footnote} \providecommand*{\mkibid}[1]{#1} @@ -57,8 +57,11 @@ {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}}% + \addspace\bibopenparen}}% \savefield{namehash}{\cbx@lasthash}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \iffieldundef{shorthand} {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} @@ -66,7 +69,7 @@ {\usebibmacro{cite:shorthand}}% \setunit{% \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \multicitedelim}} @@ -94,18 +97,18 @@ {\ifnameundef{labelname} {\setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}} + \addspace\bibopenparen}} {\setunit{\postnotedelim}}% \printfield{postnote}}% \ifthenelse{\value{multicitecount}=\value{multicitetotal}} {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}}} {\setunit{% \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \multicitedelim}}} @@ -158,8 +161,7 @@ {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\textcite} - {\usebibmacro{cite:init}% - \usebibmacro{prenote}} + {\usebibmacro{cite:init}} {\usebibmacro{citeindex}% \usebibmacro{textcite}} {} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx index e77a224bd4a..6350f87a79c 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx @@ -1,7 +1,7 @@ -% $Id: authortitle-tcomp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: authortitle-tcomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{authortitle-tcomp.cbx} -[\abx@cbxid $Id: authortitle-tcomp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: authortitle-tcomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \RequireCitationStyle{authortitle-comp} \ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline} @@ -40,41 +40,48 @@ {\usebibmacro{cite:title}}% {\usebibmacro{cite:shorthand}}} {\ifnameundef{labelname} - {\iffieldundef{shorthand} + {\ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} {\usebibmacro{cite:title}}% {\usebibmacro{cite:shorthand}}} - {\ifsingletitle + {\ifthenelse{\ifsingletitle\AND + \(\iffieldundef{prenote}\OR\value{citecount}>1\)} {\printtext[bibhyperref]{\printnames{labelname}}} {\printnames{labelname} \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}% + \addspace\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \iffieldundef{shorthand} {\usebibmacro{cite:title}}% {\usebibmacro{cite:shorthand}}}}% \savefield{namehash}{\cbx@lasthash}}% \setunit{% \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \multicitedelim}} \renewbibmacro*{textcite:postnote}{% - \ifthenelse{\ifnameundef{labelname}\OR\ifsingletitle} + \ifbool{cbx:parens} + {\setunit{\postnotedelim}} {\setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}} - {\setunit{\postnotedelim}}% + \addspace\bibopenparen}}% \printfield{postnote}% \ifthenelse{\value{multicitecount}=\value{multicitetotal}} {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}}} {\setunit{% \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \multicitedelim}}} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx index 7c0634f1f6c..a58bf3860e0 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx @@ -1,7 +1,7 @@ -% $Id: authortitle-terse.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: authortitle-terse.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{authortitle-terse.cbx} -[\abx@cbxid $Id: authortitle-terse.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: authortitle-terse.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \RequireCitationStyle{authortitle} \ExecuteBibliographyOptions{singletitle,uniquename,autocite=inline} @@ -19,17 +19,24 @@ \renewbibmacro*{textcite}{% \ifnameundef{labelname} - {\iffieldundef{shorthand} + {\ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} {\usebibmacro{cite:title}}% {\usebibmacro{cite:shorthand}}} - {\ifsingletitle + {\ifthenelse{\ifsingletitle\AND + \(\iffieldundef{prenote}\OR\value{citecount}>1\)} {\printtext[bibhyperref]{\printnames{labelname}}} {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}% - \iffieldundef{shorthand} - {\usebibmacro{cite:title}}% - {\usebibmacro{cite:shorthand}}}}} + \addspace\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \iffieldundef{shorthand} + {\usebibmacro{cite:title}}% + {\usebibmacro{cite:shorthand}}}}} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx index 83e0b45d9d9..96f07ad2afd 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx @@ -1,7 +1,7 @@ -% $Id: authortitle.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: authortitle.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{authortitle.cbx} -[\abx@cbxid $Id: authortitle.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: authortitle.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \ExecuteBibliographyOptions{autocite=footnote} \newbool{cbx:parens} @@ -26,7 +26,10 @@ {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}}% + \addspace\bibopenparen}}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \iffieldundef{shorthand} {\usebibmacro{cite:title}}% {\usebibmacro{cite:shorthand}}} @@ -41,12 +44,12 @@ \newbibmacro*{textcite:postnote}{% \iffieldundef{postnote} {\ifbool{cbx:parens} - {\bibrightparen} + {\bibcloseparen} {}} {\ifbool{cbx:parens} {\postnotedelim} - {\addspace\bibleftparen}% - \printfield{postnote}\bibrightparen}} + {\addspace\bibopenparen}% + \printfield{postnote}\bibcloseparen}} \DeclareCiteCommand{\cite} {\usebibmacro{prenote}} @@ -91,12 +94,11 @@ {\usebibmacro{postnote}} \DeclareCiteCommand{\textcite} - {\boolfalse{cbx:parens}% - \usebibmacro{prenote}} + {\boolfalse{cbx:parens}} {\usebibmacro{citeindex}% \usebibmacro{textcite}} {\ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \multicitedelim} {\usebibmacro{textcite:postnote}} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx index 726e64d22dc..c40ea714eeb 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx @@ -1,7 +1,7 @@ -% $Id: authoryear-comp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: authoryear-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{authoryear-comp.cbx} -[\abx@cbxid $Id: authoryear-comp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: authoryear-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \ExecuteBibliographyOptions{labelyear,uniquename,sortcites,autocite=inline} \newbool{cbx:parens} @@ -82,13 +82,19 @@ {\usebibmacro{cite:label}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}% + \addspace\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \usebibmacro{cite:labelyear+extrayear}} {\usebibmacro{cite:shorthand}}} {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}% + \addspace\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \iffieldundef{shorthand} {\iffieldundef{labelyear} {\usebibmacro{cite:label}} @@ -99,7 +105,7 @@ \savefield{namehash}{\cbx@lasthash}}}% \setunit{% \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \multicitedelim}} @@ -123,6 +129,20 @@ {} {\printtext[bibhyperref]{\printfield{extrayear}}}} +\newbibmacro*{textcite:postnote}{% + \usebibmacro{postnote}% + \ifthenelse{\value{multicitecount}=\value{multicitetotal}} + {\setunit{}% + \printtext{% + \ifbool{cbx:parens} + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}}} + {\setunit{% + \ifbool{cbx:parens} + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}% + \multicitedelim}}} + \DeclareCiteCommand{\cite} {\usebibmacro{cite:init}% \usebibmacro{prenote}} @@ -172,24 +192,11 @@ {\usebibmacro{postnote}} \DeclareCiteCommand{\textcite} - {\usebibmacro{cite:init}% - \usebibmacro{prenote}} + {\usebibmacro{cite:init}} {\usebibmacro{citeindex}% \usebibmacro{textcite}} {} - {\setunit{\postnotedelim}% - \printfield{postnote}% - \ifthenelse{\value{multicitecount}=\value{multicitetotal}} - {\setunit{}% - \printtext{% - \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} - {}}} - {\setunit{% - \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} - {}% - \multicitedelim}}} + {\usebibmacro{textcite:postnote}} \DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}} \DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\setunit{\multicitedelim}} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx index 172620636b8..87f0ee9f111 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx @@ -1,7 +1,7 @@ -% $Id: authoryear-ibid.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: authoryear-ibid.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{authoryear-ibid.cbx} -[\abx@cbxid $Id: authoryear-ibid.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: authoryear-ibid.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict,pagetracker,autocite=inline} \providecommand*{\mkibid}[1]{#1} @@ -43,13 +43,19 @@ {\usebibmacro{cite:label}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}% + \addspace\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \usebibmacro{cite:labelyear+extrayear}} {\usebibmacro{cite:shorthand}}} {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}% + \addspace\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \iffieldundef{shorthand} {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} @@ -87,12 +93,12 @@ \newbibmacro*{textcite:postnote}{% \ifthenelse{\iffieldundef{postnote}\OR\boolean{cbx:loccit}} {\ifbool{cbx:parens} - {\bibrightparen} + {\bibcloseparen} {}} {\ifbool{cbx:parens} {\postnotedelim} - {\addspace\bibleftparen}% - \printfield{postnote}\bibrightparen}} + {\addspace\bibopenparen}% + \printfield{postnote}\bibcloseparen}} \DeclareCiteCommand{\cite} {\usebibmacro{prenote}} @@ -137,12 +143,11 @@ {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\textcite} - {\boolfalse{cbx:parens}% - \usebibmacro{prenote}} + {\boolfalse{cbx:parens}} {\usebibmacro{citeindex}% \usebibmacro{textcite}} {\ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \multicitedelim} {\usebibmacro{textcite:postnote}} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx index 8cc7aa79910..6f9f985b8e8 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx @@ -1,7 +1,7 @@ -% $Id: authoryear-icomp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: authoryear-icomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{authoryear-icomp.cbx} -[\abx@cbxid $Id: authoryear-icomp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: authoryear-icomp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \ExecuteBibliographyOptions{labelyear,uniquename,ibidtracker=constrict, pagetracker,sortcites,autocite=inline} @@ -95,7 +95,10 @@ {\usebibmacro{cite:label}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}% + \addspace\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} {\usebibmacro{cite:ibid}} {\usebibmacro{cite:labelyear+extrayear}}} @@ -103,7 +106,10 @@ {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}% + \addspace\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \iffieldundef{shorthand} {\iffieldundef{labelyear} {\usebibmacro{cite:label}} @@ -116,7 +122,7 @@ \savefield{namehash}{\cbx@lasthash}}}% \setunit{% \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \multicitedelim}} @@ -154,17 +160,16 @@ \newbibmacro*{textcite:postnote}{% \ifbool{cbx:loccit} {} - {\setunit{\postnotedelim}% - \printfield{postnote}}% + {\usebibmacro{postnote}}% \ifthenelse{\value{multicitecount}=\value{multicitetotal}} {\setunit{}% \printtext{% \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}}} {\setunit{% \ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \multicitedelim}}} @@ -217,8 +222,7 @@ {\usebibmacro{cite:postnote}} \DeclareCiteCommand{\textcite} - {\usebibmacro{cite:init}% - \usebibmacro{prenote}} + {\usebibmacro{cite:init}} {\usebibmacro{citeindex}% \usebibmacro{textcite}} {} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx index 3358f6fe91a..2bece812403 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx @@ -1,7 +1,7 @@ -% $Id: authoryear.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: authoryear.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{authoryear.cbx} -[\abx@cbxid $Id: authoryear.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: authoryear.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \ExecuteBibliographyOptions{labelyear,uniquename,autocite=inline} \newbool{cbx:parens} @@ -29,18 +29,20 @@ {\usebibmacro{cite:label}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}% + \addspace\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \usebibmacro{cite:labelyear+extrayear}} {\usebibmacro{cite:shorthand}}} {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% - \addspace\bibleftparen}% - \iffieldundef{shorthand} - {\iffieldundef{labelyear} - {\usebibmacro{cite:label}} - {\usebibmacro{cite:labelyear+extrayear}}} - {\usebibmacro{cite:shorthand}}}} + \addspace\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{citeyear}}} \newbibmacro*{cite:shorthand}{% \printtext[bibhyperref]{\printfield{shorthand}}} @@ -57,6 +59,16 @@ \printfield{labelyear}% \printfield{extrayear}}}} +\newbibmacro*{textcite:postnote}{% + \iffieldundef{postnote} + {\ifbool{cbx:parens} + {\bibcloseparen} + {}} + {\ifbool{cbx:parens} + {\setunit{\postnotedelim}} + {\setunit{\addspace\bibopenparen}}% + \printfield{postnote}\bibcloseparen}} + \DeclareCiteCommand{\cite} {\usebibmacro{prenote}} {\usebibmacro{citeindex}% @@ -100,21 +112,13 @@ {\usebibmacro{postnote}} \DeclareCiteCommand{\textcite} - {\boolfalse{cbx:parens}% - \usebibmacro{prenote}} + {\boolfalse{cbx:parens}} {\usebibmacro{citeindex}% \usebibmacro{textcite}} {\ifbool{cbx:parens} - {\bibrightparen\global\boolfalse{cbx:parens}} + {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \multicitedelim} - {\iffieldundef{postnote} - {\ifbool{cbx:parens} - {\bibrightparen} - {}} - {\ifbool{cbx:parens} - {\postnotedelim} - {\addspace\bibleftparen}% - \printfield{postnote}\bibrightparen}} + {\usebibmacro{textcite:postnote}} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx index f5c2750f0fa..a2357a4d05c 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx @@ -1,47 +1,89 @@ -% $Id: debug.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: debug.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{debug.cbx} -[\abx@cbxid $Id: debug.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: debug.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \ExecuteBibliographyOptions{autocite=plain} -\DeclareFieldFormat{citekey}{\ttfamily[\cbx@mkcitekey{#1}]} -\DeclareUrlCommand{\cbx@mkcitekey}{\urlstyle{citekey}} +\DeclareUrlCommand{\cbx@citekey}{\urlstyle{citekey}} \def\url@citekeystyle{\def\UrlFont{\ttfamily}} -\newbibmacro*{cite:entrykey}{% - \printtext[bibhyperref]{\printfield[citekey]{entrykey}}} +\DeclareFieldFormat{key}{\cbx@citekey{#1}} +\DeclareFieldFormat{pre}{\texttt{pre=\detokenize{#1}}} +\DeclareFieldFormat{post}{\texttt{post=\detokenize{#1}}} +\DeclareFieldFormat{meta}{\texttt{#1}} + +\renewbibmacro*{multiprenote}{% + \printtext[meta]{[multi}% + \setunit{\addspace}% + \printfield[pre]{multiprenote}% + \setunit{\addspace}% + \printfield[post]{multipostnote}% + \setunit{\addspace}} + +\renewbibmacro*{multipostnote}{% + \printtext[meta]{]}} + +\newbibmacro*{begin}[1]{% + \printtext[meta]{[#1}% + \setunit{\addspace}% + \printfield[pre]{prenote}% + \setunit{\addspace}% + \printfield[post]{postnote}% + \setunit{\addspace}% + \printtext[meta]{key=}} + +\newbibmacro*{end}{% + \printtext[meta]{]}} + +\newbibmacro*{key}{% + \printtext[bibhyperref]{\printfield[key]{entrykey}}} + +\newbibmacro*{next}{% + \printtext[meta]{\addcomma}% + \setunit{\addspace}} \DeclareCiteCommand{\cite} - {\usebibmacro{prenote}} - {\usebibmacro{cite:entrykey}} - {\multicitedelim} - {\usebibmacro{postnote}} + {\usebibmacro{begin}{cite}} + {\usebibmacro{key}} + {\usebibmacro{next}} + {\usebibmacro{end}} + +\DeclareCiteCommand{\parencite} + {\usebibmacro{begin}{parencite}} + {\usebibmacro{key}} + {\usebibmacro{next}} + {\usebibmacro{end}} + +\DeclareCiteCommand{\footcite} + {\usebibmacro{begin}{footcite}} + {\usebibmacro{key}} + {\usebibmacro{next}} + {\usebibmacro{end}} + +\DeclareCiteCommand{\footcitetext} + {\usebibmacro{begin}{footcitetext}} + {\usebibmacro{key}} + {\usebibmacro{next}} + {\usebibmacro{end}} \DeclareCiteCommand{\textcite} - {\usebibmacro{prenote}} - {\printnames{labelname}% - \setunit*{\addspace}% - \usebibmacro{cite:entrykey}} - {\multicitedelim} - {\usebibmacro{postnote}} - -\DeclareCiteCommand{\parencite}[\mkbibparens] - {\usebibmacro{prenote}} - {\usebibmacro{cite:entrykey}} - {\multicitedelim} - {\usebibmacro{postnote}} - -\DeclareCiteCommand{\footcite}[\mkbibfootnote] - {\usebibmacro{prenote}} - {\usebibmacro{cite:entrykey}} - {\multicitedelim} - {\usebibmacro{postnote}} - -\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext] - {\usebibmacro{prenote}} - {\usebibmacro{cite:entrykey}} - {\multicitedelim} - {\usebibmacro{postnote}} + {\usebibmacro{begin}{textcite}} + {\usebibmacro{key}} + {\usebibmacro{next}} + {\usebibmacro{end}} + +\DeclareCiteCommand{\supercite} + {\usebibmacro{begin}{supercite}} + {\usebibmacro{key}} + {\usebibmacro{next}} + {\usebibmacro{end}} + +\DeclareMultiCiteCommand{\cites}{\cite}{\addspace} +\DeclareMultiCiteCommand{\parencites}{\parencite}{\addspace} +\DeclareMultiCiteCommand{\footcites}{\footcite}{\addspace} +\DeclareMultiCiteCommand{\footcitetexts}{\footcitetext}{\addspace} +\DeclareMultiCiteCommand{\supercites}{\supercite}{\addspace} +\DeclareMultiCiteCommand{\textcites}{\textcite}{\addspace} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx index 571812d99ca..ed7122db029 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx @@ -1,47 +1,69 @@ -% $Id: draft.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: draft.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{draft.cbx} -[\abx@cbxid $Id: draft.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: draft.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \ExecuteBibliographyOptions{autocite=plain} \DeclareFieldFormat{citekey}{\cbx@mkcitekey{#1}} \DeclareUrlCommand{\cbx@mkcitekey}{\urlstyle{citekey}} \def\url@citekeystyle{\def\UrlFont{\bfseries}} +\newbool{cbx:parens} -\newbibmacro*{cite:entrykey}{% +\newbibmacro*{cite}{% \printtext[bibhyperref]{\printfield[citekey]{entrykey}}} +\newbibmacro*{textcite}{% + \printnames{labelname}% + \setunit*{% + \global\booltrue{cbx:parens}% + \addspace\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite}} + +\newbibmacro*{textcite:postnote}{% + \iffieldundef{postnote} + {\ifbool{cbx:parens} + {\bibcloseparen} + {}} + {\ifbool{cbx:parens} + {\setunit{\postnotedelim}} + {\setunit{\addspace\bibopenparen}}% + \printfield{postnote}\bibcloseparen}} + \DeclareCiteCommand{\cite} {\usebibmacro{prenote}} - {\usebibmacro{cite:entrykey}} + {\usebibmacro{cite}} {\multicitedelim} {\usebibmacro{postnote}} \DeclareCiteCommand{\parencite}[\mkbibparens] {\usebibmacro{prenote}} - {\usebibmacro{cite:entrykey}} + {\usebibmacro{cite}} {\multicitedelim} {\usebibmacro{postnote}} \DeclareCiteCommand{\footcite}[\mkbibfootnote] {\usebibmacro{prenote}} - {\usebibmacro{cite:entrykey}} + {\usebibmacro{cite}} {\multicitedelim} {\usebibmacro{postnote}} \DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext] {\usebibmacro{prenote}} - {\usebibmacro{cite:entrykey}} + {\usebibmacro{cite}} {\multicitedelim} {\usebibmacro{postnote}} \DeclareCiteCommand{\textcite} - {\usebibmacro{prenote}} - {\printnames{labelname}% - \setunit*{\addspace}% - \printtext[parens]{\usebibmacro{cite:entrykey}}} - {\multicitedelim} - {\usebibmacro{postnote}} + {\boolfalse{cbx:parens}} + {\usebibmacro{textcite}} + {\ifbool{cbx:parens} + {\bibcloseparen\global\boolfalse{cbx:parens}} + {}% + \multicitedelim} + {\usebibmacro{textcite:postnote}} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx index d1f9cd8e111..11b3729dd0b 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx @@ -1,7 +1,7 @@ -% $Id: numeric-comp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: numeric-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{numeric-comp.cbx} -[\abx@cbxid $Id: numeric-comp.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: numeric-comp.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] \ExecuteBibliographyOptions{labelnumber,sortcites,autocite=inline} \renewcommand*{\multicitedelim}{\addcomma\space} @@ -69,16 +69,30 @@ \global\defcounter{cbx@tempcnta}{0}} {}} -\DeclareCiteCommand{\cite} +\newbibmacro*{textcite}{% + \iffieldequals{namehash}{\cbx@lasthash} + {\usebibmacro{cite:comp}} + {\usebibmacro{cite:dump}\cbx@tempa + \usebibmacro{cite:init}% + \ifnameundef{labelname} + {\printfield[citetitle]{labeltitle}} + {\printnames{labelname}}% + \addspace\bibopenbracket + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite:comp}}% + \savefield{namehash}{\cbx@lasthash}% + \gdef\cbx@tempa{\bibclosebracket\multicitedelim}} + +\DeclareCiteCommand{\cite}[\mkbibbrackets] {\usebibmacro{cite:init}% - \usebibmacro{prenote}% - \bibleftbracket} + \usebibmacro{prenote}} {\usebibmacro{citeindex}% \usebibmacro{cite:comp}} {} {\usebibmacro{cite:dump}% - \usebibmacro{postnote}% - \bibrightbracket} + \usebibmacro{postnote}} \DeclareCiteCommand{\parencite}[\mkbibbrackets] {\usebibmacro{cite:init}% @@ -108,23 +122,12 @@ \usebibmacro{postnote}} \DeclareCiteCommand{\textcite} - {\usebibmacro{cite:init}% - \usebibmacro{prenote}} + {\usebibmacro{cite:init}} {\usebibmacro{citeindex}% - \iffieldequals{namehash}{\cbx@lasthash} - {\usebibmacro{cite:comp}} - {\usebibmacro{cite:dump}\cbx@tempa - \usebibmacro{cite:init}% - \ifnameundef{labelname} - {\printfield[citetitle]{labeltitle}} - {\printnames{labelname}}% - \addspace\bibleftbracket - \usebibmacro{cite:comp}}% - \savefield{namehash}{\cbx@lasthash}% - \gdef\cbx@tempa{\bibrightbracket\multicitedelim}} + \usebibmacro{textcite}} {} - {\usebibmacro{cite:dump}% - \usebibmacro{postnote}\bibrightbracket} + {\usebibmacro{postnote}% + \bibclosebracket} \DeclareCiteCommand{\supercite}[\mkbibsuperscript] {\usebibmacro{cite:init}% @@ -140,7 +143,7 @@ {} {\usebibmacro{cite:dump}} -\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\cites}[\mkbibbrackets]{\cite}{\multicitedelim} \DeclareMultiCiteCommand{\parencites}[\mkbibbrackets]{\parencite}{\multicitedelim} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx index 39b04f0fd7d..8490d61a40a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx @@ -1,72 +1,70 @@ -% $Id: numeric-verb.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: numeric-verb.cbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{numeric-verb.cbx} -[\abx@cbxid $Id: numeric-verb.cbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@cbxid $Id: numeric-verb.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}} +\newbibmacro*{cite}{% + \printtext[bibhyperref]{% + \printfield{labelnumber}% + \ifbool{bbx:subentry} + {\printfield{entrysetcount}} + {}}} + +\newbibmacro*{textcite}{% + \ifnameundef{labelname} + {\printfield[citetitle]{labeltitle}} + {\printnames{labelname}}% + \addspace\bibopenbracket + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite}} + \DeclareCiteCommand{\cite} - {\usebibmacro{prenote}} + {\bibopenbracket + \usebibmacro{prenote}} {\usebibmacro{citeindex}% - \bibleftbracket - \printtext[bibhyperref]{% - \printfield{labelnumber}% - \ifbool{bbx:subentry} - {\printfield{entrysetcount}} - {}}} - {\bibrightbracket\multicitedelim} + \ifnumgreater{\value{citecount}}{1} + {\bibopenbracket} + {}% + \usebibmacro{cite}} + {\bibclosebracket\multicitedelim} {\usebibmacro{postnote}% - \bibrightbracket} + \bibclosebracket} \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} - {\usebibmacro{prenote}} + {} {\usebibmacro{citeindex}% - \ifnameundef{labelname} - {\printfield[citetitle]{labeltitle}} - {\printnames{labelname}}% - \addspace\bibleftbracket - \printtext[bibhyperref]{% - \printfield{labelnumber}% - \ifbool{bbx:subentry} - {\printfield{entrysetcount}} - {}}}% - {\bibrightbracket\multicitedelim} - {\usebibmacro{postnote}\bibrightbracket} + \usebibmacro{textcite}} + {\bibclosebracket\multicitedelim} + {\usebibmacro{postnote}% + \bibclosebracket} \DeclareCiteCommand{\supercite}[\mkbibsuperscript] {\iffieldundef{prenote} @@ -76,11 +74,7 @@ {} {\BibliographyWarning{Ignoring postnote argument}}} {\usebibmacro{citeindex}% - \printtext[bibhyperref]{% - \printfield{labelnumber}% - \ifbool{bbx:subentry} - {\printfield{entrysetcount}} - {}}} + \usebibmacro{cite}} {\supercitedelim} {} 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 diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx index a75ba3a15fb..7b0573cc145 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx @@ -1,7 +1,7 @@ -% $Id: brazilian.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: brazilian.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{brazilian.lbx} -[\abx@lbxid $Id: brazilian.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@lbxid $Id: brazilian.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] % STATUS OF THIS FILE % * incomplete @@ -357,6 +357,8 @@ passim = {{passim}{pass\adddot}}, see = {{ver}{ver}}, seealso = {{ver tamb\'em}{ver tamb\'em}}, + backrefpage = {{ver p\'agina}{ver p\adddot}}, + backrefpages = {{ver p\'aginas}{ver pp\adddot}}, january = {{janeiro}{jan\adddot}}, february = {{fevereiro}{fev\adddot}}, march = {{mar\c{c}o}{mar\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx index 745114ed7d7..071dc84d1df 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx @@ -1,7 +1,7 @@ -% $Id: danish.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: danish.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{danish.lbx} -[\abx@lbxid $Id: danish.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@lbxid $Id: danish.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] % STATUS OF THIS FILE % * incomplete @@ -309,6 +309,8 @@ see = {{se}{s\adddot}}, % FIXME: spacing after abbreviation dot? seealso = {{se ogs\aa}{s.\aa\adddot}}, + backrefpage = {{se side}{se s\adddot}}, + backrefpages = {{se sider}{se s\adddot}}, january = {{januar}{jan\adddot}}, february = {{februar}{feb\adddot}}, march = {{marts}{mar\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx index b1cf286e469..dc20cfb4c65 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx @@ -1,7 +1,7 @@ -% $Id: dutch.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: dutch.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{dutch.lbx} -[\abx@lbxid $Id: dutch.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@lbxid $Id: dutch.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] % STATUS OF THIS FILE % * incomplete @@ -238,8 +238,8 @@ reprint = {{herdruk}{herdr\adddot}}, reprintof = {{herdruk van}{herdr\adddotspace van}}, reprintas = {{herdrukt als}{herdr\adddotspace als}}, - page = {{pagina}{p\adddot}}, - pages = {{pagina's}{p\adddot}}, + page = {{pagina}{p\adddot}}, % FIXME: unsure + pages = {{pagina's}{p\adddot}}, % FIXME: unsure column = {{kolom}{kol\adddot}}, columns = {{kolommen}{kol\adddot}}, line = {{regel}{r\adddot}}, @@ -287,6 +287,8 @@ passim = {{passim}{pass\adddot}}, see = {{zie}{zie}}, seealso = {{zie ook}{zie ook}}, + backrefpage = {{zie pagina}{zie p\adddot}}, % FIXME: unsure + backrefpages = {{zie pagina's}{zie p\adddot}}, % FIXME: unsure january = {{januari}{jan\adddot}}, february = {{februari}{feb\adddot}}, march = {{maart}{mar\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx index f4942f4ad84..2f7c88e7e61 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx @@ -1,7 +1,7 @@ -% $Id: english.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: english.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{english.lbx} -[\abx@lbxid $Id: english.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@lbxid $Id: english.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] % STATUS OF THIS FILE % * complete @@ -357,7 +357,7 @@ inpress = {{in press}{in press}}, submitted = {{submitted}{submitted}}, citedas = {{henceforth cited as}{henceforth cited as}}, - thiscite = {{this citation}{this cit\adddot}},% FIXME: unsure + thiscite = {{especially}{esp\adddot}}, seenote = {{see note}{see n\adddot}}, quotedin = {{quoted in}{qtd\adddotspace in}}, idem = {{idem}{idem}}, @@ -377,6 +377,8 @@ passim = {{passim}{pass\adddot}}, see = {{see}{see}}, seealso = {{see also}{see also}}, + backrefpage = {{cited on page}{cit\adddotspace on p\adddot}}, + backrefpages = {{cited on pages}{cit\adddotspace on pp\adddot}}, january = {{January}{Jan\adddot}}, february = {{February}{Feb\adddot}}, march = {{March}{Mar\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx new file mode 100644 index 00000000000..c3944e07402 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx @@ -0,0 +1,439 @@ +% $Id: finnish.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ + +\ProvidesFile{finnish.lbx} +[\abx@lbxid $Id: finnish.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] + +% STATUS OF THIS FILE +% * incomplete +% * existing translations by a native speaker +% * peer review pending +% +% Some translations look akward but they are made in such a way +% that they look as good as possible in running text. +% Source for some items in translations: Kielikello 3/1998. +% and Liisa Junno: Kirjastosanasto 1. BTJ Kirjastopalvelu 2006. + +\DeclareBibliographyExtras{% + % dashes: may be either \textendash or \textemdash + \protected\def\bibrangedash{% + \textendash\penalty\hyphenpenalty}% breakable dash + \protected\def\bibdatedash{\bibrangedash}% + \let\finalandcomma=\empty + \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}% + \protected\def\mkbibmascord{\mkbibordinal}% + \protected\def\mkbibfemord{\mkbibordinal}% + \protected\def\mkbibdatelong#1#2#3{% + \iffieldundef{#3} + {} + {\mkbibordinal{\thefield{#3}}% + \iffieldundef{#2}{}{\nobreakspace}}% + \iffieldundef{#2} + {} + {\mkbibmonth{\thefield{#2}}% + \iffieldundef{#1}{}{\space}}% + \thefield{#1}}% + \protected\def\mkbibdateshort#1#2#3{% + \iffieldundef{#3} + {} + {\mkdatezeros{\thefield{#3}}\adddot + \iffieldundef{#2}{}{\thinspace}}% + \iffieldundef{#2} + {} + {\mkdatezeros{\thefield{#2}}% + \iffieldundef{#1} + {} + {\iffieldundef{#3}{/}{\adddot\thinspace}}}% + \thefield{#1}}% + \savecommand\lbx@fromlang + \def\lbx@fromlang{% + \iffieldundef{origlanguage} + {} + {\bibstring{from\thefield{origlanguage}}\space}}% + \savebibmacro{in:}% + \renewbibmacro{in:}{% + \iffieldequalstr{entrytype}{article} + {} + {\bibstring{in}\setunit{\intitlepunct}}}% +} + +\UndeclareBibliographyExtras{% + \restorecommand\lbx@fromlang + \restorebibmacro{in:}% +} + +\DeclareBibliographyStrings{% + bibliography = {{Kirjallisuusluettelo}{Kirjallisuus}}, + references = {{Viitteet}{Viitteet}}, + shorthands = {{Lyhenteet}{Lyhenteet}}, + editor = {{toimittanut}{toim\adddot}}, % Abbreviation is the same + editors = {{toimittaneet}{toim\adddot}}, % in singular and plural. + compiler = {{koontanut}{koontanut}}, % FIXME: unsure. + compilers = {{koontaneet}{koontaneet}}, % FIXME: unsure. + redactor = {{toimittanut}{toim\adddot}}, % FIXME: unsure. + redactors = {{toimittaneet}{toim\adddot}}, % FIXME: unsure. +% founder = {{}{}}, % FIXME: missing. +% founders = {{}{}}, % FIXME: missing. +% continuator = {{}{}}, % FIXME: missing. +% continuators = {{}{}}, % FIXME: missing. +% collaborator = {{}{}}, % FIXME: missing. +% collaborators = {{}{}}, % FIXME: missing. + translator = {{k\"a\"ant\"anyt}{k\"a\"ant\adddot}}, + translators = {{k\"a\"ant\"anyt}{k\"a\"ant\adddot}}, + commentator = {{kommentaarin kirjoittanut}{kommentaarin kirjoittanut}}, + commentators = {{kommentaarin kirjoittaneet}{kommentaarin kirjoittaneet}}, + annotator = {{selityksin varustanut}{selityksin varustanut}}, % FIXME: unsure. + annotators = {{selityksin varustaneet}{selityksin varustaneet}}, % FIXME: unsure. + commentary = {{kommentaari}{kommentaari}}, + annotations = {{selitykset}{selitykset}}, % FIXME: unsure. + introduction = {{johdanto}{johdanto}}, + foreword = {{esipuhe}{esipuhe}}, % Is "alkusanat" better? + afterword = {{j\"alkisanat}{j\"alkisanat}}, + editortr = {{toimittanut ja k\"a\"ant\"anyt}% + {toim\adddotspace ja k\"a\"ant\adddot}}, + editorstr = {{toimittaneet ja k\"a\"ant\"aneet}% + {toim\adddotspace ja k\"a\"ant\adddot}}, + editorco = {{toimittanut ja kommentaarin kirjoittanut}% + {toimittanut ja kommentaarin kirjottanut}}, + editorsco = {{toimittaneet ja kommentaarin kirjoittaneet}% + {toimittaneet ja kommentaarin kirjoittaneet}}, + editoran = {{toimittanut ja selityksin varustanut}% % FIXME: unsure. + {toimittanut ja selityksin varustanut}}, + editorsan = {{toimittaneet ja selityksin varustaneet}% % FIXME: unsure. + {toimittaneet ja selityksin varustaneet}}, + editorin = {{toimittanut ja johdannon kirjoittanut}% + {toimittanut ja johdannon kirjoittanut}}, + editorsin = {{toimittaneet ja johdannon kirjoittaneet}% + {toimittaneet ja johdannon kirjoittaneet}}, + editorfo = {{toimittanut ja esipuheen kirjoittanut}% + {toimittanut ja esipuheen kirjoittanut}}, + editorsfo = {{toimittaneet ja esipuheen kirjoittaneet}% + {toimittaneet ja esipuheen kirjoittaneet}}, + editoraf = {{toimittanut ja j\"alkisanat kirjoittanut}% + {toimittanut ja j\"alkisanat kirjoittanut}}, + editorsaf = {{toimittaneet ja j\"alkisanat kirjoittaneet}% + {toimittaneet ja j\"alkisanat kirjoittaneet}}, + editortrco = {{toimittanut, k\"a\"ant\"anyt ja kommentaarin kirjoittanut}% + {toimittanut, k\"a\"ant\"anyt ja kommentaarin kirjoittanut}}, + editorstrco = {{toimittaneet, k\"a\"ant\"aneet ja kommentaarin kirjoittaneet}% + {toimittaneet, k\"a\"ant\"aneet ja kommentaarin kirjoittaneet}}, + editortran = {{toimittanut, k\"a\"ant\"anyt ja selityksin varustanut}% % FIXME: unsure. + {toimittanut, k\"a\"ant\"anyt ja selityksin varustanut}}, + editorstran = {{toimittaneet, k\"a\"ant\"aneet ja selityksin varustaneet}% % FIXME: unsure. + {toimittaneet, k\"a\"ant\"aneet ja selityksin varustaneet}}, + editortrin = {{toimittanut, k\"a\"ant\"anyt ja johdannon kirjoittanut}% + {toimittanut, k\"a\"ant\"anyt ja johdannon kirjoittanut}}, + editorstrin = {{toimittaneet, k\"a\"ant\"aneet ja johdannon kirjoittaneet}% + {toimittaneet, k\"a\"ant\"aneet ja johdannon kirjoittaneet}}, + editortrfo = {{toimittanut, k\"a\"ant\"anyt ja esipuheen kirjoittanut}% + {toimittanut, k\"a\"ant\"anyt ja esipuheen kirjoittanut}}, + editorstrfo = {{toimittaneet, k\"a\"ant\"aneet ja esipuheen kirjoittaneet}% + {toimittaneet, k\"a\"ant\"aneet ja esipuheen kirjoittaneet}}, + editortraf = {{toimittanut, k\"a\"ant\"anyt ja j\"alkisanat kirjoittanut}% + {toimittanut, k\"a\"ant\"anyt ja j\"alkisanat kirjoittanut}}, + editorstraf = {{toimittaneet, k\"a\"ant\"aneet ja j\"alkisanat kirjoittaneet}% + {toimittaneet, k\"a\"ant\"aneet ja j\"alkisanat kirjoittaneet}}, + editorcoin = {{toimittanut, kommentaarin ja johdannon kirjoittanut}% + {toimittanut, kommentaarin ja johdannon kirjoittanut}}, + editorscoin = {{toimittaneet, kommentaarin ja johdannon kirjoittaneet}% + {toimittaneet, kommentaarin ja johdannon kirjoittaneet}}, + editorcofo = {{toimittanut, kommentaarin ja esipuheen kirjoittanut}% + {toimittanut, kommentaarin ja esipuheen kirjoittanut}}, + editorscofo = {{toimittaneet, kommentaarin ja esipuheen kirjoittaneet}% + {toimittaneet, kommentaarin ja esipuheen kirjoittaneet}}, + editorcoaf = {{toimittanut, kommentaarin ja j\"alkisanat kirjoittanut}% + {toimittanut, kommentaarin ja j\"alkisanat kirjoittanut}}, + editorscoaf = {{toimittaneet, kommentaarin ja j\"alkisanat kirjoittaneet}% + {toimittaneet, kommentaarin ja j\"alkisanat kirjoittaneet}}, + editoranin = {{toimittanut, selitykset ja johdannon kirjoittanut}% + {toimittanut, selitykset ja johdannon kirjoittanut}}, + editorsanin = {{toimittaneet, selitykset ja johdannon kirjoittaneet}% + {toimittaneet, selitykset ja johdannon kirjoittaneet}}, + editoranfo = {{toimittanut, selitykset ja esipuheen kirjoittanut}% + {toimittanut, selitykset ja esipuheen kirjoittanut}}, + editorsanfo = {{toimittaneet, selitykset ja esipuheen kirjoittaneet}% + {toimittaneet, selitykset ja esipuheen kirjoittaneet}}, + editoranaf = {{toimittanut, selitykset ja j\"alkisanat kirjoittanut}% + {toimittanut, selitykset ja j\"alkisanat kirjoittanut}}, + editorsanaf = {{toimittaneet, selitykset ja j\"alkisanat kirjoittaneet}% + {toimittaneet, selitykset ja j\"alkisanat kirjoittaneet}}, + editortrcoin = {{toimittanut, k\"a\"ant\"anyt, kommentaarin ja johdannon kirjoittanut}% + {toimittanut, k\"a\"ant\"anyt, kommentaarin ja johdannon kirjoittanut}}, + editorstrcoin = {{toimittaneet, k\"a\"ant\"aneet, kommentaarin ja johdannon kirjoittaneet}% + {toimittaneet, k\"a\"ant\"aneet, kommentaarin ja johdannon kirjoittaneet}}, + editortrcofo = {{toimittanut, k\"a\"ant\"anyt, kommentaarin ja esipuheen kirjoittanut}% + {toimittanut, k\"a\"ant\"anyt, kommentaarin ja esipuheen kirjoittanut}}, + editorstrcofo = {{toimittaneet, k\"a\"ant\"aneet, kommentaarin ja esipuheen kirjoittaneet}% + {toimittaneet, k\"a\"ant\"aneet, kommentaarin ja esipuheen kirjoittaneet}}, + editortrcoaf = {{toimittanut, k\"a\"ant\"anyt, kommentaarin ja j\"alkisanat kirjoittanut}% + {toimittanut, k\"a\"ant\"anyt, kommentaarin ja j\"alkisanat kirjoittanut}}, + editorstrcoaf = {{toimittaneet, k\"a\"ant\"aneet, kommentaarin ja j\"alkisanat kirjoittaneet}% + {toimittaneet, k\"a\"ant\"aneet, kommentaarin ja j\"alkisanat kirjoittaneet}}, + editortranin = {{toimittanut, k\"a\"ant\"anyt, selitykset ja johdannon kirjoittanut}% + {toimittanut, k\"a\"ant\"anyt, selitykset ja johdannon kirjoittanut}}, + editorstranin = {{toimittaneet, k\"a\"ant\"aneet, selitykset ja johdannon kirjoittaneet}% + {toimittaneet, k\"a\"ant\"aneet, selitykset ja johdannon kirjoittaneet}}, + editortranfo = {{toimittanut, k\"a\"ant\"anyt, selitykset ja esipuheen kirjoittanut}% + {toimittanut, k\"a\"ant\"anyt, selitykset ja esipuheen kirjoittanut}}, + editorstranfo = {{toimittaneet, k\"a\"ant\"aneet, selitykset ja esipuheen kirjoittaneet}% + {toimittaneet, k\"a\"ant\"aneet, selitykset ja esipuheen kirjoittaneet}}, + editortranaf = {{toimittanut, k\"a\"ant\"anyt, selitykset ja j\"alkisanat kirjoittanut}% + {toimittanut, k\"a\"ant\"anyt, selitykset ja j\"alkisanat kirjoittanut}}, + editorstranaf = {{toimittaneet, k\"a\"ant\"aneet, selitykset ja j\"alkisanat kirjoittaneet}% + {toimittaneet, k\"a\"ant\"aneet, selitykset ja j\"alkisanat kirjoittaneet}}, + translatorco = {{k\"a\"ant\"anyt ja kommentaarin kirjoittanut}% + {k\"a\"ant\"anyt ja kommentaarin kirjoittanut}}, + translatorsco = {{k\"a\"ant\"aneet ja kommentaarin kirjoittaneet}% + {k\"a\"ant\"aneet ja kommentaarin kirjoittaneet}}, + translatoran = {{k\"a\"ant\"anyt ja selityksin varustanut}% + {k\"a\"ant\"anyt ja selityksin varustanut}}, + translatorsan = {{k\"a\"ant\"aneet ja selityksin varustaneet}% + {k\"a\"ant\"aneet ja selityksin varustaneet}}, + translatorin = {{k\"a\"ant\"anyt ja johdannon kirjoittanut}% + {k\"a\"ant\"anyt ja johdannon kirjoittanut}}, + translatorsin = {{k\"a\"ant\"aneet ja johdannon kirjoittaneet}% + {k\"a\"ant\"aneet ja johdannon kirjoittaneet}}, + translatorfo = {{k\"a\"ant\"anyt ja esipuheen kirjoittanut}% + {k\"a\"ant\"anyt ja esipuheen kirjoittanut}}, + translatorsfo = {{k\"a\"ant\"aneet ja esipuheen kirjoittaneet}% + {k\"a\"ant\"aneet ja esipuheen kirjoittaneet}}, + translatoraf = {{k\"a\"ant\"anyt ja j\"alkisanat kirjoittanut}% + {k\"a\"ant\"anyt ja j\"alkisanat kirjoittanut}}, + translatorsaf = {{k\"a\"ant\"aneet ja j\"alkisanat kirjoittaneet}% + {k\"a\"ant\"aneet ja j\"alkisanat kirjoittaneet}}, + translatorcoin = {{k\"a\"ant\"anyt, kommentaarin ja johdannon kirjoittanut}% + {k\"a\"ant\"anyt, kommentaarin ja johdannon kirjoittanut}}, + translatorscoin = {{k\"a\"ant\"aneet, kommentaarin ja johdannon kirjoittaneet}% + {k\"a\"ant\"aneet, kommentaarin ja johdannon kirjoittaneet}}, + translatorcofo = {{k\"a\"ant\"anyt, kommentaarin ja esipuheen kirjoittanut}% + {k\"a\"ant\"anyt, kommentaarin ja esipuheen kirjoittanut}}, + translatorscofo = {{k\"a\"ant\"aneet, kommentaarin ja esipuheen kirjoittaneet}% + {k\"a\"ant\"aneet, kommentaarin ja esipuheen kirjoittaneet}}, + translatorcoaf = {{k\"a\"ant\"anyt, kommentaarin ja j\"alkisanat kirjoittanut}% + {k\"a\"ant\"anyt, kommentaarin ja j\"alkisanat kirjoittanut}}, + translatorscoaf = {{k\"a\"ant\"aneet, kommentaarin ja j\"alkisanat kirjoittaneet}% + {k\"a\"ant\"aneet, kommentaarin ja j\"alkisanat kirjoittaneet}}, + translatoranin = {{k\"a\"ant\"anyt, selitykset ja johdannon kirjoittanut}% + {k\"a\"ant\"anyt, selitykset ja johdannon kirjoittanut}}, + translatorsanin = {{k\"a\"ant\"aneet, selitykset ja johdannon kirjoittaneet}% + {k\"a\"ant\"aneet, selitykset ja johdannon kirjoittaneet}}, + translatoranfo = {{k\"a\"ant\"anyt, selitykset ja esipuheen kirjoittanut}% + {k\"a\"ant\"anyt, selitykset ja esipuheen kirjoittanut}}, + translatorsanfo = {{k\"a\"ant\"aneet, selitykset ja esipuheen kirjoittaneet}% + {k\"a\"ant\"aneet, selitykset ja esipuheen kirjoittaneet}}, + translatoranaf = {{k\"a\"ant\"anyt, selitykset ja j\"alkisanat kirjoittanut}% + {k\"a\"ant\"anyt, selitykset ja j\"alkisanat kirjoittanut}}, + translatorsanaf = {{k\"a\"ant\"aneet, selitykset ja j\"alkisanat kirjoittaneet}% + {k\"a\"ant\"aneet, selitykset ja j\"alkisanat kirjoittaneet}}, + byauthor = {{kirjoittanut}{kirj\adddot}}, + byeditor = {{toimittanut}{toim\adddot}}, + bycompiler = {{koontanut}{koontanut}}, + byredactor = {{toimittanut}{toim\adddot}}, % FIXME: unsure. +% byfounder = {{}{}}, % FIXME: missing +% bycontinuator = {{}{}}, % FIXME: missing +% bycollaborator = {{}{}}, % FIXME: missing + bytranslator = {{\lbx@fromlang k\"a\"ant\"anyt}{\lbx@fromlang k\"a\"ant\adddot}}, + bycommentator = {{kommentaarin kirjoittanut}{kommentaarin kirjoittanut}}, % FIXME: unsure. + byannotator = {{selityksin varustanut}{selityksin varustanut}}, % FIXME: unsure. + withcommentator = {{kommentaarin kirjoittanut}{kommentaarin kirjoittanut}}, % FIXME: unsure. + withannotator = {{selityksin varustanut}{selityksin varustanut}}, % FIXME: unsure. + withintroduction = {{johdannon kirjottanut}{johdannon kirjottanut}}, + withforeword = {{esipuheen kirjoittanut}{esipuheen kirjoittanut}}, + withafterword = {{j\"alkisanat kirjoittanut}{j\"alkisanat kirjoittanut}}, + byeditortr = {{toimittanut ja \lbx@fromlang k\"a\"ant\"anyt}% + {toim\adddotspace ja \lbx@fromlang k\"a\"ant\adddot}}, + byeditorco = {{toimittanut ja kommentaarin kirjoittanut}% + {toimittanut ja kommentaarin kirjoittanut}}, + byeditoran = {{toimittanut ja selityksin varustanut}% + {toimittanut ja selityksin varustanut}}, + byeditorin = {{toimittanut ja johdannon kirjoittanut}% + {toimittanut ja johdannon kirjoittanut}}, + byeditorfo = {{toimittanut ja esipuheen kirjoittanut}% + {toimittanut ja esipuheen kirjoittanut}}, + byeditoraf = {{toimittanut ja j\"alkisanat kirjoittanut}% + {toimittanut ja j\"alkisanat kirjoittanut}}, + byeditortrco = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja kommentaarin kirjoittanut}% + {toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja kommentaarin kirjoittanut}}, + byeditortran = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja selityksin varustanut}% + {toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja selityksin varustanut}}, + byeditortrin = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja johdannon kirjoittanut}% + {toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja johdannon kirjoittanut}}, + byeditortrfo = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja esipuheen kirjoittanut}% + {toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja esipuheen kirjoittanut}}, + byeditortraf = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja j\"alkisanat kirjoittanut}% + {toimittanut, \lbx@fromlang k\"a\"ant\"anyt ja j\"alkisanat kirjoittanut}}, + byeditorcoin = {{toimittanut, kommentaarin ja johdannon kirjoittanut}% + {toimittanut, kommentaarin ja johdannon kirjoittanut}}, + byeditorcofo = {{toimittanut, kommentaarin ja esipuheen kirjoittanut}% + {toimittanut, kommentaarin ja esipuheen kirjoittanut}}, + byeditorcoaf = {{toimittanut, kommentaarin ja j\"alkisanat kirjoittanut}% + {toimittanut, kommentaarin ja j\"alkisanat kirjoittanut}}, + byeditoranin = {{toimittanut, selitykset ja johdannon kirjoittanut}% + {toimittanut, selitykset ja johdannon kirjoittanut}}, + byeditoranfo = {{toimittanut, selitykset ja esipuheen kirjoittanut}% + {toimittanut, selitykset ja esipuheen kirjoittanut}}, + byeditoranaf = {{toimittanut, selitykset ja j\"alkisanat kirjoittanut}% + {toimittanut, selitykset ja j\"alkisanat kirjoittanut}}, + byeditortrcoin = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja johdannon kirjoittanut}% + {toimittanut, \lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja johdannon kirjoittanut}}, + byeditortrcofo = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja esipuheen kirjoittanut}% + {toimittanut, \lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja esipuheen kirjoittanut}}, + byeditortrcoaf = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja j\"alkisanat kirjoittanut}% + {toimittanut, \lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja j\"alkisanat kirjoittanut}}, + byeditortranin = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt, selitykset ja johdannon kirjoittanut}% + {toimittanut, \lbx@fromlang k\"a\"ant\"anyt, selitykset ja johdannon kirjoittanut}}, + byeditortranfo = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt, selitykset ja esipuheen kirjoittanut}% + {toimittanut, \lbx@fromlang k\"a\"ant\"anyt, selitykset ja esipuheen kirjoittanut}}, + byeditortranaf = {{toimittanut, \lbx@fromlang k\"a\"ant\"anyt, selitykset ja j\"alkisanat kirjoittanut}% + {toimittanut, \lbx@fromlang k\"a\"ant\"anyt, selitykset ja j\"alkisanat kirjoittanut}}, + bytranslatorco = {{\lbx@fromlang k\"a\"ant\"anyt ja kommentaarin kirjoittanut}% + {\lbx@fromlang k\"a\"ant\"anyt ja kommentaarin kirjoittanut}}, + bytranslatoran = {{\lbx@fromlang k\"a\"ant\"anyt ja selityksin varustanut}% + {\lbx@fromlang k\"a\"ant\"anyt ja selityksin varustanut}}, + bytranslatorin = {{\lbx@fromlang k\"a\"ant\"anyt ja johdannon kirjoittanut}% + {\lbx@fromlang k\"a\"ant\"anyt ja johdannon kirjoittanut}}, + bytranslatorfo = {{\lbx@fromlang k\"a\"ant\"anyt ja esipuheen kirjoittanut}% + {\lbx@fromlang k\"a\"ant\"anyt ja esipuheen kirjoittanut}}, + bytranslatoraf = {{\lbx@fromlang k\"a\"ant\"anyt ja j\"alkisanat kirjoittanut}% + {\lbx@fromlang k\"a\"ant\"anyt ja j\"alkisanat kirjoittanut}}, + bytranslatorcoin = {{\lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja johdannon kirjoittanut}% + {\lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja johdannon kirjoittanut}}, + bytranslatorcofo = {{\lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja esipuheen kirjoittanut}% + {\lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja esipuheen kirjoittanut}}, + bytranslatorcoaf = {{\lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja j\"alkisanat kirjoittanut}% + {\lbx@fromlang k\"a\"ant\"anyt, kommentaarin ja j\"alkisanat kirjoittanut}}, + bytranslatoranin = {{\lbx@fromlang k\"a\"ant\"anyt, selityksin varustanut ja johdannon kirjoittanut}% + {\lbx@fromlang k\"a\"ant\"anyt, selityksin varustanut ja johdannon kirjoittanut}}, + bytranslatoranfo = {{\lbx@fromlang k\"a\"ant\"anyt, selityksin varustanut ja esipuheen kirjoittanut}% + {\lbx@fromlang k\"a\"ant\"anyt, selityksin varustanut ja esipuheen kirjoittanut}}, + bytranslatoranaf = {{\lbx@fromlang k\"a\"ant\"anyt, selityksin varustanut ja j\"alkisanat kirjoittanut}% + {\lbx@fromlang k\"a\"ant\"anyt, selityksin varustanut ja j\"alkisanat kirjoittanut}}, + and = {{ja}{ja}}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + andmore = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + volume = {{volyymi}{vol\adddot}}, + volumes = {{volyymit}{vol\adddot}}, + jourvol = {{volyymi}{vol\adddot}}, + jourser = {{sarja}{sarja}}, + newseries = {{uusi sarja}{uusi sarja}}, + oldseries = {{vanha sarja}{vanha sarja}}, + edition = {{painos}{painos}}, + reprint = {{j\"alkipainos}{j\"alkipainos}}, + reprintof = {{julkaistu aiemmin nimell\"a}{julkaistu aiemmin nimell\"a}}, + reprintas = {{julkaistu uudelleen nimell\"a}{julkaistu uudelleen nimell\"a}}, + page = {{sivu}{s\adddot}}, + pages = {{sivut}{s\adddot}}, + column = {{palsta}{palsta}}, % Here "sarake" is wrong! + columns = {{palstat}{palstat}}, % Here "sarakkeet" is wrong! + line = {{rivi}{rivi}}, + lines = {{rivit}{rivit}}, + verse = {{s\"ae}{s\"ae}}, + verses = {{s\"akeet}{s\"akeet}}, + section = {{kohta}{kohta}}, % Bad translation, but "pyk\"al\"a" is no better. + sections = {{kohdat}{kohdat}}, % Bad translation, but "pyk\"al\"at" is no better. + paragraph = {{kappale}{kappale}}, + paragraphs = {{kappaleet}{kappaleet}}, + in = {{teoksessa}{teoksessa}}, + inseries = {{sarjassa}{sarjassa}}, + ofseries = {{sarjassa}{sarjassa}}, + number = {{numero}{nro}}, + chapter = {{luku}{luku}}, + mathesis = {{tutkielma}{tutkielma}}, % FIXME: unsure. + phdthesis = {{tohtorinv\"ait\"oskirja}{tohtorinv\"ait\"oskirja}}, + resreport = {{tutkimusraportti}{tutkimusraportti}}, + techreport = {{tekninen raportti}{tekninen raportti}}, + software = {{ohjelmisto}{ohjelmisto}}, + datacd = {{data-CD}{data-CD}}, % Is {CD-ROM}{CD-ROM}} better? + audiocd = {{\"a\"ani-CD}{\"a\"ani-CD}}, + version = {{versio}{versio}}, + url = {{url}{url}}, + urlseen = {{viitattu}{viitattu}}, +% inpress = {{}{}}, % FIXME: missing +% submitted = {{}{}}, % FIXME: missing + citedas = {{jatkossa}{jatkossa}}, +% thiscite = {{}{}}, % FIXME: missing + seenote = {{katso viite}{katso viite}}, + quotedin = {{lainattu teoksessa}{lainattu teoksessa}}, + idem = {{idem}{id\adddot}}, % It its not necessary to translate Latin phrases. + idemsf = {{idem}{id\adddot}}, + idemsm = {{idem}{id\adddot}}, + idemsn = {{idem}{id\adddot}}, + idempf = {{idem}{id\adddot}}, + idempm = {{idem}{id\adddot}}, + idempn = {{idem}{id\adddot}}, + idempp = {{idem}{id\adddot}}, + ibidem = {{ibidem}{ibid\adddot}}, + opcit = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}}, + loccit = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}}, + confer = {{cf\adddot}{cf\adddot}}, + sequens = {{sq\adddot}{sq\adddot}}, + sequentes = {{sqq\adddot}{sqq\adddot}}, + passim = {{passim}{pass\adddot}}, + see = {{katso}{ks\adddot}}, + seealso = {{katso my\"os}{katso my\"os}}, + backrefpage = {{katso sivu}{ks\adddotspace s\adddot}}, + backrefpages = {{katso sivut}{ks\adddotspace s\adddot}}, + january = {{tammikuuta}{tammikuuta}}, + february = {{helmikuuta}{helmikuuta}}, + march = {{maaliskuuta}{maaliskuuta}}, + april = {{huhtikuuta}{huhtikuuta}}, + may = {{toukokuuta}{toukokuuta}}, + june = {{kes\"akuuta}{kes\"akuuta}}, + july = {{hein\"akuuta}{hein\"akuuta}}, + august = {{elokuuta}{elokuuta}}, + september = {{syyskuuta}{syyskuuta}}, + october = {{lokakuuta}{lokakuuta}}, + november = {{marraskuuta}{marraskuuta}}, + december = {{joulukuuta}{joulukuuta}}, + langamerican = {{amerikanenglanti}{amerikanenglanti}}, + langbrazilian = {{brasilianportugali}{brasilianportugali}}, + langdanish = {{tanska}{tanska}}, + langdutch = {{hollanti}{hollanti}}, + langenglish = {{englanti}{englanti}}, + langfrench = {{ranska}{ranska}}, + langgerman = {{saksa}{saksa}}, + langgreek = {{kreikka}{kreikka}}, + langitalian = {{italia}{italia}}, + langlatin = {{latina}{latina}}, + langnorwegian = {{norja}{norja}}, + langportuguese = {{portugali}{portugali}}, + langspanish = {{espanja}{espanja}}, + langswedish = {{ruotsi}{ruotsi}}, + fromamerican = {{englannin kielest\"a}{englannin kielest\"a}}, + frombrazilian = {{portugalin kielest\"a}{portugalin kielest\"a}}, + fromdanish = {{tanskan kielest\"a}{tanskan kielest\"a}}, + fromdutch = {{hollannin kielest\"a}{hollannin kielest\"a}}, + fromenglish = {{englannin kielest\"a}{englannin kielest\"a}}, + fromfrench = {{ranskan kielest\"a}{ranskan kielest\"a}}, + fromgerman = {{saksan kielest\"a}{saksan kielest\"a}}, + fromgreek = {{kreikan kielest\"a}{kreikan kielest\"a}}, + fromitalian = {{italian kielest\"a}{italian kielest\"a}}, + fromlatin = {{latinan kielest\"a}{latinan kielest\"a}}, + fromnorwegian = {{norjan kielest\"a}{norjan kielest\"a}}, + fromportuguese = {{portugalin kielest\"a}{portugalin kielest\"a}}, + fromspanish = {{espanjan kielest\"a}{espanjan kielest\"a}}, + fromswedish = {{ruotsin kielest\"a}{ruotsin kielest\"a}}, + countryde = {{Saksa}{DE}}, + countryeu = {{Euroopan Unioni}{EU}}, + countryep = {{Euroopan Unioni}{EP}}, + countryfr = {{Ranska}{FR}}, + countryuk = {{Iso-Britannia}{GB}}, + countryus = {{Yhdysvallat}{US}}, + patent = {{patentti}{pat\adddot}}, + patentde = {{saksalainen patentti}{saksalainen pat\adddot}}, + patenteu = {{Euroopan Unionin patentti}{Euroopan Unionin pat\adddot}}, + patentfr = {{ranskalainen patentti}{ranskalainen pat\adddot}}, + patentuk = {{englantilainen patentti}{englantilainen pat\adddot}}, + patentus = {{yhdysvaltalainen patentti}{yhdysvaltalainen pat\adddot}}, + patreq = {{patenttihakemus}{pat\adddot\ hak\adddot}}, + patreqde = {{saksalainen patenttihakemus}{saksalainen pat\adddot\ hak\adddot}}, + patreqeu = {{Euroopan Unionin patenttihakemus}{Euroopan Unionin pat\adddot\ hak\adddot}}, + patreqfr = {{ranskalainen patenttihakemus}{ranskalainen pat\adddot\ hak\adddot}}, + patrequk = {{englantilainen patenttihakemus}{englantilainen pat\adddot\ hak\adddot}}, + patrequs = {{yhdysvaltalainen patenttihakemus}{yhdysvaltalainen pat\adddot\ hak\adddot}}, + file = {{tiedosto}{tiedosto}}, + library = {{kirjasto}{kirjasto}}, + abstract = {{tiivistelm\"a}{tiivistelm\"a}}, + annotation = {{selitykset}{selitykset}}, % FIXME: unsure. +} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx index 312dc15879f..393fd5292da 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx @@ -1,7 +1,7 @@ -% $Id: french.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: french.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{french.lbx} -[\abx@lbxid $Id: french.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@lbxid $Id: french.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] % STATUS OF THIS FILE % * incomplete @@ -312,6 +312,8 @@ passim = {{passim}{pass\adddot}}, see = {{cf\adddot}{cf\adddot}}, seealso = {{cf\adddot\ aussi}{cf\adddot\ aussi}}, + backrefpage = {{cf\adddotspace page}{cf\adddotspace p\adddot}}, + backrefpages = {{cf\adddotspace pages}{cf\adddotspace p\adddot}}, january = {{janvier}{jan\adddot}}, february = {{f\'evrier}{f\'ev\adddot}}, march = {{mars}{mar\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx index 2e3fe9ca6f4..a463ce1626f 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx @@ -1,7 +1,7 @@ -% $Id: german.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: german.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{german.lbx} -[\abx@lbxid $Id: german.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@lbxid $Id: german.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] % STATUS OF THIS FILE % * complete @@ -358,6 +358,8 @@ passim = {{passim}{pass\adddot}}, see = {{siehe}{siehe}}, seealso = {{siehe auch}{s.\,auch}}, + backrefpage = {{siehe Seite}{siehe S\adddot}}, + backrefpages = {{siehe Seiten}{siehe S\adddot}}, january = {{Januar}{Jan\adddot}}, february = {{Februar}{Feb\adddot}}, march = {{M\"arz}{M\"arz}}, @@ -373,7 +375,7 @@ langamerican = {{Amerikanisch}{Amerikanisch}}, langbrazilian = {{Brasilianisch}{Brasilianisch}}, langdanish = {{D\"anisch}{D\"anisch}}, - langdutch = {{Niederlndisch}{Niederlndisch}}, + langdutch = {{Niederl\"andisch}{Niederl\"andisch}}, langenglish = {{Englisch}{Englisch}}, langfrench = {{Franz\"osisch}{Franz\"osisch}}, langgerman = {{Deutsch}{Deutsch}}, @@ -387,7 +389,7 @@ fromamerican = {{aus dem Amerikanischen}{aus dem Amerikanischen}}, frombrazilian = {{aus dem Brasilianischen}{aus dem Brasilianischen}}, fromdanish = {{aus dem D\"anischen}{aus dem D\"anischen}}, - fromdutch = {{aus dem Niederlndischen}{aus dem Niederlndischen}}, + fromdutch = {{aus dem Niederl\"andischen}{aus dem Niederl\"andischen}}, fromenglish = {{aus dem Englischen}{aus dem Englischen}}, fromfrench = {{aus dem Franz\"osischen}{aus dem Franz\"osischen}}, fromgerman = {{aus dem Deutschen}{aus dem Deutschen}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx index be37aac840e..6f89a47df69 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx @@ -1,7 +1,20 @@ -% $Id: greek.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: greek.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{greek.lbx} -[\abx@lbxid $Id: greek.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@lbxid $Id: greek.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] + +% STATUS OF THIS FILE +% * incomplete +% * existing translations by native speaker +% * peer review pending + +% TRANSLATOR'S NOTES: +% +% The translations should be OK but should also be tested against +% enough real data. Especially: +% +% a) Abbreviations should be checked +% b) Issues concerning grammatical gender have not been studied % This file requires UTF-8 support! @@ -108,144 +121,212 @@ shorthands = {{Κατάλογος συντμήσεων}{Συντμήσεις}}, editor = {{επιμελητής}{επιμελητής}}, editors = {{επιμελητές}{επιμελητές}}, -% compiler = {{}{}}, % FIXME: missing -% compilers = {{}{}}, % FIXME: missing + compiler = {{συντάκτης}{συντάκτης}}, + compilers = {{συντάκτες}{συντάκτες}}, redactor = {{συντάκτης}{συντάκτης}}, redactors = {{συντάκτες}{συντάκτες}}, -% founder = {{}{}}, % FIXME: missing -% founders = {{}{}}, % FIXME: missing -% continuator = {{}{}}, % FIXME: missing -% continuators = {{}{}}, % FIXME: missing -% collaborator = {{}{}}, % FIXME: missing -% collaborators = {{}{}}, % FIXME: missing + founder = {{αρχικός δημιουργός}{αρχικός δημιουργός}}, + founders = {{αρχικοί δημιουργοί}{αρχικοί δημιουργοί}}, + continuator = {{συνεχιστής}{συνεχιστής}}, + continuators = {{συνεχιστές}{συνεχιστές}}, + collaborator = {{συνεργάτης}{συνεργάτης}}, + collaborators = {{συνεργάτες}{συνεργάτες}}, translator = {{μεταφραστής}{μεταφραστής}}, translators = {{μεταφραστές}{μεταφραστές}}, commentator = {{υπομνηματιστής}{υπομνηματιστής}}, % FIXME: unsure! commentators = {{υπομνηματιστές}{υπομνηματιστές}}, % FIXME: unsure! - annotator = {{σχολιαστής}{σχολιαστής}}, - annotators = {{σχολιαστές}{σχολιαστές}}, + annotator = {{υπομνηματιστής}{υπομνηματιστής}}, + annotators = {{υπομνηματιστές}{υπομνηματιστές}}, commentary = {{ερμηνευτικές σημειώσεις}{ερμηνευτικές σημειώσεις}}, annotations = {{επισημείωση}{επισημείωση}}, introduction = {{εισαγωγή}{εισαγωγή}}, foreword = {{πρόλογος}{πρόλ\adddot}}, afterword = {{επίλογος}{επίλ\adddot}}, -% editortr = {{}} % FIXME: missing -% editorstr = {{}} % FIXME: missing -% editorco = {{}} % FIXME: missing -% editorsco = {{}} % FIXME: missing -% editoran = {{}} % FIXME: missing -% editorsan = {{}} % FIXME: missing -% editorin = {{}} % FIXME: missing -% editorsin = {{}} % FIXME: missing -% editorfo = {{}} % FIXME: missing -% editorsfo = {{}} % FIXME: missing -% editoraf = {{}} % FIXME: missing -% editorsaf = {{}} % FIXME: missing -% editortrco = {{}} % FIXME: missing -% editorstrco = {{}} % FIXME: missing -% editortran = {{}} % FIXME: missing -% editorstran = {{}} % FIXME: missing -% editortrin = {{}} % FIXME: missing -% editorstrin = {{}} % FIXME: missing -% editortrfo = {{}} % FIXME: missing -% editorstrfo = {{}} % FIXME: missing -% editortraf = {{}} % FIXME: missing -% editorstraf = {{}} % FIXME: missing -% editorcoin = {{}} % FIXME: missing -% editorscoin = {{}} % FIXME: missing -% editorcofo = {{}} % FIXME: missing -% editorscofo = {{}} % FIXME: missing -% editorcoaf = {{}} % FIXME: missing -% editorscoaf = {{}} % FIXME: missing -% editoranin = {{}} % FIXME: missing -% editorsanin = {{}} % FIXME: missing -% editoranfo = {{}} % FIXME: missing -% editorsanfo = {{}} % FIXME: missing -% editoranaf = {{}} % FIXME: missing -% editorsanaf = {{}} % FIXME: missing -% editortrcoin = {{}} % FIXME: missing -% editorstrcoin = {{}} % FIXME: missing -% editortrcofo = {{}} % FIXME: missing -% editorstrcofo = {{}} % FIXME: missing -% editortrcoaf = {{}} % FIXME: missing -% editorstrcoaf = {{}} % FIXME: missing -% editortranin = {{}} % FIXME: missing -% editorstranin = {{}} % FIXME: missing -% editortranfo = {{}} % FIXME: missing -% editorstranfo = {{}} % FIXME: missing -% editortranaf = {{}} % FIXME: missing -% editorstranaf = {{}} % FIXME: missing -% translatorco = {{}} % FIXME: missing -% translatorsco = {{}} % FIXME: missing -% translatoran = {{}} % FIXME: missing -% translatorsan = {{}} % FIXME: missing -% translatorin = {{}} % FIXME: missing -% translatorsin = {{}} % FIXME: missing -% translatorfo = {{}} % FIXME: missing -% translatorsfo = {{}} % FIXME: missing -% translatoraf = {{}} % FIXME: missing -% translatorsaf = {{}} % FIXME: missing -% translatorcoin = {{}} % FIXME: missing -% translatorscoin = {{}} % FIXME: missing -% translatorcofo = {{}} % FIXME: missing -% translatorscofo = {{}} % FIXME: missing -% translatorcoaf = {{}} % FIXME: missing -% translatorscoaf = {{}} % FIXME: missing -% translatoranin = {{}} % FIXME: missing -% translatorsanin = {{}} % FIXME: missing -% translatoranfo = {{}} % FIXME: missing -% translatorsanfo = {{}} % FIXME: missing -% translatoranaf = {{}} % FIXME: missing -% translatorsanaf = {{}} % FIXME: missing + editortr = {{επιμελητή και μεταφραστής} + {επιμελητή και μτφρ\adddot}}, + editorstr = {{επιμελητέ και μεταφραστές} + {επιμελητέ και μτφρ\adddot}}, + editorco = {{επιμελητή και υπομνηματιστής} + {επιμελητή και υπομν\adddot}}, + editorsco = {{επιμελητέ και υπομνηματιστής} + {επιμελητέ και υπομν\adddot}}, + editoran = {{επιμελητή και υπομνηματιστής} + {επιμελητή και υπομν\adddot}}, + editorsan = {{επιμελητέ και υπομνηματιστές} + {επιμελητέ και υπομν\adddot}}, + editorin = {{επιμελητή και εισαγωγή} + {επιμελητή και εισαγ\adddot}}, + editorsin = {{επιμελητέ και εισαγωγή} + {επιμελητέ και εισαγ\adddot}}, + editorfo = {{επιμελητή και πρόλογος} + {επιμελητή και πρόλ\adddot}}, + editorsfo = {{επιμελητέ και πρόλογος} + {επιμελητέ και πρόλ\adddot}}, + editoraf = {{επιμελητή και επίλογος} + {επιμελητή και επίλ\adddot}}, + editorsaf = {{επιμελητέ και επίλογος} + {επιμελητέ και επίλ\adddot}}, + editortrco = {{επιμελητή, μεταφραστή και υπομνηματιστής} + {επιμελητή μτφρ\adddot\ και υπομν\adddot}}, + editorstrco = {{επιμελητέ, μεταφραστέ και υπομνηματιστές} + {επιμελητέ, μτφρ\adddot\ και υπομν\adddot}}, + editortran = {{επιμελητή, μεταφραστή και επισημειωτής} + {επιμελητή μτφρ\adddot\ και επισημ\adddot}}, + editorstran = {{επιμελητέ, μεταφραστέ και επισημειωτές} + {επιμελητέ, μτφρ\adddot\ και επισημ\adddot}}, + editortrin = {{επιμελητή, μεταφραστή και εισαγωγή} + {επιμελητή μτφρ\adddot\ και εισαγ\adddot}}, + editorstrin = {{επιμελητέ, μεταφραστέ και εισαγωγή} + {επιμελητέ, μτφρ\adddot\ και εισαγ\adddot}}, + editortrfo = {{επιμελητή, μεταφραστή και πρόλογος} + {επιμελητή μτφρ\adddot\ και πρόλ\adddot}}, + editorstrfo = {{επιμελητέ, μεταφραστέ και πρόλογος} + {επιμελητέ, μτφρ\adddot\ και πρόλ\adddot}}, + editortraf = {{επιμελητή, μεταφραστή και επίλογος} + {επιμελητή μτφρ\adddot\ και επίλ\adddot}}, + editorstraf = {{επιμελητέ, μεταφραστέ και επίλογος} + {επιμελητέ, μτφρ\adddot\ και επίλ\adddot}}, + editorcoin = {{επιμελητή, υπομνηματιστή και εισαγωγή} + {επιμελητή υπομν\adddot\ και εισαγ\adddot}}, + editorscoin = {{επιμελητέ, υπομνηματιστέ και εισαγωγή} + {επιμελητέ, υπομν\adddot\ και εισαγ\adddot}}, + editorcofo = {{επιμελητή, υπομνηματιστή και πρόλογος} + {επιμελητή υπομν\adddot\ και πρόλ\adddot}}, + editorscofo = {{επιμελητέ, υπομνηματιστέ και πρόλογος} + {επιμελητέ, υπομν\adddot\ και πρόλ\adddot}}, + editorcoaf = {{επιμελητή, υπομνηματιστή και επίλογος} + {επιμελητή υπομν\adddot\ και επίλ\adddot}}, + editorscoaf = {{επιμελητέ, υπομνηματιστέ και επίλογος} + {επιμελητέ, υπομν\adddot\ και επίλ\adddot}}, + editoranin = {{επιμελητή, επισημειωτή και εισαγωγή} + {επιμελητή επισημ\adddot\ και εισαγ\adddot}}, + editorsanin = {{επιμελητέ, επισημειωτέ και εισαγωγή} + {επιμελητέ, επισημ\adddot\ και εισαγ\adddot}}, + editoranfo = {{επιμελητή, επισημειωτή και πρόλογος} + {επιμελητή επισημ\adddot\ και πρόλ\adddot}}, + editorsanfo = {{επιμελητέ, επισημειωτέ και πρόλογος} + {επιμελητέ, επισημ\adddot\ και πρόλ\adddot}}, + editoranaf = {{επιμελητή, επισημειωτή και επίλογος} + {επιμελητή επισημ\adddot\ και επίλ\adddot}}, + editorsanaf = {{επιμελητέ, επισημειωτέ και επίλογος} + {επιμελητέ, επισημ\adddot\ και επίλ\adddot}}, + editortrcoin = {{επιμελητή, μεταφραστής, υπομνηματιστή και εισαγωγή} + {επιμελητή μτφρ., υπομν\adddot\ και εισαγ\adddot}}, + editorstrcoin = {{επιμελητέ, μεταφραστές, υπομνηματιστέ και εισαγωγή} + {επιμελητέ, μτφρ., υπομν\adddot\ και εισαγ\adddot}}, + editortrcofo = {{επιμελητή, μεταφραστής, υπομνηματιστή και πρόλογος} + {επιμελητή μτφρ., υπομν\adddot\ και πρόλ\adddot}}, + editorstrcofo = {{επιμελητέ, μεταφραστές, υπομνηματιστέ και πρόλογος} + {επιμελητέ, μτφρ., υπομν\adddot\ και πρόλ\adddot}}, + editortrcoaf = {{επιμελητή, μεταφραστής, υπομνηματιστή και επίλογος} + {επιμελητή μτφρ., υπομν\adddot\ και επίλ\adddot}}, + editorstrcoaf = {{επιμελητέ, μεταφραστές, υπομνηματιστέ και επίλογος} + {επιμελητέ, μτφρ., υπομν\adddot\ και επίλ\adddot}}, + editortranin = {{επιμελητή, μεταφραστής, επισημειωτή και εισαγωγή} + {επιμελητή μτφρ., επισημ\adddot\ και εισαγ\adddot}}, + editorstranin = {{επιμελητέ, μεταφραστές, επισημειωτέ και εισαγωγή} + {επιμελητέ, μτφρ., επισημ\adddot\ και εισαγ\adddot}}, + editortranfo = {{επιμελητή, μεταφραστής, επισημειωτή και πρόλογος} + {επιμελητή μτφρ., επισημ\adddot\ και πρόλ\adddot}}, + editorstranfo = {{επιμελητέ, μεταφραστές, επισημειωτέ και πρόλογος} + {επιμελητέ, μτφρ., επισημ\adddot\ και πρόλ\adddot}}, + editortranaf = {{επιμελητή, μεταφραστής, επισημειωτή και επίλογος} + {επιμελητή μτφρ., επισημ\adddot\ και επίλ\adddot}}, + editorstranaf = {{επιμελητέ, μεταφραστές, επισημειωτέ και επίλογος} + {επιμελητέ, μτφρ., επισημ\adddot\ και επίλ\adddot}}, + translatorco = {{μεταφραστής και υπομνηματιστής} + {μτφρ\adddot\ και υπομν\adddot}}, + translatorsco = {{μεταφραστές και υπομνηματιστές} + {μτφρ\adddot\ και υπομν\adddot}}, + translatoran = {{μεταφραστής και επισημειωτής} + {μτφρ\adddot\ και επισημ\adddot}}, + translatorsan = {{μεταφραστές και επισημειωτές} + {μτφρ\adddot\ και επισημ\adddot}}, + translatorin = {{μετάφραση και εισαγωγή} + {μτφρ\adddot\ και εισαγ\adddot}}, + translatorsin = {{μετάφραση και εισαγωγή} + {μτφρ\adddot\ και εισαγ\adddot}}, + translatorfo = {{μετάφραση και πρόλογος} + {μτφρ\adddot\ και πρόλ\adddot}}, + translatorsfo = {{μετάφραση και πρόλογος} + {μτφρ\adddot\ και πρόλ\adddot}}, + translatoraf = {{μετάφραση και επίλογος} + {μτφρ\adddot\ και επίλ\adddot}}, + translatorsaf = {{μετάφραση και επίλογος} + {μτφρ\adddot\ και επίλ\adddot}}, + translatorcoin = {{μετάφραση, υπομνηματισμό και εισαγωγή} + {μτφρ., υπομν\adddot\ και εισαγ\adddot}}, + translatorscoin = {{μετάφραση, υπομνηματισμό και εισαγωγή} + {μτφρ., υπομν\adddot\ και εισαγ\adddot}}, + translatorcofo = {{μετάφραση, υπομνηματισμό και πρόλογος} + {μτφρ., υπομν\adddot\ και πρόλ\adddot}}, + translatorscofo = {{μετάφραση, υπομνηματισμό και πρόλογος} + {μτφρ., υπομν\adddot\ και πρόλ\adddot}}, + translatorcoaf = {{μετάφραση, υπομνηματισμό και επίλογος} + {μτφρ., υπομν\adddot\ και επίλ\adddot}}, + translatorscoaf = {{μετάφραση, υπομνηματισμό και επίλογος} + {μτφρ., υπομν\adddot\ και επίλ\adddot}}, + translatoranin = {{μετάφραση, επισημείωση και εισαγωγή} + {μτφρ., επισημ\adddot\ και εισαγ\adddot}}, + translatorsanin = {{μετάφραση, επισημείωση και εισαγωγή} + {μτφρ., επισημ\adddot\ και εισαγ\adddot}}, + translatoranfo = {{μετάφραση, επισημείωση και πρόλογος} + {μτφρ., επισημ\adddot\ και πρόλ\adddot}}, + translatorsanfo = {{μετάφραση, επισημείωση και πρόλογος} + {μτφρ., επισημ\adddot\ και πρόλ\adddot}}, + translatoranaf = {{μετάφραση, επισημείωση και επίλογος} + {μτφρ., επισημ\adddot\ και επίλ\adddot}}, + translatorsanaf = {{μετάφραση, επισημείωση και επίλογος} + {μτφρ., επισημ\adddot\ και επίλ\adddot}}, byauthor = {{υπό}{υπό}}, byeditor = {{επιμέλεια υπό}{επιμέλεια υπό}}, -% bycompiler = {{}} % FIXME: missing + bycompiler = {{σύνταξη υπό}{σύνταξη υπό}} byredactor = {{σύνταξη υπό}{σύναταξη υπό}}, -% byfounder = {{}} % FIXME: missing -% bycontinuator = {{}} % FIXME: missing -% bycollaborator = {{}} % FIXME: missing + byfounder = {{αρχική δημιουργία από}{αρχική δημιουργία από}} + bycontinuator = {{συνέχεια από}{συνέχεια από}} + bycollaborator = {{συνεργασία από}{συνεργασία από}} bytranslator = {{μετάφραση \lbx@fromlang\ υπό}{μετάφραση \lbx@fromlang\ υπό}}, - bycommentator = {{σχολιασμός υπό}{σχολιασμός υπό}}, - byannotator = {{σχολιασμός υπό}{σχολιασμός υπό}}, -% withcommentator = {{}} % FIXME: missing - withannotator = {{σχολιασμός υπό}{σχολιασμός υπό}}, + bycommentator = {{υπομνηματισμός υπό}{υπομνηματισμός υπό}}, + byannotator = {{υπομνηματισμός υπό}{υπομνηματισμός υπό}}, + withcommentator = {{υπομνηματισμός υπό}{υπομνηματισμός υπό}} + withannotator = {{υπομνηματισμός υπό}{υπομνηματισμός υπό}}, withintroduction = {{εισαγωγή υπό}{εισαγωγή υπό}}, withforeword = {{πρόλογος υπό}{πρόλογος υπό}}, withafterword = {{επίλογος υπό}{επίλογος υπό}}, -% byeditortr = {{}} % FIXME: missing -% byeditorco = {{}} % FIXME: missing -% byeditoran = {{}} % FIXME: missing -% byeditorin = {{}} % FIXME: missing -% byeditorfo = {{}} % FIXME: missing -% byeditoraf = {{}} % FIXME: missing -% byeditortrco = {{}} % FIXME: missing -% byeditortran = {{}} % FIXME: missing -% byeditortrin = {{}} % FIXME: missing -% byeditortrfo = {{}} % FIXME: missing -% byeditortraf = {{}} % FIXME: missing -% byeditorcoin = {{}} % FIXME: missing -% byeditorcofo = {{}} % FIXME: missing -% byeditorcoaf = {{}} % FIXME: missing -% byeditoranin = {{}} % FIXME: missing -% byeditoranfo = {{}} % FIXME: missing -% byeditoranaf = {{}} % FIXME: missing -% byeditortrcoin = {{}} % FIXME: missing -% byeditortrcofo = {{}} % FIXME: missing -% byeditortrcoaf = {{}} % FIXME: missing -% byeditortranin = {{}} % FIXME: missing -% byeditortranfo = {{}} % FIXME: missing -% byeditortranaf = {{}} % FIXME: missing -% bytranslatorco = {{}} % FIXME: missing -% bytranslatoran = {{}} % FIXME: missing -% bytranslatorin = {{}} % FIXME: missing -% bytranslatorfo = {{}} % FIXME: missing -% bytranslatoraf = {{}} % FIXME: missing -% bytranslatorcoin = {{}} % FIXME: missing -% bytranslatorcofo = {{}} % FIXME: missing -% bytranslatorcoaf = {{}} % FIXME: missing -% bytranslatoranin = {{}} % FIXME: missing -% bytranslatoranfo = {{}} % FIXME: missing -% bytranslatoranaf = {{}} % FIXME: missing +% byeditortr = {{}{}}, % FIXME: missing +% byeditorco = {{}{}}, % FIXME: missing +% byeditoran = {{}{}}, % FIXME: missing +% byeditorin = {{}{}}, % FIXME: missing +% byeditorfo = {{}{}}, % FIXME: missing +% byeditoraf = {{}{}}, % FIXME: missing +% byeditortrco = {{}{}}, % FIXME: missing +% byeditortran = {{}{}}, % FIXME: missing +% byeditortrin = {{}{}}, % FIXME: missing +% byeditortrfo = {{}{}}, % FIXME: missing +% byeditortraf = {{}{}}, % FIXME: missing +% byeditorcoin = {{}{}}, % FIXME: missing +% byeditorcofo = {{}{}}, % FIXME: missing +% byeditorcoaf = {{}{}}, % FIXME: missing +% byeditoranin = {{}{}}, % FIXME: missing +% byeditoranfo = {{}{}}, % FIXME: missing +% byeditoranaf = {{}{}}, % FIXME: missing +% byeditortrcoin = {{}{}}, % FIXME: missing +% byeditortrcofo = {{}{}}, % FIXME: missing +% byeditortrcoaf = {{}{}}, % FIXME: missing +% byeditortranin = {{}{}}, % FIXME: missing +% byeditortranfo = {{}{}}, % FIXME: missing +% byeditortranaf = {{}{}}, % FIXME: missing +% bytranslatorco = {{}{}}, % FIXME: missing +% bytranslatoran = {{}{}}, % FIXME: missing +% bytranslatorin = {{}{}}, % FIXME: missing +% bytranslatorfo = {{}{}}, % FIXME: missing +% bytranslatoraf = {{}{}}, % FIXME: missing +% bytranslatorcoin = {{}{}}, % FIXME: missing +% bytranslatorcofo = {{}{}}, % FIXME: missing +% bytranslatorcoaf = {{}{}}, % FIXME: missing +% bytranslatoranin = {{}{}}, % FIXME: missing +% bytranslatoranfo = {{}{}}, % FIXME: missing +% bytranslatoranaf = {{}{}}, % FIXME: missing and = {{και}{και}}, andothers = {{κ.ά\adddot}{κ.ά\adddot}}, andmore = {{κ.ά\adddot}{κ.ά\adddot}}, @@ -257,7 +338,7 @@ oldseries = {{παλαιά σειρά}{παλαιά σειρά}}, edition = {{έκδοση}{έκδοση}}, reprint = {{ανατύπωση}{ανατύπωση}}, -% reprintof = {{}{}}, % FIXME: missing + reprintof = {{ανατύπωση του}{ανατύπωση του}}, reprintas = {{ανατύπωση ως}{ανατύπωση ως}}, page = {{σελίδα}{σ\adddot}}, pages = {{σελίδες}{σσ\adddot}}, @@ -276,23 +357,36 @@ ofseries = {{της}{της}}, number = {{αριθμός}{αρθμ\adddot}}, chapter = {{κεφάλαιο}{κεφ\adddot}}, - mathesis = {{Μεταπτυχιακή διπλωματική εργασία}{Μεταπτ/κή διπλ. εργασ\adddot}}, - phdthesis = {{Διδακτορική διατριβή}{Διδακτορική διατρ\adddot}}, - resreport = {{αδημοσίευτη ερευνητική εργασία}{αδημοσίευτη ερευνητική εργασία}}, - techreport = {{αδημοσίευτη ερευνητική εργασία}{αδημοσίευτη ερευνητική εργασία}}, + mathesis = {{Μεταπτυχιακή διπλωματική εργασία} + {Μεταπτ/κή διπλ\adddot\ εργασ\adddot}}, + phdthesis = {{Διδακτορική διατριβή} + {Διδακτορική διατρ\adddot}}, + resreport = {{αδημοσίευτη ερευνητική εργασία} + {αδημοσίευτη ερευνητική εργασία}}, + techreport = {{αδημοσίευτη ερευνητική εργασία} + {αδημοσίευτη ερευνητική εργασία}}, software = {{λογισμικό Η/Υ}{λογισμικό Η/Υ}}, datacd = {{CD-ROM}{CD-ROM}}, audiocd = {{ακουστικό CD}{ακουστικό CD}}, version = {{έκδοση}{έκδ\adddot}}, url = {{διεύθυνση}{διεύθν\adddot}}, -% urlseen = {{}{}}, % FIXME: missing -% inpress = {{}{}}, % FIXME: missing -% submitted = {{}{}}, % FIXME: missing + urlseen = {{επίσκεψη}{επίσκεψη}}, + inpress = {{υπό έκδοση}{υπό έκδ.}}, + submitted = {{υποβληθέν}{υποβληθέν}}, % FIXME: gender? citedas = {{εφεξής θα αναφέρεται ως}{εφεξής θα αναφέρεται ως}}, thiscite = {{αυτή η αναφορά}{αυτή η αναφορά}}, seenote = {{βλέπε σημείωση}{βλ\adddot\ σημ\adddot}}, quotedin = {{αναφέρεται στο}{αναφέρεται στο}}, idem = {{του ίδιου}{του ίδιου}}, + % FIXME: adapt gender + % + % sf=singular feminine + % sm=singular masculine + % sn=singular neuter + % pf=plural feminine + % pm=plural masculine + % pn=plural neuter + % pp=plural (group of mixed gender) idemsf = {{του ίδιου}{του ίδιου}}, % FIXME: gender? idemsm = {{του ίδιου}{του ίδιου}}, % FIXME: gender? idemsn = {{του ίδιου}{του ίδιου}}, % FIXME: gender? @@ -308,7 +402,9 @@ sequentes = {{κ.εξ\adddot}{κ.εξ\adddot}}, passim = {{σποράδην}{σποράδην}}, see = {{βλέπε}{βλ\adddot}}, - seealso = {{βλέπε επίσης}{βλ. επίσης}}, + seealso = {{βλέπε επίσης}{βλ\adddot\ επίσης}}, +% backrefpage = {{}{}}, % FIXME: missing +% backrefpages = {{}{}}, % FIXME: missing january = {{Ιανουάριος}{Ιαν\adddot}}, february = {{Φεβρουάριος}{Φεβ\adddot}}, march = {{Μάρτιος}{Μαρ\adddot}}, @@ -333,52 +429,64 @@ dateoctober = {{Οκτωβρίου}{Οκτ\adddot}}, datenovember = {{Νοεμβρίου}{Νοέ\adddot}}, datedecember = {{Δεκεμβρίου}{Δεκ\adddot}}, -% langamerican = {{}} % FIXME: missing -% langbrazilian = {{}} % FIXME: missing -% langdanish = {{}} % FIXME: missing -% langdutch = {{}} % FIXME: missing -% langenglish = {{}} % FIXME: missing -% langfrench = {{}} % FIXME: missing -% langgerman = {{}} % FIXME: missing -% langgreek = {{}} % FIXME: missing -% langitalian = {{}} % FIXME: missing -% langlatin = {{}} % FIXME: missing -% langnorwegian = {{}} % FIXME: missing -% langportuguese = {{}} % FIXME: missing -% langspanish = {{}} % FIXME: missing -% langswedish = {{}} % FIXME: missing -% fromamerican = {{}} % FIXME: missing -% frombrazilian = {{}} % FIXME: missing -% fromdanish = {{}} % FIXME: missing -% fromdutch = {{}} % FIXME: missing -% fromenglish = {{}} % FIXME: missing -% fromfrench = {{}} % FIXME: missing -% fromgerman = {{}} % FIXME: missing -% fromgreek = {{}} % FIXME: missing -% fromitalian = {{}} % FIXME: missing -% fromlatin = {{}} % FIXME: missing -% fromnorwegian = {{}} % FIXME: missing -% fromportuguese = {{}} % FIXME: missing -% fromspanish = {{}} % FIXME: missing -% fromswedish = {{}} % FIXME: missing + langamerican = {{Αγγλικά}{Αγγλικά}} + langbrazilian = {{Βραζιλιάνικα}{Βραζιλιάνικα}}, + langdanish = {{Δανέζικα}{Δανέζικα}}, + langdutch = {{Ολλανδικά}{Ολλανδικά}}, + langenglish = {{Αγγλικά}{Αγγλικά}}, + langfrench = {{Γαλλικά}{Γαλλικά}}, + langgerman = {{Γερμανικά}{Γερμανικά}}, + langgreek = {{Ελληνικά}{Ελληνικά}}, + langitalian = {{Ιταλικά}{Ιταλικά}}, + langlatin = {{Λατινικά}{Λατινικά}}, + langnorwegian = {{Νορβηγικά}{Νορβηγικά}}, + langportuguese = {{Πορτογαλικά}{Πορτογαλικά}}, + langspanish = {{Ισπανικά}{Ισπανικά}}, + langswedish = {{Σουηδικά}{Σουηδικά}}, + fromamerican = {{από τα Αγγλικά}{από τα Αγγλικά}}, + frombrazilian = {{από τα Βραζιλιάνικα}{από τα Βραζιλιάνικα}}, + fromdanish = {{από τα Δανέζικα}{από τα Δανέζικα}}, + fromdutch = {{από τα Ολλανδικά}{από τα Ολλανδικά}}, + fromenglish = {{από τα Αγγλικά}{από τα Αγγλικά}}, + fromfrench = {{από τα Γαλλικά}{από τα Γαλλικά}}, + fromgerman = {{από τα Γερμανικά}{από τα Γερμανικά}}, + fromgreek = {{από τα Ελληνικά}{από τα Ελληνικά}}, + fromitalian = {{από τα Ιταλικά}{από τα Ιταλικά}}, + fromlatin = {{από τα Λατινικά}{από τα Λατινικά}}, + fromnorwegian = {{από τα Νορβηγικά}{από τα Νορβηγικά}}, + fromportuguese = {{από τα Πορτογαλικά}{από τα Πορτογαλικά}}, + fromspanish = {{από τα Ισπανικά}{από τα Ισπανικά}}, + fromswedish = {{από τα Σουηδικά}{από τα Σουηδικά}}, countryde = {{Γερμανία}{DE}}, countryeu = {{Ευρωπαϊκή Ένωση}{ΕΕ}}, countryep = {{Ευρωπαϊκή Ένωση}{ΕΕ}}, -% countryfr = {{}} % FIXME: missing -% countryuk = {{}} % FIXME: missing -% countryus = {{}} % FIXME: missing -% patent = {{}} % FIXME: missing -% patentde = {{}} % FIXME: missing -% patenteu = {{}} % FIXME: missing -% patentfr = {{}} % FIXME: missing -% patentuk = {{}} % FIXME: missing -% patentus = {{}} % FIXME: missing -% patreq = {{}} % FIXME: missing -% patreqde = {{}} % FIXME: missing -% patreqeu = {{}} % FIXME: missing -% patreqfr = {{}} % FIXME: missing -% patrequk = {{}} % FIXME: missing -% patrequs = {{}} % FIXME: missing + countryfr = {{Γαλλία}{FR}}, + countryuk = {{Μεγάλη Βρετανία}{GB}}, + countryus = {{Ηνωμένες Πολιτείες της Αμερικής}{ΗΠΑ}}, + patent = {{δίπλωμα ευρεσιτεχνίας} + {διπλ\adddot\ ευρεσ\adddot}}, + patentde = {{γερμανικό δίπλωμα ευρεσιτεχνίας} + {γερμ\adddot\ διπλ\adddot\ ευρεσ\adddot}}, + patenteu = {{ευρωπαϊκό δίπλωμα ευρεσιτεχνίας} + {ευρωπ\adddot\ διπλ\adddot\ ευρεσ\adddot}}, + patentfr = {{γαλλικό δίπλωμα ευρεσιτεχνίας} + {γαλλ\adddot\ διπλ\adddot\ ευρεσ\adddot}}, + patentuk = {{βρετανικό δίπλωμα ευρεσιτεχνίας} + {βρετ\adddot\ διπλ\adddot\ ευρεσ\adddot}}, + patentus = {{αμερικανικό δίπλωμα ευρεσιτεχνίας} + {αμερ\adddot\ διπλ\adddot\ ευρεσ\adddot}}, + patreq = {{αίτηση διπλώματος ευρεσιτεχνίας} + {αιτ\adddot\ διπλ\adddot\ ευρεσ\adddot}}, + patreqde = {{αίτηση γερμανικού διπλώματος ευρεσιτεχνίας} + {αιτ\adddot\ γερμ\adddot\ διπλ\adddot\ ευρεσ\adddot}}, + patreqeu = {{αίτηση ευρωπαϊκού διπλώματος ευρεσιτεχνίας} + {αιτ\adddot\ ευρωπ\adddot\ διπλ\adddot\ ευρεσ\adddot}}, + patreqfr = {{αίτηση γαλλικού διπλώματος ευρεσιτεχνίας} + {αιτ\adddot\ γαλλ\adddot\ διπλ\adddot\ ευρεσ\adddot}}, + patrequk = {{αίτηση βρετανικού διπλώματος ευρεσιτεχνίας} + {αιτ\adddot\ βρετ\adddot\ διπλ\adddot\ ευρεσ\adddot}}, + patrequs = {{αίτηση αμερικανικού διπλώματος ευρεσιτεχνίας} + {αιτ\adddot\ αμερ\adddot\ διπλ\adddot\ ευρεσ\adddot}}, file = {{αρχείο}{αρχείο}}, library = {{βιβλιοθήκη}{βιβλιοθήκη}}, abstract = {{περίληψη}{περίληψη}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx index b763fa3c2b1..71bd4dd46e8 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx @@ -1,7 +1,7 @@ -% $Id: italian.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: italian.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{italian.lbx} -[\abx@lbxid $Id: italian.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@lbxid $Id: italian.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] % STATUS OF THIS FILE % * incomplete @@ -290,6 +290,8 @@ passim = {{passim}{pass\adddot}}, see = {{vedi\adddot}{v\adddot}}, seealso = {{vedi anche}{v\adddot~anche}}, + backrefpage = {{citato a pagina}{cit\adddotspace a p\adddot}}, + backrefpages = {{citato alle pagine}{cit\adddotspace alle pp\adddot}}, january = {{gennaio}{gen\adddot}}, february = {{febbraio}{feb\adddot}}, march = {{marzo}{mar\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx index f084e17cabb..f1695768afa 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx @@ -1,7 +1,7 @@ -% $Id: norwegian.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: norwegian.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{norwegian.lbx} -[\abx@lbxid $Id: norwegian.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@lbxid $Id: norwegian.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] % STATUS OF THIS FILE % * incomplete @@ -278,6 +278,8 @@ passim = {{passim}{pass\adddot}}, see = {{se}{s\adddot}}, seealso = {{se ogs\aa}{s.\,\aa\adddot}}, + backrefpage = {{se side}{se s\adddot}}, + backrefpages = {{se sider}{se s\adddot}}, january = {{januar}{jan\adddot}}, february = {{februar}{feb\adddot}}, march = {{marts}{mar\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx index 2db1c694ffa..19b5cc191b8 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx @@ -1,7 +1,7 @@ -% $Id: spanish.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: spanish.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{spanish.lbx} -[\abx@lbxid $Id: spanish.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@lbxid $Id: spanish.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] % STATUS OF THIS FILE % * incomplete @@ -303,6 +303,8 @@ passim = {{p\'assim}{p\'assim}}, see = {{v\'ease}{vid\adddot}}, seealso = {{v\'ease tambi\'en}{vid\adddotspace tambi\'en}}, + backrefpage = {{v\'ease p\'agina}{vid\adddotspace p\'ag\adddot}}, + backrefpages = {{v\'ease p\'aginas}{vid\adddotspace p\'ags\adddot}}, january = {{enero}{ene\adddot}}, february = {{febrero}{feb\adddot}}, march = {{marzo}{mar\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx index 9d430bbe56a..7fb7f8c6a0a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx @@ -1,7 +1,7 @@ -% $Id: swedish.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $ +% $Id: swedish.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ \ProvidesFile{swedish.lbx} -[\abx@lbxid $Id: swedish.lbx,v 0.9 2010/02/14 15:42:33 lehman beta $] +[\abx@lbxid $Id: swedish.lbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] % STATUS OF THIS FILE % * incomplete @@ -333,7 +333,8 @@ passim = {{passim}{pass\adddot}}, see = {{se}{se}}, seealso = {{se \"aven}{se \"aven}}, - % SS 03 82 0 + backrefpage = {{se sidan}{se s\adddot}}, + backrefpages = {{se sidorna}{se s\adddot}}, january = {{januari}{jan\adddot}}, february = {{februari}{febr\adddot}}, march = {{mars}{mars}}, |