summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/apa6/apa6.pdfbin586502 -> 587069 bytes
-rw-r--r--Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex36
-rw-r--r--Master/texmf-dist/source/latex/apa6/apa6.dtx81
-rw-r--r--Master/texmf-dist/tex/latex/apa6/apa6.cls6
4 files changed, 63 insertions, 60 deletions
diff --git a/Master/texmf-dist/doc/latex/apa6/apa6.pdf b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
index 01a463408a1..edaf2e1992e 100644
--- a/Master/texmf-dist/doc/latex/apa6/apa6.pdf
+++ b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex
index f1220e9148d..db195c05e33 100644
--- a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex
+++ b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex
@@ -186,19 +186,19 @@
\catcode`\^^G=15
\def\parencite{%
- \@ifnextchar[%
- {\@parencite}%
- {\@parencite[]}%
+ \@ifnextchar[%
+ {\@parencite}%
+ {\@parencite[]}%
}
\def\@parencite[#1]{%
- \@ifnextchar[%
- {\@@parencite[#1]}%
- {\@@parencite[#1][]}%
+ \@ifnextchar[%
+ {\@@parencite[#1]}%
+ {\@@parencite[#1][]}%
}
\def\@@parencite[#1][#2]#3{%
-\makeatletter%
-{\{{{#1}\textbackslash}{\makeCommaIntoSemicolon{#3}}@{#2}\}}%
-\makeatother%
+ \makeatletter%
+ {\{{{#1}\textbackslash}{\makeCommaIntoSemicolon{#3}}@{#2}\}}%
+ \makeatother%
}
\let\maskparencite=\parencite
@@ -219,19 +219,19 @@
\let\maskciteyearpar=\parencite
\def\textcite{%
- \@ifnextchar[%
- {\@textcite}%
- {\@textcite[]}%
+ \@ifnextchar[%
+ {\@textcite}%
+ {\@textcite[]}%
}
\def\@textcite[#1]{%
- \@ifnextchar[%
- {\@@textcite[#1]}%
- {\@@textcite[#1][]}%
+ \@ifnextchar[%
+ {\@@textcite[#1]}%
+ {\@@textcite[#1][]}%
}
\def\@@textcite[#1][#2]#3{%
-\makeatletter%
-{\{{{#1}\textbackslash}\makeCommaIntoSemicolon{#3}@{#2}@author-year\}}%
-\makeatother%
+ \makeatletter%
+ {\{ , , \makeCommaIntoSemicolon{#3}@{#2}@author-year\}}%
+ \makeatother%
}
\let\masktextcite=\textcite
\let\Textcite=\textcite
diff --git a/Master/texmf-dist/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx
index 9f650f3562b..86727f8ea11 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/20 v2.0 APA formatting (6th edition)]
+%<class>\ProvidesClass{apa6}[2012/10/26 v2.05 APA formatting (6th edition)]
% %
%<*internal> %
-\def\apaSixVersionDate{2012/10/20}
-\def\apaSixVersionNumber{2.0}
+\def\apaSixVersionDate{2012/10/26}
+\def\apaSixVersionNumber{2.05}
% %
% %
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -260,6 +260,11 @@ and the derived files apa6.ins,
% and `FormatTex2WordDocument' macro}
% \changes{v2.0}{2012/10/20}{Fixed `headwidth' for `doc' mode}
%
+% \changes{v2.01}{2012/10/25}{Really fixed `headwidth' for `doc' mode}
+%
+% \changes{v2.05}{2012/10/26}{Resolved the EndNote @@author-year
+% specification causing no files to be found}
+%
%
% \begin{abstract}
% The \textit{Publication Manual} of the American Psychological
@@ -816,19 +821,18 @@ and the derived files apa6.ins,
% citations''; (c) go to the EndNote toolbar within Word and run
% ``Update Citations and Bibliography''; for each temporary citation,
% EndNote will present a dialog containing the matched references from
-% the EndNote library; for each matched reference, remove any
-% ``@@author-year'' search text if it causes references not to be
-% found (this is a limitation in EndNote) and click ``Insert''; (d)
-% after all citations have been resolved and EndNote has generated the
-% References list at the end of the document, move the References list
-% to the proper position if needed (i.e., when there are appendices,
-% tables, or figures). Unfortunately, this workaround does mean that
-% duplicate databases will need to be maintained in both a |.bib| file
-% and an EndNote library that contain common Bib\TeX\ keys for each
-% reference. To work properly, one modification is necessary to the
-% user preferences in EndNote: un-check the ``Omit Author and/or Year
-% from formatted citation if removed from temporary citation'' option
-% (in the ``Formatting'' section of EndNote preferences).
+% the EndNote library; for each matched reference, click ``Insert'';
+% (d) after all citations have been resolved and EndNote has generated
+% the References list at the end of the document, move the References
+% list to the proper position if needed (i.e., when there are
+% appendices, tables, or figures). Unfortunately, this workaround
+% does mean that duplicate databases will need to be maintained in
+% both a |.bib| file and an EndNote library that contain common
+% Bib\TeX\ keys for each reference. To work properly, one
+% modification is necessary to the user preferences in EndNote:
+% un-check the ``Omit Author and/or Year from formatted citation if
+% removed from temporary citation'' option (in the ``Formatting''
+% section of EndNote preferences).
%
% It's well worth experimenting with the 30-day trial of TeX2Word, and
% perhaps even worth finding---or borrowing---a Windows machine if you
@@ -2963,15 +2967,15 @@ and the derived files apa6.ins,
\newcommand{\shorttitle}[1]{\def\@shorttitle{#1}}
\def\leftheader#1{\def\r@headl{#1}}
-% fix headwidth for even-numbered pages
-% suggestion from http://tex.stackexchange.com/questions/42798/apa6-package-heading-line-exceeds-textwidth
-\setlength{\headwidth}{\textwidth}
-
\RequirePackage{fancyhdr}
\setlength{\headheight}{15.2pt}
\fancyhf{}
\renewcommand{\headrulewidth}{0pt}
+% fix headwidth for even-numbered pages
+% suggestion from http://tex.stackexchange.com/questions/42798/apa6-package-heading-line-exceeds-textwidth
+\setlength{\headwidth}{\textwidth}
+
\fancypagestyle{otherpage}{%
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\lhead{\MakeUppercase{\@shorttitle}}%
@@ -3857,21 +3861,20 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
\next#2^^G}
\catcode`\^^G=15
-
\def\parencite{%
- \@ifnextchar[%
- {\@parencite}%
- {\@parencite[]}%
+ \@ifnextchar[%
+ {\@parencite}%
+ {\@parencite[]}%
}
\def\@parencite[#1]{%
- \@ifnextchar[%
- {\@@parencite[#1]}%
- {\@@parencite[#1][]}%
+ \@ifnextchar[%
+ {\@@parencite[#1]}%
+ {\@@parencite[#1][]}%
}
\def\@@parencite[#1][#2]#3{%
- \makeatletter%
- {\{{{#1}\textbackslash}{\makeCommaIntoSemicolon{#3}}@{#2}\}}%
- \makeatother%
+ \makeatletter%
+ {\{{{#1}\textbackslash}{\makeCommaIntoSemicolon{#3}}@{#2}\}}%
+ \makeatother%
}
\let\maskparencite=\parencite
@@ -3893,19 +3896,19 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
\def\textcite{%
- \@ifnextchar[%
- {\@textcite}%
- {\@textcite[]}%
+ \@ifnextchar[%
+ {\@textcite}%
+ {\@textcite[]}%
}
\def\@textcite[#1]{%
- \@ifnextchar[%
- {\@@textcite[#1]}%
- {\@@textcite[#1][]}%
+ \@ifnextchar[%
+ {\@@textcite[#1]}%
+ {\@@textcite[#1][]}%
}
\def\@@textcite[#1][#2]#3{%
- \makeatletter%
- {\{{{#1}\textbackslash}\makeCommaIntoSemicolon{#3}@{#2}@author-year\}}%
- \makeatother%
+ \makeatletter%
+ {\{ , , \makeCommaIntoSemicolon{#3}@{#2}@author-year\}}%
+ \makeatother%
}
\let\masktextcite=\textcite
\let\Textcite=\textcite
diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls
index 8ddf25a4092..87e70e4df2f 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/20 v2.0 APA formatting (6th edition)]
+\ProvidesClass{apa6}[2012/10/26 v2.05 APA formatting (6th edition)]
\NeedsTeXFormat{LaTeX2e}
\DeclareOption{man}{%
@@ -1521,13 +1521,13 @@
\newcommand{\shorttitle}[1]{\def\@shorttitle{#1}}
\def\leftheader#1{\def\r@headl{#1}}
-\setlength{\headwidth}{\textwidth}
-
\RequirePackage{fancyhdr}
\setlength{\headheight}{15.2pt}
\fancyhf{}
\renewcommand{\headrulewidth}{0pt}
+\setlength{\headwidth}{\textwidth}
+
\fancypagestyle{otherpage}{%
\lhead{\MakeUppercase{\@shorttitle}}%
\rhead{\thepage}%
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 11:49:10 +0000