14 files changed, 56 insertions, 43 deletions
diff --git a/context/data/scite/lexers/scite-context-lexer-xml.lua b/context/data/scite/lexers/scite-context-lexer-xml.lua
index 89b20f3a4..b74a43cc7 100644
--- a/context/data/scite/lexers/scite-context-lexer-xml.lua
+++ b/context/data/scite/lexers/scite-context-lexer-xml.lua
@@ -61,24 +61,28 @@ local closedoctype     = P("]>") + P(">")
 
 local entity           = ampersand * (1-semicolon)^1 * semicolon
 
-local wordpattern  = context.patterns.iwordpattern
-local iwordpattern = context.patterns.wordpattern
-local checkedword  = context.patterns.checkedword
-local setwordlist  = context.setwordlist
-local invisibles   = context.patterns.invisibles
-local validwords   = false
+local utfchar          = context.utfchar
+local wordtoken        = context.patterns.wordtoken
+local iwordtoken       = context.patterns.iwordtoken
+local wordpattern      = context.patterns.wordpattern
+local iwordpattern     = context.patterns.iwordpattern
+local invisibles       = context.patterns.invisibles
+local checkedword      = context.checkedword
+local setwordlist      = context.setwordlist
+local validwords       = false
+
 
 -- <?xml version="1.0" encoding="UTF-8" language="uk" ?>
 --
--- <?context-xml-directive editor language us ?>
+-- <?context-directive editor language us ?>
 
 local p_preamble = Cmt(#P("<?xml "), function(input,i,_) -- todo: utf bomb
-    if i < 10 then
+    if i < 200 then
         validwords = false
-        local language = match(input,"^<%?xml[^>]*%?>%s*<%?context%-xml%-directive%s+editor%s+language%s+(..)%s+%?>")
-        if not language then
-            language = match(input,'^<%?xml[^>]*language=[\"\'](..)[\"\'][^>]*%?>',i)
-        end
+        local language = match(input,"^<%?xml[^>]*%?>%s*<%?context%-directive%s+editor%s+language%s+(..)%s+%?>")
+     -- if not language then
+     --     language = match(input,'^<%?xml[^>]*language=[\"\'](..)[\"\'][^>]*%?>',i)
+     -- end
         if language then
             validwords = setwordlist(language)
         end
@@ -278,6 +282,9 @@ local p_instruction =
 local p_invisible =
     token("invisible",invisibles^1)
 
+-- local p_preamble =
+--     token('preamble',  p_preamble   )
+
 xmllexer._rules = {
     { "whitespace",  p_spacing     },
     { "preamble",    p_preamble    },
diff --git a/context/data/scite/lexers/scite-context-lexer.lua b/context/data/scite/lexers/scite-context-lexer.lua
index 04eb8400c..2d1e8b205 100644
--- a/context/data/scite/lexers/scite-context-lexer.lua
+++ b/context/data/scite/lexers/scite-context-lexer.lua
@@ -224,9 +224,9 @@ function context.setwordlist(tag,limit) -- returns hash (lowercase keys and orig
         local list = context.loaddefinitions("spell-" .. tag)
         if not list or type(list) ~= "table" then
             lists[tag] = false
-            return nil
+            return false
         elseif type(list.words) == "string" then
-            list = splitwords(list.words)
+            list = splitwords(list.words) or false
             lists[tag] = list
             return list
         else
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 400da4681..c239a37d9 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2012.04.13 09:31}
+\newcontextversion{2012.04.13 23:23}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index bb8c36d80..2312adc65 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{2012.04.13 09:31}
+\newcontextversion{2012.04.13 23:23}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 9a4d50823..b144413b1 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index b77a96efd..e2a4c2808 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 3f9fd06a1..461cb9b27 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.04.13 09:31}
+\edef\contextversion{2012.04.13 23:23}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 45f470307..3e83c4045 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -23,7 +23,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.04.13 09:31}
+\edef\contextversion{2012.04.13 23:23}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/spac-ali.mkiv b/tex/context/base/spac-ali.mkiv
index 93f00249c..ff384d13d 100644
--- a/tex/context/base/spac-ali.mkiv
+++ b/tex/context/base/spac-ali.mkiv
@@ -827,21 +827,15 @@
 
 \let\centeraligned\midaligned
 
-% indirect commands
-
 \installcorenamespace{alignline}
 
-\letvalue{\??alignline\v!middle}\midaligned
-\letvalue{\??alignline\v!center}\midaligned
-\letvalue{\??alignline\v!max   }\maxaligned
-\letvalue{\??alignline\v!left  }\leftaligned
-\letvalue{\??alignline\v!right }\rightaligned
-
-% not here, as here we use a location
-%
-% \letvalue{\??alignline\v!flushleft }\rightaligned
-% \letvalue{\??alignline\v!flushright}\leftaligned
-
+\letvalue{\??alignline\v!left      }\leftaligned
+\letvalue{\??alignline\v!right     }\rightaligned
+\letvalue{\??alignline\v!middle    }\midaligned
+\letvalue{\??alignline\v!flushleft }\rightaligned % beware, makes no sense in locations / we will have a special locations handler
+\letvalue{\??alignline\v!flushright}\leftaligned  % beware, makes no sense in locations / we will have a special locations handler
+\letvalue{\??alignline\v!center    }\midaligned
+\letvalue{\??alignline\v!max       }\maxaligned
 
 \def\doalignedline#1{\resetrealignsignal\csname\??alignline#1\endcsname}
 
@@ -884,7 +878,7 @@
 \setvalue{\??alignline\v!rightedge  }{\doxalignline\donefalse   ++\rightedgetotal  \relax\hss  }
 
 \def\doalignedline#1% unchecked
-  {\csname\??alignline#1\endcsname}
+  {\csname\??alignline#1\endcsname} % no \resetrealignsignal here ?
 
 \def\alignedline#1#2% setting default
   {\csname\??alignline\ifcsname\??alignline#1\endcsname#1\else#2\fi\endcsname}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 9a71e6cee..626b3a560 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 bef2e3e96..c2215ba65 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-ref.lua b/tex/context/base/strc-ref.lua
index 19a190cbb..8a478a4e6 100644
--- a/tex/context/base/strc-ref.lua
+++ b/tex/context/base/strc-ref.lua
@@ -1732,14 +1732,21 @@ function filters.text.title(data)
     helpers.title(data.entries.text or "?",data.metadata)
 end
 
-function filters.text.number(data)
-    helpers.title(data.entries.text or "?",data.metadata)
-end
+-- no longer considered useful:
+--
+-- function filters.text.number(data)
+--     helpers.title(data.entries.text or "?",data.metadata)
+-- end
 
 function filters.text.page(data,prefixspec,pagespec)
     helpers.prefixpage(data,prefixspec,pagespec)
 end
 
+filters.full = { }
+
+filters.full.title = filters.text.title
+filters.full.page  = filters.text.page
+
 filters.section = { }
 
 function filters.section.number(data,what,prefixspec)
diff --git a/tex/context/base/type-imp-lucida-opentype.mkiv b/tex/context/base/type-imp-lucida-opentype.mkiv
index 37853b740..8c4ff3bba 100644
--- a/tex/context/base/type-imp-lucida-opentype.mkiv
+++ b/tex/context/base/type-imp-lucida-opentype.mkiv
@@ -17,10 +17,12 @@
 
     \starttypescript [lucidanova,lucidaot,otlucida]
         \loadfontgoodies[lucida-opentype-math]
-        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] [\s!features=\s!default]
-        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [\typescriptone] [\s!default] [\s!features=\s!default]
-        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [\typescriptone] [\s!default] [\s!features=\s!none]
-        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [\typescriptone] [\s!default]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif]       [\typescriptone] [\s!default] [\s!features=\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]        [\typescriptone] [\s!default] [\s!features=\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]        [\typescriptone] [\s!default] [\s!features=\s!none]
+        \definetypeface [\typescriptone] [\s!hw] [\s!handwriting] [\typescriptone] [\s!default] [\s!features=\s!default]
+        \definetypeface [\typescriptone] [\s!cg] [\s!calligraphy] [\typescriptone] [\s!default] [\s!features=\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]        [\typescriptone] [\s!default]
         % for the moment here:
         \setupmathrendering[\typescriptone][\s!it=\s!italic]
         \quittypescriptscanning
@@ -58,9 +60,12 @@
         \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT-Demi.otf] [\s!features=\s!math\mathsizesuffix,\s!goodies=lucidanova-math]
     \stoptypescript
 
-    \starttypescript [handwriting] [lucidanova,lucidaot,otlucida]
-        \definefontsynonym [\s!Handwriting] [\s!file:LucidaHandwritingOT]
-        \definefontsynonym [\s!Serif]       [\s!Handwriting]
+    \starttypescript [\s!handwriting] [lucidanova,lucidaot,otlucida]
+        \definefontsynonym [\s!Handwriting] [\s!file:LucidaHandwritingOT.otf]
+    \stoptypescript
+
+    \starttypescript [\s!calligraphy] [lucidanova,lucidaot,otlucida]
+        \definefontsynonym [\s!Calligraphy] [\s!file:LucidaCalligraphyOT.otf]
     \stoptypescript
 
 \stoptypescriptcollection
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 360cd67c0..031fd6a1b 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  : 04/13/12 09:31:06
+-- merge date  : 04/13/12 23:23:16
 
 do -- begin closure to overcome local limits and interference