2015-01-19 19:31:00

20 files changed, 98 insertions, 31 deletions

diff --git a/colors/icc/profiles/ecirgb_v2.icc b/colors/icc/profiles/ecirgb_v2.icc
new file mode 100644
index 000000000..8fd642f85
--- /dev/null
+++ b/colors/icc/profiles/ecirgb_v2.icc
diff --git a/colors/icc/profiles/ecirgb_v2_iccv4.icc b/colors/icc/profiles/ecirgb_v2_iccv4.icc
new file mode 100644
index 000000000..efceaef63
--- /dev/null
+++ b/colors/icc/profiles/ecirgb_v2_iccv4.icc
diff --git a/colors/icc/profiles/isocoated_v2_300_eci.icc b/colors/icc/profiles/isocoated_v2_300_eci.icc
new file mode 100644
index 000000000..10704a637
--- /dev/null
+++ b/colors/icc/profiles/isocoated_v2_300_eci.icc
diff --git a/colors/icc/profiles/isocoated_v2_eci.icc b/colors/icc/profiles/isocoated_v2_eci.icc
new file mode 100644
index 000000000..0831a2508
--- /dev/null
+++ b/colors/icc/profiles/isocoated_v2_eci.icc
diff --git a/colors/icc/profiles/srgb.icc b/colors/icc/profiles/srgb.icc
new file mode 100644
index 000000000..7f9d18d09
--- /dev/null
+++ b/colors/icc/profiles/srgb.icc
diff --git a/colors/icc/profiles/srgb_v4_icc_preference.icc b/colors/icc/profiles/srgb_v4_icc_preference.icc
new file mode 100644
index 000000000..cfbd03e1f
--- /dev/null
+++ b/colors/icc/profiles/srgb_v4_icc_preference.icc
diff --git a/doc/context/documents/general/manuals/xtables-mkiv.pdf b/doc/context/documents/general/manuals/xtables-mkiv.pdf
index ba3f1b3e0..4559ce314 100644
--- a/doc/context/documents/general/manuals/xtables-mkiv.pdf
+++ b/doc/context/documents/general/manuals/xtables-mkiv.pdf
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index e6f9bc78b..939558740 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{2015.01.19 11:20}
+\newcontextversion{2015.01.19 19:29}
 
 %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 49608c313..dfb43033c 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 32280f374..27a3b9fcf 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{2015.01.19 11:20}
+\edef\contextversion{2015.01.19 19:29}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/grph-inc.lua b/tex/context/base/grph-inc.lua
index ca17a181c..6f62f88b7 100644
--- a/tex/context/base/grph-inc.lua
+++ b/tex/context/base/grph-inc.lua
@@ -1425,12 +1425,7 @@ end
 -- programs.makeoptions = makeoptions
 
 local function runprogram(binary,argument,variables)
-    -- os.which remembers found programs
---     if not variables and type(binary) == "table" and binary.command then
---         variables = argument
---         argument  = binary.argument
---         binary    = binary.command
---     end
+    -- move this check to the runner code
     local found = nil
     if type(binary) == "table" then
         for i=1,#binary do
@@ -1453,7 +1448,9 @@ local function runprogram(binary,argument,variables)
     elseif not argument or argument == "" then
         report_inclusion("nothing to run, no arguments for program %a",binary)
     else
-        local command = format([["%s" %s]],found,replacetemplate(longtostring(argument),variables))
+        -- no need to use the full found filename (found) .. we also don't quote the program
+        -- name any longer as in luatex there is too much messing with these names
+        local command = format([[%s %s]],binary,replacetemplate(longtostring(argument),variables))
         if trace_conversion or trace_programs then
             report_inclusion("running command: %s",command)
         end
@@ -1648,8 +1645,15 @@ bmpconverter.default = converter
 
 -- cmyk conversion
 
-local rgbprofile  = "srgb.icc"
-local cmykprofile = "isocoated_v2_eci.icc"
+-- ecirgb_v2.icc
+-- ecirgb_v2_iccv4.icc
+-- isocoated_v2_300_eci.icc
+-- isocoated_v2_eci.icc
+-- srgb.icc
+-- srgb_v4_icc_preference.icc
+
+local rgbprofile  = "srgb_v4_icc_preference.icc" -- srgb.icc
+local cmykprofile = "isocoated_v2_300_eci.icc"   -- isocoated_v2_eci.icc
 
 directives.register("graphics.conversion.rgbprofile", function(v) rgbprofile  = type(v) == "string" and v or rgbprofile  end)
 directives.register("graphics.conversion.cmykprofile",function(v) cmykprofile = type(v) == "string" and v or cmykprofile end)
@@ -1676,12 +1680,14 @@ end
 
 programs.pngtocmykpdf = {
     command  = "gm",
-    argument = [[convert -strip +profile "*" -profile "%rgbprofile%" -profile "%cmykprofile%" -colorspace cmyk -strip -sampling-factor 1x1 "%oldname%" "%newname%"]],
+    argument = [[convert -strip +profile "*" -profile "%rgbprofile%" -profile "%cmykprofile%" -colorspace cmyk -sampling-factor 1x1 "%oldname%" "%newname%"]],
+ -- argument = [[convert -strip +profile "*" -colorspace cmyk -sampling-factor 1x1 "%oldname%" "%newname%"]],
 }
 
 programs.jpgtocmykpdf = {
     command  = "gm",
-    argument = [[convert -strip +profile "*" -profile "%rgbprofile%" -profile "%cmykprofile%" -colorspace cmyk -strip -sampling-factor 1x1 -compress JPEG "%oldname%" "%newname%"]],
+    argument = [[convert -strip +profile "*" -profile "%rgbprofile%" -profile "%cmykprofile%" -colorspace cmyk -sampling-factor 1x1 -compress JPEG "%oldname%" "%newname%"]],
+ -- argument = [[convert -strip +profile "*" -colorspace cmyk -sampling-factor 1x1 -compress JPEG "%oldname%" "%newname%"]],
 }
 
 figures.converters.png = {
diff --git a/tex/context/base/publ-dat.lua b/tex/context/base/publ-dat.lua
index e360ca1fe..c6b2cb105 100644
--- a/tex/context/base/publ-dat.lua
+++ b/tex/context/base/publ-dat.lua
@@ -602,7 +602,14 @@ do
             current.loaded[source] = kind or true
         end
         current.newtags = #current.luadata > 0 and { } or current.newtags
+        local before = #current.luadata
         lpegmatch(bibtotable,content or "",1,current)
+        local after = #current.luadata
+        if before == after then
+            report("no entries added")
+        else
+            report("%s entries added",after-before)
+        end
         statistics.stoptiming(publications)
     end
 
@@ -739,7 +746,7 @@ do
             return
         end
         if trace then
-            report("loading file",fullname)
+            report("loading file %a",fullname)
         end
         publications.loadbibdata(dataset,data,fullname,kind)
     end
diff --git a/tex/context/base/publ-imp-apa.lua b/tex/context/base/publ-imp-apa.lua
index a529c47ec..d26e32ac4 100644
--- a/tex/context/base/publ-imp-apa.lua
+++ b/tex/context/base/publ-imp-apa.lua
@@ -37,7 +37,7 @@ local specification = {
         composer    = "author",
         producer    = "author",
         doi         = "url",
-        url         = "url", 
+        url         = "url",
         page        = "pagenumber",
         pages       = "pagenumber",
         keywords    = "keyword",
@@ -86,7 +86,7 @@ local generic = {
 -- all other fields will be ignored.
 
 -- Sets contain either/or in order of precedence.
--- 
+--
 -- For a category *not* defined here yet present in the dataset, *all* fields
 -- are taken as optional. This allows for flexibility in the addition of new
 -- categories.
diff --git a/tex/context/base/publ-ini.lua b/tex/context/base/publ-ini.lua
index 1fa2c44e1..0431b6cbb 100644
--- a/tex/context/base/publ-ini.lua
+++ b/tex/context/base/publ-ini.lua
@@ -348,9 +348,11 @@ do
         usedentries = allocate { }
         citetolist  = allocate { }
         listtocite  = allocate { }
-        local names = { }
+        local names     = { }
         local internals = structures.references.internals
         local p_collect = (C(R("09")^1) * Carg(1) / function(s,entry) listtocite[tonumber(s)] = entry end + P(1))^0
+        local nofunique = 0
+        local nofreused = 0
         for i=1,#internals do
             local entry = internals[i]
             if entry then
@@ -372,8 +374,10 @@ do
                                     else
                                         s[tag] = { entry }
                                     end
+                                    nofreused = nofreused + 1
                                 else
                                     usedentries[set] = { [tag] = { entry } }
+                                    nofunique = nofunique + 1
                                 end
                                 -- alternative: collect prev in group
                                 local bck = userdata.btxbck
@@ -386,6 +390,7 @@ do
                                     end
                                 end
                                 local detail = datasets[set].details[tag]
+-- todo: these have to be pluggable
                                 if detail then
                                     local author = detail.author
                                     if author then
@@ -437,6 +442,9 @@ do
                 end
             end
         end
+        if trace_detail then
+            report("%s unique bibentries: %s reused entries",nofunique,nofreused)
+        end
         initialize = nil
     end
 
@@ -568,6 +576,9 @@ end
 
 local function unknowncite(reference)
     ctx_btxsettag(reference)
+    if trace_detail then
+        report("expanding %a cite setup %a","unknown","unknown")
+    end
     ctx_btxcitesetup("unknown")
 end
 
@@ -580,6 +591,9 @@ local function marknocite(dataset,tag,nofcitations) -- or just: ctx_btxdomarkcit
     ctx_btxsetdataset(dataset)
     ctx_btxsettag(tag)
     ctx_btxsetbacklink(nofcitations)
+    if trace_detail then
+        report("expanding %a cite setup %a","nocite","nocite")
+    end
     ctx_btxcitesetup("nocite")
     ctx_btxstopcite()
 end
@@ -1622,6 +1636,9 @@ do
                 ctx_btxsetlastinternal(last[2].internal)
                 ctx_btxsetlastpage(last[1])
             end
+            if trace_detail then
+                report("expanding page setup")
+            end
             ctx_btxpagesetup()
         end
     end
@@ -1935,7 +1952,11 @@ do
         local found, todo, list = findallused(dataset,reference,internal)
         tobemarked = specification.markentry and todo
         --
-        if found and setup then
+        if not found then
+            report("nothing found for %a",reference)
+        elseif not setup then
+            report("invalid reference for %a",reference)
+        else
             local source  = { }
             local badkey  = false
             local luadata = datasets[dataset].luadata
@@ -2009,6 +2030,9 @@ do
                     ctx_btxsetfirst(f_missing(tag))
                 end
                 ctx_btxsetconcat(concatstate(i,n))
+                if trace_detail then
+                    report("expanding cite setup %a",setup)
+                end
                 ctx_btxcitesetup(setup)
                 ctx_btxstopcite()
             end
@@ -2017,6 +2041,7 @@ do
                 local target = (compressor or compresslist)(source)
                 local nofcollected = #target
                 if nofcollected == 0 then
+                    report("nothing found for %a",reference)
                     unknowncite(reference)
                 else
                     for i=1,nofcollected do
@@ -2476,6 +2501,9 @@ do
                         end
                     end
                     ctx_btxsetconcat(concatstate(i,nofcollected))
+                    if trace_detail then
+                        report("expanding %a cite setup %a","single author",setup)
+                    end
                     ctx_btxcitesetup(setup)
                     ctx_btxstopciteauthor()
                 end
@@ -2494,6 +2522,9 @@ do
          -- ctx_btxsetinternal(bl and bl.references.internal or "")
             ctx_btxsetfirst(entry[key] or f_missing(tag))
             ctx_btxsetthird(entry.suffix)
+            if trace_detail then
+                report("expanding %a cite setup %a","multiple author",setup)
+            end
             ctx_btxcitesetup(setup)
             ctx_btxstopciteauthor()
             ctx_btxstopsubcite()
@@ -2639,11 +2670,17 @@ do
 
     function listvariants.default(dataset,block,tag,variant)
         ctx_btxsetfirst("?")
+        if trace_detail then
+            report("expanding %a list setup %a","default",variant)
+        end
         ctx_btxlistsetup(variant)
     end
 
     function listvariants.num(dataset,block,tag,variant,listindex)
         ctx_btxsetfirst(listindex)
+        if trace_detail then
+            report("expanding %a list setup %a","num",variant)
+        end
         ctx_btxlistsetup(variant)
     end
 
@@ -2659,6 +2696,9 @@ do
         if suffix then
             ctx_btxsetthird(suffix)
         end
+        if trace_detail then
+            report("expanding %a list setup %a","short",variant)
+        end
         ctx_btxlistsetup(variant)
     end
 
@@ -2678,6 +2718,9 @@ do
                             ctx_btxsetconcat(i-2)
                             ctx_btxsetfirst(realpage)
                             ctx_btxsetsecond(backlink)
+                            if trace_detail then
+                                report("expanding %a list setup %a","page",variant)
+                            end
                             ctx_btxlistsetup(variant)
                         end
                     end
diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv
index 6e03bb96a..4bfb7db8f 100644
--- a/tex/context/base/publ-ini.mkiv
+++ b/tex/context/base/publ-ini.mkiv
@@ -123,7 +123,7 @@
 \appendtoks
     \edef\currentbtxspecification{\btxparameter\c!specification}%
     \ifcsname\??btxrenderingdefinition\currentbtxspecification\endcsname
-        % maybe fall back on apa ?
+        % maybe fall back on 4 ?
     \else
         \loadbtxdefinitionfile[\currentbtxspecification]%
         \showmessage\m!publications{14}{\currentbtxspecification}%
diff --git a/tex/context/base/publ-tra.lua b/tex/context/base/publ-tra.lua
index d3bc05ea1..7ab81da66 100644
--- a/tex/context/base/publ-tra.lua
+++ b/tex/context/base/publ-tra.lua
@@ -98,7 +98,7 @@ function tracers.showdatasetcompleteness(settings)
     end
 
     local function required(done,foundfields,key,value,indirect)
-        ctx_NC() if not done then context("required") end
+        ctx_NC() if not done then ctx_monobold("required") end
         ctx_NC() context(key)
         ctx_NC()
             if indirect then
@@ -118,7 +118,7 @@ function tracers.showdatasetcompleteness(settings)
     end
 
     local function optional(done,foundfields,key,value,indirect)
-        ctx_NC() if not done then context("optional") end
+        ctx_NC() if not done then ctx_monobold("optional") end
         ctx_NC() context(key)
         ctx_NC()
             if indirect then
@@ -132,7 +132,7 @@ function tracers.showdatasetcompleteness(settings)
     end
 
     local function special(done,key,value)
-        ctx_NC() if not done then context("special") end
+        ctx_NC() if not done then ctx_monobold("special") end
         ctx_NC() context(key)
         ctx_NC() context(lpegmatch(texescape,value))
         ctx_NC() ctx_NR()
@@ -140,7 +140,7 @@ function tracers.showdatasetcompleteness(settings)
     end
 
     local function extra(done,key,value)
-        ctx_NC() if not done then context("extra") end
+        ctx_NC() if not done then ctx_monobold("extra") end
         ctx_NC() context(key)
         ctx_NC() context(lpegmatch(texescape,value))
         ctx_NC() ctx_NR()
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index bf1ab3f94..6a88cbdf8 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 80ba54d56..b84665942 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/tabl-ntb.mkiv b/tex/context/base/tabl-ntb.mkiv
index 2f37961ea..ddb18018f 100644
--- a/tex/context/base/tabl-ntb.mkiv
+++ b/tex/context/base/tabl-ntb.mkiv
@@ -1071,7 +1071,7 @@
    \ifautoTBLemptycell
       \normalexpanded
          {\tabl_ntb_set_txt_process\c_tabl_ntb_current_row\c_tabl_ntb_current_col{\the\c_tabl_ntb_current_row}{\the\c_tabl_ntb_current_col}}%
-         {\c!option=\v!tight}{\strut}%
+         {\c!option=\v!tight}{\strut\kern\scaledpoint}% the kern forces the tight
    \fi}
 
 \def\tabl_ntb_loop_two
@@ -1299,15 +1299,26 @@
   {\global\advance\c_tabl_ntb_col\plusone
    \kern\d_tabl_ntb_columndistance}
 
+% \setvalue{\??naturaltablecell\the\c_tabl_ntb_none}#1#2%
+%   {\scratchcounter\tabl_ntb_get_col{#1}{#2}\relax
+%    \ifnum\scratchcounter>\zerocount
+%      \normalexpanded
+%        {\t_tabl_ntb_row
+%           {\the\t_tabl_ntb_row
+%            \tabl_ntb_span{\the\scratchcounter}%
+%            \tabl_ntb_plus}}%
+%    \fi}
+
 \setvalue{\??naturaltablecell\the\c_tabl_ntb_none}#1#2%
   {\scratchcounter\tabl_ntb_get_col{#1}{#2}\relax
-   \ifnum\scratchcounter>\zerocount
-     \normalexpanded
-       {\t_tabl_ntb_row
-          {\the\t_tabl_ntb_row
+   \normalexpanded
+     {\t_tabl_ntb_row
+        {\the\t_tabl_ntb_row
+         \ifnum\scratchcounter>\zerocount
            \tabl_ntb_span{\the\scratchcounter}%
-           \tabl_ntb_plus}}%
-   \fi}
+         \else
+           \tabl_ntb_plus
+         \fi}}}
 
 \setvalue{\??naturaltablecell\the\c_tabl_ntb_cell}#1#2%
   {\t_tabl_ntb_row\expandafter{\the\t_tabl_ntb_row\tabl_ntb_pass #1 #2 }% space delimited -> less tokens
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 3aceddaa1..e5b159d7d 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  : 01/19/15 11:20:20
+-- merge date  : 01/19/15 19:29:42
 
 do -- begin closure to overcome local limits and interference