Revert "ConTeXt version 2019.02.22 19:35"

This reverts commit 5c6357cdb820b4f628d036ba7b2248f221d50c0b.

git-svn-id: svn://tug.org/texlive/trunk@50112 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 53 insertions, 91 deletions

diff --git a/Master/texmf-dist/web2c/texmfcnf.lua b/Master/texmf-dist/web2c/texmfcnf.lua
index 842401af74d..95bb2bc86d6 100644
--- a/Master/texmf-dist/web2c/texmfcnf.lua
+++ b/Master/texmf-dist/web2c/texmfcnf.lua
@@ -1,9 +1,17 @@
+-- public domain
+
+-- ConTeXt needs a properly expanded TEXMFLOCAL, so here is a
+-- bit of lua code to make that happen
+
+local texmflocal = resolvers.prefixes.selfautoparent();
+texmflocal = string.gsub(texmflocal, "20%d%d$", "texmf-local");
+
 return {
 
     type    = "configuration",
-    version = "1.1.1",
-    date    = "2011-06-02",
-    time    = "14:59:00",
+    version = "1.1.0",
+    date    = "2012-05-24",
+    time    = "12:12:12",
     comment = "ConTeXt MkIV configuration file",
     author  = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
 
@@ -19,40 +27,31 @@ return {
         variables = {
 
             -- The following variable is predefined (but can be overloaded) and in
-            -- most cases you can leave this one untouched. The built-in definition
+            -- most cases you can leve this one untouched. The built-in definition
             -- permits relocation of the tree.
             --
-            --  if this_is_texlive then
-            --      resolvers.luacnfspec = 'selfautodir:;selfautoparent:;{selfautodir:,selfautoparent:}{/share,}/texmf{-local,}/web2c'
-            --  else
-            --      resolvers.luacnfspec = 'home:texmf/web2c;selfautoparent:texmf{-local,-context,}/web2c'
-            --  end
+            -- TEXMFCNF     = "{selfautodir:,selfautoparent:}{,{/share,}/texmf{-local,}/web2c}"
             --
-            -- more readable is:
+            -- more readable than "selfautoparent:{/texmf{-local,}{,/web2c},}}" is:
             --
             -- TEXMFCNF     = {
-            --     "home:texmf/web2c,
-            --     "selfautoparent:texmf-local/web2c",
-            --     "selfautoparent:texmf-context/web2c",
-            --     "selfautoparent:texmf/web2c",
+            --     "selfautoparent:/texmf-local",
+            --     "selfautoparent:/texmf-local/web2c",
+            --     "selfautoparent:/texmf-dist",
+            --     "selfautoparent:/texmf/web2c",
+            --     "selfautoparent:",
             -- }
 
-            -- One problem is that DEFAULT_TEXMFCNF is hardcoded in kpse so in fact we should
-            -- have access to it without the need to initialize kpse.
-
-            -- 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.
-            --
-            -- Keep in mind that MkIV does not run at all on older texlives so when using
-            -- that you don't need to worry about ancient and obsolete configuration paths,
-            -- simply because no configuration will be found there.
+            -- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live
 
-            TEXMFCACHE      = "$SELFAUTOPARENT/texmf-cache",
+            TEXMFSYSVAR     = "selfautoparent:texmf-var",
+            TEXMFVAR        = "home:.texlive2018/texmf-var",
 
-            -- not used by context at all
+            -- We have only one cache path but there can be more. The first writable one
+            -- will be chosen but there can be more readable paths.
 
-            TEXMFSYSVAR     = "$TEXMFCACHE",
-            TEXMFVAR        = "$TEXMFCACHE",
+            TEXMFCACHE      = "$TEXMFSYSVAR;$TEXMFVAR",
+            TEXMFCONFIG     = "home:.texlive2018/texmf-config",
 
             -- 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
@@ -63,11 +62,10 @@ return {
             -- entry. This makes the tex root relocatable.
 
             TEXMFOS         = "selfautodir:",
-            TEXMFSYSTEM     = "selfautoparent:texmf-$SELFAUTOSYSTEM",
-            TEXMFMAIN       = "selfautoparent:texmf",
             TEXMFDIST       = "selfautoparent:texmf-dist",
-            TEXMFCONTEXT    = "selfautoparent:texmf-context",
-            TEXMFLOCAL      = "selfautoparent:texmf-local",
+
+            TEXMFLOCAL      = texmflocal,
+            TEXMFSYSCONFIG  = "selfautoparent:texmf-config",
             TEXMFFONTS      = "selfautoparent:texmf-fonts",
             TEXMFPROJECT    = "selfautoparent:texmf-project",
 
@@ -77,17 +75,17 @@ return {
             -- 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.
 
-            TEXMF           = "{$TEXMFHOME,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFCONTEXT,!!$TEXMFSYSTEM,!!$TEXMFDIST,!!$TEXMFMAIN}",
+            TEXMF           = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFDIST}",
 
             TEXFONTMAPS     = ".;$TEXMF/fonts/data//;$TEXMF/fonts/map/{pdftex,dvips}//",
             ENCFONTS        = ".;$TEXMF/fonts/data//;$TEXMF/fonts/enc/{dvips,pdftex}//",
             VFFONTS         = ".;$TEXMF/fonts/{data,vf}//",
             TFMFONTS        = ".;$TEXMF/fonts/{data,tfm}//",
-            PKFONTS         = ".;$TEXMF/fonts/{data,pk}//",
             T1FONTS         = ".;$TEXMF/fonts/{data,type1}//;$OSFONTDIR",
             AFMFONTS        = ".;$TEXMF/fonts/{data,afm}//;$OSFONTDIR",
             TTFONTS         = ".;$TEXMF/fonts/{data,truetype}//;$OSFONTDIR",
             OPENTYPEFONTS   = ".;$TEXMF/fonts/{data,opentype}//;$OSFONTDIR",
+            CMAPFONTS       = ".;$TEXMF/fonts/cmap//",
             FONTFEATURES    = ".;$TEXMF/fonts/{data,fea}//;$OPENTYPEFONTS;$TTFONTS;$T1FONTS;$AFMFONTS",
             FONTCIDMAPS     = ".;$TEXMF/fonts/{data,cid}//",
             OFMFONTS        = ".;$TEXMF/fonts/{data,ofm,tfm}//",
@@ -102,31 +100,22 @@ return {
             PERLINPUTS      = ".;$TEXMF/scripts/context/perl",
             PYTHONINPUTS    = ".;$TEXMF/scripts/context/python",
             RUBYINPUTS      = ".;$TEXMF/scripts/context/ruby",
-            LUAINPUTS       = ".;$TEXINPUTS;$TEXMF/scripts/context/lua//;$TEXMF",
-            CLUAINPUTS      = ".;$SELFAUTOLOC/lib/{context,$engine,luatex}/lua//",
-
-            -- texmf-local/tex/generic/example/foo :
-            --
-            -- package.helpers.trace = true
-            -- require("example.foo.bar")
+            LUAINPUTS       = ".;$TEXINPUTS;$TEXMF/scripts/context/lua//",
+            CLUAINPUTS      = ".;$SELFAUTOLOC/lib/{context,luatex,}/lua//",
 
             -- Not really used by MkIV so they might go away.
 
-            BIBINPUTS       = ".;$TEXMF/bibtex/bib//;$TEXMF/tex/context//",
-            BSTINPUTS       = ".;$TEXMF/bibtex/bst//;$TEXMF/tex/context//",
+            BIBINPUTS       = ".;$TEXMF/bibtex/bib//",
+            BSTINPUTS       = ".;$TEXMF/bibtex/bst//",
 
             -- Experimental
 
-            ICCPROFILES     = ".;$TEXMF/colors/icc/{context,profiles}//;$OSCOLORDIR",
+            ICCPROFILES     = ".;$TEXMF/tex/context/colors/{icc,profiles}//;$OSCOLORDIR",
 
             -- A few special ones that will change some day.
 
             FONTCONFIG_FILE = "fonts.conf",
-            FONTCONFIG_PATH = "$TEXMFSYSTEM/fonts/conf",
-
-         -- EXTRAFONTS      = ".;e:/tmp//",
-
-            -- we now have a different subsystem for this,
+            FONTCONFIG_PATH = "$TEXMFSYSVAR/fonts/conf",
 
         },
 
@@ -142,12 +131,12 @@ return {
             ["luatex.expanddepth"]       =  "10000", -- 10000
             ["luatex.hashextra"]         = "100000", --     0
             ["luatex.nestsize"]          =   "1000", --    50
-            ["luatex.maxinopen"]         =   "1000", --    15
+            ["luatex.maxinopen"]         =    "500", --    15
             ["luatex.maxprintline"]      = " 10000", --    79
             ["luatex.maxstrings"]        = "500000", -- 15000 -- obsolete
             ["luatex.paramsize"]         =  "25000", --    60
-            ["luatex.savesize"]          = "100000", --  4000
-            ["luatex.stacksize"]         = "100000", --   300
+            ["luatex.savesize"]          =  "50000", --  4000
+            ["luatex.stacksize"]         =  "10000", --   300
 
             -- A few process related variables come next.
 
@@ -157,33 +146,17 @@ return {
             ["system.compile.cleanup"]   = "no",    -- remove tma files
             ["system.compile.strip"]     = "yes",   -- strip tmc files
 
-            -- sandboxing (these only kick in when --sandbox is given) .. the examples
-            -- below are just that, examples, as sandboxing is off by default ... when
-            -- turned on, restrictions kick in, and programs registered at runtime have
-            -- (even) more restrictions than already registered ones
-
-         -- ["system.rootlist"]          = { "/data" }, -- { { "/data", "read" }, ... }
-         --
-         -- ["system.executionmode"]     = "list", -- none | list | all
-         -- ["system.executionlist"]     = {
-         --     "context",
-         --     "bibtex", "mlbibcontext",
-         --     "curl",
-         --     "gswin64c", "gswin32c", "gs",
-         --     "gm", "graphicmagick", "imagemagick",
-         --     "pdftops",
-         --     "pstoedit",
-         --     "inkscape",
-         --     "woff2_decompress",
-         --     "hb-shape",
-         -- },
-         --
-         -- ["system.librarymode"]       = "list", -- none | list | all
-         -- ["system.librarylist"]       = {
-         --     "mysql",
-         --     "sqlite3",
-         --     "libharfbuzz", "libharfbuzz-0",
-         -- }
+            -- The io modes are similar to the traditional ones. Possible values
+            -- are all, paranoid and restricted.
+
+            ["system.outputmode"]        = "restricted",
+            ["system.inputmode"]         = "any",
+
+            -- The following variable is under consideration. We do have protection
+            -- mechanims but it's not enabled by default.
+
+            ["system.commandmode"]       = "any", -- any none list
+            ["system.commandlist"]       = "mtxrun, convert, inkscape, gs, imagemagick, curl, bibtex, pstoedit",
 
             -- The mplib library support mechanisms have their own
             -- configuration. Normally these variables can be left as
@@ -195,22 +168,13 @@ return {
             -- as they only make sense when testing.
 
          -- ["fonts.autoreload"]         = "no",
+         -- ["fonts.otf.loader.method"]  = "table", -- table mixed sparse
          -- ["fonts.otf.loader.cleanup"] = "0",     -- 0 1 2 3
 
             -- In an edit cycle it can be handy to launch an editor. The
             -- preferred one can be set here.
 
-         -- ["pdfview.method"]           = "sumatra",
-
-         -- ["fonts.usesystemfonts"]     = false,
-
-            -- You can permit loading modules with no prefix:
-
-         -- ["modules.permitunprefixed"] = "no",
-
-            -- You can permit loading files from anywhere in the TDS tree:
-
-         -- ["resolvers.otherwise"]      = "no",
+         -- ["pdfview.method"]           = "okular", -- default (often acrobat) xpdf okular
 
         },
 
@@ -223,6 +187,4 @@ return {
 
     },
 
- -- TEXMFCACHE  = "$SELFAUTOPARENT/texmf-cache", -- for old times sake
-
 }