2014-05-17 23:48:00

16 files changed, 649 insertions, 106 deletions

diff --git a/COPYING b/COPYING
new file mode 100644
index 000000000..eb0e6c978
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,350 @@
+Context was released under the GNU General Public License, version 2,
+exactly [0]. The full license text [1] by the Free Software Foundation
+is reproduced below.
+
+[0] Taco posted an exhaustive treatment of Context licensing at
+     http://tex.stackexchange.com/a/12456/14066
+
+[1] http://www.gnu.org/licenses/gpl-2.0.txt
+
+------------------------------------------------------------------------
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/README b/README
new file mode 100644
index 000000000..3d716e98e
--- /dev/null
+++ b/README
@@ -0,0 +1,14 @@
+-----------------------------------------------------------------------
+                            Context Mirror
+-----------------------------------------------------------------------
+
+This is a mirror repository of Context_, a document processing system
+built around Donald E. Knuth’s TeX_. Inconveniently, Context is
+supplied only as file archives and thus lacks version control. The
+mirror aims at providing a source controlled repository to facilitate
+common operations like bisection. Still no commit messages, though,
+besides timestamps.
+
+.. _Context:    http://www.pragma-ade.com
+.. _TeX:        http://www-cs-faculty.stanford.edu/~uno/abcde.html
+
diff --git a/scripts/context/lua/mtx-plain.lua b/scripts/context/lua/mtx-plain.lua
index de13717d3..1076572fc 100644
--- a/scripts/context/lua/mtx-plain.lua
+++ b/scripts/context/lua/mtx-plain.lua
@@ -103,7 +103,11 @@ function scripts.plain.make(texengine,texformat)
 end
 
 function scripts.plain.run(texengine,texformat,filename)
-    execute('%s --fmt=%s "%s"',texengine,file.removesuffix(texformat),filename)
+    local t = { }
+    for k, v in next, environment.arguments do
+        t[#t+1] = string.format("--mtx:%s=%s",k,v)
+    end
+    execute('%s --fmt=%s %s "%s"',texengine,file.removesuffix(texformat),table.concat(t," "),filename)
 end
 
 function scripts.plain.fonts()
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 47289ebe9..cded7454f 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2014.05.16 20:08}
+\newcontextversion{2014.05.17 23:46}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 145596d8c..2b973ae9b 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 50a8e6259..ef3c639e3 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2014.05.16 20:08}
+\edef\contextversion{2014.05.17 23:46}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/publ-dat.lua b/tex/context/base/publ-dat.lua
index b463064ca..da2fe1f6c 100644
--- a/tex/context/base/publ-dat.lua
+++ b/tex/context/base/publ-dat.lua
@@ -24,8 +24,9 @@ end
 local chardata  = characters.data
 local lowercase = characters.lower
 
-local lower, gsub, concat = string.lower, string.gsub, table.concat
-local next, type = next, type
+local lower, gsub, find = string.lower, string.gsub, string.find
+local concat = table.concat
+local next, type, rawget = next, type, rawget
 local utfchar = utf.char
 local lpegmatch, lpegpatterns = lpeg.match, lpeg.patterns
 local textoutf = characters and characters.tex.toutf
@@ -73,13 +74,56 @@ local defaultshortcuts = {
     dec = "12",
 }
 
+local l_splitter = lpeg.tsplitat("+")
+local d_splitter = lpeg.splitat ("+")
+
 function publications.new(name)
     publicationsstats.nofdatasets = publicationsstats.nofdatasets + 1
+    local function getcombinedluadata(t,k)
+        if find(k,"%+") then
+            local tags   = lpegmatch(l_splitter,k)
+            local parent = tags[i]
+            local first  = rawget(t,parent)
+            if first then
+                local combined = first.combined
+                if not combined then
+                    combined = { }
+                    first.combined = combined
+                end
+                -- add new ones but only once
+                for i=1,#tags do
+                    local tag = tags[i]
+                    local new = true
+                    for j=1,#combined do
+                        if combined[j] == tag then
+                            new = false
+                        end
+                    end
+                    if new then
+                        local entry = rawget(t,tag)
+                        if entry then
+                            combined[#combined+1]  = tag
+                            entry.combined[parent] = true
+                        end
+                    end
+                end
+                return first
+            end
+        end
+    end
+    local function getcombineddetails(t,k)
+        if find(k,"%+") then
+            local tag = lpegmatch(d_splitter,k)
+            return rawget(t,tag)
+        end
+    end
+    local luadata = setmetatableindex({ },getcombinedluadata)
+    local details = setmetatableindex({ },getcombineddetails)
     local dataset = {
         name       = name or "dataset " .. publicationsstats.nofdatasets,
         nofentries = 0,
         shortcuts  = { },
-        luadata    = { },
+        luadata    = luadata,
         xmldata    = xmlconvert(xmlplaceholder),
      -- details    = { },
         nofbytes   = 0,
@@ -95,10 +139,13 @@ function publications.new(name)
             userdata  = false,
         },
     }
+    -- we delay details till we need it (maybe we just delay the
+    -- individual fields but that is tricky as there can be some
+    -- depedencies)
     setmetatableindex(dataset,function(t,k)
         -- will become a plugin
         if k == "details" and publications.enhance then
-            dataset.details = { }
+            dataset.details = details
             publications.enhance(dataset.name)
             return dataset.details
         end
@@ -150,7 +197,7 @@ local filter_2 = Cs(
 )
 
 -- Currently we expand shortcuts and for large ones (like the acknowledgements
--- in tugboat.bib this is not that efficient. However, eventually strings get
+-- in tugboat.bib) this is not that efficient. However, eventually strings get
 -- hashed again.
 
 local function do_shortcut(key,value,dataset)
diff --git a/tex/context/base/publ-imp-cite.mkiv b/tex/context/base/publ-imp-cite.mkiv
index 3d227d736..0f0c69fa7 100644
--- a/tex/context/base/publ-imp-cite.mkiv
+++ b/tex/context/base/publ-imp-cite.mkiv
@@ -146,17 +146,25 @@
 
 % author lists: can be less
 
+\startsetups \s!btx:\s!cite:common:author
+    \ifx\currentbtxcitevariant\v!normal
+        \currentbtxfirst
+    \else
+        \currentbtxciteauthor
+    \fi
+\stopsetups
+
 \startsetups \s!btx:\s!cite:render:author
-    \directsetup{\s!btx:\s!cite:common:normal}
+    \directsetup{\s!btx:\s!cite:common:author}
 \stopsetups
 \startsetups \s!btx:\s!cite:render:authoryear
-    \directsetup{\s!btx:\s!cite:common:normal}
+    \directsetup{\s!btx:\s!cite:common:author}
 \stopsetups
 \startsetups \s!btx:\s!cite:render:authoryears
-    \directsetup{\s!btx:\s!cite:common:normal}
+    \directsetup{\s!btx:\s!cite:common:author}
 \stopsetups
 \startsetups \s!btx:\s!cite:render:authornum
-    \directsetup{\s!btx:\s!cite:common:normal}
+    \directsetup{\s!btx:\s!cite:common:author}
 \stopsetups
 
 \startsetups \s!btx:\s!cite:author:num
diff --git a/tex/context/base/publ-ini.lua b/tex/context/base/publ-ini.lua
index ea54a4add..09f4b0e11 100644
--- a/tex/context/base/publ-ini.lua
+++ b/tex/context/base/publ-ini.lua
@@ -79,7 +79,7 @@ local v_left         = variables.left
 local v_right        = variables.right
 local v_middle       = variables.middle
 local v_inbetween    = variables.inbetween
-
+local v_yes          = variables.yes
 local v_short        = variables.short
 local v_cite         = variables.cite
 local v_default      = variables.default
@@ -121,6 +121,7 @@ local ctx_btxsetreference         = context.btxsetreference
 local ctx_directsetup             = context.directsetup
 local ctx_btxmissing              = context.btxmissing
 
+local ctx_btxsettag               = context.btxsettag
 local ctx_btxcitesetup            = context.btxcitesetup
 local ctx_btxsetfirst             = context.btxsetfirst
 local ctx_btxsetsecond            = context.btxsetsecond
@@ -386,30 +387,44 @@ end)
 --             end
 --         end
 
+local reported = { }
+
 local function findallused(dataset,reference,block,section)
-    local tags = settings_to_array(reference)
-    local todo = { }
-    local okay = { } -- only if mark
-    local set = usedentries[dataset]
+    local tags  = settings_to_array(reference)
+    local todo  = { }
+    local okay  = { } -- only if mark
+    local set   = usedentries[dataset]
+    local valid = datasets[dataset].luadata
     if set then
         for i=1,#tags do
             local tag = tags[i]
-            local entry = set[tag]
-            if entry then
-                -- only once in a list
-                if #entry == 1 then
-                    entry = entry[1]
-                else
-                    -- find best match
-                    entry = entry[1] -- for now
+            if valid[tag] then
+                local entry = set[tag]
+                if entry then
+                    -- only once in a list
+                    if #entry == 1 then
+                        entry = entry[1]
+                    else
+                        -- find best match (todo)
+                        entry = entry[1] -- for now
+                    end
+                    okay[#okay+1] = entry
                 end
-                okay[#okay+1] = entry
+                todo[tag] = true
+            elseif not reported[tag] then
+                reported[tag] = true
+                report_cite("non-existent entry %a in %a",tag,dataset)
             end
-            todo[tag] = true
         end
     else
         for i=1,#tags do
-            todo[tags[i]] = true
+            local tag = tags[i]
+            if valid[tag] then
+                todo[tag] = true
+            elseif not reported[tag] then
+                reported[tag] = true
+                report_cite("non-existent entry %a in %a",tag,dataset)
+            end
         end
     end
     return okay, todo, tags
@@ -1002,6 +1017,7 @@ function lists.flushentries(dataset,sortvariant)
     end
     for i=1,#list do
         ctx_setvalue("currentbtxindex",i)
+        -- todo: also flush combinations
         ctx_btxhandlelistentry(list[i][1]) -- we can pass i here too ... more efficient to avoid the setvalue
     end
 end
@@ -1010,6 +1026,7 @@ function lists.fetchentries(dataset)
     local list = renderings[dataset].list
     for i=1,#list do
         ctx_setvalue("currentbtxindex",i)
+        -- todo: what to do with combinations
         ctx_btxchecklistentry(list[i][1])
     end
 end
@@ -1123,14 +1140,17 @@ end
 
 local prefixsplitter = lpeg.splitat("::")
 
--- function commands.btxhandlecite(dataset,tag,mark,variant,sorttype,compress)
 function commands.btxhandlecite(specification)
-    local dataset   = specification.dataset
-    local tag       = specification.reference
+    local tag = specification.reference
+    if not tag or tag == "" then
+        return
+    end
+    --
+    local dataset   = specification.dataset or ""
     local mark      = specification.markentry ~= false
-    local variant   = specification.variant
+    local variant   = specification.variant or "num"
     local sorttype  = specification.sorttype
-    local compress  = specification.compress
+    local compress  = specification.compress == v_yes
     --
     local prefix, rest = lpegmatch(prefixsplitter,tag)
     if rest then
@@ -1138,42 +1158,47 @@ function commands.btxhandlecite(specification)
     else
         rest = tag
     end
-    local action = citevariants[variant]
-    if action then
-        if trace_cite then
-            report_cite("inject, dataset: %s, tag: %s, variant: %s, compressed",dataset or "-",rest,variant)
-        end
-        ctx_setvalue("currentbtxdataset",dataset)
-        action(dataset,rest,mark ~= false,compress,variant)
+    local action = citevariants[variant] -- there is always fallback on default
+    if trace_cite then
+        report_cite("inject, dataset: %s, tag: %s, variant: %s, compressed",dataset or "-",rest,variant)
     end
+    ctx_setvalue("currentbtxdataset",dataset)
+    action(dataset,rest,mark,compress,variant)
 end
 
-function commands.btxhandlenocite(dataset,tag,mark)
-    if mark ~= false then
-        local prefix, rest = lpegmatch(prefixsplitter,tag)
-        if rest then
-            dataset = prefix
-        else
-            rest = tag
-        end
-        ctx_setvalue("currentbtxdataset",dataset)
-        local tags = settings_to_array(rest)
-        if trace_cite then
-            report_cite("mark, dataset: %s, tags: % | t",dataset or "-",tags)
-        end
-        for i=1,#tags do
-            markcite(dataset,tags[i])
-        end
+function commands.btxhandlenocite(specification)
+    local mark = specification.markentry ~= false
+    if not mark then
+        return
     end
-end
-
-function commands.btxcitevariant(dataset,block,tags,variant)
-    local action = citevariants[variant]
-    if action then
-        action(dataset,tags,variant)
+    local tag = specification.reference
+    if not tag or tag == "" then
+        return
+    end
+    local dataset = specification.dataset or ""
+    local prefix, rest = lpegmatch(prefixsplitter,tag)
+    if rest then
+        dataset = prefix
+    else
+        rest = tag
+    end
+    ctx_setvalue("currentbtxdataset",dataset)
+    local tags = settings_to_array(rest)
+    if trace_cite then
+        report_cite("mark, dataset: %s, tags: % | t",dataset or "-",tags)
+    end
+    for i=1,#tags do
+        markcite(dataset,tags[i])
     end
 end
 
+-- function commands.btxcitevariant(dataset,block,tags,variant) -- uses? specification ?
+--     local action = citevariants[variant]
+--     if action then
+--         action(dataset,tags,variant)
+--     end
+-- end
+
 -- sorter
 
 local keysorter = function(a,b) return a.sortkey < b.sortkey end
@@ -1267,14 +1292,15 @@ local function processcite(dataset,reference,mark,compress,setup,getter,setter,c
                 local entry = target[i]
                 local first = entry.first
                 if first then
+                    local tags = entry.tags
                     if mark then
-                        local tags = entry.tags
                         for i=1,#tags do
                             local tag = tags[i]
                             markcite(dataset,tag)
                             todo[tag] = false
                         end
                     end
+                    ctx_btxsettag(tags[1])
                     local internal = first.internal
                     if internal then
                         ctx_btxsetinternal(internal)
@@ -1283,11 +1309,12 @@ local function processcite(dataset,reference,mark,compress,setup,getter,setter,c
                         ctx_btxsetfirst(f_missing(first.tag))
                     end
                 else
+                    local tag = entry.tag
                     if mark then
-                        local tag = entry.tag
                         markcite(dataset,tag)
                         todo[tag] = false
                     end
+                    ctx_btxsettag(tag)
                     local internal = entry.internal
                     if internal then
                         ctx_btxsetinternal(internal)
@@ -1308,6 +1335,7 @@ local function processcite(dataset,reference,mark,compress,setup,getter,setter,c
                     markcite(dataset,tag)
                     todo[tag] = false
                 end
+                ctx_btxsettag(tag)
                 local internal = entry.internal
                 if internal then
                     ctx_btxsetinternal(internal)
@@ -1650,7 +1678,7 @@ local function setter(dataset,tag,entry,internal)
         internal = internal,
         author   = getfield(dataset,tag,"author"),
         num      = text,
-        sortkey  = lpegmatch(numberonly,text)
+        sortkey  = text and lpegmatch(numberonly,text)
     }
 end
 
@@ -1676,7 +1704,7 @@ local function setter(dataset,tag,entry,internal)
         internal = internal,
         author   = getfield(dataset,tag,"author"),
         year     = year,
-        sortkey  = lpegmatch(numberonly,year)
+        sortkey  = year and lpegmatch(numberonly,year)
     }
 end
 
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]
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 87359fbfc..5480e6dd9 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 1206b6e33..a41068eda 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-basics-gen.lua b/tex/generic/context/luatex/luatex-basics-gen.lua
index a304ab6aa..c19a49af3 100644
--- a/tex/generic/context/luatex/luatex-basics-gen.lua
+++ b/tex/generic/context/luatex/luatex-basics-gen.lua
@@ -353,3 +353,16 @@ end
 function table.setmetatableindex(t,f)
     setmetatable(t,{ __index = f })
 end
+
+-- helper for plain:
+
+arguments = { }
+
+if arg then
+    for i=1,#arg do
+        local k, v = string.match(arg[i],"^%-%-([^=]+)=?(.-)$")
+        if k and v then
+            arguments[k] = v
+        end
+    end
+end
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 70a395d7b..f7801ea05 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 05/16/14 20:08:26
+-- merge date  : 05/17/14 23:46:22
 
 do -- begin closure to overcome local limits and interference
 
@@ -3460,6 +3460,15 @@ end
 function table.setmetatableindex(t,f)
   setmetatable(t,{ __index=f })
 end
+arguments={}
+if arg then
+  for i=1,#arg do
+    local k,v=string.match(arg[i],"^%-%-([^=]+)=?(.-)$")
+    if k and v then
+      arguments[k]=v
+    end
+  end
+end
 
 end -- closure
 
diff --git a/tex/generic/context/luatex/luatex-math.tex b/tex/generic/context/luatex/luatex-math.tex
index c8210c2b5..604b4a1f8 100644
--- a/tex/generic/context/luatex/luatex-math.tex
+++ b/tex/generic/context/luatex/luatex-math.tex
@@ -19,15 +19,6 @@
 
 % a bunch of fonts:
 
-\font\tenrm   = file:lmroman10-regular.otf:+liga;+kern;+tlig;+trep at 10pt
-\font\sevenrm = file:lmroman7-regular.otf:+liga;+kern;+tlig;+trep  at  7pt
-\font\fiverm  = file:lmroman5-regular.otf:+liga;+kern;+tlig;+trep  at  5pt
-
-\font\tentt   = file:lmmono10-regular.otf at 10pt
-\font\tensl   = file:lmromanslant10-regular.otf:+liga;+kern;+tlig;+trep at 10pt
-\font\tenit   = file:lmroman10-italic.otf:+liga;+kern;+tlig;+trep at 10pt
-\font\tenbi   = file:lmroman10-bolditalic.otf:+liga;+kern;+tlig;+trep at 10pt
-
 \let \teni    = \relax
 \let \seveni  = \relax
 \let \fivei   = \relax
@@ -35,19 +26,58 @@
 \let \sevensy = \relax
 \let \fivesy  = \relax
 \let \tenex   = \relax
-\let \tenbf   = \relax
 \let \sevenbf = \relax
 \let \fivebf  = \relax
 
-\tenrm
+\def\latinmodern
+  {\font\tenrm   = file:lmroman10-regular.otf:+liga;+kern;+tlig;+trep at 10pt
+   \font\sevenrm = file:lmroman7-regular.otf:+liga;+kern;+tlig;+trep  at  7pt
+   \font\fiverm  = file:lmroman5-regular.otf:+liga;+kern;+tlig;+trep  at  5pt
+   %
+   \font\tentt   = file:lmmono10-regular.otf                               at 10pt
+   \font\tensl   = file:lmromanslant10-regular.otf:+liga;+kern;+tlig;+trep at 10pt
+   \font\tenit   = file:lmroman10-italic.otf:+liga;+kern;+tlig;+trep       at 10pt
+   \font\tenbf   = file:lmroman10-bold.otf:+liga;+kern;+tlig;+trep         at 10pt
+   \font\tenbi   = file:lmroman10-bolditalic.otf:+liga;+kern;+tlig;+trep   at 10pt
+   %
+   \font\mathfonttextupright         = file:latinmodern-math.otf:ssty=0;fixmath=yes at 10pt
+   \font\mathfontscriptupright       = file:latinmodern-math.otf:ssty=1;fixmath=yes at  7pt
+   \font\mathfontscriptscriptupright = file:latinmodern-math.otf:ssty=2;fixmath=yes at  5pt
+   %
+   \textfont         0 = \mathfonttextupright
+   \scriptfont       0 = \mathfontscriptupright
+   \scriptscriptfont 0 = \mathfontscriptscriptupright
+   %
+   \tenrm}
 
-\font\mathfonttextupright         = file:latinmodern-math.otf:ssty=0;fixmath=yes at 10pt
-\font\mathfontscriptupright       = file:latinmodern-math.otf:ssty=1;fixmath=yes at  7pt
-\font\mathfontscriptscriptupright = file:latinmodern-math.otf:ssty=2;fixmath=yes at  5pt
+\def\lucidabright
+  {\font\tenrm   = file:lucidabrightot.otf:+liga;+kern;+tlig;+trep at 10pt
+   \font\sevenrm = file:lucidabrightot.otf:+liga;+kern;+tlig;+trep at  7pt
+   \font\fiverm  = file:lucidabrightot.otf:+liga;+kern;+tlig;+trep at  5pt
+   %
+   \font\tentt   = file:lucidabrightot.otf                                    at 10pt
+   \font\tenit   = file:lucidabrightot.otf:+liga;+kern;+tlig;+trep            at 10pt
+   \font\tenit   = file:lucidabrightot-italic.otf:+liga;+kern;+tlig;+trep     at 10pt
+   \font\tenbf   = file:lucidabrightot-demi.otf:+liga;+kern;+tlig;+trep       at 10pt
+   \font\tenbi   = file:lucidabrightot-demiitalic.otf:+liga;+kern;+tlig;+trep at 10pt
+   %
+   \font\mathfonttextupright         = file:lucidabrightmathot.otf:ssty=0;fixmath=yes at 10pt
+   \font\mathfontscriptupright       = file:lucidabrightmathot.otf:ssty=1;fixmath=yes at  7pt
+   \font\mathfontscriptscriptupright = file:lucidabrightmathot.otf:ssty=2;fixmath=yes at  5pt
+   %
+   \textfont         0 = \mathfonttextupright
+   \scriptfont       0 = \mathfontscriptupright
+   \scriptscriptfont 0 = \mathfontscriptscriptupright
+   %
+   \tenrm}
 
-\textfont         0 = \mathfonttextupright
-\scriptfont       0 = \mathfontscriptupright
-\scriptscriptfont 0 = \mathfontscriptscriptupright
+\directlua {
+    if arguments["mtx:lucidabright"] then
+        tex.print("\string\\lucidabright")
+    else
+        tex.print("\string\\latinmodern")
+    end
+}
 
 \newtoks\everymathrm
 \newtoks\everymathmit
@@ -58,12 +88,12 @@
 \newtoks\everymathbi
 \newtoks\everymathtt
 
-\def\rm{\fam0\relax\the\everymathmrm\relax\tenrm\relax}
-\def\it{\fam0\relax\the\everymathit \relax\tenit\relax}
-\def\sl{\fam0\relax\the\everymathsl \relax\tensl\relax}
-\def\bf{\fam0\relax\the\everymathbf \relax\tenbf\relax}
-\def\bi{\fam0\relax\the\everymathbi \relax\tenbi\relax}
-\def\tt{\fam0\relax\the\everymathtt \relax\tentt\relax}
+\def\rm{\fam0\relax\the\everymathrm\relax\tenrm\relax}
+\def\it{\fam0\relax\the\everymathit\relax\tenit\relax}
+\def\sl{\fam0\relax\the\everymathsl\relax\tensl\relax}
+\def\bf{\fam0\relax\the\everymathbf\relax\tenbf\relax}
+\def\bi{\fam0\relax\the\everymathbi\relax\tenbi\relax}
+\def\tt{\fam0\relax\the\everymathtt\relax\tentt\relax}
 
 \let\mit     \relax % use names or \Uchar or define a vector
 \let\cal     \relax % idem, i'm not in the mood for this now
diff --git a/tex/generic/context/luatex/luatex-test.tex b/tex/generic/context/luatex/luatex-test.tex
index fbf8ce3cf..b822af668 100644
--- a/tex/generic/context/luatex/luatex-test.tex
+++ b/tex/generic/context/luatex/luatex-test.tex
@@ -84,4 +84,30 @@ $$\sqrt {2} { { {1} \over { {1} \over {x} } } } $$
 
 \cows Hello World!
 
+% math test
+
+\latinmodern
+
+\def\sqrt{\Uroot "0 "221A{}}
+
+\def\root#1\of{\Uroot "0 "221A{#1}}
+
+Inline $\sqrt{x}{1.2}$ math. % same for $\root n of x$
+
+$\root3\of x$
+
+$\sin{x}$
+
+\lucidabright
+
+\def\sqrt{\Uroot "0 "221A{}}
+
+\def\root#1\of{\Uroot "0 "221A{#1}}
+
+Inline $\sqrt{x}{1.2}$ math. % same for $\root n of x$
+
+$\root3\of x$
+
+$\sin{x}$
+
 \end