diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/bib/bibl-apa.tex')
-rw-r--r-- | Master/texmf-dist/tex/context/bib/bibl-apa.tex | 55 |
1 files changed, 33 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/context/bib/bibl-apa.tex b/Master/texmf-dist/tex/context/bib/bibl-apa.tex index b1ecf373f70..8e2e9e84272 100644 --- a/Master/texmf-dist/tex/context/bib/bibl-apa.tex +++ b/Master/texmf-dist/tex/context/bib/bibl-apa.tex @@ -13,7 +13,9 @@ \setupcite [author,year] - [\c!pubsep={, }, + [\c!andtext={ and }, + \c!otherstext={ et al.}, + \c!pubsep={, }, \c!lastpubsep={ and }, \c!compress=\v!no, \c!inbetween={ }, @@ -22,7 +24,9 @@ \setupcite [authoryear] - [\c!pubsep={, }, + [\c!andtext={ and }, + \c!otherstext={ et al.}, + \c!pubsep={, }, \c!lastpubsep={ and }, \c!compress=\v!yes, \c!inbetween={ }, @@ -31,7 +35,9 @@ \setupcite [authoryears] - [\c!pubsep={, }, + [\c!andtext={ and }, + \c!otherstext={ et al.}, + \c!pubsep={, }, \c!lastpubsep={ and }, \c!compress=\v!yes, \c!inbetween={, }, @@ -39,8 +45,10 @@ \c!right={)}] \setupcite - [key,number,page,short,type,doi] - [\c!pubsep={, }, + [key,serial,authornum,page,short,type,doi,url] + [\c!andtext={ and }, + \c!otherstext={ et al.}, + \c!pubsep={, }, \c!lastpubsep={ and }, \c!compress=\v!no, \c!inbetween={ }, @@ -49,13 +57,16 @@ \setupcite [num] - [\c!pubsep={, }, + [\c!andtext={ and }, + \c!otherstext={ et al.}, + \c!pubsep={, }, \c!lastpubsep={ and }, \c!compress=\v!yes, \c!inbetween={--}, \c!left={[}, \c!right={]}] + \setuppublications[% \c!sorttype=, \c!criterium=, @@ -98,7 +109,7 @@ \def\insertchap#1#2#3% {\insertchapter - {#1\inserttype{}{\ }{chapter\ }}{#2}% + {#1\insertbibtype{}{\ }{chapter\ }}{#2}% {#3}} \def\insertpublisher#1#2#3% @@ -137,10 +148,10 @@ \inserttitle {\bgroup\it }% {\/\egroup - \ifeditedbook + \ifeditedbook \global\editedbookfalse - \insertvolume - { Number~}% + \insertvolume + { Number~}% {\insertseries { in~\bgroup}% {\egroup. }% @@ -161,16 +172,16 @@ {}} {}% \insertchap{, }{}{}% - \insertpages{, pages }{. }{. }% + \insertpages{, pages }{.}{.}% }% \fi}% - { }% + {}% \insertpublisher - {}% - {\insertedition{, }{ edition. }{. }}% - {\insertedition{, }{ edition. }{}}% - \insertpages{}{p. }{}% - \insertnote{ }{.}{}% + { }% + {\insertedition{, }{ edition.}{.}}% + {\insertedition{, }{ edition.}{}}% + \insertpages{ }{p. }{}% + \insertnote{}{.}{}% } \setuppublicationlayout[inbook]{% @@ -331,7 +342,7 @@ \insertauthors{}{ }{}% \insertpubyear{(}{). }{}% \inserttitle{\bgroup }{\egroup \insertseries{ (}{)}{}. }{}% - \inserttype{}{, }{Master's thesis, }% + \insertbibtype{}{, }{Master's thesis, }% \insertpublisher{}{. }{}% \insertpages{}{p. }{}% \insertnote{ }{.}{}% @@ -341,7 +352,7 @@ \insertauthors{}{ }{}% \insertpubyear{(}{). }{}% \inserttitle{\bgroup\it }{\egroup \insertseries{ (}{)}{}. }{}% - \inserttype{}{, }{PhD thesis, }% + \insertbibtype{}{, }{PhD thesis, }% \insertpublisher{}{. }{}% \insertpages{}{p. }{}% \insertnote{ }{.}{}% @@ -360,7 +371,7 @@ \insertauthors{}{ }{}% \insertpubyear{(}{). }{}% \inserttitle{\bgroup }{\egroup \insertseries{ (}{)}{}. }{}% - \inserttype{}{\insertvolume{ }{, }{, }}{Technical Report, }% + \insertbibtype{}{\insertvolume{ }{, }{, }}{Technical Report, }% \insertpublisher{}{. }{}% \insertpages{}{p. }{}% \insertnote{ }{.}{}% @@ -372,8 +383,8 @@ \inserttitle{\bgroup }{\egroup \insertseries{ (}{)}{}. }{}% \insertpublisher{}{. }{}% \insertpages{}{p. }{}% - \inserttype{(}{)}{}% + \insertbibtype{(}{)}{}% \insertnote{ }{.}{}% } -\protect
\ No newline at end of file +\protect |