new version of texmfcnf.lua following discussions with Mojca and Hans

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

1 files changed, 30 insertions, 19 deletions

diff --git a/Master/texmf/web2c/texmfcnf.lua b/Master/texmf/web2c/texmfcnf.lua
index 3f5aaa513ff..5b8bfbcec34 100644
--- a/Master/texmf/web2c/texmfcnf.lua
+++ b/Master/texmf/web2c/texmfcnf.lua
@@ -1,8 +1,16 @@
+-- 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.0",
-    date    = "2011-09-02", -- or so
+    date    = "2011-06-02", -- or so
     time    = "12:12:12",
     comment = "ConTeXt MkIV configuration file",
     author  = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
@@ -38,6 +46,7 @@ return {
             -- will be chose but there can be more readable paths.
 
             TEXMFCACHE      = "~/.texlive2011/texmf-cache",
+            TEXMFCONFIG     = "~/.texlive2011/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
@@ -51,48 +60,53 @@ return {
             TEXMFSYSTEM     = "selfautoparent:$SELFAUTOSYSTEM",
             TEXMFMAIN       = "selfautoparent:texmf",
             TEXMFCONTEXT    = "selfautoparent:texmf-dist",
-            TEXMFLOCAL      = "selfautoparent:/../texmf-local",
+
+            TEXMFLOCAL      = texmflocal,
+            TEXMFSYSCONFIG  = "selfautoparent:texmf-config",
             TEXMFFONTS      = "selfautoparent:texmf-fonts",
             TEXMFPROJECT    = "selfautoparent:texmf-project",
 
             TEXMFHOME       = "home:texmf",
          -- TEXMFHOME       = os.name == "macosx" and "home:Library/texmf" or "home:texmf",
 
+            -- only used for FONTCONFIG_PATH in TeX Live
+            TEXMFSYSVAR     = "selfautoparent:texmf-var",
+
             -- 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,!!$TEXMFMAIN}",
+            TEXMF           = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFCONTEXT,!!$TEXMFSYSTEM,!!$TEXMFMAIN}",
 
             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}//",
-            T1FONTS         = ".;$TEXMF/fonts/{data,type1,pfb}//;$OSFONTDIR",
+            T1FONTS         = ".;$TEXMF/fonts/{data,type1}//;$OSFONTDIR",
             AFMFONTS        = ".;$TEXMF/fonts/{data,afm}//;$OSFONTDIR",
-            TTFONTS         = ".;$TEXMF/fonts/{data,truetype,ttf}//;$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,cmap}//;$OPENTYPEFONTS;$TTFONTS;$T1FONTS;$AFMFONTS",
+            FONTCIDMAPS     = ".;$TEXMF/fonts/{data,cid}//",
             OFMFONTS        = ".;$TEXMF/fonts/{data,ofm,tfm}//",
             OVFFONTS        = ".;$TEXMF/fonts/{data,ovf,vf}//",
 
-            TEXINPUTS       = ".;{$CTXDEVTXPATH};$TEXMF/tex/{context,plain/base,generic}//",
-            MPINPUTS        = ".;{$CTXDEVMPPATH};$TEXMF/metapost/{context,base,}//",
+            TEXINPUTS       = ".;$TEXMF/tex/{context,plain/base,generic}//",
+            MPINPUTS        = ".;$TEXMF/metapost/{context,base,}//",
 
             -- In the next variable the inputs path will go away.
 
-            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//",
+            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//",
             CLUAINPUTS      = ".;$SELFAUTOLOC/lib/{context,luatex,}/lua//",
 
             -- Not really used by MkIV so they might go away.
 
-            BIBINPUTS       = ".;{$CTXDEVTXPATH};$TEXMF/bibtex/bib//",
-            BSTINPUTS       = ".;{$CTXDEVTXPATH};$TEXMF/bibtex/bst//",
+            BIBINPUTS       = ".;$TEXMF/bibtex/bib//",
+            BSTINPUTS       = ".;$TEXMF/bibtex/bst//",
 
             -- Experimental
 
@@ -101,8 +115,7 @@ return {
             -- A few special ones that will change some day.
 
             FONTCONFIG_FILE = "fonts.conf",
-            FONTCONFIG_PATH = "$TEXMFSYSTEM/fonts/conf",
-            FC_CACHEDIR     = "$TEXMFSYSTEM/fonts/cache", -- not needed
+            FONTCONFIG_PATH = "$TEXMFSYSVAR/fonts/conf",
 
         },
 
@@ -174,6 +187,4 @@ return {
 
     },
 
-    TEXMFCACHE      = "~/.texlive2011/texmf-cache", -- for old times sake
-
 }