summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-07-06 17:18:20 +0000
committerKarl Berry <karl@freefriends.org>2007-07-06 17:18:20 +0000
commit44caba75c2bcdde541bd619bfa2ad748839bfd67 (patch)
treebd45c551e8a30f4a6497a6968c69967b51c4f2af
parent7331f23b85b1ccb12a1a1b745a005ec07ff2af6e (diff)
luatex->lua, try .luc before .lua
git-svn-id: svn://tug.org/texlive/trunk@4551 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/kpathsea/ChangeLog8
-rw-r--r--Build/source/texk/kpathsea/tex-file.c5
2 files changed, 11 insertions, 2 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 9d0816ea3e7..32cbf895a3e 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-06 Karl Berry <karl@tug.org>
+
+ * tex-file.c (init_path) <kpse_lua_format>: let's make the format
+ name be lua rather than luatex; otherwise kpsewhich -format=luatex
+ finds kpse_tex_format sometimes, and it seems unnecessary to debug
+ that just now.
+ (LUA_SUFFIXES): put compiled suffixes first.
+
2007-07-05 Karl Berry <karl@tug.org>
* tex-file.h (kpse_file_format_type): define kpse_lua_format.
diff --git a/Build/source/texk/kpathsea/tex-file.c b/Build/source/texk/kpathsea/tex-file.c
index d12712caee2..04e4f3972c0 100644
--- a/Build/source/texk/kpathsea/tex-file.c
+++ b/Build/source/texk/kpathsea/tex-file.c
@@ -672,9 +672,10 @@ kpse_init_format P1C(kpse_file_format_type, format)
INIT_FORMAT ("texmfscripts", DEFAULT_TEXMFSCRIPTS, TEXMFSCRIPTS_ENVS);
break;
case kpse_lua_format:
- INIT_FORMAT ("luatex", DEFAULT_LUAINPUTS, LUA_ENVS);
-#define LUA_SUFFIXES ".lua", ".luatex", ".texlua", ".luc", ".luctex", ".texluc"
+ INIT_FORMAT ("lua", DEFAULT_LUAINPUTS, LUA_ENVS);
+#define LUA_SUFFIXES ".luc", ".luctex", ".texluc", ".lua", ".luatex", ".texlua"
SUFFIXES (LUA_SUFFIXES);
+ FMT_INFO.suffix_search_only = false;
break;
default:
FATAL1 ("kpse_init_format: Unknown format %d", format);