biblatex-apa (28sep10)

git-svn-id: svn://tug.org/texlive/trunk@19938 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 117 insertions, 100 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index 0b1fd7f9827..c7fbb71b184 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/README
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/README
@@ -1,4 +1,4 @@
-Version 1.8
+Version 1.9
 
 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-references.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
index 2814b70b0ad..8a61dc4b69a 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
@@ -100,6 +100,8 @@
 }
 
 % (APA 7.01 Example 9)
+% The date format in the formatted APA example is inconsistent with all other date
+% range examples which have a '-' separating the range. We use '-' here too.
 @ARTICLE{7.01:9,
   TITLE          = {Six Sites Meet for Comprehensive Anti-gang Initiative Conference},
   SHORTTITLE     = {Six Sites Meet},
@@ -155,7 +157,7 @@
   YEAR           = {2006}
 }
 
-% Implicit example made explicit - no editors
+% APA manual implicit example made explicit - no editors
 @ARTICLE{7.01:12c,
   TITLE          = {Capital Punishment in the United Kingdom},
   SHORTTITLE     = {Capital Punishment},
@@ -163,7 +165,7 @@
   JOURNALTITLE   = {Psychology, Public Policy and Law},
   VOLUME         = {10},
   NUMBER         = {4},
-  YEAR           = {2005}
+  YEAR           = {2004}
 }
 
 % (APA 7.01 Example 13)
@@ -202,7 +204,7 @@
 
 % (APA 7.01 Example 14)
 @ARTICLE{7.01:14,
-  TITLE          = {Editorial: {"}{W}hat a Disaster{"} and Why Does This Question Matter?},
+  TITLE          = {Editorial: ``{W}hat a Disaster'' and Why Does This Question Matter?},
   TITLEADDON     = {Editorial},
   JOURNALTITLE   = {Journal of Contingencies and Crisis Management},
   VOLUME         = {14},
@@ -636,7 +638,7 @@
   AUTHOR         = {K. S. Wolf},
   TITLE          = {The Future for {D}eaf Individuals is Not That Bleak},
   ENTRYSUBTYPE   = {Peer commentary on the paper},
-  ORIGTITLE      = {``Decrease of Deaf Potential in a Mainstreamed Environment''},
+  ORIGTITLE      = {``{D}ecrease of {D}eaf potential in a mainstreamed environment''},
   VERBA          = {by K. S. Wolf},
   DATE           = {2005},
   URL            = {http://www.personalityresearch.org/papers/hal.htm#wolf}
@@ -808,7 +810,7 @@
 % (APA 7.09 Example 62)
 @UNPUBLISHED{7.09:62,
   AUTHOR         = {K. Kubota},
-  TITLE          = {{"}{S}oaking{"} Model for Learning},
+  TITLE          = {``{S}oaking'' Model for Learning},
   SUBTITLE       = {Analyzing {J}apanese Learning/Teaching Process from a Socio-Historical Perspective},
   YEAR           = {2007},
   EPRINTTYPE     = {ERIC database},
@@ -914,7 +916,7 @@
   AUTHOR         = {{Sci-Art Publishers}},
   TITLE          = {Sci-{A}rt {P}ublications},
   TITLEADDON     = {Brochure},
-  HOWPUBLISHED   = {Cambridge, MA: Author. A. A. Roback Papers (HUGFP 104.50, Box2, Folder {"}Miscellaneous Psychological Materials{"})},
+  HOWPUBLISHED   = {Cambridge, MA: Author. A. A. Roback Papers (HUGFP 104.50, Box2, Folder ``Miscellaneous Psychological Materials'')},
   LOCATION       = {Harvard University Archives, Cambridge, MA},
   DATE           = {1935}
 }
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 211f1d13110..55bd5a1a900 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
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 e9abe573e25..ec3faa2a575 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,16 +1,21 @@
 \documentclass{article}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
 \usepackage[american]{babel}
 \usepackage{csquotes}
 \usepackage{shortvrb}
 \usepackage{ifthen}
 \usepackage{color}
-\usepackage{MnSymbol}
+\usepackage[retainmissing]{MnSymbol}
+
+% Unicode
+\usepackage{fontspec}
+\setmainfont[Ligatures=TeX]{TeXGyrePagella}
+\setsansfont{Arial}
+\setmonofont{Courier New}
 
 % Biblatex
 \usepackage[style=apa,%
-            bibencoding=inputenc]{biblatex}
+            backend=biber,
+            bibencoding=utf8]{biblatex}
 
 \MakeShortVerb{\|}
 
@@ -21,8 +26,8 @@
 \setlength{\parskip}{3ex}
 \bibliography{biblatex-apa-test-citations,biblatex-apa-test-references}
 
-\def\apaex#1{\hbox{\hspace{-4em}\texttt{\small \detokenize{#1}}}\\ $\rcurvearrowse$ \textbf{#1}}
-\def\apaexs#1{\hbox{\texttt{\footnotesize \detokenize{#1}}} \textbf{\small #1}}
+\def\apaex#1{\hbox{\hspace{-4em}\texttt{\small\detokenize{#1}}}\\$\rcurvearrowse$ \textbf{#1}}
+\def\apaexs#1{\hbox{\texttt{\footnotesize\detokenize{#1}}} \textbf{\small #1}}
 
 % This just makes it easier to find a specific (APA 7.x) example in the
 % typeset references section
@@ -242,6 +247,10 @@ Entries with no date use ``n.d.''.\\
 \apaex{\parencite{6.28a}}\\
 \apaex{(\nptextcite{6.28a})}\\
 
+\noindent\apa{7.01:12c}\\
+Issue with no editors\\
+\apaex{\parencite{7.01:12c}}\\
+
 \noindent\apa{A7.07}\\
 A patent citation uses the title but with no quotes\\
 \apaex{\textcite{A7.07}}\\
@@ -254,18 +263,3 @@ A patent citation uses the title but with no quotes\\
 % see (APA 7.x) examples there.
 \printbibliography[notkeyword=noinclude]
 \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 3ba2127a2c3..8c623797264 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
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 d695b44885e..49f3534a7e6 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
@@ -1,12 +1,17 @@
 \documentclass{ltxdockit}
-\usepackage[utf8]{inputenc}
 \usepackage[british]{babel}
-\usepackage[strict,babel=once]{csquotes}
+\usepackage[strict]{csquotes}
 \usepackage{shortvrb}
 \usepackage{ifthen}
 \MakeAutoQuote{«}{»}
 \MakeShortVerb{\|}
 
+% Unicode
+\usepackage{fontspec}
+\setmainfont[Ligatures=TeX]{TeXGyrePagella}
+\setsansfont{Arial}
+\setmonofont{Courier New}
+
 \newcommand\apa[2][]{\ifthenelse{\equal{#1}{}}%
                        {\texttt{(APA #2)}}%
                        {\texttt{(APA #2 Example #1)}}}
@@ -18,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={1.8},
+  revision={1.9},
   date={\today}}
 
 \hypersetup{%
@@ -167,7 +172,9 @@ this is not really apparent in the bibliography. There is an APA standard
 for long date formats which may not be correct for European journals using
 roughly APA formatting standards (German journals tend to have a different
 long date format, for example). The «american» babel option will give you
-APA compliant US date formats.
+APA compliant US date formats. Default sensible date formats are included
+for german, ngerman and french. You should redefine the |\mkbibdatelong|
+macro in the relevant language |*-apa.lbx| file to change this if needed.
 
 \subsection{Limitations}
 \label{use:limit}
@@ -322,6 +329,12 @@ to see how it was implemented. Some general notes:
 
 \begin{changelog}
 
+\begin{release}{1.9}{2010-09-27}
+\item Moved docs to LuaLaTeX compat
+\item Fixed german/ngerman date formats
+\item Cleaned up date format code
+\end{release}
+
 \begin{release}{1.8}{2010-08-06}
 \item Fixed seven author ellipsis bug
 \end{release}
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 91a4c1210ba..fda11b61c9b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
@@ -66,23 +66,29 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (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}{%
   \protected\def\mkbibdatelong#1#2#3{%
-      \iffieldundef{#1}
-        {}
-        {\ifthenelse{\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}}
-          {}
-          {\thefield{#1},\space}}%
-      \iffieldundef{#2}
+    \ifthenelse{\iffieldundef{#1}\OR%
+                \(\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}\)}
+      {}
+      {\thefield{#1}%
+       \ifthenelse{\(\equal{#1}{year}\AND\iffieldundef{month}\)\OR%
+                   \(\equal{#1}{endyear}\AND\iffieldundef{endmonth}\)}
+         {}
+         {\addcomma\addspace}}%
+    \ifthenelse{\iffieldundef{#2}\OR%
+                \(\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}\)}
       {}
-      {\ifthenelse{\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}}
-        {}
-        {\mkbibmonth{\thefield{#2}}\addspace}%
-        \iffieldundef{#3}
-        {}
-        {\ifthenelse{\equal{#3}{endday}\AND\iffieldsequal{day}{endday}}
+      {\mkbibmonth{\thefield{#2}}%
+       \ifthenelse{\(\equal{#2}{month}\AND\iffieldundef{day}\)\OR%
+                   \(\equal{#2}{endmonth}\AND\iffieldundef{endday}\)}
+         {}
+         {\addspace}}%
+    \ifthenelse{\iffieldundef{#3}\OR%
+                \(\equal{#3}{endday}\AND\iffieldsequal{day}{endday}\)}
           {}
-          {\stripzeros{\thefield{#3}}}}}}}
+          {\stripzeros{\thefield{#3}}}}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index 4fd11e27717..e48423c38b1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -216,12 +216,6 @@
          {\ifnum\value{liststop}>1 \finalandcomma\fi\addspace\&\space}
          {\addspace\&\space}}}}
 
-      % {\ifstrequal{\currentlist}{author}
-      %   {\ifnum\value{liststop}>1 \finalandcomma\fi\addspace\&\space}
-      %   {\ifthenelse{\boolean{bbx:editorinauthpos}}
-      %     {\ifnum\value{liststop}>1 \finalandcomma\fi\addspace\&\space}
-      %     {\addspace\&\space}}}}}
-
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -248,13 +242,7 @@
     {\iffieldundef{origyear}
       {\printtext[parens]{\usebibmacro{cite:noyear}}}
       {\printtext[yearorunkyear]{\printfield[noformat]{origyear}}}}
-    {\ifthenelse{\iffieldundef{month}\AND\iffieldundef{issue}}
-       {\printtext[yearorunkyear]{\printfield{labelyear}\printfield{extrayear}}}
-       {\iffieldundef{day}
-          {\printtext[yearorunkyear]{\printfield{labelyear}\printfield{extrayear}%
-           \usebibmacro{monthorissue}}}
-          {\printtext[parens]{\printfield{labelyear}\printfield{extrayear}\addcomma\space\printfield{month}\space\printfield{day}}}}}}
-
+    {\printtext[yearorunkyear]{\printdate}}}
 
 \DeclareFieldFormat{yearorunkyear}{%
   \ifthenelse{\iffieldequalstr{usere}{unkdate}\OR\iffieldequalstr{usere}{unkauthdate}}
@@ -471,7 +459,9 @@
 
 \renewbibmacro*{author/editor}{%
   \ifnameundef{author}
-    {\usebibmacro{editorinauthpos}}
+    {\ifnameundef{editor}
+      {}
+      {\usebibmacro{editorinauthpos}}}
     {\global\boolfalse{bbx:editorinauthpos}%
      \usebibmacro{author}}}
 
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 0724ba6e083..640ee2c2a38 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
@@ -61,23 +61,29 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (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{french}{%
   \protected\def\mkbibdatelong#1#2#3{%
-      \iffieldundef{#1}
-        {}
-        {\ifthenelse{\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}}
-          {}
-          {\thefield{#1},\space}}%
-      \iffieldundef{#2}
+    \ifthenelse{\iffieldundef{#1}\OR%
+                \(\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}\)}
+      {}
+      {\thefield{#1}%
+       \ifthenelse{\(\equal{#1}{year}\AND\iffieldundef{month}\)\OR%
+                   \(\equal{#1}{endyear}\AND\iffieldundef{endmonth}\)}
+         {}
+         {\addcomma\addspace}}%
+    \ifthenelse{\iffieldundef{#2}\OR%
+                \(\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}\)}
       {}
-      {\ifthenelse{\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}}
-        {}
-        {\mkbibmonth{\thefield{#2}}\addspace}%
-        \iffieldundef{#3}
-        {}
-        {\ifthenelse{\equal{#3}{endday}\AND\iffieldsequal{day}{endday}}
+      {\mkbibmonth{\thefield{#2}}%
+       \ifthenelse{\(\equal{#2}{month}\AND\iffieldundef{day}\)\OR%
+                   \(\equal{#2}{endmonth}\AND\iffieldundef{endday}\)}
+         {}
+         {\addspace}}%
+    \ifthenelse{\iffieldundef{#3}\OR%
+                \(\equal{#3}{endday}\AND\iffieldsequal{day}{endday}\)}
           {}
-          {\stripzeros{\thefield{#3}}}}}}}
+          {\stripzeros{\thefield{#3}}}}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
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 23350780985..5f90c08248a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
@@ -62,23 +62,26 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 7.10 Example 68) Drop end* when they are the same as *
 
-\DefineBibliographyExtras{american}{%
+% You must use \printdate to get here otherwise it will be ignored
+\DefineBibliographyExtras{german}{%
   \protected\def\mkbibdatelong#1#2#3{%
-      \iffieldundef{#1}
-        {}
-        {\ifthenelse{\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}}
-          {}
-          {\thefield{#1},\space}}%
-      \iffieldundef{#2}
+    \ifthenelse{\iffieldundef{#1}}
       {}
-      {\ifthenelse{\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}}
-        {}
-        {\mkbibmonth{\thefield{#2}}\addspace}%
-        \iffieldundef{#3}
-        {}
-        {\ifthenelse{\equal{#3}{endday}\AND\iffieldsequal{day}{endday}}
+      {\thefield{#1}%
+       \ifthenelse{\(\equal{#1}{year}\AND\iffieldundef{month}\)\OR%
+                   \(\equal{#1}{endyear}\AND\iffieldundef{endmonth}\)}
+         {}
+         {\addcomma\addspace}}%
+    \ifthenelse{\iffieldundef{#3}}
           {}
-          {\stripzeros{\thefield{#3}}}}}}}
+          {\stripzeros{\thefield{#3}}%
+           \ifthenelse{\(\equal{#3}{day}\AND\iffieldundef{month}\)\OR%
+                       \(\equal{#2}{endday}\AND\iffieldundef{endmonth}\)}
+             {}
+             {\adddot\addspace}}%
+    \ifthenelse{\iffieldundef{#2}}
+      {}
+      {\mkbibmonth{\thefield{#2}}}}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
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 cbb24b450a5..484f9f88c48 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
@@ -62,23 +62,26 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 7.10 Example 68) Drop end* when they are the same as *
 
-\DefineBibliographyExtras{american}{%
+% You must use \printdate to get here otherwise it will be ignored
+\DefineBibliographyExtras{ngerman}{%
   \protected\def\mkbibdatelong#1#2#3{%
-      \iffieldundef{#1}
-        {}
-        {\ifthenelse{\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}}
-          {}
-          {\thefield{#1},\space}}%
-      \iffieldundef{#2}
+    \ifthenelse{\iffieldundef{#1}}
       {}
-      {\ifthenelse{\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}}
-        {}
-        {\mkbibmonth{\thefield{#2}}\addspace}%
-        \iffieldundef{#3}
-        {}
-        {\ifthenelse{\equal{#3}{endday}\AND\iffieldsequal{day}{endday}}
+      {\thefield{#1}%
+       \ifthenelse{\(\equal{#1}{year}\AND\iffieldundef{month}\)\OR%
+                   \(\equal{#1}{endyear}\AND\iffieldundef{endmonth}\)}
+         {}
+         {\addcomma\addspace}}%
+    \ifthenelse{\iffieldundef{#3}}
           {}
-          {\stripzeros{\thefield{#3}}}}}}}
+          {\stripzeros{\thefield{#3}}%
+           \ifthenelse{\(\equal{#3}{day}\AND\iffieldundef{month}\)\OR%
+                       \(\equal{#2}{endday}\AND\iffieldundef{endmonth}\)}
+             {}
+             {\adddot\addspace}}%
+    \ifthenelse{\iffieldundef{#2}}
+      {}
+      {\mkbibmonth{\thefield{#2}}}}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%