diff options
Diffstat (limited to 'tex/context/base/publ-ini.mkiv')
| -rw-r--r-- | tex/context/base/publ-ini.mkiv | 94 |
1 files changed, 62 insertions, 32 deletions
diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv index 8114b4a56..f056acf3b 100644 --- a/tex/context/base/publ-ini.mkiv +++ b/tex/context/base/publ-ini.mkiv @@ -852,7 +852,8 @@ \ctxcommand{btxauthor("\currentbtxdataset","\currentbtxtag","\currentbtxfield",{ combiner = "#1", kind = "list", - % symbol = ".", + %symbol = \btxlistvariantparameter\c!initialsterminator, + %connector = \btxlistvariantparameter\c!initialssep, etallimit = \number\btxlistvariantparameter\c!etallimit, etaldisplay = \number\btxlistvariantparameter\c!etaldisplay, })}% @@ -869,7 +870,8 @@ \ctxcommand{btxauthor("\currentbtxdataset","\currentbtxtag","author",{ combiner = "\btxcitevariantparameter\c!authorconversion", kind = "cite", - % symbol = ".", + %symbol = \btxcitevariantparameter\c!initialsterminator, + %connector = \btxcitevariantparameter\c!initialssep, etallimit = \number\btxcitevariantparameter\c!etallimit, etaldisplay = \number\btxcitevariantparameter\c!etaldisplay, })}% @@ -1348,14 +1350,16 @@ \setupbtxlistvariant [\c!namesep={, }, - \c!lastnamesep={ \btxlabeltext{\currentbtxalternative:and} }, - \c!finalnamesep={ \btxlabeltext{\currentbtxalternative:and} }, + \c!lastnamesep={,\nobreakspace\textampersand\space}, + \c!finalnamesep={,\nobreakspace\textampersand\space}, \c!firstnamesep={ }, % \c!andtext={ \btxlabeltext{\currentbtxalternative:and} }, \c!otherstext={ \btxlabeltext{\currentbtxalternative:others}}, \c!juniorsep={ }, \c!vonsep={ }, - \c!initialsep={ }, + \c!initialsep={ }, % between initials and lastname + %\c!initialssep={ }, % between multiple initials + %\c!initialsterminator={.}, \c!surnamesep={, }, \c!surnameinitialsep={, }, \c!surnamefirstnamesep={, }, @@ -1384,9 +1388,9 @@ % \c!setups=btx:cite:initialize, \c!alternative=num, % APA 2013 section 6.16 (p. 177) - \c!pubsep={; }, % {, }, - \c!lastpubsep={; }, % { \btxlabeltext{\currentbtxalternative:and} }, - \c!finalpubsep={; }, % { \btxlabeltext{\currentbtxalternative:and} }, + \c!pubsep={, }, + \c!lastpubsep={ \btxlabeltext{\currentbtxalternative:and} }, + \c!finalpubsep={ \btxlabeltext{\currentbtxalternative:and} }, \c!compress=\v!no, \c!inbetween={ }, \c!range=\endash, @@ -1394,31 +1398,36 @@ \c!middle=, \c!right=] -% \c!authorconversion=\v!normal - \definebtxcitevariant [author] - [%c!sorttype=, - \c!left={(}, - \c!middle={, }, - \c!right={)}] + %[c!sorttype=, \definebtxcitevariant [authornum] [author] - [\c!inbetween={ }] + [\c!left={(}, + %\c!middle={, }, + \c!right={)}] \definebtxcitevariant [authoryear] [\c!compress=\v!yes, \c!inbetween={, }, \c!left={(}, - \c!middle={, }, - \c!right={)}] + %\c!middle={, }, + \c!right={)}, + \c!pubsep={; }, + \c!lastpubsep={; }, + \c!finalpubsep={; }] \definebtxcitevariant [authoryears] [authoryear] + [\c!left=, + \c!inbetween={ (}, + \c!pubsep={); }, + \c!lastpubsep={); }, + \c!finalpubsep={); }] \definebtxcitevariant [author:num] @@ -1445,7 +1454,7 @@ \definebtxcitevariant [year] [\c!left={(}, - \c!middle={, }, % is middle used? + %\c!middle={, }, \c!pubsep={, }, \c!lastpubsep={, }, \c!finalpubsep={, }, @@ -1453,12 +1462,12 @@ \definebtxcitevariant [title] - [\c!middle={, }] + %[\c!middle={, }] \definebtxcitevariant [tag] [\c!left={[}, - \c!middle={, }, + %\c!middle={, }, \c!right={]}] \definebtxcitevariant @@ -1468,13 +1477,13 @@ \definebtxcitevariant [serial] [\c!left={[}, - \c!middle={, }, + %\c!middle={, }, \c!right={]}] \definebtxcitevariant [page] [\c!left={[}, - \c!middle={, }, + %\c!middle={, }, \c!right={]}] \definebtxcitevariant @@ -1487,13 +1496,13 @@ \definebtxcitevariant [short] [\c!left={[}, - \c!middle={, }, + %\c!middle={, }, \c!right={]}] \definebtxcitevariant [category] [\c!left={[}, - \c!middle={, }, + %\c!middle={, }, \c!right={]}] \definebtxcitevariant @@ -1503,38 +1512,45 @@ \definebtxcitevariant [doi] [\c!left={[}, - \c!middle={, }, + %\c!middle={, }, \c!right={]}] \definebtxcitevariant [url] [\c!left={[}, - \c!middle={, }, + %\c!middle={, }, \c!right={]}] \definebtxcitevariant [page] [\c!left=, - \c!middle={, }, + %\c!middle={, }, \c!right=] \definebtxcitevariant [num] [\c!compress=\v!yes, \c!left={[}, - \c!middle={, }, - \c!right={]}] + %\c!middle={, }, + \c!right={]}, + \c!pubsep={,}, + \c!lastpubsep={,}, + \c!finalpubsep={,}] + +% These cannot, for some reason, be folded-in above... \setupbtxcitevariant [\c!namesep={, }, - \c!lastnamesep={\nobreakspace\textampersand\space}, - \c!finalnamesep={\nobreakspace\textampersand\space}, + \c!lastnamesep={,\nobreakspace\textampersand\space}, + \c!finalnamesep={,\nobreakspace\textampersand\space}, \c!firstnamesep={ }, - % \c!andtext={ \btxlabeltext{\currentbtxalternative:and} }, + %\c!andtext={ \btxlabeltext{\currentbtxalternative:and} }, \c!otherstext={ \btxlabeltext{\currentbtxalternative:others}}, \c!juniorsep={ }, \c!vonsep={ }, \c!initialsep={ }, + %\c!initialssep={ }, % used? + %\c!initialsterminator={.}, \c!surnamesep={, }, \c!surnameinitialsep={, }, \c!surnamefirstnamesep={, }, @@ -1543,6 +1559,20 @@ \c!monthconversion=\v!number, \c!authorconversion=\v!name] +% And why these here: + +\setupbtxcitevariant + [author] + [\c!lastnamesep={, \btxlabeltext{\currentbtxalternative:and} }, + \c!finalnamesep={, \btxlabeltext{\currentbtxalternative:and} }, + \c!authorconversion=\v!name] + +\setupbtxcitevariant + [authoryears] + [\c!lastnamesep={, \btxlabeltext{\currentbtxalternative:and} }, + \c!finalnamesep={, \btxlabeltext{\currentbtxalternative:and} }, + \c!authorconversion=\v!name] + % Do we want these in the format? Loading them delayed is somewhat messy. \loadbtxdefinitionfile[commands] |