summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-07-03 20:45:01 +0000
committerKarl Berry <karl@freefriends.org>2016-07-03 20:45:01 +0000
commit97e6a48f1a9e44e729537262aeed3cd8a2d628cb (patch)
tree7f269cacb11a0f96ceb1d84582e4bc3c24997f4c /Master
parentf0c23554405bd929a290a9a0532aeecaaf94a255 (diff)
apa6 (3jul16)
git-svn-id: svn://tug.org/texlive/trunk@41609 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/apa6/apa6.pdfbin594358 -> 595373 bytes
-rw-r--r--Master/texmf-dist/source/latex/apa6/apa6.dtx29
-rw-r--r--Master/texmf-dist/tex/latex/apa6/apa6.cls10
3 files changed, 33 insertions, 6 deletions
diff --git a/Master/texmf-dist/doc/latex/apa6/apa6.pdf b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
index 30e8274995d..d162328f0d5 100644
--- a/Master/texmf-dist/doc/latex/apa6/apa6.pdf
+++ b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx
index 74e2d06457a..a8367d86142 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}[2016/05/26 v2.20 APA formatting (6th edition)]
+%<class>\ProvidesClass{apa6}[2016/07/02 v2.22 APA formatting (6th edition)]
% %
%<*internal> %
-\def\apaSixVersionDate{2016/05/26}
-\def\apaSixVersionNumber{2.20}
+\def\apaSixVersionDate{2016/07/02}
+\def\apaSixVersionNumber{2.22}
% %
% %
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -293,6 +293,11 @@ and the derived files apa6.ins,
% \changes{v2.20}{2016/05/26}{Added Turkish localization file}
% \changes{v2.20}{2016/05/26}{Corrected `doc' mode to be one-sided}
%
+% \changes{v2.21}{2016/07/02}{Added code to be more friendly to
+% rotated tables in `man' mode}
+%
+% \changes{v2.22}{2016/07/02}{Bug fix for `floatsintext' option with
+% sideways tables}%
%
% \begin{abstract}
% The \textit{Publication Manual} of the American Psychological
@@ -392,8 +397,13 @@ and the derived files apa6.ins,
% 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
-% be necessary in conjunction with \textsf{rotating} package (and
-% its |\sideways| command) to produce rotated tables.
+% be necessary in conjunction with the \textsf{rotating} package
+% (and its |\sideways| command) to produce rotated tables; this
+% works for |man| mode only. For rotated tables in |jou| or |doc|
+% mode, the \textsf{rotating} package may be used. If sideways
+% tables get pushed to the end of your document with the
+% |floatsintext| option, try using the |ph!| placement specifier for
+% your sideways table(s); for example, |\begin{sidewaystable}[ph!]|.
% \item \DescribeMacro{notxfonts}|notxfonts|: In |jou| mode, prevents
% \textsf{txfonts} from loading, in case \textsf{pslatex} or
% \textsf{times} is preferable for some reason.
@@ -2370,6 +2380,15 @@ and the derived files apa6.ins,
\endlinechar`\^^M \catcode`\^^M=12 \ef@xtable%
\fi
}%
+
+% for rotated tables, per Ulrike Fischer: http://tex.stackexchange.com/a/79843
+ \AtEndPreamble{%
+ \@ifpackageloaded{rotating}{%
+ \DeclareDelayedFloatFlavor{sidewaystable}{table}
+ \DeclareDelayedFloatFlavor{sidewaysfigure}{figure}
+ }{}%
+ }%
+
}{%
\RequirePackage{float}
\floatplacement{figure}{htb}
diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls
index 544717e0037..7fc6a46e24a 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}[2016/05/26 v2.20 APA formatting (6th edition)]
+\ProvidesClass{apa6}[2016/07/02 v2.22 APA formatting (6th edition)]
\NeedsTeXFormat{LaTeX2e}
\DeclareOption{man}{%
@@ -1046,6 +1046,14 @@
\endlinechar`\^^M \catcode`\^^M=12 \ef@xtable%
\fi
}%
+
+ \AtEndPreamble{%
+ \@ifpackageloaded{rotating}{%
+ \DeclareDelayedFloatFlavor{sidewaystable}{table}
+ \DeclareDelayedFloatFlavor{sidewaysfigure}{figure}
+ }{}%
+ }%
+
}{%
\RequirePackage{float}
\floatplacement{figure}{htb}