2014-11-02 13:46:00

9 files changed, 26 insertions, 13 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 3e925590f..e19cfac44 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.11.02 12:23}
+\newcontextversion{2014.11.02 13:44}
 
 %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 a993ae649..55ed5ed5e 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 ac76e4d27..8eae3bd00 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.11.02 12:23}
+\edef\contextversion{2014.11.02 13:44}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/publ-imp-author.mkvi b/tex/context/base/publ-imp-author.mkvi
index 5620d3720..41eb6fda2 100644
--- a/tex/context/base/publ-imp-author.mkvi
+++ b/tex/context/base/publ-imp-author.mkvi
@@ -142,13 +142,18 @@
 \stopsetups
 
 \startsetups \s!btx:\s!cite:\s!author:name
-    \ifcase\currentbtxauthorstate
-        \fastsetup{\s!btx:\s!cite:\s!author:concat}
-        \fastsetup{\s!btx:\s!list:\s!author:normal}
-        \fastsetup{\s!btx:\s!cite:\s!author:others}
-    \else
-        \fastsetup{\s!btx:\s!list:\s!author:normal}
+    \fastsetup{\s!btx:\s!cite:\s!author:concat}
+    \ifx\currentbtxvons\empty \else
+        \currentbtxvons
+        \btxcitevariantparameter\c!vonsep
     \fi
+    \currentbtxsurnames
+    \ifcase\currentbtxauthorstate \else
+        % potential clash of names so we force initials
+        \btxcitevariantparameter\c!surnameinitialsep
+        \currentbtxinitials
+    \fi
+    \fastsetup{\s!btx:\s!cite:\s!author:others}
 \stopsetups
 
 % list (mostly the same)
diff --git a/tex/context/base/publ-ini.lua b/tex/context/base/publ-ini.lua
index 910348698..ad36aa4e3 100644
--- a/tex/context/base/publ-ini.lua
+++ b/tex/context/base/publ-ini.lua
@@ -392,9 +392,17 @@ setmetatableindex(usedentries,function(t,k)
             end
         end
         for k, v in next, names do
-            if #v > 1 then
-                for i=1,#v do
-                    v[i].state = 1
+            local n = #v
+            if n > 1 then
+                local original = v[1].original
+                for i=2,n do
+                    if original ~= v[i].original then
+                        report("potential clash in name %a",k)
+                        for i=1,n do
+                            v[i].state = 1
+                        end
+                        break
+                    end
                 end
             end
         end
diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv
index f056acf3b..15541dc18 100644
--- a/tex/context/base/publ-ini.mkiv
+++ b/tex/context/base/publ-ini.mkiv
@@ -877,7 +877,7 @@
    })}%
    \endgroup}
 
-\unexpanded\def\btxstartauthor#1#2#3%
+\unexpanded\def\btxstartauthor#1#2#3% a state > 0 signals that some authors can clash
   {\begingroup
    \currentbtxauthorindex#1\relax
    \currentbtxauthorcount#2\relax
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 49b7d784e..c9e7b112f 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 af7effa94..34b2bcba3 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index b31389ea4..f1d804adb 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  : 11/02/14 12:23:01
+-- merge date  : 11/02/14 13:44:07
 
 do -- begin closure to overcome local limits and interference