diff options
| author | Karl Berry <karl@freefriends.org> | 2011-11-14 23:55:19 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2011-11-14 23:55:19 +0000 |
| commit | a29c7813b0314e553b69c72ed2b6a88b57cc1e20 (patch) | |
| tree | 16337cec204b13e6cbda22ac470ddb16cc880a03 /Master/texmf-dist/tex/latex/biblatex | |
| parent | 389fcf38bf3f3a413329dc89f7381a1b53d25561 (diff) | |
biblatex 1.7 (14nov11)
git-svn-id: svn://tug.org/texlive/trunk@24596 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex')
87 files changed, 1548 insertions, 633 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx index b2e3c3ca877..5323b7b960e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx @@ -1,7 +1,7 @@ -% $Id: alphabetic-verb.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: alphabetic-verb.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{alphabetic-verb.bbx} -[\abx@bbxid $Id: alphabetic-verb.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: alphabetic-verb.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{alphabetic} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx index b2cdff90412..f3cf7e09d91 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: alphabetic.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{alphabetic.bbx} -[\abx@bbxid $Id: alphabetic.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: alphabetic.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{standard} \ExecuteBibliographyOptions{labelalpha,sorting=anyt} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx index 459300433c4..c1362eb12dc 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx @@ -1,7 +1,7 @@ -% $Id: authortitle-comp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authortitle-comp.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authortitle-comp.bbx} -[\abx@bbxid $Id: authortitle-comp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: authortitle-comp.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{authortitle} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx index 381e33e4a2f..3ee21efebe1 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx @@ -1,7 +1,7 @@ -% $Id: authortitle-ibid.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authortitle-ibid.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authortitle-ibid.bbx} -[\abx@bbxid $Id: authortitle-ibid.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: authortitle-ibid.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{authortitle} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx index 2027772dee5..89174567403 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx @@ -1,7 +1,7 @@ -% $Id: authortitle-icomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authortitle-icomp.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authortitle-icomp.bbx} -[\abx@bbxid $Id: authortitle-icomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: authortitle-icomp.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{authortitle} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx index bb8c13b61be..f1128ccc186 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx @@ -1,7 +1,7 @@ -% $Id: authortitle-tcomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authortitle-tcomp.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authortitle-tcomp.bbx} -[\abx@bbxid $Id: authortitle-tcomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: authortitle-tcomp.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{authortitle} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx index 58a203d93c3..a0d578f774a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx @@ -1,7 +1,7 @@ -% $Id: authortitle-terse.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authortitle-terse.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authortitle-terse.bbx} -[\abx@bbxid $Id: authortitle-terse.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: authortitle-terse.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{authortitle} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx index 0a4697b69a9..060c9cf0832 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx @@ -1,7 +1,7 @@ -% $Id: authortitle-ticomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authortitle-ticomp.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authortitle-ticomp.bbx} -[\abx@bbxid $Id: authortitle-ticomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: authortitle-ticomp.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{authortitle} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx index 689f01f39c2..ebeb7003907 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authortitle.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authortitle.bbx} -[\abx@bbxid $Id: authortitle.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: authortitle.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{standard} \ExecuteBibliographyOptions{pagetracker} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx index 293199c7195..ba75ca61d4e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx @@ -1,7 +1,7 @@ -% $Id: authoryear-comp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authoryear-comp.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authoryear-comp.bbx} -[\abx@bbxid $Id: authoryear-comp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: authoryear-comp.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{authoryear} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx index ff0931b3dd6..6202f6d627a 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx @@ -1,7 +1,7 @@ -% $Id: authoryear-ibid.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authoryear-ibid.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authoryear-ibid.bbx} -[\abx@bbxid $Id: authoryear-ibid.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: authoryear-ibid.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{authoryear} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx index 3084afda06b..3fdb40e55c1 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx @@ -1,7 +1,7 @@ -% $Id: authoryear-icomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authoryear-icomp.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authoryear-icomp.bbx} -[\abx@bbxid $Id: authoryear-icomp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: authoryear-icomp.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{authoryear} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx index 1fef8c1dd46..1085e5e9c48 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authoryear.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authoryear.bbx} -[\abx@bbxid $Id: authoryear.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: authoryear.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{standard} @@ -44,7 +44,7 @@ \renewbibmacro*{issue+date}{% \iffieldundef{issue} {} - {\printtext[parens]{\printfield{issue}}} + {\printtext[parens]{\printfield{issue}}}% \newunit}% } diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx index 490becc7818..e4b2214ea76 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx @@ -1,7 +1,7 @@ -% $Id: debug.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: debug.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{debug.bbx} -[\abx@bbxid $Id: debug.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: debug.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \ExecuteBibliographyOptions{sorting=debug} \DeclareFieldFormat{entrykey}{\ttfamily[#1]} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx index f5f114697a3..67655a116f5 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: draft.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{draft.bbx} -[\abx@bbxid $Id: draft.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: draft.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{standard} \ExecuteBibliographyOptions{sorting=debug} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx index 33606b57f53..47ce22e2450 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx @@ -1,7 +1,7 @@ -% $Id: numeric-comp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: numeric-comp.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{numeric-comp.bbx} -[\abx@bbxid $Id: numeric-comp.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: numeric-comp.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{numeric} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx index 790f1283d77..84e24a173be 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx @@ -1,7 +1,7 @@ -% $Id: numeric-verb.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: numeric-verb.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{numeric-verb.bbx} -[\abx@bbxid $Id: numeric-verb.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: numeric-verb.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{numeric} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx index 092f6ff2cc7..55a5b95f9bf 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: numeric.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{numeric.bbx} -[\abx@bbxid $Id: numeric.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: numeric.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{standard} \ExecuteBibliographyOptions{labelnumber} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx index 56e3e29417e..64b709d2a5d 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: reading.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{reading.bbx} -[\abx@bbxid $Id: reading.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: reading.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{standard} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx index 4a14e42177a..b9f79ba5e4e 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: standard.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{standard.bbx} -[\abx@bbxid $Id: standard.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: standard.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \newtoggle{bbx:isbn} \newtoggle{bbx:url} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx index be6e4e1239c..e531cfc535e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx @@ -1,7 +1,7 @@ -% $Id: verbose-ibid.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: verbose-ibid.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{verbose-ibid.bbx} -[\abx@bbxid $Id: verbose-ibid.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: verbose-ibid.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{authortitle} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx index f8b07d0abb6..5d10cef58ae 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx @@ -1,7 +1,7 @@ -% $Id: verbose-inote.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: verbose-inote.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{verbose-inote.bbx} -[\abx@bbxid $Id: verbose-inote.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: verbose-inote.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{authortitle} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx index 51f7f976f8d..e4096a346fc 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx @@ -1,7 +1,7 @@ -% $Id: verbose-note.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: verbose-note.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{verbose-note.bbx} -[\abx@bbxid $Id: verbose-note.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: verbose-note.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{authortitle} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx index d0bdc60ba4c..46ae4158311 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx @@ -1,7 +1,7 @@ -% $Id: verbose-trad1.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: verbose-trad1.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{verbose-trad1.bbx} -[\abx@bbxid $Id: verbose-trad1.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: verbose-trad1.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{authortitle} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx index 83d83986611..610cca8966d 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx @@ -1,7 +1,7 @@ -% $Id: verbose-trad2.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: verbose-trad2.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{verbose-trad2.bbx} -[\abx@bbxid $Id: verbose-trad2.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: verbose-trad2.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{authortitle} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx index 029cc5ae64a..8003bb379a7 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx @@ -1,7 +1,7 @@ -% $Id: verbose-trad3.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: verbose-trad3.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{verbose-trad3.bbx} -[\abx@bbxid $Id: verbose-trad3.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: verbose-trad3.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{authortitle} diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx index 41420ee61cb..80d05549a7c 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx @@ -1,7 +1,7 @@ -% $Id: verbose.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: verbose.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{verbose.bbx} -[\abx@bbxid $Id: verbose.bbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@bbxid $Id: verbose.bbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireBibliographyStyle{authortitle} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg b/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg index 100c48ccd0e..f544b1af305 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.cfg @@ -1,4 +1,4 @@ -% $Id: biblatex.cfg,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: biblatex.cfg,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{biblatex.cfg} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def index fe50dcacf90..89b815e8134 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: biblatex.def,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{biblatex.def} -[\abx@rcsid $Id: biblatex.def,v 1.6 2011/07/29 19:21:28 lehman stable $ +[\abx@rcsid $Id: biblatex.def,v 1.7 2011/11/13 19:09:07 lehman stable $ biblatex generic definitions] % ------------------------------------------------------------------ @@ -43,6 +43,7 @@ \newcommand*{\postnotedelim}{\addcomma\space} \newcommand*{\nametitledelim}{\addcomma\space} \newcommand*{\nameyeardelim}{\addspace} +\newcommand*{\volcitedelim}{\addcomma\space} % Used in the bibliography and the list of shorthands @@ -122,28 +123,35 @@ % Local setup for \url; see comments in url.sty for details. +\newcounter{biburlnumpenalty} +\newcounter{biburlucpenalty} +\newcounter{biburllcpenalty} + \newcommand*{\biburlsetup}{% \Urlmuskip=0mu plus 3mu\relax \mathchardef\UrlBigBreakPenalty=100\relax \mathchardef\UrlBreakPenalty=200\relax - \mathchardef\UrlNumberPenalty=3000\relax - \mathchardef\UrlUppercasePenalty=6000\relax - \mathchardef\UrlLowercasePenalty=9000\relax \def\UrlBigBreaks{\do\:\do\-}% \def\UrlBreaks{% \do\.\do\@\do\/\do\\\do\!\do\_\do\|\do\;\do\>\do\]\do\)\do\}% \do\,\do\?\do\'\do\+\do\=\do\#\do\$\do\&\do\*\do\^\do\"}% - \def\do##1{\appto\UrlSpecials{\do##1{\penalty\UrlNumberPenalty\mathchar`##1 }}}% - \do\1\do\2\do\3\do\4\do\5\do\6\do\7\do\8\do\9\do\0% - \def\do##1{\appto\UrlSpecials{\do##1{\penalty\UrlUppercasePenalty\mathchar`##1 }}}% - \do\A\do\B\do\C\do\D\do\E\do\F\do\G\do\H\do\I\do\J - \do\K\do\L\do\M\do\N\do\O\do\P\do\Q\do\R\do\S\do\T - \do\U\do\V\do\W\do\X\do\Y\do\Z - \def\do##1{\appto\UrlSpecials{\do##1{\penalty\UrlLowercasePenalty\mathchar`##1 }}}% - \do\a\do\b\do\c\do\d\do\e\do\f\do\g\do\h\do\i\do\j - \do\k\do\l\do\m\do\n\do\o\do\p\do\q\do\r\do\s\do\t - \do\u\do\v\do\w\do\x\do\y\do\z - \let\do\noexpand} + \ifnumgreater{\value{biburlnumpenalty}}{0} + {\def\do##1{\appto\UrlSpecials{\do##1{\mathchar`##1 \penalty\value{biburlnumpenalty}}}}% + \do\1\do\2\do\3\do\4\do\5\do\6\do\7\do\8\do\9\do\0} + {}% + \ifnumgreater{\value{biburlucpenalty}}{0} + {\def\do##1{\appto\UrlSpecials{\do##1{\mathchar`##1 \penalty\value{biburlucpenalty}}}}% + \do\A\do\B\do\C\do\D\do\E\do\F\do\G\do\H\do\I\do\J + \do\K\do\L\do\M\do\N\do\O\do\P\do\Q\do\R\do\S\do\T + \do\U\do\V\do\W\do\X\do\Y\do\Z} + {}% + \ifnumgreater{\value{biburllcpenalty}}{0} + {\def\do##1{\appto\UrlSpecials{\do##1{\mathchar`##1 \penalty\value{biburllcpenalty}}}}% + \do\a\do\b\do\c\do\d\do\e\do\f\do\g\do\h\do\i\do\j + \do\k\do\l\do\m\do\n\do\o\do\p\do\q\do\r\do\s\do\t + \do\u\do\v\do\w\do\x\do\y\do\z} + {}% + \let\do=\noexpand} % The above code allows linebreaks before numbers and letters. % This is often the only way to break DOIs. It also allows breaks @@ -2271,7 +2279,7 @@ \iffieldundef{urlyear} {} {\setunit*{\addspace}% - \printtext[urldate]{\printurldate}}} + \printurldate}} \newbibmacro*{pageref}{% \iflistundef{pageref} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty index ea050248981..6eeb7ae78e9 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: biblatex.sty,v 1.7 2011/11/13 19:09:07 lehman stable $ % Copyright (c) 2006-2011 Philipp Lehman. % @@ -21,11 +21,11 @@ \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{biblatex} -[\abx@rcsid $Id: biblatex.sty,v 1.6 2011/07/29 19:21:28 lehman stable $ +[\abx@rcsid $Id: biblatex.sty,v 1.7 2011/11/13 19:09:07 lehman stable $ programmable bibliographies] \def\blx@bblversion$#1: #2 ${#2} -\edef\blx@bblversion{\blx@bblversion$Revision: 1.6 $} +\edef\blx@bblversion{\blx@bblversion$Revision: 1.7 $} %% Dependencies @@ -366,8 +366,16 @@ \def\blx@minbibnames{0} \def\blx@maxcitenames{0} \def\blx@mincitenames{0} +\def\blx@maxbibnames@type{\blx@maxbibnames} +\def\blx@minbibnames@type{\blx@minbibnames} +\def\blx@maxcitenames@type{\blx@maxcitenames} +\def\blx@mincitenames@type{\blx@mincitenames} \def\blx@maxalphanames{0} \def\blx@minalphanames{0} +\def\blx@maxitems{0} +\def\blx@minitems{0} +\def\blx@maxitems@type{\blx@maxitems} +\def\blx@minitems@type{\blx@minitems} \newlength{\labelnumberwidth} \newlength{\labelalphawidth} @@ -456,7 +464,7 @@ #1\ifx#2\@empty\else \expandafter\blx@tempa \fi#2} -\edef\blx@ctrlfile{% +\edef\blx@ctrlfile@bibtex{% \noexpand\blx@tempa \expandafter\blx@tempa\jobname"\@empty \space\noexpand\@empty} @@ -464,7 +472,7 @@ #1\ifx#2\@empty\else \string_\expandafter\blx@tempa \fi#2} -\xdef\blx@ctrlfile{\blx@ctrlfile} +\xdef\blx@ctrlfile@bibtex{\blx@ctrlfile@bibtex} \endgroup \def\blx@secinit{% @@ -652,7 +660,7 @@ \fi \string\bibstyle{biblatex}\blx@nl \string\bibdata{% - \blx@ctrlfile\blxauxsuffix + \blx@ctrlfile@bibtex\blxauxsuffix \ifx#1\@empty \else \dolistloop#1% @@ -1048,7 +1056,7 @@ \provides[type=dynamic]{ \def\do##1{\file{##1.aux}} \dolistloop\blx@list@inactive - \file{\blx@ctrlfile\blxauxsuffix.bib} + \file{\blx@ctrlfile@bibtex\blxauxsuffix.bib} } \requires[type=dynamic]{ \def\do##1{\file{##1.bbl}} @@ -1105,7 +1113,7 @@ } \requires[type=dynamic]{ \file{#2.aux} - \file{\blx@ctrlfile\blxauxsuffix.bib} + \file{\blx@ctrlfile@bibtex\blxauxsuffix.bib} } \requires[type=editable]{ \ifcsdef{blx@list@bibfiles@#2} @@ -2022,7 +2030,42 @@ % {<namelist1>}{<namelist2>}{<true>}{<false>} \def\blx@imc@ifnamesequal#1#2{% - \ifcsequal{abx@name@#1}{abx@name@#2}} + \ifcsundef{abx@name@#1} + {\@secondoftwo} + {\ifcsundef{abx@name@#2} + {\@secondoftwo} + {\blx@ifnamesequal{#1}{#2}}}} + +\def\blx@ifnamesequal#1#2{% + \begingroup + \let\blx@tempa\@empty + \expandafter\expandafter + \expandafter\blx@ifnamesequal@i\csname abx@name@#2\endcsname + \let\blx@tempb\blx@tempa + \let\blx@tempa\@empty + \expandafter\expandafter + \expandafter\blx@ifnamesequal@i\csname abx@name@#1\endcsname + \expandafter\endgroup + \ifx\blx@tempa\blx@tempb + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi} + +\def\blx@ifnamesequal@i#1#2{% + \expandafter\blx@ifnamesequal@ii#2{}&} + +\def\blx@ifnamesequal@ii#1{% + \ifblank{#1} + {\blx@namebreak} + {\blx@ifnamesequal@iii#1% + \blx@ifnamesequal@ii}} + +\def\blx@ifnamesequal@iii#1#2#3#4#5#6#7#8#9{% + \setkeys{blx@opt@name}{#1}% + \ifdef\abx@field@hash + {\eappto\blx@tempa{{\abx@field@hash}}} + {\appto\blx@tempa{{{#2}{#4}{#6}{#8}}}}} % {<field>}{<macro>}{<true>}{<false>} @@ -2052,7 +2095,7 @@ % {<namelist>}{<macro>}{<true>}{<false>} -\def\blx@imc@ifnameequals#1#2{% +\def\blx@imc@ifnameequals#1#2{% FIXME \blx@imc@ifnameundef{#1} {\@secondoftwo} {\ifundef#2% @@ -2075,7 +2118,7 @@ % {<namelist>}{<csname>}{<true>}{<false>} -\def\blx@imc@ifnameequalcs#1{% +\def\blx@imc@ifnameequalcs#1{% FIXME \ifcsequal{abx@name@#1}} % {<field>}{<string>}{<true>}{<false>} @@ -2745,31 +2788,47 @@ \setcounter{mincompwidth}{1} \def\abx@rangeproclimit{100000} -% [<postpro>]{<string>} +% <*>[<postpro>]{<string>} -\newrobustcmd*{\mkcomprange}[2][\@firstofone]{% +\newrobustcmd*{\mkcomprange}{% \begingroup + \@ifstar + {\blx@comprange\blx@comprange@ii} + {\blx@comprange\blx@comprange@i}} + +\def\blx@comprange#1{% + \@ifnextchar[{#1}{#1[\@firstofone]}} + +\def\blx@comprange@i[#1]#2{% \let\blx@tempa\@empty - \protected\def\blx@range@out{\appto\blx@tempa}% + \protected\def\blx@range@out@value{\appto\blx@tempa}% + \let\blx@range@out@delim\blx@range@out@value \let\blx@range@split\blx@comprange@split - \blx@imc@ifpages{#2} - {\blx@range@chunk{#2}} - {\blx@range@out{#2}}% + \blx@range@chunk{#2}% \edef\blx@tempa{\endgroup \unexpanded{#1}{\expandonce\blx@tempa}}% \blx@tempa} +\def\blx@comprange@ii[#1]#2{% + \protected\def\blx@range@out@value{#1}% + \let\blx@range@out@delim\@firstofone + \let\blx@range@split\blx@comprange@split + \blx@range@chunk{#2}% + \endgroup} + \def\blx@comprange@split#1{% - \def\blx@comprange@abort{\blx@range@out{#1}}% - \blx@comprange@range#1\bibrangedash\bibrangedash&} + \def\blx@comprange@abort{\blx@range@out@value{#1}}% + \blx@imc@ifpages{#1} + {\blx@comprange@range#1\bibrangedash\bibrangedash&} + {\blx@comprange@abort}} \def\blx@comprange@range#1\bibrangedash#2\bibrangedash#3&{% \ifblank{#3} {\blx@comprange@hyphen#1--&} {\ifblank{#2} - {\blx@range@out{#1\bibrangedash}} + {\blx@range@out@value{#1\bibrangedash}} {\ifblank{#1} - {\blx@range@out{\bibrangedash#2}} + {\blx@range@out@value{\bibrangedash#2}} {\blx@comprange@check{#1}{#2}}}}} \def\blx@comprange@hyphen#1-#2-#3&{% @@ -2781,16 +2840,16 @@ {\def\blx@tempb{#1}}% \blx@comprange@hyphen@i#3&} {\ifblank{#1} - {\blx@range@out{\bibrangedash#2}} + {\blx@range@out@value{\bibrangedash#2}} {\blx@comprange@check{#1}{#2}}}}} \def\blx@comprange@hyphen@i#1-#2&{% \ifblank{#1#2} - {\expandafter\blx@range@out + {\expandafter\blx@range@out@value \expandafter{\blx@tempb\bibrangedash}} {\notblank{#1} {\ifdefempty\blx@tempb - {\blx@range@out{\bibrangedash#1}} + {\blx@range@out@value{\bibrangedash#1}} {\expandafter\blx@comprange@check \expandafter{\blx@tempb}{#1}}} {\blx@comprange@hyphen@i#2&}}} @@ -2799,8 +2858,8 @@ \blx@imc@ifinteger{#1} {\blx@imc@ifinteger{#2} {\blx@comprange@comp{#1}{#2}} - {\blx@range@out{#1\bibrangedash#2}}} - {\blx@range@out{#1\bibrangedash#2}}} + {\blx@range@out@value{#1\bibrangedash#2}}} + {\blx@range@out@value{#1\bibrangedash#2}}} \def\blx@comprange@comp#1#2{% \def\blx@tempb{#1}% @@ -2830,7 +2889,7 @@ \else \numdef\blx@tempc\blx@tempd \fi - \edef\blx@tempb{\blx@range@out{\blx@tempb\noexpand\bibrangedash\blx@tempc}}% + \edef\blx@tempb{\blx@range@out@value{\blx@tempb\noexpand\bibrangedash\blx@tempc}}% \blx@tempb} \def\blx@comprange@comp@div{% @@ -2862,7 +2921,7 @@ {\blx@range@chunk@comma#1,&} {}% \notblank{#2} - {\notblank{#1}{\blx@range@out{;\space}}{}% + {\notblank{#1}{\blx@range@out@delim{;\space}}{}% \blx@range@chunk@semcol#2&} {}} @@ -2872,34 +2931,48 @@ \expandafter{\@firstofone#1}} {}% \notblank{#2} - {\notblank{#1}{\blx@range@out{,\space}}{}% + {\notblank{#1}{\blx@range@out@delim{,\space}}{}% \blx@range@chunk@comma#2&} {}} -% [<postpro>]{<string>} +% <*>[<postpro>]{<string>} -\newrobustcmd*{\mkfirstpage}[2][\@firstofone]{% +\newrobustcmd*{\mkfirstpage}{% \begingroup + \@ifstar + {\blx@firstpage\blx@firstpage@ii} + {\blx@firstpage\blx@firstpage@i}} + +\def\blx@firstpage#1{% + \@ifnextchar[{#1}{#1[\@firstofone]}} + +\def\blx@firstpage@i[#1]#2{% \let\blx@tempa\@empty - \protected\def\blx@range@out{\appto\blx@tempa}% + \protected\def\blx@range@out@value{\appto\blx@tempa}% + \let\blx@range@out@delim\blx@range@out@value \let\blx@range@split\blx@firstpage@split - \blx@imc@ifpages{#2} - {\blx@range@chunk{#2}} - {\blx@range@out{#2}}% + \blx@range@chunk{#2}% \edef\blx@tempa{\endgroup \unexpanded{#1}{\expandonce\blx@tempa}}% \blx@tempa} +\def\blx@firstpage@ii[#1]#2{% + \protected\def\blx@range@out@value{#1}% + \let\blx@range@out@delim\@firstofone + \let\blx@range@split\blx@firstpage@split + \blx@range@chunk{#2}% + \endgroup} + \def\blx@firstpage@split#1{% - \def\blx@firstpage@abort{\blx@range@out{#1}}% + \def\blx@firstpage@abort{\blx@range@out@value{#1}}% \blx@firstpage@range#1\bibrangedash\bibrangedash&} \def\blx@firstpage@range#1\bibrangedash#2\bibrangedash#3&{% \ifblank{#3} {\blx@firstpage@hyphen#1--&} {\ifblank{#1} - {\blx@range@out{\bibrangedash#2}} - {\blx@range@out{#1}}}} + {\blx@range@out@value{\bibrangedash#2}} + {\blx@range@out@value{#1}}}} \def\blx@firstpage@hyphen#1-#2-#3&{% \ifblank{#3} @@ -2907,15 +2980,15 @@ {\ifblank{#1} {\ifblank{#2} {\blx@firstpage@hyphen@i#3&} - {\blx@range@out{\bibrangedash#2}}} - {\blx@range@out{#1}}}} + {\blx@range@out@value{\bibrangedash#2}}} + {\blx@range@out@value{#1}}}} \def\blx@firstpage@hyphen@i#1-#2&{% \ifblank{#1} {\ifblank{#2} {\blx@firstpage@abort} {\blx@firstpage@hyphen@i#2&}} - {\blx@range@out{\bibrangedash#1}}} + {\blx@range@out@value{\bibrangedash#1}}} \newcommand*{\ppspace}{\addnbspace} \newcommand*{\sqspace}{\addnbspace} @@ -3776,6 +3849,7 @@ {\begingroup \blx@imc@clearlist{pageref}% \blx@getdata{#1}% + \blx@setoptions@type\abx@field@entrytype \def\abx@field@entrysetcount{1}% \blx@entryset@precode \blx@driver{\blx@imc@thefield{entrytype}}% @@ -3945,38 +4019,65 @@ \let\blx@hook@lc\relax \AtEndPreamble{% + \toggletrue{blx@tempa}% + \toggletrue{blx@tempb}% \expandafter\patchcmd\csname MakeUppercase \endcsname {\protected@edef} {\blx@hook@uc\protected@edef} - {} - {\blx@err@patch{\string\MakeUppercase}}% + {\togglefalse{blx@tempa}} + {}% \expandafter\patchcmd\csname MakeLowercase \endcsname {\protected@edef} {\blx@hook@lc\protected@edef} - {} - {\blx@err@patch{\string\MakeLowercase}}} + {\togglefalse{blx@tempb}} + {}% + \@ifpackageloaded{textcase} + {\expandafter\patchcmd\csname MakeUppercase \endcsname + {\def\i} + {\blx@hook@uc\def\i} + {\togglefalse{blx@tempa}} + {}% + \expandafter\patchcmd\csname MakeLowercase \endcsname + {\@uclcnotmath{}} + {\@uclcnotmath{\blx@hook@lc}} + {\togglefalse{blx@tempb}} + {}% + \expandafter\patchcmd\csname MakeTextUppercase \endcsname + {\def\i} + {\blx@hook@uc\def\i} + {} + {}% + \expandafter\patchcmd\csname MakeTextLowercase \endcsname + {\@uclcnotmath{}} + {\@uclcnotmath{\blx@hook@lc}} + {} + {}} + {}% + \iftoggle{blx@tempa}{\blx@err@patch{\string\MakeUppercase}}{}% + \iftoggle{blx@tempb}{\blx@err@patch{\string\MakeLowercase}}{}% +} \appto\blx@blxinit{% \def\blx@hook@uc{% - \let\bibstring\blx@imc@bibucstring - \let\biblstring\blx@imc@bibuclstring - \let\bibsstring\blx@imc@bibucsstring - \let\biblcstring\blx@imc@bibucstring - \let\biblclstring\blx@imc@bibuclstring - \let\biblcsstring\blx@imc@bibucsstring - \let\bibcpstring\blx@imc@bibucstring - \let\bibcplstring\blx@imc@bibuclstring - \let\bibcpsstring\blx@imc@bibucsstring}% + \def\bibstring{\blx@imc@bibucstring}% + \def\biblstring{\blx@imc@bibuclstring}% + \def\bibsstring{\blx@imc@bibucsstring}% + \def\biblcstring{\blx@imc@bibucstring}% + \def\biblclstring{\blx@imc@bibuclstring}% + \def\biblcsstring{\blx@imc@bibucsstring}% + \def\bibcpstring{\blx@imc@bibucstring}% + \def\bibcplstring{\blx@imc@bibuclstring}% + \def\bibcpsstring{\blx@imc@bibucsstring}}% \def\blx@hook@lc{% - \let\bibstring\blx@imc@biblcstring - \let\biblstring\blx@imc@biblclstring - \let\bibsstring\blx@imc@biblcsstring - \let\bibucstring\blx@imc@biblcstring - \let\bibuclstring\blx@imc@biblclstring - \let\bibucsstring\blx@imc@biblcsstring - \let\bibcpstring\blx@imc@biblcstring - \let\bibcplstring\blx@imc@biblclstring - \let\bibcpsstring\blx@imc@biblcsstring}} + \def\bibstring{\blx@imc@biblcstring}% + \def\biblstring{\blx@imc@biblclstring}% + \def\bibsstring{\blx@imc@biblcsstring}% + \def\bibucstring{\blx@imc@biblcstring}% + \def\bibuclstring{\blx@imc@biblclstring}% + \def\bibucsstring{\blx@imc@biblcsstring}% + \def\bibcpstring{\blx@imc@biblcstring}% + \def\bibcplstring{\blx@imc@biblclstring}% + \def\bibcpsstring{\blx@imc@biblcsstring}}} \def\abx@dostrings{% \do{bibliography}% @@ -4131,6 +4232,7 @@ \do{andmore}% \do{volume}% \do{volumes}% + \do{part}% \do{jourvol}% \do{jourser}% \do{newseries}% @@ -4154,6 +4256,8 @@ \do{in}% \do{inseries}% \do{ofseries}% + \do{book}% + \do{issue}% \do{number}% \do{chapter}% \do{mathesis}% @@ -4168,9 +4272,10 @@ \do{url}% \do{urlseen}% \do{file}% - \do{inpress}% \do{inpreparation}% \do{submitted}% + \do{inpress}% + \do{forthcoming}% \do{library}% \do{abstract}% \do{annotation}% @@ -4211,9 +4316,11 @@ \do{december}% \do{langamerican}% \do{langbrazilian}% + \do{langcroatian}% \do{langdanish}% \do{langdutch}% \do{langenglish}% + \do{langfinnish}% \do{langfrench}% \do{langgerman}% \do{langgreek}% @@ -4221,13 +4328,16 @@ \do{langlatin}% \do{langnorwegian}% \do{langportuguese}% + \do{langrussian}% \do{langspanish}% \do{langswedish}% \do{fromamerican}% \do{frombrazilian}% + \do{fromcroatian}% \do{fromdanish}% \do{fromdutch}% \do{fromenglish}% + \do{fromfinnish}% \do{fromfrench}% \do{fromgerman}% \do{fromgreek}% @@ -4235,6 +4345,7 @@ \do{fromlatin}% \do{fromnorwegian}% \do{fromportuguese}% + \do{fromrussian}% \do{fromspanish}% \do{fromswedish}% \do{countryde}% @@ -4497,7 +4608,7 @@ \newrobustcmd*{\mkbibrangefull}[2]{% \iffieldundef{#2year} {} - {\printtext{% + {\printtext[#2date]{% \csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \iffieldundef{#2endyear} {} @@ -4509,7 +4620,7 @@ \newrobustcmd*{\mkbibrangetrunc}[2]{% \iffieldundef{#2year} {} - {\printtext{% + {\printtext[#2date]{% \iffieldsequal{#2year}{#2endyear} {\iffieldsequal{#2month}{#2endmonth} {\csuse{mkbibdate#1}{}{}{#2day}} @@ -4525,42 +4636,44 @@ \newrobustcmd*{\mkbibrangefullextra}[2]{% \iffieldundef{#2year} {} - {\printtext{% - \csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% - \iffieldundef{#2endyear} - {\printfield{extrayear}} - {\iffieldequalstr{#2endyear}{} - {\printfield{extrayear}% - \printtext{\mbox{\bibdatedash}}} - {\printtext{% - \bibdatedash - \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% - \printfield{extrayear}}}}}} + {\printtext[#2date]{% + \printtext{% + \csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% + \iffieldundef{#2endyear} + {\printfield{extrayear}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extrayear}% + \printtext{\mbox{\bibdatedash}}} + {\printtext{% + \bibdatedash + \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% + \printfield{extrayear}}}}}}} \newrobustcmd*{\mkbibrangetruncextra}[2]{% \iffieldundef{#2year} {} - {\printtext{% - \iffieldsequal{#2year}{#2endyear} - {\iffieldsequal{#2month}{#2endmonth} - {\csuse{mkbibdate#1}{}{}{#2day}} - {\csuse{mkbibdate#1}{}{#2month}{#2day}}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}% - \iffieldundef{#2endyear} - {\printfield{extrayear}} - {\iffieldequalstr{#2endyear}{} - {\printfield{extrayear}% - \printtext{\mbox{\bibdatedash}}} - {\printtext{% - \bibdatedash - \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% - \printfield{extrayear}}}}}} + {\printtext[#2date]{% + \printtext{% + \iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{}{}{#2day}} + {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}}% + \iffieldundef{#2endyear} + {\printfield{extrayear}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extrayear}% + \printtext{\mbox{\bibdatedash}}} + {\printtext{% + \bibdatedash + \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% + \printfield{extrayear}}}}}}} \expandafter\newrobustcmd \expandafter*\csname mkbibrangeiso8601\endcsname[1]{% \iffieldundef{#1year} {} - {\printtext{% + {\printtext[#1date]{% \blx@isodate{#1year}{#1month}{#1day}% \iffieldundef{#1endyear} {} @@ -4570,7 +4683,7 @@ \expandafter*\csname mkbibrangeiso8601extra\endcsname[1]{% \iffieldundef{#1year} {} - {\printtext{% + {\printtext[#1date]{% \blx@isodate[extrayear]{#1year}{#1month}{#1day}% \iffieldundef{#1endyear} {} @@ -4589,6 +4702,7 @@ \newrobustcmd*{\mkbibordinal}[1]{#1} \newrobustcmd*{\mkbibmascord}{\mkbibordinal} \newrobustcmd*{\mkbibfemord}{\mkbibordinal} +\newrobustcmd*{\mkbibneutord}{\mkbibordinal} \newrobustcmd*{\mkbibmonth}[1]{% \ifcase0#1\relax \blx@warning@entry{Month out of range or not an integer}% @@ -4973,8 +5087,15 @@ \abx@dofields\do{execute}\do{options}% \def\do##1{\togglefalse{abx@bool@##1}}% \abx@dobooleans + \let\do\blx@saved@do \c@citecounter\z@ - \let\do\blx@saved@do} + \iftoggle{blx@bibliography} + {\c@maxnames\blx@maxbibnames\relax + \c@minnames\blx@minbibnames\relax} + {\c@maxnames\blx@maxcitenames\relax + \c@minnames\blx@mincitenames\relax}% + \c@maxitems\blx@maxitems\relax + \c@minitems\blx@minitems\relax} \protected\def\blx@saveentry{% \let\blx@saved@do\do @@ -5331,7 +5452,8 @@ {\begingroup \edef\blx@tempa{\endgroup \noexpand\setkeys{blx@opt@ent}{\abx@field@options}}% - \blx@tempa}} + \blx@tempa + \blx@checkoptions@entry}} \def\blx@setoptions@type#1{% \ifcsdef{blx@opts@type@#1} @@ -5341,6 +5463,10 @@ \blx@tempa} {}} +\def\blx@checkoptions@global{} +\def\blx@checkoptions@type{} +\def\blx@checkoptions@entry{} + \def\blx@entrysetcount{% \ifdef\abx@field@entrykey {\ifcsdef{blx@seti@\the\c@refsection @\abx@field@entrykey} @@ -6206,8 +6332,6 @@ \let\blx@theprenote\@empty \let\blx@thepostnote\@empty \let\blx@thetitle\@empty - \c@maxnames\blx@maxbibnames\relax - \c@minnames\blx@minbibnames\relax \blx@safe@actives \setkeys{blx@bib}{#1}% \blx@rest@actives @@ -6234,8 +6358,6 @@ \let\blx@thepostnote\@empty \let\blx@thetitle\@empty \c@refsection\z@ - \c@maxnames\blx@maxbibnames\relax - \c@minnames\blx@minbibnames\relax \blx@safe@actives \setkeys{blx@bbs}{#1}% \blx@rest@actives @@ -6276,8 +6398,6 @@ \let\blx@thetitle\@empty \c@refsection\z@ \c@refsegment\@ne - \c@maxnames\blx@maxbibnames\relax - \c@minnames\blx@minbibnames\relax \blx@safe@actives \setkeys{blx@bbg}{#1}% \blx@rest@actives @@ -6320,8 +6440,6 @@ \let\blx@thetitle\@empty \c@refsection\z@ \blx@safe@actives - \c@maxnames\blx@maxbibnames\relax - \c@minnames\blx@minbibnames\relax \setkeys{blx@bbc}{#1}% \blx@rest@actives \togglefalse{blx@tempa}% @@ -6541,8 +6659,6 @@ \let\blx@thepostnote\@empty \let\blx@thetitle\@empty \let\blx@printbibchecks\relax - \c@maxnames\blx@maxbibnames\relax - \c@minnames\blx@minbibnames\relax \blx@safe@actives \setkeys{blx@los}{#1}% \blx@rest@actives @@ -8648,8 +8764,8 @@ \blx@getformat\blx@tempc{ffd}{}{volcitepages}% \edef\blx@tempa{\expandonce\blx@tempa[{% \expandonce{\blx@tempb{#1}}% - \noexpand\addcomma\noexpand\space - \expandonce{\blx@tempc{#2}}}]} + \noexpand\volcitedelim + \expandonce{\blx@tempc{#2}}}]}% \blx@tempa} %% Control file @@ -8686,6 +8802,19 @@ \xdef\blx@xml@ordered#1#2{% ~~~~~~<bcf:value order="#1">#2</bcf:value>\blx@nl} +\xdef\blx@xml@displaymodes#1#2{% + ~~<bcf:displaymodes type="#1">\blx@nl + #2% + ~~</bcf:displaymodes>\blx@nl} +\xdef\blx@xml@displaymode#1{% + ~~~~<bcf:displaymode>\blx@nl + #1% + ~~~~</bcf:displaymode>\blx@nl} +\xdef\blx@xml@dtarget#1{% + ~~~~~~<bcf:dtarget>#1</bcf:dtarget>\blx@nl} +\xdef\blx@xml@dmode#1#2{% + ~~~~~~<bcf:dmode order="#1">#2</bcf:dmode>\blx@nl} + \xdef\blx@xml@inheritance#1{% ~~<bcf:inheritance>\blx@nl #1% @@ -8761,12 +8890,12 @@ \blx@xml@mvalue{labelyearspec}{\blx@bcf@labelyearspec}% \blx@xml@svalue{maxalphanames}{\blx@maxalphanames}% \blx@xml@svalue{maxbibnames}{\blx@maxbibnames}% - \blx@xml@svalue{maxitems}{\the\c@maxitems}% - \blx@xml@svalue{maxnames}{\blx@maxcitenames}% + \blx@xml@svalue{maxcitenames}{\blx@maxcitenames}% + \blx@xml@svalue{maxitems}{\blx@maxitems}% \blx@xml@svalue{minalphanames}{\blx@minalphanames}% \blx@xml@svalue{minbibnames}{\blx@minbibnames}% - \blx@xml@svalue{minitems}{\the\c@minitems}% - \blx@xml@svalue{minnames}{\blx@mincitenames}% + \blx@xml@svalue{mincitenames}{\blx@mincitenames}% + \blx@xml@svalue{minitems}{\blx@minitems}% \blx@xml@toggle{singletitle}% \blx@xml@svalue{sortalphaothers}{\sortalphaothers}% \blx@xml@svalue{sortlos}{\blx@sortlos}% @@ -8792,6 +8921,14 @@ \ifcsdef{blx@bcf@labelyearspec@#1} {\csuse{blx@bcf@labelyearspec@#1}} {\blx@bcf@labelyearspec}}% + \blx@xml@svalue{maxalphanames}{\blx@maxalphanames}% + \blx@xml@svalue{maxbibnames}{\blx@maxbibnames@type}% + \blx@xml@svalue{maxcitenames}{\blx@maxcitenames@type}% + \blx@xml@svalue{maxitems}{\blx@maxitems@type}% + \blx@xml@svalue{minalphanames}{\blx@minalphanames}% + \blx@xml@svalue{minbibnames}{\blx@minbibnames@type}% + \blx@xml@svalue{mincitenames}{\blx@mincitenames@type}% + \blx@xml@svalue{minitems}{\blx@minitems@type}% \blx@xml@toggle{singletitle}% \blx@xml@toggle{skipbib}% \blx@xml@toggle{skiplab}% @@ -8836,7 +8973,7 @@ } \def\blx@ctrlwrite@bibtex{% - \immediate\openout\blx@auxout\blx@ctrlfile\blxauxsuffix.bib\relax + \immediate\openout\blx@auxout\blx@ctrlfile@bibtex\blxauxsuffix.bib\relax \blx@auxwrite\blx@auxout{}{\blx@ctrl@bibtex}% \immediate\closeout\blx@auxout} @@ -8870,10 +9007,21 @@ {\def\do##1{% \begingroup \blx@setoptions@type{##1}% + \begingroup + \let\protect\relax + \blx@checkoptions@type + \endgroup \xappto\blx@tempa{\blx@bcf@options@type{##1}}% \endgroup}% \dolistloop\blx@opts@type} {}% + % displaymode + \eappto\blx@tempa{% + \blx@xml@comment{DISPLAYMODES}% + \blx@xml@displaymodes{global}{% + \csuse{blx@biber@displaymodes@global}% + }% + }% % data inheritance \eappto\blx@tempa{% \blx@xml@comment{CROSSREF}% @@ -9149,6 +9297,25 @@ \docsvlist{#2}% \endgroup} +% experimental + +\newrobustcmd*{\DeclareDisplaymode}[2][global]{% + \begingroup + \blx@tempcnta\z@ + \def\blx@tempa{\blx@xml@dtarget{*}}% + \forcsvlist\blx@defdisplaymode{#2}% + \csxdef{blx@biber@displaymodes@#1}{% + \blx@xml@displaymode{\blx@tempa}}% + \endgroup} + +\def\blx@defdisplaymode#1{% + \advance\blx@tempcnta\@ne + \edef\blx@tempa{% + \blx@tempa + \blx@xml@dmode{\the\blx@tempcnta}{#1}}} + +\DeclareDisplaymode{original,romanised,uniform,translated} + %% Package options % [<entrytype,entrytype,...>]{<options>} @@ -9285,71 +9452,144 @@ \def\blx@opt@sortlos@los{1} \DeclareBibliographyOption{maxnames}{% - \blx@setmaxval{names}{#1}% - \numdef\blx@maxbibnames{#1}% - \numdef\blx@maxcitenames{#1}} + \numdef\blx@maxcitenames{#1}% + \numdef\blx@maxbibnames{#1}} \DeclareBibliographyOption{minnames}{% - \blx@setminval{names}{#1}% - \numdef\blx@minbibnames{#1}% - \numdef\blx@mincitenames{#1}} + \numdef\blx@mincitenames{#1}% + \numdef\blx@minbibnames{#1}} +\DeclareTypeOption{maxnames}{% + \numdef\blx@maxcitenames@type{#1}% + \numdef\blx@maxbibnames@type{#1}% + \c@maxnames#1\relax} +\DeclareTypeOption{minnames}{% + \numdef\blx@mincitenames@type{#1}% + \numdef\blx@minbibnames@type{#1}% + \c@minnames#1\relax} +\DeclareEntryOption{maxnames}{% + \c@maxnames#1\relax} +\DeclareEntryOption{minnames}{% + \c@minnames#1\relax} \DeclareBibliographyOption{maxbibnames}{% - \blx@defmaxval{bibnames}{#1}} + \numdef\blx@maxbibnames{#1}} \DeclareBibliographyOption{minbibnames}{% - \blx@defminval{bibnames}{#1}} + \numdef\blx@minbibnames{#1}} +\DeclareTypeOption{maxbibnames}{% + \numdef\blx@maxbibnames@type{#1}% + \iftoggle{blx@bibliography} + {\c@maxnames#1\relax} + {}} +\DeclareTypeOption{minbibnames}{% + \numdef\blx@minbibnames@type{#1}% + \iftoggle{blx@bibliography} + {\c@minnames#1\relax} + {}} +\DeclareEntryOption{maxbibnames}{% + \iftoggle{blx@bibliography} + {\c@maxnames#1\relax} + {}} +\DeclareEntryOption{minbibnames}{% + \iftoggle{blx@bibliography} + {\c@minnames#1\relax} + {}} \DeclareBibliographyOption{maxcitenames}{% - \blx@defmaxval{citenames}{#1}} + \numdef\blx@maxcitenames{#1}} \DeclareBibliographyOption{mincitenames}{% - \blx@defminval{citenames}{#1}} + \numdef\blx@minbibnames{#1}} +\DeclareTypeOption{maxcitenames}{% + \numdef\blx@maxcitenames@type{#1}% + \iftoggle{blx@bibliography} + {} + {\c@maxnames#1\relax}} +\DeclareTypeOption{mincitenames}{% + \numdef\blx@minbibnames@type{#1}% + \iftoggle{blx@bibliography} + {} + {\c@minnames#1\relax}} +\DeclareEntryOption{maxcitenames}{% + \iftoggle{blx@bibliography} + {} + {\c@maxnames#1\relax}} +\DeclareEntryOption{mincitenames}{% + \iftoggle{blx@bibliography} + {} + {\c@minnames#1\relax}} -\DeclareBibliographyOption{maxalphanames}{% - \blx@defmaxval{alphanames}{#1}} -\DeclareBibliographyOption{minalphanames}{% - \blx@defminval{alphanames}{#1}} - -\def\blx@setmaxval#1#2{% - \ifnumless{#2}\@ne - {\blx@err@invopt{max#1=#2}{% - 'max#1' must be greater than zero}} - {\ifnumless{#2}{\csname c@min#1\endcsname} - {\blx@err@confopt{max#1/min#1}{% - 'max#1' must be greater than or equal to 'min#1'}} - {\defcounter{max#1}{#2}}}} - -\def\blx@setminval#1#2{% - \ifnumless{#2}\@ne - {\blx@err@invopt{min#1=#2}{% - min#1' must be greater than zero}} - {\ifnumgreater{#2}{\csname c@max#1\endcsname} - {\blx@err@confopt{max#1/min#1}{% - 'min#1' must be less than or equal to 'max#1'}} - {\defcounter{min#1}{#2}}}} - -\def\blx@defmaxval#1#2{% - \ifnumless{#2}\@ne - {\blx@err@invopt{max#1=#2}{% - 'max#1' must be greater than zero}} - {\ifnumless{#2}{\csname blx@min#1\endcsname} - {\blx@err@confopt{max#1/min#1}{% - 'max#1' must be greater than or equal to 'min#1'}} - {\csnumdef{blx@max#1}{#2}}}} - -\def\blx@defminval#1#2{% - \ifnumless{#2}\@ne - {\blx@err@invopt{min#1=#2}{% - min#1' must be greater than zero}} - {\ifnumgreater{#2}{\csname blx@max#1\endcsname} - {\blx@err@confopt{max#1/min#1}{% - 'min#1' must be less than or equal to 'max#1'}} - {\csnumdef{blx@min#1}{#2}}}} +\appto\blx@checkoptions@global{% + \blx@maxmin@num{maxbibnames}{minbibnames}\blx@maxbibnames\blx@minbibnames + \blx@maxmin@num{maxcitenames}{mincitenames}\blx@maxcitenames\blx@mincitenames} +\appto\blx@checkoptions@type{% + \blx@maxmin@num{maxbibnames}{minbibnames}\blx@maxbibnames@type\blx@minbibnames@type + \blx@maxmin@num{maxcitenames}{mincitenames}\blx@maxcitenames@type\blx@mincitenames@type} +\appto\blx@checkoptions@entry{% + \blx@maxmin@cnt{maxnames}{minnames}\c@maxnames\c@minnames} \DeclareBibliographyOption{maxitems}{% - \blx@setmaxval{items}{#1}} + \numdef\blx@maxitems{#1}} \DeclareBibliographyOption{minitems}{% - \blx@setminval{items}{#1}} + \numdef\blx@minitems{#1}} +\DeclareTypeOption{maxitems}{% + \numdef\blx@maxitems@type{#1}% + \c@maxitems#1\relax} +\DeclareTypeOption{minitems}{% + \numdef\blx@minitems@type{#1}% + \c@minitems#1\relax} +\DeclareEntryOption{maxitems}{% + \c@maxitems#1\relax} +\DeclareEntryOption{minitems}{% + \c@minitems#1\relax} + +\appto\blx@checkoptions@global{% + \blx@maxmin@num{maxitems}{minitems}\blx@maxitems\blx@minitems} +\appto\blx@checkoptions@type{% + \blx@maxmin@num{maxitems}{minitems}\blx@maxitems@type\blx@minitems@type} +\appto\blx@checkoptions@entry{% + \blx@maxmin@cnt{maxitems}{minitems}\c@maxitems\blx@minitems} -\DeclareBibliographyOption{maxline}{% +\DeclareBibliographyOption{maxalphanames}{% + \numdef\blx@maxalphanames{#1}} +\DeclareBibliographyOption{minalphanames}{% + \numdef\blx@minalphanames{#1}} +\DeclareTypeOption{maxalphanames}{% + \numdef\blx@maxalphanames{#1}} +\DeclareTypeOption{minalphanames}{% + \numdef\blx@minalphanames{#1}} + +\appto\blx@checkoptions@global{% + \blx@maxmin@num{maxalphanames}{minalphanames}\blx@maxalphanames\blx@minalphanames} +\appto\blx@checkoptions@type{% + \blx@maxmin@num{maxalphanames}{minalphanames}\blx@maxalphanames\blx@minalphanames} + +\def\blx@maxmin@num#1#2#3#4{% + \ifnumless#3\@ne + {\blx@err@invopt{#1=#3}{'#1' must be greater than zero}% + \let#3\@ne} + {}% + \ifnumless#4\@ne + {\blx@err@invopt{#2=#4}{'#2' must be greater than zero}% + \let#4\@ne} + {}% + \ifnumless#3#4 + {\blx@err@confopt{#1/#2}{'#1' must be greater than or equal to '#2'}% + \let#3#4} + {}} + +\def\blx@maxmin@cnt#1#2#3#4{% + \ifnumless#3\@ne + {\blx@err@invopt{#1=\number#3}{'#1' must be greater than zero}% + #3\@ne} + {}% + \ifnumless#4\@ne + {\blx@err@invopt{#2=\number#4}{'#2' must be greater than zero}% + #4\@ne} + {}% + \ifnumless#3#4 + {\blx@err@confopt{#1/#2}{'#1' must be greater than or equal to '#2'}% + #3=#4} + {}} + +\DeclareBibliographyOption{maxline}{% BibTeX only \ifnum#1<49 \def\blx@maxline{49}% \else @@ -10061,18 +10301,11 @@ % Deferred setup at end of preamble \AtEndPreamble{% - \ifnumless\blx@maxbibnames\blx@maxcitenames - {\blx@warn@conflopt{% - 'maxbibnames' (=\the\numexpr\blx@maxbibnames\relax) - should not be smaller than\MessageBreak - 'maxcitenames' (=\the\numexpr\blx@maxcitenames\relax)}} - {}% - \ifnumless\blx@minbibnames\blx@mincitenames - {\blx@warn@conflopt{% - 'minbibnames' (=\the\numexpr\blx@minbibnames\relax) - should not be smaller than\MessageBreak - 'mincitenames' (=\the\numexpr\blx@mincitenames\relax)}} - {}% + \blx@checkoptions@global + \c@maxnames\blx@maxcitenames\relax + \c@minnames\blx@mincitenames\relax + \c@maxitems\blx@maxitems\relax + \c@minitems\blx@minitems\relax \iftoggle{blx@firstinits} {\ifnumequal\blx@uniquename\blx@opt@uniquename@full {\blx@warn@conflopt{% @@ -10184,7 +10417,6 @@ Use backend=bibtex8 or backend=biber}}}}% \ifboolexpr{% togl {blx@safeinputenc} - and test {\ifdefstring\blx@texencoding{utf8}} and test {\ifnumequal\blx@backend\blx@backend@biber} and ( test {\@ifpackageloaded{inputenc}} or @@ -10202,8 +10434,6 @@ \AtBeginDocument{% \blx@checkbackend{style}% \blx@checkencoding - \c@maxnames\blx@maxcitenames\relax - \c@minnames\blx@mincitenames\relax \if@filesw \ifnum\blx@backend=\blx@backend@biber \blx@ifsigned{\jobname}{bcf} @@ -10211,7 +10441,7 @@ {}% \else \blx@auxinit@bibtex\blx@bibfiles - \blx@ifsigned{\blx@ctrlfile\blxauxsuffix}{bib} + \blx@ifsigned{\blx@ctrlfile@bibtex\blxauxsuffix}{bib} {\blx@ctrlwrite@bibtex} {}% \fi diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def index f976a1c996a..2e0a9fbfec2 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def @@ -1,7 +1,7 @@ -% $Id: blx-compat.def,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: blx-compat.def,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{blx-compat.def} -[\abx@rcsid $Id: blx-compat.def,v 1.6 2011/07/29 19:21:28 lehman stable $ +[\abx@rcsid $Id: blx-compat.def,v 1.7 2011/11/13 19:09:07 lehman stable $ biblatex generic compatibility] % LaTeX @@ -23,6 +23,16 @@ \DeclareOption{openbib}{\ExecuteBibliographyOptions{block=par}} +% biblatex <0.9b + +\DeclareBibliographyOption{defernums}[true]{% + \ExecuteBibliographyOptions{defernumbers=#1}} + +\providecommand*{\lbx@fromlang}{% + \iffieldundef{origlanguage} + {\unspace} + {\bibstring{from\thefield{origlanguage}}}} + % memoir \ifdef\ifnobibintoc diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def b/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def index 10bf0cada9a..b2260b1b716 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-mcite.def @@ -1,7 +1,7 @@ -% $Id: blx-mcite.def,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: blx-mcite.def,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{blx-mcite.def} -[\abx@rcsid $Id: blx-mcite.def,v 1.6 2011/07/29 19:21:28 lehman stable $ +[\abx@rcsid $Id: blx-mcite.def,v 1.7 2011/11/13 19:09:07 lehman stable $ mcite-like citation commands] \newrobustcmd*{\mcite}{\mcitelike\cite} diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def index 811b210413e..fcc5b0ef9a8 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-natbib.def @@ -1,7 +1,7 @@ -% $Id: blx-natbib.def,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: blx-natbib.def,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{blx-natbib.def} -[\abx@rcsid $Id: blx-natbib.def,v 1.6 2011/07/29 19:21:28 lehman stable $ +[\abx@rcsid $Id: blx-natbib.def,v 1.7 2011/11/13 19:09:07 lehman stable $ biblatex natbib compatibility] \renewcommand*{\nameyeardelim}{\addcomma\space} 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 1f862602d39..55e0451e907 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx @@ -1,7 +1,7 @@ -% $Id: alphabetic-verb.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: alphabetic-verb.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{alphabetic-verb.cbx} -[\abx@cbxid $Id: alphabetic-verb.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: alphabetic-verb.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \ExecuteBibliographyOptions{labelalpha,autocite=inline} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx index 9555f5a618a..d21640becc8 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx @@ -1,7 +1,7 @@ -% $Id: alphabetic.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: alphabetic.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{alphabetic.cbx} -[\abx@cbxid $Id: alphabetic.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: alphabetic.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \ExecuteBibliographyOptions{labelalpha,autocite=inline} 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 64f10d762e5..34e38583808 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authortitle-comp.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authortitle-comp.cbx} -[\abx@cbxid $Id: authortitle-comp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: authortitle-comp.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \ExecuteBibliographyOptions{uniquename,uniquelist,sortcites,autocite=footnote} \newbool{cbx:parens} 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 b23d510624f..b1a72767f23 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authortitle-ibid.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authortitle-ibid.cbx} -[\abx@cbxid $Id: authortitle-ibid.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: authortitle-ibid.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \ExecuteBibliographyOptions{uniquename,uniquelist,ibidtracker=constrict,pagetracker,autocite=footnote} \providecommand*{\mkibid}[1]{#1} 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 23853ec9774..5e39e58d019 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authortitle-icomp.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authortitle-icomp.cbx} -[\abx@cbxid $Id: authortitle-icomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: authortitle-icomp.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \ExecuteBibliographyOptions{uniquename,uniquelist,ibidtracker=constrict, pagetracker,sortcites,autocite=footnote} 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 0f296410334..c92f8599bbf 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authortitle-tcomp.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authortitle-tcomp.cbx} -[\abx@cbxid $Id: authortitle-tcomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: authortitle-tcomp.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireCitationStyle{authortitle-comp} \ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline} 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 dd4f91365fd..ebfb2f0be3c 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authortitle-terse.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authortitle-terse.cbx} -[\abx@cbxid $Id: authortitle-terse.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: authortitle-terse.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireCitationStyle{authortitle} \ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx index 225880f6bf2..25b255ff919 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx @@ -1,7 +1,7 @@ -% $Id: authortitle-ticomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authortitle-ticomp.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authortitle-ticomp.cbx} -[\abx@cbxid $Id: authortitle-ticomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: authortitle-ticomp.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireCitationStyle{authortitle-icomp} \ExecuteBibliographyOptions{singletitle,uniquename,uniquelist,autocite=inline} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx index f8e68ebd271..f010f7f9298 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authortitle.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authortitle.cbx} -[\abx@cbxid $Id: authortitle.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: authortitle.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \ExecuteBibliographyOptions{uniquename,uniquelist,autocite=footnote} \newbool{cbx:parens} 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 6a8fce5d4d0..21a2e9abf5d 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authoryear-comp.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authoryear-comp.cbx} -[\abx@cbxid $Id: authoryear-comp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: authoryear-comp.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,sortcites,autocite=inline} \newbool{cbx:parens} 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 51ef9333420..6119852780c 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authoryear-ibid.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authoryear-ibid.cbx} -[\abx@cbxid $Id: authoryear-ibid.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: authoryear-ibid.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,pagetracker, ibidtracker=constrict,autocite=inline} 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 8b81b50d1bb..de084dc3c54 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authoryear-icomp.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authoryear-icomp.cbx} -[\abx@cbxid $Id: authoryear-icomp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: authoryear-icomp.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,ibidtracker=constrict, pagetracker,sortcites,autocite=inline} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx index e87ae85d47a..9d2f8155964 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: authoryear.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{authoryear.cbx} -[\abx@cbxid $Id: authoryear.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: authoryear.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,autocite=inline} \newbool{cbx:parens} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx index 3c725be98f5..f428806df22 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/debug.cbx @@ -1,7 +1,7 @@ -% $Id: debug.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: debug.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{debug.cbx} -[\abx@cbxid $Id: debug.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: debug.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \ExecuteBibliographyOptions{autocite=plain} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx index e29517eaf00..a2a1a488ec4 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/draft.cbx @@ -1,7 +1,7 @@ -% $Id: draft.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: draft.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{draft.cbx} -[\abx@cbxid $Id: draft.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: draft.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \ExecuteBibliographyOptions{autocite=plain} 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 1334e6b0ac3..19f7aaed7cc 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 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: numeric-comp.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{numeric-comp.cbx} -[\abx@cbxid $Id: numeric-comp.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: numeric-comp.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \ExecuteBibliographyOptions{labelnumber,sortcites,autocite=inline} \renewcommand*{\multicitedelim}{\addcomma\space} 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 de60d874433..e7c2ddf6f84 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-verb.cbx @@ -1,7 +1,7 @@ -% $Id: numeric-verb.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: numeric-verb.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{numeric-verb.cbx} -[\abx@cbxid $Id: numeric-verb.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: numeric-verb.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \ExecuteBibliographyOptions{labelnumber,autocite=inline} \renewcommand*{\multicitedelim}{\addcomma\space} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx index 74e22224ceb..15dc0eb3616 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx @@ -1,7 +1,7 @@ -% $Id: numeric.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: numeric.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{numeric.cbx} -[\abx@cbxid $Id: numeric.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: numeric.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \ExecuteBibliographyOptions{labelnumber,autocite=inline} \renewcommand*{\multicitedelim}{\addcomma\space} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx index df6a55f20c0..5834a6f3a97 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/reading.cbx @@ -1,7 +1,7 @@ -% $Id: reading.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: reading.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{reading.cbx} -[\abx@cbxid $Id: reading.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: reading.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \RequireCitationStyle{authortitle} diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx index 49baa86caf5..af78b9ee90c 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx @@ -1,7 +1,7 @@ -% $Id: verbose-ibid.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: verbose-ibid.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{verbose-ibid.cbx} -[\abx@cbxid $Id: verbose-ibid.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: verbose-ibid.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}} \DeclareFieldFormat{bibhyperlink}{% @@ -169,4 +169,17 @@ {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\textcite}[\cbx@textcite\footcite] + {\gdef\cbx@savedkeys{}} + {\printnames{labelname}% + \xappto\cbx@savedkeys{\thefield{entrykey},}} + {\multinamedelim} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + +\newrobustcmd{\cbx@textcite}[2]{% + \def\cbx@savedcites{#1}#2\cbx@savedcites} + +\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\multinamedelim} + \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx index 717b618966c..492ea42667d 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx @@ -1,7 +1,7 @@ -% $Id: verbose-inote.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: verbose-inote.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{verbose-inote.cbx} -[\abx@cbxid $Id: verbose-inote.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: verbose-inote.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \DeclareFieldFormat{bibhyperlink}{% \bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}} @@ -228,4 +228,17 @@ {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\textcite}[\cbx@textcite\footcite] + {\gdef\cbx@savedkeys{}} + {\printnames{labelname}% + \xappto\cbx@savedkeys{\thefield{entrykey},}} + {\multinamedelim} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + +\newrobustcmd{\cbx@textcite}[2]{% + \def\cbx@savedcites{#1}#2\cbx@savedcites} + +\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\multinamedelim} + \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx index 5d4340061fb..347f291afa6 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx @@ -1,7 +1,7 @@ -% $Id: verbose-note.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: verbose-note.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{verbose-note.cbx} -[\abx@cbxid $Id: verbose-note.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: verbose-note.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \DeclareFieldFormat{bibhyperlink}{% \bibhyperlink{\thefield{entrykey}:\csuse{cbx@\iffootnote{f}{t}@\thefield{entrykey}}}{#1}} @@ -198,4 +198,17 @@ {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\textcite}[\cbx@textcite\footcite] + {\gdef\cbx@savedkeys{}} + {\printnames{labelname}% + \xappto\cbx@savedkeys{\thefield{entrykey},}} + {\multinamedelim} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + +\newrobustcmd{\cbx@textcite}[2]{% + \def\cbx@savedcites{#1}#2\cbx@savedcites} + +\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\multinamedelim} + \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx index 06fcacf734c..3f53294ef64 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx @@ -1,7 +1,7 @@ -% $Id: verbose-trad1.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: verbose-trad1.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{verbose-trad1.cbx} -[\abx@cbxid $Id: verbose-trad1.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: verbose-trad1.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \providecommand*{\mkibid}[1]{#1} \newtoggle{cbx:ibidpage} @@ -197,4 +197,17 @@ {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\textcite}[\cbx@textcite\footcite] + {\gdef\cbx@savedkeys{}} + {\printnames{labelname}% + \xappto\cbx@savedkeys{\thefield{entrykey},}} + {\multinamedelim} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + +\newrobustcmd{\cbx@textcite}[2]{% + \def\cbx@savedcites{#1}#2\cbx@savedcites} + +\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\multinamedelim} + \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx index 385c0a41002..7227d0ebb43 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx @@ -1,7 +1,7 @@ -% $Id: verbose-trad2.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: verbose-trad2.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{verbose-trad2.cbx} -[\abx@cbxid $Id: verbose-trad2.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: verbose-trad2.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \providecommand*{\mkibid}[1]{#1} \newtoggle{cbx:fullcite} @@ -189,4 +189,17 @@ {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\textcite}[\cbx@textcite\footcite] + {\gdef\cbx@savedkeys{}} + {\printnames{labelname}% + \xappto\cbx@savedkeys{\thefield{entrykey},}} + {\multinamedelim} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + +\newrobustcmd{\cbx@textcite}[2]{% + \def\cbx@savedcites{#1}#2\cbx@savedcites} + +\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\multinamedelim} + \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx index 60ea0cc218d..e451e8285ca 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx @@ -1,7 +1,7 @@ -% $Id: verbose-trad3.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: verbose-trad3.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{verbose-trad3.cbx} -[\abx@cbxid $Id: verbose-trad3.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: verbose-trad3.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \providecommand*{\mkibid}[1]{#1} \newtoggle{cbx:loccit} @@ -164,4 +164,17 @@ {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\textcite}[\cbx@textcite\footcite] + {\gdef\cbx@savedkeys{}} + {\printnames{labelname}% + \xappto\cbx@savedkeys{\thefield{entrykey},}} + {\multinamedelim} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + +\newrobustcmd{\cbx@textcite}[2]{% + \def\cbx@savedcites{#1}#2\cbx@savedcites} + +\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\multinamedelim} + \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx index d2811badf9a..eecfc6a26d4 100644 --- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx +++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose.cbx @@ -1,7 +1,7 @@ -% $Id: verbose.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: verbose.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{verbose.cbx} -[\abx@cbxid $Id: verbose.cbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@cbxid $Id: verbose.cbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}} \DeclareFieldFormat{bibhyperlink}{% @@ -139,4 +139,17 @@ {\multicitedelim} {\usebibmacro{cite:postnote}} +\DeclareCiteCommand{\textcite}[\cbx@textcite\footcite] + {\gdef\cbx@savedkeys{}} + {\printnames{labelname}% + \xappto\cbx@savedkeys{\thefield{entrykey},}} + {\multinamedelim} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + +\newrobustcmd{\cbx@textcite}[2]{% + \def\cbx@savedcites{#1}#2\cbx@savedcites} + +\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\footcites]{\textcite}{\multinamedelim} + \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx index c4d62b6f1a2..2b1e0b591a6 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/UKenglish.lbx @@ -1,7 +1,7 @@ -% $Id: UKenglish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: UKenglish.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{UKenglish.lbx} -[\abx@lbxid $Id: UKenglish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@lbxid $Id: UKenglish.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \InheritBibliographyExtras{british} \InheritBibliographyStrings{british} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx index cf1e41bec9f..dd1ab54b14e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/USenglish.lbx @@ -1,7 +1,7 @@ -% $Id: USenglish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: USenglish.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{USenglish.lbx} -[\abx@lbxid $Id: USenglish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@lbxid $Id: USenglish.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \InheritBibliographyExtras{american} \InheritBibliographyStrings{american} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx index ff3c1679fa5..28a8bfc53e1 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/american.lbx @@ -1,11 +1,7 @@ -% $Id: american.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: american.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{american.lbx} -[\abx@lbxid $Id: american.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] - -% Status: -% - complete -% - peer review pending (see english.lbx) +[\abx@lbxid $Id: american.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \InheritBibliographyExtras{english} \DeclareBibliographyExtras{\uspunctuation} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx index dbeabb69306..0b9176e48d1 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx @@ -1,11 +1,7 @@ -% $Id: australian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: australian.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{australian.lbx} -[\abx@lbxid $Id: australian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] - -% Status: -% - complete -% - peer review pending (see also british.lbx and english.lbx) +[\abx@lbxid $Id: australian.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \InheritBibliographyExtras{british} \DeclareBibliographyExtras{% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx index f8917cce710..cce27921a31 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/austrian.lbx @@ -1,11 +1,7 @@ -% $Id: austrian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: austrian.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{austrian.lbx} -[\abx@lbxid $Id: austrian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] - -% Status: -% - complete -% - translations + peer review by native speakers +[\abx@lbxid $Id: austrian.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \InheritBibliographyExtras{german} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx index 4e077602104..bed339c3770 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazil.lbx @@ -1,7 +1,7 @@ -% $Id: brazil.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: brazil.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{brazil.lbx} -[\abx@lbxid $Id: brazil.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@lbxid $Id: brazil.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \InheritBibliographyExtras{brazilian} \InheritBibliographyStrings{brazilian} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx index 632b6a09ef9..6fb1a37b265 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx @@ -1,11 +1,7 @@ -% $Id: brazilian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: brazilian.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{brazilian.lbx} -[\abx@lbxid $Id: brazilian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] - -% Status: -% - Almost complete -% - Translations by native speakers +[\abx@lbxid $Id: brazilian.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \DeclareRedundantLanguages{brazilian}{brazil,portuges} @@ -19,6 +15,7 @@ \stripzeros{#1}\textordmasculine}% \textordmasculine -> textcomp.sty \protected\def\mkbibfemord#1{% \stripzeros{#1}\textordfeminine}% \textordfeminine -> textcomp.sty + \protected\def\mkbibneutord{\mkbibmascord}% \protected\def\mkbibdatelong#1#2#3{% \iffieldundef{#3} {} @@ -306,6 +303,9 @@ volumes = {{volumes}{vols\adddot}}, jourvol = {{volume}{vol\adddot}}, jourser = {{s\'erie}{s\'er\adddot}}, +% book = {{}{}}, % FIXME: missing +% part = {{}{}}, % FIXME: missing +% issue = {{}{}}, % FIXME: missing newseries = {{nova s\'erie}{nova s\'er\adddot}}, oldseries = {{s\'erie antiga}{s\'er\adddot\ antiga}}, edition = {{edi\c{c}\~ao}{ed\adddot}}, @@ -339,9 +339,10 @@ version = {{vers\~ao}{vers\~ao}}, url = {{endere\c{c}o eletr\^onico}{endere\c{c}o}}, urlseen = {{acesso em}{acesso em}}, - inpress = {{na prensa}{na prensa}}, % inpreparation = {{}{}}, % FIXME: missing submitted = {{submetido}{subm\adddot}}, +% forthcoming = {{}{}}, % FIXME: missing + inpress = {{na prensa}{na prensa}}, citedas = {{doravante citado como}{doravante citado como}}, seenote = {{ver nota}{ver nota}}, quotedin = {{apud}{apud}}, @@ -378,9 +379,11 @@ december = {{dezembro}{dez\adddot}}, langamerican = {{ingl\^es}{ingl\^es}}, langbrazilian = {{portugu{\^e}s}{portugu{\^e}s}}, +% langcroatian = {{}{}}, % FIXME: missing langdanish = {{dinamarqu\^es}{dinamarqu\^es}}, langdutch = {{holand{\^e}s}{holand{\^e}s}}, langenglish = {{ingl\^es}{ingl\^es}}, +% langfinnish = {{}{}}, % FIXME: missing langfrench = {{franc\^es}{franc\^es}}, langgerman = {{alem\~ao}{alem\~ao}}, langgreek = {{grego}{grego}}, @@ -388,13 +391,16 @@ langlatin = {{latim}{latim}}, langnorwegian = {{noruegu\^es}{noruegu\^es}}, langportuguese = {{portugu{\^e}s}{portugu{\^e}s}}, +% langrussian = {{}{}}, % FIXME: missing langspanish = {{espanhol}{espanhol}}, langswedish = {{sueco}{sueco}}, fromamerican = {{do ingl\^es}{do ingl\^es}}, frombrazilian = {{do portugu{\^e}s}{do portugu{\^e}s}}, +% fromcroatian = {{}{}}, % FIXME: missing fromdanish = {{do dinamarqu\^es}{do dinamarqu\^es}}, fromdutch = {{do holand{\^e}s}{do holand{\^e}s}}, fromenglish = {{do ingl\^es}{do ingl\^es}}, +% fromfinnish = {{}{}}, % FIXME: missing fromfrench = {{do franc\^es}{do franc\^es}}, fromgerman = {{do alem\~ao}{do alem\~ao}}, fromgreek = {{do grego}{do grego}}, @@ -402,6 +408,7 @@ fromlatin = {{do latim}{do latim}}, fromnorwegian = {{do noruegu\^es}{do noruegu\^es}}, fromportuguese = {{do portugu{\^e}s}{do portugu{\^e}s}}, +% fromrussian = {{}{}}, % FIXME: missing fromspanish = {{do espanhol}{do espanhol}}, fromswedish = {{do sueco}{do sueco}}, countryde = {{Alemanha}{DE}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx index 8d907f8deb1..4213e3103df 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx @@ -1,11 +1,7 @@ -% $Id: british.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: british.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{british.lbx} -[\abx@lbxid $Id: british.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] - -% Status: -% - complete -% - peer review pending (see also english.lbx) +[\abx@lbxid $Id: british.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \DeclareBibliographyExtras{% \protected\def\bibrangedash{% @@ -23,6 +19,7 @@ \endgroup}% \protected\def\mkbibmascord{\mkbibordinal}% \protected\def\mkbibfemord{\mkbibordinal}% + \protected\def\mkbibneutord{\mkbibordinal}% \protected\def\mkbibdatelong#1#2#3{% \iffieldundef{#3} {} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx index b5dc25698de..992f72b191b 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/canadian.lbx @@ -1,11 +1,7 @@ -% $Id: canadian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: canadian.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{canadian.lbx} -[\abx@lbxid $Id: canadian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] - -% Status: -% - complete -% - peer review pending (see english.lbx) +[\abx@lbxid $Id: canadian.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \InheritBibliographyExtras{english}% correct? these are the US standards \InheritBibliographyStrings{english} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx index c80e3f7f36e..9fb9c611d45 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx @@ -1,11 +1,7 @@ -% $Id: danish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: danish.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{danish.lbx} -[\abx@lbxid $Id: danish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] - -% Status: -% - Incomplete -% - Translations by native speakers +[\abx@lbxid $Id: danish.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \DeclareRedundantLanguages{danish}{danish} @@ -17,6 +13,7 @@ \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}% \protected\def\mkbibmascord{\mkbibordinal}% \protected\def\mkbibfemord{\mkbibordinal}% + \protected\def\mkbibneutord{\mkbibordinal}% \protected\def\mkbibdatelong#1#2#3{% \iffieldundef{#3} {} @@ -239,6 +236,9 @@ volumes = {{bind}{bd\adddot}}, jourvol = {{\aa rgang}{\aa g\adddot}}, jourser = {{serie}{ser\adddot}}, +% book = {{}{}}, % FIXME: missing +% part = {{}{}}, % FIXME: missing +% issue = {{}{}}, % FIXME: missing % FIXME: spacing after abbreviation dot? newseries = {{ny serie}{n.s\adddot}}, % FIXME: spacing after abbreviation dot? @@ -286,9 +286,10 @@ version = {{version}{vers\adddot}}, url = {{side}{side}}, urlseen = {{sidst set}{sidst set}}, -% inpress = {{}{}}, % FIXME: missing % inpreparation = {{}{}}, % FIXME: missing % submitted = {{}{}}, % FIXME: missing +% forthcoming = {{}{}}, % FIXME: missing +% inpress = {{}{}}, % FIXME: missing citedas = {{herefter citeret som}{herefter cit\adddot\ som}}, % thiscite = {{}{}}, % FIXME: missing seenote = {{se note}{se note}}, @@ -331,9 +332,11 @@ december = {{december}{dec\adddot}}, langamerican = {{amerikansk}{amerikansk}}, % langbrazilian = {{}{}}, % FIXME: missing +% langcroatian = {{}{}}, % FIXME: missing % langdanish = {{}{}}, % FIXME: missing % langdutch = {{}{}}, % FIXME: missing langenglish = {{engelsk}{engelsk}}, +% langfinnish = {{}{}}, % FIXME: missing langfrench = {{fransk}{fransk}}, langgerman = {{tysk}{tysk}}, langgreek = {{gr\ae sk}{gr\ae sk}}, @@ -341,13 +344,16 @@ langlatin = {{latin}{latin}}, langnorwegian = {{norsk}{norsk}}, % langportuguese = {{}{}}, % FIXME: missing +% langrussian = {{}{}}, % FIXME: missing langspanish = {{spansk}{spansk}}, % langswedish = {{}{}}, % FIXME: missing fromamerican = {{fra amerikansk}{fra amerikansk}}, % frombrazilian = {{}{}}, % FIXME: missing +% fromcroatian = {{}{}}, % FIXME: missing % fromdanish = {{}{}}, % FIXME: missing % fromdutch = {{}{}}, % FIXME: missing fromenglish = {{fra engelsk}{fra engelsk}}, +% fromfinnish = {{}{}}, % FIXME: missing fromfrench = {{fra fransk}{fra fransk}}, fromgerman = {{fra tysk}{fra tysk}}, fromgreek = {{fra gr\ae sk}{fra gr\ae sk}}, @@ -355,6 +361,7 @@ fromlatin = {{fra latin}{fra latin}}, fromnorwegian = {{fra norsk}{fra norsk}}, % fromportuguese = {{}{}}, % FIXME: missing +% fromrussian = {{}{}}, % FIXME: missing fromspanish = {{fra spansk}{fra spansk}}, % fromswedish = {{}{}}, % FIXME: missing countryde = {{Tyskland}{DE}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx index f03aeb791e9..08833c3b5bf 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx @@ -1,24 +1,39 @@ -% $Id: dutch.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: dutch.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{dutch.lbx} -[\abx@lbxid $Id: dutch.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@lbxid $Id: dutch.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] -% Status: -% - Almost complete -% - Translations by native speakers -% % Changes: % 2010-10-31 Update by Alexander van Loon +% 2011-08-27 Update by Pieter Belmans \DeclareRedundantLanguages{dutch}{dutch} \DeclareBibliographyExtras{% - \protected\def\bibrangedash{-}% - \protected\def\bibdatedash{\bibrangedash}% FIXME: unsure + \protected\def\bibrangedash{% + \textendash\penalty\hyphenpenalty}% breakable dash + \protected\def\bibdatedash{\bibrangedash}% \let\finalandcomma=\empty - \protected\def\mkbibordinal#1{\stripzeros{#1}e}% + % both ordinal numbers are valid, the first is the most basic: 1e, 2e, 19e + % whereas the second is capable of typesetting 1ste, 2de, 21ste, 102de + % \protected\def\mkbibordinal#1{\stripzeros{#1}e}% + \protected\def\mkbibordinal#1{% + \begingroup + \@tempcnta0#1\relax\number\@tempcnta + \@whilenum\@tempcnta>100\do{\advance\@tempcnta-100\relax}% + \ifnum\@tempcnta>19 + ste% + \else + \ifnum\@tempcnta=1 + ste% + \else + \ifnum\@tempcnta=8 ste\else de\fi + \fi + \fi + \endgroup}% \protected\def\mkbibmascord{\mkbibordinal}% \protected\def\mkbibfemord{\mkbibordinal}% + \protected\def\mkbibneutord{\mkbibordinal}% \protected\def\mkbibdatelong#1#2#3{% \iffieldundef{#3} {} @@ -39,16 +54,6 @@ {\mkdatezeros{\thefield{#2}}% \iffieldundef{#1}{}{\mbox{-}}}% \mkdatezeros{\thefield{#1}}}% - \savecommand\mkbibrangeterse - \protected\def\mkbibrangeterse{% - \BibliographyWarning{% - Date format 'terse' not applicable to\MessageBreak - Dutch dates. Using format 'short' instead}% - \mkbibrangefull{short}}% -} - -\UndeclareBibliographyExtras{% - \restorecommand\mkbibrangeterse } \DeclareBibliographyStrings{% @@ -56,30 +61,25 @@ references = {{Referenties}{Referenties}}, shorthands = {{Lijst van afkortingen}{Afkortingen}}, editor = {{redacteur}{red\adddot}}, - editors = {{redacteuren}{red\adddot}}, - compiler = {{compilator}{comp\adddot}}, - compilers = {{compilatoren}{comp\adddot}}, + editors = {{redacteurs}{red\adddot}}, + compiler = {{samensteller}{samenst\adddot}}, + compilers = {{samenstellers}{samenst\adddot}}, + founder = {{oprichter}{opr\adddot}}, + founders = {{oprichters}{opr\adddot}}, + continuator = {{opvolger}{opv\adddot}}, + continuators = {{opvolgers}{opv\adddot}}, redactor = {{redacteur}{red\adddot}}, redactors = {{redacteuren}{red\adddot}}, -% reviser = {{}{}}, % FIXME: missing -% revisers = {{}{}}, % FIXME: missing - founder = {{oprichter}{oprichter}}, - founders = {{oprichters}{oprichters}}, - continuator = {{vervolgd}{vervolgd}}, - continuators = {{vervolgd}{vervolgd}}, - collaborator = {{medewerker}{mederwerker}}, - collaborators = {{medewerkers}{medewerkers}}, + reviser = {{revisor}{rev\adddot}}, + revisers = {{revisors}{rev\adddot}}, + collaborator = {{medewerker}{med\adddot}}, + collaborators = {{medewerkers}{med\adddot}}, translator = {{vertaler}{vert\adddot}}, translators = {{vertalers}{vert\adddot}}, commentator = {{commentator}{comm\adddot}}, commentators = {{commentatoren}{comm\adddot}}, annotator = {{annotator}{annot\adddot}}, annotators = {{annotatoren}{annot\adddot}}, - commentary = {{commentaar}{comm\adddot}}, - annotations = {{annotaties}{annot\adddot}}, - introduction = {{introduction}{intro\adddot}}, - foreword = {{voorwoord}{voorw\adddot}}, - afterword = {{nawoord}{naw\adddot}}, editortr = {{redacteur en vertaler}% {red\adddotspace en vert\adddot}}, editorstr = {{redacteuren en vertalers}% @@ -92,10 +92,10 @@ {red\adddotspace en annot\adddot}}, editorsan = {{redacteuren en annotatoren}% {red\adddotspace en annot\adddot}}, - editorin = {{redactie en introductie}% - {red\adddotspace en introd\adddot}}, - editorsin = {{redacteuren en introductie}% - {red\adddotspace en introd\adddot}}, + editorin = {{redactie en inleiding}% + {red\adddotspace en inl\adddot}}, + editorsin = {{redacteuren en inleiding}% + {red\adddotspace en inl\adddot}}, editorfo = {{redacteur en voorwoord}% {red\adddotspace en voorw\adddot}}, editorsfo = {{redacteuren en voorwoord}% @@ -104,7 +104,7 @@ {red\adddotspace en naw\adddot}}, editorsaf = {{redacteuren en nawoord}% {red\adddotspace en naw\adddot}}, - editortrco = {{redacteur, vertaleren commentator}% + editortrco = {{redacteur, vertaler en commentator}% {red.,\addabbrvspace vert\adddot\ en comm\adddot}}, editorstrco = {{redacteuren, vertalers en commentatoren}% {red.,\addabbrvspace vert\adddot\ en comm\adddot}}, @@ -112,22 +112,22 @@ {red.,\addabbrvspace vert\adddot\ en annot\adddot}}, editorstran = {{redacteur, vertalers en annotatoren}% {red.,\addabbrvspace vert\adddot\ en annot\adddot}}, - editortrin = {{redacteur, vertaler en introductie}% - {red.,\addabbrvspace vert\adddot\ en introd\adddot}}, - editorstrin = {{redacteuren, vertalers en introductie}% - {red.,\addabbrvspace vert\adddot\ en introd\adddot}}, + editortrin = {{redacteur, vertaler en inleiding}% + {red.,\addabbrvspace vert\adddot\ en inl\adddot}}, + editorstrin = {{redacteuren, vertalers en inleiding}% + {red.,\addabbrvspace vert\adddot\ en inl\adddot}}, editortrfo = {{redacteur, vertaler en voorwoord}% {red.,\addabbrvspace vert\adddot\ en voorw\adddot}}, editorstrfo = {{redacteuren, vertalers en voorwoord}% {red.,\addabbrvspace vert\adddot\ en voorw\adddot}}, editortraf = {{redacteur, vertaler en nawoord}% - {ed.,\addabbrvspace trans\adddot\ and naw\adddot}}, + {red.,\addabbrvspace vert\adddot\ en naw\adddot}}, editorstraf = {{redacteuren, vertalers en nawoord}% {red.,\addabbrvspace vert\adddot\ en naw\adddot}}, - editorcoin = {{redacteur, commentator en introductie}% - {red.,\addabbrvspace comm\adddot\ en introd\adddot}}, - editorscoin = {{redacteuren, commentatoren en introductie}% - {red.,\addabbrvspace comm\adddot\ en introd\adddot}}, + editorcoin = {{redacteur, commentator en inleiding}% + {red.,\addabbrvspace comm\adddot\ en inl\adddot}}, + editorscoin = {{redacteuren, commentatoren en inleiding}% + {red.,\addabbrvspace comm\adddot\ en inl\adddot}}, editorcofo = {{redacteur, commentator en voorwoord}% {red.,\addabbrvspace comm\adddot\ en voorw\adddot}}, editorscofo = {{redacteuren, commentatoren en voorwoord}% @@ -136,10 +136,10 @@ {red.,\addabbrvspace comm\adddot\ en naw\adddot}}, editorscoaf = {{redacteuren, commentatoren en nawoord}% {red.,\addabbrvspace comm\adddot\ en naw\adddot}}, - editoranin = {{redacteur, annotator en introductie}% - {red.,\addabbrvspace annot\adddot\ en introd\adddot}}, - editorsanin = {{redacteuren, annotatoren en introductie}% - {red.,\addabbrvspace annot\adddot\ en introd\adddot}}, + editoranin = {{redacteur, annotator en inleiding}% + {red.,\addabbrvspace annot\adddot\ en inl\adddot}}, + editorsanin = {{redacteuren, annotatoren en inleiding}% + {red.,\addabbrvspace annot\adddot\ en inl\adddot}}, editoranfo = {{redacteur, annotator en voorwoord}% {red.,\addabbrvspace annot\adddot\ en voorw\adddot}}, editorsanfo = {{redacteuren, annotatoren en voorwoord}% @@ -148,10 +148,10 @@ {red.,\addabbrvspace annot\adddot\ en nawoord\adddot}}, editorsanaf = {{redacteuren, annotatoren en nawoord}% {red.,\addabbrvspace annot\adddot\ en naw\adddot}}, - editortrcoin = {{redacteur, vertaler, commentator en introductie}% - {red.,\addabbrvspace vert., comm\adddot\ en introd\adddot}}, - editorstrcoin = {{redacteuren, vertalers, commentatoren en introductie}% - {red.,\addabbrvspace vert., comm\adddot\ and introd\adddot}}, + editortrcoin = {{redacteur, vertaler, commentator en inleiding}% + {red.,\addabbrvspace vert., comm\adddot\ en inl\adddot}}, + editorstrcoin = {{redacteuren, vertalers, commentatoren en inleiding}% + {red.,\addabbrvspace vert., comm\adddot\ en inl\adddot}}, editortrcofo = {{redacteur, vertaling, commentator en voorwoord}% {red.,\addabbrvspace vert., comm\adddot\ en voorw\adddot}}, editorstrcofo = {{redacteuren, vertalers, commentatoren en voorwoord}% @@ -160,12 +160,12 @@ {red.,\addabbrvspace vert., comm\adddot\ en naw\adddot}}, editorstrcoaf = {{redacteuren, vertalers, commentators en nawoord}% {red.,\addabbrvspace vert., comm\adddot\ en naw\adddot}}, - editortranin = {{redacteur, vertaler, annotator en introductie}% - {red.,\addabbrvspace vert., annot\adddot\ en introd\adddot}}, - editorstranin = {{redacteuren, vertalers, annotatoren en introductie}% - {red.,\addabbrvspace vert., annot\adddot\ en introd\adddot}}, + editortranin = {{redacteur, vertaler, annotator en inleiding}% + {red.,\addabbrvspace vert., annot\adddot\ en inl\adddot}}, + editorstranin = {{redacteuren, vertalers, annotatoren en inleiding}% + {red.,\addabbrvspace vert., annot\adddot\ en inl\adddot}}, editortranfo = {{redacteur, vertaler, annotator en voorwoord}% - {red.,\addabbrvspace vert., annot\adddot\ and voorw\adddot}}, + {red.,\addabbrvspace vert., annot\adddot\ en voorw\adddot}}, editorstranfo = {{redacteuren, vertalers, annotatoren en voorwoord}% {red.,\addabbrvspace vert., annot\adddot\ en voorw\adddot}}, editortranaf = {{redacteur, vertaler, annotator en nawoord}% @@ -180,10 +180,10 @@ {vert\adddot\ en annot\adddot}}, translatorsan = {{vertalers en annotatoren}% {vert\adddot\ en annot\adddot}}, - translatorin = {{vertaling en introductie}% - {vert\adddot\ en introd\adddot}}, - translatorsin = {{vertaling en introductie}% - {vert\adddot\ en introd\adddot}}, + translatorin = {{vertaling en inleiding}% + {vert\adddot\ en inl\adddot}}, + translatorsin = {{vertaling en inleiding}% + {vert\adddot\ en inl\adddot}}, translatorfo = {{vertaling en voorwoord}% {vert\adddot\ en voorw\adddot}}, translatorsfo = {{vertaling en voorwoord}% @@ -192,160 +192,170 @@ {vert\adddot\ en naw\adddot}}, translatorsaf = {{vertaling en nawoord}% {vert\adddot\ en naw\adddot}}, - translatorcoin = {{vertaling, commentaar en introductie}% - {vert., comm\adddot\ en introd\adddot}}, - translatorscoin = {{vertaling, commentaar en introductie}% - {trans., comm\adddot\ en introd\adddot}}, + translatorcoin = {{vertaling, commentaar en inleiding}% + {vert., comm\adddot\ en inl\adddot}}, + translatorscoin = {{vertaling, commentaar en inleiding}% + {vert., comm\adddot\ en inl\adddot}}, translatorcofo = {{vertaling, commentaar en voorwoord}% - {trans., comm\adddot\ en voorwoord\adddot}}, + {vert., comm\adddot\ en voorwoord\adddot}}, translatorscofo = {{vertaling, commentaar en voorwoord}% - {trans., comm\adddot\ en voorw\adddot}}, + {vert., comm\adddot\ en voorw\adddot}}, translatorcoaf = {{vertaling, commentaar en nawoord}% - {trans., comm\adddot\ en naw\adddot}}, + {vert., comm\adddot\ en naw\adddot}}, translatorscoaf = {{vertaling, commentaar en nawoord}% - {trans., comm\adddot\ en naw\adddot}}, - translatoranin = {{vertaling, annotaties en introductie}% - {trans., annot\adddot\ en introd\adddot}}, - translatorsanin = {{vertaling, annotaties en introductie}% - {trans., annot\adddot\ en introd\adddot}}, + {vert., comm\adddot\ en naw\adddot}}, + translatoranin = {{vertaling, annotaties en inleiding}% + {vert., annot\adddot\ en inl\adddot}}, + translatorsanin = {{vertaling, annotaties en inleiding}% + {vert., annot\adddot\ en inl\adddot}}, translatoranfo = {{vertaling, annotaties en voorwoord}% - {trans., annot\adddot\ en voorw\adddot}}, + {vert., annot\adddot\ en voorw\adddot}}, translatorsanfo = {{vertaling, annotaties en voorwoord}% - {trans., annot\adddot\ en voorw\adddot}}, + {vert., annot\adddot\ en voorw\adddot}}, translatoranaf = {{vertaling, annotaties en nawoord}% - {trans., annot\adddot\ en naw\adddot}}, + {vert., annot\adddot\ en naw\adddot}}, translatorsanaf = {{vertaling, annotaties en nawoord}% - {trans., annot\adddot\ en naw\adddot}}, + {vert., annot\adddot\ en naw\adddot}}, byauthor = {{door}{door}}, - byeditor = {{geredigeerd door}{red\adddotspace door}}, - bycompiler = {{gecompileerd door}{comp\adddotspace door}}, - byredactor = {{geredigeerd door}{red\adddotspace door}}, -% byreviser = {{}{}}, % FIXME: missing - byfounder = {{opgericht door}{opgericht door}}, - bycontinuator = {{vervolgd door}{vervolgd door}}, - bycollaborator = {{in samenwerking met}{in samenwerking met}}, - bytranslator = {{vertaald \lbx@lfromlang\ door}{vert\adddot\ \lbx@sfromlang\ door}}, - bycommentator = {{becommentari\"{e}erd door}{comm\adddot\ door}}, + byeditor = {{geredigeerd door}{red\adddot\addabbrvspace door}}, + bycompiler = {{samengesteld door}{sam\adddot\addabbrvspace door}}, + byfounder = {{opgericht door}{opger\adddot\addabbrvspace door}}, + bycontinuator = {{opgevolgd door}{opgev\adddot\addabbrvspace door}}, + byredactor = {{geredigeerd door}{red\adddot\ door}}, + byreviser = {{nagekeken door}{nagek\adddot\addabbrvspace door}}, + bycollaborator = {{met medewerking van}{m\adddot m\adddot v}}, + bytranslator = {{vertaald \lbx@lfromlang\ door}{vert\adddot\ \lbx@lfromlang\ door}}, + bycommentator = {{becommentarieerd door}{comm\adddot\ door}}, byannotator = {{geannoteerd door}{annot\adddot\ door}}, - withcommentator = {{met een commentaar van}{met een comment\adddot\ van}}, - withannotator = {{met annotaties van}{met annot\adddot\ van}}, - withintroduction = {{met een introductie van}{met een introd\adddot\ van}}, - withforeword = {{met een voorwoord van}{met een woorw\adddot\ van}}, - withafterword = {{met een nawoord van}{met een naw\adddot\ van}}, byeditortr = {{geredigeerd en vertaald \lbx@lfromlang\ door}% {red\adddotspace en vert\adddot\ \lbx@sfromlang\ door}}, - byeditorco = {{geredigeerd en becommentari\"{e}erd door}% + byeditorco = {{geredigeerd en becommentarieerd door}% {red\adddotspace en comm\adddot\ door}}, byeditoran = {{geredigeerd en geannoteerd door}% {red\adddotspace en annot\adddot\ door}}, - byeditorin = {{geredigeerd, met een introductie, van}% - {red., met een introd., van}}, + byeditorin = {{geredigeerd, met een inleiding, van}% + {red., met een inl., van}}, byeditorfo = {{geredigeerd, met een voorwoord, van}% {red., met een voorw., van}}, byeditoraf = {{geredigeerd, met een nawoord, van}% {red., met een naw., van}}, - byeditortrco = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentari\"{e}erd door}% + byeditortrco = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentarieerd door}% {red., vert\adddot\ \lbx@sfromlang\ en comm\adddot\ door}}, byeditortran = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd door}% {red., vert\adddot\ \lbx@sfromlang\ en annot\adddot\ door}}, - byeditortrin = {{geredigeerd en vertaald \lbx@lfromlang, met een introductie, door}% - {red\adddotspace en vert. \lbx@sfromlang, met een introd., door}}, + byeditortrin = {{geredigeerd en vertaald \lbx@lfromlang, met een inleiding, door}% + {red\adddotspace en vert. \lbx@sfromlang, met een inl., door}}, byeditortrfo = {{geredigeerd en vertaald \lbx@lfromlang, met een voorwoord, door}% {red\adddotspace en vert. \lbx@sfromlang, met een voorw., door}}, byeditortraf = {{geredigeerd en vertaald \lbx@lfromlang, met een nawoord, door}% {red\adddotspace en vert. \lbx@sfromlang, met een naw., door}}, - byeditorcoin = {{geredigeerd en becommentari\"{e}erd, met een introductie, door}% - {red\adddotspace en comm., met een introd., door}}, - byeditorcofo = {{geredigeerd en becommentari\"{e}erd, met een voorwoord, door}% + byeditorcoin = {{geredigeerd en becommentarieerd, met een inleiding, door}% + {red\adddotspace en comm., met een inl., door}}, + byeditorcofo = {{geredigeerd en becommentarieerd, met een voorwoord, door}% {red\adddotspace en comm., met een voorw., door}}, - byeditorcoaf = {{geredigeerd en becommentari\"{e}erd, met een nawoord, door}% + byeditorcoaf = {{geredigeerd en becommentarieerd, met een nawoord, door}% {red\adddotspace en comm., met een naw., door}}, - byeditoranin = {{geredigeerd en geannoteerd, met een introductie, door}% - {red\adddotspace en annot., met een introd., door}}, + byeditoranin = {{geredigeerd en geannoteerd, met een inleiding, door}% + {red\adddotspace en annot., met een inl., door}}, byeditoranfo = {{geredigeerd en geannoteerd, met een voorwoord, door}% {red\adddotspace en annot., met een voorw., door}}, byeditoranaf = {{geredigeerd en geannoteerd, met een nawoord, door}% {red\adddotspace en annot., met een naw., door}}, - byeditortrcoin = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentari\"{e}erd, met een introductie, door}% - {red., vert\adddot\ \lbx@sfromlang\ en comm., met een introd., door}}, - byeditortrcofo = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentari\"{e}erd, met een voorwoord, door}% + byeditortrcoin = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentarieerd, met een inleiding, door}% + {red., vert\adddot\ \lbx@sfromlang\ en comm., met een inl., door}}, + byeditortrcofo = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentarieerd, met een voorwoord, door}% {red., vert\adddot\ \lbx@sfromlang\ en comm., met een voorw., door}}, - byeditortrcoaf = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentari\"{e}erd, met een nawoord, door}% + byeditortrcoaf = {{geredigeerd, vertaald \lbx@lfromlang\ en becommentarieerd, met een nawoord, door}% {red., vert\adddot\ \lbx@sfromlang\ en comm., met een naw., door}}, - byeditortranin = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd, met een introductie, door}% - {red., vert\adddot\ \lbx@sfromlang\ en annot., met een introd., door}}, + byeditortranin = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd, met een inleiding, door}% + {red., vert\adddot\ \lbx@sfromlang\ en annot., met een inl., door}}, byeditortranfo = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd, met een voorwoord, door}% {red., vert\adddot\ \lbx@sfromlang\ en annot., met een voorw., door}}, byeditortranaf = {{geredigeerd, vertaald \lbx@lfromlang\ en geannoteerd, met een nawoord, door}% {red., vert\adddot\ \lbx@sfromlang\ en annot., met een naw., door}}, - bytranslatorco = {{vertaald \lbx@lfromlang\ en becommentari\"{e}erd door}% + bytranslatorco = {{vertaald \lbx@lfromlang\ en becommentarieerd door}% {vert\adddot\ \lbx@sfromlang\ en comm\adddot\ door}}, bytranslatoran = {{vertaald \lbx@lfromlang\ en geannoteerd door}% {vert\adddot\ \lbx@sfromlang\ en annot.\adddot\ door}}, - bytranslatorin = {{vertaald \lbx@lfromlang, met een introductie, door}% - {vert. \lbx@sfromlang, met een introd., door}}, + bytranslatorin = {{vertaald \lbx@lfromlang, met een inleiding, door}% + {vert. \lbx@sfromlang, met een inl., door}}, bytranslatorfo = {{vertaald \lbx@lfromlang, met een voorwoord, door}% {vert. \lbx@sfromlang, met een voorw., door}}, bytranslatoraf = {{vertaald \lbx@lfromlang, met een nawoord, door}% {vert. \lbx@sfromlang, met een naw., door}}, - bytranslatorcoin = {{vertaald \lbx@lfromlang\ en becommentari\"{e}erd, met een introd., door}% - {vert\adddot\ \lbx@sfromlang\ en comm., met een introd., door}}, - bytranslatorcofo = {{vertaald \lbx@lfromlang\ en becommentari\"{e}erd, met een voorwoord, door}% + bytranslatorcoin = {{vertaald \lbx@lfromlang\ en becommentarieerd, met een inleiding., door}% + {vert\adddot\ \lbx@sfromlang\ en comm., met een inl., door}}, + bytranslatorcofo = {{vertaald \lbx@lfromlang\ en becommentarieerd, met een voorwoord, door}% {vert\adddot\ \lbx@sfromlang\ en comm., met een voorw., door}}, - bytranslatorcoaf = {{vertaald \lbx@lfromlang\ en becommentari\"{e}erd, met een nawoord, door}% + bytranslatorcoaf = {{vertaald \lbx@lfromlang\ en becommentarieerd, met een nawoord, door}% {vert\adddot\ \lbx@sfromlang\ en comm., met een naw., door}}, - bytranslatoranin = {{vertaald \lbx@lfromlang\ en geannoteerd, met een introd., door}% - {vert\adddot\ \lbx@sfromlang\ en annot., met een introd., door}}, + bytranslatoranin = {{vertaald \lbx@lfromlang\ en geannoteerd, met een inleiding., door}% + {vert\adddot\ \lbx@sfromlang\ en annot., met een inl., door}}, bytranslatoranfo = {{vertaald \lbx@lfromlang\ en geannoteerd, met een voorwoord, door}% {vert\adddot\ \lbx@sfromlang\ en annot., met een voorw., door}}, bytranslatoranaf = {{vertaald \lbx@lfromlang\ en geannoteerd, met een nawoord, door}% {vert\adddot\ \lbx@sfromlang\ en annot., met een naw., door}}, - and = {{en}{en}}, - andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, - andmore = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + withcommentator = {{met een commentaar van}{met een comm\adddot\ van}}, + withannotator = {{met annotaties door}{met annot\adddot\ door}}, + withintroduction = {{met een inleiding van}{met een inl\adddot\ van}}, + withforeword = {{met een voorwoord van}{met een voorw\adddot\ van}}, + withafterword = {{met een nawoord van}{met een naw\adddot\ van}}, + commentary = {{commentaar}{comm\adddot}}, + annotations = {{annotaties}{annot\adddot}}, + introduction = {{inleiding}{inl\adddot}}, + foreword = {{voorwoord}{voorw\adddot}}, + afterword = {{nawoord}{naw\adddot}}, volume = {{deel}{deel}}, volumes = {{delen}{delen}}, jourvol = {{jaargang}{jrg\adddot}}, - jourser = {{serie}{ser\adddot}}, - newseries = {{nieuwe serie}{nieuwe ser\adddot}}, - oldseries = {{oude serie}{oude ser\adddot}}, + jourser = {{reeks}{reeks}}, +% book = {{}{}}, % FIXME: missing +% part = {{}{}}, % FIXME: missing +% issue = {{}{}}, % FIXME: missing + newseries = {{nieuwe reeks}{nieuwe reeks}}, + oldseries = {{oude reeks}{oude reeks}}, edition = {{editie}{ed\adddot}}, + in = {{in}{in}}, + inseries = {{in}{in}}, + ofseries = {{van}{van}}, + number = {{nummer}{nr\adddot}}, + chapter = {{hoofdstuk}{hfdstk\adddot}}, + version = {{versie}{versie}}, reprint = {{herdruk}{herdr\adddot}}, reprintof = {{herdruk van}{herdr\adddotspace van}}, reprintas = {{herdrukt als}{herdr\adddotspace als}}, + inpreparation = {{in voorbereiding}{in voorbereiding}}, + submitted = {{ingediend}{ingedied}}, +% forthcoming = {{}{}}, % FIXME: missing + inpress = {{in druk}{in druk}}, page = {{pagina}{p\adddot}}, - pages = {{pagina's}{pp\adddot}}, + pages = {{pagina's}{p\adddot}}, column = {{kolom}{kol\adddot}}, columns = {{kolommen}{kol\adddot}}, - line = {{regel}{r\adddot}}, - lines = {{regels}{r\adddot}}, - verse = {{vers}{v\adddot}}, - verses = {{verzen}{v\adddot}}, section = {{sectie}{\S}}, sections = {{secties}{\S}}, paragraph = {{paragraaf}{par\adddot}}, paragraphs = {{paragrafen}{par\adddot}}, - in = {{in}{in}}, - inseries = {{in}{in}}, - ofseries = {{van}{van}}, - number = {{nummer}{nr\adddot}}, - chapter = {{hoofdstuk}{hfdstk\adddot}}, + verse = {{vers}{v\adddot}}, + verses = {{verzen}{v\adddot}}, + line = {{regel}{r\adddot}}, + lines = {{regels}{r\adddot}}, mathesis = {{masterscriptie}{masterscriptie}}, phdthesis = {{proefschrift}{proefschrift}}, resreport = {{onderzoeksrapport}{onderzoeksrap\adddot}}, techreport = {{technisch rapport}{tech\adddotspace rap\adddot}}, - software = {{computer software}{comp\adddotspace software}}, - datacd = {{CD-ROM}{CD-ROM}}, - audiocd = {{audio CD}{audio CD}}, - version = {{versie}{versie}}, + software = {{computersoftware}{computersoft\adddot}}, + datacd = {{cd-rom}{cd-rom}}, + audiocd = {{audio-cd}{audio-cd}}, + and = {{en}{en}}, + andothers = {{en andere}{e\adddot a\adddot}}, + andmore = {{en andere}{e\adddot a\adddot}}, url = {{addres}{addres}}, urlseen = {{bezocht op}{bezocht op}}, - inpress = {{in druk}{in druk}}, -% inpreparation = {{}{}}, % FIXME: missing - submitted = {{ingediend}{ingediend}}, - citedas = {{verder geciteerd als}{verder geciteerd als}}, - seenote = {{zie voetnoot}{zie v\adddot}}, - quotedin = {{geciteerd in}{cit\adddotspace in}}, + file = {{bestand}{bestand}}, + library = {{bibliotheek}{bibliotheek}}, + abstract = {{samenvatting}{samenvatting}}, + annotation = {{annotaties}{annotaties}}, idem = {{idem}{idem}}, idemsm = {{idem}{idem}}, idemsf = {{eadem}{eadem}}, @@ -363,25 +373,31 @@ passim = {{passim}{pass\adddot}}, see = {{zie}{zie}}, seealso = {{zie ook}{zie ook}}, - backrefpage = {{zie pagina}{zie p\adddot}}, - backrefpages = {{zie pagina's}{zie pp\adddot}}, - january = {{januari}{jan\adddot}}, - february = {{februari}{feb\adddot}}, - march = {{maart}{mar\adddot}}, - april = {{april}{apr\adddot}}, + seenote = {{zie voetnoot}{zie v\adddot}}, + backrefpage = {{zie pagina}{zie pag\adddot}}, + backrefpages = {{zie pagina's}{zie pag\adddot}}, + quotedin = {{geciteerd in}{cit\adddotspace in}}, + citedas = {{verder geciteerd als}{verder geciteerd als}}, + thiscite = {{met name}{m.n\adddot}}, + january = {{januari}{jan}}, + february = {{februari}{feb}}, + march = {{maart}{mrt}}, + april = {{april}{apr}}, may = {{mei}{mei}}, - june = {{juni}{juni}}, - july = {{juli}{juli}}, - august = {{augustus}{aug\adddot}}, - september = {{september}{sept\adddot}}, - october = {{oktober}{okt\adddot}}, - november = {{november}{nov\adddot}}, - december = {{december}{dec\adddot}}, - langamerican = {{Amerikaans}{Amerikaans}}, - langbrazilian = {{Braziliaans}{Braziliaans}}, + june = {{juni}{jun}}, + july = {{juli}{jul}}, + august = {{augustus}{aug}}, + september = {{september}{sep}}, + october = {{oktober}{okt}}, + november = {{november}{nov}}, + december = {{december}{dec}}, + langamerican = {{Amerikaans Engels}{Amerikaans Engels}}, + langbrazilian = {{Braziliaans Portugeens}{Braziliaans Portugees}}, +% langcroatian = {{}{}}, % FIXME: missing langdanish = {{Deens}{Deens}}, langdutch = {{Nederlands}{Nederlands}}, langenglish = {{Engels}{Engels}}, +% langfinnish = {{}{}}, % FIXME: missing langfrench = {{Frans}{Frans}}, langgerman = {{Duits}{Duits}}, langgreek = {{Grieks}{Grieks}}, @@ -389,13 +405,16 @@ langlatin = {{Latijn}{Latijn}}, langnorwegian = {{Noors}{Noors}}, langportuguese = {{Portugees}{Portugees}}, +% langrussian = {{}{}}, % FIXME: missing langspanish = {{Spaans}{Spaans}}, langswedish = {{Zweeds}{Zweeds}}, - fromamerican = {{uit het Amerikaans}{uit het Amerikaans}}, - frombrazilian = {{uit het Braziliaans}{uit het Braziliaans}}, + fromamerican = {{uit het Amerikaans Engels}{uit het Amerikaans Engels}}, + frombrazilian = {{uit het Braziliaans Portugees}{uit het Braziliaans Portugees}}, +% fromcroatian = {{}{}}, % FIXME: missing fromdanish = {{uit het Deens}{uit het Deens}}, fromdutch = {{uit het Nederlands}{uit het Nederlands}}, fromenglish = {{uit het Engels}{uit het Engels}}, +% fromfinnish = {{}{}}, % FIXME: missing fromfrench = {{uit het Frans}{uit het Frans}}, fromgerman = {{uit het Duits}{uit het Duits}}, fromgreek = {{uit het Grieks}{uit het Grieks}}, @@ -403,6 +422,7 @@ fromlatin = {{uit het Latijn}{uit het Latijn}}, fromnorwegian = {{uit het Noors}{uit het Noors}}, fromportuguese = {{uit het Portugees}{uit het Portugees}}, +% fromrussian = {{}{}}, % FIXME: missing fromspanish = {{uit het Spaans}{uit het Spaans}}, fromswedish = {{uit het Zweeds}{uit het Zweeds}}, countryde = {{Duitsland}{DE}}, @@ -417,16 +437,12 @@ patentfr = {{Frans patent}{Frans pat\adddot}}, patentuk = {{Brits patent}{Brits pat\adddot}}, patentus = {{Amerikaans patent}{Amerikaans pat\adddot}}, - patreq = {{patent verzoek}{pat\adddot\ verz\adddot}}, - patreqde = {{Duits patent verzoek}{Duits pat\adddot\ verz\adddot}}, - patreqeu = {{Europees patent verzoek}{Europees pat\adddot\ verz\adddot}}, - patreqfr = {{Frans patent verzoek}{Frans pat\adddot\ verz\adddot}}, - patrequk = {{Brits patent verzoek}{Brits pat\adddot\ verz\adddot}}, - patrequs = {{Amerikaans patent verzoek}{Amerikaans pat\adddot\ verz\adddot}}, - file = {{bestand}{bestand}}, - library = {{bibliotheek}{bibliotheel}}, - abstract = {{samenvatting}{samenvatting}}, - annotation = {{annotaties}{annotaties}}, + patreq = {{patentaanvraag}{patentaanvr\adddot}}, + patreqde = {{Duitse patentaanvraag}{Duitse patentaanvr\adddot}}, + patreqeu = {{Europese patentaanvraag}{Europese patentaanvr\adddot}}, + patreqfr = {{Franse patentaanvraag}{Franse patentaanvr\adddot}}, + patrequk = {{Britse patentaanvraag}{Britse patentaanvr\adddot}}, + patrequs = {{Amerikaanse patentaanvraag}{Amerikaanse patentaanvr\adddot}}, } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx index be006230728..26a9105f581 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx @@ -1,11 +1,7 @@ -% $Id: english.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: english.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{english.lbx} -[\abx@lbxid $Id: english.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] - -% Status: -% - Complete -% - Some recently added translations need review +[\abx@lbxid $Id: english.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \DeclareRedundantLanguages{english,american}{english,american,british, canadian,australian,newzealand,USenglish,UKenglish} @@ -26,6 +22,7 @@ canadian,australian,newzealand,USenglish,UKenglish} \endgroup}% \protected\def\mkbibmascord{\mkbibordinal}% \protected\def\mkbibfemord{\mkbibordinal}% + \protected\def\mkbibneutord{\mkbibordinal}% \protected\def\mkbibdatelong#1#2#3{% \iffieldundef{#2} {} @@ -327,6 +324,9 @@ canadian,australian,newzealand,USenglish,UKenglish} volumes = {{volumes}{vols\adddot}}, jourvol = {{volume}{vol\adddot}}, jourser = {{series}{ser\adddot}}, + book = {{book}{book}}, + part = {{part}{part}}, + issue = {{issue}{issue}}, newseries = {{new series}{new ser\adddot}}, oldseries = {{old series}{old ser\adddot}}, edition = {{edition}{ed\adddot}}, @@ -360,9 +360,10 @@ canadian,australian,newzealand,USenglish,UKenglish} version = {{version}{version}}, url = {{address}{address}}, urlseen = {{visited on}{visited on}}, - inpress = {{in press}{in press}}, inpreparation = {{in preparation}{in preparation}}, submitted = {{submitted}{submitted}}, + forthcoming = {{forthcoming}{forthcoming}}, + inpress = {{in press}{in press}}, citedas = {{henceforth cited as}{henceforth cited as}}, thiscite = {{especially}{esp\adddot}}, seenote = {{see note}{see n\adddot}}, @@ -400,9 +401,11 @@ canadian,australian,newzealand,USenglish,UKenglish} december = {{December}{Dec\adddot}}, langamerican = {{American}{American}}, langbrazilian = {{Brazilian}{Brazilian}}, + langcroatian = {{Croatian}{Croatian}}, langdanish = {{Danish}{Danish}}, langdutch = {{Dutch}{Dutch}}, langenglish = {{English}{English}}, + langfinnish = {{Finnish}{Finnish}}, langfrench = {{French}{French}}, langgerman = {{German}{German}}, langgreek = {{Greek}{Greek}}, @@ -410,13 +413,16 @@ canadian,australian,newzealand,USenglish,UKenglish} langlatin = {{Latin}{Latin}}, langnorwegian = {{Norwegian}{Norwegian}}, langportuguese = {{Portuguese}{Portuguese}}, + langrussian = {{Russian}{Russian}}, langspanish = {{Spanish}{Spanish}}, langswedish = {{Swedish}{Swedish}}, fromamerican = {{from the American}{from the American}}, frombrazilian = {{from the Brazilian}{from the Brazilian}}, + fromcroatian = {{from the Croatian}{from the Croatian}}, fromdanish = {{from the Danish}{from the Danish}}, fromdutch = {{from the Dutch}{from the Dutch}}, fromenglish = {{from the English}{from the English}}, + fromfinnish = {{from the Finnish}{from the Finnish}}, fromfrench = {{from the French}{from the French}}, fromgerman = {{from the German}{from the German}}, fromgreek = {{from the Greek}{from the Greek}}, @@ -424,6 +430,7 @@ canadian,australian,newzealand,USenglish,UKenglish} fromlatin = {{from the Latin}{from the Latin}}, fromnorwegian = {{from the Norwegian}{from the Norwegian}}, fromportuguese = {{from the Portuguese}{from the Portuguese}}, + fromrussian = {{from the Russian}{from the Russian}}, fromspanish = {{from the Spanish}{from the Spanish}}, fromswedish = {{from the Swedish}{from the Swedish}}, countryde = {{Germany}{DE}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx index 4ab1e83cf4b..5b9c83a4bc7 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx @@ -1,12 +1,8 @@ -% $Id: finnish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: finnish.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{finnish.lbx} -[\abx@lbxid $Id: finnish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@lbxid $Id: finnish.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] -% Status: -% - Incomplete -% - Translations by native speakers -% % Translator's notes: % % Some translations look akward but they are made in such a way @@ -25,6 +21,7 @@ \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}% \protected\def\mkbibmascord{\mkbibordinal}% \protected\def\mkbibfemord{\mkbibordinal}% + \protected\def\mkbibneutord{\mkbibordinal}% \protected\def\mkbibdatelong#1#2#3{% \iffieldundef{#3} {} @@ -326,6 +323,9 @@ volumes = {{volyymit}{vol\adddot}}, jourvol = {{volyymi}{vol\adddot}}, jourser = {{sarja}{sarja}}, +% book = {{}{}}, % FIXME: missing +% part = {{}{}}, % FIXME: missing +% issue = {{}{}}, % FIXME: missing newseries = {{uusi sarja}{uusi sarja}}, oldseries = {{vanha sarja}{vanha sarja}}, edition = {{painos}{painos}}, @@ -359,9 +359,10 @@ version = {{versio}{versio}}, url = {{url}{url}}, urlseen = {{viitattu}{viitattu}}, -% inpress = {{}{}}, % FIXME: missing % inpreparation = {{}{}}, % FIXME: missing % submitted = {{}{}}, % FIXME: missing +% forthcoming = {{}{}}, % FIXME: missing +% inpress = {{}{}}, % FIXME: missing citedas = {{jatkossa}{jatkossa}}, % thiscite = {{}{}}, % FIXME: missing seenote = {{katso viite}{katso viite}}, @@ -399,9 +400,11 @@ december = {{joulukuuta}{joulukuuta}}, langamerican = {{amerikanenglanti}{amerikanenglanti}}, langbrazilian = {{brasilianportugali}{brasilianportugali}}, +% langcroatian = {{}{}}, % FIXME: missing langdanish = {{tanska}{tanska}}, langdutch = {{hollanti}{hollanti}}, langenglish = {{englanti}{englanti}}, +% langfinnish = {{}{}}, % FIXME: missing langfrench = {{ranska}{ranska}}, langgerman = {{saksa}{saksa}}, langgreek = {{kreikka}{kreikka}}, @@ -409,13 +412,16 @@ langlatin = {{latina}{latina}}, langnorwegian = {{norja}{norja}}, langportuguese = {{portugali}{portugali}}, +% langrussian = {{}{}}, % FIXME: missing langspanish = {{espanja}{espanja}}, langswedish = {{ruotsi}{ruotsi}}, fromamerican = {{englannin kielest\"a}{englannin kielest\"a}}, frombrazilian = {{portugalin kielest\"a}{portugalin kielest\"a}}, +% fromcroatian = {{}{}}, % FIXME: missing fromdanish = {{tanskan kielest\"a}{tanskan kielest\"a}}, fromdutch = {{hollannin kielest\"a}{hollannin kielest\"a}}, fromenglish = {{englannin kielest\"a}{englannin kielest\"a}}, +% fromfinnish = {{}{}}, % FIXME: missing fromfrench = {{ranskan kielest\"a}{ranskan kielest\"a}}, fromgerman = {{saksan kielest\"a}{saksan kielest\"a}}, fromgreek = {{kreikan kielest\"a}{kreikan kielest\"a}}, @@ -423,6 +429,7 @@ fromlatin = {{latinan kielest\"a}{latinan kielest\"a}}, fromnorwegian = {{norjan kielest\"a}{norjan kielest\"a}}, fromportuguese = {{portugalin kielest\"a}{portugalin kielest\"a}}, +% fromrussian = {{}{}}, % FIXME: missing fromspanish = {{espanjan kielest\"a}{espanjan kielest\"a}}, fromswedish = {{ruotsin kielest\"a}{ruotsin kielest\"a}}, countryde = {{Saksa}{DE}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx index 7540b0d1b8d..2d71cfdc745 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx @@ -1,12 +1,9 @@ -% $Id: french.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: french.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{french.lbx} -[\abx@lbxid $Id: french.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@lbxid $Id: french.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] -% Status: -% - Incomplete -% - Translations by non-native speaker; -% this file needs an overhaul! +% Translations by non-native speaker: this file needs an overhaul! \DeclareRedundantLanguages{french}{french} @@ -18,6 +15,7 @@ \def\mkbibordinal{\mkbibmascord}% \protected\def\mkbibmascord{\lbx@fr@ordinal{er}}% \protected\def\mkbibfemord{\lbx@fr@ordinal{re}}% + \protected\def\mkbibneutord{\mkbibmascord}% \protected\def\mkbibdatelong#1#2#3{% \iffieldundef{#3} {} @@ -261,6 +259,9 @@ volumes = {{tomes}{t\adddot}}, jourvol = {{tome}{t\adddot}}, jourser = {{s\'erie}{s\'er\adddot}}, + book = {{livre}{livre}}, +% part = {{}{}}, % FIXME: missing +% issue = {{}{}}, % FIXME: missing newseries = {{nouvelle s\'erie}{nouv\adddot\ s\'er\adddot}}, oldseries = {{ancienne s\'erie}{anc\adddot\ s\'er\adddot}}, edition = {{\'edition}{\'ed\adddot}}, @@ -294,9 +295,10 @@ version = {{version}{version}}, url = {{adresse}{adresse}}, urlseen = {{visit\'e le}{visit\'e le}}, -% inpress = {{}{}}, % FIXME: missing % inpreparation = {{}{}}, % FIXME: missing % submitted = {{}{}}, % FIXME: missing +% forthcoming = {{}{}}, % FIXME: missing +% inpress = {{}{}}, % FIXME: missing citedas = {{d\'esign\'e ci-apr\`es par}{ci-apr\`es}}, % thiscite = {{}{}}, % FIXME: missing seenote = {{voir note}{cf\adddotspace note}}, @@ -334,9 +336,11 @@ december = {{d\'ecembre}{d\'ec\adddot}}, langamerican = {{am\'ericain}{am\'ericain}}, langbrazilian = {{br\'esilien}{br\'esilien}}, + langcroatian = {{croate}{croate}}, langdanish = {{danois}{danois}}, langdutch = {{n\'eerlandais}{n\'eerlandais}}, langenglish = {{anglais}{anglais}}, + langfinnish = {{finnois}{finnois}}, langfrench = {{fran\c{c}ais}{fran\c{c}ais}}, langgerman = {{allemand}{allemand}}, langgreek = {{grec}{grec}}, @@ -344,13 +348,16 @@ langlatin = {{latin}{latin}}, langnorwegian = {{norv\'egien}{norv\'egien}}, langportuguese = {{portugais}{portugais}}, + langrussian = {{russe}{russe}}, langspanish = {{espagnol}{espagnol}}, langswedish = {{su\'edois}{su\'edois}}, fromamerican = {{de l'am\'ericain}{de l'am\'ericain}}, frombrazilian = {{du br\'esilien}{du br\'esilien}}, + fromcroatian = {{du croate}{du croate}}, fromdanish = {{du danois}{du danois}}, fromdutch = {{du n\'eerlandais}{du n\'eerlandais}}, fromenglish = {{de l'anglais}{de l'anglais}}, + fromfinnish = {{du finnois}{du finnois}}, fromfrench = {{du fran\c{c}ais}{du fran\c{c}ais}}, fromgerman = {{de l'allemand}{de l'allemand}}, fromgreek = {{du grec}{du grec}}, @@ -358,6 +365,7 @@ fromlatin = {{du latin}{du latin}}, fromnorwegian = {{du norv\'egien}{du norv\'egien}}, fromportuguese = {{du portugais}{du portugais}}, + fromrussian = {{du russe}{du russe}}, fromspanish = {{de l'espagnol}{de l'espagnol}}, fromswedish = {{du su\'edois}{du su\'edois}}, countryde = {{Allemagne}{DE}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx index 9875e73d1d4..5dec0129a62 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx @@ -1,11 +1,7 @@ -% $Id: german.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: german.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{german.lbx} -[\abx@lbxid $Id: german.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] - -% Status: -% - Complete -% - Translations by native speakers +[\abx@lbxid $Id: german.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \DeclareRedundantLanguages{german}{german,ngerman,austrian,naustrian} @@ -18,6 +14,7 @@ \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}% \protected\def\mkbibmascord{\mkbibordinal}% \protected\def\mkbibfemord{\mkbibordinal}% + \protected\def\mkbibneutord{\mkbibordinal}% \protected\def\mkbibdatelong#1#2#3{% \iffieldundef{#3} {} @@ -313,6 +310,9 @@ volumes = {{B\"ande}{Bde\adddot}}, jourvol = {{Jahrgang}{Jg\adddot}}, jourser = {{Serie}{Ser\adddot}}, + book = {{Buch}{Buch}}, + part = {{Teil}{T.\adddot}}, + issue = {{Ausgabe}{Ausg\adddot}}, newseries = {{neue Folge}{n.\,F\adddot}}, oldseries = {{alte Folge}{a.\,F\adddot}}, edition = {{Auf\noligature lage}{Aufl\adddot}}, @@ -346,9 +346,10 @@ version = {{Version}{Version}}, url = {{Adresse}{Adresse}}, urlseen = {{besucht am}{besucht am}}, - inpress = {{im Druck}{im Druck}}, inpreparation = {{in Vorbereitung}{in Vorbereitung}}, submitted = {{eingereicht}{eingereicht}}, + forthcoming = {{im Erscheinen}{im Erscheinen}}, + inpress = {{im Druck}{im Druck}}, citedas = {{im folgenden zitiert als}{im folgenden zit\adddotspace als}}, thiscite = {{hier}{hier}}, seenote = {{siehe Anmerkung}{s\adddotspace Anm\adddot}}, @@ -386,9 +387,11 @@ december = {{Dezember}{Dez\adddot}}, langamerican = {{Amerikanisch}{Amerikanisch}}, langbrazilian = {{Brasilianisch}{Brasilianisch}}, + langcroatian = {{Kroatisch}{Kroatisch}}, langdanish = {{D\"anisch}{D\"anisch}}, langdutch = {{Niederl\"andisch}{Niederl\"andisch}}, langenglish = {{Englisch}{Englisch}}, + langfinnish = {{Finnisch}{Finnisch}}, langfrench = {{Franz\"osisch}{Franz\"osisch}}, langgerman = {{Deutsch}{Deutsch}}, langgreek = {{Griechisch}{Griechisch}}, @@ -396,13 +399,16 @@ langlatin = {{Lateinisch}{Lateinisch}}, langnorwegian = {{Norwegisch}{Norwegisch}}, langportuguese = {{Portugiesisch}{Portugiesisch}}, + langrussian = {{Russisch}{Russisch}}, langspanish = {{Spanisch}{Spanisch}}, langswedish = {{Schwedisch}{Schwedisch}}, fromamerican = {{aus dem Amerikanischen}{aus dem Amerikanischen}}, frombrazilian = {{aus dem Brasilianischen}{aus dem Brasilianischen}}, + fromcroatian = {{aus dem Kroatischen}{aus dem Kroatischen}}, fromdanish = {{aus dem D\"anischen}{aus dem D\"anischen}}, fromdutch = {{aus dem Niederl\"andischen}{aus dem Niederl\"andischen}}, fromenglish = {{aus dem Englischen}{aus dem Englischen}}, + fromfinnish = {{aus dem Finnischen}{aus dem Finnischen}}, fromfrench = {{aus dem Franz\"osischen}{aus dem Franz\"osischen}}, fromgerman = {{aus dem Deutschen}{aus dem Deutschen}}, fromgreek = {{aus dem Griechischen}{aus dem Griechischen}}, @@ -410,6 +416,7 @@ fromlatin = {{aus dem Lateinischen}{aus dem Lateinischen}}, fromnorwegian = {{aus dem Norwegischen}{aus dem Norwegischen}}, fromportuguese = {{aus dem Portugiesischen}{aus dem Portugiesischen}}, + fromrussian = {{aus dem Russischen}{aus dem Russischen}}, fromspanish = {{aus dem Spanischen}{aus dem Spanischen}}, fromswedish = {{aus dem Schwedischen}{aus dem Schwedischen}}, countryde = {{Deutschland}{DE}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx index 5f0a47fe829..b2682dfaaf3 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx @@ -1,11 +1,7 @@ -% $Id: greek.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: greek.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{greek.lbx} -[\abx@lbxid $Id: greek.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] - -% Status: -% - Incomplete -% - Translations by native speakers +[\abx@lbxid $Id: greek.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] % Translator's notes: % @@ -54,6 +50,7 @@ \protected\def\mkbibordinal{\mkbibmascord}% \protected\def\mkbibmascord#1{\stripzeros{#1}ος}% \protected\def\mkbibfemord#1{\stripzeros{#1}η}% + \protected\def\mkbibneutord{\mkbibmascord}% \savecommand\mkbibmonth \let\mkbibmonth\lbx@gr@mkbibmonth \protected\def\mkbibdatelong#1#2#3{% @@ -310,6 +307,9 @@ volumes = {{τόμοι}{τόμοι}}, jourvol = {{τόμος}{τόμ\adddot}}, jourser = {{σειρά}{σειρά}}, +% book = {{}{}}, % FIXME: missing +% part = {{}{}}, % FIXME: missing +% issue = {{}{}}, % FIXME: missing newseries = {{νέα σειρά}{νέα σειρά}}, oldseries = {{παλαιά σειρά}{παλαιά σειρά}}, edition = {{έκδοση}{έκδοση}}, @@ -347,9 +347,10 @@ version = {{έκδοση}{έκδ\adddot}}, url = {{διεύθυνση}{διεύθν\adddot}}, urlseen = {{επίσκεψη}{επίσκεψη}}, - inpress = {{υπό έκδοση}{υπό έκδ.}}, % inpreparation = {{}{}}, % FIXME: missing submitted = {{υποβληθέν}{υποβληθέν}}, % FIXME: gender? +% forthcoming = {{}{}}, % FIXME: missing + inpress = {{υπό έκδοση}{υπό έκδ.}}, citedas = {{εφεξής θα αναφέρεται ως}{εφεξής θα αναφέρεται ως}}, thiscite = {{αυτή η αναφορά}{αυτή η αναφορά}}, seenote = {{βλέπε σημείωση}{βλ\adddot\ σημ\adddot}}, @@ -408,9 +409,11 @@ datedecember = {{Δεκεμβρίου}{Δεκ\adddot}}, langamerican = {{Αγγλικά}{Αγγλικά}} langbrazilian = {{Βραζιλιάνικα}{Βραζιλιάνικα}}, +% langcroatian = {{}{}}, % FIXME: missing langdanish = {{Δανέζικα}{Δανέζικα}}, langdutch = {{Ολλανδικά}{Ολλανδικά}}, langenglish = {{Αγγλικά}{Αγγλικά}}, +% langfinnish = {{}{}}, % FIXME: missing langfrench = {{Γαλλικά}{Γαλλικά}}, langgerman = {{Γερμανικά}{Γερμανικά}}, langgreek = {{Ελληνικά}{Ελληνικά}}, @@ -418,13 +421,16 @@ langlatin = {{Λατινικά}{Λατινικά}}, langnorwegian = {{Νορβηγικά}{Νορβηγικά}}, langportuguese = {{Πορτογαλικά}{Πορτογαλικά}}, +% langrussian = {{}{}}, % FIXME: missing langspanish = {{Ισπανικά}{Ισπανικά}}, langswedish = {{Σουηδικά}{Σουηδικά}}, fromamerican = {{από τα Αγγλικά}{από τα Αγγλικά}}, frombrazilian = {{από τα Βραζιλιάνικα}{από τα Βραζιλιάνικα}}, +% fromcroatian = {{}{}}, % FIXME: missing fromdanish = {{από τα Δανέζικα}{από τα Δανέζικα}}, fromdutch = {{από τα Ολλανδικά}{από τα Ολλανδικά}}, fromenglish = {{από τα Αγγλικά}{από τα Αγγλικά}}, +% fromfinnish = {{}{}}, % FIXME: missing fromfrench = {{από τα Γαλλικά}{από τα Γαλλικά}}, fromgerman = {{από τα Γερμανικά}{από τα Γερμανικά}}, fromgreek = {{από τα Ελληνικά}{από τα Ελληνικά}}, @@ -432,6 +438,7 @@ fromlatin = {{από τα Λατινικά}{από τα Λατινικά}}, fromnorwegian = {{από τα Νορβηγικά}{από τα Νορβηγικά}}, fromportuguese = {{από τα Πορτογαλικά}{από τα Πορτογαλικά}}, +% fromrussian = {{}{}}, % FIXME: missing fromspanish = {{από τα Ισπανικά}{από τα Ισπανικά}}, fromswedish = {{από τα Σουηδικά}{από τα Σουηδικά}}, countryde = {{Γερμανία}{DE}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx index 593886cb03d..8c293199215 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx @@ -1,12 +1,8 @@ -% $Id: italian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: italian.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{italian.lbx} -[\abx@lbxid $Id: italian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@lbxid $Id: italian.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] -% Status: -% - Incomplete -% - Translations by native speakers -% % Changes: % 2010-11-10 Update by Andrea Marchitelli @@ -20,6 +16,7 @@ \def\mkbibordinal{\mkbibmascord}% \protected\def\mkbibmascord#1{\stripzeros{#1}\textsuperscript{o}}% \protected\def\mkbibfemord#1{\stripzeros{#1}\textsuperscript{a}}% + \protected\def\mkbibneutord{\mkbibmascord}% \protected\def\mkbibdatelong#1#2#3{% \iffieldundef{#3} {} @@ -241,6 +238,9 @@ volumes = {{volumi}{voll\adddot}}, jourvol = {{volume}{vol\adddot}}, jourser = {{serie}{ser\adddot}}, +% book = {{}{}}, % FIXME: missing +% part = {{}{}}, % FIXME: missing +% issue = {{}{}}, % FIXME: missing newseries = {{nuova serie}{nuova ser\adddot}}, oldseries = {{vecchia serie}{vecchia ser\adddot}}, edition = {{edizione}{ed\adddot}}, @@ -274,9 +274,10 @@ version = {{versione}{ver\adddot}}, url = {{indirizzo}{indirizzo}}, urlseen = {{visitato il}{visitato il}}, - inpress = {{in stampa}{in stampa}}, % inpreparation = {{}{}}, % FIXME: missing % submitted = {{}{}}, % FIXME: missing +% forthcoming = {{}{}}, % FIXME: missing + inpress = {{in stampa}{in stampa}}, citedas = {{citato come}{cit\adddotspace come}}, % thiscite = {{}{}}, % FIXME: missing seenote = {{vedi nota}{v\adddotspace nota}}, @@ -314,9 +315,11 @@ december = {{dicembre}{dic\adddot}}, langamerican = {{americano}{americano}}, langbrazilian = {{brasiliano}{brasiliano}}, +% langcroatian = {{}{}}, % FIXME: missing langdanish = {{danese}{danese}}, langdutch = {{olandese}{olandese}}, langenglish = {{inglese}{inglese}}, +% langfinnish = {{}{}}, % FIXME: missing langfrench = {{francese}{francese}}, langgerman = {{tedesco}{tedesco}}, langgreek = {{greco}{greco}}, @@ -324,13 +327,16 @@ langlatin = {{latino}{latino}}, langnorwegian = {{norvegese}{norvegese}}, langportuguese = {{portoghese}{portoghese}}, +% langrussian = {{}{}}, % FIXME: missing langspanish = {{spagnolo}{spagnolo}}, langswedish = {{svedese}{svedese}}, fromamerican = {{dall'americano}{dall'americano}}, frombrazilian = {{dall brasiliano}{dall brasiliano}}, +% fromcroatian = {{}{}}, % FIXME: missing fromdanish = {{dal danese}{dal danese}}, fromdutch = {{dall'olandese}{dall'olandese}}, fromenglish = {{dall'inglese}{dall'inglese}}, +% fromfinnish = {{}{}}, % FIXME: missing fromfrench = {{dal francese}{dal francese}}, fromgerman = {{dal tedesco}{dal tedesco}}, fromgreek = {{dal greco}{dal greco}}, @@ -338,6 +344,7 @@ fromlatin = {{dal latino}{dal latino}}, fromnorwegian = {{dal norvegese}{dal norvegese}}, fromportuguese = {{dall portoghese}{dall portoghese}}, +% fromrussian = {{}{}}, % FIXME: missing fromspanish = {{dallo spagnolo}{dallo spagnolo}}, fromswedish = {{dal svedese}{dal svedese}}, countryde = {{Germania}{DE}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx index f246b2bf3e0..11710a37497 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx @@ -1,11 +1,7 @@ -% $Id: naustrian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: naustrian.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{naustrian.lbx} -[\abx@lbxid $Id: naustrian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] - -% Status: -% - complete -% - translations + peer review by native speakers +[\abx@lbxid $Id: naustrian.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \InheritBibliographyExtras{german} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx index ce483016957..c07f950c106 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx @@ -1,11 +1,7 @@ -% $Id: newzealand.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: newzealand.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{newzealand.lbx} -[\abx@lbxid $Id: newzealand.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] - -% Status: -% - complete -% - peer review pending (see also british.lbx and english.lbx) +[\abx@lbxid $Id: newzealand.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \InheritBibliographyExtras{british} \DeclareBibliographyExtras{% diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx index 3590c99ae54..9c13c6b1e0f 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx @@ -1,11 +1,7 @@ -% $Id: ngerman.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: ngerman.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{ngerman.lbx} -[\abx@lbxid $Id: ngerman.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] - -% Status: -% - complete -% - translations + peer review by native speakers +[\abx@lbxid $Id: ngerman.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \InheritBibliographyExtras{german} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx index 91967cf4d43..e1da25c5388 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx @@ -1,7 +1,7 @@ -% $Id: norsk.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: norsk.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{norsk.lbx} -[\abx@lbxid $Id: norsk.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@lbxid $Id: norsk.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] % Status: % - 'norsk' and 'nynorsk' use the same translations, correct? diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx index b82b96138c2..0e9f8b44ed3 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx @@ -1,11 +1,7 @@ -% $Id: norwegian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: norwegian.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{norwegian.lbx} -[\abx@lbxid $Id: norwegian.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] - -% Status: -% - Incomplete -% - Translations by native speakers +[\abx@lbxid $Id: norwegian.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \DeclareRedundantLanguages{norwegian}{norsk,nynorsk} @@ -17,6 +13,7 @@ \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}% \protected\def\mkbibmascord{\mkbibordinal}% \protected\def\mkbibfemord{\mkbibordinal}% + \protected\def\mkbibneutord{\mkbibordinal}% \protected\def\mkbibdatelong#1#2#3{% \iffieldundef{#3} {} @@ -226,6 +223,9 @@ volumes = {{bind}{bd\adddot}}, jourvol = {{\aa rgang}{\aa g\adddot}}, jourser = {{serie}{ser\adddot}}, +% book = {{}{}}, % FIXME: missing +% part = {{}{}}, % FIXME: missing +% issue = {{}{}}, % FIXME: missing newseries = {{ny serie}{n.\,s\adddot}}, oldseries = {{gammel serie}{g.\,s\adddot}}, edition = {{utgave}{utg\adddot}}, @@ -259,9 +259,10 @@ version = {{versjon}{versjon}}, url = {{side}{side}}, urlseen = {{sjekket}{sjekket}}, -% inpress = {{}{}}, % FIXME: missing % inpreparation = {{}{}}, % FIXME: missing % submitted = {{}{}}, % FIXME: missing +% forthcoming = {{}{}}, % FIXME: missing +% inpress = {{}{}}, % FIXME: missing citedas = {{fremover sitert som}{fremover sit\adddot\ som}}, % thiscite = {{}{}}, % FIXME: missing seenote = {{se notat}{se notat}}, @@ -299,9 +300,11 @@ december = {{desember}{des\adddot}}, langamerican = {{amerikansk}{amerikansk}}, % langbrazilian = {{}{}}, % FIXME: missing +% langcroatian = {{}{}}, % FIXME: missing % langdanish = {{}{}}, % FIXME: missing % langdutch = {{}{}}, % FIXME: missing langenglish = {{engelsk}{engelsk}}, +% langfinnish = {{}{}}, % FIXME: missing langfrench = {{fransk}{fransk}}, langgerman = {{tysk}{tysk}}, langgreek = {{gresk}{gresk}}, @@ -309,13 +312,16 @@ langlatin = {{latin}{latin}}, langnorwegian = {{norsk}{norsk}}, % langportuguese = {{}{}}, % FIXME: missing +% langrussian = {{}{}}, % FIXME: missing langspanish = {{spansk}{spansk}}, % langswedish = {{}{}}, % FIXME: missing fromamerican = {{fra amerikansk}{fra amerikansk}}, % frombrazilian = {{}{}}, % FIXME: missing +% fromcroatian = {{}{}}, % FIXME: missing % fromdanish = {{}{}}, % FIXME: missing % fromdutch = {{}{}}, % FIXME: missing fromenglish = {{fra engelsk}{fra engelsk}}, +% fromfinnish = {{}{}}, % FIXME: missing fromfrench = {{fra fransk}{fra fransk}}, fromgerman = {{fra tysk}{fra tysk}}, fromgreek = {{fra gresk}{fra gresk}}, @@ -323,6 +329,7 @@ fromlatin = {{fra latin}{fra latin}}, fromnorwegian = {{fra norsk}{fra norsk}}, % fromportuguese = {{}{}}, % FIXME: missing +% fromrussian = {{}{}}, % FIXME: missing fromspanish = {{fra spansk}{fra spansk}}, % fromswedish = {{}{}}, % FIXME: missing countryde = {{Tyskland}{DE}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx index f3269df2f97..d24ae383604 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx @@ -1,7 +1,7 @@ -% $Id: nynorsk.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: nynorsk.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{nynorsk.lbx} -[\abx@lbxid $Id: nynorsk.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@lbxid $Id: nynorsk.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] % Status: % - 'norsk' and 'nynorsk' use the same translations, correct? diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx index e045bb38335..d0cb720965e 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuges.lbx @@ -1,7 +1,7 @@ -% $Id: portuges.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: portuges.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{portuges.lbx} -[\abx@lbxid $Id: portuges.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@lbxid $Id: portuges.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \InheritBibliographyExtras{portuguese} \InheritBibliographyStrings{portuguese} diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx index d9dba9a54c2..e0a9ad8a872 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx @@ -1,12 +1,8 @@ -% $Id: portuguese.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: portuguese.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{portuguese.lbx} -[\abx@lbxid $Id: portuguese.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@lbxid $Id: portuguese.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] -% Status: -% - Almost complete -% - Translations by native speakers -% % Changes: % 2010-11-21 Update by Jos\'e Carlos Santos @@ -29,6 +25,7 @@ \stripzeros{#1}\textordmasculine}% \textordmasculine -> textcomp.sty \protected\def\mkbibfemord#1{% \stripzeros{#1}\textordfeminine}% \textordfeminine -> textcomp.sty + \protected\def\mkbibneutord{\mkbibmascord}% \protected\def\mkbibdatelong#1#2#3{% \iffieldundef{#3} {} @@ -316,6 +313,9 @@ volumes = {{volumes}{vols\adddot}}, jourvol = {{volume}{vol\adddot}}, jourser = {{s\'erie}{s\'er\adddot}}, +% book = {{}{}}, % FIXME: missing +% part = {{}{}}, % FIXME: missing +% issue = {{}{}}, % FIXME: missing newseries = {{nova s\'erie}{nova s\'er\adddot}}, oldseries = {{s\'erie antiga}{s\'er\adddot\ antiga}}, edition = {{edi\c{c}\~ao}{ed\adddot}}, @@ -349,9 +349,10 @@ version = {{vers\~ao}{vers\~ao}}, url = {{endere\c{c}o eletr\^onico}{endere\c{c}o}}, urlseen = {{acedido em}{acedido em}}, - inpress = {{na imprensa}{na imp\addot}}, % inpreparation = {{}{}}, % FIXME: missing submitted = {{submetido}{subm\adddot}}, +% forthcoming = {{}{}}, % FIXME: missing + inpress = {{na imprensa}{na imp\addot}}, citedas = {{doravante citado como}{doravante citado como}}, seenote = {{ver nota}{ver nota}}, quotedin = {{apud}{apud}}, @@ -400,9 +401,11 @@ december = {{dezembro}{dez\adddot}}, langamerican = {{ingl\^es}{ingl\^es}}, langbrazilian = {{portugu{\^e}s}{portugu{\^e}s}}, +% langcroatian = {{}{}}, % FIXME: missing langdanish = {{dinamarqu\^es}{dinamarqu\^es}}, langdutch = {{holand{\^e}s}{holand{\^e}s}}, langenglish = {{ingl\^es}{ingl\^es}}, +% langfinnish = {{}{}}, % FIXME: missing langfrench = {{franc\^es}{franc\^es}}, langgerman = {{alem\~ao}{alem\~ao}}, langgreek = {{grego}{grego}}, @@ -410,13 +413,16 @@ langlatin = {{latim}{latim}}, langnorwegian = {{noruegu\^es}{noruegu\^es}}, langportuguese = {{portugu{\^e}s}{portugu{\^e}s}}, +% langrussian = {{}{}}, % FIXME: missing langspanish = {{espanhol}{espanhol}}, langswedish = {{sueco}{sueco}}, fromamerican = {{do ingl\^es}{do ingl\^es}}, frombrazilian = {{do portugu{\^e}s}{do portugu{\^e}s}}, +% fromcroatian = {{}{}}, % FIXME: missing fromdanish = {{do dinamarqu\^es}{do dinamarqu\^es}}, fromdutch = {{do holand{\^e}s}{do holand{\^e}s}}, fromenglish = {{do ingl\^es}{do ingl\^es}}, +% fromfinnish = {{}{}}, % FIXME: missing fromfrench = {{do franc\^es}{do franc\^es}}, fromgerman = {{do alem\~ao}{do alem\~ao}}, fromgreek = {{do grego}{do grego}}, @@ -424,6 +430,7 @@ fromlatin = {{do latim}{do latim}}, fromnorwegian = {{do noruegu\^es}{do noruegu\^es}}, fromportuguese = {{do portugu{\^e}s}{do portugu{\^e}s}}, +% fromrussian = {{}{}}, % FIXME: missing fromspanish = {{do espanhol}{do espanhol}}, fromswedish = {{do sueco}{do sueco}}, countryde = {{Alemanha}{DE}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx new file mode 100644 index 00000000000..bf85e0b5d23 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx @@ -0,0 +1,506 @@ +% $Id: russian.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ + +\ProvidesFile{russian.lbx} +[\abx@lbxid $Id: russian.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] + +\DeclareRedundantLanguages{russian}{russian} + +% This file requires UTF-8 support! + +\lbx@ifutfinput + {} + {\PackageError{biblatex} + {Russian requires UTF-8 support} + {The 'russian.lbx' file requires UTF-8 encoding but you + seem\MessageBreak to be using a different encoding. + This is a fatal error. I will\MessageBreak abort loading + russian.lbx now.}% + \endinput} + +\NewBibliographyString{% + involumes, + candthesis, + datejanuary, + datefebruary, + datemarch, + dateapril, + datemay, + datejune, + datejuly, + dateaugust, + dateseptember, + dateoctober, + datenovember, + datedecember% +} + +\DeclareBibliographyExtras{% + \protected\def\bibrangedash{% + \textendash\penalty\hyphenpenalty}% breakable dash + \protected\def\bibdatedash{% + \addnbthinspace\textendash\addthinspace + \penalty\hyphenpenalty}% breakable dash + \let\finalandcomma=\empty + \protected\def\mkbibordinal#1{\mkbibmascord}% + \protected\def\mkbibmascord#1{#1-й}% + \protected\def\mkbibfemord#1{#1-я}% + \protected\def\mkbibneutord#1{#1-е}% + \protected\def\mkbibdatelong#1#2#3{% + \iffieldundef{#3} + {} + {\stripzeros{\thefield{#3}}% + \iffieldundef{#2}{}{\nobreakspace}}% + \iffieldundef{#2} + {} + {\iffieldundef{#3} + {\mkbibmonth{\thefield{#2}}} + {\lbx@ru@mkbibdatemonth{\thefield{#2}}}% + \iffieldundef{#1}{}{\space}}% + \stripzeros{\thefield{#1}}}% + \protected\def\mkbibdateshort#1#2#3{% + \iffieldundef{#3} + {} + {\mkdatezeros{\thefield{#3}}% + \iffieldundef{#2}{}{\adddot}}% + \iffieldundef{#2} + {} + {\mkdatezeros{\thefield{#2}}% + \iffieldundef{#1}{}{\adddot}}% + \mkdatezeros{\thefield{#1}}}% + \savecommand\mkbibordedition + \savecommand\mkbibordseries + \def\mkbibordedition{\mkbibneutord}% + \def\mkbibordseries{\mkbibfemord}% +} + +\UndeclareBibliographyExtras{% + \restorecommand\mkbibordedition + \restorecommand\mkbibordseries +} + +\DeclareBibliographyStrings{% + bibliography = {{Список литературы}{Список литературы}},%book-like (chapter) + references = {{Список литературы}{Список литературы}},%article-like (section) + shorthands = {{Список сокращений}{Сокращения}}, + editor = {{редактор}{ред\adddot}}, + editors = {{редакторы}{ред\adddot}}, + compiler = {{составитель}{сост\adddot}}, + compilers = {{составители}{сост\adddot}}, + redactor = {{редактор}{ред\adddot}},% FIXME: unsure + redactors = {{редакторы}{ред\adddot}},% FIXME: unsure + reviser = {{ревизионный корректор}{рев. корр\adddot}}, + revisers = {{ревизионные корректоры}{рев. корр\adddot}}, + founder = {{учредитель}{учр\adddot}}, + founders = {{учредители}{учр\adddot}}, + continuator = {{продолжатель}{прод\adddot}}, + continuators = {{продолжатели}{прод\adddot}}, + collaborator = {{участник}{участ\adddot}},% FIXME: unsure + collaborators = {{участники}{участ\adddot}},% FIXME: unsure + translator = {{переводчик}{пер\adddot}}, + translators = {{переводчики}{пер\adddot}}, + commentator = {{комментатор}{комм\adddot}}, + commentators = {{комментаторы}{комм\adddot}}, + annotator = {{составитель примечаний}{сост. прим\adddot}}, + annotators = {{составитель примечаний}{сост. прим\adddot}}, + commentary = {{комментарий}{комм\adddot}}, + annotations = {{примечания}{прим\adddot}}, + introduction = {{введение}{введ\adddot}}, + foreword = {{предисловие}{предисл\adddot}}, + afterword = {{послесловие}{послесл\adddot}}, + 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}}, + editorstrco = {{редакторы, переводчики и комментаторы}% + {ред., пер. и комм\adddot}}, + editortran = {{редактор, переводчик и составитель примечаний}% + {ред., пер. и сост. прим\adddot}}, + editorstran = {{редакторы, переводчики и составители примечаний}% + {ред., пер. и сост. прим\adddot}}, + editortrin = {{редактор, переводчик и автор введения}% + {ред., пер. и авт. введ\adddot}}, + editorstrin = {{редакторы, переводчики и авторы введения}% + {ред., пер. и авт. введ\adddot}}, + editortrfo = {{редактор, переводчик и автор предисловия}% + {ред., пер. и авт. предисл\adddot}}, + editorstrfo = {{редакторы, переводчики и авторы предисловия}% + {ред., пер. и авт. предисл\adddot}}, + editortraf = {{редактор, переводчик и автор послесловия}% + {ред., пер. и авт. послесловия\adddot}}, + editorstraf = {{редакторы, переводчики и авторы послесловия}% + {ред., пер. и авт. послесл\adddot}}, + editorcoin = {{редактор, комментатор и автор введения}% + {ред., комм. и авт. введ\adddot}}, + editorscoin = {{редакторы, комментаторы и автор введения}% + {ред., комм. и авт. введ\adddot}}, + editorcofo = {{редактор, комментатор и автор предисловия}% + {ред., комм. и авт. предисл\adddot}}, + editorscofo = {{редакторы, комментаторы и авторы предисловия}% + {ред., комм. и авт. предисл\adddot}}, + editorcoaf = {{редактор, комментатор и автор послесловия}% + {ред., комм. и авт. послесл\adddot}}, + editorscoaf = {{редакторы, комментаторы и авторы послесловия}% + {ред., комм. и авт. послесл\adddot}}, + editoranin = {{редактор, составитель примечаний и автор введения}% + {ред., сост. прим. и авт. введ\adddot}}, + editorsanin = {{редакторы, составители примечаний и авторы введения}% + {ред., сост. прим. и авт. введ\adddot}}, + editoranfo = {{редактор, составитель примечаний и автор предисловия}% + {ред., сост. прим. и авт. предисл\adddot}}, + editorsanfo = {{редакторы, составители примечаний и авторы предисловия}% + {ред., сост. прим. и авт. предисл\adddot}}, + editoranaf = {{редактор, составитель примечаний и автор послесловия}% + {ред., сост. прим. и авт. послесл\adddot}}, + editorsanaf = {{редакторы, составители примечаний и авторы послесловия}% + {ред., сост. прим. и авт. послесл\adddot}}, + editortrcoin = {{редактор, переводчик, комментатор и автор введения}% + {ред., пер., комм. и авт. введ\adddot}}, + editorstrcoin = {{редакторы, переводчики, комментаторы и авторы введение}% + {ред., пер., комм. и авт. введ\adddot}}, + editortrcofo = {{редактор, переводчик, комментатор и автор предисловия}% + {ред., пер., комм. и авт. предисл\adddot}}, + editorstrcofo = {{редакторы, переводчики, комментаторы и авторы предисловия}% + {ред., пер., комм. и авт. предисл\adddot}}, + editortrcoaf = {{редактор, переводчик, комментатор и автор послесловия}% + {ред., пер., комм. и авт. послесл\adddot}}, + editorstrcoaf = {{редакторы, переводчики, комментаторы и авторы послесловия}% + {ред., пер., комм. и авт. послесл\adddot}}, + editortranin = {{редактор, переводчик, составитель примечаний и автор введения}% + {ред., пер., сост. прим. и авт. введ\adddot}}, + editorstranin = {{редакторы, переводчики, составители примечаний и авторы введение}% + {ред., пер., сост. прим. и авт. введ\adddot}}, + editortranfo = {{редактор, переводчик, составитель примечаний и автор предисловия}% + {ред., пер., сост. прим. и авт. предисл\adddot}}, + editorstranfo = {{редакторы, переводчики, составители примечаний и авторы предисловия}% + {ред., пер., сост. прим. и авт. предисл\adddot}}, + editortranaf = {{редактор, переводчик, составитель примечаний и автор послесловия}% + {ред., пер., сост. прим. и авт. послесл\adddot}}, + editorstranaf = {{редакторы, переводчики, составители примечаний и авторы послесловия}% + {ред., пер., сост. прим. и авт. послесл\adddot}}, + translatorco = {{переводчик и комментатор}% + {пер. и комм\adddot}}, + translatorsco = {{переводчики и комментаторы}% + {пер. и комм\adddot}}, + translatoran = {{переводчик и автор примечаний}% + {пер. и сост. прим\adddot}}, + translatorsan = {{переводчики и составители примечаний}% + {пер. и сост. прим\adddot}}, + translatorin = {{переводчик и автор введения}% + {пер. и авт. введ\adddot}}, + translatorsin = {{переводчики и авторы введения}% + {пер. и авт. введ\adddot}}, + translatorfo = {{переводчик и автор предисловия}% + {пер. и авт. предисл\adddot}}, + translatorsfo = {{переводчики и авторы предисловия}% + {пер. и авт. предисл\adddot}}, + translatoraf = {{переводчик и автор послесловия}% + {пер. и авт. послесл\adddot}}, + translatorsaf = {{переводчики и авторы послесловия}% + {пер. и авт. послесл\adddot}}, + translatorcoin = {{переводчик, составитель комментариев и автор введения}% + {пер., сост. комм. и авт. введ\adddot}}, + translatorscoin = {{переводчики, составители комментариев и авторы введение}% + {пер., сост. комм. и авт. введ\adddot}}, + translatorcofo = {{переводчик, составитель комментариев и автор предисловия}% + {пер., сост. комм. и авт. предисл\adddot}}, + translatorscofo = {{переводчики, составители комментариев и авторы предисловия}% + {пер., сост. комм. и авт. предисл\adddot}}, + translatorcoaf = {{переводчик, составитель комментариев и автор послесловия}% + {пер., сост. комм. и авт. послесл\adddot}}, + translatorscoaf = {{переводчики, составители комментариев и авторы послесловия}% + {пер., сост. комм. и авт. послесл\adddot}}, + translatoranin = {{переводчик, составитель комментариев и автор введения}% + {пер., сост. комм. и авт. введ\adddot}}, + translatorsanin = {{переводчики, составители комментариев и авторы введения}% + {пер., сост. комм. и авт. введ\adddot}}, + translatoranfo = {{переводчик, составитель комментариев и автор предисловия}% + {пер., сост. комм. и авт. предисл\adddot}}, + translatorsanfo = {{переводчики, составители комментариев и авторы предисловия}% + {пер., сост. комм. и авт. предисл\adddot}}, + translatoranaf = {{переводчик, составитель комментариев и автор послесловия}% + {пер., сост. комм. и авт. послесл\adddot}}, + translatorsanaf = {{переводчики, составители комментариев и авторы послесловия}% + {пер., сост. комм. и авт. послесл\adddot}}, + byauthor = {{}{}}, + byeditor = {{под редакцией}{под\addabbrvspace ред\adddot}}, + bycompiler = {{составлено}{сост\adddot}}, + byredactor = {{под редакцией}{под\addabbrvspace ред\adddot}}, + byreviser = {{исправлено}{испр\adddot}}, + byfounder = {{учреждено}{учр\adddot}},% FIXME: unsure + bycontinuator = {{продолжение}{продолж\adddot}},% FIXME: unsure + bycollaborator = {{при участии}{при\addabbrvspace уч\adddot}}, + bytranslator = {{перевод \lbx@lfromlang}{пер. \lbx@sfromlang}}, + bycommentator = {{комментарии}{комм\adddot}}, + byannotator = {{примечания}{прим\adddot}}, + withcommentator = {{с комментариями}{с\addabbrvspace комм\adddot}}, + withannotator = {{с примечаниями}{с\addabbrvspace прим\adddot}}, + withintroduction = {{с введением}{с\addabbrvspace введ\adddot}}, + withforeword = {{с предисловием}{с\addabbrvspace предисл\adddot}}, + withafterword = {{с послесловием}{с\addabbrvspace послесл\adddot}}, + byeditortr = {{перевод \lbx@lfromlang, под редакцией}% + {пер. \lbx@sfromlang, под\addabbrvspace ред\adddotspace}}, + byeditorco = {{под редакцией и с комментариями}% + {под ред. и с\addabbrvspace комм\adddot}}, + byeditoran = {{под редакцией и с примечаниями}% + {под ред. и с\addabbrvspace прим\adddot}}, + byeditorin = {{под редакцией, с введением}% + {под ред., с\addabbrvspace введ\adddot}}, + byeditorfo = {{под редакцией, с предисловием}% + {под ред., с\addabbrvspace предисл\adddot}}, + byeditoraf = {{под редакцией, с послесловием}% + {под ред., с\addabbrvspace послесл\adddot}}, + byeditortrco = {{под редакцией, перевод \lbx@lfromlang и комментарии}% + {под ред., пер. \lbx@sfromlang и комм\adddot}}, + byeditortran = {{под редакцией, перевод \lbx@lfromlang и примечания}% + {под ред., пер. \lbx@sfromlang и прим\adddot}}, + byeditortrin = {{под редакцией, перевод \lbx@lfromlang, введение}% + {под ред., пер. \lbx@sfromlang, введ\adddot}}, + byeditortrfo = {{под редакцией, перевод \lbx@lfromlang, предисловие}% + {под ред., пер. \lbx@sfromlang, предисл\adddot}}, + byeditortraf = {{под редакцией, перевод \lbx@lfromlang, послесловие}% + {под ред. и пер. \lbx@sfromlang, послесл\adddot}}, + byeditorcoin = {{под редакцией, комментарии и введение}% + {под ред., комм. и введ\adddot}}, + byeditorcofo = {{под редакцией, комментарии и предисловие}% + {под ред., комм. и предисл\adddot}}, + byeditorcoaf = {{под редакцией, комментарии и послесловие}% + {под ред., комм. и послесл\adddot}}, + byeditoranin = {{под редакцией, примечания и введение}% + {под ред., прим. и введ\adddot}}, + byeditoranfo = {{под редакцией, примечания и предисловие}% + {под ред., прим. и предисл\adddot}}, + byeditoranaf = {{под редакцией, примечания и послесловие}% + {под ред., прим. и послесл\adddot}}, + byeditortrcoin = {{под редакцией, перевод \lbx@lfromlang, комментарии и введение}% + {под ред., пер. \lbx@sfromlang, комм. и введ\adddot}}, + byeditortrcofo = {{под редакцией, перевод \lbx@lfromlang, комментарии и предисловие}% + {под ред., пер. \lbx@sfromlang, комм. и предисл\adddot}}, + byeditortrcoaf = {{под редакцией, перевод \lbx@lfromlang, комментарии и послесловие}% + {под ред., пер. \lbx@sfromlang, комм. и послесл\adddot}}, + byeditortranin = {{под редакцией, перевод \lbx@lfromlang, примечания и введение}% + {под ред., пер. \lbx@sfromlang, примеч. и введ\adddot}}, + byeditortranfo = {{под редакцией, перевод \lbx@lfromlang, примечания и предисловие}% + {под ред., пер. \lbx@sfromlang, примеч. и предисл\adddot}}, + byeditortranaf = {{под редакцией, перевод \lbx@lfromlang, примечания и послесловие}% + {под ред., пер. \lbx@sfromlang, примеч. и послесл\adddot}}, + bytranslatorco = {{перевод \lbx@lfromlang\ и комментарии}% + {пер. \lbx@sfromlang\ и комм\adddot}}, + bytranslatoran = {{перевод \lbx@lfromlang\ и примечания}% + {пер. \lbx@sfromlang\ и примеч\adddot}}, + bytranslatorin = {{перевод \lbx@lfromlang\ и введение}% + {пер. \lbx@sfromlang\ и введ\adddot}}, + bytranslatorfo = {{перевод \lbx@lfromlang\ и предисловие}% + {пер. \lbx@sfromlang\ и предисл\adddot}}, + bytranslatoraf = {{перевод \lbx@lfromlang\ и послесловие}% + {пер. \lbx@sfromlang\ и и послесл\adddot}}, + bytranslatorcoin = {{перевод \lbx@lfromlang, комментарии и введение}% + {пер. \lbx@sfromlang, комм. и введ\adddot}}, + bytranslatorcofo = {{перевод \lbx@lfromlang, комментарии и предисловие}% + {пер. \lbx@sfromlang, комм. и предисл\adddot}}, + bytranslatorcoaf = {{перевод \lbx@lfromlang, комментарии и послесловие}% + {пер. \lbx@sfromlang, комм. и послесл\adddot}}, + bytranslatoranin = {{перевод \lbx@lfromlang, примечания и введение}% + {пер. \lbx@sfromlang, примеч. и введ\adddot}}, + bytranslatoranfo = {{перевод \lbx@lfromlang, примечания и предисловие}% + {пер. \lbx@sfromlang, примеч. и предисл\adddot}}, + bytranslatoranaf = {{перевод \lbx@lfromlang, примечания и послесловие}% + {пер. \lbx@sfromlang, примеч. и послесл\adddot}}, + and = {{и}{и}}, + andothers = {{и\addabbrvspace др\adddot}{и\addabbrvspace др\adddot}}, + andmore = {{и\addabbrvspace др\adddot}{и\addabbrvspace др\adddot}}, + volume = {{том}{т\adddot}}, + volumes = {{томах}{т\adddot}}, + involumes = {{в}{в}}, + book = {{книга}{кн\adddot}}, + part = {{часть}{ч\adddot}}, + jourvol = {{том}{т\adddot}}, + jourser = {{серия}{сер\adddot}}, +% book = {{}{}}, % FIXME: missing +% part = {{}{}}, % FIXME: missing +% issue = {{}{}}, % FIXME: missing + newseries = {{новая серия}{нов\addabbrvspace сер\adddot}}, + oldseries = {{старая серия}{стар\addabbrvspace сер\adddot}}, + edition = {{издание}{изд\adddot}}, + reprint = {{переиздание}{переизд\adddot}}, + reprintof = {{переиздание}{переизд\adddot}}, + reprintas = {{переиздано как}{переизд. как}}, + page = {{страница}{с\adddot}}, + pages = {{страницы}{с\adddot}}, + column = {{колонка}{кол\adddot}}, + columns = {{колонки}{кол\adddot}}, + line = {{строка}{с\adddot}}, + lines = {{строки}{с\adddot}}, + verse = {{стих}{ст\adddot}}, + verses = {{стихи}{ст\adddot}}, + section = {{параграф}{\S}}, + sections = {{параграфы}{\S\S}}, + paragraph = {{абзац}{абз\adddot}}, + paragraphs = {{абзацы}{абз\adddot}}, + in = {{в}{в}}, + inseries = {{в}{в}}, + ofseries = {{из}{из}}, + number = {{номер}{№}}, + issue = {{выпуск}{вып\adddot}}, + chapter = {{глава}{гл\adddot}}, + mathesis = {{магистерская диссертация}{маг\adddotspace дисс\adddot}}, + phdthesis = {{докторская диссертация}{докт\adddotspace дисс\adddot}}, + candthesis = {{кандидатская диссертация}{канд\adddotspace дисс\adddot}}, + resreport = {{научный отчёт}{науч\adddotspace отч\adddot}}, + techreport = {{технический отчёт}{тех\adddotspace отч\adddot}}, + software = {{программное обеспечение}{прогр\adddotspace обесп\adddot}}, + datacd = {{CD-ROM}{CD-ROM}}, + audiocd = {{audio CD}{audio CD}}, + version = {{версия}{вер\adddot}}, + url = {{адрес}{адр\adddot}}, + urlseen = {{дата обращения}{дата\addabbrvspace обр\adddot}}, + inpreparation = {{в\addabbrvspace подготовке}{в подг\adddot}}, + submitted = {{представлено}{предст\adddot}}, +% forthcoming = {{}{}}, % FIXME: missing + inpress = {{в\addabbrvspace печати}{в печ\adddot}}, + citedas = {{далее цитируется как}{далее цит\adddot}}, + thiscite = {{здесь}{здесь}}, + seenote = {{смотри сноску}{см\adddotspace сн\adddot}}, + quotedin = {{цитируется по}{цит\adddotspace по}}, + idem = {{он\addabbrvspace же}{он\addabbrvspace же}}, + idemsm = {{он\addabbrvspace же}{он\addabbrvspace же}}, + idemsf = {{она\addabbrvspace же}{она\addabbrvspace же}}, + idemsn = {{он\addabbrvspace же}{он\addabbrvspace же}}, + idempm = {{они\addabbrvspace же}{они\addabbrvspace же}}, + idempf = {{они\addabbrvspace же}{они\addabbrvspace же}}, + idempn = {{они\addabbrvspace же}{они\addabbrvspace же}}, + idempp = {{они\addabbrvspace же}{они\addabbrvspace же}}, + ibidem = {{там\addabbrvspace же}{там\addabbrvspace же}}, + opcit = {{цит\adddotspace соч\adddot}{цит\adddotspace соч\adddot}}, + loccit = {{цит\adddotspace мест\adddot}{цит\adddotspace мест\adddot}}, + confer = {{сравни}{ср\adddot}}, + sequens = {{и следующая}{и\addabbrvspace сл\adddot}}, + sequentes = {{и следующие}{и\addabbrvspace сл\adddot}}, + passim = {{всюду}{всюду}}, + see = {{смотри}{см\adddot}}, + seealso = {{смотри также}{см. также}}, + backrefpage = {{цитируется на странице}{цит\adddotspace на\addabbrvspace с\adddot}}, + backrefpages = {{цитируется на страницах}{цит\adddotspace на\addabbrvspace с\adddot}}, + january = {{январь}{янв\adddot}}, + february = {{февраль}{фев\adddot}}, + march = {{март}{мар\adddot}}, + april = {{апрель}{апр\adddot}}, + may = {{май}{май}}, + june = {{июнь}{июн\adddot}}, + july = {{июль}{июл\adddot}}, + august = {{август}{авг\adddot}}, + september = {{сентябрь}{сент\adddot}}, + october = {{октябрь}{окт\adddot}}, + november = {{ноябрь}{ноя\adddot}}, + december = {{декабрь}{дек\adddot}}, + datejanuary = {{января}{янв\adddot}}, + datefebruary = {{февраля}{фев\adddot}}, + datemarch = {{марта}{мар\adddot}}, + dateapril = {{апреля}{апр\adddot}}, + datemay = {{мая}{мая}}, + datejune = {{июня}{июн\adddot}}, + datejuly = {{июля}{июл\adddot}}, + dateaugust = {{августа}{авг\adddot}}, + dateseptember = {{сентября}{сент\adddot}}, + dateoctober = {{октября}{окт\adddot}}, + datenovember = {{ноября}{ноя\adddot}}, + datedecember = {{декабря}{дек\adddot}}, + langamerican = {{американский}{американский}}, + langbrazilian = {{бразильский}{бразильский}}, +% langcroatian = {{}{}}, % FIXME: missing + langdanish = {{датский}{датский}}, + langdutch = {{голландский}{голландский}}, + langenglish = {{английский}{английский}}, +% langfinnish = {{}{}}, % FIXME: missing + langfrench = {{французский}{французский}}, + langgerman = {{немецкий}{немецкий}}, + langgreek = {{греческий}{греческий}}, + langitalian = {{итальянский}{итальянский}}, + langlatin = {{латинский}{латинский}}, + langnorwegian = {{норвежский}{норвежский}}, + langportuguese = {{португальский}{португальский}}, + langrussian = {{русский}{русский}}, + langspanish = {{испанский}{испанский}}, + langswedish = {{шведский}{шведский}}, + fromamerican = {{с американского}{с\addabbrvspace амер\adddot}}, + frombrazilian = {{с бразильского}{с\addabbrvspace браз\adddot}}, +% fromcroatian = {{}{}}, % FIXME: missing + fromdanish = {{с датского}{с\addabbrvspace дат\adddot}}, + fromdutch = {{с нидерландского}{с\addabbrvspace нидерл\adddot}}, + fromenglish = {{с английского}{с\addabbrvspace англ\adddot}}, +% fromfinnish = {{}{}}, % FIXME: missing + fromfrench = {{с французского}{с\addabbrvspace фр\adddot}}, + fromgerman = {{с немецкого}{с\addabbrvspace нем\adddot}}, + fromgreek = {{с греческого}{с\addabbrvspace греч\adddot}}, + fromitalian = {{с итальянского}{с\addabbrvspace ит\adddot}}, + fromlatin = {{с латинского}{с\addabbrvspace лат\adddot}}, + fromnorwegian = {{с норвежского}{с\addabbrvspace норв\adddot}}, + fromportuguese = {{с португальского}{с\addabbrvspace порт\adddot}}, + fromrussian = {{с русского}{с\addabbrvspace русс\adddot}}, + fromspanish = {{с испанского}{с\addabbrvspace исп\adddot}}, + fromswedish = {{со шведского}{со\addabbrvspace швед\adddot}}, + countryde = {{Германия}{DE}}, + countryeu = {{Европейский Союз}{EU}}, + countryep = {{Европейский Союз}{EP}}, + countryfr = {{Франция}{FR}}, + countryuk = {{Великобритания}{GB}}, + countryus = {{Соединённые Штаты Америки}{US}}, + patent = {{патент}{пат\adddot}}, + patentde = {{патент Германии}{пат\adddotspace Германии}}, + patenteu = {{патент Европы}{пат\adddotspace Европы}}, + patentfr = {{патент Франции}{пат\adddotspace Франции}}, + patentuk = {{патент Великобритании}{пат\adddotspace Великобритании}}, + patentus = {{патент США}{пат\adddotspace США}}, + patreq = {{заявка на патент}{заявка на пат\adddot}}, + patreqde = {{заявка на патент Германии}{заявка на пат\adddotspace Германии}}, + patreqeu = {{заявка на патент Европы}{заявка на пат\adddotspace Европы}}, + patreqfr = {{заявка на патент Франции}{заявка на пат\adddotspace Франции}}, + patrequk = {{заявка на патент Великобритании}{заявка на пат\adddotspace Великобритании}}, + patrequs = {{заявка на патент США}{заявка на пат\adddotspace США}}, + file = {{файл}{файл}}, + library = {{библиотека}{библ\adddot}}, + abstract = {{резюме}{рез\adddot}}, + annotation = {{аннотация}{анн\adddot}}, +} + +\protected\gdef\lbx@ru@mkbibdatemonth#1{% + \ifcase0#1\relax + #1\BibliographyWarning{Month out of range}% + \or\abx@bibmonth{datejanuary}% + \or\abx@bibmonth{datefebruary}% + \or\abx@bibmonth{datemarch}% + \or\abx@bibmonth{dateapril}% + \or\abx@bibmonth{datemay}% + \or\abx@bibmonth{datejune}% + \or\abx@bibmonth{datejuly}% + \or\abx@bibmonth{dateaugust}% + \or\abx@bibmonth{dateseptember}% + \or\abx@bibmonth{dateoctober}% + \or\abx@bibmonth{datenovember}% + \or\abx@bibmonth{datedecember}% + \else + #1\BibliographyWarning{Month out of range}% + \fi}% + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx index 32076d14fab..4da696155fe 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx @@ -1,11 +1,7 @@ -% $Id: spanish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: spanish.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{spanish.lbx} -[\abx@lbxid $Id: spanish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] - -% Status: -% - Incomplete -% - Translations by native speakers +[\abx@lbxid $Id: spanish.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] \DeclareRedundantLanguages{spanish}{spanish} @@ -17,6 +13,7 @@ \providecommand*{\sptext}{\textsuperscript}% \sptext -> spanish.ldf (babel) \protected\def\mkbibmascord#1{\stripzeros{#1}\sptext{o}}% \protected\def\mkbibfemord#1{\stripzeros{#1}\sptext{a}}% + \protected\def\mkbibneutord{\mkbibmascord}% \protected\def\mkbibdatelong#1#2#3{% \iffieldundef{#3} {} @@ -251,6 +248,9 @@ volumes = {{vol\'umenes}{vols\adddot}}, jourvol = {{volumen}{vol\adddot}}, jourser = {{\'epoca}{\'ep\adddot}}, +% book = {{}{}}, % FIXME: missing +% part = {{}{}}, % FIXME: missing +% issue = {{}{}}, % FIXME: missing newseries = {{nueva \'epoca}{n\adddotspace\'ep\adddot}}, oldseries = {{antigua \'epoca}{ant\adddotspace\'ep\adddot}}, edition = {{edici\'on}{ed\adddot}}, @@ -284,9 +284,10 @@ version = {{versi\'on}{versi\'on}}, url = {{direcci\'on}{direcci\'on}}, urlseen = {{visitado}{visitado}}, -% inpress = {{}{}}, % FIXME: missing % inpreparation = {{}{}}, % FIXME: missing % submitted = {{}{}}, % FIXME: missing +% forthcoming = {{}{}}, % FIXME: missing +% inpress = {{}{}}, % FIXME: missing citedas = {{citado en adelante como}{cit\adddotspace en adelante como}}, % thiscite = {{}{}}, % FIXME: missing % seenote = {{}{}}, % FIXME: missing @@ -324,9 +325,11 @@ december = {{diciembre}{dic\adddot}}, langamerican = {{americano}{americano}}, langbrazilian = {{brasile\~no}{brasile\~no}}, +% langcroatian = {{}{}}, % FIXME: missing langdanish = {{dan\'es}{dan\'es}}, langdutch = {{neerland\'es}{neerland\'es}}, langenglish = {{ingl\'es}{ingl\'es}}, +% langfinnish = {{}{}}, % FIXME: missing langfrench = {{franc\'es}{franc\'es}}, langgerman = {{alem\'an}{alem\'an}}, langgreek = {{griego}{griego}}, @@ -334,13 +337,16 @@ langlatin = {{lat\'{\i}n}{lat\'{\i}n}}, langnorwegian = {{noruego}{noruego}}, langportuguese = {{portugu\'es}{portugu\'es}}, +% langrussian = {{}{}}, % FIXME: missing langspanish = {{espa\~nol}{espa\~nol}}, langswedish = {{sueco}{sueco}}, fromamerican = {{del americano}{del americano}}, frombrazilian = {{del brasile\~no}{del brasile\~no}}, +% fromcroatian = {{}{}}, % FIXME: missing fromdanish = {{del dan\'es}{del dan\'es}}, fromdutch = {{del neerland\'es}{del neerland\'es}}, fromenglish = {{del ingl\'es}{del ingl\'es}}, +% fromfinnish = {{}{}}, % FIXME: missing fromfrench = {{del franc\'es}{del franc\'es}}, fromgerman = {{del alem\'an}{del alem\'an}}, fromgreek = {{del griego}{del griego}}, @@ -348,6 +354,7 @@ fromlatin = {{del lat\'{\i}n}{del lat\'{\i}n}}, fromnorwegian = {{del noruego}{del noruego}}, fromportuguese = {{del portugu\'es}{del portugu\'es}}, +% fromrussian = {{}{}}, % FIXME: missing fromspanish = {{del espa\~nol}{del espa\~nol}}, fromswedish = {{del sueco}{del sueco}}, countryde = {{Alemania}{DE}}, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx index 918fa07b1a5..142add75a02 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx @@ -1,12 +1,8 @@ -% $Id: swedish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $ +% $Id: swedish.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $ \ProvidesFile{swedish.lbx} -[\abx@lbxid $Id: swedish.lbx,v 1.6 2011/07/29 19:21:28 lehman stable $] +[\abx@lbxid $Id: swedish.lbx,v 1.7 2011/11/13 19:09:07 lehman stable $] -% Status: -% - Incomplete -% - Translations by native speakers -% % Changes: % 2009-03-02 Update by Per Starb\"ack % @@ -52,6 +48,7 @@ % \endgroup}% \protected\def\mkbibmascord{\mkbibordinal}% \protected\def\mkbibfemord{\mkbibordinal}% + \protected\def\mkbibneutord{\mkbibordinal}% \protected\def\mkbibdatelong#1#2#3{% \iffieldundef{#3} {} @@ -276,6 +273,9 @@ volumes = {{volymer}{vol\adddot}}, jourvol = {{\aa rg\aa ng}{\aa rg\adddot}}, jourser = {{serie}{ser\adddot}}, +% book = {{}{}}, % FIXME: missing +% part = {{}{}}, % FIXME: missing +% issue = {{}{}}, % FIXME: missing % Both "ny serie (N.S.)" and "ny f\"oljd (N.F.)" are common newseries = {{ny f\"oljd}{N.\,F\adddot}}, oldseries = {{gammal f\"oljd}{gammal f\"oljd}}, @@ -318,9 +318,10 @@ version = {{version}{version}}, url = {{webbadress}{URL}}, urlseen = {{senast h\"amtad}{h\"amtad}}, -% inpress = {{}{}}, % FIXME: missing % inpreparation = {{}{}}, % FIXME: missing % submitted = {{}{}}, % FIXME: missing +% forthcoming = {{}{}}, % FIXME: missing +% inpress = {{}{}}, % FIXME: missing citedas = {{h\"adanefter citerad som}{h\"adanefter cit\adddotspace som}}, % thiscite = {{}{}}, % FIXME: missing seenote = {{se not}{se not}}, @@ -358,9 +359,11 @@ december = {{december}{dec\adddot}}, langamerican = {{amerikanska}{amerikanska}}, % langbrazilian = {{}{}}, % FIXME: missing +% langcroatian = {{}{}}, % FIXME: missing langdanish = {{danska}{danska}}, % langdutch = {{}{}}, % FIXME: missing langenglish = {{engelska}{engelska}}, +% langfinnish = {{}{}}, % FIXME: missing langfrench = {{franska}{franska}}, langgerman = {{tyska}{tyska}}, langgreek = {{grekiska}{grekiska}}, @@ -368,13 +371,16 @@ langlatin = {{latin}{latin}}, langnorwegian = {{norska}{norska}}, % langportuguese = {{}{}}, % FIXME: missing +% langrussian = {{}{}}, % FIXME: missing langspanish = {{spanska}{spanska}}, langswedish = {{svenska}{svenska}}, fromamerican = {{fr\aa n amerikanska}{fr\aa n amerikanska}}, % frombrazilian = {{}{}}, % FIXME: missing +% fromcroatian = {{}{}}, % FIXME: missing fromdanish = {{fr\aa n danska}{fr\aa n danska}}, % fromdutch = {{}{}}, % FIXME: missing fromenglish = {{fr\aa n engelska}{fr\aa n engelska}}, +% fromfinnish = {{}{}}, % FIXME: missing fromfrench = {{fr\aa n franska}{fr\aa n franska}}, fromgerman = {{fr\aa n tyska}{fr\aa n tyska}}, fromgreek = {{fr\aa n grekiska}{fr\aa n grekiska}}, @@ -382,6 +388,7 @@ fromlatin = {{fr\aa n latin}{fr\aa n latin}}, fromnorwegian = {{fr\aa n norska}{fr\aa n norska}}, % fromportuguese = {{}{}}, % FIXME: missing +% fromrussian = {{}{}}, % FIXME: missing fromspanish = {{fr\aa n spanska}{fr\aa n spanska}}, fromswedish = {{fr\aa n svenska}{fr\aa n svenska}}, countryde = {{Tyskland}{DE}}, |