summaryrefslogtreecommitdiff
path: root/tex/context/base/publ-imp-apa.mkvi
diff options
context:
space:
mode:
Diffstat (limited to 'tex/context/base/publ-imp-apa.mkvi')
-rw-r--r--tex/context/base/publ-imp-apa.mkvi27
1 files changed, 19 insertions, 8 deletions
diff --git a/tex/context/base/publ-imp-apa.mkvi b/tex/context/base/publ-imp-apa.mkvi
index 9468b0b0c..1411042c9 100644
--- a/tex/context/base/publ-imp-apa.mkvi
+++ b/tex/context/base/publ-imp-apa.mkvi
@@ -462,6 +462,7 @@
apa:Volume={Vol.},
apa:Volumes={Vols.},
apa:others={et al.},
+ apa:with=with,
apa:page={p.},
apa:pages={pp.},
apa:nd={n.d.}, % no date
@@ -492,6 +493,7 @@
apa:Volume={Vol.},
apa:Volumes={Vols.},
apa:others={et al.},
+ apa:with=met,
apa:page={p.},
apa:pages={pp.},
apa:nd={g.d.} % geen datum
@@ -522,6 +524,7 @@
apa:Volume=Volume,
apa:Volumes=Volumes,
apa:others={et al.},
+ apa:with=avec,
apa:page={p.},
apa:pages={pp.},
apa:nd={s.d.} % sans date
@@ -552,6 +555,7 @@
apa:Volume=Band, % Bd.
apa:Volumes={Bände},
apa:others={et al.},
+ apa:with=mit,
apa:page={S.},
apa:pages={S.},
apa:nd={o.D.}, % ohne Datum (mostly: o.J. / ohne Jahr)
@@ -584,6 +588,7 @@
apa:Volume={Vol.}, % Volume
apa:Volumes={Vol.}, % Volumi
apa:others={et al.},
+ apa:with=con,
apa:page={p.},
apa:pages={pp.},
apa:nd={s.d.}, % senza data
@@ -614,6 +619,7 @@
apa:Volume={Vol.}, % Volumen
apa:Volumes={Vols.}, % Volúmenes
apa:others={et al.},
+ apa:with=con,
apa:page={p.},
apa:pages={pp.},
apa:nd={s.f.}, % sin fecha
@@ -657,7 +663,7 @@
\texdefinition {\s!btx:\s!cite:inject} {
\currentbtxsecond
}
- \fi
+ \fi
\btxflushsuffix
\fi
%\btxparameter\c!right
@@ -754,7 +760,6 @@
\btxstartstyleandcolor[apa:\s!list:title:\currentbtxcategory]
\begingroup
\language[\currentbtxlanguage]
- \tracingall
\btxusecommand [apa:\s!list:title:\currentbtxcategory] {
\btxflush{#title}
\btxdoif {sub#title} {
@@ -826,7 +831,7 @@
} {
\btxlabeltext{apa:Editors}
}
- \btxrightparenthesisperiod
+ \btxrightparenthesis
} {
\doifelse {\btxfoundname{#author}} {producer} {
\btxleftparenthesis
@@ -836,7 +841,7 @@
\btxlabeltext{apa:Producers}
}
\btxrightparenthesis
- \btxdoifelse {director} {
+ \btxdoif {director} {
\removeunwantedspaces
\btxparameter{\c!separator:names:3}
\btxflush{director}
@@ -846,9 +851,7 @@
} {
\btxlabeltext{apa:Directors}
}
- \btxrightparenthesisperiod
- } {
- \btxperiod
+ \btxrightparenthesis
}
} {
\doif {\btxfoundname{#author}} {director} {
@@ -858,10 +861,18 @@
} {
\btxlabeltext{apa:Directors}
}
- \btxrightparenthesisperiod
+ \btxrightparenthesis
}
}
}
+ \btxdoif {withauthor} {
+ \btxleftparenthesis
+ \btxlabeltext{apa:with}
+ \btxspace
+ \btxflush{withauthor}
+ \btxrightparenthesis
+ }
+ \btxperiod
}
\stoptexdefinition