From cd12b5497dc4a12dc33751a0deffda08b26bcbcd Mon Sep 17 00:00:00 2001
From: Context Git Mirror Bot <phg42.2a@gmail.com>
Date: Sun, 18 May 2014 00:15:13 +0200
Subject: 2014-05-17 23:48:00

---
 tex/context/base/publ-ini.mkiv | 46 +++++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 16 deletions(-)

(limited to 'tex/context/base/publ-ini.mkiv')

diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv
index ab20d2fd9..0b1a92300 100644
--- a/tex/context/base/publ-ini.mkiv
+++ b/tex/context/base/publ-ini.mkiv
@@ -554,6 +554,13 @@
 \unexpanded\def\btxflushauthorinverted     {\btx_flush_author{inverted}}      % #1
 \unexpanded\def\btxflushauthorinvertedshort{\btx_flush_author{invertedshort}} % #1
 
+\unexpanded\def\currentbtxciteauthor % always author
+  {\ctxcommand{btxauthor("\currentbtxdataset","\currentbtxtag","author",{
+        combiner    = "\btxcitevariantparameter\c!author",
+        etallimit   = \number\btxcitevariantparameter\c!etallimit,
+        etaldisplay = \number\btxcitevariantparameter\c!etaldisplay,
+   })}}
+
 % \btxflushauthor{author}
 % \btxflushauthor{artauthor}
 % \btxflushauthor{editor}
@@ -713,11 +720,15 @@
 \unexpanded\def\publ_cite_tags_options[#1]%
   {\strictdoifnextoptionalelse{\publ_cite_tags_options_indeed{#1}}{\publ_cite_tags_indeed{#1}}}
 
+% \unexpanded\def\publ_cite_tags_options_indeed#1[#2]%
+%   {\edef\currentbtxcitetag{#2}%
+%    \doifassignmentelse{#1}
+%      {\publ_cite_tags_settings_indeed{#1}}
+%      {\publ_cite_tags_variants_indeed{#1}}}
+
 \unexpanded\def\publ_cite_tags_options_indeed#1[#2]%
   {\edef\currentbtxcitetag{#2}%
-   \doifassignmentelse{#1}
-     {\publ_cite_tags_settings_indeed{#1}}
-     {\publ_cite_tags_variants_indeed{#1}}}
+   \doifassignmentelse{#1}\publ_cite_tags_settings_indeed\publ_cite_tags_variants_indeed{#1}}
 
 \def\publ_cite_tags_settings_indeed#1%
   {\letinteractionparameter\c!style\empty
@@ -778,22 +789,14 @@
   {\usebtxcitevariantstyleandcolor\c!style\c!color
    \letbtxcitevariantparameter\c!alternative\currentbtxcitevariant
    \btxcitevariantparameter\v!left
-   \edef\p_compress{\btxcitevariantparameter\c!compress}%
-%    \ctxcommand{btxhandlecite(%
-%      "\currentbtxdataset",%
-%      "#1",%
-%      \iftrialtypesetting false\else true\fi,%
-%      "\currentbtxcitevariant",%
-%      "\btxcitevariantparameter\c!sorttype",%
-%      \ifx\p_compress\v!yes true\else false\fi%
-%    )}%
    \ctxcommand{btxhandlecite{%
      dataset   = "\currentbtxdataset",%
      reference = "#1",%
      markentry = \iftrialtypesetting false\else true\fi,%
      variant   = "\currentbtxcitevariant",%
      sorttype  = "\btxcitevariantparameter\c!sorttype",%
-     compress  = \ifx\p_compress\v!yes true\else false\fi,%
+     compress  = "\btxcitevariantparameter\c!compress",%
+     author    = "\btxcitevariantparameter\c!author",%
    }}%
    \btxcitevariantparameter\v!right
    \endgroup}
@@ -815,7 +818,11 @@
 
 \unexpanded\def\publ_cite_no[#1]%
   {\iftrialtypesetting \else
-     \ctxcommand{btxhandlenocite("\currentbtxdataset","#1",true)}%
+     \ctxcommand{btxhandlecite{%
+       dataset   = "\currentbtxdataset",%
+       reference = "#1",%
+       markentry = \iftrialtypesetting false\else true\fi,%
+   }}%
    \fi}
 
 \unexpanded\def\btxmissing#1%
@@ -833,13 +840,14 @@
 
 \newconstant\currentbtxconcat
 
-\unexpanded\def\btxcitevariant#1%
-  {\ctxcommand{btxcitevariant("\currentbtxdataset","\currentbtxblock","\currentbtxtag","#1")}}
+% \unexpanded\def\btxcitevariant#1%
+%   {\ctxcommand{btxcitevariant("\currentbtxdataset","\currentbtxblock","\currentbtxtag","#1")}}
 
 \unexpanded\def\btxcitereset
   {\let\currentbtxfirst   \empty
    \let\currentbtxsecond  \empty
    \let\currentbtxinternal\empty
+   \let\currentbtxtag     \empty
    \setconstant\currentbtxconcat\zerocount}
 
 \btxcitereset
@@ -850,6 +858,7 @@
 
 \unexpanded\def\btxsetfirst   {\def\currentbtxfirst}
 \unexpanded\def\btxsetsecond  {\def\currentbtxsecond}
+\unexpanded\def\btxsettag     {\def\currentbtxtag}
 \unexpanded\def\btxsetinternal{\def\currentbtxinternal}
 \unexpanded\def\btxsetconcat#1{\setconstant\currentbtxconcat#1\relax}
 
@@ -1066,6 +1075,11 @@
   [artauthor]
   [author]
 
+\setupbtxcitevariant
+  [\c!author      =\btxlistvariantparameter\c!author,
+   \c!etallimit   =\btxlistvariantparameter\c!etallimit,
+   \c!etaldisplay =\btxlistvariantparameter\c!etaldisplay]
+
 % Do we want these in the format? Loading them delayed is somewhat messy.
 
 \loadbtxdefinitionfile[apa]
-- 
cgit v1.2.3