summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scripts/context/lua/mtx-fonts.lua13
-rw-r--r--scripts/context/lua/mtx-plain.lua45
-rw-r--r--scripts/context/lua/mtxrun.lua8
-rw-r--r--scripts/context/stubs/mswin/mtxrun.lua8
-rw-r--r--scripts/context/stubs/unix/mtxrun8
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4127 -> 4137 bytes
-rw-r--r--tex/context/base/context-version.pngbin40464 -> 40421 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/data-con.lua3
-rw-r--r--tex/context/base/font-pre.mkiv7
-rw-r--r--tex/context/base/status-files.pdfbin24744 -> 24732 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin211486 -> 211422 bytes
-rw-r--r--tex/context/base/typo-cap.mkiv4
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua4
-rw-r--r--web2c/context.cnf116
16 files changed, 129 insertions, 91 deletions
diff --git a/scripts/context/lua/mtx-fonts.lua b/scripts/context/lua/mtx-fonts.lua
index 506556483..d2ce5087a 100644
--- a/scripts/context/lua/mtx-fonts.lua
+++ b/scripts/context/lua/mtx-fonts.lua
@@ -378,6 +378,17 @@ function scripts.fonts.list()
end
+function scripts.fonts.justload()
+ local fullname = environment.files[1]
+ if fullname then
+ local result = fontloader.open(fullname)
+ if type(result) == "table" then
+ report("loading %s: %s","succeeded",fullname)
+ end
+ end
+ report("loading %s: %s","failed",fullname)
+end
+
function scripts.fonts.unpack()
local name = file.removesuffix(file.basename(givenfiles[1] or ""))
if name and name ~= "" then
@@ -447,6 +458,8 @@ elseif getargument("reload") then
scripts.fonts.reload()
elseif getargument("save") then
scripts.fonts.save()
+elseif getargument("justload") then
+ scripts.fonts.justload()
elseif getargument("unpack") then
scripts.fonts.unpack()
elseif getargument("statistics") then
diff --git a/scripts/context/lua/mtx-plain.lua b/scripts/context/lua/mtx-plain.lua
index 918e9de8c..663664bae 100644
--- a/scripts/context/lua/mtx-plain.lua
+++ b/scripts/context/lua/mtx-plain.lua
@@ -17,8 +17,6 @@ if not modules then modules = { } end modules ['mtx-plain'] = {
-- "c:/data/develop/tex-context/tex/texmf/web2c",
-- }
-local format = string.format
-
local helpinfo = [[
<?xml version="1.0"?>
<application>
@@ -52,9 +50,40 @@ local report = application.report
scripts = scripts or { }
scripts.plain = scripts.plain or { }
+local function execute(...)
+ local command = string.format(...)
+ report("running command %a",command)
+ report()
+ os.execute(command)
+ report()
+end
+
+local function resultof(...)
+ local command = string.format(...)
+ report("running command %a",command)
+ return string.strip(os.resultof(command) or "")
+end
+
function scripts.plain.make(texengine,texformat)
- os.execute("mktexlsr") -- better play safe and use this one
- local fmtpathspec = os.resultof(format("kpsewhich --expand-path=$TEXFORMATS --engine=%s",texengine))
+ report("generating kpse file database")
+ execute("mktexlsr") -- better play safe and use this one
+ local fmtpathspec = resultof("kpsewhich --var-value=TEXFORMATS --engine=%s",texengine)
+ if fmtpathspec ~= "" then
+ report("using path specification %a",fmtpathspec)
+ fmtpathspec = resultof('kpsewhich -expand-path="%s"',fmtpathspec)
+ end
+ if fmtpathspec ~= "" then
+ report("using path expansion %a",fmtpathspec)
+ else
+ report("no valid path reported, trying alternative")
+ fmtpathspec = resultof("kpsewhich --show-path=fmt --engine=%s",texengine)
+ if fmtpathspec ~= "" then
+ report("using path expansion %a",fmtpathspec)
+ else
+ report("no valid path reported, falling back to current path")
+ fmtpathspec = "."
+ end
+ end
fmtpathspec = string.splitlines(fmtpathspec)[1] or fmtpathspec
fmtpathspec = file.splitpath(fmtpathspec)
local fmtpath = nil
@@ -69,13 +98,15 @@ function scripts.plain.make(texengine,texformat)
-- message
else
lfs.chdir(fmtpath)
- os.execute(format('%s --ini %s',texengine,file.addsuffix(texformat,"tex")))
- os.execute("mktexlsr")
+ execute('%s --ini %s',texengine,file.addsuffix(texformat,"tex"))
+ report("generating kpse file database")
+ execute("mktexlsr")
end
+ report("format saved on path %a",fmtpath)
end
function scripts.plain.run(texengine,texformat,filename)
- os.execute(format('%s --fmt=%s "%s"',texengine,file.removesuffix(texformat),filename))
+ execute('%s --fmt=%s "%s"',texengine,file.removesuffix(texformat),filename)
end
local texformat = environment.arguments.texformat or environment.arguments.format
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 80489902b..2700b6b9f 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -14575,7 +14575,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["data-con"] = package.loaded["data-con"] or true
--- original size: 4940, stripped down to: 3580
+-- original size: 5012, stripped down to: 3588
if not modules then modules={} end modules ['data-con']={
version=1.100,
@@ -14684,7 +14684,7 @@ function containers.content(container,name)
return container.storage[name]
end
function containers.cleanname(name)
- return (gsub(lower(name),"[^%w%d]+","-"))
+ return (gsub(lower(name),"[^%w\128-\255]+","-"))
end
@@ -15991,8 +15991,8 @@ end -- of closure
-- used libraries : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 667202
--- stripped bytes : 244308
+-- original bytes : 667274
+-- stripped bytes : 244372
-- end library merge
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 80489902b..2700b6b9f 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -14575,7 +14575,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["data-con"] = package.loaded["data-con"] or true
--- original size: 4940, stripped down to: 3580
+-- original size: 5012, stripped down to: 3588
if not modules then modules={} end modules ['data-con']={
version=1.100,
@@ -14684,7 +14684,7 @@ function containers.content(container,name)
return container.storage[name]
end
function containers.cleanname(name)
- return (gsub(lower(name),"[^%w%d]+","-"))
+ return (gsub(lower(name),"[^%w\128-\255]+","-"))
end
@@ -15991,8 +15991,8 @@ end -- of closure
-- used libraries : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 667202
--- stripped bytes : 244308
+-- original bytes : 667274
+-- stripped bytes : 244372
-- end library merge
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 80489902b..2700b6b9f 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -14575,7 +14575,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["data-con"] = package.loaded["data-con"] or true
--- original size: 4940, stripped down to: 3580
+-- original size: 5012, stripped down to: 3588
if not modules then modules={} end modules ['data-con']={
version=1.100,
@@ -14684,7 +14684,7 @@ function containers.content(container,name)
return container.storage[name]
end
function containers.cleanname(name)
- return (gsub(lower(name),"[^%w%d]+","-"))
+ return (gsub(lower(name),"[^%w\128-\255]+","-"))
end
@@ -15991,8 +15991,8 @@ end -- of closure
-- used libraries : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 667202
--- stripped bytes : 244308
+-- original bytes : 667274
+-- stripped bytes : 244372
-- end library merge
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index c3d3b77ea..a127ceefd 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2013.04.27 22:36}
+\newcontextversion{2013.04.28 18:31}
%D This file is loaded at runtime, thereby providing an excellent place for
%D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 920764a0a..63096df22 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 77244b17f..559bcba87 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 05de832ce..f5130a2f6 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2013.04.27 22:36}
+\edef\contextversion{2013.04.28 18:31}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/data-con.lua b/tex/context/base/data-con.lua
index 354c6807d..ef1635714 100644
--- a/tex/context/base/data-con.lua
+++ b/tex/context/base/data-con.lua
@@ -133,5 +133,6 @@ function containers.content(container,name)
end
function containers.cleanname(name)
- return (gsub(lower(name),"[^%w%d]+","-"))
+ -- return (gsub(lower(name),"[^%w]+","-"))
+ return (gsub(lower(name),"[^%w\128-\255]+","-")) -- more utf friendly
end
diff --git a/tex/context/base/font-pre.mkiv b/tex/context/base/font-pre.mkiv
index 74c39722f..bbb06dce1 100644
--- a/tex/context/base/font-pre.mkiv
+++ b/tex/context/base/font-pre.mkiv
@@ -501,8 +501,11 @@
\definefontfeature[f:smallcaps][smcp=yes]
\definefontfeature[f:oldstyle] [onum=yes]
-\definealternativestyle [\v!smallcaps] [\doaddfeature{f:smallcaps}] [\doaddfeature{f:smallcaps}]
-\definealternativestyle [\v!oldstyle] [\doaddfeature{f:oldstyle}] [\doaddfeature{f:oldstyle}]
+\definealternativestyle [\v!smallcaps] [\setsmallcaps] [\setsmallcaps]
+\definealternativestyle [\v!oldstyle] [\setoldstyle ] [\setoldstyle ]
+
+\unexpanded\def\setsmallcaps{\doaddfeature{f:smallcaps}}
+\unexpanded\def\setoldstyle {\doaddfeature{f:oldstyle}}
%D \macros
%D {tinyfont}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index db3a68053..0ca67ef87 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 5c908c9c1..f43f97a10 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/typo-cap.mkiv b/tex/context/base/typo-cap.mkiv
index 25a0ff9ee..d2f1dc0e0 100644
--- a/tex/context/base/typo-cap.mkiv
+++ b/tex/context/base/typo-cap.mkiv
@@ -211,9 +211,9 @@
\appendtoks
\doifelse{\directcapitalsparameter\c!title}\v!yes
{\definealternativestyle[\v!capital ][\font_style_normalsmallcapped][\font_style_normalsmallcapped]%
- \definealternativestyle[\v!smallcaps][\sc][\sc]}
+ \definealternativestyle[\v!smallcaps][\setsmallcaps][\setsmallcaps]}
{\definealternativestyle[\v!capital ][\font_style_normalsmallcapped][\font_style_normalWORD]%
- \definealternativestyle[\v!smallcaps][\sc][\font_style_normalWORD]}%
+ \definealternativestyle[\v!smallcaps][\setsmallcaps][\font_style_normalWORD]}%
\doifelse{\directcapitalsparameter\s!sc}\v!yes
\userealcaps
\usepseudocaps
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 63f1381ae..1d37c791d 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 04/27/13 22:36:05
+-- merge date : 04/28/13 18:31:01
do -- begin closure to overcome local limits and interference
@@ -3217,7 +3217,7 @@ function containers.content(container,name)
return container.storage[name]
end
function containers.cleanname(name)
- return (gsub(lower(name),"[^%w%d]+","-"))
+ return (gsub(lower(name),"[^%w\128-\255]+","-"))
end
end -- closure
diff --git a/web2c/context.cnf b/web2c/context.cnf
index 32c9d6cc0..aad2c51eb 100644
--- a/web2c/context.cnf
+++ b/web2c/context.cnf
@@ -12,38 +12,37 @@ progname = unsetprogname
engine = unsetengine
backend = unsetbackend
+% binaries and formats
+
TEXMFOS = $SELFAUTODIR
-TEXMFSYSTEM = $SELFAUTOPARENT/texmf-$SELFAUTOSYSTEM
+
+% base TeX files & fonts
+
TEXMFMAIN = $SELFAUTOPARENT/texmf
+% ConTeXt
+TEXMFCONTEXT = $SELFAUTOPARENT/texmf-context
+TEXMFMODULES = $SELFAUTOPARENT/texmf-modules
+
+% user additions & modifications - take precedence over distribution files
TEXMFLOCAL = $SELFAUTOPARENT/texmf-local
+
+% optional (by/for Hans)
+
TEXMFFONTS = $SELFAUTOPARENT/texmf-fonts
TEXMFPROJECT = $SELFAUTOPARENT/texmf-project
-TEXMFCONTEXT = $SELFAUTOPARENT/texmf-context
TEXMFCACHE = $SELFAUTOPARENT/texmf-cache
-TEXMFHOME = $HOME/texmf
-
-TEXMFSYSVAR = $TEXMFCACHE
-TEXMFVAR = $TEXMFCACHE
-VARTEXMF = $TEXMFCACHE
-VARTEXFONTS = $TEXMFVAR/varfonts
-HOMETEXMF = $HOME/texmf
-
-TEXMF = {$TEXMFHOME,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFCONTEXT,!!$TEXMFSYSTEM,!!$TEXMFMAIN}
+TEXMFHOME = $HOME/texmf
+TEXMF = {$TEXMFHOME,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFMODULES,!!$TEXMFCONTEXT,!!$TEXMFOS,!!$TEXMFMAIN}
SYSTEXMF = $TEXMF
-TEXMFCNF = .;$TEXMF/texmf{-local,}/web2c
-TEXMFDBS = $TEXMF;$VARTEXFONTS
+TEXMFCNF = .;$TEXMF/web2c
+TEXMFDBS = $TEXMF
% In the case of an multi-os setup, this one can be set
% by the environment. watch out, lowercase engine !
-TEXFORMATS = .;$TEXMF/web2c/{$engine,}
-MFBASES = .;$TEXFORMATS
-MPMEMS = .;$TEXFORMATS
-TEXPOOL = .;$TEXFORMATS
-MFPOOL = .;$TEXFORMATS
-MPPOOL = .;$TEXFORMATS
+TEXFORMATS = .;$TEXMFOS/web2c/{$engine,}
WEB2C = $TEXMF/web2c
@@ -53,61 +52,56 @@ OSFONTDIR =
TEXPSHEADERS = .;$TEXMF/{fonts/{enc,map,type1,truetype},dvips,pdftex,tex}//;$TEXMF/{etex,tex,pdftex,dvips,fonts/type1}//
-TEXFONTMAPS.dvipdfm = .;$TEXMF/fonts/{data,map}/{dvipdfm,dvips,}//
-TEXFONTMAPS.dvipdfmx = .;$TEXMF/fonts/{data,map}/{dvipdfm,pdftex,dvips,}//
+TEXFONTMAPS.dvipdfmx = .;$TEXMF/fonts/{data,map}/{dvipdfmx,pdftex,dvips,}//
TEXFONTMAPS.pdftex = .;$TEXMF/fonts/{data,map}/{pdftex,dvips,}//
-TEXFONTMAPS.pdfetex = .;$TEXMF/fonts/{data,map}/{pdftex,dvips,}//
TEXFONTMAPS.luatex = .;$TEXMF/fonts/{data,map}/{pdftex,dvips,}//
-TEXFONTMAPS.xetex = .;$TEXMF/fonts/{data,map}/{xetex,pdftex,dvips,}//
TEXFONTMAPS.dvips = .;$TEXMF/fonts/{data,map}/{dvips,pdftex,}//
TEXFONTMAPS = .;$TEXMF/fonts/{data,map}/{$progname,$engine,pdftex,dvips,}//;$TEXMF/{$progname,$engine,pdftex,dvips}/{config,}//
-VFFONTS = $TEXMF/fonts/{data,vf}//
-TFMFONTS = $TEXMF/fonts/{data,tfm}//
-T1FONTS = $TEXMF/fonts/{data,type1,pfb}//;$TEXMF/fonts/misc/hbf//;$OSFONTDIR
-AFMFONTS = $TEXMF/fonts/{data,afm}//;$OSFONTDIR
-LIGFONTS = $TEXMF/fonts/lig//
-TTFONTS = $TEXMF/fonts/{data,truetype,ttf}//;$OSFONTDIR
-TTF2TFMINPUTS = $TEXMF/ttf2pk//
-T42FONTS = $TEXMF/fonts/type42//
-MISCFONTS = $TEXMF/fonts/misc//
-% ENCFONTS = $TEXMF/fonts/enc//
-ENCFONTS = $TEXMF/{fonts/{data,enc},dvips,pdftex,dvipdfm}//
-CMAPFONTS = $TEXMF/fonts/cmap//
-SFDFONTS = $TEXMF/fonts/sfd//
-OPENTYPEFONTS = $TEXMF/fonts/{data,opentype}//;$OSFONTDIR
-
-FONTFEATURES = $TEXMF/fonts/fea//;$OPENTYPEFONTS;$TTFONTS;$T1FONTS;$AFMFONTS
-FONTCIDMAPS = $TEXMF/fonts/cid//;$OPENTYPEFONTS;$TTFONTS;$T1FONTS;$AFMFONTS
-
-OFMFONTS = $TEXMF/fonts/{data,ofm,tfm}//
-OPLFONTS = $TEXMF/fonts/{data,opl}//
-OVFFONTS = $TEXMF/fonts/{data,ovf,vf}//
-OVPFONTS = $TEXMF/fonts/{data,ovp}//
-OTPINPUTS = $TEXMF/omega/otp//
-OCPINPUTS = $TEXMF/omega/ocp//
-OTFFONTS = $TEXMF/fonts/otf/{data,xetex,}//;$OSFONTDIR
+VFFONTS = .;$TEXMF/fonts/{data,vf}//
+TFMFONTS = .;$TEXMF/fonts/{data,tfm}//
+T1FONTS = .;$TEXMF/fonts/{data,type1,pfb}//;$TEXMF/fonts/misc/hbf//;$OSFONTDIR
+AFMFONTS = .;$TEXMF/fonts/{data,afm}//;$OSFONTDIR
+LIGFONTS = .;$TEXMF/fonts/lig//
+TTFONTS = .;$TEXMF/fonts/{data,truetype,ttf}//;$OSFONTDIR
+TTF2TFMINPUTS = .;$TEXMF/ttf2pk//
+T42FONTS = .;$TEXMF/fonts/type42//
+MISCFONTS = .;$TEXMF/fonts/misc//
+% ENCFONTS = .;$TEXMF/fonts/enc//
+ENCFONTS = .;$TEXMF/{fonts/{data,enc},dvips,pdftex,dvipdfm}//
+CMAPFONTS = .;$TEXMF/fonts/cmap//
+SFDFONTS = .;$TEXMF/fonts/sfd//
+OPENTYPEFONTS = .;$TEXMF/fonts/{data,opentype}//;$OSFONTDIR
+
+FONTFEATURES = .;$TEXMF/fonts/fea//;$OPENTYPEFONTS;$TTFONTS;$T1FONTS;$AFMFONTS
+FONTCIDMAPS = .;$TEXMF/fonts/cid//;$OPENTYPEFONTS;$TTFONTS;$T1FONTS;$AFMFONTS
+
+OFMFONTS = .;$TEXMF/fonts/{data,ofm,tfm}//
+OPLFONTS = .;$TEXMF/fonts/{data,opl}//
+OVFFONTS = .;$TEXMF/fonts/{data,ovf,vf}//
+OVPFONTS = .;$TEXMF/fonts/{data,ovp}//
+OTPINPUTS = .;$TEXMF/omega/otp//
+OCPINPUTS = .;$TEXMF/omega/ocp//
+OTFFONTS = .;$TEXMF/fonts/otf/{data,xetex,}//;$OSFONTDIR
% configurations
TEXINPUTS = .;$TEXMF/tex/{$progname,plain,generic,}//
TEXINPUTS.context = .;$TEXMF/tex/{context,plain/base,generic}//
MPINPUTS = .;$TEXMF/metapost/{context,base,}//
-MFINPUTS = .;$TEXMF/metafont/{context,base,}//;$TEXMF/fonts/source//
BSTINPUTS = .;$TEXMF/bibtex/bst//
BIBINPUTS = .;$TEXMF/bibtex/bib//
-TEXCONFIG = $TEXMF/{fonts/map,dvips,pdftex,dvipdfmx,dvipdfm}//
-PDFTEXCONFIG = $TEXMF/pdftex/{$progname,}//
-DVIPDFMINPUTS = $TEXMF/{fonts/{map,enc,lig}/dvipdfm,fonts/type1,dvips,pdftex,dvipdfmx,dvipdfm}//
+TEXCONFIG = .;$TEXMF/{fonts/map,dvips,pdftex,dvipdfmx,dvipdfm}//
+PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}//
+DVIPDFMINPUTS = .;$TEXMF/{fonts/{map,enc,lig}/dvipdfm,fonts/type1,dvips,pdftex,dvipdfmx,dvipdfm}//
% some old paths; we restrict the search to context paths; new ones as well as old ones
PERLINPUTS = .;$TEXMF/scripts/context/perl
PYTHONINPUTS = .;$TEXMF/scripts/context/python
RUBYINPUTS = .;$TEXMF/scripts/context/ruby
-% LUAINPUTS = .;$TEXMF/scripts/context/lua
JAVAINPUTS = .;$TEXMF/scripts/context/java
LUAINPUTS = .;$TEXINPUTS;$TEXMF/scripts/context/lua//
@@ -166,7 +160,7 @@ trie_size = 500000
hyph_size = 8191
expand_depth = 10000
-buf_size.context = 1000000 % needed for omega bug
+buf_size.context = 4000000
extra_mem_bot.context = 2000000
extra_mem_top.context = 4000000
font_max.context = 5000
@@ -224,16 +218,12 @@ max_print_line.metafun = 255
extra_mem_top.mptopdf = 1000000
extra_mem_bot.mptopdf = 1000000
-% ocp_buf_size = 500000
-% ocp_stack_size = 10000
-% ocp_list_size = 1000
-
-ocp_buf_size = 1
-ocp_stack_size = 1
-ocp_list_size = 1
+ocp_buf_size = 500000
+ocp_stack_size = 10000
+ocp_list_size = 1000
% Just for xetex:
FONTCONFIG_FILE = fonts.conf
-FONTCONFIG_PATH = $TEXMFSYSTEM/fonts/conf
-FC_CACHEDIR = $TEXMFSYSTEM/fonts/cache
+FONTCONFIG_PATH = $TEXMFOS/fonts/conf
+FC_CACHEDIR = $TEXMFOS/fonts/cache
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 13:26:16 +0000