diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/apa6/apa6.pdf | bin | 587069 -> 587449 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex | 77 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/apa6/samples/longsample.tex | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/apa6/apa6.dtx | 112 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/apa6/apa6.cls | 14 |
6 files changed, 147 insertions, 60 deletions
diff --git a/Master/texmf-dist/doc/latex/apa6/apa6.pdf b/Master/texmf-dist/doc/latex/apa6/apa6.pdf Binary files differindex 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} diff --git a/Master/texmf-dist/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx index 86727f8ea11..ec8e7717822 100644 --- a/Master/texmf-dist/source/latex/apa6/apa6.dtx +++ b/Master/texmf-dist/source/latex/apa6/apa6.dtx @@ -4,11 +4,11 @@ % % % CHANGE THESE VALUES WITH EACH NEW RELEASE: % % % -%<class>\ProvidesClass{apa6}[2012/10/26 v2.05 APA formatting (6th edition)] +%<class>\ProvidesClass{apa6}[2012/12/21 v2.10 APA formatting (6th edition)] % % %<*internal> % -\def\apaSixVersionDate{2012/10/26} -\def\apaSixVersionNumber{2.05} +\def\apaSixVersionDate{2012/12/21} +\def\apaSixVersionNumber{2.10} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -265,6 +265,11 @@ and the derived files apa6.ins, % \changes{v2.05}{2012/10/26}{Resolved the EndNote @@author-year % specification causing no files to be found} % +% \changes{v2.10}{2012/12/20}{Package `biber' now required when using +% biblatex} +% +% \changes{v2.10}{2012/12/20}{apa6.ptex file now honors `mask' option} +% % % \begin{abstract} % The \textit{Publication Manual} of the American Psychological @@ -859,7 +864,8 @@ and the derived files apa6.ins, % (\textsf{draftwatermark} automatically loads \textsf{everypage} % \item \textsf{endfloat}: handles placing tables and figures at the % end of a manuscript; used only with the |man| option -% \item \textsf{etoolbox}: provides capability of intercepting the +% \item \textsf{etoolbox}: provides low-level hooks needed to detect +% user-loaded packages % \item \textsf{fancyhdr}: formats page headers % \item \textsf{float}: handles floats placed within text; used only % when the |man| and |floatsintext| options are both specified @@ -903,7 +909,7 @@ and the derived files apa6.ins, % \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} % @@ -1207,7 +1213,7 @@ and the derived files apa6.ins, \ClassInfo{apa6}{No bibliography package was specified; defaulting to (but not loading) Biblatex} }{% \def\def@biblatex{\@biblatexmode}% the selected bibliography package is Biblatex - \RequirePackage[style=apa,sortcites=true,sorting=nyt]{biblatex} + \RequirePackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex} \@ifundefined{def@man}{% \defbibheading{bibliography}{\section*{\normalfont\refname}}% }{% @@ -1865,6 +1871,7 @@ and the derived files apa6.ins, \long\def\title#1{\long\def\@title{#1}} \long\def\author#1{\long\def\@author{#1}} +\long\def\shorttitle#1{\long\def\@shorttitle{#1}} \long\def\twoauthors#1#2{\long\def\@authorOne{#1}\long\def\@authorTwo{#2}% \long\def\@author{#1}} \long\def\onetwoauthors#1#2#3{\long\def\@authorOne{#1}\long\def\@authorTwo{#2}% @@ -2190,7 +2197,8 @@ and the derived files apa6.ins, \def\rightheader#1{\def\r@headr{\protect\MakeUppercase{#1}}} \def\leftheader#1{\def\r@headl{#1}} %\def\shorttitle#1{\def\s@title{#1}}%\markright{\hfill #1 \thepage} %% no rm - thp 020227 -\newcommand{\shorttitle}[1]{\def\@shorttitle{#1}} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\newcommand{\shorttitle}[1]{\def\@shorttitle{#1}} \raggedright @@ -2661,9 +2669,8 @@ and the derived files apa6.ins, \def\rightheader#1{\def\r@headr{\protect\MakeUppercase{\protect\scriptsize #1}}} \def\leftheader#1{\def\r@headl{\protect\MakeUppercase{\protect\scriptsize #1}}} -%\def\shorttitle#1{} -\def\shorttitle#1{\def\r@headr{\protect\MakeUppercase{\protect\scriptsize #1}}}% BDB - +\def\r@headr{\protect\MakeUppercase{\protect\scriptsize\@shorttitle}}% BDB +%%%%%%%%%%%%%%%%%%%%%%%\def\shorttitle#1{\def\r@headr{\protect\MakeUppercase{\protect\scriptsize #1}}}% BDB \def\put@one@authaffil#1#2{% \parbox[t]{\textwidth}{\begin{center}{\large #1\vspace{0in}}% @@ -2964,7 +2971,8 @@ and the derived files apa6.ins, %\pagestyle{myheadings} -\newcommand{\shorttitle}[1]{\def\@shorttitle{#1}} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\renewcommand{\shorttitle}[1]{\def\@shorttitle{#1}} + \def\leftheader#1{\def\r@headl{#1}} \RequirePackage{fancyhdr} @@ -3420,7 +3428,7 @@ and the derived files apa6.ins, \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} @@ -3523,7 +3531,7 @@ skill in interpreting the results for the masses. \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} @@ -3700,6 +3708,10 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] %% 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} @@ -3861,6 +3873,7 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] \next#2^^G} \catcode`\^^G=15 +% handle bibliographic citations \def\parencite{% \@ifnextchar[% {\@parencite}% @@ -3876,23 +3889,12 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] {\{{{#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{% @@ -3910,27 +3912,71 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] {\{ , , \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 + +} % re-define the maketitle diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls index 87e70e4df2f..3242842d92e 100644 --- a/Master/texmf-dist/tex/latex/apa6/apa6.cls +++ b/Master/texmf-dist/tex/latex/apa6/apa6.cls @@ -27,7 +27,7 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesClass{apa6}[2012/10/26 v2.05 APA formatting (6th edition)] +\ProvidesClass{apa6}[2012/12/21 v2.10 APA formatting (6th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% @@ -188,7 +188,7 @@ \ClassInfo{apa6}{No bibliography package was specified; defaulting to (but not loading) Biblatex} }{% \def\def@biblatex{\@biblatexmode}% the selected bibliography package is Biblatex - \RequirePackage[style=apa,sortcites=true,sorting=nyt]{biblatex} + \RequirePackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex} \@ifundefined{def@man}{% \defbibheading{bibliography}{\section*{\normalfont\refname}}% }{% @@ -737,6 +737,7 @@ \long\def\title#1{\long\def\@title{#1}} \long\def\author#1{\long\def\@author{#1}} +\long\def\shorttitle#1{\long\def\@shorttitle{#1}} \long\def\twoauthors#1#2{\long\def\@authorOne{#1}\long\def\@authorTwo{#2}% \long\def\@author{#1}} \long\def\onetwoauthors#1#2#3{\long\def\@authorOne{#1}\long\def\@authorTwo{#2}% @@ -970,7 +971,8 @@ \def\rightheader#1{\def\r@headr{\protect\MakeUppercase{#1}}} \def\leftheader#1{\def\r@headl{#1}} -\newcommand{\shorttitle}[1]{\def\@shorttitle{#1}} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\newcommand{\shorttitle}[1]{\def\@shorttitle{#1}} \raggedright @@ -1293,7 +1295,8 @@ \def\rightheader#1{\def\r@headr{\protect\MakeUppercase{\protect\scriptsize #1}}} \def\leftheader#1{\def\r@headl{\protect\MakeUppercase{\protect\scriptsize #1}}} -\def\shorttitle#1{\def\r@headr{\protect\MakeUppercase{\protect\scriptsize #1}}}% BDB +\def\r@headr{\protect\MakeUppercase{\protect\scriptsize\@shorttitle}}% BDB +%%%%%%%%%%%%%%%%%%%%%%%\def\shorttitle#1{\def\r@headr{\protect\MakeUppercase{\protect\scriptsize #1}}}% BDB \def\put@one@authaffil#1#2{% \parbox[t]{\textwidth}{\begin{center}{\large #1\vspace{0in}}% @@ -1518,7 +1521,8 @@ \@ifundefined{def@doc}{}{% -\newcommand{\shorttitle}[1]{\def\@shorttitle{#1}} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\renewcommand{\shorttitle}[1]{\def\@shorttitle{#1}} + \def\leftheader#1{\def\r@headl{#1}} \RequirePackage{fancyhdr} |