apa6 (22dec12)

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

4 files changed, 59 insertions, 22 deletions

diff --git a/Master/texmf-dist/doc/latex/apa6/apa6.pdf b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
index edaf2e1992e..e87389331cd 100644
--- a/Master/texmf-dist/doc/latex/apa6/apa6.pdf
+++ b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
diff --git a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex
index db195c05e33..3329178e4d4 100644
--- a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex
+++ b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex
@@ -41,6 +41,10 @@
 %% Modified by Brian Beitzel for the 'apa6' class
 %% Distributed with permission from Chikrii Softlab
 
+\DeclareOption{mask}{\def\apaSix@maskauthoridentity{\relax}}
+
+\ProcessOptions\relax
+
 \newenvironment{abstract}{\section*{\abstractname}}{\relax}
 
 \newenvironment{titlepage}{\relax}{\relax}
@@ -200,23 +204,12 @@
   {\{{{#1}\textbackslash}{\makeCommaIntoSemicolon{#3}}@{#2}\}}%
   \makeatother%
 }
-\let\maskparencite=\parencite
 
 \let\Parencite=\parencite
-\let\maskParencite=\parencite
-
 \let\citep=\parencite
-\let\maskcitep=\parencite
 \let\Citep=\parencite
-\let\maskCitep=\parencite
-
-\let\cite=\parencite
-\let\maskcite=\parencite
-
 \let\citeyear=\parencite
-\let\maskciteyear=\parencite
 \let\citeyearpar=\parencite
-\let\maskciteyearpar=\parencite
 
 \def\textcite{%
   \@ifnextchar[%
@@ -233,27 +226,71 @@
   {\{ , , \makeCommaIntoSemicolon{#3}@{#2}@author-year\}}%
   \makeatother%
 }
-\let\masktextcite=\textcite
 \let\Textcite=\textcite
-\let\maskTextcite=\textcite
 
 \let\citet=\textcite
-\let\maskcitet=\textcite
 \let\Citet=\textcite
-\let\maskCitet=\textcite
 
 \let\citeA=\textcite
-\let\maskciteA=\textcite
 
 \let\citeauthor=\textcite
-\let\maskciteauthor=\textcite
 \let\Citeauthor=\textcite
-\let\maskCiteauthor=\textcite
 
 \let\citeyearNP=\textcite
-\let\maskciteyearNP=\textcite
 \let\citeNP=\textcite
-\let\maskciteNP=\textcite
+
+\@ifundefined{apaSix@maskauthoridentity}{%  change masked references to unmasked
+
+    % \maskcite
+    \let\maskcite=\parencite
+
+    \let\maskparencite=\maskcite
+    \let\maskParencite=\maskparencite
+    \let\maskcitep=\maskparencite
+    \let\maskCitep=\maskparencite
+    \let\maskciteyear=\maskparencite
+    \let\maskciteyearpar=\maskparencite
+    \let\masktextcite=\maskparencite
+    \let\maskTextcite=\maskparencite
+    \let\maskcitet=\maskparencite
+    \let\maskCitet=\maskparencite
+    \let\maskciteA=\maskparencite
+    \let\maskciteauthor=\maskparencite
+    \let\maskCiteauthor=\maskparencite
+    \let\maskciteyearNP=\maskparencite
+    \let\maskciteNP=\maskparencite
+
+}{%  mask references to author
+
+    % \maskcite
+    \newcommand\maskcite{\@ifnextchar[{\maskcite@@also}{\maskcite@@also[]}}
+    \newcommand\maskcite@@also{}
+    \def\maskcite@@also[#1]{\@ifnextchar[{\maskcite@@@also[#1]}{\maskcite@@@also[][#1]}}
+
+    \def\maskcite@@@also%
+        [#1][#2]#3{%
+            \def\apaSix@masked@refs{\it (citation(s) removed for masked review)}%
+            {\apaSix@masked@refs}%
+    }
+
+    \let\maskparencite=\maskcite
+    \let\maskParencite=\maskparencite
+    \let\maskcitep=\maskparencite
+    \let\maskCitep=\maskparencite
+    \let\maskciteyear=\maskparencite
+    \let\maskciteyearpar=\maskparencite
+
+    \let\masktextcite=\maskparencite
+    \let\maskTextcite=\maskparencite
+    \let\maskcitet=\maskparencite
+    \let\maskCitet=\maskparencite
+    \let\maskciteA=\maskparencite
+    \let\maskciteauthor=\maskparencite
+    \let\maskCiteauthor=\maskparencite
+    \let\maskciteyearNP=\maskparencite
+    \let\maskciteNP=\maskparencite
+
+}
 
 \long\def\maketitle{\entity@paragraph@new\begingroup\entity@paragraph@just=1\relax%
 {\raggedright\entity@paragraph@first=0\entity@paragraph@linespacingmultiple=0\entity@paragraph@spacebetween=240%
diff --git a/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex b/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex
index 45e081fe73d..985cf021002 100644
--- a/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex
+++ b/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex
@@ -34,7 +34,7 @@
 \usepackage[american]{babel}
 
 \usepackage{csquotes}
-\usepackage[style=apa,sortcites=true,sorting=nyt]{biblatex}
+\usepackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex}
 \DeclareLanguageMapping{american}{american-apa}
 \addbibresource{bibliography.bib}
 
diff --git a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex
index e7cd4257b3b..f2a34b2f5a8 100644
--- a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex
+++ b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex
@@ -32,7 +32,7 @@
 \usepackage[american]{babel}
 
 \usepackage{csquotes}
-\usepackage[style=apa,sortcites=true,sorting=nyt]{biblatex}
+\usepackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex}
 \DeclareLanguageMapping{american}{american-apa}
 \addbibresource{bibliography.bib}