summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/apa7/apa7.pdfbin509958 -> 515208 bytes
-rw-r--r--Master/texmf-dist/doc/latex/apa7/samples/longsample.pdfbin195752 -> 195752 bytes
-rw-r--r--Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdfbin58852 -> 58852 bytes
-rw-r--r--Master/texmf-dist/source/latex/apa7/apa7.dtx117
-rw-r--r--Master/texmf-dist/tex/latex/apa7/apa7.cls2
5 files changed, 63 insertions, 56 deletions
diff --git a/Master/texmf-dist/doc/latex/apa7/apa7.pdf b/Master/texmf-dist/doc/latex/apa7/apa7.pdf
index 49da09af66e..b334f6db646 100644
--- a/Master/texmf-dist/doc/latex/apa7/apa7.pdf
+++ b/Master/texmf-dist/doc/latex/apa7/apa7.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf b/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf
index d42c350b5da..331640c4ac5 100644
--- a/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf
+++ b/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf
index af39d696c8b..86bd2a0488b 100644
--- a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf
+++ b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/apa7/apa7.dtx b/Master/texmf-dist/source/latex/apa7/apa7.dtx
index c8e6a0383c4..4641281267d 100644
--- a/Master/texmf-dist/source/latex/apa7/apa7.dtx
+++ b/Master/texmf-dist/source/latex/apa7/apa7.dtx
@@ -4,11 +4,11 @@
% %
% CHANGE THESE VALUES WITH EACH NEW RELEASE: %
% %
-%<class>\ProvidesClass{apa7}[2019/12/29 v1.03 APA formatting (7th edition)]
+%<class>\ProvidesClass{apa7}[2019/12/30 v1.04 APA formatting (7th edition)]
% %
%<*internal> %
-\def\apaSevenVersionDate{2019/12/29}
-\def\apaSevenVersionNumber{1.03}
+\def\apaSevenVersionDate{2019/12/30}
+\def\apaSevenVersionNumber{1.04}
% %
% %
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -185,6 +185,16 @@ and the derived files apa7.ins,
}{|}}} https://orcid.org/#2}}
\usepackage{hyperref}
+\hypersetup{%
+ colorlinks,
+ linkcolor=blue,
+ citecolor=blue,
+ urlcolor=black,
+ pdfauthor = {Daniel A. Weiss <daniel.weiss.led@gmail.com>},
+ pdftitle = {The apa7 class},
+ pdfsubject = {Documentation of LaTeX class apa7},
+ pdfkeywords = {LaTeX, APA}
+}
\usepackage{graphicx}
\usepackage{booktabs}
\usepackage{verbatimbox}
@@ -204,14 +214,6 @@ and the derived files apa7.ins,
%\DoNotIndex{\closeout,\day,\def,\edef,\else,\empty,\endgroup}
%\DoNotIndex{\newcommand,\renewcommand}
%
-% \ifpdf
-% \hypersetup{%
-% pdfauthor = {Daniel A. Weiss <daniel.weiss.led@gmail.com>},
-% pdftitle = {The apa7 class},
-% pdfsubject = {Documentation of LaTeX class apa7},
-% pdfkeywords = {LaTeX, APA}
-% }%
-% \fi
%
% \title{^^A
% Formatting documents in APA style (7th Edition)\\^^A
@@ -233,6 +235,9 @@ and the derived files apa7.ins,
%
% \changes{v1.03}{2019/12/29}{Updated class to detect babel package in document and localize accordingly.}
%
+% \changes{v1.04}{2019/12/30}{Added table of contents.}
+% \changes{v1.04}{2019/12/30}{Updated documentation and added correct license statement to cls for apa6 package.}
+%
% \begin{abstract}
% The \textit{Publication Manual} of the American Psychological
% Association is widely used in the social sciences. The most
@@ -242,6 +247,8 @@ and the derived files apa7.ins,
% \textsf{apa6} class. The student manuscript type has been added.
% \end{abstract}
%
+% \tableofcontents
+%
% \section{Background}
% Most journals in the social sciences require manuscripts to be
% formatted in compliance with the American Psychological
@@ -270,7 +277,7 @@ and the derived files apa7.ins,
% available.
%
% \vspace{1em}
-% \textbf{Document mode:} Three choices are available.
+% \textbf{Document mode:} Four choices are available.
% \begin{itemize}
% \item \DescribeMacro{jou}|jou| (default): Formats the document with an
% appearance resembling a printed APA journal (e.g., \textit{Journal
@@ -416,7 +423,7 @@ and the derived files apa7.ins,
% \item \DescribeMacro{\authornote}|\authornote|\marg{author-note}:
% The Author Note, containing contact information, acknowledgements,
% etc.
-% \item \DescribeMacro{\addORCIDlink}|\addORCIDlink|\marg{author-name}\marg{ORCID}: Use this within the author note to generate the ORCID link. \\
+% \item \DescribeMacro{\addORCIDlink}|\addORCIDlink|\marg{author-name}\marg{ORCID}: Optionally, use this within the author note to generate the ORCID link. \\
% For example
% \begin{verbatim} \addORCIDlink{First M. Last}{0000-0000-0000-0000} \end{verbatim} \\
% generates \\ \\
@@ -589,39 +596,17 @@ and the derived files apa7.ins,
% utilizes code (with permission) from the \textsf{apa6} class to
% comply with all of these specifications.
%
-% \subsection{Float Placement}
-% The 7th Edition requires
-% that tables and figures (in that order) be placed after the
-% references but before the appendices. This creates a bit of a
-% conundrum as to what should happen with tables or figures that are
-% ultimately typeset within an appendix. The choices we are left with
-% are to place appendix floats (a) along with the floats from the main
-% part of the manuscript, which would mean that appendix floats appear
-% prior to the point at which they are mentioned; (b) within the
-% appendices themselves, which is not consistent with how floats in
-% the main part of the manuscript are handled; or (c) in a separate
-% float section that follows the appendices, which results in two
-% float sections. Obviously none of these choices is satisfactory, so
-% I posed the question to APA's Style Expert. He responded that at
-% least for APA's journals ``it doesn't matter whether appendix tables
-% are submitted with text tables or separately, as long as they are
-% numbered correctly (e.g., Table A1, Table B1, etc.)'' (J.\
-% Hume-Pratuch, personal communication, June 15, 2011). Therefore,
-% \textsf{apa7} takes the most straightforward approach and includes
-% all appendix floats within the body of the relevant appendix. This
-% also has the advantage of making appendices more readable.
-%
% Because the 7th Edition requires figure captions to be printed on
% the same page as their respective figures, there are no more Figure
% Captions pages.
%
% \subsection{Author Note}
-% According to 7th Edition guidelines, Author Notes are placed on the
-% title page of manuscripts.
+% According to 7th Edition guidelines, Author Notes are now placed "in the bottom half of the title page" on the
+% title page of manuscripts per the style guide.
%
% \section{Features}
-% In addition to providing compatibility with the 7th Edition of the
-% \textit{Manual}, several features have been implemented.
+% The featured implemented in the |apa6| have been included in the |apa7| class for the 7th Edition of the
+% \textit{Manual}.
%
% \subsection{Masked References}
% \label{sec:masking}
@@ -694,7 +679,7 @@ and the derived files apa7.ins,
% \DescribeMacro{floatsintext}|floatsintext| option (specified in the
% |\documentclass| line) will integrate tables and figures
% approximately where they are mentioned in the text. This is
-% available only with the |man| option, of course, because the other
+% available only with the |man| and |stu| options, of course, because the other
% formats already have floats integrated with the text.
%
% \subsection{User-defined Font Size}
@@ -717,7 +702,7 @@ and the derived files apa7.ins,
% \subsection{Flexible Bibliographies}
% The \textsf{apa7} class supports three bibliography packages:
% \textsf{biblatex}, \textsf{apacite}, and \textsf{natbib}. \\ \\
-% At this time, only biblatex is updated to support the 7th edition of APA style for citations and references.
+% At this time, only \textsf{biblatex} is updated to support the 7th edition of APA style for citations and references.
%
% \subsubsection{\textsf{biblatex}}
% \label{sec:biblatexinfo}
@@ -760,6 +745,28 @@ and the derived files apa7.ins,
% label can be localized by modifying the appropriate configuration
% file (in the `config' folder of the \textsf{apa7} installation).
%
+% \subsection{Float Placement}
+% The 7th Edition (as did the 6th Edition) requires
+% that tables and figures (in that order) be placed after the
+% references but before the appendices. This creates a bit of a
+% conundrum as to what should happen with tables or figures that are
+% ultimately typeset within an appendix. The choices we are left with
+% are to place appendix floats (a) along with the floats from the main
+% part of the manuscript, which would mean that appendix floats appear
+% prior to the point at which they are mentioned; (b) within the
+% appendices themselves, which is not consistent with how floats in
+% the main part of the manuscript are handled; or (c) in a separate
+% float section that follows the appendices, which results in two
+% float sections. Obviously none of these choices is satisfactory, so
+% Brian Beitzel (author of |apa6| package) posed the question to APA's Style Expert. The style expert responded that at
+% least for APA's journals ``it doesn't matter whether appendix tables
+% are submitted with text tables or separately, as long as they are
+% numbered correctly (e.g., Table A1, Table B1, etc.)'' (J.\
+% Hume-Pratuch, personal communication, June 15, 2011). Therefore,
+% \textsf{apa7} takes the same approach as \textsf{apa6}: the most straightforward approach that includes
+% all appendix floats within the body of the relevant appendix. This
+% also has the advantage of making appendices more readable.
+%
% \section{Dependencies}
% \textsf{apa7} automatically loads the following packages. If these
% packages are not already installed, producing the first
@@ -838,7 +845,7 @@ and the derived files apa7.ins,
\author{Daniel A. Weiss}
\affiliation{A University Somewhere}
- \leftheader{Beitzel}
+ \leftheader{Weiss}
\abstract{This demonstration paper uses the \textsf{apa7} \LaTeX\
class to format the document in compliance with the 7th Edition of
@@ -953,25 +960,25 @@ and the derived files apa7.ins,
% % apa7 class was built
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% apa.cls version 1.3.4
+% apa6 version 2.33
%
-% NOTE CHANGE IN VERSION NUMBERING : 1.21--1.28 should have been 1.2.1--1.2.8
+% apa6 - A LaTeX class for formatting documents in compliance with the
+% American Psychological Association's Publication Manual, 6th edition
%
-% Athanassios Protopapas, December 2008
-% protopap@ilsp.gr
+% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
%
-% This package may be distributed under the terms of the LaTeX Project Public
-% License, as described in lppl.txt in the base LaTeX distribution. Either
-% version 1.0 or, at your option, any later version.
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License (LPPL), either
+% version 1.3c of this license or (at your option) any later
+% version. The latest version of this license is in the file:
%
-% The term "package", in the above license statement, applies to all files
-% included with apa.cls (language files, examples, configuration,
-% instructions etc.) -- they may be all distributed under LPPL.
+% http://www.latex-project.org/lppl.txt
%
-% Use with LaTeX2e, \documentclass[man|jou|doc]{apa}
-% Default mode is doc. Conforms to the APA manual 5th ed.
+% Users may freely modify these files without permission, as long as the
+% copyright line and this statement are maintained intact.
%
-% ** Read apacls.txt and examples.txt carefully before using **
+% This work is not endorsed by, affiliated with, or probably even known
+% by, the American Psychological Association.
%
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/apa7/apa7.cls b/Master/texmf-dist/tex/latex/apa7/apa7.cls
index 40f95788974..e0030ebc10f 100644
--- a/Master/texmf-dist/tex/latex/apa7/apa7.cls
+++ b/Master/texmf-dist/tex/latex/apa7/apa7.cls
@@ -27,7 +27,7 @@
%%
%% ----------------------------------------------------------------------
%%
-\ProvidesClass{apa7}[2019/12/29 v1.03 APA formatting (7th edition)]
+\ProvidesClass{apa7}[2019/12/30 v1.04 APA formatting (7th edition)]
\NeedsTeXFormat{LaTeX2e}
\DeclareOption{man}{%