beta 2011.09.18 22:35

24 files changed, 141 insertions, 86 deletions

diff --git a/tex/context/base/cont-log.mkiv b/tex/context/base/cont-log.mkiv
index c0ed606e0..0e866d665 100644
--- a/tex/context/base/cont-log.mkiv
+++ b/tex/context/base/cont-log.mkiv
@@ -250,4 +250,7 @@
 \unexpanded\def\MKIV{MkIV}
 \unexpanded\def\MKVI{MkVI}
 
+\unexpanded\def\MPII{MpII}
+\unexpanded\def\MPIV{MpIV}
+
 \protect \endinput
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index d90576138..95ada7443 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{2011.09.17 15:56}
+\newcontextversion{2011.09.18 22:35}
 
 %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 a2b5e8fc9..45c97a2ed 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{2011.09.17 15:56}
+\newcontextversion{2011.09.18 22:35}
 
 %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 94d1b8d35..f81c97e37 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 876c4ab7d..df771f0c4 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 d7841eb80..00e384030 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{2011.09.17 15:56}
+\edef\contextversion{2011.09.18 22:35}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index b8b7378f4..35e92543f 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.09.17 15:56}
+\edef\contextversion{2011.09.18 22:35}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/l-pdfview.lua b/tex/context/base/l-pdfview.lua
index c8cfa1229..3f4a8bea5 100644
--- a/tex/context/base/l-pdfview.lua
+++ b/tex/context/base/l-pdfview.lua
@@ -8,35 +8,63 @@ if not modules then modules = { } end modules ['l-pdfview'] = {
 
 -- Todo: figure out pdfopen/pdfclose on linux. Calling e.g. okular directly
 -- doesn't work in linux when issued from scite as it blocks the editor (no
--- & possible or so).
+-- & possible or so). Unfortunately pdfopen keeps changing with not keeping
+-- downward compatibility (command line arguments and so).
+
+-- no 2>&1 any more, needs checking on windows
 
 local format, concat = string.format, table.concat
 
 pdfview = pdfview or { }
 
-local opencalls = {
-    ['default'] = "pdfopen --ax --file", -- "pdfopen --back --file"
-    ['xpdf']    = "xpdfopen",
-}
+local opencalls, closecalls, allcalls, runner
 
-local closecalls= {
-    ['default'] = "pdfclose --ax --file",
-    ['xpdf']    = nil,
-}
+if os.type == "windows" then
 
-local allcalls = {
-    ['default'] = "pdfclose --ax --all",
-    ['xpdf']    = nil,
-}
+    opencalls = {
+        ['default'] = "pdfopen --ax --file", -- --back --file --ax
+        ['acrobat'] = "pdfopen --ax --file", -- --back --file --ax
+        ['okular']  = 'start "test" "c:/data/system/kde/bin/okular.exe" --unique' -- todo!
+    }
+    closecalls= {
+        ['default'] = "pdfclose --ax --file", -- --ax
+        ['acrobat'] = "pdfclose --ax --file", -- --ax
+        ['okular']  = false,
+    }
+    allcalls = {
+        ['default'] = "pdfclose --ax --all", -- --ax
+        ['acrobat'] = "pdfclose --ax --all", -- --ax
+        ['okular']  = false,
+    }
+
+    pdfview.method = "acrobat"
+
+    runner = function(...)
+        os.execute(...)
+    end
 
-if os.type == "windows" then
- -- opencalls['okular'] = 'start "test" "c:/program files/kde/bin/okular.exe" --unique' -- todo: get focus
-    opencalls['okular'] = 'start "test" "c:/data/system/kde/bin/okular.exe" --unique' -- todo: get focus
 else
-    opencalls['okular'] = 'okular --unique'
-end
 
-pdfview.method = "default"
+    opencalls = {
+        ['default'] = "pdfopen", -- we could pass the default here
+        ['okular']  = 'okular --unique'
+    }
+    closecalls= {
+        ['default'] = "pdfclose --file",
+        ['okular']  = false,
+    }
+    allcalls = {
+        ['default'] = "pdfclose --all",
+        ['okular']  = false,
+    }
+
+    pdfview.method = "okular"
+
+    runner = function(...)
+        os.spawn(...)
+    end
+
+end
 
 directives.register("pdfview.method", function(v)
     pdfview.method = (opencalls[v] and v) or 'default'
@@ -69,7 +97,7 @@ function pdfview.open(...)
         for i=1,#t do
             local name = fullname(t[i])
             if io.exists(name) then
-                os.execute(format('%s "%s"', opencall, name)) -- no 2>&1 any more, needs checking on windows
+                runner(format('%s "%s"', opencall, name))
                 openedfiles[name] = true
             end
         end
@@ -83,7 +111,7 @@ function pdfview.close(...)
         for i=1,#t do
             local name = fullname(t[i])
             if openedfiles[name] then
-                os.execute(format('%s "%s"', closecall, name)) -- no 2>&1 any more, needs checking on windows
+                runner(format('%s "%s"', closecall, name))
                 openedfiles[name] = nil
             else
                 pdfview.closeall()
@@ -96,7 +124,7 @@ end
 function pdfview.closeall()
     local allcall = allcalls[pdfview.method]
     if allcall then
-        os.execute(format('%s', allcall)) -- no 2>&1 any more, needs checking on windows
+        runner(format('%s', allcall))
     end
     openedfiles = { }
 end
diff --git a/tex/context/base/mlib-pps.lua b/tex/context/base/mlib-pps.lua
index 8034fbc32..330339c40 100644
--- a/tex/context/base/mlib-pps.lua
+++ b/tex/context/base/mlib-pps.lua
@@ -832,17 +832,24 @@ local function sh_process(object,prescript,before,after)
             local value_a, components_a, fractions_a, name_a
             local value_b, components_b, fractions_b, name_b
             for i=1,#prescript do
+                -- { "sh_color_a", "1" },
+                -- { "sh_color", "into" },
+                -- { "sh_radius_b", "0" },
+                -- { "sh_radius_a", "141.73225" },
+                -- { "sh_center_b", "425.19676 141.73225" },
+                -- { "sh_center_a", "425.19676 0" },
+                -- { "sh_factor", "1" },
                 local tag = prescript[i][1]
                 if not name_a and tag == "sh_color_a" then
-                    value_a      = prescript[i-4][2]
-                    components_a = prescript[i-3][2]
-                    fractions_a  = prescript[i-2][2]
-                    name_a       = prescript[i-1][2]
+                    value_a      = prescript[i-5][2]
+                    components_a = prescript[i-4][2]
+                    fractions_a  = prescript[i-3][2]
+                    name_a       = prescript[i-2][2]
                 elseif not name_b and tag == "sh_color_b" then
-                    value_b      = prescript[i-4][2]
-                    components_b = prescript[i-3][2]
-                    fractions_b  = prescript[i-2][2]
-                    name_b       = prescript[i-1][2]
+                    value_b      = prescript[i-5][2]
+                    components_b = prescript[i-4][2]
+                    fractions_b  = prescript[i-3][2]
+                    name_b       = prescript[i-2][2]
                 end
                 if name_a and name_b then
                     break
diff --git a/tex/context/base/s-abr-01.tex b/tex/context/base/s-abr-01.tex
index 46336940d..51e2cb5a2 100644
--- a/tex/context/base/s-abr-01.tex
+++ b/tex/context/base/s-abr-01.tex
@@ -24,6 +24,8 @@
 \logo [MKIII]      {MkIII} % joke
 \logo [MKIV]       {MkIV}
 \logo [MKVI]       {MkVI}
+\logo [MPII]       {MpII}
+\logo [MPIV]       {MpIV}
 
 %logo [FGA]        {fga}
 %logo [FGBBS]      {fgbbs}
diff --git a/tex/context/base/s-pre-62.tex b/tex/context/base/s-pre-62.tex
index d4f2a54f8..cc9762e12 100644
--- a/tex/context/base/s-pre-62.tex
+++ b/tex/context/base/s-pre-62.tex
@@ -54,14 +54,13 @@
      backspace=5\measure{layoutwd},
       topspace=5\measure{layoutht}]
 
-\setuplayout
+\definelayout
   [step]
   [  backspace=\numexpr2+                         \getvariable{layout}{dx}\relax\measure{layoutwd},
       cutspace=\numexpr3+\getvariable{layout}{nx}-\getvariable{layout}{dx}\relax\measure{layoutwd},
       topspace=\numexpr2+                         \getvariable{layout}{dy}\relax\measure{layoutht},
    bottomspace=\numexpr3+\getvariable{layout}{ny}-\getvariable{layout}{dy}\relax\measure{layoutht}]
 
-
 \definecolor[layout:left]  [t=.5,a=1,b=1]
 \definecolor[layout:right] [t=.5,a=1,r=1]
 \definecolor[layout:top]   [t=.5,a=1,g=1]
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index edab0a6b8..2acd1ac05 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 eee3ffe94..0bd966ab6 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-sec.mkiv b/tex/context/base/strc-sec.mkiv
index 1990e0d97..a2f011941 100644
--- a/tex/context/base/strc-sec.mkiv
+++ b/tex/context/base/strc-sec.mkiv
@@ -183,11 +183,11 @@
 \unexpanded\def\setupsection
   {\dotripleempty\dosetupsection}
 
-\def\dosetupsection[#1]%
+\def\dosetupsection[#1][#2][#3]%
   {\ifcsname\??nh:\c!level:#1\endcsname
-     \dodosetupsection[#1]%
+     \dodosetupsection[#1][#2][#3]%
    \else
-     \dodosetupsection[\sectionheadsection{#1}]%
+     \dodosetupsection[\sectionheadsection{#1}][#2][#3]%
    \fi}
 
 \def\dodosetupsection[#1][#2][#3]%
diff --git a/tex/context/base/syst-aux.mkiv b/tex/context/base/syst-aux.mkiv
index a0f32c713..63718babd 100644
--- a/tex/context/base/syst-aux.mkiv
+++ b/tex/context/base/syst-aux.mkiv
@@ -966,7 +966,7 @@
   {\begingroup\let\do_process_comma_item\do_quit_prev_comma_list}
 
 \def\do_quit_prev_comma_list#1]%
-  {\let\do_process_comma_item\do_quit_commalist}
+  {\let\do_process_comma_item\do_quit_comma_list}
 
 %D The hack we used for checking the next character
 %D \type {\doifnextcharelse} is also used here.
@@ -6601,12 +6601,12 @@
 % \setmeasure {xx} {1cm}
 % \setmeasure {xxx}{1cm}
 
-\def\setmeasure #1#2{\expandafter\def \csname\??dm#1\endcsname{#2}} % quick way
-\def\setemeasure#1#2{\expandafter\edef\csname\??dm#1\endcsname{#2}} % quick way
-\def\setgmeasure#1#2{\expandafter\gdef\csname\??dm#1\endcsname{#2}} % quick way
-\def\setxmeasure#1#2{\expandafter\xdef\csname\??dm#1\endcsname{#2}} % quick way
+\unexpanded\def\setmeasure #1#2{\expandafter\def \csname\??dm#1\endcsname{#2}} % quick way
+\unexpanded\def\setemeasure#1#2{\expandafter\edef\csname\??dm#1\endcsname{#2}} % quick way
+\unexpanded\def\setgmeasure#1#2{\expandafter\gdef\csname\??dm#1\endcsname{#2}} % quick way
+\unexpanded\def\setxmeasure#1#2{\expandafter\xdef\csname\??dm#1\endcsname{#2}} % quick way
 
-\def\measure#1%
+\def\measure#1% maybe \dimexpr ... \relax
   {\ifcsname\??dm#1\endcsname\csname\??dm#1\endcsname\else\zeropoint\fi}
 
 %D \macros
diff --git a/tex/context/interface/cont-cs.xml b/tex/context/interface/cont-cs.xml
index a7b246655..988f8476e 100644
--- a/tex/context/interface/cont-cs.xml
+++ b/tex/context/interface/cont-cs.xml
@@ -2,16 +2,18 @@
 
 <!-- versions:
 
-    comment  : user interface definitions of ConTeXt
+     comment  : user interface definitions of ConTeXt
 
-    authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
+     authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
 
-    versions : 2004.11.17 : initial version
-               2006.08.02 : define + resolve
+     versions : 2004.11.17 : initial version
+                2006.08.02 : define + resolve
+
+    <lexertest/>ss
 
 -->
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cs" version="2006.08.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="cs" version="2006.08.02">
 
   <cd:define name="align">
     <cd:constant type="uvnitr"/>
diff --git a/tex/context/interface/cont-de.xml b/tex/context/interface/cont-de.xml
index 61441dd9c..ff375be46 100644
--- a/tex/context/interface/cont-de.xml
+++ b/tex/context/interface/cont-de.xml
@@ -2,16 +2,18 @@
 
 <!-- versions:
 
-    comment  : user interface definitions of ConTeXt
+     comment  : user interface definitions of ConTeXt
 
-    authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
+     authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
 
-    versions : 2004.11.17 : initial version
-               2006.08.02 : define + resolve
+     versions : 2004.11.17 : initial version
+                2006.08.02 : define + resolve
+
+    <lexertest/>ss
 
 -->
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2006.08.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="de" version="2006.08.02">
 
   <cd:define name="align">
     <cd:constant type="innen"/>
diff --git a/tex/context/interface/cont-en.xml b/tex/context/interface/cont-en.xml
index b532f2b21..100148f42 100644
--- a/tex/context/interface/cont-en.xml
+++ b/tex/context/interface/cont-en.xml
@@ -2,16 +2,18 @@
 
 <!-- versions:
 
-    comment  : user interface definitions of ConTeXt
+     comment  : user interface definitions of ConTeXt
 
-    authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
+     authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
 
-    versions : 2004.11.17 : initial version
-               2006.08.02 : define + resolve
+     versions : 2004.11.17 : initial version
+                2006.08.02 : define + resolve
+
+    <lexertest/>ss
 
 -->
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2006.08.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="en" version="2006.08.02">
 
   <cd:define name="align">
     <cd:constant type="inner"/>
diff --git a/tex/context/interface/cont-fr.xml b/tex/context/interface/cont-fr.xml
index 615eda784..d6096aa55 100644
--- a/tex/context/interface/cont-fr.xml
+++ b/tex/context/interface/cont-fr.xml
@@ -2,16 +2,18 @@
 
 <!-- versions:
 
-    comment  : user interface definitions of ConTeXt
+     comment  : user interface definitions of ConTeXt
 
-    authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
+     authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
 
-    versions : 2004.11.17 : initial version
-               2006.08.02 : define + resolve
+     versions : 2004.11.17 : initial version
+                2006.08.02 : define + resolve
+
+    <lexertest/>ss
 
 -->
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.08.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="fr" version="2006.08.02">
 
   <cd:define name="align">
     <cd:constant type="interieur"/>
diff --git a/tex/context/interface/cont-it.xml b/tex/context/interface/cont-it.xml
index 5038f13ac..7675c612c 100644
--- a/tex/context/interface/cont-it.xml
+++ b/tex/context/interface/cont-it.xml
@@ -2,16 +2,18 @@
 
 <!-- versions:
 
-    comment  : user interface definitions of ConTeXt
+     comment  : user interface definitions of ConTeXt
 
-    authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
+     authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
 
-    versions : 2004.11.17 : initial version
-               2006.08.02 : define + resolve
+     versions : 2004.11.17 : initial version
+                2006.08.02 : define + resolve
+
+    <lexertest/>ss
 
 -->
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2006.08.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="it" version="2006.08.02">
 
   <cd:define name="align">
     <cd:constant type="interno"/>
diff --git a/tex/context/interface/cont-nl.xml b/tex/context/interface/cont-nl.xml
index dbe1b0223..a84a88c0e 100644
--- a/tex/context/interface/cont-nl.xml
+++ b/tex/context/interface/cont-nl.xml
@@ -2,16 +2,18 @@
 
 <!-- versions:
 
-    comment  : user interface definitions of ConTeXt
+     comment  : user interface definitions of ConTeXt
 
-    authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
+     authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
 
-    versions : 2004.11.17 : initial version
-               2006.08.02 : define + resolve
+     versions : 2004.11.17 : initial version
+                2006.08.02 : define + resolve
+
+    <lexertest/>ss
 
 -->
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2006.08.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="nl" version="2006.08.02">
 
   <cd:define name="align">
     <cd:constant type="binnen"/>
diff --git a/tex/context/interface/cont-pe.xml b/tex/context/interface/cont-pe.xml
index 12a54339d..94e042012 100644
--- a/tex/context/interface/cont-pe.xml
+++ b/tex/context/interface/cont-pe.xml
@@ -2,16 +2,18 @@
 
 <!-- versions:
 
-    comment  : user interface definitions of ConTeXt
+     comment  : user interface definitions of ConTeXt
 
-    authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
+     authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
 
-    versions : 2004.11.17 : initial version
-               2006.08.02 : define + resolve
+     versions : 2004.11.17 : initial version
+                2006.08.02 : define + resolve
+
+    <lexertest/>ss
 
 -->
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="pe" version="2006.08.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="pe" version="2006.08.02">
 
   <cd:define name="align">
     <cd:constant type="داخلی"/>
diff --git a/tex/context/interface/cont-ro.xml b/tex/context/interface/cont-ro.xml
index b7fa62d59..8c12b7c35 100644
--- a/tex/context/interface/cont-ro.xml
+++ b/tex/context/interface/cont-ro.xml
@@ -2,16 +2,18 @@
 
 <!-- versions:
 
-    comment  : user interface definitions of ConTeXt
+     comment  : user interface definitions of ConTeXt
 
-    authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
+     authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
 
-    versions : 2004.11.17 : initial version
-               2006.08.02 : define + resolve
+     versions : 2004.11.17 : initial version
+                2006.08.02 : define + resolve
+
+    <lexertest/>ss
 
 -->
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2006.08.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="ro" version="2006.08.02">
 
   <cd:define name="align">
     <cd:constant type="intern"/>
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 132562502..e4d504969 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  : 09/17/11 15:56:52
+-- merge date  : 09/18/11 22:35:11
 
 do -- begin closure to overcome local limits and interference