2016-07-15 23:35:00

1 files changed, 9 insertions, 63 deletions

diff --git a/tex/context/base/mkiv/publ-imp-aps.mkvi b/tex/context/base/mkiv/publ-imp-aps.mkvi
index 73ea9775b..5099c5d9f 100644
--- a/tex/context/base/mkiv/publ-imp-aps.mkvi
+++ b/tex/context/base/mkiv/publ-imp-aps.mkvi
@@ -379,8 +379,8 @@
 \definebtx
   [aps:\s!cite:url]
   [aps:\s!cite]
-  [\c!left={[},
-   \c!right={]}]
+  [\c!left={(},
+   \c!right={)}]
 
 \definebtx
   [aps:\s!cite:doi]
@@ -429,139 +429,85 @@
 
 \setupbtxlabeltext
   [en]
-  [%aps:and=and,
-   aps:number={no.},
+  [aps:number={no.},
    aps:edition={ed.},
    aps:Editor={Ed.},
    aps:Editors={Eds.},
    aps:Volume={Vol.},
    aps:Volumes={Vols.},
-  %aps:others={et al.},
-  %aps:page={p.},
-  %aps:pages={pp.},
-  %aps:mastersthesis={Master's thesis},
-  %aps:phdthesis={Doctoral dissertation},
-  %aps:technicalreport={Tech. Rep.},  % Technical report
    aps:supplement={Suppl.},           % Supplement (not used?)
-   aps:patent=Patent,
    aps:inpress={in press},
    aps:tobe={to be published},
    aps:unpublished={unpublished}]
-  %aps:In=In]
 
 % Check this (google translate!!):
 
 \setupbtxlabeltext
   [nl]
-  [%aps:and=en,
-   aps:number={nr.},
+  [aps:number={nr.},
    aps:edition={ed.}, % editie
    aps:Editor=Editor, % Ed./Eds.
    aps:Editors=Editors,
    aps:Volume={Vol.},
    aps:Volumes={Vols.},
-  %aps:others={et al.},
-  %aps:page={p.},
-  %aps:pages={pp.},
-  %aps:mastersthesis=Masterproef,
-  %aps:phdthesis=Proefschrift,
-  %aps:technicalreport={Technisch rapport},  % Technical report
    aps:supplement=Supplement,
-   aps:patent=Octrooi,
    aps:inpress={in press}, % CHECK THESE!
    aps:tobe={worden gepubliceerd},
    aps:unpublished={onuitgegeven}]
-  %aps:In=In]
 
 \setupbtxlabeltext
   [fr]
-  [%aps:and=et,
-   aps:number={n\high{o}},
+  [aps:number={n\high{o}},
    aps:edition={édition},
    aps:Editor=Éditeur,
    aps:Editors=Éditeurs,
    aps:Volume=Volume,
    aps:Volumes=Volumes,
-  %aps:others={et al.},
-  %aps:page={p.},
-  %aps:pages={pp.},
-  %aps:mastersthesis={Thèse de master (DEA, DESS, master)},
-  %aps:phdthesis={Thèse de doctorat},
-  %aps:technicalreport={Rapport technique},
    aps:supplement=Supplément,
-   aps:patent=Brevet,
    aps:inpress={sous impression},
    aps:tobe={à paraître},
    aps:unpublished={inédit}]          % pour un livre
-  %aps:In=Dans]
 
 \setupbtxlabeltext
   [de]
-  [%aps:and=und,
-   aps:number={nr.},
+  [aps:number={nr.},
    aps:edition=Auf\/lage,
    aps:Editor=Herausgeber, % Hrsg./Hg.
    aps:Editors=Herausgeber,
    aps:Volume=Band,        % Bd.
    aps:Volumes={Bände},
-  %aps:others={et al.},
-  %aps:page={S.},
-  %aps:pages={S.},
-  %aps:mastersthesis={Masterarbeit},
-  %aps:phdthesis={Dissertation},
-  %aps:technicalreport={Technischer Bericht},
    aps:supplement={Beilage},          % Supplement
-   aps:patent=Patent,
    aps:inpress={in der Presse}, % CHECK THESE!
    aps:tobe={veröffentlicht werden},
    aps:unpublished={unveröffentlicht}]
-  %aps:In=In]
 
 % thanks: Andrea Valle
 
 \setupbtxlabeltext
   [it]
-  [%aps:and=e,
-   aps:number={nº},
+  [aps:number={nº},
    aps:edition={ed.}, % edizione
    aps:Editor={A cura di},
    aps:Editors={A cura di},
    aps:Volume={Vol.},  % Volume
    aps:Volumes={Vol.}, % Volumi
-  %aps:others={et al.},
-  %aps:page={p.},
-  %aps:pages={pp.},
-  %aps:mastersthesis={Tesi di laurea},
-  %aps:phdthesis={Tesi di dottorato},
-  %aps:technicalreport={Relazione tecnica},
    aps:supplement={Supplemento},
-   aps:patent=Brevetto,
    aps:inpress={in press}, % CHECK THESE!
    aps:tobe={da pubblicare},
    aps:unpublished={inedito}]
-  %aps:In=In]
 
 \setupbtxlabeltext
   [es]
-  [%aps:and=y,
-   aps:number={nº},
+  [aps:number={nº},
    aps:edition={ed.}, % edición
    aps:Editor=Editor, % Ed./Eds.
    aps:Editors=Editores,
    aps:Volume={Vol.},   % Volumen
    aps:Volumes={Vols.}, % Volúmenes
-  %aps:others={et al.},
-  %aps:page={p.},
-  %aps:pages={pp.},
-  %aps:mastersthesis={Tesis de maestría},
-  %aps:phdthesis={Tesis doctoral},
-  %aps:technicalreport={Informe técnico},
    aps:supplement=Suplemento,
-   aps:patent=Patente,
    aps:inpress={en prensa}, % CHECK THESE!
    aps:tobe={que se publicará},
    aps:unpublished={inédito}]
-  %aps:In=En]
 
 % cite setups
 
@@ -1063,7 +1009,7 @@
             \btxflush{nationality}
         }
         \btxspace
-        \btxlabeltext{aps:patent}
+        \btxlabeltext{patent}
         \btxdoif {number} {
             \btxspace
             \btxlabeltext{aps:number}