diff options
17 files changed, 140 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/latex/apa6/apa6.pdf b/Master/texmf-dist/doc/latex/apa6/apa6.pdf Binary files differindex 9f950882f0c..6620cb6c45d 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/doc/latex/apa6/pseudoTeX/apa6.ptex b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex index b6caf8e97a3..1bd2f0fa0e1 100644 --- a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex +++ b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex @@ -256,7 +256,7 @@ %% and the derived files apa6.ins, %% apa6.cls, %% apa6.pdf, -%% README.txt, +%% README, %% APAamerican.txt, %% APAbritish.txt, %% APAdutch.txt, @@ -264,6 +264,7 @@ %% APAgerman.txt, %% APAngerman.txt, %% APAgreek.txt, +%% APAczech.txt, %% APAendfloat.cfg, %% apa6.ptex, %% Figure1.pdf, diff --git a/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib b/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib index 08bbd81cfbb..d59cf0084e3 100644 --- a/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib +++ b/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib @@ -212,7 +212,7 @@ the design of multimedia instruction}, %% and the derived files apa6.ins, %% apa6.cls, %% apa6.pdf, -%% README.txt, +%% README, %% APAamerican.txt, %% APAbritish.txt, %% APAdutch.txt, @@ -220,6 +220,7 @@ the design of multimedia instruction}, %% APAgerman.txt, %% APAngerman.txt, %% APAgreek.txt, +%% APAczech.txt, %% APAendfloat.cfg, %% apa6.ptex, %% Figure1.pdf, diff --git a/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex b/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex index 07631c8f281..3159c1696f8 100644 --- a/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex +++ b/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex @@ -207,7 +207,7 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] %% and the derived files apa6.ins, %% apa6.cls, %% apa6.pdf, -%% README.txt, +%% README, %% APAamerican.txt, %% APAbritish.txt, %% APAdutch.txt, @@ -215,6 +215,7 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] %% APAgerman.txt, %% APAngerman.txt, %% APAgreek.txt, +%% APAczech.txt, %% APAendfloat.cfg, %% apa6.ptex, %% Figure1.pdf, diff --git a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex index d78c0cd1fe3..06cbf83e656 100644 --- a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex +++ b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex @@ -144,7 +144,7 @@ skill in interpreting the results for the masses. %% and the derived files apa6.ins, %% apa6.cls, %% apa6.pdf, -%% README.txt, +%% README, %% APAamerican.txt, %% APAbritish.txt, %% APAdutch.txt, @@ -152,6 +152,7 @@ skill in interpreting the results for the masses. %% APAgerman.txt, %% APAngerman.txt, %% APAgreek.txt, +%% APAczech.txt, %% APAendfloat.cfg, %% apa6.ptex, %% Figure1.pdf, diff --git a/Master/texmf-dist/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx index 57edb6ff71a..637aae3e855 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/25 v1.26 APA formatting (6th edition)] +%<class>\ProvidesClass{apa6}[2012/03/24 v1.27 APA formatting (6th edition)] % % %<*internal> % -\def\apaSixVersionDate{2012/02/25} -\def\apaSixVersionNumber{1.26} +\def\apaSixVersionDate{2012/03/24} +\def\apaSixVersionNumber{1.27} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -107,7 +107,7 @@ This work consists of the file apa6.dtx and the derived files apa6.ins, apa6.cls, apa6.pdf, - README.txt, + README, APAamerican.txt, APAbritish.txt, APAdutch.txt, @@ -115,6 +115,7 @@ and the derived files apa6.ins, APAgerman.txt, APAngerman.txt, APAgreek.txt, + APAczech.txt, APAendfloat.cfg, apa6.ptex, Figure1.pdf, @@ -136,6 +137,7 @@ and the derived files apa6.ins, \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/APAendfloat.cfg}{\from{\jobname.dtx}{APAendfloat}} } \usedir{tex/latex/apa6/samples} @@ -249,6 +251,7 @@ and the derived files apa6.ins, % \changes{v1.25}{2012/02/23}{Localized `Keywords' label (in config file)} % % +% % \begin{abstract} % The \textit{Publication Manual} of the American Psychological % Association is widely used in the social sciences. The most @@ -788,6 +791,12 @@ and the derived files apa6.ins, % have one readily available (the conversion process does not require % a \TeX\ installation to be present). % +% Another pretty good solution is the Nitro software +% (\url{http://www.nitropdf.com/}), which does a good job with +% maintaining bibliographic information but distorts some font +% formatting. Nitro converts from PDF to Word rather than using the +% raw .tex file. +% % \section{Dependencies} % \textsf{apa6} automatically loads the following packages. If these % packages are not already installed, producing the first @@ -2712,7 +2721,7 @@ and the derived files apa6.ins, {\par \parbox{4.6875in} {\small \noindent \@abstract \@ifundefined{@keywords}{}{% - \par\vspace{0.12in}\raggedright\textit{Keywords:} \@keywords% + \par\vspace{0.12in}\raggedright\textit{\keywordname:} \@keywords% }% } \vspace{0.24in}% @@ -3035,7 +3044,7 @@ and the derived files apa6.ins, \parbox{5in}{\@abstract% \@ifundefined{@keywords}{}{% - \par\vspace{0.12in}\textit{Keywords:} \@keywords% + \par\vspace{0.12in}\textit{\keywordname:} \@keywords% }% }\vspace{0.25in}% } @@ -3954,6 +3963,20 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] % \end{macrocode} %\end{macro} % +%\begin{macro}{APAczech.txt} +% \begin{macrocode} +%<*czech> +\ProvidesFile{APAgreek.txt}[2012/02/23 v1.25 apa6 configuration for Czech] + +\renewcommand{\rheadname}{Záhlaví}% Running head +\renewcommand{\acksname}{Poznámka~autora}% Author Note +\renewcommand{\keywordname}{Klícová~1slova}% Keywords +\renewcommand{\notesname}{Poznámky}% Footnotes + +%</czech> +% \end{macrocode} +%\end{macro} +% %\begin{macro}{APAendfloat.cfg} % \begin{macrocode} %<*APAendfloat> diff --git a/Master/texmf-dist/source/latex/apa6/apa6.ins b/Master/texmf-dist/source/latex/apa6/apa6.ins index 315a1627b31..9c8164b1dd0 100644 --- a/Master/texmf-dist/source/latex/apa6/apa6.ins +++ b/Master/texmf-dist/source/latex/apa6/apa6.ins @@ -78,7 +78,7 @@ This work consists of the file apa6.dtx and the derived files apa6.ins, apa6.cls, apa6.pdf, - README.txt, + README, APAamerican.txt, APAbritish.txt, APAdutch.txt, @@ -86,6 +86,7 @@ and the derived files apa6.ins, APAgerman.txt, APAngerman.txt, APAgreek.txt, + APAczech.txt, APAendfloat.cfg, apa6.ptex, Figure1.pdf, @@ -107,6 +108,7 @@ and the derived files apa6.ins, \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/APAendfloat.cfg}{\from{\jobname.dtx}{APAendfloat}} } \usedir{tex/latex/apa6/samples} @@ -144,7 +146,7 @@ and the derived files apa6.ins, %% and the derived files apa6.ins, %% apa6.cls, %% apa6.pdf, -%% README.txt, +%% README, %% APAamerican.txt, %% APAbritish.txt, %% APAdutch.txt, @@ -152,6 +154,7 @@ and the derived files apa6.ins, %% APAgerman.txt, %% APAngerman.txt, %% APAgreek.txt, +%% APAczech.txt, %% APAendfloat.cfg, %% apa6.ptex, %% Figure1.pdf, diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls index 494ec3f7f90..1bf9f200803 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/25 v1.26 APA formatting (6th edition)] +\ProvidesClass{apa6}[2012/03/24 v1.27 APA formatting (6th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% @@ -1399,7 +1399,7 @@ {\par \parbox{4.6875in} {\small \noindent \@abstract \@ifundefined{@keywords}{}{% - \par\vspace{0.12in}\raggedright\textit{Keywords:} \@keywords% + \par\vspace{0.12in}\raggedright\textit{\keywordname:} \@keywords% }% } \vspace{0.24in}% @@ -1646,7 +1646,7 @@ \parbox{5in}{\@abstract% \@ifundefined{@keywords}{}{% - \par\vspace{0.12in}\textit{Keywords:} \@keywords% + \par\vspace{0.12in}\textit{\keywordname:} \@keywords% }% }\vspace{0.25in}% } @@ -1755,7 +1755,7 @@ %% and the derived files apa6.ins, %% apa6.cls, %% apa6.pdf, -%% README.txt, +%% README, %% APAamerican.txt, %% APAbritish.txt, %% APAdutch.txt, @@ -1763,6 +1763,7 @@ %% APAgerman.txt, %% APAngerman.txt, %% APAgreek.txt, +%% APAczech.txt, %% APAendfloat.cfg, %% apa6.ptex, %% Figure1.pdf, diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt b/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt index 947147ebfdc..16e26be83fe 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt @@ -57,7 +57,7 @@ %% and the derived files apa6.ins, %% apa6.cls, %% apa6.pdf, -%% README.txt, +%% README, %% APAamerican.txt, %% APAbritish.txt, %% APAdutch.txt, @@ -65,6 +65,7 @@ %% APAgerman.txt, %% APAngerman.txt, %% APAgreek.txt, +%% APAczech.txt, %% APAendfloat.cfg, %% apa6.ptex, %% Figure1.pdf, diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt b/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt index 639461ecf4b..301d6aacc54 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt @@ -57,7 +57,7 @@ %% and the derived files apa6.ins, %% apa6.cls, %% apa6.pdf, -%% README.txt, +%% README, %% APAamerican.txt, %% APAbritish.txt, %% APAdutch.txt, @@ -65,6 +65,7 @@ %% APAgerman.txt, %% APAngerman.txt, %% APAgreek.txt, +%% APAczech.txt, %% APAendfloat.cfg, %% apa6.ptex, %% Figure1.pdf, diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt b/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt new file mode 100644 index 00000000000..d6f6e4d6b46 --- /dev/null +++ b/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt @@ -0,0 +1,77 @@ +%% +%% This is file `./config/APAczech.txt', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% apa6.dtx (with options: `czech') +%% ---------------------------------------------------------------------- +%% +%% apa6 - A LaTeX class for formatting documents in compliance with the +%% American Psychological Association's Publication Manual, 6th edition +%% +%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% +%% 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: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% Users may freely modify these files without permission, as long as the +%% copyright line and this statement are maintained intact. +%% +%% This work is not endorsed by, affiliated with, or probably even known +%% by, the American Psychological Association. +%% +%% ---------------------------------------------------------------------- +%% +\ProvidesFile{APAgreek.txt}[2012/02/23 v1.25 apa6 configuration for Czech] + +\renewcommand{\rheadname}{Záhlaví}% Running head +\renewcommand{\acksname}{Poznámka~autora}% Author Note +\renewcommand{\keywordname}{Klícová~1slova}% Keywords +\renewcommand{\notesname}{Poznámky}% Footnotes + +%% +%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% +%% 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: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% Users may freely modify these files without permission, as long as the +%% copyright line and this statement are maintained intact. +%% +%% This work is not endorsed by, affiliated with, or probably even known +%% by, the American Psychological Association. +%% +%% This work is "maintained" (as per LPPL maintenance status) by +%% Brian D. Beitzel. +%% +%% This work consists of the file apa6.dtx +%% and the derived files apa6.ins, +%% apa6.cls, +%% apa6.pdf, +%% README, +%% APAamerican.txt, +%% APAbritish.txt, +%% APAdutch.txt, +%% APAenglish.txt, +%% APAgerman.txt, +%% APAngerman.txt, +%% APAgreek.txt, +%% APAczech.txt, +%% APAendfloat.cfg, +%% apa6.ptex, +%% Figure1.pdf, +%% shortsample.tex, +%% longsample.tex, and +%% bibliography.bib. +%% +%% +%% End of file `./config/APAczech.txt'. diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt b/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt index 6678121c7b0..32292a3a764 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt @@ -57,7 +57,7 @@ %% and the derived files apa6.ins, %% apa6.cls, %% apa6.pdf, -%% README.txt, +%% README, %% APAamerican.txt, %% APAbritish.txt, %% APAdutch.txt, @@ -65,6 +65,7 @@ %% APAgerman.txt, %% APAngerman.txt, %% APAgreek.txt, +%% APAczech.txt, %% APAendfloat.cfg, %% apa6.ptex, %% Figure1.pdf, diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg b/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg index ca479ccf0b7..26d68dbaa3b 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg +++ b/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg @@ -121,7 +121,7 @@ %% and the derived files apa6.ins, %% apa6.cls, %% apa6.pdf, -%% README.txt, +%% README, %% APAamerican.txt, %% APAbritish.txt, %% APAdutch.txt, @@ -129,6 +129,7 @@ %% APAgerman.txt, %% APAngerman.txt, %% APAgreek.txt, +%% APAczech.txt, %% APAendfloat.cfg, %% apa6.ptex, %% Figure1.pdf, diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt b/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt index 184f6013ae1..10aceb588e3 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt @@ -57,7 +57,7 @@ %% and the derived files apa6.ins, %% apa6.cls, %% apa6.pdf, -%% README.txt, +%% README, %% APAamerican.txt, %% APAbritish.txt, %% APAdutch.txt, @@ -65,6 +65,7 @@ %% APAgerman.txt, %% APAngerman.txt, %% APAgreek.txt, +%% APAczech.txt, %% APAendfloat.cfg, %% apa6.ptex, %% Figure1.pdf, diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt b/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt index 2e5325c9b17..5d55cc6107e 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt @@ -57,7 +57,7 @@ %% and the derived files apa6.ins, %% apa6.cls, %% apa6.pdf, -%% README.txt, +%% README, %% APAamerican.txt, %% APAbritish.txt, %% APAdutch.txt, @@ -65,6 +65,7 @@ %% APAgerman.txt, %% APAngerman.txt, %% APAgreek.txt, +%% APAczech.txt, %% APAendfloat.cfg, %% apa6.ptex, %% Figure1.pdf, diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt b/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt index 83c9a7cdfa3..177c8a8039d 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt @@ -57,7 +57,7 @@ %% and the derived files apa6.ins, %% apa6.cls, %% apa6.pdf, -%% README.txt, +%% README, %% APAamerican.txt, %% APAbritish.txt, %% APAdutch.txt, @@ -65,6 +65,7 @@ %% APAgerman.txt, %% APAngerman.txt, %% APAgreek.txt, +%% APAczech.txt, %% APAendfloat.cfg, %% apa6.ptex, %% Figure1.pdf, diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt b/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt index 9d2e3b93f7d..f09f8d630bc 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt @@ -57,7 +57,7 @@ %% and the derived files apa6.ins, %% apa6.cls, %% apa6.pdf, -%% README.txt, +%% README, %% APAamerican.txt, %% APAbritish.txt, %% APAdutch.txt, @@ -65,6 +65,7 @@ %% APAgerman.txt, %% APAngerman.txt, %% APAgreek.txt, +%% APAczech.txt, %% APAendfloat.cfg, %% apa6.ptex, %% Figure1.pdf, |