diff options
author | Karl Berry <karl@freefriends.org> | 2010-01-11 18:56:11 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-01-11 18:56:11 +0000 |
commit | 74f307ed842839ce794611cde308b787becdf74e (patch) | |
tree | 196b3b0eebdf4a519f5a96eddabad5ac197581bd | |
parent | 3a7e27adc553f5e0ccf8206fff4e757bf3cdf062 (diff) |
add kpse_clua_format type, from Taco and Akira
git-svn-id: svn://tug.org/texlive/trunk@16676 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 10 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/tex-file.c | 9 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/texmf.cnf | 3 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/types.h | 7 |
4 files changed, 25 insertions, 4 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 324f5b01c7b..8493dc1299e 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,13 @@ +2010-01-11 Taco Hoekwater <taco@metapost.org> + + * types.h (kpse_clua_format): new type. + (kpse_def, kpse_def_inst): need KPSEDLL (from Akira). + * tex-file.c (CLUA_ENVS): new define. + (kpse_init_format): initialize it. + * texmf.cnf (CLUAINPUTS): new definition. + This implies using, e.g., bin/i386-linux/lib/luatex/lua/*.so + in TL. + 2010-01-05 Peter Breitenlohner <peb@mppmu.mpg.de> * tex-file.c: Add alt_suffix ".pl" for kpse_opl_format and diff --git a/Build/source/texk/kpathsea/tex-file.c b/Build/source/texk/kpathsea/tex-file.c index d0d0edd8901..75cc017d9ad 100644 --- a/Build/source/texk/kpathsea/tex-file.c +++ b/Build/source/texk/kpathsea/tex-file.c @@ -1,6 +1,6 @@ /* tex-file.c: high-level file searching by format. - Copyright 1993, 1994, 1995, 1996, 1997, 2007, 2008, 2009 Karl Berry. + Copyright 1993, 1994, 1995, 1996, 1997, 2007, 2008, 2009, 2010 Karl Berry. Copyright 1998-2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -86,6 +86,7 @@ #define LIG_ENVS "LIGFONTS", "TEXFONTS" #define TEXMFSCRIPTS_ENVS "TEXMFSCRIPTS" #define LUA_ENVS "LUAINPUTS" +#define CLUA_ENVS "CLUAINPUTS" #define FONTFEATURES_ENVS "FONTFEATURES" #define FONTCIDMAPS_ENVS "FONTCIDMAPS" #define MLBIB_ENVS "MLBIBINPUTS", BIB_ENVS @@ -780,6 +781,12 @@ kpathsea_init_format (kpathsea kpse, kpse_file_format_type format) SUFFIXES (MLBST_SUFFIXES); FMT_INFO.suffix_search_only = true; break; + case kpse_clua_format: + INIT_FORMAT ("clua", DEFAULT_CLUAINPUTS, CLUA_ENVS); +#define CLUA_SUFFIXES ".dll", ".so" + SUFFIXES (CLUA_SUFFIXES); + FMT_INFO.suffix_search_only = true; + break; default: LIB_FATAL1 ("kpse_init_format: Unknown format %d", format); } diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf index e430efe55a2..f92f2338edb 100644 --- a/Build/source/texk/kpathsea/texmf.cnf +++ b/Build/source/texk/kpathsea/texmf.cnf @@ -429,6 +429,9 @@ TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}// % Lua needs to look in TEXINPUTS for lua scripts distributed with packages. LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/lua//;$TEXINPUTS +% Lua needs to look for lua libraries distributed with packages. +CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua// + % Architecture independent executables. TEXMFSCRIPTS = $TEXMF/scripts/{$engine,$progname,}// diff --git a/Build/source/texk/kpathsea/types.h b/Build/source/texk/kpathsea/types.h index 72b82df14ff..9def695edbd 100644 --- a/Build/source/texk/kpathsea/types.h +++ b/Build/source/texk/kpathsea/types.h @@ -1,6 +1,6 @@ /* types.h: general types for kpathsea. - Copyright 1993, 1995, 1996, 2005, 2008, 2009 Karl Berry. + Copyright 1993, 1995, 1996, 2005, 2008, 2009, 2010 Karl Berry. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -140,6 +140,7 @@ typedef enum kpse_cid_format, kpse_mlbib_format, kpse_mlbst_format, + kpse_clua_format, kpse_last_format /* one past last index */ } kpse_file_format_type; @@ -267,8 +268,8 @@ extern KPSEDLL void kpathsea_finish (kpathsea kpse) ; #define kpse_bug_address kpathsea_bug_address -extern kpathsea_instance kpse_def_inst; -extern kpathsea kpse_def; +extern KPSEDLL kpathsea_instance kpse_def_inst; +extern KPSEDLL kpathsea kpse_def; #define kpathsea_debug kpse_def_inst.debug #define kpse_program_name kpse_def_inst.program_name |