diff options
author | Karl Berry <karl@freefriends.org> | 2019-12-30 22:16:14 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-12-30 22:16:14 +0000 |
commit | f56dddc3f3fce9850405369b12615d3544254bee (patch) | |
tree | 92bceddd207e8fd605e3fa6325372a980fc5ff96 | |
parent | 7d9b6f976db70d076719678e4e6f2bda2dc7ee8f (diff) |
apa7 (30dec19)
git-svn-id: svn://tug.org/texlive/trunk@53269 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/apa7/apa7.pdf | bin | 508466 -> 509958 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/apa7/samples/bibliography.bib | 22 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf | bin | 195752 -> 195752 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/apa7/samples/longsample.tex | 22 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf | bin | 58852 -> 58852 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex | 22 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/apa7/apa7.dtx | 98 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/apa7/apa7.ins | 64 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apa7/apa7.cls | 30 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apa7/config/APA7american.txt (renamed from Master/texmf-dist/tex/latex/apa7/config/APAamerican.txt) | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apa7/config/APA7british.txt (renamed from Master/texmf-dist/tex/latex/apa7/config/APAbritish.txt) | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apa7/config/APA7czech.txt (renamed from Master/texmf-dist/tex/latex/apa7/config/APAczech.txt) | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apa7/config/APA7dutch.txt (renamed from Master/texmf-dist/tex/latex/apa7/config/APAdutch.txt) | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apa7/config/APA7endfloat.cfg (renamed from Master/texmf-dist/tex/latex/apa7/config/APAendfloat.cfg) | 26 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apa7/config/APA7english.txt (renamed from Master/texmf-dist/tex/latex/apa7/config/APAenglish.txt) | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apa7/config/APA7german.txt (renamed from Master/texmf-dist/tex/latex/apa7/config/APAgerman.txt) | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apa7/config/APA7greek.txt (renamed from Master/texmf-dist/tex/latex/apa7/config/APAgreek.txt) | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apa7/config/APA7ngerman.txt (renamed from Master/texmf-dist/tex/latex/apa7/config/APAngerman.txt) | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/apa7/config/APA7turkish.txt (renamed from Master/texmf-dist/tex/latex/apa7/config/APAturkish.txt) | 28 |
19 files changed, 253 insertions, 283 deletions
diff --git a/Master/texmf-dist/doc/latex/apa7/apa7.pdf b/Master/texmf-dist/doc/latex/apa7/apa7.pdf Binary files differindex ee6608e2366..49da09af66e 100644 --- a/Master/texmf-dist/doc/latex/apa7/apa7.pdf +++ b/Master/texmf-dist/doc/latex/apa7/apa7.pdf diff --git a/Master/texmf-dist/doc/latex/apa7/samples/bibliography.bib b/Master/texmf-dist/doc/latex/apa7/samples/bibliography.bib index d9f2e084bff..7ffc74e526f 100644 --- a/Master/texmf-dist/doc/latex/apa7/samples/bibliography.bib +++ b/Master/texmf-dist/doc/latex/apa7/samples/bibliography.bib @@ -213,18 +213,16 @@ the design of multimedia instruction}, %% apa7.cls, %% apa7.pdf, %% README, -%% APAamerican.txt, -%% APAbritish.txt, -%% APAdutch.txt, -%% APAenglish.txt, -%% APAgerman.txt, -%% APAngerman.txt, -%% APAgreek.txt, -%% APAczech.txt, -%% APAturkish.txt, -%% APAendfloat.cfg, -%% apa7.ptex, -%% TeX2WordForapa7.bas, +%% APA7american.txt, +%% APA7british.txt, +%% APA7dutch.txt, +%% APA7english.txt, +%% APA7german.txt, +%% APA7ngerman.txt, +%% APA7greek.txt, +%% APA7czech.txt, +%% APA7turkish.txt, +%% APA7endfloat.cfg, %% Figure1.pdf, %% shortsample.tex, %% longsample.tex, and diff --git a/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf b/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf Binary files differindex 1af9d9eebc2..d42c350b5da 100644 --- a/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf +++ b/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf diff --git a/Master/texmf-dist/doc/latex/apa7/samples/longsample.tex b/Master/texmf-dist/doc/latex/apa7/samples/longsample.tex index 9fda4e7de16..e500a2d4926 100644 --- a/Master/texmf-dist/doc/latex/apa7/samples/longsample.tex +++ b/Master/texmf-dist/doc/latex/apa7/samples/longsample.tex @@ -207,18 +207,16 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] %% apa7.cls, %% apa7.pdf, %% README, -%% APAamerican.txt, -%% APAbritish.txt, -%% APAdutch.txt, -%% APAenglish.txt, -%% APAgerman.txt, -%% APAngerman.txt, -%% APAgreek.txt, -%% APAczech.txt, -%% APAturkish.txt, -%% APAendfloat.cfg, -%% apa7.ptex, -%% TeX2WordForapa7.bas, +%% APA7american.txt, +%% APA7british.txt, +%% APA7dutch.txt, +%% APA7english.txt, +%% APA7german.txt, +%% APA7ngerman.txt, +%% APA7greek.txt, +%% APA7czech.txt, +%% APA7turkish.txt, +%% APA7endfloat.cfg, %% Figure1.pdf, %% shortsample.tex, %% longsample.tex, and diff --git a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf Binary files differindex 55900e2ff54..af39d696c8b 100644 --- a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf +++ b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf diff --git a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex index a122c2dacdf..70e70eabee1 100644 --- a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex +++ b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex @@ -155,18 +155,16 @@ skill in interpreting the results for the masses. %% apa7.cls, %% apa7.pdf, %% README, -%% APAamerican.txt, -%% APAbritish.txt, -%% APAdutch.txt, -%% APAenglish.txt, -%% APAgerman.txt, -%% APAngerman.txt, -%% APAgreek.txt, -%% APAczech.txt, -%% APAturkish.txt, -%% APAendfloat.cfg, -%% apa7.ptex, -%% TeX2WordForapa7.bas, +%% APA7american.txt, +%% APA7british.txt, +%% APA7dutch.txt, +%% APA7english.txt, +%% APA7german.txt, +%% APA7ngerman.txt, +%% APA7greek.txt, +%% APA7czech.txt, +%% APA7turkish.txt, +%% APA7endfloat.cfg, %% Figure1.pdf, %% shortsample.tex, %% longsample.tex, and diff --git a/Master/texmf-dist/source/latex/apa7/apa7.dtx b/Master/texmf-dist/source/latex/apa7/apa7.dtx index 303a2064f98..c8e6a0383c4 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.01 APA formatting (7th edition)] +%<class>\ProvidesClass{apa7}[2019/12/29 v1.03 APA formatting (7th edition)] % % %<*internal> % \def\apaSevenVersionDate{2019/12/29} -\def\apaSevenVersionNumber{1.01} +\def\apaSevenVersionNumber{1.03} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -105,18 +105,16 @@ and the derived files apa7.ins, apa7.cls, apa7.pdf, README, - APAamerican.txt, - APAbritish.txt, - APAdutch.txt, - APAenglish.txt, - APAgerman.txt, - APAngerman.txt, - APAgreek.txt, - APAczech.txt, - APAturkish.txt, - APAendfloat.cfg, - apa7.ptex, - TeX2WordForapa7.bas, + APA7american.txt, + APA7british.txt, + APA7dutch.txt, + APA7english.txt, + APA7german.txt, + APA7ngerman.txt, + APA7greek.txt, + APA7czech.txt, + APA7turkish.txt, + APA7endfloat.cfg, Figure1.pdf, shortsample.tex, longsample.tex, and @@ -129,16 +127,16 @@ and the derived files apa7.ins, } \usedir{tex/latex/apa7/config} \generate{ - \file{./config/APAamerican.txt}{\from{\jobname.dtx}{american}} - \file{./config/APAbritish.txt}{\from{\jobname.dtx}{british}} - \file{./config/APAdutch.txt}{\from{\jobname.dtx}{dutch}} - \file{./config/APAenglish.txt}{\from{\jobname.dtx}{english}} - \file{./config/APAgerman.txt}{\from{\jobname.dtx}{german}} - \file{./config/APAngerman.txt}{\from{\jobname.dtx}{ngerman}} - \file{./config/APAgreek.txt}{\from{\jobname.dtx}{greek}} - \file{./config/APAczech.txt}{\from{\jobname.dtx}{czech}} - \file{./config/APAturkish.txt}{\from{\jobname.dtx}{turkish}} - \file{./config/APAendfloat.cfg}{\from{\jobname.dtx}{APAendfloat}} + \file{./config/APA7american.txt}{\from{\jobname.dtx}{american}} + \file{./config/APA7british.txt}{\from{\jobname.dtx}{british}} + \file{./config/APA7dutch.txt}{\from{\jobname.dtx}{dutch}} + \file{./config/APA7english.txt}{\from{\jobname.dtx}{english}} + \file{./config/APA7german.txt}{\from{\jobname.dtx}{german}} + \file{./config/APA7ngerman.txt}{\from{\jobname.dtx}{ngerman}} + \file{./config/APA7greek.txt}{\from{\jobname.dtx}{greek}} + \file{./config/APA7czech.txt}{\from{\jobname.dtx}{czech}} + \file{./config/APA7turkish.txt}{\from{\jobname.dtx}{turkish}} + \file{./config/APA7endfloat.cfg}{\from{\jobname.dtx}{APAendfloat}} } \usedir{tex/latex/apa7/samples} \generate{ @@ -231,6 +229,10 @@ and the derived files apa7.ins, % \changes{v1.01}{2019/12/29}{Corrected figure caption styles for doc format.} % \changes{v1.01}{2019/12/29}{Clarified that apacite and natbib are in 6th edition style.} % +% \changes{v1.02}{2019/12/29}{Fixed filename issue with language localization files.} +% +% \changes{v1.03}{2019/12/29}{Updated class to detect babel package in document and localize accordingly.} +% % \begin{abstract} % The \textit{Publication Manual} of the American Psychological % Association is widely used in the social sciences. The most @@ -327,10 +329,10 @@ and the derived files apa7.ins, % it may not work in all contexts). Do \textbf{\textit{not}} load % \textsf{longtable} yourself because of precedence requirements % with the \textsf{endfloat} package. Copy the file -% |APAendfloat.cfg| from the ``config'' folder of your \textsf{apa} +% |APA7endfloat.cfg| from the ``config'' folder of your \textsf{apa} % installation to the working folder of your document (not in your % |texmf| tree), and rename it to |endfloat.cfg| so that endfloat -% will recognize it. The supplied |APAendfloat.cfg| file will also +% will recognize it. The supplied |APA7endfloat.cfg| file will also % be necessary in conjunction with the \textsf{rotating} package % (and its |\sideways| command) to produce rotated tables; this % works for |man| and |stu| mode only. For rotated tables in |jou| or |doc| @@ -1387,9 +1389,9 @@ and the derived files apa7.ins, % last in the definition list, whether or not the babel % package is loaded by the current document - \@ifundefined{def@babel}% this is defined only if the user requested loading babel - {\def\@apaSeven@langfile{config/APAamerican.txt}} - {\def\@apaSeven@langfile{config/APA\languagename.txt}} +\@ifpackageloaded{babel}% this is defined only if the user requested loading babel + {\def\@apaSeven@langfile{config/APA7\languagename.txt}} + {\def\@apaSeven@langfile{config/APA7american.txt}} \InputIfFileExists{\@apaSeven@langfile}{}{% \ClassInfo{apa7}{Language definition file \@apaSeven@langfile\space not found} }% @@ -3733,10 +3735,10 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] % % %%%%%%%%%%% CONFIGURATION FILES %%%%%%%%%%%% % -%\begin{macro}{APAamerican.txt} +%\begin{macro}{APA7american.txt} % \begin{macrocode} %<*american> -\ProvidesFile{APAamerican.txt}[2012/02/23 v1.25 apa7 configuration for American English] +\ProvidesFile{APA7american.txt}[2019/12/29 v1.00 apa7 configuration for American English] \renewcommand{\acksname}{Author Note} \renewcommand{\keywordname}{Keywords} @@ -3748,10 +3750,10 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] %\end{macro} % % -%\begin{macro}{APAbritish.txt} +%\begin{macro}{APA7british.txt} % \begin{macrocode} %<*british> -\ProvidesFile{APAbritish.txt}[2012/02/23 v1.25 apa7 configuration for British English] +\ProvidesFile{APA7british.txt}[2019/12/29 v1.00 apa7 configuration for British English] \renewcommand{\acksname}{Author Note} \renewcommand{\keywordname}{Keywords} @@ -3763,10 +3765,10 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] %\end{macro} % % -%\begin{macro}{APAenglish.txt} +%\begin{macro}{APA7english.txt} % \begin{macrocode} %<*english> -\ProvidesFile{APAenglish.txt}[2012/02/23 v1.25 apa7 configuration for non-American English] +\ProvidesFile{APA7english.txt}[2019/12/29 v1.00 apa7 configuration for non-American English] \renewcommand{\acksname}{Author Note} \renewcommand{\keywordname}{Keywords} @@ -3776,10 +3778,10 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] % \end{macrocode} %\end{macro} % -%\begin{macro}{APAdutch.txt} +%\begin{macro}{APA7dutch.txt} % \begin{macrocode} %<*dutch> -\ProvidesFile{APAdutch.txt}[2012/02/23 v1.25 apa7 configuration for Dutch] +\ProvidesFile{APA7dutch.txt}[2019/12/29 v1.00 apa7 configuration for Dutch] \renewcommand{\acksname}{Auteursnoot}% Author Note \renewcommand{\keywordname}{Trefwoorden}% Keywords @@ -3789,10 +3791,10 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] % \end{macrocode} %\end{macro} % -%\begin{macro}{APAgerman.txt} +%\begin{macro}{APA7german.txt} % \begin{macrocode} %<*german> -\ProvidesFile{APAgerman.txt}[2012/02/23 v1.25 apa7 configuration for German] +\ProvidesFile{APA7german.txt}[2019/12/29 v1.00 apa7 configuration for German] \renewcommand{\acksname}{Autorenhinweis}% Author Note \renewcommand{\keywordname}{Schl\"usselw\"orter}% Keywords @@ -3802,10 +3804,10 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] % \end{macrocode} %\end{macro} % -%\begin{macro}{APAngerman.txt} +%\begin{macro}{APA7ngerman.txt} % \begin{macrocode} %<*ngerman> -\ProvidesFile{APAgerman.txt}[2012/02/23 v1.25 apa7 configuration for "new" German] +\ProvidesFile{APA7german.txt}[2019/12/29 v1.00 apa7 configuration for "new" German] \renewcommand{\acksname}{Autorenhinweis}% Author Note \renewcommand{\keywordname}{Schl\"usselw\"orter}% Keywords @@ -3815,10 +3817,10 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] % \end{macrocode} %\end{macro} % -%\begin{macro}{APAgreek.txt} +%\begin{macro}{APA7greek.txt} % \begin{macrocode} %<*greek> -\ProvidesFile{APAgreek.txt}[2012/02/23 v1.25 apa7 configuration for Greek] +\ProvidesFile{APA7greek.txt}[2019/12/29 v1.00 apa7 configuration for Greek] \renewcommand{\acksname}{Shmei'wseis tou suggraf'ea}% Author Note \renewcommand{\keywordname}{L'exeis kleidi'a}% Keywords @@ -3828,10 +3830,10 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] % \end{macrocode} %\end{macro} % -%\begin{macro}{APAczech.txt} +%\begin{macro}{APA7czech.txt} % \begin{macrocode} %<*czech> -\ProvidesFile{APAczech.txt}[2012/02/23 v1.25 apa7 configuration for Czech] +\ProvidesFile{APA7czech.txt}[2019/12/29 v1.00 apa7 configuration for Czech] \renewcommand{\acksname}{Poznámka~autora}% Author Note \renewcommand{\keywordname}{Klícová~1slova}% Keywords @@ -3841,10 +3843,10 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] % \end{macrocode} %\end{macro} % -%\begin{macro}{APAturkish.txt} +%\begin{macro}{APA7turkish.txt} % \begin{macrocode} %<*turkish> -\ProvidesFile{APAturkish.txt}[2016/05/26 v2.2 apa7 configuration for Turkish] +\ProvidesFile{APA7turkish.txt}[2019/12/29 v1.00 apa7 configuration for Turkish] \renewcommand{\acksname}{Yazar Notu}% Author Note \renewcommand{\keywordname}{Anahtar Kelimeler}% Keywords @@ -3854,7 +3856,7 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] % \end{macrocode} %\end{macro} % -%\begin{macro}{APAendfloat.cfg} +%\begin{macro}{APA7endfloat.cfg} % \begin{macrocode} %<*APAendfloat> %% diff --git a/Master/texmf-dist/source/latex/apa7/apa7.ins b/Master/texmf-dist/source/latex/apa7/apa7.ins index e3b6e43277a..a264f390d66 100644 --- a/Master/texmf-dist/source/latex/apa7/apa7.ins +++ b/Master/texmf-dist/source/latex/apa7/apa7.ins @@ -79,18 +79,16 @@ and the derived files apa7.ins, apa7.cls, apa7.pdf, README, - APAamerican.txt, - APAbritish.txt, - APAdutch.txt, - APAenglish.txt, - APAgerman.txt, - APAngerman.txt, - APAgreek.txt, - APAczech.txt, - APAturkish.txt, - APAendfloat.cfg, - apa7.ptex, - TeX2WordForapa7.bas, + APA7american.txt, + APA7british.txt, + APA7dutch.txt, + APA7english.txt, + APA7german.txt, + APA7ngerman.txt, + APA7greek.txt, + APA7czech.txt, + APA7turkish.txt, + APA7endfloat.cfg, Figure1.pdf, shortsample.tex, longsample.tex, and @@ -103,16 +101,16 @@ and the derived files apa7.ins, } \usedir{tex/latex/apa7/config} \generate{ - \file{./config/APAamerican.txt}{\from{\jobname.dtx}{american}} - \file{./config/APAbritish.txt}{\from{\jobname.dtx}{british}} - \file{./config/APAdutch.txt}{\from{\jobname.dtx}{dutch}} - \file{./config/APAenglish.txt}{\from{\jobname.dtx}{english}} - \file{./config/APAgerman.txt}{\from{\jobname.dtx}{german}} - \file{./config/APAngerman.txt}{\from{\jobname.dtx}{ngerman}} - \file{./config/APAgreek.txt}{\from{\jobname.dtx}{greek}} - \file{./config/APAczech.txt}{\from{\jobname.dtx}{czech}} - \file{./config/APAturkish.txt}{\from{\jobname.dtx}{turkish}} - \file{./config/APAendfloat.cfg}{\from{\jobname.dtx}{APAendfloat}} + \file{./config/APA7american.txt}{\from{\jobname.dtx}{american}} + \file{./config/APA7british.txt}{\from{\jobname.dtx}{british}} + \file{./config/APA7dutch.txt}{\from{\jobname.dtx}{dutch}} + \file{./config/APA7english.txt}{\from{\jobname.dtx}{english}} + \file{./config/APA7german.txt}{\from{\jobname.dtx}{german}} + \file{./config/APA7ngerman.txt}{\from{\jobname.dtx}{ngerman}} + \file{./config/APA7greek.txt}{\from{\jobname.dtx}{greek}} + \file{./config/APA7czech.txt}{\from{\jobname.dtx}{czech}} + \file{./config/APA7turkish.txt}{\from{\jobname.dtx}{turkish}} + \file{./config/APA7endfloat.cfg}{\from{\jobname.dtx}{APAendfloat}} } \usedir{tex/latex/apa7/samples} \generate{ @@ -146,18 +144,16 @@ and the derived files apa7.ins, %% apa7.cls, %% apa7.pdf, %% README, -%% APAamerican.txt, -%% APAbritish.txt, -%% APAdutch.txt, -%% APAenglish.txt, -%% APAgerman.txt, -%% APAngerman.txt, -%% APAgreek.txt, -%% APAczech.txt, -%% APAturkish.txt, -%% APAendfloat.cfg, -%% apa7.ptex, -%% TeX2WordForapa7.bas, +%% APA7american.txt, +%% APA7british.txt, +%% APA7dutch.txt, +%% APA7english.txt, +%% APA7german.txt, +%% APA7ngerman.txt, +%% APA7greek.txt, +%% APA7czech.txt, +%% APA7turkish.txt, +%% APA7endfloat.cfg, %% Figure1.pdf, %% shortsample.tex, %% longsample.tex, and diff --git a/Master/texmf-dist/tex/latex/apa7/apa7.cls b/Master/texmf-dist/tex/latex/apa7/apa7.cls index 32a365dd7d1..40f95788974 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.01 APA formatting (7th edition)] +\ProvidesClass{apa7}[2019/12/29 v1.03 APA formatting (7th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% @@ -383,9 +383,9 @@ % last in the definition list, whether or not the babel % package is loaded by the current document - \@ifundefined{def@babel}% this is defined only if the user requested loading babel - {\def\@apaSeven@langfile{config/APAamerican.txt}} - {\def\@apaSeven@langfile{config/APA\languagename.txt}} +\@ifpackageloaded{babel}% this is defined only if the user requested loading babel + {\def\@apaSeven@langfile{config/APA7\languagename.txt}} + {\def\@apaSeven@langfile{config/APA7american.txt}} \InputIfFileExists{\@apaSeven@langfile}{}{% \ClassInfo{apa7}{Language definition file \@apaSeven@langfile\space not found} }% @@ -1864,18 +1864,16 @@ %% apa7.cls, %% apa7.pdf, %% README, -%% APAamerican.txt, -%% APAbritish.txt, -%% APAdutch.txt, -%% APAenglish.txt, -%% APAgerman.txt, -%% APAngerman.txt, -%% APAgreek.txt, -%% APAczech.txt, -%% APAturkish.txt, -%% APAendfloat.cfg, -%% apa7.ptex, -%% TeX2WordForapa7.bas, +%% APA7american.txt, +%% APA7british.txt, +%% APA7dutch.txt, +%% APA7english.txt, +%% APA7german.txt, +%% APA7ngerman.txt, +%% APA7greek.txt, +%% APA7czech.txt, +%% APA7turkish.txt, +%% APA7endfloat.cfg, %% Figure1.pdf, %% shortsample.tex, %% longsample.tex, and diff --git a/Master/texmf-dist/tex/latex/apa7/config/APAamerican.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7american.txt index dc265b0a1c0..07a4a490605 100644 --- a/Master/texmf-dist/tex/latex/apa7/config/APAamerican.txt +++ b/Master/texmf-dist/tex/latex/apa7/config/APA7american.txt @@ -1,5 +1,5 @@ %% -%% This is file `./config/APAamerican.txt', +%% This is file `./config/APA7american.txt', %% generated with the docstrip utility. %% %% The original source files were: @@ -27,7 +27,7 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesFile{APAamerican.txt}[2012/02/23 v1.25 apa7 configuration for American English] +\ProvidesFile{APA7american.txt}[2019/12/29 v1.00 apa7 configuration for American English] \renewcommand{\acksname}{Author Note} \renewcommand{\keywordname}{Keywords} @@ -57,22 +57,20 @@ %% apa7.cls, %% apa7.pdf, %% README, -%% APAamerican.txt, -%% APAbritish.txt, -%% APAdutch.txt, -%% APAenglish.txt, -%% APAgerman.txt, -%% APAngerman.txt, -%% APAgreek.txt, -%% APAczech.txt, -%% APAturkish.txt, -%% APAendfloat.cfg, -%% apa7.ptex, -%% TeX2WordForapa7.bas, +%% APA7american.txt, +%% APA7british.txt, +%% APA7dutch.txt, +%% APA7english.txt, +%% APA7german.txt, +%% APA7ngerman.txt, +%% APA7greek.txt, +%% APA7czech.txt, +%% APA7turkish.txt, +%% APA7endfloat.cfg, %% Figure1.pdf, %% shortsample.tex, %% longsample.tex, and %% bibliography.bib. %% %% -%% End of file `./config/APAamerican.txt'. +%% End of file `./config/APA7american.txt'. diff --git a/Master/texmf-dist/tex/latex/apa7/config/APAbritish.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7british.txt index 27f09e13471..51bf6009ab0 100644 --- a/Master/texmf-dist/tex/latex/apa7/config/APAbritish.txt +++ b/Master/texmf-dist/tex/latex/apa7/config/APA7british.txt @@ -1,5 +1,5 @@ %% -%% This is file `./config/APAbritish.txt', +%% This is file `./config/APA7british.txt', %% generated with the docstrip utility. %% %% The original source files were: @@ -27,7 +27,7 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesFile{APAbritish.txt}[2012/02/23 v1.25 apa7 configuration for British English] +\ProvidesFile{APA7british.txt}[2019/12/29 v1.00 apa7 configuration for British English] \renewcommand{\acksname}{Author Note} \renewcommand{\keywordname}{Keywords} @@ -57,22 +57,20 @@ %% apa7.cls, %% apa7.pdf, %% README, -%% APAamerican.txt, -%% APAbritish.txt, -%% APAdutch.txt, -%% APAenglish.txt, -%% APAgerman.txt, -%% APAngerman.txt, -%% APAgreek.txt, -%% APAczech.txt, -%% APAturkish.txt, -%% APAendfloat.cfg, -%% apa7.ptex, -%% TeX2WordForapa7.bas, +%% APA7american.txt, +%% APA7british.txt, +%% APA7dutch.txt, +%% APA7english.txt, +%% APA7german.txt, +%% APA7ngerman.txt, +%% APA7greek.txt, +%% APA7czech.txt, +%% APA7turkish.txt, +%% APA7endfloat.cfg, %% Figure1.pdf, %% shortsample.tex, %% longsample.tex, and %% bibliography.bib. %% %% -%% End of file `./config/APAbritish.txt'. +%% End of file `./config/APA7british.txt'. diff --git a/Master/texmf-dist/tex/latex/apa7/config/APAczech.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7czech.txt index 4203e9932c7..aa5633d2db0 100644 --- a/Master/texmf-dist/tex/latex/apa7/config/APAczech.txt +++ b/Master/texmf-dist/tex/latex/apa7/config/APA7czech.txt @@ -1,5 +1,5 @@ %% -%% This is file `./config/APAczech.txt', +%% This is file `./config/APA7czech.txt', %% generated with the docstrip utility. %% %% The original source files were: @@ -27,7 +27,7 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesFile{APAczech.txt}[2012/02/23 v1.25 apa7 configuration for Czech] +\ProvidesFile{APA7czech.txt}[2019/12/29 v1.00 apa7 configuration for Czech] \renewcommand{\acksname}{Poznámka~autora}% Author Note \renewcommand{\keywordname}{Klícová~1slova}% Keywords @@ -57,22 +57,20 @@ %% apa7.cls, %% apa7.pdf, %% README, -%% APAamerican.txt, -%% APAbritish.txt, -%% APAdutch.txt, -%% APAenglish.txt, -%% APAgerman.txt, -%% APAngerman.txt, -%% APAgreek.txt, -%% APAczech.txt, -%% APAturkish.txt, -%% APAendfloat.cfg, -%% apa7.ptex, -%% TeX2WordForapa7.bas, +%% APA7american.txt, +%% APA7british.txt, +%% APA7dutch.txt, +%% APA7english.txt, +%% APA7german.txt, +%% APA7ngerman.txt, +%% APA7greek.txt, +%% APA7czech.txt, +%% APA7turkish.txt, +%% APA7endfloat.cfg, %% Figure1.pdf, %% shortsample.tex, %% longsample.tex, and %% bibliography.bib. %% %% -%% End of file `./config/APAczech.txt'. +%% End of file `./config/APA7czech.txt'. diff --git a/Master/texmf-dist/tex/latex/apa7/config/APAdutch.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7dutch.txt index 5aefec9e33e..c5c64b5bb1b 100644 --- a/Master/texmf-dist/tex/latex/apa7/config/APAdutch.txt +++ b/Master/texmf-dist/tex/latex/apa7/config/APA7dutch.txt @@ -1,5 +1,5 @@ %% -%% This is file `./config/APAdutch.txt', +%% This is file `./config/APA7dutch.txt', %% generated with the docstrip utility. %% %% The original source files were: @@ -27,7 +27,7 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesFile{APAdutch.txt}[2012/02/23 v1.25 apa7 configuration for Dutch] +\ProvidesFile{APA7dutch.txt}[2019/12/29 v1.00 apa7 configuration for Dutch] \renewcommand{\acksname}{Auteursnoot}% Author Note \renewcommand{\keywordname}{Trefwoorden}% Keywords @@ -57,22 +57,20 @@ %% apa7.cls, %% apa7.pdf, %% README, -%% APAamerican.txt, -%% APAbritish.txt, -%% APAdutch.txt, -%% APAenglish.txt, -%% APAgerman.txt, -%% APAngerman.txt, -%% APAgreek.txt, -%% APAczech.txt, -%% APAturkish.txt, -%% APAendfloat.cfg, -%% apa7.ptex, -%% TeX2WordForapa7.bas, +%% APA7american.txt, +%% APA7british.txt, +%% APA7dutch.txt, +%% APA7english.txt, +%% APA7german.txt, +%% APA7ngerman.txt, +%% APA7greek.txt, +%% APA7czech.txt, +%% APA7turkish.txt, +%% APA7endfloat.cfg, %% Figure1.pdf, %% shortsample.tex, %% longsample.tex, and %% bibliography.bib. %% %% -%% End of file `./config/APAdutch.txt'. +%% End of file `./config/APA7dutch.txt'. diff --git a/Master/texmf-dist/tex/latex/apa7/config/APAendfloat.cfg b/Master/texmf-dist/tex/latex/apa7/config/APA7endfloat.cfg index 2108025c95d..feb2af203e8 100644 --- a/Master/texmf-dist/tex/latex/apa7/config/APAendfloat.cfg +++ b/Master/texmf-dist/tex/latex/apa7/config/APA7endfloat.cfg @@ -1,5 +1,5 @@ %% -%% This is file `./config/APAendfloat.cfg', +%% This is file `./config/APA7endfloat.cfg', %% generated with the docstrip utility. %% %% The original source files were: @@ -122,22 +122,20 @@ %% apa7.cls, %% apa7.pdf, %% README, -%% APAamerican.txt, -%% APAbritish.txt, -%% APAdutch.txt, -%% APAenglish.txt, -%% APAgerman.txt, -%% APAngerman.txt, -%% APAgreek.txt, -%% APAczech.txt, -%% APAturkish.txt, -%% APAendfloat.cfg, -%% apa7.ptex, -%% TeX2WordForapa7.bas, +%% APA7american.txt, +%% APA7british.txt, +%% APA7dutch.txt, +%% APA7english.txt, +%% APA7german.txt, +%% APA7ngerman.txt, +%% APA7greek.txt, +%% APA7czech.txt, +%% APA7turkish.txt, +%% APA7endfloat.cfg, %% Figure1.pdf, %% shortsample.tex, %% longsample.tex, and %% bibliography.bib. %% %% -%% End of file `./config/APAendfloat.cfg'. +%% End of file `./config/APA7endfloat.cfg'. diff --git a/Master/texmf-dist/tex/latex/apa7/config/APAenglish.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7english.txt index bf3368c6605..e76cef85428 100644 --- a/Master/texmf-dist/tex/latex/apa7/config/APAenglish.txt +++ b/Master/texmf-dist/tex/latex/apa7/config/APA7english.txt @@ -1,5 +1,5 @@ %% -%% This is file `./config/APAenglish.txt', +%% This is file `./config/APA7english.txt', %% generated with the docstrip utility. %% %% The original source files were: @@ -27,7 +27,7 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesFile{APAenglish.txt}[2012/02/23 v1.25 apa7 configuration for non-American English] +\ProvidesFile{APA7english.txt}[2019/12/29 v1.00 apa7 configuration for non-American English] \renewcommand{\acksname}{Author Note} \renewcommand{\keywordname}{Keywords} @@ -57,22 +57,20 @@ %% apa7.cls, %% apa7.pdf, %% README, -%% APAamerican.txt, -%% APAbritish.txt, -%% APAdutch.txt, -%% APAenglish.txt, -%% APAgerman.txt, -%% APAngerman.txt, -%% APAgreek.txt, -%% APAczech.txt, -%% APAturkish.txt, -%% APAendfloat.cfg, -%% apa7.ptex, -%% TeX2WordForapa7.bas, +%% APA7american.txt, +%% APA7british.txt, +%% APA7dutch.txt, +%% APA7english.txt, +%% APA7german.txt, +%% APA7ngerman.txt, +%% APA7greek.txt, +%% APA7czech.txt, +%% APA7turkish.txt, +%% APA7endfloat.cfg, %% Figure1.pdf, %% shortsample.tex, %% longsample.tex, and %% bibliography.bib. %% %% -%% End of file `./config/APAenglish.txt'. +%% End of file `./config/APA7english.txt'. diff --git a/Master/texmf-dist/tex/latex/apa7/config/APAgerman.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7german.txt index 3b74c0fc87c..e3cd2dfec7a 100644 --- a/Master/texmf-dist/tex/latex/apa7/config/APAgerman.txt +++ b/Master/texmf-dist/tex/latex/apa7/config/APA7german.txt @@ -1,5 +1,5 @@ %% -%% This is file `./config/APAgerman.txt', +%% This is file `./config/APA7german.txt', %% generated with the docstrip utility. %% %% The original source files were: @@ -27,7 +27,7 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesFile{APAgerman.txt}[2012/02/23 v1.25 apa7 configuration for German] +\ProvidesFile{APA7german.txt}[2019/12/29 v1.00 apa7 configuration for German] \renewcommand{\acksname}{Autorenhinweis}% Author Note \renewcommand{\keywordname}{Schl\"usselw\"orter}% Keywords @@ -57,22 +57,20 @@ %% apa7.cls, %% apa7.pdf, %% README, -%% APAamerican.txt, -%% APAbritish.txt, -%% APAdutch.txt, -%% APAenglish.txt, -%% APAgerman.txt, -%% APAngerman.txt, -%% APAgreek.txt, -%% APAczech.txt, -%% APAturkish.txt, -%% APAendfloat.cfg, -%% apa7.ptex, -%% TeX2WordForapa7.bas, +%% APA7american.txt, +%% APA7british.txt, +%% APA7dutch.txt, +%% APA7english.txt, +%% APA7german.txt, +%% APA7ngerman.txt, +%% APA7greek.txt, +%% APA7czech.txt, +%% APA7turkish.txt, +%% APA7endfloat.cfg, %% Figure1.pdf, %% shortsample.tex, %% longsample.tex, and %% bibliography.bib. %% %% -%% End of file `./config/APAgerman.txt'. +%% End of file `./config/APA7german.txt'. diff --git a/Master/texmf-dist/tex/latex/apa7/config/APAgreek.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7greek.txt index 946236f54bb..d61694753ab 100644 --- a/Master/texmf-dist/tex/latex/apa7/config/APAgreek.txt +++ b/Master/texmf-dist/tex/latex/apa7/config/APA7greek.txt @@ -1,5 +1,5 @@ %% -%% This is file `./config/APAgreek.txt', +%% This is file `./config/APA7greek.txt', %% generated with the docstrip utility. %% %% The original source files were: @@ -27,7 +27,7 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesFile{APAgreek.txt}[2012/02/23 v1.25 apa7 configuration for Greek] +\ProvidesFile{APA7greek.txt}[2019/12/29 v1.00 apa7 configuration for Greek] \renewcommand{\acksname}{Shmei'wseis tou suggraf'ea}% Author Note \renewcommand{\keywordname}{L'exeis kleidi'a}% Keywords @@ -57,22 +57,20 @@ %% apa7.cls, %% apa7.pdf, %% README, -%% APAamerican.txt, -%% APAbritish.txt, -%% APAdutch.txt, -%% APAenglish.txt, -%% APAgerman.txt, -%% APAngerman.txt, -%% APAgreek.txt, -%% APAczech.txt, -%% APAturkish.txt, -%% APAendfloat.cfg, -%% apa7.ptex, -%% TeX2WordForapa7.bas, +%% APA7american.txt, +%% APA7british.txt, +%% APA7dutch.txt, +%% APA7english.txt, +%% APA7german.txt, +%% APA7ngerman.txt, +%% APA7greek.txt, +%% APA7czech.txt, +%% APA7turkish.txt, +%% APA7endfloat.cfg, %% Figure1.pdf, %% shortsample.tex, %% longsample.tex, and %% bibliography.bib. %% %% -%% End of file `./config/APAgreek.txt'. +%% End of file `./config/APA7greek.txt'. diff --git a/Master/texmf-dist/tex/latex/apa7/config/APAngerman.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7ngerman.txt index d0a0fb31121..c19a981c661 100644 --- a/Master/texmf-dist/tex/latex/apa7/config/APAngerman.txt +++ b/Master/texmf-dist/tex/latex/apa7/config/APA7ngerman.txt @@ -1,5 +1,5 @@ %% -%% This is file `./config/APAngerman.txt', +%% This is file `./config/APA7ngerman.txt', %% generated with the docstrip utility. %% %% The original source files were: @@ -27,7 +27,7 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesFile{APAgerman.txt}[2012/02/23 v1.25 apa7 configuration for "new" German] +\ProvidesFile{APA7german.txt}[2019/12/29 v1.00 apa7 configuration for "new" German] \renewcommand{\acksname}{Autorenhinweis}% Author Note \renewcommand{\keywordname}{Schl\"usselw\"orter}% Keywords @@ -57,22 +57,20 @@ %% apa7.cls, %% apa7.pdf, %% README, -%% APAamerican.txt, -%% APAbritish.txt, -%% APAdutch.txt, -%% APAenglish.txt, -%% APAgerman.txt, -%% APAngerman.txt, -%% APAgreek.txt, -%% APAczech.txt, -%% APAturkish.txt, -%% APAendfloat.cfg, -%% apa7.ptex, -%% TeX2WordForapa7.bas, +%% APA7american.txt, +%% APA7british.txt, +%% APA7dutch.txt, +%% APA7english.txt, +%% APA7german.txt, +%% APA7ngerman.txt, +%% APA7greek.txt, +%% APA7czech.txt, +%% APA7turkish.txt, +%% APA7endfloat.cfg, %% Figure1.pdf, %% shortsample.tex, %% longsample.tex, and %% bibliography.bib. %% %% -%% End of file `./config/APAngerman.txt'. +%% End of file `./config/APA7ngerman.txt'. diff --git a/Master/texmf-dist/tex/latex/apa7/config/APAturkish.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7turkish.txt index ba90ff12e4b..61f20c2cb8c 100644 --- a/Master/texmf-dist/tex/latex/apa7/config/APAturkish.txt +++ b/Master/texmf-dist/tex/latex/apa7/config/APA7turkish.txt @@ -1,5 +1,5 @@ %% -%% This is file `./config/APAturkish.txt', +%% This is file `./config/APA7turkish.txt', %% generated with the docstrip utility. %% %% The original source files were: @@ -27,7 +27,7 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesFile{APAturkish.txt}[2016/05/26 v2.2 apa7 configuration for Turkish] +\ProvidesFile{APA7turkish.txt}[2019/12/29 v1.00 apa7 configuration for Turkish] \renewcommand{\acksname}{Yazar Notu}% Author Note \renewcommand{\keywordname}{Anahtar Kelimeler}% Keywords @@ -57,22 +57,20 @@ %% apa7.cls, %% apa7.pdf, %% README, -%% APAamerican.txt, -%% APAbritish.txt, -%% APAdutch.txt, -%% APAenglish.txt, -%% APAgerman.txt, -%% APAngerman.txt, -%% APAgreek.txt, -%% APAczech.txt, -%% APAturkish.txt, -%% APAendfloat.cfg, -%% apa7.ptex, -%% TeX2WordForapa7.bas, +%% APA7american.txt, +%% APA7british.txt, +%% APA7dutch.txt, +%% APA7english.txt, +%% APA7german.txt, +%% APA7ngerman.txt, +%% APA7greek.txt, +%% APA7czech.txt, +%% APA7turkish.txt, +%% APA7endfloat.cfg, %% Figure1.pdf, %% shortsample.tex, %% longsample.tex, and %% bibliography.bib. %% %% -%% End of file `./config/APAturkish.txt'. +%% End of file `./config/APA7turkish.txt'. |