14 files changed, 24 insertions, 10 deletions
diff --git a/tex/context/base/bibl-bib.lua b/tex/context/base/bibl-bib.lua
index c86a0c0c2..65ca1f9e1 100644
--- a/tex/context/base/bibl-bib.lua
+++ b/tex/context/base/bibl-bib.lua
@@ -140,6 +140,7 @@ function bibtex.convert(session,content)
 end
 
 function bibtex.load(session,filename)
+    statistics.starttiming(bibtex)
     local filename = resolvers.findfile(filename,"bib")
     if filename ~= "" then
         local data = io.loaddata(filename) or ""
@@ -150,6 +151,7 @@ function bibtex.load(session,filename)
         end
         bibtex.convert(session,data)
     end
+    statistics.stoptiming(bibtex)
 end
 
 function bibtex.new()
@@ -246,7 +248,7 @@ end
 statistics.register("bibtex load time", function()
     local nofbytes = bibtexstats.nofbytes
     if nofbytes > 0 then
-        return format("%s seconds (%s bytes, %s definitions, %s shortcuts)",
+        return format("%s seconds, %s bytes, %s definitions, %s shortcuts",
             statistics.elapsedtime(bibtex),nofbytes,bibtexstats.nofdefinitions,bibtexstats.nofshortcuts)
     else
         return nil
diff --git a/tex/context/base/bxml-apa.mkiv b/tex/context/base/bxml-apa.mkiv
index 35319e4ce..7665d829c 100644
--- a/tex/context/base/bxml-apa.mkiv
+++ b/tex/context/base/bxml-apa.mkiv
@@ -142,6 +142,8 @@
     }
 \stopxmlsetups
 
+% we can inherit .. less assignments
+
 \startxmlsetups bibtex:apa:common:publisher
     \setvariables[bibtex:temp][label=publisher,left=,right=,otherwise=]\relax
     \bibxmlsetup{bibtex:apa:common:wherefrom}
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 529c04a22..c77cf0564 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{2013.12.02 15:22}
+\newcontextversion{2013.12.03 22:36}
 
 %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 4e667e642..637f4bbc1 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 12b88c4d0..2c36505e3 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2013.12.02 15:22}
+\edef\contextversion{2013.12.03 22:36}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/core-uti.mkiv b/tex/context/base/core-uti.mkiv
index da4a98fb7..527b90445 100644
--- a/tex/context/base/core-uti.mkiv
+++ b/tex/context/base/core-uti.mkiv
@@ -22,7 +22,8 @@
 
 \appendtoks
     \ctxlua {
-        job.comment("file","\jobname")
+      % job.comment("file","\jobname")
+        job.comment("file",tex.jobname)
         job.comment("format","\contextformat")
         job.comment("stamp","\contextversion")
         job.comment("escape","\!!bs\space...\space\!!es")
@@ -31,7 +32,8 @@
 
 \appendtoks
     \ctxlua {
-        job.initialize("\jobname.tuc","\jobname.tua")
+      % job.initialize("\jobname.tuc","\jobname.tua")
+        job.initialize(tex.jobname .. ".tuc",tex.jobname .. ".tua")
     }%
 \to \everyjob
 
diff --git a/tex/context/base/lpdf-wid.lua b/tex/context/base/lpdf-wid.lua
index 30bd3572b..11ac82a08 100644
--- a/tex/context/base/lpdf-wid.lua
+++ b/tex/context/base/lpdf-wid.lua
@@ -305,9 +305,9 @@ function nodeinjections.attachfile(specification)
     if registered == "" then
         registered = filename
     end
-    if author == "" then
+    if author == "" and title ~= "" then
         author = title
-        title = ""
+        title  = filename or ""
     end
     if author == "" then
         author = filename or "<unknown>"
diff --git a/tex/context/base/mtx-context-xml.tex b/tex/context/base/mtx-context-xml.tex
index 63b1d6e9e..eeaca3213 100644
--- a/tex/context/base/mtx-context-xml.tex
+++ b/tex/context/base/mtx-context-xml.tex
@@ -63,6 +63,7 @@
     if #files > 0 then
         if document.arguments.analyze then
             moduledata.xml.analyzers.structure (files)
+            context.page()
             moduledata.xml.analyzers.characters(files)
         else
             context("no action given")
diff --git a/tex/context/base/page-brk.mkiv b/tex/context/base/page-brk.mkiv
index 139dee1cd..cc9a9b4d2 100644
--- a/tex/context/base/page-brk.mkiv
+++ b/tex/context/base/page-brk.mkiv
@@ -392,7 +392,11 @@
 
 \def\page_tests_columns_test[#1][#2]%
   {\ifdefined\page_otr_command_test_column
-     \page_otr_command_test_column[#1][#2]%
+     \ifsecondargument
+        \page_otr_command_test_column[#1][#2]%
+     \else
+        \page_otr_command_test_column[#1][\zeropoint]%
+     \fi
    \fi}
 
 \protect \endinput
diff --git a/tex/context/base/page-mix.lua b/tex/context/base/page-mix.lua
index 220972caf..7d13d9e4e 100644
--- a/tex/context/base/page-mix.lua
+++ b/tex/context/base/page-mix.lua
@@ -468,7 +468,7 @@ local function setsplit(specification) -- a rather large function
             lastcurrent = nil
         elseif penalty == forcedbreak then
             local needed  = current[a_checkedbreak]
-            local proceed = not checked or checked == 0
+            local proceed = not needed or needed == 0
             if not proceed then
                 local available = target - height
                 proceed = needed >= available
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 2d49efa85..d7c3284fe 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 c020445b2..2de214591 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-not.mkvi b/tex/context/base/strc-not.mkvi
index c78fe842c..a1aecf83a 100644
--- a/tex/context/base/strc-not.mkvi
+++ b/tex/context/base/strc-not.mkvi
@@ -1313,6 +1313,9 @@
            \fi}}%
      \setbox\scratchbox\hbox{\lower\strutdepth\box\scratchbox}%
      \dp\scratchbox\strutdepth % so we know that it has the note bodyfont depth
+     \ifvmode
+       \nointerlineskip % else sometimes empty line
+     \fi
      \box\scratchbox
      \egroup
      \endgraf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index cd3b5d06b..434bd0624 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  : 12/02/13 15:22:43
+-- merge date  : 12/03/13 22:36:28
 
 do -- begin closure to overcome local limits and interference