2015-01-10 00:46:00

30 files changed, 840 insertions, 459 deletions

diff --git a/doc/context/documents/general/manuals/tools-mkiv.pdf b/doc/context/documents/general/manuals/tools-mkiv.pdf
index cd2c062eb..b0560258b 100644
--- a/doc/context/documents/general/manuals/tools-mkiv.pdf
+++ b/doc/context/documents/general/manuals/tools-mkiv.pdf
diff --git a/doc/context/documents/general/manuals/units-mkiv.pdf b/doc/context/documents/general/manuals/units-mkiv.pdf
index 50e09def5..e04f7f417 100644
--- a/doc/context/documents/general/manuals/units-mkiv.pdf
+++ b/doc/context/documents/general/manuals/units-mkiv.pdf
diff --git a/doc/context/documents/general/manuals/workflows-mkiv.pdf b/doc/context/documents/general/manuals/workflows-mkiv.pdf
new file mode 100644
index 000000000..8d9ee5cd6
--- /dev/null
+++ b/doc/context/documents/general/manuals/workflows-mkiv.pdf
diff --git a/doc/context/sources/general/manuals/workflows/workflows-contents.tex b/doc/context/sources/general/manuals/workflows/workflows-contents.tex
new file mode 100644
index 000000000..a32f4737d
--- /dev/null
+++ b/doc/context/sources/general/manuals/workflows/workflows-contents.tex
@@ -0,0 +1,13 @@
+% language=uk
+
+\environment workflows-style
+
+\startcomponent workflows-contents
+
+\starttitle[title=Contents]
+
+    \placelist[chapter]
+
+\stoptitle
+
+\stopcomponent
diff --git a/doc/context/sources/general/manuals/workflows/workflows-graphics.tex b/doc/context/sources/general/manuals/workflows/workflows-graphics.tex
new file mode 100644
index 000000000..549b8b9f2
--- /dev/null
+++ b/doc/context/sources/general/manuals/workflows/workflows-graphics.tex
@@ -0,0 +1,88 @@
+% language=uk
+
+\environment workflows-style
+
+\startcomponent workflows-graphics
+
+\startchapter[title=Graphics]
+
+\startsection[title=Bad names]
+
+After many years of using \CONTEXT\ in workflows where large amounts of source files
+as well as graphics were involved we can safely say that it's hard for publishers to
+control the way these are named. This is probably due to the fact that in a
+click|-|and|-|point based desktop publishing workflow names don't matter as one stays on
+one machine, and names are only entered once (after that these names become abstractions and
+get cut and pasted). Proper consistent resource managament is simply not part of the flow.
+
+This means that you get names like:
+
+\starttyping
+foo_Bar_01_03-a.EPS
+foo__Bar-01a_03.eps
+foo__Bar-01a_03.eps
+foo BarA  01-03.eps
+\stoptyping
+
+Especially when a non proportional screen font is used multiple spaces can look
+like one. In fancy screen fonts upper and lowercase usage might get obscured. It
+really makes one wonder if copy|-|editing or adding labels to graphics isn't
+suffering from the same problem.
+
+Anyhow, as in an automated rendering workflow the rendering is often the last step you
+can imagine that when names get messed up it's that last step that gets blamed. It's not
+that hard to sanitize names of files on disk as well as in the files that refer to them,
+and we normally do that we have complete control. This is no option when all the resources
+are synchronzied from elsewhere. In that case the only way out is signaling potential
+issues. Say that in the source file there is a reference:
+
+\starttyping
+foo_Bar_01_03-a.EPS
+\stoptyping
+
+and that the graphic on disk has the same name, but for some reason after an update
+has become:
+
+\starttyping
+foo-Bar_01_03-a.EPS
+\stoptyping
+
+The old image is probably still there so the update is not reflected in the final
+product. This is not that uncommon when you deal with tens of thousands of files,
+many editors and graphic designers, and no strict filename policy.
+
+For this we provide the following tracing option:
+
+\starttyping
+\enabletrackers[graphics.lognames]
+\stoptyping
+
+This will put information in the log file about included graphics, like:
+
+\starttyping
+system          > graphics > start names
+
+used graphic    > asked   : cow.pdf
+used graphic    > comment : not found
+used graphic    > asked   : t:/sources/cow.pdf
+used graphic    > format  : pdf
+used graphic    > found   : t:/sources/cow.pdf
+used graphic    > used    : t:/sources/cow.pdf
+
+system          > graphics > stop names
+\stoptyping
+
+You can also information to the file itself:
+
+\starttyping
+\usemodule[s-figures-names]
+\stoptyping
+
+Of course that has to be done at the end of the document. Bad names are reported
+and suitable action can be taken.
+
+\stopsection
+
+\stopchapter
+
+\stopcomponent
diff --git a/doc/context/sources/general/manuals/workflows/workflows-injectors.tex b/doc/context/sources/general/manuals/workflows/workflows-injectors.tex
new file mode 100644
index 000000000..d2f837d82
--- /dev/null
+++ b/doc/context/sources/general/manuals/workflows/workflows-injectors.tex
@@ -0,0 +1,86 @@
+% language=uk
+
+\environment workflows-style
+
+\startcomponent workflows-injectors
+
+\startchapter[title={Injectors}]
+
+When you have no control over the source but need to manually tweak some aspects
+of the typesetting, like an occasional page break of column switch, you can use
+the injector mechanism. This mechanism is part of list and register building but
+can also be used elsewhere.
+
+\startbuffer[one]
+\startmixedcolumns[balance=yes]
+  \dotestinjector{test}line 1 \par
+  \dotestinjector{test}line 2 \par
+  \dotestinjector{test}line 3 \par
+  \dotestinjector{test}line 4 \par
+  \dotestinjector{test}line 5
+\stopmixedcolumns
+\stopbuffer
+
+\startbuffer[two]
+\startmixedcolumns[balance=yes]
+  \dotestinjector{test}line 1 \par
+  \dotestinjector{test}line 2 \par
+  \dotestinjector{test}line 3 \par
+  \dotestinjector{test}line 4 \par
+  \dotestinjector{test}line 5
+\stopmixedcolumns
+\stopbuffer
+
+We have two buffers:
+
+\typebuffer[one]
+
+and
+
+\typebuffer[two]
+
+When typeset these come out as:
+
+\blank \startpacked \bf \getbuffer[one] \stoppacked \blank
+
+and
+
+\blank \startpacked \bf \getbuffer[two] \stoppacked \blank
+
+We can enable (and show) the injectors with:
+
+\startbuffer
+\doactivateinjector{test} \showinjector
+\stopbuffer
+
+\typebuffer \getbuffer
+
+Now we get:
+
+\blank \startpacked \bf \getbuffer[one] \stoppacked \blank
+
+and
+
+\blank \startpacked \bf \getbuffer[two] \stoppacked \blank
+
+The small numbers are injector points. These will of course change when we add
+more in|-|between. Let's add actions to some of the injection points:
+
+\startbuffer
+\setinjector[test][13][{\column}]
+\setinjector[test][17][{\column}]
+\stopbuffer
+
+\typebuffer \getbuffer
+
+As expected we now get column breaks:
+
+\blank \startpacked \bf \getbuffer[one] \stoppacked \blank
+
+and
+
+\blank \startpacked \bf \getbuffer[two] \stoppacked \blank
+
+\stopchapter
+
+\stopcomponent
diff --git a/doc/context/sources/general/manuals/workflows/workflows-introduction.tex b/doc/context/sources/general/manuals/workflows/workflows-introduction.tex
new file mode 100644
index 000000000..298158a63
--- /dev/null
+++ b/doc/context/sources/general/manuals/workflows/workflows-introduction.tex
@@ -0,0 +1,27 @@
+% language=uk
+
+\environment workflows-style
+
+\startcomponent workflows-introduction
+
+\startchapter[title=Introduction]
+
+This manual contains some information about features that can help you to manage
+workflows or \CONTEXT\ related processes. Because we use \CONTEXT\ ourselves all
+that we need ends up in the distribution. When you discover something workflow
+related that is not yet covered here, you can tell me. I simply forget about all
+there is, especially if it's made for projects. Don't expect this manual to be
+complete or extensive, it's just a goodie.
+
+\startlines
+\documentvariable{author},
+\documentvariable{affiliation}
+\documentvariable{location}
+\currentdate[month,year]
+\stoplines
+
+\stopsubject
+
+\stopchapter
+
+\stopcomponent
diff --git a/doc/context/sources/general/manuals/workflows/workflows-mkiv.tex b/doc/context/sources/general/manuals/workflows/workflows-mkiv.tex
index fd4737296..3070a5be6 100644
--- a/doc/context/sources/general/manuals/workflows/workflows-mkiv.tex
+++ b/doc/context/sources/general/manuals/workflows/workflows-mkiv.tex
@@ -1,46 +1,4 @@
-% language=uk
-
-% \usepath[jobfile:]
-% \setupexternalfigures[directory=jobfile:]
-% \usepath[toppath:]
-% \setupexternalfigures[directory=toppath:]
-
-\usemodule
-  [abr-04]
-
-\setupbodyfont
-  [bookman,11pt]
-
-\definecolor
-  [maincolor]
-  [s=.35]
-
-\setuplayout
-  [height=middle,
-   width=middle,
-   footer=0pt]
-
-\setupwhitespace
-  [big]
-
-\setuphead
-  [chapter]
-  [style=\bfc,
-   color=maincolor,
-   header=high]
-
-\setuphead
-  [section]
-  [style=\bfb,
-   color=maincolor]
-
-\setuptyping
-  [color=maincolor]
-
-\setuptype
-  [color=maincolor]
-
-% \showframe
+\environment workflows-style
 
 \startdocument
   [metadata:author=Hans Hagen,
@@ -53,299 +11,19 @@
    support=www.contextgarden.net,
    website=www.pragma-ade.nl]
 
-\definefontfeature[LatinModernMonoVariable][default][liga=no]
-\definefont[LatinModernMonoVariable][LMTypewriterVarWd-Regular*LatinModernMonoVariable sa 1]
-
-\startMPpage
-
-    fill fullsquare xysized(PaperWidth,PaperHeight) withcolor .4white ;
-
-    draw image (
-        fill arrowhead fullcircle scaled .5 rotated   0 scaled 10 withcolor white ;
-        fill arrowhead fullcircle scaled .5 rotated 120 scaled 10 withcolor white ;
-        fill arrowhead fullcircle scaled .5 rotated 240 scaled 10 withcolor white ;
-        fill arrowhead fullcircle scaled .5 rotated  60 scaled 10 withcolor white ;
-        fill arrowhead fullcircle scaled .5 rotated 180 scaled 10 withcolor white ;
-        fill arrowhead fullcircle scaled .5 rotated 300 scaled 10 withcolor white ;
-    ) xsized (.9PaperWidth) shifted (0,.2PaperWidth) ;
-
-    draw image (
-        fill arrowhead fullcircle scaled .5 rotated   0 scaled 10 withcolor .4red     withtransparency (1,.5) ;
-        fill arrowhead fullcircle scaled .5 rotated 120 scaled 10 withcolor .4green   withtransparency (1,.5) ;
-        fill arrowhead fullcircle scaled .5 rotated 240 scaled 10 withcolor .4blue    withtransparency (1,.5) ;
-        fill arrowhead fullcircle scaled .5 rotated  60 scaled 10 withcolor .4cyan    withtransparency (1,.5) ;
-        fill arrowhead fullcircle scaled .5 rotated 180 scaled 10 withcolor .4magenta withtransparency (1,.5) ;
-        fill arrowhead fullcircle scaled .5 rotated 300 scaled 10 withcolor .4yellow  withtransparency (1,.5) ;
-    ) xsized (.9PaperWidth) shifted (0,.2PaperWidth) ;
-
-    draw textext ("\LatinModernMonoVariable \documentvariable{title}") xsized (.9PaperWidth) shifted (0,-.425PaperWidth) withcolor white ;
-    draw textext ("\LatinModernMonoVariable \documentvariable{extra}") xsized (.9PaperWidth) shifted (0,-.575PaperWidth) withcolor white ;
-
-\stopMPpage
+\component workflows-titlepage
 
 \startfrontmatter
-
-\starttitle[title=Contents]
-
-    \placelist[chapter]
-
-\stoptitle
-
+    \component workflows-contents
+    \component workflows-introduction
 \stopfrontmatter
 
 \startbodymatter
-
-\startchapter[title=Introduction]
-
-This manual contains some information about features that can help you to manage
-workflows or \CONTEXT\ related processes. Because we use \CONTEXT\ ourselves all
-that we need ends up in the distribution. When you discover something workflow
-related that is not yet covered here, you can tell me. I simply forget about all
-there is (especially if it's made for projects.)
-
-\startlines
-\documentvariable{author},
-\documentvariable{affiliation}
-\documentvariable{location}
-\currentdate[month,year]
-\stoplines
-
-\stopsubject
-
-\stopchapter
-
-\startchapter[title=Accessing resources]
-
-One of the benefits of \TEX\ is that you can use it in automated workflows
-where large quantities of data is involved. A document can consist of
-several files and normally also includes images. Of course there are styles
-involved too. At \PRAGMA\ normally put styles and fonts in:
-
-\starttyping
-/data/site/context/tex/texmf-project/tex/context/user/<project>/...
-/data/site/context/tex/texmf-fonts/data/<foundry>/<collection>/...
-\stoptyping
-
-alongside
-
-\starttyping
-/data/framework/...
-\stoptyping
-
-where the job management services are put, while we put resources in:
-
-\starttyping
-/data/resources/...
-\stoptyping
-
-The processing happens in:
-
-\starttyping
-/data/work/<uuid user space>/
-\stoptyping
-
-Putting styles (and resources like logos and common images) and fonts (if the
-project has specific ones not present in the distribution) in the \TEX\ tree
-makes sense because that is where such files are normally searched. Of course you
-need to keep the distributions file database upto|-|date after adding files there.
-
-Processing has to happen isolated from other runs so there we use unique
-locations. The services responsible for running also deal with regular cleanup
-of these temporary files.
-
-Resources are somewhat special. They can be stable, i.e.\ change seldom, but more
-often they are updated or extended periodically (or even daily). We're not
-talking of a few files here but of thousands. In one project we have 20 thousand
-resources, that can be combined into arbitrary books, and in another one, each
-chapter alone is about 400 \XML\ and image files. That means we can have 5000
-files per book and as we have at least 20 books, we end up with 100K files. In
-the first case accessing the resources is easy because there is a well defined
-structure (under our control) so we know exactly where each file sits in the
-resource tree. In the 100K case there is a deeper structure which is in itself
-predictable but because many authors are involved the references to these files
-are somewhat instable (and undefined). It is surprising to notice that publishers
-don't care about filenames (read: cannot control all the parties involved) which
-means that we have inconsist use of mixed case in filenames, and spaces,
-underscores and dashes creeping in. Because typesetting for paper is always at
-the end of the pipeline (which nowadays is mostly driven by (limitations) of web
-products) we need to have a robust and flexible lookup mechanism. It's a side
-effect of the click and point culture: if objects are associated (filename in
-source file with file on the system) anything you key in will work, and
-consistency completely depends on the user. And bad things then happen when files
-are copied, renamed, etc. In that stadium we can better be tolerant than try to
-get it fixed. \footnote {From what we normally receive we often conclude that
-copy|-|editing and image production companies don't impose any discipline or
-probably simply lack the tools and methods to control this. Some of our workflows
-had checkers and fixers, so that when we got 5000 new resources while only a few
-needed to be replaced we could filter the right ones.  It was not uncommon to find
-duplicates for thousands of pictures: similar or older variants.}
-
-\starttyping
-foo.jpg
-bar/foo.jpg
-images/bar/foo.jpg
-images/foo.jpg
-\stoptyping
-
-The xml files have names like:
-
-\starttyping
-b-c.xml
-a/b-c.jpg
-a/b/b-c.jpg
-a/b/c/b-c.jpg
-\stoptyping
-
-So it's sort of a mess, especially if you add arbitrary casing to this. Of course
-one can argue that a wrong (relative) location is asking for problems, it's less
-an issue here because each image has a unique name. We could flatten the resource
-tree but having tens of thousands of files on one directory is asking for
-problems when you want to manage them.
-
-The typesetting (and related services) run on virtual machines. The three
-directories:
-
-\starttyping
-/data/site
-/data/resources
-/data/work
-\stoptyping
-
-are all mounted as nfs shares on a network storage. For the styles (and binaries)
-this is no big deal as normally these files are cached, but the resources are
-another story. Scanning the complete (mounted) resource tree each run is no
-option so there we use a special mechanism in \CONTEXT\ for locating files.
-
-Already early in the development of \MKIV\ one of the locating mechanisms was
-the following:
-
-\starttyping
-tree:////data/resources/foo/**/drawing.jpg
-tree:////data/resources/foo/**/Drawing.jpg
-\stoptyping
-
-Here the tree is scanned once per run, which is normally quite okay when there
-are not that many files and when the files reside on the machine itself. For a
-more high performance approach using network shares we have a different
-mechanism. This time it looks like this:
-
-\starttyping
-dirlist:/data/resources/**/drawing.jpg
-dirlist:/data/resources/**/Drawing.jpg
-dirlist:/data/resources/**/just/some/place/drawing.jpg
-dirlist:/data/resources/**/images/drawing.jpg
-dirlist:/data/resources/**/images/drawing.jpg?option=fileonly
-dirfile:/data/resources/**/images/drawing.jpg
-\stoptyping
-
-The first two lookups are wildcard. If there is a file with that name, it will be
-found. If there are more, the first hit is used. The second and third examples
-are more selective. Here the part after the \type {**} has to match too. So here
-we can deal with multiple files named \type {drawing.jpg}. The last two
-equivalent examples are more tolerant. If no explicit match is found, a lookup
-happens without being selective. The case of a name is ignored but when found, a
-name with the right case is used.
-
-You can hook a path into the resolver for source files, for example:
-
-\starttyping
-\usepath                       [dirfile://./resources/**]
-\setupexternalfigures[directory=dirfile://./resources/**]
-\stoptyping
-
-You need to make sure that file(name)s in that location don't override ones in
-the regular \TEX\ tree. These extra paths are only used for source file lookups
-so for instance font lookups are not affected.
-
-When you add, remove or move files the tree, you need to remove the \type
-{dirlist.*} files in the root because these are used for locating files. A new
-file will be generated automatically. Don't forget this!
-
-\stopchapter
-
-\startchapter[title=Graphics]
-
-\startsection[title=Bad names]
-
-After many years of using \CONTEXT\ in workflows where large amounts of source files
-as well as graphics were involved we can safely say that it's hard for publishers to
-control the way these are named. This is probably due to the fact that in a
-click|-|and|-|point based desktop publishing workflow names don't matter as one stays on
-one machine, and names are only entered once (after that these names become abstractions and
-get cut and pasted). Proper consistent resource managament is simply not part of the flow.
-
-This means that you get names like:
-
-\starttyping
-foo_Bar_01_03-a.EPS
-foo__Bar-01a_03.eps
-foo__Bar-01a_03.eps
-foo BarA  01-03.eps
-\stoptyping
-
-Especially when a non proportional screen font is used multiple spaces can look
-like one. In fancy screen fonts upper and lowercase usage might get obscured. It
-really makes one wonder if copy|-|editing or adding labels to graphics isn't
-suffering from the same problem.
-
-Anyhow, as in an automated rendering workflow the rendering is often the last step you
-can imagine that when names get messed up it's that last step that gets blamed. It's not
-that hard to sanitize names of files on disk as well as in the files that refer to them,
-and we normally do that we have complete control. This is no option when all the resources
-are synchronzied from elsewhere. In that case the only way out is signaling potential
-issues. Say that in the source file there is a reference:
-
-\starttyping
-foo_Bar_01_03-a.EPS
-\stoptyping
-
-and that the graphic on disk has the same name, but for some reason after an update
-has become:
-
-\starttyping
-foo-Bar_01_03-a.EPS
-\stoptyping
-
-The old image is probably still there so the update is not reflected in the final
-product. This is not that uncommon when you deal with tens of thousands of files,
-many editors and graphic designers, and no strict filename policy.
-
-For this we provide the following tracing option:
-
-\starttyping
-\enabletrackers[graphics.lognames]
-\stoptyping
-
-This will put information in the log file about included graphics, like:
-
-\starttyping
-system          > graphics > start names
-
-used graphic    > asked   : cow.pdf
-used graphic    > comment : not found
-used graphic    > asked   : t:/sources/cow.pdf
-used graphic    > format  : pdf
-used graphic    > found   : t:/sources/cow.pdf
-used graphic    > used    : t:/sources/cow.pdf
-
-system          > graphics > stop names
-\stoptyping
-
-You can also information to the file itself:
-
-\starttyping
-\usemodule[s-figures-names]
-\stoptyping
-
-Of course that has to be done at the end of the document. Bad names are reported
-and suitable action can be taken.
-
-\stopsection
-
-\stopchapter
-
+    \component workflows-resources
+    \component workflows-graphics
+    \component workflows-suspects
+    \component workflows-injectors
+    \component workflows-xml
 \stopbodymatter
 
 \stopdocument
-
-\disabledirectives[resolvers.maxreadlevel]
diff --git a/doc/context/sources/general/manuals/workflows/workflows-resources.tex b/doc/context/sources/general/manuals/workflows/workflows-resources.tex
new file mode 100644
index 000000000..cbed64864
--- /dev/null
+++ b/doc/context/sources/general/manuals/workflows/workflows-resources.tex
@@ -0,0 +1,156 @@
+% language=uk
+
+\environment workflows-style
+
+\startcomponent workflows-resources
+
+\startchapter[title=Accessing resources]
+
+One of the benefits of \TEX\ is that you can use it in automated workflows
+where large quantities of data is involved. A document can consist of
+several files and normally also includes images. Of course there are styles
+involved too. At \PRAGMA\ normally put styles and fonts in:
+
+\starttyping
+/data/site/context/tex/texmf-project/tex/context/user/<project>/...
+/data/site/context/tex/texmf-fonts/data/<foundry>/<collection>/...
+\stoptyping
+
+alongside
+
+\starttyping
+/data/framework/...
+\stoptyping
+
+where the job management services are put, while we put resources in:
+
+\starttyping
+/data/resources/...
+\stoptyping
+
+The processing happens in:
+
+\starttyping
+/data/work/<uuid user space>/
+\stoptyping
+
+Putting styles (and resources like logos and common images) and fonts (if the
+project has specific ones not present in the distribution) in the \TEX\ tree
+makes sense because that is where such files are normally searched. Of course you
+need to keep the distributions file database upto|-|date after adding files there.
+
+Processing has to happen isolated from other runs so there we use unique
+locations. The services responsible for running also deal with regular cleanup
+of these temporary files.
+
+Resources are somewhat special. They can be stable, i.e.\ change seldom, but more
+often they are updated or extended periodically (or even daily). We're not
+talking of a few files here but of thousands. In one project we have 20 thousand
+resources, that can be combined into arbitrary books, and in another one, each
+chapter alone is about 400 \XML\ and image files. That means we can have 5000
+files per book and as we have at least 20 books, we end up with 100K files. In
+the first case accessing the resources is easy because there is a well defined
+structure (under our control) so we know exactly where each file sits in the
+resource tree. In the 100K case there is a deeper structure which is in itself
+predictable but because many authors are involved the references to these files
+are somewhat instable (and undefined). It is surprising to notice that publishers
+don't care about filenames (read: cannot control all the parties involved) which
+means that we have inconsist use of mixed case in filenames, and spaces,
+underscores and dashes creeping in. Because typesetting for paper is always at
+the end of the pipeline (which nowadays is mostly driven by (limitations) of web
+products) we need to have a robust and flexible lookup mechanism. It's a side
+effect of the click and point culture: if objects are associated (filename in
+source file with file on the system) anything you key in will work, and
+consistency completely depends on the user. And bad things then happen when files
+are copied, renamed, etc. In that stadium we can better be tolerant than try to
+get it fixed. \footnote {From what we normally receive we often conclude that
+copy|-|editing and image production companies don't impose any discipline or
+probably simply lack the tools and methods to control this. Some of our workflows
+had checkers and fixers, so that when we got 5000 new resources while only a few
+needed to be replaced we could filter the right ones.  It was not uncommon to find
+duplicates for thousands of pictures: similar or older variants.}
+
+\starttyping
+foo.jpg
+bar/foo.jpg
+images/bar/foo.jpg
+images/foo.jpg
+\stoptyping
+
+The xml files have names like:
+
+\starttyping
+b-c.xml
+a/b-c.jpg
+a/b/b-c.jpg
+a/b/c/b-c.jpg
+\stoptyping
+
+So it's sort of a mess, especially if you add arbitrary casing to this. Of course
+one can argue that a wrong (relative) location is asking for problems, it's less
+an issue here because each image has a unique name. We could flatten the resource
+tree but having tens of thousands of files on one directory is asking for
+problems when you want to manage them.
+
+The typesetting (and related services) run on virtual machines. The three
+directories:
+
+\starttyping
+/data/site
+/data/resources
+/data/work
+\stoptyping
+
+are all mounted as nfs shares on a network storage. For the styles (and binaries)
+this is no big deal as normally these files are cached, but the resources are
+another story. Scanning the complete (mounted) resource tree each run is no
+option so there we use a special mechanism in \CONTEXT\ for locating files.
+
+Already early in the development of \MKIV\ one of the locating mechanisms was
+the following:
+
+\starttyping
+tree:////data/resources/foo/**/drawing.jpg
+tree:////data/resources/foo/**/Drawing.jpg
+\stoptyping
+
+Here the tree is scanned once per run, which is normally quite okay when there
+are not that many files and when the files reside on the machine itself. For a
+more high performance approach using network shares we have a different
+mechanism. This time it looks like this:
+
+\starttyping
+dirlist:/data/resources/**/drawing.jpg
+dirlist:/data/resources/**/Drawing.jpg
+dirlist:/data/resources/**/just/some/place/drawing.jpg
+dirlist:/data/resources/**/images/drawing.jpg
+dirlist:/data/resources/**/images/drawing.jpg?option=fileonly
+dirfile:/data/resources/**/images/drawing.jpg
+\stoptyping
+
+The first two lookups are wildcard. If there is a file with that name, it will be
+found. If there are more, the first hit is used. The second and third examples
+are more selective. Here the part after the \type {**} has to match too. So here
+we can deal with multiple files named \type {drawing.jpg}. The last two
+equivalent examples are more tolerant. If no explicit match is found, a lookup
+happens without being selective. The case of a name is ignored but when found, a
+name with the right case is used.
+
+You can hook a path into the resolver for source files, for example:
+
+\starttyping
+\usepath                       [dirfile://./resources/**]
+\setupexternalfigures[directory=dirfile://./resources/**]
+\stoptyping
+
+You need to make sure that file(name)s in that location don't override ones in
+the regular \TEX\ tree. These extra paths are only used for source file lookups
+so for instance font lookups are not affected.
+
+When you add, remove or move files the tree, you need to remove the \type
+{dirlist.*} files in the root because these are used for locating files. A new
+file will be generated automatically. Don't forget this!
+
+\stopchapter
+
+\stopcomponent
diff --git a/doc/context/sources/general/manuals/workflows/workflows-style.tex b/doc/context/sources/general/manuals/workflows/workflows-style.tex
new file mode 100644
index 000000000..ed64da6b2
--- /dev/null
+++ b/doc/context/sources/general/manuals/workflows/workflows-style.tex
@@ -0,0 +1,50 @@
+\startenvironment workflows-style
+
+\usemodule
+  [abr-04]
+
+\setupbodyfont
+  [bookman,11pt]
+
+\definecolor
+  [maincolor]
+  [s=.35]
+
+\setuplayout
+  [height=middle,
+   width=middle,
+   footer=0pt]
+
+\setupwhitespace
+  [big]
+
+\setuphead
+  [chapter]
+  [style=\bfc,
+   color=maincolor,
+   header=high]
+
+\setuphead
+  [section]
+  [style=\bfb,
+   color=maincolor]
+
+\setuptyping
+  [color=maincolor]
+
+\setuptype
+  [color=maincolor]
+
+
+\setupdocument
+  [metadata:author=<author>,
+   metadata:title=<title>,
+   author=<author>,
+   affiliation=<affiliation>,
+   location=<location>,
+   title=<title>,
+   extra=<extra>,
+   support=<support>,
+   website=<website>]
+
+\stopenvironment
diff --git a/doc/context/sources/general/manuals/workflows/workflows-suspects.tex b/doc/context/sources/general/manuals/workflows/workflows-suspects.tex
new file mode 100644
index 000000000..621fd6f59
--- /dev/null
+++ b/doc/context/sources/general/manuals/workflows/workflows-suspects.tex
@@ -0,0 +1,54 @@
+% language=uk
+
+\environment workflows-style
+
+\startcomponent workflows-suspects
+
+\startchapter[title={Suspects}]
+
+When many authors and editors are involved there is the danger of inconsistent
+spacing being applied. We're not only talking of the (often invisible in editing
+programs) nobreak spaces, but also spacing inside or outside quotations and
+before and after punctuation or around math.
+
+In \CONTEXT\ we have a built||in suspects checker that you can enable with the
+following command:
+
+\starttyping
+\enabletrackers[typesetters.suspects]
+\stoptyping
+
+The next table shows some identified suspects.
+
+\starttexdefinition ShowSample #1
+    \NC \type{#1}
+    \NC \enabletrackers[typesetters.suspects]#1\disabletrackers[typesetters.spacing]
+    \NC \NR
+\stoptexdefinition
+
+\starttabulate[|||][before=,after=]
+    \ShowSample{foo$x$}
+    \ShowSample{$x$bar}
+    \ShowSample{foo$x$bar}
+    \ShowSample{$f+o+o$:}
+    \ShowSample{;$f+o+o$}
+    \ShowSample{; bar}
+    \ShowSample{foo:bar}
+    \ShowSample{\quote{ foo }}
+    \ShowSample{\quote{bar }}
+    \ShowSample{\quote{ bar}}
+    \ShowSample{(foo )}
+    \ShowSample{\{foo \}}
+    \ShowSample{foo{\bf gnu}bar}
+    \ShowSample{foo{\it gnu}bar}
+    \ShowSample{foo$x^2$bar}
+    \ShowSample{foo\nobreakspace bar}
+\stoptabulate
+
+Of course this analysis is not perfect but we use it in final checking of complex
+documents that are generated automatically from \XML. \footnote {Think of math
+school books where each book is assembled from over a thousands files.}
+
+\stopchapter
+
+\stopcomponent
diff --git a/doc/context/sources/general/manuals/workflows/workflows-titlepage.tex b/doc/context/sources/general/manuals/workflows/workflows-titlepage.tex
new file mode 100644
index 000000000..f184152b3
--- /dev/null
+++ b/doc/context/sources/general/manuals/workflows/workflows-titlepage.tex
@@ -0,0 +1,37 @@
+% language=uk
+
+\environment workflows-style
+
+\startcomponent workflows-titlepage
+
+\definefontfeature[LatinModernMonoVariable][default][liga=no]
+\definefont[LatinModernMonoVariable][LMTypewriterVarWd-Regular*LatinModernMonoVariable sa 1]
+
+\startMPpage
+
+    fill fullsquare xysized(PaperWidth,PaperHeight) withcolor .4white ;
+
+    draw image (
+        fill arrowhead fullcircle scaled .5 rotated   0 scaled 10 withcolor white ;
+        fill arrowhead fullcircle scaled .5 rotated 120 scaled 10 withcolor white ;
+        fill arrowhead fullcircle scaled .5 rotated 240 scaled 10 withcolor white ;
+        fill arrowhead fullcircle scaled .5 rotated  60 scaled 10 withcolor white ;
+        fill arrowhead fullcircle scaled .5 rotated 180 scaled 10 withcolor white ;
+        fill arrowhead fullcircle scaled .5 rotated 300 scaled 10 withcolor white ;
+    ) xsized (.9PaperWidth) shifted (0,.2PaperWidth) ;
+
+    draw image (
+        fill arrowhead fullcircle scaled .5 rotated   0 scaled 10 withcolor .4red     withtransparency (1,.5) ;
+        fill arrowhead fullcircle scaled .5 rotated 120 scaled 10 withcolor .4green   withtransparency (1,.5) ;
+        fill arrowhead fullcircle scaled .5 rotated 240 scaled 10 withcolor .4blue    withtransparency (1,.5) ;
+        fill arrowhead fullcircle scaled .5 rotated  60 scaled 10 withcolor .4cyan    withtransparency (1,.5) ;
+        fill arrowhead fullcircle scaled .5 rotated 180 scaled 10 withcolor .4magenta withtransparency (1,.5) ;
+        fill arrowhead fullcircle scaled .5 rotated 300 scaled 10 withcolor .4yellow  withtransparency (1,.5) ;
+    ) xsized (.9PaperWidth) shifted (0,.2PaperWidth) ;
+
+    draw textext ("\LatinModernMonoVariable \documentvariable{title}") xsized (.9PaperWidth) shifted (0,-.425PaperWidth) withcolor white ;
+    draw textext ("\LatinModernMonoVariable \documentvariable{extra}") xsized (.9PaperWidth) shifted (0,-.575PaperWidth) withcolor white ;
+
+\stopMPpage
+
+\stopcomponent
diff --git a/doc/context/sources/general/manuals/workflows/workflows-xml.tex b/doc/context/sources/general/manuals/workflows/workflows-xml.tex
new file mode 100644
index 000000000..0f29f5f55
--- /dev/null
+++ b/doc/context/sources/general/manuals/workflows/workflows-xml.tex
@@ -0,0 +1,96 @@
+% language=uk
+
+\environment workflows-style
+
+\startcomponent workflows-xml
+
+\startluacode
+  for i=1,10 do
+    local filename = string.formatters["temp-%02i.xml"](i)
+    local filedata = string.formatters["<?xml version='1.0'?><p>snippet %i</p>"](i)
+    io.savedata(filename,filedata)
+  end
+\stopluacode
+
+\startchapter[title={XML}]
+
+When you have an \XML\ project with many files involved, finding the right spot
+of something that went wrong can be a pain. In one of our project the production of
+some 50 books involves 60.000 \XML\ files and 20.000 images. Say that we have the
+following file:
+
+\startbuffer[demo]
+<?xml version='1.0'?>
+<document>
+  <include name="temp-01.xml"/> <include name="temp-02.xml"/>
+  <include name="temp-03.xml"/> <include name="temp-04.xml"/>
+  <include name="temp-05.xml"/> <include name="temp-06.xml"/>
+  <include name="temp-07.xml"/> <include name="temp-08.xml"/>
+  <include name="temp-09.xml"/> <include name="temp-10.xml"/>
+</document>
+\stopbuffer
+
+\typebuffer[demo]
+
+Before we process this file we will merge the content of the files defined
+as includes into it. When this happens the filename is automatically
+registered so it can be accessed later.
+
+\startbuffer
+\startxmlsetups xml:initialize
+    \xmlincludeoptions{#1}{include}{filename|name}{recurse,basename}
+    \xmlsetsetup{#1}{p|document}{xml:*}
+\stopxmlsetups
+
+\startxmlsetups xml:document
+    \xmlflush{#1}
+\stopxmlsetups
+
+\startxmlsetups xml:p
+    \inleftmargin{\infofont\xmlinclusion{#1}}
+    \xmlflush{#1}
+    \par
+\stopxmlsetups
+
+\xmlregistersetup{xml:initialize}
+
+\xmlprocessbuffer{main}{demo}{}
+\stopbuffer
+
+\typebuffer
+
+In this case we put the name of the file in the margin. Depending on when and how
+elements are flushed other solutions, like overlays, can be used.
+
+\startpacked
+\getbuffer
+\stoppacked
+
+At any moment you can see what the current node contains. The whole (merged)
+document is also available:
+
+\startbuffer
+\xmlshow{main}
+\stopbuffer
+
+\typebuffer
+
+A small font is used to typeset the (sub)tree:
+
+\blank \getbuffer \blank
+
+You can also save the tree:
+
+\startbuffer
+\xmlsave{main}{temp.xml}
+\stopbuffer
+
+\typebuffer \getbuffer
+
+This file looks like:
+
+\typefile{temp.xml}
+
+\stopchapter
+
+\stopcomponent
diff --git a/metapost/context/base/mp-tool.mpiv b/metapost/context/base/mp-tool.mpiv
index 6502720ad..a51017e23 100644
--- a/metapost/context/base/mp-tool.mpiv
+++ b/metapost/context/base/mp-tool.mpiv
@@ -2299,7 +2299,8 @@ enddef ;
 
 vardef basiccolors[] =
     save n ; n := @ mod 7 ;
-    if     n = 1 : red
+    if     n = 0 : white
+    elseif n = 1 : red
     elseif n = 2 : green
     elseif n = 3 : blue
     elseif n = 4 : cyan
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 66a8e0b29..0ac7e5013 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -10466,7 +10466,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-lpt"] = package.loaded["lxml-lpt"] or true
 
--- original size: 48150, stripped down to: 30607
+-- original size: 48226, stripped down to: 30681
 
 if not modules then modules={} end modules ['lxml-lpt']={
   version=1.001,
@@ -11297,7 +11297,6 @@ expressions.print=function(...)
   print(...)
   return true
 end
-expressions.contains=find
 expressions.find=find
 expressions.upper=upper
 expressions.lower=lower
@@ -11319,6 +11318,9 @@ function expressions.contains(str,pattern)
   end
   return false
 end
+function xml.expressions.idstring(str)
+  return type(str)=="string" and gsub(str,"^#","") or ""
+end
 local function traverse(root,pattern,handle)
   local collected=applylpath(root,pattern)
   if collected then
@@ -17759,8 +17761,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 744628
--- stripped bytes    : 272128
+-- original bytes    : 744704
+-- stripped bytes    : 272130
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 66a8e0b29..0ac7e5013 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -10466,7 +10466,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-lpt"] = package.loaded["lxml-lpt"] or true
 
--- original size: 48150, stripped down to: 30607
+-- original size: 48226, stripped down to: 30681
 
 if not modules then modules={} end modules ['lxml-lpt']={
   version=1.001,
@@ -11297,7 +11297,6 @@ expressions.print=function(...)
   print(...)
   return true
 end
-expressions.contains=find
 expressions.find=find
 expressions.upper=upper
 expressions.lower=lower
@@ -11319,6 +11318,9 @@ function expressions.contains(str,pattern)
   end
   return false
 end
+function xml.expressions.idstring(str)
+  return type(str)=="string" and gsub(str,"^#","") or ""
+end
 local function traverse(root,pattern,handle)
   local collected=applylpath(root,pattern)
   if collected then
@@ -17759,8 +17761,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 744628
--- stripped bytes    : 272128
+-- original bytes    : 744704
+-- stripped bytes    : 272130
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 66a8e0b29..0ac7e5013 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -10466,7 +10466,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-lpt"] = package.loaded["lxml-lpt"] or true
 
--- original size: 48150, stripped down to: 30607
+-- original size: 48226, stripped down to: 30681
 
 if not modules then modules={} end modules ['lxml-lpt']={
   version=1.001,
@@ -11297,7 +11297,6 @@ expressions.print=function(...)
   print(...)
   return true
 end
-expressions.contains=find
 expressions.find=find
 expressions.upper=upper
 expressions.lower=lower
@@ -11319,6 +11318,9 @@ function expressions.contains(str,pattern)
   end
   return false
 end
+function xml.expressions.idstring(str)
+  return type(str)=="string" and gsub(str,"^#","") or ""
+end
 local function traverse(root,pattern,handle)
   local collected=applylpath(root,pattern)
   if collected then
@@ -17759,8 +17761,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 744628
--- stripped bytes    : 272128
+-- original bytes    : 744704
+-- stripped bytes    : 272130
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index 66a8e0b29..0ac7e5013 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -10466,7 +10466,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-lpt"] = package.loaded["lxml-lpt"] or true
 
--- original size: 48150, stripped down to: 30607
+-- original size: 48226, stripped down to: 30681
 
 if not modules then modules={} end modules ['lxml-lpt']={
   version=1.001,
@@ -11297,7 +11297,6 @@ expressions.print=function(...)
   print(...)
   return true
 end
-expressions.contains=find
 expressions.find=find
 expressions.upper=upper
 expressions.lower=lower
@@ -11319,6 +11318,9 @@ function expressions.contains(str,pattern)
   end
   return false
 end
+function xml.expressions.idstring(str)
+  return type(str)=="string" and gsub(str,"^#","") or ""
+end
 local function traverse(root,pattern,handle)
   local collected=applylpath(root,pattern)
   if collected then
@@ -17759,8 +17761,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 744628
--- stripped bytes    : 272128
+-- original bytes    : 744704
+-- stripped bytes    : 272130
 
 -- end library merge
 
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 4504cef0f..fe4223739 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.09 10:43}
+\newcontextversion{2015.01.10 00: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 30da9e238..4f788b0c7 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 c502cb58b..06dd636bd 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.09 10:43}
+\edef\contextversion{2015.01.10 00:44}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/lxml-lpt.lua b/tex/context/base/lxml-lpt.lua
index a914c43ca..a38a7a8e2 100644
--- a/tex/context/base/lxml-lpt.lua
+++ b/tex/context/base/lxml-lpt.lua
@@ -1134,7 +1134,6 @@ expressions.print = function(...)
     return true
 end
 
-expressions.contains  = find
 expressions.find      = find
 expressions.upper     = upper
 expressions.lower     = lower
@@ -1158,6 +1157,10 @@ function expressions.contains(str,pattern)
     return false
 end
 
+function xml.expressions.idstring(str)
+    return type(str) == "string" and gsub(str,"^#","") or ""
+end
+
 -- user interface
 
 local function traverse(root,pattern,handle)
diff --git a/tex/context/base/page-mix.mkiv b/tex/context/base/page-mix.mkiv
index fd72a6b49..ece93c948 100644
--- a/tex/context/base/page-mix.mkiv
+++ b/tex/context/base/page-mix.mkiv
@@ -367,7 +367,7 @@
      {\edef\currentmixedcolumns{#1}%
       \firstargumentfalse}%
    \edef\currentmixedcolumnsmethod{\mixedcolumnsparameter\c!method}%
-   \mixedcolumnsparameter\c!before\relax % so, it doesn't list to local settings !
+   \mixedcolumnsparameter\c!before\relax % so, it doesn't listen to local settings !
    \csname\??mixedcolumnsbefore\currentmixedcolumnsmethod\endcsname\relax
    \begingroup
    \iffirstargument
diff --git a/tex/context/base/spac-chr.lua b/tex/context/base/spac-chr.lua
index 0cdec4b8f..81c0ce98b 100644
--- a/tex/context/base/spac-chr.lua
+++ b/tex/context/base/spac-chr.lua
@@ -112,8 +112,8 @@ local function inject_char_space(unicode,head,current,parent)
 end
 
 local function inject_nobreak_space(unicode,head,current,space,spacestretch,spaceshrink)
-    local attr = getfield(current,"attr")
-    local glue = new_glue(space,spacestretch,spaceshrink)
+    local attr    = getfield(current,"attr")
+    local glue    = new_glue(space,spacestretch,spaceshrink)
     local penalty = new_penalty(10000)
     setfield(glue,"attr",attr)
     setfield(current,"attr",nil)
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index f65c1abf4..94c0faf0f 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 7fe933655..2ead08753 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 2a36581b5..02fa82835 100644
--- a/tex/context/base/tabl-ntb.mkiv
+++ b/tex/context/base/tabl-ntb.mkiv
@@ -1264,7 +1264,8 @@
    \fi}
 
 \unexpanded\def\tabl_ntb_row_align_stop_inject
-  {\nointerlineskip
+  {\par
+   \nointerlineskip
    \ifenableTBLbreak
      \tabl_ntb_after_page
    \fi
diff --git a/tex/context/base/typo-inj.mkiv b/tex/context/base/typo-inj.mkiv
index 3ac1c6623..0293f12fa 100644
--- a/tex/context/base/typo-inj.mkiv
+++ b/tex/context/base/typo-inj.mkiv
@@ -69,5 +69,9 @@
   {\setuxvalue{typo_injectors_mark_#1}{\dontleavehmode\noexpand\ctxcommand{markinjector("#1")}}%
    \setuxvalue{typo_injectors_check_#1}{\noexpand\ctxcommand{checkinjector("#1")}}}
 
+\unexpanded\def\dotestinjector#1%  only for testing outside unprotect
+  {\csname typo_injectors_check_#1\endcsname
+   \csname typo_injectors_mark_#1\endcsname}
+
 \protect \endinput
 
diff --git a/tex/context/base/typo-sus.lua b/tex/context/base/typo-sus.lua
index 6f4947b1f..9eef6196b 100644
--- a/tex/context/base/typo-sus.lua
+++ b/tex/context/base/typo-sus.lua
@@ -20,43 +20,53 @@ local closequote = {
     pf = true,
 }
 
-local categories    = characters.categories
+local categories      = characters.categories
 
-local nodecodes     = nodes.nodecodes
+local nodecodes       = nodes.nodecodes
 
-local glyph_code    = nodecodes.glyph
-local kern_code     = nodecodes.kern
-local penalty_code  = nodecodes.penalty
-local glue_code     = nodecodes.glue
-local math_code     = nodecodes.math
-local hlist_code    = nodecodes.hlist
+local glyph_code      = nodecodes.glyph
+local kern_code       = nodecodes.kern
+local penalty_code    = nodecodes.penalty
+local glue_code       = nodecodes.glue
+local math_code       = nodecodes.math
+local hlist_code      = nodecodes.hlist
+local vlist_code      = nodecodes.vlist
 
-local nuts          = nodes.nuts
-local tonut         = nodes.tonut
-local tonode        = nodes.tonode
+local nuts            = nodes.nuts
+local tonut           = nodes.tonut
+local tonode          = nodes.tonode
 
-local getid         = nuts.getid
-local getchar       = nuts.getchar
-local getprev       = nuts.getprev
-local getnext       = nuts.getnext
-local getfield      = nuts.getfield
-local getattr       = nuts.getattr
-local getfont       = nuts.getfont
+local getid           = nuts.getid
+local getchar         = nuts.getchar
+local getprev         = nuts.getprev
+local getnext         = nuts.getnext
+local getfield        = nuts.getfield
+local getattr         = nuts.getattr
+local getfont         = nuts.getfont
+local getlist         = nuts.getlist
 
-local setcolor      = nodes.tracers.colors.set
-local insert_before = nuts.insert_before
-local insert_after  = nuts.insert_after
-local end_of_math   = nuts.end_of_math
+local setfield        = nuts.setfield
+local setattr         = nuts.setattr
 
-local nodepool      = nuts.pool
+local setcolor        = nodes.tracers.colors.set
+local insert_before   = nuts.insert_before
+local insert_after    = nuts.insert_after
+local end_of_math     = nuts.end_of_math
 
-local new_rule      = nodepool.rule
-local new_kern      = nodepool.kern
-local new_penalty   = nodepool.penalty
+local nodepool        = nuts.pool
 
-local a_characters  = attributes.private("characters")
+local new_rule        = nodepool.rule
+local new_kern        = nodepool.kern
+local new_hlist       = nodepool.hlist
+----- new_penalty     = nodepool.penalty
 
-local threshold     = 65536 / 4
+local a_characters    = attributes.private("characters")
+local a_suspecting    = attributes.private('suspecting')
+local a_suspect       = attributes.private('suspect')
+local texsetattribute = tex.setattribute
+local enabled         = false
+
+local threshold       = 65536 / 4
 
 local function special(n)
     if n then
@@ -108,19 +118,19 @@ local function mark(head,current,id,color)
         head = insert_before(head,current,rule)
         head = insert_before(head,current,kern)
         setcolor(rule,color)
-    elseif id == kern_code then
-        local width = getfield(current,"kern")
-        local rule  = new_rule(width)
-        local kern  = new_kern(-width)
-        head = insert_before(head,current,rule)
-        head = insert_before(head,current,kern)
-        setcolor(rule,color)
+ -- elseif id == kern_code then
+ --     local width = getfield(current,"kern")
+ --     local rule  = new_rule(width)
+ --     local kern  = new_kern(-width)
+ --     head = insert_before(head,current,rule)
+ --     head = insert_before(head,current,kern)
+ --     setcolor(rule,color)
     else
         local width = getfield(current,"width")
-        local rule  = new_rule(width,getfield(current,"height"),getfield(current,"depth"))
-        local kern  = new_kern(-width)
-        head = insert_before(head,current,rule)
-        head = insert_before(head,current,kern)
+        local extra = fonts.hashes.xheights[getfont(current)] / 2
+        local rule  = new_rule(width,getfield(current,"height")+extra,getfield(current,"depth")+extra)
+        local hlist = new_hlist(rule)
+        head = insert_before(head,current,hlist)
         setcolor(rule,color)
         setcolor(current,"white")
     end
@@ -131,95 +141,164 @@ end
 -- save enough time and it makes the code looks bad too ... after
 -- all, we seldom use this
 
-function typesetters.showsuspects(head)
+local colors = {
+    "darkred",
+    "darkgreen",
+    "darkblue",
+    "darkcyan",
+    "darkmagenta",
+    "darkyellow",
+    "darkgray",
+    "orange",
+}
+
+local found = 0
+
+function typesetters.marksuspects(head)
     local head     = tonut(head)
     local current  = head
     local lastdone = nil
     while current do
-        local id = getid(current)
-        if id == glyph_code then
-            local char = getchar(current)
-            local code = categories[char]
-            local done = false
-            if punctuation[code] then
-                local prev, pid = goback(current)
-                if prev and pid == glue_code then
-                    done = "darkblue"
-                elseif prev and pid == math_code then
-                    done = "darkgray"
-                else
-                    local next, nid = goforward(current)
-                    if next and nid ~= glue_code then
-                        done = "darkblue"
-                    end
-                end
-            elseif openquote[code] then
-                local next, nid = goforward(current)
-                if next and nid == glue_code then
-                    done = "darkred"
-                end
-            elseif closequote[code] then
-                local prev, pid = goback(current)
-                if prev and pid == glue_code then
-                    done = "darkred"
-                end
-            else
-                local prev, pid = goback(current)
-                if prev then
-                    if pid == math_code then
-                        done = "darkgray"
-                    elseif pid == glyph_code and getfont(current) ~= getfont(prev) then
-                        if lastdone ~= prev then
-                            done = "darkgreen"
+        if getattr(current,a_suspecting) then
+            local id = getid(current)
+            if id == glyph_code then
+                local char = getchar(current)
+                local code = categories[char]
+                local done = false
+                if punctuation[code] then
+                    local prev, pid = goback(current)
+                    if prev and pid == glue_code then
+                        done = 3 -- darkblue
+                    elseif prev and pid == math_code then
+                        done = 3 -- darkblue
+                    else
+                        local next, nid = goforward(current)
+                        if next and nid ~= glue_code then
+                            done = 3 -- darkblue
                         end
                     end
-                end
-                if not done then
+                elseif openquote[code] then
                     local next, nid = goforward(current)
-                    if next then
-                        if nid == math_code then
-                            done = "darkgray"
-                        elseif nid == glyph_code and getfont(current) ~= getfont(next) then
+                    if next and nid == glue_code then
+                        done = 1 -- darkred
+                    end
+                elseif closequote[code] then
+                    local prev, pid = goback(current)
+                    if prev and pid == glue_code then
+                        done = 1 -- darkred
+                    end
+                else
+                    local prev, pid = goback(current)
+                    if prev then
+                        if pid == math_code then
+                            done = 7-- darkgray
+                        elseif pid == glyph_code and getfont(current) ~= getfont(prev) then
                             if lastdone ~= prev then
-                                done = "darkgreen"
+                                done = 2 -- darkgreen
+                            end
+                        end
+                    end
+                    if not done then
+                        local next, nid = goforward(current)
+                        if next then
+                            if nid == math_code then
+                                done = 7 -- darkgray
+                            elseif nid == glyph_code and getfont(current) ~= getfont(next) then
+                                if lastdone ~= prev then
+                                    done = 2 -- darkgreen
+                                end
                             end
                         end
                     end
                 end
+                if done then
+                    setattr(current,a_suspect,done)
+                    lastdone = current
+                    found = found + 1
+                end
+                current = getnext(current)
+            elseif id == math_code then
+                current = getnext(end_of_math(current))
+            elseif id == glue_code then
+                local a = getattr(current,a_characters)
+                if a then
+                    local prev = getprev(current)
+                    local prid = prev and getid(prev)
+                    local done = false
+                    if prid == penalty_code and getfield(prev,"penalty") == 10000 then
+                        done = 8 -- orange
+                    else
+                        done = 5 -- darkmagenta
+                    end
+                    if done then
+                        setattr(current,a_suspect,done)
+                     -- lastdone = current
+                        found = found + 1
+                    end
+                end
+                current = getnext(current)
+            else
+                current = getnext(current)
             end
-            if done then
-                head     = mark(head,current,id,done)
-                lastdone = current
-            end
+        else
             current = getnext(current)
-        elseif id == math_code then
-            current = getnext(end_of_math(current))
+        end
+    end
+    return tonode(head), found > 0
+end
+
+local function showsuspects(head)
+    local current = head
+    while current do
+        local id = getid(current)
+        if id == glyph_code then
+            local a = getattr(current,a_suspect)
+            if a then
+                head, current = mark(head,current,id,colors[a])
+            end
         elseif id == glue_code then
-            local a = getattr(current,a_characters)
+            local a = getattr(current,a_suspect)
             if a then
-                local prev = getprev(current)
-                local prid = prev and getid(prev)
-                if prid == penalty_code and getfield(prev,"penalty") == 10000 then
-                    head = mark(head,current,id,"orange")
-                    head = insert_before(head,current,new_penalty(10000))
-                else
-                    head = mark(head,current,id,"darkmagenta")
+                head, current = mark(head,current,id,colors[a])
+            end
+        elseif id == math_code then
+            current = end_of_math(current)
+        elseif id == hlist_code or id == vlist_code then
+            local list = getlist(current)
+            if list then
+                local l = showsuspects(list)
+                if l ~= list then
+                    setfield(current,"list",l)
                 end
             end
-            current = getnext(current)
-        else
-            current = getnext(current)
         end
+        current = getnext(current)
     end
-    return tonode(head), false
+    return head
 end
 
-nodes.tasks.appendaction("processors","after","typesetters.showsuspects")
-nodes.tasks.disableaction("processors","typesetters.showsuspects")
+function typesetters.showsuspects(head)
+    if found > 0 then
+        return tonode(showsuspects(tonut(head))), true
+    else
+        return head, false
+    end
+end
+
+nodes.tasks.appendaction ("processors","after",      "typesetters.marksuspects")
+nodes.tasks.prependaction("shipouts",  "normalizers","typesetters.showsuspects")
+
+nodes.tasks.disableaction("processors","typesetters.marksuspects")
+nodes.tasks.disableaction("shipouts",  "typesetters.showsuspects")
 
 -- or maybe a directive
 
 trackers.register("typesetters.suspects",function(v)
-    nodes.tasks.setaction("processors","typesetters.showsuspects",v)
+    texsetattribute(a_suspecting,v and 1 or unsetvalue)
+    if v and not enabled then
+        nodes.tasks.enableaction("processors","typesetters.marksuspects")
+        nodes.tasks.enableaction("shipouts",  "typesetters.showsuspects")
+        enabled = true
+    end
 end)
 
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 737aca4f9..3fff3ee0b 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/09/15 10:43:31
+-- merge date  : 01/10/15 00:44:31
 
 do -- begin closure to overcome local limits and interference