From 6938aedf350efef74b717a3d85fff2e9214cb745 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 17 Oct 2010 22:09:46 +0000 Subject: biblatex-apa (17oct10) git-svn-id: svn://tug.org/texlive/trunk@20129 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/biblatex-apa/README | 2 +- .../doc/latex/biblatex-apa/biblatex-apa-test.pdf | Bin 113903 -> 111715 bytes .../doc/latex/biblatex-apa/biblatex-apa-test.tex | 16 ++- .../doc/latex/biblatex-apa/biblatex-apa.pdf | Bin 144564 -> 144637 bytes .../doc/latex/biblatex-apa/biblatex-apa.tex | 12 +- .../tex/latex/biblatex-apa/dutch-apa.lbx | 125 +++++++++++++++++++++ .../tex/latex/biblatex-apa/french-apa.lbx | 2 +- 7 files changed, 142 insertions(+), 15 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README index ec7f0f2b9d5..996f8508fba 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/README +++ b/Master/texmf-dist/doc/latex/biblatex-apa/README @@ -1,4 +1,4 @@ -Version 2.0 +Version 2.1 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.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf index 65761c8fce9..86609f5ffdd 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 ec3faa2a575..db5216bd019 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 @@ -1,10 +1,11 @@ -\documentclass{article} +\documentclass[paper=a4]{article} \usepackage[american]{babel} \usepackage{csquotes} \usepackage{shortvrb} \usepackage{ifthen} \usepackage{color} \usepackage[retainmissing]{MnSymbol} +\usepackage[top=2.5cm]{geometry} % Unicode \usepackage{fontspec} @@ -38,9 +39,7 @@ \DeclareLanguageMapping{american}{american-apa} \begin{document} - \section*{|biblatex-apa| style examples} - This file typesets just about all useful examples from \apa{6.11}--\apa{6.21} and \apa{7.01}--\apa{7.11}. Please refer to the |biblatex-apa-test-references.bib| file for details on the references @@ -210,7 +209,7 @@ Two or more works withing the same parentheses:\\ \noindent\apa{6.17}\\ Secondary sources:\\ -\apaex{\parencite[as cited in][]{6.17}}\\ +\apaex{\parencite[as cited in][]{6.17}} \noindent\apa{6.18}\\ Classical works:\\ @@ -229,7 +228,7 @@ they wouldn't usually be in the References section anyway. \noindent\apa{6.19}\\ These examples are easily dealt with using standard |biblatex| functionality.\\ \apaex{\parencite[][10]{6.19a}}\\ -\apaex{\parencite[][Chapter 3]{6.19b}}\\ +\apaex{\parencite[][Chapter 3]{6.19b}} \noindent\apa{6.20}\\ Such cases are just typed out--they have no Reference section entry and @@ -245,17 +244,16 @@ See the |biblatex-apa| docs.\\ Entries with no date use ``n.d.''.\\ \apaex{\textcite{6.28a}}\\ \apaex{\parencite{6.28a}}\\ -\apaex{(\nptextcite{6.28a})}\\ +\apaex{(\nptextcite{6.28a})} \noindent\apa{7.01:12c}\\ Issue with no editors\\ -\apaex{\parencite{7.01:12c}}\\ +\apaex{\parencite{7.01:12c}} \noindent\apa{A7.07}\\ A patent citation uses the title but with no quotes\\ \apaex{\textcite{A7.07}}\\ -\apaex{\parencite{A7.07}}\\ - +\apaex{\parencite{A7.07}} \newpage \nocite{*} 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 6e672da8858..d645bdc58b0 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 87fcd44db45..727e2488013 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex @@ -23,7 +23,7 @@ url={http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-apa/}, author={Philip Kime}, email={Philip@kime.org.uk}, - revision={2.0}, + revision={2.1}, date={\today}} \hypersetup{% @@ -98,9 +98,9 @@ limitations are described below and will be addressed in a future \subsection{Acknowledgments} -I wished I could acknowledge someone as then this wouldn't have been such a -huge piece of work \ldots\ thanks to Philipp Lehman for \sty{biblatex} which -really has been a major advance over pure \bibtex. +Thanks to Philipp Lehman for \sty{biblatex} which really has been a major +advance over pure \bibtex. Thanks to Alexander van Loon for the Dutch +localisation. \section{Use}\label{ref:use} \label{use} @@ -329,6 +329,10 @@ to see how it was implemented. Some general notes: \begin{changelog} +\begin{release}{2.1}{2010-10-17} +\item New Dutch localisation (thanks to Alexander van Loon) +\end{release} + \begin{release}{2.0}{2010-09-30} \item Moved to new date format code internally \end{release} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx new file mode 100644 index 00000000000..94c63729525 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx @@ -0,0 +1,125 @@ +\ProvidesFile{dutch-apa.lbx} +\InheritBibliographyExtras{dutch} + +% (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} + +\DeclareBibliographyStrings{% + inherit = {dutch}, + revisededition = {{Herziene\space editie}{Herz\adddotspace ed\adddot}}, + page = {{Pagina}{{}p\adddot}}, + pages = {{Pagina's}{{}pp\adddot}}, + on = {{op}{op}}, + retrieved = {{verkregen}{verkregen}}, + available = {{beschikbaar}{beschikbaar}}, + from = {{van}{van}}, + archivedat = {{gearchiveerd\space onder}{gearchiveerd\space onder}}, + nodate = {{geen\space datum}{{}n\adddot d\adddot}}, + reviewof = {{Bespreking\space van}{bespreking\space van}}, + paragraph = {{par\adddot}{par\adddot}}, + paragraphs = {{par\adddot}{par\adddot}}, + january = {{januari}{januari}}, + february = {{februari}{februari}}, + march = {{maart}{maart}}, + april = {{april}{april}}, + may = {{mei}{mei}}, + june = {{juni}{juni}}, + july = {{juli}{juli}}, + august = {{augustus}{augustus}}, + september = {{september}{september}}, + october = {{oktober}{oktober}}, + november = {{november}{november}}, + december = {{december}{december}}, + mathesis = {{masterscriptie}{masterscriptie}}, + phdthesis = {{proefschrift}{proefschrift}}, + origyear = {{origineel\space werk\space gepubliceerd}{origineel\space werk\space gepubliceerd}}, + typechair = {{hoofd}{hoofd}}, + typechairs = {{hoofden}{hoofden}}, + typevolume = {{Volume\space Redacteur}{Vol\adddot\space Red\adddot}}, + typevolumes = {{Volume\space Redacteuren}{Vol\adddot\space Red\adddot}}, + typeseries = {{Serie\space Redacteur}{Serie\space Red\adddot}}, + typeseriess = {{Serie\space Redacteuren}{Serie\space Red\adddot}}, + typevolseries = {{Serie\space en\space Volume\space Redacteur}{Serie\space\& Vol\adddot\space Red\adddot}}, + typevolseriess = {{Serie\space en\space Volume\space Redacteuren}{Serie\space\& Vol\adddot\space Red\adddot}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored + +\DefineBibliographyExtras{dutch}{% + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#1}% + {}% + {\thefield{#1}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + \iffieldundef{#1}% + {}% + {\thefield{#1}\printfield{extrayear}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongdmy#1#2#3{% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}% + {}% + {\addspace}% + \thefield{#1}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\endinput 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 1c6af30a246..3bd468be530 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx @@ -62,7 +62,7 @@ % (APA 7.10 Example 68) Drop end* when they are the same as * % You must use \printdate to get here otherwise it will be ignored -\DefineBibliographyExtras{american}{% +\DefineBibliographyExtras{french}{% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% -- cgit v1.2.3