diff --git a/source/texk/web2c/luatexdir/dvi/dvigen.c b/source/texk/web2c/luatexdir/dvi/dvigen.c
index 946f20002a6ee82da836ded6f4b842df8bcf67fb..77b20e048537a0b550ee84cf82c30421f566f7aa 100644
--- a/source/texk/web2c/luatexdir/dvi/dvigen.c
+++ b/source/texk/web2c/luatexdir/dvi/dvigen.c
@@ -577,18 +577,18 @@ values of these variables are not needed during recursive calls.
@^recursion@>
*/
-integer total_pages = 0; /* the number of pages that have been shipped out */
+int total_pages = 0; /* the number of pages that have been shipped out */
scaled max_v = 0; /* maximum height-plus-depth of pages shipped so far */
scaled max_h = 0; /* maximum width of pages shipped so far */
-integer max_push = 0; /* deepest nesting of |push| commands encountered so far */
-integer last_bop = -1; /* location of previous |bop| in the \.{DVI} output */
-integer dead_cycles = 0; /* recent outputs that didn't ship anything out */
+int max_push = 0; /* deepest nesting of |push| commands encountered so far */
+int last_bop = -1; /* location of previous |bop| in the \.{DVI} output */
+int dead_cycles = 0; /* recent outputs that didn't ship anything out */
boolean doing_leaders = false; /* are we inside a leader box? */
-integer c, f; /* character and font in current |char_node| */
-integer oval, ocmd; /* used by |out_cmd| for generating |set|, |fnt| and |fnt_def| commands */
+int c, f; /* character and font in current |char_node| */
+int oval, ocmd; /* used by |out_cmd| for generating |set|, |fnt| and |fnt_def| commands */
pointer g; /* current glue specification */
-integer lq, lr; /* quantities used in calculations for leaders */
-integer cur_s = -1; /* current depth of output box nesting, initially $-1$ */
+int lq, lr; /* quantities used in calculations for leaders */
+int cur_s = -1; /* current depth of output box nesting, initially $-1$ */
/*
@ The \.{DVI} bytes are output to a buffer instead of being written directly
@@ -626,13 +626,13 @@ Initially the buffer is all in one piece; we will output half of it only
after it first fills up.
*/
-integer dvi_buf_size = 800; /* size of the output buffer; must be a multiple of 8 */
+int dvi_buf_size = 800; /* size of the output buffer; must be a multiple of 8 */
eight_bits *dvi_buf; /* buffer for \.{DVI} output */
dvi_index half_buf = 0; /* half of |dvi_buf_size| */
dvi_index dvi_limit = 0; /* end of the current half buffer */
dvi_index dvi_ptr = 0; /* the next available buffer address */
-integer dvi_offset = 0; /* |dvi_buf_size| times the number of times the output buffer has been fully emptied */
-integer dvi_gone = 0; /* the number of bytes already output to |dvi_file| */
+int dvi_offset = 0; /* |dvi_buf_size| times the number of times the output buffer has been fully emptied */
+int dvi_gone = 0; /* the number of bytes already output to |dvi_file| */
/*
The actual output of |dvi_buf[a..b]| to |dvi_file| is performed by calling
@@ -674,7 +674,7 @@ The |dvi_four| procedure outputs four bytes in two's complement notation,
without risking arithmetic overflow.
*/
-void dvi_four(integer x)
+void dvi_four(int x)
{
if (x >= 0) {
dvi_out(x / 0100000000);
@@ -702,7 +702,7 @@ void dvi_push(void)
dvi_out(push);
}
-void dvi_pop(integer l)
+void dvi_pop(int l)
{
if ((l == dvi_offset + dvi_ptr) && (dvi_ptr > 0))
decr(dvi_ptr);
@@ -854,7 +854,7 @@ void movement(scaled w, eight_bits o)
{
small_number mstate; /* have we seen a |y| or |z|? */
halfword p, q; /* current and top nodes on the stack */
- integer k; /* index into |dvi_buf|, modulo |dvi_buf_size| */
+ int k; /* index into |dvi_buf|, modulo |dvi_buf_size| */
if (false) { /* TODO: HUH? */
q = new_node(movement_node, 0); /* new node for the top of the stack */
width(q) = w;
@@ -1020,7 +1020,7 @@ except that some |vinfo|'s may have become more restrictive.
*/
/* delete movement nodes with |location>=l| */
-void prune_movements(integer l)
+void prune_movements(int l)
{
pointer p; /* node being deleted */
while (down_ptr != null) {
@@ -1075,7 +1075,7 @@ void dvi_place_rule(PDF pdf, halfword q, scaledpos size)
dvi_four(size.h);
}
-void dvi_place_glyph(PDF pdf, internal_font_number f, integer c)
+void dvi_place_glyph(PDF pdf, internal_font_number f, int c)
{
scaled_whd ci;
synch_dvi_with_pos(pdf->posstruct->pos);
@@ -1103,7 +1103,7 @@ void dvi_place_glyph(PDF pdf, internal_font_number f, integer c)
void dvi_special(PDF pdf, halfword p)
{
int old_setting; /* holds print |selector| */
- unsigned k; /* index into |cur_string| */
+ unsigned k; /* index into |cur_string| */
synch_dvi_with_pos(pdf->posstruct->pos);
old_setting = selector;
selector = new_string;
@@ -1118,7 +1118,7 @@ void dvi_special(PDF pdf, halfword p)
}
for (k = 0; k < cur_length; k++)
dvi_out(cur_string[k]);
- cur_length = 0; /* erase the string */
+ cur_length = 0; /* erase the string */
}
/*
@@ -1136,7 +1136,7 @@ single page, the stack would overflow.
void expand_macros_in_tokenlist(halfword p)
{
- integer old_mode; /* saved |mode| */
+ int old_mode; /* saved |mode| */
pointer q, r; /* temporary variables for list manipulation */
q = get_avail();
token_info(q) = right_brace_token + '}';
@@ -1176,7 +1176,7 @@ void write_out(halfword p)
int old_setting; /* holds print |selector| */
int j; /* write stream number */
boolean clobbered; /* system string is ok? */
- integer ret; /* return value from |runsystem| */
+ int ret; /* return value from |runsystem| */
char *s, *ss; /* line to be written, as a C string */
int callback_id;
int lua_retval;
@@ -1217,20 +1217,20 @@ void write_out(halfword p)
if (!log_opened)
selector = term_only;
tprint_nl("runsystem(");
- tprint((char *)cur_string);
+ tprint((char *) cur_string);
tprint(")...");
if (shellenabledp) {
clobbered = false;
- if (strlen((char *)cur_string)!=cur_length)
+ if (strlen((char *) cur_string) != cur_length)
clobbered = true;
- /* minimal checking: NUL not allowed in argument string of |system|() */
+ /* minimal checking: NUL not allowed in argument string of |system|() */
if (clobbered) {
tprint("clobbered");
} else {
/* We have the command. See if we're allowed to execute it,
and report in the log. We don't check the actual exit status of
the command, or do anything with the output. */
- ret = runsystem((char *)cur_string);
+ ret = runsystem((char *) cur_string);
if (ret == -1)
tprint("quotation error in system command");
else if (ret == 0)
@@ -1246,7 +1246,7 @@ void write_out(halfword p)
print_char('.');
tprint_nl("");
print_ln();
- cur_length = 0; /* erase the string */
+ cur_length = 0; /* erase the string */
}
selector = old_setting;
}
@@ -1260,7 +1260,7 @@ ship out a box of stuff, we shall use the macro |ensure_dvi_open|.
void ensure_dvi_header_written(PDF pdf)
{
unsigned l;
- unsigned s; /* index into |str_pool| */
+ unsigned s; /* index into |str_pool| */
int old_setting; /* saved |selector| setting */
assert(pdf->o_mode == OMODE_DVI);
assert(pdf->o_state == ST_FILE_OPEN);
@@ -1303,8 +1303,8 @@ void ensure_dvi_header_written(PDF pdf)
void dvi_begin_page(PDF pdf)
{
- integer k;
- integer page_loc; /* location of the current |bop| */
+ int k;
+ int page_loc; /* location of the current |bop| */
ensure_output_state(pdf, ST_HEADER_WRITTEN);
/* Initialize variables as |ship_out| begins */
page_loc = dvi_offset + dvi_ptr;
@@ -1351,9 +1351,9 @@ If |total_pages>=65536|, the \.{DVI} file will lie. And if
void finish_dvi_file(PDF pdf, int version, int revision)
{
- integer k;
+ int k;
boolean res;
- integer callback_id = callback_defined(stop_run_callback);
+ int callback_id = callback_defined(stop_run_callback);
(void) version;
(void) revision;
while (cur_s > -1) {
diff --git a/source/texk/web2c/luatexdir/dvi/dvigen.h b/source/texk/web2c/luatexdir/dvi/dvigen.h
index cd08b4242364d677f1d5f347b7ad4af3072bc742..f26e2d797807a10c4ab252aeae96101c10e644f7 100644
--- a/source/texk/web2c/luatexdir/dvi/dvigen.h
+++ b/source/texk/web2c/luatexdir/dvi/dvigen.h
@@ -22,28 +22,28 @@
#ifndef DVIGEN_H
# define DVIGEN_H
-extern integer total_pages;
+extern int total_pages;
extern scaled max_v;
extern scaled max_h;
-extern integer max_push;
-extern integer last_bop;
-extern integer dead_cycles;
+extern int max_push;
+extern int last_bop;
+extern int dead_cycles;
extern boolean doing_leaders;
-extern integer c, f;
-extern integer oval, ocmd;
+extern int c, f;
+extern int oval, ocmd;
extern halfword g;
-extern integer lq, lr;
-extern integer cur_s;
+extern int lq, lr;
+extern int cur_s;
typedef int dvi_index; /* an index into the output buffer */
-extern integer dvi_buf_size;
+extern int dvi_buf_size;
extern eight_bits *dvi_buf; /* 0 is unused */
extern dvi_index half_buf;
extern dvi_index dvi_limit;
extern dvi_index dvi_ptr;
-extern integer dvi_offset;
-extern integer dvi_gone;
+extern int dvi_offset;
+extern int dvi_gone;
/*
To put a byte in the buffer without paying the cost of invoking a procedure
@@ -56,9 +56,9 @@ each time, we use the macro |dvi_out|.
} while (0)
extern void dvi_swap(void);
-extern void dvi_four(integer x);
+extern void dvi_four(int x);
extern void dvi_push(void);
-extern void dvi_pop(integer l);
+extern void dvi_pop(int l);
extern void out_cmd(void);
extern void dvi_font_def(internal_font_number f);
@@ -121,7 +121,7 @@ typedef enum {
# define z_seen 12 /* we have seen |z_here| but not |y_here| */
extern void movement(scaled w, eight_bits o);
-extern void prune_movements(integer l);
+extern void prune_movements(int l);
/*
The actual distances by which we want to move might be computed as the
@@ -184,7 +184,7 @@ extern void dvi_special(PDF pdf, halfword p);
extern void ensure_dvi_header_written(PDF pdf);
extern void finish_dvi_file(PDF pdf, int version, int revision);
-extern void dvi_place_glyph(PDF pdf, internal_font_number f, integer c);
+extern void dvi_place_glyph(PDF pdf, internal_font_number f, int c);
extern void dvi_place_rule(PDF pdf, halfword q, scaledpos size);
extern void dvi_begin_page(PDF pdf);
diff --git a/source/texk/web2c/luatexdir/font/dofont.c b/source/texk/web2c/luatexdir/font/dofont.c
index aebb0ff32652edb9c9257bf4e4c9e9c47c96ca4b..41bce04cb6e69dcdf6691fdc2ca4b079d0f87eea 100644
--- a/source/texk/web2c/luatexdir/font/dofont.c
+++ b/source/texk/web2c/luatexdir/font/dofont.c
@@ -44,11 +44,11 @@ static char *font_error_message(pointer u, char *nom, scaled s)
return str;
}
-static int do_define_font(integer f, char *cnom, scaled s, integer natural_dir)
+static int do_define_font(int f, char *cnom, scaled s, int natural_dir)
{
boolean res; /* was the callback successful? */
- integer callback_id;
+ int callback_id;
char *cnam;
int r;
res = 0;
@@ -102,9 +102,9 @@ static int do_define_font(integer f, char *cnom, scaled s, integer natural_dir)
}
-int read_font_info(pointer u, str_number nom, scaled s, integer natural_dir)
+int read_font_info(pointer u, str_number nom, scaled s, int natural_dir)
{
- integer f;
+ int f;
char *cnom;
char *msg;
cnom = makecstring(nom);
@@ -137,7 +137,7 @@ int read_font_info(pointer u, str_number nom, scaled s, integer natural_dir)
int find_font_id(char *nom, scaled s)
{
- integer f;
+ int f;
f = new_font();
if ((f = do_define_font(f, nom, s, -1))) {
return f;
diff --git a/source/texk/web2c/luatexdir/font/luafont.c b/source/texk/web2c/luatexdir/font/luafont.c
index 4c70eb2890a41c096185908f677bdabe1e6b7e29..157002bee61c3afc8efa22ce1b4add73061b8bd9 100644
--- a/source/texk/web2c/luatexdir/font/luafont.c
+++ b/source/texk/web2c/luatexdir/font/luafont.c
@@ -527,7 +527,7 @@ int font_to_lua(lua_State * L, int f)
lua_setfield(L, -2, "characters");
if (font_cache_id(f) == 0) { /* renew */
- integer r;
+ int r;
lua_pushvalue(L, -1);
r = luaL_ref(Luas, LUA_REGISTRYINDEX); /* pops the table */
set_font_cache_id(f, r);
@@ -870,7 +870,7 @@ scaled sp_to_dvi(halfword sp, halfword atsize)
static void
-read_char_packets(lua_State * L, integer * l_fonts, charinfo * co, int atsize)
+read_char_packets(lua_State * L, int *l_fonts, charinfo * co, int atsize)
{
int i, n, m;
size_t l;
@@ -1172,8 +1172,8 @@ static void store_math_kerns(lua_State * L, charinfo * co, int id)
}
void
-font_char_from_lua(lua_State * L, internal_font_number f, integer i,
- integer * l_fonts, boolean has_math)
+font_char_from_lua(lua_State * L, internal_font_number f, int i,
+ int *l_fonts, boolean has_math)
{
int k, r, t;
charinfo *co;
@@ -1377,7 +1377,7 @@ font_char_from_lua(lua_State * L, internal_font_number f, integer i,
lua_pushnil(L); /* first key */
if (lua_next(L, -2) != 0) {
lua_pop(L, 2);
- read_char_packets(L, (integer *) l_fonts, co, atsize);
+ read_char_packets(L, (int *) l_fonts, co, atsize);
}
}
lua_pop(L, 1);
@@ -1451,8 +1451,8 @@ int font_from_lua(lua_State * L, int f)
int bc; /* first char index */
int ec; /* last char index */
char *s;
- integer *l_fonts = NULL;
- integer save_ref = 1; /* unneeded, really */
+ int *l_fonts = NULL;
+ int save_ref = 1; /* unneeded, really */
boolean no_math = false;
/* will we save a cache of the luat table? */
@@ -1545,8 +1545,8 @@ int font_from_lua(lua_State * L, int f)
/* now fetch the base fonts, if needed */
n = count_hash_items(L, luaS_index(fonts));
if (n > 0) {
- l_fonts = xmalloc((n + 2) * sizeof(integer));
- memset(l_fonts, 0, (n + 2) * sizeof(integer));
+ l_fonts = xmalloc((n + 2) * sizeof(int));
+ memset(l_fonts, 0, (n + 2) * sizeof(int));
lua_rawgeti(L, LUA_REGISTRYINDEX, luaS_index(fonts));
lua_rawget(L, -2);
for (i = 1; i <= n; i++) {
@@ -1592,7 +1592,7 @@ int font_from_lua(lua_State * L, int f)
if (font_type(f) == virtual_font_type) {
pdftex_fail("Invalid local fonts in font %s!\n", font_name(f));
} else {
- l_fonts = xmalloc(3 * sizeof(integer));
+ l_fonts = xmalloc(3 * sizeof(int));
l_fonts[0] = 0;
l_fonts[1] = f;
l_fonts[2] = 0;
diff --git a/source/texk/web2c/luatexdir/font/luatexfont.h b/source/texk/web2c/luatexdir/font/luatexfont.h
index aa8d4f2260e193ed285f56c59d42979bbfb1c625..8ead75b8f5f499cc425105957629bed556b92770 100644
--- a/source/texk/web2c/luatexdir/font/luatexfont.h
+++ b/source/texk/web2c/luatexdir/font/luatexfont.h
@@ -83,19 +83,19 @@ typedef struct {
} intparm;
typedef struct {
- integer fe_objnum; /* object number */
+ int fe_objnum; /* object number */
char *name; /* encoding file name */
char **glyph_names; /* array of glyph names */
struct avl_table *tx_tree; /* tree of encoding positions marked as used by TeX */
} fe_entry;
typedef struct fd_entry_ {
- integer fd_objnum; /* object number of the font descriptor object */
+ int fd_objnum; /* object number of the font descriptor object */
char *fontname; /* /FontName (without subset tag) */
char *subset_tag; /* 6-character subset tag */
boolean ff_found;
- integer ff_objnum; /* object number of the font program stream */
- integer fn_objnum; /* font name object number (embedded PDF) */
+ int ff_objnum; /* object number of the font program stream */
+ int fn_objnum; /* font name object number (embedded PDF) */
boolean all_glyphs; /* embed all glyphs? */
boolean write_ttf_glyph_names;
intparm font_dim[FONT_KEYS_NUM];
@@ -107,16 +107,16 @@ typedef struct fd_entry_ {
} fd_entry;
typedef struct fo_entry_ {
- integer fo_objnum; /* object number of the font dictionary */
+ int fo_objnum; /* object number of the font dictionary */
internalfontnumber tex_font; /* needed only for \pdffontattr{} */
fm_entry *fm; /* pointer to font map structure for this font dictionary */
fd_entry *fd; /* pointer to /FontDescriptor object structure */
fe_entry *fe; /* pointer to encoding structure */
- integer cw_objnum; /* object number of the font program object */
- integer first_char; /* first character used in this font */
- integer last_char; /* last character used in this font */
+ int cw_objnum; /* object number of the font program object */
+ int first_char; /* first character used in this font */
+ int last_char; /* last character used in this font */
struct avl_table *tx_tree; /* tree of non-reencoded TeX characters marked as used */
- integer tounicode_objnum; /* object number of ToUnicode */
+ int tounicode_objnum; /* object number of ToUnicode */
} fo_entry;
typedef struct {
@@ -132,7 +132,7 @@ typedef struct glw_entry_ { /* subset glyphs for inclusion in CID-based font
} glw_entry;
typedef struct {
- integer charcode, cwidth, cheight, xoff, yoff, xescape, rastersize;
+ int charcode, cwidth, cheight, xoff, yoff, xescape, rastersize;
halfword *raster;
} chardesc;
@@ -141,15 +141,15 @@ typedef struct {
# include "texfont.h"
/* tounicode.c */
-integer write_cid_tounicode(PDF, fo_entry *, internal_font_number);
+int write_cid_tounicode(PDF, fo_entry *, internal_font_number);
void glyph_unicode_free(void);
void def_tounicode(str_number, str_number);
-integer write_tounicode(PDF, char **, char *);
+int write_tounicode(PDF, char **, char *);
/* vfpacket.c */
-void replace_packet_fonts(internal_font_number f, integer * old_fontid,
- integer * new_fontid, int count);
-integer *packet_local_fonts(internal_font_number f, integer * num);
+void replace_packet_fonts(internal_font_number f, int *old_fontid,
+ int *new_fontid, int count);
+int *packet_local_fonts(internal_font_number f, int *num);
/* writecff.c */
void writetype1w(PDF pdf, fd_entry * fd);
@@ -158,12 +158,12 @@ void writetype1w(PDF pdf, fd_entry * fd);
void writetype0(PDF pdf, fd_entry * fd);
/* writefont.c */
-void do_pdf_font(PDF, integer, internalfontnumber);
-fd_entry *lookup_fd_entry(char *, integer);
+void do_pdf_font(PDF, int, internalfontnumber);
+fd_entry *lookup_fd_entry(char *, int);
fd_entry *new_fd_entry(void);
void write_fontstuff(PDF);
-integer get_fd_objnum(fd_entry * fd);
-integer get_fn_objnum(PDF, fd_entry *);
+int get_fd_objnum(fd_entry * fd);
+int get_fn_objnum(PDF, fd_entry *);
void embed_whole_font(fd_entry * fd);
void register_fd_entry(fd_entry * fd);
@@ -172,7 +172,7 @@ boolean t1_subset(char *, char *, unsigned char *);
char **load_enc_file(char *);
void writet1(PDF, fd_entry *);
void t1_free(void);
-extern integer t1_length1, t1_length2, t1_length3;
+extern int t1_length1, t1_length2, t1_length3;
/* writetype2.c */
void writetype2(PDF, fd_entry *);
@@ -194,7 +194,7 @@ void write_fontencodings(PDF pdf);
void writettf(PDF, fd_entry *);
void writeotf(PDF, fd_entry *);
void ttf_free(void);
-extern integer ttf_length;
+extern int ttf_length;
/* pkin.c */
int readchar(boolean, chardesc *);
@@ -205,9 +205,9 @@ extern const char notdef[];
/* vfovf.c */
void vf_expand_local_fonts(internal_font_number f);
internal_font_number letter_space_font(halfword u, internal_font_number f,
- integer e);
-internal_font_number auto_expand_font(internal_font_number f, integer e);
-str_number expand_font_name(internal_font_number f, integer e);
+ int e);
+internal_font_number auto_expand_font(internal_font_number f, int e);
+str_number expand_font_name(internal_font_number f, int e);
void pdf_check_vf(internal_font_number f);
internal_font_number copy_font_info(internal_font_number f);
@@ -216,8 +216,8 @@ extern FILE *t3_file;
void writet3(PDF, int, internalfontnumber);
extern unsigned char *t3_buffer;
-extern integer t3_size;
-extern integer t3_curbyte;
+extern int t3_size;
+extern int t3_curbyte;
# define t3_read_file() readbinfile(t3_file, &t3_buffer, &t3_size)
# define t3_close() xfclose(t3_file, cur_file_name)
diff --git a/source/texk/web2c/luatexdir/font/mapfile.c b/source/texk/web2c/luatexdir/font/mapfile.c
index 43b3a8be1c56f2927fb332c41e4ecdd10d292ae7..a6dfe2785c0e51c3b37720fa247e0ac50655353f 100644
--- a/source/texk/web2c/luatexdir/font/mapfile.c
+++ b/source/texk/web2c/luatexdir/font/mapfile.c
@@ -34,8 +34,8 @@ static const char _svn_version[] =
static FILE *fm_file;
static unsigned char *fm_buffer = NULL;
-static integer fm_size = 0;
-static integer fm_curbyte = 0;
+static int fm_size = 0;
+static int fm_curbyte = 0;
#define fm_open(a) \
(fm_file = fopen((char *)(a), FOPEN_RBIN_MODE))
@@ -474,11 +474,11 @@ static void fm_scan_line(void)
s--; /* e. g. 0.5ExtendFont: %f = 0.5E */
if (str_prefix(s, "SlantFont")) {
d *= 1000.0; /* correct rounding also for neg. numbers */
- fm->slant = (integer) (d > 0 ? d + 0.5 : d - 0.5);
+ fm->slant = (int) (d > 0 ? d + 0.5 : d - 0.5);
r = s + strlen("SlantFont");
} else if (str_prefix(s, "ExtendFont")) {
d *= 1000.0;
- fm->extend = (integer) (d > 0 ? d + 0.5 : d - 0.5);
+ fm->extend = (int) (d > 0 ? d + 0.5 : d - 0.5);
if (fm->extend == 0) /* special user case... */
fm->extend = 1000; /* ...mapped to natural internal representation */
r = s + strlen("ExtendFont");
@@ -822,14 +822,14 @@ void process_map_item(char *s, int type)
}
}
-void pdfmapfile(integer t)
+void pdfmapfile(int t)
{
char *s = tokenlist_to_cstring(t, true, NULL);
process_map_item(s, MAPFILE);
free(s);
}
-void pdfmapline(integer t)
+void pdfmapline(int t)
{
char *s = tokenlist_to_cstring(t, true, NULL);
process_map_item(s, MAPLINE);
diff --git a/source/texk/web2c/luatexdir/font/mapfile.h b/source/texk/web2c/luatexdir/font/mapfile.h
index 848e1ea856cbb5b119a6e3f3e975efebbb0309f6..fbdb4044fd047a17f20352973230b175294fc152 100644
--- a/source/texk/web2c/luatexdir/font/mapfile.h
+++ b/source/texk/web2c/luatexdir/font/mapfile.h
@@ -89,9 +89,9 @@ typedef struct {
char *tfm_name; /* TFM file name (1st field in map line) */
char *sfd_name; /* subfont directory name, like @sfd_name@ */
char *ps_name; /* PostScript name (optional 2nd field in map line) */
- integer fd_flags; /* font descriptor /Flags (PDF Ref. section 5.7.1) */
- integer slant; /* SlantFont */
- integer extend; /* ExtendFont */
+ int fd_flags; /* font descriptor /Flags (PDF Ref. section 5.7.1) */
+ int slant; /* SlantFont */
+ int extend; /* ExtendFont */
char *encname; /* encoding file name */
char *ff_name; /* font file name */
unsigned short type; /* various flags */
@@ -115,8 +115,8 @@ boolean hasfmentry(internalfontnumber);
void fm_free(void);
void fm_read_info(void);
ff_entry *check_ff_exist(char *, boolean);
-void pdfmapfile(integer);
-void pdfmapline(integer);
+void pdfmapfile(int);
+void pdfmapline(int);
void pdf_init_map_file(string map_name);
fm_entry *new_fm_entry(void);
void delete_fm_entry(fm_entry *);
diff --git a/source/texk/web2c/luatexdir/font/pkin.c b/source/texk/web2c/luatexdir/font/pkin.c
index 371d9fd6137c722c15306f5d145e1e5518fa07ff..0aa35d0456c941d244d57dc4b2e350e0e39d35fc 100644
--- a/source/texk/web2c/luatexdir/font/pkin.c
+++ b/source/texk/web2c/luatexdir/font/pkin.c
@@ -63,9 +63,9 @@ static shalfword pkbyte(void)
return (i);
}
-static integer pkduo(void)
+static int pkduo(void)
{
- register integer i;
+ register int i;
i = pkbyte();
if (i > 127)
@@ -74,9 +74,9 @@ static integer pkduo(void)
return (i);
}
-static integer pktrio(void)
+static int pktrio(void)
{
- register integer i;
+ register int i;
i = pkbyte();
if (i > 127)
@@ -86,9 +86,9 @@ static integer pktrio(void)
return (i);
}
-static integer pkquad(void)
+static int pkquad(void)
{
- register integer i;
+ register int i;
i = pkbyte();
if (i > 127)
@@ -225,7 +225,7 @@ static halfword gpower[17] = { 0, 1, 3, 7, 15, 31, 63, 127,
static void unpack(chardesc * cd)
{
- register integer i, j;
+ register int i, j;
register halfword word, wordweight;
halfword *raster;
shalfword rowsleft;
@@ -315,7 +315,7 @@ static void unpack(chardesc * cd)
}
turnon = !turnon;
}
- if ((rowsleft != 0) || ((integer) hbit != cd->cwidth))
+ if ((rowsleft != 0) || ((int) hbit != cd->cwidth))
pdftex_fail("error while unpacking; more bits than required");
}
}
@@ -336,8 +336,8 @@ static void unpack(chardesc * cd)
int readchar(boolean check_preamble, chardesc * cd)
{
register shalfword i;
- register integer k;
- register integer length = 0;
+ register int k;
+ register int length = 0;
/*
* Check the preamble of the pkfile
diff --git a/source/texk/web2c/luatexdir/font/sfnt.c b/source/texk/web2c/luatexdir/font/sfnt.c
index 22868055553314f9a59a76eb41d1b039b212f7a7..6f43546bdbe5f001c3b78925d7e48498cbd3b671 100644
--- a/source/texk/web2c/luatexdir/font/sfnt.c
+++ b/source/texk/web2c/luatexdir/font/sfnt.c
@@ -162,7 +162,7 @@ sfnt *sfnt_open(FT_Face face, int accept_types)
}
#else /* not XETEX */
# ifdef pdfTeX
-sfnt *sfnt_open(unsigned char *buffer, integer buflen)
+sfnt *sfnt_open(unsigned char *buffer, int buflen)
{
sfnt *sfont;
ULONG type;
diff --git a/source/texk/web2c/luatexdir/font/sfnt.h b/source/texk/web2c/luatexdir/font/sfnt.h
index 1eb4a7bf50622f2b186bfc91e1ffca3c067a74b3..e1be9c801f609c104f87bd2252ecf581adea246a 100644
--- a/source/texk/web2c/luatexdir/font/sfnt.h
+++ b/source/texk/web2c/luatexdir/font/sfnt.h
@@ -157,7 +157,7 @@ extern int put_big_endian(void *s, LONG q, int n);
# ifdef XETEX
extern sfnt *sfnt_open(FT_Face face, int accept_types);
# elif defined(pdfTeX)
-extern sfnt *sfnt_open(unsigned char *buffer, integer buflen);
+extern sfnt *sfnt_open(unsigned char *buffer, int buflen);
# else
extern sfnt *sfnt_open(FILE * fp);
# endif
diff --git a/source/texk/web2c/luatexdir/font/subfont.c b/source/texk/web2c/luatexdir/font/subfont.c
index 2f3c49559bc225308dbb87db87a392efb271c521..24ee15d25daee032c1e66e8fa483ed6b4df9368d 100644
--- a/source/texk/web2c/luatexdir/font/subfont.c
+++ b/source/texk/web2c/luatexdir/font/subfont.c
@@ -27,8 +27,8 @@ static const char _svn_version[] =
static struct avl_table *sfd_tree = NULL;
static unsigned char *sfd_buffer = NULL;
-static integer sfd_size = 0;
-static integer sfd_curbyte = 0;
+static int sfd_size = 0;
+static int sfd_curbyte = 0;
#define SFD_BUF_SIZE SMALL_BUF_SIZE
diff --git a/source/texk/web2c/luatexdir/font/texfont.c b/source/texk/web2c/luatexdir/font/texfont.c
index babbe06234b7d67c84dec9edc1a73892bb02dc27..88bfc8d6e4f858f236db0fa3a032c0b343c802c9 100644
--- a/source/texk/web2c/luatexdir/font/texfont.c
+++ b/source/texk/web2c/luatexdir/font/texfont.c
@@ -46,8 +46,8 @@ static const char _svn_version[] =
texfont **font_tables = NULL;
-static integer font_arr_max = 0;
-static integer font_id_maxval = 0;
+static int font_arr_max = 0;
+static int font_id_maxval = 0;
extern extinfo *get_charinfo_vert_variants(charinfo * ci);
extern extinfo *get_charinfo_hor_variants(charinfo * ci);
@@ -57,7 +57,7 @@ extern void set_charinfo_vert_variants(charinfo * ci, extinfo * ext);
extern extinfo *copy_variants(extinfo * o);
-static void grow_font_table(integer id)
+static void grow_font_table(int id)
{
int j;
if (id >= font_arr_max) {
@@ -71,7 +71,7 @@ static void grow_font_table(integer id)
}
}
-integer new_font_id(void)
+int new_font_id(void)
{
int i;
for (i = 0; i < font_arr_max; i++) {
@@ -86,17 +86,17 @@ integer new_font_id(void)
return i;
}
-integer max_font_id(void)
+int max_font_id(void)
{
return font_id_maxval;
}
-void set_max_font_id(integer i)
+void set_max_font_id(int i)
{
font_id_maxval = i;
}
-integer new_font(void)
+int new_font(void)
{
int k;
int id;
@@ -150,7 +150,7 @@ void font_malloc_charinfo(internal_font_number f, int num)
#define find_charinfo_id(f,c) get_sa_item(font_tables[f]->characters,c)
-charinfo *get_charinfo(internal_font_number f, integer c)
+charinfo *get_charinfo(internal_font_number f, int c)
{
sa_tree_item glyph;
charinfo *ci;
@@ -184,7 +184,7 @@ charinfo *get_charinfo(internal_font_number f, integer c)
return &(font_tables[f]->charinfo[0]);
}
-void set_charinfo(internal_font_number f, integer c, charinfo * ci)
+void set_charinfo(internal_font_number f, int c, charinfo * ci)
{
sa_tree_item glyph;
if (proper_char_index(c)) {
@@ -314,7 +314,7 @@ charinfo *copy_charinfo(charinfo * ci)
return co;
}
-charinfo *char_info(internal_font_number f, integer c)
+charinfo *char_info(internal_font_number f, int c)
{
if (f > font_id_maxval)
return 0;
@@ -329,7 +329,7 @@ charinfo *char_info(internal_font_number f, integer c)
return &(font_tables[f]->charinfo[0]);
}
-scaled_whd get_charinfo_whd(internal_font_number f, integer c)
+scaled_whd get_charinfo_whd(internal_font_number f, int c)
{
scaled_whd s;
charinfo *i;
@@ -340,7 +340,7 @@ scaled_whd get_charinfo_whd(internal_font_number f, integer c)
return s;
}
-integer char_exists(internal_font_number f, integer c)
+int char_exists(internal_font_number f, int c)
{
if (f > font_id_maxval)
return 0;
@@ -354,9 +354,9 @@ integer char_exists(internal_font_number f, integer c)
return 0;
}
-int lua_char_exists_callback(internal_font_number f, integer c)
+int lua_char_exists_callback(internal_font_number f, int c)
{
- integer callback_id;
+ int callback_id;
lua_State *L = Luas;
int ret = 0;
callback_id = callback_defined(char_exists_callback);
@@ -420,7 +420,7 @@ void dump_variant(extinfo * ext)
extinfo *undump_variant(void)
{
- integer x;
+ int x;
extinfo *ext;
undump_int(x);
if (x == 0)
@@ -683,7 +683,7 @@ void add_charinfo_math_kern(charinfo * ci, int id, scaled ht, scaled krn)
static void dump_math_kerns(charinfo * ci)
{
- integer k, l;
+ int k, l;
l = ci->top_left_math_kerns;
dump_int(l);
for (k = 0; k < l; k++) {
@@ -713,7 +713,7 @@ static void dump_math_kerns(charinfo * ci)
static void undump_math_kerns(charinfo * ci)
{
int k;
- integer x;
+ int x;
undump_int(x);
ci->top_left_math_kerns = (int) x;
if (x > 0)
@@ -834,7 +834,7 @@ char get_charinfo_tag(charinfo * ci)
return ci->tag;
}
-integer get_charinfo_remainder(charinfo * ci)
+int get_charinfo_remainder(charinfo * ci)
{
return ci->remainder;
}
@@ -844,7 +844,7 @@ char get_charinfo_used(charinfo * ci)
return ci->used;
}
-integer get_charinfo_index(charinfo * ci)
+int get_charinfo_index(charinfo * ci)
{
return ci->index;
}
@@ -874,17 +874,17 @@ eight_bits *get_charinfo_packets(charinfo * ci)
return ci->packets;
}
-integer get_charinfo_ef(charinfo * ci)
+int get_charinfo_ef(charinfo * ci)
{
return ci->ef;
}
-integer get_charinfo_rp(charinfo * ci)
+int get_charinfo_rp(charinfo * ci)
{
return ci->rp;
}
-integer get_charinfo_lp(charinfo * ci)
+int get_charinfo_lp(charinfo * ci)
{
return ci->lp;
}
@@ -906,7 +906,7 @@ extinfo *get_charinfo_hor_variants(charinfo * ci)
}
-scaled char_width(internal_font_number f, integer c)
+scaled char_width(internal_font_number f, int c)
{
charinfo *ci = char_info(f, c);
scaled w = get_charinfo_width(ci);
@@ -914,7 +914,7 @@ scaled char_width(internal_font_number f, integer c)
return w;
}
-scaled char_depth(internal_font_number f, integer c)
+scaled char_depth(internal_font_number f, int c)
{
charinfo *ci = char_info(f, c);
scaled w = get_charinfo_depth(ci);
@@ -922,7 +922,7 @@ scaled char_depth(internal_font_number f, integer c)
return w;
}
-scaled char_height(internal_font_number f, integer c)
+scaled char_height(internal_font_number f, int c)
{
charinfo *ci = char_info(f, c);
scaled w = get_charinfo_height(ci);
@@ -930,68 +930,68 @@ scaled char_height(internal_font_number f, integer c)
return w;
}
-scaled char_italic(internal_font_number f, integer c)
+scaled char_italic(internal_font_number f, int c)
{
charinfo *ci = char_info(f, c);
return get_charinfo_italic(ci);
}
-scaled char_top_accent(internal_font_number f, integer c)
+scaled char_top_accent(internal_font_number f, int c)
{
charinfo *ci = char_info(f, c);
return get_charinfo_top_accent(ci);
}
-scaled char_bot_accent(internal_font_number f, integer c)
+scaled char_bot_accent(internal_font_number f, int c)
{
charinfo *ci = char_info(f, c);
return get_charinfo_bot_accent(ci);
}
-integer char_remainder(internal_font_number f, integer c)
+int char_remainder(internal_font_number f, int c)
{
charinfo *ci = char_info(f, c);
return get_charinfo_remainder(ci);
}
-char char_tag(internal_font_number f, integer c)
+char char_tag(internal_font_number f, int c)
{
charinfo *ci = char_info(f, c);
return get_charinfo_tag(ci);
}
-char char_used(internal_font_number f, integer c)
+char char_used(internal_font_number f, int c)
{
charinfo *ci = char_info(f, c);
return get_charinfo_used(ci);
}
-char *char_name(internal_font_number f, integer c)
+char *char_name(internal_font_number f, int c)
{
charinfo *ci = char_info(f, c);
return get_charinfo_name(ci);
}
-integer char_index(internal_font_number f, integer c)
+int char_index(internal_font_number f, int c)
{
charinfo *ci = char_info(f, c);
return get_charinfo_index(ci);
}
-liginfo *char_ligatures(internal_font_number f, integer c)
+liginfo *char_ligatures(internal_font_number f, int c)
{
charinfo *ci = char_info(f, c);
return get_charinfo_ligatures(ci);
}
-kerninfo *char_kerns(internal_font_number f, integer c)
+kerninfo *char_kerns(internal_font_number f, int c)
{
charinfo *ci = char_info(f, c);
return get_charinfo_kerns(ci);
}
-eight_bits *char_packets(internal_font_number f, integer c)
+eight_bits *char_packets(internal_font_number f, int c)
{
charinfo *ci = char_info(f, c);
return get_charinfo_packets(ci);
@@ -1004,7 +1004,7 @@ void set_font_params(internal_font_number f, int b)
i = font_params(f);
if (i != b) {
font_bytes += (b - font_params(f) + 1) * sizeof(scaled);
- do_realloc(param_base(f), (b + 2), integer);
+ do_realloc(param_base(f), (b + 2), int);
font_params(f) = b;
if (b > i) {
while (i < b) {
@@ -1021,7 +1021,7 @@ void set_font_math_params(internal_font_number f, int b)
i = font_math_params(f);
if (i != b) {
font_bytes += (b - font_math_params(f) + 1) * sizeof(scaled);
- do_realloc(math_param_base(f), (b + 2), integer);
+ do_realloc(math_param_base(f), (b + 2), int);
font_math_params(f) = b;
if (b > i) {
while (i < b) {
@@ -1034,11 +1034,11 @@ void set_font_math_params(internal_font_number f, int b)
-integer copy_font(integer f)
+int copy_font(int f)
{
int i, ci_cnt, ci_size;
charinfo *ci;
- integer k = new_font();
+ int k = new_font();
{
ci = font_tables[k]->charinfo;
@@ -1111,7 +1111,7 @@ integer copy_font(integer f)
return k;
}
-void delete_font(integer f)
+void delete_font(int f)
{
int i;
charinfo *co;
@@ -1166,7 +1166,7 @@ void create_null_font(void)
set_font_touched(i, 1);
}
-boolean is_valid_font(integer id)
+boolean is_valid_font(int id)
{
int ret = 0;
if (id >= 0 && id <= font_id_maxval && font_tables[id] != NULL)
@@ -1175,7 +1175,7 @@ boolean is_valid_font(integer id)
}
/* return 1 == identical */
-boolean cmp_font_name(integer id, str_number t)
+boolean cmp_font_name(int id, str_number t)
{
char *tid, *tt;
if (!is_valid_font(id))
@@ -1190,7 +1190,7 @@ boolean cmp_font_name(integer id, str_number t)
return 1;
}
-boolean cmp_font_area(integer id, str_number t)
+boolean cmp_font_area(int id, str_number t)
{
char *tt = NULL;
char *tid = font_area(id);
@@ -1210,7 +1210,7 @@ boolean cmp_font_area(integer id, str_number t)
}
-static boolean same_font_name(integer id, integer t)
+static boolean same_font_name(int id, int t)
{
int ret = 0;
if (font_name(t) == NULL ||
@@ -1257,9 +1257,9 @@ boolean font_shareable(internal_font_number f, internal_font_number k)
return ret;
}
-integer test_no_ligatures(internal_font_number f)
+int test_no_ligatures(internal_font_number f)
{
- integer c;
+ int c;
for (c = font_bc(f); c <= font_ec(f); c++) {
if (has_lig(f, c)) /* char_exists(f,c) */
return 0;
@@ -1267,7 +1267,7 @@ integer test_no_ligatures(internal_font_number f)
return 1;
}
-integer get_tag_code(internal_font_number f, integer c)
+int get_tag_code(internal_font_number f, int c)
{
small_number i;
if (char_exists(f, c)) {
@@ -1284,27 +1284,27 @@ integer get_tag_code(internal_font_number f, integer c)
return -1;
}
-integer get_lp_code(internal_font_number f, integer c)
+int get_lp_code(internal_font_number f, int c)
{
charinfo *ci = char_info(f, c);
return get_charinfo_lp(ci);
}
-integer get_rp_code(internal_font_number f, integer c)
+int get_rp_code(internal_font_number f, int c)
{
charinfo *ci = char_info(f, c);
return get_charinfo_rp(ci);
}
-integer get_ef_code(internal_font_number f, integer c)
+int get_ef_code(internal_font_number f, int c)
{
charinfo *ci = char_info(f, c);
return get_charinfo_ef(ci);
}
-void set_tag_code(internal_font_number f, integer c, integer i)
+void set_tag_code(internal_font_number f, int c, int i)
{
- integer fixedi;
+ int fixedi;
charinfo *co;
if (char_exists(f, c)) {
/* abs(fix_int(i-7,0)) */
@@ -1330,7 +1330,7 @@ void set_tag_code(internal_font_number f, integer c, integer i)
}
-void set_lp_code(internal_font_number f, integer c, integer i)
+void set_lp_code(internal_font_number f, int c, int i)
{
charinfo *co;
if (char_exists(f, c)) {
@@ -1339,7 +1339,7 @@ void set_lp_code(internal_font_number f, integer c, integer i)
}
}
-void set_rp_code(internal_font_number f, integer c, integer i)
+void set_rp_code(internal_font_number f, int c, int i)
{
charinfo *co;
if (char_exists(f, c)) {
@@ -1348,7 +1348,7 @@ void set_rp_code(internal_font_number f, integer c, integer i)
}
}
-void set_ef_code(internal_font_number f, integer c, integer i)
+void set_ef_code(internal_font_number f, int c, int i)
{
charinfo *co;
if (char_exists(f, c)) {
@@ -1359,7 +1359,7 @@ void set_ef_code(internal_font_number f, integer c, integer i)
void set_no_ligatures(internal_font_number f)
{
- integer c;
+ int c;
charinfo *co;
if (font_tables[f]->ligatures_disabled)
@@ -1376,7 +1376,7 @@ void set_no_ligatures(internal_font_number f)
font_tables[f]->ligatures_disabled = 1;
}
-liginfo get_ligature(internal_font_number f, integer lc, integer rc)
+liginfo get_ligature(internal_font_number f, int lc, int rc)
{
int k;
liginfo t, u;
@@ -1405,9 +1405,9 @@ liginfo get_ligature(internal_font_number f, integer lc, integer rc)
}
-scaled raw_get_kern(internal_font_number f, integer lc, integer rc)
+scaled raw_get_kern(internal_font_number f, int lc, int rc)
{
- integer k;
+ int k;
kerninfo u;
charinfo *co;
if (lc == non_boundarychar || rc == non_boundarychar)
@@ -1430,7 +1430,7 @@ scaled raw_get_kern(internal_font_number f, integer lc, integer rc)
}
-scaled get_kern(internal_font_number f, integer lc, integer rc)
+scaled get_kern(internal_font_number f, int lc, int rc)
{
if (lc == non_boundarychar || rc == non_boundarychar || (!has_kern(f, lc)))
return 0;
@@ -1451,7 +1451,7 @@ scaled get_kern(internal_font_number f, integer lc, integer rc)
void dump_charinfo(int f, int c)
{
charinfo *co;
- integer x;
+ int x;
liginfo *lig;
kerninfo *kern;
dump_int(c);
@@ -1550,7 +1550,7 @@ void dump_font_entry(texfont * f)
void dump_font(int f)
{
- integer i, x;
+ int i, x;
set_font_used(f, 0);
font_tables[f]->charinfo_cache = NULL;
@@ -1592,7 +1592,7 @@ void dump_font(int f)
int undump_charinfo(int f)
{
charinfo *co;
- integer x, i;
+ int x, i;
char *s = NULL;
liginfo *lig = NULL;
kerninfo *kern = NULL;
@@ -1686,7 +1686,7 @@ int undump_charinfo(int f)
void undump_font_entry(texfont * f)
{
- integer x = 0;
+ int x = 0;
/* *INDENT-OFF* */
undump_int(x); f->_font_size = x;
undump_int(x); f->_font_dsize = x;
@@ -1728,7 +1728,7 @@ void undump_font_entry(texfont * f)
void undump_font(int f)
{
- integer x, i;
+ int x, i;
texfont *tt;
charinfo *ci;
char *s;
diff --git a/source/texk/web2c/luatexdir/font/texfont.h b/source/texk/web2c/luatexdir/font/texfont.h
index 97cfabd02f9ed1b67a5913eda6c7fdbfb547b6ae..7babc6c47abf1010e85ef24d657a20361cb14b08 100644
--- a/source/texk/web2c/luatexdir/font/texfont.h
+++ b/source/texk/web2c/luatexdir/font/texfont.h
@@ -33,13 +33,13 @@
# define pointer halfword
typedef struct liginfo {
- integer adj;
- integer lig;
+ int adj;
+ int lig;
char type;
} liginfo;
typedef struct kerninfo {
- integer adj;
+ int adj;
scaled sc;
} kerninfo;
@@ -58,16 +58,16 @@ typedef struct charinfo {
kerninfo *kerns; /* kern items */
eight_bits *packets; /* virtual commands. */
unsigned short index; /* CID index */
- integer remainder; /* spare value for odd items, could be union-ed with extensible */
+ int remainder; /* spare value for odd items, could be union-ed with extensible */
scaled width; /* width */
scaled height; /* height */
scaled depth; /* depth */
scaled italic; /* italic correction */
scaled top_accent; /* top accent alignment */
scaled bot_accent; /* bot accent alignment */
- integer ef; /* font expansion factor */
- integer lp; /* left protruding factor */
- integer rp; /* right protruding factor */
+ int ef; /* font expansion factor */
+ int lp; /* left protruding factor */
+ int rp; /* right protruding factor */
char tag; /* list / ext taginfo */
char used; /* char is typeset ? */
char *tounicode; /* unicode equivalent */
@@ -98,13 +98,13 @@ extern extinfo *copy_variants(extinfo * o);
extern extinfo *new_variant(int glyph, int startconnect, int endconnect,
int advance, int repeater);
-extern scaled_whd get_charinfo_whd(internal_font_number f, integer c);
+extern scaled_whd get_charinfo_whd(internal_font_number f, int c);
typedef struct texfont {
- integer _font_size;
- integer _font_dsize;
+ int _font_size;
+ int _font_dsize;
char *_font_name;
char *_font_area;
char *_font_filename;
@@ -113,51 +113,51 @@ typedef struct texfont {
char *_font_encodingname;
char *_font_cidregistry;
char *_font_cidordering;
- integer _font_cidversion;
- integer _font_cidsupplement;
+ int _font_cidversion;
+ int _font_cidsupplement;
- integer _font_ec;
+ int _font_ec;
unsigned _font_checksum; /* internal information */
char _font_used; /* internal information */
char _font_touched; /* internal information */
- integer _font_cache_id; /* internal information */
+ int _font_cache_id; /* internal information */
char _font_encodingbytes; /* 1 or 2 bytes */
- integer _font_slant; /* a slant in ppt */
- integer _font_extend; /* an extension in ppt, or 1000 */
+ int _font_slant; /* a slant in ppt */
+ int _font_extend; /* an extension in ppt, or 1000 */
char _font_tounicode; /* 1 if info is present */
fm_entry_ptr _font_map;
- integer _font_type;
- integer _font_format;
- integer _font_embedding;
- integer _font_bc;
- integer _hyphen_char;
- integer _skew_char;
- integer _font_natural_dir;
+ int _font_type;
+ int _font_format;
+ int _font_embedding;
+ int _font_bc;
+ int _hyphen_char;
+ int _skew_char;
+ int _font_natural_dir;
charinfo *_left_boundary;
charinfo *_right_boundary;
- integer _font_params;
+ int _font_params;
scaled *_param_base;
- integer _font_math_params;
+ int _font_math_params;
scaled *_math_param_base;
sa_tree characters;
- integer charinfo_count;
- integer charinfo_size;
+ int charinfo_count;
+ int charinfo_size;
charinfo *charinfo;
int *charinfo_cache;
- integer ligatures_disabled;
+ int ligatures_disabled;
- integer _pdf_font_num; /* maps to a PDF resource ID */
+ int _pdf_font_num; /* maps to a PDF resource ID */
scaled _pdf_font_size; /* maps to a PDF font size */
internal_font_number _pdf_font_blink; /* link to base font for expanded fonts */
internal_font_number _pdf_font_elink; /* link to expanded fonts for base font */
- integer _pdf_font_expand_ratio; /* expansion ratio of a particular font */
+ int _pdf_font_expand_ratio; /* expansion ratio of a particular font */
internal_font_number _pdf_font_shrink; /* font at limit of shrinking */
internal_font_number _pdf_font_stretch; /* font at limit of stretching */
- integer _pdf_font_step; /* amount of one step of expansion */
+ int _pdf_font_step; /* amount of one step of expansion */
boolean _pdf_font_auto_expand; /* this font is auto-expanded? */
str_number _pdf_font_attr; /* pointer to additional attributes */
} texfont;
@@ -206,14 +206,14 @@ extern char *font_embedding_strings[];
# define set_font_name(f,b) font_name(f) = b
# define tex_font_name(a) maketexstring(font_name(a))
-boolean cmp_font_name(integer, str_number);
+boolean cmp_font_name(int, str_number);
# define font_area(a) font_tables[a]->_font_area
# define get_font_area(a) (unsigned char *)font_area(a)
# define set_font_area(f,b) font_area(f) = b
# define tex_font_area(a) maketexstring(font_area(a))
-boolean cmp_font_area(integer, str_number);
+boolean cmp_font_area(int, str_number);
# define font_reassign(a,b) { if (a!=NULL) free(a); a = b; }
@@ -400,9 +400,9 @@ typedef enum {
top_left_kern = 4
} font_math_kern_codes;
-extern charinfo *get_charinfo(internal_font_number f, integer c);
-extern integer char_exists(internal_font_number f, integer c);
-extern charinfo *char_info(internal_font_number f, integer c);
+extern charinfo *get_charinfo(internal_font_number f, int c);
+extern int char_exists(internal_font_number f, int c);
+extern charinfo *char_info(internal_font_number f, int c);
/* Here is a quick way to test if a glyph exists, when you are
already certain the font |f| exists, and that the |c| is a regular
@@ -446,23 +446,23 @@ extern scaled get_charinfo_italic(charinfo * ci);
extern scaled get_charinfo_top_accent(charinfo * ci);
extern scaled get_charinfo_bot_accent(charinfo * ci);
extern char get_charinfo_tag(charinfo * ci);
-extern integer get_charinfo_remainder(charinfo * ci);
+extern int get_charinfo_remainder(charinfo * ci);
extern char get_charinfo_used(charinfo * ci);
-extern integer get_charinfo_index(charinfo * ci);
+extern int get_charinfo_index(charinfo * ci);
extern char *get_charinfo_name(charinfo * ci);
extern char *get_charinfo_tounicode(charinfo * ci);
extern liginfo *get_charinfo_ligatures(charinfo * ci);
extern kerninfo *get_charinfo_kerns(charinfo * ci);
extern eight_bits *get_charinfo_packets(charinfo * ci);
-extern integer get_charinfo_ef(charinfo * ci);
-extern integer get_charinfo_rp(charinfo * ci);
-extern integer get_charinfo_lp(charinfo * ci);
-extern integer get_charinfo_extensible(charinfo * ci, int which);
+extern int get_charinfo_ef(charinfo * ci);
+extern int get_charinfo_rp(charinfo * ci);
+extern int get_charinfo_lp(charinfo * ci);
+extern int get_charinfo_extensible(charinfo * ci, int which);
-extern integer ext_top(internal_font_number f, integer c);
-extern integer ext_bot(internal_font_number f, integer c);
-extern integer ext_rep(internal_font_number f, integer c);
-extern integer ext_mid(internal_font_number f, integer c);
+extern int ext_top(internal_font_number f, int c);
+extern int ext_bot(internal_font_number f, int c);
+extern int ext_rep(internal_font_number f, int c);
+extern int ext_mid(internal_font_number f, int c);
# define set_ligature_item(f,b,c,d) { f.type = b; f.adj = c; f.lig = d; }
@@ -508,30 +508,30 @@ extern integer ext_mid(internal_font_number f, integer c);
# define list_tag 2 /* character has a successor in a charlist */
# define ext_tag 3 /* character is extensible */
-extern scaled char_height(internal_font_number f, integer c);
-extern scaled char_width(internal_font_number f, integer c);
-extern scaled char_depth(internal_font_number f, integer c);
-extern scaled char_italic(internal_font_number f, integer c);
-extern scaled char_top_accent(internal_font_number f, integer c);
-extern scaled char_bot_accent(internal_font_number f, integer c);
+extern scaled char_height(internal_font_number f, int c);
+extern scaled char_width(internal_font_number f, int c);
+extern scaled char_depth(internal_font_number f, int c);
+extern scaled char_italic(internal_font_number f, int c);
+extern scaled char_top_accent(internal_font_number f, int c);
+extern scaled char_bot_accent(internal_font_number f, int c);
-extern liginfo *char_ligatures(internal_font_number f, integer c);
-extern kerninfo *char_kerns(internal_font_number f, integer c);
-extern eight_bits *char_packets(internal_font_number f, integer c);
+extern liginfo *char_ligatures(internal_font_number f, int c);
+extern kerninfo *char_kerns(internal_font_number f, int c);
+extern eight_bits *char_packets(internal_font_number f, int c);
# define has_lig(f,b) (char_exists(f,b) &&( char_ligatures(f,b) != NULL))
# define has_kern(f,b) (char_exists(f,b) && (char_kerns(f,b) != NULL))
# define has_packet(f,b) (char_exists(f,b) && (char_packets(f,b) != NULL))
-extern integer char_remainder(internal_font_number f, integer c);
-extern char char_tag(internal_font_number f, integer c);
-extern char char_used(internal_font_number f, integer c);
-extern char *char_name(internal_font_number f, integer c);
-extern integer char_index(internal_font_number f, integer c);
+extern int char_remainder(internal_font_number f, int c);
+extern char char_tag(internal_font_number f, int c);
+extern char char_used(internal_font_number f, int c);
+extern char *char_name(internal_font_number f, int c);
+extern int char_index(internal_font_number f, int c);
-scaled raw_get_kern(internalfontnumber f, integer lc, integer rc);
-scaled get_kern(internalfontnumber f, integer lc, integer rc);
-liginfo get_ligature(internalfontnumber f, integer lc, integer rc);
+scaled raw_get_kern(internalfontnumber f, int lc, int rc);
+scaled get_kern(internalfontnumber f, int lc, int rc);
+liginfo get_ligature(internalfontnumber f, int lc, int rc);
# define EXT_TOP 0
# define EXT_BOT 1
@@ -540,39 +540,39 @@ liginfo get_ligature(internalfontnumber f, integer lc, integer rc);
extern texfont **font_tables;
-integer new_font(void);
+int new_font(void);
extern void font_malloc_charinfo(internal_font_number f, int num);
-integer copy_font(integer id);
-integer scale_font(integer id, integer atsize);
-integer max_font_id(void);
-void set_max_font_id(integer id);
-integer new_font_id(void);
+int copy_font(int id);
+int scale_font(int id, int atsize);
+int max_font_id(void);
+void set_max_font_id(int id);
+int new_font_id(void);
void create_null_font(void);
-void delete_font(integer id);
-boolean is_valid_font(integer id);
+void delete_font(int id);
+boolean is_valid_font(int id);
void dump_font(int font_number);
void undump_font(int font_number);
-integer test_no_ligatures(internal_font_number f);
+int test_no_ligatures(internal_font_number f);
void set_no_ligatures(internal_font_number f);
-extern integer get_tag_code(internal_font_number f, integer c);
-extern integer get_lp_code(internal_font_number f, integer c);
-extern integer get_rp_code(internal_font_number f, integer c);
-extern integer get_ef_code(internal_font_number f, integer c);
+extern int get_tag_code(internal_font_number f, int c);
+extern int get_lp_code(internal_font_number f, int c);
+extern int get_rp_code(internal_font_number f, int c);
+extern int get_ef_code(internal_font_number f, int c);
-extern void set_tag_code(internal_font_number f, integer c, integer i);
-extern void set_lp_code(internal_font_number f, integer c, integer i);
-extern void set_rp_code(internal_font_number f, integer c, integer i);
-extern void set_ef_code(internal_font_number f, integer c, integer i);
+extern void set_tag_code(internal_font_number f, int c, int i);
+extern void set_lp_code(internal_font_number f, int c, int i);
+extern void set_rp_code(internal_font_number f, int c, int i);
+extern void set_ef_code(internal_font_number f, int c, int i);
int read_tfm_info(internal_font_number f, char *nom, scaled s);
/* from dofont.c */
-extern int read_font_info(pointer u, str_number nom, scaled s, integer ndir);
+extern int read_font_info(pointer u, str_number nom, scaled s, int ndir);
extern int find_font_id(char *nom, scaled s);
/* for and from vfpacket.c */
@@ -591,9 +591,9 @@ typedef enum { packet_char_code,
packet_end_code
} packet_command_codes;
-extern scaled store_scaled_f(scaled sq, integer fw);
+extern scaled store_scaled_f(scaled sq, int fw);
-extern void do_vf_packet(PDF pdf, internal_font_number vf_f, integer c);
+extern void do_vf_packet(PDF pdf, internal_font_number vf_f, int c);
extern int vf_packet_bytes(charinfo * co);
charinfo *copy_charinfo(charinfo * ci);
diff --git a/source/texk/web2c/luatexdir/font/tfmofm.c b/source/texk/web2c/luatexdir/font/tfmofm.c
index 5614afa5ede2a0eedd89cd3c833c1c368baaea8c..8c26bd8e6707f799b60f2f328f46e7587d8615c6 100644
--- a/source/texk/web2c/luatexdir/font/tfmofm.c
+++ b/source/texk/web2c/luatexdir/font/tfmofm.c
@@ -375,11 +375,11 @@ additional parameter information, which is explained later.
xfree(xligs); xfree(xkerns); return 1; }
-int open_tfm_file(char *nom, unsigned char **tfm_buf, integer * tfm_siz)
+int open_tfm_file(char *nom, unsigned char **tfm_buf, int *tfm_siz)
{
boolean res; /* was the callback successful? */
boolean opened; /* was |tfm_file| successfully opened? */
- integer callback_id;
+ int callback_id;
FILE *tfm_file;
char *fname = luatex_find_file(nom, find_font_file_callback);
if (!fname)
@@ -517,7 +517,7 @@ scaled store_scaled_f(scaled sq, scaled z_in)
{
eight_bits a, b, c, d;
scaled sw;
- static integer alpha, beta; /* beta:1..16 */
+ static int alpha, beta; /* beta:1..16 */
static scaled z, z_prev = 0;
/* @<Replace |z| by $|z|^\prime$ and compute $\alpha,\beta$@>; */
if (z_in != z_prev || z_prev == 0) {
@@ -564,46 +564,46 @@ scaled store_scaled_f(scaled sq, scaled z_in)
}
typedef struct tfmcharacterinfo {
- integer _kern_index;
- integer _lig_index;
- integer _width_index;
- integer _height_index;
- integer _depth_index;
- integer _italic_index;
- integer _remainder;
+ int _kern_index;
+ int _lig_index;
+ int _width_index;
+ int _height_index;
+ int _depth_index;
+ int _italic_index;
+ int _remainder;
unsigned char _tag;
} tfmcharacterinfo;
int read_tfm_info(internalfontnumber f, char *cnom, scaled s)
{
- integer k; /* index into |font_info| */
+ int k; /* index into |font_info| */
halfword lf, lh, bc, ec, nw, nh, nd, ni, nl, nk, ne, np, slh; /* sizes of subfiles */
scaled *widths, *heights, *depths, *italics, *kerns;
halfword font_dir;
- integer a, b, c, d; /* byte variables */
- integer i; /* counter */
- integer font_level, header_length;
- integer nco, ncw, npc, nlw, neew;
+ int a, b, c, d; /* byte variables */
+ int i; /* counter */
+ int font_level, header_length;
+ int nco, ncw, npc, nlw, neew;
tfmcharacterinfo ci;
charinfo *co;
four_quarters qw;
four_quarters *lig_kerns, *extens;
scaled sw; /* accumulators */
- integer bch_label; /* left boundary start location, or infinity */
+ int bch_label; /* left boundary start location, or infinity */
int bchar; /* :0..too_big_char; *//* right boundary character, or |too_big_char| */
- integer first_two;
+ int first_two;
scaled z; /* the design size or the ``at'' size */
- integer alpha;
+ int alpha;
char beta; /* :1..16 */
- integer *xligs, *xkerns; /* aux. for ligkern processing */
+ int *xligs, *xkerns; /* aux. for ligkern processing */
liginfo *cligs;
kerninfo *ckerns;
int fligs, fkerns;
char *tmpnam;
- integer tfm_byte = 0; /* index into |tfm_buffer| */
- integer saved_tfm_byte = 0; /* saved index into |tfm_buffer| */
+ int tfm_byte = 0; /* index into |tfm_buffer| */
+ int saved_tfm_byte = 0; /* saved index into |tfm_buffer| */
unsigned char *tfm_buffer = NULL; /* byte buffer for tfm files */
- integer tfm_size = 0; /* total size of the tfm file */
+ int tfm_size = 0; /* total size of the tfm file */
widths = NULL;
heights = NULL;
@@ -1001,8 +1001,8 @@ int read_tfm_info(internalfontnumber f, char *cnom, scaled s)
/* first pass: count ligs and kerns */
- xligs = xcalloc((ec + 1), sizeof(integer));
- xkerns = xcalloc((ec + 1), sizeof(integer));
+ xligs = xcalloc((ec + 1), sizeof(int));
+ xkerns = xcalloc((ec + 1), sizeof(int));
for (i = bc; i <= ec; i++) {
if (char_tag(f, i) == lig_tag) {
diff --git a/source/texk/web2c/luatexdir/font/tounicode.c b/source/texk/web2c/luatexdir/font/tounicode.c
index 9f98b1aec9f9d392b9a896c2fd15fab35b6c7cc9..e20c1543a1885de3987767ed2ebad368ce174f00 100644
--- a/source/texk/web2c/luatexdir/font/tounicode.c
+++ b/source/texk/web2c/luatexdir/font/tounicode.c
@@ -65,7 +65,7 @@ void glyph_unicode_free(void)
void def_tounicode(str_number glyph, str_number unistr)
{
- char buf[SMALL_BUF_SIZE], *p ,*ph;
+ char buf[SMALL_BUF_SIZE], *p, *ph;
char buf2[SMALL_BUF_SIZE], *q;
int valid_unistr; /* 0: invalid; 1: unicode value; 2: string */
int i, l;
@@ -310,13 +310,13 @@ static void set_cid_glyph_unicode(long index, glyph_unicode_entry * gp,
}
-integer write_tounicode(PDF pdf, char **glyph_names, char *name)
+int write_tounicode(PDF pdf, char **glyph_names, char *name)
{
char buf[SMALL_BUF_SIZE], *p;
static char builtin_suffix[] = "-builtin";
short range_size[257];
glyph_unicode_entry gtab[257];
- integer objnum;
+ int objnum;
int i, j;
int bfchar_count, bfrange_count, subrange_count;
assert(strlen(name) + strlen(builtin_suffix) < SMALL_BUF_SIZE);
@@ -458,12 +458,12 @@ integer write_tounicode(PDF pdf, char **glyph_names, char *name)
return objnum;
}
-integer write_cid_tounicode(PDF pdf, fo_entry * fo, internalfontnumber f)
+int write_cid_tounicode(PDF pdf, fo_entry * fo, internalfontnumber f)
{
int range_size[65537];
glyph_unicode_entry gtab[65537];
- integer objnum;
+ int objnum;
int i, j, k;
int bfchar_count, bfrange_count, subrange_count;
char *buf;
diff --git a/source/texk/web2c/luatexdir/font/vfovf.c b/source/texk/web2c/luatexdir/font/vfovf.c
index f662fa1af19fea2cc81f11031ef16ad8f568fb86..33bdf829377b7cdc15eb32a21cd21803b9650208 100644
--- a/source/texk/web2c/luatexdir/font/vfovf.c
+++ b/source/texk/web2c/luatexdir/font/vfovf.c
@@ -155,10 +155,10 @@ boolean auto_expand_vf(internal_font_number f); /* forward */
#define vf_read(k, l) \
{ \
- integer itmp = 0, dtmp = k, jtmp = 0; \
+ int itmp = 0, dtmp = k, jtmp = 0; \
while (dtmp > 0) { \
vf_byte(jtmp); \
- if ((dtmp == (integer) k) && jtmp > 127) \
+ if ((dtmp == (int) k) && jtmp > 127) \
jtmp = jtmp - 256; \
itmp = itmp * 256 + jtmp; \
decr(dtmp); \
@@ -184,7 +184,7 @@ void pdf_check_vf(internal_font_number f)
static void
vf_local_font_warning(internal_font_number f, internal_font_number k, char *s,
- integer a, integer b)
+ int a, int b)
{
print_nlp();
tprint(s);
@@ -203,14 +203,14 @@ vf_local_font_warning(internal_font_number f, internal_font_number k, char *s,
/* process a local font in \.{VF} file */
internal_font_number
-vf_def_font(internal_font_number f, unsigned char *vf_buffer, integer * vf_cr)
+vf_def_font(internal_font_number f, unsigned char *vf_buffer, int *vf_cr)
{
internal_font_number k;
str_number s;
scaled ds, fs;
four_quarters cs;
memory_word tmp_w; /* accumulator */
- integer junk;
+ int junk;
unsigned long checksum;
cs.b0 = vf_buffer[(*vf_cr)];
cs.b1 = vf_buffer[(*vf_cr) + 1];
@@ -254,7 +254,7 @@ vf_def_font(internal_font_number f, unsigned char *vf_buffer, integer * vf_cr)
tmp_b0--;
(*vf_cr)++; /* skip the font path */
}
- str_room((unsigned)tmp_b1);
+ str_room((unsigned) tmp_b1);
while (tmp_b1 > 0) {
tmp_b1--;
junk = vf_buffer[(*vf_cr)];
@@ -283,10 +283,10 @@ vf_def_font(internal_font_number f, unsigned char *vf_buffer, integer * vf_cr)
}
-int open_vf_file(char *fn, unsigned char **vbuffer, integer * vsize)
+int open_vf_file(char *fn, unsigned char **vbuffer, int *vsize)
{
boolean res; /* was the callback successful? */
- integer callback_id;
+ int callback_id;
boolean file_read = false; /* was |vf_file| successfully read? */
FILE *vf_file;
char *fname = luatex_find_file(fn, find_vf_file_callback);
@@ -647,27 +647,27 @@ int count_packet_bytes(eight_bits * vf_buf, int cur_bute, int count)
void do_vf(internal_font_number f)
{
- integer k, i;
+ int k, i;
unsigned cmd, n;
scaled x, y, w, z, h, v;
- integer cc, cmd_length, packet_length;
+ int cc, cmd_length, packet_length;
charinfo *co;
scaled tfm_width;
- integer save_cur_byte;
+ int save_cur_byte;
vf_stack_index stack_level;
- integer vf_z; /* multiplier */
- integer vf_alpha; /* correction for negative values */
+ int vf_z; /* multiplier */
+ int vf_alpha; /* correction for negative values */
char vf_beta; /* divisor */
- integer vf_np;
+ int vf_np;
eight_bits *vpackets;
memory_word tmp_w; /* accumulator */
vf_stack_record vf_stack[256];
- integer junk;
+ int junk;
unsigned char *vf_buffer;
- integer vf_size;
- integer vf_cur;
- integer *vf_local_fnts = NULL; /* external font ids */
- integer *vf_real_fnts = NULL; /* internal font ids */
+ int vf_size;
+ int vf_cur;
+ int *vf_local_fnts = NULL; /* external font ids */
+ int *vf_real_fnts = NULL; /* internal font ids */
unsigned vf_nf = 0; /* local font counter */
if (font_type(f) != unknown_font_type)
@@ -721,7 +721,7 @@ void do_vf(internal_font_number f)
vf_byte(cmd);
/* malloc and fill the local font arrays */
if (vf_nf > 0) {
- i = vf_nf * sizeof(integer);
+ i = vf_nf * sizeof(int);
vf_local_fnts = xmalloc(i);
memset(vf_local_fnts, 0, i);
vf_real_fnts = xmalloc(i);
@@ -1031,25 +1031,25 @@ void do_vf(internal_font_number f)
int make_vf_table(lua_State * L, char *cnom, scaled atsize)
{
- integer cmd, k, i;
- integer cc, cmd_length, packet_length;
+ int cmd, k, i;
+ int cc, cmd_length, packet_length;
scaled tfm_width;
vf_stack_index stack_level;
- integer vf_z; /* multiplier */
- integer vf_alpha; /* correction for negative values */
+ int vf_z; /* multiplier */
+ int vf_alpha; /* correction for negative values */
char vf_beta; /* divisor */
char *s;
scaled h, v;
scaled w, x, y, z;
- integer s_top; /* lua stack */
- integer vf_nf; /* local font counter */
+ int s_top; /* lua stack */
+ int vf_nf; /* local font counter */
scaled ds, fs;
four_quarters cs;
memory_word tmp_w; /* accumulator */
vf_stack_record vf_stack[256];
unsigned char *vf_buffer;
- integer vf_size;
- integer vf_cur;
+ int vf_size;
+ int vf_cur;
stack_level = 0;
@@ -1394,9 +1394,9 @@ boolean auto_expand_vf(internal_font_number f)
{
internal_font_number bf;
- integer e, k;
- integer *vf_old_fonts, *vf_new_fonts;
- integer num = 0;
+ int e, k;
+ int *vf_old_fonts, *vf_new_fonts;
+ int num = 0;
if ((!pdf_font_auto_expand(f)) || (pdf_font_blink(f) == null_font))
return false; /* not an auto-expanded font */
@@ -1409,7 +1409,7 @@ boolean auto_expand_vf(internal_font_number f)
vf_old_fonts = packet_local_fonts(bf, &num);
if (num > 0) {
- vf_new_fonts = xmalloc(num * sizeof(integer));
+ vf_new_fonts = xmalloc(num * sizeof(int));
for (k = 0; k < num; k++) {
vf_new_fonts[k] = auto_expand_font(vf_old_fonts[k], e);
copy_expand_params(vf_new_fonts[k], vf_old_fonts[k], e);
@@ -1422,7 +1422,7 @@ boolean auto_expand_vf(internal_font_number f)
return true;
}
-str_number expand_font_name(internal_font_number f, integer e)
+str_number expand_font_name(internal_font_number f, int e)
{
int old_setting;
old_setting = selector;
@@ -1437,13 +1437,13 @@ str_number expand_font_name(internal_font_number f, integer e)
}
-internal_font_number auto_expand_font(internal_font_number f, integer e)
+internal_font_number auto_expand_font(internal_font_number f, int e)
{
internal_font_number k;
kerninfo *krn;
charinfo *co;
char *fn;
- integer i;
+ int i;
scaled w;
k = copy_font(f);
i = strlen(font_name(f)) + 12;
@@ -1473,8 +1473,8 @@ internal_font_number auto_expand_font(internal_font_number f, integer e)
void vf_expand_local_fonts(internal_font_number f)
{
internal_font_number lf;
- integer k, num;
- integer *vf_old_fonts;
+ int k, num;
+ int *vf_old_fonts;
pdfassert(font_type(f) == virtual_font_type);
num = 0;
vf_old_fonts = packet_local_fonts(f, &num);
@@ -1493,15 +1493,15 @@ void vf_expand_local_fonts(internal_font_number f)
}
internal_font_number
-letter_space_font(halfword u, internal_font_number f, integer e)
+letter_space_font(halfword u, internal_font_number f, int e)
{
internal_font_number k;
scaled w, r;
char *new_font_name;
- integer vf_z;
- integer vf_alpha;
- integer vf_beta;
+ int vf_z;
+ int vf_alpha;
+ int vf_beta;
memory_word tmp_w; /* accumulator */
diff --git a/source/texk/web2c/luatexdir/font/vfpacket.c b/source/texk/web2c/luatexdir/font/vfpacket.c
index 2207da69fcad5dfd8e7a136189ef7034f1bc3ad7..02b97eebee240bd7d7491671efcd7cd6d5fda85a 100644
--- a/source/texk/web2c/luatexdir/font/vfpacket.c
+++ b/source/texk/web2c/luatexdir/font/vfpacket.c
@@ -59,7 +59,7 @@ static packet_stack_index packet_stack_ptr = 0; /* pointer into |packet_stack| *
fw = fw*256 + do_packet_byte(); \
fw = fw*256 + do_packet_byte(); }
-#define packet_scaled(a,fs) { integer fw; \
+#define packet_scaled(a,fs) { int fw; \
fw = do_packet_byte(); \
if (fw>127) fw = fw - 256; \
fw = fw*256 + do_packet_byte(); \
@@ -72,7 +72,7 @@ static packet_stack_index packet_stack_ptr = 0; /* pointer into |packet_stack| *
int vf_packet_bytes(charinfo * co)
{
eight_bits *vf_packets;
- integer cur_packet_byte;
+ int cur_packet_byte;
unsigned k;
int cmd;
@@ -123,14 +123,14 @@ char *packet_command_names[] = {
};
-void do_vf_packet(PDF pdf, internal_font_number vf_f, integer c)
+void do_vf_packet(PDF pdf, internal_font_number vf_f, int c)
{
internal_font_number lf;
charinfo *co;
scaledpos cur = { 0, 0 }, size;
eight_bits *vf_packets;
- integer cur_packet_byte;
- integer cmd, fs_f;
+ int cur_packet_byte;
+ int cmd, fs_f;
scaled i;
unsigned k;
str_number s;
@@ -208,7 +208,7 @@ void do_vf_packet(PDF pdf, internal_font_number vf_f, integer c)
break;
case packet_special_code:
packet_number(k);
- str_room((unsigned)k);
+ str_room((unsigned) k);
while (k > 0) {
k--;
append_char(do_packet_byte());
@@ -236,11 +236,11 @@ void do_vf_packet(PDF pdf, internal_font_number vf_f, integer c)
pdf->posstruct = refpos;
}
-integer *packet_local_fonts(internal_font_number f, integer * num)
+int *packet_local_fonts(internal_font_number f, int *num)
{
int c, cmd, cur_packet_byte, lf, k, l, i;
- integer localfonts[256] = { 0 };
- integer *lfs;
+ int localfonts[256] = { 0 };
+ int *lfs;
charinfo *co;
eight_bits *vf_packets;
@@ -295,8 +295,8 @@ integer *packet_local_fonts(internal_font_number f, integer * num)
}
*num = k;
if (k > 0) {
- lfs = xmalloc(k * sizeof(integer));
- memcpy(lfs, localfonts, k * sizeof(integer));
+ lfs = xmalloc(k * sizeof(int));
+ memcpy(lfs, localfonts, k * sizeof(int));
return lfs;
}
return NULL;
@@ -304,8 +304,8 @@ integer *packet_local_fonts(internal_font_number f, integer * num)
void
-replace_packet_fonts(internal_font_number f, integer * old_fontid,
- integer * new_fontid, int count)
+replace_packet_fonts(internal_font_number f, int *old_fontid,
+ int *new_fontid, int count)
{
int c, cmd, cur_packet_byte, lf, k, l;
charinfo *co;
diff --git a/source/texk/web2c/luatexdir/font/writecff.c b/source/texk/web2c/luatexdir/font/writecff.c
index c5f821ed12da1caf44bb1e9a6d3ab507837acbdc..5c0f6381ced218181c191d0575dcfa7846fc325c 100644
--- a/source/texk/web2c/luatexdir/font/writecff.c
+++ b/source/texk/web2c/luatexdir/font/writecff.c
@@ -3390,7 +3390,7 @@ void write_cid_cff(PDF pdf, cff_font * cffont, fd_entry * fd)
* I have defined a utility function in luafflib.c that does exactly that.
* If it works out ok, I will clean up this code.
*/
-extern int ff_createcff(char *, unsigned char **, integer *); /* libs/luafontforge/src/luafflib.c */
+extern int ff_createcff(char *, unsigned char **, int *); /* libs/luafontforge/src/luafflib.c */
void writetype1w(PDF pdf, fd_entry * fd)
{
@@ -3399,7 +3399,7 @@ void writetype1w(PDF pdf, fd_entry * fd)
FILE *fp;
ff_entry *ff;
unsigned char *tfm_buffer = NULL;
- integer tfm_size = 0;
+ int tfm_size = 0;
ff = check_ff_exist(fd->fm->ff_name, 0);
diff --git a/source/texk/web2c/luatexdir/font/writeenc.c b/source/texk/web2c/luatexdir/font/writeenc.c
index 6e07c84e48c2e4d335b18c4bf0b7afa64810e0ac..a1077ffb2a03420331b4780f5070a3a6b834f330 100644
--- a/source/texk/web2c/luatexdir/font/writeenc.c
+++ b/source/texk/web2c/luatexdir/font/writeenc.c
@@ -88,7 +88,7 @@ fe_entry *get_fe_entry(char *s)
/**********************************************************************/
-void epdf_write_enc(PDF pdf, char **glyph_names, integer fe_objnum)
+void epdf_write_enc(PDF pdf, char **glyph_names, int fe_objnum)
{
int i, i_old;
assert(glyph_names != NULL);
@@ -113,7 +113,7 @@ void epdf_write_enc(PDF pdf, char **glyph_names, integer fe_objnum)
}
void write_enc(PDF pdf, char **glyph_names, struct avl_table *tx_tree,
- integer fe_objnum)
+ int fe_objnum)
{
int i_old, *p;
struct avl_traverser t;
diff --git a/source/texk/web2c/luatexdir/font/writefont.c b/source/texk/web2c/luatexdir/font/writefont.c
index b5c2aedbf3431c82d883568c91a01bbaa03e9d5f..7771dd4f38f0afa22682cd320b30eacdc47763ea 100644
--- a/source/texk/web2c/luatexdir/font/writefont.c
+++ b/source/texk/web2c/luatexdir/font/writefont.c
@@ -27,7 +27,7 @@ static const char _svn_version[] =
void write_cid_fontdictionary(PDF pdf, fo_entry * fo, internalfontnumber f);
void create_cid_fontdictionary(PDF pdf,
- fm_entry * fm, integer font_objnum,
+ fm_entry * fm, int font_objnum,
internalfontnumber f);
const key_entry font_key[FONT_KEYS_NUM] = {
@@ -229,7 +229,7 @@ static void write_fontname_object(PDF pdf, fd_entry * fd)
/**********************************************************************/
-fd_entry *lookup_fd_entry(char *s, integer extend)
+fd_entry *lookup_fd_entry(char *s, int extend)
{
fd_entry fd;
fm_entry fm;
@@ -279,13 +279,13 @@ void create_fontdescriptor(fo_entry * fo, internalfontnumber f)
assert(fo->fd->gl_tree != NULL);
}
-integer get_fd_objnum(fd_entry * fd)
+int get_fd_objnum(fd_entry * fd)
{
assert(fd->fd_objnum != 0);
return fd->fd_objnum;
}
-integer get_fn_objnum(PDF pdf, fd_entry * fd)
+int get_fn_objnum(PDF pdf, fd_entry * fd)
{
if (fd->fn_objnum == 0)
fd->fn_objnum = pdf_new_objnum(pdf);
@@ -686,7 +686,7 @@ void write_fontstuff(PDF pdf)
/**********************************************************************/
-void create_fontdictionary(PDF pdf, fm_entry * fm, integer font_objnum,
+void create_fontdictionary(PDF pdf, fm_entry * fm, int font_objnum,
internalfontnumber f)
{
fo_entry *fo = new_fo_entry();
@@ -769,7 +769,7 @@ static int has_ttf_outlines(fm_entry * fm)
extern char *FindResourceTtfFont(char *filename, char *fontname);
-void do_pdf_font(PDF pdf, integer font_objnum, internalfontnumber f)
+void do_pdf_font(PDF pdf, int font_objnum, internalfontnumber f)
{
int del_file = 0;
fm_entry *fm;
@@ -984,7 +984,7 @@ static void write_cid_charwidth_array(PDF pdf, fo_entry * fo)
void create_cid_fontdictionary(PDF pdf,
- fm_entry * fm, integer font_objnum,
+ fm_entry * fm, int font_objnum,
internalfontnumber f)
{
fo_entry *fo = new_fo_entry();
diff --git a/source/texk/web2c/luatexdir/font/writet1.c b/source/texk/web2c/luatexdir/font/writet1.c
index 8d34597e96f8f7ea96df364687f321d7f9516edf..eb3c9d6eacb3469d168f8b1d9fad29b0db4ed8b4 100644
--- a/source/texk/web2c/luatexdir/font/writet1.c
+++ b/source/texk/web2c/luatexdir/font/writet1.c
@@ -44,13 +44,13 @@ static const char _svn_version[] =
strncpy(pdf->fb_array + t1_fontname_offset, fm_cur->subset_tag, 6)
#define fixedcontent false
-integer t1_length1, t1_length2, t1_length3;
-static integer t1_save_offset;
-static integer t1_fontname_offset;
+int t1_length1, t1_length2, t1_length3;
+static int t1_save_offset;
+static int t1_fontname_offset;
static unsigned char *t1_buffer = NULL;
-static integer t1_size = 0;
-static integer t1_curbyte = 0;
+static int t1_size = 0;
+static int t1_curbyte = 0;
#define t1_read_file() \
readbinfile(t1_file,&t1_buffer,&t1_size)
@@ -69,8 +69,8 @@ static integer t1_curbyte = 0;
#define t1_cleartomark() t1_prefix("cleartomark")
static unsigned char *enc_buffer = NULL;
-static integer enc_size = 0;
-static integer enc_curbyte = 0;
+static int enc_size = 0;
+static int enc_curbyte = 0;
#define enc_open(a) \
(enc_file = fopen((char *)(a), FOPEN_RBIN_MODE))
@@ -1062,7 +1062,7 @@ static void cs_store(boolean is_subr)
#define CC_STACK_SIZE 24
-static integer cc_stack[CC_STACK_SIZE], *stack_ptr = cc_stack;
+static int cc_stack[CC_STACK_SIZE], *stack_ptr = cc_stack;
static cc_entry cc_tab[CS_MAX];
static boolean is_cc_init = false;
@@ -1078,22 +1078,6 @@ static boolean is_cc_init = false;
goto cs_error; \
}
-/*
-static integer cc_get(integer index)
-{
- if (index < 0) {
- if (stack_ptr + index < cc_stack )
- stack_error(stack_ptr - cc_stack + index);
- return *(stack_ptr + index);
- }
- else {
- if (cc_stack + index >= stack_ptr)
- stack_error(index);
- return cc_stack[index];
- }
-}
-*/
-
#define cc_get(N) ((N) < 0 ? *(stack_ptr + (N)) : *(cc_stack + (N)))
#define cc_push(V) *stack_ptr++ = V
@@ -1200,10 +1184,10 @@ static void cs_mark(const char *cs_name, int subr)
byte *data;
int i, b, cs_len;
int last_cmd = 0;
- integer a, a1, a2;
+ int a, a1, a2;
unsigned short cr;
- static integer lastargOtherSubr3 = 3; /* the argument of last call to
- OtherSubrs[3] */
+ static int lastargOtherSubr3 = 3; /* the argument of last call to
+ OtherSubrs[3] */
cs_entry *ptr;
cc_entry *cc;
if (cs_name == NULL) {
@@ -1255,7 +1239,7 @@ static void cs_mark(const char *cs_name, int subr)
a |= (cs_getchar() & 0xff) << 16;
a |= (cs_getchar() & 0xff) << 8;
a |= (cs_getchar() & 0xff) << 0;
- if (sizeof(integer) > 4 && (a & 0x80000000))
+ if (sizeof(int) > 4 && (a & 0x80000000))
a |= ~0x7FFFFFFF;
}
cc_push(a);
diff --git a/source/texk/web2c/luatexdir/font/writet3.c b/source/texk/web2c/luatexdir/font/writet3.c
index d3241d423d67f7776a282bcdbf208324fa6abd52..20827f3764436871d4c74ebeb51baf8e6833b171 100644
--- a/source/texk/web2c/luatexdir/font/writet3.c
+++ b/source/texk/web2c/luatexdir/font/writet3.c
@@ -35,24 +35,24 @@ define_array(t3_line);
FILE *t3_file;
static boolean t3_image_used;
-static integer t3_char_procs[256];
+static int t3_char_procs[256];
static float t3_char_widths[256];
static int t3_glyph_num;
static float t3_font_scale;
-static integer t3_b0, t3_b1, t3_b2, t3_b3;
+static int t3_b0, t3_b1, t3_b2, t3_b3;
static boolean is_pk_font;
/* not static because used by pkin.c */
unsigned char *t3_buffer = NULL;
-integer t3_size = 0;
-integer t3_curbyte = 0;
+int t3_size = 0;
+int t3_curbyte = 0;
#define t3_check_eof() \
if (t3_eof()) \
pdftex_fail("unexpected end of file");
-static void update_bbox(integer llx, integer lly, integer urx, integer ury,
+static void update_bbox(int llx, int lly, int urx, int ury,
boolean is_first_glyph)
{
if (is_first_glyph) {
@@ -72,8 +72,8 @@ static void update_bbox(integer llx, integer lly, integer urx, integer ury,
}
}
-static integer get_pk_font_scale(internalfontnumber f, int precision,
- int scale_factor)
+static int get_pk_font_scale(internalfontnumber f, int precision,
+ int scale_factor)
{
return
divide_scaled(scale_factor,
@@ -81,8 +81,8 @@ static integer get_pk_font_scale(internalfontnumber f, int precision,
precision + 2), 0);
}
-static integer pk_char_width(internalfontnumber f, scaled w, int precision,
- int scale_factor)
+static int pk_char_width(internalfontnumber f, scaled w, int precision,
+ int scale_factor)
{
return
divide_scaled(divide_scaled(w, pdf_font_size(f), 7),
@@ -92,14 +92,14 @@ static integer pk_char_width(internalfontnumber f, scaled w, int precision,
static boolean writepk(PDF pdf, internal_font_number f)
{
kpse_glyph_file_type font_ret;
- integer llx, lly, urx, ury;
- integer cw, rw, i, j;
+ int llx, lly, urx, ury;
+ int cw, rw, i, j;
halfword *row;
char *name;
char *ftemp = NULL;
chardesc cd;
boolean is_null_glyph, check_preamble;
- integer dpi;
+ int dpi;
int callback_id = 0;
int file_opened = 0;
int mallocsize = 0;
@@ -225,9 +225,9 @@ void writet3(PDF pdf, int objnum, internalfontnumber f)
{
int i;
- integer wptr, eptr, cptr;
+ int wptr, eptr, cptr;
int first_char, last_char;
- integer pk_font_scale;
+ int pk_font_scale;
boolean is_notdef;
t3_glyph_num = 0;
diff --git a/source/texk/web2c/luatexdir/font/writettf.c b/source/texk/web2c/luatexdir/font/writettf.c
index d66d6f4dac90fbcd772db78358627152cc95c143..12dd26ef94f872f91fa8aaff4cd6cb84aa438b8f 100644
--- a/source/texk/web2c/luatexdir/font/writettf.c
+++ b/source/texk/web2c/luatexdir/font/writettf.c
@@ -35,8 +35,8 @@ static const char _svn_version[] =
/* #define INFILE ttf_file */
unsigned char *ttf_buffer = NULL;
-integer ttf_size = 0;
-integer ttf_curbyte = 0;
+int ttf_size = 0;
+int ttf_curbyte = 0;
typedef struct {
char *name; /* name of glyph */
@@ -94,7 +94,7 @@ fd_entry *fd_cur; /* pointer to the current font descriptor */
static struct avl_table *ttf_cmap_tree = NULL;
-integer ttf_length;
+int ttf_length;
#include "macnames.c"
@@ -926,7 +926,7 @@ static void ttf_write_dirtab(PDF pdf)
dirtab_entry *tab;
TTF_ULONG i, k;
char *p;
- const integer save_offset = ttf_offset();
+ const int save_offset = ttf_offset();
ttf_seek_outbuf(TABDIR_OFF);
if (is_subsetted(fd_cur->fm)) {
for (i = 0; i < DEFAULT_NTABS; i++) {
diff --git a/source/texk/web2c/luatexdir/font/writettf.h b/source/texk/web2c/luatexdir/font/writettf.h
index dfac3bf054100983f26df4ad10059919a1ca4544..d04542524dbbc23fab7fed26208512f301b315ba 100644
--- a/source/texk/web2c/luatexdir/font/writettf.h
+++ b/source/texk/web2c/luatexdir/font/writettf.h
@@ -146,8 +146,8 @@ typedef struct {
extern fd_entry *fd_cur; /* pointer to the current font descriptor */
extern unsigned char *ttf_buffer;
-extern integer ttf_size;
-extern integer ttf_curbyte;
+extern int ttf_size;
+extern int ttf_curbyte;
extern glyph_entry *glyph_tab;
extern dirtab_entry *dir_tab;
extern dirtab_entry *ttf_name_lookup(const char *s, boolean required);
diff --git a/source/texk/web2c/luatexdir/font/writetype2.c b/source/texk/web2c/luatexdir/font/writetype2.c
index 53be084cfe5f10b7613d6aadf0cae4ef6198b7dc..e6c17a938bdfc973048427add089de6509bc9960 100644
--- a/source/texk/web2c/luatexdir/font/writetype2.c
+++ b/source/texk/web2c/luatexdir/font/writetype2.c
@@ -28,8 +28,7 @@ static const char _svn_version[] =
"$Id$ $URL$";
/* forward*/
-void make_tt_subset(PDF pdf, fd_entry * fd, unsigned char *buffer,
- integer buflen);
+void make_tt_subset(PDF pdf, fd_entry * fd, unsigned char *buffer, int buflen);
unsigned long cidtogid_obj = 0;
@@ -254,8 +253,7 @@ unsigned long ttc_read_offset(sfnt * sfont, int ttc_idx)
extern int ff_get_ttc_index(char *ffname, char *psname); /* libs/luafontforge/src/luafflib.c */
-void make_tt_subset(PDF pdf, fd_entry * fd, unsigned char *buffer,
- integer buflen)
+void make_tt_subset(PDF pdf, fd_entry * fd, unsigned char *buffer, int buflen)
{
long i, cid;
diff --git a/source/texk/web2c/luatexdir/image/epdf.h b/source/texk/web2c/luatexdir/image/epdf.h
index 1d35178a18ac7df9fbc93b6acaf7bffbf5b9d54d..170f678ebf20f591058d2baf767353401cefa4fc 100644
--- a/source/texk/web2c/luatexdir/image/epdf.h
+++ b/source/texk/web2c/luatexdir/image/epdf.h
@@ -38,7 +38,6 @@ extern "C" {
#endif
#include <web2c/c-auto.h> /* define SIZEOF_LONG */
-#include <web2c/config.h> /* define type integer */
#define xfree(p) do { if (p != NULL) free(p); p = NULL; } while (0)
@@ -47,22 +46,21 @@ extern "C" {
#include "../utils/avlstuff.h"
#include "../pdf/pdftypes.h"
- extern void pdf_room(PDF, integer);
+ extern void pdf_room(PDF, int);
#define pdf_out(B,A) do { pdf_room(B,1); B->buf[B->ptr++] = A; } while (0)
extern void unrefPdfDocument(char *);
extern void *epdf_xref;
- extern integer epdf_lastGroupObjectNum;
- extern integer pool_ptr;
+ extern int epdf_lastGroupObjectNum;
+ extern int pool_ptr;
extern char notdef[];
extern int is_subsetable(struct fm_entry *);
extern struct fm_entry *lookup_fontmap(char *);
- extern integer get_fontfile(struct fm_entry *);
- extern integer get_fontname(struct fm_entry *);
- extern integer pdf_new_objnum(PDF);
- extern void read_pdf_info(PDF, image_dict *, integer, integer,
- img_readtype_e);
+ extern int get_fontfile(struct fm_entry *);
+ extern int get_fontname(struct fm_entry *);
+ extern int pdf_new_objnum(PDF);
+ extern void read_pdf_info(PDF, image_dict *, int, int, img_readtype_e);
extern void embed_whole_font(struct fd_entry *);
extern void epdf_check_mem(void);
extern void epdf_free(void);
@@ -80,7 +78,7 @@ extern "C" {
extern void write_epdf(PDF, image_dict *);
extern void write_additional_epdf_objects(PDF, char *);
- extern void pdf_begin_obj(PDF, integer, bool);
+ extern void pdf_begin_obj(PDF, int, bool);
/* epdf.c */
extern void epdf_mark_glyphs(struct fd_entry *, char *);
@@ -90,7 +88,7 @@ extern "C" {
extern int get_fn_objnum(PDF, struct fd_entry *);
/* write_enc.c */
- extern void epdf_write_enc(PDF, char **, integer);
+ extern void epdf_write_enc(PDF, char **, int);
/* utils.c */
extern char *convertStringToPDFString(char *in, int len);
diff --git a/source/texk/web2c/luatexdir/image/image.h b/source/texk/web2c/luatexdir/image/image.h
index 1bf5fdab72fef88e3f5684f6b9ac960b2c99169f..5a32d6e8df7ee347398d3774f56af7a4ea535043 100644
--- a/source/texk/web2c/luatexdir/image/image.h
+++ b/source/texk/web2c/luatexdir/image/image.h
@@ -34,8 +34,8 @@
# define IMAGE_COLOR_C 2
# define IMAGE_COLOR_I 4
-extern integer zround(double); /* from zround.c */
-# define bp2int(p) zround(p * (one_hundred_bp / 100.0))
+extern int do_zround (double r); /* from utils.c */
+# define bp2int(p) do_zround(p * (one_hundred_bp / 100.0))
# define int2bp(i) (i * 100.0 / one_hundred_bp)
# define TYPE_IMG "image"
@@ -84,21 +84,21 @@ typedef enum { PDF_BOX_SPEC_NONE, PDF_BOX_SPEC_MEDIA, PDF_BOX_SPEC_CROP,
/**********************************************************************/
typedef struct {
- integer objnum;
- integer index; /* /Im1, /Im2, ... */
+ int objnum;
+ int index; /* /Im1, /Im2, ... */
scaled_whd dimen; /* TeX dimensions given to \pdfximage */
- integer transform; /* transform given to \pdfximage */
- integer x_size; /* dimensions in pixel counts as in JPG/PNG/JBIG2 file */
- integer y_size;
- integer x_orig; /* origin in sp for PDF files */
- integer y_orig;
- integer x_res; /* pixel resolution as in JPG/PNG/JBIG2 file */
- integer y_res;
- integer rotation; /* rotation (multiples of 90 deg.) for PDF files */
- integer colorspace; /* number of /ColorSpace object */
- integer group_ref; /* if it's <=0, the page has no group */
- integer total_pages;
- integer page_num; /* requested page (by number) */
+ int transform; /* transform given to \pdfximage */
+ int x_size; /* dimensions in pixel counts as in JPG/PNG/JBIG2 file */
+ int y_size;
+ int x_orig; /* origin in sp for PDF files */
+ int y_orig;
+ int x_res; /* pixel resolution as in JPG/PNG/JBIG2 file */
+ int y_res;
+ int rotation; /* rotation (multiples of 90 deg.) for PDF files */
+ int colorspace; /* number of /ColorSpace object */
+ int group_ref; /* if it's <=0, the page has no group */
+ int total_pages;
+ int page_num; /* requested page (by number) */
char *pagename; /* requested page (by name) */
char *filename; /* requested raw file name */
char *filepath; /* full file path after kpathsea */
@@ -108,9 +108,9 @@ typedef struct {
int color_space; /* used color space. See JPG_ constants */
int color_depth; /* color depth */
pdfboxspec_e page_box_spec; /* PDF page box spec.: media/crop/bleed/trim/art */
- integer bbox[4];
+ int bbox[4];
dict_state state;
- integer flags;
+ int flags;
union {
pdf_stream_struct *pdfstream;
png_img_struct *png;
@@ -188,7 +188,7 @@ typedef struct {
typedef struct {
scaled_whd dimen; /* requested/actual TeX dimensions */
- integer transform;
+ int transform;
image_dict *dict;
int dict_ref; /* luaL_ref() reference */
} image;
diff --git a/source/texk/web2c/luatexdir/image/pdftoepdf.cc b/source/texk/web2c/luatexdir/image/pdftoepdf.cc
index 87298a0768abaa874e2f9a515b95bae11b952927..432e63bc4f21e8a613faba348f88a46ef47512be 100644
--- a/source/texk/web2c/luatexdir/image/pdftoepdf.cc
+++ b/source/texk/web2c/luatexdir/image/pdftoepdf.cc
@@ -110,14 +110,14 @@ enum InObjType { objFont, objFontDesc, objOther };
struct InObj {
Ref ref; // ref in original PDF
InObjType type; // object type
- integer num; // new object number in output PDF
+ int num; // new object number in output PDF
fd_entry *fd; // pointer to /FontDescriptor object structure
- integer enc_objnum; // Encoding for objFont
+ int enc_objnum; // Encoding for objFont
InObj *next; // next entry in list of indirect objects
};
struct UsedEncoding {
- integer enc_objnum;
+ int enc_objnum;
GfxFont *font;
UsedEncoding *next;
};
@@ -292,7 +292,7 @@ static int addEncoding(GfxFont * gfont, int obj_num)
addInObj(pdf, pdf_doc, objOther, ref, NULL, 0)
static int addInObj(PDF pdf, PdfDocument * pdf_doc, InObjType type, Ref ref,
- fd_entry * fd, integer e)
+ fd_entry * fd, int e)
{
ObjMap *obj_map;
InObj *p, *q, *n;
@@ -710,7 +710,7 @@ static void writeEncodings(PDF pdf)
// get the pagebox coordinates according to the pagebox_spec
-static PDFRectangle *get_pagebox(Page * page, integer pagebox_spec)
+static PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
{
switch (pagebox_spec) {
case PDF_BOX_SPEC_MEDIA:
@@ -763,8 +763,8 @@ char *get_file_checksum(char *a)
void
read_pdf_info(PDF pdf,
- image_dict * idict, integer minor_pdf_version_wanted,
- integer pdf_inclusion_errorlevel, img_readtype_e readtype)
+ image_dict * idict, int minor_pdf_version_wanted,
+ int pdf_inclusion_errorlevel, img_readtype_e readtype)
{
PdfDocument *pdf_doc;
Page *page;
diff --git a/source/texk/web2c/luatexdir/image/pdftoepdf.h b/source/texk/web2c/luatexdir/image/pdftoepdf.h
index 0cf3211a6966f2a75e16e55564620ad5e9f40dd5..3302042f93c80a3e06a587aec27327ab4e13b00f 100644
--- a/source/texk/web2c/luatexdir/image/pdftoepdf.h
+++ b/source/texk/web2c/luatexdir/image/pdftoepdf.h
@@ -25,15 +25,15 @@
# include "image.h"
-void read_pdf_info(PDF, image_dict *, integer, integer, img_readtype_e);
+void read_pdf_info(PDF, image_dict *, int, int, img_readtype_e);
void unrefPdfDocument(char *);
void write_additional_epdf_objects(PDF, char *);
void write_epdf(PDF, image_dict *);
void epdf_check_mem(void);
/* epdf.c --- this should go in an own header file */
-extern integer get_fontfile_num(int);
-extern integer get_fontname_num(int);
+extern int get_fontfile_num(int);
+extern int get_fontname_num(int);
extern void epdf_free(void);
#endif /* PDFTOEPDF_H */
diff --git a/source/texk/web2c/luatexdir/image/writeimg.c b/source/texk/web2c/luatexdir/image/writeimg.c
index ead44451b3c6cf8ace23493be0b0165d163276cc..5adb45f3147ac51f08e8bdadfcc32f38bf71cfb2 100644
--- a/source/texk/web2c/luatexdir/image/writeimg.c
+++ b/source/texk/web2c/luatexdir/image/writeimg.c
@@ -122,7 +122,7 @@ static const char _svn_version[] =
#define HEADER_PDF "%PDF-1."
#define MAX_HEADER (sizeof(HEADER_PNG)-1)
-integer epdf_lastGroupObjectNum;
+int epdf_lastGroupObjectNum;
static void check_type_by_header(image_dict * idict)
{
@@ -285,8 +285,7 @@ void free_image_dict(image_dict * p)
/**********************************************************************/
void read_img(PDF pdf,
- image_dict * idict, integer minor_version,
- integer inclusion_errorlevel)
+ image_dict * idict, int minor_version, int inclusion_errorlevel)
{
char *filepath;
int callback_id;
@@ -340,10 +339,10 @@ void read_img(PDF pdf,
img_state(idict) = DICT_FILESCANNED;
}
-static image_dict *read_image(PDF pdf, char *file_name, integer page_num,
- char *page_name, integer colorspace,
- integer page_box, integer minor_version,
- integer inclusion_errorlevel)
+static image_dict *read_image(PDF pdf, char *file_name, int page_num,
+ char *page_name, int colorspace,
+ int page_box, int minor_version,
+ int inclusion_errorlevel)
{
image *a = new_image();
image_dict *idict = img_dict(a) = new_image_dict();
@@ -384,7 +383,7 @@ void scan_pdfximage(PDF pdf)
{
scaled_whd alt_rule;
image_dict *idict;
- integer transform = 0, page = 1, pagebox, colorspace = 0;
+ int transform = 0, page = 1, pagebox, colorspace = 0;
char *named = NULL, *attr = NULL, *file_name = NULL;
alt_rule = scan_alt_rule(); /* scans |<rule spec>| to |alt_rule| */
if (scan_keyword("attr")) {
@@ -430,7 +429,7 @@ void scan_pdfximage(PDF pdf)
void scan_pdfrefximage(PDF pdf)
{
- integer transform = 0; /* one could scan transform as well */
+ int transform = 0; /* one could scan transform as well */
image_dict *idict;
scaled_whd alt_rule, dim;
alt_rule = scan_alt_rule(); /* scans |<rule spec>| to |alt_rule| */
@@ -510,11 +509,11 @@ scaled_whd tex_scale(scaled_whd nat, scaled_whd tex)
// But one needs rotation info to swap width and height.
// img_rotation() comes from the optional /Rotate key in the PDF file.
-scaled_whd scale_img(image_dict * idict, scaled_whd alt_rule, integer transform)
+scaled_whd scale_img(image_dict * idict, scaled_whd alt_rule, int transform)
{
- integer x, y, xr, yr, tmp; /* size and resolution of image */
+ int x, y, xr, yr, tmp; /* size and resolution of image */
scaled_whd nat; /* natural size corresponding to image resolution */
- integer default_res;
+ int default_res;
assert(idict != NULL);
if ((img_type(idict) == IMG_TYPE_PDF
|| img_type(idict) == IMG_TYPE_PDFSTREAM) && img_is_bbox(idict)) {
@@ -606,7 +605,7 @@ void write_img(PDF pdf, image_dict * idict)
}
/* write an image */
-void pdf_write_image(PDF pdf, integer n)
+void pdf_write_image(PDF pdf, int n)
{
pdf_begin_dict(pdf, n, 0);
if (pdf->draftmode == 0)
@@ -693,7 +692,7 @@ void idict_to_array(image_dict * idict)
#define dumpcharptr(a) \
do { \
- integer x; \
+ int x; \
if (a!=NULL) { \
x = strlen(a)+1; \
dumpinteger(x); dump_things(*a, x); \
@@ -704,7 +703,7 @@ void idict_to_array(image_dict * idict)
#define undumpcharptr(s) \
do { \
- integer x; \
+ int x; \
char *a; \
undumpinteger (x); \
if (x>0) { \
@@ -751,8 +750,7 @@ void dumpimagemeta(void)
}
}
-void undumpimagemeta(PDF pdf, integer pdfversion,
- integer pdfinclusionerrorlevel)
+void undumpimagemeta(PDF pdf, int pdfversion, int pdfinclusionerrorlevel)
{
int cur_index, i;
image_dict *idict;
diff --git a/source/texk/web2c/luatexdir/image/writeimg.h b/source/texk/web2c/luatexdir/image/writeimg.h
index 92efc718871990dff652e10f94fceb78f90c583d..2aab7d5c75371306c845006653903ad250dfdccd 100644
--- a/source/texk/web2c/luatexdir/image/writeimg.h
+++ b/source/texk/web2c/luatexdir/image/writeimg.h
@@ -35,18 +35,18 @@ image *new_image(void);
/*void init_image_dict(image_dict *);*/
image_dict *new_image_dict(void);
void free_image_dict(image_dict * p);
-void read_img(PDF, image_dict *, integer, integer);
+void read_img(PDF, image_dict *, int, int);
void scan_pdfximage(PDF pdf);
void scan_pdfrefximage(PDF pdf);
scaled_whd tex_scale(scaled_whd nat, scaled_whd tex);
-scaled_whd scale_img(image_dict *, scaled_whd, integer);
+scaled_whd scale_img(image_dict *, scaled_whd, int);
void write_img(PDF, image_dict *);
-void pdf_write_image(PDF pdf, integer n);
+void pdf_write_image(PDF pdf, int n);
void check_pdfstream_dict(image_dict *);
void write_pdfstream(PDF, image_dict *);
void idict_to_array(image_dict *);
void dumpimagemeta(void);
-void undumpimagemeta(PDF, integer, integer);
+void undumpimagemeta(PDF, int, int);
scaled_whd scan_alt_rule(void);
#endif /* WRITEIMG_H */
diff --git a/source/texk/web2c/luatexdir/image/writejpg.c b/source/texk/web2c/luatexdir/image/writejpg.c
index 5f763e6503556cabd7821525e9ce8ae075cb3b07..d958a10481a274a5136cb64e2f878e70290637a9 100644
--- a/source/texk/web2c/luatexdir/image/writejpg.c
+++ b/source/texk/web2c/luatexdir/image/writejpg.c
@@ -234,7 +234,7 @@ void read_jpg_info(PDF pdf, image_dict * idict, img_readtype_e readtype)
static void reopen_jpg(PDF pdf, image_dict * idict)
{
- integer width, height, xres, yres;
+ int width, height, xres, yres;
width = img_xsize(idict);
height = img_ysize(idict);
xres = img_xres(idict);
diff --git a/source/texk/web2c/luatexdir/image/writepng.c b/source/texk/web2c/luatexdir/image/writepng.c
index 123ae123e1c165ed05d5b60378f2a1ebcdfc623d..308fda3a8ca6eebc03c9702e78861f9b39021922 100644
--- a/source/texk/web2c/luatexdir/image/writepng.c
+++ b/source/texk/web2c/luatexdir/image/writepng.c
@@ -172,7 +172,7 @@ static void write_png_palette(PDF pdf, image_dict * idict)
png_structp png_p = img_png_png_ptr(idict);
png_infop info_p = img_png_info_ptr(idict);
png_bytep row, r, *rows;
- integer palette_objnum = 0;
+ int palette_objnum = 0;
if (img_colorspace(idict) != 0) {
pdf_printf(pdf, "%i 0 R\n", (int) img_colorspace(idict));
} else {
@@ -247,10 +247,10 @@ static void write_png_gray_alpha(PDF pdf, image_dict * idict)
png_structp png_p = img_png_png_ptr(idict);
png_infop info_p = img_png_info_ptr(idict);
png_bytep row, r, *rows;
- integer smask_objnum = 0;
+ int smask_objnum = 0;
png_bytep smask;
- integer smask_ptr = 0;
- integer smask_size = 0;
+ int smask_ptr = 0;
+ int smask_size = 0;
int bitdepth;
if (img_colorspace(idict) != 0) {
pdf_printf(pdf, "%i 0 R\n", (int) img_colorspace(idict));
@@ -346,10 +346,10 @@ static void write_png_rgb_alpha(PDF pdf, image_dict * idict)
png_structp png_p = img_png_png_ptr(idict);
png_infop info_p = img_png_info_ptr(idict);
png_bytep row, r, *rows;
- integer smask_objnum = 0;
+ int smask_objnum = 0;
png_bytep smask;
- integer smask_ptr = 0;
- integer smask_size = 0;
+ int smask_ptr = 0;
+ int smask_size = 0;
int bitdepth;
if (img_colorspace(idict) != 0) {
pdf_printf(pdf, "%i 0 R\n", (int) img_colorspace(idict));
@@ -509,7 +509,7 @@ static void copy_png(PDF pdf, image_dict * idict)
static void reopen_png(PDF pdf, image_dict * idict)
{
- integer width, height, xres, yres;
+ int width, height, xres, yres;
width = img_xsize(idict); /* do consistency check */
height = img_ysize(idict);
xres = img_xres(idict);
@@ -526,7 +526,7 @@ void write_png(PDF pdf, image_dict * idict)
{
double gamma, checked_gamma;
int i;
- integer palette_objnum = 0;
+ int palette_objnum = 0;
png_structp png_p;
png_infop info_p;
assert(idict != NULL);
diff --git a/source/texk/web2c/luatexdir/lang/texlang.c b/source/texk/web2c/luatexdir/lang/texlang.c
index a78ca3704dfd9d492f1d5d45f664b0711da2cd53..c836e4a423515f733d8f0f64932cf39c5320eedd 100644
--- a/source/texk/web2c/luatexdir/lang/texlang.c
+++ b/source/texk/web2c/luatexdir/lang/texlang.c
@@ -157,14 +157,14 @@ struct tex_language *get_language(int n)
}
}
-void set_pre_hyphen_char(integer n, integer v)
+void set_pre_hyphen_char(int n, int v)
{
struct tex_language *l = get_language((int) n);
if (l != NULL)
l->pre_hyphen_char = (int) v;
}
-void set_post_hyphen_char(integer n, integer v)
+void set_post_hyphen_char(int n, int v)
{
struct tex_language *l = get_language((int) n);
if (l != NULL)
@@ -172,14 +172,14 @@ void set_post_hyphen_char(integer n, integer v)
}
-void set_pre_exhyphen_char(integer n, integer v)
+void set_pre_exhyphen_char(int n, int v)
{
struct tex_language *l = get_language((int) n);
if (l != NULL)
l->pre_exhyphen_char = (int) v;
}
-void set_post_exhyphen_char(integer n, integer v)
+void set_post_exhyphen_char(int n, int v)
{
struct tex_language *l = get_language((int) n);
if (l != NULL)
@@ -188,37 +188,37 @@ void set_post_exhyphen_char(integer n, integer v)
-integer get_pre_hyphen_char(integer n)
+int get_pre_hyphen_char(int n)
{
struct tex_language *l = get_language((int) n);
if (l == NULL)
return -1;
- return (integer) l->pre_hyphen_char;
+ return (int) l->pre_hyphen_char;
}
-integer get_post_hyphen_char(integer n)
+int get_post_hyphen_char(int n)
{
struct tex_language *l = get_language((int) n);
if (l == NULL)
return -1;
- return (integer) l->post_hyphen_char;
+ return (int) l->post_hyphen_char;
}
-integer get_pre_exhyphen_char(integer n)
+int get_pre_exhyphen_char(int n)
{
struct tex_language *l = get_language((int) n);
if (l == NULL)
return -1;
- return (integer) l->pre_exhyphen_char;
+ return (int) l->pre_exhyphen_char;
}
-integer get_post_exhyphen_char(integer n)
+int get_post_exhyphen_char(int n)
{
struct tex_language *l = get_language((int) n);
if (l == NULL)
return -1;
- return (integer) l->post_exhyphen_char;
+ return (int) l->post_exhyphen_char;
}
void load_patterns(struct tex_language *lang, unsigned char *buffer)
@@ -950,7 +950,7 @@ void new_hyphenation(halfword head, halfword tail)
void dump_one_language(int i)
{
char *s = NULL;
- integer x = 0;
+ int x = 0;
struct tex_language *lang;
lang = tex_languages[i];
dump_int(lang->id);
@@ -977,7 +977,7 @@ void dump_one_language(int i)
void dump_language_data(void)
{
- integer i;
+ int i;
dump_int(next_lang_id);
for (i = 0; i < next_lang_id; i++) {
if (tex_languages[i]) {
@@ -993,7 +993,7 @@ void dump_language_data(void)
void undump_one_language(int i)
{
char *s = NULL;
- integer x = 0;
+ int x = 0;
struct tex_language *lang = get_language(i);
undump_int(x);
lang->id = x;
@@ -1025,7 +1025,7 @@ void undump_one_language(int i)
void undump_language_data(void)
{
- integer i, x, numlangs;
+ int i, x, numlangs;
undump_int(numlangs);
next_lang_id = numlangs;
for (i = 0; i < numlangs; i++) {
diff --git a/source/texk/web2c/luatexdir/lang/texlang.h b/source/texk/web2c/luatexdir/lang/texlang.h
index 0413180bbc8e0807c9bdd3540fb8b3124d0a4e56..8532a7bb88593cbf351cf5976369034b5177b8d1 100644
--- a/source/texk/web2c/luatexdir/lang/texlang.h
+++ b/source/texk/web2c/luatexdir/lang/texlang.h
@@ -55,15 +55,15 @@ extern void clear_hyphenation(struct tex_language *lang);
extern char *clean_hyphenation(char *buffer, char **cleaned);
extern void hnj_hyphenation(halfword head, halfword tail);
-extern void set_pre_hyphen_char(integer lan, integer val);
-extern void set_post_hyphen_char(integer lan, integer val);
-extern integer get_pre_hyphen_char(integer lan);
-extern integer get_post_hyphen_char(integer lan);
-
-extern void set_pre_exhyphen_char(integer lan, integer val);
-extern void set_post_exhyphen_char(integer lan, integer val);
-extern integer get_pre_exhyphen_char(integer lan);
-extern integer get_post_exhyphen_char(integer lan);
+extern void set_pre_hyphen_char(int lan, int val);
+extern void set_post_hyphen_char(int lan, int val);
+extern int get_pre_hyphen_char(int lan);
+extern int get_post_hyphen_char(int lan);
+
+extern void set_pre_exhyphen_char(int lan, int val);
+extern void set_post_exhyphen_char(int lan, int val);
+extern int get_pre_exhyphen_char(int lan);
+extern int get_post_exhyphen_char(int lan);
extern halfword compound_word_break(halfword t, int clang);
extern void dump_language_data(void);
diff --git a/source/texk/web2c/luatexdir/lua/lcallbacklib.c b/source/texk/web2c/luatexdir/lua/lcallbacklib.c
index 70ce409fc17b3c57a1b8ac33f49b662847bea095..c2a946df89e9e59e32f3b6d048f67ca16a47f2f7 100644
--- a/source/texk/web2c/luatexdir/lua/lcallbacklib.c
+++ b/source/texk/web2c/luatexdir/lua/lcallbacklib.c
@@ -107,7 +107,7 @@ void get_saved_lua_boolean(int r, char *name, boolean * target)
return;
}
-void get_lua_number(char *table, char *name, integer * target)
+void get_lua_number(char *table, char *name, int * target)
{
int stacktop;
stacktop = lua_gettop(Luas);
@@ -123,7 +123,7 @@ void get_lua_number(char *table, char *name, integer * target)
return;
}
-void get_saved_lua_number(int r, char *name, integer * target)
+void get_saved_lua_number(int r, char *name, int * target)
{
int stacktop;
stacktop = lua_gettop(Luas);
diff --git a/source/texk/web2c/luatexdir/lua/lfontlib.c b/source/texk/web2c/luatexdir/lua/lfontlib.c
index f977c60ff81082f5a8d98ab4a38375d51ca95f0e..b3d8b94b1e6f2ce0cf15db78e8fdfcb5fc040ac5 100644
--- a/source/texk/web2c/luatexdir/lua/lfontlib.c
+++ b/source/texk/web2c/luatexdir/lua/lfontlib.c
@@ -51,7 +51,7 @@ static int font_read_tfm(lua_State * L)
if (lua_isstring(L, 1)) {
cnom = (char *) lua_tostring(L, 1);
if (lua_isnumber(L, 2)) {
- s = (integer) lua_tonumber(L, 2);
+ s = (int) lua_tonumber(L, 2);
if (strlen(cnom)) {
f = get_fontid();
if (read_tfm_info(f, cnom, s)) {
@@ -261,7 +261,7 @@ static int getfontid(lua_State * L)
char *s;
size_t ff;
int cur_cs;
- integer f;
+ int f;
if (lua_type(L, 1) == LUA_TSTRING) {
s = (char *) lua_tolstring(L, 1, &ff);
cur_cs = string_lookup(s, ff);
diff --git a/source/texk/web2c/luatexdir/lua/limglib.c b/source/texk/web2c/luatexdir/lua/limglib.c
index bcf31edb05e232777ef1fc781b662b4b3e646c8c..aac80f29e51530293ad1d7c0e8082fe0a9295cc4 100644
--- a/source/texk/web2c/luatexdir/lua/limglib.c
+++ b/source/texk/web2c/luatexdir/lua/limglib.c
@@ -449,11 +449,11 @@ void copy_image(lua_State * L, lua_Number scale)
lua_setmetatable(L, -2); /* b */
b = *bb = new_image();
if (!is_wd_running(a))
- img_width(b) = zround(img_width(a) * scale);
+ img_width(b) = do_zround(img_width(a) * scale);
if (!is_ht_running(a))
- img_height(b) = zround(img_height(a) * scale);
+ img_height(b) = do_zround(img_height(a) * scale);
if (!is_dp_running(a))
- img_depth(b) = zround(img_depth(a) * scale);
+ img_depth(b) = do_zround(img_depth(a) * scale);
img_transform(b) = img_transform(a);
img_dict(b) = img_dict(a);
if (img_dictref(a) != LUA_NOREF) {
diff --git a/source/texk/web2c/luatexdir/lua/llualib.c b/source/texk/web2c/luatexdir/lua/llualib.c
index f850bab33a11d099730d14944d2eb2d027c98ed5..9b082fe4f74e5995657cb4174d2f119dc1cceb42 100644
--- a/source/texk/web2c/luatexdir/lua/llualib.c
+++ b/source/texk/web2c/luatexdir/lua/llualib.c
@@ -35,7 +35,7 @@ typedef struct {
static bytecode *lua_bytecode_registers = NULL;
-integer luabytecode_max = -1;
+int luabytecode_max = -1;
unsigned int luabytecode_bytes = 0;
char *luanames[65536] = { NULL };
@@ -51,8 +51,8 @@ char *get_lua_name(int i)
void dump_luac_registers(void)
{
- integer x;
- integer k, n;
+ int x;
+ int k, n;
bytecode b;
dump_int(luabytecode_max);
if (lua_bytecode_registers != NULL) {
@@ -86,8 +86,8 @@ void dump_luac_registers(void)
void undump_luac_registers(void)
{
- integer x;
- integer k, n;
+ int x;
+ int k, n;
unsigned int i;
bytecode b;
undump_int(luabytecode_max);
diff --git a/source/texk/web2c/luatexdir/lua/lnodelib.c b/source/texk/web2c/luatexdir/lua/lnodelib.c
index d78cfc696f6ca30a11be413756726f1952e62812..285d209b43535006aa8e1561240003f61d3a5f2c 100644
--- a/source/texk/web2c/luatexdir/lua/lnodelib.c
+++ b/source/texk/web2c/luatexdir/lua/lnodelib.c
@@ -167,7 +167,7 @@ void lua_nodelib_push_fast(lua_State * L, halfword n)
static int lua_nodelib_id(lua_State * L)
{
- integer i = get_node_type_id(L, 1);
+ int i = get_node_type_id(L, 1);
if (i >= 0) {
lua_pushnumber(L, i);
} else {
@@ -179,7 +179,7 @@ static int lua_nodelib_id(lua_State * L)
static int lua_nodelib_subtype(lua_State * L)
{
- integer i = get_node_subtype_id(L, 1);
+ int i = get_node_subtype_id(L, 1);
if (i >= 0) {
lua_pushnumber(L, i);
} else {
@@ -192,7 +192,7 @@ static int lua_nodelib_subtype(lua_State * L)
static int lua_nodelib_type(lua_State * L)
{
- integer i = get_node_type_id(L, 1);
+ int i = get_node_type_id(L, 1);
if (i >= 0) {
lua_pushstring(L, node_data[i].name);
} else {
@@ -476,7 +476,7 @@ static int lua_nodelib_hpack(lua_State * L)
{
halfword n, p;
char *s;
- integer w = 0;
+ int w = 0;
int m = 1;
int d = -1;
n = *(check_isnode(L, 1));
@@ -566,7 +566,7 @@ static int lua_nodelib_vpack(lua_State * L)
{
halfword n, p;
char *s;
- integer w = 0;
+ int w = 0;
int m = 1;
int d = -1;
n = *(check_isnode(L, 1));
diff --git a/source/texk/web2c/luatexdir/lua/lpdflib.c b/source/texk/web2c/luatexdir/lua/lpdflib.c
index 6a9c9834588910e563d89b28f750e514a624300c..3c533aa2f2495e1bb6dc1672a443b2c6e2d8bd80 100644
--- a/source/texk/web2c/luatexdir/lua/lpdflib.c
+++ b/source/texk/web2c/luatexdir/lua/lpdflib.c
@@ -96,7 +96,7 @@ unsigned char *fread_to_buf(lua_State * L, char *filename, size_t * len)
unsigned char *buf = NULL;
if ((f = fopen(filename, "rb")) == NULL)
luaL_error(L, "pdf.immediateobj() cannot open input file");
- if ((i = readbinfile(f, &buf, (integer *) len)) == 0)
+ if ((i = readbinfile(f, &buf, (int *)len)) == 0)
luaL_error(L, "pdf.immediateobj() cannot read input file");
fclose(f);
return buf;
@@ -106,7 +106,7 @@ static int l_immediateobj(lua_State * L)
{
int n, first_arg = 1;
unsigned i;
- integer k;
+ int k;
lstring buf, st1, st2, st3;
buf.s = st1.s = st2.s = st3.s = NULL;
check_o_mode(static_pdf, "immediateobj()", 1 << OMODE_PDF, true);
@@ -436,7 +436,7 @@ static int table_obj(lua_State * L)
static int orig_obj(lua_State * L)
{
int n, first_arg = 1;
- integer k;
+ int k;
lstring st;
st.s = NULL;
n = lua_gettop(L);
@@ -500,7 +500,7 @@ static int orig_obj(lua_State * L)
static int l_obj(lua_State * L)
{
int n;
- integer k;
+ int k;
n = lua_gettop(L);
if (n == 1 && lua_istable(L, 1))
k = table_obj(L); /* new */
diff --git a/source/texk/web2c/luatexdir/lua/lstatslib.c b/source/texk/web2c/luatexdir/lua/lstatslib.c
index 670899467a84902ea71f3311ce25e49eb2dea903..32ce1761f9da183848ed84fd2f67fe46b57b1c6a 100644
--- a/source/texk/web2c/luatexdir/lua/lstatslib.c
+++ b/source/texk/web2c/luatexdir/lua/lstatslib.c
@@ -35,7 +35,7 @@ extern void lua_nodelib_push_fast(lua_State * L, halfword n);
typedef char *(*charfunc) (void);
typedef lua_Number(*numfunc) (void);
-typedef integer(*intfunc) (void);
+typedef int(*intfunc) (void);
char *getbanner(void)
{
@@ -61,7 +61,7 @@ static char *get_output_file_name(void)
char *getfilename(void)
{
- integer t = 0;
+ int t = 0;
int level = in_open;
while ((level > 0)) {
t = input_stack[level--].name_field;
@@ -268,7 +268,7 @@ static int do_getstat(lua_State * L, int i)
lua_pushstring(L, st);
break;
case 's':
- str = *(integer *) (stats[i].value);
+ str = *(int *) (stats[i].value);
if (str) {
char *ss = makecstring(str);
lua_pushstring(L, ss);
@@ -286,7 +286,7 @@ static int do_getstat(lua_State * L, int i)
lua_pushnumber(L, g());
break;
case 'g':
- lua_pushnumber(L, *(integer *) (stats[i].value));
+ lua_pushnumber(L, *(int *) (stats[i].value));
break;
case 'B':
g = stats[i].value;
@@ -299,7 +299,7 @@ static int do_getstat(lua_State * L, int i)
lua_pushnil(L);
break;
case 'b':
- lua_pushboolean(L, *(integer *) (stats[i].value));
+ lua_pushboolean(L, *(int *) (stats[i].value));
break;
default:
lua_pushnil(L);
diff --git a/source/texk/web2c/luatexdir/lua/ltexlib.c b/source/texk/web2c/luatexdir/lua/ltexlib.c
index 1674624bbf9606b3dc0a699d007b8b9512b3bbbc..a5bb2047a9577af23bb8f892ba1c24029081091b 100644
--- a/source/texk/web2c/luatexdir/lua/ltexlib.c
+++ b/source/texk/web2c/luatexdir/lua/ltexlib.c
@@ -42,7 +42,7 @@ typedef struct {
unsigned int tsize;
void *next;
boolean partial;
- integer cattable;
+ int cattable;
} rope;
typedef struct {
@@ -61,7 +61,7 @@ static int spindle_size = 0;
static spindle *spindles = NULL;
static int spindle_index = 0;
-static void luac_store(lua_State * L, int i, int partial, integer cattable)
+static void luac_store(lua_State * L, int i, int partial, int cattable)
{
char *st, *sttemp;
size_t tsize;
@@ -92,7 +92,7 @@ static void luac_store(lua_State * L, int i, int partial, integer cattable)
static int do_luacprint(lua_State * L, int partial, int deftable)
{
int i, n;
- integer cattable = (integer) deftable;
+ int cattable = deftable;
int startstrings = 1;
n = lua_gettop(L);
if (cattable != NO_CAT_TABLE) {
@@ -138,9 +138,9 @@ int luacsprint(lua_State * L)
return do_luacprint(L, PARTIAL_LINE, DEFAULT_CAT_TABLE);
}
-integer luacstring_cattable(void)
+int luacstring_cattable(void)
{
- return (integer) read_spindle.tail->cattable;
+ return (int) read_spindle.tail->cattable;
}
int luacstring_partial(void)
@@ -273,10 +273,10 @@ int dimen_to_number(lua_State * L, char *s)
}
-integer get_item_index(lua_State * L, int i, integer base)
+int get_item_index(lua_State * L, int i, int base)
{
size_t kk;
- integer k;
+ int k;
int cur_cs;
char *s;
if (lua_type(L, i) == LUA_TSTRING) {
@@ -288,7 +288,7 @@ integer get_item_index(lua_State * L, int i, integer base)
k = (equiv(cur_cs) - base);
}
} else {
- k = (integer) luaL_checkinteger(L, i);
+ k = (int) luaL_checkinteger(L, i);
}
return k;
}
@@ -297,8 +297,8 @@ integer get_item_index(lua_State * L, int i, integer base)
static int vsetdimen(lua_State * L, int is_global)
{
int i, j, err;
- integer k;
- integer save_global_defs = int_par(global_defs_code);
+ int k;
+ int save_global_defs = int_par(global_defs_code);
if (is_global)
int_par(global_defs_code) = 1;
i = lua_gettop(L);
@@ -338,7 +338,7 @@ static int setdimen(lua_State * L)
static int getdimen(lua_State * L)
{
int j;
- integer k;
+ int k;
k = get_item_index(L, lua_gettop(L), scaled_base);
check_index_range(k, "getdimen");
j = get_tex_dimen_register(k);
@@ -350,8 +350,8 @@ static int vsetskip(lua_State * L, int is_global)
{
int i, err;
halfword *j;
- integer k;
- integer save_global_defs = int_par(global_defs_code);
+ int k;
+ int save_global_defs = int_par(global_defs_code);
if (is_global)
int_par(global_defs_code) = 1;
i = lua_gettop(L);
@@ -382,7 +382,7 @@ static int setskip(lua_State * L)
int getskip(lua_State * L)
{
halfword j;
- integer k;
+ int k;
k = get_item_index(L, lua_gettop(L), skip_base);
check_index_range(k, "getskip");
j = get_tex_skip_register(k);
@@ -395,8 +395,8 @@ int getskip(lua_State * L)
static int vsetcount(lua_State * L, int is_global)
{
int i, j, err;
- integer k;
- integer save_global_defs = int_par(global_defs_code);
+ int k;
+ int save_global_defs = int_par(global_defs_code);
if (is_global)
int_par(global_defs_code) = 1;
i = lua_gettop(L);
@@ -427,7 +427,7 @@ static int setcount(lua_State * L)
static int getcount(lua_State * L)
{
int j;
- integer k;
+ int k;
k = get_item_index(L, lua_gettop(L), count_base);
check_index_range(k, "getcount");
j = get_tex_count_register(k);
@@ -439,8 +439,8 @@ static int getcount(lua_State * L)
static int vsetattribute(lua_State * L, int is_global)
{
int i, j, err;
- integer k;
- integer save_global_defs = int_par(global_defs_code);
+ int k;
+ int save_global_defs = int_par(global_defs_code);
if (is_global)
int_par(global_defs_code) = 1;
i = lua_gettop(L);
@@ -471,7 +471,7 @@ static int setattribute(lua_State * L)
static int getattribute(lua_State * L)
{
int j;
- integer k;
+ int k;
k = get_item_index(L, lua_gettop(L), attribute_base);
check_index_range(k, "getattribute");
j = get_tex_attribute_register(k);
@@ -482,9 +482,9 @@ static int getattribute(lua_State * L)
int vsettoks(lua_State * L, int is_global)
{
int i, err;
- integer k;
+ int k;
lstring str;
- integer save_global_defs = int_par(global_defs_code);
+ int save_global_defs = int_par(global_defs_code);
if (is_global)
int_par(global_defs_code) = 1;
i = lua_gettop(L);
@@ -518,7 +518,7 @@ static int settoks(lua_State * L)
static int gettoks(lua_State * L)
{
- integer k;
+ int k;
str_number t;
char *ss;
k = get_item_index(L, lua_gettop(L), toks_base);
@@ -534,7 +534,7 @@ static int gettoks(lua_State * L)
static int get_box_id(lua_State * L, int i)
{
char *s;
- integer cur_cs, cur_cmd;
+ int cur_cs, cur_cmd;
size_t k = 0;
int j = -1;
if (lua_type(L, i) == LUA_TSTRING) {
@@ -564,7 +564,7 @@ static int getbox(lua_State * L)
static int vsetbox(lua_State * L, int is_global)
{
int i, j, k, err;
- integer save_global_defs = int_par(global_defs_code);
+ int save_global_defs = int_par(global_defs_code);
if (is_global)
int_par(global_defs_code) = 1;
k = get_box_id(L, -2);
@@ -648,7 +648,7 @@ int getboxdp(lua_State * L)
static int vsetboxdim(lua_State * L, int whichdim, int is_global)
{
int i, j, k, err;
- integer save_global_defs = int_par(global_defs_code);
+ int save_global_defs = int_par(global_defs_code);
if (is_global)
int_par(global_defs_code) = 1;
i = lua_gettop(L);
@@ -787,7 +787,7 @@ int settex(lua_State * L)
int do_convert(lua_State * L, int cur_code)
{
int texstr;
- integer i = -1;
+ int i = -1;
char *str = NULL;
switch (cur_code) {
case pdf_creation_date_code: /* ? */
@@ -1413,7 +1413,7 @@ static int tex_enableprimitives(lua_State * L)
halfword prim_val = prim_lookup(s);
if (prim_val != undefined_primitive) {
char *newprim;
- integer val;
+ int val;
size_t newl;
halfword cur_cmd = get_prim_eq_type(prim_val);
halfword cur_chr = get_prim_equiv(prim_val);
diff --git a/source/texk/web2c/luatexdir/lua/ltokenlib.c b/source/texk/web2c/luatexdir/lua/ltokenlib.c
index 51dc5c90ccf85ed10aecc9a857b7c909359d1b56..82ece261d6c78baafb5a9fd9da7e4a9c1784c141 100644
--- a/source/texk/web2c/luatexdir/lua/ltokenlib.c
+++ b/source/texk/web2c/luatexdir/lua/ltokenlib.c
@@ -32,7 +32,7 @@ extern int get_command_id(char *);
#define is_active_string(s) (strlen((char *)s)>3 && *s==0xEF && *(s+1)==0xBF && *(s+2)==0xBF)
-static unsigned char *get_cs_text(integer cs)
+static unsigned char *get_cs_text(int cs)
{
if (cs == null_cs)
return (unsigned char *) xstrdup("\\csname\\endcsname");
@@ -45,7 +45,7 @@ static unsigned char *get_cs_text(integer cs)
static int test_expandable(lua_State * L)
{
- integer cmd = -1;
+ int cmd = -1;
if (is_valid_token(L, -1)) {
get_token_cmd(L, -1);
if (lua_isnumber(L, -1)) {
@@ -67,7 +67,7 @@ static int test_expandable(lua_State * L)
static int test_protected(lua_State * L)
{
- integer chr = -1;
+ int chr = -1;
if (is_valid_token(L, -1)) {
get_token_chr(L, -1);
if (lua_isnumber(L, -1)) {
@@ -90,7 +90,7 @@ static int test_activechar(lua_State * L)
{
if (is_valid_token(L, -1)) {
unsigned char *s;
- integer cs = 0;
+ int cs = 0;
get_token_cs(L, -1);
if (lua_isnumber(L, -1)) {
cs = lua_tointeger(L, -1);
@@ -217,7 +217,7 @@ static int run_lookup(lua_State * L)
{
char *s;
size_t l;
- integer cs, cmd, chr;
+ int cs, cmd, chr;
int save_nncs;
if (lua_isstring(L, -1)) {
s = (char *) lua_tolstring(L, -1, &l);
@@ -239,7 +239,7 @@ static int run_lookup(lua_State * L)
static int run_build(lua_State * L)
{
- integer cmd, chr, cs;
+ int cmd, chr, cs;
if (lua_isnumber(L, 1)) {
cs = 0;
chr = lua_tointeger(L, 1);
diff --git a/source/texk/web2c/luatexdir/lua/luagen.c b/source/texk/web2c/luatexdir/lua/luagen.c
index e4e69b0e6989e21f36a24f51fdb6da7cfd0508bf..8e8ebd7714274df663fa82f5141978fa90fc377e 100644
--- a/source/texk/web2c/luatexdir/lua/luagen.c
+++ b/source/texk/web2c/luatexdir/lua/luagen.c
@@ -35,7 +35,7 @@ void lua_end_page(PDF pdf __attribute__ ((unused)))
}
void lua_place_glyph(PDF pdf __attribute__ ((unused)), internal_font_number f
- __attribute__ ((unused)), integer c)
+ __attribute__ ((unused)), int c)
{
printf("%c", (int) c);
}
diff --git a/source/texk/web2c/luatexdir/lua/luagen.h b/source/texk/web2c/luatexdir/lua/luagen.h
index 51a87cbaf2e99ae549556ab146f98d695148883a..24774dd4ae8cc3e641ee333c2f75837d16e84bbc 100644
--- a/source/texk/web2c/luatexdir/lua/luagen.h
+++ b/source/texk/web2c/luatexdir/lua/luagen.h
@@ -22,6 +22,6 @@
extern void lua_begin_page(PDF pdf);
extern void lua_end_page(PDF pdf);
-extern void lua_place_glyph(PDF pdf, internal_font_number f, integer c);
+extern void lua_place_glyph(PDF pdf, internal_font_number f, int c);
extern void lua_place_rule(PDF pdf, scaledpos size);
extern void finish_lua_file(PDF pdf);
diff --git a/source/texk/web2c/luatexdir/lua/luanode.c b/source/texk/web2c/luatexdir/lua/luanode.c
index 6fe806184b6db7eb62302ccfc81531ee74c50215..5d97f52722aab11f32bf2e1a6a47619add5f4620 100644
--- a/source/texk/web2c/luatexdir/lua/luanode.c
+++ b/source/texk/web2c/luatexdir/lua/luanode.c
@@ -205,7 +205,7 @@ lua_vpack_filter(halfword head_node, scaled size, int pack_type, scaled maxd,
int extrainfo, int pack_direction)
{
halfword ret;
- integer callback_id;
+ int callback_id;
lua_State *L = Luas;
if (head_node == null)
return head_node;
diff --git a/source/texk/web2c/luatexdir/lua/luatoken.c b/source/texk/web2c/luatexdir/lua/luatoken.c
index b43faaffd7cb7784afa7e0a2060a390d9ba3ecd4..c55ca615f6bd0f06e44d77f11418a8e327b3e9b8 100644
--- a/source/texk/web2c/luatexdir/lua/luatoken.c
+++ b/source/texk/web2c/luatexdir/lua/luatoken.c
@@ -244,7 +244,7 @@ static int get_cur_cs(lua_State * L)
char *s;
unsigned j;
size_t l;
- integer cs;
+ int cs;
int save_nncs;
int ret;
ret = 0;
@@ -352,7 +352,7 @@ int tokenlist_from_lua(lua_State * L)
}
}
-void do_get_token_lua(integer callback_id)
+void do_get_token_lua(int callback_id)
{
lua_State *L = Luas;
while (1) {
@@ -369,7 +369,7 @@ void do_get_token_lua(integer callback_id)
if (lua_istable(L, -1)) {
lua_rawgeti(L, -1, 1);
if (lua_istable(L, -1)) { /* container, result, result[1] */
- integer p, q, r;
+ int p, q, r;
int i, j;
lua_pop(L, 1); /* container, result */
/* build a token list */
diff --git a/source/texk/web2c/luatexdir/luatex.c b/source/texk/web2c/luatexdir/luatex.c
index 8aba72d0723a13d088a2c3116d0c44f6e54aaae5..ca399fb9e148a732110b9bec37eb3bca87ad13a5 100644
--- a/source/texk/web2c/luatexdir/luatex.c
+++ b/source/texk/web2c/luatexdir/luatex.c
@@ -725,8 +725,8 @@ static RETSIGTYPE catch_interrupt(int arg)
good a place as any. */
void
-get_date_and_time(integer * minutes, integer * day,
- integer * month, integer * year)
+get_date_and_time(int * minutes, int * day,
+ int * month, int * year)
{
time_t myclock = time((time_t *) 0);
struct tm *tmptr = localtime(&myclock);
@@ -770,7 +770,7 @@ get_date_and_time(integer * minutes, integer * day,
/*
Getting a high resolution time.
*/
-void get_seconds_and_micros(integer * seconds, integer * micros)
+void get_seconds_and_micros(int * seconds, int * micros)
{
#if defined (HAVE_GETTIMEOFDAY)
struct timeval tv;
@@ -792,7 +792,7 @@ void get_seconds_and_micros(integer * seconds, integer * micros)
/*
Generating a better seed numbers
*/
-integer getrandomseed()
+int getrandomseed()
{
#if defined (HAVE_GETTIMEOFDAY)
struct timeval tv;
@@ -866,7 +866,7 @@ static const_string edit_value = EDITOR;
void
calledit(packedASCIIcode * filename,
- poolpointer fnstart, integer fnlength, integer linenumber)
+ poolpointer fnstart, int fnlength, int linenumber)
{
char *temp, *command;
char c;
@@ -1060,13 +1060,13 @@ void do_undump(char *p, int item_size, int nitems, FILE * in_file)
/* Look up VAR_NAME in texmf.cnf; assign either the value found there or
DFLT to *VAR. */
-void setupboundvariable(integer * var, const_string var_name, integer dflt)
+void setupboundvariable(int * var, const_string var_name, int dflt)
{
string expansion = kpse_var_value(var_name);
*var = dflt;
if (expansion) {
- integer conf_val = atoi(expansion);
+ int conf_val = atoi(expansion);
/* It's ok if the cnf file specifies 0 for extra_mem_{top,bot}, etc.
But negative numbers are always wrong. */
if (conf_val < 0 || (conf_val == 0 && dflt > 0)) {
diff --git a/source/texk/web2c/luatexdir/ocp/ocp.c b/source/texk/web2c/luatexdir/ocp/ocp.c
index 9ddd4f23cd37bbebe6ce4ede4d836269801b1866..d6610e79759f4a25b5b4e2ce2b4f6432c382e23e 100644
--- a/source/texk/web2c/luatexdir/ocp/ocp.c
+++ b/source/texk/web2c/luatexdir/ocp/ocp.c
@@ -26,7 +26,7 @@ static const char _svn_version[] =
int **ocp_tables;
static int ocp_entries = 0;
-integer ocp_maxint = 10000000;
+int ocp_maxint = 10000000;
/*
When the user defines \.{\\ocp\\f}, say, \TeX\ assigns an internal number
@@ -141,7 +141,7 @@ static void dump_ocp_table(int ocp_number)
void dump_ocp_info(void)
{
- integer k;
+ int k;
dump_int(123456);
dump_int(ocp_ptr);
for (k = null_ocp; k <= ocp_ptr; k++) {
@@ -182,8 +182,8 @@ static void undump_ocp_table(int ocp_number)
void undump_ocp_info(void)
{
- integer k;
- integer x;
+ int k;
+ int x;
undump_int(x);
assert(x == 123456);
undump_int(ocp_ptr);
diff --git a/source/texk/web2c/luatexdir/ocp/ocp.h b/source/texk/web2c/luatexdir/ocp/ocp.h
index ec42b2dc831f7d608eee76828afd8b61ad218152..faf79f5290a8b5cd8b91b193a0668da2ea47066f 100644
--- a/source/texk/web2c/luatexdir/ocp/ocp.h
+++ b/source/texk/web2c/luatexdir/ocp/ocp.h
@@ -23,12 +23,12 @@
# define OCP_H 1
-typedef integer internal_ocp_number;
-typedef integer ocp_index;
+typedef int internal_ocp_number;
+typedef int ocp_index;
extern int **ocp_tables;
-extern integer ocp_maxint;
+extern int ocp_maxint;
extern internal_ocp_number ocp_ptr; /* largest internal ocp number in use */
diff --git a/source/texk/web2c/luatexdir/ocp/ocplist.c b/source/texk/web2c/luatexdir/ocp/ocplist.c
index 3e0bb0ccf901878a7e6198d34be02013840c7042..460ae0e7513c6a18e95d6aa37cb4731bc9ea4145 100644
--- a/source/texk/web2c/luatexdir/ocp/ocplist.c
+++ b/source/texk/web2c/luatexdir/ocp/ocplist.c
@@ -46,7 +46,7 @@ void initialize_init_ocplists(void)
}
-void initialize_ocplist_arrays(integer ocp_list_size)
+void initialize_ocplist_arrays(int ocp_list_size)
{
ocp_list_info = xmallocarray(memory_word, ocp_list_size);
memset(ocp_list_info, 0, sizeof(memory_word) * ocp_list_size);
@@ -311,7 +311,7 @@ void new_ocp_list(small_number a)
void dump_ocplist_info(void)
{
- integer k;
+ int k;
dump_int(ocp_listmem_ptr);
for (k = 0; k <= ocp_listmem_ptr - 1; k++)
dump_wd(ocp_list_info[k]);
@@ -332,7 +332,7 @@ void dump_ocplist_info(void)
void undump_ocplist_info(void)
{
- integer k;
+ int k;
initialize_ocplist_arrays(ocp_list_size);
undump_int(ocp_listmem_ptr);
for (k = 0; k <= ocp_listmem_ptr - 1; k++)
diff --git a/source/texk/web2c/luatexdir/ocp/ocplist.h b/source/texk/web2c/luatexdir/ocp/ocplist.h
index fbc0d030bf7b232a54d2f522fab9d7f1b9b33055..8b907d20d8b6422e700316d292e8698220a13f04 100644
--- a/source/texk/web2c/luatexdir/ocp/ocplist.h
+++ b/source/texk/web2c/luatexdir/ocp/ocplist.h
@@ -28,9 +28,9 @@
# define number_ocp_lists 32768
# define null_ocp_list ocp_list_base
-typedef integer internal_ocp_list_number;
-typedef integer ocp_list_index; /* index into |ocp_list_info| */
-typedef integer ocp_lstack_index; /* index into |ocp_lstack_info| */
+typedef int internal_ocp_list_number;
+typedef int ocp_list_index; /* index into |ocp_list_info| */
+typedef int ocp_lstack_index; /* index into |ocp_lstack_info| */
extern memory_word *ocp_list_info;
extern memory_word *ocp_lstack_info;
@@ -57,7 +57,7 @@ typedef enum {
extern void initialize_init_ocplists(void);
-extern void initialize_ocplist_arrays(integer ocp_list_size);
+extern void initialize_ocplist_arrays(int ocp_list_size);
extern ocp_list_index make_ocp_list_node(ocp_lstack_index llstack,
scaled llstack_no,
diff --git a/source/texk/web2c/luatexdir/ocp/readocp.c b/source/texk/web2c/luatexdir/ocp/readocp.c
index 5a45934ebac2c574659f29520769140cf2700464..b3c3903c890dc3fc4d597aa3cd47033ec5a69e98 100644
--- a/source/texk/web2c/luatexdir/ocp/readocp.c
+++ b/source/texk/web2c/luatexdir/ocp/readocp.c
@@ -37,8 +37,8 @@ static char *b_test_in(char *nam)
static unsigned char *ocp_buffer = NULL; /* byte buffer for ocp files */
-static integer ocp_size = 0; /* total size of the ocp file */
-static integer ocp_cur = 0; /* index into |ocp_buffer| */
+static int ocp_size = 0; /* total size of the ocp file */
+static int ocp_cur = 0; /* index into |ocp_buffer| */
void init_null_ocp(str_number a, str_number n)
{
@@ -107,19 +107,19 @@ read_ocp_info(pointer u, char *nom, char *aire, char *ext, boolean external_ocp)
{
boolean file_opened; /* was |ocp_file| successfully opened? */
boolean res;
- integer callback_id;
+ int callback_id;
char *cnam; /* C version of file name */
internal_ocp_number f; /* the new ocp's number */
internal_ocp_number g; /* the number to return */
- integer ocpword;
+ int ocpword;
ocp_index ocpmem_run_ptr;
- integer ocp_length, real_ocp_length; /* length of ocp file */
+ int ocp_length, real_ocp_length; /* length of ocp file */
ocp_index previous_address;
- integer temp_ocp_input;
- integer temp_ocp_output;
- integer temp_ocp_no_tables;
- integer temp_ocp_no_states;
- integer i, new_offset, room_for_tables, room_for_states;
+ int temp_ocp_input;
+ int temp_ocp_output;
+ int temp_ocp_no_tables;
+ int temp_ocp_no_states;
+ int i, new_offset, room_for_tables, room_for_states;
g = null_ocp;
f = null_ocp;
cnam = NULL;
diff --git a/source/texk/web2c/luatexdir/ocp/runocp.c b/source/texk/web2c/luatexdir/ocp/runocp.c
index 982e9552234c51cfd67ba0b709a1541485dfe1db..d1dbada7f4187a9e43fe87e67f119f5c8487cf5d 100644
--- a/source/texk/web2c/luatexdir/ocp/runocp.c
+++ b/source/texk/web2c/luatexdir/ocp/runocp.c
@@ -149,9 +149,9 @@ halfword otp_second_arg;
halfword otp_input_ocp;
boolean otp_finished;
-integer otp_ext_str;
-integer otp_ext_str_arg;
-integer otp_ext_i;
+int otp_ext_str;
+int otp_ext_str_arg;
+int otp_ext_i;
#define otp_set_instruction() do { \
if (otp_pc>=ocp_state_no(otp_input_ocp,otp_cur_state)) { \
@@ -708,7 +708,7 @@ void run_external_ocp(char *external_ocp_name)
void run_ocp(void)
{
- integer t = 0;
+ int t = 0;
halfword otp_i;
halfword otp_counter;
/* The OTP input buffer is an array of 16-bit values.
@@ -863,7 +863,7 @@ void run_ocp(void)
}
-void initialize_ocp_buffers(integer ocp_buf_size, integer ocp_stack_size)
+void initialize_ocp_buffers(int ocp_buf_size, int ocp_stack_size)
{
otp_init_input_buf = xmallocarray(quarterword, ocp_buf_size);
otp_input_buf = xmallocarray(quarterword, ocp_buf_size);
@@ -873,7 +873,7 @@ void initialize_ocp_buffers(integer ocp_buf_size, integer ocp_stack_size)
otp_states = xmallocarray(halfword, ocp_stack_size);
}
-boolean is_last_ocp(scaled llstack_no, integer counter)
+boolean is_last_ocp(scaled llstack_no, int counter)
{
active_min_ptr = equiv(ocp_active_min_ptr_base);
active_max_ptr = equiv(ocp_active_max_ptr_base);
@@ -892,7 +892,7 @@ boolean is_last_ocp(scaled llstack_no, integer counter)
void print_active_ocps(void)
{
- integer i;
+ int i;
tprint_nl("Active ocps: [");
i = active_min_ptr;
while (i < active_max_ptr) {
@@ -910,11 +910,11 @@ void print_active_ocps(void)
tprint("]");
}
-void add_ocp_stack(integer min_index, scaled min_value)
+void add_ocp_stack(int min_index, scaled min_value)
{
ocp_lstack_index p;
scaled llstack_no;
- integer counter;
+ int counter;
scaled m;
m = min_value; /* TH: whatever this is .. */
p = ocp_list_lstack(holding[min_index]);
@@ -932,11 +932,11 @@ void add_ocp_stack(integer min_index, scaled min_value)
void active_compile(void)
{
- integer i;
- integer min_index;
+ int i;
+ int min_index;
scaled min_stack_ocp;
scaled old_min;
- integer max_active;
+ int max_active;
scaled stack_value;
active_min_ptr = active_max_ptr;
min_stack_ocp = ocp_maxint;
@@ -972,7 +972,7 @@ void do_push_ocp_list(small_number a)
{
halfword ocp_list_no;
halfword old_number;
- integer i;
+ int i;
scan_ocp_list_ident();
ocp_list_no = cur_val;
old_number = equiv(ocp_active_number_base);
@@ -997,7 +997,7 @@ void do_push_ocp_list(small_number a)
void do_pop_ocp_list(small_number a)
{
halfword old_number;
- integer i;
+ int i;
old_number = equiv(ocp_active_number_base);
if (old_number == 0) {
print_err("No active ocp lists to be popped");
@@ -1031,7 +1031,7 @@ void do_clear_ocp_lists(small_number a)
void dump_active_ocp_info(void)
{
- integer k;
+ int k;
dump_int(active_min_ptr);
dump_int(active_max_ptr);
for (k = 0; k <= active_max_ptr - 1; k++)
@@ -1045,7 +1045,7 @@ void dump_active_ocp_info(void)
void undump_active_ocp_info(void)
{
- integer k;
+ int k;
undump_int(active_min_ptr);
/* undump_size(0)(active_mem_size)('active start point')(active_min_ptr); */
undump_int(active_max_ptr);
diff --git a/source/texk/web2c/luatexdir/ocp/runocp.h b/source/texk/web2c/luatexdir/ocp/runocp.h
index 6eb3299b7c167db92e117d1da19783236652e2e8..3b015e9a75c575f71b1e66acef5516d09513f759 100644
--- a/source/texk/web2c/luatexdir/ocp/runocp.h
+++ b/source/texk/web2c/luatexdir/ocp/runocp.h
@@ -25,7 +25,7 @@
# define active_mem_size 50000 /* number of words of |active_info| for active ocps */
-typedef integer active_index;
+typedef int active_index;
extern memory_word active_info[(active_mem_size + 1)];
extern active_index active_min_ptr;
@@ -36,10 +36,10 @@ extern active_index active_real;
# define active_counter(A) active_info[(A)].hh.u.B1
# define active_lstack_no(A) active_info[(A)+1].cint
-extern boolean is_last_ocp(scaled llstack_no, integer counter);
+extern boolean is_last_ocp(scaled llstack_no, int counter);
extern void print_active_ocps(void);
-extern void add_ocp_stack(integer min_index, scaled min_value);
+extern void add_ocp_stack(int min_index, scaled min_value);
extern void active_compile(void);
extern void run_ocp(void);
@@ -52,10 +52,10 @@ extern void do_clear_ocp_lists(small_number a);
extern void dump_active_ocp_info(void);
extern void undump_active_ocp_info(void);
-extern void initialize_ocp_buffers(integer ocp_buf_size,
- integer ocp_stack_size);
+extern void initialize_ocp_buffers(int ocp_buf_size,
+ int ocp_stack_size);
/* for ocplist.h */
-/* typedef integer ocp_list_index ; */
+/* typedef int ocp_list_index ; */
#endif
diff --git a/source/texk/web2c/luatexdir/pdf/pagetree.c b/source/texk/web2c/luatexdir/pdf/pagetree.c
index 0a1f15052883965add5431d875d05afbb80bacb5..8f0e9023b05879a2836c2623d92dc913fe9e4659 100644
--- a/source/texk/web2c/luatexdir/pdf/pagetree.c
+++ b/source/texk/web2c/luatexdir/pdf/pagetree.c
@@ -35,15 +35,15 @@ static const char __svn_version[] =
static struct avl_table *divert_list_tree = NULL;
typedef struct pages_entry_ {
- integer objnum; /* object number of this /Pages object */
- integer number_of_pages; /* total number of all pages below */
- integer number_of_kids; /* number of direct kid objects */
- integer kids[PAGES_TREE_KIDSMAX]; /* array of kid object numbers */
+ int objnum; /* object number of this /Pages object */
+ int number_of_pages; /* total number of all pages below */
+ int number_of_kids; /* number of direct kid objects */
+ int kids[PAGES_TREE_KIDSMAX]; /* array of kid object numbers */
struct pages_entry_ *next;
} pages_entry;
typedef struct divert_list_entry_ {
- integer divnum;
+ int divnum;
pages_entry *first;
pages_entry *last;
} divert_list_entry;
@@ -91,7 +91,7 @@ static void ensure_list_tree(void)
}
}
-static divert_list_entry *get_divert_list(integer divnum)
+static divert_list_entry *get_divert_list(int divnum)
{
divert_list_entry *d, tmp;
void **aa;
@@ -108,7 +108,7 @@ static divert_list_entry *get_divert_list(integer divnum)
/* pdf_do_page_divert() returns the current /Parent object number */
-integer pdf_do_page_divert(PDF pdf, integer objnum, integer divnum)
+int pdf_do_page_divert(PDF pdf, int objnum, int divnum)
{
divert_list_entry *d;
pages_entry *p;
@@ -165,7 +165,7 @@ static void movelist(divert_list_entry * d, divert_list_entry * dto)
/* undivert from diversion <divnum> into diversion <curdivnum> */
-void pdf_do_page_undivert(integer divnum, integer curdivnum)
+void pdf_do_page_undivert(int divnum, int curdivnum)
{
divert_list_entry *d, *dto, tmp;
struct avl_traverser t;
@@ -230,7 +230,7 @@ static void write_pages(PDF pdf, pages_entry * p, int parent)
/* loop over all /Pages objects, output them, create their parents,
* recursing bottom up, return the /Pages root object number */
-static integer output_pages_list(PDF pdf, pages_entry * pe)
+static int output_pages_list(PDF pdf, pages_entry * pe)
{
pages_entry *p, *q, *r;
assert(pe != NULL);
@@ -251,7 +251,7 @@ static integer output_pages_list(PDF pdf, pages_entry * pe)
return output_pages_list(pdf, r); /* recurse through next higher level */
}
-integer output_pages_tree(PDF pdf)
+int output_pages_tree(PDF pdf)
{
divert_list_entry *d;
pdf_do_page_undivert(0, 0); /* concatenate all diversions into diversion 0 */
diff --git a/source/texk/web2c/luatexdir/pdf/pagetree.h b/source/texk/web2c/luatexdir/pdf/pagetree.h
index 2d713466725461eba1d0affc2766ada9e6390513..0cb1abbf37ec54de6eb2f8cd44509284b8387f20 100644
--- a/source/texk/web2c/luatexdir/pdf/pagetree.h
+++ b/source/texk/web2c/luatexdir/pdf/pagetree.h
@@ -22,8 +22,8 @@
#ifndef PAGETREE_H
# define PAGETREE_H
-integer output_pages_tree(PDF);
-integer pdf_do_page_divert(PDF, integer, integer);
-void pdf_do_page_undivert(integer, integer);
+int output_pages_tree(PDF);
+int pdf_do_page_divert(PDF, int, int);
+void pdf_do_page_undivert(int, int);
#endif
diff --git a/source/texk/web2c/luatexdir/pdf/pdfaction.c b/source/texk/web2c/luatexdir/pdf/pdfaction.c
index 6f998a14d1c8b29b090d44c225c316151ec7c1e6..e5029273429f9e291bb217d08d8d284e2d435ea6 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfaction.c
+++ b/source/texk/web2c/luatexdir/pdf/pdfaction.c
@@ -51,7 +51,7 @@ void delete_action_node(halfword a)
halfword scan_action(PDF pdf)
{
- integer p;
+ int p;
(void) pdf;
p = new_action_node();
if (scan_keyword("user"))
@@ -80,10 +80,10 @@ halfword scan_action(PDF pdf)
pdf_error("ext1", "page number must be positive");
set_pdf_action_id(p, cur_val);
set_pdf_action_named_id(p, 0);
- scan_pdf_ext_toks();
+ scan_pdf_ext_toks();
set_pdf_action_tokens(p, def_ref);
} else if (scan_keyword("name")) {
- scan_pdf_ext_toks();
+ scan_pdf_ext_toks();
set_pdf_action_named_id(p, 1);
set_pdf_action_id(p, def_ref);
} else if (scan_keyword("num")) {
@@ -127,7 +127,7 @@ halfword scan_action(PDF pdf)
void write_action(PDF pdf, halfword p)
{
char *s;
- integer d = 0;
+ int d = 0;
if (pdf_action_type(p) == pdf_action_user) {
pdf_print_toks_ln(pdf, pdf_action_tokens(p));
return;
diff --git a/source/texk/web2c/luatexdir/pdf/pdfannot.c b/source/texk/web2c/luatexdir/pdf/pdfannot.c
index 61a1dd54f8360b745fbd993e9eb4ea3f42647ddb..7a0073caa65b142f4d939b94fc30b11f1e2f9a32 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfannot.c
+++ b/source/texk/web2c/luatexdir/pdf/pdfannot.c
@@ -65,7 +65,7 @@ void new_annot_whatsit(small_number w)
void scan_annot(PDF pdf)
{
- integer k;
+ int k;
if (scan_keyword("reserveobjnum")) {
pdf_create_obj(pdf, obj_type_annot, pdf->sys_obj_ptr + 1);
k = pdf->sys_obj_ptr;
diff --git a/source/texk/web2c/luatexdir/pdf/pdfcolorstack.c b/source/texk/web2c/luatexdir/pdf/pdfcolorstack.c
index 7caa73cc7471fa0f9ae95c7e6495234f91a823ea..50a9f1c42de0ee8276168ef605d20f67667deef3 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfcolorstack.c
+++ b/source/texk/web2c/luatexdir/pdf/pdfcolorstack.c
@@ -107,7 +107,7 @@ int colorstackused(void)
A new color stack is setup with the given parameters.
The stack number is returned or -1 in case of error (no room).
*/
-int newcolorstack(integer s, integer literal_mode, boolean page_start)
+int newcolorstack(int s, int literal_mode, boolean page_start)
{
colstack_type *colstack;
int colstack_num;
@@ -165,7 +165,7 @@ static void put_cstring_on_str_pool(char *str)
selector = save_selector;
}
-integer colorstackset(int colstack_no, str_number s)
+int colorstackset(int colstack_no, str_number s)
{
colstack_type *colstack = get_colstack(colstack_no);
@@ -179,7 +179,7 @@ integer colorstackset(int colstack_no, str_number s)
return colstack->literal_mode;
}
-integer colorstackcurrent(int colstack_no)
+int colorstackcurrent(int colstack_no)
{
colstack_type *colstack = get_colstack(colstack_no);
@@ -191,7 +191,7 @@ integer colorstackcurrent(int colstack_no)
return colstack->literal_mode;
}
-static integer colorstackpush(int colstack_no, str_number s)
+static int colorstackpush(int colstack_no, str_number s)
{
colstack_type *colstack = get_colstack(colstack_no);
char *str;
@@ -227,7 +227,7 @@ static integer colorstackpush(int colstack_no, str_number s)
return colstack->literal_mode;
}
-integer colorstackpop(int colstack_no)
+int colorstackpop(int colstack_no)
{
colstack_type *colstack = get_colstack(colstack_no);
@@ -278,7 +278,7 @@ void colorstackpagestart(void)
}
}
-integer colorstackskippagestart(int colstack_no)
+int colorstackskippagestart(int colstack_no)
{
colstack_type *colstack = get_colstack(colstack_no);
@@ -297,11 +297,11 @@ integer colorstackskippagestart(int colstack_no)
void pdf_out_colorstack(PDF pdf, halfword p)
{
- integer old_setting;
+ int old_setting;
str_number s;
- integer cmd;
- integer stack_no;
- integer literal_mode;
+ int cmd;
+ int stack_no;
+ int literal_mode;
cmd = pdf_colorstack_cmd(p);
stack_no = pdf_colorstack_stack(p);
literal_mode = 0;
@@ -318,7 +318,7 @@ void pdf_out_colorstack(PDF pdf, halfword p)
case colorstack_push:
old_setting = selector;
selector = new_string;
- show_token_list(token_link(pdf_colorstack_data(p)), null,-1);
+ show_token_list(token_link(pdf_colorstack_data(p)), null, -1);
selector = old_setting;
s = make_string();
if (cmd == colorstack_set)
@@ -348,10 +348,10 @@ void pdf_out_colorstack(PDF pdf, halfword p)
void pdf_out_colorstack_startpage(PDF pdf)
{
- integer i;
- integer max;
- integer start_status;
- integer literal_mode;
+ int i;
+ int max;
+ int start_status;
+ int literal_mode;
str_number s;
i = 0;
max = colorstackused();
diff --git a/source/texk/web2c/luatexdir/pdf/pdfcolorstack.h b/source/texk/web2c/luatexdir/pdf/pdfcolorstack.h
index 20fddda1b7ddfde2f2b828c47b00983c4bd4a99d..1df5212cbac5e38f8d744e8d5f5c35853703029b 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfcolorstack.h
+++ b/source/texk/web2c/luatexdir/pdf/pdfcolorstack.h
@@ -31,11 +31,11 @@ extern boolean page_mode;
# define STACK_INCREMENT 8
-int newcolorstack(integer s, integer literal_mode, boolean pagestart);
+int newcolorstack(int s, int literal_mode, boolean pagestart);
int colorstackused(void);
-integer colorstackpop(int colstack_no);
-integer colorstackcurrent(int colstack_no);
-integer colorstackskippagestart(int colstack_no);
+int colorstackpop(int colstack_no);
+int colorstackcurrent(int colstack_no);
+int colorstackskippagestart(int colstack_no);
void colorstackpagestart(void);
extern void pdf_out_colorstack(PDF pdf, halfword p);
diff --git a/source/texk/web2c/luatexdir/pdf/pdfdest.c b/source/texk/web2c/luatexdir/pdf/pdfdest.c
index 7400944a93985ed448ebdc3922e16a82793e5151..bfa0c07b55f88794f5d00946cccaa99e73acc542 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfdest.c
+++ b/source/texk/web2c/luatexdir/pdf/pdfdest.c
@@ -39,9 +39,9 @@ void init_dest_names(PDF pdf)
pdf->dest_names = xmallocarray(dest_name_entry, inf_dest_names_size); /* will grow dynamically */
}
-void append_dest_name(PDF pdf, char *s, integer n)
+void append_dest_name(PDF pdf, char *s, int n)
{
- integer a;
+ int a;
if (pdf->dest_names_ptr == sup_dest_names_size)
overflow("number of destination names (dest_names_size)",
pdf->dest_names_size);
@@ -65,7 +65,7 @@ When a destination is created we need to check whether another destination
with the same identifier already exists and give a warning if needed.
*/
-void warn_dest_dup(integer id, small_number byname, char *s1, char *s2)
+void warn_dest_dup(int id, small_number byname, char *s1, char *s2)
{
pdf_warning(s1, "destination with the same identifier (", false, false);
if (byname > 0) {
@@ -86,7 +86,7 @@ void do_dest(PDF pdf, halfword p, halfword parent_box, scaledpos cur)
{
scaledpos pos = pdf->posstruct->pos;
scaled_whd alt_rule;
- integer k;
+ int k;
if (!is_shipping_page)
pdf_error("ext4", "destinations cannot be inside an XForm");
if (doing_leaders)
@@ -142,7 +142,7 @@ void write_out_pdf_mark_destinations(PDF pdf)
pdf_error("ext5",
"destination has been already written (this shouldn't happen)");
} else {
- integer i;
+ int i;
i = obj_dest_ptr(pdf, k->info);
if (pdf_dest_named_id(i) > 0) {
pdf_begin_dict(pdf, k->info, 1);
@@ -213,7 +213,7 @@ void write_out_pdf_mark_destinations(PDF pdf)
void scan_pdfdest(PDF pdf)
{
halfword q;
- integer k;
+ int k;
str_number i;
scaled_whd alt_rule;
q = cur_list.tail_field;
@@ -311,15 +311,15 @@ pointers.
*/
-integer output_name_tree(PDF pdf)
+int output_name_tree(PDF pdf)
{
boolean is_names = true; /* flag for name tree output: is it Names or Kids? */
- integer b = 0, j, l;
- integer k = 0; /* index of current child of |l|; if |k < pdf_dest_names_ptr|
+ int b = 0, j, l;
+ int k = 0; /* index of current child of |l|; if |k < pdf_dest_names_ptr|
then this is pointer to |dest_names| array;
otherwise it is the pointer to |obj_tab| (object number) */
- integer dests = 0;
- integer names_head = 0, names_tail = 0;
+ int dests = 0;
+ int names_head = 0, names_tail = 0;
if (pdf->dest_names_ptr == 0) {
goto DONE;
}
diff --git a/source/texk/web2c/luatexdir/pdf/pdfdest.h b/source/texk/web2c/luatexdir/pdf/pdfdest.h
index 06d19f99861acf4f47a85bcbbbb3c63e818ef936..78a929e1cb6b086819055afb7e365444feb86bee 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfdest.h
+++ b/source/texk/web2c/luatexdir/pdf/pdfdest.h
@@ -51,15 +51,15 @@ typedef enum {
# define inf_dest_names_size 1000 /* min size of the destination names table for PDF output */
# define sup_dest_names_size 131072 /* max size of the destination names table for PDF output */
-extern void append_dest_name(PDF, char *, integer);
+extern void append_dest_name(PDF, char *, int);
extern void do_dest(PDF pdf, halfword p, halfword parent_box, scaledpos cur);
-extern void warn_dest_dup(integer id, small_number byname, char *s1, char *s2);
+extern void warn_dest_dup(int id, small_number byname, char *s1, char *s2);
extern void write_out_pdf_mark_destinations(PDF);
extern void scan_pdfdest(PDF);
extern void init_dest_names(PDF);
extern void sort_dest_names(PDF);
-extern integer output_name_tree(PDF);
+extern int output_name_tree(PDF);
#endif
diff --git a/source/texk/web2c/luatexdir/pdf/pdffont.c b/source/texk/web2c/luatexdir/pdf/pdffont.c
index 2e02f52c4c070df639665f0a2c3b425170601549..f7290718353d78db54c653895b3471377938a7b5 100644
--- a/source/texk/web2c/luatexdir/pdf/pdffont.c
+++ b/source/texk/web2c/luatexdir/pdf/pdffont.c
@@ -27,7 +27,7 @@ static const char __svn_version[] =
#define font_id_text(A) cs_text(font_id_base+(A)) /* a frozen font identifier's name */
-integer pk_dpi; /* PK pixel density value from \.{texmf.cnf} */
+int pk_dpi; /* PK pixel density value from \.{texmf.cnf} */
/*
As \pdfTeX{} should also act as a back-end driver, it needs to support virtual
@@ -41,7 +41,7 @@ The |has_packet()| C macro checks for this condition.
/* The following code typesets a character to PDF output */
-void output_one_char(PDF pdf, internal_font_number ffi, integer c)
+void output_one_char(PDF pdf, internal_font_number ffi, int c)
{
scaled_whd ci; /* the real width, height and depth of the character */
ci = get_charinfo_whd(ffi, c);
@@ -68,7 +68,7 @@ void output_one_char(PDF pdf, internal_font_number ffi, integer c)
}
/* mark |f| as a used font; set |font_used(f)|, |pdf_font_size(f)| and |pdf_font_num(f)| */
-void pdf_use_font(internal_font_number f, integer fontnum)
+void pdf_use_font(internal_font_number f, int fontnum)
{
set_pdf_font_size(f, font_size(f));
set_font_used(f, true);
@@ -88,7 +88,7 @@ indicates that the corresponding font shares the font resource with the font
void pdf_init_font(PDF pdf, internal_font_number f)
{
internal_font_number k, b;
- integer i;
+ int i;
assert(!font_used(f));
/* if |f| is auto expanded then ensure the base font is initialized */
@@ -132,7 +132,7 @@ internal_font_number pdf_set_font(PDF pdf, internal_font_number f)
{
pdf_object_list *p;
internal_font_number k;
- integer ff; /* for use with |set_ff| */
+ int ff; /* for use with |set_ff| */
if (!font_used(f))
pdf_init_font(pdf, f);
@@ -155,8 +155,7 @@ internal_font_number pdf_set_font(PDF pdf, internal_font_number f)
/* Here come some subroutines to deal with expanded fonts for HZ-algorithm. */
-void copy_expand_params(internal_font_number k, internal_font_number f,
- integer e)
+void copy_expand_params(internal_font_number k, internal_font_number f, int e)
{ /* set expansion-related parameters for an expanded font |k|, based on the base
font |f| and the expansion amount |e| */
set_pdf_font_expand_ratio(k, e);
@@ -184,7 +183,7 @@ internal_font_number tfm_lookup(str_number s, scaled fs)
return null_font;
}
-internal_font_number load_expand_font(internal_font_number f, integer e)
+internal_font_number load_expand_font(internal_font_number f, int e)
{ /* loads font |f| expanded by |e| thousandths into font memory; |e| is nonzero
and is a multiple of |pdf_font_step(f)| */
str_number s; /* font name */
@@ -203,10 +202,10 @@ internal_font_number load_expand_font(internal_font_number f, integer e)
return k;
}
-integer fix_expand_value(internal_font_number f, integer e)
+int fix_expand_value(internal_font_number f, int e)
{ /* return the multiple of |pdf_font_step(f)| that is nearest to |e| */
- integer step;
- integer max_expand;
+ int step;
+ int max_expand;
boolean neg;
if (e == 0)
return 0;
@@ -230,7 +229,7 @@ integer fix_expand_value(internal_font_number f, integer e)
return e;
}
-internal_font_number get_expand_font(internal_font_number f, integer e)
+internal_font_number get_expand_font(internal_font_number f, int e)
{ /* look up and create if not found an expanded version of |f|; |f| is an
expandable font; |e| is nonzero and is a multiple of |pdf_font_step(f)| */
internal_font_number k;
@@ -246,7 +245,7 @@ internal_font_number get_expand_font(internal_font_number f, integer e)
return k;
}
-internal_font_number expand_font(internal_font_number f, integer e)
+internal_font_number expand_font(internal_font_number f, int e)
{ /* looks up for font |f| expanded by |e| thousandths, |e| is an arbitrary value
between max stretch and max shrink of |f|; if not found then creates it */
if (e == 0)
@@ -260,8 +259,8 @@ internal_font_number expand_font(internal_font_number f, integer e)
}
void set_expand_params(internal_font_number f, boolean auto_expand,
- integer stretch_limit, integer shrink_limit,
- integer font_step, integer expand_ratio)
+ int stretch_limit, int shrink_limit,
+ int font_step, int expand_ratio)
{ /* expand a font with given parameters */
set_pdf_font_step(f, font_step);
set_pdf_font_auto_expand(f, auto_expand);
@@ -275,7 +274,7 @@ void set_expand_params(internal_font_number f, boolean auto_expand,
void read_expand_font(void)
{ /* read font expansion spec and load expanded font */
- integer shrink_limit, stretch_limit, font_step;
+ int shrink_limit, stretch_limit, font_step;
internal_font_number f;
boolean auto_expand;
/* read font expansion parameters */
@@ -396,7 +395,7 @@ void make_font_copy(small_number a)
void pdf_include_chars(PDF pdf)
{
str_number s;
- unsigned char *k, *j; /* running index */
+ unsigned char *k, *j; /* running index */
internal_font_number f;
scan_font_ident();
f = cur_val;
@@ -408,7 +407,7 @@ void pdf_include_chars(PDF pdf)
scan_pdf_ext_toks();
s = tokens_to_string(def_ref);
delete_token_ref(def_ref);
- j = str_string(s)+str_length(s);
+ j = str_string(s) + str_length(s);
for (k = str_string(s); k < j; k++) {
pdf_mark_char(f, *k);
}
diff --git a/source/texk/web2c/luatexdir/pdf/pdffont.h b/source/texk/web2c/luatexdir/pdf/pdffont.h
index 4e095da9b5a1963a1ac3f1870deb67a08d5b2fea..7f52b70e99295419e4d6945441ebec5ad0aefe70 100644
--- a/source/texk/web2c/luatexdir/pdf/pdffont.h
+++ b/source/texk/web2c/luatexdir/pdf/pdffont.h
@@ -22,27 +22,27 @@
#ifndef PDFFONT_H
# define PDFFONT_H
-extern void output_one_char(PDF pdf, internal_font_number ffi, integer c);
+extern void output_one_char(PDF pdf, internal_font_number ffi, int c);
-extern void pdf_use_font(internal_font_number f, integer fontnum);
+extern void pdf_use_font(internal_font_number f, int fontnum);
extern void pdf_init_font(PDF pdf, internal_font_number f);
extern internal_font_number pdf_set_font(PDF pdf, internal_font_number f);
-typedef integer *fm_entry_ptr;
+typedef int *fm_entry_ptr;
-extern integer pk_dpi; /* PK pixel density value from \.{texmf.cnf} */
+extern int pk_dpi; /* PK pixel density value from \.{texmf.cnf} */
extern void copy_expand_params(internal_font_number k, internal_font_number f,
- integer e);
+ int e);
extern internal_font_number tfm_lookup(str_number s, scaled fs);
-extern internal_font_number load_expand_font(internal_font_number f, integer e);
-extern integer fix_expand_value(internal_font_number f, integer e);
-extern internal_font_number get_expand_font(internal_font_number f, integer e);
-extern internal_font_number expand_font(internal_font_number f, integer e);
+extern internal_font_number load_expand_font(internal_font_number f, int e);
+extern int fix_expand_value(internal_font_number f, int e);
+extern internal_font_number get_expand_font(internal_font_number f, int e);
+extern internal_font_number expand_font(internal_font_number f, int e);
extern void set_expand_params(internal_font_number f, boolean auto_expand,
- integer stretch_limit, integer shrink_limit,
- integer font_step, integer expand_ratio);
+ int stretch_limit, int shrink_limit,
+ int font_step, int expand_ratio);
extern void read_expand_font(void);
extern void new_letterspaced_font(small_number a);
diff --git a/source/texk/web2c/luatexdir/pdf/pdfgen.c b/source/texk/web2c/luatexdir/pdf/pdfgen.c
index 48b3737ae7175799485820f949ab52238290de2c..e4db999900d8edec736253fdcfa6ce58463109b4 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfgen.c
+++ b/source/texk/web2c/luatexdir/pdf/pdfgen.c
@@ -38,10 +38,10 @@ PDF static_pdf = NULL;
static char *jobname_cstr = NULL;
/* commandline interface */
-integer pdf_output_option;
-integer pdf_output_value;
-integer pdf_draftmode_option;
-integer pdf_draftmode_value;
+int pdf_output_option;
+int pdf_output_value;
+int pdf_draftmode_option;
+int pdf_draftmode_value;
halfword pdf_info_toks; /* additional keys of Info dictionary */
halfword pdf_catalog_toks; /* additional keys of Catalog dictionary */
@@ -132,10 +132,10 @@ static void pdf_shipout_end(boolean shipping_page)
We use |pdf_get_mem| to allocate memory in |mem|
*/
-integer pdf_get_mem(PDF pdf, integer s)
+int pdf_get_mem(PDF pdf, int s)
{ /* allocate |s| words in |mem| */
- integer a;
- integer ret;
+ int a;
+ int ret;
if (s > sup_pdf_mem_size - pdf->mem_ptr)
overflow("PDF memory size (pdf_mem_size)", pdf->mem_size);
if (pdf->mem_ptr + s > pdf->mem_size) {
@@ -225,7 +225,7 @@ to finish it. The stream contents will be compressed if compression is turn on.
/* writepdf() always writes by fwrite() */
-static void write_pdf(PDF pdf, integer a, int b)
+static void write_pdf(PDF pdf, int a, int b)
{
(void) fwrite((char *) &pdf->buf[a], sizeof(pdf->buf[a]),
(int) ((b) - (a) + 1), pdf->file);
@@ -287,7 +287,7 @@ void pdf_os_switch(PDF pdf, boolean pdf_os)
}
/* create new \.{/ObjStm} object if required, and set up cross reference info */
-void pdf_os_prepare_obj(PDF pdf, integer i, integer pdf_os_level)
+void pdf_os_prepare_obj(PDF pdf, int i, int pdf_os_level)
{
pdf_os_switch(pdf, ((pdf_os_level > 0)
&& (pdf->objcompresslevel >= pdf_os_level)));
@@ -315,9 +315,9 @@ void pdf_os_prepare_obj(PDF pdf, integer i, integer pdf_os_level)
/* low-level buffer checkers */
/* check that |s| bytes more fit into |pdf_os_buf|; increase it if required */
-static void pdf_os_get_os_buf(PDF pdf, integer s)
+static void pdf_os_get_os_buf(PDF pdf, int s)
{
- integer a;
+ int a;
if (s > sup_pdf_os_buf_size - pdf->ptr)
overflow("PDF object stream buffer", pdf->os_buf_size);
if (pdf->ptr + s > pdf->os_buf_size) {
@@ -336,7 +336,7 @@ static void pdf_os_get_os_buf(PDF pdf, integer s)
}
/* make sure that there are at least |n| bytes free in PDF buffer */
-void pdf_room(PDF pdf, integer n)
+void pdf_room(PDF pdf, int n)
{
if (pdf->os_mode && (n + pdf->ptr > pdf->buf_size))
pdf_os_get_os_buf(pdf, n);
@@ -428,8 +428,8 @@ void pdf_print(PDF pdf, str_number s)
void pdf_print_int(PDF pdf, longinteger n)
{
- register integer k = 0; /* current digit; we assume that $|n|<10^{23}$ */
- integer dig[24];
+ register int k = 0; /* current digit; we assume that $|n|<10^{23}$ */
+ int dig[24];
if (n < 0) {
pdf_out(pdf, '-');
if (n < -0x7FFFFFFF) { /* need to negate |n| more carefully */
@@ -460,7 +460,7 @@ void pdf_print_int(PDF pdf, longinteger n)
/* print $m/10^d$ as real */
-void pdf_print_real(PDF pdf, integer m, integer d)
+void pdf_print_real(PDF pdf, int m, int d)
{
if (m < 0) {
pdf_out(pdf, '-');
@@ -584,7 +584,7 @@ scaled one_hundred_bp = (7227 * 65536) / 72;
scaled one_bp = ((7227 * 65536) / 72 + 50) / 100;
/* $10^0..10^9$ */
-integer ten_pow[10] = {
+int ten_pow[10] = {
1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000
};
@@ -594,7 +594,7 @@ digits of precision. It is defined in C because it is a good candidate
for optimizations that are not possible in pascal.
*/
-scaled round_xn_over_d(scaled x, integer n, integer d)
+scaled round_xn_over_d(scaled x, int n, int d)
{
boolean positive; /* was |x>=0|? */
unsigned t, u, v; /* intermediate quantities */
@@ -670,7 +670,7 @@ void reset_resource_lists(pdf_resource_struct * p)
p->image_procset = 0;
}
-void append_object_list(PDF pdf, pdf_obj_type t, integer objnum)
+void append_object_list(PDF pdf, pdf_obj_type t, int objnum)
{
pdf_object_list *p;
pdf_object_list *item = xmalloc(sizeof(pdf_object_list));
@@ -697,7 +697,7 @@ void append_object_list(PDF pdf, pdf_obj_type t, integer objnum)
}
/* return zero on failure, or the object */
-pdf_object_list *lookup_object_list(PDF pdf, pdf_obj_type t, integer f)
+pdf_object_list *lookup_object_list(PDF pdf, pdf_obj_type t, int f)
{
pdf_object_list *p;
switch (t) {
@@ -775,10 +775,10 @@ void flush_resource_lists(PDF pdf)
/* Subroutines to print out various PDF objects */
/* print out an integer with fixed width; used for outputting cross-reference table */
-void pdf_print_fw_int(PDF pdf, longinteger n, integer w)
+void pdf_print_fw_int(PDF pdf, longinteger n, int w)
{
- integer k; /* $0\le k\le23$ */
- integer dig[24];
+ int k; /* $0\le k\le23$ */
+ int dig[24];
k = 0;
do {
dig[k] = n % 10;
@@ -791,10 +791,10 @@ void pdf_print_fw_int(PDF pdf, longinteger n, integer w)
}
/* print out an integer as a number of bytes; used for outputting \.{/XRef} cross-reference stream */
-void pdf_out_bytes(PDF pdf, longinteger n, integer w)
+void pdf_out_bytes(PDF pdf, longinteger n, int w)
{
- integer k;
- integer bytes[8]; /* digits in a number being output */
+ int k;
+ int bytes[8]; /* digits in a number being output */
k = 0;
do {
bytes[k] = n % 256;
@@ -808,11 +808,11 @@ void pdf_out_bytes(PDF pdf, longinteger n, integer w)
/* print out an entry in dictionary with integer value to PDF buffer */
-void pdf_int_entry(PDF pdf, char *s, integer v)
+void pdf_int_entry(PDF pdf, char *s, int v)
{
pdf_printf(pdf, "/%s ", s);
pdf_print_int(pdf, v);
-} void pdf_int_entry_ln(PDF pdf, char *s, integer v)
+} void pdf_int_entry_ln(PDF pdf, char *s, int v)
{
pdf_int_entry(pdf, s, v);
@@ -820,10 +820,10 @@ void pdf_int_entry(PDF pdf, char *s, integer v)
}
/* print out an indirect entry in dictionary */
-void pdf_indirect(PDF pdf, char *s, integer o)
+void pdf_indirect(PDF pdf, char *s, int o)
{
pdf_printf(pdf, "/%s %d 0 R", s, (int) o);
-} void pdf_indirect_ln(PDF pdf, char *s, integer o)
+} void pdf_indirect_ln(PDF pdf, char *s, int o)
{
pdf_indirect(pdf, s, o);
@@ -1029,7 +1029,7 @@ void ensure_output_state(PDF pdf, output_state s)
/**********************************************************************/
/* begin a PDF dictionary object */
-void pdf_begin_dict(PDF pdf, integer i, integer pdf_os_level)
+void pdf_begin_dict(PDF pdf, int i, int pdf_os_level)
{
ensure_output_state(pdf, ST_HEADER_WRITTEN);
pdf_os_prepare_obj(pdf, i, pdf_os_level);
@@ -1043,7 +1043,7 @@ void pdf_begin_dict(PDF pdf, integer i, integer pdf_os_level)
}
/* begin a new PDF dictionary object */
-void pdf_new_dict(PDF pdf, integer t, integer i, integer pdf_os)
+void pdf_new_dict(PDF pdf, int t, int i, int pdf_os)
{
pdf_create_obj(pdf, t, i);
pdf_begin_dict(pdf, pdf->obj_ptr, pdf_os);
@@ -1121,7 +1121,7 @@ void pdf_os_write_objstream(PDF pdf)
}
/* begin a PDF object */
-void pdf_begin_obj(PDF pdf, integer i, integer pdf_os_level)
+void pdf_begin_obj(PDF pdf, int i, int pdf_os_level)
{
ensure_output_state(pdf, ST_HEADER_WRITTEN);
pdf_os_prepare_obj(pdf, i, pdf_os_level);
@@ -1133,7 +1133,7 @@ void pdf_begin_obj(PDF pdf, integer i, integer pdf_os_level)
}
/* begin a new PDF object */
-void pdf_new_obj(PDF pdf, integer t, integer i, integer pdf_os)
+void pdf_new_obj(PDF pdf, int t, int i, int pdf_os)
{
pdf_create_obj(pdf, t, i);
pdf_begin_obj(pdf, pdf->obj_ptr, pdf_os);
@@ -1150,7 +1150,7 @@ void pdf_end_obj(PDF pdf)
}
}
-void write_stream_length(PDF pdf, integer length, longinteger offset)
+void write_stream_length(PDF pdf, int length, longinteger offset)
{
if (jobname_cstr == NULL)
jobname_cstr = makecstring(job_name);
@@ -1436,12 +1436,12 @@ static void realloc_fb(PDF pdf)
}
}
-integer fb_offset(PDF pdf)
+int fb_offset(PDF pdf)
{
return pdf->fb_ptr - pdf->fb_array;
}
-void fb_seek(PDF pdf, integer offset)
+void fb_seek(PDF pdf, int offset)
{
pdf->fb_ptr = pdf->fb_array + offset;
}
@@ -1457,7 +1457,7 @@ void fb_putchar(PDF pdf, eight_bits b)
void fb_flush(PDF pdf)
{
char *p;
- integer n;
+ int n;
for (p = pdf->fb_array; p < pdf->fb_ptr;) {
n = pdf->buf_size - pdf->ptr;
if (pdf->fb_ptr - p < n)
@@ -1748,7 +1748,7 @@ void pdf_begin_page(PDF pdf, boolean shipping_page)
void pdf_end_page(PDF pdf, boolean shipping_page)
{
- integer j, ff;
+ int j, ff;
pdf_resource_struct *res_p = pdf->resources;
pdf_resource_struct local_resources;
pdf_object_list *ol;
@@ -1994,7 +1994,7 @@ PDF browsers, so we need to fix them; they point to the last page.
static void check_nonexisting_destinations(PDF pdf)
{
- integer k;
+ int k;
for (k = pdf->head_tab[obj_type_dest]; k != 0; k = obj_link(pdf, k)) {
if (obj_dest_ptr(pdf, k) == null) {
pdf_warning("dest", NULL, false, false);
@@ -2050,7 +2050,7 @@ boolean substr_of_str(char *s, char *t)
return true;
}
-void pdf_print_info(PDF pdf, integer luatex_version, str_number luatex_revision)
+void pdf_print_info(PDF pdf, int luatex_version, str_number luatex_revision)
{ /* print info object */
boolean creator_given, producer_given, creationdate_given, moddate_given,
trapped_given;
@@ -2107,7 +2107,7 @@ void pdf_print_info(PDF pdf, integer luatex_version, str_number luatex_revision)
void build_free_object_list(PDF pdf)
{
- integer k, l;
+ int k, l;
l = 0;
set_obj_fresh(pdf, l); /* null object at begin of list of free objects */
for (k = 1; k <= pdf->sys_obj_ptr; k++) {
@@ -2126,14 +2126,13 @@ Now the finish of PDF output file. At this moment all Page objects
are already written completely to PDF output file.
*/
-void finish_pdf_file(PDF pdf, integer luatex_version,
- str_number luatex_revision)
+void finish_pdf_file(PDF pdf, int luatex_version, str_number luatex_revision)
{
boolean res;
- integer i, j, k;
- integer root, outlines, threads, names_tree;
- integer xref_offset_width;
- integer callback_id = callback_defined(stop_run_callback);
+ int i, j, k;
+ int root, outlines, threads, names_tree;
+ int xref_offset_width;
+ int callback_id = callback_defined(stop_run_callback);
if (total_pages == 0) {
if (callback_id == 0) {
diff --git a/source/texk/web2c/luatexdir/pdf/pdfgen.h b/source/texk/web2c/luatexdir/pdf/pdfgen.h
index 164d99e415e125b62c6a4452d36170aed0809888..7b5951b8dd5687f2715b9a9c4b50f95beebdda24 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfgen.h
+++ b/source/texk/web2c/luatexdir/pdf/pdfgen.h
@@ -27,7 +27,7 @@
extern PDF static_pdf;
-extern integer pdf_get_mem(PDF pdf, integer s);
+extern int pdf_get_mem(PDF pdf, int s);
/*
We use the similiar subroutines to handle the output buffer for
@@ -70,20 +70,20 @@ typedef enum {
zip_finish = 2 /* finish \.{ZIP} compression */
} zip_write_states;
-extern integer pdf_output_option;
-extern integer pdf_output_value;
-extern integer pdf_draftmode_option;
-extern integer pdf_draftmode_value;
+extern int pdf_output_option;
+extern int pdf_output_value;
+extern int pdf_draftmode_option;
+extern int pdf_draftmode_value;
extern scaled one_hundred_inch;
extern scaled one_inch;
extern scaled one_true_inch;
extern scaled one_hundred_bp;
extern scaled one_bp;
-extern integer ten_pow[10];
+extern int ten_pow[10];
extern void pdf_flush(PDF);
-extern void pdf_room(PDF, integer);
+extern void pdf_room(PDF, int);
extern void fix_pdf_minorversion(PDF);
@@ -130,7 +130,7 @@ extern void pdf_print_char(PDF, int);
extern void pdf_print_wide_char(PDF, int);
extern void pdf_print(PDF, str_number);
extern void pdf_print_int(PDF, longinteger);
-extern void pdf_print_real(PDF, integer, integer);
+extern void pdf_print_real(PDF, int, int);
extern void pdf_print_str(PDF, char *);
extern void pdf_begin_stream(PDF);
@@ -144,8 +144,8 @@ extern void pdf_print_mag_bp(PDF, scaled);
/* This is for the resource lists */
extern void reset_resource_lists(pdf_resource_struct * p);
-extern void append_object_list(PDF pdf, pdf_obj_type t, integer f);
-extern pdf_object_list *lookup_object_list(PDF pdf, pdf_obj_type t, integer f);
+extern void append_object_list(PDF pdf, pdf_obj_type t, int f);
+extern pdf_object_list *lookup_object_list(PDF pdf, pdf_obj_type t, int f);
void flush_resource_lists(PDF pdf);
# define pdf_print_resname_prefix(pdf) do { \
@@ -153,12 +153,12 @@ void flush_resource_lists(PDF pdf);
pdf_puts(pdf,pdf->resname_prefix); \
} while (0)
-extern void pdf_print_fw_int(PDF, longinteger, integer);
-extern void pdf_out_bytes(PDF, longinteger, integer);
-extern void pdf_int_entry(PDF, char *, integer);
-extern void pdf_int_entry_ln(PDF, char *, integer);
-extern void pdf_indirect(PDF, char *, integer);
-extern void pdf_indirect_ln(PDF, char *, integer);
+extern void pdf_print_fw_int(PDF, longinteger, int);
+extern void pdf_out_bytes(PDF, longinteger, int);
+extern void pdf_int_entry(PDF, char *, int);
+extern void pdf_int_entry_ln(PDF, char *, int);
+extern void pdf_indirect(PDF, char *, int);
+extern void pdf_indirect_ln(PDF, char *, int);
extern void pdf_print_str_ln(PDF, char *);
extern void pdf_str_entry(PDF, char *, char *);
extern void pdf_str_entry_ln(PDF, char *, char *);
@@ -169,19 +169,19 @@ extern void pdf_print_toks_ln(PDF, halfword);
extern void pdf_print_rect_spec(PDF, halfword);
extern void pdf_rectangle(PDF, halfword);
-extern void pdf_begin_obj(PDF, integer, integer);
-extern void pdf_new_obj(PDF, integer, integer, integer);
+extern void pdf_begin_obj(PDF, int, int);
+extern void pdf_new_obj(PDF, int, int, int);
extern void pdf_end_obj(PDF);
-extern void pdf_begin_dict(PDF, integer, integer);
-extern void pdf_new_dict(PDF, integer, integer, integer);
+extern void pdf_begin_dict(PDF, int, int);
+extern void pdf_new_dict(PDF, int, int, int);
extern void pdf_end_dict(PDF);
extern void pdf_os_switch(PDF pdf, boolean pdf_os);
-extern void pdf_os_prepare_obj(PDF pdf, integer i, integer pdf_os_level);
+extern void pdf_os_prepare_obj(PDF pdf, int i, int pdf_os_level);
extern void pdf_os_write_objstream(PDF);
-extern void write_stream_length(PDF, integer, longinteger);
+extern void write_stream_length(PDF, int, longinteger);
extern void print_creation_date(PDF);
extern void print_mod_date(PDF);
@@ -189,10 +189,10 @@ extern void print_ID(PDF, char *);
extern void remove_pdffile(PDF);
-extern integer fb_offset(PDF);
+extern int fb_offset(PDF);
extern void fb_flush(PDF);
extern void fb_putchar(PDF, eight_bits);
-extern void fb_seek(PDF, integer);
+extern void fb_seek(PDF, int);
extern void fb_free(PDF);
extern void write_zip(PDF, boolean);
@@ -200,7 +200,7 @@ extern void zip_free(PDF);
/* functions that do not output stuff */
-extern scaled round_xn_over_d(scaled x, integer n, integer d);
+extern scaled round_xn_over_d(scaled x, int n, int d);
extern char *convertStringToPDFString(const char *in, int len);
extern void init_start_time(PDF);
@@ -225,7 +225,7 @@ extern halfword pdf_catalog_openaction;
extern halfword pdf_names_toks; /* additional keys of Names dictionary */
extern halfword pdf_trailer_toks; /* additional keys of Trailer dictionary */
extern void scan_pdfcatalog(PDF pdf);
-extern void finish_pdf_file(PDF pdf, integer luatex_version,
+extern void finish_pdf_file(PDF pdf, int luatex_version,
str_number luatex_revision);
extern boolean is_shipping_page;
diff --git a/source/texk/web2c/luatexdir/pdf/pdfglyph.c b/source/texk/web2c/luatexdir/pdf/pdfglyph.c
index b54b2f5bdec929ed6689c4ca5bd878ba23737ede..92ebdfa60eda897bd04a0d4bf74febc7e46d9d4e 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfglyph.c
+++ b/source/texk/web2c/luatexdir/pdf/pdfglyph.c
@@ -151,7 +151,7 @@ void end_chararray(PDF pdf)
/**********************************************************************/
-void pdf_place_glyph(PDF pdf, internal_font_number f, integer c)
+void pdf_place_glyph(PDF pdf, internal_font_number f, int c)
{
boolean move;
pdfstructure *p = pdf->pstruct;
diff --git a/source/texk/web2c/luatexdir/pdf/pdfglyph.h b/source/texk/web2c/luatexdir/pdf/pdfglyph.h
index 9df820d7e5547a35ddf5d1ebf0484e9987a7d7a2..ddfcd2de418caa4797702c9e57532d0a8879ba5e 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfglyph.h
+++ b/source/texk/web2c/luatexdir/pdf/pdfglyph.h
@@ -24,7 +24,7 @@
void end_chararray(PDF pdf);
void end_charmode(PDF pdf);
-void pdf_place_glyph(PDF pdf, internal_font_number f, integer c);
+void pdf_place_glyph(PDF pdf, internal_font_number f, int c);
void pdf_print_charwidth(PDF pdf, internal_font_number f, int i);
#endif
diff --git a/source/texk/web2c/luatexdir/pdf/pdfimage.c b/source/texk/web2c/luatexdir/pdf/pdfimage.c
index 2d0b9d35be78c86675df61564895b6840acfcb1f..e42598f129360f37b95e5a93ab8c3bfe6c1bcbd1 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfimage.c
+++ b/source/texk/web2c/luatexdir/pdf/pdfimage.c
@@ -33,7 +33,7 @@ void place_img(PDF pdf, image_dict * idict, scaled_whd dim, int transform)
int k;
scaledpos tmppos;
pdffloat cm[6];
- integer groupref; /* added from web for 1.40.8 */
+ int groupref; /* added from web for 1.40.8 */
assert(idict != 0);
assert(p != NULL);
a[0] = a[3] = 1.0e6;
diff --git a/source/texk/web2c/luatexdir/pdf/pdflink.c b/source/texk/web2c/luatexdir/pdf/pdflink.c
index e82445c8874d92510f5349ff7ceb4af84e0537a3..18672001d5a5d401d479efb87ecb7273930f7f68 100644
--- a/source/texk/web2c/luatexdir/pdf/pdflink.c
+++ b/source/texk/web2c/luatexdir/pdf/pdflink.c
@@ -141,7 +141,7 @@ void append_link(PDF pdf, halfword parent_box, scaledpos cur, small_number i)
void scan_startlink(PDF pdf)
{
- integer k;
+ int k;
halfword r;
if (abs(cur_list.mode_field) == vmode)
pdf_error("ext1", "\\pdfstartlink cannot be used in vertical mode");
@@ -149,7 +149,7 @@ void scan_startlink(PDF pdf)
new_annot_whatsit(pdf_start_link_node);
set_pdf_link_attr(cur_list.tail_field, null);
if (scan_keyword("attr")) {
- scan_pdf_ext_toks();
+ scan_pdf_ext_toks();
set_pdf_link_attr(cur_list.tail_field, def_ref);
}
r = scan_action(pdf);
diff --git a/source/texk/web2c/luatexdir/pdf/pdflistout.c b/source/texk/web2c/luatexdir/pdf/pdflistout.c
index 851b2e150f6d89f5d93925e5e5c9037d78c4ed18..202e8c2e758fe126608e9b487f1a1b3de0c72eac 100644
--- a/source/texk/web2c/luatexdir/pdf/pdflistout.c
+++ b/source/texk/web2c/luatexdir/pdf/pdflistout.c
@@ -166,8 +166,8 @@ static halfword calculate_width_to_enddir(halfword p, real cur_glue,
/* to me, it looks like the next is needed. but Aleph doesn't do that, so let us not do it either */
real glue_temp; /* glue value before rounding */
/* |w:=w-cur_g; cur_glue:=0;| */
- integer g_sign = glue_sign(this_box);
- integer g_order = glue_order(this_box);
+ int g_sign = glue_sign(this_box);
+ int g_order = glue_order(this_box);
while ((q != null) && (vlink(q) != null)) {
q = vlink(q);
if (is_char_node(q))
@@ -317,8 +317,8 @@ void hlist_out(PDF pdf, halfword this_box)
halfword enddir_ptr; /* temporary pointer to enddir node */
/* label move_past, fin_rule, next_p; */
/* scaled w; temporary value for directional width calculation */
- integer g_order; /* applicable order of infinity for glue */
- integer g_sign; /* selects type of glue */
+ int g_order; /* applicable order of infinity for glue */
+ int g_sign; /* selects type of glue */
halfword p, q; /* current position in the hlist */
halfword leader_box; /* the leader box being replicated */
scaled leader_wd; /* width of leader box being replicated */
@@ -330,7 +330,7 @@ void hlist_out(PDF pdf, halfword this_box)
scaled cur_g = 0; /* rounded equivalent of |cur_glue| times the glue ratio */
scaled_whd rule, ci;
int i; /* index to scan |pdf_link_stack| */
- integer save_loc = 0; /* DVI! \.{DVI} byte location upon entry */
+ int save_loc = 0; /* DVI! \.{DVI} byte location upon entry */
scaledpos save_dvi = { 0, 0 }; /* DVI! what |dvi| should pop to */
g_order = glue_order(this_box);
@@ -791,7 +791,7 @@ void vlist_out(PDF pdf, halfword this_box)
scaled top_edge; /* the top coordinate for this box */
scaled edge; /* bottom boundary of leader space */
glue_ord g_order; /* applicable order of infinity for glue */
- integer g_sign; /* selects type of glue */
+ int g_sign; /* selects type of glue */
halfword p; /* current position in the vlist */
halfword leader_box; /* the leader box being replicated */
scaled leader_ht; /* height of leader box being replicated */
@@ -801,7 +801,7 @@ void vlist_out(PDF pdf, halfword this_box)
real cur_glue = 0.0; /* glue seen so far */
scaled cur_g = 0; /* rounded equivalent of |cur_glue| times the glue ratio */
scaled_whd rule;
- integer save_loc = 0; /* DVI! \.{DVI} byte location upon entry */
+ int save_loc = 0; /* DVI! \.{DVI} byte location upon entry */
scaledpos save_dvi = { 0, 0 }; /* DVI! what |dvi| should pop to */
g_order = glue_order(this_box);
diff --git a/source/texk/web2c/luatexdir/pdf/pdfliteral.c b/source/texk/web2c/luatexdir/pdf/pdfliteral.c
index 7d48989a6914363045237bbd3eb11a4bd67009d8..a4a54430999b282b3811d51d2a6031b7daf5baa6 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfliteral.c
+++ b/source/texk/web2c/luatexdir/pdf/pdfliteral.c
@@ -25,7 +25,7 @@ static const char __svn_version[] =
void pdf_special(PDF pdf, halfword p)
{
- integer old_setting; /* holds print |selector| */
+ int old_setting; /* holds print |selector| */
str_number s;
old_setting = selector;
selector = new_string;
@@ -46,7 +46,7 @@ need to declare some procedures needed in |hlist_out| and |vlist_out|.
void pdf_out_literal(PDF pdf, halfword p)
{
- integer old_setting; /* holds print |selector| */
+ int old_setting; /* holds print |selector| */
str_number s;
if (pdf_literal_type(p) == normal) {
old_setting = selector;
@@ -92,7 +92,7 @@ static boolean str_in_cstr(str_number s, char *r, unsigned i)
return true;
}
-void pdf_literal(PDF pdf, str_number s, integer literal_mode, boolean warn)
+void pdf_literal(PDF pdf, str_number s, int literal_mode, boolean warn)
{
pool_pointer j = 0; /* current character code position, initialized to make the compiler happy */
if (s >= STRING_OFFSET) { /* needed for |out_save| */
@@ -137,11 +137,11 @@ void pdf_literal(PDF pdf, str_number s, integer literal_mode, boolean warn)
unsigned char *ss = str_string(s);
int l = str_length(s) - j;
if (l < max_single_pdf_print) {
- pdf_out_block(pdf, (ss+j), l);
+ pdf_out_block(pdf, (ss + j), l);
} else {
-
+
while (l--)
- pdf_out(pdf, *(ss+j++));
+ pdf_out(pdf, *(ss + j++));
}
} else {
assert(s < 256);
diff --git a/source/texk/web2c/luatexdir/pdf/pdfliteral.h b/source/texk/web2c/luatexdir/pdf/pdfliteral.h
index 4f4ae15a7c4c69d345848d3abcc5dc0cfd075c7e..f74edf280610afa08a3e03f67ddcc7819db0a6d8 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfliteral.h
+++ b/source/texk/web2c/luatexdir/pdf/pdfliteral.h
@@ -27,8 +27,7 @@
# define set_pdf_literal_type(A,B) pdf_literal_type(A)=B
# define set_pdf_literal_data(A,B) pdf_literal_data(A)=B
-extern void pdf_literal(PDF pdf, str_number s, integer literal_mode,
- boolean warn);
+extern void pdf_literal(PDF pdf, str_number s, int literal_mode, boolean warn);
extern void pdf_special(PDF pdf, halfword p);
extern void pdf_out_literal(PDF pdf, halfword p);
diff --git a/source/texk/web2c/luatexdir/pdf/pdfobj.c b/source/texk/web2c/luatexdir/pdf/pdfobj.c
index 71756078813bd10171ab1c50e2781402ad62f5dd..c735a11e4511db95a682088873f3ab287d7d0cc7 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfobj.c
+++ b/source/texk/web2c/luatexdir/pdf/pdfobj.c
@@ -24,11 +24,11 @@ static const char __svn_version[] =
#include "ptexlib.h"
#include "lua/luatex-api.h"
-integer pdf_last_obj;
+int pdf_last_obj;
/* write a raw PDF object */
-void pdf_write_obj(PDF pdf, integer k)
+void pdf_write_obj(PDF pdf, int k)
{
lstring data, st;
size_t i; /* index into |data.s| */
@@ -64,9 +64,9 @@ void pdf_write_obj(PDF pdf, integer k)
if (obj_obj_is_file(pdf, k)) {
boolean res = false; /* callback status value */
char *fnam = NULL; /* callback found filename */
- integer callback_id;
+ int callback_id;
/* st.s is also '\0'-terminated, even as lstring */
- fnam = luatex_find_file((char *)st.s, find_data_file_callback);
+ fnam = luatex_find_file((char *) st.s, find_data_file_callback);
callback_id = callback_defined(read_data_file_callback);
if (fnam && callback_id > 0) {
boolean file_opened = false;
@@ -77,11 +77,12 @@ void pdf_write_obj(PDF pdf, integer k)
} else {
byte_file f; /* the data file's FILE* */
if (!fnam)
- fnam = (char *)st.s;
+ fnam = (char *) st.s;
if (!luatex_open_input
(&f, fnam, kpse_tex_format, FOPEN_RBIN_MODE, true))
pdf_error("ext5", "cannot open file for embedding");
- res = read_data_file(f, (unsigned char **)&data.s, (integer *)&data.l);
+ res =
+ read_data_file(f, (unsigned char **) &data.s, (int *) &data.l);
close_file(f);
}
if (!data.l)
@@ -89,7 +90,7 @@ void pdf_write_obj(PDF pdf, integer k)
if (!res)
pdf_error("ext5", "error reading file for embedding");
tprint("<<");
- tprint((char *)st.s);
+ tprint((char *) st.s);
for (i = 0; i < data.l; i++)
pdf_out(pdf, data.s[i]);
if (!obj_obj_is_stream(pdf, k) && data.s[data.l - 1] != '\n')
@@ -112,7 +113,7 @@ void pdf_write_obj(PDF pdf, integer k)
pdf->compress_level = saved_compress_level;
}
-void init_obj_obj(PDF pdf, integer k)
+void init_obj_obj(PDF pdf, int k)
{
obj_obj_stream_attr(pdf, k) = LUA_NOREF;
obj_obj_data(pdf, k) = LUA_NOREF;
@@ -131,7 +132,7 @@ void init_obj_obj(PDF pdf, integer k)
void scan_obj(PDF pdf)
{
- integer k;
+ int k;
lstring *st = NULL;
if (scan_keyword("reserveobjnum")) {
/* Scan an optional space */
@@ -165,7 +166,7 @@ void scan_obj(PDF pdf)
scan_pdf_ext_toks();
st = tokenlist_to_lstring(def_ref, true);
flush_list(def_ref);
- lua_pushlstring(Luas, (char *)st->s, st->l);
+ lua_pushlstring(Luas, (char *) st->s, st->l);
obj_obj_stream_attr(pdf, k) = luaL_ref(Luas, LUA_REGISTRYINDEX);
free_lstring(st);
st = NULL;
@@ -176,7 +177,7 @@ void scan_obj(PDF pdf)
scan_pdf_ext_toks();
st = tokenlist_to_lstring(def_ref, true);
flush_list(def_ref);
- lua_pushlstring(Luas, (char *)st->s, st->l);
+ lua_pushlstring(Luas, (char *) st->s, st->l);
obj_obj_data(pdf, k) = luaL_ref(Luas, LUA_REGISTRYINDEX);
free_lstring(st);
st = NULL;
diff --git a/source/texk/web2c/luatexdir/pdf/pdfobj.h b/source/texk/web2c/luatexdir/pdf/pdfobj.h
index c89f2b25fd78f428ddf2aa86516bfa1d33d44771..cfe1a754c5ff0fdf2f9b2cea159ae384ea61382f 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfobj.h
+++ b/source/texk/web2c/luatexdir/pdf/pdfobj.h
@@ -55,10 +55,10 @@
/**********************************************************************/
-extern integer pdf_last_obj;
+extern int pdf_last_obj;
-extern void init_obj_obj(PDF pdf, integer k);
-extern void pdf_write_obj(PDF pdf, integer n);
+extern void init_obj_obj(PDF pdf, int k);
+extern void pdf_write_obj(PDF pdf, int n);
extern void scan_obj(PDF pdf);
extern void scan_refobj(PDF pdf);
extern void pdf_ref_obj(PDF pdf, halfword p);
diff --git a/source/texk/web2c/luatexdir/pdf/pdfoutline.c b/source/texk/web2c/luatexdir/pdf/pdfoutline.c
index 7a1e48c47eef8e121ed48a37c6d97c7ea87eb851..be309a7c2f5f3535266802e7e0f57d423bec762d 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfoutline.c
+++ b/source/texk/web2c/luatexdir/pdf/pdfoutline.c
@@ -56,10 +56,10 @@ will store data of outline entries in |pdf->mem| instead of |mem|
#define set_obj_outline_parent(pdf,A,B) obj_outline_parent(pdf,A)=B
#define set_obj_outline_attr(pdf,A,B) obj_outline_attr(pdf,A)=B
-static integer open_subentries(PDF pdf, halfword p)
+static int open_subentries(PDF pdf, halfword p)
{
- integer k, c;
- integer l, r;
+ int k, c;
+ int l, r;
k = 0;
if (obj_outline_first(pdf, p) != 0) {
l = obj_outline_first(pdf, p);
@@ -83,9 +83,9 @@ static integer open_subentries(PDF pdf, halfword p)
}
/* return number of outline entries in the same level with |p| */
-static integer outline_list_count(PDF pdf, pointer p)
+static int outline_list_count(PDF pdf, pointer p)
{
- integer k = 1;
+ int k = 1;
while (obj_outline_prev(pdf, p) != 0) {
incr(k);
p = obj_outline_prev(pdf, p);
@@ -96,9 +96,9 @@ static integer outline_list_count(PDF pdf, pointer p)
void scan_pdfoutline(PDF pdf)
{
halfword p, q, r;
- integer i, j, k;
+ int i, j, k;
if (scan_keyword("attr")) {
- scan_pdf_ext_toks();
+ scan_pdf_ext_toks();
r = def_ref;
} else {
r = 0;
@@ -173,10 +173,10 @@ void scan_pdfoutline(PDF pdf)
/* In the end we must flush PDF objects that cannot be written out
immediately after shipping out pages. */
-integer print_outlines(PDF pdf)
+int print_outlines(PDF pdf)
{
- integer k, l, a;
- integer outlines;
+ int k, l, a;
+ int outlines;
if (pdf->first_outline != 0) {
pdf_new_dict(pdf, obj_type_others, 0, 1);
outlines = pdf->obj_ptr;
diff --git a/source/texk/web2c/luatexdir/pdf/pdfoutline.h b/source/texk/web2c/luatexdir/pdf/pdfoutline.h
index 1fc5fadb7bd9f9cc3d702b7bbcf5f0921a12ff00..44bc4f6b72675c8708111dcd2b7d518f8df836c0 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfoutline.h
+++ b/source/texk/web2c/luatexdir/pdf/pdfoutline.h
@@ -23,6 +23,6 @@
# define PDFOUTLINE_H
extern void scan_pdfoutline(PDF pdf);
-extern integer print_outlines(PDF pdf);
+extern int print_outlines(PDF pdf);
#endif
diff --git a/source/texk/web2c/luatexdir/pdf/pdfsetmatrix.c b/source/texk/web2c/luatexdir/pdf/pdfsetmatrix.c
index 3fcf2f28d21acc11ad352d9283cfdfd9407ce57f..a44c8fdc832edde5b2350dd79572b6772ac495b5 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfsetmatrix.c
+++ b/source/texk/web2c/luatexdir/pdf/pdfsetmatrix.c
@@ -214,12 +214,12 @@ void matrixrecalculate(scaled urx)
void pdf_out_setmatrix(PDF pdf, halfword p)
{
scaledpos pos = pdf->posstruct->pos;
- integer old_setting; /* holds print |selector| */
+ int old_setting; /* holds print |selector| */
str_number s;
old_setting = selector;
selector = new_string;
show_token_list(token_link(pdf_setmatrix_data(p)), null, -1);
- pdfsetmatrix((char *)cur_string, pos);
+ pdfsetmatrix((char *) cur_string, pos);
tprint(" 0 0 cm");
selector = old_setting;
s = make_string();
diff --git a/source/texk/web2c/luatexdir/pdf/pdfshipout.c b/source/texk/web2c/luatexdir/pdf/pdfshipout.c
index 34ebaa623661cf5dc4bb526ba8fcd63089c1e406..87564e3e139c6f1d41af432bc1d91ca3f91b920c 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfshipout.c
+++ b/source/texk/web2c/luatexdir/pdf/pdfshipout.c
@@ -52,9 +52,9 @@ If |shipping_page| is not set then the output will be a Form object
void ship_out(PDF pdf, halfword p, boolean shipping_page)
{
/* output the box |p| */
- integer j, k; /* indices to first ten count registers */
- integer post_callback_id;
- integer pre_callback_id;
+ int j, k; /* indices to first ten count registers */
+ int post_callback_id;
+ int pre_callback_id;
posstructure refpoint; /* the origin pos. on the page */
scaledpos cur = { 0, 0 };
diff --git a/source/texk/web2c/luatexdir/pdf/pdftables.c b/source/texk/web2c/luatexdir/pdf/pdftables.c
index 55a83a5f7927ff956954eee5e0b1ddd98378dba3..72ee53876d90085f1c3a0e1802e3cb6d4e2d098e 100644
--- a/source/texk/web2c/luatexdir/pdf/pdftables.c
+++ b/source/texk/web2c/luatexdir/pdf/pdftables.c
@@ -67,7 +67,7 @@ static int compare_info(const void *pa, const void *pb, void *param)
return 1;
}
-static void avl_put_obj(PDF pdf, integer t, oentry * oe)
+static void avl_put_obj(PDF pdf, int t, oentry * oe)
{
void **pp;
assert(t >= 0 || t <= PDF_OBJ_TYPE_MAX || obj_in_tree[t] == 1);
@@ -81,7 +81,7 @@ static void avl_put_obj(PDF pdf, integer t, oentry * oe)
pdftex_fail("avlstuff.c: avl_probe() out of memory in insertion");
}
-static void avl_put_int_obj(PDF pdf, integer int0, integer objptr, integer t)
+static void avl_put_int_obj(PDF pdf, int int0, int objptr, int t)
{
oentry *oe;
oe = xtalloc(1, oentry);
@@ -91,7 +91,7 @@ static void avl_put_int_obj(PDF pdf, integer int0, integer objptr, integer t)
avl_put_obj(pdf, t, oe);
}
-static void avl_put_str_obj(PDF pdf, char *str0, integer objptr, integer t)
+static void avl_put_str_obj(PDF pdf, char *str0, int objptr, int t)
{
oentry *oe;
oe = xtalloc(1, oentry);
@@ -101,7 +101,7 @@ static void avl_put_str_obj(PDF pdf, char *str0, integer objptr, integer t)
avl_put_obj(pdf, t, oe);
}
-static integer avl_find_int_obj(PDF pdf, integer t, integer i)
+static int avl_find_int_obj(PDF pdf, int t, int i)
{
oentry *p;
oentry tmp;
@@ -116,7 +116,7 @@ static integer avl_find_int_obj(PDF pdf, integer t, integer i)
return p->objptr;
}
-static integer avl_find_str_obj(PDF pdf, integer t, char *s)
+static int avl_find_str_obj(PDF pdf, int t, char *s)
{
oentry *p;
oentry tmp;
@@ -134,9 +134,9 @@ static integer avl_find_str_obj(PDF pdf, integer t, char *s)
/**********************************************************************/
/* create an object with type |t| and identifier |i| */
-void pdf_create_obj(PDF pdf, integer t, integer i)
+void pdf_create_obj(PDF pdf, int t, int i)
{
- integer a;
+ int a;
char *ss = NULL;
if (pdf->sys_obj_ptr == sup_obj_tab_size)
overflow("indirect objects table size", pdf->obj_tab_size);
@@ -169,10 +169,10 @@ void pdf_create_obj(PDF pdf, integer t, integer i)
}
}
-integer find_obj(PDF pdf, integer t, integer i, boolean byname)
+int find_obj(PDF pdf, int t, int i, boolean byname)
{
char *ss = NULL;
- integer ret;
+ int ret;
assert(i >= 0); /* no tricks */
if (byname) {
ss = makecstring(i);
@@ -193,9 +193,9 @@ integer find_obj(PDF pdf, integer t, integer i, boolean byname)
|vlist_out|.
*/
-integer get_obj(PDF pdf, integer t, integer i, boolean byname)
+int get_obj(PDF pdf, int t, int i, boolean byname)
{
- integer r;
+ int r;
str_number s;
assert(i >= 0);
if (byname > 0) {
@@ -222,13 +222,13 @@ integer get_obj(PDF pdf, integer t, integer i, boolean byname)
}
/* create a new object and return its number */
-integer pdf_new_objnum(PDF pdf)
+int pdf_new_objnum(PDF pdf)
{
pdf_create_obj(pdf, obj_type_others, 0);
return pdf->obj_ptr;
}
-void check_obj_exists(PDF pdf, integer t, integer objnum)
+void check_obj_exists(PDF pdf, int t, int objnum)
{
if (objnum < 0 || objnum > pdf->obj_ptr)
pdf_error("ext1", "cannot find referenced object");
@@ -311,7 +311,7 @@ possible to, say, load an image in the \.{INITEX} run and then reference it in a
void dump_pdftex_data(PDF pdf)
{
- integer k, x;
+ int k, x;
pdf_object_list *l;
dumpimagemeta(); /* the image information array */
dump_int(pdf->mem_size);
@@ -388,7 +388,7 @@ already in an earlier module.
void undump_pdftex_data(PDF pdf)
{
- integer k, x;
+ int k, x;
undumpimagemeta(pdf, pdf_minor_version, pdf_inclusion_errorlevel); /* the image information array */
undump_int(pdf->mem_size);
pdf->mem = xreallocarray(pdf->mem, int, pdf->mem_size);
diff --git a/source/texk/web2c/luatexdir/pdf/pdftables.h b/source/texk/web2c/luatexdir/pdf/pdftables.h
index ea93f324297cab6595c742d79690a7f8783c1e2f..579a9618a584e9043acf538446adf94377c3fa33 100644
--- a/source/texk/web2c/luatexdir/pdf/pdftables.h
+++ b/source/texk/web2c/luatexdir/pdf/pdftables.h
@@ -29,11 +29,11 @@ typedef enum {
typedef struct {
union {
- integer int0;
+ int int0;
char *str0;
} u;
union_type u_type; /* integer or char * in union above */
- integer objptr;
+ int objptr;
} oentry;
/*
@@ -97,11 +97,11 @@ well.
# define inf_pk_dpi 72 /* min PK pixel density value from \.{texmf.cnf} */
# define sup_pk_dpi 8000 /* max PK pixel density value from \.{texmf.cnf} */
-extern integer find_obj(PDF pdf, integer t, integer i, boolean byname);
-extern void check_obj_exists(PDF pdf, integer t, integer n);
-extern integer get_obj(PDF pdf, integer t, integer i, boolean byname);
-extern void pdf_create_obj(PDF pdf, integer t, integer i);
-extern integer pdf_new_objnum(PDF pdf);
+extern int find_obj(PDF pdf, int t, int i, boolean byname);
+extern void check_obj_exists(PDF pdf, int t, int n);
+extern int get_obj(PDF pdf, int t, int i, boolean byname);
+extern void pdf_create_obj(PDF pdf, int t, int i);
+extern int pdf_new_objnum(PDF pdf);
extern void set_rect_dimens(PDF pdf, halfword p, halfword parent_box,
scaledpos cur, scaled_whd alt_rule, scaled margin);
diff --git a/source/texk/web2c/luatexdir/pdf/pdfthread.c b/source/texk/web2c/luatexdir/pdf/pdfthread.c
index fe3d3994567a7d4126b15d6e20c915f35974b499..d833eb7f07e726af564ea6a82dee37a89cdbf844 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfthread.c
+++ b/source/texk/web2c/luatexdir/pdf/pdfthread.c
@@ -31,7 +31,7 @@ static const char __svn_version[] =
void append_bead(PDF pdf, halfword p)
{
- integer a, b, c, t;
+ int a, b, c, t;
if (!is_shipping_page)
pdf_error("ext4", "threads cannot be inside an XForm");
t = get_obj(pdf, obj_type_thread, pdf_thread_id(p), pdf_thread_named_id(p));
@@ -136,7 +136,7 @@ void end_thread(PDF pdf, halfword p)
/* The following function are needed for outputing article thread. */
-void thread_title(PDF pdf, integer t)
+void thread_title(PDF pdf, int t)
{
pdf_printf(pdf, "/Title (");
if (obj_info(pdf, t) < 0)
@@ -146,7 +146,7 @@ void thread_title(PDF pdf, integer t)
pdf_printf(pdf, ")\n");
}
-void pdf_fix_thread(PDF pdf, integer t)
+void pdf_fix_thread(PDF pdf, int t)
{
halfword a;
pdf_warning("thread", "destination", false, false);
@@ -181,10 +181,10 @@ void pdf_fix_thread(PDF pdf, integer t)
pdf_end_dict(pdf);
}
-void out_thread(PDF pdf, integer t)
+void out_thread(PDF pdf, int t)
{
halfword a, b;
- integer last_attr;
+ int last_attr;
if (obj_thread_first(pdf, t) == 0) {
pdf_fix_thread(pdf, t);
return;
diff --git a/source/texk/web2c/luatexdir/pdf/pdfthread.h b/source/texk/web2c/luatexdir/pdf/pdfthread.h
index 96fe24e7a9d5ce53ff05dea000a3ed4a2ed4565f..b3a8283052a43e903b509e82fa30b86957eb16a2 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfthread.h
+++ b/source/texk/web2c/luatexdir/pdf/pdfthread.h
@@ -59,9 +59,9 @@ extern void append_thread(PDF pdf, halfword parent_box, scaledpos cur);
extern void end_thread(PDF pdf, halfword p);
extern void scan_thread_id(void);
-extern void thread_title(PDF pdf, integer t);
-extern void pdf_fix_thread(PDF pdf, integer t);
-extern void out_thread(PDF pdf, integer t);
+extern void thread_title(PDF pdf, int t);
+extern void pdf_fix_thread(PDF pdf, int t);
+extern void out_thread(PDF pdf, int t);
extern void check_running_thread(PDF pdf, halfword this_box, scaledpos cur);
extern void print_beads_list(PDF pdf);
diff --git a/source/texk/web2c/luatexdir/pdf/pdftypes.h b/source/texk/web2c/luatexdir/pdf/pdftypes.h
index 588b7a0c7f217b93c1a0bc672e231c8b8e61ce38..316e3e29c9b04fa081f56ba172d466fe0844e058 100644
--- a/source/texk/web2c/luatexdir/pdf/pdftypes.h
+++ b/source/texk/web2c/luatexdir/pdf/pdftypes.h
@@ -50,7 +50,7 @@ typedef struct {
pdffloat v;
} pdfpos;
-# define scaled integer
+# define scaled int
typedef struct scaledpos_ {
scaled h;
@@ -114,30 +114,30 @@ typedef struct {
typedef struct obj_entry_ {
union {
- integer int0;
+ int int0;
char *str0;
} u;
- integer int1;
+ int int1;
off_t int2;
- integer int3;
+ int int3;
union {
- integer int4;
+ int int4;
char *str4;
} v;
- integer objtype; /* integer int5 */
+ int objtype; /* integer int5 */
} obj_entry;
typedef struct dest_name_entry_ {
char *objname; /* destination name */
- integer objnum; /* destination object number */
+ int objnum; /* destination object number */
} dest_name_entry;
# define pdf_max_link_level 10 /* maximum depth of link nesting */
typedef struct pdf_link_stack_record {
- integer nesting_level;
- integer link_node; /* holds a copy of the corresponding |pdf_start_link_node| */
- integer ref_link_node; /* points to original |pdf_start_link_node|, or a
+ int nesting_level;
+ int link_node; /* holds a copy of the corresponding |pdf_start_link_node| */
+ int ref_link_node; /* points to original |pdf_start_link_node|, or a
copy of |link_node| created by |append_link| in
case of multi-line link */
} pdf_link_stack_record;
@@ -175,9 +175,9 @@ typedef struct pdf_resource_struct_ {
pdf_object_list *link_list; /* the pdf links */
pdf_object_list *bead_list; /* the thread beads */
pdf_object_list *annot_list; /* the pdf annotations */
- integer text_procset; /* |pdf_text_procset| */
- integer image_procset; /* |pdf_image_procset| */
- integer last_resources; /* halfword to most recently generated Resources object. */
+ int text_procset; /* |pdf_text_procset| */
+ int image_procset; /* |pdf_image_procset| */
+ int last_resources; /* halfword to most recently generated Resources object. */
} pdf_resource_struct;
typedef struct pdf_output_file_ {
@@ -269,29 +269,29 @@ typedef struct pdf_output_file_ {
TH: this used to be a local in pdf_shipout, but I would like to
be able to split that function into a pre- and post part */
- integer obj_count;
- integer xform_count;
- integer ximage_count;
+ int obj_count;
+ int xform_count;
+ int ximage_count;
pdf_resource_struct *resources;
/* the variables from pdfdest */
- integer dest_names_size;
- integer dest_names_ptr;
+ int dest_names_size;
+ int dest_names_ptr;
dest_name_entry *dest_names;
/* the (static) variables from pdfoutline */
- integer first_outline;
- integer last_outline;
- integer parent_outline;
+ int first_outline;
+ int last_outline;
+ int parent_outline;
/* the pdf link stack */
pdf_link_stack_record link_stack[(pdf_max_link_level + 1)];
- integer link_stack_ptr;
+ int link_stack_ptr;
/* the thread data */
- integer last_thread; /* pointer to the last thread */
+ int last_thread; /* pointer to the last thread */
scaled_whd thread;
- integer last_thread_id; /* identifier of the last thread */
+ int last_thread_id; /* identifier of the last thread */
int last_thread_named_id; /* is identifier of the last thread named */
- integer thread_level; /* depth of nesting of box containing the last thread */
+ int thread_level; /* depth of nesting of box containing the last thread */
int f_cur; /* TeX font number */
} pdf_output_file;
diff --git a/source/texk/web2c/luatexdir/pdf/pdfxform.c b/source/texk/web2c/luatexdir/pdf/pdfxform.c
index 8e19fbed18336555623b5f997839746e4db79c0b..a9e393b7d113da7ab93dadcc4e846909c9996aed 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfxform.c
+++ b/source/texk/web2c/luatexdir/pdf/pdfxform.c
@@ -26,7 +26,7 @@ static const char __svn_version[] =
#define box(A) eqtb[box_base+(A)].hh.rh
-integer pdf_cur_form; /* the form being output */
+int pdf_cur_form; /* the form being output */
void pdf_place_form(PDF pdf, halfword p)
{
@@ -34,7 +34,7 @@ void pdf_place_form(PDF pdf, halfword p)
scaled x, y;
pdffloat cm[6];
pdfstructure *q = pdf->pstruct;
- integer r = 6, objnum = pdf_xform_objnum(p);
+ int r = 6, objnum = pdf_xform_objnum(p);
nat.wd = obj_xform_width(pdf, objnum);
nat.ht = obj_xform_height(pdf, objnum);
nat.dp = obj_xform_depth(pdf, objnum);
@@ -66,7 +66,7 @@ void pdf_place_form(PDF pdf, halfword p)
void scan_pdfxform(PDF pdf)
{
- integer k;
+ int k;
halfword p;
incr(pdf->xform_count);
pdf_create_obj(pdf, obj_type_xform, pdf->xform_count);
@@ -100,7 +100,7 @@ void scan_pdfxform(PDF pdf)
void scan_pdfrefxform(PDF pdf)
{
- integer transform = 0;
+ int transform = 0;
scaled_whd alt_rule, dim, nat;
alt_rule = scan_alt_rule(); /* scans |<rule spec>| to |alt_rule| */
scan_int();
diff --git a/source/texk/web2c/luatexdir/pdf/pdfxform.h b/source/texk/web2c/luatexdir/pdf/pdfxform.h
index 6c6dd2fe1d746f01d84afd46a6085ee087bb4b0a..0d4898deeb03bb3a5abae44e8a1d60dbd0b7626d 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfxform.h
+++ b/source/texk/web2c/luatexdir/pdf/pdfxform.h
@@ -46,7 +46,7 @@
# define set_obj_xform_attr(pdf,A,B) obj_xform_attr(pdf,A)=B
# define set_obj_xform_resources(pdf,A,B) obj_xform_resources(pdf,A)=B
-extern integer pdf_cur_form; /* the form being output */
+extern int pdf_cur_form; /* the form being output */
void pdf_place_form(PDF pdf, halfword p);
diff --git a/source/texk/web2c/luatexdir/ptexlib.h b/source/texk/web2c/luatexdir/ptexlib.h
index 37a4a7c5a37bc3a1d76002a58ad0aca6c9dafd12..804eb6474f698b712f2a5da893b4cc314f6444d6 100644
--- a/source/texk/web2c/luatexdir/ptexlib.h
+++ b/source/texk/web2c/luatexdir/ptexlib.h
@@ -274,13 +274,13 @@ void undump_luac_registers(void);
/* lua/ltexlib.c */
void luacstring_start(int n);
void luacstring_close(int n);
-integer luacstring_cattable(void);
+int luacstring_cattable(void);
int luacstring_input(void);
int luacstring_partial(void);
int luacstring_final_line(void);
/* lua/luatoken.c */
-void do_get_token_lua(integer callback_id);
+void do_get_token_lua(int callback_id);
/* lua/luanode.c */
int visible_last_node_type(int n);
@@ -298,7 +298,7 @@ extern void late_lua(PDF pdf, halfword p);
extern void check_texconfig_init(void);
-scaled divide_scaled(scaled s, scaled m, integer dd);
+scaled divide_scaled(scaled s, scaled m, int dd);
scaled divide_scaled_n(double s, double m, double d);
# include "tex/texdeffont.h"
@@ -354,11 +354,11 @@ extern void destroy_saved_callback(int i);
extern boolean get_callback(lua_State * L, int i);
extern void get_saved_lua_boolean(int i, char *name, boolean * target);
-extern void get_saved_lua_number(int i, char *name, integer * target);
+extern void get_saved_lua_number(int i, char *name, int * target);
extern void get_saved_lua_string(int i, char *name, char **target);
extern void get_lua_boolean(char *table, char *name, boolean * target);
-extern void get_lua_number(char *table, char *name, integer * target);
+extern void get_lua_number(char *table, char *name, int * target);
extern void get_lua_string(char *table, char *name, char **target);
extern char *get_lua_name(int i);
@@ -378,9 +378,9 @@ extern char *get_lua_name(int i);
extern volatile memory_word *varmem;
extern halfword var_mem_min;
extern halfword var_mem_max;
-extern halfword get_node(integer s);
-extern void free_node(halfword p, integer s);
-extern void init_node_mem(integer s);
+extern halfword get_node(int s);
+extern void free_node(halfword p, int s);
+extern void init_node_mem(int s);
extern void dump_node_mem(void);
extern void undump_node_mem(void);
@@ -388,14 +388,14 @@ extern void do_vf(internal_font_number tmp_f);
/* This routine has to return four values. */
# define dateandtime(i,j,k,l) get_date_and_time (&(i), &(j), &(k), &(l))
-extern void get_date_and_time(integer *, integer *, integer *, integer *);
+extern void get_date_and_time(int *, int *, int *, int *);
/* Get high-res time info. */
# define seconds_and_micros(i,j) get_seconds_and_micros (&(i), &(j))
-extern void get_seconds_and_micros(integer *, integer *);
+extern void get_seconds_and_micros(int *, int *);
/* This routine has to return a scaled value. */
-extern integer getrandomseed(void);
+extern int getrandomseed(void);
/* Copy command-line arguments into the buffer, despite the name. */
extern void topenin(void);
@@ -407,7 +407,7 @@ extern void topenin(void);
/* extern void calledit (); */
/* Set an array size from texmf.cnf. */
-extern void setupboundvariable(integer *, const_string, integer);
+extern void setupboundvariable(int *, const_string, int);
/* here are a few functions that used to be in coerce.h */
diff --git a/source/texk/web2c/luatexdir/tex/arithmetic.c b/source/texk/web2c/luatexdir/tex/arithmetic.c
index c37f715ea07c261e21db1997be73d014c89a698a..b89d9236ce17556c59099c583512fa604b6b2a68 100644
--- a/source/texk/web2c/luatexdir/tex/arithmetic.c
+++ b/source/texk/web2c/luatexdir/tex/arithmetic.c
@@ -49,7 +49,7 @@ unambiguous convention with respect to signed odd numbers.
*/
-integer half(integer x)
+int half(int x)
{
if (odd(x))
return ((x + 1) / 2);
@@ -65,7 +65,7 @@ given in |dig[i]|, and the calculation produces a correctly rounded result.
scaled round_decimals(int k)
{ /* converts a decimal fraction */
- integer a; /* the accumulator */
+ int a; /* the accumulator */
a = 0;
while (k-- > 0) {
a = (a + dig[k] * two) / 10;
@@ -143,7 +143,7 @@ and~|y| are |scaled| and |n| is an integer. We will also use it to
multiply integers.
*/
-scaled mult_and_add(integer n, scaled x, scaled y, scaled max_answer)
+scaled mult_and_add(int n, scaled x, scaled y, scaled max_answer)
{
if (n == 0)
return y;
@@ -161,7 +161,7 @@ scaled mult_and_add(integer n, scaled x, scaled y, scaled max_answer)
/* We also need to divide scaled dimensions by integers. */
-scaled x_over_n(scaled x, integer n)
+scaled x_over_n(scaled x, int n)
{
boolean negative; /* should |tex_remainder| be negated? */
negative = false;
@@ -198,7 +198,7 @@ would be too inaccurate to divide by |d| and then multiply by |n|. Hence
this subroutine simulates 1.5-precision arithmetic.
*/
-scaled xn_over_d(scaled x, integer n, integer d)
+scaled xn_over_d(scaled x, int n, int d)
{
nonnegative_integer t, u, v; /* intermediate quantities */
boolean positive = true; /* was |x>=0|? */
@@ -245,7 +245,7 @@ computing at most 1095 distinct values, but that is plenty.
halfword badness(scaled t, scaled s)
{ /* compute badness, given |t>=0| */
- integer r; /* approximation to $\alpha t/s$, where $\alpha^3\approx
+ int r; /* approximation to $\alpha t/s$, where $\alpha^3\approx
100\cdot2^{18}$ */
if (t == 0) {
return 0;
@@ -313,7 +313,7 @@ The global variable |j_random| tells which element has most recently
been consumed.
*/
-static integer randoms[55]; /* the last 55 random values generated */
+static int randoms[55]; /* the last 55 random values generated */
static int j_random; /* the number of unused |randoms| */
scaled random_seed; /* the default random seed */
@@ -366,11 +366,11 @@ preferable to trickery, unless the cost is too high.
*/
-static integer make_frac(integer p, integer q)
+static int make_frac(int p, int q)
{
- integer f; /* the fraction bits, with a leading 1 bit */
- integer n; /* the integer part of $\vert p/q\vert$ */
- register integer be_careful; /* disables certain compiler optimizations */
+ int f; /* the fraction bits, with a leading 1 bit */
+ int n; /* the integer part of $\vert p/q\vert$ */
+ register int be_careful; /* disables certain compiler optimizations */
boolean negative = false; /* should the result be negated? */
if (p < 0) {
negate(p);
@@ -430,11 +430,11 @@ static integer make_frac(integer p, integer q)
}
}
-static integer take_frac(integer q, integer f)
+static int take_frac(int q, int f)
{
- integer p; /* the fraction so far */
- integer n; /* additional multiple of $q$ */
- register integer be_careful; /* disables certain compiler optimizations */
+ int p; /* the fraction so far */
+ int n; /* additional multiple of $q$ */
+ register int be_careful; /* disables certain compiler optimizations */
boolean negative = false; /* should the result be negated? */
/* Reduce to the case that |f>=0| and |q>0| */
if (f < 0) {
@@ -504,8 +504,8 @@ a bit more calculation, which the author claims to have done correctly:
nearest integer.
*/
-static integer two_to_the[31]; /* powers of two */
-static integer spec_log[29]; /* special logarithms */
+static int two_to_the[31]; /* powers of two */
+static int spec_log[29]; /* special logarithms */
void initialize_arithmetic(void)
{
@@ -532,10 +532,10 @@ void initialize_arithmetic(void)
}
-static integer m_log(integer x)
+static int m_log(int x)
{
- integer y, z; /* auxiliary registers */
- integer k; /* iteration counter */
+ int y, z; /* auxiliary registers */
+ int k; /* iteration counter */
if (x <= 0) {
/* Handle non-positive logarithm */
print_err("Logarithm of ");
@@ -579,9 +579,9 @@ given integers $(a,b,c,d)$. In most cases a quick decision is reached.
The result is $+1$, 0, or~$-1$ in the three respective cases.
*/
-static integer ab_vs_cd(integer a, integer b, integer c, integer d)
+static int ab_vs_cd(int a, int b, int c, int d)
{
- integer q, r; /* temporary registers */
+ int q, r; /* temporary registers */
/* Reduce to the case that |a,c>=0|, |b,d>0| */
if (a < 0) {
negate(a);
@@ -639,7 +639,7 @@ and then it will fetch |randoms[j_random]|.
static void new_randoms(void)
{
int k; /* index into |randoms| */
- integer x; /* accumulator */
+ int x; /* accumulator */
for (k = 0; k <= 23; k++) {
x = randoms[k] - randoms[k + 31];
if (x < 0)
@@ -658,9 +658,9 @@ static void new_randoms(void)
/* To initialize the |randoms| table, we call the following routine. */
-void init_randoms(integer seed)
+void init_randoms(int seed)
{
- integer j, jj, k; /* more or less random integers */
+ int j, jj, k; /* more or less random integers */
int i; /* index into |randoms| */
j = abs(seed);
while (j >= fraction_one)
@@ -688,9 +688,9 @@ with about half the probability that it will produce any other particular
values between 0 and~|x|, because it rounds its answers.
*/
-integer unif_rand(integer x)
+int unif_rand(int x)
{
- integer y; /* trial value */
+ int y; /* trial value */
next_random();
y = take_frac(abs(x), randoms[j_random]);
if (y == abs(x))
@@ -707,9 +707,9 @@ can readily be obtained with the ratio method (Algorithm 3.4.1R in
{\sl The Art of Computer Programming\/}).
*/
-integer norm_rand(void)
+int norm_rand(void)
{
- integer x, u, l; /* what the book would call $2^{16}X$, $2^{28}U$, and $-2^{24}\ln U$ */
+ int x, u, l; /* what the book would call $2^{16}X$, $2^{28}U$, and $-2^{24}\ln U$ */
do {
do {
next_random();
@@ -728,7 +728,7 @@ integer norm_rand(void)
breakpoint for debugging.
*/
-integer fix_int(integer val, integer min, integer max)
+int fix_int(int val, int min, int max)
{
return (val < min ? min : (val > max ? max : val));
}
diff --git a/source/texk/web2c/luatexdir/tex/arithmetic.h b/source/texk/web2c/luatexdir/tex/arithmetic.h
index 7bf3e243f3bbb2f677b8d578d9489ceffe14235a..c01726d9ef8a06acb1d9e512ed572dcadcdc254b 100644
--- a/source/texk/web2c/luatexdir/tex/arithmetic.h
+++ b/source/texk/web2c/luatexdir/tex/arithmetic.h
@@ -30,7 +30,7 @@
# define negate(A) (A)=-(A) /* change the sign of a variable */
# undef half
-extern integer half(integer x);
+extern int half(int x);
/*
Fixed-point arithmetic is done on {\sl scaled integers\/} that are multiples
@@ -49,13 +49,13 @@ extern void print_scaled(scaled s);
extern boolean arith_error;
extern scaled tex_remainder;
-extern scaled mult_and_add(integer n, scaled x, scaled y, scaled max_answer);
+extern scaled mult_and_add(int n, scaled x, scaled y, scaled max_answer);
# define nx_plus_y(A,B,C) mult_and_add((A),(B),(C),07777777777)
# define mult_integers(A,B) mult_and_add((A),(B),0,017777777777)
-extern scaled x_over_n(scaled x, integer n);
-extern scaled xn_over_d(scaled x, integer n, integer d);
+extern scaled x_over_n(scaled x, int n);
+extern scaled xn_over_d(scaled x, int n, int d);
# define inf_bad 10000 /* infinitely bad value */
@@ -72,10 +72,10 @@ extern void initialize_arithmetic(void);
extern scaled random_seed; /* the default random seed */
-extern void init_randoms(integer seed);
-extern integer unif_rand(integer x);
-extern integer norm_rand(void);
+extern void init_randoms(int seed);
+extern int unif_rand(int x);
+extern int norm_rand(void);
-extern integer fix_int(integer val, integer min, integer max);
+extern int fix_int(int val, int min, int max);
#endif
diff --git a/source/texk/web2c/luatexdir/tex/buildpage.c b/source/texk/web2c/luatexdir/tex/buildpage.c
index 9a8d9196f184ce34473e0f8d2fbfacb73ac007de..2cef557d7cf39c903fe0230e6ea2772c9c4861b6 100644
--- a/source/texk/web2c/luatexdir/tex/buildpage.c
+++ b/source/texk/web2c/luatexdir/tex/buildpage.c
@@ -94,7 +94,7 @@ halfword page_tail; /* the final node on the current page */
int page_contents; /* what is on the current page so far? */
scaled page_max_depth; /* maximum box depth on page being built */
halfword best_page_break; /* break here to get the best page known so far */
-integer least_page_cost; /* the score for this currently best page */
+int least_page_cost; /* the score for this currently best page */
scaled best_size; /* its |page_goal| */
/*
@@ -192,10 +192,10 @@ all split and floating insertions.
scaled page_so_far[8]; /* height and glue of the current page */
halfword last_glue; /* used to implement \.{\\lastskip */
-integer last_penalty; /* used to implement \.{\\lastpenalty} */
+int last_penalty; /* used to implement \.{\\lastpenalty} */
scaled last_kern; /* used to implement \.{\\lastkern} */
-integer last_node_type; /* used to implement \.{\\lastnodetype} */
-integer insert_penalties; /* sum of the penalties for held-over insertions */
+int last_node_type; /* used to implement \.{\\lastnodetype} */
+int insert_penalties; /* sum of the penalties for held-over insertions */
#define print_plus(A,B) do { \
if (page_so_far[(A)]!=0) { \
@@ -277,7 +277,7 @@ If not, an error message is printed, and the following subroutine
flushes the unwanted contents, reporting them to the user.
*/
-static void box_error(integer n)
+static void box_error(int n)
{
error();
begin_diagnostic();
@@ -293,7 +293,7 @@ The following procedure guarantees that a given box register
does not contain an \.{\\hbox}.
*/
-static void ensure_vbox(integer n)
+static void ensure_vbox(int n)
{
halfword p; /* the box register contents */
p = box(n);
@@ -318,8 +318,8 @@ void build_page(void)
{ /* append contributions to the current page */
halfword p; /* the node being appended */
halfword q, r; /* nodes being examined */
- integer b, c; /* badness and cost of current page */
- integer pi; /* penalty to be added to the badness */
+ int b, c; /* badness and cost of current page */
+ int pi; /* penalty to be added to the badness */
int n; /* insertion box number */
scaled delta, h, w; /* sizes used for insertion calculations */
pi = 0;
@@ -744,7 +744,7 @@ void fire_up(halfword c)
halfword prev_p; /* predecessor of |p| */
int n; /* insertion box number */
boolean wait; /* should the present insertion be held over? */
- integer save_vbadness; /* saved value of |vbadness| */
+ int save_vbadness; /* saved value of |vbadness| */
scaled save_vfuzz; /* saved value of |vfuzz| */
halfword save_split_top_skip; /* saved value of |split_top_skip| */
halfword i; /* for looping through the marks */
diff --git a/source/texk/web2c/luatexdir/tex/buildpage.h b/source/texk/web2c/luatexdir/tex/buildpage.h
index 6618ebfd8a02a155bebeb4a507b9d393a70a86e7..ae4224741a41292c086ce59219130ff1d2ebe19f 100644
--- a/source/texk/web2c/luatexdir/tex/buildpage.h
+++ b/source/texk/web2c/luatexdir/tex/buildpage.h
@@ -30,7 +30,7 @@ extern halfword page_tail; /* the final node on the current page */
extern int page_contents; /* what is on the current page so far? */
extern scaled page_max_depth; /* maximum box depth on page being built */
extern halfword best_page_break; /* break here to get the best page known so far */
-extern integer least_page_cost; /* the score for this currently best page */
+extern int least_page_cost; /* the score for this currently best page */
extern scaled best_size; /* its |page_goal| */
/*
@@ -53,10 +53,10 @@ extern void initialize_buildpage(void);
extern scaled page_so_far[8]; /* height and glue of the current page */
extern halfword last_glue; /* used to implement \.{\\lastskip */
-extern integer last_penalty; /* used to implement \.{\\lastpenalty} */
+extern int last_penalty; /* used to implement \.{\\lastpenalty} */
extern scaled last_kern; /* used to implement \.{\\lastkern} */
-extern integer last_node_type; /* used to implement \.{\\lastnodetype} */
-extern integer insert_penalties; /* sum of the penalties for held-over insertions */
+extern int last_node_type; /* used to implement \.{\\lastnodetype} */
+extern int insert_penalties; /* sum of the penalties for held-over insertions */
extern void print_totals(void);
extern void freeze_page_specs(int s);
diff --git a/source/texk/web2c/luatexdir/tex/conditional.c b/source/texk/web2c/luatexdir/tex/conditional.c
index ccb1b4ee147495d899f7ebe873234a6badc5f0c3..149aee531ee11074946bd8b8ff1f86729fd05394 100644
--- a/source/texk/web2c/luatexdir/tex/conditional.c
+++ b/source/texk/web2c/luatexdir/tex/conditional.c
@@ -50,14 +50,14 @@ corresponding |if_line|.
halfword cond_ptr; /* top of the condition stack */
int if_limit; /* upper bound on |fi_or_else| codes */
int cur_if; /* type of conditional being worked on */
-integer if_line; /* line where that conditional began */
+int if_line; /* line where that conditional began */
/*
When we skip conditional text, we keep track of the line number
where skipping began, for use in error messages.
*/
-integer skip_line; /* skipping began here */
+int skip_line; /* skipping began here */
/*
Here is a procedure that ignores text until coming to an \.{\\or},
@@ -69,7 +69,7 @@ procedure run faster).
void pass_text(void)
{
- integer l; /* level of $\.{\\if}\ldots\.{\\fi}$ nesting */
+ int l; /* level of $\.{\\if}\ldots\.{\\fi}$ nesting */
int save_scanner_status; /* |scanner_status| upon entry */
save_scanner_status = scanner_status;
scanner_status = skipping;
@@ -160,7 +160,7 @@ preceding the mandatory \.{\\endcsname} have been expanded).
static boolean test_for_cs(void)
{
boolean b; /*is the condition true? */
- integer m, s; /*to be tested against the second operand */
+ int m, s; /*to be tested against the second operand */
halfword n, p, q; /*for traversing token lists in \.{\\ifx} tests */
n = get_avail();
p = n; /*head of the list of characters */
@@ -248,7 +248,7 @@ void conditional(void)
{
boolean b; /*is the condition true? */
int r; /*relation to be evaluated */
- integer m, n; /*to be tested against the second operand */
+ int m, n; /*to be tested against the second operand */
halfword p, q; /*for traversing token lists in \.{\\ifx} tests */
int save_scanner_status; /*|scanner_status| upon entry */
halfword save_cond_ptr; /*|cond_ptr| corresponding to this conditional */
diff --git a/source/texk/web2c/luatexdir/tex/conditional.h b/source/texk/web2c/luatexdir/tex/conditional.h
index a8777af92bf513477f45eeb0f08f36f3c7e9a666..e69a19884efddd01116615f9e15d2749953c31bf 100644
--- a/source/texk/web2c/luatexdir/tex/conditional.h
+++ b/source/texk/web2c/luatexdir/tex/conditional.h
@@ -69,8 +69,8 @@ typedef enum {
extern halfword cond_ptr; /* top of the condition stack */
extern int if_limit; /* upper bound on |fi_or_else| codes */
extern int cur_if; /* type of conditional being worked on */
-extern integer if_line; /* line where that conditional began */
-extern integer skip_line; /* skipping began here */
+extern int if_line; /* line where that conditional began */
+extern int skip_line; /* skipping began here */
extern void pass_text(void);
extern void push_condition_stack(void);
diff --git a/source/texk/web2c/luatexdir/tex/dumpdata.c b/source/texk/web2c/luatexdir/tex/dumpdata.c
index c2fa968af55be6bb82437146308098a254c2e91c..e929414c3b4447e356942262793e9b2145097401 100644
--- a/source/texk/web2c/luatexdir/tex/dumpdata.c
+++ b/source/texk/web2c/luatexdir/tex/dumpdata.c
@@ -57,9 +57,9 @@ FILE *fmt_file; /* for input or output of format information */
void store_fmt_file(void)
{
- integer j, k, l; /* all-purpose indices */
+ int j, k, l; /* all-purpose indices */
halfword p; /* all-purpose pointer */
- integer x; /* something to dump */
+ int x; /* something to dump */
char *format_engine;
char *fmtname = NULL;
/* If dumping is not allowed, abort */
@@ -127,9 +127,9 @@ void store_fmt_file(void)
/* Dump the string pool */
k = dump_string_pool();
print_ln();
- print_int(k);
+ print_int(k);
tprint(" strings using ");
- print_int(pool_size);
+ print_int(pool_size);
tprint(" bytes");
/* Dump the dynamic memory */
@@ -265,7 +265,8 @@ void store_fmt_file(void)
tprint_nl("\\font");
print_esc(font_id_text(k));
print_char('=');
- tprint_file_name((unsigned char *)font_name(k), (unsigned char *)font_area(k), NULL);
+ tprint_file_name((unsigned char *) font_name(k),
+ (unsigned char *) font_area(k), NULL);
if (font_size(k) != font_dsize(k)) {
tprint(" at ");
print_scaled(font_size(k));
@@ -349,9 +350,9 @@ read an integer value |x| that is supposed to be in the range |a<=x<=b|.
boolean load_fmt_file(char *fmtname)
{
- integer j, k; /* all-purpose indices */
+ int j, k; /* all-purpose indices */
halfword p; /* all-purpose pointer */
- integer x; /* something undumped */
+ int x; /* something undumped */
char *format_engine;
/* Undump constants for consistency check */
if (ini_version) {
diff --git a/source/texk/web2c/luatexdir/tex/dumpdata.h b/source/texk/web2c/luatexdir/tex/dumpdata.h
index afbd8ed14c12e2e5fa16283541a2865bf9c61325..7d5eb5df9eadb5908a79c9d19ca9e4e3c6bbb8db 100644
--- a/source/texk/web2c/luatexdir/tex/dumpdata.h
+++ b/source/texk/web2c/luatexdir/tex/dumpdata.h
@@ -88,7 +88,7 @@ extern void do_zundump(char *, int, int, FILE *);
# define dump_int(x) \
do \
{ \
- integer x_val = (x); \
+ int x_val = (x); \
generic_dump (x_val); \
} \
while (0)
@@ -100,7 +100,7 @@ extern void do_zundump(char *, int, int, FILE *);
# define undump_int(x) \
do \
{ \
- integer x_val; \
+ int x_val; \
generic_undump (x_val); \
x = x_val; \
} \
diff --git a/source/texk/web2c/luatexdir/tex/equivalents.c b/source/texk/web2c/luatexdir/tex/equivalents.c
index e3644edfa0b13b8ec2485a12bfeeb0abaf97478d..5910e9c6574af4b9e44dcc3bd4b5d778bf22ffb3 100644
--- a/source/texk/web2c/luatexdir/tex/equivalents.c
+++ b/source/texk/web2c/luatexdir/tex/equivalents.c
@@ -84,7 +84,7 @@ quarterword xeq_level[(eqtb_size + 1)];
void initialize_equivalents(void)
{
- integer k;
+ int k;
for (k = int_base; k <= eqtb_size; k++)
xeq_level[k] = level_one;
}
@@ -158,11 +158,11 @@ in the |save_stack| or in |eqtb| ever has a level greater than |cur_level|.
*/
save_record *save_stack;
-integer save_ptr; /* first unused entry on |save_stack| */
-integer max_save_stack; /* maximum usage of save stack */
+int save_ptr; /* first unused entry on |save_stack| */
+int max_save_stack; /* maximum usage of save stack */
quarterword cur_level = level_one; /* current nesting level for groups */
group_code cur_group = bottom_level; /* current group type */
-integer cur_boundary; /* where the current level begins */
+int cur_boundary; /* where the current level begins */
/*
At this time it might be a good idea for the reader to review the introduction
@@ -374,12 +374,12 @@ void print_save_stack(void)
void show_save_groups(void)
{
int p; /* index into |nest| */
- integer m; /* mode */
+ int m; /* mode */
save_pointer v; /* saved value of |save_ptr| */
quarterword l; /* saved value of |cur_level| */
group_code c; /* saved value of |cur_group| */
int a; /* to keep track of alignments */
- integer i;
+ int i;
quarterword j;
char *s;
/* print_save_stack(); */
@@ -540,7 +540,7 @@ void show_save_groups(void)
/* Show the box packaging info */
{
/* offsets may vary */
- integer ii = -1;
+ int ii = -1;
while (saved_type(ii) != saved_boxspec)
ii--;
if (saved_value(ii) != 0) {
@@ -657,7 +657,7 @@ The counterpart of |eq_define| for the remaining (fullword) positions in
|p|, a `|restore_zero|' will never be used in this case.
*/
-void eq_word_define(halfword p, integer w)
+void eq_word_define(halfword p, int w)
{
if (eqtb[p].cint == w) {
assign_trace(p, "reassigning");
@@ -689,7 +689,7 @@ void geq_define(halfword p, quarterword t, halfword e)
assign_trace(p, "into");
}
-void geq_word_define(halfword p, integer w)
+void geq_word_define(halfword p, int w)
{ /* global |eq_word_define| */
assign_trace(p, "globally changing");
eqtb[p].cint = w;
@@ -809,7 +809,7 @@ entire run. The global variable |mag_set| is set to the current magnification
whenever it becomes necessary to ``freeze'' it at a particular value.
*/
-integer mag_set; /* if nonzero, this magnification should be used henceforth */
+int mag_set; /* if nonzero, this magnification should be used henceforth */
/*
The |prepare_mag| subroutine is called whenever \TeX\ wants to use |mag|
@@ -893,7 +893,7 @@ Therefore it will not be difficult to translate these algorithms into
low-level languages that do not support recursion.
*/
-integer cur_cmd; /* current command set by |get_next| */
+int cur_cmd; /* current command set by |get_next| */
halfword cur_chr; /* operand of current command */
halfword cur_cs; /* control sequence found here, zero if none found */
halfword cur_tok; /* packed representative of |cur_cmd| and |cur_chr| */
@@ -904,8 +904,8 @@ halfword cur_tok; /* packed representative of |cur_cmd| and |cur_c
void show_cur_cmd_chr(void)
{
- integer n; /* level of \.{\\if...\\fi} nesting */
- integer l; /* line where \.{\\if} started */
+ int n; /* level of \.{\\if...\\fi} nesting */
+ int l; /* line where \.{\\if} started */
halfword p;
begin_diagnostic();
tprint_nl("{");
diff --git a/source/texk/web2c/luatexdir/tex/equivalents.h b/source/texk/web2c/luatexdir/tex/equivalents.h
index 63456f93ab224965c0e121611297ca5fbb229185..527f04eadc180d5f92a93f8bcdc7ba7e533c382d 100644
--- a/source/texk/web2c/luatexdir/tex/equivalents.h
+++ b/source/texk/web2c/luatexdir/tex/equivalents.h
@@ -432,11 +432,11 @@ typedef struct save_record_ {
extern save_record *save_stack;
-extern integer save_ptr; /* first unused entry on |save_stack| */
-extern integer max_save_stack; /* maximum usage of save stack */
+extern int save_ptr; /* first unused entry on |save_stack| */
+extern int max_save_stack; /* maximum usage of save stack */
extern quarterword cur_level; /* current nesting level for groups */
extern group_code cur_group; /* current group type */
-extern integer cur_boundary; /* where the current level begins */
+extern int cur_boundary; /* where the current level begins */
# define save_type(A) save_stack[(A)].type_ /* classifies a |save_stack| entry */
@@ -487,7 +487,7 @@ extern void print_save_stack(void);
# define loc_par(A) equiv(local_base+(A))
# define glue_par(A) equiv(glue_base+(A))
-extern integer mag_set; /* if nonzero, this magnification should be used henceforth */
+extern int mag_set; /* if nonzero, this magnification should be used henceforth */
extern void prepare_mag(void);
/*
@@ -533,7 +533,7 @@ typedef enum {
# define max_group_code local_box_group /* which is wrong, but is what the web says */
-extern integer cur_cmd; /* current command set by |get_next| */
+extern int cur_cmd; /* current command set by |get_next| */
extern halfword cur_chr; /* operand of current command */
extern halfword cur_cs; /* control sequence found here, zero if none found */
extern halfword cur_tok; /* packed representative of |cur_cmd| and |cur_chr| */
@@ -544,9 +544,9 @@ extern void new_save_level(group_code c); /* begin a new level of grouping
extern void eq_destroy(memory_word w); /* gets ready to forget |w| */
extern void eq_save(halfword p, quarterword l); /* saves |eqtb[p]| */
extern void eq_define(halfword p, quarterword t, halfword e); /* new data for |eqtb| */
-extern void eq_word_define(halfword p, integer w);
+extern void eq_word_define(halfword p, int w);
extern void geq_define(halfword p, quarterword t, halfword e); /* global |eq_define| */
-extern void geq_word_define(halfword p, integer w); /* global |eq_word_define| */
+extern void geq_word_define(halfword p, int w); /* global |eq_word_define| */
extern void save_for_after(halfword t);
extern void unsave(void); /* pops the top level off the save stack */
extern void restore_trace(halfword p, char *s); /* |eqtb[p]| has just been restored or retained */
diff --git a/source/texk/web2c/luatexdir/tex/errors.c b/source/texk/web2c/luatexdir/tex/errors.c
index 0d464749b3098572d2f0041929602781f892354d..7a69d960c99967a94d3b5803cac0873b8397a118 100644
--- a/source/texk/web2c/luatexdir/tex/errors.c
+++ b/source/texk/web2c/luatexdir/tex/errors.c
@@ -115,7 +115,7 @@ boolean deletions_allowed; /* is it safe for |error| to call |get_token|? *
boolean set_box_allowed; /* is it safe to do a \.{\\setbox} assignment? */
int history; /* has the source input been clean so far? */
int error_count; /* the number of scrolled errors since the last paragraph ended */
-integer interrupt; /* should \TeX\ pause for instructions? */
+int interrupt; /* should \TeX\ pause for instructions? */
boolean OK_to_interrupt; /* should interrupts be observed? */
@@ -175,8 +175,8 @@ void jump_out(void)
void error(void)
{ /* completes the job of error reporting */
ASCII_code c; /* what the user types */
- integer callback_id;
- integer s1, s2, s3, s4; /* used to save global variables when deleting tokens */
+ int callback_id;
+ int s1, s2, s3, s4; /* used to save global variables when deleting tokens */
boolean t;
int i;
if (history < error_message_issued)
@@ -386,7 +386,7 @@ A dozen or so error messages end with a parenthesized integer, so we
save a teeny bit of program space by declaring the following procedure:
*/
-void int_error(integer n)
+void int_error(int n)
{
tprint(" (");
print_int(n);
@@ -438,7 +438,7 @@ void fatal_error(char *s)
void lua_norm_error(char *s)
{ /* lua found a problem */
- integer saved_new_line_char;
+ int saved_new_line_char;
saved_new_line_char = new_line_char;
new_line_char = 10;
print_err("LuaTeX error ");
@@ -460,7 +460,7 @@ void lua_fatal_error(char *s)
/* Here is the most dreaded error message */
-void overflow(char *s, integer n)
+void overflow(char *s, int n)
{ /* stop due to finiteness */
normalize_selector();
print_err("TeX capacity exceeded, sorry [");
@@ -589,9 +589,9 @@ that characters exist when it sees them. The following procedure
prints a warning message unless the user has suppressed it.
*/
-void char_warning(internal_font_number f, integer c)
+void char_warning(internal_font_number f, int c)
{
- integer old_setting; /* saved value of |tracing_online| */
+ int old_setting; /* saved value of |tracing_online| */
int k; /* index to current digit; we assume that $0\L n<16^{22}$ */
if (int_par(tracing_lost_chars_code) > 0) {
old_setting = int_par(tracing_online_code);
diff --git a/source/texk/web2c/luatexdir/tex/errors.h b/source/texk/web2c/luatexdir/tex/errors.h
index 3876875b79742921c85542e9832ca4d56ea6f85a..506dc3c0131263fcd2841d45f0da335a35c5ddb2 100644
--- a/source/texk/web2c/luatexdir/tex/errors.h
+++ b/source/texk/web2c/luatexdir/tex/errors.h
@@ -48,7 +48,7 @@ extern boolean deletions_allowed;
extern boolean set_box_allowed;
extern int history;
extern int error_count;
-extern integer interrupt;
+extern int interrupt;
extern boolean OK_to_interrupt;
typedef enum {
@@ -81,13 +81,13 @@ extern boolean use_err_help; /* should the |err_help| list be shown? */
extern void do_final_end(void);
extern void jump_out(void);
extern void error(void);
-extern void int_error(integer n);
+extern void int_error(int n);
extern void normalize_selector(void);
extern void succumb(void);
extern void fatal_error(char *s);
extern void lua_norm_error(char *s);
extern void lua_fatal_error(char *s);
-extern void overflow(char *s, integer n);
+extern void overflow(char *s, int n);
extern void confusion(char *s);
extern void check_interrupt(void);
extern void pause_for_instructions(void);
@@ -97,6 +97,6 @@ extern void tex_error(char *msg, char **hlp);
extern void back_error(void);
extern void ins_error(void);
-extern void char_warning(internal_font_number f, integer c);
+extern void char_warning(internal_font_number f, int c);
#endif
diff --git a/source/texk/web2c/luatexdir/tex/expand.c b/source/texk/web2c/luatexdir/tex/expand.c
index d6cfe2dd753351be7639053f473d9cfc3038b610..63f91045852237d234f045188a7b86af35f18112 100644
--- a/source/texk/web2c/luatexdir/tex/expand.c
+++ b/source/texk/web2c/luatexdir/tex/expand.c
@@ -44,7 +44,7 @@ the initial setting of |100| should be enough to prevent problems.
@^system dependencies@>
*/
-static integer expand_depth_count = 0;
+static int expand_depth_count = 0;
/*
The |expand| subroutine is used when |cur_cmd>max_command|. It removes a
@@ -67,8 +67,8 @@ void expand(void)
halfword t; /* token that is being ``expanded after'' */
halfword p; /* for list manipulation */
halfword cur_ptr; /* for a local token list pointer */
- integer cv_backup; /* to save the global quantity |cur_val| */
- integer cvl_backup, radix_backup, co_backup; /* to save |cur_val_level|, etc. */
+ int cv_backup; /* to save the global quantity |cur_val| */
+ int cvl_backup, radix_backup, co_backup; /* to save |cur_val_level|, etc. */
halfword backup_backup; /* to save |link(backup_head)| */
int save_scanner_status; /* temporary storage of |scanner_status| */
incr(expand_depth_count);
@@ -318,8 +318,8 @@ void complain_missing_csname(void)
void manufacture_csname(void)
{
halfword p, q, r;
- integer j; /* index into |buffer| */
- integer s; /* a character */
+ int j; /* index into |buffer| */
+ int s; /* a character */
r = get_avail();
p = r; /* head of the list of characters */
is_in_csname = true;
diff --git a/source/texk/web2c/luatexdir/tex/extensions.c b/source/texk/web2c/luatexdir/tex/extensions.c
index 4e223cee7015265ec2b949a13ca96fd8888984f2..cc0fe83876228e89663f4f1a16efea7c74a72968 100644
--- a/source/texk/web2c/luatexdir/tex/extensions.c
+++ b/source/texk/web2c/luatexdir/tex/extensions.c
@@ -131,7 +131,7 @@ the |do_extension| routine is called.
void do_extension(PDF pdf)
{
- integer i, k; /* all-purpose integers */
+ int i, k; /* all-purpose integers */
halfword p; /* all-purpose pointer */
switch (cur_chr) {
case open_node:
@@ -269,7 +269,7 @@ void do_extension(PDF pdf)
scan_pdf_ext_toks();
set_pdf_font_attr(k, tokens_to_string(def_ref));
if (str_length(pdf_font_attr(k)) == 0) {
- flush_str((str_ptr-1)); /* from tokens_to_string */
+ flush_str((str_ptr - 1)); /* from tokens_to_string */
set_pdf_font_attr(k, 0);
}
break;
@@ -577,21 +577,21 @@ halfword prev_rightmost(halfword s, halfword e)
\.{\\pdfrefobj}
*/
-integer pdf_last_xform;
+int pdf_last_xform;
/* \.{\\pdfximage} and \.{\\pdfrefximage} are similiar to \.{\\pdfxform} and
\.{\\pdfrefxform}. As we have to scan |<rule spec>| quite often, it is better
have a |rule_node| that holds the most recently scanned |<rule spec>|.
*/
-integer pdf_last_ximage;
-integer pdf_last_ximage_pages;
-integer pdf_last_ximage_colordepth;
-integer pdf_last_annot;
+int pdf_last_ximage;
+int pdf_last_ximage_pages;
+int pdf_last_ximage_colordepth;
+int pdf_last_annot;
/* pdflastlink needs an extra global variable */
-integer pdf_last_link;
+int pdf_last_link;
scaledpos pdf_last_pos = { 0, 0 };
/*
@@ -612,7 +612,7 @@ halfword concat_tokens(halfword q, halfword r)
return q;
}
-integer pdf_retval; /* global multi-purpose return value */
+int pdf_retval; /* global multi-purpose return value */
halfword make_local_par_node(void)
@@ -858,7 +858,7 @@ void file_warning(void)
halfword p; /* saved value of |save_ptr| or |cond_ptr| */
quarterword l; /* saved value of |cur_level| or |if_limit| */
quarterword c; /* saved value of |cur_group| or |cur_if| */
- integer i; /* saved value of |if_line| */
+ int i; /* saved value of |if_line| */
p = save_ptr;
l = cur_level;
c = cur_group;
@@ -916,7 +916,7 @@ pascal defines are not available.
#define get_tex_attribute_register(j) attribute(j)
#define get_tex_box_register(j) box(j)
-integer set_tex_dimen_register(integer j, scaled v)
+int set_tex_dimen_register(int j, scaled v)
{
int a; /* return non-nil for error */
if (global_defs > 0)
@@ -927,7 +927,7 @@ integer set_tex_dimen_register(integer j, scaled v)
return 0;
}
-integer set_tex_skip_register(integer j, halfword v)
+int set_tex_skip_register(int j, halfword v)
{
int a; /* return non-nil for error */
if (global_defs > 0)
@@ -940,7 +940,7 @@ integer set_tex_skip_register(integer j, halfword v)
return 0;
}
-integer set_tex_count_register(integer j, scaled v)
+int set_tex_count_register(int j, scaled v)
{
int a; /* return non-nil for error */
if (global_defs > 0)
@@ -951,7 +951,7 @@ integer set_tex_count_register(integer j, scaled v)
return 0;
}
-integer set_tex_box_register(integer j, scaled v)
+int set_tex_box_register(int j, scaled v)
{
int a; /* return non-nil for error */
if (global_defs > 0)
@@ -962,7 +962,7 @@ integer set_tex_box_register(integer j, scaled v)
return 0;
}
-integer set_tex_attribute_register(integer j, scaled v)
+int set_tex_attribute_register(int j, scaled v)
{
int a; /* return non-nil for error */
if (global_defs > 0)
@@ -976,7 +976,7 @@ integer set_tex_attribute_register(integer j, scaled v)
return 0;
}
-integer get_tex_toks_register(integer j)
+int get_tex_toks_register(int j)
{
str_number s;
s = get_nullstr();
@@ -986,7 +986,7 @@ integer get_tex_toks_register(integer j)
return s;
}
-integer set_tex_toks_register(integer j, lstring s)
+int set_tex_toks_register(int j, lstring s)
{
halfword ref;
int a;
@@ -1002,7 +1002,7 @@ integer set_tex_toks_register(integer j, lstring s)
return 0;
}
-scaled get_tex_box_width(integer j)
+scaled get_tex_box_width(int j)
{
halfword q = box(j);
if (q != null)
@@ -1010,7 +1010,7 @@ scaled get_tex_box_width(integer j)
return 0;
}
-integer set_tex_box_width(integer j, scaled v)
+int set_tex_box_width(int j, scaled v)
{
halfword q = box(j);
if (q == null)
@@ -1019,7 +1019,7 @@ integer set_tex_box_width(integer j, scaled v)
return 0;
}
-scaled get_tex_box_height(integer j)
+scaled get_tex_box_height(int j)
{
halfword q = box(j);
if (q != null)
@@ -1027,7 +1027,7 @@ scaled get_tex_box_height(integer j)
return 0;
}
-integer set_tex_box_height(integer j, scaled v)
+int set_tex_box_height(int j, scaled v)
{
halfword q = box(j);
if (q == null)
@@ -1037,7 +1037,7 @@ integer set_tex_box_height(integer j, scaled v)
}
-scaled get_tex_box_depth(integer j)
+scaled get_tex_box_depth(int j)
{
halfword q = box(j);
if (q != null)
@@ -1045,7 +1045,7 @@ scaled get_tex_box_depth(integer j)
return 0;
}
-integer set_tex_box_depth(integer j, scaled v)
+int set_tex_box_depth(int j, scaled v)
{
halfword q = box(j);
if (q == null)
@@ -1086,7 +1086,7 @@ This is just a placeholder where the command line controller will put
the {\sl Sync\TeX} related options, and the {\sl Sync\TeX} controller will read them.
*/
-integer synctexoption;
+int synctexoption;
/*
@ A convenient primitive is provided:
@@ -1103,7 +1103,7 @@ the same memory storage. |synctexoffset| is initialized to
the correct value when quite everything is initialized.
*/
-integer synctexoffset; /* holds the true value of |synctex_code| */
+int synctexoffset; /* holds the true value of |synctex_code| */
/*
Synchronization is achieved with the help of an auxiliary file named
@@ -1200,7 +1200,7 @@ system-dependent section allows easy integration of Web2c and e-\TeX, etc.)
*/
pool_pointer edit_name_start; /* where the filename to switch to starts */
-integer edit_name_length, edit_line; /* what line to start editing at */
+int edit_name_length, edit_line; /* what line to start editing at */
int ipcon; /* level of IPC action, 0 for none [default] */
boolean stop_at_space; /* whether |more_name| returns false for space */
diff --git a/source/texk/web2c/luatexdir/tex/extensions.h b/source/texk/web2c/luatexdir/tex/extensions.h
index 7cdab0d0b13ad7ffb3dd5139c65b6ad3cdae3c53..20643bd7325032141e6d273052dfad873b3b4128 100644
--- a/source/texk/web2c/luatexdir/tex/extensions.h
+++ b/source/texk/web2c/luatexdir/tex/extensions.h
@@ -47,15 +47,15 @@ extern void new_whatsit(int s);
extern void new_write_whatsit(int w);
extern void scan_pdf_ext_toks(void);
extern halfword prev_rightmost(halfword s, halfword e);
-extern integer pdf_last_xform;
-extern integer pdf_last_ximage;
-extern integer pdf_last_ximage_pages;
-extern integer pdf_last_ximage_colordepth;
-extern integer pdf_last_annot;
-extern integer pdf_last_link;
+extern int pdf_last_xform;
+extern int pdf_last_ximage;
+extern int pdf_last_ximage_pages;
+extern int pdf_last_ximage_colordepth;
+extern int pdf_last_annot;
+extern int pdf_last_link;
extern scaledpos pdf_last_pos;
extern halfword concat_tokens(halfword q, halfword r);
-extern integer pdf_retval;
+extern int pdf_retval;
extern halfword make_local_par_node(void);
@@ -85,29 +85,29 @@ extern halfword last_line_fill; /* the |par_fill_skip| glue node of the new para
# define get_tex_attribute_register(j) attribute(j)
# define get_tex_box_register(j) box(j)
-extern integer set_tex_dimen_register(integer j, scaled v);
-extern integer set_tex_skip_register(integer j, halfword v);
-extern integer set_tex_count_register(integer j, scaled v);
-extern integer set_tex_box_register(integer j, scaled v);
-extern integer set_tex_attribute_register(integer j, scaled v);
-extern integer get_tex_toks_register(integer l);
-extern integer set_tex_toks_register(integer j, lstring s);
-extern scaled get_tex_box_width(integer j);
-extern integer set_tex_box_width(integer j, scaled v);
-extern scaled get_tex_box_height(integer j);
-extern integer set_tex_box_height(integer j, scaled v);
-extern scaled get_tex_box_depth(integer j);
-extern integer set_tex_box_depth(integer j, scaled v);
+extern int set_tex_dimen_register(int j, scaled v);
+extern int set_tex_skip_register(int j, halfword v);
+extern int set_tex_count_register(int j, scaled v);
+extern int set_tex_box_register(int j, scaled v);
+extern int set_tex_attribute_register(int j, scaled v);
+extern int get_tex_toks_register(int l);
+extern int set_tex_toks_register(int j, lstring s);
+extern scaled get_tex_box_width(int j);
+extern int set_tex_box_width(int j, scaled v);
+extern scaled get_tex_box_height(int j);
+extern int set_tex_box_height(int j, scaled v);
+extern scaled get_tex_box_depth(int j);
+extern int set_tex_box_depth(int j, scaled v);
/* Synctex variables */
-extern integer synctexoption;
-extern integer synctexoffset;
+extern int synctexoption;
+extern int synctexoffset;
/* Here are extra variables for Web2c. */
extern pool_pointer edit_name_start;
-extern integer edit_name_length, edit_line;
+extern int edit_name_length, edit_line;
extern int ipcon;
extern boolean stop_at_space;
extern int shellenabledp;
diff --git a/source/texk/web2c/luatexdir/tex/inputstack.c b/source/texk/web2c/luatexdir/tex/inputstack.c
index 9bd6caa0bd221e4006719f079614be0b81fe2924..86bf8f4b590029e9f09bb2ec70b361ac8504af42 100644
--- a/source/texk/web2c/luatexdir/tex/inputstack.c
+++ b/source/texk/web2c/luatexdir/tex/inputstack.c
@@ -30,21 +30,21 @@ static const char _svn_version[] =
in_state_record *input_stack = NULL;
-integer input_ptr = 0; /* first unused location of |input_stack| */
-integer max_in_stack = 0; /* largest value of |input_ptr| when pushing */
+int input_ptr = 0; /* first unused location of |input_stack| */
+int max_in_stack = 0; /* largest value of |input_ptr| when pushing */
in_state_record cur_input; /* the ``top'' input state */
-integer in_open = 0; /* the number of lines in the buffer, less one */
-integer open_parens = 0; /* the number of open text files */
+int in_open = 0; /* the number of lines in the buffer, less one */
+int open_parens = 0; /* the number of open text files */
alpha_file *input_file = NULL;
-integer line = 0; /* current line number in the current source file */
-integer *line_stack = NULL;
+int line = 0; /* current line number in the current source file */
+int *line_stack = NULL;
str_number *source_filename_stack = NULL;
char **full_source_filename_stack = NULL;
-integer scanner_status = 0; /* can a subfile end now? */
+int scanner_status = 0; /* can a subfile end now? */
pointer warning_index = null; /* identifier relevant to non-|normal| scanner status */
pointer def_ref = null; /* reference count of token list being defined */
@@ -92,8 +92,8 @@ rate from the others.
*/
pointer *param_stack = NULL; /* token list pointers for parameters */
-integer param_ptr = 0; /* first unused entry in |param_stack| */
-integer max_param_stack = 0; /* largest value of |param_ptr|, will be |<=param_size+9| */
+int param_ptr = 0; /* first unused entry in |param_stack| */
+int max_param_stack = 0; /* largest value of |param_ptr|, will be |<=param_size+9| */
/*
The input routines must also interact with the processing of
@@ -107,7 +107,7 @@ is nonzero during the \<u_j> template, after which it is set to zero; the
|align_state=0|.
*/
-integer align_state = 0; /* group level with respect to current alignment */
+int align_state = 0; /* group level with respect to current alignment */
/*
Thus, the ``current input state'' can be very complicated indeed; there
@@ -119,7 +119,7 @@ The global variable |base_ptr| contains the lowest level that was
displayed by this procedure.
*/
-integer base_ptr = 0; /* shallowest level shown by |show_context| */
+int base_ptr = 0; /* shallowest level shown by |show_context| */
/*
The status at each level is indicated by printing two lines, where the first
@@ -257,16 +257,16 @@ void set_trick_count(void)
void show_context(void)
{ /* prints where the scanner is */
- integer old_setting; /* saved |selector| setting */
- integer nn; /* number of contexts shown so far, less one */
+ int old_setting; /* saved |selector| setting */
+ int nn; /* number of contexts shown so far, less one */
boolean bottom_line; /* have we reached the final context to be shown? */
- integer i; /* index into |buffer| */
- integer j; /* end of current line in |buffer| */
- integer l; /* length of descriptive information on line 1 */
- integer m; /* context information gathered for line 2 */
- integer n; /* length of line 1 */
- integer p; /* starting or ending place in |trick_buf| */
- integer q; /* temporary index */
+ int i; /* index into |buffer| */
+ int j; /* end of current line in |buffer| */
+ int l; /* length of descriptive information on line 1 */
+ int m; /* context information gathered for line 2 */
+ int n; /* length of line 1 */
+ int p; /* starting or ending place in |trick_buf| */
+ int q; /* temporary index */
base_ptr = input_ptr;
input_stack[base_ptr] = cur_input;
@@ -649,7 +649,7 @@ all the following words contain ASCII codes.
halfword pseudo_files; /* stack of pseudo files */
-static halfword string_to_pseudo(str_number str, integer nl)
+static halfword string_to_pseudo(str_number str, int nl)
{
halfword i, r, q = null;
unsigned l, len;
@@ -657,10 +657,10 @@ static halfword string_to_pseudo(str_number str, integer nl)
int sz;
halfword h = new_node(pseudo_file_node, 0);
unsigned char *s = str_string(str);
- len = str_length(str);
+ len = str_length(str);
l = 0;
- while (l<len) {
- unsigned m = l; /* start of current line */
+ while (l < len) {
+ unsigned m = l; /* start of current line */
while ((l < len) && (s[l] != nl))
l++;
sz = (l - m + 7) / 4;
@@ -755,7 +755,7 @@ void lua_string_start(void)
boolean pseudo_input(void)
{ /* inputs the next line or returns |false| */
halfword p; /* current line from pseudo file */
- integer sz; /* size of node |p| */
+ int sz; /* size of node |p| */
four_quarters w; /* four ASCII codes */
halfword r; /* loop index */
last = first; /* cf.\ Matthew 19\thinspace:\thinspace30 */
diff --git a/source/texk/web2c/luatexdir/tex/inputstack.h b/source/texk/web2c/luatexdir/tex/inputstack.h
index 73e0297a3391c38827c37aa4203e02a525b8f585..0a271d61ee62033061699425b5b5b63c14701bba 100644
--- a/source/texk/web2c/luatexdir/tex/inputstack.h
+++ b/source/texk/web2c/luatexdir/tex/inputstack.h
@@ -34,9 +34,9 @@ typedef struct in_state_record {
halfword limit_field;
halfword name_field;
halfword ocp_lstack_field; /* used for omega translation processes */
- integer synctex_tag_field; /* stack the tag of the current file */
+ int synctex_tag_field; /* stack the tag of the current file */
halfword ocp_no_field:16; /* used for omega translation processes */
- integer cattable_field:16; /* category table used by the current line (see textoken.c) */
+ int cattable_field:16; /* category table used by the current line (see textoken.c) */
quarterword state_field:8;
quarterword index_field:8;
boolean partial_field:8; /* is the current line partial? (see textoken.c) */
@@ -44,8 +44,8 @@ typedef struct in_state_record {
} in_state_record;
extern in_state_record *input_stack;
-extern integer input_ptr;
-extern integer max_in_stack;
+extern int input_ptr;
+extern int max_in_stack;
extern in_state_record cur_input; /* the ``top'' input state */
# define iloc cur_input.loc_field /* location of first unread character in |buffer| */
@@ -156,11 +156,11 @@ by analogy with |line_stack|.
# define terminal_input (iname==0) /* are we reading from the terminal? */
# define cur_file input_file[iindex] /* the current |alpha_file| variable */
-extern integer in_open;
-extern integer open_parens;
+extern int in_open;
+extern int open_parens;
extern alpha_file *input_file;
-extern integer line;
-extern integer *line_stack;
+extern int line;
+extern int *line_stack;
extern str_number *source_filename_stack;
extern char **full_source_filename_stack;
@@ -204,7 +204,7 @@ typedef enum {
absorbing = 5, /* |scanner_status| when reading a balanced text */
} scanner_states;
-extern integer scanner_status;
+extern int scanner_status;
extern pointer warning_index;
extern pointer def_ref;
@@ -314,12 +314,12 @@ typedef enum {
} token_types;
extern pointer *param_stack;
-extern integer param_ptr;
-extern integer max_param_stack;
+extern int param_ptr;
+extern int max_param_stack;
-extern integer align_state;
+extern int align_state;
-extern integer base_ptr;
+extern int base_ptr;
extern void show_context(void);
extern void set_trick_count(void);
diff --git a/source/texk/web2c/luatexdir/tex/linebreak.c b/source/texk/web2c/luatexdir/tex/linebreak.c
index 3cd82eca9d6f8e29a92eb7e1eda952c414a95319..58c766c351ced62cd9f42f6db376a49cf9354fda 100644
--- a/source/texk/web2c/luatexdir/tex/linebreak.c
+++ b/source/texk/web2c/luatexdir/tex/linebreak.c
@@ -138,13 +138,13 @@ static void ext_do_line_break(boolean d,
-void line_break(boolean d, integer line_break_context)
+void line_break(boolean d, int line_break_context)
{
- integer paragraph_dir; /* main direction of paragraph */
+ int paragraph_dir; /* main direction of paragraph */
halfword final_par_glue;
halfword start_of_par;
- integer callback_id;
- integer line_break_dir; /* current direction within paragraph */
+ int callback_id;
+ int line_break_dir; /* current direction within paragraph */
pack_begin_line = cur_list.ml_field; /* this is for over/underfull box messages */
vlink(temp_head) = vlink(cur_list.head_field);
new_hyphenation(temp_head, cur_list.tail_field);
@@ -310,7 +310,7 @@ static halfword finite_shrink(halfword p)
static boolean second_pass; /* is this our second attempt to break this paragraph? */
static boolean final_pass; /*is this our final attempt to break this paragraph? */
-static integer threshold; /* maximum badness on feasible lines */
+static int threshold; /* maximum badness on feasible lines */
/* skipable nodes at the margins during character protrusion */
@@ -367,9 +367,9 @@ static halfword pop_node(void)
return hlist_stack[--hlist_stack_level];
}
-static integer max_stretch_ratio = 0; /*maximal stretch ratio of expanded fonts */
-static integer max_shrink_ratio = 0; /*maximal shrink ratio of expanded fonts */
-static integer cur_font_step = 0; /*the current step of expanded fonts */
+static int max_stretch_ratio = 0; /*maximal stretch ratio of expanded fonts */
+static int max_shrink_ratio = 0; /*maximal shrink ratio of expanded fonts */
+static int cur_font_step = 0; /*the current step of expanded fonts */
static boolean check_expand_pars(internal_font_number f)
@@ -683,14 +683,14 @@ static boolean auto_breaking; /*make |auto_breaking| accessible out of |line_b
-static integer internal_pen_inter; /* running \.{\\localinterlinepenalty} */
-static integer internal_pen_broken; /* running \.{\\localbrokenpenalty} */
+static int internal_pen_inter; /* running \.{\\localinterlinepenalty} */
+static int internal_pen_broken; /* running \.{\\localbrokenpenalty} */
static halfword internal_left_box; /* running \.{\\localleftbox} */
-static integer internal_left_box_width; /* running \.{\\localleftbox} width */
+static int internal_left_box_width; /* running \.{\\localleftbox} width */
static halfword init_internal_left_box; /* running \.{\\localleftbox} */
-static integer init_internal_left_box_width; /* running \.{\\localleftbox} width */
+static int init_internal_left_box_width; /* running \.{\\localleftbox} width */
static halfword internal_right_box; /* running \.{\\localrightbox} */
-static integer internal_right_box_width; /* running \.{\\localrightbox} width */
+static int internal_right_box_width; /* running \.{\\localrightbox} width */
static scaled disc_width[10] = { 0 }; /* the length of discretionary material preceding a break */
@@ -708,10 +708,10 @@ static scaled disc_width[10] = { 0 }; /* the length of discretionary material
*/
-static integer minimal_demerits[4]; /* best total demerits known for current
- line class and position, given the fitness */
-static integer minimum_demerits; /* best total demerits known for current line class
- and position */
+static int minimal_demerits[4]; /* best total demerits known for current
+ line class and position, given the fitness */
+static int minimum_demerits; /* best total demerits known for current line class
+ and position */
static halfword best_place[4]; /* how to achieve |minimal_demerits| */
static halfword best_pl_line[4]; /*corresponding line number */
@@ -743,11 +743,11 @@ static scaled first_indent; /*left margin to go with |first_width| */
static scaled second_indent; /*left margin to go with |second_width| */
static halfword best_bet; /*use this passive node and its predecessors */
-static integer fewest_demerits; /*the demerits associated with |best_bet| */
+static int fewest_demerits; /*the demerits associated with |best_bet| */
static halfword best_line; /*line number following the last line of the new paragraph */
-static integer actual_looseness; /*the difference between |line_number(best_bet)|
- and the optimum |best_line| */
-static integer line_diff; /*the difference between the current line number and
+static int actual_looseness; /*the difference between |line_number(best_bet)|
+ and the optimum |best_line| */
+static int line_diff; /*the difference between the current line number and
the optimum |best_line| */
@@ -824,8 +824,8 @@ static scaled best_pl_glue[4]; /*corresponding glue stretch or shrink */
* only character nodes, kern nodes, and box or rule nodes.
*/
-static void add_to_widths(halfword s, integer line_break_dir,
- integer pdf_adjust_spacing, scaled * widths)
+static void add_to_widths(halfword s, int line_break_dir,
+ int pdf_adjust_spacing, scaled * widths)
{
while (s != null) {
if (is_char_node(s)) {
@@ -866,8 +866,8 @@ static void add_to_widths(halfword s, integer line_break_dir,
* with the |add_to_widths| function.
*/
-static void sub_from_widths(halfword s, integer line_break_dir,
- integer pdf_adjust_spacing, scaled * widths)
+static void sub_from_widths(halfword s, int line_break_dir,
+ int pdf_adjust_spacing, scaled * widths)
{
while (s != null) {
/* @<Subtract the width of node |s| from |break_width|@>; */
@@ -1045,8 +1045,8 @@ print_break_node(halfword q, fitness_value fit_class,
static void
-print_feasible_break(halfword cur_p, pointer r, halfword b, integer pi,
- integer d, boolean artificial_demerits)
+print_feasible_break(halfword cur_p, pointer r, halfword b, int pi,
+ int d, boolean artificial_demerits)
{
/* @<Print a symbolic description of this feasible break@>; */
if (printed_node != cur_p) {
@@ -1134,7 +1134,7 @@ print_feasible_break(halfword cur_p, pointer r, halfword b, integer pi,
}
static void
-ext_try_break(integer pi,
+ext_try_break(int pi,
quarterword break_type,
int line_break_dir,
int pdf_adjust_spacing,
@@ -1162,7 +1162,7 @@ ext_try_break(integer pi,
scaled line_width; /*the current line will be justified to this width */
fitness_value fit_class; /*possible fitness class of test line */
halfword b; /*badness of test line */
- integer d; /*demerits of test line */
+ int d; /*demerits of test line */
boolean artificial_demerits; /*has |d| been forced to zero? */
scaled shortfall; /*used in badness calculations */
diff --git a/source/texk/web2c/luatexdir/tex/linebreak.h b/source/texk/web2c/luatexdir/tex/linebreak.h
index 77d66c98d4acd4fb173064f3c627da18cdeec95d..0f1f6d7093d02d4b7e72b429eabf4825f7f22d38 100644
--- a/source/texk/web2c/luatexdir/tex/linebreak.h
+++ b/source/texk/web2c/luatexdir/tex/linebreak.h
@@ -27,7 +27,7 @@
extern halfword just_box; /* the |hlist_node| for the last line of the new paragraph */
-extern void line_break(boolean d, integer line_break_context);
+extern void line_break(boolean d, int line_break_context);
# define inf_bad 10000 /* infinitely bad value */
# define awful_bad 07777777777 /* more than a billion demerits */
diff --git a/source/texk/web2c/luatexdir/tex/mainbody.c b/source/texk/web2c/luatexdir/tex/mainbody.c
index ba0f3ec03bffc7350dfb9425343454d738ca4401..76ed57c0c6975ce482bc1cc9e2414a053dbd5a2f 100644
--- a/source/texk/web2c/luatexdir/tex/mainbody.c
+++ b/source/texk/web2c/luatexdir/tex/mainbody.c
@@ -181,7 +181,7 @@ This is the first of many sections of \TeX\ where global variables are
defined.
*/
-integer bad; /* is some ``constant'' wrong? */
+int bad; /* is some ``constant'' wrong? */
boolean luainit; /* are we using lua for initializations */
boolean tracefilenames; /* print file open-close info? */
@@ -196,35 +196,35 @@ production version, which cuts the initialization to a bare minimum.
boolean ini_version; /* are we \.{INITEX}? */
boolean dump_option; /* was the dump name option used? */
boolean dump_line; /* was a \.{\%\AM format} line seen? */
-integer bound_default; /* temporary for setup */
+int bound_default; /* temporary for setup */
char *bound_name; /* temporary for setup */
-integer error_line; /* width of context lines on terminal error messages */
-integer half_error_line; /* width of first lines of contexts in terminal
+int error_line; /* width of context lines on terminal error messages */
+int half_error_line; /* width of first lines of contexts in terminal
error messages; should be between 30 and |error_line-15| */
-integer max_print_line; /* width of longest text lines output; should be at least 60 */
-integer ocp_list_size;
-integer ocp_buf_size;
-integer ocp_stack_size;
-integer max_strings; /* maximum number of strings; must not exceed |max_halfword| */
-integer strings_free; /* strings available after format loaded */
-integer font_k; /* loop variable for initialization */
-integer buf_size; /* maximum number of characters simultaneously present in
+int max_print_line; /* width of longest text lines output; should be at least 60 */
+int ocp_list_size;
+int ocp_buf_size;
+int ocp_stack_size;
+int max_strings; /* maximum number of strings; must not exceed |max_halfword| */
+int strings_free; /* strings available after format loaded */
+int font_k; /* loop variable for initialization */
+int buf_size; /* maximum number of characters simultaneously present in
current lines of open files and in control sequences between
\.{\\csname} and \.{\\endcsname}; must not exceed |max_halfword| */
-integer stack_size; /* maximum number of simultaneous input sources */
-integer max_in_open; /* maximum number of input files and error insertions that
+int stack_size; /* maximum number of simultaneous input sources */
+int max_in_open; /* maximum number of input files and error insertions that
can be going on simultaneously */
-integer param_size; /* maximum number of simultaneous macro parameters */
-integer nest_size; /* maximum number of semantic levels simultaneously active */
-integer save_size; /* space for saving values outside of current group; must be
+int param_size; /* maximum number of simultaneous macro parameters */
+int nest_size; /* maximum number of semantic levels simultaneously active */
+int save_size; /* space for saving values outside of current group; must be
at most |max_halfword| */
-integer expand_depth; /* limits recursive calls of the |expand| procedure */
+int expand_depth; /* limits recursive calls of the |expand| procedure */
int parsefirstlinep; /* parse the first line for options */
int filelineerrorstylep; /* format messages as file:line:error */
int haltonerrorp; /* stop at first error */
boolean quoted_filename; /* current filename is quoted */
-integer get_luatexversion(void)
+int get_luatexversion(void)
{
return luatex_version;
}
@@ -234,7 +234,7 @@ str_number get_luatexrevision(void)
return luatex_revision;
}
-integer get_luatex_date_info(void)
+int get_luatex_date_info(void)
{
return luatex_date_info; /* todo, silly value */
}
@@ -317,8 +317,8 @@ int main_initialize(void)
save_stack = xmallocarray(save_record, save_size);
input_stack = xmallocarray(in_state_record, stack_size);
input_file = xmallocarray(alpha_file, max_in_open);
- input_file_callback_id = xmallocarray(integer, max_in_open);
- line_stack = xmallocarray(integer, max_in_open);
+ input_file_callback_id = xmallocarray(int, max_in_open);
+ line_stack = xmallocarray(int, max_in_open);
eof_seen = xmallocarray(boolean, max_in_open);
grp_stack = xmallocarray(save_pointer, max_in_open);
if_stack = xmallocarray(pointer, max_in_open);
@@ -486,8 +486,8 @@ This program doesn't bother to close the input files that may still be open.
void close_files_and_terminate()
{
- integer k; /* all-purpose index */
- integer callback_id;
+ int k; /* all-purpose index */
+ int callback_id;
PDF pdf = static_pdf;
callback_id = callback_defined(stop_run_callback);
/* Finish the extensions */
@@ -667,7 +667,7 @@ program below. (If |m=13|, there is an additional argument, |l|.)
#ifdef DEBUG
void debug_help(void)
{ /* routine to display various things */
- integer k;
+ int k;
int m = 0, n = 0, l = 0;
while (1) {
wake_up_terminal();
diff --git a/source/texk/web2c/luatexdir/tex/mainbody.h b/source/texk/web2c/luatexdir/tex/mainbody.h
index f78d4a87ab5b035fef124fe74736fdc18bfeb8db..eabe3a9bfd8424928c33c0e00db26852f3b393d7 100644
--- a/source/texk/web2c/luatexdir/tex/mainbody.h
+++ b/source/texk/web2c/luatexdir/tex/mainbody.h
@@ -86,11 +86,11 @@ typedef unsigned char eight_bits; /* unsigned one-byte quantity */
typedef FILE *alpha_file; /* files that contain textual data */
typedef FILE *byte_file; /* files that contain binary data */
-typedef integer str_number;
-typedef integer pool_pointer;
+typedef int str_number;
+typedef int pool_pointer;
typedef unsigned char packed_ASCII_code;
-typedef integer scaled; /* this type is used for scaled integers */
+typedef int scaled; /* this type is used for scaled integers */
typedef char small_number; /* this type is self-explanatory */
typedef float glue_ratio; /* one-word representation of a glue expansion factor */
@@ -103,9 +103,9 @@ typedef unsigned char glue_ord; /* infinity to the 0, 1, 2, 3, or 4 power */
typedef unsigned char group_code; /* |save_level| for a level boundary */
typedef int internal_font_number; /* |font| in a |char_node| */
-typedef integer font_index; /* index into |font_info| */
+typedef int font_index; /* index into |font_info| */
-typedef integer save_pointer;
+typedef int save_pointer;
/*
Characters of text that have been converted to \TeX's internal form
@@ -122,7 +122,7 @@ names in this program because they are used with a special meaning.
# define carriage_return '\r' /* ASCII code used at end of line */
/* Global variables */
-extern integer bad; /* is some ``constant'' wrong? */
+extern int bad; /* is some ``constant'' wrong? */
extern boolean luainit; /* are we using lua for initializations */
extern boolean tracefilenames; /* print file open-close info? */
@@ -130,24 +130,24 @@ extern boolean tracefilenames; /* print file open-close info? */
extern boolean ini_version; /* are we \.{INITEX}? */
extern boolean dump_option;
extern boolean dump_line;
-extern integer bound_default;
+extern int bound_default;
extern char *bound_name;
-extern integer error_line;
-extern integer half_error_line;
-extern integer max_print_line;
-extern integer ocp_list_size;
-extern integer ocp_buf_size;
-extern integer ocp_stack_size;
-extern integer max_strings;
-extern integer strings_free;
-extern integer font_k;
-extern integer buf_size;
-extern integer stack_size;
-extern integer max_in_open;
-extern integer param_size;
-extern integer nest_size;
-extern integer save_size;
-extern integer expand_depth;
+extern int error_line;
+extern int half_error_line;
+extern int max_print_line;
+extern int ocp_list_size;
+extern int ocp_buf_size;
+extern int ocp_stack_size;
+extern int max_strings;
+extern int strings_free;
+extern int font_k;
+extern int buf_size;
+extern int stack_size;
+extern int max_in_open;
+extern int param_size;
+extern int nest_size;
+extern int save_size;
+extern int expand_depth;
extern int parsefirstlinep;
extern int filelineerrorstylep;
extern int haltonerrorp;
@@ -230,9 +230,9 @@ is conditionally compiled in the C code.
# define fix_date_and_time() dateandtime(int_par(time_code),int_par(day_code),int_par(month_code),int_par(year_code))
-extern integer get_luatexversion(void);
+extern int get_luatexversion(void);
extern str_number get_luatexrevision(void);
-extern integer get_luatex_date_info(void);
+extern int get_luatex_date_info(void);
extern int ready_already;
diff --git a/source/texk/web2c/luatexdir/tex/maincontrol.c b/source/texk/web2c/luatexdir/tex/maincontrol.c
index 69824f483ab08b19d1133e32ff65a6a6d5c30ede..07cfd80b0a9192e6931ea8d50b0e23f00b203515 100644
--- a/source/texk/web2c/luatexdir/tex/maincontrol.c
+++ b/source/texk/web2c/luatexdir/tex/maincontrol.c
@@ -192,9 +192,9 @@ mode by mistake. \TeX\ will insert a dollar sign and rescan the current token.
void main_control(void)
{ /* governs \TeX's activities */
- integer t; /* general-purpose temporary variable */
+ int t; /* general-purpose temporary variable */
halfword p; /* for whatsit nodes and testing whether an auto kern should be inserted */
- integer chr_stack; /* to temporarily save an |cur_chr| to be appended */
+ int chr_stack; /* to temporarily save an |cur_chr| to be appended */
mathcodeval mval; /* to build up an argument to |set_math_char| */
t = 0; /* for -Wall */
chr_stack = -1;
@@ -1120,7 +1120,7 @@ void handle_right_brace(void)
{
halfword p, q; /* for short-term use */
scaled d; /* holds |split_max_depth| in |insert_group| */
- integer f; /* holds |floating_penalty| in |insert_group| */
+ int f; /* holds |floating_penalty| in |insert_group| */
p = null;
switch (cur_group) {
case simple_group:
@@ -1281,7 +1281,7 @@ The |box_end| procedure does the right thing with |cur_box|, if
|box_context| represents the context as explained above.
*/
-void box_end(integer box_context)
+void box_end(int box_context)
{
if (box_context < box_flag) {
/* Append box |cur_box| to the current list, shifted by |box_context| */
@@ -1355,7 +1355,7 @@ void box_end(integer box_context)
}
/* the next input should specify a box or perhaps a rule */
-void scan_box(integer box_context)
+void scan_box(int box_context)
{
/* Get the next non-blank non-relax... */
do {
@@ -1461,7 +1461,7 @@ pretty heavy memory leaks. This means the current code is probably
wrong in some way that relates to in-paragraph displays.
*/
-void end_graf(integer line_break_context)
+void end_graf(int line_break_context)
{
if (mode == hmode) {
if ((head == tail) || (vlink(head) == tail)) {
@@ -1670,7 +1670,7 @@ void append_italic_correction(void)
}
-void append_local_box(integer kind)
+void append_local_box(int kind)
{
incr(save_ptr);
set_saved_record(-1, saved_boxtype, 0, kind);
@@ -1691,7 +1691,7 @@ but it starts out as 1000 in the subsidiary lists.
void append_discretionary(void)
{
- integer c;
+ int c;
tail_append(new_disc());
subtype(tail) = cur_chr;
if (cur_chr == explicit_disc) {
@@ -1725,7 +1725,7 @@ void append_discretionary(void)
void build_local_box(void)
{
halfword p;
- integer kind;
+ int kind;
unsave();
assert(saved_type(-1) == saved_boxtype);
kind = saved_value(-1);
@@ -1755,7 +1755,7 @@ hboxes. A~subroutine called |build_discretionary| handles the transitions.
void build_discretionary(void)
{
halfword p, q; /* for link manipulation */
- integer n; /* length of discretionary list */
+ int n; /* length of discretionary list */
unsave();
/* Prune the current list, if necessary, until it contains only
|char_node|, |kern_node|, |hlist_node|, |vlist_node| and
@@ -2064,7 +2064,7 @@ void prefixed_command(void)
internal_font_number f; /* identifies a font */
halfword j; /* index into a \.{\\parshape} specification */
halfword p, q; /* for temporary short-term use */
- integer n; /* ditto */
+ int n; /* ditto */
boolean e; /* should a definition be expanded? or was \.{\\let} not done? */
mathcodeval mval; /* for handling of \.{\\mathchardef}s */
a = 0;
@@ -2690,9 +2690,9 @@ void prefixed_command(void)
void fixup_directions(void)
{
- integer temp_no_whatsits;
- integer temp_no_dirs;
- integer temporary_dir;
+ int temp_no_whatsits;
+ int temp_no_dirs;
+ int temporary_dir;
temp_no_whatsits = no_local_whatsits;
temp_no_dirs = no_local_dirs;
temporary_dir = text_direction;
@@ -2747,7 +2747,7 @@ void get_r_token(void)
}
}
-void assign_internal_value(int a, halfword p, integer cur_val)
+void assign_internal_value(int a, halfword p, int cur_val)
{
halfword n;
if ((p >= int_base) && (p < attribute_base)) {
@@ -2875,7 +2875,7 @@ void trap_zero_glue(void)
void do_register_command(int a)
{
halfword l, q, r, s; /* for list manipulation */
- integer p; /* type of register involved */
+ int p; /* type of register involved */
q = cur_cmd;
/* Compute the register location |l| and its type |p|; but |return| if invalid */
/* Here we use the fact that the consecutive codes |int_val..mu_val| and
@@ -3092,7 +3092,7 @@ void alter_integer(void)
void alter_box_dimen(void)
{
int c; /* |width_offset| or |height_offset| or |depth_offset| */
- integer b; /* box number */
+ int b; /* box number */
c = cur_chr;
scan_register_num();
b = cur_val;
@@ -3193,7 +3193,7 @@ void issue_message(void)
s = make_string();
if (c == 0) {
/* Print string |s| on the terminal */
- if (term_offset + (int)str_length(s) > max_print_line - 2)
+ if (term_offset + (int) str_length(s) > max_print_line - 2)
print_ln();
else if ((term_offset > 0) || (file_offset > 0))
print_char(' ');
@@ -3292,8 +3292,8 @@ void show_whatever(void)
halfword p; /* tail of a token list to show */
int t; /* type of conditional being shown */
int m; /* upper bound on |fi_or_else| codes */
- integer l; /* line where that conditional began */
- integer n; /* level of \.{\\if...\\fi} nesting */
+ int l; /* line where that conditional began */
+ int n; /* level of \.{\\if...\\fi} nesting */
switch (cur_chr) {
case show_lists:
begin_diagnostic();
@@ -3408,7 +3408,7 @@ void show_whatever(void)
void initialize(void)
{ /* this procedure gets things started properly */
- integer k; /* index into |mem|, |eqtb|, etc. */
+ int k; /* index into |mem|, |eqtb|, etc. */
/* Initialize whatever \TeX\ might access */
/* Set initial values of key variables */
initialize_errors();
diff --git a/source/texk/web2c/luatexdir/tex/maincontrol.h b/source/texk/web2c/luatexdir/tex/maincontrol.h
index bc30843a4ddd96b37909b41123607cbfde281f2a..7b1534315e38034d52de1a3a5c09f3b54d34be72 100644
--- a/source/texk/web2c/luatexdir/tex/maincontrol.h
+++ b/source/texk/web2c/luatexdir/tex/maincontrol.h
@@ -127,19 +127,19 @@ extern void off_save(void);
extern void handle_right_brace(void);
extern void extra_right_brace(void);
extern void normal_paragraph(void);
-extern void box_end(integer box_context);
-extern void scan_box(integer box_context);
+extern void box_end(int box_context);
+extern void scan_box(int box_context);
extern void new_graf(boolean indented);
extern void indent_in_hmode(void);
extern void head_for_vmode(void);
-extern void end_graf(integer);
+extern void end_graf(int);
extern void begin_insert_or_adjust(void);
extern void handle_mark(void);
extern void append_penalty(void);
extern void delete_last(void);
extern void unpackage(void);
extern void append_italic_correction(void);
-extern void append_local_box(integer kind);
+extern void append_local_box(int kind);
extern void append_discretionary(void);
extern void build_local_box(void);
extern void build_discretionary(void);
@@ -172,7 +172,7 @@ extern void fixup_directions(void);
}
extern void get_r_token(void);
-extern void assign_internal_value(int a, halfword p, integer cur_val);
+extern void assign_internal_value(int a, halfword p, int cur_val);
extern void trap_zero_glue(void);
extern void do_register_command(int a);
extern void alter_aux(void);
diff --git a/source/texk/web2c/luatexdir/tex/mathcodes.c b/source/texk/web2c/luatexdir/tex/mathcodes.c
index bb836ae820471eb2647b9a40503a58c13c2f43b6..2bda3ffe032f07ea2d4e2b3caa737bb0af797dd4 100644
--- a/source/texk/web2c/luatexdir/tex/mathcodes.c
+++ b/source/texk/web2c/luatexdir/tex/mathcodes.c
@@ -22,7 +22,7 @@
-extern void rawset_sa_item(sa_tree head, integer n, integer v);
+extern void rawset_sa_item(sa_tree head, int n, int v);
static const char __svn_version[] =
"$Id$ $URL$";
@@ -34,8 +34,8 @@ static sa_tree mathcode_head = NULL;
#define MATHCODEHEAP 8
static mathcodeval *mathcode_heap = NULL;
-static integer mathcode_heapsize = MATHCODEHEAP;
-static integer mathcode_heapptr = 0;
+static int mathcode_heapsize = MATHCODEHEAP;
+static int mathcode_heapptr = 0;
/* the 0xFFFFFFFF is a flag value */
#define MATHCODESTACK 8
@@ -48,8 +48,8 @@ static sa_tree delcode_head = NULL;
#define DELCODEHEAP 8
static delcodeval *delcode_heap = NULL;
-static integer delcode_heapsize = DELCODEHEAP;
-static integer delcode_heapptr = 0;
+static int delcode_heapsize = DELCODEHEAP;
+static int delcode_heapptr = 0;
#define DELCODESTACK 4
#define DELCODEDEFAULT 0xFFFFFFFF
@@ -105,7 +105,7 @@ void show_mathcode_value(mathcodeval c)
}
-void show_mathcode(integer n)
+void show_mathcode(int n)
{
mathcodeval c = get_math_code(n);
if (c.origin_value == aleph_mathcode) {
@@ -129,7 +129,7 @@ void unsavemathcode(quarterword gl)
return;
while (mathcode_head->stack_ptr > 0 &&
abs(mathcode_head->stack[mathcode_head->stack_ptr].level)
- >= (integer) gl) {
+ >= (int) gl) {
st = mathcode_head->stack[mathcode_head->stack_ptr];
if (st.level > 0) {
rawset_sa_item(mathcode_head, st.code, st.value);
@@ -148,10 +148,10 @@ void unsavemathcode(quarterword gl)
}
}
-void set_math_code(integer n,
- integer commandorigin,
- integer mathclass,
- integer mathfamily, integer mathcharacter, quarterword level)
+void set_math_code(int n,
+ int commandorigin,
+ int mathclass,
+ int mathfamily, int mathcharacter, quarterword level)
{
mathcodeval d;
d.origin_value = commandorigin;
@@ -177,7 +177,7 @@ void set_math_code(integer n,
}
}
-mathcodeval get_math_code(integer n)
+mathcodeval get_math_code(int n)
{
unsigned int ret;
ret = get_sa_item(mathcode_head, n);
@@ -195,7 +195,7 @@ mathcodeval get_math_code(integer n)
}
-integer get_math_code_num(integer n)
+int get_math_code_num(int n)
{
mathcodeval mval;
mval = get_math_code(n);
@@ -221,7 +221,7 @@ void initializemathcode(void)
void dumpmathcode(void)
{
- integer k;
+ int k;
mathcodeval d;
dump_sa_tree(mathcode_head);
dump_int(mathcode_heapsize);
@@ -237,7 +237,7 @@ void dumpmathcode(void)
void undumpmathcode(void)
{
- integer k, x;
+ int k, x;
mathcodeval d;
mathcode_head = undump_sa_tree();
undump_int(mathcode_heapsize);
@@ -264,7 +264,7 @@ void undumpmathcode(void)
}
-void show_delcode(integer n)
+void show_delcode(int n)
{
delcodeval c;
c = get_del_code(n);
@@ -319,7 +319,7 @@ void unsavedelcode(quarterword gl)
return;
while (delcode_head->stack_ptr > 0 &&
abs(delcode_head->stack[delcode_head->stack_ptr].level)
- >= (integer) gl) {
+ >= (int) gl) {
st = delcode_head->stack[delcode_head->stack_ptr];
if (st.level > 0) {
rawset_sa_item(delcode_head, st.code, st.value);
@@ -339,11 +339,11 @@ void unsavedelcode(quarterword gl)
}
-void set_del_code(integer n,
- integer commandorigin,
- integer smathfamily,
- integer smathcharacter,
- integer lmathfamily, integer lmathcharacter, quarterword gl)
+void set_del_code(int n,
+ int commandorigin,
+ int smathfamily,
+ int smathcharacter,
+ int lmathfamily, int lmathcharacter, quarterword gl)
{
delcodeval d;
d.class_value = 0;
@@ -371,7 +371,7 @@ void set_del_code(integer n,
delcode_heapptr++;
}
-delcodeval get_del_code(integer n)
+delcodeval get_del_code(int n)
{
unsigned ret;
ret = get_sa_item(delcode_head, n);
@@ -390,7 +390,7 @@ delcodeval get_del_code(integer n)
}
/* this really only works for old-style delcodes! */
-integer get_del_code_num(integer n)
+int get_del_code_num(int n)
{
unsigned ret;
ret = get_sa_item(delcode_head, n);
@@ -417,7 +417,7 @@ void initializedelcode(void)
void dumpdelcode(void)
{
- integer k;
+ int k;
delcodeval d;
dump_sa_tree(delcode_head);
dump_int(delcode_heapsize);
@@ -435,7 +435,7 @@ void dumpdelcode(void)
void undumpdelcode(void)
{
- integer k;
+ int k;
delcodeval d;
delcode_head = undump_sa_tree();
undump_int(delcode_heapsize);
diff --git a/source/texk/web2c/luatexdir/tex/mathcodes.h b/source/texk/web2c/luatexdir/tex/mathcodes.h
index db36d7a6d9d663a685396c6fb83ac79cc8713c60..145a3f9e6912fa458248931f2b6a4c060f076618 100644
--- a/source/texk/web2c/luatexdir/tex/mathcodes.h
+++ b/source/texk/web2c/luatexdir/tex/mathcodes.h
@@ -31,42 +31,42 @@
# define xetexnum_mathcode 22
typedef struct mathcodeval {
- integer class_value;
- integer origin_value;
- integer family_value;
- integer character_value;
+ int class_value;
+ int origin_value;
+ int family_value;
+ int character_value;
} mathcodeval;
-void set_math_code(integer n,
- integer commandorigin,
- integer mathclass,
- integer mathfamily, integer mathcharacter, quarterword gl);
+void set_math_code(int n,
+ int commandorigin,
+ int mathclass,
+ int mathfamily, int mathcharacter, quarterword gl);
-mathcodeval get_math_code(integer n);
-integer get_math_code_num(integer n);
-integer get_del_code_num(integer n);
+mathcodeval get_math_code(int n);
+int get_math_code_num(int n);
+int get_del_code_num(int n);
mathcodeval scan_mathchar(int extcode);
mathcodeval scan_delimiter_as_mathchar(int extcode);
-mathcodeval mathchar_from_integer(integer value, int extcode);
+mathcodeval mathchar_from_integer(int value, int extcode);
void show_mathcode_value(mathcodeval d);
typedef struct delcodeval {
- integer class_value;
- integer origin_value;
- integer small_family_value;
- integer small_character_value;
- integer large_family_value;
- integer large_character_value;
+ int class_value;
+ int origin_value;
+ int small_family_value;
+ int small_character_value;
+ int large_family_value;
+ int large_character_value;
} delcodeval;
-void set_del_code(integer n,
- integer commandorigin,
- integer smathfamily,
- integer smathcharacter,
- integer lmathfamily, integer lmathcharacter, quarterword gl);
+void set_del_code(int n,
+ int commandorigin,
+ int smathfamily,
+ int smathcharacter,
+ int lmathfamily, int lmathcharacter, quarterword gl);
-delcodeval get_del_code(integer n);
+delcodeval get_del_code(int n);
void unsave_math_codes(quarterword grouplevel);
void initialize_math_codes(void);
diff --git a/source/texk/web2c/luatexdir/tex/memoryword.h b/source/texk/web2c/luatexdir/tex/memoryword.h
index 870192c4854e85d5eaedc6a03170c7f31299ae3d..c366a2fc6bb12603c1e0f9000b1ca00744d4f20e 100644
--- a/source/texk/web2c/luatexdir/tex/memoryword.h
+++ b/source/texk/web2c/luatexdir/tex/memoryword.h
@@ -83,9 +83,9 @@ typedef struct {
typedef struct {
# ifdef WORDS_BIGENDIAN
- integer CINT0, CINT1;
+ int CINT0, CINT1;
# else
- integer CINT1, CINT0;
+ int CINT1, CINT0;
# endif
} two_ints;
diff --git a/source/texk/web2c/luatexdir/tex/mlist.c b/source/texk/web2c/luatexdir/tex/mlist.c
index 5d4c58a2698f3baa21fcd8d804cb9c6e0b3cfbd1..3c4f27f9511679a351c2ab5a04bc68f2f1d5f758 100644
--- a/source/texk/web2c/luatexdir/tex/mlist.c
+++ b/source/texk/web2c/luatexdir/tex/mlist.c
@@ -178,7 +178,7 @@ void math_param_error(char *param, int style)
}
-static scaled accent_base_height(integer f)
+static scaled accent_base_height(int f)
{
scaled a;
a = x_height(f);
@@ -680,8 +680,7 @@ boolean check_necessary_fonts(void)
return false; /* temp */
}
-void fixup_math_parameters(integer fam_id, integer size_id, integer f,
- integer lvl)
+void fixup_math_parameters(int fam_id, int size_id, int f, int lvl)
{
if (is_new_mathfont(f)) { /* fix all known parameters */
@@ -919,10 +918,12 @@ void fixup_math_parameters(integer fam_id, integer size_id, integer f,
FractionDenominatorDisplayStyleShiftDown),
lvl);
- DEFINE_MATH_PARAMETERS(math_param_fraction_del_size, size_id,
+ DEFINE_MATH_PARAMETERS(math_param_fraction_del_size, size_id,
font_MATH_par(f, FractionDelimiterSize), lvl);
- DEFINE_DMATH_PARAMETERS(math_param_fraction_del_size, size_id,
- font_MATH_par(f, FractionDelimiterDisplayStyleSize), lvl);
+ DEFINE_DMATH_PARAMETERS(math_param_fraction_del_size, size_id,
+ font_MATH_par(f,
+ FractionDelimiterDisplayStyleSize),
+ lvl);
DEFINE_MATH_PARAMETERS(math_param_space_after_script, size_id,
font_MATH_par(f, SpaceAfterScript), lvl);
@@ -1177,7 +1178,7 @@ void fixup_math_parameters(integer fam_id, integer size_id, integer f,
/* this needs to be called just at the start of |mlist_to_hlist| */
void finalize_math_parameters(void)
{
- integer saved_trace = int_par(tracing_assigns_code);
+ int saved_trace = int_par(tracing_assigns_code);
int_par(tracing_assigns_code) = 0;
if (get_math_param(math_param_space_after_script, display_style) ==
undefined_math_parameter) {
@@ -1215,7 +1216,7 @@ larger as the type gets smaller.)
*/
-char *math_size_string(integer s)
+char *math_size_string(int s)
{
if (s == text_size)
return "textfont";
@@ -1309,7 +1310,7 @@ pointer overbar(pointer b, scaled k, scaled t, scaled ht, pointer att)
may deliver a slightly different result than |hpack| would produce.
*/
-static pointer char_box(internal_font_number f, integer c, pointer bb)
+static pointer char_box(internal_font_number f, int c, pointer bb)
{
pointer b, p; /* the new box and its character node */
b = new_null_box();
@@ -1328,7 +1329,7 @@ static pointer char_box(internal_font_number f, integer c, pointer bb)
a given character:
*/
-scaled height_plus_depth(internal_font_number f, integer c)
+scaled height_plus_depth(internal_font_number f, int c)
{
return (char_height(f, c) + char_depth(f, c));
}
@@ -1340,7 +1341,7 @@ scaled height_plus_depth(internal_font_number f, integer c)
of the characters already in box |b|:
*/
-scaled stack_into_box(pointer b, internal_font_number f, integer c)
+scaled stack_into_box(pointer b, internal_font_number f, int c)
{
pointer p; /* new node placed into |b| */
p = char_box(f, c, node_attr(b));
@@ -1351,7 +1352,7 @@ scaled stack_into_box(pointer b, internal_font_number f, integer c)
}
-scaled stack_into_hbox(pointer b, internal_font_number f, integer c)
+scaled stack_into_hbox(pointer b, internal_font_number f, int c)
{
pointer p, q; /* new node placed into |b| */
p = char_box(f, c, node_attr(b));
@@ -1409,8 +1410,8 @@ pointer get_delim_box(extinfo * ext, internal_font_number f, scaled v,
scaled b_max; /* natural (maximum) height of the stack */
scaled s_max; /* amount of possible shrink in the stack */
scaled a, wd, ht, dp, last_ht;
- integer cc; /* a temporary character code for extensibles */
- integer i; /* a temporary counter number of extensible pieces */
+ int cc; /* a temporary character code for extensibles */
+ int i; /* a temporary counter number of extensible pieces */
int with_extenders;
int num_extenders, num_normal, num_total;
scaled c, d, u;
@@ -1759,7 +1760,7 @@ pointer get_delim_hbox(extinfo * ext, internal_font_number f, scaled v,
will be the height of its topmost component.
*/
-static void endless_loop_error(internal_font_number g, integer y)
+static void endless_loop_error(internal_font_number g, int y)
{
char s[256];
char *hlp[] = {
@@ -1773,15 +1774,15 @@ static void endless_loop_error(internal_font_number g, integer y)
tex_error(s, hlp);
}
-static pointer var_delimiter(pointer d, integer s, scaled v, scaled *ic)
+static pointer var_delimiter(pointer d, int s, scaled v, scaled * ic)
{
/* label found,continue; */
pointer b; /* the box that will be constructed */
internal_font_number f, g; /* best-so-far and tentative font codes */
- integer c, i, x, y; /* best-so-far and tentative character codes */
+ int c, i, x, y; /* best-so-far and tentative character codes */
scaled u; /* height-plus-depth of a tentative character */
scaled w; /* largest height-plus-depth so far */
- integer z; /* runs through font family members */
+ int z; /* runs through font family members */
boolean large_attempt; /* are we trying the ``large'' variant? */
pointer att; /* to save the current attribute list */
extinfo *ext;
@@ -1855,13 +1856,13 @@ static pointer var_delimiter(pointer d, integer s, scaled v, scaled *ic)
} else {
b = char_box(f, c, att);
}
- if (ic!=NULL)
+ if (ic != NULL)
*ic = char_italic(f, c);
} else {
b = new_null_box();
reset_attributes(b, att);
width(b) = null_delimiter_space; /* use this width if no delimiter was found */
- if (ic!=NULL)
+ if (ic != NULL)
*ic = 0;
}
shift_amount(b) = half(height(b) - depth(b)) - math_axis(s);
@@ -1869,15 +1870,15 @@ static pointer var_delimiter(pointer d, integer s, scaled v, scaled *ic)
return b;
}
-pointer flat_var_delimiter(pointer d, integer s, scaled v)
+pointer flat_var_delimiter(pointer d, int s, scaled v)
{
/* label found,continue; */
pointer b; /* the box that will be constructed */
internal_font_number f, g; /* best-so-far and tentative font codes */
- integer c, i, x, y; /* best-so-far and tentative character codes */
+ int c, i, x, y; /* best-so-far and tentative character codes */
scaled u; /* height-plus-depth of a tentative character */
scaled w; /* largest height-plus-depth so far */
- integer z; /* runs through font family members */
+ int z; /* runs through font family members */
boolean large_attempt; /* are we trying the ``large'' variant? */
pointer att; /* to save the current attribute list */
extinfo *ext;
@@ -2031,7 +2032,7 @@ one that is expressed in `\.{mu}', given the value of the math unit.
pointer math_glue(pointer g, scaled m)
{
pointer p; /* the new glue specification */
- integer n; /* integer part of |m| */
+ int n; /* integer part of |m| */
scaled f; /* fraction part of |m| */
n = x_over_n(m, unity);
f = tex_remainder;
@@ -2061,7 +2062,7 @@ the value of the math unit.
void math_kern(pointer p, scaled m)
{
- integer n; /* integer part of |m| */
+ int n; /* integer part of |m| */
scaled f; /* fraction part of |m| */
if (subtype(p) == mu_glue) {
n = x_over_n(m, unity);
@@ -2093,12 +2094,12 @@ that stresses compactness over efficiency.
*/
pointer cur_mlist; /* beginning of mlist to be translated */
-integer cur_style; /* style code at current place in the list */
-integer cur_size; /* size code corresponding to |cur_style| */
+int cur_style; /* style code at current place in the list */
+int cur_size; /* size code corresponding to |cur_style| */
scaled cur_mu; /* the math unit width corresponding to |cur_size| */
boolean mlist_penalties; /* should |mlist_to_hlist| insert penalties? */
-void run_mlist_to_hlist(halfword p, integer mstyle, boolean penalties)
+void run_mlist_to_hlist(halfword p, int mstyle, boolean penalties)
{
int callback_id;
int a, sfix;
@@ -2150,10 +2151,10 @@ The box returned by |clean_box| is ``clean'' in the
sense that its |shift_amount| is zero.
*/
-pointer clean_box(pointer p, integer s)
+pointer clean_box(pointer p, int s)
{
pointer q; /* beginning of a list to be boxed */
- integer save_style; /* |cur_style| to be restored */
+ int save_style; /* |cur_style| to be restored */
pointer x; /* box to be returned */
pointer r; /* temporary pointer */
switch (type(p)) {
@@ -2220,7 +2221,7 @@ after |fetch| has acted, and the field will also have been reset to |null|.
/* The outputs of |fetch| are placed in global variables. */
internal_font_number cur_f; /* the |font| field of a |math_char| */
-integer cur_c; /* the |character| field of a |math_char| */
+int cur_c; /* the |character| field of a |math_char| */
void fetch(pointer a)
{ /* unpack the |math_char| field |a| */
@@ -2546,7 +2547,7 @@ respect to the size of the final box.
#define TOP_CODE 1
#define BOT_CODE 2
-void do_make_math_accent(pointer q, internal_font_number f, integer c,
+void do_make_math_accent(pointer q, internal_font_number f, int c,
int top_or_bot)
{
pointer p, r, x, y; /* temporary registers for box construction */
@@ -2599,7 +2600,7 @@ void do_make_math_accent(pointer q, internal_font_number f, integer c,
} else if (char_tag(f, c) != list_tag) {
break;
} else {
- integer yy = char_remainder(f, c);
+ int yy = char_remainder(f, c);
if (!char_exists(f, yy))
break;
if (char_width(f, yy) > w)
@@ -2813,7 +2814,7 @@ scaled make_op(pointer q)
{
scaled delta; /* offset between subscript and superscript */
pointer p, v, x, y, z; /* temporary registers for box construction */
- integer c; /* register for character examination */
+ int c; /* register for character examination */
scaled shift_up, shift_down; /* dimensions for box calculation */
scaled ok_size;
if ((subtype(q) == op_noad_type_normal) && (cur_style < text_style))
@@ -2958,7 +2959,7 @@ No boundary characters enter into these ligatures.
void make_ord(pointer q)
{
- integer a; /* the left-side character for lig/kern testing */
+ int a; /* the left-side character for lig/kern testing */
pointer p, r, s; /* temporary registers for list manipulation */
scaled k; /* a kern */
liginfo lig; /* a ligature */
@@ -3066,7 +3067,7 @@ void make_ord(pointer q)
actual images say
*/
-scaled math_kern_at(internal_font_number f, integer c, int side, int v)
+scaled math_kern_at(internal_font_number f, int c, int side, int v)
{
int h, k, numkerns;
scaled *kerns_heights;
@@ -3111,8 +3112,8 @@ scaled math_kern_at(internal_font_number f, integer c, int side, int v)
scaled
-find_math_kern(internal_font_number l_f, integer l_c,
- internal_font_number r_f, integer r_c, int cmd, scaled shift)
+find_math_kern(internal_font_number l_f, int l_c,
+ internal_font_number r_f, int r_c, int cmd, scaled shift)
{
scaled corr_height_top = 0, corr_height_bot = 0;
scaled krn_l = 0, krn_r = 0, krn = 0;
@@ -3415,8 +3416,7 @@ the required size and returns the value |open_noad| or |close_noad|. The
so they will have consistent sizes.
*/
-small_number make_left_right(pointer q, integer style, scaled max_d,
- scaled max_hv)
+small_number make_left_right(pointer q, int style, scaled max_d, scaled max_hv)
{
scaled delta, delta1, delta2; /* dimensions used in the calculation */
pointer tmp;
@@ -3650,17 +3650,17 @@ void mlist_to_hlist(void)
{
pointer mlist; /* beginning of the given list */
boolean penalties; /* should penalty nodes be inserted? */
- integer style; /* the given style */
- integer save_style; /* holds |cur_style| during recursion */
+ int style; /* the given style */
+ int save_style; /* holds |cur_style| during recursion */
pointer q; /* runs through the mlist */
pointer r; /* the most recent noad preceding |q| */
- integer r_type; /* the |type| of noad |r|, or |op_noad| if |r=null| */
- integer r_subtype; /* the |subtype| of noad |r| if |r_type| is |fence_noad| */
- integer t; /* the effective |type| of noad |q| during the second pass */
- integer t_subtype; /* the effective |subtype| of noad |q| during the second pass */
+ int r_type; /* the |type| of noad |r|, or |op_noad| if |r=null| */
+ int r_subtype; /* the |subtype| of noad |r| if |r_type| is |fence_noad| */
+ int t; /* the effective |type| of noad |q| during the second pass */
+ int t_subtype; /* the effective |subtype| of noad |q| during the second pass */
pointer p, x, y, z; /* temporary registers for list construction */
- integer pen; /* a penalty to be inserted */
- integer s; /* the size of a noad to be deleted */
+ int pen; /* a penalty to be inserted */
+ int s; /* the size of a noad to be deleted */
scaled max_hl, max_d; /* maximum height and depth of the list translated so far */
scaled delta; /* italic correction offset for subscript and superscript */
mlist = cur_mlist;
diff --git a/source/texk/web2c/luatexdir/tex/mlist.h b/source/texk/web2c/luatexdir/tex/mlist.h
index 44307e31439d15bd44ed1c0d7e95db44c9b02928..24095b80dbdd79afc4aa6ec6d61617a9dbb5d21b 100644
--- a/source/texk/web2c/luatexdir/tex/mlist.h
+++ b/source/texk/web2c/luatexdir/tex/mlist.h
@@ -24,13 +24,12 @@
# define MLIST_H 1
extern pointer cur_mlist;
-extern integer cur_style;
+extern int cur_style;
extern boolean mlist_penalties;
-extern integer cur_size;
+extern int cur_size;
-void run_mlist_to_hlist(halfword, integer, boolean);
-void fixup_math_parameters(integer fam_id, integer size_id, integer f,
- integer lvl);
+void run_mlist_to_hlist(halfword, int, boolean);
+void fixup_math_parameters(int fam_id, int size_id, int f, int lvl);
scaled get_math_quad(int a);
diff --git a/source/texk/web2c/luatexdir/tex/nesting.c b/source/texk/web2c/luatexdir/tex/nesting.c
index 736d783723f5022d0feba46a14fc448eb192ce48..181bb71290d73565876aeae6d764fda0dcc36cd6 100644
--- a/source/texk/web2c/luatexdir/tex/nesting.c
+++ b/source/texk/web2c/luatexdir/tex/nesting.c
@@ -64,7 +64,7 @@ do by computing the value |abs(mode)+cur_cmd|, where |mode| is the current
mode and |cur_cmd| is the current command code.
*/
-void print_mode(integer m)
+void print_mode(int m)
{ /* prints the mode represented by |m| */
if (m > 0) {
switch (m / (max_command_cmd + 1)) {
@@ -101,7 +101,7 @@ void print_mode(integer m)
}
}
-void print_in_mode(integer m)
+void print_in_mode(int m)
{ /* prints the mode represented by |m| */
if (m > 0) {
switch (m / (max_command_cmd + 1)) {
@@ -138,9 +138,9 @@ void print_in_mode(integer m)
}
}
-integer get_mode_id(void)
+int get_mode_id(void)
{ /* returns the mode represented by |m| */
- integer m = cur_list.mode_field;
+ int m = cur_list.mode_field;
if (m > 0) {
switch (m / (max_command_cmd + 1)) {
case 0:
@@ -250,7 +250,7 @@ list_state_record *nest;
int nest_ptr; /* first unused location of |nest| */
int max_nest_stack; /* maximum of |nest_ptr| when pushing */
list_state_record cur_list; /* the ``top'' semantic state */
-integer shown_mode; /* most recent mode shown by \.{\\tracingcommands} */
+int shown_mode; /* most recent mode shown by \.{\\tracingcommands} */
halfword save_tail; /* save |tail| so we can examine whether we have an auto
kern before a glue */
@@ -356,10 +356,10 @@ void pop_nest(void)
void show_activities(void)
{
int p; /* index into |nest| */
- integer m; /* mode */
+ int m; /* mode */
memory_word a; /* auxiliary */
halfword q, r; /* for showing the current page */
- integer t; /* ditto */
+ int t; /* ditto */
nest[nest_ptr] = cur_list; /* put the top level into the array */
tprint_nl("");
print_ln();
diff --git a/source/texk/web2c/luatexdir/tex/nesting.h b/source/texk/web2c/luatexdir/tex/nesting.h
index af3c0acbe0ab27774aba36a8612ab512627d950c..5a1d5124bbc82cdbb38c6e8759f0dfa1ae941409 100644
--- a/source/texk/web2c/luatexdir/tex/nesting.h
+++ b/source/texk/web2c/luatexdir/tex/nesting.h
@@ -28,30 +28,30 @@
# define mmode (hmode+max_command_cmd+1)
/* math mode */
-extern void print_mode(integer m);
-extern void print_in_mode(integer m);
-extern integer get_mode_id(void);
+extern void print_mode(int m);
+extern void print_in_mode(int m);
+extern int get_mode_id(void);
# define ignore_depth -65536000 /* magic dimension value to mean `ignore me' */
typedef struct list_state_record_ {
- integer mode_field;
+ int mode_field;
halfword head_field;
halfword tail_field;
halfword eTeX_aux_field;
- integer pg_field;
- integer ml_field;
+ int pg_field;
+ int ml_field;
memory_word aux_field;
halfword dirs_field;
- integer math_field;
- integer math_style_field;
+ int math_field;
+ int math_style_field;
} list_state_record;
extern list_state_record *nest;
extern int nest_ptr;
extern int max_nest_stack;
extern list_state_record cur_list;
-extern integer shown_mode;
+extern int shown_mode;
extern halfword save_tail;
extern void push_nest(void);
diff --git a/source/texk/web2c/luatexdir/tex/packaging.c b/source/texk/web2c/luatexdir/tex/packaging.c
index 9c57466477d8f13e02d26e51d2f1d255255eb973..438db7bccf8f9c06c101d84647b938f4f80d7ccb 100644
--- a/source/texk/web2c/luatexdir/tex/packaging.c
+++ b/source/texk/web2c/luatexdir/tex/packaging.c
@@ -109,11 +109,11 @@ input stream (the others are \.{\\vcenter}, \.{\\valign}, and
*/
-void scan_full_spec(group_code c, integer spec_direction)
+void scan_full_spec(group_code c, int spec_direction)
{ /* scans a box specification and left brace */
- integer s; /* temporarily saved value */
- integer i;
- integer v;
+ int s; /* temporarily saved value */
+ int i;
+ int v;
int spec_code;
halfword attr_list;
s = 0;
@@ -200,7 +200,7 @@ to implement \.{\\badness}.
scaled total_stretch[5];
scaled total_shrink[5]; /* glue found by |hpack| or |vpack| */
-integer last_badness; /* badness of the most recently packaged box */
+int last_badness; /* badness of the most recently packaged box */
/*
If the global variable |adjust_tail| is non-null, the |hpack| routine
@@ -218,7 +218,7 @@ Materials in \.{\\vadjust} used with \.{pre} keyword will be appended to
halfword pre_adjust_tail;
-integer font_expand_ratio; /* current expansion ratio */
+int font_expand_ratio; /* current expansion ratio */
halfword last_leftmost_char;
halfword last_rightmost_char;
@@ -236,9 +236,9 @@ scaled char_stretch(halfword p)
{
internal_font_number k;
scaled dw;
- integer ef;
+ int ef;
internal_font_number f;
- integer c;
+ int c;
f = font(p);
c = character(p);
k = pdf_font_stretch(f);
@@ -255,9 +255,9 @@ scaled char_shrink(halfword p)
{
internal_font_number k;
scaled dw;
- integer ef;
+ int ef;
internal_font_number f;
- integer c;
+ int c;
f = font(p);
c = character(p);
k = pdf_font_shrink(f);
@@ -304,11 +304,11 @@ scaled kern_shrink(halfword p)
get_ef_code(font(l), character(l)), 1000);
}
-void do_subst_font(halfword p, integer ex_ratio)
+void do_subst_font(halfword p, int ex_ratio)
{
internal_font_number f, k;
halfword r;
- integer ef;
+ int ef;
if (type(p) == disc_node) {
r = vlink(pre_break(p));
while (r != null) {
@@ -369,7 +369,7 @@ void do_subst_font(halfword p, integer ex_ratio)
scaled char_pw(halfword p, int side)
{
internal_font_number f;
- integer c;
+ int c;
if (side == left_side)
last_leftmost_char = null;
else
@@ -420,8 +420,8 @@ halfword hpack(halfword p, scaled w, int m, int pack_direction)
internal_font_number f; /* the font in a |char_node| */
halfword dir_ptr; /* for managing the direction stack */
/* BEWARE: this shadows a global |dir_ptr| */
- integer hpack_dir; /* the current direction */
- integer disc_level;
+ int hpack_dir; /* the current direction */
+ int disc_level;
halfword pack_interrupt[8];
scaled font_stretch;
scaled font_shrink;
@@ -826,7 +826,7 @@ halfword hpack(halfword p, scaled w, int m, int pack_direction)
return r;
}
-halfword filtered_hpack(halfword p, halfword qt, scaled w, int m, integer grp,
+halfword filtered_hpack(halfword p, halfword qt, scaled w, int m, int grp,
int pac)
{
halfword q;
@@ -840,12 +840,12 @@ halfword filtered_hpack(halfword p, halfword qt, scaled w, int m, integer grp,
/* here is a function to calculate the natural whd of a (horizontal) node list */
scaled_whd natural_sizes(halfword p, halfword pp, glue_ratio g_mult,
- integer g_sign, integer g_order, int pack_direction)
+ int g_sign, int g_order, int pack_direction)
{
scaled s; /* shift amount */
halfword g; /* points to a glue specification */
internal_font_number f; /* the font in a |char_node| */
- integer hpack_dir;
+ int hpack_dir;
scaled_whd xx; /* for recursion */
scaled_whd whd, siz = { 0, 0, 0 };
if (pack_direction == -1) {
@@ -953,7 +953,7 @@ set nonzero only when |hpack| is being called by the paragraph builder
or the alignment finishing routine.
*/
-integer pack_begin_line; /* source file line where the current paragraph
+int pack_begin_line; /* source file line where the current paragraph
or alignment began; a negative value denotes alignment */
/*
@@ -1196,7 +1196,7 @@ halfword vpackage(halfword p, scaled h, int m, scaled l, int pack_direction)
return r;
}
-halfword filtered_vpackage(halfword p, scaled h, int m, scaled l, integer grp,
+halfword filtered_vpackage(halfword p, scaled h, int m, scaled l, int grp,
int pack_direction)
{
halfword q;
@@ -1221,7 +1221,7 @@ void package(int c)
scaled h; /* height of box */
halfword p; /* first node in a box */
scaled d; /* max depth */
- integer grp;
+ int grp;
grp = cur_group;
d = box_max_depth;
unsave();
@@ -1413,9 +1413,9 @@ halfword vert_break(halfword p, scaled h, scaled d)
halfword prev_p; /* if |p| is a glue node, |type(prev_p)| determines
whether |p| is a legal breakpoint */
halfword q, r; /* glue specifications */
- integer pi; /* penalty value */
- integer b; /* badness at a trial breakpoint */
- integer least_cost; /* the smallest badness plus penalties found so far */
+ int pi; /* penalty value */
+ int b; /* badness at a trial breakpoint */
+ int least_cost; /* the smallest badness plus penalties found so far */
halfword best_place; /* the most recent break that leads to |least_cost| */
scaled prev_dp; /* depth of previous box in the list */
int t; /* |type| of the node following a kern */
@@ -1583,7 +1583,7 @@ box was void (or if it was, erroneously, an hlist box).
halfword vsplit(halfword n, scaled h)
{ /* extracts a page of height |h| from box |n| */
halfword v; /* the box to be split */
- integer vdir; /* the direction of the box to be split */
+ int vdir; /* the direction of the box to be split */
halfword p; /* runs through the vlist */
halfword q; /* points to where the break occurs */
halfword i; /* for traversing marks lists */
@@ -1662,12 +1662,12 @@ the first steps in their creation. The |begin_box| routine is called when
box desired, and |cur_cmd=make_box|.
*/
-void begin_box(integer box_context)
+void begin_box(int box_context)
{
halfword q; /* run through the current list */
halfword k; /* 0 or |vmode| or |hmode| */
- integer n; /* a box number */
- integer spec_direction = -1;
+ int n; /* a box number */
+ int spec_direction = -1;
switch (cur_chr) {
case box_code:
scan_register_num();
diff --git a/source/texk/web2c/luatexdir/tex/packaging.h b/source/texk/web2c/luatexdir/tex/packaging.h
index 511d5ce9dd11a185f17e07656a42cb6b9bbdeb69..5754e6f4bfcb2fe35444badcddb06af3f35a8c15 100644
--- a/source/texk/web2c/luatexdir/tex/packaging.h
+++ b/source/texk/web2c/luatexdir/tex/packaging.h
@@ -35,14 +35,14 @@ typedef enum {
# define substituted 3 /* |subtype| of kern nodes that should be substituted */
extern void scan_spec(group_code c);
-extern void scan_full_spec(group_code c, integer spec_direction);
+extern void scan_full_spec(group_code c, int spec_direction);
extern scaled total_stretch[5];
extern scaled total_shrink[5]; /* glue found by |hpack| or |vpack| */
-extern integer last_badness; /* badness of the most recently packaged box */
+extern int last_badness; /* badness of the most recently packaged box */
extern halfword adjust_tail; /* tail of adjustment list */
extern halfword pre_adjust_tail;
-extern integer font_expand_ratio; /* current expansion ratio */
+extern int font_expand_ratio; /* current expansion ratio */
extern halfword last_leftmost_char;
extern halfword last_rightmost_char;
extern halfword next_char_p; /* pointer to the next char of an implicit kern */
@@ -53,7 +53,7 @@ extern scaled char_stretch(halfword p);
extern scaled char_shrink(halfword p);
extern scaled kern_stretch(halfword p);
extern scaled kern_shrink(halfword p);
-extern void do_subst_font(halfword p, integer ex_ratio);
+extern void do_subst_font(halfword p, int ex_ratio);
extern scaled char_pw(halfword p, int side);
extern halfword new_margin_kern(scaled w, halfword p, int side);
@@ -65,18 +65,18 @@ extern halfword new_margin_kern(scaled w, halfword p, int side);
extern halfword hpack(halfword p, scaled w, int m, int d);
extern halfword filtered_hpack(halfword p, halfword qt, scaled w, int m,
- integer grp, int d);
+ int grp, int d);
extern scaled_whd natural_sizes(halfword p, halfword pp, glue_ratio g_mult,
- integer g_sign, integer g_order, int d);
+ int g_sign, int g_order, int d);
-extern integer pack_begin_line;
+extern int pack_begin_line;
# define vpack(A,B,C,D) vpackage(A,B,C,max_dimen,D) /* special case of unconstrained depth */
extern halfword vpackage(halfword p, scaled h, int m, scaled l, int d);
extern halfword filtered_vpackage(halfword p, scaled h, int m, scaled l,
- integer grp, int d);
+ int grp, int d);
extern void finish_vcenter(void);
extern void package(int c);
extern void append_to_vlist(halfword b);
@@ -145,6 +145,6 @@ where the latter two are used denote \.{\\vbox} and \.{\\hbox}, respectively.
# define ship_out_flag (max_global_box_flag+1) /* context code for `\.{\\shipout}' */
# define leader_flag ship_out_flag+1 /* context code for `\.{\\leaders}' */
-extern void begin_box(integer box_context);
+extern void begin_box(int box_context);
#endif
diff --git a/source/texk/web2c/luatexdir/tex/postlinebreak.c b/source/texk/web2c/luatexdir/tex/postlinebreak.c
index e9e9a2e5f7d604a139178587e28ea7cea0ed0e60..e8e8ef18ae62bc45a9c603dbc8ff064d18a4be50 100644
--- a/source/texk/web2c/luatexdir/tex/postlinebreak.c
+++ b/source/texk/web2c/luatexdir/tex/postlinebreak.c
@@ -100,7 +100,7 @@ void ext_post_line_break(boolean d,
boolean post_disc_break; /*and did it have a nonempty post-break part? */
scaled cur_width; /*width of line number |cur_line| */
scaled cur_indent; /*left margin of line number |cur_line| */
- integer pen; /*use when calculating penalties between lines */
+ int pen; /*use when calculating penalties between lines */
halfword cur_p; /* cur_p, but localized */
halfword cur_line; /*the current line number being justified */
@@ -153,7 +153,7 @@ void ext_post_line_break(boolean d,
halfword nxt = vlink(temp_head);
delete_attribute_ref(node_attr(tmp));
node_attr(tmp) = node_attr(temp_head);
- add_node_attr_ref (node_attr(tmp));
+ add_node_attr_ref(node_attr(tmp));
couple_nodes(temp_head, tmp);
try_couple_nodes(tmp, nxt); /* \break\par */
}
@@ -285,7 +285,7 @@ void ext_post_line_break(boolean d,
halfword s = new_dir(dir_dir(p) - 64);
delete_attribute_ref(node_attr(s));
node_attr(s) = node_attr(r);
- add_node_attr_ref (node_attr(s));
+ add_node_attr_ref(node_attr(s));
couple_nodes(r, s);
try_couple_nodes(s, e);
r = s;
@@ -327,7 +327,7 @@ void ext_post_line_break(boolean d,
k = new_margin_kern(-w, last_rightmost_char, right_side);
delete_attribute_ref(node_attr(k));
node_attr(k) = node_attr(p);
- add_node_attr_ref (node_attr(k));
+ add_node_attr_ref(node_attr(k));
vlink(k) = vlink(ptmp);
vlink(ptmp) = k;
if (ptmp == q)
@@ -342,7 +342,7 @@ void ext_post_line_break(boolean d,
vlink(r) = vlink(q);
delete_attribute_ref(node_attr(r));
node_attr(r) = node_attr(q);
- add_node_attr_ref (node_attr(r));
+ add_node_attr_ref(node_attr(r));
vlink(q) = r;
q = r;
}
@@ -384,7 +384,7 @@ void ext_post_line_break(boolean d,
k = new_margin_kern(-w, last_leftmost_char, left_side);
delete_attribute_ref(node_attr(k));
node_attr(k) = node_attr(q);
- add_node_attr_ref (node_attr(k));
+ add_node_attr_ref(node_attr(k));
vlink(k) = q;
q = k;
}
@@ -393,7 +393,7 @@ void ext_post_line_break(boolean d,
r = new_param_glue(left_skip_code);
delete_attribute_ref(node_attr(r));
node_attr(r) = node_attr(q);
- add_node_attr_ref (node_attr(r));
+ add_node_attr_ref(node_attr(r));
vlink(r) = q;
q = r;
}
diff --git a/source/texk/web2c/luatexdir/tex/primitive.c b/source/texk/web2c/luatexdir/tex/primitive.c
index dfaf96e913ef9119fd7d88cfa6cddd97ba22e173..2f240179f60d6a4a91c924d0f2fefd6cc96289aa 100644
--- a/source/texk/web2c/luatexdir/tex/primitive.c
+++ b/source/texk/web2c/luatexdir/tex/primitive.c
@@ -54,11 +54,11 @@ A global boolean variable called |no_new_control_sequence| is set to
two_halves *hash; /* the hash table */
halfword hash_used; /* allocation pointer for |hash| */
-integer hash_extra; /* |hash_extra=hash| above |eqtb_size| */
+int hash_extra; /* |hash_extra=hash| above |eqtb_size| */
halfword hash_top; /* maximum of the hash array */
halfword hash_high; /* pointer to next high hash location */
boolean no_new_control_sequence; /* are new identifiers legal? */
-integer cs_count; /* total number of known identifiers */
+int cs_count; /* total number of known identifiers */
#define hash_is_full (hash_used==hash_base) /* test if all positions are occupied */
@@ -140,7 +140,7 @@ static halfword compute_hash(char *j, pool_pointer l, halfword prime_number)
pointer prim_lookup(str_number s)
{
- integer h; /* hash code */
+ int h; /* hash code */
pointer p; /* index in |hash| array */
unsigned char *j;
unsigned l;
@@ -188,7 +188,7 @@ pointer prim_lookup(str_number s)
boolean is_primitive(str_number csname)
{
- integer n, m;
+ int n, m;
char *ss;
m = prim_lookup(csname);
ss = makecstring(csname);
@@ -202,22 +202,22 @@ boolean is_primitive(str_number csname)
/* a few simple accessors */
-quarterword get_prim_eq_type(integer p)
+quarterword get_prim_eq_type(int p)
{
return prim_eq_type(p);
}
-quarterword get_prim_origin(integer p)
+quarterword get_prim_origin(int p)
{
return prim_origin(p);
}
-halfword get_prim_equiv(integer p)
+halfword get_prim_equiv(int p)
{
return prim_equiv(p);
}
-str_number get_prim_text(integer p)
+str_number get_prim_text(int p)
{
return prim_text(p);
}
@@ -334,7 +334,7 @@ store_primitive_name(str_number s, quarterword c, halfword o, halfword offset)
void
primitive(char *thes, quarterword c, halfword o, halfword off, int cmd_origin)
{
- integer prim_val; /* needed to fill |prim_eqtb| */
+ int prim_val; /* needed to fill |prim_eqtb| */
str_number ss;
assert(o >= off);
ss = maketexstring(thes);
@@ -379,15 +379,15 @@ static halfword insert_id(halfword p, unsigned char *j, pool_pointer l)
p = hash_used;
}
}
- saved_cur_length = cur_length;
- saved_cur_string = cur_string;
+ saved_cur_length = cur_length;
+ saved_cur_string = cur_string;
saved_cur_string_size = cur_string_size;
reset_cur_string();
for (k = j; k <= j + l - 1; k++)
append_char(*k);
cs_text(p) = make_string();
- cur_length = saved_cur_length;
- cur_string = saved_cur_string;
+ cur_length = saved_cur_length;
+ cur_string = saved_cur_string;
cur_string_size = saved_cur_string_size;
incr(cs_count);
return p;
@@ -405,9 +405,9 @@ static halfword insert_id(halfword p, unsigned char *j, pool_pointer l)
*/
-pointer id_lookup(integer j, integer l)
+pointer id_lookup(int j, int l)
{ /* search the hash table */
- integer h; /* hash code */
+ int h; /* hash code */
pointer p; /* index in |hash| array */
h = compute_hash((char *) (buffer + j), l, hash_prime);
@@ -424,7 +424,7 @@ pointer id_lookup(integer j, integer l)
p = h + hash_base; /* we start searching here; note that |0<=h<hash_prime| */
while (1) {
if (cs_text(p) > 0)
- if (str_length(cs_text(p)) == (unsigned)l)
+ if (str_length(cs_text(p)) == (unsigned) l)
if (str_eq_buf(cs_text(p), j))
goto FOUND;
if (cs_next(p) == 0) {
@@ -449,7 +449,7 @@ pointer id_lookup(integer j, integer l)
pointer string_lookup(char *s, size_t l)
{ /* search the hash table */
- integer h; /* hash code */
+ int h; /* hash code */
pointer p; /* index in |hash| array */
h = compute_hash(s, l, hash_prime);
p = h + hash_base; /* we start searching here; note that |0<=h<hash_prime| */
@@ -507,7 +507,7 @@ void prim_cmd_chr(quarterword cmd, halfword chr_code)
void print_cmd_chr(quarterword cmd, halfword chr_code)
{
- integer n; /* temp variable */
+ int n; /* temp variable */
switch (cmd) {
case left_brace_cmd:
chr_cmd("begin-group character ");
diff --git a/source/texk/web2c/luatexdir/tex/primitive.h b/source/texk/web2c/luatexdir/tex/primitive.h
index 7f0e5e318ca5f9ec3bae79bece6ea277c2b30778..d086f7c1894e140b342b34df8ea0aca905a06e9c 100644
--- a/source/texk/web2c/luatexdir/tex/primitive.h
+++ b/source/texk/web2c/luatexdir/tex/primitive.h
@@ -41,11 +41,11 @@ typedef enum {
extern two_halves *hash; /* the hash table */
extern halfword hash_used; /* allocation pointer for |hash| */
-extern integer hash_extra; /* |hash_extra=hash| above |eqtb_size| */
+extern int hash_extra; /* |hash_extra=hash| above |eqtb_size| */
extern halfword hash_top; /* maximum of the hash array */
extern halfword hash_high; /* pointer to next high hash location */
extern boolean no_new_control_sequence; /* are new identifiers legal? */
-extern integer cs_count; /* total number of known identifiers */
+extern int cs_count; /* total number of known identifiers */
# define cs_next(a) hash[(a)].lhfield /* link for coalesced lists */
# define cs_text(a) hash[(a)].rh
@@ -64,10 +64,10 @@ extern pointer prim_lookup(str_number s);
extern boolean is_primitive(str_number csname);
-extern quarterword get_prim_eq_type(integer p);
-extern halfword get_prim_equiv(integer p);
-extern str_number get_prim_text(integer p);
-extern quarterword get_prim_origin(integer p);
+extern quarterword get_prim_eq_type(int p);
+extern halfword get_prim_equiv(int p);
+extern str_number get_prim_text(int p);
+extern quarterword get_prim_origin(int p);
extern void dump_primitives(void);
extern void undump_primitives(void);
@@ -87,6 +87,6 @@ extern void primitive_def(char *s, size_t l, quarterword c, halfword o);
extern void print_cmd_chr(quarterword cmd, halfword chr_code);
extern pointer string_lookup(char *s, size_t l);
-extern pointer id_lookup(integer j, integer l);
+extern pointer id_lookup(int j, int l);
#endif /* LUATEX_PRIMITIVE_H */
diff --git a/source/texk/web2c/luatexdir/tex/printing.c b/source/texk/web2c/luatexdir/tex/printing.c
index 32f989e9d4b93b1c6adc69d835e5147ad5321105..1ec3b2299c4b876949220415b469a47a68962841 100644
--- a/source/texk/web2c/luatexdir/tex/printing.c
+++ b/source/texk/web2c/luatexdir/tex/printing.c
@@ -75,12 +75,12 @@ terminal or to the transcript file, respectively.
alpha_file log_file; /* transcript of \TeX\ session */
int selector = term_only; /* where to print a message */
int dig[23]; /* digits in a number being output */
-integer tally = 0; /* the number of characters recently printed */
+int tally = 0; /* the number of characters recently printed */
int term_offset = 0; /* the number of characters on the current terminal line */
int file_offset = 0; /* the number of characters on the current file line */
packed_ASCII_code trick_buf[(ssup_error_line + 1)]; /* circular buffer for pseudoprinting */
-integer trick_count; /* threshold for pseudoprinting, explained later */
-integer first_count; /* another variable for pseudoprinting */
+int trick_count; /* threshold for pseudoprinting, explained later */
+int first_count; /* another variable for pseudoprinting */
boolean inhibit_par_tokens = false; /* for minor adjustments to |show_token_list| */
/* To end a line of text output, we call |print_ln| */
@@ -223,9 +223,9 @@ from that value. This allows byte-oriented output to things like
to do the same substraction while typesetting.
*/
-void print(integer s)
+void print(int s)
{ /* prints string |s| */
- unsigned char *j, *l; /* current character code position */
+ unsigned char *j, *l; /* current character code position */
if (s >= str_ptr) {
/* this can't happen */
@@ -285,7 +285,7 @@ void print(integer s)
return;
}
j = str_string(s);
- l = j+str_length(s);
+ l = j + str_length(s);
while (j < l) {
/* 0x110000 in utf=8: 0xF4 0x90 0x80 0x80 */
/* I don't bother checking the last two bytes explicitly */
@@ -323,7 +323,7 @@ void print_nl(str_number s)
void tprint(char *s)
{
- unsigned char *ss = (unsigned char *)s;
+ unsigned char *ss = (unsigned char *) s;
if (selector == new_string) {
append_string(ss, strlen(s));
return;
@@ -340,7 +340,7 @@ void tprint_nl(char *s)
/* |slow_print| is the same as |print| nowadays, but the name is kept for now. */
-void slow_print(integer s)
+void slow_print(int s)
{ /* prints string |s| */
print(s);
}
@@ -356,7 +356,7 @@ character positions.
void print_banner(char *v, int e)
{
boolean res;
- integer callback_id;
+ int callback_id;
callback_id = callback_defined(start_run_callback);
if (callback_id == 0) {
fprintf(term_out, "This is LuaTeX, Version %s-%d", v, e);
@@ -426,7 +426,7 @@ the user's escape character (which is usually a backslash).
void print_esc(str_number s)
{ /* prints escape character, then |s| */
- integer c; /* the escape character code */
+ int c; /* the escape character code */
/* Set variable |c| to the current escape character */
c = int_par(escape_char_code);
if (c >= 0 && c < STRING_OFFSET)
@@ -436,7 +436,7 @@ void print_esc(str_number s)
void tprint_esc(char *s)
{ /* prints escape character, then |s| */
- integer c; /* the escape character code */
+ int c; /* the escape character code */
/* Set variable |c| to the current escape character */
c = int_par(escape_char_code);
if (c >= 0 && c < STRING_OFFSET)
@@ -500,7 +500,7 @@ Here is a trivial procedure to print two digits; it is usually called with
a parameter in the range |0<=n<=99|.
*/
-void print_two(integer n)
+void print_two(int n)
{ /* prints two least significant digits */
n = abs(n) % 100;
print_char('0' + (n / 10));
@@ -511,7 +511,7 @@ void print_two(integer n)
Hexadecimal printing of nonnegative integers is accomplished by |print_hex|.
*/
-void print_hex(integer n)
+void print_hex(int n)
{ /* prints a positive integer in hexadecimal form */
int k; /* index to current digit; we assume that $0\L n<16^{22}$ */
k = 0;
@@ -531,7 +531,7 @@ works; therefore no explanation will be given. Notice that 1990 yields
\.{mcmxc}, not \.{mxm}.
*/
-void print_roman_int(integer n)
+void print_roman_int(int n)
{
char *j, *k; /* mysterious indices */
nonnegative_integer u, v; /* mysterious numbers */
@@ -582,7 +582,7 @@ individual characters must be printed one at a time using |print|, since
they may be unprintable.
*/
-void print_cs(integer p)
+void print_cs(int p)
{ /* prints a purported control sequence */
str_number t = cs_text(p);
if (p < hash_base) { /* nullcs */
@@ -648,7 +648,7 @@ Then there is a subroutine that prints glue stretch and shrink, possibly
followed by the name of finite units:
*/
-void print_glue(scaled d, integer order, char *s)
+void print_glue(scaled d, int order, char *s)
{ /* prints a glue component */
print_scaled(d);
if ((order < normal) || (order > filll)) {
@@ -666,7 +666,7 @@ void print_glue(scaled d, integer order, char *s)
/* The next subroutine prints a whole glue specification */
-void print_spec(integer p, char *s)
+void print_spec(int p, char *s)
{ /* prints a glue specification */
if (p < 0) {
print_char('*');
@@ -704,7 +704,7 @@ is assumed to be present when |short_display| begins; deviations from this
font will be printed.
*/
-integer font_in_short_display; /* an internal font number */
+int font_in_short_display; /* an internal font number */
/*
Boxes, rules, inserts, whatsits, marks, and things in general that are
@@ -745,7 +745,7 @@ void print_font_identifier(internal_font_number f)
}
}
-void short_display(integer p)
+void short_display(int p)
{ /* prints highlights of list |p| */
while (p != null) {
if (is_char_node(p)) {
@@ -776,7 +776,7 @@ print a font-and-character combination, one to print a token list without
its reference count, and one to print a rule dimension.
*/
-void print_font_and_char(integer p)
+void print_font_and_char(int p)
{ /* prints |char_node| data */
if (!is_valid_font(font(p)))
print_char('*');
@@ -786,7 +786,7 @@ void print_font_and_char(integer p)
print(character(p));
}
-void print_mark(integer p)
+void print_mark(int p)
{ /* prints token list data in braces */
print_char('{');
if ((p < fix_mem_min) || (p > fix_mem_end))
@@ -819,8 +819,8 @@ be given and no sublists will be traversed. Another global variable, called
|breadth_max| had better be positive, or you won't see anything.
*/
-integer depth_threshold; /* maximum nesting depth in box displays */
-integer breadth_max; /* maximum number of items shown at the same list level */
+int depth_threshold; /* maximum nesting depth in box displays */
+int breadth_max; /* maximum number of items shown at the same list level */
/* The recursive machinery is started by calling |show_box|. */
@@ -841,9 +841,9 @@ void show_box(halfword p)
/* Helper for debugging purposes */
-void short_display_n(integer p, integer m)
+void short_display_n(int p, int m)
{ /* prints highlights of list |p| */
- integer i = 0;
+ int i = 0;
font_in_short_display = null_font;
if (p == null)
return;
@@ -894,9 +894,9 @@ they came from. (This isn't a truly ``basic'' printing procedure, but
that's a convenient module in which to put it.)
*/
-void print_csnames(integer hstart, integer hfinish)
+void print_csnames(int hstart, int hfinish)
{
- integer h;
+ int h;
unsigned char *c, *l;
fprintf(stderr, "fmtdebug:csnames from %d to %d:", (int) hstart,
(int) hfinish);
@@ -904,8 +904,8 @@ void print_csnames(integer hstart, integer hfinish)
if (cs_text(h) > 0) { /* if have anything at this position */
c = str_string(cs_text(h));
l = c + str_length(cs_text(h));
- while (c<l) {
- fputc(*c++, stderr); /* print the characters */
+ while (c < l) {
+ fputc(*c++, stderr); /* print the characters */
}
fprintf(stderr, "|");
}
diff --git a/source/texk/web2c/luatexdir/tex/printing.h b/source/texk/web2c/luatexdir/tex/printing.h
index b4222964bb198b640fbe187e2f46caa80f4cd58d..e205dbab1e7df7d28b908fd3778baf54c930ae0f 100644
--- a/source/texk/web2c/luatexdir/tex/printing.h
+++ b/source/texk/web2c/luatexdir/tex/printing.h
@@ -38,12 +38,12 @@ typedef enum {
extern alpha_file log_file;
extern int selector;
extern int dig[23];
-extern integer tally;
+extern int tally;
extern int term_offset;
extern int file_offset;
extern packed_ASCII_code trick_buf[(ssup_error_line + 1)];
-extern integer trick_count;
-extern integer first_count;
+extern int trick_count;
+extern int first_count;
extern boolean inhibit_par_tokens;
/*
@@ -59,24 +59,24 @@ by changing |wterm|, |wterm_ln|, and |wterm_cr| in this section.
extern void print_ln(void);
extern void print_char(int s);
-extern void print(integer s);
+extern void print(int s);
extern void print_nl(str_number s);
extern void print_nlp(void);
-extern void slow_print(integer s);
+extern void slow_print(int s);
extern void print_banner(char *, int);
extern void log_banner(char *, int);
extern void print_version_banner(void);
extern void print_esc(str_number s);
extern void print_the_digs(eight_bits k);
extern void print_int(longinteger n);
-extern void print_two(integer n);
-extern void print_hex(integer n);
-extern void print_roman_int(integer n);
+extern void print_two(int n);
+extern void print_hex(int n);
+extern void print_roman_int(int n);
extern void print_current_string(void);
# define print_font_name(A) tprint(font_name(A))
-extern void print_cs(integer p);
+extern void print_cs(int p);
extern void sprint_cs(pointer p);
extern void tprint(char *s);
extern void tprint_nl(char *s);
@@ -99,21 +99,21 @@ extern void prompt_input(char *s);
# define active_cs_value(A) pool_to_unichar((str_string((A))+3))
-extern void print_glue(scaled d, integer order, char *s); /* prints a glue component */
-extern void print_spec(integer p, char *s); /* prints a glue specification */
+extern void print_glue(scaled d, int order, char *s); /* prints a glue component */
+extern void print_spec(int p, char *s); /* prints a glue specification */
-extern integer font_in_short_display; /* an internal font number */
+extern int font_in_short_display; /* an internal font number */
extern void print_font_identifier(internal_font_number f);
-extern void short_display(integer p); /* prints highlights of list |p| */
-extern void print_font_and_char(integer p); /* prints |char_node| data */
-extern void print_mark(integer p); /* prints token list data in braces */
+extern void short_display(int p); /* prints highlights of list |p| */
+extern void print_font_and_char(int p); /* prints |char_node| data */
+extern void print_mark(int p); /* prints token list data in braces */
extern void print_rule_dimen(scaled d); /* prints dimension in rule node */
-extern integer depth_threshold; /* maximum nesting depth in box displays */
-extern integer breadth_max; /* maximum number of items shown at the same list level */
+extern int depth_threshold; /* maximum nesting depth in box displays */
+extern int breadth_max; /* maximum number of items shown at the same list level */
extern void show_box(halfword p);
-extern void short_display_n(integer p, integer m); /* prints highlights of list |p| */
+extern void short_display_n(int p, int m); /* prints highlights of list |p| */
-extern void print_csnames(integer hstart, integer hfinish);
+extern void print_csnames(int hstart, int hfinish);
extern void print_file_line(void);
extern void begin_diagnostic(void);
diff --git a/source/texk/web2c/luatexdir/tex/scanning.c b/source/texk/web2c/luatexdir/tex/scanning.c
index 110284c1f252b3efd99bebcebce3a0d515db4c8f..bbdcaa291ff11ee8023ff6e6a830d46bf48c85c3 100644
--- a/source/texk/web2c/luatexdir/tex/scanning.c
+++ b/source/texk/web2c/luatexdir/tex/scanning.c
@@ -144,8 +144,8 @@ its reference count, but in this case the count will not have been updated.
Otherwise |cur_val| will contain the integer or scaled value in question.
*/
-integer cur_val; /* value returned by numeric scanners */
-integer cur_val1; /* delcodes are sometimes 51 digits */
+int cur_val; /* value returned by numeric scanners */
+int cur_val1; /* delcodes are sometimes 51 digits */
int cur_val_level; /* the ``level'' of this value */
#define scanned_result(A,B) do { \
@@ -207,7 +207,7 @@ static boolean short_scan_something_internal(int cmd, int chr, int level,
halfword m; /* |chr_code| part of the operand token */
halfword q; /* general purpose index */
int p; /* index into |nest| */
- integer save_cur_chr;
+ int save_cur_chr;
boolean succeeded = true;
m = chr;
switch (cmd) {
@@ -641,7 +641,7 @@ void scan_something_internal(int level, boolean negative)
{
/* fetch an internal parameter */
halfword m; /* |chr_code| part of the operand token */
- integer n, k; /* accumulators */
+ int n, k; /* accumulators */
RESTART:
m = cur_chr;
if (!short_scan_something_internal(cur_cmd, cur_chr, level, negative)) {
@@ -913,7 +913,7 @@ void scan_fifteen_bit_int(void)
void scan_fifty_one_bit_int(void)
{
- integer iiii;
+ int iiii;
scan_int();
if ((cur_val < 0) || (cur_val > 0777777777)) {
print_err("Bad delimiter code");
@@ -960,7 +960,7 @@ void scan_four_bit_int_or_18(void)
void scan_string_argument(void)
{
- integer s;
+ int s;
scan_left_brace();
get_x_token();
while ((cur_cmd != right_brace_cmd)) {
@@ -1011,7 +1011,7 @@ int radix; /* |scan_int| sets this to 8, 10, 16, or zero */
void scan_int(void)
{ /* sets |cur_val| to an integer */
boolean negative; /* should the answer be negated? */
- integer m; /* |$2^{31}$ / radix|, the threshold of danger */
+ int m; /* |$2^{31}$ / radix|, the threshold of danger */
int d; /* the digit just scanned */
boolean vacuous; /* have no digits appeared? */
boolean OK_so_far; /* has an error message been issued? */
@@ -1163,7 +1163,7 @@ of ``muglue.''
static void coerce_glue(void)
{
- integer v;
+ int v;
if (cur_val_level >= glue_val_level) {
v = width(cur_val);
delete_glue_ref(cur_val);
@@ -1206,13 +1206,13 @@ void scan_dimen(boolean mu, boolean inf, boolean shortcut)
/* sets |cur_val| to a dimension */
{
boolean negative; /* should the answer be negated? */
- integer f; /* numerator of a fraction whose denominator is $2^{16}$ */
+ int f; /* numerator of a fraction whose denominator is $2^{16}$ */
/* Local variables for dimension calculations */
int num, denom; /* conversion ratio for the scanned units */
int k, kk; /* number of digits in a decimal fraction */
halfword p, q; /* top of decimal digit stack */
scaled v; /* an internal dimension */
- integer save_cur_val; /* temporary storage of |cur_val| */
+ int save_cur_val; /* temporary storage of |cur_val| */
f = 0;
arith_error = false;
@@ -1555,7 +1555,7 @@ void scan_glue(int level)
void scan_scaled(void)
{ /* sets |cur_val| to a scaled value */
boolean negative; /* should the answer be negated? */
- integer f; /* numerator of a fraction whose denominator is $2^{16}$ */
+ int f; /* numerator of a fraction whose denominator is $2^{16}$ */
int k, kk; /* number of digits in a decimal fraction */
halfword p, q; /* top of decimal digit stack */
f = 0;
@@ -1769,7 +1769,7 @@ The boolean parameter |writing| is set |true| if the calling program
intends to change the parameter value.
*/
-static void font_param_error(integer f)
+static void font_param_error(int f)
{
print_err("Font ");
print_esc(font_id_text(f));
@@ -1784,7 +1784,7 @@ static void font_param_error(integer f)
void set_font_dimen(void)
{
internal_font_number f;
- integer n; /* the parameter number */
+ int n; /* the parameter number */
scan_int();
n = cur_val;
scan_font_ident();
@@ -1811,7 +1811,7 @@ void set_font_dimen(void)
void get_font_dimen(void)
{
internal_font_number f;
- integer n; /* the parameter number */
+ int n; /* the parameter number */
scan_int();
n = cur_val;
scan_font_ident();
@@ -2246,9 +2246,9 @@ numerator for a combined multiplication and division, if any.
|max_answer|.
*/
-integer add_or_sub(integer x, integer y, integer max_answer, boolean negative)
+int add_or_sub(int x, int y, int max_answer, boolean negative)
{
- integer a; /* the answer */
+ int a; /* the answer */
if (negative)
negate(y);
if (x >= 0) {
@@ -2274,10 +2274,10 @@ The function |quotient(n,d)| computes the rounded quotient
$q=\lfloor n/d+{1\over2}\rfloor$, when $n$ and $d$ are positive.
*/
-integer quotient(integer n, integer d)
+int quotient(int n, int d)
{
boolean negative; /* should the answer be negated? */
- integer a; /* the answer */
+ int a; /* the answer */
if (d == 0) {
num_error(a);
} else {
@@ -2315,14 +2315,14 @@ this subroutine simulates double precision arithmetic, somewhat
analogous to \MF's |make_fraction| and |take_fraction| routines.
*/
-integer fract(integer x, integer n, integer d, integer max_answer)
+int fract(int x, int n, int d, int max_answer)
{
boolean negative; /* should the answer be negated? */
- integer a; /* the answer */
- integer f; /* a proper fraction */
- integer h; /* smallest integer such that |2*h>=d| */
- integer r; /* intermediate remainder */
- integer t; /* temp variable */
+ int a; /* the answer */
+ int f; /* a proper fraction */
+ int h; /* smallest integer such that |2*h>=d| */
+ int r; /* intermediate remainder */
+ int t; /* temp variable */
if (d == 0)
goto TOO_BIG;
a = 0;
@@ -2423,10 +2423,10 @@ void scan_expr(void)
int r; /* state of expression so far */
int s; /* state of term so far */
int o; /* next operation or type of next factor */
- integer e; /* expression so far */
- integer t; /* term so far */
- integer f; /* current factor */
- integer n; /* numerator of combined multiplication and division */
+ int e; /* expression so far */
+ int t; /* term so far */
+ int f; /* current factor */
+ int n; /* numerator of combined multiplication and division */
halfword p; /* top of expression stack */
halfword q; /* for stack manipulations */
l = cur_val_level;
diff --git a/source/texk/web2c/luatexdir/tex/scanning.h b/source/texk/web2c/luatexdir/tex/scanning.h
index 3ec242db5836b489199c4789cb3e4dce2696ed43..adca35cd71852ca974694e75fcca830719d6f758 100644
--- a/source/texk/web2c/luatexdir/tex/scanning.h
+++ b/source/texk/web2c/luatexdir/tex/scanning.h
@@ -36,8 +36,8 @@ typedef enum {
extern void scan_left_brace(void);
extern void scan_optional_equals(void);
-extern integer cur_val; /* value returned by numeric scanners */
-extern integer cur_val1; /* delcodes are sometimes 51 digits */
+extern int cur_val; /* value returned by numeric scanners */
+extern int cur_val1; /* delcodes are sometimes 51 digits */
extern int cur_val_level; /* the ``level'' of this value */
extern void scan_something_simple(halfword cmd, halfword subitem);
@@ -101,10 +101,9 @@ extern halfword scan_toks(boolean macrodef, boolean xpand);
extern void scan_normal_glue(void);
extern void scan_mu_glue(void);
-extern integer add_or_sub(integer x, integer y, integer max_answer,
- boolean negative);
-extern integer quotient(integer n, integer d);
-extern integer fract(integer x, integer n, integer d, integer max_answer);
+extern int add_or_sub(int x, int y, int max_answer, boolean negative);
+extern int quotient(int n, int d);
+extern int fract(int x, int n, int d, int max_answer);
extern void scan_expr(void);
diff --git a/source/texk/web2c/luatexdir/tex/stringpool.c b/source/texk/web2c/luatexdir/tex/stringpool.c
index 6b8bf3bd3cfbe8abd44344e186cb5798e914ef3d..82f4e245481451cf1179b271f4804e991a6947b3 100644
--- a/source/texk/web2c/luatexdir/tex/stringpool.c
+++ b/source/texk/web2c/luatexdir/tex/stringpool.c
@@ -61,7 +61,7 @@ str_number init_str_ptr; /* the starting value of |str_ptr| */
unsigned char *cur_string; /* current string buffer */
unsigned cur_length; /* current index in that buffer */
unsigned cur_string_size; /* malloced size of |cur_string| */
-unsigned pool_size; /* occupied byte count */
+unsigned pool_size; /* occupied byte count */
/*
Once a sequence of characters has been appended to |cur_string|, it
@@ -70,22 +70,23 @@ This function returns the identification number of the new string as its
value.
*/
-void reset_cur_string (void)
+void reset_cur_string(void)
{
cur_length = 0;
cur_string_size = 255;
- cur_string = (unsigned char *)xmalloc(256);
- memset(cur_string,0,256);
+ cur_string = (unsigned char *) xmalloc(256);
+ memset(cur_string, 0, 256);
}
/* current string enters the pool */
str_number make_string(void)
{
if (str_ptr == (max_strings + STRING_OFFSET))
- overflow("number of strings", max_strings - init_str_ptr + STRING_OFFSET);
+ overflow("number of strings",
+ max_strings - init_str_ptr + STRING_OFFSET);
str_room(1);
- cur_string[cur_length] = '\0'; /* now |lstring.s| is always a valid C string */
- str_string(str_ptr) = (unsigned char *)cur_string;
+ cur_string[cur_length] = '\0'; /* now |lstring.s| is always a valid C string */
+ str_string(str_ptr) = (unsigned char *) cur_string;
str_length(str_ptr) = cur_length;
pool_size += cur_length;
reset_cur_string();
@@ -184,10 +185,10 @@ UTF-8 encoding.
} while (0)
-static integer buffer_to_unichar(integer k)
+static int buffer_to_unichar(int k)
{
- integer a; /* a utf char */
- integer b; /* a utf nibble */
+ int a; /* a utf char */
+ int b; /* a utf nibble */
b = buffer[k];
if (b < 0x80) {
a = b;
@@ -228,9 +229,9 @@ static integer buffer_to_unichar(integer k)
return a;
}
-integer pool_to_unichar(unsigned char *t)
+int pool_to_unichar(unsigned char *t)
{
- return (integer) str2uni(t);
+ return (int) str2uni(t);
}
@@ -242,9 +243,9 @@ Empirical tests indicate that |str_eq_buf| is used in such a way that
it tends to return |true| about 80 percent of the time.
*/
-boolean str_eq_buf(str_number s, integer k)
+boolean str_eq_buf(str_number s, int k)
{ /* test equality of strings */
- integer a; /* a unicode character */
+ int a; /* a unicode character */
if (s < STRING_OFFSET) {
a = buffer_to_unichar(k);
if (a != s)
@@ -267,8 +268,8 @@ and it does not assume that they have the same length.
boolean str_eq_str(str_number s, str_number t)
{ /* test equality of strings */
- integer a = 0; /* a utf char */
- unsigned char *j, *k, *l; /* running indices */
+ int a = 0; /* a utf char */
+ unsigned char *j, *k, *l; /* running indices */
if (s < STRING_OFFSET) {
if (t >= STRING_OFFSET) {
k = str_string(t);
@@ -346,7 +347,7 @@ boolean get_strings_started(void)
str_number search_string(str_number search)
{
str_number s; /* running index */
- unsigned len; /* length of searched string */
+ unsigned len; /* length of searched string */
len = str_length(search);
if (len == 0) {
return get_nullstr();
@@ -374,11 +375,11 @@ str_number maketexlstring(const char *s, size_t l)
{
if (s == NULL || l == 0)
return get_nullstr();
- str_string(str_ptr) = xmalloc(l+1);
- memcpy(str_string(str_ptr),s,(l+1));
- str_length(str_ptr) = (unsigned)l;
+ str_string(str_ptr) = xmalloc(l + 1);
+ memcpy(str_string(str_ptr), s, (l + 1));
+ str_length(str_ptr) = (unsigned) l;
str_ptr++;
- return (str_ptr -1);
+ return (str_ptr - 1);
}
/* append a C string to a TeX string */
@@ -386,68 +387,70 @@ void append_string(unsigned char *s, unsigned l)
{
if (s == NULL || *s == 0)
return;
- l = strlen((char *)s);
+ l = strlen((char *) s);
str_room(l);
- memcpy(cur_string+cur_length, s, l);
+ memcpy(cur_string + cur_length, s, l);
cur_length += l;
return;
}
-char *makecstring(integer s)
+char *makecstring(int s)
{
size_t l;
return makeclstring(s, &l);
}
-char *makeclstring(integer s, size_t * len)
+char *makeclstring(int s, size_t * len)
{
- if (s<STRING_OFFSET) {
+ if (s < STRING_OFFSET) {
*len = utf8_size(s);
- return (char *)uni2str(s);
+ return (char *) uni2str(s);
} else {
unsigned l = str_length(s);
- char *cstrbuf = xmalloc(l+1);
- memcpy(cstrbuf,str_string(s),l);
+ char *cstrbuf = xmalloc(l + 1);
+ memcpy(cstrbuf, str_string(s), l);
cstrbuf[l] = '\0';
*len = l;
return cstrbuf;
}
}
-int dump_string_pool (void) {
+int dump_string_pool(void)
+{
int j;
int k = str_ptr;
unsigned l;
- dump_int(k-STRING_OFFSET);
- for (j=STRING_OFFSET+1;j<k;j++) {
+ dump_int(k - STRING_OFFSET);
+ for (j = STRING_OFFSET + 1; j < k; j++) {
l = str_length(j);
- if (str_string(j)==NULL)
- l=-1;
+ if (str_string(j) == NULL)
+ l = -1;
dump_int(l);
- if (l>0)
- dump_things(*str_string(j),str_length(j));
+ if (l > 0)
+ dump_things(*str_string(j), str_length(j));
}
- return (k-STRING_OFFSET);
+ return (k - STRING_OFFSET);
}
-int undump_string_pool (void) {
+int undump_string_pool(void)
+{
int j;
- integer x;
+ int x;
undump_int(str_ptr);
if (max_strings < str_ptr + strings_free)
max_strings = str_ptr + strings_free;
str_ptr += STRING_OFFSET;
if (ini_version)
libcfree(string_pool);
- init_string_pool_array (max_strings);
- for (j=STRING_OFFSET+1;j<str_ptr;j++) {
+ init_string_pool_array(max_strings);
+ for (j = STRING_OFFSET + 1; j < str_ptr; j++) {
undump_int(x);
- if (x>=0) {
- str_length(j) = (unsigned)x;
+ if (x >= 0) {
+ str_length(j) = (unsigned) x;
pool_size += x;
- str_string(j) = xmallocarray(unsigned char, (unsigned)(x+1));
- undump_things(*str_string(j),(unsigned)x);
- *(str_string(j)+str_length(j)) = '\0';
+ str_string(j) = xmallocarray(unsigned char, (unsigned) (x + 1));
+ undump_things(*str_string(j), (unsigned) x);
+ *(str_string(j) + str_length(j)) = '\0';
} else {
str_length(j) = 0;
}
@@ -456,7 +459,7 @@ int undump_string_pool (void) {
return str_ptr;
}
-void init_string_pool_array (int s)
+void init_string_pool_array(int s)
{
string_pool = xmallocarray(lstring, s);
_string_pool = string_pool - STRING_OFFSET;
@@ -471,13 +474,12 @@ void init_string_pool_array (int s)
void flush_str(str_number s)
{
/* printf("Flushing a string: %s (s=%d,str_ptr=%d)\n", (char *)str_string(s), (int)s, (int)str_ptr); */
- if (s > STRING_OFFSET) { /* don't ever delete the null string */
+ if (s > STRING_OFFSET) { /* don't ever delete the null string */
pool_size -= str_length(s);
str_length(s) = 0;
- xfree (str_string(s));
+ xfree(str_string(s));
str_string(s) = NULL;
}
- while (str_string((str_ptr-1))==NULL)
+ while (str_string((str_ptr - 1)) == NULL)
str_ptr--;
}
-
diff --git a/source/texk/web2c/luatexdir/tex/stringpool.h b/source/texk/web2c/luatexdir/tex/stringpool.h
index 036324259d729534b2cba724d470070ddb5cd21b..62291ffda8cd3fbdf79404f8698ccfcf3676fa2b 100644
--- a/source/texk/web2c/luatexdir/tex/stringpool.h
+++ b/source/texk/web2c/luatexdir/tex/stringpool.h
@@ -73,9 +73,9 @@ extern str_number init_str_ptr;
extern unsigned char *cur_string;
extern unsigned cur_length;
extern unsigned cur_string_size;
-extern unsigned pool_size;
+extern unsigned pool_size;
-#define EXTRA_STRING 500
+# define EXTRA_STRING 500
/* put |ASCII_code| \# at the end of |str_pool| */
# define append_char(A) do { \
@@ -97,17 +97,17 @@ extern unsigned pool_size;
} \
} while (0)
-# define flush_char() --cur_length /* forget the last character in the pool */
+# define flush_char() --cur_length /* forget the last character in the pool */
extern str_number make_string(void);
-extern boolean str_eq_buf(str_number s, integer k);
+extern boolean str_eq_buf(str_number s, int k);
extern boolean str_eq_str(str_number s, str_number t);
extern boolean str_eq_cstr(str_number, char *, size_t);
extern boolean get_strings_started(void);
-extern void reset_cur_string (void);
+extern void reset_cur_string(void);
extern str_number search_string(str_number search);
-extern integer pool_to_unichar(unsigned char *t);
+extern int pool_to_unichar(unsigned char *t);
extern unsigned char *uni2str(unsigned);
extern unsigned str2uni(unsigned char *);
@@ -116,13 +116,13 @@ extern str_number maketexstring(const char *);
extern str_number maketexlstring(const char *, size_t);
extern void append_string(unsigned char *s, unsigned l);
-extern char *makecstring(integer);
-extern char *makeclstring(integer, size_t *);
+extern char *makecstring(int);
+extern char *makeclstring(int, size_t *);
-extern int dump_string_pool (void);
-extern int undump_string_pool (void);
+extern int dump_string_pool(void);
+extern int undump_string_pool(void);
-extern void init_string_pool_array (int s);
+extern void init_string_pool_array(int s);
extern void flush_str(str_number s);
#endif
diff --git a/source/texk/web2c/luatexdir/tex/texdeffont.c b/source/texk/web2c/luatexdir/tex/texdeffont.c
index ee61a0aa5f9e59c593ae6dc95eb36b022ffde5dc..9e255ff9049a834d62ba23b8676fc29ff6d29214 100644
--- a/source/texk/web2c/luatexdir/tex/texdeffont.c
+++ b/source/texk/web2c/luatexdir/tex/texdeffont.c
@@ -34,7 +34,7 @@ to the user's font~\.{\\f}. Adding this number to |font_id_base| gives the
the font.
*/
-integer font_bytes;
+int font_bytes;
void set_cur_font(internal_font_number f)
{
@@ -86,9 +86,9 @@ void tex_def_font(small_number a)
internal_font_number f; /* runs through existing fonts */
str_number t; /* name for the frozen font identifier */
int old_setting; /* holds |selector| setting */
- integer offset = 0;
+ int offset = 0;
scaled s = -1000; /* stated ``at'' size, or negative of scaled magnification */
- integer natural_dir = -1; /* the natural direction of the font */
+ int natural_dir = -1; /* the natural direction of the font */
if (job_name == 0)
open_log_file(); /* avoid confusing \.{texput} with the font name */
get_r_token();
diff --git a/source/texk/web2c/luatexdir/tex/texdeffont.h b/source/texk/web2c/luatexdir/tex/texdeffont.h
index 2aa5bf29f6422368a4bc1e1518daf435c3df73c4..fada9ba44c296466fcd625c18c0045cbdfc4899c 100644
--- a/source/texk/web2c/luatexdir/tex/texdeffont.h
+++ b/source/texk/web2c/luatexdir/tex/texdeffont.h
@@ -22,7 +22,7 @@
#ifndef TEXDEFFONT_H
# define TEXDEFFONT_H
-extern integer font_bytes;
+extern int font_bytes;
extern void set_cur_font(internal_font_number f);
diff --git a/source/texk/web2c/luatexdir/tex/texfileio.c b/source/texk/web2c/luatexdir/tex/texfileio.c
index 782c169ba15856a32ceb68852501736011a94f9a..8712a442eda9930344f797736ee5f3a56f1a7944 100644
--- a/source/texk/web2c/luatexdir/tex/texfileio.c
+++ b/source/texk/web2c/luatexdir/tex/texfileio.c
@@ -83,8 +83,8 @@ in the traditional sense.
Signalling this fact is achieved by having two arrays of integers.
*/
-integer *input_file_callback_id;
-integer read_file_callback_id[17];
+int *input_file_callback_id;
+int read_file_callback_id[17];
/* Handle -output-directory.
We assume that it is OK to look here first. Possibly it
@@ -271,9 +271,9 @@ boolean luatex_open_output(FILE ** f_ptr, char *fn, const_string fopen_mode)
boolean lua_a_open_in(alpha_file * f, char *fn, quarterword n)
{
- integer k;
+ int k;
char *fnam; /* string returned by find callback */
- integer callback_id;
+ int callback_id;
boolean ret = true; /* return value */
boolean file_ok = true; /* the status so far */
if (n == 0) {
@@ -315,7 +315,7 @@ boolean lua_a_open_out(alpha_file * f, char *fn, quarterword n)
{
boolean test;
str_number fnam;
- integer callback_id;
+ int callback_id;
boolean ret = false;
callback_id = callback_defined(find_write_file_callback);
if (callback_id > 0) {
@@ -336,7 +336,7 @@ boolean lua_b_open_out(alpha_file * f, char *fn)
{
boolean test;
str_number fnam;
- integer callback_id;
+ int callback_id;
boolean ret = false;
callback_id = callback_defined(find_output_file_callback);
if (callback_id > 0) {
@@ -356,7 +356,7 @@ boolean lua_b_open_out(alpha_file * f, char *fn)
void lua_a_close_in(alpha_file f, quarterword n)
{ /* close a text file */
boolean ret;
- integer callback_id;
+ int callback_id;
if (n == 0)
callback_id = input_file_callback_id[iindex];
else
@@ -396,9 +396,9 @@ representing the beginning and ending of a line of text.
*/
packed_ASCII_code *buffer; /* lines of characters being read */
-integer first; /* the first unused position in |buffer| */
-integer last; /* end of the line just input to |buffer| */
-integer max_buf_stack; /* largest index used in |buffer| */
+int first; /* the first unused position in |buffer| */
+int last; /* end of the line just input to |buffer| */
+int max_buf_stack; /* largest index used in |buffer| */
/*
The |lua_input_ln| function brings the next line of input from the specified
@@ -445,8 +445,8 @@ finer tuning is often possible at well-developed \PASCAL\ sites.
boolean lua_input_ln(alpha_file f, quarterword n, boolean bypass_eoln)
{
boolean lua_result;
- integer last_ptr;
- integer callback_id;
+ int last_ptr;
+ int callback_id;
(void) bypass_eoln; /* todo: variable can be removed */
if (n == 0)
callback_id = input_file_callback_id[iindex];
@@ -593,7 +593,7 @@ The input is placed into locations |first| through |last-1| of the
void term_input(void)
{ /* gets a line from the terminal */
- integer k; /* index into |buffer| */
+ int k; /* index into |buffer| */
update_terminal(); /* now the user sees the prompt for sure */
if (!input_ln(term_in, true))
fatal_error("End of file on the terminal!");
@@ -692,16 +692,16 @@ These system area names will, of course, vary from place to place.
char *pack_file_name(str_number n, str_number a, str_number e)
{
ASCII_code c; /* character being packed */
- unsigned char *j; /* index into |str_pool| */
- integer k = 0; /* number of positions filled in |fn| */
+ unsigned char *j; /* index into |str_pool| */
+ int k = 0; /* number of positions filled in |fn| */
unsigned char *fn = xmallocarray(packed_ASCII_code,
str_length(a) + str_length(n) +
str_length(e) + 1);
- for (j = str_string(a); j < str_string(a)+str_length(a); j++)
+ for (j = str_string(a); j < str_string(a) + str_length(a); j++)
append_to_fn(*j);
- for (j = str_string(n); j < str_string(n)+str_length(n); j++)
+ for (j = str_string(n); j < str_string(n) + str_length(n); j++)
append_to_fn(*j);
- for (j = str_string(e); j < str_string(e)+str_length(e); j++)
+ for (j = str_string(e); j < str_string(e) + str_length(e); j++)
append_to_fn(*j);
fn[k] = 0;
return (char *) fn;
@@ -793,7 +793,7 @@ We have |job_name=0| if and only if the `\.{log}' file has not been opened,
except of course for a short time just after |job_name| has become nonzero.
*/
-unsigned char *texmf_log_name; /* full name of the log file */
+unsigned char *texmf_log_name; /* full name of the log file */
/*
The |open_log_file| routine is used to open the transcript file and to help
@@ -831,7 +831,7 @@ void open_log_file(void)
selector = term_only;
fn = prompt_file_name("transcript file name", ".log");
}
- texmf_log_name = (unsigned char *)xstrdup(fn);
+ texmf_log_name = (unsigned char *) xstrdup(fn);
selector = log_only;
log_opened = true;
if (callback_defined(start_run_callback) == 0) {
@@ -894,12 +894,12 @@ void start_input(void)
/* |open_log_file| doesn't |show_context|, so |limit|
and |loc| needn't be set to meaningful values yet */
if (tracefilenames) {
- if (term_offset + (int)str_length(iname) > max_print_line - 2)
+ if (term_offset + (int) str_length(iname) > max_print_line - 2)
print_ln();
else if ((term_offset > 0) || (file_offset > 0))
print_char(' ');
print_char('(');
- tprint_file_name(NULL, (unsigned char *)fullnameoffile, NULL);
+ tprint_file_name(NULL, (unsigned char *) fullnameoffile, NULL);
}
incr(open_parens);
update_terminal();
@@ -1028,7 +1028,7 @@ int open_outfile(FILE ** f, char *name, char *mode)
/* the caller sets tfm_buffer=NULL and tfm_size=0 */
-int readbinfile(FILE * f, unsigned char **tfm_buffer, integer * tfm_size)
+int readbinfile(FILE * f, unsigned char **tfm_buffer, int *tfm_size)
{
void *buf;
int size;
@@ -1039,7 +1039,7 @@ int readbinfile(FILE * f, unsigned char **tfm_buffer, integer * tfm_size)
if (fseek(f, 0, SEEK_SET) == 0) {
if (fread((void *) buf, size, 1, f) == 1) {
*tfm_buffer = (unsigned char *) buf;
- *tfm_size = (integer) size;
+ *tfm_size = (int) size;
return 1;
}
}
diff --git a/source/texk/web2c/luatexdir/tex/texfileio.h b/source/texk/web2c/luatexdir/tex/texfileio.h
index 0fbebc5391215a54ec73a78b0aa054d490b71542..d967c19de3e8dbb0e134ea2de971d812ff24bc2a 100644
--- a/source/texk/web2c/luatexdir/tex/texfileio.h
+++ b/source/texk/web2c/luatexdir/tex/texfileio.h
@@ -22,8 +22,8 @@
#ifndef TEXFILEIO_H
# define TEXFILEIO_H
-extern integer *input_file_callback_id;
-extern integer read_file_callback_id[17];
+extern int *input_file_callback_id;
+extern int read_file_callback_id[17];
extern char *luatex_find_file(char *s, int callback_index);
extern char *luatex_find_read_file(char *s, int n, int callback_index);
@@ -39,9 +39,9 @@ extern void lua_a_close_in(alpha_file f, quarterword n);
extern void lua_a_close_out(alpha_file f);
extern packed_ASCII_code *buffer;
-extern integer first;
-extern integer last;
-extern integer max_buf_stack;
+extern int first;
+extern int last;
+extern int max_buf_stack;
extern boolean lua_input_ln(alpha_file f, quarterword n, boolean bypass_eoln);
@@ -113,7 +113,7 @@ extern boolean name_in_progress; /* is a file name being scanned? */
extern str_number job_name; /* principal file name */
extern boolean log_opened; /* has the transcript file been opened? */
-extern unsigned char *texmf_log_name; /* full name of the log file */
+extern unsigned char *texmf_log_name; /* full name of the log file */
extern void open_log_file(void);
extern void start_input(void);
@@ -124,7 +124,7 @@ extern boolean zopen_w_input(FILE **, char *, int, const_string fopen_mode);
extern boolean zopen_w_output(FILE **, char *, const_string fopen_mode);
extern void zwclose(FILE *);
-extern int readbinfile(FILE * f, unsigned char **b, integer * s);
+extern int readbinfile(FILE * f, unsigned char **b, int *s);
# define read_tfm_file readbinfile
# define read_vf_file readbinfile
diff --git a/source/texk/web2c/luatexdir/tex/texmath.c b/source/texk/web2c/luatexdir/tex/texmath.c
index 43b60afd30bc14532a3d49edfbb12c033bce40ad..84e1726ac3032406a8ba650215c38e9e0760c9af 100644
--- a/source/texk/web2c/luatexdir/tex/texmath.c
+++ b/source/texk/web2c/luatexdir/tex/texmath.c
@@ -40,7 +40,7 @@ static const char _svn_version[] =
#define var_code 7
-extern void rawset_sa_item(sa_tree hed, integer n, integer v);
+extern void rawset_sa_item(sa_tree hed, int n, int v);
/* TODO: not sure if this is the right order */
#define back_error(A,B) do { \
@@ -177,15 +177,15 @@ void flush_math(void)
static sa_tree math_fam_head = NULL;
-integer fam_fnt(integer fam_id, integer size_id)
+int fam_fnt(int fam_id, int size_id)
{
- integer n = fam_id + (256 * size_id);
- return (integer) get_sa_item(math_fam_head, n);
+ int n = fam_id + (256 * size_id);
+ return (int) get_sa_item(math_fam_head, n);
}
-void def_fam_fnt(integer fam_id, integer size_id, integer f, integer lvl)
+void def_fam_fnt(int fam_id, int size_id, int f, int lvl)
{
- integer n = fam_id + (256 * size_id);
+ int n = fam_id + (256 * size_id);
set_sa_item(math_fam_head, n, f, lvl);
fixup_math_parameters(fam_id, size_id, f, lvl);
if (int_par(tracing_assigns_code) > 0) {
@@ -201,14 +201,14 @@ void def_fam_fnt(integer fam_id, integer size_id, integer f, integer lvl)
}
}
-void unsave_math_fam_data(integer gl)
+void unsave_math_fam_data(int gl)
{
sa_stack_item st;
if (math_fam_head->stack == NULL)
return;
while (math_fam_head->stack_ptr > 0 &&
abs(math_fam_head->stack[math_fam_head->stack_ptr].level)
- >= (integer) gl) {
+ >= (int) gl) {
st = math_fam_head->stack[math_fam_head->stack_ptr];
if (st.level > 0) {
rawset_sa_item(math_fam_head, st.code, st.value);
@@ -242,7 +242,7 @@ static sa_tree math_param_head = NULL;
void def_math_param(int param_id, int style_id, scaled value, int lvl)
{
- integer n = param_id + (256 * style_id);
+ int n = param_id + (256 * style_id);
set_sa_item(math_param_head, n, value, lvl);
if (int_par(tracing_assigns_code) > 0) {
begin_diagnostic();
@@ -259,19 +259,19 @@ void def_math_param(int param_id, int style_id, scaled value, int lvl)
scaled get_math_param(int param_id, int style_id)
{
- integer n = param_id + (256 * style_id);
+ int n = param_id + (256 * style_id);
return (scaled) get_sa_item(math_param_head, n);
}
-void unsave_math_param_data(integer gl)
+void unsave_math_param_data(int gl)
{
sa_stack_item st;
if (math_param_head->stack == NULL)
return;
while (math_param_head->stack_ptr > 0 &&
abs(math_param_head->stack[math_param_head->stack_ptr].level)
- >= (integer) gl) {
+ >= (int) gl) {
st = math_param_head->stack[math_param_head->stack_ptr];
if (st.level > 0) {
rawset_sa_item(math_param_head, st.code, st.value);
@@ -297,7 +297,7 @@ void unsave_math_param_data(integer gl)
/* saving and unsaving of both */
-void unsave_math_data(integer gl)
+void unsave_math_data(int gl)
{
unsave_math_fam_data(gl);
unsave_math_param_data(gl);
@@ -575,7 +575,7 @@ void print_fam_and_char(pointer p)
void print_delimiter(pointer p)
{
- integer a;
+ int a;
if (small_fam(p) < 0) {
print_int(-1); /* this should never happen */
} else if (small_fam(p) < 16 && large_fam(p) < 16 &&
@@ -610,7 +610,7 @@ distinguished from a missing field, because these are not equivalent
void print_subsidiary_data(pointer p, ASCII_code c)
{ /* display a noad field */
- if ((int)cur_length >= depth_threshold) {
+ if ((int) cur_length >= depth_threshold) {
if (p != null)
tprint(" []");
} else {
@@ -894,7 +894,7 @@ void enter_display_math(void)
scaled l; /* new |display_width| */
scaled s; /* new |display_indent| */
pointer p;
- integer n; /* scope of paragraph shape specification */
+ int n; /* scope of paragraph shape specification */
if (head == tail || /* `\.{\\noindent\$\$}' or `\.{\$\${ }\$\$}' */
(vlink(head) == tail && /* the 2nd of \.{\$\${ }\$\$} \.{\$\${ }\$\$} */
type(tail) == whatsit_node &&
@@ -967,8 +967,8 @@ delcodeval do_scan_extdef_del_code(int extcode, boolean doclass)
NULL
};
delcodeval d;
- integer cur_val1; /* and the global |cur_val| */
- integer mcls, msfam = 0, mschr = 0, mlfam = 0, mlchr = 0;
+ int cur_val1; /* and the global |cur_val| */
+ int mcls, msfam = 0, mschr = 0, mlfam = 0, mlchr = 0;
mcls = 0;
if (extcode == tex_mathcode) { /* \delcode, this is the easiest */
scan_int();
@@ -1054,7 +1054,7 @@ delcodeval do_scan_extdef_del_code(int extcode, boolean doclass)
void scan_extdef_del_code(int level, int extcode)
{
delcodeval d;
- integer p;
+ int p;
scan_char_num();
p = cur_val;
scan_optional_equals();
@@ -1070,7 +1070,7 @@ mathcodeval scan_mathchar(int extcode)
NULL
};
mathcodeval d;
- integer mcls = 0, mfam = 0, mchr = 0;
+ int mcls = 0, mfam = 0, mchr = 0;
if (extcode == tex_mathcode) { /* \mathcode */
/* "TFCC */
scan_int();
@@ -1137,7 +1137,7 @@ mathcodeval scan_mathchar(int extcode)
void scan_extdef_math_code(int level, int extcode)
{
mathcodeval d;
- integer p;
+ int p;
scan_char_num();
p = cur_val;
scan_optional_equals();
@@ -1165,7 +1165,7 @@ mathcodeval scan_delimiter_as_mathchar(int extcode)
* where the |\Umathchardef| is executed
*/
-mathcodeval mathchar_from_integer(integer value, int extcode)
+mathcodeval mathchar_from_integer(int value, int extcode)
{
mathcodeval mval;
mval.origin_value = extcode;
@@ -1388,7 +1388,7 @@ delimiter is to be placed; the second tells if this delimiter follows
*/
-void scan_delimiter(pointer p, integer r)
+void scan_delimiter(pointer p, int r)
{
delcodeval dval;
if (r == tex_mathcode) { /* \radical */
@@ -2134,7 +2134,7 @@ static void finish_displayed_math(boolean l, pointer a, pointer p)
void after_math(void)
{
boolean danger; /* not enough symbol fonts are present */
- integer m; /* |mmode| or |-mmode| */
+ int m; /* |mmode| or |-mmode| */
pointer p; /* the formula */
pointer a = null; /* box containing equation number */
boolean l = false; /* `\.{\\leqno}' instead of `\.{\\eqno}' */
diff --git a/source/texk/web2c/luatexdir/tex/texmath.h b/source/texk/web2c/luatexdir/tex/texmath.h
index 12de0b4c56020b0e730df31529c6c3210ec5fb64..d01c6d88eafe9af7554075530cb30f062defe3dc 100644
--- a/source/texk/web2c/luatexdir/tex/texmath.h
+++ b/source/texk/web2c/luatexdir/tex/texmath.h
@@ -78,12 +78,11 @@ extern void after_math(void);
extern void scan_extdef_del_code(int level, int extcode);
extern void scan_extdef_math_code(int level, int extcode);
-extern integer fam_fnt(integer fam_id, integer size_id);
-extern void def_fam_fnt(integer fam_id, integer size_id, integer f,
- integer lvl);
+extern int fam_fnt(int fam_id, int size_id);
+extern void def_fam_fnt(int fam_id, int size_id, int f, int lvl);
extern void dump_math_data(void);
extern void undump_math_data(void);
-void unsave_math_data(integer lvl);
+void unsave_math_data(int lvl);
/*
@ We also need to compute the change in style between mlists and their
diff --git a/source/texk/web2c/luatexdir/tex/texnodes.c b/source/texk/web2c/luatexdir/tex/texnodes.c
index 01c1dfa4959c1f311ad38d90343059e4c9ee46c1..52117736f227b7315c5a9768e37fa68e2667409a 100644
--- a/source/texk/web2c/luatexdir/tex/texnodes.c
+++ b/source/texk/web2c/luatexdir/tex/texnodes.c
@@ -52,14 +52,14 @@ halfword rover = 0;
halfword free_chain[MAX_CHAIN_SIZE] = { null };
-static integer my_prealloc = 0;
+static int my_prealloc = 0;
int fix_node_lists = 1;
int free_error_seen = 0;
int copy_error_seen = 0;
-halfword slow_get_node(integer s); /* defined below */
+halfword slow_get_node(int s); /* defined below */
int copy_error(halfword p); /* define below */
#define fake_node 100
@@ -873,8 +873,8 @@ void flush_node(halfword p)
return;
#ifdef DEBUG
- fprintf(DEBUG_OUT, "Free-ing %s node %d\n", get_node_name(type(p), subtype(p)),
- (int) p);
+ fprintf(DEBUG_OUT, "Free-ing %s node %d\n",
+ get_node_name(type(p), subtype(p)), (int) p);
#endif
if (free_error(p))
return;
@@ -1389,7 +1389,7 @@ void fix_node_list(halfword head)
}
}
-halfword get_node(integer s)
+halfword get_node(int s)
{
register halfword r;
@@ -1421,7 +1421,7 @@ void print_free_chain(int c)
fprintf(stdout, "null;\n");
}
-void free_node(halfword p, integer s)
+void free_node(halfword p, int s)
{
if (p <= my_prealloc) {
@@ -1447,7 +1447,7 @@ void free_node(halfword p, integer s)
var_used -= s; /* maintain statistics */
}
-void free_node_chain(halfword q, integer s)
+void free_node_chain(halfword q, int s)
{
register halfword p = q;
while (vlink(p) != null) {
@@ -1466,7 +1466,7 @@ void free_node_chain(halfword q, integer s)
}
-void init_node_mem(integer t)
+void init_node_mem(int t)
{
my_prealloc = var_mem_stat_max;
assert(whatsit_node_data[user_defined_node].id == user_defined_node);
@@ -1611,7 +1611,7 @@ void dump_node_mem(void)
void undump_node_mem(void)
{
- integer x;
+ int x;
undump_int(x);
undump_int(rover);
var_mem_max = (x < 100000 ? 100000 : x);
@@ -1655,7 +1655,7 @@ void test_rovers(char *s)
# define test_rovers(a)
#endif
-halfword slow_get_node(integer s)
+halfword slow_get_node(int s)
{
register int t;
@@ -1818,7 +1818,7 @@ void print_node_mem_stats(void)
halfword j;
char msg[256];
char *s;
- integer free_chain_counts[MAX_CHAIN_SIZE] = { 0 };
+ int free_chain_counts[MAX_CHAIN_SIZE] = { 0 };
snprintf(msg, 255, " %d words of node memory still in use:",
(int) (var_used + my_prealloc));
tprint_nl(msg);
@@ -2143,7 +2143,7 @@ void print_short_node_contents(halfword p)
}
-void show_pdftex_whatsit_rule_spec(integer p)
+void show_pdftex_whatsit_rule_spec(int p)
{
tprint("(");
print_rule_dimen(height(p));
@@ -2174,7 +2174,7 @@ void print_write_whatsit(char *s, pointer p)
}
-void show_whatsit_node(integer p)
+void show_whatsit_node(int p)
{
switch (subtype(p)) {
case open_node:
@@ -2508,9 +2508,9 @@ void show_whatsit_node(integer p)
flush_char(); \
} while (0)
-void show_node_list(integer p)
+void show_node_list(int p)
{ /* prints a node list symbolically */
- integer n; /* the number of items already printed at this level */
+ int n; /* the number of items already printed at this level */
real g; /* a glue ratio, as a floating point number */
if ((int) cur_length > depth_threshold) {
if (p > null)
@@ -2879,7 +2879,7 @@ void delete_glue_ref(halfword p)
fast_delete_glue_ref(p);
}
-integer var_used;
+int var_used;
halfword temp_ptr; /* a pointer variable for occasional emergency use */
/*
@@ -2891,7 +2891,7 @@ trusted: after an assignment to an attribute register, and after a group has
ended.
*/
-integer max_used_attr; /* maximum assigned attribute id */
+int max_used_attr; /* maximum assigned attribute id */
halfword attr_list_cache;
/*
@@ -3060,7 +3060,7 @@ conversion from |mlist| to |hlist|).
@d y_displace(#)==vlink(#+4) { vertical displacement }
*/
-halfword new_glyph(integer f, integer c)
+halfword new_glyph(int f, int c)
{
halfword p = null; /* the new node */
if ((f == 0) || (char_exists(f, c))) {
@@ -3093,7 +3093,7 @@ kerning steps of the program.
|subtype_normal| by |new_ligkern|.
*/
-quarterword norm_min(integer h)
+quarterword norm_min(int h)
{
if (h <= 0)
return 1;
@@ -3103,7 +3103,7 @@ quarterword norm_min(integer h)
return h;
}
-halfword new_char(integer f, integer c)
+halfword new_char(int f, int c)
{
halfword p; /* the new node */
p = new_glyph_node();
@@ -3421,7 +3421,7 @@ break will be forced.
be able to guess what comes next.
*/
-halfword new_penalty(integer m)
+halfword new_penalty(int m)
{
halfword p; /* the new node */
p = new_node(penalty_node, 0); /* the |subtype| is not used */
diff --git a/source/texk/web2c/luatexdir/tex/texnodes.h b/source/texk/web2c/luatexdir/tex/texnodes.h
index 60d99eaa43fb842b7b49065d8a6d35fd974c49d3..a380382aa3db9b340c9a19fa4b7035f44ca5a78d 100644
--- a/source/texk/web2c/luatexdir/tex/texnodes.h
+++ b/source/texk/web2c/luatexdir/tex/texnodes.h
@@ -669,7 +669,7 @@ extern int has_attribute(halfword n, int c, int w);
extern halfword new_span_node(halfword n, int c, scaled w);
extern void print_short_node_contents(halfword n);
-extern void show_node_list(integer i);
+extern void show_node_list(int i);
extern pointer actual_box_width(pointer r, scaled base_width);
/* TH: these two defines still need checking. The node ordering in luatex is not
@@ -739,19 +739,19 @@ typedef enum {
extern halfword tail_of_list(halfword p);
extern void delete_glue_ref(halfword p);
-extern integer var_used;
+extern int var_used;
extern halfword temp_ptr;
# define cache_disabled max_halfword
-extern integer max_used_attr;
+extern int max_used_attr;
extern halfword attr_list_cache;
extern halfword new_null_box(void);
extern halfword new_rule(void);
-extern halfword new_glyph(integer f, integer c);
-extern quarterword norm_min(integer h);
-extern halfword new_char(integer f, integer c);
+extern halfword new_glyph(int f, int c);
+extern quarterword norm_min(int h);
+extern halfword new_char(int f, int c);
extern scaled glyph_width(halfword p);
extern scaled glyph_height(halfword p);
extern scaled glyph_depth(halfword p);
@@ -762,6 +762,6 @@ extern halfword new_param_glue(int n);
extern halfword new_glue(halfword q);
extern halfword new_skip_param(int n);
extern halfword new_kern(scaled w);
-extern halfword new_penalty(integer m);
+extern halfword new_penalty(int m);
#endif
diff --git a/source/texk/web2c/luatexdir/tex/textcodes.c b/source/texk/web2c/luatexdir/tex/textcodes.c
index ab11f6bcad201a89739f0c9c8d49b53bfaa1f910..bc0d19b7ea553701d1993c6c9d59450d34bee7a4 100644
--- a/source/texk/web2c/luatexdir/tex/textcodes.c
+++ b/source/texk/web2c/luatexdir/tex/textcodes.c
@@ -45,12 +45,12 @@ static sa_tree sfcode_head = NULL;
#define CATCODEDEFAULT 12
-void set_lc_code(integer n, halfword v, quarterword gl)
+void set_lc_code(int n, halfword v, quarterword gl)
{
set_sa_item(lccode_head, n, v, gl);
}
-halfword get_lc_code(integer n)
+halfword get_lc_code(int n)
{
return (halfword) get_sa_item(lccode_head, n);
}
@@ -75,12 +75,12 @@ static void undumplccodes(void)
lccode_head = undump_sa_tree();
}
-void set_uc_code(integer n, halfword v, quarterword gl)
+void set_uc_code(int n, halfword v, quarterword gl)
{
set_sa_item(uccode_head, n, v, gl);
}
-halfword get_uc_code(integer n)
+halfword get_uc_code(int n)
{
return (halfword) get_sa_item(uccode_head, n);
}
@@ -105,12 +105,12 @@ static void undumpuccodes(void)
uccode_head = undump_sa_tree();
}
-void set_sf_code(integer n, halfword v, quarterword gl)
+void set_sf_code(int n, halfword v, quarterword gl)
{
set_sa_item(sfcode_head, n, v, gl);
}
-halfword get_sf_code(integer n)
+halfword get_sf_code(int n)
{
return (halfword) get_sa_item(sfcode_head, n);
}
@@ -137,14 +137,14 @@ static void undumpsfcodes(void)
static sa_tree *catcode_heads = NULL;
-static integer catcode_max = 0;
+static int catcode_max = 0;
static unsigned char *catcode_valid = NULL;
#define CATCODE_MAX 65535
#define update_catcode_max(h) if (h > catcode_max) catcode_max = h
-void set_cat_code(integer h, integer n, halfword v, quarterword gl)
+void set_cat_code(int h, int n, halfword v, quarterword gl)
{
sa_tree s = catcode_heads[h];
update_catcode_max(h);
@@ -155,7 +155,7 @@ void set_cat_code(integer h, integer n, halfword v, quarterword gl)
set_sa_item(s, n, v, gl);
}
-halfword get_cat_code(integer h, integer n)
+halfword get_cat_code(int h, int n)
{
sa_tree s = catcode_heads[h];
update_catcode_max(h);
@@ -166,7 +166,7 @@ halfword get_cat_code(integer h, integer n)
return (halfword) get_sa_item(s, n);
}
-void unsave_cat_codes(integer h, quarterword gl)
+void unsave_cat_codes(int h, quarterword gl)
{
int k;
update_catcode_max(h);
@@ -176,7 +176,7 @@ void unsave_cat_codes(integer h, quarterword gl)
}
}
-void clearcatcodestack(integer h)
+void clearcatcodestack(int h)
{
clear_sa_stack(catcode_heads[h]);
}
@@ -215,7 +215,7 @@ static void dumpcatcodes(void)
static void undumpcatcodes(void)
{
- integer total, k, x;
+ int total, k, x;
xfree(catcode_heads);
xfree(catcode_valid);
catcode_heads = Mxmalloc_array(sa_tree, (CATCODE_MAX + 1));
diff --git a/source/texk/web2c/luatexdir/tex/textcodes.h b/source/texk/web2c/luatexdir/tex/textcodes.h
index 0cbd0367d7d84a8c73adfb3f64c833482c18e841..24335c8de169f4a704e9927dc99764d7960fc12f 100644
--- a/source/texk/web2c/luatexdir/tex/textcodes.h
+++ b/source/texk/web2c/luatexdir/tex/textcodes.h
@@ -23,15 +23,15 @@
# define TEXTCODES_H
-void set_lc_code(integer n, halfword v, quarterword gl);
-halfword get_lc_code(integer n);
-void set_uc_code(integer n, halfword v, quarterword gl);
-halfword get_uc_code(integer n);
-void set_sf_code(integer n, halfword v, quarterword gl);
-halfword get_sf_code(integer n);
-void set_cat_code(integer h, integer n, halfword v, quarterword gl);
-halfword get_cat_code(integer h, integer n);
-void unsave_cat_codes(integer h, quarterword gl);
+void set_lc_code(int n, halfword v, quarterword gl);
+halfword get_lc_code(int n);
+void set_uc_code(int n, halfword v, quarterword gl);
+halfword get_uc_code(int n);
+void set_sf_code(int n, halfword v, quarterword gl);
+halfword get_sf_code(int n);
+void set_cat_code(int h, int n, halfword v, quarterword gl);
+halfword get_cat_code(int h, int n);
+void unsave_cat_codes(int h, quarterword gl);
int valid_catcode_table(int h);
void initex_cat_codes(int h);
void unsave_text_codes(quarterword grouplevel);
diff --git a/source/texk/web2c/luatexdir/tex/textoken.c b/source/texk/web2c/luatexdir/tex/textoken.c
index 71410c65c17f3a55d8b7664538867762cb7be60a..ee402597f4202e69f800da69400789be875432c5 100644
--- a/source/texk/web2c/luatexdir/tex/textoken.c
+++ b/source/texk/web2c/luatexdir/tex/textoken.c
@@ -74,7 +74,7 @@ maximum memory usage. When code between the delimiters |@!stat| $\ldots$
report these statistics when |tracing_stats| is sufficiently large.
*/
-integer var_used, dyn_used; /* how much memory is in use */
+int var_used, dyn_used; /* how much memory is in use */
halfword avail; /* head of the list of available one-word nodes */
halfword fix_mem_end; /* the last one-word node used in |mem| */
@@ -126,7 +126,7 @@ If, that doesn't work, we have to quit.
halfword get_avail(void)
{ /* single-word node allocation */
halfword p; /* the new node being got */
- integer t;
+ int t;
p = avail; /* get top location in the |avail| stack */
if (p != null) {
avail = token_link(avail); /* and pop it off */
@@ -309,15 +309,15 @@ form of control sequences that are not followed by a blank space, e.g.,
a real control sequence named \.{BAD} would come out `\.{\\BAD\ }'.
*/
-void show_token_list(integer p, integer q, integer l)
+void show_token_list(int p, int q, int l)
{
- integer m, c; /* pieces of a token */
+ int m, c; /* pieces of a token */
ASCII_code match_chr; /* character used in a `|match|' */
ASCII_code n; /* the highest parameter number, as an ASCII digit */
match_chr = '#';
n = '0';
tally = 0;
- if (l<0)
+ if (l < 0)
l = 0x3FFFFFFF;
while ((p != null) && (tally < l)) {
if (p == q) {
@@ -517,8 +517,8 @@ boolean scan_keyword(char *s)
}
flush_list(token_link(backup_head));
}
- cur_cs = save_cur_cs;
- return true;
+ cur_cs = save_cur_cs;
+ return true;
}
/* We can not return |undefined_control_sequence| under some conditions
@@ -656,7 +656,7 @@ statements waiting to be input, it is changed by |luatokencall|.
*/
boolean force_eof; /* should the next \.{\\input} be aborted early? */
-integer luacstrings; /* how many lua strings are waiting to be input? */
+int luacstrings; /* how many lua strings are waiting to be input? */
/*
If the user has set the |pausing| parameter to some positive value,
@@ -669,7 +669,7 @@ used instead of the line in the file.
void firm_up_the_line(void)
{
- integer k; /* an index into |buffer| */
+ int k; /* an index into |buffer| */
ilimit = last;
if (pausing > 0) {
if (interaction > nonstop_mode) {
@@ -1090,7 +1090,7 @@ static boolean process_sup_mark(void)
buffer and the process is repeated, slowly but surely.
*/
-static boolean check_expanded_code(integer * kk); /* below */
+static boolean check_expanded_code(int *kk); /* below */
static int scan_control_sequence(void)
{
@@ -1100,7 +1100,7 @@ static int scan_control_sequence(void)
} else {
register int cat; /* |cat_code(cur_chr)|, usually */
while (1) {
- integer k = iloc;
+ int k = iloc;
do_buffer_to_unichar(cur_chr, k);
do_get_cat_code(cat);
if (cat != letter_cmd || k > ilimit) {
@@ -1144,7 +1144,7 @@ static int scan_control_sequence(void)
the buffer left two or three places.
*/
-static boolean check_expanded_code(integer * kk)
+static boolean check_expanded_code(int *kk)
{
int l;
int k = *kk;
@@ -1545,11 +1545,11 @@ static halfword lua_str_toks(lstring b)
halfword p; /* tail of the token list */
halfword q; /* new node being added to the token list via |store_new_token| */
halfword t; /* token being appended */
- unsigned char *k; /* index into string */
+ unsigned char *k; /* index into string */
p = temp_token_head;
set_token_link(p, null);
- k = (unsigned char *)b.s;
- while (k < (unsigned char *)b.s+b.l) {
+ k = (unsigned char *) b.s;
+ while (k < (unsigned char *) b.s + b.l) {
t = pool_to_unichar(k);
k += utf8_size(t);
if (t == ' ') {
@@ -1585,7 +1585,7 @@ halfword str_toks(lstring s)
set_token_link(p, null);
k = s.s;
l = k + s.l;
- while (k<l) {
+ while (k < l) {
t = pool_to_unichar(k);
k += utf8_size(t);
if (t == ' ')
@@ -1611,9 +1611,9 @@ void ins_the_toks(void)
the code |c|. The function exists because lua code and tex code can
both call it to convert something. */
-static boolean print_convert_string(halfword c, integer i)
+static boolean print_convert_string(halfword c, int i)
{
- integer ff; /* for use with |set_ff| */
+ int ff; /* for use with |set_ff| */
boolean ret = true;
switch (c) {
case number_code:
@@ -1656,7 +1656,7 @@ static boolean print_convert_string(halfword c, integer i)
print(job_name);
break;
case font_name_code:
- append_string((unsigned char *)font_name(i),strlen(font_name(i)));
+ append_string((unsigned char *) font_name(i), strlen(font_name(i)));
if (font_size(i) != font_dsize(i)) {
tprint(" at ");
print_scaled(font_size(i));
@@ -1701,9 +1701,9 @@ static boolean print_convert_string(halfword c, integer i)
}
-integer scan_lua_state(void)
+int scan_lua_state(void)
{
- integer sn = 0;
+ int sn = 0;
if (scan_keyword("name")) {
scan_pdf_ext_toks();
sn = def_ref;
@@ -1745,10 +1745,10 @@ void conv_toks(void)
halfword save_warning_index;
boolean bool; /* temp boolean */
str_number s; /* first temp string */
- integer sn; /* lua chunk name */
+ int sn; /* lua chunk name */
str_number u = 0; /* third temp string, will become non-nil if a string is already being built */
- integer i = 0; /* first temp integer */
- integer j = 0; /* second temp integer */
+ int i = 0; /* first temp integer */
+ int j = 0; /* second temp integer */
int c = cur_chr; /* desired type of conversion */
str_number str;
/* Scan the argument for command |c| */
@@ -1850,15 +1850,15 @@ void conv_toks(void)
case lua_escape_string_code:
{
lstring str;
- int l = 0;
+ int l = 0;
save_scanner_status = scanner_status;
save_def_ref = def_ref;
save_warning_index = warning_index;
scan_pdf_ext_toks();
bool = in_lua_escape;
in_lua_escape = true;
- str.s = (unsigned char *)tokenlist_to_cstring(def_ref, false, &l);
- str.l = (unsigned)l;
+ str.s = (unsigned char *) tokenlist_to_cstring(def_ref, false, &l);
+ str.l = (unsigned) l;
in_lua_escape = bool;
delete_token_ref(def_ref);
def_ref = save_def_ref;
@@ -2033,7 +2033,7 @@ boolean is_convert(halfword c)
return (c == convert_cmd);
}
-str_number the_convert_string(halfword c, integer i)
+str_number the_convert_string(halfword c, int i)
{
int old_setting; /* saved |selector| setting */
str_number ret = 0;
@@ -2075,11 +2075,11 @@ macro definition, and makes |cur_val| point to it. Parameter |r| points
to the control sequence that will receive this token list.
*/
-void read_toks(integer n, halfword r, halfword j)
+void read_toks(int n, halfword r, halfword j)
{
halfword p; /* tail of the token list */
halfword q; /* new node being added to the token list via |store_new_token| */
- integer s; /* saved value of |align_state| */
+ int s; /* saved value of |align_state| */
int m; /* stream number */
scanner_status = defining;
warning_index = r;
@@ -2255,9 +2255,9 @@ str_number tokens_to_string(halfword p)
char *tokenlist_to_cstring(int pp, int inhibit_par, int *siz)
{
- register integer p, c, m;
- integer q;
- integer infop;
+ register int p, c, m;
+ int q;
+ int infop;
char *s, *sh;
int e;
char *ret;
@@ -2385,7 +2385,9 @@ char *tokenlist_to_cstring(int pp, int inhibit_par, int *siz)
lstring *tokenlist_to_lstring(int pp, int inhibit_par)
{
lstring *ret = xmalloc(sizeof(lstring));
- ret->s = (unsigned char *)tokenlist_to_cstring(pp, inhibit_par, (int *) &(ret->l));
+ ret->s =
+ (unsigned char *) tokenlist_to_cstring(pp, inhibit_par,
+ (int *) &(ret->l));
return ret;
}
diff --git a/source/texk/web2c/luatexdir/tex/textoken.h b/source/texk/web2c/luatexdir/tex/textoken.h
index 0ea0bed03535d5e53e845517d676f1a943761f93..f5bd5f353f790cf5343f78dd6c776cb2830fb00f 100644
--- a/source/texk/web2c/luatexdir/tex/textoken.h
+++ b/source/texk/web2c/luatexdir/tex/textoken.h
@@ -42,7 +42,7 @@
# define end_match_token 0x1C00000 /* $2^{21}\cdot|end_match|$ */
# define protected_token 0x1C00001 /* $2^{21}\cdot|end_match|+1$ */
-#include "tex/stringpool.h"
+# include "tex/stringpool.h"
typedef struct smemory_word_ {
halfword hhrh;
@@ -64,7 +64,7 @@ extern halfword backup_head; /* head of token list built by |scan_keyword| */
extern void initialize_tokens(void);
-extern integer dyn_used;
+extern int dyn_used;
# define token_info(a) fixmem[(a)].hhlh
# define token_link(a) fixmem[(a)].hhrh
@@ -99,7 +99,7 @@ the places that would otherwise account for the most calls of |get_avail|.
extern void print_meaning(void);
extern void flush_list(halfword p);
-extern void show_token_list(integer p, integer q, integer l);
+extern void show_token_list(int p, int q, int l);
extern void token_show(halfword p);
# define token_ref_count(a) token_info((a)) /* reference count preceding a token list */
@@ -141,7 +141,7 @@ extern boolean end_line_char_inactive(void);
extern halfword par_loc;
extern halfword par_token;
extern boolean force_eof;
-extern integer luacstrings;
+extern int luacstrings;
extern void firm_up_the_line(void);
extern void get_token(void);
@@ -149,12 +149,12 @@ extern void get_token(void);
extern halfword str_toks(lstring b);
extern void ins_the_toks(void);
-extern integer scan_lua_state(void);
+extern int scan_lua_state(void);
extern void conv_toks(void);
extern boolean in_lua_escape;
extern boolean is_convert(halfword c);
-extern str_number the_convert_string(halfword c, integer i);
+extern str_number the_convert_string(halfword c, int i);
# define closed 2 /* not open, or at end of file */
# define just_open 1 /* newly opened, first line not yet read */
@@ -164,7 +164,7 @@ extern int read_open[17]; /* state of |read_file[n]| */
extern void initialize_read(void);
-extern void read_toks(integer n, halfword r, halfword j);
+extern void read_toks(int n, halfword r, halfword j);
extern str_number tokens_to_string(halfword p); /* return a string from tokens list */
diff --git a/source/texk/web2c/luatexdir/utils/managed-sa.c b/source/texk/web2c/luatexdir/utils/managed-sa.c
index ddd3993cc3f616b1c41426987d52a23eb89f6a0d..35fa38b118d2a0a56fe77297bf1ce4f475b2aa9b 100644
--- a/source/texk/web2c/luatexdir/utils/managed-sa.c
+++ b/source/texk/web2c/luatexdir/utils/managed-sa.c
@@ -23,7 +23,7 @@
static const char __svn_version[] =
"$Id$ $URL$";
-static void store_sa_stack(sa_tree a, integer n, integer v, integer gl)
+static void store_sa_stack(sa_tree a, int n, int v, int gl)
{
sa_stack_item st;
st.code = n;
@@ -39,7 +39,7 @@ static void store_sa_stack(sa_tree a, integer n, integer v, integer gl)
a->stack[a->stack_ptr] = st;
}
-static void skip_in_stack(sa_tree a, integer n)
+static void skip_in_stack(sa_tree a, int n)
{
int p = a->stack_ptr;
if (a->stack == NULL)
@@ -52,7 +52,7 @@ static void skip_in_stack(sa_tree a, integer n)
}
}
-sa_tree_item get_sa_item(const sa_tree head, const integer n)
+sa_tree_item get_sa_item(const sa_tree head, const int n)
{
register int h;
register int m;
@@ -68,7 +68,7 @@ sa_tree_item get_sa_item(const sa_tree head, const integer n)
return head->dflt;
}
-void set_sa_item(sa_tree head, integer n, sa_tree_item v, integer gl)
+void set_sa_item(sa_tree head, int n, sa_tree_item v, int gl)
{
int h, m, l;
int i;
@@ -98,7 +98,7 @@ void set_sa_item(sa_tree head, integer n, sa_tree_item v, integer gl)
head->tree[h][m][l] = v;
}
-void rawset_sa_item(sa_tree head, integer n, integer v)
+void rawset_sa_item(sa_tree head, int n, int v)
{
head->tree[HIGHPART_PART(n)][MIDPART_PART(n)][LOWPART_PART(n)] = v;
}
@@ -173,7 +173,7 @@ Allocating those here immediately improves the chance of the structure
|a->tree[0][0][x]| being close together in actual memory locations
*/
-sa_tree new_sa_tree(integer size, sa_tree_item dflt)
+sa_tree new_sa_tree(int size, sa_tree_item dflt)
{
sa_tree_head *a;
a = (sa_tree_head *) xmalloc(sizeof(sa_tree_head));
@@ -187,7 +187,7 @@ sa_tree new_sa_tree(integer size, sa_tree_item dflt)
return (sa_tree) a;
}
-void restore_sa_stack(sa_tree head, integer gl)
+void restore_sa_stack(sa_tree head, int gl)
{
sa_stack_item st;
if (head->stack == NULL)
@@ -242,7 +242,7 @@ void dump_sa_tree(sa_tree a)
sa_tree undump_sa_tree(void)
{
- integer x;
+ int x;
int h, m, l;
boolean f;
sa_tree a = (sa_tree) Mxmalloc_array(sa_tree_head, 1);
diff --git a/source/texk/web2c/luatexdir/utils/managed-sa.h b/source/texk/web2c/luatexdir/utils/managed-sa.h
index 6ca051108147cea8c0ff0d21d07374a136b9006d..b4c82e12f56472f59a5fcaa0cae0eb45f2b380e4 100644
--- a/source/texk/web2c/luatexdir/utils/managed-sa.h
+++ b/source/texk/web2c/luatexdir/utils/managed-sa.h
@@ -60,10 +60,10 @@ typedef struct {
typedef sa_tree_head *sa_tree;
-extern sa_tree_item get_sa_item(const sa_tree head, const integer n);
-extern void set_sa_item(sa_tree head, integer n, sa_tree_item v, integer gl);
+extern sa_tree_item get_sa_item(const sa_tree head, const int n);
+extern void set_sa_item(sa_tree head, int n, sa_tree_item v, int gl);
-extern sa_tree new_sa_tree(integer size, sa_tree_item dflt);
+extern sa_tree new_sa_tree(int size, sa_tree_item dflt);
extern sa_tree copy_sa_tree(sa_tree head);
extern void destroy_sa_tree(sa_tree head);
@@ -71,7 +71,7 @@ extern void destroy_sa_tree(sa_tree head);
extern void dump_sa_tree(sa_tree a);
extern sa_tree undump_sa_tree(void);
-extern void restore_sa_stack(sa_tree a, integer gl);
+extern void restore_sa_stack(sa_tree a, int gl);
extern void clear_sa_stack(sa_tree a);
#endif
diff --git a/source/texk/web2c/luatexdir/utils/synctex.c b/source/texk/web2c/luatexdir/utils/synctex.c
index d54b84db5faec06d4f9ff551c8b5731450db59f0..201e1a82d2b60024e89834bfbc0b5935b7298726 100644
--- a/source/texk/web2c/luatexdir/utils/synctex.c
+++ b/source/texk/web2c/luatexdir/utils/synctex.c
@@ -239,18 +239,18 @@ static struct {
synctex_fprintf_t fprintf; /* either fprintf or gzprintf */
char *busy_name; /* the real "foo.synctex(busy)" or "foo.synctex.gz(busy)" name */
char *root_name; /* in general jobname.tex */
- integer count; /* The number of interesting records in "foo.synctex" */
+ int count; /* The number of interesting records in "foo.synctex" */
/* next concern the last sync record encountered */
halfword node; /* the last synchronized node, must be set
* before the recorder */
synctex_recorder_t recorder;/* the recorder of the node above, the
* routine that knows how to record the
* node to the .synctex file */
- integer tag, line; /* current tag and line */
- integer curh, curv; /* current point */
- integer magnification; /* The magnification as given by \mag */
- integer unit; /* The unit, defaults to 1, use 8192 to produce shorter but less accurate info */
- integer total_length; /* The total length of the bytes written since the last check point */
+ int tag, line; /* current tag and line */
+ int curh, curv; /* current point */
+ int magnification; /* The magnification as given by \mag */
+ int unit; /* The unit, defaults to 1, use 8192 to produce shorter but less accurate info */
+ int total_length; /* The total length of the bytes written since the last check point */
struct _flags {
unsigned int option_read:1; /* Command line option read (in case of problem or at the end) */
unsigned int off:1; /* Definitely turn off synctex, corresponds to cli option -synctex=0 */
@@ -321,7 +321,7 @@ void synctex_abort(void)
}
static inline int synctex_record_preamble(void);
-static inline int synctex_record_input(integer tag, char *name);
+static inline int synctex_record_input(int tag, char *name);
static char *synctex_suffix = ".synctex";
static char *synctex_suffix_gz = ".gz";
@@ -587,12 +587,12 @@ void synctex_terminate(boolean log_opened)
static inline int synctex_record_content(void);
static inline int synctex_record_settings(void);
-static inline int synctex_record_sheet(integer sheet);
+static inline int synctex_record_sheet(int sheet);
/* Recording the "{..." line. In *tex.web, use synctex_sheet(pdf_output) at
* the very beginning of the ship_out procedure.
*/
-void synctex_sheet(integer mag)
+void synctex_sheet(int mag)
{
SYNCTEX_RETURN_IF_DISABLED;
#if SYNCTEX_DEBUG
@@ -630,7 +630,7 @@ void synctex_sheet(integer mag)
return;
}
-static inline int synctex_record_teehs(integer sheet);
+static inline int synctex_record_teehs(int sheet);
/* Recording the "}..." line. In *tex.web, use synctex_teehs at
* the very end of the ship_out procedure.
@@ -1067,7 +1067,7 @@ static inline int synctex_record_preamble(void)
}
/* Recording a "Input:..." line */
-static inline int synctex_record_input(integer tag, char *name)
+static inline int synctex_record_input(int tag, char *name)
{
size_t len = 0;
#if SYNCTEX_DEBUG > 999
@@ -1116,7 +1116,7 @@ static inline int synctex_record_content(void)
}
/* Recording a "{..." line */
-static inline int synctex_record_sheet(integer sheet)
+static inline int synctex_record_sheet(int sheet)
{
#if SYNCTEX_DEBUG > 999
printf("\nSynchronize DEBUG: synctex_record_sheet\n");
@@ -1134,7 +1134,7 @@ static inline int synctex_record_sheet(integer sheet)
}
/* Recording a "}..." line */
-static inline int synctex_record_teehs(integer sheet)
+static inline int synctex_record_teehs(int sheet)
{
#if SYNCTEX_DEBUG > 999
printf("\nSynchronize DEBUG: synctex_record_teehs\n");
diff --git a/source/texk/web2c/luatexdir/utils/synctex.h b/source/texk/web2c/luatexdir/utils/synctex.h
index 2de54b7d7b29995db2e0144bc36789be46c52874..7ff3d887b999fc383a28bb1f9c912f94f23a35c4 100644
--- a/source/texk/web2c/luatexdir/utils/synctex.h
+++ b/source/texk/web2c/luatexdir/utils/synctex.h
@@ -55,7 +55,7 @@ extern void synctex_start_input(void);
/* Recording the "{..." line. In *tex.web, use synctex_sheet(pdf_output) at
* the very beginning of the ship_out procedure.
*/
-extern void synctex_sheet(integer mag);
+extern void synctex_sheet(int mag);
/* Recording the "}..." line. In *tex.web, use synctex_teehs at
* the very end of the ship_out procedure.
diff --git a/source/texk/web2c/luatexdir/utils/utils.c b/source/texk/web2c/luatexdir/utils/utils.c
index b108002f2ec55055eb658d249ef8da2ea8b01e9c..484fc26611264b78d79d187513f9d46c5bd5dd4e 100644
--- a/source/texk/web2c/luatexdir/utils/utils.c
+++ b/source/texk/web2c/luatexdir/utils/utils.c
@@ -61,8 +61,8 @@ static char print_buf[PRINTF_BUF_SIZE];
extern string ptexbanner; /* from web2c/lib/texmfmp.c */
extern string versionstring; /* from web2c/lib/version.c */
extern KPSEDLL string kpathsea_version_string; /* from kpathsea/version.c */
-integer epochseconds;
-integer microseconds;
+int epochseconds;
+int microseconds;
extern PDF static_pdf;
@@ -362,7 +362,7 @@ void check_buffer_overflow(int wsize)
|scaled_out| is the number of scaled points corresponding to that.
*/
-scaled divide_scaled(scaled s, scaled m, integer dd)
+scaled divide_scaled(scaled s, scaled m, int dd)
{
register scaled q;
register scaled r;
@@ -408,6 +408,23 @@ scaled divide_scaled_n(double sd, double md, double n)
return (scaled) di;
}
+int
+do_zround (double r)
+{
+ int i;
+
+ if (r > 2147483647.0)
+ i = 2147483647;
+ else if (r < -2147483647.0)
+ i = -2147483647;
+ else if (r >= 0.0)
+ i = (int)(r + 0.5);
+ else
+ i = (int)(r - 0.5);
+
+ return i;
+}
+
#ifdef MSVC
@@ -427,3 +444,4 @@ double rint(double x)
}
#endif
+
diff --git a/source/texk/web2c/luatexdir/utils/utils.h b/source/texk/web2c/luatexdir/utils/utils.h
index 7a119c3f13cd6acfc755fc959222378b155c28ce..bf35d2d406b749bf670a07908862c62090aeef7c 100644
--- a/source/texk/web2c/luatexdir/utils/utils.h
+++ b/source/texk/web2c/luatexdir/utils/utils.h
@@ -23,8 +23,8 @@
#ifndef UTILS_H
# define UTILS_H
-extern integer epochseconds;
-extern integer microseconds;
+extern int epochseconds;
+extern int microseconds;
extern char *pdftex_banner;
void make_subset_tag(fd_entry *);
diff --git a/source/texk/web2c/tmf-pool.h b/source/texk/web2c/tmf-pool.h
index cab973115708f04924950ec2bb58425d138073a1..0767c18e29c39daaf01b08019e13e9b37d2e32ce 100644
--- a/source/texk/web2c/tmf-pool.h
+++ b/source/texk/web2c/tmf-pool.h
@@ -2,16 +2,15 @@
You may freely use, modify and/or distribute this file. */
#ifndef TMF_POOL_H
-#define TMF_POOL_H
-#ifndef META_FONT
-typedef int integer;
-typedef integer strnumber;
+# define TMF_POOL_H
+# ifndef META_FONT
+typedef int strnumber;
typedef unsigned char packedASCIIcode;
-typedef integer poolpointer;
-extern packedASCIIcode *strpool;
-extern poolpointer poolptr;
-#else
-#define EXTERN extern
-#include "mfd.h"
-#endif
+typedef int poolpointer;
+extern packedASCIIcode *strpool;
+extern poolpointer poolptr;
+# else
+# define EXTERN extern
+# include "mfd.h"
+# endif
#endif