apa6 (2dec11)

git-svn-id: svn://tug.org/texlive/trunk@24723 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 70 insertions, 31 deletions

diff --git a/Master/texmf-dist/doc/latex/apa6/apa6.pdf b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
index 5aa4f403d50..a74865eeba9 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/samples/longsample.pdf b/Master/texmf-dist/doc/latex/apa6/samples/longsample.pdf
index 3e924f8c547..f2c3786f2e5 100644
--- a/Master/texmf-dist/doc/latex/apa6/samples/longsample.pdf
+++ b/Master/texmf-dist/doc/latex/apa6/samples/longsample.pdf
diff --git a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.pdf b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.pdf
index 3a0541d398f..38a4950b331 100644
--- a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.pdf
+++ b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.pdf
diff --git a/Master/texmf-dist/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx
index ed6b2f7be67..e1fe978f456 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}[2011/11/28 v1.01 APA formatting (6th edition)]
+%<class>\ProvidesClass{apa6}[2011/12/01 v1.02 APA formatting (6th edition)]
 %                                                                           %
 %<*internal>                                                                %
-\def\apaSixVersionDate{2011/11/28}
-\def\apaSixVersionNumber{1.01}
+\def\apaSixVersionDate{2011/12/01}
+\def\apaSixVersionNumber{1.02}
 %                                                                           %
 %                                                                           %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -211,6 +211,9 @@ and the derived files           apa6.ins,
 % \changes{v1.01}{2011/11/28}{Minor changes in `apa6.ptex' to
 % accommodate the \cs{note} command.}
 %
+% \changes{v1.02}{2011/12/01}{More reliable font-size selection}
+% \changes{v1.02}{2011/12/01}{Corrected default mode to jou}
+%
 % \begin{abstract}
 %   The \textit{Publication Manual} of the American Psychological
 %   Association is widely used in the social sciences.  The most
@@ -1017,37 +1020,55 @@ and the derived files           apa6.ins,
 
 \DeclareOption{mask}{\def\apaSix@maskauthoridentity{\relax}}  % BDB
 
+% declare the font-size commands
+\newcommand\apaSix@ptsize{}
+\newcommand\apaSix@noptsize{}
+\DeclareOption{10pt}{\renewcommand\apaSix@ptsize{10pt}}
+\DeclareOption{11pt}{\renewcommand\apaSix@ptsize{11pt}}
+\DeclareOption{12pt}{\renewcommand\apaSix@ptsize{12pt}}
+
+
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
 
 \ProcessOptions\relax
 
+% make jou the default if no other options have been specified
+\@ifundefined{def@man}{%
+ \@ifundefined{def@doc}{%
+  \@ifundefined{def@jou}{%
+   \def\def@jou{\@joumode}
+   \ClassWarningNoLine{apa6}{Using default mode (jou)}
+  }{}
+ }{}
+}{}
+
 % pass the default font-size to the article class
 \@ifundefined{def@man}{%
     \@ifundefined{def@jou}{%
         \@ifundefined{def@doc}{%
         }{% doc
-            \LoadClass[11pt]{article}
+          \ifx\apaSix@ptsize\apaSix@noptsize
+            \LoadClass[11pt,twoside]{article} % default for doc is 11pt
+          \else
+            \LoadClass[\apaSix@ptsize]{article}
+          \fi
         }
     }{% jou
-        \LoadClass[11pt,twoside]{article}
+      \ifx\apaSix@ptsize\apaSix@noptsize
+        \LoadClass[10pt,twoside]{article} % default for jou is 10pt
+      \else
+        \LoadClass[\apaSix@ptsize,twoside]{article}
+      \fi
     }
 }{% man
-    \LoadClass[12pt]{article}
+  \ifx\apaSix@ptsize\apaSix@noptsize
+    \LoadClass[12pt,twoside]{article} % default for man is 12pt
+  \else
+    \LoadClass[\apaSix@ptsize]{article}
+  \fi
 }
 
 
-
-% make jou the default if no other options have been specified
-\@ifundefined{def@man}{%
- \@ifundefined{def@doc}{%
-  \@ifundefined{def@jou}{%
-   \def\def@doc{\@joumode}
-   \ClassWarningNoLine{apa6}{Using default mode (jou)}
-  }{}
- }{}
-}{}
-
-
 % determine the bibliography package, and load it if selected through the appropriate \documentclass option
 \@ifundefined{def@apacite}{%
   \@ifundefined{def@natbib}{%
diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls
index f93b34e060b..6cfa6ac6587 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}[2011/11/28 v1.01 APA formatting (6th edition)]
+\ProvidesClass{apa6}[2011/12/01 v1.02 APA formatting (6th edition)]
 \NeedsTeXFormat{LaTeX2e}
 
 \DeclareOption{man}{%
@@ -109,32 +109,50 @@
 
 \DeclareOption{mask}{\def\apaSix@maskauthoridentity{\relax}}  % BDB
 
+\newcommand\apaSix@ptsize{}
+\newcommand\apaSix@noptsize{}
+\DeclareOption{10pt}{\renewcommand\apaSix@ptsize{10pt}}
+\DeclareOption{11pt}{\renewcommand\apaSix@ptsize{11pt}}
+\DeclareOption{12pt}{\renewcommand\apaSix@ptsize{12pt}}
+
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
 
 \ProcessOptions\relax
 
 \@ifundefined{def@man}{%
+ \@ifundefined{def@doc}{%
+  \@ifundefined{def@jou}{%
+   \def\def@jou{\@joumode}
+   \ClassWarningNoLine{apa6}{Using default mode (jou)}
+  }{}
+ }{}
+}{}
+
+\@ifundefined{def@man}{%
     \@ifundefined{def@jou}{%
         \@ifundefined{def@doc}{%
         }{% doc
-            \LoadClass[11pt]{article}
+          \ifx\apaSix@ptsize\apaSix@noptsize
+            \LoadClass[11pt,twoside]{article} % default for doc is 11pt
+          \else
+            \LoadClass[\apaSix@ptsize]{article}
+          \fi
         }
     }{% jou
-        \LoadClass[11pt,twoside]{article}
+      \ifx\apaSix@ptsize\apaSix@noptsize
+        \LoadClass[10pt,twoside]{article} % default for jou is 10pt
+      \else
+        \LoadClass[\apaSix@ptsize,twoside]{article}
+      \fi
     }
 }{% man
-    \LoadClass[12pt]{article}
+  \ifx\apaSix@ptsize\apaSix@noptsize
+    \LoadClass[12pt,twoside]{article} % default for man is 12pt
+  \else
+    \LoadClass[\apaSix@ptsize]{article}
+  \fi
 }
 
-\@ifundefined{def@man}{%
- \@ifundefined{def@doc}{%
-  \@ifundefined{def@jou}{%
-   \def\def@doc{\@joumode}
-   \ClassWarningNoLine{apa6}{Using default mode (jou)}
-  }{}
- }{}
-}{}
-
 \@ifundefined{def@apacite}{%
   \@ifundefined{def@natbib}{%
     \@ifundefined{def@biblatex}{%