beta 2011.01.31 16:59

1 files changed, 54 insertions, 20 deletions

diff --git a/web2c/contextcnf.lua b/web2c/contextcnf.lua
index 072f06980..b420f485c 100644
--- a/web2c/contextcnf.lua
+++ b/web2c/contextcnf.lua
@@ -11,21 +11,43 @@ return {
 
         variables = {
 
-            TEXMFCACHE      = "$SELFAUTOPARENT/texmf-cache",
+            -- The following variable is predefined (but can be overloaded) and in
+            -- most cases you can leve this one untouched. The built-in definition
+            -- permits relocation of the tree.
+            --
+            -- TEXMFCNF     = "{selfautodir:,selfautoparent:}{,{/share,}/texmf{-local,}/web2c}"
+            --
+            -- more readable than "selfautoparent:{/texmf{-local,}{,/web2c},}}" is:
+            --
+            -- TEXMFCNF     = {
+            --     "selfautoparent:/texmf-local",
+            --     "selfautoparent:/texmf-local/web2c",
+            --     "selfautoparent:/texmf",
+            --     "selfautoparent:/texmf/web2c",
+            --     "selfautoparent:",
+            -- }
+
+            -- We have only one cache path but there can be more. The first writable one
+            -- will be chose but there can be more readable paths.
 
-            TEXMFOS         = "$SELFAUTODIR",
-            TEXMFSYSTEM     = "$SELFAUTOPARENT/texmf-$SELFAUTOSYSTEM",
-            TEXMFMAIN       = "$SELFAUTOPARENT/texmf",
-            TEXMFCONTEXT    = "$SELFAUTOPARENT/texmf-context",
-            TEXMFLOCAL      = "$SELFAUTOPARENT/texmf-local",
-            TEXMFFONTS      = "$SELFAUTOPARENT/texmf-fonts",
-            TEXMFPROJECT    = "$SELFAUTOPARENT/texmf-project",
+            TEXMFCACHE      = "$SELFAUTOPARENT/texmf-cache",
 
             -- I don't like this texmf under home and texmf-home would make more
             -- sense. One never knows what installers put under texmf anywhere and
-            -- sorting out problems will be a pain.
-
-            TEXMFHOME       = "$HOME/texmf", -- "tree:///$HOME/texmf
+            -- sorting out problems will be a pain. But on the other hand ... home
+            -- mess is normally under the users own responsibility.
+            --
+            -- By using prefixes we don't get expanded paths in the cache __path__
+            -- entry. This makes the tex root relocatable.
+
+            TEXMFOS         = "selfautodir:",
+            TEXMFSYSTEM     = "selfautoparent:texmf-$SELFAUTOSYSTEM",
+            TEXMFMAIN       = "selfautoparent:texmf",
+            TEXMFCONTEXT    = "selfautoparent:texmf-context",
+            TEXMFLOCAL      = "selfautoparent:texmf-local",
+            TEXMFFONTS      = "selfautoparent:texmf-fonts",
+            TEXMFPROJECT    = "selfautoparent:texmf-project",
+            TEXMFHOME       = "home:texmf",
 
             -- We need texmfos for a few rare files but as I have a few more bin trees
             -- a hack is needed. Maybe other users also have texmf-platform-new trees.
@@ -46,22 +68,22 @@ return {
             OFMFONTS        = ".;$TEXMF/fonts/{data,ofm,tfm}//",
             OVFFONTS        = ".;$TEXMF/fonts/{data,ovf,vf}//",
 
-            TEXINPUTS       = ".;$TEXMF/tex/{context,plain/base,generic}//",
-            MPINPUTS        = ".;$TEXMF/metapost/{context,base,}//",
+            TEXINPUTS       = ".;{$CTXDEVTXPATH};$TEXMF/tex/{context,plain/base,generic}//",
+            MPINPUTS        = ".;{$CTXDEVMPPATH};$TEXMF/metapost/{context,base,}//",
 
             -- In the next variable the inputs path will go away.
 
-            TEXMFSCRIPTS    = ".;$TEXMF/scripts/context/{lua,ruby,python,perl}//;$TEXINPUTS",
-            PERLINPUTS      = ".;$TEXMF/scripts/context/perl",
-            PYTHONINPUTS    = ".;$TEXMF/scripts/context/python",
-            RUBYINPUTS      = ".;$TEXMF/scripts/context/ruby",
-            LUAINPUTS       = ".;$TEXINPUTS;$TEXMF/scripts/context/lua//",
+            TEXMFSCRIPTS    = ".;$CTXDEVLUPATH;$CTXDEVRBPATH;$CTXDEVPLPATH;$TEXMF/scripts/context/{lua,ruby,python,perl}//;$TEXINPUTS",
+            PERLINPUTS      = ".;$CTXDEVPLPATH;$TEXMF/scripts/context/perl",
+            PYTHONINPUTS    = ".;$CTXDEVPYPATH;$TEXMF/scripts/context/python",
+            RUBYINPUTS      = ".;$CTXDEVRBPATH;$TEXMF/scripts/context/ruby",
+            LUAINPUTS       = ".;$CTXDEVLUPATH;$TEXINPUTS;$TEXMF/scripts/context/lua//",
             CLUAINPUTS      = ".;$SELFAUTOLOC/lib/{$progname,$engine,}/lua//",
 
             -- Not really used by MkIV so they might go away.
 
-            BIBINPUTS       = ".;$TEXMF/bibtex/bib//",
-            BSTINPUTS       = ".;$TEXMF/bibtex/bst//",
+            BIBINPUTS       = ".;{$CTXDEVTXPATH};$TEXMF/bibtex/bib//",
+            BSTINPUTS       = ".;{$CTXDEVTXPATH};$TEXMF/bibtex/bst//",
 
             -- Experimental
 
@@ -78,6 +100,18 @@ return {
             FONTCONFIG_PATH = "$TEXMFSYSTEM/fonts/conf",
             FC_CACHEDIR     = "$TEXMFSYSTEM/fonts/cache", -- not needed
 
+            -- The io modes are similar to the traditional ones. Possible values
+            -- are all, paranoid and restricted.
+
+            output_mode  = "restricted",
+            input_mode   = "any",
+
+            -- The following variable is under consideration. We do have protection
+            -- mechanims but it's not enabled by default.
+
+            command_mode = "any", -- any none list
+            command_list = "mtxrun, convert, inkscape, gs, imagemagick, curl, bibtex, pstoedit",
+
         },
 
         -- We have a few reserved subtables. These control runtime behaviour. The