2015-03-30 23:36:00

1 files changed, 16 insertions, 18 deletions

diff --git a/tex/context/base/publ-imp-apa.mkvi b/tex/context/base/publ-imp-apa.mkvi
index c812a76be..3651fd036 100644
--- a/tex/context/base/publ-imp-apa.mkvi
+++ b/tex/context/base/publ-imp-apa.mkvi
@@ -27,6 +27,18 @@
 %D }
 %D \stopTEX
 
+% set ALL specific APA compliant values
+
+\definebtx
+  [apa]
+  [\c!default=default,
+   \c!specification=apa,
+   \c!otherstext={\space\btxlabeltext{apa:others}},
+   %c!journalconversion=\v!normal,
+   \c!monthconversion=\v!month]
+
+% First, define list and rendering parameters
+
 % The APA style sorts the unnumbered rendered list by authoryear
 
 \definebtxrendering
@@ -42,15 +54,6 @@
    \c!distance=.5\emwidth,
    \c!margin=3\emwidth]
 
-% set ALL specific APA compliant values
-
-\definebtx
-  [apa]
-  [\c!default=default,
-   \c!otherstext={\space\btxlabeltext{apa:others}},
-   %c!journalconversion=\v!normal,
-   \c!monthconversion=\v!month]
-
 \definebtx
   [apa:list]
   [apa]
@@ -62,8 +65,6 @@
    \c!separator:names:3={,\nobreakspace\textampersand\space}, % comma separated list
    \c!separator:names:4= {\nobreakspace\textampersand\space}] % last of two, no comma!
 
-% The following are similar to default, but inherit from apa:list
-
 \definebtx
   [apa:list:author]
   [apa:list]
@@ -225,11 +226,11 @@
   [apa:page]
   [\c!command={\wordright}]
 
-% The APA style defines authoryear citations.
+% Then define and set cite parameters.
 
 \definebtx
   [apa:cite]
-  [apa:list]
+  [apa]
   [\c!alternative=authoryear,
    \c!otherstext={,\space\btxlabeltext{apa:others}},
    \c!etallimit=5,
@@ -244,8 +245,6 @@
   [apa:cite:author]
   [apa:cite]
 
-% The following are similar to default, but inherit from apa:cite
-
 \definebtx
   [apa:cite:authoryear]
   [apa:cite:author]
@@ -441,8 +440,6 @@
    apa:Retrieved={Available from},    % {Retrieved from},
    apa:In=In]
 
-% Check this (google translate!!):
-
 \setupbtxlabeltext
   [nl]
   [apa:and=en,
@@ -791,7 +788,8 @@
             \texdefinition{btx:apa:suffixedyear}
             \btxrightparenthesis
         }
-    \btxperiod % outside of interaction
+    % outside of interaction
+    \btxperiod
     \doif {\btxfoundname{author}} {title} {
         \setmode{btx:apa:title-placed}
     }