From b566914cb449cd85779f6346019604feb6c1a09f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 11 Jul 2013 23:24:58 +0000 Subject: biblatex-apa (11jul13) git-svn-id: svn://tug.org/texlive/trunk@31164 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/biblatex-apa/README | 2 +- .../biblatex-apa/biblatex-apa-test-citations.bib | 64 +++++++++- .../biblatex-apa/biblatex-apa-test-references.bib | 4 +- .../doc/latex/biblatex-apa/biblatex-apa-test.pdf | Bin 101695 -> 110673 bytes .../doc/latex/biblatex-apa/biblatex-apa-test.tex | 20 +++- .../doc/latex/biblatex-apa/biblatex-apa.pdf | Bin 76523 -> 76124 bytes .../doc/latex/biblatex-apa/biblatex-apa.tex | 10 +- .../tex/latex/biblatex-apa/american-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 26 ++--- Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx | 9 +- Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx | 2 +- .../tex/latex/biblatex-apa/austrian-apa.lbx | 2 +- .../tex/latex/biblatex-apa/brazilian-apa.lbx | 2 +- .../tex/latex/biblatex-apa/british-apa.lbx | 2 +- .../tex/latex/biblatex-apa/dutch-apa.lbx | 2 +- .../tex/latex/biblatex-apa/french-apa.lbx | 2 +- .../tex/latex/biblatex-apa/german-apa.lbx | 2 +- .../tex/latex/biblatex-apa/greek-apa.lbx | 2 +- .../tex/latex/biblatex-apa/italian-apa.lbx | 2 +- .../tex/latex/biblatex-apa/naustrian-apa.lbx | 2 +- .../tex/latex/biblatex-apa/ngerman-apa.lbx | 2 +- .../tex/latex/biblatex-apa/norsk-apa.lbx | 2 +- .../tex/latex/biblatex-apa/norwegian-apa.lbx | Bin 4540 -> 4540 bytes .../tex/latex/biblatex-apa/nynorsk-apa.lbx | 2 +- .../tex/latex/biblatex-apa/spanish-apa.lbx | 2 +- .../tex/latex/biblatex-apa/swedish-apa.lbx | 130 +++++++++++++++++++++ 26 files changed, 254 insertions(+), 41 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README index c1364cc9344..8f6b7512e66 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/README +++ b/Master/texmf-dist/doc/latex/biblatex-apa/README @@ -1,4 +1,4 @@ -Version 5.9 +Version 6.0 Permission is granted to copy, distribute and/or modify this software under the terms of the LaTeX Project Public License, version diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib index 6d60469cbf2..7c10adbf771 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib @@ -1,6 +1,6 @@ % (APA 6.11) @BOOK{6.11, - AUTHOR = {Kessler, Jr., A}, + AUTHOR = {Kessler, Jr., A.}, TITLE = {Title}, YEAR = {2003}, } @@ -412,3 +412,65 @@ PAGES = {1-17}, DATE = {1906} } + +% Suffix test for first-last (editor) +@INCOLLECTION{stest1, + AUTHOR = {Gring, III, Alan J.}, + EDITOR = {Greaves, Jr., Percy L.}, + TITLE = {A test of suffix 1}, + DATE = {1968}, + LOCATION = {New York, NY}, + PUBLISHER = {Wiley}, + PAGES = {1--34} +} + +% Suffix test for first-last (editor) +@INCOLLECTION{stest2, + EDITOR = {Greaves, Jr., Percy L.}, + TITLE = {A test of suffix 2}, + DATE = {1968}, + LOCATION = {New York, NY}, + PUBLISHER = {Wiley}, + PAGES = {1--34} +} + +% Don't forget that useprefix=false doesn't ignore the prefix completely - it is still used in +% hash and uniqueness generation and so there are two different "Greaves" here - one von and one not +% Prefix test (useprefix=true) +@BOOK{pretest, + AUTHOR = {Luis von Mises}, + TITLE = {A Title}, + YEAR = {2000} +} + +% Prefix test (useprefix=false) +@MISC{nopretest, + OPTIONS = {useprefix=false}, + AUTHOR = {Luis von Mises}, + TITLE = {Another Title}, + YEAR = {2001} +} + +% Prefix + suffix test (useprefix=true) first-last +@INCOLLECTION{presufftest, + EDITOR = {von Greaves, Jr., Percy L.}, + TITLE = {A test of prefix 2}, + DATE = {1969}, +} + +% Prefix + suffix test (useprefix=false) +@MISC{nopresufftest, + OPTIONS = {useprefix=false}, + AUTHOR = {von Greaves, Jr., Percy L.}, + TITLE = {A test of noprefix 2}, + TITLE = {Another Title}, + YEAR = {2001} +} + +% Prefix + suffix test (useprefix=true) +@BOOK{presufftest2, + AUTHOR = {von Greaves, Jr., Percy L.}, + TITLE = {A test of noprefix 2}, + TITLE = {Another Title}, + YEAR = {2001} +} diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib index f853ddbf31a..64abca9ba5e 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib @@ -26,7 +26,7 @@ % (APA 7.01 Example 3) @ARTICLE{7.01:3a, AUTHOR = {T. J. Sillick and N. S. Schutte}, - TITLE = {Emotional Intelligence and Self-esteem Mediate Between Perceived Early Parental Love and Adult Happiness.}, + TITLE = {Emotional Intelligence and Self-esteem Mediate Between Perceived Early Parental Love and Adult Happiness}, JOURNALTITLE = {E-Journal of Applied Psychology}, VOLUME = {2}, NUMBER = {2}, @@ -49,7 +49,7 @@ @ARTICLE{7.01:4, AUTHOR = {P. Guimard and A. Florin}, ORIGTITLE = {Les évaluations des enseignants en grande section de maternelle sont-elles prédictives des difficultés de lecture au cours préparatoire?}, - TITLE = {Are Teacher Ratings in Kindergarten Predictive of Reading Dificulties in First Grade?}, + TITLE = {Are Teacher Ratings in Kindergarten Predictive of Reading Difficulties in First Grade?}, JOURNALTITLE = {Approche Neuropsychologique des Apprentissages chez l'Enfant}, VOLUME = {19}, PAGES = {5--17}, diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf index 7282e3b747f..cc4d3fe60b6 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf and b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex index 45c5ad7b3d4..7141db656aa 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex @@ -18,7 +18,7 @@ \usepackage[style=apa]{biblatex} % Custom settings for misc entries in order to format the table for 6.13* -% This table implies that the examples on each line are in a seperate +% This table implies that the examples on each line are in a separate % document but since we are generating the citations from a real data % source, we have to prevent the usual uniquelist processing by making % all of the examples MISC entrytypes and changing uniquelist @@ -366,6 +366,22 @@ these appear in references\\ \apaex{\textcite{6.27a}}\\ \apaex{\textcite{6.27b}} +\noindent Testing suffices\\ +\apaex{\textcite{stest1}}\\ +\apaex{\textcite{stest2}} + +\noindent Testing prefices\\ +\apaex{\textcite{pretest}}\\ +\apaex{\textcite{nopretest}} + +% presufftest2 and nopresufftest have same year but don't have extrayear +% because useprefix=false for MISC and this is taken account of in +% extrayear generation +\noindent Testing prefices plus suffices\\ +\apaex{\textcite{presufftest}}\\ +\apaex{\textcite{presufftest2}}\\ +\apaex{\textcite{nopresufftest}} + \end{refsection} \begin{refsection}[biblatex-apa-test-references] \nocite{*} @@ -376,5 +392,5 @@ these appear in references\\ \newpage % Include a references section for citation examples just so hyperref % targets can be checked -\printbibliography[section=1,title=Misc citation references for checking hyperref targets] +\printbibliography[section=1,title=Misc citation references] \end{document} diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf index 6ed3a853e90..aeb19cf34d4 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf and b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex index 2043635d231..078ea0e5114 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex @@ -25,7 +25,7 @@ url={http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-apa/}, author={Philip Kime}, email={Philip@kime.org.uk}, - revision={5.9}, + revision={6.0}, date={\today}} \hypersetup{% @@ -158,7 +158,8 @@ Greek localisation. Thanks to Erikson Kaszubowski for the Brazilian localisation. Thanks to Braulio José Solano Rojas for the Spanish localisation. Thanks to Stefan Mayer for the |subtitlepunct| suggestion. Thanks to Håkon Malmedal for the Norwegian localisation. Thanks to -Johann Gründl for the Austrian localisation. +Johann Gründl for the Austrian localisation. Thanks to Svante Kvarnström +for the Swedish localisation. \section{Use}\label{ref:use} \label{use} @@ -373,6 +374,11 @@ general notes: \begin{changelog} +\begin{release}{6.0}{2013-07-10} +\item Added Swedish localisation +\item Fixed useprefix=false issue +\end{release} + \begin{release}{5.9}{2013-05-08} \item Compatibility with |biblatex| 2.6--«nodate» is now part of core \item autocite is set to inline diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx index d00cb46c681..72ee51c5885 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{american-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation] +\ProvidesFile{american-apa.lbx}[2013/07/09\space v6.0\space APA biblatex localisation] \InheritBibliographyExtras{american} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index 0ccedb54c6d..7e1c9bd9b1f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa.bbx}[2013/03/20\space v5.9\space APA biblatex references style] +\ProvidesFile{apa.bbx}[2013/07/09\space v6.0\space APA biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text @@ -362,8 +362,8 @@ \ifnameundef{with} {} {\setunit{}\addspace\mkbibparens{\printtext{\bibstring{with}\addspace}% - \printnames[apaauthor][-\value{listtotal}]{with}} - \setunit*{\addspace}}}% + \printnames[apaauthor][-\value{listtotal}]{with}} + \setunit*{\addspace}}}% \newunit\newblock% \usebibmacro{labelyear+extrayear}} @@ -663,7 +663,7 @@ {\usebibmacro{name:delim}{#4#1}% \usebibmacro{name:hook}{#4#1}% \ifblank{#4}{}{% - \mkbibnameprefix{#4\isdot}% + \mkbibnameprefix{#4}% \ifpunctmark{'}{}{\addhighpenspace}}% \mkbibnamelast{#1\isdot}% \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#3}\isdot% @@ -675,12 +675,13 @@ \usebibmacro{name:hook}{#1}% \mkbibnamelast{#1}\isdot \ifblank{#2#4}{}{\addcomma}% - \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}% - \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#3}\isdot% + \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#3}% \ifthenelse{\value{uniquename}>1} {\addspace\mkbibbrackets{#2}} {}}% - \ifblank{#4}{}{\addlowpenspace\mkbibnameprefix{#4}\isdot}% + \ifblank{#4}{}{% + \addhighpenspace\mkbibnameprefix{#4}% + \ifpunctmark{'}{}{\addhighpenspace}}% \ifblank{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}} \newbibmacro*{name:apa:first-last}[5]{% @@ -695,17 +696,14 @@ \mkbibnameprefix{#4\isdot}% \ifpunctmark{'}{}{\addhighpenspace}}% \mkbibnamelast{#1\isdot}% - \ifblank{#5}{}{\mkbibnameaffix{#5}\isdot}} + \ifblank{#5}{}{\addlowpenspace\mkbibnameaffix{#5}\isdot}} {\usebibmacro{name:delim}{#1}% \usebibmacro{name:hook}{#1}% - \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#3}\isdot% + \ifblank{#2}{}{\mkbibnamefirst{#3}\isdot% \ifthenelse{\value{uniquename}>1} {\addspace\mkbibbrackets{#2}} {}\addspace}% \mkbibnamelast{#1}\isdot - \ifblank{#2#4}{}{\addcomma}% - \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}% - \ifblank{#4}{}{\addlowpenspace\mkbibnameprefix{#4}\isdot}% \ifblank{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}} % @@ -977,7 +975,7 @@ % (APA 7.06) Reviews % The title of the review depends on the entrytype of the thing reviewed -\DeclareFieldFormat[review]{title}{ +\DeclareFieldFormat[review]{title}{% \entrydata*{\thefield{related}}{% \iffieldequalstr{entrytype}{article} {\mkbibemph{\printtext[apacase]{\thefield{savedtitle}}}} @@ -1383,7 +1381,7 @@ \newunit\newblock \usebibmacro{location+publisher}% \setunit{\addcomma\addspace}% - \printtext{\printfield{number}}% + \printfield{number}% \newunit\newblock \printfield{series}% \newunit\newblock diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index f3c49e42f49..6426e59b343 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx @@ -25,7 +25,7 @@ %% biblatex-apa-test-citations.bib (Style examples - citations) %% biblatex-apa-test-references.bib (Style examples - references) -\ProvidesFile{apa.cbx}[2013/03/20\space v5.9\space APA biblatex citation style] +\ProvidesFile{apa.cbx}[2013/07/09\space v6.0\space APA biblatex citation style] \RequireBiber[3] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -79,6 +79,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.11) Suffices are not shown in citations % (APA 6.12) 3-5 authors have "et al." after first cite % #1 = last name @@ -92,11 +93,11 @@ \newbibmacro*{labelname:doname}[8]{% \ifcase\value{uniquename}% - \usebibmacro{name:last}{#1}{#3}{#5}{#7}% + \usebibmacro{name:last}{#1}{#3}{#5}{}% \or - \usebibmacro{name:first-last}{#1}{#4}{#5}{#8}% + \usebibmacro{name:first-last}{#1}{#4}{#5}{}% \or - \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}% + \usebibmacro{name:first-last}{#1}{#3}{#5}{}% \fi \usebibmacro{name:andothers}} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx index 22ff3690a95..415a36c7ac1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx @@ -25,7 +25,7 @@ %% biblatex-apa-test-citations.bib (Style examples - citations) %% biblatex-apa-test-references.bib (Style examples - references) -\ProvidesFile{apa.dbx}[2013/03/20\space v5.9\space APA biblatex style data model] +\ProvidesFile{apa.dbx}[2013/07/09\space v6.0\space APA biblatex style data model] \RequireBiber[3] \DeclareDatamodelEntrytypes{ diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx index 0ae5a09ffba..8af21772da7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{austrian-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation] +\ProvidesFile{austrian-apa.lbx}[2013/07/09\space v6.0\space APA biblatex localisation] \InheritBibliographyExtras{austrian} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx index 30aa24ee6b8..c270ba2e9f0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{brazilian-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation] +\ProvidesFile{brazilian-apa.lbx}[2013/07/09\space v6.0\space APA biblatex localisation] \InheritBibliographyExtras{brazilian} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx index 7455ecafcd8..dafb0994f7b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{british-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation] +\ProvidesFile{british-apa.lbx}[2013/07/09\space v6.0\space APA biblatex localisation] \InheritBibliographyExtras{british} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx index d363c9c620c..5056ac456e1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{dutch-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation] +\ProvidesFile{dutch-apa.lbx}[2013/07/09\space v6.0\space APA biblatex localisation] \InheritBibliographyExtras{dutch} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx index 3d2e915d425..25cf6a39699 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{french-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation] +\ProvidesFile{french-apa.lbx}[2013/07/09\space v6.0\space APA biblatex localisation] \InheritBibliographyExtras{french} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx index aa0d74da277..d90e62e0cf2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{german-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation] +\ProvidesFile{german-apa.lbx}[2013/07/09\space v6.0\space APA biblatex localisation] \InheritBibliographyExtras{german} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx index 5fc34d9b417..7ffe0b5dfdb 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{greek-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation] +\ProvidesFile{greek-apa.lbx}[2013/07/09\space v6.0\space APA biblatex localisation] \InheritBibliographyExtras{greek} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx index 92ed1abc695..9284547538e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{italian-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation] +\ProvidesFile{italian-apa.lbx}[2013/07/09\space v6.0\space APA biblatex localisation] \InheritBibliographyExtras{italian} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx index b84a4c87db0..16f9e75a2ef 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{naustrian-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation] +\ProvidesFile{naustrian-apa.lbx}[2013/07/09\space v6.0\space APA biblatex localisation] \InheritBibliographyExtras{naustrian} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx index 9a6511b0cf4..abf67ff3bf1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{ngerman-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation] +\ProvidesFile{ngerman-apa.lbx}[2013/07/09\space v6.0\space APA biblatex localisation] \InheritBibliographyExtras{ngerman} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx index 5c9d86e0960..e712c92ad56 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{norsk-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation] +\ProvidesFile{norsk-apa.lbx}[2013/07/09\space v6.0\space APA biblatex localisation] \InheritBibliographyExtras{norsk} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx index 5d48130edab..6094f7fd8d0 100644 Binary files a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx and b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx differ diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx index 6abb2547d7d..e3bb3d0f7d2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{nynorsk-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation] +\ProvidesFile{nynorsk-apa.lbx}[2013/07/09\space v6.0\space APA biblatex localisation] \InheritBibliographyExtras{nynorsk} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx index d7c59f36c5b..69748c9fabc 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{spanish-apa.lbx}[2013/03/20\space v5.9\space APA biblatex localisation] +\ProvidesFile{spanish-apa.lbx}[2013/07/09\space v6.0\space APA biblatex localisation] \InheritBibliographyExtras{spanish} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx new file mode 100644 index 00000000000..3507fa31229 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx @@ -0,0 +1,130 @@ +\ProvidesFile{swedish-apa.lbx}[2013/07/09\space v6.0\space APA biblatex localisation] +\InheritBibliographyExtras{swedish} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{nodate} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {swedish}, + revisededition = {{reviderad\space utg{\aa}va}{rev\adddotspace utg\adddot}}, + page = {{sida}{{}s\adddot}}, + pages = {{sidor}{{}s\adddot}}, + on = {{p{\aa}}{p{\aa}}}, + retrieved = {{h\"amtad}{h\"amtad}}, + available = {{tillg\"anglig}{tillg\"anglig}}, + from = {{fr{\aa}n}{fr{\aa}n}}, + archivedat = {{arkiverat\space vid}{arkiverat\space vid}}, + nodate = {{utan\space {\aa}r}{u\adddot~{\aa}}}, + reviewof = {{granskning\space av}{granskning\space av}}, + producer = {{producent}{producent}}, + execproducer = {{exekutiv\space producent}{exekutiv\space producent}}, + director = {{regiss\"or}{regiss\"or}}, + editor = {{redakt\"or}{red\adddot}}, + editors = {{redakt\"or}{red\adddot}}, + writer = {{manus}{manus}}, + with = {{med}{med}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + january = {{januari}{januari}}, + february = {{februari}{februari}}, + march = {{mars}{mars}}, + april = {{april}{april}}, + may = {{maj}{maj}}, + june = {{juni}{juni}}, + july = {{juli}{juli}}, + august = {{augusti}{augusti}}, + september = {{september}{september}}, + october = {{oktober}{oktober}}, + november = {{november}{november}}, + december = {{december}{december}}, + mathesis = {{examensuppsats}{examensuppsats}}, + phdthesis = {{doktorsavhandling}{doktorsavhandling}}, + origyear = {{originalarbete\space publicerat}{originalarbete\space publicerat}}, + typechair = {{ordf\"orande}{ordf\"orande}}, + typechairs = {{ordf\"oranden}{ordf\"oranden}}, + typevolume = {{redakt\"or}{red\adddot}}, + typevolumes = {{redakt\"orer}{red\adddot}}, + typeseries = {{redakt\"or}{red\adddot}}, + typeseriess = {{redakt\"orer}{red\adddot}}, + typevolseries = {{redakt\"or}{red\adddot}}, + typevolseriess = {{redakt\"orer}{red\adddot}}, +} + + +\DefineBibliographyExtras{swedish}{% + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#1}% + {}% + {\thefield{#1}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + \iffieldundef{#1}% + {}% + {\thefield{#1}\printfield{extrayear}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \thefield{#1}}}} + +\endinput -- cgit v1.2.3