stable 2006.07.28 23:56

54 files changed, 204 insertions, 121 deletions

diff --git a/scripts/context/ruby/base/tex.rb b/scripts/context/ruby/base/tex.rb
index 04dc4541a..da94eee21 100644
--- a/scripts/context/ruby/base/tex.rb
+++ b/scripts/context/ruby/base/tex.rb
@@ -185,7 +185,7 @@ class TEX
         'modefile', 'result', 'suffix', 'response', 'path',
         'filters', 'usemodules', 'environments', 'separation', 'setuppath',
         'arguments', 'input', 'output', 'randomseed', 'modes', 'mode', 'filename',
-        'ctxfile', 'printformat', 'paperformat',
+        'ctxfile', 'printformat', 'paperformat', 'paperoffset',
         'timeout'
     ]
     @@standardvars = [
@@ -1289,7 +1289,7 @@ class TEX
               # begin getvariable('environments').split(',').uniq.each do |e| opt << "\\useenvironment[#{e}]\n" end ; rescue ; end
                 opt << "\\endinput\n"
                 opt.close
-            else
+           else
                 report("unable to write option file #{topname}")
             end
         rescue
@@ -1726,8 +1726,8 @@ class TEX
                         end
                     end
 
-                    Kpse.runscript('ctxtools',rawbase,'--purge')    if getvariable('purge')
-                    Kpse.runscript('ctxtools',rawbase,'--purgeall') if getvariable('purgeall')
+                    Kpse.runscript('ctxtools',rawbase,'--purge')       if getvariable('purge')
+                    Kpse.runscript('ctxtools',rawbase,'--purge --all') if getvariable('purgeall')
 
                 when 'latex' then
 
diff --git a/scripts/context/ruby/ctxtools.rb b/scripts/context/ruby/ctxtools.rb
index d04688890..48bce8146 100644
--- a/scripts/context/ruby/ctxtools.rb
+++ b/scripts/context/ruby/ctxtools.rb
@@ -2314,31 +2314,28 @@ class Commands
         end
 
         def locatedlocaltree
-            return `kpsewhich --expand-var $TEXMFLOCAL`.chomp rescue nil
+            tree = `kpsewhich --expand-path $TEXMFLOCAL`.chomp rescue nil
+            unless tree && FileTest.directory?(tree) then
+                tree = `kpsewhich --expand-path $TEXMF`.chomp rescue nil
+            end
+            return tree
         end
 
         def extractarchive(archive)
-            if FileTest.file?(archive) then
-                begin
-                    system("unzip -uo #{archive}")
-                rescue
-                    report("fatal error, make sure that you have 'unzip' in your path")
-                    return false
-                else
-                    if System.unix? then
-                        begin
-                            system("chmod +x scripts/context/unix/stubs/*")
-                        rescue
-                            report("change x-permissions of 'scripts/context/unix/stubs/*' manually")
-                        end
-                    end
-                    return true
-                end
-            else
-                report("fatal error, '{archive}' has not been downloaded")
+            unless FileTest.file?(archive) then
+                 report("fatal error, '#{archive}' has not been downloaded")
+                 return false
+            end
+            unless system("unzip -uo #{archive}") then
+                report("fatal error, make sure that you have 'unzip' in your path")
                 return false
             end
-        end
+            stubs = "scripts/context/stubs/unix/*"
+            if System.unix? and not system("chmod +x #{stubs}") then
+                report("change x-permissions of '#{stubs}' manually")
+            end
+            return true
+         end
 
         def remakeformats
             return system("texmfstart texexec --make --all")
diff --git a/scripts/context/ruby/texexec.rb b/scripts/context/ruby/texexec.rb
index 14bc15662..1a7175f23 100644
--- a/scripts/context/ruby/texexec.rb
+++ b/scripts/context/ruby/texexec.rb
@@ -285,6 +285,7 @@ class Commands
                     f.close
                     job.setvariable('interface','english')
                     job.setvariable('simplerun',true)
+                    job.setvariable('arrange',true)
                     # job.setvariable('nooptionfile',true)
                     job.setvariable('files',[job.tempfilename])
                     job.processtex
@@ -376,7 +377,7 @@ class Commands
             if files.length > 0 then
                 if f = File.open(job.tempfilename('tex'),'w') then
                     scale = @commandline.checkedoption('scale')
-                    scale = (scale * 1000).to_i if scale < 10
+                    scale = (scale * 1000).to_i if scale.to_i < 10
                     paperoffset = @commandline.checkedoption('paperoffset', '0cm')
                     f << "\\starttext\n"
                     files.each do |filename|
@@ -399,7 +400,7 @@ class Commands
                             f <<  "\\setupexternalfigures\n"
                             f <<  "  [directory=]\n"
                             f <<  "\\copypages\n"
-                            f <<  "  [#[filename}]\n"
+                            f <<  "  [#{filename}]\n"
                             f <<  "  [scale=#{scale},\n"
                             f <<  "   marking=on,\n" if @commandline.option('markings')
                             f <<  "   size=trimbox,\n" if trim
@@ -601,12 +602,12 @@ class Commands
 
 end
 
-# so far for compatibility
+# so far for compatibility, will move to tex
 
 @@extrastringvars = [
     'pages', 'background', 'backspace', 'topspace', 'boxtype', 'tempdir','bannerheight',
-    'printformat', 'paperformat', 'method', 'scale', 'selection',
-    'combination', 'paperoffset', 'textwidth', 'addempty', 'logfile',
+    'printformat', 'method', 'scale', 'selection',
+    'combination', 'textwidth', 'addempty', 'logfile',
     'startline', 'endline', 'startcolumn', 'endcolumn', 'scale'
 ]
 
diff --git a/scripts/context/ruby/texmfstart.rb b/scripts/context/ruby/texmfstart.rb
index 1f76d703f..411cb9248 100644
--- a/scripts/context/ruby/texmfstart.rb
+++ b/scripts/context/ruby/texmfstart.rb
@@ -2222,7 +2222,7 @@ def make(filename,windows=false,linux=false,remove=false)
             elsif linux && f = open(basename,'w') then
                 f.binmode
                 f.write("#!/bin/sh\012")
-                f.write("#{program} #{callname} $@\012")
+                f.write("#{program} #{callname} \"$@\"\012")
                 f.close
                 report("unix stub '#{basename}' made (calls #{callname})")
             end
diff --git a/scripts/context/stubs/unix/ctxtools b/scripts/context/stubs/unix/ctxtools
index 5a6a1feb5..84e47bbee 100755
--- a/scripts/context/stubs/unix/ctxtools
+++ b/scripts/context/stubs/unix/ctxtools
@@ -1,2 +1,2 @@
 #!/bin/sh
-texmfstart ctxtools.rb $@
+texmfstart ctxtools.rb "$@"
diff --git a/scripts/context/stubs/unix/exatools b/scripts/context/stubs/unix/exatools
index cededbb57..50ff0f07e 100755
--- a/scripts/context/stubs/unix/exatools
+++ b/scripts/context/stubs/unix/exatools
@@ -1,2 +1,2 @@
 #!/bin/sh
-texmfstart exatools.rb $@
+texmfstart exatools.rb "$@"
diff --git a/scripts/context/stubs/unix/makempy b/scripts/context/stubs/unix/makempy
index c30a261f0..4bf7a1af2 100755
--- a/scripts/context/stubs/unix/makempy
+++ b/scripts/context/stubs/unix/makempy
@@ -1,2 +1,2 @@
 #!/bin/sh
-texmfstart makempy.pl $@
+texmfstart makempy.pl "$@"
diff --git a/scripts/context/stubs/unix/mpstools b/scripts/context/stubs/unix/mpstools
index 68fd485bc..b4c8f6345 100755
--- a/scripts/context/stubs/unix/mpstools
+++ b/scripts/context/stubs/unix/mpstools
@@ -1,2 +1,2 @@
 #!/bin/sh
-texmfstart mpstools.rb $@
+texmfstart mpstools.rb "$@"
diff --git a/scripts/context/stubs/unix/mptopdf b/scripts/context/stubs/unix/mptopdf
index a29448782..980a3123d 100755
--- a/scripts/context/stubs/unix/mptopdf
+++ b/scripts/context/stubs/unix/mptopdf
@@ -1,2 +1,2 @@
 #!/bin/sh
-texmfstart mptopdf.pl $@
+texmfstart mptopdf.pl "$@"
diff --git a/scripts/context/stubs/unix/pdftools b/scripts/context/stubs/unix/pdftools
index fc6b9e864..92ee803a8 100755
--- a/scripts/context/stubs/unix/pdftools
+++ b/scripts/context/stubs/unix/pdftools
@@ -1,2 +1,2 @@
 #!/bin/sh
-texmfstart pdftools.rb $@
+texmfstart pdftools.rb "$@"
diff --git a/scripts/context/stubs/unix/pstopdf b/scripts/context/stubs/unix/pstopdf
index e1f0375e5..5b38ed426 100755
--- a/scripts/context/stubs/unix/pstopdf
+++ b/scripts/context/stubs/unix/pstopdf
@@ -1,2 +1,2 @@
 #!/bin/sh
-texmfstart pstopdf.rb $@
+texmfstart pstopdf.rb "$@"
diff --git a/scripts/context/stubs/unix/rlxtools b/scripts/context/stubs/unix/rlxtools
index 6cd5db89f..41cea40fc 100755
--- a/scripts/context/stubs/unix/rlxtools
+++ b/scripts/context/stubs/unix/rlxtools
@@ -1,2 +1,2 @@
 #!/bin/sh
-texmfstart rlxtools.rb $@
+texmfstart rlxtools.rb "$@"
diff --git a/scripts/context/stubs/unix/runtools b/scripts/context/stubs/unix/runtools
index 3e4e2c505..ff9a33379 100755
--- a/scripts/context/stubs/unix/runtools
+++ b/scripts/context/stubs/unix/runtools
@@ -1,2 +1,2 @@
 #!/bin/sh
-texmfstart runtools.rb $@
+texmfstart runtools.rb "$@"
diff --git a/scripts/context/stubs/unix/texexec b/scripts/context/stubs/unix/texexec
index a8e297307..215817290 100755
--- a/scripts/context/stubs/unix/texexec
+++ b/scripts/context/stubs/unix/texexec
@@ -1,2 +1,2 @@
 #!/bin/sh
-texmfstart texexec.rb $@
+texmfstart texexec.rb "$@"
diff --git a/scripts/context/stubs/unix/texfont b/scripts/context/stubs/unix/texfont
index ec1bd57d5..a91f786e3 100755
--- a/scripts/context/stubs/unix/texfont
+++ b/scripts/context/stubs/unix/texfont
@@ -1,2 +1,2 @@
 #!/bin/sh
-texmfstart texfont.pl $@
+texmfstart texfont.pl "$@"
diff --git a/scripts/context/stubs/unix/textools b/scripts/context/stubs/unix/textools
index 5078ebce0..7445eac37 100755
--- a/scripts/context/stubs/unix/textools
+++ b/scripts/context/stubs/unix/textools
@@ -1,2 +1,2 @@
 #!/bin/sh
-texmfstart textools.rb $@
+texmfstart textools.rb "$@"
diff --git a/scripts/context/stubs/unix/texutil b/scripts/context/stubs/unix/texutil
index 773176da5..607154af0 100755
--- a/scripts/context/stubs/unix/texutil
+++ b/scripts/context/stubs/unix/texutil
@@ -1,2 +1,2 @@
 #!/bin/sh
-texmfstart texutil.rb $@
+texmfstart texutil.rb "$@"
diff --git a/scripts/context/stubs/unix/tmftools b/scripts/context/stubs/unix/tmftools
index 9b52a5e53..7531a9663 100755
--- a/scripts/context/stubs/unix/tmftools
+++ b/scripts/context/stubs/unix/tmftools
@@ -1,2 +1,2 @@
 #!/bin/sh
-texmfstart tmftools.rb $@
+texmfstart tmftools.rb "$@"
diff --git a/scripts/context/stubs/unix/xmltools b/scripts/context/stubs/unix/xmltools
index 7e8c174ca..03086d043 100755
--- a/scripts/context/stubs/unix/xmltools
+++ b/scripts/context/stubs/unix/xmltools
@@ -1,2 +1,2 @@
 #!/bin/sh
-texmfstart xmltools.rb $@
+texmfstart xmltools.rb "$@"
diff --git a/tex/context/base/colo-ini.tex b/tex/context/base/colo-ini.tex
index 70e19b914..e6d18ddba 100644
--- a/tex/context/base/colo-ini.tex
+++ b/tex/context/base/colo-ini.tex
@@ -181,7 +181,7 @@
 \stopmessages
 
 \startmessages  french  library: colors
-  title: color
+  title: couleurs
       1: le système -- est globalement activé
       2: le système -- est localement activé
       3: -- n'est pas défini --
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 60c841c50..c4da67356 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2006.07.24 10:49}
+\newcontextversion{2006.07.28 23:56}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
@@ -29,6 +29,47 @@
 
 \writestatus{\m!systems}{beware: some patches loaded from cont-new.tex}
 
+% we need to overhaul the page modules anyway
+
+\def\settext
+  {\doquintupleempty\dosettext}
+
+\def\dosettext[#1][#2][#3][#4][#5]% header text middle text/text
+  {\iffifthargument
+     \setvalue{\??tk#1#2\executeifdefined{:\c!text:#3:}\c!middletext}%
+       {\dodoubletexts{\??tk#1}{#2}%
+          {\c!leftstyle \c!leftcolor \c!leftwidth }{#4}%
+          {\c!rightstyle\c!rightcolor\c!rightwidth}{#5}}%
+   \else\iffourthargument
+     \setvalue{\??tk#1#2\executeifdefined{:\c!text:#3:}\c!middletext}%
+       {\dodoubletexts{\??tk#1}{#2}%
+          {\c!leftstyle \c!leftcolor \c!leftwidth }{#4}%
+          {\c!rightstyle\c!rightcolor\c!rightwidth}{#4}}%
+   \else\ifthirdargument
+     \setvalue{\??tk#1#2\c!middletext}%
+       {\dodoubletexts{\??tk#1}{#2}%
+          {\c!leftstyle \c!leftcolor \c!leftwidth }{#3}%
+          {\c!rightstyle\c!rightcolor\c!rightwidth}{#3}}%
+   \fi\fi\fi}
+
+\def\resettext
+  {\dotripleempty\doresettext}
+
+\def\doresettext[#1][#2][#3]% header text middle
+  {\ifthirdargument
+     \letvalue{\??tk#1#2\executeifdefined{:\c!text:#3:}\c!middletext}\empty
+   \else\ifsecondargument
+     \letvalue{\??tk#1#2\c!lefttext  }\empty
+     \letvalue{\??tk#1#2\c!middletext}\empty
+     \letvalue{\??tk#1#2\c!righttext }\empty
+   \fi\fi}
+
+\setvalue{:\c!middle:\c!text:}{\c!middletext}
+\setvalue{:\c!left  :\c!text:}{\c!lefttext  }
+\setvalue{:\c!right :\c!text:}{\c!righttext }
+
+% \settext[header][text][middle][xxx][yyy]
+
 %D A nice example of a plugin:
 %D
 %D \startbuffer
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index ca1131e23..86c63834c 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -31,7 +31,7 @@
 %D 2004.8.30 the low level interface is english. Watch out and adapt
 %D your styles an modules.
 
-\def\contextversion{2006.07.24 10:49}
+\def\contextversion{2006.07.28 23:56}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/core-buf.tex b/tex/context/base/core-buf.tex
index b580d2d72..8a5202ebf 100644
--- a/tex/context/base/core-buf.tex
+++ b/tex/context/base/core-buf.tex
@@ -128,7 +128,7 @@
 \stopmessages
 
 \startmessages  french  library: textblocks
-  title: textblocks
+  title: blocs de texte
       1: nouvelle version, une seconde passe est nécessaire
       2: ecriture des blocs vers --
       3: lecture des blocs en provenance de --
diff --git a/tex/context/base/core-dat.tex b/tex/context/base/core-dat.tex
index d859023c0..aab352daa 100644
--- a/tex/context/base/core-dat.tex
+++ b/tex/context/base/core-dat.tex
@@ -74,7 +74,7 @@
 \stopmessages
 
 \startmessages  french  library: databases
-  title: databases
+  title: bases de données
       1: --
       2: fichier local --
       3: fichier global --
diff --git a/tex/context/base/core-fil.tex b/tex/context/base/core-fil.tex
index d19ef115d..b12a78324 100644
--- a/tex/context/base/core-fil.tex
+++ b/tex/context/base/core-fil.tex
@@ -55,7 +55,7 @@
 \stopmessages
 
 \startmessages  french  library: files
-   title: files
+   title: fichiers
        1: le synonyme de fichier -- est déjà utilisé pour --
 \stopmessages
 
diff --git a/tex/context/base/core-ref.tex b/tex/context/base/core-ref.tex
index 0876ba13d..4a0c1a3ce 100644
--- a/tex/context/base/core-ref.tex
+++ b/tex/context/base/core-ref.tex
@@ -120,7 +120,7 @@
 \stopmessages
 
 \startmessages  french  library: references
-  title: references
+  title: réferences
       1: réference -- inconnue
       2: réference -- dupliquée à la page --
       3: type -- de réference inconnu
diff --git a/tex/context/base/core-reg.tex b/tex/context/base/core-reg.tex
index ebc743af1..99e6657e2 100644
--- a/tex/context/base/core-reg.tex
+++ b/tex/context/base/core-reg.tex
@@ -380,12 +380,12 @@
     \fi\fi\fi
     \ifdone
       \begingroup
-%
-\doifelsevalue{\??id#2\c!prefix}\v!none % default v!both
-  {\chardef\pageprefixmode\zerocount}%
-  {\doifvalue{\??id#2\c!prefix}\v!first % only first in range (1.2-4)
-     {\ifnum#1=3 \chardef\pageprefixmode\zerocount \fi}}%
-%
+      %
+      \doifelsevalue{\??id#2\c!prefix}\v!none % default v!both
+        {\chardef\pageprefixmode\zerocount}%
+        {\doifvalue{\??id#2\c!prefix}\v!first % only first in range (1.2-4)
+           {\ifnum#1=3 \chardef\pageprefixmode\zerocount \fi}}%
+      %
       \doifelsevalue{\??id#2\c!interaction}\v!pagenumber
         {\bgroup
          \setbox0\hbox
@@ -393,7 +393,7 @@
          \gotonextinternal{\s!ind}{#4}{#6}{\box0}%{\copy0}%
          \egroup}
         {\hbox{\doregisterpage{#2}[#5]\ifnum#1=2\/\fi}}%
-\endgroup
+      \endgroup
       \ignorespaces
       \global\chardef\lastregisterpagestatus#1\relax
     \fi
@@ -479,6 +479,26 @@
       \global\let\c!entryletter\relax
       \doregistercharacter[#1]{#2}}}
 
+% \def\HowUgly    #1{\doHowUgly#1\relax}
+% \def\doHowUgly#1#2\relax{\iffirstregisterentry{\bf#1}#2\fi#1#2} # handles utf too
+%
+% \setupregister[index][indicator=no,deeptextcommand=\HowUgly]
+%
+% \starttext
+%     \chapter{First Chapter}
+%         Some text...\index{word}
+%         \section {First Section}
+%             Some text...\index{word}
+%             Some text...\index{another entry}
+%             Some text...\index{ansi}
+%             Some text...\index{another entry}
+%     \page[yes]
+%     \completeindex
+% \stoptext
+
+\def\dohandlepageregisterentry#1#2%
+  {\dohandleregisterentry{\executeifdefined{\??id#1\c!deeptextcommand}\firstofoneargument{#2}}}
+
 \def\dosetpageregisterentrya#1#2%
   {\edef\currententrylevel{1}%
    \global\let\c!entryb\relax
@@ -487,7 +507,7 @@
      {\iffirstregisterentry\else\endgraf\fi % new
       \global\firstregisterpagetrue
       \hangindent1em\noindent\c!entryreference
-      \dohandleregisterentry{#2}%
+      \dohandlepageregisterentry{#1}{#2}%
       \global\firstregisterentryfalse
       \global\firstsubentrytrue
       \global\firstsubsubentrytrue}}
@@ -501,7 +521,7 @@
       \global\let\c!entrya\relax
       \iffirstsubentry\nobreak\fi
       \hangindent2em\noindent\c!entryreference\hskip1em\relax
-      \dohandleregisterentry{#2}%
+      \dohandlepageregisterentry{#1}{#2}%
       \global\firstregisterentryfalse
       \global\firstsubentryfalse
       \global\firstsubsubentrytrue}}
@@ -515,7 +535,7 @@
       \global\let\c!entryb\relax
       \iffirstsubsubentry\nobreak\fi
       \hangindent3em\noindent\c!entryreference\hskip2em\relax
-      \dohandleregisterentry{#2}%
+      \dohandlepageregisterentry{#1}{#2}%
       \global\firstregisterentryfalse
       \global\firstsubsubentryfalse}}
 
@@ -562,7 +582,7 @@
     \c!entryletter
     \iflocation
       \getalllistreferences{#1}{#2}%
-% \endgraf
+      % no \endgraf
       \hangindent1em\noindent\c!entryreference
       %
       %\thisissomeinternal{\s!lin}{\internallistreference}%
@@ -619,7 +639,7 @@
          \docommando\lastlistreference\v!next}%
       % tot hier
     \else
-% \endgraf
+      % no \endgraf
       \noindent\c!entryreference
       \limitedregisterentry{#1}{#2}%
     \fi
@@ -647,36 +667,36 @@
       \doglobal\increment\internallistreference}%
    \setvalue{#1\s!from}%
      {\getvalue{#1\s!page}}%
-\ifautoregisterhack
-   \setvalue{#1\s!page}##1##2##3##4%
-     {\doifreglevelelse[##3]
-        {\global\utilitydonetrue
-         \iffirstregisterpage
-           \@EA\xdef\csname\??id#1\??id\currentregisterentry\endcsname
-             {\internallistreference::##4}%
-         \else % catches errors in index
-           \ifcsname\??id#1\??id\currentregisterentry\endcsname
+   \ifautoregisterhack
+     \setvalue{#1\s!page}##1##2##3##4%
+       {\doifreglevelelse[##3]
+          {\global\utilitydonetrue
+           \iffirstregisterpage
              \@EA\xdef\csname\??id#1\??id\currentregisterentry\endcsname
-               {\csname\??id#1\??id\currentregisterentry\endcsname,##4}%
-           \fi
-         \fi}
-        {}}%
-\else
-   \setvalue{#1\s!page}##1##2##3##4%
-     {\doifreglevelelse[##3]
-        {\global\utilitydonetrue
-         \iffirstregisterpage
-           \global\firstregisterpagefalse
-           \@EA\xdef\csname\??id#1\??id\currentregisterentry\endcsname
-             {\internallistreference::##2-##4}%
-         \else % catches errors in index
-           \ifcsname\??id#1\??id\currentregisterentry\endcsname
+               {\internallistreference::##4}%
+           \else % catches errors in index
+             \ifcsname\??id#1\??id\currentregisterentry\endcsname
+               \@EA\xdef\csname\??id#1\??id\currentregisterentry\endcsname
+                 {\csname\??id#1\??id\currentregisterentry\endcsname,##4}%
+             \fi
+           \fi}
+          {}}%
+   \else
+     \setvalue{#1\s!page}##1##2##3##4%
+       {\doifreglevelelse[##3]
+          {\global\utilitydonetrue
+           \iffirstregisterpage
+             \global\firstregisterpagefalse
              \@EA\xdef\csname\??id#1\??id\currentregisterentry\endcsname
-               {\csname\??id#1\??id\currentregisterentry\endcsname,##2-##4}%
-           \fi
-         \fi}
-        {}}%
-\fi}
+               {\internallistreference::##2-##4}%
+           \else % catches errors in index
+             \ifcsname\??id#1\??id\currentregisterentry\endcsname
+               \@EA\xdef\csname\??id#1\??id\currentregisterentry\endcsname
+                 {\csname\??id#1\??id\currentregisterentry\endcsname,##2-##4}%
+             \fi
+           \fi}
+          {}}%
+   \fi}
 
 \def\docoupleregister[#1][#2]%
   {\iflocation
@@ -965,6 +985,7 @@
       \c!prefix=\v!both,
       \c!expansion=,
       \c!keyexpansion=,
+     %\c!deeptextcommand=, % undefined by default !
       \s!language=\currentmainlanguage]%
    \doglobal\appendtoksonce
      \doregisterregisterlanguage{#1}%
diff --git a/tex/context/base/core-sec.tex b/tex/context/base/core-sec.tex
index b94ceee70..bfe8364a7 100644
--- a/tex/context/base/core-sec.tex
+++ b/tex/context/base/core-sec.tex
@@ -2110,6 +2110,7 @@
       \c!textstyle=\getvalue{\??ko#1\c!style},
       \c!numbercolor=\getvalue{\??ko#1\c!color},
       \c!textcolor=\getvalue{\??ko#1\c!color}]%
+   % deeptextcommand and deepnumbercommand are left undefined !
    \doifassignmentelse{#2}
      {\getparameters
         [\??ko#1]
diff --git a/tex/context/base/core-ver.tex b/tex/context/base/core-ver.tex
index 55646f053..5713e0cb3 100644
--- a/tex/context/base/core-ver.tex
+++ b/tex/context/base/core-ver.tex
@@ -185,8 +185,9 @@
    \doifnumberelse{\typingparameter\c!tab}
      {\def\obeytabs{\setfixedtabskips{\typingparameter\c!tab}}}%
      \donothing
-%    \def\verbatimfont{\typingparameter\c!style\normalnoligatures\font}%
-   \def\verbatimfont{\dosetfontattribute{\currenttypingclass\currenttyping}\c!style\normalnoligatures\font}%
+  %\def\verbatimfont{\typingparameter\c!style\normalnoligatures\font}%
+  % more generic, but beware of the \redoconvertfont (else no typing in titles and such)
+   \def\verbatimfont{\redoconvertfont\dosetfontattribute{\currenttypingclass\currenttyping}\c!style\normalnoligatures\font}%
    \setupverbatimcolor}
 
 \ifx\normalnoligatures\undefined \let\normalnoligatures\gobbleoneargument \fi
diff --git a/tex/context/base/enco-ini.tex b/tex/context/base/enco-ini.tex
index 70878656f..9b78ae18d 100644
--- a/tex/context/base/enco-ini.tex
+++ b/tex/context/base/enco-ini.tex
@@ -116,7 +116,7 @@
 \stopmessages
 
 \startmessages  french  library: encodings
-  title: encoding
+  title: encodage
       1: encodage --
       2: l'encodage -- est chargé
       3: encodage -- inconnu
diff --git a/tex/context/base/filt-ini.tex b/tex/context/base/filt-ini.tex
index 3df7da946..9827bb21a 100644
--- a/tex/context/base/filt-ini.tex
+++ b/tex/context/base/filt-ini.tex
@@ -59,7 +59,7 @@
 \stopmessages
 
 \startmessages  french  library: filters
-  title: filter
+  title: filtre
       1: le filtre -- est chargé
       2: filtre -- inconnu
 \stopmessages
diff --git a/tex/context/base/font-ini.tex b/tex/context/base/font-ini.tex
index f6b8e4f4a..29cdc1261 100644
--- a/tex/context/base/font-ini.tex
+++ b/tex/context/base/font-ini.tex
@@ -227,7 +227,7 @@
 \stopmessages
 
 \startmessages  french  library: fonts
-  title: bodyfont
+  title: corps de texte
       1: encodage --
       2: la variante -- est chargée
       3: variante -- inconnue
diff --git a/tex/context/base/hand-ini.tex b/tex/context/base/hand-ini.tex
index e11e3da1a..cef84d0e6 100644
--- a/tex/context/base/hand-ini.tex
+++ b/tex/context/base/hand-ini.tex
@@ -70,7 +70,7 @@
 \stopmessages
 
 \startmessages  french  library: handlings
-  title: handling
+  title: manipulation
       1: manipulation -- de police
       2: la manipulation -- de police est chargée
       3: manipulation -- inconnue de police
diff --git a/tex/context/base/lang-ger.tex b/tex/context/base/lang-ger.tex
index 8a379203f..4434b7dba 100644
--- a/tex/context/base/lang-ger.tex
+++ b/tex/context/base/lang-ger.tex
@@ -126,7 +126,7 @@
    \c!leftquotation=\upperleftdoublesixquote,
    \c!rightquotation=\upperrightdoubleninequote,
    \c!date={\v!day,{.},\ ,\v!month,\ ,\v!year},
-   \c!default=\s!nl, % patterns
+   \c!default=\s!no,
    \c!state=\v!stop]
 
 %D Extra:
diff --git a/tex/context/base/lang-ini.tex b/tex/context/base/lang-ini.tex
index a031a32ed..f47a4e914 100644
--- a/tex/context/base/lang-ini.tex
+++ b/tex/context/base/lang-ini.tex
@@ -123,7 +123,7 @@
 \stopmessages
 
 \startmessages  french  library: linguals
-  title: language
+  title: langue
       1: les motifs -- pour -- sont chargés (n=--,e=--,m=--)
       2: pas de motifs -- pour -- (n=--,e=--,m=--) (--,--)
       3: hyphenations -- pour -- chargés (n=--,e=--,m=--)
diff --git a/tex/context/base/mult-sys.tex b/tex/context/base/mult-sys.tex
index 8636ec402..6d3f97138 100644
--- a/tex/context/base/mult-sys.tex
+++ b/tex/context/base/mult-sys.tex
@@ -840,7 +840,7 @@
 \stopmessages
 
 \startmessages  french library: check
-  title: check
+  title:  vérification
       1: missing or ungrouped '=' manquant ou dégroupé après '--' à la ligne --
       2: -- argument(s) attendu(s) à la ligne --
       3: -- -- remplace une macro, utilisez des MAJUSCULES !
diff --git a/tex/context/base/page-flt.tex b/tex/context/base/page-flt.tex
index eb1311512..1912a0140 100644
--- a/tex/context/base/page-flt.tex
+++ b/tex/context/base/page-flt.tex
@@ -158,7 +158,7 @@
 \stopmessages
 
 \startmessages  french  library: floatblocks
- title: floatblocks
+ title: blocs de flottants
       1: -- renuméroté / -- => --
       2: -- sauvegardé
       3: -- déplacé
diff --git a/tex/context/base/page-ini.tex b/tex/context/base/page-ini.tex
index b7cbfc9c3..c29277581 100644
--- a/tex/context/base/page-ini.tex
+++ b/tex/context/base/page-ini.tex
@@ -244,7 +244,7 @@
 \stopmessages
 
 \startmessages  french  library: systems
-  title: system
+  title: système
       1: chargement de fichier utilitaire reporté (typemode)
       2: -- chargé
 %     3: try LaTeX
@@ -373,7 +373,7 @@
 \stopmessages
 
 \startmessages  french  library: layouts
-  title: layout
+  title: calque
       1: hauteurtexte adaptée avec -- à la page --
       2: -- times postponed text placed
       3: -- times text postponed
@@ -608,7 +608,7 @@
 \stopmessages
 
 \startmessages  french  library: columns
-  title: columns
+  title: colonnes
       1: seules -- colonnes possibles
       2: utilisez \string\filbreak\space en tant qu'alternative
       3: problèmes, désactive l'équilibrage
diff --git a/tex/context/base/symb-ini.tex b/tex/context/base/symb-ini.tex
index 063d361dd..a3a9048b8 100644
--- a/tex/context/base/symb-ini.tex
+++ b/tex/context/base/symb-ini.tex
@@ -55,7 +55,7 @@
 \stopmessages
 
 \startmessages  french  library: symbols
-  title: symbols
+  title: symboles
       1: chargement du jeu de symbole --
 \stopmessages
 
diff --git a/tex/context/base/x-set-11.tex b/tex/context/base/x-set-11.tex
index 57117174e..ffa97cbc3 100644
--- a/tex/context/base/x-set-11.tex
+++ b/tex/context/base/x-set-11.tex
@@ -265,9 +265,9 @@
 \stopmessages
 
 \startmessages  french  library: setup
-        title:  setup
+        title:  réglage
       formula:  formule
-       number:  numero
+       number:  numéro
          list:  liste
     dimension:  dimension
          mark:  marquage
@@ -283,18 +283,18 @@
        matrix:  n*m
           see:  vois
      inherits:  herite de
-            1:  les caracteres < et > sont globalement actifs !
-            2:  -- est traite
-            3:  -- n'est pas defini
-            4:  -- est traite de nouveau
+            1:  les caractères < et > sont globalement actifs !
+            2:  -- est traité
+            3:  -- n'est pas défini
+            4:  -- est traité de nouveau
      optional:  optionel
   displaymath:  formule
-        index:  entree
+        index:  entrée
          math:  formule
       nothing:  vide
          file:  fichier
      position:  position
-    reference:  reference
+    reference:  réference
        csname:  nom
   destination:  destination
       triplet:  triplet
diff --git a/tex/context/interface/cont-cz.xml b/tex/context/interface/cont-cz.xml
index 3fc6114d4..6afbcda63 100644
--- a/tex/context/interface/cont-cz.xml
+++ b/tex/context/interface/cont-cz.xml
@@ -6505,6 +6505,9 @@
         <cd:constant type="prvni"/>
         <cd:constant type="zadny"/>
       </cd:parameter>
+      <cd:parameter name="deeptextcommand">
+        <cd:constant type="cd:oneargument"/>
+      </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
diff --git a/tex/context/interface/cont-de.xml b/tex/context/interface/cont-de.xml
index 692b1da7c..d55bd615d 100644
--- a/tex/context/interface/cont-de.xml
+++ b/tex/context/interface/cont-de.xml
@@ -6505,6 +6505,9 @@
         <cd:constant type="erste"/>
         <cd:constant type="kein"/>
       </cd:parameter>
+      <cd:parameter name="deeptextcommand">
+        <cd:constant type="cd:oneargument"/>
+      </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
diff --git a/tex/context/interface/cont-en.xml b/tex/context/interface/cont-en.xml
index 02da11418..def97d62f 100644
--- a/tex/context/interface/cont-en.xml
+++ b/tex/context/interface/cont-en.xml
@@ -6505,6 +6505,9 @@
         <cd:constant type="first"/>
         <cd:constant type="none"/>
       </cd:parameter>
+      <cd:parameter name="deeptextcommand">
+        <cd:constant type="cd:oneargument"/>
+      </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
diff --git a/tex/context/interface/cont-fr.xml b/tex/context/interface/cont-fr.xml
index d83b66832..5f17211f9 100644
--- a/tex/context/interface/cont-fr.xml
+++ b/tex/context/interface/cont-fr.xml
@@ -6505,6 +6505,9 @@
         <cd:constant type="premier"/>
         <cd:constant type="rien"/>
       </cd:parameter>
+      <cd:parameter name="deeptextcommand">
+        <cd:constant type="cd:oneargument"/>
+      </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
diff --git a/tex/context/interface/cont-it.xml b/tex/context/interface/cont-it.xml
index 9e54d250e..f07085466 100644
--- a/tex/context/interface/cont-it.xml
+++ b/tex/context/interface/cont-it.xml
@@ -6505,6 +6505,9 @@
         <cd:constant type="primo"/>
         <cd:constant type="nessuno"/>
       </cd:parameter>
+      <cd:parameter name="deeptextcommand">
+        <cd:constant type="cd:oneargument"/>
+      </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
diff --git a/tex/context/interface/cont-nl.xml b/tex/context/interface/cont-nl.xml
index 94fa35d92..db4995763 100644
--- a/tex/context/interface/cont-nl.xml
+++ b/tex/context/interface/cont-nl.xml
@@ -6505,6 +6505,9 @@
         <cd:constant type="eerste"/>
         <cd:constant type="geen"/>
       </cd:parameter>
+      <cd:parameter name="dieptekstcommando">
+        <cd:constant type="cd:oneargument"/>
+      </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
diff --git a/tex/context/interface/cont-ro.xml b/tex/context/interface/cont-ro.xml
index 4f7495b0a..de208d294 100644
--- a/tex/context/interface/cont-ro.xml
+++ b/tex/context/interface/cont-ro.xml
@@ -6505,6 +6505,9 @@
         <cd:constant type="primul"/>
         <cd:constant type="niciunul"/>
       </cd:parameter>
+      <cd:parameter name="deeptextcommand">
+        <cd:constant type="cd:oneargument"/>
+      </cd:parameter>
     </cd:assignments>
   </cd:arguments>
 </cd:command>
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index a7afe0131..90b80d2b4 100644
--- a/tex/context/interface/keys-cz.xml
+++ b/tex/context/interface/keys-cz.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2006.07.24 10:49">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2006.07.28 23:56">
 
   <cd:variables>
     <cd:variable name="one" value="jedna"/>
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml
index 655980a00..bca5ca6fd 100644
--- a/tex/context/interface/keys-de.xml
+++ b/tex/context/interface/keys-de.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2006.07.24 10:49">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2006.07.28 23:56">
 
   <cd:variables>
     <cd:variable name="one" value="eins"/>
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml
index bc9ddd071..93287674b 100644
--- a/tex/context/interface/keys-en.xml
+++ b/tex/context/interface/keys-en.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2006.07.24 10:49">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2006.07.28 23:56">
 
   <cd:variables>
     <cd:variable name="one" value="one"/>
diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml
index 3dca3a191..b5df55613 100644
--- a/tex/context/interface/keys-fr.xml
+++ b/tex/context/interface/keys-fr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.07.24 10:49">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.07.28 23:56">
 
   <cd:variables>
     <cd:variable name="one" value="un"/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index be9d85d3f..3189e466a 100644
--- a/tex/context/interface/keys-it.xml
+++ b/tex/context/interface/keys-it.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2006.07.24 10:49">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2006.07.28 23:56">
 
   <cd:variables>
     <cd:variable name="one" value="uno"/>
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml
index a8e8ce7b5..7900ce623 100644
--- a/tex/context/interface/keys-nl.xml
+++ b/tex/context/interface/keys-nl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2006.07.24 10:49">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2006.07.28 23:56">
 
   <cd:variables>
     <cd:variable name="one" value="een"/>
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml
index f94f55e56..33f3e2f1d 100644
--- a/tex/context/interface/keys-ro.xml
+++ b/tex/context/interface/keys-ro.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2006.07.24 10:49">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2006.07.28 23:56">
 
   <cd:variables>
     <cd:variable name="one" value="unu"/>