summaryrefslogtreecommitdiff
path: root/tex/context/base/mkiv/publ-imp-apa.mkvi
diff options
context:
space:
mode:
authorContext Git Mirror Bot <phg42.2a@gmail.com>2016-08-26 16:29:15 +0200
committerContext Git Mirror Bot <phg42.2a@gmail.com>2016-08-26 16:29:15 +0200
commit2146c5714b53b92df35551a989cbe1db7b290829 (patch)
treec5082e64775784c5aee84039b6bf316e75c155a7 /tex/context/base/mkiv/publ-imp-apa.mkvi
parentacf69d3d7873025941544add3ba168b367c84edd (diff)
downloadcontext-2146c5714b53b92df35551a989cbe1db7b290829.tar.gz
2016-08-26 15:40:00
Diffstat (limited to 'tex/context/base/mkiv/publ-imp-apa.mkvi')
-rw-r--r--tex/context/base/mkiv/publ-imp-apa.mkvi22
1 files changed, 12 insertions, 10 deletions
diff --git a/tex/context/base/mkiv/publ-imp-apa.mkvi b/tex/context/base/mkiv/publ-imp-apa.mkvi
index 9492b44e8..6aa589478 100644
--- a/tex/context/base/mkiv/publ-imp-apa.mkvi
+++ b/tex/context/base/mkiv/publ-imp-apa.mkvi
@@ -35,7 +35,11 @@
\c!specification=apa,
\c!otherstext={\btxspace\btxlabeltext{others}},
%c!journalconversion=\v!normal,
- \c!monthconversion=\v!month]
+ \c!monthconversion=\v!month,
+ \c!stopper:initials={. }, % with a (breakable) space
+ \c!separator:names:2={\btxcomma}, % aka namesep - in this namespace
+ \c!separator:names:3={\btxcomma\btxnobreakspace\textampersand\space}, % comma separated list
+ \c!separator:names:4={\btxnobreakspace\textampersand\space}] % last of two, no comma!
% First, define list and rendering parameters
@@ -61,10 +65,7 @@
\c!etallimit=7,
\c!etaldisplay=6,
\c!etaloption=last,
- \c!authorconversion=invertedshort,
- \c!separator:names:2={\btxcomma}, % aka namesep - in this namespace
- \c!separator:names:3={\btxcomma\btxnobreakspace\textampersand\space}, % comma separated list
- \c!separator:names:4={\btxnobreakspace\textampersand\space}] % last of two, no comma!
+ \c!authorconversion=invertedshort]
% First, we define a namespace for a few special fields
@@ -280,7 +281,6 @@
\c!authorconversion=\v!name,
\c!sorttype=normal,
\c!compress=\v!yes, % note that cite sorts only work with compress=yes.
- \c!separator:names:2={\btxcomma},
\c!separator:names:3={\btxcomma\btxlabeltext{and}\space}, % not \textampersand
\c!separator:names:4={\btxspace\btxlabeltext{and}\space}] % not \textampersand
@@ -319,8 +319,8 @@
[\c!left={(},
\c!right={)},
\c!inbetween={\btxcomma},
- \c!separator:names:3={\btxcomma\texampersand\space},
- \c!separator:names:4={\btxspace\texampersand\space}]
+ \c!separator:names:3={\btxcomma\textampersand\space},
+ \c!separator:names:4={\btxspace\textampersand\space}]
\definebtx
[apa:\s!cite:default]
@@ -329,7 +329,7 @@
\definebtx
[apa:\s!cite:authoryears]
[apa:\s!cite:author]
- [\c!left=,
+ [\c!left=, % these two settings are perhaps redundant?
\c!right=,
\c!inbetween={\btxspace}]
@@ -337,7 +337,9 @@
[apa:\s!cite:authornum]
[apa:\s!cite:author]
[\c!left={(},
- \c!right={)}]
+ \c!right={)},
+ \c!separator:names:3={\btxcomma\textampersand\space},
+ \c!separator:names:4={\btxspace\textampersand\space}]
\definebtx
[apa:\s!cite:author:num] % todo