diff options
author | Karl Berry <karl@freefriends.org> | 2013-07-11 23:24:58 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-07-11 23:24:58 +0000 |
commit | b566914cb449cd85779f6346019604feb6c1a09f (patch) | |
tree | d035f6fcce2869d6b8cab3bd15b83aafd5149bac /Master/texmf-dist/tex/latex/biblatex-apa | |
parent | cd19244f37a468b37244a760a0025106e326c9d3 (diff) |
biblatex-apa (11jul13)
git-svn-id: svn://tug.org/texlive/trunk@31164 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-apa')
19 files changed, 162 insertions, 33 deletions
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 Binary files differindex 5d48130edab..6094f7fd8d0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx 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 |