diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/apa6/apa6.pdf | bin | 585259 -> 585098 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/apa6/apa6.dtx | 21 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/apa6/apa6.cls | 9 |
3 files changed, 15 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/latex/apa6/apa6.pdf b/Master/texmf-dist/doc/latex/apa6/apa6.pdf Binary files differindex d1a2dcb82b6..9f950882f0c 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/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx index 5c37705c92a..57edb6ff71a 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/02/23 v1.25 APA formatting (6th edition)] +%<class>\ProvidesClass{apa6}[2012/02/25 v1.26 APA formatting (6th edition)] % % %<*internal> % -\def\apaSixVersionDate{2012/02/23} -\def\apaSixVersionNumber{1.25} +\def\apaSixVersionDate{2012/02/25} +\def\apaSixVersionNumber{1.26} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -735,11 +735,9 @@ and the derived files apa6.ins, % \subsubsection{\textsf{natbib}} % \label{sec:natbibinfo} % Specifying the \DescribeMacro{natbib}|natbib| option implicitly -% loads \textsf{apacite} and directs \textsf{apa6} to mask references -% using \textsf{natbib} commands if the |mask| option is specified. -% Because of how the \textsf{natbib} package is written, it must be -% loaded explicitly in the document preamble with -% |\usepackage[sort,longnamesfirst]{natbib}|. +% loads \textsf{apacite} and \textsf{natbib}, and directs +% \textsf{apa6} to mask references using \textsf{natbib} commands if +% the |mask| option is specified. % % \subsection{Keywords} % \label{sec:keywords} @@ -1163,9 +1161,10 @@ and the derived files apa6.ins, }{% \def\def@natbib{\@natbibmode}% the selected bibliography package is natbib (with apacite) \@ifundefined{def@man}{% -- thp 2005/07/23 - \RequirePackage[natbibapa]{apacite}[2012/02/14} - {\RequirePackage[natbibapa,bibnewpage]{apacite}[2012/02/14]} - \ClassInfo{apa6}{The selected bibliography package, natbib, must be loaded in the preamble; apacite has been loaded} + \RequirePackage[natbibapa]{apacite}[2012/02/25]} + {\RequirePackage[natbibapa,bibnewpage]{apacite}[2012/02/25]} + \ClassInfo{apa6}{The selected bibliography package, apacite and + natbib, have been loaded} } }{% \def\def@apacite{\@apacitemode}% the selected bibliography package is apacite diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls index 77c6c36c39b..494ec3f7f90 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/02/23 v1.25 APA formatting (6th edition)] +\ProvidesClass{apa6}[2012/02/25 v1.26 APA formatting (6th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% @@ -198,9 +198,10 @@ }{% \def\def@natbib{\@natbibmode}% the selected bibliography package is natbib (with apacite) \@ifundefined{def@man}{% -- thp 2005/07/23 - \RequirePackage[natbibapa]{apacite}[2012/02/14} - {\RequirePackage[natbibapa,bibnewpage]{apacite}[2012/02/14]} - \ClassInfo{apa6}{The selected bibliography package, natbib, must be loaded in the preamble; apacite has been loaded} + \RequirePackage[natbibapa]{apacite}[2012/02/25]} + {\RequirePackage[natbibapa,bibnewpage]{apacite}[2012/02/25]} + \ClassInfo{apa6}{The selected bibliography package, apacite and + natbib, have been loaded} } }{% \def\def@apacite{\@apacitemode}% the selected bibliography package is apacite |