2015-12-29 13:32:00

16 files changed, 64 insertions, 51 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 7e9af7174..7b3be3b04 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.12.22 10:50}
+\newcontextversion{2015.12.29 13:30}
 
 %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 6791d5c81..8dfbadc4f 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 19376d0e6..6fa3d1d98 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2015.12.22 10:50}
+\edef\contextversion{2015.12.29 13:30}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/lpdf-ini.lua b/tex/context/base/lpdf-ini.lua
index a0707c23c..6bce56b43 100644
--- a/tex/context/base/lpdf-ini.lua
+++ b/tex/context/base/lpdf-ini.lua
@@ -1239,9 +1239,9 @@ implement { name = "lpdf_collectedresources",                             action
 implement { name = "lpdf_addtocatalog",          arguments = two_strings, actions = lpdf.addtocatalog }
 implement { name = "lpdf_addtoinfo",             arguments = two_strings, actions = lpdf.addtoinfo }
 implement { name = "lpdf_addtonames",            arguments = two_strings, actions = lpdf.addtonames }
-implement { name = "lpdf_addpageattributes",     arguments = two_strings, actions = lpdf.addtopageattributes }
-implement { name = "lpdf_addpagesattributes",    arguments = two_strings, actions = lpdf.addtopagesattributes }
-implement { name = "lpdf_addpageresources",      arguments = two_strings, actions = lpdf.addtopageresources }
+implement { name = "lpdf_addtopageattributes",   arguments = two_strings, actions = lpdf.addtopageattributes }
+implement { name = "lpdf_addtopagesattributes",  arguments = two_strings, actions = lpdf.addtopagesattributes }
+implement { name = "lpdf_addtopageresources",    arguments = two_strings, actions = lpdf.addtopageresources }
 implement { name = "lpdf_adddocumentextgstate",  arguments = two_strings, actions = function(a,b) lpdf.adddocumentextgstate (a,lpdfverbose(b)) end }
 implement { name = "lpdf_adddocumentcolorspace", arguments = two_strings, actions = function(a,b) lpdf.adddocumentcolorspace(a,lpdfverbose(b)) end }
 implement { name = "lpdf_adddocumentpattern",    arguments = two_strings, actions = function(a,b) lpdf.adddocumentpattern   (a,lpdfverbose(b)) end }
diff --git a/tex/context/base/math-noa.lua b/tex/context/base/math-noa.lua
index 74d947415..878b1e9a1 100644
--- a/tex/context/base/math-noa.lua
+++ b/tex/context/base/math-noa.lua
@@ -100,13 +100,10 @@ local getchar              = nuts.getchar
 local getfont              = nuts.getfont
 local getattr              = nuts.getattr
 
-local insert_node_after    = nuts.insert_after
-local insert_node_before   = nuts.insert_before
 local free_node            = nuts.free
 local new_node             = nuts.new -- todo: pool: math_noad math_sub
 local copy_node            = nuts.copy
 local slide_nodes          = nuts.slide
-local linked_nodes         = nuts.linked
 local set_visual           = nuts.setvisual
 
 local mlist_to_hlist       = nodes.mlist_to_hlist
diff --git a/tex/context/base/mult-mes.lua b/tex/context/base/mult-mes.lua
index 64184f8b0..979831726 100644
--- a/tex/context/base/mult-mes.lua
+++ b/tex/context/base/mult-mes.lua
@@ -490,6 +490,9 @@ return {
             no = "there is nothing to split",
             ro = "there is nothing to split",
         },
+        ["floatblocks:1"] = {
+            en = "%a is empty",
+        },
         ["floatblocks:2"] = {
             cs = "%a ulozeno",
             de = "%a gespeichert",
diff --git a/tex/context/base/page-flt.lua b/tex/context/base/page-flt.lua
index e91285d0a..9cc9012a2 100644
--- a/tex/context/base/page-flt.lua
+++ b/tex/context/base/page-flt.lua
@@ -34,6 +34,13 @@ local textakebox       = nodes.takebox
 floats                 = floats or { }
 local floats           = floats
 
+local context          = context
+local commands         = commands
+local interfaces       = interfaces
+local showmessage      = interfaces.showmessage
+local implement        = interfaces.implement
+local setmacro         = interfaces.setmacro
+
 local noffloats        = 0
 local last             = nil
 local default          = "text"
@@ -118,12 +125,13 @@ function floats.save(which,data)
             box  = b,
         }
         insert(stack,t)
+-- inspect(stacks)
         setcount("global","savednoffloats",#stacks[default])
         if trace_floats then
             report_floats("%s, category %a, number %a, slot %a, width %p, height %p, depth %p","saving",
                 which,noffloats,#stack,b.width,b.height,b.depth)
         else
-            interfaces.showmessage("floatblocks",2,noffloats)
+            showmessage("floatblocks",2,noffloats)
         end
     else
         report_floats("ignoring empty, category %a, number %a",which,noffloats)
@@ -137,12 +145,13 @@ function floats.resave(which)
         local b = textakebox("floatbox")
         last.box = b
         insert(stack,1,last)
+-- inspect(stacks)
         setcount("global","savednoffloats",#stacks[default])
         if trace_floats then
             report_floats("%s, category %a, number %a, slot %a width %p, height %p, depth %p","resaving",
                 which,noffloats,#stack,b.width,b.height,b.depth)
         else
-            interfaces.showmessage("floatblocks",2,noffloats)
+            showmessage("floatblocks",2,noffloats)
         end
     else
         report_floats("unable to resave float")
@@ -151,15 +160,19 @@ end
 
 function floats.flush(which,n,bylabel)
     which = which or default
+-- inspect(stacks)
     local stack = stacks[which]
     local t, b, n = get(stack,n or 1,bylabel)
     if t then
+        if not b then
+            showmessage("floatblocks",1,t.n)
+        end
         if trace_floats then
             local w, h, d = setdimensions(b) -- ?
             report_floats("%s, category %a, number %a, slot %a width %p, height %p, depth %p","flushing",
                 which,t.n,n,w,h,d)
         else
-            interfaces.showmessage("floatblocks",3,t.n)
+            showmessage("floatblocks",3,t.n)
         end
         texsetbox("floatbox",b)
         last = remove(stack,n)
@@ -175,8 +188,8 @@ function floats.consult(which,n)
     local stack = stacks[which]
     local t, b, n = get(stack,n)
     if t then
+        local w, h, d = setdimensions(b)
         if trace_floats then
-            local w, h, d = setdimensions(b)
             report_floats("%s, category %a, number %a, slot %a width %p, height %p, depth %p","consulting",
                 which,t.n,n,w,h,d)
         end
@@ -277,11 +290,6 @@ end
 
 -- interface
 
-local context   = context
-local commands  = commands
-local implement = interfaces.implement
-local setmacro  = interfaces.setmacro
-
 implement {
     name      = "flushfloat",
     actions   = floats.flush,
diff --git a/tex/context/base/page-set.mkiv b/tex/context/base/page-set.mkiv
index f0a088ea3..98548b3aa 100644
--- a/tex/context/base/page-set.mkiv
+++ b/tex/context/base/page-set.mkiv
@@ -1038,15 +1038,6 @@
         \fi}%
    \fi}
 
-\let\preferedcolumn\empty
-\let\preferedrow   \empty
-
-\def\OTRSETsetpreferedcolumnslot#1#2%
-  {\doifsomething{#1}{\edef\preferedcolumn{#1}}%
-   \doifsomething{#2}{\edef\preferedrow   {#2}}}
-
-\OTRSETsetpreferedcolumnslot{\nofcolumns}{1} % default ?
-
 \let\pofcolumns\mofcolumns
 \let\qofcolumns\mofcolumns
 
@@ -1118,8 +1109,8 @@
      {\OTRSETprepareforcolumnslot2}{\OTRSETprepareforcolumnslot1}{#1}% % 1/2 dependent of place, todo
    \OTRSETflushtextsofar
    \OTRSETstoreincolumnslotindeed
-     \pofcolumns \pofcolumns    +\currenthcell
-     \preferedrow\columnmaxcells+\currentvcell{#1}}
+     \pofcolumns \pofcolumns +\currenthcell
+     \floatrow\columnmaxcells+\currentvcell{#1}}
 
 \def\OTRSETstoreincolumnslotFXBT#1% fixed column
   {\OTRSETcheckprefered
@@ -1127,8 +1118,8 @@
      {\OTRSETprepareforcolumnslot2}{\OTRSETprepareforcolumnslot3}{#1}% % 3/2 dependent of place, todo
    \OTRSETflushtextsofar
    \OTRSETstoreincolumnslotindeed
-     \pofcolumns    \pofcolumns +\currenthcell
-     \columnmaxcells\preferedrow-\currentvcell{#1}}
+     \pofcolumns    \pofcolumns+\currenthcell
+     \columnmaxcells\floatrow  -\currentvcell{#1}}
 
 \newconstant\OTRSETforcefixedfloats
 
@@ -1179,10 +1170,10 @@
    \page_set_command_set_vsize}
 
 \def\OTRSETcheckprefered
-  {\ifnum\preferedcolumn<\mofcolumns
+  {\ifnum\floatcolumn<\mofcolumns
      \let\pofcolumns\mofcolumns
    \else
-     \let\pofcolumns\preferedcolumn
+     \let\pofcolumns\floatcolumn
    \fi
    \ifquitincurrentcolumn
      \ifnum\mofcolumns=\nofcolumns
diff --git a/tex/context/base/scrn-pag.mkvi b/tex/context/base/scrn-pag.mkvi
index a16b90c6d..3a01271ce 100644
--- a/tex/context/base/scrn-pag.mkvi
+++ b/tex/context/base/scrn-pag.mkvi
@@ -192,6 +192,11 @@
     \global\let\scrn_canvas_synchronize_complex\scrn_canvas_synchronize_complex_indeed
 \to \everysetuplayout
 
+\appendtoks
+    \global\let\scrn_canvas_synchronize_simple \scrn_canvas_synchronize_simple_indeed
+    \global\let\scrn_canvas_synchronize_complex\scrn_canvas_synchronize_complex_indeed
+\to \everysetuplayouttarget
+
 \def\scrn_canvas_synchronize_simple_indeed
   {\clf_setupcanvas
      paperwidth  \printpaperwidth
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 5649b4397..2ed0c234e 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 fc1ca4903..6572d3cd2 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-flt.mkvi b/tex/context/base/strc-flt.mkvi
index a367c5ba7..ff06b4609 100644
--- a/tex/context/base/strc-flt.mkvi
+++ b/tex/context/base/strc-flt.mkvi
@@ -2043,9 +2043,6 @@
 %      \let\floatrow   \empty
 %      \setfloatmethodvariables\floatlocation
      % todo: nog algemeen otr
-     \ifdefined\OTRSETsetpreferedcolumnslot
-       \OTRSETsetpreferedcolumnslot\floatcolumn\floatrow
-     \fi
      \ifcsname\??floatmethods\currentoutputroutine:\floatmethod\endcsname \else
         \let\floatmethod\v!here
      \fi
diff --git a/tex/context/base/strc-reg.mkiv b/tex/context/base/strc-reg.mkiv
index e3c92ae37..fd4a81657 100644
--- a/tex/context/base/strc-reg.mkiv
+++ b/tex/context/base/strc-reg.mkiv
@@ -464,7 +464,7 @@
   {\doflushatpar{\strc_registers_register_page_entry{#1}{\c!label=#2,#3}{#4}}}
 
 \def\strc_registers_stop[#1][#2]%
-  {\normalexpanded{\ctxlatelua{structures.registers.extend("#1","#2")}}}
+  {\normalexpanded{\ctxlatecommand{structures.registers.extend("#1","#2")}}}
 
 % So far.
 
diff --git a/tex/context/sample/samples.tex b/tex/context/sample/samples.tex
index 97e777ccc..0201ab318 100644
--- a/tex/context/sample/samples.tex
+++ b/tex/context/sample/samples.tex
@@ -19,33 +19,35 @@ used in testing bibliographic references and citations.
 \NC douglas.tex        \NC Douglas R. Hofstadter \NC \NC \NR
 \NC dawkins.tex        \NC            Dawkins    \NC \NC \NR
 \NC ward.tex           \NC Peter   D. Ward       \NC The Life and Death of Planet Earth \NC \NR
-\NC zapf.tex           \NC Hermann    Zapf       \NC About micro-typography and the hz-program, \endgraf
-                                                     Electronic Publishing, vol. 6(3), \endgraf
+\NC zapf.tex           \NC Hermann    Zapf       \NC About micro-typography and the hz-program,
+                                                     Electronic Publishing, vol. 6(3),
                                                      283-288 (September 1993) \NC \NR
-\NC bryson.tex         \NC Bill       Bryson     \NC A Short History of Nearly Everything, \endgraf
+\NC bryson.tex         \NC Bill       Bryson     \NC A Short History of Nearly Everything,
                                                      Random House, 2003 \NC \NR
-\NC davis.tex          \NC Kenneth C. Davis      \NC Don't Know Much About History, \endgraf
+\NC davis.tex          \NC Kenneth C. Davis      \NC Don't Know Much About History,
                                                      Everything You Need to Know About American
-                                                     History but Never Learned, \endgraf
+                                                     History but Never Learned,
                                                      HarperCollins, 2003 \NC \NR
 \NC thuan.tex          \NC Trinh Xuan Thuan      \NC Chaos and Harmony, Perspectives on Scientific
-                                                     Revolutions of the Twentieth Century, \endgraf
+                                                     Revolutions of the Twentieth Century,
                                                      Oxford University Press, 2001 \NC \NR
 \NC hawking.tex        \NC Steve W. Hawking      \NC The Universe in a Nutshell, Bantam Books
                                                      Random House, 2001 \NC \NR
 \NC linden.tex         \NC Eugene Linden         \NC The Winds of Change, Climate, Weather, and the
-                                                     Destruction of Civilizations, \endgraf
+                                                     Destruction of Civilizations,
                                                      Simon \& Schuster, 2006, p.106 \NC \NR
-\NC weisman.tex        \NC Alan Weisman          \NC The World Without Us, \endgraf
+\NC weisman.tex        \NC Alan Weisman          \NC The World Without Us,
                                                      Thomas Dunne Books, 2007, p.160 \NC \NR
-\NC montgomery.tex     \NC David R Montgomery    \NC Dirt, The Erosion of Civilizations, \endgraf
+\NC montgomery.tex     \NC David R Montgomery    \NC Dirt, The Erosion of Civilizations,
                                                      University of California Press, 2007, p.199 \NC \NR
-\NC carrol.tex         \NC Sean B. Carrol        \NC The Making of the Fittest, \endgraf
+\NC carrol.tex         \NC Sean B. Carrol        \NC The Making of the Fittest,
                                                      Quercus, London, 2006 \NC \NR
-%NC jojomayer.tex      \NC Jojo Mayer            \NC Between Zero & One, www.youtube.com/watch?v=mSj298iBjBY \NC \NR
-%NC schwarzenegger.tex \NC Arnold Schwarzenegger \NC Several place on the World Wide Web. \NC \NR
-\NC carey.tex          \NC Nessa Carey           \NC The Epigenetics Revolution, \endgraf
+%NC schwarzenegger.tex \NC Arnold Schwarzenegger \NC Several places on the World Wide Web. \NC \NR
+\NC carey.tex          \NC Nessa Carey           \NC The Epigenetics Revolution,
                                                      Columbia University Press, 2012, p. 195 \NC \NR
+\NC waltham.tex        \NC David Waltham         \NC Lucky Planet, why earth is exceptional and what that
+                                                     means for life in the universe,
+                                                     Icon Books Ltd, London, 2014, p. 168 \NC \NR
 \stoptabulate
 
 % Tufte: This quote will always produce hyphenated text, apart from the content,
@@ -71,7 +73,7 @@ used in testing bibliographic references and citations.
 % Dirt, The Erosion of Civilizations: one of those books that you buy immediately after
 % reading a few sentences. Also one of those books that every politician should read.
 
-% The Making of the Fittest: nice sample for color ans subsentence testing. A very
+% The Making of the Fittest: nice sample for color and subsentence testing. A very
 % readable book but unfortunately it has inter-character spacing.
 
 % The Schwarzenegger letter was originally typeset at a width equivalent to 16.1cm in
diff --git a/tex/context/sample/waltham.tex b/tex/context/sample/waltham.tex
new file mode 100644
index 000000000..09bb8839d
--- /dev/null
+++ b/tex/context/sample/waltham.tex
@@ -0,0 +1,10 @@
+None of these properties have values set, as far as we know, by fundamental laws
+of nature, and quite moderate alterations produce imagined universes with
+substantially less complexity than our own |=| universes where galaxies, stars,
+planets, molecules, atoms or even nuclei cannot exist. Life is, if nothing else,
+complexity|-|unmatched and it stretches credulity to suggest that universes that
+can't even make atoms could somehow generate life. It's conceivable that the
+values of physical constants in our Universe are the only possible, but the
+alternative explanation, that multiple universes are actually realised in nature
+and that we necessarily live in one of the few where the constants are \quote
+{just right}, is surely a fascinating idea worth pursuing.
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 9208e5286..f4dbf705a 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 12/22/15 10:50:54
+-- merge date  : 12/29/15 13:30:02
 
 do -- begin closure to overcome local limits and interference