context update

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

1 files changed, 60 insertions, 51 deletions

diff --git a/Master/texmf/web2c/context.cnf b/Master/texmf/web2c/context.cnf
index c96630c10f7..0d273a75459 100644
--- a/Master/texmf/web2c/context.cnf
+++ b/Master/texmf/web2c/context.cnf
@@ -16,12 +16,14 @@ TEXMFMAIN     = $SELFAUTOPARENT/texmf
 TEXMFLOCAL    = $SELFAUTOPARENT/texmf-local
 TEXMFFONTS    = $SELFAUTOPARENT/texmf-fonts
 TEXMFEXTRA    = $SELFAUTOPARENT/texmf-extra
-TEXMFPROJECTS = $SELFAUTOPARENT/texmf-projects
+TEXMFPROJECT  = $SELFAUTOPARENT/texmf-project
 VARTEXMF      = $SELFAUTOPARENT/texmf-var
 HOMETEXMF     = /nonexist
 TEXMF         = {!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFEXTRA,!!$TEXMFMAIN}
 SYSTEXMF      = $TEXMF
 
+TEXMFCACHE    = $TMP;$TEMP;$TMPDIR;$TEMPDIR;$HOME;$TEXMFVAR;$VARTEXMF;.
+
 TEXMFCNF      = .;$TEXMF/texmf{-local,}/web2c
 TEXMFDBS      = $TEXMF;$VARTEXFONTS
 
@@ -43,40 +45,41 @@ WEB2C         = $TEXMF/web2c
 
 OSFONTDIR =
 
-TEXPSHEADERS  = .;$TEXMF/{fonts/{enc,map,type1,truetype},dvips,pdftex,tex}//;$TEXMF/{etex,tex,pdftex,dvips,fonts/type1}//
+TEXPSHEADERS  = .;$TEXMF/{fonts/{enc,map,type1,truetype},dvips,pdftex,tex}//;$TEXMF/{etex,tex,pdftex,dvips,fonts/type1}//;./fonts//
 
-TEXFONTMAPS.dvipdfm  = .;$TEXMF/fonts/map/{dvipdfm,dvips,}//
-TEXFONTMAPS.dvipdfmx = .;$TEXMF/fonts/map/{dvipdfm,dvips,}//
-TEXFONTMAPS.pdftex   = .;$TEXMF/fonts/map/{pdftex,dvips,}//
-TEXFONTMAPS.pdfetex  = .;$TEXMF/fonts/map/{pdftex,dvips,}//
-TEXFONTMAPS.xetex    = .;$TEXMF/fonts/map/{xetex,pdftex,dvips,}//
-TEXFONTMAPS.dvips    = .;$TEXMF/fonts/map/{dvips,pdftex,}//
+TEXFONTMAPS.dvipdfm  = .;$TEXMF/fonts/map/{dvipdfm,dvips,}//;./fonts//
+TEXFONTMAPS.dvipdfmx = .;$TEXMF/fonts/map/{dvipdfm,dvips,}//;./fonts//
+TEXFONTMAPS.pdftex   = .;$TEXMF/fonts/map/{pdftex,dvips,}//;./fonts//
+TEXFONTMAPS.pdfetex  = .;$TEXMF/fonts/map/{pdftex,dvips,}//;./fonts//
+TEXFONTMAPS.luatex   = .;$TEXMF/fonts/map/{pdftex,dvips,}//;./fonts//
+TEXFONTMAPS.xetex    = .;$TEXMF/fonts/map/{xetex,pdftex,dvips,}//;./fonts//
+TEXFONTMAPS.dvips    = .;$TEXMF/fonts/map/{dvips,pdftex,}//;./fonts//
 
 # TEXFONTMAPS = .;$TEXMF/fonts/map/{$backend,pdftex,dvips,}//;$TEXMF/{$progname,pdftex,dvips}/{config,}//
-TEXFONTMAPS   = .;$TEXMF/fonts/map/{$progname,pdftex,dvips,}//;$TEXMF/{$progname,pdftex,dvips}/{config,}//
-
-VFFONTS       = .;$TEXMF/fonts/vf//
-TFMFONTS      = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm//
-T1FONTS       = .;$TEXMF/fonts/{type1,pfb}//;$TEXMF/fonts/misc/hbf//;$OSFONTDIR
-AFMFONTS      = .;$TEXMF/fonts/afm//;$OSFONTDIR
-LIGFONTS      = .;$TEXMF/fonts/lig//
-TTFONTS       = .;$TEXMF/fonts/{truetype,ttf}//;$OSFONTDIR
-TTF2TFMINPUTS = .;$TEXMF/ttf2pk//
-T42FONTS      = .;$TEXMF/fonts/type42//
-MISCFONTS     = .;$TEXMF/fonts/misc//
-% ENCFONTS    = .;$TEXMF/fonts/enc//
-ENCFONTS      = .;$TEXMF/{fonts/enc,dvips,pdftex,dvipdfm}//
-CMAPFONTS     = .;$TEXMF/fonts/cmap//
-SFDFONTS      = .;$TEXMF/fonts/sfd//
-OPENTYPEFONTS = .;$TEXMF/fonts/opentype//;$OSFONTDIR
-
-OFMFONTS      = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}//;$TFMFONTS
-OPLFONTS      = .;{$TEXMF/fonts,$VARTEXFONTS}/opl//
-OVFFONTS      = .;{$TEXMF/fonts,$VARTEXFONTS}/ovf//
-OVPFONTS      = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp//
+TEXFONTMAPS   = .;$TEXMF/fonts/map/{$progname,$engine,pdftex,dvips,}//;$TEXMF/{$progname,$engine,pdftex,dvips}/{config,}//;./fonts//
+
+VFFONTS       = .;$TEXMF/fonts/vf//;./fonts//
+TFMFONTS      = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm//;./fonts//
+T1FONTS       = .;$TEXMF/fonts/{type1,pfb}//;$TEXMF/fonts/misc/hbf//;$OSFONTDIR;./fonts//
+AFMFONTS      = .;$TEXMF/fonts/afm//;$OSFONTDIR;./fonts//
+LIGFONTS      = .;$TEXMF/fonts/lig//;./fonts//
+TTFONTS       = .;$TEXMF/fonts/{truetype,ttf}//;$OSFONTDIR;./fonts//
+TTF2TFMINPUTS = .;$TEXMF/ttf2pk//;./fonts//
+T42FONTS      = .;$TEXMF/fonts/type42//;./fonts//
+MISCFONTS     = .;$TEXMF/fonts/misc//;./fonts//
+% ENCFONTS    = .;$TEXMF/fonts/enc//;./fonts//
+ENCFONTS      = .;$TEXMF/{fonts/enc,dvips,pdftex,dvipdfm}//;./fonts//
+CMAPFONTS     = .;$TEXMF/fonts/cmap//;./fonts//
+SFDFONTS      = .;$TEXMF/fonts/sfd//;./fonts//
+OPENTYPEFONTS = .;$TEXMF/fonts/opentype//;$OSFONTDIR;./fonts//
+
+OFMFONTS      = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}//;$TFMFONTS;./fonts//
+OPLFONTS      = .;{$TEXMF/fonts,$VARTEXFONTS}/opl//;./fonts//
+OVFFONTS      = .;{$TEXMF/fonts,$VARTEXFONTS}/ovf//;./fonts//
+OVPFONTS      = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp//;./fonts//
 OTPINPUTS     = .;$TEXMF/omega/otp//
 OCPINPUTS     = .;$TEXMF/omega/ocp//
-OTFFONTS      = .;$TEXMF/fonts/otf/{xetex,}//
+OTFFONTS      = .;$TEXMF/fonts/otf/{xetex,}//;./fonts//
 
 % configurations
 
@@ -92,9 +95,12 @@ CTXDEVTXPATH=rubish
 CTXDEVMPPATH=rubish
 CTXDEVMFPATH=rubish
 
-TEXINPUTS.context = .;{$TXRESOURCES}//;{$CTXDEVTXPATH}//;$TEXMF/{pdftex,pdfetex,etex,xetex,omega,tex}/{context,plain,generic,}//
-MPINPUTS          = .;{$MFRESOURCES}//;{$CTXDEVMPPATH}//;$TEXMF/metapost/{context,base,}//
-MFINPUTS          = .;{$MPRESOURCES}//;{$CTXDEVMFPATH}//;$TEXMF/metafont/{context,base,}//;{$TEXMF/fonts,$VARTEXFONTS}/source//
+% TEXINPUTS.context = .;{$TXRESOURCES}//;{$CTXDEVTXPATH};$TEXMF/{pdftex,pdfetex,etex,xetex,omega,tex}/{context,plain,generic,}//
+% TEXINPUTS.context = .;{$TXRESOURCES}//;{$CTXDEVTXPATH};$TEXMF/{tex,omega}/{context,plain,generic}//
+% TEXINPUTS.context = .;{$TXRESOURCES}//;{$CTXDEVTXPATH};$TEXMF/tex/{context,plain/base,generic/context,generic/hyphen,generic/omega}//
+TEXINPUTS.context = .;{$TXRESOURCES}//;{$CTXDEVTXPATH};$TEXMF/tex/{context,plain/base,generic}//
+MPINPUTS          = .;{$MFRESOURCES}//;{$CTXDEVMPPATH};$TEXMF/metapost/{context,base,}//
+MFINPUTS          = .;{$MPRESOURCES}//;{$CTXDEVMFPATH};$TEXMF/metafont/{context,base,}//;{$TEXMF/fonts,$VARTEXFONTS}/source//
 
 TEXCONFIG     = .;$TEXMF/{fonts/map,dvips,pdftex,dvipdfmx,dvipdfm}//
 PDFTEXCONFIG  = .;$TEXMF/pdftex/{$progname,}//
@@ -109,21 +115,21 @@ CTXDEVJVPATH=rubish
 
 % some old paths; we restrict the search to context paths; new ones as well as old ones
 
-PERLINPUTS   = .;$CTXDEVPLPATH//;$TEXMF/scripts/context/perl//;$TEXMF/{context/perl,context/perltk,perl,perltk}//
-PYTHONINPUTS = .;$CTXDEVPYPATH//;$TEXMF/scripts/context/python//;$TEXMF/{context/python,python}//
-RUBYINPUTS   = .;$CTXDEVRBPATH//;$TEXMF/scripts/context/ruby//;$TEXMF/{context/ruby,ruby}//
-LUAINPUTS    = .;$CTXDEVJVPATH//;$TEXMF/scripts/context/lua//;$TEXMF/{context/lua,lua}//
-JAVAINPUTS   = .;$CTXDEVJVPATH//;$TEXMF/scripts/context/java//;$TEXMF/{context/java,java}//
+PERLINPUTS   = .;$CTXDEVPLPATH;$TEXMF/scripts/context/perl
+PYTHONINPUTS = .;$CTXDEVPYPATH;$TEXMF/scripts/context/python
+RUBYINPUTS   = .;$CTXDEVRBPATH;$TEXMF/scripts/context/ruby
+LUAINPUTS    = .;$CTXDEVJVPATH;$TEXMF/scripts/context/lua
+JAVAINPUTS   = .;$CTXDEVJVPATH;$TEXMF/scripts/context/java
 
-TEXMFSCRIPTS = .;$CTXDEVRBPATH//;$CTXDEVLUPATH//;$CTXDEVPLPATH//;$TEXMF/scripts/context//;$TEXMF/scripts//
+TEXMFSCRIPTS = .;$CTXDEVRBPATH;$CTXDEVLUPATH;$CTXDEVPLPATH;$TEXMF/scripts/context
 
-% RUBYINPUTS   = .;$CTXDEVPLPATH//;$TEXMF/scripts/{$progname,$engine,}/ruby//;$TEXMF/{context/ruby,ruby}//
-% LUAINPUTS    = .;$CTXDEVPYPATH//;$TEXMF/scripts/{$progname,$engine,}/lua//;$TEXMF/{context/lua,lua}//
-% PYTHONINPUTS = .;$CTXDEVRBPATH//;$TEXMF/scripts/{$progname,$engine,}/python//;$TEXMF/{context/python,python}//
-% PERLINPUTS   = .;$CTXDEVJVPATH//;$TEXMF/scripts/{$progname,$engine,}/perl//;$TEXMF/{context/perl,context/perltk,perl,perltk}//
-% JAVAINPUTS   = .;$CTXDEVJVPATH//;$TEXMF/scripts/{$progname,$engine,}/java//;$TEXMF/{context/java,java}//
+% RUBYINPUTS   = .;$CTXDEVPLPATH;$TEXMF/scripts/{$progname,$engine,}/ruby
+% LUAINPUTS    = .;$CTXDEVPYPATH;$TEXMF/scripts/{$progname,$engine,}/lua
+% PYTHONINPUTS = .;$CTXDEVRBPATH;$TEXMF/scripts/{$progname,$engine,}/python
+% PERLINPUTS   = .;$CTXDEVJVPATH;$TEXMF/scripts/{$progname,$engine,}/perl
+% JAVAINPUTS   = .;$CTXDEVJVPATH;$TEXMF/scripts/{$progname,$engine,}/java
 
-% TEXMFSCRIPTS = .;$CTXDEVRBPATH//;$CTXDEVLUPATH//;$CTXDEVPLPATH//;$TEXMF/scripts/{$engine,$progname,}//
+% TEXMFSCRIPTS = .;$CTXDEVRBPATH;$CTXDEVLUPATH;$CTXDEVPLPATH;$TEXMF/scripts/$progname
 
 % features
 
@@ -151,18 +157,18 @@ TEX        = texexec --batch --once --nomp
 % These values are about the same as in the main
 % configuration file (dest_names_size added).
 
-buf_size.context         =  200000 % needed for omega bug
+buf_size.context         = 2000000 % needed for omega bug
 extra_mem_bot.context    = 2000000
 extra_mem_top.context    = 4000000
 font_max.context         =    2000
 font_mem_size.context    = 1000000
-hash_extra.context       =   75000
+hash_extra.context       =  100000
 main_memory.context      = 2000000
-max_strings.context      =  250000
+max_strings.context      =  300000
 nest_size.context        =     500
-obj_tab_size.context     =  300000 % 8388607
-pdf_mem_size.context     =  500000 % 524288
-dest_names_size.context  =  300000 % 131072
+obj_tab_size.context     =  300000
+pdf_mem_size.context     =  500000
+dest_names_size.context  =  300000
 param_size.context       =   10000
 pool_free.context        =   47500
 pool_size.context        = 2000000
@@ -198,6 +204,8 @@ mp_buf_size              =   30000
 mf_buf_size              =   30000
 mpost_buf_size           =   30000
 
+max_print_line.pdftex    =     250
+max_print_line.luatex    =     250
 max_print_line.mpost     =     250
 max_print_line.metafun   =     250
 
@@ -207,3 +215,4 @@ extra_mem_bot.mptopdf    = 1000000
 ocp_buf_size             =  500000
 ocp_stack_size           =   10000
 ocp_list_size            =    1000
+