2016-07-15 23:35:00

1 files changed, 42 insertions, 101 deletions

diff --git a/tex/context/base/mkiv/publ-imp-apa.mkvi b/tex/context/base/mkiv/publ-imp-apa.mkvi
index 8031c34b1..5d11ef62f 100644
--- a/tex/context/base/mkiv/publ-imp-apa.mkvi
+++ b/tex/context/base/mkiv/publ-imp-apa.mkvi
@@ -355,6 +355,18 @@
    \c!right={)}]
 
 \definebtx
+  [apa:\s!cite:lefttext]
+  [apa:\s!cite]
+  [\c!left=,
+   \c!right={\btxspace}]
+
+\definebtx
+  [apa:\s!cite:righttext]
+  [apa:\s!cite]
+  [\c!left={\btxcomma},
+   \c!right=]
+
+\definebtx
   [apa:\s!cite:year]
   [apa:\s!cite]
   [\c!separator:2={\btxcomma}, % :0 and :1 - between items of a list
@@ -418,8 +430,8 @@
 \definebtx
   [apa:\s!cite:url]
   [apa:\s!cite]
-  [\c!left={[},
-   \c!right={]}]
+  [\c!left={(},
+   \c!right={)}]
 
 \definebtx
   [apa:\s!cite:doi]
@@ -463,23 +475,14 @@
 
 \setupbtxlabeltext
   [en]
-  [%apa:and=and,
-   apa:number={no.},
+  [apa:number={no.},
    apa:edition={ed.},
    apa:Editor={Ed.},
    apa:Editors={Eds.},
    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
-  %apa:mastersthesis={Master's thesis},
-  %apa:phdthesis={Doctoral dissertation},
-  %apa:technicalreport={Tech. Rep.},  % Technical report
    apa:supplement={Suppl.},           % Supplement (not used?)
-   apa:patent=Patent,
    apa:MotionPicture={Motion picture},
    apa:Producer=Producer,
    apa:Producers=Producers,
@@ -490,27 +493,17 @@
    apa:Translator={Trans.},           % Translator(s)
    apa:Advanced={Advanced online publication},
    apa:Retrieved={Available from}]    % {Retrieved from},
-  %apa:In=In]
 
 \setupbtxlabeltext
   [nl]
-  [%apa:and=en,
-   apa:number={nr.},
+  [apa:number={nr.},
    apa:edition={ed.}, % editie
    apa:Editor=Editor, % Ed./Eds.
    apa:Editors=Editors,
    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
-  %apa:mastersthesis=Masterproef,
-  %apa:phdthesis=Proefschrift,
-  %apa:technicalreport={Technisch rapport},  % Technical report
    apa:supplement=Supplement,
-   apa:patent=Octrooi,
    apa:MotionPicture=Film, % ?
    apa:Producer=Producent,   % ?
    apa:Producers=Producents, % ?
@@ -521,27 +514,17 @@
    apa:Translator=Vertaler,
    apa:Advanced={Geavanceerde online publicatie},
    apa:Retrieved={Beschikbaar vanaf}]    % {Ontvangen van},
-  %apa:In=In]
 
 \setupbtxlabeltext
   [fr]
-  [%apa:and=et,
-   apa:number={n\high{o}},
+  [apa:number={n\high{o}},
    apa:edition={édition},
    apa:Editor=Éditeur,
    apa:Editors=Éditeurs,
    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
-  %apa:mastersthesis={Thèse de master (DEA, DESS, master)},
-  %apa:phdthesis={Thèse de doctorat},
-  %apa:technicalreport={Rapport technique},
    apa:supplement=Supplément,
-   apa:patent=Brevet,
    apa:MotionPicture={Film cinématographique},
    apa:Producer=Producteur,
    apa:Producers=Producteurs,
@@ -552,27 +535,17 @@
    apa:Translator=Traducteur,
    apa:Advanced={Publication en ligne anticipée},
    apa:Retrieved={Disponible à}]      % {Téléchargé de},
-  %apa:In=Dans]
 
 \setupbtxlabeltext
   [de]
-  [%apa:and=und,
-   apa:number={nr.},
+  [apa:number={nr.},
    apa:edition=Auf\/lage,
    apa:Editor=Herausgeber, % Hrsg./Hg.
    apa:Editors=Herausgeber,
    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)
-  %apa:mastersthesis={Masterarbeit},
-  %apa:phdthesis={Dissertation},
-  %apa:technicalreport={Technischer Bericht},
    apa:supplement={Beilage},          % Supplement
-   apa:patent=Patent,
    apa:MotionPicture=Kinofilm, % ?
    apa:Producer=Producer,      % ?
    apa:Producers=Produzenten,  % ?
@@ -583,29 +556,19 @@
    apa:Translator={Übersetzer},       % Übers.
    apa:Advanced={Erweiterte Online-Publikation},
    apa:Retrieved={heruntergeladen von}]
-  %apa:In=In]
 
 % thanks: Andrea Valle
 
 \setupbtxlabeltext
   [it]
-  [%apa:and=e,
-   apa:number={nº},
+  [apa:number={nº},
    apa:edition={ed.}, % edizione
    apa:Editor={A cura di},
    apa:Editors={A cura di},
    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
-  %apa:mastersthesis={Tesi di laurea},
-  %apa:phdthesis={Tesi di dottorato},
-  %apa:technicalreport={Relazione tecnica},
    apa:supplement={Supplemento},
-   apa:patent=Brevetto,
    apa:MotionPicture=Film, % ?
    apa:Producer=Produttore,
    apa:Producers=Produttori,
@@ -616,27 +579,17 @@
    apa:Translator={Trad.},                        % Translator(s)
    apa:Advanced={Pre-pubblicazione on line},
    apa:Retrieved={Accessible online}]
-  %apa:In=In]
 
 \setupbtxlabeltext
   [es]
-  [%apa:and=y,
-   apa:number={nº},
+  [apa:number={nº},
    apa:edition={ed.}, % edición
    apa:Editor=Editor, % Ed./Eds.
    apa:Editors=Editores,
    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
-  %apa:mastersthesis={Tesis de maestría},
-  %apa:phdthesis={Tesis doctoral},
-  %apa:technicalreport={Informe técnico},
    apa:supplement=Suplemento,
-   apa:patent=Patente,
    apa:MotionPicture=Cinematográfica,
    apa:Producer=Productor,
    apa:Producers=Productores,
@@ -647,48 +600,32 @@
    apa:Translator=Traductor,
    apa:Advanced={Publicación en línea avanzada},
    apa:Retrieved={Disponible desde}]    % {Obtenido de},
-  %apa:In=En]
 
 % cite setups
 
 % The following differs from the default returning n.d. if year is empty
 
-\startsetups btx:apa:nd
-    \btxlabeltext{apa:nd}
-\stopsetups
-
 \startsetups btx:apa:cite:author:year
-    \texdefinition{\s!btx:\s!cite:concat}
-   %\btxparameter\c!left
     \ifx\currentbtxfirst\empty
-        \fastsetup{btx:apa:nd}
-    \else
-        \texdefinition {\s!btx:\s!cite:inject} {
-            \btxcitereference
-            \currentbtxfirst
-        }
-        \ifx\currentbtxsecond\empty \else
-            \btxparameter\c!range
-            \texdefinition {\s!btx:\s!cite:inject} {
-                \currentbtxsecond
-            }
-            \fi
-        \btxflushsuffix
+        \def\currentbtxfirst{\fastsetup{\s!btx:apa:nd}}
     \fi
-   %\btxparameter\c!right
+    \fastsetup{\s!btx:\s!cite:author:year}
 \stopsetups
 
 \startsetups btx:apa:cite:author:years
-    \fastsetup{btx:apa:cite:author:year}
+    \ifx\currentbtxfirst\empty
+        \def\currentbtxfirst{\fastsetup{\s!btx:apa:nd}}
+    \fi
+    \fastsetup{\s!btx:\s!cite:author:years}
 \stopsetups
 
 % used in publ-imp-page.mkvi
 
 \startsetups [btx:apa:list:page-or-pages]
     \ifx\currentbtxlastpage\empty
-        \btxlabeltext{p}.
+        \btxlabeltext{p}
     \else
-        \btxlabeltext{pp}.
+        \btxlabeltext{pp}
     \fi
     \btxnbsp
 \stopsetups
@@ -820,6 +757,10 @@
     }
 \stoptexdefinition
 
+\startsetups btx:apa:nd
+    \btxlabeltext{apa:nd}
+\stopsetups
+
 \starttexdefinition unexpanded btx:apa:suffixedyear
     \btxdoifelse {year} {
         \btxflush{year}
@@ -883,7 +824,7 @@
         }
         \btxdoif {withauthor} {
             \btxleftparenthesis
-            \btxlabeltext{apa:with}
+            \btxlabeltext{with}
             \btxspace
             \btxflush{withauthor}
             \btxrightparenthesis
@@ -978,9 +919,9 @@
     \btxdoif {pages} {
         \texdefinition{btx:apa:leftparenthesis-or-comma}
         \btxoneorrange {pages} {
-            \btxlabeltext{p}.
+            \btxlabeltext{p}
         } {
-            \btxlabeltext{pp}.
+            \btxlabeltext{pp}
         }
         \btxnbsp
         \btxflush{pages}
@@ -1030,9 +971,9 @@
             \btxcomma
             \doif {\currentbtxcategory} {newspaper} {
                 \btxoneorrange {pages} {
-                    \btxlabeltext{p}.
+                    \btxlabeltext{p}
                 } {
-                    \btxlabeltext{pp}.
+                    \btxlabeltext{pp}
                 }
                 \btxnbsp
             }
@@ -1090,9 +1031,6 @@
 % use \btxentry here?
 
 \starttexdefinition unexpanded btx:apa:url
-    \btxspace
-    \btxlabeltext{apa:Retrieved}
-    \btxspace
     \begingroup
         \setbreakpoints[doi]
         \ifconditional\btxinteractive
@@ -1110,7 +1048,6 @@
 % use \btxentry here?
 
 \starttexdefinition unexpanded btx:apa:doi
-    \btxspace
     \begingroup
         \setbreakpoints[doi]
         \ifconditional\btxinteractive
@@ -1135,9 +1072,13 @@
 
 \starttexdefinition unexpanded btx:apa:url-doi-note
     \doif {\btxfoundname{doi}} {url} {
+        \btxspace
+        \btxlabeltext{apa:Retrieved}
+        \btxspace
         \texdefinition{btx:apa:url}
     }
     \doif {\btxfoundname{doi}} {doi} {
+        \btxspace
         \texdefinition{btx:apa:doi}
     }
     \texdefinition{btx:apa:note}
@@ -1365,7 +1306,7 @@
             \btxflush{nationality}
         }
         \btxspace
-        \btxlabeltext{apa:patent}
+        \btxlabeltext{patent}
         \btxdoif {number} {
             \btxspace
             \btxlabeltext{apa:number}