summaryrefslogtreecommitdiff
path: root/web2c
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2011-06-08 19:06:00 +0200
committerHans Hagen <pragma@wxs.nl>2011-06-08 19:06:00 +0200
commit701a932650f685309ced993cf464f9a5fcf4caa1 (patch)
treebd862fd0de7fa450bba2c658a7a51f769d96a442 /web2c
parent819217701ac4baf8b6099c8f8475ae22597454d4 (diff)
downloadcontext-701a932650f685309ced993cf464f9a5fcf4caa1.tar.gz
beta 2011.06.08 19:06
Diffstat (limited to 'web2c')
-rw-r--r--web2c/contextcnf.lua58
-rw-r--r--web2c/natural.tcx181
-rw-r--r--web2c/texlive2011cnf.lua40
3 files changed, 71 insertions, 208 deletions
diff --git a/web2c/contextcnf.lua b/web2c/contextcnf.lua
index e3f857878..b89b7d34d 100644
--- a/web2c/contextcnf.lua
+++ b/web2c/contextcnf.lua
@@ -1,9 +1,9 @@
return {
type = "configuration",
- version = "1.1.0",
- date = "2011-09-02", -- or so
- time = "12:12:12",
+ version = "1.1.1",
+ date = "2011-06-02",
+ time = "14:59:00",
comment = "ConTeXt MkIV configuration file",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
@@ -19,23 +19,30 @@ return {
variables = {
-- The following variable is predefined (but can be overloaded) and in
- -- most cases you can leve this one untouched. The built-in definition
+ -- most cases you can leave this one untouched. The built-in definition
-- permits relocation of the tree.
--
- -- TEXMFCNF = "{selfautodir:,selfautoparent:}{,{/share,}/texmf{-local,}/web2c}"
+ -- 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
--
- -- more readable than "selfautoparent:{/texmf{-local,}{,/web2c},}}" is:
+ -- more readable is:
--
-- TEXMFCNF = {
- -- "selfautoparent:/texmf-local",
- -- "selfautoparent:/texmf-local/web2c",
- -- "selfautoparent:/texmf",
- -- "selfautoparent:/texmf/web2c",
- -- "selfautoparent:",
+ -- "home:texmf/web2c,
+ -- "selfautoparent:texmf-local/web2c",
+ -- "selfautoparent:texmf-context/web2c",
+ -- "selfautoparent:texmf/web2c",
-- }
-- 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.
TEXMFCACHE = "$SELFAUTOPARENT/texmf-cache",
@@ -67,32 +74,31 @@ return {
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}//;$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
@@ -102,7 +108,6 @@ return {
FONTCONFIG_FILE = "fonts.conf",
FONTCONFIG_PATH = "$TEXMFSYSTEM/fonts/conf",
- FC_CACHEDIR = "$TEXMFSYSTEM/fonts/cache", -- not needed
},
@@ -155,7 +160,6 @@ 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
@@ -174,6 +178,6 @@ return {
},
- TEXMFCACHE = "$SELFAUTOPARENT/texmf-cache", -- for old times sake
+ -- TEXMFCACHE = "$SELFAUTOPARENT/texmf-cache", -- for old times sake
}
diff --git a/web2c/natural.tcx b/web2c/natural.tcx
deleted file mode 100644
index 2457df240..000000000
--- a/web2c/natural.tcx
+++ /dev/null
@@ -1,181 +0,0 @@
-% natural.tcx -- 27/02/2004 - Hartmut Henkel & Hans Hagen
-%
-% Usage - command line:
-%
-% pdfetex --translate-file=natural.tcx
-%
-% Usage - first line of any file
-%
-% %& --translate-file=natural.tcx
-%
-% Usage - first line of ConTeXt file
-%
-% % translate=natural.tcx
-%
-% Usage - texexec
-%
-% --translate=natural.tcx
-
-0x00 0x00
-0x01 0x01
-0x02 0x02
-0x03 0x03
-0x04 0x04
-0x05 0x05
-0x06 0x06
-0x07 0x07
-0x08 0x08
-0x09 0x09
-0x0a 0x0a
-0x0b 0x0b
-0x0c 0x0c
-0x0d 0x0d
-0x0e 0x0e
-0x0f 0x0f
-0x10 0x10
-0x11 0x11
-0x12 0x12
-0x13 0x13
-0x14 0x14
-0x15 0x15
-0x16 0x16
-0x17 0x17
-0x18 0x18
-0x19 0x19
-0x1a 0x1a
-0x1b 0x1b
-0x1c 0x1c
-0x1d 0x1d
-0x1e 0x1e
-0x1f 0x1f
-
-% 0x20 -- 0x7F are natural anyway, but we may add them some day
-
-0x80 0x80
-0x81 0x81
-0x82 0x82
-0x83 0x83
-0x84 0x84
-0x85 0x85
-0x86 0x86
-0x87 0x87
-0x88 0x88
-0x89 0x89
-0x8a 0x8a
-0x8b 0x8b
-0x8c 0x8c
-0x8d 0x8d
-0x8e 0x8e
-0x8f 0x8f
-0x90 0x90
-0x91 0x91
-0x92 0x92
-0x93 0x93
-0x94 0x94
-0x95 0x95
-0x96 0x96
-0x97 0x97
-0x98 0x98
-0x99 0x99
-0x9a 0x9a
-0x9b 0x9b
-0x9c 0x9c
-0x9d 0x9d
-0x9e 0x9e
-0x9f 0x9f
-0xa0 0xa0
-0xa1 0xa1
-0xa2 0xa2
-0xa3 0xa3
-0xa4 0xa4
-0xa5 0xa5
-0xa6 0xa6
-0xa7 0xa7
-0xa8 0xa8
-0xa9 0xa9
-0xaa 0xaa
-0xab 0xab
-0xac 0xac
-0xad 0xad
-0xae 0xae
-0xaf 0xaf
-0xb0 0xb0
-0xb1 0xb1
-0xb2 0xb2
-0xb3 0xb3
-0xb4 0xb4
-0xb5 0xb5
-0xb6 0xb6
-0xb7 0xb7
-0xb8 0xb8
-0xb9 0xb9
-0xba 0xba
-0xbb 0xbb
-0xbc 0xbc
-0xbd 0xbd
-0xbe 0xbe
-0xbf 0xbf
-0xc0 0xc0
-0xc1 0xc1
-0xc2 0xc2
-0xc3 0xc3
-0xc4 0xc4
-0xc5 0xc5
-0xc6 0xc6
-0xc7 0xc7
-0xc8 0xc8
-0xc9 0xc9
-0xca 0xca
-0xcb 0xcb
-0xcc 0xcc
-0xcd 0xcd
-0xce 0xce
-0xcf 0xcf
-0xd0 0xd0
-0xd1 0xd1
-0xd2 0xd2
-0xd3 0xd3
-0xd4 0xd4
-0xd5 0xd5
-0xd6 0xd6
-0xd7 0xd7
-0xd8 0xd8
-0xd9 0xd9
-0xda 0xda
-0xdb 0xdb
-0xdc 0xdc
-0xdd 0xdd
-0xde 0xde
-0xdf 0xdf
-0xe0 0xe0
-0xe1 0xe1
-0xe2 0xe2
-0xe3 0xe3
-0xe4 0xe4
-0xe5 0xe5
-0xe6 0xe6
-0xe7 0xe7
-0xe8 0xe8
-0xe9 0xe9
-0xea 0xea
-0xeb 0xeb
-0xec 0xec
-0xed 0xed
-0xee 0xee
-0xef 0xef
-0xf0 0xf0
-0xf1 0xf1
-0xf2 0xf2
-0xf3 0xf3
-0xf4 0xf4
-0xf5 0xf5
-0xf6 0xf6
-0xf7 0xf7
-0xf8 0xf8
-0xf9 0xf9
-0xfa 0xfa
-0xfb 0xfb
-0xfc 0xfc
-0xfd 0xfd
-0xfe 0xfe
-0xff 0xff
diff --git a/web2c/texlive2011cnf.lua b/web2c/texlive2011cnf.lua
new file mode 100644
index 000000000..f11e45731
--- /dev/null
+++ b/web2c/texlive2011cnf.lua
@@ -0,0 +1,40 @@
+return {
+
+ type = "configuration",
+ version = "1.1.1",
+ date = "2011-06-02",
+ time = "14:59:00",
+ comment = "TeX Live differences",
+
+ parent = "contextcnf.lua",
+
+ content = {
+
+ -- Keep in mind that MkIV is is relatively new and there is zero change that
+ -- (configuration) files will be found on older obsolete locations.
+
+ variables = {
+
+ -- This needs testing and if it works, then we can remove the texmflocal setting later on
+ --
+ -- TEXMFCNF = "{selfautodir:{/share,}/texmf-local/web2c,selfautoparent:{/share,}/texmf{-local,}/web2c}",
+
+ TEXMFCACHE = "selfautoparent:texmf-var;~/.texlive2011/texmf-cache",
+ TEXMFCONFIG = "~/.texlive2011/texmf-config",
+
+ TEXMFSYSTEM = "selfautoparent:$SELFAUTOSYSTEM",
+ TEXMFCONTEXT = "selfautoparent:texmf-dist",
+
+ TEXMFLOCAL = string.gsub(resolvers.prefixes.selfautoparent(),"20%d%d$","texmf-local"),
+
+ TEXMFSYSCONFIG = "selfautoparent:texmf-config",
+
+ TEXMFSYSVAR = "selfautoparent:texmf-var",
+
+ TEXMF = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFCONTEXT,!!$TEXMFSYSTEM,!!$TEXMFMAIN}",
+
+ FONTCONFIG_PATH = "$TEXMFSYSVAR/fonts/conf",
+
+ },
+ },
+}