summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-12-30 22:16:14 +0000
committerKarl Berry <karl@freefriends.org>2019-12-30 22:16:14 +0000
commitf56dddc3f3fce9850405369b12615d3544254bee (patch)
tree92bceddd207e8fd605e3fa6325372a980fc5ff96 /Master/texmf-dist/source
parent7d9b6f976db70d076719678e4e6f2bda2dc7ee8f (diff)
apa7 (30dec19)
git-svn-id: svn://tug.org/texlive/trunk@53269 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/apa7/apa7.dtx98
-rw-r--r--Master/texmf-dist/source/latex/apa7/apa7.ins64
2 files changed, 80 insertions, 82 deletions
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