Hi! LuaTeX stopped using tangle long time ago, but identifiers like kpseinitprog, kpsesetprogramenabled, are still in the code. They make the program a little unreadable, so I'm current working on it. I would like to hear any suggestions from you: is it necessary? Best regards, minux.
On 10/14/2011 08:33 AM, minux wrote:
Hi!
LuaTeX stopped using tangle long time ago, but identifiers like kpseinitprog, kpsesetprogramenabled, are still in the code. They make the program a little unreadable, so I'm current working on it. I would like to hear any suggestions from you: is it necessary?
Some of the external identifiers (in kpathsea/ and web2c/ 's C code) are without underscores to be compatible with the other tex-style programs that still do use tangle. The calls to these functions are typically added in a pascal change file, where tangle strips the underscores, so the actual functions needs to have names without underscores also. When luatex needs such a function, it cannot use underscores either, obviously. There could be a bunch of #define kpse_init_prog kpseinitprog in a header file, but that is just cosmetics so I am not in a hurry to do that. Best wishes, Taco
On Fri, Oct 14, 2011 at 8:40 AM, Taco Hoekwater
On 10/14/2011 08:33 AM, minux wrote:
Hi!
LuaTeX stopped using tangle long time ago, but identifiers like kpseinitprog, kpsesetprogramenabled, are still in the code. They make the program a little unreadable, so I'm current working on it. I would like to hear any suggestions from you: is it necessary?
So we have abandoned CWeb ? -- luigi
Patch attached and shown below. There isn't that many occurrences, sorry for the title. diff --git a/trunk/source/texk/web2c/luatexdir/pdf/pdfgen.w b/trunk/source/texk/web2c/luatexdir/pdf/pdfgen.w index 273c319..628586f 100644 --- a/trunk/source/texk/web2c/luatexdir/pdf/pdfgen.w +++ b/trunk/source/texk/web2c/luatexdir/pdf/pdfgen.w @@ -1041,13 +1041,13 @@ static void init_pdf_outputparameters(PDF pdf) if (!callback_defined(read_pk_file_callback)) { if (pdf_pk_mode != null) { char *s = tokenlist_to_cstring(pdf_pk_mode, true, NULL); - kpseinitprog("PDFTEX", (unsigned) pdf->pk_resolution, s, nil); + kpse_init_prog("PDFTEX", (unsigned) pdf->pk_resolution, s, nil); xfree(s); } else { - kpseinitprog("PDFTEX", (unsigned) pdf->pk_resolution, nil, nil); + kpse_init_prog("PDFTEX", (unsigned) pdf->pk_resolution, nil, nil); } - if (!kpsevarvalue("MKTEXPK")) - kpsesetprogramenabled(kpsepkformat, 1, kpsesrccmdline); + if (!kpse_var_value("MKTEXPK")) + kpse_set_program_enabled(kpse_pk_format, 1, kpse_src_cmdline); } set_job_id(pdf, int_par(year_code), int_par(month_code), int_par(day_code), int_par(time_code)); diff --git a/trunk/source/texk/web2c/luatexdir/tex/filename.w b/trunk/source/texk/web2c/luatexdir/tex/filename.w index c969fb9..cbc4f39 100644 --- a/trunk/source/texk/web2c/luatexdir/tex/filename.w +++ b/trunk/source/texk/web2c/luatexdir/tex/filename.w @@ -80,7 +80,7 @@ static boolean more_name(ASCII_code c) } else { str_room(1); append_char(c); /* contribute |c| to the current string */ - if (ISDIRSEP(c)) { + if (IS_DIR_SEP(c)) { area_delimiter = (pool_pointer) cur_length; ext_delimiter = 0; } else if (c == '.') @@ -187,7 +187,7 @@ void scan_file_name_toks(void) a = n = s; e = NULL; for (i = 0; i < l; i++) { - if (ISDIRSEP(s[i])) { + if (IS_DIR_SEP(s[i])) { n = s + i + 1; e = NULL; } else if (s[i] == '.') { diff --git a/trunk/source/texk/web2c/luatexdir/tex/maincontrol.w b/trunk/source/texk/web2c/luatexdir/tex/maincontrol.w index 21e4f15..ac399f2 100644 --- a/trunk/source/texk/web2c/luatexdir/tex/maincontrol.w +++ b/trunk/source/texk/web2c/luatexdir/tex/maincontrol.w @@ -3148,9 +3148,9 @@ void new_interaction(void) print_ln(); interaction = cur_chr; if (interaction == batch_mode) - kpsemaketexdiscarderrors = 1; + kpse_make_tex_discard_errors = 1; else - kpsemaketexdiscarderrors = 0; + kpse_make_tex_discard_errors = 0; fixup_selector(log_opened); }
participants (3)
-
luigi scarso -
minux -
Taco Hoekwater