2015-04-18 14:44:00

1 files changed, 22 insertions, 6 deletions

diff --git a/tex/context/base/publ-imp-apa.mkvi b/tex/context/base/publ-imp-apa.mkvi
index a6b9ffa70..a1814b0a4 100644
--- a/tex/context/base/publ-imp-apa.mkvi
+++ b/tex/context/base/publ-imp-apa.mkvi
@@ -65,6 +65,8 @@
    \c!separator:names:3={,\nobreakspace\textampersand\space}, % comma separated list
    \c!separator:names:4={\nobreakspace\textampersand\space}] % last of two, no comma!
 
+% First, we define a namespace for a few special fields
+
 \definebtx
   [apa:list:author]
   [apa:list]
@@ -93,6 +95,8 @@
   [apa:list:short]
   [apa:list]
 
+% Next, we define a namespace for each category
+
 %D In order to be able to get journals expanded (or normalized or abbreviated) you need
 %D to load a list:
 %D
@@ -100,7 +104,6 @@
 %D \btxloadjournallist[journals.txt] % the jabref list
 %D \stoptyping
 
-% TODO
 
 \definebtx
   [apa:list:journal]
@@ -198,6 +201,14 @@
   [apa:list:title]
 
 \definebtx
+  [apa:list:title:music]
+  [apa:list:title]
+
+\definebtx
+  [apa:list:title:film]
+  [apa:list:title]
+
+\definebtx
   [apa:list:title:other]
   [apa:list:title]
 
@@ -282,10 +293,8 @@
    \c!right={]\poppunctuation}]
 
 \definebtx
-  [apa:cite:author:year] % todo
-  [apa:cite:authoryear]
-  [\c!left=(,
-   \c!right=)]
+  [apa:cite:author:year] % todo 
+  [apa:cite]
 
 \definebtx
   [apa:cite:author:years] % todo
@@ -410,6 +419,8 @@
    \c!separator:3=\btxparameter{\c!separator:2},
    \c!separator:4=\btxparameter{\c!separator:2}]
 
+% Now we setup for the details of the renderings
+
 %D Sometimes we have verbose injections in an entry and these can be language
 %D dependent, so we use labels.
 %D
@@ -601,6 +612,8 @@
 
 % cite setups
 
+% The following differs from the default returning n.d. if year is empty
+
 \startsetups btx:apa:cite:author:year
     \texdefinition{\s!btx:\s!cite:concat}
     \btxparameter\c!left
@@ -630,6 +643,8 @@
     \fastsetup{btx:apa:cite:author:year}
 \stopsetups
 
+% The following differs from the default by including the labels p. and pp.
+
 \startsetups btx:apa:page:list
     \fastsetup{\s!btx:\s!page:concat}
     \ifx\currentbtxlastpage\empty
@@ -666,7 +681,7 @@
 % It can be removed using the command:
 % \resetsetups [apa:list:sameauthor]
 
-% Or texdefinition?
+% :rule, :empty or :ditto ...
 
 \startsetups apa:list:sameauthor
     \fastsetup{apa:list:sameauthor:rule}
@@ -678,6 +693,7 @@
        \c!height=1.5\linewidth]% \linewidth is just too thin with respect to font strokes...
 \stopsetups
 
+
 \startsetups [apa:list:sameauthor:\v!empty]
     \kern\dimexpr\listparameter\c!margin-\interwordspace\relax
 \stopsetups