From a94278f9e2c781a67d137e0df26c35592f60cb0b Mon Sep 17 00:00:00 2001 From: Taco Hoekwater Date: Fri, 18 Apr 2008 12:27:06 +0000 Subject: luatex 0.25.3 git-svn-id: svn://tug.org/texlive/trunk@7494 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/luafontforge/src/luafflib.c | 22 +- Build/source/libs/luapeg/lpeg.c | 410 ++- Build/source/texk/web2c/luatexdir/font/vfovf.c | 4 +- Build/source/texk/web2c/luatexdir/font/vfpacket.c | 10 +- Build/source/texk/web2c/luatexdir/font/writefont.c | 3 +- Build/source/texk/web2c/luatexdir/image/epdf.h | 7 +- Build/source/texk/web2c/luatexdir/image/image.h | 24 +- .../source/texk/web2c/luatexdir/image/pdftoepdf.cc | 382 +-- Build/source/texk/web2c/luatexdir/image/writeimg.c | 167 +- .../source/texk/web2c/luatexdir/image/writejbig2.c | 3 +- Build/source/texk/web2c/luatexdir/lang/hyphen.c | 6 +- Build/source/texk/web2c/luatexdir/lang/texlang.c | 21 +- Build/source/texk/web2c/luatexdir/lua/lfontlib.c | 13 +- Build/source/texk/web2c/luatexdir/lua/llanglib.c | 3 + Build/source/texk/web2c/luatexdir/lua/llualib.c | 12 +- Build/source/texk/web2c/luatexdir/lua/lmplib.c | 60 +- Build/source/texk/web2c/luatexdir/lua/lpdflib.c | 121 +- Build/source/texk/web2c/luatexdir/lua/ltexlib.c | 48 +- Build/source/texk/web2c/luatexdir/lua/luatoken.c | 10 +- Build/source/texk/web2c/luatexdir/lua/mp.w | 79 +- Build/source/texk/web2c/luatexdir/lua/psout.w | 23 +- Build/source/texk/web2c/luatexdir/luatex.web | 83 +- Build/source/texk/web2c/luatexdir/tex/linebreak.c | 3220 ++++++++++---------- .../texk/web2c/luatexdir/tex/postlinebreak.c | 924 +++--- Build/source/texk/web2c/luatexdir/tex/texnodes.c | 3066 ++++++++++--------- Build/source/texk/web2c/luatexdir/tex/texpdf.c | 246 +- Build/source/texk/web2c/luatexdir/tex/textoken.c | 1190 ++++---- 27 files changed, 5353 insertions(+), 4804 deletions(-) (limited to 'Build/source') diff --git a/Build/source/libs/luafontforge/src/luafflib.c b/Build/source/libs/luafontforge/src/luafflib.c index cf252e682ea..8c67e0b2697 100644 --- a/Build/source/libs/luafontforge/src/luafflib.c +++ b/Build/source/libs/luafontforge/src/luafflib.c @@ -255,6 +255,14 @@ static char *make_tag_string (unsigned int field) { return (char *)tag_string; } +static char featbuf[32] = {0}; + +static char *make_mactag_string (unsigned int field) { + sprintf( featbuf, "<%d,%d>", field>>16, field&0xffff ); + return (char *)featbuf; +} + + static void dump_tag (lua_State *L, char *name, unsigned int field) { lua_checkstack(L,2); @@ -263,6 +271,14 @@ dump_tag (lua_State *L, char *name, unsigned int field) { lua_rawset(L,-3); } +static void +dump_mactag (lua_State *L, char *name, unsigned int field) { + lua_checkstack(L,2); + lua_pushstring(L,name); + lua_pushstring(L,make_mactag_string(field)); + lua_rawset(L,-3); +} + #define NESTED_TABLE(a,b,c) { \ int k = 1; \ next = b; \ @@ -308,7 +324,11 @@ handle_scriptlanglist (lua_State *L, struct scriptlanglist *sll) { void do_handle_featurescriptlanglist (lua_State *L, struct featurescriptlanglist *features) { - dump_tag (L,"tag",features->featuretag); + if (features->ismac) { + dump_mactag (L,"tag",features->featuretag); + } else { + dump_tag (L,"tag",features->featuretag); + } lua_newtable(L); handle_scriptlanglist(L, features->scripts); lua_setfield(L,-2,"scripts"); diff --git a/Build/source/libs/luapeg/lpeg.c b/Build/source/libs/luapeg/lpeg.c index 2f2bbb706be..969ef9d1433 100644 --- a/Build/source/libs/luapeg/lpeg.c +++ b/Build/source/libs/luapeg/lpeg.c @@ -1,23 +1,10 @@ /* -** $Id: lpeg.c,v 1.75 2007/10/08 14:10:53 roberto Exp $ +** $Id: lpeg.c,v 1.86 2008/03/07 17:20:19 roberto Exp $ ** LPeg - PEG pattern matching for Lua -** Copyright 2007, Lua.org & PUC-Rio (see documentation for license) +** Copyright 2007, Lua.org & PUC-Rio (see 'lpeg.html' for license) ** written by Roberto Ierusalimschy */ -/* - PEG rules: - - e1 | e2 -> choice L1; e1; commit L2; L1: e2; L2: - e* -> L2: choice L1; e; commit L2; L1: - or e* -> choice L1; L2: e; partialcommit L2; L1: - e? -> choice L1; e; commit L1; L1: - !e -> choice L1; e; commit L2; L2: fail; L1: - or !e -> choice L1; e; failtwice; L1: - &e -> choice L1; choice L2; e; L2: commit L3; L3: fail; L1: - or &e -> choice L1; e; backcommit L2; L1: fail; L2: -*/ - #include #include @@ -28,6 +15,9 @@ #include "lauxlib.h" +#define VERSION "0.8" +#define PATTERN_T "pattern" + /* maximum call/backtrack levels */ #define MAXBACK 400 @@ -38,14 +28,17 @@ /* index, on Lua stack, for subject */ #define SUBJIDX 2 +/* number of fixed arguments to 'match' (before capture arguments) */ +#define FIXEDARGS 3 + /* index, on Lua stack, for substitution value cache */ -#define SUBSCACHE 3 +#define subscache(ptop) ((ptop) + 1) /* index, on Lua stack, for capture list */ -#define CAPLISTIDX (SUBSCACHE + 1) +#define caplistidx(ptop) ((ptop) + 2) /* index, on Lua stack, for pattern's fenv */ -#define PENVIDX (CAPLISTIDX + 1) +#define penvidx(ptop) ((ptop) + 3) @@ -72,8 +65,9 @@ typedef enum Opcode { IRet, IEnd, IChoice, IJmp, ICall, IOpenCall, ICommit, IPartialCommit, IBackCommit, IFailTwice, IFail, IGiveup, - IFunc, ILFunc, - IFullCapture, IEmptyCapture, IOpenCapture, ICloseCapture + IFunc, + IFullCapture, IEmptyCapture, IEmptyCaptureIdx, + IOpenCapture, ICloseCapture, ICloseRunTime } Opcode; @@ -110,11 +104,12 @@ static const byte opproperties[] = { /* IFail */ 0, /* IGiveup */ 0, /* IFunc */ 0, - /* ILFunc */ ISFENVOFF, /* IFullCapture */ ISCAPTURE | ISNOFAIL | ISFENVOFF, - /* IEmptyCapture */ ISCAPTURE | ISNOFAIL | ISMOVABLE | ISFENVOFF, + /* IEmptyCapture */ ISCAPTURE | ISNOFAIL | ISMOVABLE, + /* IEmptyCaptureIdx */ISCAPTURE | ISNOFAIL | ISMOVABLE | ISFENVOFF, /* IOpenCapture */ ISCAPTURE | ISNOFAIL | ISMOVABLE | ISFENVOFF, - /* ICloseCapture */ ISCAPTURE | ISNOFAIL | ISMOVABLE | ISFENVOFF + /* ICloseCapture */ ISCAPTURE | ISNOFAIL | ISMOVABLE | ISFENVOFF, + /* ICloseRunTime */ ISCAPTURE | ISFENVOFF }; @@ -150,8 +145,8 @@ static const Instruction giveup = {{IGiveup, 0, 0}}; /* kinds of captures */ typedef enum CapKind { - Cclose, Cposition, Cconst, Csimple, Ctable, Cfunction, - Cquery, Cstring, Csubst, Caccum + Cclose, Cposition, Cconst, Cbackref, Carg, Csimple, Ctable, Cfunction, + Cquery, Cstring, Csubst, Caccum, Cruntime } CapKind; #define iscapnosize(k) ((k) == Cposition || (k) == Cconst) @@ -210,7 +205,7 @@ static int getposition (lua_State *L, int t, int i) { res = lua_tointeger(L, -1); if (res == 0) { /* key has no registered position? */ lua_rawgeti(L, -2, i); /* get key again */ - luaL_error(L, "%s is not defined in given grammar", val2str(L, -1)); + return luaL_error(L, "%s is not defined in given grammar", val2str(L, -1)); } lua_pop(L, 2); /* remove environment and position */ return res; @@ -242,12 +237,19 @@ static void printcharset (const Charset st) { static void printcapkind (int kind) { const char *const modes[] = { - "close", "position", "constant", "simple", "table", "function", - "query", "string", "substitution", "accumulator"}; + "close", "position", "constant", "backref", + "argument", "simple", "table", "function", + "query", "string", "substitution", "accumulator", + "runtime"}; printf("%s", modes[kind]); } +static void printjmp (const Instruction *op, const Instruction *p) { + printf("-> %ld", (long)(dest(0, p) - op)); +} + + static void printinst (const Instruction *op, const Instruction *p) { const char *const names[] = { "any", "char", "set", "zset", @@ -256,10 +258,11 @@ static void printinst (const Instruction *op, const Instruction *p) { "ret", "end", "choice", "jmp", "call", "open_call", "commit", "partial_commit", "back_commit", "failtwice", "fail", "giveup", - "func", "Luafunc", - "fullcapture", "emptycapture", "opencapture", "closecapture" + "func", + "fullcapture", "emptycapture", "emptycaptureidx", "opencapture", + "closecapture", "closeruntime" }; - printf("%02d: %s ", p - op, names[p->i.code]); + printf("%02ld: %s ", (long)(p - op), names[p->i.code]); switch ((Opcode)p->i.code) { case IChar: { printf("'%c'", p->i.aux); @@ -267,7 +270,7 @@ static void printinst (const Instruction *op, const Instruction *p) { } case ITestChar: { printf("'%c'", p->i.aux); - printf("-> %d", dest(0, p) - op); + printjmp(op, p); break; } case IAny: { @@ -276,17 +279,14 @@ static void printinst (const Instruction *op, const Instruction *p) { } case ITestAny: { printf("* %d", p->i.aux); - printf("-> %d", dest(0, p) - op); + printjmp(op, p); break; } case IFullCapture: case IOpenCapture: - case IEmptyCapture: case ICloseCapture: { + case IEmptyCapture: case IEmptyCaptureIdx: + case ICloseCapture: case ICloseRunTime: { printcapkind(getkind(p)); - printf("(n = %d)", getoff(p)); - /* go through */ - } - case ILFunc: { - printf(" (%d)", p->i.offset); + printf("(n = %d) (off = %d)", getoff(p), p->i.offset); break; } case ISet: case IZSet: case ISpan: case ISpanZ: { @@ -295,7 +295,7 @@ static void printinst (const Instruction *op, const Instruction *p) { } case ITestSet: case ITestZSet: { printcharset((p+1)->buff); - printf("-> %d", dest(0, p) - op); + printjmp(op, p); break; } case IOpenCall: { @@ -303,12 +303,13 @@ static void printinst (const Instruction *op, const Instruction *p) { break; } case IChoice: { - printf("-> %d (%d)", dest(0, p) - op, p->i.aux); + printjmp(op, p); + printf(" (%d)", p->i.aux); break; } case IJmp: case ICall: case ICommit: case IPartialCommit: case IBackCommit: { - printf("-> %d", dest(0, p) - op); + printjmp(op, p); break; } default: break; @@ -328,10 +329,13 @@ static void printpatt (Instruction *p) { static void printcap (Capture *cap) { - for (; cap->s; cap++) { - printcapkind(cap->kind); - printf(" (idx: %d - size: %d) -> %p\n", cap->idx, cap->siz, cap->s); - } + printcapkind(cap->kind); + printf(" (idx: %d - size: %d) -> %p\n", cap->idx, cap->siz, cap->s); +} + + +static void printcaplist (Capture *cap) { + for (; cap->s; cap++) printcap(cap); } /* }====================================================== */ @@ -353,19 +357,40 @@ typedef struct Stack { } Stack; -static Capture *doublecap (lua_State *L, Capture *cap, int captop) { +static int runtimecap (lua_State *L, Capture *close, Capture *ocap, + const char *o, const char *s, int ptop); + + +static Capture *doublecap (lua_State *L, Capture *cap, int captop, int ptop) { Capture *newc; if (captop >= INT_MAX/((int)sizeof(Capture) * 2)) luaL_error(L, "too many captures"); newc = (Capture *)lua_newuserdata(L, captop * 2 * sizeof(Capture)); memcpy(newc, cap, captop * sizeof(Capture)); - lua_replace(L, CAPLISTIDX); + lua_replace(L, caplistidx(ptop)); return newc; } -static const char *match (lua_State *L, const char *o, const char *s, - const char *e, Instruction *op, Capture *capture) { +static void adddyncaptures (const char *s, Capture *base, int n, int fd) { + int i; + assert(base[0].kind == Cruntime && base[0].siz == 0); + base[0].idx = fd; /* first returned capture */ + for (i = 1; i < n; i++) { /* add extra captures */ + base[i].siz = 1; /* mark it as closed */ + base[i].s = s; + base[i].kind = Cruntime; + base[i].idx = fd + i; /* stack index */ + } + base[n].kind = Cclose; /* add closing entry */ + base[n].siz = 1; + base[n].s = s; +} + + +static const char *match (lua_State *L, + const char *o, const char *s, const char *e, + Instruction *op, Capture *capture, int ptop) { Stack stackbase[MAXBACK]; Stack *stacklimit = stackbase + MAXBACK; Stack *stack = stackbase; /* point to first empty slot in stack */ @@ -463,19 +488,6 @@ static const char *match (lua_State *L, const char *o, const char *s, p += p->i.offset; continue; } - case ILFunc: { - lua_Integer res; - lua_rawgeti(L, PENVIDX, p->i.offset); /* push function */ - lua_pushvalue(L, SUBJIDX); /* push original subject */ - lua_pushinteger(L, s - o + 1); /* current position */ - lua_call(L, 2, 1); - res = lua_tointeger(L, -1) - 1; - lua_pop(L, 1); - if (res < s - o || res > e - o) goto fail; - s = o + res; - p++; - continue; - } case IJmp: { p += p->i.offset; continue; @@ -515,7 +527,6 @@ static const char *match (lua_State *L, const char *o, const char *s, case IBackCommit: { assert(stack > stackbase && (stack - 1)->s != NULL); s = (--stack)->s; - captop = stack->caplevel; p += p->i.offset; continue; } @@ -533,6 +544,34 @@ static const char *match (lua_State *L, const char *o, const char *s, p = stack->p; continue; } + case ICloseRunTime: { + int fr = lua_gettop(L) + 1; /* stack index of first result */ + int ncap = runtimecap(L, capture + captop, capture, o, s, ptop); + lua_Integer res = lua_tointeger(L, fr) - 1; /* offset */ + int n = lua_gettop(L) - fr; /* number of new captures */ + if (res == -1) { /* may not be a number */ + if (!lua_toboolean(L, fr)) { /* false value? */ + lua_settop(L, fr - 1); /* remove results */ + goto fail; /* and fail */ + } + else if (lua_isboolean(L, fr)) /* true? */ + res = s - o; /* keep current position */ + } + if (res < s - o || res > e - o) + luaL_error(L, "invalid position returned by match-time capture"); + s = o + res; /* update current position */ + captop -= ncap; /* remove nested captures */ + lua_remove(L, fr); /* remove first result (offset) */ + if (n > 0) { /* captures? */ + if ((captop += n + 1) >= capsize) { + capture = doublecap(L, capture, captop, ptop); + capsize = 2 * captop; + } + adddyncaptures(s, capture + captop - n - 1, n, fr); + } + p++; + continue; + } case ICloseCapture: { const char *s1 = s - getoff(p); assert(captop > 0); @@ -547,7 +586,7 @@ static const char *match (lua_State *L, const char *o, const char *s, goto capture; } } - case IEmptyCapture: + case IEmptyCapture: case IEmptyCaptureIdx: capture[captop].siz = 1; /* mark entry as closed */ goto capture; case IOpenCapture: @@ -560,14 +599,16 @@ static const char *match (lua_State *L, const char *o, const char *s, capture[captop].idx = p->i.offset; capture[captop].kind = getkind(p); if (++captop >= capsize) { - capture = doublecap(L, capture, captop); + capture = doublecap(L, capture, captop, ptop); capsize = 2 * captop; } p++; continue; } - case IOpenCall: - luaL_error(L, "reference to unknown rule #%d", p->i.offset); + case IOpenCall: { + lua_rawgeti(L, penvidx(ptop), p->i.offset); + luaL_error(L, "reference to %s outside a grammar", val2str(L, -1)); + } default: assert(0); return NULL; } } @@ -673,22 +714,21 @@ static int verify (lua_State *L, Instruction *op, const Instruction *p, continue; } case ISpan: case ISpanZ: - case IOpenCapture: - case ICloseCapture: - case IEmptyCapture: + case IOpenCapture: case ICloseCapture: + case IEmptyCapture: case IEmptyCaptureIdx: case IFullCapture: { p += sizei(p); continue; } + case ICloseRunTime: { + goto fail; /* be liberal in this case */ + } case IFunc: { const char *r = (p+1)->f((p+2)->buff, dummy, dummy, dummy); if (r == NULL) goto fail; p += p->i.offset; continue; } - case ILFunc: { - goto fail; /* be liberal in this case */ - } case IEnd: /* cannot happen (should stop before it) */ default: assert(0); return 0; } @@ -860,7 +900,7 @@ static int isheadfail (Instruction *p) { } -#define checkpattern(L, idx) ((Instruction *)luaL_checkudata(L, idx, "pattern")) +#define checkpattern(L, idx) ((Instruction *)luaL_checkudata(L, idx, PATTERN_T)) static int jointable (lua_State *L, int p1) { @@ -923,6 +963,9 @@ static void setinstaux (Instruction *i, Opcode op, int offset, int aux) { #define setinst(i,op,off) setinstaux(i,op,off,0) +#define setinstcap(i,op,idx,k,n) setinstaux(i,op,idx,((k) | ((n) << 4))) + + static int value2fenv (lua_State *L, int vidx) { lua_createtable(L, 1, 0); lua_pushvalue(L, vidx); @@ -937,7 +980,7 @@ static Instruction *newpatt (lua_State *L, size_t n) { if (n >= MAXPATTSIZE - 1) luaL_error(L, "pattern too big"); p = (Instruction *)lua_newuserdata(L, (n + 1) * sizeof(Instruction)); - luaL_getmetatable(L, "pattern"); + luaL_getmetatable(L, PATTERN_T); lua_setmetatable(L, -2); setinst(p + n, IEnd, 0); return p; @@ -1054,18 +1097,17 @@ static int nter_l (lua_State *L) { -static void checkfield (lua_State *L) { - Instruction *p = (Instruction *)lua_touserdata(L, -1); - if (p != NULL) { /* value is a userdata? */ - if (lua_getmetatable(L, -1)) { /* does it have a metatable? */ - lua_getfield(L, LUA_REGISTRYINDEX, "pattern"); +static int testpattern (lua_State *L, int idx) { + if (lua_touserdata(L, idx)) { /* value is a userdata? */ + if (lua_getmetatable(L, idx)) { /* does it have a metatable? */ + luaL_getmetatable(L, PATTERN_T); if (lua_rawequal(L, -1, -2)) { /* does it have the correct mt? */ lua_pop(L, 2); /* remove both metatables */ - return; + return 1; } } } - luaL_error(L, "invalid field in grammar"); + return 0; } @@ -1085,7 +1127,8 @@ static Instruction *fix_l (lua_State *L, int t) { lua_replace(L, base + 2); /* use this value as initial rule */ continue; } - checkfield(L); + if (!testpattern(L, -1)) + luaL_error(L, "invalid field in grammar"); l = pattsize(L, -1) + 1; /* space for pattern + ret */ if (totalsize >= MAXPATTSIZE - l) luaL_error(L, "grammar too large"); @@ -1195,8 +1238,9 @@ static Instruction *getpatt (lua_State *L, int idx, int *size) { break; } case LUA_TFUNCTION: { - p = newpatt(L, 1); - setinst(p, ILFunc, value2fenv(L, idx)); + p = newpatt(L, 2); + setinstcap(p, IOpenCapture, value2fenv(L, idx), Cruntime, 0); + setinstcap(p + 1, ICloseRunTime, 0, Cclose, 0); lua_replace(L, idx); break; } @@ -1528,9 +1572,6 @@ static int getlabel (lua_State *L, int labelidx) { } -#define setinstcap(i,op,idx,k,n) setinstaux(i,op,idx,((k) | ((n) << 4))) - - static int capture_aux (lua_State *L, int kind, int labelidx) { int l1, n; Instruction *p1 = getpatt(L, 1, &l1); @@ -1576,6 +1617,38 @@ static int position_l (lua_State *L) { } +static int emptycap_aux (lua_State *L, int kind, const char *msg) { + int n = luaL_checkint(L, 1); + Instruction *p = newpatt(L, 1); + luaL_argcheck(L, 0 < n && n <= SHRT_MAX, 1, msg); + setinstcap(p, IEmptyCapture, n, kind, 0); + return 1; +} + + +static int backref_l (lua_State *L) { + return emptycap_aux(L, Cbackref, "invalid back reference"); +} + + +static int argcap_l (lua_State *L) { + return emptycap_aux(L, Carg, "invalid argument index"); +} + + +static int matchtime_l (lua_State *L) { + int l1 = getpattl(L, 1); + Instruction *op = newpatt(L, 1 + l1 + 1); + Instruction *p = op; + luaL_checktype(L, 2, LUA_TFUNCTION); + setinstcap(p++, IOpenCapture, value2fenv(L, 2), Cruntime, 0); + p += addpatt(L, p, 1); + setinstcap(p, ICloseRunTime, 0, Cclose, 0); + optimizecaptures(op); + return 1; +} + + static int capconst_l (lua_State *L) { int i, j; int n = lua_gettop(L); @@ -1583,9 +1656,9 @@ static int capconst_l (lua_State *L) { lua_createtable(L, n, 0); /* new environment for the new pattern */ for (i = j = 1; i <= n; i++) { if (lua_isnil(L, i)) - setinstcap(p++, IEmptyCapture, 0, Cconst, 0); + setinstcap(p++, IEmptyCaptureIdx, 0, Cconst, 0); else { - setinstcap(p++, IEmptyCapture, j, Cconst, 0); + setinstcap(p++, IEmptyCaptureIdx, j, Cconst, 0); lua_pushvalue(L, i); lua_rawseti(L, -2, j++); } @@ -1645,7 +1718,9 @@ static int span_l (lua_State *L) { typedef struct CapState { Capture *cap; /* current capture */ + Capture *ocap; /* (original) capture list */ lua_State *L; + int ptop; /* index of last argument to 'match' */ const char *s; /* original string */ int valuecached; /* value stored in cache slot */ } CapState; @@ -1659,7 +1734,7 @@ typedef struct CapState { #define isfullcap(cap) ((cap)->siz != 0) -#define pushluaval(cs) lua_rawgeti((cs)->L, PENVIDX, (cs)->cap->idx) +#define pushluaval(cs) lua_rawgeti((cs)->L, penvidx((cs)->ptop), (cs)->cap->idx) #define pushsubject(cs, c) lua_pushlstring((cs)->L, (c)->s, (c)->siz - 1) @@ -1668,8 +1743,8 @@ typedef struct CapState { static void updatecache_ (CapState *cs, int v) { - lua_rawgeti(cs->L, PENVIDX, v); - lua_replace(cs->L, SUBSCACHE); + lua_rawgeti(cs->L, penvidx(cs->ptop), v); + lua_replace(cs->L, subscache(cs->ptop)); cs->valuecached = v; } @@ -1677,6 +1752,33 @@ static void updatecache_ (CapState *cs, int v) { static int pushcapture (CapState *cs); +static Capture *findopen (Capture *cap) { + int n = 0; + for (;;) { + cap--; + if (isclosecap(cap)) n++; + else if (!isfullcap(cap)) + if (n-- == 0) return cap; + } +} + + +static Capture *findback (CapState *cs, Capture *cap, int n) { + int i; + for (i = 0; i < n; i++) { + if (cap == cs->ocap) + luaL_error(cs->L, "invalid back reference (%d)", n); + cap--; + if (isclosecap(cap)) + cap = findopen(cap); + else if (!isfullcap(cap)) + i--; /* does not count enclosing captures */ + } + assert(!isclosecap(cap)); + return cap; +} + + static int pushallcaptures (CapState *cs, int addextra) { Capture *co = cs->cap; int n = 0; @@ -1704,6 +1806,17 @@ static int simplecap (CapState *cs) { } +static int backrefcap (CapState *cs) { + int n = (cs->cap)->idx; + Capture *curr = cs->cap; + Capture *backref = findback(cs, curr, n); + cs->cap = backref; + n = pushcapture(cs); + cs->cap = curr + 1; + return n; +} + + static int tablecap (CapState *cs) { int n = 0; lua_newtable(cs->L); @@ -1727,7 +1840,7 @@ static int querycap (CapState *cs) { if (n > 1) /* extra captures? */ lua_pop(cs->L, n - 1); /* throw them away */ updatecache(cs, idx); - lua_gettable(cs->L, SUBSCACHE); + lua_gettable(cs->L, subscache(cs->ptop)); if (!lua_isnil(cs->L, -1)) return 1; else { @@ -1740,11 +1853,11 @@ static int querycap (CapState *cs) { static int accumcap (CapState *cs) { lua_State *L = cs->L; if (isfullcap(cs->cap++) || isclosecap(cs->cap) || pushcapture(cs) != 1) - luaL_error(L, "no initial value for accumulator capture"); + return luaL_error(L, "no initial value for accumulator capture"); while (!isclosecap(cs->cap)) { int n; if (captype(cs->cap) != Cfunction) - luaL_error(L, "invalid (non function) capture to accumulate"); + return luaL_error(L, "invalid (non function) capture to accumulate"); pushluaval(cs); lua_insert(L, -2); /* put function before previous capture */ n = pushallcaptures(cs, 0); @@ -1765,6 +1878,27 @@ static int functioncap (CapState *cs) { } +static int runtimecap (lua_State *L, Capture *close, Capture *ocap, + const char *o, const char *s, int ptop) { + CapState cs; + int n; + Capture *open = findopen(close); + assert(captype(open) == Cruntime); + close->kind = Cclose; + close->s = s; + cs.ocap = ocap; cs.cap = open; cs.L = L; + cs.s = o; cs.valuecached = 0; cs.ptop = ptop; + luaL_checkstack(L, 4, "too many runtime captures"); + pushluaval(&cs); + lua_pushvalue(L, SUBJIDX); /* push original subject */ + lua_pushinteger(L, s - o + 1); /* current position */ + n = pushallcaptures(&cs, 0); + lua_call(L, n + 2, LUA_MULTRET); + return close - open; +} + + + typedef struct StrAux { const char *s; const char *e; @@ -1778,7 +1912,8 @@ static int getstrcaps (CapState *cs, StrAux *cps, int n) { if (!isfullcap(cs->cap++)) { while (!isclosecap(cs->cap)) { if (captype(cs->cap) != Csimple) - luaL_error(cs->L, "invalid capture #%d in replacement pattern", n); + return luaL_error(cs->L, + "invalid capture #%d in replacement pattern", n); n = getstrcaps(cs, cps, n); } cs->cap++; /* skip close */ @@ -1794,7 +1929,7 @@ static void stringcap (luaL_Buffer *b, CapState *cs) { size_t len, i; const char *c; updatecache(cs, cs->cap->idx); - c = lua_tolstring(cs->L, SUBSCACHE, &len); + c = lua_tolstring(cs->L, subscache(cs->ptop), &len); n = getstrcaps(cs, cps, 0) - 1; for (i = 0; i < len; i++) { if (c[i] != '%' || c[++i] < '0' || c[i] > '9') @@ -1852,6 +1987,13 @@ static int pushcapture (CapState *cs) { cs->cap++; return 1; } + case Carg: { + int arg = (cs->cap++)->idx; + if (arg + FIXEDARGS > cs->ptop) + return luaL_error(cs->L, "reference to absent argument #%d", arg); + lua_pushvalue(cs->L, arg + FIXEDARGS); + return 1; + } case Csimple: { if (isfullcap(cs->cap)) { pushsubject(cs, cs->cap); @@ -1860,6 +2002,15 @@ static int pushcapture (CapState *cs) { } else return simplecap(cs); } + case Cruntime: { + int i = 0; + while (!isclosecap(cs->cap++)) { + luaL_checkstack(cs->L, 4, "too many unstored captures"); + lua_pushvalue(cs->L, (cs->cap - 1)->idx); + i++; + } + return i; + } case Cstring: { luaL_Buffer b; luaL_buffinit(cs->L, &b); @@ -1874,6 +2025,7 @@ static int pushcapture (CapState *cs) { substcap(cs); return 1; } + case Cbackref: return backrefcap(cs); case Ctable: return tablecap(cs); case Cfunction: return functioncap(cs); case Cquery: return querycap(cs); @@ -1883,14 +2035,18 @@ static int pushcapture (CapState *cs) { } -static int getcaptures (lua_State *L, const char *s, const char *r) { - Capture *capture = (Capture *)lua_touserdata(L, CAPLISTIDX); - CapState cs; +static int getcaptures (lua_State *L, const char *s, const char *r, int ptop) { + Capture *capture = (Capture *)lua_touserdata(L, caplistidx(ptop)); int n = 0; - cs.cap = capture; cs.L = L; cs.s = s; cs.valuecached = 0; - while (!isclosecap(cs.cap)) - n += pushcapture(&cs); - if (n == 0) { /* no captures? */ + if (!isclosecap(capture)) { /* is there any capture? */ + CapState cs; + cs.ocap = cs.cap = capture; cs.L = L; + cs.s = s; cs.valuecached = 0; cs.ptop = ptop; + do { /* collect their values */ + n += pushcapture(&cs); + } while (!isclosecap(cs.cap)); + } + if (n == 0) { /* no capture values? */ lua_pushinteger(L, r - s + 1); /* return only end position */ n = 1; } @@ -1900,6 +2056,21 @@ static int getcaptures (lua_State *L, const char *s, const char *r) { /* }====================================================== */ +static int version_l (lua_State *L) { + lua_pushstring(L, VERSION); + return 1; +} + + +static int type_l (lua_State *L) { + if (testpattern(L, 1)) + lua_pushliteral(L, "pattern"); + else + lua_pushnil(L); + return 1; +} + + static int printpat_l (lua_State *L) { Instruction *p = getpatt(L, 1, NULL); int n, i; @@ -1927,20 +2098,20 @@ static int matchl (lua_State *L) { size_t l; Instruction *p = getpatt(L, 1, NULL); const char *s = luaL_checklstring(L, SUBJIDX, &l); - lua_Integer i = luaL_optinteger(L, 3, 1); - i = (i > 0) ? - ((i <= (lua_Integer)l) ? i - 1 : (lua_Integer)l) : - (((lua_Integer)l + i >= 0) ? (lua_Integer)l + i : 0); - lua_settop(L, CAPLISTIDX - 1); - lua_pushlightuserdata(L, capture); - lua_getfenv(L, 1); - r = match(L, s, s + i, s + l, p, capture); + int ptop = lua_gettop(L); + lua_Integer ii = luaL_optinteger(L, 3, 1); + size_t i = (ii > 0) ? + (((size_t)ii <= l) ? (size_t)ii - 1 : l) : + (((size_t)-ii <= l) ? l - ((size_t)-ii) : 0); + lua_pushnil(L); /* subscache */ + lua_pushlightuserdata(L, capture); /* caplistidx */ + lua_getfenv(L, 1); /* penvidx */ + r = match(L, s, s + i, s + l, p, capture, ptop); if (r == NULL) { lua_pushnil(L); return 1; } - assert(lua_gettop(L) == PENVIDX); - return getcaptures(L, s, r); + return getcaptures(L, s, r, ptop); } @@ -1951,6 +2122,9 @@ static struct luaL_reg pattreg[] = { {"Ca", capaccum_l}, {"Cc", capconst_l}, {"Cp", position_l}, + {"Cb", backref_l}, + {"Carg", argcap_l}, + {"Cmt", matchtime_l}, {"Cs", capsubst_l}, {"Ct", tcapture_l}, {"P", pattern_l}, @@ -1958,6 +2132,8 @@ static struct luaL_reg pattreg[] = { {"S", set_l}, {"V", nter_l}, {"span", span_l}, + {"type", type_l}, + {"version", version_l}, {NULL, NULL} }; @@ -1978,7 +2154,7 @@ int luaopen_lpeg (lua_State *L); int luaopen_lpeg (lua_State *L) { lua_newtable(L); lua_replace(L, LUA_ENVIRONINDEX); /* empty env for new patterns */ - luaL_newmetatable(L, "pattern"); + luaL_newmetatable(L, PATTERN_T); luaL_register(L, NULL, metapattreg); luaL_register(L, "lpeg", pattreg); lua_pushliteral(L, "__index"); diff --git a/Build/source/texk/web2c/luatexdir/font/vfovf.c b/Build/source/texk/web2c/luatexdir/font/vfovf.c index 0f23cb07b94..61a0b76aaa4 100644 --- a/Build/source/texk/web2c/luatexdir/font/vfovf.c +++ b/Build/source/texk/web2c/luatexdir/font/vfovf.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with LuaTeX; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -$Id: vfovf.c 1022 2008-02-14 11:49:30Z taco $ +$Id: vfovf.c 1169 2008-04-15 14:57:56Z oneiros $ */ #include "ptexlib.h" @@ -167,7 +167,7 @@ pdf_check_vf_cur_val (void) { internal_font_number f; f = cur_val; if (font_type(f) == virtual_font_type) - pdf_error("font", "command cannot be used with virtual font"); + pdf_error(maketexstring("font"), maketexstring("command cannot be used with virtual font")); } static void diff --git a/Build/source/texk/web2c/luatexdir/font/vfpacket.c b/Build/source/texk/web2c/luatexdir/font/vfpacket.c index 4d8445f2227..3ce10dd10ce 100644 --- a/Build/source/texk/web2c/luatexdir/font/vfpacket.c +++ b/Build/source/texk/web2c/luatexdir/font/vfpacket.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with pdfTeX; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -$Id: vfpacket.c 1013 2008-02-14 00:09:02Z oneiros $ +$Id: vfpacket.c 1169 2008-04-15 14:57:56Z oneiros $ */ #include "ptexlib.h" @@ -102,7 +102,7 @@ vf_packet_bytes (charinfo *co) { case packet_nop_code: break; default: - pdf_error("vf", "invalid DVI command"); + pdf_error(maketexstring("vf"), maketexstring("invalid DVI command")); } }; return (cur_packet_byte +1); @@ -211,7 +211,7 @@ do_vf_packet (internal_font_number vf_f, integer c) { case packet_nop_code: break; default: - pdf_error("vf", "invalid DVI command"); + pdf_error(maketexstring("vf"), maketexstring("invalid DVI command")); } }; cur_h = save_cur_h; @@ -268,7 +268,7 @@ integer *packet_local_fonts(internal_font_number f, integer *num) { (void)do_packet_byte(); break; default: - pdf_error("vf", "invalid DVI command"); + pdf_error(maketexstring("vf"), maketexstring("invalid DVI command")); } } } @@ -334,7 +334,7 @@ replace_packet_fonts(internal_font_number f, integer *old_fontid, integer *new_f (void)do_packet_byte(); break; default: - pdf_error("vf", "invalid DVI command"); + pdf_error(maketexstring("vf"), maketexstring("invalid DVI command")); } } } diff --git a/Build/source/texk/web2c/luatexdir/font/writefont.c b/Build/source/texk/web2c/luatexdir/font/writefont.c index 05257746889..679929e32e4 100644 --- a/Build/source/texk/web2c/luatexdir/font/writefont.c +++ b/Build/source/texk/web2c/luatexdir/font/writefont.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with pdfTeX; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -$Id: writefont.c 1112 2008-03-20 14:46:32Z taco $ +$Id: writefont.c 1139 2008-04-09 14:44:20Z taco $ */ #include "ptexlib.h" @@ -596,6 +596,7 @@ void create_fontdictionary(fm_entry * fm, integer font_objnum, { fo_entry *fo = new_fo_entry(); get_char_range(fo, f); /* set fo->first_char and fo->last_char from f */ + if (fo->last_char>255) fo->last_char=255; /* added 9-4-2008, mantis #25 */ assert(fo->last_char >= fo->first_char); fo->fm = fm; fo->fo_objnum = font_objnum; diff --git a/Build/source/texk/web2c/luatexdir/image/epdf.h b/Build/source/texk/web2c/luatexdir/image/epdf.h index 2359d53d3db..93a9e1c45eb 100644 --- a/Build/source/texk/web2c/luatexdir/image/epdf.h +++ b/Build/source/texk/web2c/luatexdir/image/epdf.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with pdfTeX; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -$Id: epdf.h 1031 2008-02-14 23:03:20Z hhenkel $ +$Id: epdf.h 1125 2008-03-25 19:36:52Z hhenkel $ */ extern "C" { @@ -45,6 +45,7 @@ extern "C" { #include #include "openbsd-compat.h" #include "image.h" +#include "../avlstuff.h" /* #-define pdfbufsize pdfbufmax */ @@ -78,7 +79,6 @@ extern "C" { extern void read_pdf_info(image_dict *, integer, integer); extern void embed_whole_font(struct fd_entry *); extern void epdf_check_mem(void); - extern void epdf_delete(image_dict *); extern void epdf_free(void); __attribute__ ((format(printf, 1, 2))) extern void pdf_printf(const char *fmt, ...); @@ -109,9 +109,6 @@ extern "C" { /* write_enc.c */ extern void epdf_write_enc(char **, integer); -/* write_enc.c */ - extern pdf_img_struct *new_pdf_img_struct(void); - /* utils.c */ extern char *convertStringToPDFString(char *in, int len); extern char *stripzeros(char *a); diff --git a/Build/source/texk/web2c/luatexdir/image/image.h b/Build/source/texk/web2c/luatexdir/image/image.h index cf7d4f0dd88..e239e617f37 100644 --- a/Build/source/texk/web2c/luatexdir/image/image.h +++ b/Build/source/texk/web2c/luatexdir/image/image.h @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with pdfTeX; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -$Id: image.h 1100 2008-03-09 13:40:48Z hhenkel $ +$Id: image.h 1125 2008-03-25 19:36:52Z hhenkel $ */ #ifndef IMAGE_H @@ -42,14 +42,6 @@ extern integer zround(double); /* from zround.c */ /**********************************************************************/ -typedef struct { - float width; - float height; - float orig_x; - float orig_y; - void *doc; -} pdf_img_struct; - typedef struct { png_structp png_ptr; png_infop info_ptr; @@ -89,6 +81,8 @@ typedef struct { integer index; /* /Im1, /Im2, ... */ 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 colorspace; /* number of /ColorSpace object */ @@ -105,7 +99,6 @@ typedef struct { pdfboxspec_e page_box_spec; /* PDF page box spec.: media/crop/bleed/trim/art */ dict_state state; union { - pdf_img_struct *pdf; png_img_struct *png; jpg_img_struct *jpg; jb2_img_struct *jb2; @@ -116,6 +109,8 @@ typedef struct { # define img_index(N) ((N)->index) # define img_xsize(N) ((N)->x_size) # define img_ysize(N) ((N)->y_size) +# define img_xorig(N) ((N)->x_orig) +# define img_yorig(N) ((N)->y_orig) # define img_xres(N) ((N)->x_res) # define img_yres(N) ((N)->y_res) # define img_colorspace(N) ((N)->colorspace) @@ -132,13 +127,6 @@ typedef struct { # define img_pagebox(N) ((N)->page_box_spec) # define img_state(N) ((N)->state) -# define img_pdf_ptr(N) ((N)->img_struct.pdf) -# define img_pdf_width(N) ((N)->img_struct.pdf->width) -# define img_pdf_height(N) ((N)->img_struct.pdf->height) -# define img_pdf_orig_x(N) ((N)->img_struct.pdf->orig_x) -# define img_pdf_orig_y(N) ((N)->img_struct.pdf->orig_y) -# define img_pdf_doc(N) ((N)->img_struct.pdf->doc) - # define img_png_ptr(N) ((N)->img_struct.png) # define img_png_png_ptr(N) ((N)->img_struct.png->png_ptr) # define img_png_info_ptr(N) ((N)->img_struct.png->info_ptr) @@ -218,6 +206,6 @@ void write_epdf(image_dict *); /* pdftoepdf.cc */ -void epdf_delete(image_dict * idict); +void unrefPdfDocument(char *); #endif diff --git a/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc b/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc index c5270eb58bd..21ded8e0b0f 100644 --- a/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc +++ b/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with pdfTeX; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -$Id: pdftoepdf.cc 1058 2008-02-19 21:13:58Z hhenkel $ +$Id: pdftoepdf.cc 1129 2008-03-27 19:43:44Z hhenkel $ */ #include @@ -79,7 +79,8 @@ $Id: pdftoepdf.cc 1058 2008-02-19 21:13:58Z hhenkel $ class PdfObject { public: PdfObject() { // nothing - } ~PdfObject() { + } + ~PdfObject() { iObject.free(); } Object *operator->() { @@ -101,20 +102,16 @@ class PdfObject { // appended into a linked list. Duplicates are checked and removed from the // list of indirect objects during appending. -enum InObjType { - objFont, - objFontDesc, - objOther -}; +enum InObjType { objFont, objFontDesc, objOther }; struct InObj { Ref ref; // ref in original PDF InObjType type; // object type - InObj *next; // next entry in list of indirect objects integer num; // new object number in output PDF fd_entry *fd; // pointer to /FontDescriptor object structure integer enc_objnum; // Encoding for objFont int written; // has it been written to output PDF? + InObj *next; // next entry in list of indirect objects }; struct UsedEncoding { @@ -123,89 +120,104 @@ struct UsedEncoding { UsedEncoding *next; }; -static InObj *inObjList; +static XRef *xref = NULL; +static InObj *inObjList = NULL; static UsedEncoding *encodingList; static GBool isInit = gFalse; -// -------------------------------------------------------------------- -// Maintain list of open embedded PDF files -// -------------------------------------------------------------------- +//********************************************************************** +// Maintain AVL tree of open embedded PDF files + +static avl_table *PdfDocumentTree = NULL; struct PdfDocument { - char *file_name; + char *file_path; // full file name including path PDFDoc *doc; XRef *xref; InObj *inObjList; - int occurences; // number of references to the document; the doc can be - // deleted when this is negative - PdfDocument *next; + int occurences; // number of references to the PdfDocument; it can be deleted when occurences == 0 }; -static PdfDocument *pdfDocuments = 0; +/* AVL sort PdfDocument into PdfDocumentTree by file_path */ -static XRef *xref = 0; +static int CompPdfDocument(const void *pa, const void *pb, void *p) +{ + return strcmp(((const PdfDocument *) pa)->file_path, + ((const PdfDocument *) pb)->file_path); +} -// Returns pointer to PdfDocument record for PDF file. -// Creates a new record if it doesn't exist yet. -// xref is made current for the document. +// Returns pointer to PdfDocument structure for PDF file. -static PdfDocument *find_add_document(char *file_name) +static PdfDocument *findPdfDocument(char *file_path) { - PdfDocument *p = pdfDocuments; - while (p && strcmp(p->file_name, file_name) != 0) - p = p->next; - if (p) { - xref = p->xref; - (p->occurences)++; + PdfDocument *pdf_doc, tmp; + assert(file_path != NULL); + if (PdfDocumentTree == NULL) + PdfDocumentTree = avl_create(CompPdfDocument, NULL, &avl_xallocator); + assert(PdfDocumentTree != NULL); + tmp.file_path = file_path; + pdf_doc = (PdfDocument *) avl_find(PdfDocumentTree, &tmp); + return pdf_doc; +} + +// Returns pointer to PdfDocument structure for PDF file. +// Creates a new structure if it doesn't exist yet. + +static PdfDocument *refPdfDocument(char *file_path) +{ + PdfDocument *pdf_doc = findPdfDocument(file_path); + if (pdf_doc == NULL) { + pdf_doc = new PdfDocument; + pdf_doc->file_path = xstrdup(file_path); + void **aa = avl_probe(PdfDocumentTree, pdf_doc); + assert(aa != NULL); + GString *docName = new GString(pdf_doc->file_path); + pdf_doc->doc = new PDFDoc(docName); // takes ownership of docName + if (!pdf_doc->doc->isOk() || !pdf_doc->doc->okToPrint()) + pdftex_fail("xpdf: reading PDF image failed"); + pdf_doc->xref = NULL; + pdf_doc->inObjList = NULL; + pdf_doc->occurences = 0; // 0 = unreferenced #ifdef DEBUG - fprintf(stderr, "\npdfTeX Debug: Incrementing %s (%d)\n", p->file_name, - p->occurences); + fprintf(stderr, "\nluatex Debug: Creating %s (%d)\n", + pdf_doc->file_path, pdf_doc->occurences); #endif - return p; } - p = new PdfDocument; - p->file_name = xstrdup(file_name); - p->xref = xref = 0; - p->occurences = 0; + pdf_doc->occurences++; #ifdef DEBUG - fprintf(stderr, "\npdfTeX Debug: Creating %s (%d)\n", p->file_name, - p->occurences); + fprintf(stderr, "\nluatex Debug: Incrementing %s (%d)\n", + pdf_doc->file_path, pdf_doc->occurences); #endif - GString *docName = new GString(p->file_name); - p->doc = new PDFDoc(docName); // takes ownership of docName - if (!p->doc->isOk() || !p->doc->okToPrint()) { - pdftex_fail("xpdf: reading PDF image failed"); - } - p->inObjList = 0; - p->next = pdfDocuments; - pdfDocuments = p; - return p; + return pdf_doc; } -// Deallocate a PdfDocument with all its resources +static void deletePdfDocument(PdfDocument *); -static void delete_document(PdfDocument * pdf_doc) +// Called when an image has been written and its resources in image_tab are +// freed and it's not referenced anymore. + +void unrefPdfDocument(char *file_path) { - PdfDocument **p = &pdfDocuments; - while (*p && *p != pdf_doc) - p = &((*p)->next); - // should not happen: - if (!*p) - return; - // unlink from list - *p = pdf_doc->next; - // free pdf_doc's resources - InObj *r, *n; - for (r = pdf_doc->inObjList; r != 0; r = n) { - n = r->next; - delete r; + PdfDocument *pdf_doc = findPdfDocument(file_path); + assert(pdf_doc != NULL); + assert(pdf_doc->occurences > 0); // aim for point landing + pdf_doc->occurences--; +#ifdef DEBUG + fprintf(stderr, "\nluatex Debug: Decrementing %s (%d)\n", + pdf_doc->file_path, pdf_doc->occurences); +#endif + if (pdf_doc->occurences == 0) { +#ifdef DEBUG + fprintf(stderr, "\nluatex Debug: Deleting %s\n", pdf_doc->file_path); +#endif + void *a = avl_delete(PdfDocumentTree, pdf_doc); + assert((PdfDocument *) a == pdf_doc); + deletePdfDocument(pdf_doc); } - xref = pdf_doc->xref; - delete pdf_doc->doc; - xfree(pdf_doc->file_name); - delete pdf_doc; } +//********************************************************************** + // Replacement for // Object *initDict(Dict *dict1){ initObj(objDict); dict = dict1; return this; } @@ -218,8 +230,6 @@ static void initDictFromDict(PdfObject & obj, Dict * dict) } } -// -------------------------------------------------------------------- - static int addEncoding(GfxFont * gfont) { UsedEncoding *n; @@ -241,7 +251,7 @@ static int addEncoding(GfxFont * gfont) addInObj(objFontDesc, ref, fd, 0) #define addOther(ref) \ - addInObj(objOther, ref, 0, 0) + addInObj(objOther, ref, NULL, 0) static int addInObj(InObjType type, Ref ref, fd_entry * fd, integer e) { @@ -250,14 +260,14 @@ static int addInObj(InObjType type, Ref ref, fd_entry * fd, integer e) pdftex_fail("PDF inclusion: invalid reference"); n->ref = ref; n->type = type; - n->next = 0; + n->next = NULL; n->fd = fd; n->enc_objnum = e; n->written = 0; - if (inObjList == 0) + if (inObjList == NULL) inObjList = n; else { - for (p = inObjList; p != 0; p = p->next) { + for (p = inObjList; p != NULL; p = p->next) { if (p->ref.num == ref.num && p->ref.gen == ref.gen) { delete n; return p->num; @@ -266,7 +276,7 @@ static int addInObj(InObjType type, Ref ref, fd_entry * fd, integer e) } // it is important to add new objects at the end of the list, // because new objects are being added while the list is being - // written out. + // written out by writeRefs(). q->next = n; } if (type == objFontDesc) @@ -276,8 +286,6 @@ static int addInObj(InObjType type, Ref ref, fd_entry * fd, integer e) return n->num; } -static void copyObject(Object *); - static void copyName(char *s) { pdf_puts("/"); @@ -290,6 +298,8 @@ static void copyName(char *s) } } +static void copyObject(Object *); + static void copyDictEntry(Object * obj, int i) { PdfObject obj1; @@ -502,7 +512,7 @@ static char *convertNumToPDF(double n) fval /= 10; } } else - buf[bindex++] = 0; + buf[bindex++] = '\0'; } return (char *) buf; } @@ -591,7 +601,7 @@ static void copyObject(Object * obj) static void writeRefs() { InObj *r; - for (r = inObjList; r != 0; r = r->next) { + for (r = inObjList; r != NULL; r = r->next) { if (!r->written) { Object obj1; r->written = 1; @@ -621,20 +631,20 @@ static void writeEncodings() UsedEncoding *r, *n; char *glyphNames[256], *s; int i; - for (r = encodingList; r != 0; r = r->next) { + for (r = encodingList; r != NULL; r = r->next) { for (i = 0; i < 256; i++) { if (r->font->isCIDFont()) { pdftex_warn ("PDF inclusion: CID font included, encoding maybe wrong"); } - if ((s = ((Gfx8BitFont *) r->font)->getCharName(i)) != 0) + if ((s = ((Gfx8BitFont *) r->font)->getCharName(i)) != NULL) glyphNames[i] = s; else glyphNames[i] = notdef; } epdf_write_enc(glyphNames, r->enc_objnum); } - for (r = encodingList; r != 0; r = n) { + for (r = encodingList; r != NULL; r = n) { n = r->next; delete r->font; delete r; @@ -661,7 +671,6 @@ static PDFRectangle *get_pagebox(Page * page, integer pagebox_spec) return page->getMediaBox(); // to make the compiler happy } - // Reads various information about the PDF and sets it up for later inclusion. // This will fail if the PDF version of the PDF is higher than // minor_pdf_version_wanted or page_name is given and can not be found. @@ -676,28 +685,25 @@ read_pdf_info(image_dict * idict, integer minor_pdf_version_wanted, Page *page; int rotate; PDFRectangle *pagebox; - float pdf_version_found, pdf_version_wanted; + float pdf_version_found, pdf_version_wanted, pdf_width, pdf_height, + pdf_xorig, pdf_yorig; assert(idict != NULL); assert(img_type(idict) == IMAGE_TYPE_PDF); - assert(img_pdf_ptr(idict) == NULL); - img_pdf_ptr(idict) = new_pdf_img_struct(); // initialize - if (!isInit) { + if (isInit == gFalse) { globalParams = new GlobalParams(); globalParams->setErrQuiet(gFalse); isInit = gTrue; } // open PDF file - pdf_doc = find_add_document(img_filepath(idict)); - img_pdf_doc(idict) = pdf_doc; - + pdf_doc = refPdfDocument(img_filepath(idict)); // check PDF version // this works only for PDF 1.x -- but since any versions of PDF newer // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will // then have to changed drastically anyway. pdf_version_found = pdf_doc->doc->getPDFVersion(); pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1); - if (pdf_version_found > pdf_version_wanted) { + if (pdf_version_found > pdf_version_wanted + 0.01) { char msg[] = "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed"; if (pdf_inclusion_errorlevel > 0) { @@ -711,7 +717,7 @@ read_pdf_info(image_dict * idict, integer minor_pdf_version_wanted, // get page by name GString name(img_pagename(idict)); LinkDest *link = pdf_doc->doc->findDest(&name); - if (link == 0 || !link->isOk()) + if (link == NULL || !link->isOk()) pdftex_fail("PDF inclusion: invalid destination <%s>", img_pagename(idict)); Ref ref = link->getPageRef(); @@ -734,53 +740,50 @@ read_pdf_info(image_dict * idict, integer minor_pdf_version_wanted, // get the pagebox (media, crop...) to use. pagebox = get_pagebox(page, img_pagebox(idict)); if (pagebox->x2 > pagebox->x1) { - img_pdf_orig_x(idict) = pagebox->x1; - img_pdf_width(idict) = pagebox->x2 - pagebox->x1; + pdf_xorig = pagebox->x1; + pdf_width = pagebox->x2 - pagebox->x1; } else { - img_pdf_orig_x(idict) = pagebox->x2; - img_pdf_width(idict) = pagebox->x1 - pagebox->x2; + pdf_xorig = pagebox->x2; + pdf_width = pagebox->x1 - pagebox->x2; } if (pagebox->y2 > pagebox->y1) { - img_pdf_orig_y(idict) = pagebox->y1; - img_pdf_height(idict) = pagebox->y2 - pagebox->y1; + pdf_yorig = pagebox->y1; + pdf_height = pagebox->y2 - pagebox->y1; } else { - img_pdf_orig_y(idict) = pagebox->y2; - img_pdf_height(idict) = pagebox->y1 - pagebox->y2; + pdf_yorig = pagebox->y2; + pdf_height = pagebox->y1 - pagebox->y2; } rotate = page->getRotate(); // handle page rotation and adjust dimens as needed if (rotate != 0) { - if (rotate % 90 == 0) { - // handle only the simple case: multiple of 90s. - // these are the only values allowed according to the - // reference (v1.3, p. 78). - // 180 needs no special treatment here - register float f; - switch (rotate) { - case 90: - f = img_pdf_height(idict); - img_pdf_height(idict) = img_pdf_width(idict); - img_pdf_width(idict) = f; - break; - case 270: - f = img_pdf_height(idict); - img_pdf_height(idict) = img_pdf_width(idict); - img_pdf_width(idict) = f; - break; - } + // handle only the simple case: multiple of 90s. + // these are the only values allowed according to the + // reference (v1.3, p. 78). + // 180 needs no special treatment here + register float f; + switch (rotate % 360) { + case 90: + case 270: + f = pdf_height; + pdf_height = pdf_width; + pdf_width = f; + break; + default:; } } pdf_doc->xref = pdf_doc->doc->getXRef(); - img_xsize(idict) = bp2int(img_pdf_width(idict)); - img_ysize(idict) = bp2int(img_pdf_height(idict)); + img_xsize(idict) = bp2int(pdf_width); + img_ysize(idict) = bp2int(pdf_height); + img_xorig(idict) = bp2int(pdf_xorig); + img_yorig(idict) = bp2int(pdf_yorig); } -// writes the current epf_doc. +// Writes the current epf_doc. // Here the included PDF is copied, so most errors that can happen during PDF // inclusion will arise here. -void write_epdf(image_dict * idict) +static void write_epdf1(image_dict * idict) { Page *page; PdfObject contents, obj1, obj2; @@ -792,15 +795,11 @@ void write_epdf(image_dict * idict) int rotate; double scale[6] = { 0, 0, 0, 0, 0, 0 }; bool writematrix = false; - PdfDocument *pdf_doc = (PdfDocument *) img_pdf_doc(idict); - (pdf_doc->occurences)--; -#ifdef DEBUG - fprintf(stderr, "\npdfTeX Debug: Decrementing %s (%d)\n", - pdf_doc->file_name, pdf_doc->occurences); -#endif + PdfDocument *pdf_doc = (PdfDocument *) findPdfDocument(img_filepath(idict)); + assert(pdf_doc != NULL); xref = pdf_doc->xref; inObjList = pdf_doc->inObjList; - encodingList = 0; + encodingList = NULL; page = pdf_doc->doc->getCatalog()->getPage(img_pagenum(idict)); rotate = page->getRotate(); PDFRectangle *pagebox; @@ -812,8 +811,8 @@ void write_epdf(image_dict * idict) // write additional information pdf_printf("/%s.FileName (%s)\n", pdfkeyprefix, - convertStringToPDFString(pdf_doc->file_name, - strlen(pdf_doc->file_name))); + convertStringToPDFString(pdf_doc->file_path, + strlen(pdf_doc->file_path))); pdf_printf("/%s.PageNumber %i\n", pdfkeyprefix, (int) img_pagenum(idict)); pdf_doc->doc->getDocInfoNF(&info); if (info.isRef()) { @@ -826,42 +825,40 @@ void write_epdf(image_dict * idict) // handle page rotation if (rotate != 0) { - if (rotate % 90 == 0) { - // this handles only the simple case: multiple of 90s but these - // are the only values allowed according to the reference - // (v1.3, p. 78). - // the image is rotated around its center. - // the /Rotate key is clockwise while the matrix is - // counterclockwise :-% - tex_printf(", page is rotated %d degrees", rotate); - switch (rotate) { - case 90: - scale[1] = -1; - scale[2] = 1; - scale[4] = pagebox->x1 - pagebox->y1; - scale[5] = pagebox->y1 + pagebox->x2; - writematrix = true; - break; - case 180: - scale[0] = scale[3] = -1; - scale[4] = pagebox->x1 + pagebox->x2; - scale[5] = pagebox->y1 + pagebox->y2; - writematrix = true; - break; // width and height are exchanged - case 270: - scale[1] = 1; - scale[2] = -1; - scale[4] = pagebox->x1 + pagebox->y2; - scale[5] = pagebox->y1 - pagebox->x1; - writematrix = true; - break; - } - if (writematrix) { // The matrix is only written if the image is rotated. - sprintf(s, "/Matrix [%.8f %.8f %.8f %.8f %.8f %.8f]\n", - scale[0], - scale[1], scale[2], scale[3], scale[4], scale[5]); - pdf_printf(stripzeros(s)); - } + // this handles only the simple case: multiple of 90s but these + // are the only values allowed according to the reference + // (v1.3, p. 78). + // the image is rotated around its center. + // the /Rotate key is clockwise while the matrix is + // counterclockwise :-% + tex_printf(", page is rotated %d degrees", rotate); + switch (rotate % 360) { + case 90: + scale[1] = -1; + scale[2] = 1; + scale[4] = pagebox->x1 - pagebox->y1; + scale[5] = pagebox->y1 + pagebox->x2; + writematrix = true; + break; + case 180: + scale[0] = scale[3] = -1; + scale[4] = pagebox->x1 + pagebox->x2; + scale[5] = pagebox->y1 + pagebox->y2; + writematrix = true; + break; // width and height are exchanged + case 270: + scale[1] = 1; + scale[2] = -1; + scale[4] = pagebox->x1 + pagebox->y2; + scale[5] = pagebox->y1 - pagebox->x1; + writematrix = true; + break; + default:; + } + if (writematrix) { // The matrix is only written if the image is rotated. + sprintf(s, "/Matrix [%.8f %.8f %.8f %.8f %.8f %.8f]\n", + scale[0], scale[1], scale[2], scale[3], scale[4], scale[5]); + pdf_printf(stripzeros(s)); } } @@ -883,12 +880,12 @@ void write_epdf(image_dict * idict) # else // FIXME: currently we don't know how to handle Page Groups so we abort gracefully :-( pdftex_fail - ("PDF inclusion: Page Group detected which pdfTeX can't handle. Sorry."); + ("PDF inclusion: Page Group detected which luatex can't handle. Sorry."); # endif #else // FIXME: currently we don't know how to handle Page Groups so we at least give a warning :-( pdftex_warn - ("PDF inclusion: Page Group detected which pdfTeX can't handle. Ignoring it."); + ("PDF inclusion: Page Group detected which luatex can't handle. Ignoring it."); #endif } // write the page Metadata if it's there @@ -970,25 +967,39 @@ void write_epdf(image_dict * idict) writeRefs(); // write out all used encodings (and delete list) writeEncodings(); - // save object list, xref + // save object list pdf_doc->inObjList = inObjList; - pdf_doc->xref = xref; + assert(xref == pdf_doc->xref); // xref should be unchanged } -// Called when an image has been written and it's resources in image_tab are -// freed and it's not referenced anymore. +void write_epdf(image_dict * idict) +{ + assert(idict != NULL); + write_epdf1(idict); + unrefPdfDocument(img_filepath(idict)); +} -void epdf_delete(image_dict * idict) +//********************************************************************** +// Deallocate a PdfDocument with all its resources + +static void deletePdfDocument(PdfDocument * pdf_doc) { - PdfDocument *pdf_doc = (PdfDocument *) img_pdf_doc(idict); - xref = pdf_doc->xref; - if (pdf_doc->occurences < 0) { -#ifdef DEBUG - fprintf(stderr, "\npdfTeX Debug: Deleting %s\n", pdf_doc->file_name); -#endif - delete_document(pdf_doc); + assert(pdf_doc != NULL); + // free PdfDocument's resources + InObj *r, *n; + for (r = pdf_doc->inObjList; r != NULL; r = n) { + n = r->next; + delete r; } - img_pdf_doc(idict) = NULL; + delete pdf_doc->doc; + xfree(pdf_doc->file_path); + delete pdf_doc; +} + +static void destroyPdfDocument(void *pa, void *pb) +{ + PdfDocument *pdf_doc = (PdfDocument *) pa; + deletePdfDocument(pdf_doc); } // Called when PDF embedding system is finalized. @@ -996,13 +1007,10 @@ void epdf_delete(image_dict * idict) void epdf_check_mem() { - if (isInit) { - PdfDocument *p, *n; - for (p = pdfDocuments; p; p = n) { - n = p->next; - delete_document(p); - } - // see above for globalParams + if (PdfDocumentTree != NULL) + avl_destroy(PdfDocumentTree, destroyPdfDocument); + PdfDocumentTree = NULL; + if (isInit == gTrue) delete globalParams; - } + isInit = gFalse; } diff --git a/Build/source/texk/web2c/luatexdir/image/writeimg.c b/Build/source/texk/web2c/luatexdir/image/writeimg.c index 66eb459bc0c..c49ef9a28d9 100644 --- a/Build/source/texk/web2c/luatexdir/image/writeimg.c +++ b/Build/source/texk/web2c/luatexdir/image/writeimg.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with pdfTeX; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -$Id: writeimg.c 1119 2008-03-22 11:27:02Z hhenkel $ +$Id: writeimg.c 1152 2008-04-13 22:29:59Z hhenkel $ */ #include @@ -168,18 +168,6 @@ static void check_type_by_extension(image_dict * idict) /**********************************************************************/ -pdf_img_struct *new_pdf_img_struct() -{ - pdf_img_struct *p; - p = xtalloc(1, pdf_img_struct); - p->width = 0; - p->height = 0; - p->orig_x = 0; - p->orig_y = 0; - p->doc = NULL; - return p; -} - void init_image(image * p) { assert(p != NULL); @@ -208,6 +196,8 @@ void init_image_dict(image_dict * p) img_index(p) = 0; img_xsize(p) = 0; img_ysize(p) = 0; + img_xorig(p) = 0; + img_yorig(p) = 0; img_xres(p) = 0; img_yres(p) = 0; img_colorspace(p) = 0; @@ -223,7 +213,7 @@ void init_image_dict(image_dict * p) img_colordepth(p) = 0; img_pagebox(p) = PDF_BOX_SPEC_MEDIA; img_state(p) = DICT_NEW; - img_pdf_ptr(p) = NULL; /* union */ + img_png_ptr(p) = NULL; /* union */ } image_dict *new_image_dict() @@ -250,10 +240,26 @@ void free_dict_strings(image_dict * p) } void free_image_dict(image_dict * p) -{ +{ /* called from limglib.c */ + assert(img_state(p) < DICT_REFERED); + switch (img_type(p)) { + case IMAGE_TYPE_PDF: + unrefPdfDocument(img_filepath(p)); + break; + case IMAGE_TYPE_PNG: /* assuming IMG_CLOSEINBETWEEN */ + assert(img_png_ptr(p) == NULL); + break; + case IMAGE_TYPE_JPG: /* assuming IMG_CLOSEINBETWEEN */ + assert(img_jpg_ptr(p) == NULL); + break; + case IMAGE_TYPE_JBIG2: /* todo: writejbig2.c cleanup */ + break; + case IMAGE_TYPE_NONE: + break; + default: + assert(0); + } free_dict_strings(p); - if (img_type(p) == IMAGE_TYPE_PDF) - epdf_delete(p); assert(img_file(p) == NULL); xfree(p); } @@ -405,7 +411,8 @@ void scale_img(image * img) void out_img(image * img, scaled hpos, scaled vpos) { - float a[7]; /* transformation matrix (todo: indices should be reduced!) */ + float a[6]; /* transformation matrix */ + float xoff, yoff, tmp; int r; /* number of digits after the decimal point */ assert(img != 0); image_dict *idict = img_dict(img); @@ -413,92 +420,94 @@ void out_img(image * img, scaled hpos, scaled vpos) scaled wd = img_width(img); scaled ht = img_height(img); scaled dp = img_depth(img); + if ((img_transform(img) & 1) == 1) { /* 90 deg. or 270 deg. rotated */ + if (ht == -dp) + pdftex_fail("image transform: division by zero (height == -depth)"); + if (wd == 0) + pdftex_fail("image transform: division by zero (width == 0)"); + } + a[1] = a[2] = 0; if (img_type(idict) == IMAGE_TYPE_PDF) { - a[1] = wd * 1.0e6 / img_xsize(idict); - a[2] = 0; - a[3] = 0; - a[4] = (ht + dp) * 1.0e6 / img_ysize(idict); - a[5] = hpos - - (float) wd *bp2int(img_pdf_orig_x(idict)) / img_xsize(idict); - a[6] = vpos - - (float) ht *bp2int(img_pdf_orig_y(idict)) / img_ysize(idict); + a[0] = 1.0e6 / img_xsize(idict); + a[3] = 1.0e6 / img_ysize(idict); r = 6; } else { - a[1] = wd * 1.0e6 / one_hundred_bp; - a[2] = 0; - a[3] = 0; - a[4] = (ht + dp) * 1.0e6 / one_hundred_bp; - a[5] = hpos; - a[6] = vpos; + a[3] = a[0] = 1.0e6 / one_hundred_bp; r = 4; } - if ((img_transform(img) & 1) == 1) { - if (ht == -dp) - pdftex_fail("image transform: division by zero (height == -depth)"); - if (wd == 0) - pdftex_fail("image transform: division by zero (width == 0)"); + xoff = (float) img_xorig(idict) / img_xsize(idict); + yoff = (float) img_yorig(idict) / img_ysize(idict); + if ((img_transform(img) & 7) > 3) { /* mirrored */ + a[0] *= -1; + xoff *= -1; } - switch (img_transform(img) & 7) { - case 0: /* unrotated */ + switch (img_transform(img) & 3) { + case 0: /* no transform */ break; case 1: /* rot. 90 deg. (counterclockwise) */ - a[2] = a[1] * (ht + dp) / wd; - a[1] = 0; - a[3] = -a[4] * wd / (ht + dp); - a[4] = 0; - a[5] += wd; + a[1] = a[0]; + a[2] = -a[3]; + a[3] = a[0] = 0; + tmp = yoff; + yoff = xoff; + xoff = -tmp; break; - case 2: /* rot. 180 deg. */ - a[1] = -a[1]; - a[4] = -a[4]; - a[5] += wd; - a[6] += ht + dp; + case 2: /* rot. 180 deg. (counterclockwise) */ + a[0] *= -1; + a[3] *= -1; + xoff *= -1; + yoff *= -1; break; - case 3: /* rot. 270 deg. */ - a[2] = -a[1] * (ht + dp) / wd; - a[1] = 0; - a[3] = a[4] * wd / (ht + dp); - a[4] = 0; - a[6] += ht + dp; + case 3: /* rot. 270 deg. (counterclockwise) */ + a[1] = -a[0]; + a[2] = a[3]; + a[3] = a[0] = 0; + tmp = yoff; + yoff = -xoff; + xoff = tmp; break; + default:; + } + xoff *= wd; + yoff *= ht + dp; + a[0] *= wd; + a[1] *= ht + dp; + a[2] *= wd; + a[3] *= ht + dp; + a[4] = hpos - xoff; + a[5] = vpos - yoff; + switch (img_transform(img) & 7) { + case 0: /* no transform */ + case 7: /* mirrored, then rot. 270 deg. */ + break; + case 1: /* rot. 90 deg. (counterclockwise) */ case 4: /* mirrored, unrotated */ - a[1] = -a[1]; - a[5] += wd; + a[4] += wd; break; + case 2: /* rot. 180 deg. */ case 5: /* mirrored, then rot. 90 deg. */ - a[2] = -a[1] * (ht + dp) / wd; - a[1] = 0; - a[3] = -a[4] * wd / (ht + dp); - a[4] = 0; - a[5] += wd; - a[6] += ht + dp; + a[4] += wd; + a[5] += ht + dp; break; + case 3: /* rot. 270 deg. */ case 6: /* mirrored, then rot. 180 deg. */ - a[4] = -a[4]; - a[6] += ht + dp; + a[5] += ht + dp; break; - case 7: /* mirrored, then rot. 270 deg. */ - a[2] = a[1] * (ht + dp) / wd; - a[1] = 0; - a[3] = a[4] * wd / (ht + dp); - a[4] = 0; - break; - default: - assert(0); + default:; } pdf_end_text(); pdf_printf("q\n"); + pdf_print_real((integer) a[0], r); + pdfout(' '); pdf_print_real((integer) a[1], r); pdfout(' '); pdf_print_real((integer) a[2], r); pdfout(' '); pdf_print_real((integer) a[3], r); pdfout(' '); - pdf_print_real((integer) a[4], r); + pdf_print_bp((integer) a[4]); pdfout(' '); pdf_print_bp((integer) a[5]); - pdfout(' '); - pdf_print_bp((integer) a[6]); pdf_printf(" cm\n/Im"); pdf_print_int(img_index(idict)); pdf_print_resname_prefix(); @@ -621,12 +630,12 @@ integer image_colordepth(integer ref) integer epdf_orig_x(integer ref) { - return bp2int(img_pdf_orig_x(img_dict(img_array[ref]))); + return img_xorig(img_dict(img_array[ref])); } integer epdf_orig_y(integer ref) { - return bp2int(img_pdf_orig_y(img_dict(img_array[ref]))); + return img_yorig(img_dict(img_array[ref])); } integer image_objnum(integer ref) @@ -659,8 +668,6 @@ void update_image_procset(integer ref) pdf_image_procset |= img_color(img_dict(img_array[ref])); } -/**********************************************************************/ - boolean check_image_b(integer procset) { return procset & IMAGE_COLOR_B; diff --git a/Build/source/texk/web2c/luatexdir/image/writejbig2.c b/Build/source/texk/web2c/luatexdir/image/writejbig2.c index d50ed88c485..2d7d4560548 100644 --- a/Build/source/texk/web2c/luatexdir/image/writejbig2.c +++ b/Build/source/texk/web2c/luatexdir/image/writejbig2.c @@ -75,7 +75,7 @@ object exists, reference it. Else create fresh one. 09 Dec. 2002: JBIG2 seg. page numbers > 0 are now set to 1, see PDF Ref. -$Id: writejbig2.c 1027 2008-02-14 21:01:03Z hhenkel $ +$Id: writejbig2.c 1127 2008-03-25 21:32:54Z hhenkel $ ***********************************************************************/ #include "writejbig2.h" @@ -705,6 +705,7 @@ void read_jbig2_info(image_dict * idict) if (pip == NULL) pdftex_fail("read_jbig2_info(): page %d not found in JBIG2 image file", (int) img_pagenum(idict)); + img_totalpages(idict) = fip->numofpages; img_xsize(idict) = pip->width; img_ysize(idict) = pip->height; img_xres(idict) = (int) (pip->xres * 0.0254 + 0.5); diff --git a/Build/source/texk/web2c/luatexdir/lang/hyphen.c b/Build/source/texk/web2c/luatexdir/lang/hyphen.c index 140cde8d768..1f75b352bca 100644 --- a/Build/source/texk/web2c/luatexdir/lang/hyphen.c +++ b/Build/source/texk/web2c/luatexdir/lang/hyphen.c @@ -623,7 +623,7 @@ void hnj_hyphen_load( repl = hnj_strdup(repl + 1); } */ - for (i=0,j=0,e=0; i='0'&&format[i]<='9') j++; if (is_utf8_follow(format[i])) e++; } @@ -633,7 +633,7 @@ void hnj_hyphen_load( char *org = ( char*) malloc(2+l-e-j); /* remove hyphenation encoders (digits) from pat*/ org[0] = '0'; - for (i=0,j=0,e=0; i=0 && n<=MAX_TEX_LANGUAGES ) { + if (n>=0 && npre_hyphen_char = (int)v; + if (l!=NULL) + l->pre_hyphen_char = (int)v; } void set_post_hyphen_char (integer n, integer v) { struct tex_language *l = get_language((int)n); - l->post_hyphen_char = (int)v; + if (l!=NULL) + l->post_hyphen_char = (int)v; } integer get_pre_hyphen_char (integer n) { struct tex_language *l = get_language((int)n); + if (l==NULL) return -1; return (integer)l->pre_hyphen_char; } integer get_post_hyphen_char (integer n) { struct tex_language *l = get_language((int)n); + if (l==NULL) return -1; return (integer)l->post_hyphen_char; } @@ -352,7 +356,7 @@ char *hyphenation_exception(int exceptions, char *w) { char *exception_strings(struct tex_language *lang) { char *value; - int size = 0, current =0; + size_t size = 0, current =0; size_t l =0; char *ret = NULL; lua_State *L = Luas[0]; @@ -382,7 +386,7 @@ char *exception_strings(struct tex_language *lang) { /* the sequence from |wordstart| to |r| can contain only normal characters */ /* it could be faster to modify a halfword pointer and return an integer */ -halfword find_exception_part(int *j, int *uword, int len) { +halfword find_exception_part(unsigned int *j, int *uword, int len) { halfword g = null, gg = null; register int i = *j; i++; /* this puts uword[i] on the '{' */ @@ -401,7 +405,7 @@ halfword find_exception_part(int *j, int *uword, int len) { return gg; } -int count_exception_part(int *j, int *uword, int len) { +int count_exception_part(unsigned int *j, int *uword, int len) { int ret=0; register int i = *j; i++; /* this puts uword[i] on the '{' */ @@ -420,7 +424,7 @@ static char *PAT_ERROR[] = { NULL }; void do_exception (halfword wordstart, halfword r, char *replacement) { - int i; + unsigned i; halfword t; unsigned len; int clang; @@ -812,8 +816,7 @@ void undump_one_language (int i) { } void undump_language_data (void) { - int i; - unsigned x, numlangs; + unsigned i, x, numlangs; undump_int(numlangs); for (i=0;i @@ -181,6 +181,16 @@ deffont (lua_State *L) { return 0; /* not reached */ } +/* this returns the expected (!) next fontid. */ +static int +nextfontid (lua_State *L) { + int i = new_font(); + lua_pushnumber(L,i); + delete_font(i); + return 1; +} + + static int getfont (lua_State *L) { int i; @@ -201,6 +211,7 @@ static const struct luaL_reg fontlib [] = { {"getfont", getfont}, {"setfont", setfont}, {"define", deffont}, + {"nextid", nextfontid}, {"frozen", frozenfont}, {NULL, NULL} /* sentinel */ }; diff --git a/Build/source/texk/web2c/luatexdir/lua/llanglib.c b/Build/source/texk/web2c/luatexdir/lua/llanglib.c index 63e8c45dec8..a5227afa1a0 100644 --- a/Build/source/texk/web2c/luatexdir/lua/llanglib.c +++ b/Build/source/texk/web2c/luatexdir/lua/llanglib.c @@ -29,6 +29,9 @@ This is llanglib.c #define check_islang(L,b) (struct tex_language **)luaL_checkudata(L,b,LANG_METATABLE) +extern halfword *check_isnode (lua_State *L, int ud) ; + + static int lang_new (lua_State *L) { struct tex_language **lang; diff --git a/Build/source/texk/web2c/luatexdir/lua/llualib.c b/Build/source/texk/web2c/luatexdir/lua/llualib.c index 0d13500a9b7..90b1687f3b1 100644 --- a/Build/source/texk/web2c/luatexdir/lua/llualib.c +++ b/Build/source/texk/web2c/luatexdir/lua/llualib.c @@ -1,5 +1,5 @@ -/* $Id: llualib.c 1013 2008-02-14 00:09:02Z oneiros $ */ +/* $Id: llualib.c 1169 2008-04-15 14:57:56Z oneiros $ */ #include "luatex-api.h" #include @@ -49,17 +49,17 @@ void undump_luac_registers (void) { if (luabytecode_max>=0) { i = (luabytecode_max+1); if ((int)(UINT_MAX32/sizeof(bytecode)+1)<=i) { - lua_fatal_error("Corrupt format file"); + lua_fatal_error(maketexstring("Corrupt format file")); } lua_bytecode_registers = xmalloc(i*sizeof(bytecode)); luabytecode_bytes = i*sizeof(bytecode); - for (i=0;i<=luabytecode_max;i++) { + for (i=0;i<=(unsigned)luabytecode_max;i++) { lua_bytecode_registers[i].done = 0; lua_bytecode_registers[i].size = 0; lua_bytecode_registers[i].buf = NULL; } undump_int(n); - for (i=0;isize + size > buf->alloc) { + if ((int)(buf->size + size) > buf->alloc) { buf->buf = xrealloc(buf->buf,buf->alloc+size+LOAD_BUF_SIZE); buf->alloc = buf->alloc+size+LOAD_BUF_SIZE; } @@ -176,7 +176,7 @@ int set_bytecode (lua_State *L) { } else { luabytecode_bytes += sizeof(bytecode)*(k+1-luabytecode_max); } - for (i=(luabytecode_max+1);i<=k;i++) { + for (i=(luabytecode_max+1);i<=(unsigned)k;i++) { lua_bytecode_registers[i].buf=NULL; lua_bytecode_registers[i].size=0; lua_bytecode_registers[i].done=0; diff --git a/Build/source/texk/web2c/luatexdir/lua/lmplib.c b/Build/source/texk/web2c/luatexdir/lua/lmplib.c index a194f9a55d8..b435618e97b 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lmplib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lmplib.c @@ -430,7 +430,7 @@ void mplib_write_ascii_file (MP mp, void *ff, const char *s) { } else if (f==mplib_data->ps_file_ptr) { APPEND_STRING(ps_out,s); } else { - fprintf((FILE *)f,s); + fprintf((FILE *)f,"%s",s); } } } @@ -883,8 +883,7 @@ mplib_gr_tostring (lua_State *L) { static int mplib_gr_fields (lua_State *L) { const char **fields; - const char *f; - int i = 1; + int i ; struct mp_graphic_object **hh = is_gr_object(L,1); if (*hh) { switch ((*hh)->_type_field) { @@ -899,9 +898,9 @@ mplib_gr_fields (lua_State *L) { default: fields = no_fields; } lua_newtable(L); - for (f = *fields; f != NULL; f++) { - lua_pushstring(L,f); - lua_rawseti(L,-2,i); i++; + for (i=0;fields[i]!=NULL;i++) { + lua_pushstring(L,fields[i]); + lua_rawseti(L,-2,(i+1)); } } else { lua_pushnil(L); @@ -926,16 +925,16 @@ mplib_push_path (lua_State *L, struct mp_knot *h, int is_pen) { lua_createtable(L,0,6); if (!is_pen) { if (p->left_type_field != mp_explicit) { - mplib_push_S(left_type); - lua_pushstring(L,knot_type_enum[p->left_type_field]); - lua_rawset(L,-3); - } - if (p->right_type_field != mp_explicit) { - mplib_push_S(right_type); - lua_pushstring(L,knot_type_enum[p->right_type_field]); - lua_rawset(L,-3); - } - } + mplib_push_S(left_type); + lua_pushstring(L,knot_type_enum[p->left_type_field]); + lua_rawset(L,-3); + } + if (p->right_type_field != mp_explicit) { + mplib_push_S(right_type); + lua_pushstring(L,knot_type_enum[p->right_type_field]); + lua_rawset(L,-3); + } + } mplib_push_S(x_coord); mplib_push_number(L,p->x_coord_field); lua_rawset(L,-3); @@ -965,6 +964,23 @@ mplib_push_path (lua_State *L, struct mp_knot *h, int is_pen) { } } +/* this assumes that the top of the stack is a table + or nil already in the case + */ +static void +mplib_push_pentype (lua_State *L, struct mp_knot *h) { + struct mp_knot *p; /* for scanning the path */ + p=h; + if (p==NULL) { + /* do nothing */ + } else if (p==p->next_field) { + mplib_push_S(type); + lua_pushstring(L,"elliptical"); + lua_rawset(L,-3); + } else { + } +} + #define set_color_objects(pq) \ object_color_model = pq->color_model_field; \ object_color_a = pq->color_field._a_val; \ @@ -1012,6 +1028,7 @@ mplib_push_color (lua_State *L, struct mp_graphic_object *p ) { static void mplib_push_dash (lua_State *L, struct mp_stroked_object *h ) { mp_dash_object *d; + double ds; if (h!=NULL && h->dash_p_field != NULL) { d = h->dash_p_field; lua_newtable(L); @@ -1021,7 +1038,8 @@ mplib_push_dash (lua_State *L, struct mp_stroked_object *h ) { int i = 0; lua_newtable(L); while (*(d->array_field+i) != -1) { - mplib_push_number(L, *(d->array_field+1)); + ds = *(d->array_field+1) / 65536.0; + lua_pushnumber(L, ds); i++; lua_rawseti(L,-2,i); } @@ -1064,6 +1082,7 @@ mplib_fill_field (lua_State *L, struct mp_fill_object *h) { mplib_push_path(L, h->htap_p_field, MPLIB_PATH); } else if (FIELD(pen)) { mplib_push_path(L, h->pen_p_field, MPLIB_PEN); + mplib_push_pentype(L, h->pen_p_field); } else if (FIELD(color)) { mplib_push_color(L,(mp_graphic_object *)h); } else if (FIELD(linejoin)) { @@ -1085,6 +1104,7 @@ mplib_stroked_field (lua_State *L, struct mp_stroked_object *h) { mplib_push_path(L, h->path_p_field, MPLIB_PATH); } else if (FIELD(pen)) { mplib_push_path(L, h->pen_p_field, MPLIB_PEN); + mplib_push_pentype(L, h->pen_p_field); } else if (FIELD(color)) { mplib_push_color(L, (mp_graphic_object *)h); } else if (FIELD(dash)) { @@ -1163,6 +1183,7 @@ mplib_gr_index (lua_State *L) { struct mp_graphic_object **hh = is_gr_object(L,1); if (*hh) { struct mp_graphic_object *h = *hh; + if (mplib_is_S(type,2)) { lua_rawgeti(L,LUA_REGISTRYINDEX,mplib_type_Ses[h->_type_field]); } else { @@ -1206,7 +1227,6 @@ static const struct luaL_reg mplib_gr_meta[] = { {"__gc", mplib_gr_collect }, {"__tostring", mplib_gr_tostring }, {"__index", mplib_gr_index }, - {"fields", mplib_gr_fields }, {NULL, NULL} /* sentinel */ }; @@ -1220,7 +1240,8 @@ static const struct luaL_reg mplib_d [] = { static const struct luaL_reg mplib_m[] = { - {"new", mplib_new}, + {"new", mplib_new }, + {"fields", mplib_gr_fields }, {NULL, NULL} /* sentinel */ }; @@ -1228,6 +1249,7 @@ static const struct luaL_reg mplib_m[] = { int luaopen_mp (lua_State *L) { mplib_init_Ses(L); + luaL_newmetatable(L,MPLIB_GR_METATABLE); lua_pushvalue(L, -1); /* push metatable */ lua_setfield(L, -2, "__index"); /* metatable.__index = metatable */ diff --git a/Build/source/texk/web2c/luatexdir/lua/lpdflib.c b/Build/source/texk/web2c/luatexdir/lua/lpdflib.c index 9cf847c84c8..393409b0729 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lpdflib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lpdflib.c @@ -1,23 +1,23 @@ -/* $Id: lpdflib.c 1013 2008-02-14 00:09:02Z oneiros $ */ +/* $Id: lpdflib.c 1154 2008-04-13 22:36:03Z oneiros $ */ #include "luatex-api.h" #include -static int -findcurv (lua_State *L) { - int j; - j = get_cur_v(); - lua_pushnumber(L, j); - return 1; +static int findcurv(lua_State * L) +{ + int j; + j = get_cur_v(); + lua_pushnumber(L, j); + return 1; } -static int -findcurh (lua_State *L) { - int j; - j = get_cur_h(); - lua_pushnumber(L, j); - return 1; +static int findcurh(lua_State * L) +{ + int j; + j = get_cur_h(); + lua_pushnumber(L, j); + return 1; } @@ -26,7 +26,8 @@ typedef enum { set_origin, direct_page, direct_always } pdf_lit_mode; int luapdfprint(lua_State * L) { int n; - unsigned i, len; + unsigned i; + size_t len; const char *outputstr, *st; pdf_lit_mode literal_mode; n = lua_gettop(L); @@ -46,13 +47,12 @@ int luapdfprint(lua_State * L) else if (strcmp(outputstr, "page") == 0) literal_mode = direct_page; else { - lua_pushstring(L, - "invalid argument for print literal mode"); + lua_pushstring(L, "invalid argument for print literal mode"); lua_error(L); } } } else { - if (n != 1) { + if (n != 1) { lua_pushstring(L, "invalid number of arguments"); lua_error(L); } @@ -71,57 +71,72 @@ int luapdfprint(lua_State * L) default: assert(0); } - st = lua_tolstring(L, n,&len); + st = lua_tolstring(L, n, &len); for (i = 0; i < len; i++) { - if (i%16 == 0) - pdfroom(16); - pdf_buf[pdf_ptr++] = st[i]; + if (i % 16 == 0) + pdfroom(16); + pdf_buf[pdf_ptr++] = st[i]; } return 0; } -static int -getpdf (lua_State *L) { - char *st; - if (lua_isstring(L,2)) { - st = (char *)lua_tostring(L,2); - if (st && *st) { - if (*st == 'h') - return findcurh(L); - else if (*st == 'v') - return findcurv(L); +#define obj_type_others 0 + +static int l_immediateobj(lua_State * L) +{ + if (!lua_isstring(L, -1)) + luaL_error(L, "pdf.immediateobj needs string value"); + pdf_create_obj(obj_type_others, 0); + pdf_begin_obj(obj_ptr, 1); + pdf_printf("%s\n", lua_tostring(L, -1)); + pdf_end_obj(); + lua_pop(L, 1); + lua_pushinteger(L, obj_ptr); + return 1; +} + +static int getpdf(lua_State * L) +{ + char *st; + if (lua_isstring(L, 2)) { + st = (char *) lua_tostring(L, 2); + if (st && *st) { + if (*st == 'h') + return findcurh(L); + else if (*st == 'v') + return findcurv(L); + } } - } - lua_pushnil(L); - return 1; + lua_pushnil(L); + return 1; } -static int -setpdf (lua_State *L) { - return (L==NULL ? 0 : 0); /* for -Wall */ +static int setpdf(lua_State * L) +{ + return (L == NULL ? 0 : 0); /* for -Wall */ } static const struct luaL_reg pdflib[] = { {"print", luapdfprint}, + {"immediateobj", l_immediateobj}, {NULL, NULL} /* sentinel */ }; -int -luaopen_pdf (lua_State *L) { - luaL_register(L, "pdf", pdflib); - /* build meta table */ - luaL_newmetatable(L,"pdf_meta"); - lua_pushstring(L, "__index"); - lua_pushcfunction(L, getpdf); - /* do these later, NYI */ - if (0) { +int luaopen_pdf(lua_State * L) +{ + luaL_register(L, "pdf", pdflib); + /* build meta table */ + luaL_newmetatable(L, "pdf_meta"); + lua_pushstring(L, "__index"); + lua_pushcfunction(L, getpdf); + /* do these later, NYI */ + if (0) { + lua_settable(L, -3); + lua_pushstring(L, "__newindex"); + lua_pushcfunction(L, setpdf); + } lua_settable(L, -3); - lua_pushstring(L, "__newindex"); - lua_pushcfunction(L, setpdf); - } - lua_settable(L, -3); - lua_setmetatable(L,-2); /* meta to itself */ - return 1; + lua_setmetatable(L, -2); /* meta to itself */ + return 1; } - diff --git a/Build/source/texk/web2c/luatexdir/lua/ltexlib.c b/Build/source/texk/web2c/luatexdir/lua/ltexlib.c index f2258010136..937c802727a 100644 --- a/Build/source/texk/web2c/luatexdir/lua/ltexlib.c +++ b/Build/source/texk/web2c/luatexdir/lua/ltexlib.c @@ -1,4 +1,4 @@ -/* $Id: ltexlib.c 1087 2008-03-07 23:52:35Z hhenkel $ */ +/* $Id: ltexlib.c 1168 2008-04-15 13:43:34Z taco $ */ #include "luatex-api.h" #include @@ -135,6 +135,8 @@ luacstring_input (void) { last = first; ret = last; check_buffer_overflow (last + t->tsize); + /* make sure it fits in the pool as well (for show_token_list c.s) */ + check_pool_overflow(pool_ptr + t->tsize); while (t->tsize-->0) buffer[last++] = *st++; if (!t->partial) { @@ -193,7 +195,7 @@ luacstring_close (int n) { #define height_offset 3 #define check_index_range(j) \ - if (j<0 || j > 65535) { \ + if (j > 65535) { \ lua_pushstring(L, "incorrect index value"); \ lua_error(L); } @@ -449,9 +451,38 @@ int gettoks (lua_State *L) { return 1; } +/* UGLY hack */ + +#define char_given 70 +#define math_given 71 +#define omath_given 72 + +static int get_box_id (lua_State *L, int i) { + const char *s; + integer cur_cs, cur_cmd; + str_number texstr; + size_t k = 0; + int j = -1; + if (lua_type(L,i)==LUA_TSTRING) { + s = (char *)lua_tolstring(L,i, &k); + texstr = maketexlstring(s,k); + cur_cs = string_lookup(texstr); + cur_cmd = zget_eq_type(cur_cs); + flush_str(texstr); + if (cur_cmd==char_given || + cur_cmd==math_given || + cur_cmd==omath_given) { + j = zget_equiv(cur_cs); + } + } else { + j = (int)lua_tonumber(L,(i)); + } + return j; +} + int getbox (lua_State *L) { int k, t; - k = (int)luaL_checkinteger(L,-1); + k = get_box_id(L,-1); check_index_range(k); t = get_tex_box_register(k); nodelist_to_lua(L,t); @@ -460,10 +491,7 @@ int getbox (lua_State *L) { int setbox (lua_State *L) { int i,j,k; - - - - k = (int)luaL_checkinteger(L,-2); + k = get_box_id(L,-2); check_index_range(k); i = get_tex_box_register(k); if (lua_isboolean(L,-1)) { @@ -482,11 +510,10 @@ int setbox (lua_State *L) { return 0; } - static int getboxdim (lua_State *L, int whichdim) { int i, j; i = lua_gettop(L); - j = (int)lua_tonumber(L,(i)); + j = get_box_id(L,i); lua_settop(L,(i-2)); /* table at -1 */ if (j<0 || j > 65535) { lua_pushstring(L, "incorrect index"); @@ -525,7 +552,7 @@ static int setboxdim (lua_State *L, int whichdim) { } else { j = (int)lua_tonumber(L,i); } - k = (int)lua_tonumber(L,(i-1)); + k = get_box_id(L,(i-1)); lua_settop(L,(i-3)); /* table at -2 */ if (k<0 || k > 65535) { lua_pushstring(L, "incorrect index"); @@ -704,6 +731,7 @@ getlist (lua_State *L) { int setlist (lua_State *L) { + assert(L); return 0; } diff --git a/Build/source/texk/web2c/luatexdir/lua/luatoken.c b/Build/source/texk/web2c/luatexdir/lua/luatoken.c index 23d9ca82150..bf434b286bb 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luatoken.c +++ b/Build/source/texk/web2c/luatexdir/lua/luatoken.c @@ -1,4 +1,4 @@ -/* $Id: luatoken.c 1013 2008-02-14 00:09:02Z oneiros $ */ +/* $Id: luatoken.c 1168 2008-04-15 13:43:34Z taco $ */ #include "luatex-api.h" #include @@ -222,7 +222,7 @@ get_cur_cs (lua_State *L) { if (lua_isstring(L,-1)) { s = (char *)lua_tolstring(L,-1,&l); if (l>0) { - if (last+l>buf_size) + if ((int)(last+l)>buf_size) check_buffer_overflow(last+l); for (j=0;j=undefined_control_sequence)&&((q<=eqtb_size))||(q>eqtb_size+hash_extra)) { + } else if ((q>=undefined_control_sequence)&&((q<=eqtb_size)||(q>eqtb_size+hash_extra))) { Print_esc("IMPOSSIBLE."); } else if ((zget_cs_text(q)<0)||(zget_cs_text(q)>=str_ptr)) { Print_esc("NONEXISTENT."); @@ -439,8 +439,8 @@ tokenlist_to_luastring(lua_State *L, int p) { int tokenlist_from_lua(lua_State *L) { char *s; - int tok,i; - size_t j; + int tok; + size_t i,j; halfword p,q,r; r = get_avail(); info(r)=0; /* ref count */ diff --git a/Build/source/texk/web2c/luatexdir/lua/mp.w b/Build/source/texk/web2c/luatexdir/lua/mp.w index a459cc48fe1..4894a54e9aa 100644 --- a/Build/source/texk/web2c/luatexdir/lua/mp.w +++ b/Build/source/texk/web2c/luatexdir/lua/mp.w @@ -75,8 +75,8 @@ undergoes any modifications, so that it will be clear which version of @d banner "This is MetaPost, Version 1.003" /* printed when \MP\ starts */ @d metapost_version "1.003" -@d mplib_version "0.30" -@d version_string " (Cweb version 0.30)" +@d mplib_version "0.40" +@d version_string " (Cweb version 0.40)" @d true 1 @d false 0 @@ -659,6 +659,8 @@ char *mp_read_ascii_file (MP mp, void *ff, size_t *size) { FILE *f = (FILE *)ff; *size = 0; (void) mp; /* for -Wunused */ + if (f==NULL) + return NULL; #if NOTTESTING c = fgetc(f); if (c==EOF) @@ -700,7 +702,8 @@ void mp_read_binary_file (MP mp, void *f, void **data, size_t *size) { size_t len = 0; (void) mp; #if NOTTESTING - len = fread(*data,1,*size,(FILE *)f); + if (f!=NULL) + len = fread(*data,1,*size,(FILE *)f); #endif *size = len; } @@ -719,7 +722,8 @@ void mp_write_binary_file (MP mp, void *f, void *s, size_t size) { void mp_close_file (MP mp, void *f) { (void) mp; #if NOTTESTING - fclose((FILE *)f); + if (f!=NULL) + fclose((FILE *)f); #endif } @@ -727,7 +731,10 @@ void mp_close_file (MP mp, void *f) { int mp_eof_file (MP mp, void *f) { (void) mp; #if NOTTESTING - return feof((FILE *)f); + if (f!=NULL) + return feof((FILE *)f); + else + return 1; #else return 0; #endif @@ -737,7 +744,8 @@ int mp_eof_file (MP mp, void *f) { void mp_flush_file (MP mp, void *f) { (void) mp; #if NOTTESTING - fflush((FILE *)f); + if (f!=NULL) + fflush((FILE *)f); #endif } @@ -9517,27 +9525,39 @@ dash_y(hh)=dash_y(h) @ |h| is an edge structure @c -mp_dash_object *mp_export_dashes (MP mp, pointer h) { +mp_dash_object *mp_export_dashes (MP mp, pointer q, scaled *w) { mp_dash_object *d; - pointer p; + pointer p, h; + scaled scf; /* scale factor */ scaled *dashes = NULL; int num_dashes = 1; + h = dash_p(q); if (h==null || dash_list(h)==null_dash) return NULL; p = dash_list(h); + scf=mp_get_pen_scale(mp, pen_p(q)); + if (scf==0) { + if (*w==0) scf = dash_scale(q); else return NULL; + } else { + scf=mp_make_scaled(mp, *w,scf); + scf=mp_take_scaled(mp, scf,dash_scale(q)); + } + *w = scf; d = mp_xmalloc(mp,1,sizeof(mp_dash_object)); start_x(null_dash)=start_x(p)+dash_y(h); while (p != null_dash) { dashes = mp_xrealloc(mp, dashes, num_dashes+2, sizeof(scaled)); - dashes[(num_dashes-1)] = (stop_x(p)-start_x(p)); - dashes[(num_dashes)] = (start_x(link(p))-stop_x(p)); + dashes[(num_dashes-1)] = + mp_take_scaled(mp,(stop_x(p)-start_x(p)),scf); + dashes[(num_dashes)] = + mp_take_scaled(mp,(start_x(link(p))-stop_x(p)),scf); dashes[(num_dashes+1)] = -1; /* terminus */ num_dashes+=2; p=link(p); } d->array_field = dashes; - d->offset_field = mp_dash_offset(mp, h); - d->scale_field = dash_scale(h); + d->offset_field = + mp_take_scaled(mp,mp_dash_offset(mp, h),scf); return d; } @@ -9590,8 +9610,6 @@ pointer mp_copy_objects (MP mp, pointer p, pointer q) { } @ @= -if ( pre_script(p)!=null ) add_str_ref(pre_script(p)); -if ( post_script(p)!=null ) add_str_ref(post_script(p)); switch (type(p)) { case mp_start_clip_code: case mp_start_bounds_code: @@ -9599,14 +9617,20 @@ case mp_start_bounds_code: break; case mp_fill_code: path_p(pp)=mp_copy_path(mp, path_p(p)); + if ( pre_script(p)!=null ) add_str_ref(pre_script(p)); + if ( post_script(p)!=null ) add_str_ref(post_script(p)); if ( pen_p(p)!=null ) pen_p(pp)=copy_pen(pen_p(p)); break; case mp_stroked_code: + if ( pre_script(p)!=null ) add_str_ref(pre_script(p)); + if ( post_script(p)!=null ) add_str_ref(post_script(p)); path_p(pp)=mp_copy_path(mp, path_p(p)); pen_p(pp)=copy_pen(pen_p(p)); if ( dash_p(p)!=null ) add_edge_ref(dash_p(pp)); break; case mp_text_code: + if ( pre_script(p)!=null ) add_str_ref(pre_script(p)); + if ( post_script(p)!=null ) add_str_ref(post_script(p)); add_str_ref(text_p(pp)); break; case mp_stop_clip_code: @@ -10376,7 +10400,7 @@ integer spec_offset; /* number of pen edges between |h| and the initial offset * @ @c @ pointer mp_offset_prep (MP mp,pointer c, pointer h) { halfword n; /* the number of vertices in the pen polygon */ - pointer p,q,q0,r,w, ww; /* for list manipulation */ + pointer c0,p,q,q0,r,w, ww; /* for list manipulation */ integer k_needed; /* amount to be added to |info(p)| when it is computed */ pointer w0; /* a pointer to pen offset to use just before |p| */ scaled dxin,dyin; /* the direction into knot |p| */ @@ -10385,7 +10409,7 @@ pointer mp_offset_prep (MP mp,pointer c, pointer h) { dx0=0; dy0=0; @; @; - p=c; k_needed=0; + p=c; c0=c; k_needed=0; do { q=link(p); @= @@ -23247,7 +23271,6 @@ void mp_do_write (MP mp) ; @ @= { (mp->close_file)(mp,mp->wr_file[n]); xfree(mp->wr_fname[n]); - mp->wr_fname[n]=NULL; if ( n==mp->write_files-1 ) mp->write_files=n; } @@ -25218,6 +25241,7 @@ void mp_ship_out (MP mp, pointer h) ; struct mp_edge_object *mp_gr_export(MP mp, pointer h) { pointer p; /* the current graphical object */ integer t; /* a temporary value */ + scaled d_width; /* the current pen width */ mp_edge_object *hh; /* the first graphical object */ struct mp_graphic_object *hq; /* something |hp| points to */ struct mp_text_object *tt; @@ -25244,6 +25268,7 @@ struct mp_edge_object *mp_gr_export(MP mp, pointer h) { case mp_fill_code: tf = (mp_fill_object *)hq; gr_pen_p(tf) = mp_export_knot_list(mp,pen_p(p)); + d_width = mp_get_pen_scale(mp, pen_p(p)); if ((pen_p(p)==null) || pen_is_elliptical(pen_p(p))) { gr_path_p(tf) = mp_export_knot_list(mp,path_p(p)); } else { @@ -25265,6 +25290,7 @@ struct mp_edge_object *mp_gr_export(MP mp, pointer h) { case mp_stroked_code: ts = (mp_stroked_object *)hq; gr_pen_p(ts) = mp_export_knot_list(mp,pen_p(p)); + d_width = mp_get_pen_scale(mp, pen_p(p)); if (pen_is_elliptical(pen_p(p))) { gr_path_p(ts) = mp_export_knot_list(mp,path_p(p)); } else { @@ -25286,7 +25312,7 @@ struct mp_edge_object *mp_gr_export(MP mp, pointer h) { gr_ljoin_val(ts) = ljoin_val(p); gr_miterlim_val(ts) = miterlim_val(p); gr_lcap_val(ts) = lcap_val(p); - gr_dash_p(ts) = mp_export_dashes(mp,dash_p(p)); + gr_dash_p(ts) = mp_export_dashes(mp,p,&d_width); break; case mp_text_code: tt = (mp_text_object *)hq; @@ -25666,6 +25692,7 @@ for (k=p;k<=mp->lo_mem_max;k++ ) undump_wd(mp->mem[k]); undump(mp->lo_mem_max+1,hi_mem_stat_min,mp->hi_mem_min); undump(null,mp->mem_top,mp->avail); mp->mem_end=mp->mem_top; +mp->last_pending=spec_head; for (k=mp->hi_mem_min;k<= mp->mem_end;k++) undump_wd(mp->mem[k]); undump_int(mp->var_used); undump_int(mp->dyn_used) @@ -25841,6 +25868,7 @@ if (mp->rd_fname!=NULL) { for (k=0;k<=(int)mp->read_files-1;k++ ) { if ( mp->rd_fname[k]!=NULL ) { (mp->close_file)(mp,mp->rd_file[k]); + xfree(mp->rd_fname[k]); } } } @@ -25848,6 +25876,7 @@ if (mp->wr_fname!=NULL) { for (k=0;k<=(int)mp->write_files-1;k++) { if ( mp->wr_fname[k]!=NULL ) { (mp->close_file)(mp,mp->wr_file[k]); + xfree(mp->wr_fname[k]); } } } @@ -25856,19 +25885,19 @@ if (mp->wr_fname!=NULL) { for (k=0;k<(int)mp->max_read_files;k++ ) { if ( mp->rd_fname[k]!=NULL ) { (mp->close_file)(mp,mp->rd_file[k]); - mp_xfree(mp->rd_fname[k]); + xfree(mp->rd_fname[k]); } } -mp_xfree(mp->rd_file); -mp_xfree(mp->rd_fname); +xfree(mp->rd_file); +xfree(mp->rd_fname); for (k=0;k<(int)mp->max_write_files;k++) { if ( mp->wr_fname[k]!=NULL ) { (mp->close_file)(mp,mp->wr_file[k]); - mp_xfree(mp->wr_fname[k]); + xfree(mp->wr_fname[k]); } } -mp_xfree(mp->wr_file); -mp_xfree(mp->wr_fname); +xfree(mp->wr_file); +xfree(mp->wr_fname); @ We want to produce a \.{TFM} file if and only if |mp_fontmaking| is positive. diff --git a/Build/source/texk/web2c/luatexdir/lua/psout.w b/Build/source/texk/web2c/luatexdir/lua/psout.w index 4a3f588ef7f..90cf6923e01 100644 --- a/Build/source/texk/web2c/luatexdir/lua/psout.w +++ b/Build/source/texk/web2c/luatexdir/lua/psout.w @@ -4405,12 +4405,9 @@ format, it is closely modelled to the PostScript model. The array of dashes is ended by a single negative value, because this is not allowed in PostScript. -@d gr_dash_scale(A) (gr_dash_p(A))->scale_field - @= typedef struct { scaled offset_field; - scaled scale_field; scaled *array_field; } mp_dash_object ; @@ -4707,7 +4704,6 @@ void mp_gr_fix_graphics_state (MP mp, mp_graphic_object *p) { scaled wx,wy,ww; /* dimensions of pen bounding box */ boolean adj_wx; /* whether pixel rounding should be based on |wx| or |wy| */ integer tx,ty; /* temporaries for computing |adj_wx| */ - scaled scf; /* a scale factor for the dash pattern */ if ( gr_has_color(p) ) @; if ( (gr_type(p)==mp_fill_code)||(gr_type(p)==mp_stroked_code) ) { @@ -4980,13 +4976,6 @@ if ( gr_type(p)==mp_fill_code || gr_dash_p(p) == NULL) { hh=NULL; } else { hh=gr_dash_p(p); - scf=mp_gr_get_pen_scale(mp, gr_pen_p((mp_fill_object *)p)); - if ( scf==0 ) { - if ( gs_width==0 ) scf=hh->scale_field; else hh=NULL; - } else { - scf=mp_make_scaled(mp, gs_width,scf); - scf=mp_take_scaled(mp, scf, (hh == NULL ? unity : gr_dash_scale(p))); - } } if ( hh==NULL ) { if ( gs_dash_p!=NULL || gs_dash_init_done == false) { @@ -5038,9 +5027,6 @@ boolean mp_gr_same_dashes (mp_dash_object *h, mp_dash_object *hh) ; @ This function test if |h| and |hh| represent the same dash pattern. -The |scale_field| is ignored in this test because it is not really -a property of the PostScript format of a dash pattern. - @c boolean mp_gr_same_dashes (mp_dash_object *h, mp_dash_object *hh) { boolean ret=false; @@ -5496,9 +5482,12 @@ void mp_gr_ship_out (mp_edge_object *hh, int prologues, int procset) { case mp_start_bounds_code: case mp_stop_bounds_code: break; - case mp_special_code: - mp_ps_print_nl (mp, gr_pre_script((mp_special_object *)p)); - mp_ps_print_ln (mp); + case mp_special_code: + { + mp_special_object *ps = (mp_special_object *)p; + mp_ps_print_nl (mp, gr_pre_script(ps)); + mp_ps_print_ln (mp); + } break; } /* all cases are enumerated */ p=gr_link(p); diff --git a/Build/source/texk/web2c/luatexdir/luatex.web b/Build/source/texk/web2c/luatexdir/luatex.web index b1c977706ff..99fe08e72a9 100644 --- a/Build/source/texk/web2c/luatexdir/luatex.web +++ b/Build/source/texk/web2c/luatexdir/luatex.web @@ -243,8 +243,8 @@ known as `\eTeX'. @d pdftex_version_string=='-2.00.0' {current \pdfTeX\ version} @# @d luatex_version==25 { \.{\\luatexversion} } -@d luatex_revision=="1" { \.{\\luatexrevision} } -@d luatex_version_string=='snapshot-0.25.1' {current \LuaTeX\ version} +@d luatex_revision=="3" { \.{\\luatexrevision} } +@d luatex_version_string=='snapshot-0.25.3' {current \LuaTeX\ version} @d luatex_date_info==-extra_version_info { the compile date is negated } @# @d luaTeX_banner=='This is LuaTeX, Version ',luatex_version_string,extra_version_info @@ -10908,8 +10908,8 @@ at the value |p| that is returned. (If |p=temp_token_head|, the list is empty.) |lua_str_toks| is almost identical, but it also escapes the three symbols that |lua| considers special while scanning a literal string -@d unicode_incr(#)==if str_pool[#]>@"F0 then #:=#+4 else if str_pool[#]>@"E0 - then #:=#+3 else if str_pool[#]>@"C0 then #:=#+2 else incr(#) +@d unicode_incr(#)==if str_pool[#]>=@"F0 then #:=#+4 else if str_pool[#]>=@"E0 + then #:=#+3 else if str_pool[#]>=@"C0 then #:=#+2 else incr(#) @p @t\4@>@@;@/ @@ -16318,15 +16318,15 @@ var w, s_out: scaled; begin w := char_width(f,c); if hasfmentry(f) then begin - if pdf_cur_Tm_a = 0 then begin - call_func(divide_scaled_n(w, pdf_font_size(f),10000.0)); + if pdf_cur_Tm_a = 1000 then begin + call_func(divide_scaled_n(w, pdf_font_size(f), 10000.0)); pdf_delta_h := pdf_delta_h + scaled_out; end else begin - s := divide_scaled_n(round_xn_over_d(w, 1000, 1000 + pdf_cur_Tm_a), - pdf_font_size(f),10000.0); + s := divide_scaled_n(round_xn_over_d(w, 1000, pdf_cur_Tm_a), + pdf_font_size(f), 10000.0); s_out := round_xn_over_d(round_xn_over_d(pdf_font_size(f), abs(s), 10000), - 1000 + pdf_cur_Tm_a, 1000); + pdf_cur_Tm_a, 1000); if s < 0 then s_out := -s_out; pdf_delta_h := pdf_delta_h + s_out; @@ -16378,12 +16378,12 @@ end; @!pdf_output_value: integer; @!pdf_draftmode_option: integer; @!pdf_draftmode_value: integer; -@!pdf_cur_Tm_a: integer; {|a| value of the current text matrix, ie the current - horizontal scaling factor} +@!pdf_cur_Tm_a: integer; {value |a| of the current text matrix, i.e., + the current horizontal scaling factor} +@!pdf_cur_Tm_c: integer; {value |c| of the current text matrix, i.e., slant (skew, obliqueness)} @!pdf_last_f: internal_font_number; {last font in PDF output page} @!pdf_last_fs: internal_font_number; {last font size in PDF output page} - @ Following procedures implement low-level subroutines to convert \TeX{} internal structures to PDF page description. @@ -16434,19 +16434,26 @@ end; procedure pdf_set_textmatrix(v, v_out: scaled; f: internal_font_number); {set the next starting point to |cur_h|, |cur_v|} -var pdf_new_Tm_a: integer; {|a| value of the new text matrix} +var pdf_new_Tm_a, pdf_new_Tm_c: integer; {values |a| and |c| of the new text matrix} begin pdf_out(" "); - if f = pdf_f then - pdf_new_Tm_a := pdf_cur_Tm_a - else if not pdf_font_auto_expand(f) then - pdf_new_Tm_a := 0 - else - pdf_new_Tm_a := pdf_font_expand_ratio(f); - if (pdf_new_Tm_a <> 0) or - ((pdf_new_Tm_a = 0) and (pdf_cur_Tm_a <> 0)) then begin - pdf_print_real(1000 + pdf_new_Tm_a, 3); - pdf_print(" 0 0 1 "); + if f = pdf_f then begin + pdf_new_Tm_a := pdf_cur_Tm_a; + pdf_new_Tm_c := pdf_cur_Tm_c; + end else begin + if pdf_font_auto_expand(f) then + pdf_new_Tm_a := 1000 + pdf_font_expand_ratio(f) + else + pdf_new_Tm_a := 1000; + pdf_new_Tm_c := 0 * font_slant(f); {don't activate it yet, needs fixing writefont.c etc.} + end; + if (pdf_new_Tm_a <> 1000) or (pdf_cur_Tm_a <> 1000) + or (pdf_new_Tm_c <> 0) or (pdf_cur_Tm_c <> 0) + then begin + pdf_print_real(pdf_new_Tm_a, 3); + pdf_print(" 0 "); + pdf_print_real(pdf_new_Tm_c, 3); + pdf_print(" 1 "); pdf_print_bp(cur_h - pdf_origin_h); pdf_h := pdf_origin_h + scaled_out; pdf_out(" "); @@ -16454,7 +16461,8 @@ begin pdf_v := pdf_origin_v - scaled_out; pdf_print(" Tm"); pdf_cur_Tm_a := pdf_new_Tm_a; - pdfassert(pdf_cur_Tm_a > -1000); + pdf_cur_Tm_c := pdf_new_Tm_c; + pdfassert(pdf_cur_Tm_a > 0); end else begin pdf_print_bp(cur_h - pdf_tj_start_h); {works only for unexpanded fonts} pdf_h := pdf_tj_start_h + scaled_out; @@ -16582,7 +16590,8 @@ begin pdf_last_f := null_font; pdf_last_fs := 0; pdf_doing_string := false; - pdf_cur_Tm_a := 0; + pdf_cur_Tm_a := 1000; + pdf_cur_Tm_c := 0; end; @ @p @@ -16596,18 +16605,16 @@ begin s_out:=0; pdf_end_string; pdf_set_font(f); end; - if pdf_cur_Tm_a = 0 then begin - s := divide_scaled_n(cur_h - (pdf_tj_start_h + pdf_delta_h), pdf_font_size(f),1000.0); + if pdf_cur_Tm_a = 1000 then begin + s := divide_scaled_n(cur_h - (pdf_tj_start_h + pdf_delta_h), pdf_font_size(f), 1000.0); s_out := scaled_out; end else begin s := divide_scaled_n(round_xn_over_d(cur_h - (pdf_tj_start_h + pdf_delta_h), 1000, - 1000 + pdf_cur_Tm_a), - pdf_font_size(f), - 1000.0); + pdf_cur_Tm_a), pdf_font_size(f), 1000.0); if abs(s) < @'100000 then begin s_out := round_xn_over_d(round_xn_over_d(pdf_font_size(f), abs(s), 1000), - 1000 + pdf_cur_Tm_a, 1000); + pdf_cur_Tm_a, 1000); if s < 0 then s_out := -s_out; end; @@ -27630,7 +27637,7 @@ by causing its width to be zero. begin if (e<>0)and((w-total_shrink[normal]+q<=z)or@| (total_shrink[sfi]<>0)or(total_shrink[fil]<>0)or (total_shrink[fill]<>0)or(total_shrink[filll]<>0)) then - begin flush_node(b); + begin list_ptr(b):=null; flush_node(b); b:=hpack(p,z-q,exactly); end else begin e:=0; @@ -34782,7 +34789,7 @@ var q:pointer; begin q := box(j); get_tex_box_width := 0; - if q <> min_halfword then + if q <> null then get_tex_box_width := width(q); end; @@ -34791,7 +34798,7 @@ var q:pointer; begin q := box(j); set_tex_box_width := 0; - if q <> min_halfword then + if q <> null then width(q) := v else set_tex_box_width := 1; @@ -34802,7 +34809,7 @@ var q:pointer; begin q := box(j); get_tex_box_height := 0; - if q <> min_halfword then + if q <> null then get_tex_box_height := height(q); end; @@ -34811,7 +34818,7 @@ var q:pointer; begin q := box(j); set_tex_box_height := 0; - if q <> min_halfword then + if q <> null then height(q) := v else set_tex_box_height := 1; @@ -34822,7 +34829,7 @@ var q:pointer; begin q := box(j); get_tex_box_depth := 0; - if q <> min_halfword then + if q <> null then get_tex_box_depth := depth(q); end; @@ -34831,7 +34838,7 @@ var q:pointer; begin q := box(j); set_tex_box_depth := 0; - if q <> min_halfword then + if q <> null then depth(q) := v else set_tex_box_depth := 1; diff --git a/Build/source/texk/web2c/luatexdir/tex/linebreak.c b/Build/source/texk/web2c/luatexdir/tex/linebreak.c index 910d26b9f27..768d1999af8 100644 --- a/Build/source/texk/web2c/luatexdir/tex/linebreak.c +++ b/Build/source/texk/web2c/luatexdir/tex/linebreak.c @@ -1,4 +1,4 @@ -/* $Id: linebreak.c 1102 2008-03-11 09:52:54Z taco $ */ +/* $Id: linebreak.c 1168 2008-04-15 13:43:34Z taco $ */ #include "luatex-api.h" #include @@ -12,29 +12,31 @@ prevents this error message from appearing more than once per paragraph. */ -#define check_shrinkage(a) \ - if ((shrink_order((a))!=normal)&&(shrink((a))!=0)) \ +#define check_shrinkage(a) \ + if ((shrink_order((a))!=normal)&&(shrink((a))!=0)) \ a=finite_shrink((a)) -static boolean no_shrink_error_yet; /*have we complained about infinite shrinkage?*/ - -halfword -finite_shrink(halfword p) { /* recovers from infinite shrinkage */ - halfword q; /*new glue specification*/ - char *hlp[] = { - "The paragraph just ended includes some glue that has", - "infinite shrinkability, e.g., `\\hskip 0pt minus 1fil'.", - "Such glue doesn't belong there---it allows a paragraph", - "of any length to fit on one line. But it's safe to proceed,", - "since the offensive shrinkability has been made finite.", - NULL }; - if (no_shrink_error_yet) { - no_shrink_error_yet=false; - tex_error("Infinite glue shrinkage found in a paragraph",hlp); - } - q=new_spec(p); shrink_order(q)=normal; - delete_glue_ref(p); - return q; +static boolean no_shrink_error_yet; /*have we complained about infinite shrinkage? */ + +halfword finite_shrink(halfword p) +{ /* recovers from infinite shrinkage */ + halfword q; /*new glue specification */ + char *hlp[] = { + "The paragraph just ended includes some glue that has", + "infinite shrinkability, e.g., `\\hskip 0pt minus 1fil'.", + "Such glue doesn't belong there---it allows a paragraph", + "of any length to fit on one line. But it's safe to proceed,", + "since the offensive shrinkability has been made finite.", + NULL + }; + if (no_shrink_error_yet) { + no_shrink_error_yet = false; + tex_error("Infinite glue shrinkage found in a paragraph", hlp); + } + q = new_spec(p); + shrink_order(q) = normal; + delete_glue_ref(p); + return q; } /* A pointer variable |cur_p| runs through the given horizontal list as we look @@ -60,168 +62,177 @@ finite_shrink(halfword p) { /* recovers from infinite shrinkage */ stretchability and set |final_pass=true|. */ -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 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 */ /* skipable nodes at the margins during character protrusion */ -#define cp_skipable(a) ((! is_char_node((a))) && \ - ((type((a)) == ins_node) \ - || (type((a)) == mark_node) \ - || (type((a)) == adjust_node) \ - || (type((a)) == penalty_node) \ - || ((type((a)) == whatsit_node) && \ - (subtype((a)) != pdf_refximage_node) && \ - (subtype((a)) != pdf_refxform_node)) \ - /* reference to an image or XObject form */ \ - || ((type((a)) == disc_node) && \ - (vlink_pre_break(a) == null) && \ - (vlink_post_break(a) == null) && \ - (vlink_no_break(a) == null)) \ - /* an empty |disc_node| */ \ - || ((type((a)) == math_node) && \ - (surround((a)) == 0)) \ - || ((type((a)) == kern_node) && \ - ((width((a)) == 0) || \ - (subtype((a)) == normal))) \ - || ((type((a)) == glue_node) && \ - (glue_ptr((a)) == zero_glue)) \ - || ((type((a)) == hlist_node) && \ - (width((a)) == 0) && \ - (height((a)) == 0) && \ - (depth((a)) == 0) && \ - (list_ptr((a)) == null)) \ - )) +#define cp_skipable(a) ((! is_char_node((a))) && \ + ((type((a)) == ins_node) \ + || (type((a)) == mark_node) \ + || (type((a)) == adjust_node) \ + || (type((a)) == penalty_node) \ + || ((type((a)) == whatsit_node) && \ + (subtype((a)) != pdf_refximage_node) && \ + (subtype((a)) != pdf_refxform_node)) \ + /* reference to an image or XObject form */ \ + || ((type((a)) == disc_node) && \ + (vlink_pre_break(a) == null) && \ + (vlink_post_break(a) == null) && \ + (vlink_no_break(a) == null)) \ + /* an empty |disc_node| */ \ + || ((type((a)) == math_node) && \ + (surround((a)) == 0)) \ + || ((type((a)) == kern_node) && \ + ((width((a)) == 0) || \ + (subtype((a)) == normal))) \ + || ((type((a)) == glue_node) && \ + (glue_ptr((a)) == zero_glue)) \ + || ((type((a)) == hlist_node) && \ + (width((a)) == 0) && \ + (height((a)) == 0) && \ + (depth((a)) == 0) && \ + (list_ptr((a)) == null)) \ + )) /* maximum fill level for |hlist_stack|*/ -#define max_hlist_stack 512 /* maybe good if larger than |2 * - max_quarterword|, so that box nesting - level would overflow first */ +#define max_hlist_stack 512 /* maybe good if larger than |2 * + max_quarterword|, so that box nesting + level would overflow first */ /* stack for |find_protchar_left()| and |find_protchar_right()| */ -static halfword hlist_stack[max_hlist_stack]; +static halfword hlist_stack[max_hlist_stack]; /* fill level for |hlist_stack| */ -static short hlist_stack_level = 0; +static short hlist_stack_level = 0; -void push_node(halfword p) { - if (hlist_stack_level >= max_hlist_stack) - pdf_error("push_node", "stack overflow"); - hlist_stack[hlist_stack_level++] = p; +void push_node(halfword p) +{ + if (hlist_stack_level >= max_hlist_stack) + pdf_error(maketexstring("push_node"), maketexstring("stack overflow")); + hlist_stack[hlist_stack_level++] = p; } -halfword pop_node (void) { - if (hlist_stack_level <= 0) /* would point to some bug */ - pdf_error("pop_node", "stack underflow (internal error)"); - return hlist_stack[--hlist_stack_level]; +halfword pop_node(void) +{ + if (hlist_stack_level <= 0) /* would point to some bug */ + pdf_error(maketexstring("pop_node"), + maketexstring("stack underflow (internal error)")); + return hlist_stack[--hlist_stack_level]; } #define null_font 0 -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*/ - - -boolean check_expand_pars(internal_font_number f) { - internal_font_number k; - - if ((pdf_font_step(f) == 0) || ((pdf_font_stretch(f) == null_font) && - (pdf_font_shrink(f) == null_font))) - return false; - if (cur_font_step < 0) - cur_font_step = pdf_font_step(f); - else if (cur_font_step != pdf_font_step(f)) - pdf_error("font expansion", - "using fonts with different step of expansion in one paragraph is not allowed"); - k = pdf_font_stretch(f); - if( k != null_font) { - if (max_stretch_ratio < 0) - max_stretch_ratio = pdf_font_expand_ratio(k); - else if (max_stretch_ratio != pdf_font_expand_ratio(k)) - pdf_error("font expansion", - "using fonts with different limit of expansion in one paragraph is not allowed"); - } - k = pdf_font_shrink(f); - if( k != null_font) { - if (max_shrink_ratio < 0) - max_shrink_ratio = -pdf_font_expand_ratio(k); - else if (max_shrink_ratio != -pdf_font_expand_ratio(k)) - pdf_error("font expansion", - "using fonts with different limit of expansion in one paragraph is not allowed"); - } - return true; +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 */ + + +boolean check_expand_pars(internal_font_number f) +{ + internal_font_number k; + + if ((pdf_font_step(f) == 0) || ((pdf_font_stretch(f) == null_font) && + (pdf_font_shrink(f) == null_font))) + return false; + if (cur_font_step < 0) + cur_font_step = pdf_font_step(f); + else if (cur_font_step != pdf_font_step(f)) + pdf_error(maketexstring("font expansion"), + maketexstring + ("using fonts with different step of expansion in one paragraph is not allowed")); + k = pdf_font_stretch(f); + if (k != null_font) { + if (max_stretch_ratio < 0) + max_stretch_ratio = pdf_font_expand_ratio(k); + else if (max_stretch_ratio != pdf_font_expand_ratio(k)) + pdf_error(maketexstring("font expansion"), + maketexstring + ("using fonts with different limit of expansion in one paragraph is not allowed")); + } + k = pdf_font_shrink(f); + if (k != null_font) { + if (max_shrink_ratio < 0) + max_shrink_ratio = -pdf_font_expand_ratio(k); + else if (max_shrink_ratio != -pdf_font_expand_ratio(k)) + pdf_error(maketexstring("font expansion"), + maketexstring + ("using fonts with different limit of expansion in one paragraph is not allowed")); + } + return true; } /* searches left to right from list head |l|, returns 1st non-skipable item*/ -/*public*/ halfword find_protchar_left(halfword l, boolean d) { - halfword t; - boolean run; - if ((vlink(l) != null) && (type(l) == hlist_node) && (width(l) == 0) - && (height(l) == 0) && (depth(l) == 0) && (list_ptr(l) == null)) { - l = vlink(l); /*for paragraph start with \.{\\parindent = 0pt*/ - } else if (d) { - while ((vlink(l) != null) && (!(is_char_node(l) || non_discardable(l)))) { - l = vlink(l); /* std.\ discardables at line break, \TeX book, p 95 */ - } - } - hlist_stack_level = 0; - run = true; - do { - t = l; - while (run && (type(l) == hlist_node) && (list_ptr(l) != null)) { - push_node(l); - l = list_ptr(l); - } - while (run && cp_skipable(l)) { - while ((vlink(l) == null) && (hlist_stack_level > 0)) { - l = pop_node(); /* don't visit this node again */ - } - if (vlink(l) != null) - l = vlink(l); - else if (hlist_stack_level == 0) - run = false; +/*public*/ halfword find_protchar_left(halfword l, boolean d) +{ + halfword t; + boolean run; + if ((vlink(l) != null) && (type(l) == hlist_node) && (width(l) == 0) + && (height(l) == 0) && (depth(l) == 0) && (list_ptr(l) == null)) { + l = vlink(l); /*for paragraph start with \.{\\parindent = 0pt */ + } else if (d) { + while ((vlink(l) != null) && (!(is_char_node(l) || non_discardable(l)))) { + l = vlink(l); /* std.\ discardables at line break, \TeX book, p 95 */ + } } - } while (t != l); - return l; + hlist_stack_level = 0; + run = true; + do { + t = l; + while (run && (type(l) == hlist_node) && (list_ptr(l) != null)) { + push_node(l); + l = list_ptr(l); + } + while (run && cp_skipable(l)) { + while ((vlink(l) == null) && (hlist_stack_level > 0)) { + l = pop_node(); /* don't visit this node again */ + } + if (vlink(l) != null) + l = vlink(l); + else if (hlist_stack_level == 0) + run = false; + } + } while (t != l); + return l; } /* searches right to left from list tail |r| to head |l|, returns 1st non-skipable item */ -/*public*/ halfword find_protchar_right(halfword l, halfword r) { - halfword t; - boolean run; - if (r == null) - return null; - hlist_stack_level = 0; - run = true; - do { - t = r; - while (run && (type(r) == hlist_node) && (list_ptr(r) != null)) { - push_node(l); - push_node(r); - l = list_ptr(r); - r = l; - while (vlink(r) != null) { - halfword s = r; - r = vlink(r); - alink(r) = s; - } - } - while (run && cp_skipable(r)) { - while ((r == l) && (hlist_stack_level > 0)) { - r = pop_node(); /* don't visit this node again */ - l = pop_node(); - } - if ((r != l) && (r != null) ) { - assert(vlink(alink(r))==r); - r = alink(r); - } else if ((r == l) && (hlist_stack_level == 0)) - run = false; - } - } while (t != r); - return r; +/*public*/ halfword find_protchar_right(halfword l, halfword r) +{ + halfword t; + boolean run; + if (r == null) + return null; + hlist_stack_level = 0; + run = true; + do { + t = r; + while (run && (type(r) == hlist_node) && (list_ptr(r) != null)) { + push_node(l); + push_node(r); + l = list_ptr(r); + r = l; + while (vlink(r) != null) { + halfword s = r; + r = vlink(r); + alink(r) = s; + } + } + while (run && cp_skipable(r)) { + while ((r == l) && (hlist_stack_level > 0)) { + r = pop_node(); /* don't visit this node again */ + l = pop_node(); + } + if ((r != l) && (r != null)) { + assert(vlink(alink(r)) == r); + r = alink(r); + } else if ((r == l) && (hlist_stack_level == 0)) + run = false; + } + } while (t != r); + return r; } #define left_pw(a) char_pw((a), left_side) @@ -232,30 +243,31 @@ boolean check_expand_pars(internal_font_number f) { |cur_break(break_node(q))| and |p| is the leftmost resp. rightmost node in the horizontal list representing the actual line */ -scaled total_pw (halfword first_p, halfword q, halfword p) { - halfword l, r; - l = (break_node(q) == null) ? first_p : cur_break(break_node(q)); - assert(vlink(alink(p))==p); - r = alink(r); - /* let's look at the right margin first */ - if ((p != null) && (type(p) == disc_node) && (vlink(pre_break(p)) != null)) { - /* a |disc_node| with non-empty |pre_break|, protrude the last char of |pre_break| */ - r = vlink(pre_break(p)); - while (vlink(r) != null) - r = vlink(r); - } else { - r = find_protchar_right(l, r); - } - /* now the left margin */ - if ((l != null) && (type(l) == disc_node)) { - if (vlink(post_break(l)) != null) { - l = vlink(post_break(l)); /* protrude the first char */ - goto DONE; +scaled total_pw(halfword first_p, halfword q, halfword p) +{ + halfword l, r; + l = (break_node(q) == null) ? first_p : cur_break(break_node(q)); + assert(vlink(alink(p)) == p); + r = alink(r); + /* let's look at the right margin first */ + if ((p != null) && (type(p) == disc_node) && (vlink(pre_break(p)) != null)) { + /* a |disc_node| with non-empty |pre_break|, protrude the last char of |pre_break| */ + r = vlink(pre_break(p)); + while (vlink(r) != null) + r = vlink(r); + } else { + r = find_protchar_right(l, r); } - } - l = find_protchar_left(l, true); -DONE: - return (left_pw(l) + right_pw(r)); + /* now the left margin */ + if ((l != null) && (type(l) == disc_node)) { + if (vlink(post_break(l)) != null) { + l = vlink(post_break(l)); /* protrude the first char */ + goto DONE; + } + } + l = find_protchar_left(l, true); + DONE: + return (left_pw(l) + right_pw(r)); } #endif @@ -271,14 +283,14 @@ DONE: */ typedef enum { - very_loose_fit = 0, /* fitness classification for lines stretching more than - their stretchability */ - loose_fit, /* fitness classification for lines stretching 0.5 to 1.0 of their - stretchability */ - decent_fit, /* fitness classification for all other lines*/ - tight_fit /* fitness classification for lines shrinking 0.5 to 1.0 of their - shrinkability */ -} fitness_value ; + very_loose_fit = 0, /* fitness classification for lines stretching more than + their stretchability */ + loose_fit, /* fitness classification for lines stretching 0.5 to 1.0 of their + stretchability */ + decent_fit, /* fitness classification for all other lines */ + tight_fit /* fitness classification for lines shrinking 0.5 to 1.0 of their + shrinkability */ +} fitness_value; /* The algorithm essentially determines the best possible way to achieve @@ -324,11 +336,11 @@ except that nodes with |line_number>easy_line| may be in any order relative to each other. */ -void -initialize_active (void) { - type(active)=hyphenated_node; - line_number(active)=max_halfword; - subtype(active)=0; /* the |subtype| is never examined */ +void initialize_active(void) +{ + type(active) = hyphenated_node; + line_number(active) = max_halfword; + subtype(active) = 0; /* the |subtype| is never examined */ } /* The passive node for a given breakpoint contains EIGHT fields: @@ -356,9 +368,9 @@ is used to help print out the paragraph when detailed information about the line-breaking computation is being displayed. */ -static halfword passive; /* most recent node on passive list */ -static halfword printed_node; /*most recent node that has been printed*/ -static halfword pass_number; /*the number of passive nodes allocated on this pass*/ +static halfword passive; /* most recent node on passive list */ +static halfword printed_node; /*most recent node that has been printed */ +static halfword pass_number; /*the number of passive nodes allocated on this pass */ /* @ The active list also contains ``delta'' nodes that help the algorithm @@ -398,15 +410,15 @@ macro makes such six-tuples convenient. #define save_active_width(a) prev_active_width[(a)] = active_width[(a)] #define restore_active_width(a) active_width[(a)] = prev_active_width[(a)] -static scaled active_width[10] = {0}; /*distance from first active node to~|cur_p|*/ -static scaled background[10] = {0}; /*length of an ``empty'' line*/ -static scaled break_width[10] = {0}; /*length being computed after current break*/ +static scaled active_width[10] = { 0 }; /*distance from first active node to~|cur_p| */ +static scaled background[10] = { 0 }; /*length of an ``empty'' line */ +static scaled break_width[10] = { 0 }; /*length being computed after current break */ -static boolean auto_breaking; /*make |auto_breaking| accessible out of |line_break|*/ -static boolean try_prev_break; /*force break at the previous legal breakpoint?*/ -static halfword prev_legal; /*the previous legal breakpoint*/ -static halfword rejected_cur_p; /*the last |cur_p| that has been rejected*/ -static boolean before_rejected_cur_p; /*|cur_p| is still before |rejected_cur_p|?*/ +static boolean auto_breaking; /*make |auto_breaking| accessible out of |line_break| */ +static boolean try_prev_break; /*force break at the previous legal breakpoint? */ +static halfword prev_legal; /*the previous legal breakpoint */ +static halfword rejected_cur_p; /*the last |cur_p| that has been rejected */ +static boolean before_rejected_cur_p; /*|cur_p| is still before |rejected_cur_p|? */ /* Let's state the principles of the delta nodes more precisely and concisely, so that the following programs will be less obscure. For each legal @@ -467,16 +479,16 @@ static boolean before_rejected_cur_p; /*|cur_p| is still before |rejected_cur_p| -static integer internal_pen_inter; /* running \.{\\localinterlinepenalty} */ -static integer internal_pen_broken; /* running \.{\\localbrokenpenalty} */ -static halfword internal_left_box; /* running \.{\\localleftbox} */ +static integer internal_pen_inter; /* running \.{\\localinterlinepenalty} */ +static integer internal_pen_broken; /* running \.{\\localbrokenpenalty} */ +static halfword internal_left_box; /* running \.{\\localleftbox} */ static integer 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 halfword internal_right_box; /* running \.{\\localrightbox} */ -static integer internal_right_box_width; /* running \.{\\localrightbox} width */ +static integer 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 scaled disc_width [10] = {0}; /* the length of discretionary material preceding a break*/ +static scaled disc_width[10] = { 0 }; /* the length of discretionary material preceding a break */ /* As we consider various ways to end a line at |cur_p|, in a given line number class, we keep track of the best total demerits known, in an array with @@ -492,12 +504,12 @@ static scaled disc_width [10] = {0}; /* the length of discretionary material pre */ -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 halfword best_place[4]; /* how to achieve |minimal_demerits| */ -static halfword best_pl_line[4]; /*corresponding line number*/ +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 halfword best_place[4]; /* how to achieve |minimal_demerits| */ +static halfword best_pl_line[4]; /*corresponding line number */ /* @@ -518,21 +530,21 @@ Note that if |hang_indent=0|, the value of |hang_after| is irrelevant. @^length of lines@> @^hanging indentation@> */ -static halfword easy_line; /*line numbers |>easy_line| are equivalent in break nodes*/ -static halfword last_special_line; /*line numbers |>last_special_line| all have the same width */ -static scaled first_width; /*the width of all lines |<=last_special_line|, if - no \.{\\parshape} has been specified*/ -static scaled second_width; /*the width of all lines |>last_special_line|*/ -static scaled first_indent; /*left margin to go with |first_width|*/ -static scaled second_indent; /*left margin to go with |second_width|*/ +static halfword easy_line; /*line numbers |>easy_line| are equivalent in break nodes */ +static halfword last_special_line; /*line numbers |>last_special_line| all have the same width */ +static scaled first_width; /*the width of all lines |<=last_special_line|, if + no \.{\\parshape} has been specified */ +static scaled second_width; /*the width of all lines |>last_special_line| */ +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 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 - the optimum |best_line|*/ +static halfword best_bet; /*use this passive node and its predecessors */ +static integer 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 + the optimum |best_line| */ @@ -551,7 +563,7 @@ static integer line_diff; /*the difference between the current line number and #define store_background(a) {active_width[a]=background[a];} -#define act_width active_width[1] /*length from first active node to current node*/ +#define act_width active_width[1] /*length from first active node to current node */ #define kern_break() { \ if ((!is_char_node(vlink(cur_p))) && auto_breaking) \ @@ -581,17 +593,17 @@ static integer line_diff; /*the difference between the current line number and } \ } -#define inf_bad 10000 /* infinitely bad value */ +#define inf_bad 10000 /* infinitely bad value */ -static boolean do_last_line_fit; /* special algorithm for last line of paragraph? */ -static scaled fill_width[4]; /* infinite stretch components of |par_fill_skip| */ +static boolean do_last_line_fit; /* special algorithm for last line of paragraph? */ +static scaled fill_width[4]; /* infinite stretch components of |par_fill_skip| */ static scaled best_pl_short[4]; /* |shortfall| corresponding to |minimal_demerits| */ -static scaled best_pl_glue[4]; /*corresponding glue stretch or shrink */ +static scaled best_pl_glue[4]; /*corresponding glue stretch or shrink */ -#define awful_bad 07777777777 /* more than a billion demerits */ +#define awful_bad 07777777777 /* more than a billion demerits */ -#define before 0 /* |subtype| for math node that introduces a formula */ -#define after 1 /* |subtype| for math node that winds up a formula */ +#define before 0 /* |subtype| for math node that introduces a formula */ +#define after 1 /* |subtype| for math node that winds up a formula */ #define reset_disc_width(a) disc_width[(a)] = 0 @@ -636,241 +648,250 @@ static scaled best_pl_glue[4]; /*corresponding glue stretch or shrink */ disc_width[] line_break_dir */ -static void -compute_break_width (int break_type, int pdf_adjust_spacing, halfword p - /*, halfword s*/) { - halfword s; /* glue and other 'whitespace' to be skipped after a break - * used if unhyphenated, or post_break==empty */ - s=p; - if (break_type>unhyphenated_node && p!=null) { - /*@;*/ - /* When |p| is a discretionary break, the length of a line - ``from |p| to |p|'' has to be defined properly so - that the other calculations work out. Suppose that the - pre-break text at |p| has length $l_0$, the post-break - text has length $l_1$, and the replacement text has length - |l|. Suppose also that |q| is the node following the - replacement text. Then length of a line from |p| to |q| - will be computed as $\gamma+\beta(q)-\alpha(|p|)$, where - $\beta(q)=\beta(|p|)-l_0+l$. The actual length will be - the background plus $l_1$, so the length from |p| to - |p| should be $\gamma+l_0+l_1-l$. If the post-break text - of the discretionary is empty, a break may also discard~|q|; - in that unusual case we subtract the length of~|q| and any - other nodes that will be discarded after the discretionary - break. - - TH: I don't quite understand the above remarks. - - The value of $l_0$ need not be computed, since |line_break| - will put it into the global variable |disc_width| before - calling |try_break|. - */ - /* In case of nested discretionaries, we always follow the no_break - path, as we are talking about the breaking on _this_ position. - */ - - halfword v; - for (v=vlink_no_break(p); v!=null; v=vlink(v)) { - /* @; */ - /* Replacement texts and discretionary texts are supposed to contain - only character nodes, kern nodes, and box or rule nodes.*/ - if (is_char_node(v)) { - if (is_rotated(line_break_dir)) { - break_width[1] -= (glyph_height(v)+glyph_depth(v)); - } else { - break_width[1] -= glyph_width(v); - } - if ((pdf_adjust_spacing > 1) && check_expand_pars(font(v))) { - set_prev_char_p(v); - sub_char_stretch(break_width[8],v); - sub_char_shrink(break_width[9],v); +static void +compute_break_width(int break_type, int pdf_adjust_spacing, halfword p + /*, halfword s */ ) +{ + halfword s; /* glue and other 'whitespace' to be skipped after a break + * used if unhyphenated, or post_break==empty */ + s = p; + if (break_type > unhyphenated_node && p != null) { + /*@; */ + /* When |p| is a discretionary break, the length of a line + ``from |p| to |p|'' has to be defined properly so + that the other calculations work out. Suppose that the + pre-break text at |p| has length $l_0$, the post-break + text has length $l_1$, and the replacement text has length + |l|. Suppose also that |q| is the node following the + replacement text. Then length of a line from |p| to |q| + will be computed as $\gamma+\beta(q)-\alpha(|p|)$, where + $\beta(q)=\beta(|p|)-l_0+l$. The actual length will be + the background plus $l_1$, so the length from |p| to + |p| should be $\gamma+l_0+l_1-l$. If the post-break text + of the discretionary is empty, a break may also discard~|q|; + in that unusual case we subtract the length of~|q| and any + other nodes that will be discarded after the discretionary + break. + + TH: I don't quite understand the above remarks. + + The value of $l_0$ need not be computed, since |line_break| + will put it into the global variable |disc_width| before + calling |try_break|. + */ + /* In case of nested discretionaries, we always follow the no_break + path, as we are talking about the breaking on _this_ position. + */ + + halfword v; + for (v = vlink_no_break(p); v != null; v = vlink(v)) { + /* @; */ + /* Replacement texts and discretionary texts are supposed to contain + only character nodes, kern nodes, and box or rule nodes. */ + if (is_char_node(v)) { + if (is_rotated(line_break_dir)) { + break_width[1] -= (glyph_height(v) + glyph_depth(v)); + } else { + break_width[1] -= glyph_width(v); + } + if ((pdf_adjust_spacing > 1) && check_expand_pars(font(v))) { + set_prev_char_p(v); + sub_char_stretch(break_width[8], v); + sub_char_shrink(break_width[9], v); + } + } else { + switch (type(v)) { + case hlist_node: + case vlist_node: + if (!(dir_orthogonal(dir_primary[box_dir(v)], + dir_primary[line_break_dir]))) + break_width[1] -= width(v); + else + break_width[1] -= (depth(v) + height(v)); + break; + case kern_node: + if ((pdf_adjust_spacing > 1) && (subtype(v) == normal)) { + sub_kern_stretch(break_width[8], v); + sub_kern_shrink(break_width[9], v); + } + /* fall through */ + case rule_node: + break_width[1] -= width(v); + break; + case disc_node: + assert(vlink(v) == null); /* discs are _always_ last */ + v = no_break(v); + break; + default: + tconfusion("disc1"); + break; + } + } } - } else { - switch (type(v)) { - case hlist_node: - case vlist_node: - if (!(dir_orthogonal(dir_primary[box_dir(v)], - dir_primary[line_break_dir]))) - break_width[1] -= width(v); - else - break_width[1] -= (depth(v)+height(v)); - break; - case kern_node: - if ((pdf_adjust_spacing > 1) && (subtype(v) == normal)) { - sub_kern_stretch(break_width[8],v); - sub_kern_shrink(break_width[9],v); - } - /* fall through */ - case rule_node: - break_width[1] -= width(v); - break; - case disc_node: - assert(vlink(v)==null); /* discs are _always_ last */ - v = no_break(v); - break; - default: - tconfusion("disc1"); - break; + + for (v = vlink_post_break(p); v != null; v = vlink(v)) { + /* @; */ + if (is_char_node(v)) { + if (is_rotated(line_break_dir)) + break_width[1] += (glyph_height(v) + glyph_depth(v)); + else + break_width[1] += glyph_width(v); + if ((pdf_adjust_spacing > 1) && check_expand_pars(font(v))) { + set_prev_char_p(v); + add_char_stretch(break_width[8], v); + add_char_shrink(break_width[9], v); + } + } else { + switch (type(v)) { + case hlist_node: + case vlist_node: + if (!(dir_orthogonal(dir_primary[box_dir(v)], + dir_primary[line_break_dir]))) + break_width[1] += width(v); + else + break_width[1] += (depth(v) + height(v)); + break; + case kern_node: + if ((pdf_adjust_spacing > 1) && (subtype(v) == normal)) { + add_kern_stretch(break_width[8], v); + add_kern_shrink(break_width[9], v); + } + /* fall through */ + case rule_node: + break_width[1] += width(v); + break; + case disc_node: + assert(vlink(v) == null); + v = no_break(v); + break; + default: + tconfusion("disc2"); + } + } } - } - } - for (v=vlink_post_break(p); v!=null; v=vlink(v)) { - /* @; */ - if (is_char_node(v)) { - if (is_rotated(line_break_dir)) - break_width[1] += (glyph_height(v)+glyph_depth(v)); - else - break_width[1] += glyph_width(v); - if ((pdf_adjust_spacing > 1) && check_expand_pars(font(v))) { - set_prev_char_p(v); - add_char_stretch(break_width[8],v); - add_char_shrink(break_width[9],v); + do_one_seven_eight(add_disc_width_to_break_width); + if (vlink_post_break(p) == null) { + s = vlink(p); /* no post_break: 'skip' any 'whitespace' following */ + } else { + s = null; } - } else { - switch (type(v)) { - case hlist_node: - case vlist_node: - if (!(dir_orthogonal(dir_primary[box_dir(v)], - dir_primary[line_break_dir]))) - break_width[1] += width(v); - else - break_width[1] += (depth(v)+height(v)); - break; + } else { + s = p; /* unhyphenated: we need to 'skip' any 'whitespace' following */ + } + while (s != null) { + switch (type(s)) { + case glue_node: + /*@; */ + { + halfword v = glue_ptr(s); + break_width[1] -= width(v); + break_width[2 + stretch_order(v)] -= stretch(v); + break_width[7] -= shrink(v); + } + break; + case penalty_node: + break; + case math_node: + break_width[1] -= surround(s); + break; case kern_node: - if ((pdf_adjust_spacing > 1) && (subtype(v) == normal)) { - add_kern_stretch(break_width[8],v); - add_kern_shrink(break_width[9],v); - } - /* fall through */ - case rule_node: - break_width[1] += width(v); - break; - case disc_node: - assert(vlink(v)==null); - v = no_break(v); - break; + if (subtype(s) != explicit) + return; + else + break_width[1] -= width(s); + break; default: - tconfusion("disc2"); - } - } + return; + }; + s = vlink(s); } - - do_one_seven_eight(add_disc_width_to_break_width); - if (vlink_post_break(p)==null) { - s=vlink(p); /* no post_break: 'skip' any 'whitespace' following */ - } else { - s=null; - } - } else { - s = p; /* unhyphenated: we need to 'skip' any 'whitespace' following */ - } - while (s!=null) { - switch (type(s)) { - case glue_node: - /*@;*/ - {halfword v=glue_ptr(s); - break_width[1] -= width(v); - break_width[2+stretch_order(v)] -= stretch(v); - break_width[7] -= shrink(v); - }break; - case penalty_node: - break; - case math_node: - break_width[1] -= surround(s); - break; - case kern_node: - if (subtype(s)!=explicit) - return; - else - break_width[1] -= width(s); - break; - default: - return; - }; - s=vlink(s); - } } static void print_break_node(halfword q, fitness_value fit_class, - quarterword break_type, halfword cur_p) { - /* @ */ - tprint_nl("@@"); - print_int(serial(passive)); - tprint(": line "); - print_int(line_number(q)-1); - print_char('.'); - print_int(fit_class); - if (break_type==hyphenated_node) - print_char('-'); - tprint(" t="); - print_int(total_demerits(q)); - if (do_last_line_fit) { - /*@; */ - tprint(" s="); - print_scaled(active_short(q)); - if (cur_p==null) - tprint(" a="); - else - tprint(" g="); - print_scaled(active_glue(q)); - } - tprint(" -> @@"); - if (prev_break(passive)==null) - print_char('0'); - else - print_int(serial(prev_break(passive))); + quarterword break_type, halfword cur_p) +{ + /* @ */ + tprint_nl("@@"); + print_int(serial(passive)); + tprint(": line "); + print_int(line_number(q) - 1); + print_char('.'); + print_int(fit_class); + if (break_type == hyphenated_node) + print_char('-'); + tprint(" t="); + print_int(total_demerits(q)); + if (do_last_line_fit) { + /*@; */ + tprint(" s="); + print_scaled(active_short(q)); + if (cur_p == null) + tprint(" a="); + else + tprint(" g="); + print_scaled(active_glue(q)); + } + tprint(" -> @@"); + if (prev_break(passive) == null) + print_char('0'); + else + print_int(serial(prev_break(passive))); } -static void +static void print_feasible_break(halfword cur_p, pointer r, halfword b, integer pi, - integer d, boolean artificial_demerits) { - /* @;*/ - if (printed_node!=cur_p) { - /* @;*/ - tprint_nl(""); - if (cur_p==null) { - short_display(vlink(printed_node)); - } else { - halfword save_link=vlink(cur_p); - vlink(cur_p)=null; - tprint_nl(""); - short_display(vlink(printed_node)); - vlink(cur_p)=save_link; + integer d, boolean artificial_demerits) +{ + /* @; */ + if (printed_node != cur_p) { + /* @; */ + tprint_nl(""); + if (cur_p == null) { + short_display(vlink(printed_node)); + } else { + halfword save_link = vlink(cur_p); + vlink(cur_p) = null; + tprint_nl(""); + short_display(vlink(printed_node)); + vlink(cur_p) = save_link; + } + printed_node = cur_p; } - printed_node=cur_p; - } - tprint_nl("@"); - if (cur_p==null) { - tprint_esc("par"); - } else if (type(cur_p)!=glue_node) { - if (type(cur_p)==penalty_node) tprint_esc("penalty"); - else if (type(cur_p)==disc_node) tprint_esc("discretionary"); - else if (type(cur_p)==kern_node) tprint_esc("kern"); - else tprint_esc("math"); - } - tprint(" via @@"); - if (break_node(r)==null) - print_char('0'); - else - print_int(serial(break_node(r))); - tprint(" b="); - if (b>inf_bad) - print_char('*'); - else - print_int(b); - tprint(" p="); - print_int(pi); - tprint(" d="); - if (artificial_demerits) - print_char('*'); - else - print_int(d); + tprint_nl("@"); + if (cur_p == null) { + tprint_esc("par"); + } else if (type(cur_p) != glue_node) { + if (type(cur_p) == penalty_node) + tprint_esc("penalty"); + else if (type(cur_p) == disc_node) + tprint_esc("discretionary"); + else if (type(cur_p) == kern_node) + tprint_esc("kern"); + else + tprint_esc("math"); + } + tprint(" via @@"); + if (break_node(r) == null) + print_char('0'); + else + print_int(serial(break_node(r))); + tprint(" b="); + if (b > inf_bad) + print_char('*'); + else + print_int(b); + tprint(" p="); + print_int(pi); + tprint(" d="); + if (artificial_demerits) + print_char('*'); + else + print_int(d); } #define add_disc_width_to_active_width(a) active_width[a] += disc_width[a] @@ -898,7 +919,7 @@ print_feasible_break(halfword cur_p, pointer r, halfword b, integer pi, #define total_font_stretch cur_active_width[8] #define total_font_shrink cur_active_width[9] -#define max_dimen 07777777777 /* $2^{30}-1$ */ +#define max_dimen 07777777777 /* $2^{30}-1$ */ #define left_side 0 #define right_side 1 @@ -909,1187 +930,1238 @@ print_feasible_break(halfword cur_p, pointer r, halfword b, integer pi, font(cp) = font((a)); \ do_subst_font(cp, 1000); \ if (font(cp) != font((a))) \ - margin_kern_stretch += (left_pw((a)) - left_pw(cp)); \ + margin_kern_stretch += (left_pw((a)) - left_pw(cp)); \ font(cp) = font((a)); \ do_subst_font(cp, -1000); \ if (font(cp) != font((a))) \ - margin_kern_shrink += (left_pw(cp) - left_pw((a))); \ + margin_kern_shrink += (left_pw(cp) - left_pw((a))); \ } -static void +static void ext_try_break(integer pi, quarterword break_type, int pdf_adjust_spacing, - int par_shape_ptr, - int adj_demerits, - int tracing_paragraphs, + int par_shape_ptr, + int adj_demerits, + int tracing_paragraphs, int pdf_protrude_chars, int line_penalty, - int last_line_fit, - int double_hyphen_demerits, - int final_hyphen_demerits, - halfword first_p, - halfword cur_p) { - /* CONTINUE,DEACTIVATE,FOUND,NOT_FOUND; */ - pointer r; /* runs through the active list */ - scaled margin_kern_stretch; - scaled margin_kern_shrink; - halfword lp, rp, cp; - halfword prev_r; /* stays a step behind |r| */ - halfword prev_prev_r; /*a step behind |prev_r|, if |type(prev_r)=delta_node|*/ - halfword old_l; /* maximum line number in current equivalence class of lines */ - boolean no_break_yet; /* have we found a feasible break at |cur_p|? */ - halfword q; /*points to a new node being created*/ - halfword l; /*line number of current active node*/ - boolean node_r_stays_active; /*should node |r| remain in the active list?*/ - 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*/ - boolean artificial_demerits; /*has |d| been forced to zero?*/ - - scaled shortfall; /*used in badness calculations*/ - scaled g; /*glue stretch or shrink of test line, adjustment for last line*/ - scaled cur_active_width[10] = {0}; /*distance from current active node*/ - - line_width=0; g=0; prev_prev_r=null; - /*@;*/ - if (pi>=inf_penalty) { - return; /* this breakpoint is inhibited by infinite penalty */ - } else if (pi<=-inf_penalty) { - pi=eject_penalty; /*this breakpoint will be forced*/ - } - - no_break_yet=true; - prev_r=active; - old_l=0; - do_all_eight(copy_to_cur_active); - - while (1) { - r=vlink(prev_r); - /* @; */ - /* The following code uses the fact that |type(active)<>delta_node| */ - if (type(r)==delta_node) { - do_all_eight(update_width); /* IMPLICIT ,r */ - prev_prev_r=prev_r; - prev_r=r; - continue; + int last_line_fit, + int double_hyphen_demerits, + int final_hyphen_demerits, halfword first_p, halfword cur_p) +{ + /* CONTINUE,DEACTIVATE,FOUND,NOT_FOUND; */ + pointer r; /* runs through the active list */ + scaled margin_kern_stretch; + scaled margin_kern_shrink; + halfword lp, rp, cp; + halfword prev_r; /* stays a step behind |r| */ + halfword prev_prev_r; /*a step behind |prev_r|, if |type(prev_r)=delta_node| */ + halfword old_l; /* maximum line number in current equivalence class of lines */ + boolean no_break_yet; /* have we found a feasible break at |cur_p|? */ + halfword q; /*points to a new node being created */ + halfword l; /*line number of current active node */ + boolean node_r_stays_active; /*should node |r| remain in the active list? */ + 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 */ + boolean artificial_demerits; /*has |d| been forced to zero? */ + + scaled shortfall; /*used in badness calculations */ + scaled g; /*glue stretch or shrink of test line, adjustment for last line */ + scaled cur_active_width[10] = { 0 }; /*distance from current active node */ + + line_width = 0; + g = 0; + prev_prev_r = null; + /*@; */ + if (pi >= inf_penalty) { + return; /* this breakpoint is inhibited by infinite penalty */ + } else if (pi <= -inf_penalty) { + pi = eject_penalty; /*this breakpoint will be forced */ } - /* @; */ - /* The first part of the following code is part of \TeX's inner loop, so - we don't want to waste any time. The current active node, namely node |r|, - contains the line number that will be considered next. At the end of the - list we have arranged the data structure so that |r=active| and - |line_number(active)>old_l|. - */ - l=line_number(r); - if (l>old_l) { /* now we are no longer in the inner loop */ - if ((minimum_demerits*/ - /* It is not necessary to create new active nodes having |minimal_demerits| - greater than - |minimum_demerits+abs(adj_demerits)|, since such active nodes will never - be chosen in the final paragraph breaks. This observation allows us to - omit a substantial number of feasible breakpoints from further consideration. - */ - if (no_break_yet) { - no_break_yet=false; - do_all_eight(set_break_width_to_background); - compute_break_width(break_type, pdf_adjust_spacing, cur_p); - } - /* @;*/ - /* We use the fact that |type(active)<>delta_node|.*/ - if (type(prev_r)==delta_node) {/* modify an existing delta node */ - do_all_eight(convert_to_break_width); /* IMPLICIT prev_r */ - } else if (prev_r==active) { /* no delta node needed at the beginning */ - do_all_eight(store_break_width); - } else { - q=new_node(delta_node,0); - vlink(q)=r; - do_all_eight(new_delta_to_break_width); /* IMPLICIT q */ - vlink(prev_r)=q; - prev_prev_r=prev_r; - prev_r=q; + + no_break_yet = true; + prev_r = active; + old_l = 0; + do_all_eight(copy_to_cur_active); + + while (1) { + r = vlink(prev_r); + /* @; */ + /* The following code uses the fact that |type(active)<>delta_node| */ + if (type(r) == delta_node) { + do_all_eight(update_width); /* IMPLICIT ,r */ + prev_prev_r = prev_r; + prev_r = r; + continue; } + /* @; */ + /* The first part of the following code is part of \TeX's inner loop, so + we don't want to waste any time. The current active node, namely node |r|, + contains the line number that will be considered next. At the end of the + list we have arranged the data structure so that |r=active| and + |line_number(active)>old_l|. + */ + l = line_number(r); + if (l > old_l) { /* now we are no longer in the inner loop */ + if ((minimum_demerits < awful_bad) + && ((old_l != easy_line) || (r == active))) { + /*@ */ + /* It is not necessary to create new active nodes having |minimal_demerits| + greater than + |minimum_demerits+abs(adj_demerits)|, since such active nodes will never + be chosen in the final paragraph breaks. This observation allows us to + omit a substantial number of feasible breakpoints from further consideration. + */ + if (no_break_yet) { + no_break_yet = false; + do_all_eight(set_break_width_to_background); + compute_break_width(break_type, pdf_adjust_spacing, cur_p); + } + /* @; */ + /* We use the fact that |type(active)<>delta_node|. */ + if (type(prev_r) == delta_node) { /* modify an existing delta node */ + do_all_eight(convert_to_break_width); /* IMPLICIT prev_r */ + } else if (prev_r == active) { /* no delta node needed at the beginning */ + do_all_eight(store_break_width); + } else { + q = new_node(delta_node, 0); + vlink(q) = r; + do_all_eight(new_delta_to_break_width); /* IMPLICIT q */ + vlink(prev_r) = q; + prev_prev_r = prev_r; + prev_r = q; + } - if (abs(adj_demerits)>=awful_bad-minimum_demerits) - minimum_demerits=awful_bad-1; - else - minimum_demerits += abs(adj_demerits); - for (fit_class=very_loose_fit;fit_class<=tight_fit;fit_class++) { - if (minimal_demerits[fit_class]<=minimum_demerits) { - /* @; */ - /* When we create an active node, we also create the corresponding - passive node. - */ - q=new_node(passive_node,0); - vlink(q)=passive; - passive=q; - cur_break(q)=cur_p; - incr(pass_number); - serial(q)=pass_number; - prev_break(q)=best_place[fit_class]; - /*Here we keep track of the subparagraph penalties in the break nodes*/ - passive_pen_inter(q)=internal_pen_inter; - passive_pen_broken(q)=internal_pen_broken; - passive_last_left_box(q)=internal_left_box; - passive_last_left_box_width(q)=internal_left_box_width; - if (prev_break(q)!=null) { - passive_left_box(q)=passive_last_left_box(prev_break(q)); - passive_left_box_width(q)=passive_last_left_box_width(prev_break(q)); + if (abs(adj_demerits) >= awful_bad - minimum_demerits) + minimum_demerits = awful_bad - 1; + else + minimum_demerits += abs(adj_demerits); + for (fit_class = very_loose_fit; fit_class <= tight_fit; + fit_class++) { + if (minimal_demerits[fit_class] <= minimum_demerits) { + /* @; */ + /* When we create an active node, we also create the corresponding + passive node. + */ + q = new_node(passive_node, 0); + vlink(q) = passive; + passive = q; + cur_break(q) = cur_p; + incr(pass_number); + serial(q) = pass_number; + prev_break(q) = best_place[fit_class]; + /*Here we keep track of the subparagraph penalties in the break nodes */ + passive_pen_inter(q) = internal_pen_inter; + passive_pen_broken(q) = internal_pen_broken; + passive_last_left_box(q) = internal_left_box; + passive_last_left_box_width(q) = + internal_left_box_width; + if (prev_break(q) != null) { + passive_left_box(q) = + passive_last_left_box(prev_break(q)); + passive_left_box_width(q) = + passive_last_left_box_width(prev_break(q)); + } else { + passive_left_box(q) = init_internal_left_box; + passive_left_box_width(q) = + init_internal_left_box_width; + } + passive_right_box(q) = internal_right_box; + passive_right_box_width(q) = internal_right_box_width; + q = new_node(break_type, fit_class); + break_node(q) = passive; + line_number(q) = best_pl_line[fit_class] + 1; + total_demerits(q) = minimal_demerits[fit_class]; + if (do_last_line_fit) { + /*@ */ + /* Here we save these data in the active node + representing a potential line break. */ + active_short(q) = best_pl_short[fit_class]; + active_glue(q) = best_pl_glue[fit_class]; + } + vlink(q) = r; + vlink(prev_r) = q; + prev_r = q; + if (tracing_paragraphs > 0) + print_break_node(q, fit_class, break_type, cur_p); + } + minimal_demerits[fit_class] = awful_bad; + } + minimum_demerits = awful_bad; + /* @; */ + /* When the following code is performed, we will have just inserted at + least one active node before |r|, so |type(prev_r)<>delta_node|. + */ + if (r != active) { + q = new_node(delta_node, 0); + vlink(q) = r; + do_all_eight(new_delta_from_break_width); /* IMPLICIT q */ + vlink(prev_r) = q; + prev_prev_r = prev_r; + prev_r = q; + } + } + if (r == active) + return; + /*@; */ + /* When we come to the following code, we have just encountered + the first active node~|r| whose |line_number| field contains + |l|. Thus we want to compute the length of the $l\mskip1mu$th + line of the current paragraph. Furthermore, we want to set + |old_l| to the last number in the class of line numbers + equivalent to~|l|. + */ + if (l > easy_line) { + old_l = max_halfword - 1; + line_width = second_width; } else { - passive_left_box(q)=init_internal_left_box; - passive_left_box_width(q)=init_internal_left_box_width; + old_l = l; + if (l > last_special_line) { + line_width = second_width; + } else if (par_shape_ptr == null) { + line_width = first_width; + } else { + line_width = varmem[(par_shape_ptr + 2 * l + 1)].cint; + } } - passive_right_box(q)=internal_right_box; - passive_right_box_width(q)=internal_right_box_width; - q=new_node(break_type,fit_class); - break_node(q)=passive; - line_number(q)=best_pl_line[fit_class]+1; - total_demerits(q)=minimal_demerits[fit_class]; - if (do_last_line_fit) { - /*@*/ - /* Here we save these data in the active node - representing a potential line break.*/ - active_short(q)=best_pl_short[fit_class]; - active_glue(q)=best_pl_glue[fit_class]; + } + /* /If a line number class has ended, create new active nodes for + the best feasible breaks in that class; then |return| + if |r=active|, otherwise compute the new |line_width|@>; */ + + /* @; */ + artificial_demerits = false; + shortfall = line_width - cur_active_width[1] + - ((break_node(r) == null) + ? init_internal_left_box_width + : passive_last_left_box_width(break_node(r))) + - internal_right_box_width; + if (pdf_protrude_chars > 1) { + halfword l, o; + l = (break_node(r) == null) ? first_p : cur_break(break_node(r)); + if (cur_p == null) { + o = null; + } else { /* TODO if (is_character_node(alink(cur_p))) */ + o = alink(cur_p); + assert(vlink(o) == cur_p); + } + /* let's look at the right margin first */ + if ((cur_p != null) && (type(cur_p) == disc_node) + && (vlink_pre_break(cur_p) != null)) { + /* a |disc_node| with non-empty |pre_break|, protrude the last char of |pre_break| */ + o = tlink_pre_break(cur_p); + } else { + o = find_protchar_right(l, o); + } + /* now the left margin */ + if ((l != null) && (type(l) == disc_node) + && (vlink_post_break(l) != null)) { + /* FIXME: first 'char' could be a disc! */ + l = vlink_post_break(l); /* protrude the first char */ + } else { + l = find_protchar_left(l, true); } - vlink(q)=r; - vlink(prev_r)=q; - prev_r=q; - if (tracing_paragraphs>0) - print_break_node(q,fit_class,break_type,cur_p); - } - minimal_demerits[fit_class]=awful_bad; + shortfall += (left_pw(l) + right_pw(o)); } - minimum_demerits=awful_bad; - /* @;*/ - /* When the following code is performed, we will have just inserted at - least one active node before |r|, so |type(prev_r)<>delta_node|. - */ - if (r!=active) { - q=new_node(delta_node,0); - vlink(q)=r; - do_all_eight(new_delta_from_break_width); /* IMPLICIT q */ - vlink(prev_r)=q; - prev_prev_r=prev_r; - prev_r=q; + if ((shortfall != 0) && (pdf_adjust_spacing > 1)) { + margin_kern_stretch = 0; + margin_kern_shrink = 0; + if (pdf_protrude_chars > 1) { + /* @; */ + lp = last_leftmost_char; + rp = last_rightmost_char; + cp = raw_glyph_node(); + if (lp != null) { + cal_margin_kern_var(lp); + } + if (rp != null) { + cal_margin_kern_var(rp); + } + flush_node(cp); + } + if ((shortfall > 0) + && ((total_font_stretch + margin_kern_stretch) > 0)) { + if ((total_font_stretch + margin_kern_stretch) > shortfall) + shortfall = ((total_font_stretch + margin_kern_stretch) / + (max_stretch_ratio / cur_font_step)) / 2; + else + shortfall -= (total_font_stretch + margin_kern_stretch); + } else if ((shortfall < 0) + && ((total_font_shrink + margin_kern_shrink) > 0)) { + if ((total_font_shrink + margin_kern_shrink) > -shortfall) + shortfall = -((total_font_shrink + margin_kern_shrink) / + (max_shrink_ratio / cur_font_step)) / 2; + else + shortfall += (total_font_shrink + margin_kern_shrink); + } } - } - if (r==active) - return; - /*@;*/ - /* When we come to the following code, we have just encountered - the first active node~|r| whose |line_number| field contains - |l|. Thus we want to compute the length of the $l\mskip1mu$th - line of the current paragraph. Furthermore, we want to set - |old_l| to the last number in the class of line numbers - equivalent to~|l|. - */ - if (l>easy_line) { - old_l=max_halfword-1; - line_width=second_width; - } else { - old_l=l; - if (l>last_special_line) { - line_width=second_width; - } else if (par_shape_ptr==null) { - line_width=first_width; + if (shortfall > 0) { + /* @ */ + + /* When a line must stretch, the available stretchability can be + found in the subarray |cur_active_width[2..6]|, in units of + points, sfi, fil, fill and filll. + + The present section is part of \TeX's inner loop, and it is + most often performed when the badness is infinite; therefore + it is worth while to make a quick test for large width excess + and small stretchability, before calling the |badness| + subroutine. @^inner loop@> */ + + if ((cur_active_width[3] != 0) || (cur_active_width[4] != 0) || + (cur_active_width[5] != 0) || (cur_active_width[6] != 0)) { + if (do_last_line_fit) { + if (cur_p == null) { /* the last line of a paragraph */ + /* @; */ + + /* Here we compute the adjustment |g| and badness |b| for + a line from |r| to the end of the paragraph. When any + of the criteria for adjustment is violated we fall + through to the normal algorithm. + + The last line must be too short, and have infinite + stretch entirely due to |par_fill_skip|. */ + if ((active_short(r) == 0) || (active_glue(r) <= 0)) + /* previous line was neither stretched nor shrunk, or + was infinitely bad */ + goto NOT_FOUND; + if ((cur_active_width[3] != fill_width[0]) || + (cur_active_width[4] != fill_width[1]) || + (cur_active_width[5] != fill_width[2]) || + (cur_active_width[6] != fill_width[3])) + /* infinite stretch of this line not entirely due to + |par_fill_skip| */ + goto NOT_FOUND; + if (active_short(r) > 0) + g = cur_active_width[2]; + else + g = cur_active_width[7]; + if (g <= 0) + /*no finite stretch resp.\ no shrink */ + goto NOT_FOUND; + arith_error = false; + g = fract(g, active_short(r), active_glue(r), + max_dimen); + if (last_line_fit < 1000) + g = fract(g, last_line_fit, 1000, max_dimen); + if (arith_error) { + if (active_short(r) > 0) + g = max_dimen; + else + g = -max_dimen; + } + if (g > 0) { + /*@ */ + /* These badness computations are rather similar to + those of the standard algorithm, with the adjustment + amount |g| replacing the |shortfall|. */ + if (g > shortfall) + g = shortfall; + if (g > 7230584) { + if (cur_active_width[2] < 1663497) { + b = inf_bad; + fit_class = very_loose_fit; + goto FOUND; + } + } + b = badness(g, cur_active_width[2]); + if (b > 99) { + fit_class = very_loose_fit; + } else if (b > 12) { + fit_class = loose_fit; + } else { + fit_class = decent_fit; + } + goto FOUND; + } else if (g < 0) { + /*@; */ + if (-g > cur_active_width[7]) + g = -cur_active_width[7]; + b = badness(-g, cur_active_width[7]); + if (b > 12) + fit_class = tight_fit; + else + fit_class = decent_fit; + goto FOUND; + } + } + NOT_FOUND: + shortfall = 0; + } + b = 0; + fit_class = decent_fit; /* infinite stretch */ + } else { + if (shortfall > 7230584 && cur_active_width[2] < 1663497) { + b = inf_bad; + fit_class = very_loose_fit; + } else { + b = badness(shortfall, cur_active_width[2]); + if (b > 99) { + fit_class = very_loose_fit; + } else if (b > 12) { + fit_class = loose_fit; + } else { + fit_class = decent_fit; + } + } + } } else { - line_width=varmem[(par_shape_ptr+2*l+1)].cint; + /* Set the value of |b| to the badness for shrinking the line, + and compute the corresponding |fit_class|@>; */ + /* Shrinkability is never infinite in a paragraph; we can shrink + the line from |r| to |cur_p| by at most + |cur_active_width[7]|. */ + if (-shortfall > cur_active_width[7]) + b = inf_bad + 1; + else + b = badness(-shortfall, cur_active_width[7]); + if (b > 12) + fit_class = tight_fit; + else + fit_class = decent_fit; } - } - } - /* /If a line number class has ended, create new active nodes for - the best feasible breaks in that class; then |return| - if |r=active|, otherwise compute the new |line_width|@>; */ - - /* @; */ - artificial_demerits=false; - shortfall = line_width - - cur_active_width[1] - -(( break_node(r)==null) - ? init_internal_left_box_width - : passive_last_left_box_width(break_node(r))) - - internal_right_box_width; - if (pdf_protrude_chars > 1) { - halfword l, o; - l = (break_node(r) == null) ? first_p : cur_break(break_node(r)); - if (cur_p==null) { - o = null; - } else { /* TODO if (is_character_node(alink(cur_p))) */ - o = alink(cur_p); - assert(vlink(o)==cur_p); - } - /* let's look at the right margin first */ - if ((cur_p != null) && (type(cur_p) == disc_node) && (vlink_pre_break(cur_p) != null)) { - /* a |disc_node| with non-empty |pre_break|, protrude the last char of |pre_break| */ - o = tlink_pre_break(cur_p); - } else { - o = find_protchar_right(l, o); - } - /* now the left margin */ - if ((l != null) && (type(l) == disc_node) && (vlink_post_break(l) != null)) { - /* FIXME: first 'char' could be a disc! */ - l = vlink_post_break(l); /* protrude the first char */ - } else { - l = find_protchar_left(l, true); - } - shortfall += (left_pw(l) + right_pw(o)); - } - if ((shortfall != 0) && (pdf_adjust_spacing > 1)) { - margin_kern_stretch = 0; - margin_kern_shrink = 0; - if (pdf_protrude_chars > 1) { - /* @;*/ - lp = last_leftmost_char; - rp = last_rightmost_char; - cp = raw_glyph_node(); - if (lp != null) { - cal_margin_kern_var(lp); - } - if (rp != null) { - cal_margin_kern_var(rp); - } - flush_node(cp); - } - if ((shortfall > 0) && ((total_font_stretch + margin_kern_stretch) > 0)) { - if ((total_font_stretch + margin_kern_stretch) > shortfall) - shortfall = ((total_font_stretch + margin_kern_stretch) / - (max_stretch_ratio / cur_font_step)) / 2; - else - shortfall -= (total_font_stretch + margin_kern_stretch); - } else if ((shortfall < 0) && ((total_font_shrink + margin_kern_shrink) > 0)) { - if ((total_font_shrink + margin_kern_shrink) > -shortfall) - shortfall = -((total_font_shrink + margin_kern_shrink) / - (max_shrink_ratio / cur_font_step)) / 2; - else - shortfall += (total_font_shrink + margin_kern_shrink); - } - } - if (shortfall>0) { - /* @ */ - - /* When a line must stretch, the available stretchability can be - found in the subarray |cur_active_width[2..6]|, in units of - points, sfi, fil, fill and filll. - - The present section is part of \TeX's inner loop, and it is - most often performed when the badness is infinite; therefore - it is worth while to make a quick test for large width excess - and small stretchability, before calling the |badness| - subroutine. @^inner loop@> */ - - if ((cur_active_width[3]!=0)||(cur_active_width[4]!=0)|| - (cur_active_width[5]!=0)||(cur_active_width[6]!=0)) { if (do_last_line_fit) { - if (cur_p==null) { /* the last line of a paragraph */ - /* @;*/ - - /* Here we compute the adjustment |g| and badness |b| for - a line from |r| to the end of the paragraph. When any - of the criteria for adjustment is violated we fall - through to the normal algorithm. - - The last line must be too short, and have infinite - stretch entirely due to |par_fill_skip|.*/ - if ((active_short(r)==0)||(active_glue(r)<=0)) - /* previous line was neither stretched nor shrunk, or - was infinitely bad*/ - goto NOT_FOUND; - if ((cur_active_width[3]!=fill_width[0])|| - (cur_active_width[4]!=fill_width[1])|| - (cur_active_width[5]!=fill_width[2])|| - (cur_active_width[6]!=fill_width[3])) - /* infinite stretch of this line not entirely due to - |par_fill_skip| */ - goto NOT_FOUND; - if (active_short(r)>0) - g=cur_active_width[2]; - else - g=cur_active_width[7]; - if (g<=0) - /*no finite stretch resp.\ no shrink*/ - goto NOT_FOUND; - arith_error=false; - g=fract(g,active_short(r),active_glue(r),max_dimen); - if (last_line_fit<1000) - g=fract(g,last_line_fit,1000,max_dimen); - if (arith_error) { - if (active_short(r)>0) - g=max_dimen; - else - g=-max_dimen; + /* @; */ + if (cur_p == null) + shortfall = 0; + if (shortfall > 0) { + g = cur_active_width[2]; + } else if (shortfall < 0) { + g = cur_active_width[7]; + } else { + g = 0; } - if (g>0) { - /*@*/ - /* These badness computations are rather similar to - those of the standard algorithm, with the adjustment - amount |g| replacing the |shortfall|.*/ - if (g>shortfall) - g=shortfall; - if (g>7230584) { - if (cur_active_width[2]<1663497) { - b=inf_bad; - fit_class=very_loose_fit; - goto FOUND; - } - } - b=badness(g,cur_active_width[2]); - if (b>99) { fit_class=very_loose_fit; } - else if (b>12) { fit_class=loose_fit; } - else { fit_class=decent_fit; } - goto FOUND; - } else if (g<0) { - /*@;*/ - if (-g>cur_active_width[7]) - g=-cur_active_width[7]; - b=badness(-g,cur_active_width[7]); - if (b>12) fit_class=tight_fit; - else fit_class=decent_fit; - goto FOUND; + } + FOUND: + if ((b > inf_bad) || (pi == eject_penalty)) { + /* @ */ + /* During the final pass, we dare not lose all active nodes, lest we lose + touch with the line breaks already found. The code shown here makes + sure that such a catastrophe does not happen, by permitting overfull + boxes as a last resort. This particular part of \TeX\ was a source of + several subtle bugs before the correct program logic was finally + discovered; readers who seek to ``improve'' \TeX\ should therefore + think thrice before daring to make any changes here. + @^overfull boxes@> + */ + if (final_pass && (minimum_demerits == awful_bad) && + (vlink(r) == active) && (prev_r == active)) { + artificial_demerits = true; /* set demerits zero, this break is forced */ + } else if (b > threshold) { + goto DEACTIVATE; } - } - NOT_FOUND: - shortfall=0; + node_r_stays_active = false; + } else { + prev_r = r; + if (b > threshold) + continue; + node_r_stays_active = true; } - b=0; - fit_class=decent_fit; /* infinite stretch */ - } else { - if (shortfall>7230584 && cur_active_width[2]<1663497) { - b=inf_bad; - fit_class=very_loose_fit; + /* @; */ + /* When we get to this part of the code, the line from |r| to |cur_p| is + feasible, its badness is~|b|, and its fitness classification is + |fit_class|. We don't want to make an active node for this break yet, + but we will compute the total demerits and record them in the + |minimal_demerits| array, if such a break is the current champion among + all ways to get to |cur_p| in a given line-number class and fitness + class. + */ + if (artificial_demerits) { + d = 0; } else { - b=badness(shortfall,cur_active_width[2]); - if (b>99) { fit_class=very_loose_fit; } - else if (b>12) { fit_class=loose_fit; } - else { fit_class=decent_fit; } + /* @; */ + d = line_penalty + b; + if (abs(d) >= 10000) + d = 100000000; + else + d = d * d; + if (pi != 0) { + if (pi > 0) { + d += (pi * pi); + } else if (pi > eject_penalty) { + d -= (pi * pi); + } + } + if ((break_type == hyphenated_node) && (type(r) == hyphenated_node)) { + if (cur_p != null) + d += double_hyphen_demerits; + else + d += final_hyphen_demerits; + } + if (abs(fit_class - fitness(r)) > 1) + d = d + adj_demerits; } - } - } else { - /* Set the value of |b| to the badness for shrinking the line, - and compute the corresponding |fit_class|@>; */ - /* Shrinkability is never infinite in a paragraph; we can shrink - the line from |r| to |cur_p| by at most - |cur_active_width[7]|.*/ - if (-shortfall>cur_active_width[7]) - b=inf_bad+1; - else - b=badness(-shortfall,cur_active_width[7]); - if (b>12) - fit_class=tight_fit; - else - fit_class=decent_fit; - } - if (do_last_line_fit) { - /* @; */ - if (cur_p==null) shortfall=0; - if (shortfall>0) { g=cur_active_width[2]; } - else if (shortfall<0) { g=cur_active_width[7]; } - else { g=0;} - } - FOUND: - if ((b>inf_bad)||(pi==eject_penalty)) { - /* @ */ - /* During the final pass, we dare not lose all active nodes, lest we lose - touch with the line breaks already found. The code shown here makes - sure that such a catastrophe does not happen, by permitting overfull - boxes as a last resort. This particular part of \TeX\ was a source of - several subtle bugs before the correct program logic was finally - discovered; readers who seek to ``improve'' \TeX\ should therefore - think thrice before daring to make any changes here. - @^overfull boxes@> - */ - if (final_pass && (minimum_demerits==awful_bad) && - (vlink(r)==active) && (prev_r==active)) { - artificial_demerits=true; /* set demerits zero, this break is forced */ - } else if (b>threshold) { - goto DEACTIVATE; - } - node_r_stays_active=false; - } else { - prev_r=r; - if (b>threshold) - continue; - node_r_stays_active=true; - } - /* @;*/ - /* When we get to this part of the code, the line from |r| to |cur_p| is - feasible, its badness is~|b|, and its fitness classification is - |fit_class|. We don't want to make an active node for this break yet, - but we will compute the total demerits and record them in the - |minimal_demerits| array, if such a break is the current champion among - all ways to get to |cur_p| in a given line-number class and fitness - class. - */ - if (artificial_demerits) { - d=0; - } else { - /* @;*/ - d=line_penalty+b; - if (abs(d)>=10000) d=100000000; else d=d*d; - if (pi!=0) { - if (pi>0) { - d += (pi*pi); - } else if (pi>eject_penalty) { - d -= (pi*pi); + if (tracing_paragraphs > 0) + print_feasible_break(cur_p, r, b, pi, d, artificial_demerits); + d += total_demerits(r); /*this is the minimum total demerits + from the beginning to |cur_p| via |r| */ + if (d <= minimal_demerits[fit_class]) { + minimal_demerits[fit_class] = d; + best_place[fit_class] = break_node(r); + best_pl_line[fit_class] = l; + if (do_last_line_fit) { + /* Store \(a)additional data for this feasible break@>; */ + /* For each feasible break we record the shortfall and glue stretch or + shrink (or adjustment). */ + best_pl_short[fit_class] = shortfall; + best_pl_glue[fit_class] = g; + } + if (d < minimum_demerits) + minimum_demerits = d; } - } - if ((break_type==hyphenated_node)&&(type(r)==hyphenated_node)) { - if (cur_p!=null) - d += double_hyphen_demerits; - else - d += final_hyphen_demerits; - } - if (abs(fit_class-fitness(r))>1) d=d+adj_demerits; - } - if (tracing_paragraphs>0) - print_feasible_break(cur_p, r, b, pi, d, artificial_demerits); - d += total_demerits(r); /*this is the minimum total demerits - from the beginning to |cur_p| via |r| */ - if (d<=minimal_demerits[fit_class]) { - minimal_demerits[fit_class]=d; - best_place[fit_class]=break_node(r); - best_pl_line[fit_class]=l; - if (do_last_line_fit) { - /* Store \(a)additional data for this feasible break@>; */ - /* For each feasible break we record the shortfall and glue stretch or - shrink (or adjustment).*/ - best_pl_short[fit_class]=shortfall; - best_pl_glue[fit_class]=g; - } - if (d; */ - /* When an active node disappears, we must delete an adjacent delta node if - the active node was at the beginning or the end of the active list, or - if it was surrounded by delta nodes. We also must preserve the property - that |cur_active_width| represents the length of material from - |vlink(prev_r)| to~|cur_p|.*/ - - vlink(prev_r)=vlink(r); - flush_node(r); - if (prev_r==active) { - /*@*/ - /* The following code uses the fact that |type(active)<>delta_node|. - If the active list has just become empty, we do not need to update the - |active_width| array, since it will be initialized when an active - node is next inserted. - */ - r=vlink(active); - if (type(r)==delta_node) { - do_all_eight(update_active); /* IMPLICIT r */ - do_all_eight(copy_to_cur_active); - vlink(active)=vlink(r); + /* /Record a new feasible break */ + if (node_r_stays_active) + continue; /*|prev_r| has been set to |r| */ + DEACTIVATE: + /* @; */ + /* When an active node disappears, we must delete an adjacent delta node if + the active node was at the beginning or the end of the active list, or + if it was surrounded by delta nodes. We also must preserve the property + that |cur_active_width| represents the length of material from + |vlink(prev_r)| to~|cur_p|. */ + + vlink(prev_r) = vlink(r); flush_node(r); - } - } else if (type(prev_r)==delta_node){ - r=vlink(prev_r); - if (r==active) { - do_all_eight(downdate_width); /* IMPLICIT prev_r */ - vlink(prev_prev_r)=active; - flush_node(prev_r); - prev_r=prev_prev_r; - } else if (type(r)==delta_node) { - do_all_eight(update_width); /* IMPLICIT ,r */ - do_all_eight(combine_two_deltas); /* IMPLICIT r prev_r */ - vlink(prev_r)=vlink(r); - flush_node(r); - } - } - } + if (prev_r == active) { + /*@ */ + /* The following code uses the fact that |type(active)<>delta_node|. + If the active list has just become empty, we do not need to update the + |active_width| array, since it will be initialized when an active + node is next inserted. + */ + r = vlink(active); + if (type(r) == delta_node) { + do_all_eight(update_active); /* IMPLICIT r */ + do_all_eight(copy_to_cur_active); + vlink(active) = vlink(r); + flush_node(r); + } + } else if (type(prev_r) == delta_node) { + r = vlink(prev_r); + if (r == active) { + do_all_eight(downdate_width); /* IMPLICIT prev_r */ + vlink(prev_prev_r) = active; + flush_node(prev_r); + prev_r = prev_prev_r; + } else if (type(r) == delta_node) { + do_all_eight(update_width); /* IMPLICIT ,r */ + do_all_eight(combine_two_deltas); /* IMPLICIT r prev_r */ + vlink(prev_r) = vlink(r); + flush_node(r); + } + } + } } void -ext_do_line_break (boolean d, - int pretolerance, - int tracing_paragraphs, - int tolerance, - scaled emergency_stretch, - int looseness, - int hyphen_penalty, - int ex_hyphen_penalty, - int pdf_adjust_spacing, - halfword par_shape_ptr, - int adj_demerits, - int pdf_protrude_chars, - int line_penalty, - int last_line_fit, - int double_hyphen_demerits, - int final_hyphen_demerits, - int hang_indent, - int hsize, - int hang_after, - halfword left_skip, - halfword right_skip, - int pdf_each_line_height, - int pdf_each_line_depth, - int pdf_first_line_height, - int pdf_last_line_depth, - halfword inter_line_penalties_ptr, - int inter_line_penalty, - int club_penalty, - halfword club_penalties_ptr, - halfword display_widow_penalties_ptr, - halfword widow_penalties_ptr, - int display_widow_penalty, - int widow_penalty, - int broken_penalty, - halfword final_par_glue) { - /* DONE,DONE1,DONE2,DONE3,DONE4,DONE5,CONTINUE;*/ - halfword cur_p,q,r,s; /* miscellaneous nodes of temporary interest */ - - /* Get ready to start ... */ - minimum_demerits=awful_bad; - minimal_demerits[tight_fit]=awful_bad; - minimal_demerits[decent_fit]=awful_bad; - minimal_demerits[loose_fit]=awful_bad; - minimal_demerits[very_loose_fit]=awful_bad; - - /* We compute the values of |easy_line| and the other local variables relating - to line length when the |line_break| procedure is initializing itself. */ - if (par_shape_ptr==null) { - if (hang_indent==0) { - last_special_line=0; - second_width=hsize; - second_indent=0; - } else { - /* @*/ - /* We compute the values of |easy_line| and the other local variables relating - to line length when the |line_break| procedure is initializing itself. */ - last_special_line=abs(hang_after); - if (hang_after<0) { - first_width=hsize-abs(hang_indent); - if (hang_indent>=0) - first_indent=hang_indent; - else - first_indent=0; - second_width=hsize; - second_indent=0; - } else { - first_width=hsize; - first_indent=0; - second_width=hsize-abs(hang_indent); - if (hang_indent>=0) - second_indent=hang_indent; - else - second_indent=0; - } +ext_do_line_break(boolean d, + int pretolerance, + int tracing_paragraphs, + int tolerance, + scaled emergency_stretch, + int looseness, + int hyphen_penalty, + int ex_hyphen_penalty, + int pdf_adjust_spacing, + halfword par_shape_ptr, + int adj_demerits, + int pdf_protrude_chars, + int line_penalty, + int last_line_fit, + int double_hyphen_demerits, + int final_hyphen_demerits, + int hang_indent, + int hsize, + int hang_after, + halfword left_skip, + halfword right_skip, + int pdf_each_line_height, + int pdf_each_line_depth, + int pdf_first_line_height, + int pdf_last_line_depth, + halfword inter_line_penalties_ptr, + int inter_line_penalty, + int club_penalty, + halfword club_penalties_ptr, + halfword display_widow_penalties_ptr, + halfword widow_penalties_ptr, + int display_widow_penalty, + int widow_penalty, + int broken_penalty, halfword final_par_glue) +{ + /* DONE,DONE1,DONE2,DONE3,DONE4,DONE5,CONTINUE; */ + halfword cur_p, q, r, s; /* miscellaneous nodes of temporary interest */ + + /* Get ready to start ... */ + minimum_demerits = awful_bad; + minimal_demerits[tight_fit] = awful_bad; + minimal_demerits[decent_fit] = awful_bad; + minimal_demerits[loose_fit] = awful_bad; + minimal_demerits[very_loose_fit] = awful_bad; + + /* We compute the values of |easy_line| and the other local variables relating + to line length when the |line_break| procedure is initializing itself. */ + if (par_shape_ptr == null) { + if (hang_indent == 0) { + last_special_line = 0; + second_width = hsize; + second_indent = 0; + } else { + /* @ */ + /* We compute the values of |easy_line| and the other local variables relating + to line length when the |line_break| procedure is initializing itself. */ + last_special_line = abs(hang_after); + if (hang_after < 0) { + first_width = hsize - abs(hang_indent); + if (hang_indent >= 0) + first_indent = hang_indent; + else + first_indent = 0; + second_width = hsize; + second_indent = 0; + } else { + first_width = hsize; + first_indent = 0; + second_width = hsize - abs(hang_indent); + if (hang_indent >= 0) + second_indent = hang_indent; + else + second_indent = 0; + } + } + } else { + last_special_line = vinfo(par_shape_ptr + 1) - 1; + second_indent = varmem[(par_shape_ptr + (2 * last_special_line))].cint; + second_width = + varmem[(par_shape_ptr + 2 * (last_special_line + 1) + 1)].cint; } - } else { - last_special_line=vinfo(par_shape_ptr+1)-1; - second_indent=varmem[(par_shape_ptr+(2*last_special_line))].cint; - second_width=varmem[(par_shape_ptr+2*(last_special_line+1)+1)].cint; - } - if (looseness==0) - easy_line=last_special_line; - else - easy_line=max_halfword; - - no_shrink_error_yet=true; - check_shrinkage(left_skip); - check_shrinkage(right_skip); - q=left_skip; - r=right_skip; - background[1]=width(q)+width(r); - background[2]=0; - background[3]=0; - background[4]=0; - background[5]=0; - background[6]=0; - background[2+stretch_order(q)] = stretch(q); - background[2+stretch_order(r)] += stretch(r); - background[7]=shrink(q)+shrink(r); - if (pdf_adjust_spacing > 1) { - background[8] = 0; - background[9] = 0; - max_stretch_ratio = -1; - max_shrink_ratio = -1; - cur_font_step = -1; - set_prev_char_p(null); - } - /* @;*/ - /* The new algorithm for the last line requires that the stretchability - |par_fill_skip| is infinite and the stretchability of |left_skip| plus - |right_skip| is finite. - */ - do_last_line_fit=false; - if (last_line_fit>0) { - q=glue_ptr(last_line_fill); - if ((stretch(q)>0)&&(stretch_order(q)>normal)) { - if ((background[3]==0)&&(background[4]==0)&& - (background[5]==0)&&(background[6]==0)) { - do_last_line_fit=true; - fill_width[0]=0; - fill_width[1]=0; - fill_width[2]=0; - fill_width[3]=0; - fill_width[stretch_order(q)-1]=stretch(q); - } + if (looseness == 0) + easy_line = last_special_line; + else + easy_line = max_halfword; + + no_shrink_error_yet = true; + check_shrinkage(left_skip); + check_shrinkage(right_skip); + q = left_skip; + r = right_skip; + background[1] = width(q) + width(r); + background[2] = 0; + background[3] = 0; + background[4] = 0; + background[5] = 0; + background[6] = 0; + background[2 + stretch_order(q)] = stretch(q); + background[2 + stretch_order(r)] += stretch(r); + background[7] = shrink(q) + shrink(r); + if (pdf_adjust_spacing > 1) { + background[8] = 0; + background[9] = 0; + max_stretch_ratio = -1; + max_shrink_ratio = -1; + cur_font_step = -1; + set_prev_char_p(null); } - } - /* @ */ - if (dir_ptr!=null) { - fprintf(stdout,"-dir_node s %d\n",dir_ptr); - flush_node_list(dir_ptr); - dir_ptr=null; - } - /*push_dir(paragraph_dir);*/ /* TODO what was the point of this? */ - - /* @;*/ - threshold=pretolerance; - if (threshold>=0) { - if (tracing_paragraphs>0) { - begin_diagnostic(); - tprint_nl("@firstpass"); + /* @; */ + /* The new algorithm for the last line requires that the stretchability + |par_fill_skip| is infinite and the stretchability of |left_skip| plus + |right_skip| is finite. + */ + do_last_line_fit = false; + if (last_line_fit > 0) { + q = glue_ptr(last_line_fill); + if ((stretch(q) > 0) && (stretch_order(q) > normal)) { + if ((background[3] == 0) && (background[4] == 0) && + (background[5] == 0) && (background[6] == 0)) { + do_last_line_fit = true; + fill_width[0] = 0; + fill_width[1] = 0; + fill_width[2] = 0; + fill_width[3] = 0; + fill_width[stretch_order(q) - 1] = stretch(q); + } + } } - second_pass=false; - final_pass=false; - } else { - threshold=tolerance; - second_pass=true; - final_pass=(emergency_stretch<=0); - if (tracing_paragraphs>0) - begin_diagnostic(); - } - - while (1) { - halfword first_p; - halfword nest_stack[10]; - int nest_index = 0; - if (threshold>inf_bad) - threshold=inf_bad; - /* Create an active breakpoint representing the beginning of the paragraph */ - q=new_node(unhyphenated_node,decent_fit); - vlink(q)=active; - break_node(q)=null; - line_number(q)=cur_list.pg_field+1; - total_demerits(q)=0; - active_short(q)=0; - active_glue(q)=0; - vlink(active)=q; - do_all_eight(store_background); - passive=null; - printed_node=temp_head; - pass_number=0; - font_in_short_display=null_font; - /* /Create an active breakpoint representing the beginning of the paragraph */ - auto_breaking=true; - cur_p=vlink(temp_head); - assert(alink(cur_p)==temp_head); - /* LOCAL: Initialize with first |local_paragraph| node */ - if ((type(cur_p)==whatsit_node)&&(subtype(cur_p)==local_par_node)) { - internal_pen_inter=local_pen_inter(cur_p); - internal_pen_broken=local_pen_broken(cur_p); - init_internal_left_box=local_box_left(cur_p); - init_internal_left_box_width=local_box_left_width(cur_p); - internal_left_box=init_internal_left_box; - internal_left_box_width=init_internal_left_box_width; - internal_right_box=local_box_right(cur_p); - internal_right_box_width=local_box_right_width(cur_p); - } else { - internal_pen_inter=0; - internal_pen_broken=0; - init_internal_left_box=null; - init_internal_left_box_width=0; - internal_left_box=init_internal_left_box; - internal_left_box_width=init_internal_left_box_width; - internal_right_box=null; - internal_right_box_width=0; + /* @ */ + if (dir_ptr != null) { + flush_node_list(dir_ptr); + dir_ptr = null; } - /* /LOCAL: Initialize with first |local_paragraph| node */ - set_prev_char_p (null); - prev_legal = null; - rejected_cur_p = null; - try_prev_break = false; - before_rejected_cur_p = false; - first_p = cur_p; - /* to access the first node of paragraph as the first active node - has |break_node=null| */ - while ((cur_p!=null)&&(vlink(active)!=active)) { - /* |try_break| if |cur_p| is a legal breakpoint; on the 2nd pass, also look at disc_nodes. */ - - while (is_char_node(cur_p)) { - /* Advance \(c)|cur_p| to the node following the present string of characters ;*/ - /* The code that passes over the characters of words in a paragraph is part of - \TeX's inner loop, so it has been streamlined for speed. We use the fact that - `\.{\\parfillskip}' glue appears at the end of each paragraph; it is therefore - unnecessary to check if |vlink(cur_p)=null| when |cur_p| is a character node. - */ - act_width += (is_rotated(line_break_dir)) - ? (glyph_height(cur_p)+glyph_depth(cur_p)) - : glyph_width(cur_p); - if ((pdf_adjust_spacing > 1) && check_expand_pars(font(cur_p))) { - set_prev_char_p (cur_p); - add_char_stretch(active_width[8],cur_p); - add_char_shrink(active_width[9],cur_p); - } - cur_p=vlink(cur_p); - while (cur_p==null && nest_index>0) { - cur_p = nest_stack[--nest_index]; - /* fprintf(stderr,"Node Pop %d [%d]\n",nest_index,(int)cur_p); */ + /*push_dir(paragraph_dir); *//* TODO what was the point of this? */ + + /* @; */ + threshold = pretolerance; + if (threshold >= 0) { + if (tracing_paragraphs > 0) { + begin_diagnostic(); + tprint_nl("@firstpass"); } - } - if (cur_p==null) { /* TODO */ - tconfusion("linebreak_tail"); - } - /* Determine legal breaks: As we move through the hlist, we need to keep - the |active_width| array up to date, so that the badness of individual - lines is readily calculated by |try_break|. It is convenient to use the - short name |act_width| for the component of active width that represents - real width as opposed to glue. */ - - switch (type(cur_p)) { - - case hlist_node: - case vlist_node: - act_width += (dir_orthogonal(dir_primary[box_dir(cur_p)], dir_primary[line_break_dir])) - ? (depth(cur_p)+height(cur_p)) - : width(cur_p); - break; - case rule_node: - act_width += width(cur_p); - break; - case whatsit_node: - /* @;*/ - switch (subtype(cur_p)) { - case local_par_node: /* @;*/ - internal_pen_inter=local_pen_inter(cur_p); - internal_pen_broken=local_pen_broken(cur_p); - internal_left_box=local_box_left(cur_p); - internal_left_box_width=local_box_left_width(cur_p); - internal_right_box=local_box_right(cur_p); - internal_right_box_width=local_box_right_width(cur_p); - break; - case dir_node: /* @;*/ - if (dir_dir(cur_p)>=0) { - line_break_dir=dir_dir(cur_p); - push_dir_node(cur_p); - } else { - pop_dir_node(); - if (dir_ptr!=null) - line_break_dir=dir_dir(dir_ptr); - } - break; - case pdf_refxform_node: - case pdf_refximage_node: - act_width += pdf_width(cur_p); - } - /* / Advance \(p)past a whatsit node in the \(l)|line_break| loop/; */ - break; - case glue_node: - /* @; */ - /* When node |cur_p| is a glue node, we look at the previous to - see whether or not a breakpoint is legal at |cur_p|, as - explained above. */ - if (auto_breaking) { - halfword prev_p = alink(cur_p); - if (prev_p!=temp_head && - (is_char_node(prev_p) || - precedes_break(prev_p)|| - ((type(prev_p)==kern_node)&&(subtype(prev_p)!=explicit)))) { - ext_try_break(0,unhyphenated_node, pdf_adjust_spacing, par_shape_ptr, - adj_demerits, tracing_paragraphs, pdf_protrude_chars, - line_penalty, last_line_fit, double_hyphen_demerits, - final_hyphen_demerits,first_p,cur_p); - } - } - check_shrinkage(glue_ptr(cur_p)); - q=glue_ptr(cur_p); - act_width += width(q); - active_width[2+stretch_order(q)] += stretch(q); - active_width[7] += shrink(q); - break; - case kern_node: - if (subtype(cur_p)==explicit) { - kern_break(); + second_pass = false; + final_pass = false; + } else { + threshold = tolerance; + second_pass = true; + final_pass = (emergency_stretch <= 0); + if (tracing_paragraphs > 0) + begin_diagnostic(); + } + + while (1) { + halfword first_p; + halfword nest_stack[10]; + int nest_index = 0; + if (threshold > inf_bad) + threshold = inf_bad; + /* Create an active breakpoint representing the beginning of the paragraph */ + q = new_node(unhyphenated_node, decent_fit); + vlink(q) = active; + break_node(q) = null; + line_number(q) = cur_list.pg_field + 1; + total_demerits(q) = 0; + active_short(q) = 0; + active_glue(q) = 0; + vlink(active) = q; + do_all_eight(store_background); + passive = null; + printed_node = temp_head; + pass_number = 0; + font_in_short_display = null_font; + /* /Create an active breakpoint representing the beginning of the paragraph */ + auto_breaking = true; + cur_p = vlink(temp_head); + assert(alink(cur_p) == temp_head); + /* LOCAL: Initialize with first |local_paragraph| node */ + if ((type(cur_p) == whatsit_node) && (subtype(cur_p) == local_par_node)) { + internal_pen_inter = local_pen_inter(cur_p); + internal_pen_broken = local_pen_broken(cur_p); + init_internal_left_box = local_box_left(cur_p); + init_internal_left_box_width = local_box_left_width(cur_p); + internal_left_box = init_internal_left_box; + internal_left_box_width = init_internal_left_box_width; + internal_right_box = local_box_right(cur_p); + internal_right_box_width = local_box_right_width(cur_p); } else { - act_width += width(cur_p); - if ((pdf_adjust_spacing > 1) && (subtype(cur_p) == normal)) { - add_kern_stretch(active_width[8],cur_p); - add_kern_shrink(active_width[9],cur_p); - } + internal_pen_inter = 0; + internal_pen_broken = 0; + init_internal_left_box = null; + init_internal_left_box_width = 0; + internal_left_box = init_internal_left_box; + internal_left_box_width = init_internal_left_box_width; + internal_right_box = null; + internal_right_box_width = 0; } - break; - case disc_node: - /* @;*/ - /* The following code knows that discretionary texts contain - only character nodes, kern nodes, box nodes, and rule - nodes. */ - if (second_pass) { - int actual_penalty = hyphen_penalty; - if (subtype(cur_p)==automatic_disc) - actual_penalty = ex_hyphen_penalty; - s=vlink_pre_break(cur_p); - do_one_seven_eight(reset_disc_width); - if (s==null) { /* trivial pre-break */ - ext_try_break(actual_penalty,hyphenated_node, pdf_adjust_spacing, - par_shape_ptr, adj_demerits, tracing_paragraphs, - pdf_protrude_chars, line_penalty, last_line_fit, - double_hyphen_demerits, final_hyphen_demerits,first_p,cur_p); - } else { - do { - /* @;*/ - if (is_char_node(s)) { - if (is_rotated(line_break_dir)) { - disc_width[1] += (glyph_height(s)+glyph_depth(s)); - } else { - disc_width[1] += glyph_width(s); + /* /LOCAL: Initialize with first |local_paragraph| node */ + set_prev_char_p(null); + prev_legal = null; + rejected_cur_p = null; + try_prev_break = false; + before_rejected_cur_p = false; + first_p = cur_p; + /* to access the first node of paragraph as the first active node + has |break_node=null| */ + while ((cur_p != null) && (vlink(active) != active)) { + /* |try_break| if |cur_p| is a legal breakpoint; on the 2nd pass, also look at disc_nodes. */ + + while (is_char_node(cur_p)) { + /* Advance \(c)|cur_p| to the node following the present string of characters ; */ + /* The code that passes over the characters of words in a paragraph is part of + \TeX's inner loop, so it has been streamlined for speed. We use the fact that + `\.{\\parfillskip}' glue appears at the end of each paragraph; it is therefore + unnecessary to check if |vlink(cur_p)=null| when |cur_p| is a character node. + */ + act_width += (is_rotated(line_break_dir)) + ? (glyph_height(cur_p) + glyph_depth(cur_p)) + : glyph_width(cur_p); + if ((pdf_adjust_spacing > 1) && check_expand_pars(font(cur_p))) { + set_prev_char_p(cur_p); + add_char_stretch(active_width[8], cur_p); + add_char_shrink(active_width[9], cur_p); } - if ((pdf_adjust_spacing > 1) && check_expand_pars(font(s))) { - set_prev_char_p (s); - add_char_stretch(disc_width[8],s); - add_char_shrink(disc_width[9],s); + cur_p = vlink(cur_p); + while (cur_p == null && nest_index > 0) { + cur_p = nest_stack[--nest_index]; + /* fprintf(stderr,"Node Pop %d [%d]\n",nest_index,(int)cur_p); */ } - } else { - switch (type(s)) { - case hlist_node: - case vlist_node: - if (!(dir_orthogonal(dir_primary[box_dir(s)], - dir_primary[line_break_dir]))) { - disc_width[1] += width(s); - } else { - disc_width[1] += (depth(s)+height(s)); - } - break; - case kern_node: - if ((pdf_adjust_spacing > 1) && (subtype(s) == normal)) { - add_kern_stretch(disc_width[8],s); - add_kern_shrink(disc_width[9],s); - } - /* fall through */ - case rule_node: - disc_width[1] += width(s); - break; - case disc_node: - tconfusion("pre_break_disc"); - break; - default: - tconfusion("disc3"); - } - } - /* /Add the width of node |s| to |disc_width| */ - s=vlink(s); - } while (s!=null); - do_one_seven_eight(add_disc_width_to_active_width); - ext_try_break(actual_penalty,hyphenated_node, pdf_adjust_spacing, - par_shape_ptr, adj_demerits, tracing_paragraphs, - pdf_protrude_chars, line_penalty, last_line_fit, - double_hyphen_demerits, final_hyphen_demerits, - first_p,cur_p); - do_one_seven_eight(sub_disc_width_from_active_width); - } -#define FOO 1 -#if FOO -#if 0 - if (vlink(cur_p)!=null) nest_stack[nest_index++] = vlink(cur_p); - cur_p = no_break(cur_p); -#else - s=vlink_no_break(cur_p); - while (s!=null) { - /* @;*/ - if (is_char_node(s)) { - if (is_rotated(line_break_dir)) { - act_width += glyph_height(s)+glyph_depth(s); - } else { - act_width += glyph_width(s); - } - if ((pdf_adjust_spacing > 1) && check_expand_pars(font(s))) { - set_prev_char_p (s); - add_char_stretch(active_width[8],s); - add_char_shrink(active_width[9],s); - }; - } else { - switch (type(s)) { - case hlist_node: - case vlist_node: - if (!(dir_orthogonal(dir_primary[box_dir(s)], - dir_primary[line_break_dir]))) - act_width += width(s); - else - act_width += (depth(s)+height(s)); + } + if (cur_p == null) { /* TODO */ + tconfusion("linebreak_tail"); + } + /* Determine legal breaks: As we move through the hlist, we need to keep + the |active_width| array up to date, so that the badness of individual + lines is readily calculated by |try_break|. It is convenient to use the + short name |act_width| for the component of active width that represents + real width as opposed to glue. */ + + switch (type(cur_p)) { + + case hlist_node: + case vlist_node: + act_width += + (dir_orthogonal + (dir_primary[box_dir(cur_p)], dir_primary[line_break_dir])) + ? (depth(cur_p) + height(cur_p)) + : width(cur_p); break; - case kern_node: - if ((pdf_adjust_spacing > 1) && (subtype(s) == normal)) { - add_kern_stretch(active_width[8],s); - add_kern_shrink(active_width[9],s); + case rule_node: + act_width += width(cur_p); + break; + case whatsit_node: + /* @; */ + switch (subtype(cur_p)) { + case local_par_node: /* @; */ + internal_pen_inter = local_pen_inter(cur_p); + internal_pen_broken = local_pen_broken(cur_p); + internal_left_box = local_box_left(cur_p); + internal_left_box_width = local_box_left_width(cur_p); + internal_right_box = local_box_right(cur_p); + internal_right_box_width = local_box_right_width(cur_p); + break; + case dir_node: /* @; */ + if (dir_dir(cur_p) >= 0) { + line_break_dir = dir_dir(cur_p); + push_dir_node(cur_p); + } else { + pop_dir_node(); + if (dir_ptr != null) + line_break_dir = dir_dir(dir_ptr); + } + break; + case pdf_refxform_node: + case pdf_refximage_node: + act_width += pdf_width(cur_p); } - /* fall through */ - case rule_node: - act_width += width(s); + /* / Advance \(p)past a whatsit node in the \(l)|line_break| loop/; */ break; - case disc_node: - /* what now */ - assert(vlink(s)==null); /* discs are _always_ last */ - /* NB: temporary solution: not good, but not bad either */ - s = no_break(s); + case glue_node: + /* @; */ + /* When node |cur_p| is a glue node, we look at the previous to + see whether or not a breakpoint is legal at |cur_p|, as + explained above. */ + /* *INDENT-OFF* */ + if (auto_breaking) { + halfword prev_p = alink(cur_p); + if (prev_p != temp_head && + (is_char_node(prev_p) || + precedes_break(prev_p) || + ((type(prev_p) == kern_node) + && (subtype(prev_p) != explicit)))) { + ext_try_break(0, unhyphenated_node, pdf_adjust_spacing, + par_shape_ptr, adj_demerits, + tracing_paragraphs, pdf_protrude_chars, + line_penalty, last_line_fit, + double_hyphen_demerits, + final_hyphen_demerits, first_p, cur_p); + } + } + /* *INDENT-ON* */ + check_shrinkage(glue_ptr(cur_p)); + q = glue_ptr(cur_p); + act_width += width(q); + active_width[2 + stretch_order(q)] += stretch(q); + active_width[7] += shrink(q); break; - default: - tconfusion("disc5"); - } - } - /* /Add the width of node |s| to |act_width|;*/ - s=vlink(s); - } -#endif - } else { /* first pass, just take the no_break path */ -#else /* FOO */ - } -#endif /* FOO */ + case kern_node: + if (subtype(cur_p) == explicit) { + kern_break(); + } else { + act_width += width(cur_p); + if ((pdf_adjust_spacing > 1) && (subtype(cur_p) == normal)) { + add_kern_stretch(active_width[8], cur_p); + add_kern_shrink(active_width[9], cur_p); + } + } + break; + case disc_node: + /* @; */ + /* The following code knows that discretionary texts contain + only character nodes, kern nodes, box nodes, and rule + nodes. */ + if (second_pass) { + int actual_penalty = hyphen_penalty; + if (subtype(cur_p) == automatic_disc) + actual_penalty = ex_hyphen_penalty; + s = vlink_pre_break(cur_p); + do_one_seven_eight(reset_disc_width); + if (s == null) { /* trivial pre-break */ + ext_try_break(actual_penalty, hyphenated_node, + pdf_adjust_spacing, par_shape_ptr, + adj_demerits, tracing_paragraphs, + pdf_protrude_chars, line_penalty, + last_line_fit, double_hyphen_demerits, + final_hyphen_demerits, first_p, cur_p); + } else { + do { + /* @; */ + if (is_char_node(s)) { + if (is_rotated(line_break_dir)) { + disc_width[1] += + (glyph_height(s) + glyph_depth(s)); + } else { + disc_width[1] += glyph_width(s); + } + if ((pdf_adjust_spacing > 1) + && check_expand_pars(font(s))) { + set_prev_char_p(s); + add_char_stretch(disc_width[8], s); + add_char_shrink(disc_width[9], s); + } + } else { + switch (type(s)) { + case hlist_node: + case vlist_node: + if (! + (dir_orthogonal + (dir_primary[box_dir(s)], + dir_primary[line_break_dir]))) { + disc_width[1] += width(s); + } else { + disc_width[1] += (depth(s) + height(s)); + } + break; + case kern_node: + if ((pdf_adjust_spacing > 1) + && (subtype(s) == normal)) { + add_kern_stretch(disc_width[8], s); + add_kern_shrink(disc_width[9], s); + } + /* fall through */ + case rule_node: + disc_width[1] += width(s); + break; + case disc_node: + tconfusion("pre_break_disc"); + break; + default: + tconfusion("disc3"); + } + } + /* /Add the width of node |s| to |disc_width| */ + s = vlink(s); + } while (s != null); + do_one_seven_eight(add_disc_width_to_active_width); + ext_try_break(actual_penalty, hyphenated_node, + pdf_adjust_spacing, par_shape_ptr, + adj_demerits, tracing_paragraphs, + pdf_protrude_chars, line_penalty, + last_line_fit, double_hyphen_demerits, + final_hyphen_demerits, first_p, cur_p); + do_one_seven_eight(sub_disc_width_from_active_width); + } +#define FOO 1 +#if FOO +# if 0 + if (vlink(cur_p) != null) + nest_stack[nest_index++] = vlink(cur_p); + cur_p = no_break(cur_p); +# else + s = vlink_no_break(cur_p); + while (s != null) { + /* @; */ + if (is_char_node(s)) { + if (is_rotated(line_break_dir)) { + act_width += glyph_height(s) + glyph_depth(s); + } else { + act_width += glyph_width(s); + } + if ((pdf_adjust_spacing > 1) + && check_expand_pars(font(s))) { + set_prev_char_p(s); + add_char_stretch(active_width[8], s); + add_char_shrink(active_width[9], s); + }; + } else { + switch (type(s)) { + case hlist_node: + case vlist_node: + if (!(dir_orthogonal(dir_primary[box_dir(s)], + dir_primary + [line_break_dir]))) + act_width += width(s); + else + act_width += (depth(s) + height(s)); + break; + case kern_node: + if ((pdf_adjust_spacing > 1) + && (subtype(s) == normal)) { + add_kern_stretch(active_width[8], s); + add_kern_shrink(active_width[9], s); + } + /* fall through */ + case rule_node: + act_width += width(s); + break; + case disc_node: + /* what now */ + assert(vlink(s) == null); /* discs are _always_ last */ + /* NB: temporary solution: not good, but not bad either */ + s = no_break(s); + break; + default: + tconfusion("disc5"); + } + } + /* /Add the width of node |s| to |act_width|; */ + s = vlink(s); + } +# endif + } else { /* first pass, just take the no_break path */ +#else /* FOO */ + } +#endif /* FOO */ #if 0 - if (vlink_no_break(cur_p)!=null) { - if (vlink(cur_p)!=null) nest_stack[nest_index++] = vlink(cur_p); - /* fprintf(stderr,"Node Push %d [%d]->[%d] / [%d]\n",(nest_index-1),(int)cur_p,(int)vlink(cur_p),(int)vlink_no_break(cur_p));*/ - cur_p = no_break(cur_p); - } + if (vlink_no_break(cur_p) != null) { + if (vlink(cur_p) != null) + nest_stack[nest_index++] = vlink(cur_p); + /* fprintf(stderr,"Node Push %d [%d]->[%d] / [%d]\n",(nest_index-1),(int)cur_p,(int)vlink(cur_p),(int)vlink_no_break(cur_p)); */ + cur_p = no_break(cur_p); + } #else - s=vlink_no_break(cur_p); - while (s!=null) { - /* @;*/ - if (is_char_node(s)) { - if (is_rotated(line_break_dir)) { - act_width += glyph_height(s)+glyph_depth(s); - } else { - act_width += glyph_width(s); - } - if ((pdf_adjust_spacing > 1) && check_expand_pars(font(s))) { - set_prev_char_p (s); - add_char_stretch(active_width[8],s); - add_char_shrink(active_width[9],s); - }; - } else { - switch (type(s)) { - case hlist_node: - case vlist_node: - if (!(dir_orthogonal(dir_primary[box_dir(s)], - dir_primary[line_break_dir]))) - act_width += width(s); - else - act_width += (depth(s)+height(s)); - break; - case kern_node: - if ((pdf_adjust_spacing > 1) && (subtype(s) == normal)) { - add_kern_stretch(active_width[8],s); - add_kern_shrink(active_width[9],s); + s = vlink_no_break(cur_p); + while (s != null) { + /* @; */ + if (is_char_node(s)) { + if (is_rotated(line_break_dir)) { + act_width += glyph_height(s) + glyph_depth(s); + } else { + act_width += glyph_width(s); + } + if ((pdf_adjust_spacing > 1) + && check_expand_pars(font(s))) { + set_prev_char_p(s); + add_char_stretch(active_width[8], s); + add_char_shrink(active_width[9], s); + }; + } else { + switch (type(s)) { + case hlist_node: + case vlist_node: + if (!(dir_orthogonal(dir_primary[box_dir(s)], + dir_primary[line_break_dir]))) + act_width += width(s); + else + act_width += (depth(s) + height(s)); + break; + case kern_node: + if ((pdf_adjust_spacing > 1) + && (subtype(s) == normal)) { + add_kern_stretch(active_width[8], s); + add_kern_shrink(active_width[9], s); + } + /* fall through */ + case rule_node: + act_width += width(s); + break; + case disc_node: + assert(vlink(s) == null); /* discs are _always_ last */ + s = no_break(s); + break; + default: + tconfusion("disc4"); + } + } + /* /Add the width of node |s| to |act_width|; */ + s = vlink(s); } - /* fall through */ - case rule_node: - act_width += width(s); - break; - case disc_node: - assert(vlink(s)==null); /* discs are _always_ last */ - s = no_break(s); - break; - default: - tconfusion("disc4"); - } - } - /* /Add the width of node |s| to |act_width|;*/ - s=vlink(s); - } #endif #if FOO + } +#endif /* FOO */ + break; +case math_node: + auto_breaking = (subtype(cur_p) == after); + kern_break(); + break; +case penalty_node: + ext_try_break(penalty(cur_p), unhyphenated_node, pdf_adjust_spacing, + par_shape_ptr, adj_demerits, tracing_paragraphs, + pdf_protrude_chars, line_penalty, last_line_fit, + double_hyphen_demerits, final_hyphen_demerits, + first_p, cur_p); + break; +case mark_node: +case ins_node: +case adjust_node: + break; +case glue_spec_node: + fprintf(stdout, "\nfound a glue_spec in a paragraph!"); + break; +default: + fprintf(stdout, "\ntype=%d", type(cur_p)); + tconfusion("paragraph"); + } + cur_p = vlink(cur_p); + while (cur_p == null && nest_index > 0) { + cur_p = nest_stack[--nest_index]; + /* fprintf(stderr,"Node Pop %d [%d]\n",nest_index,(int)cur_p); */ } -#endif /* FOO */ - break; - case math_node: - auto_breaking=(subtype(cur_p)==after); - kern_break(); - break; - case penalty_node: - ext_try_break(penalty(cur_p),unhyphenated_node, pdf_adjust_spacing, - par_shape_ptr, adj_demerits, tracing_paragraphs, - pdf_protrude_chars, line_penalty, last_line_fit, - double_hyphen_demerits, final_hyphen_demerits,first_p,cur_p); - break; - case mark_node: - case ins_node: - case adjust_node: - break; - case glue_spec_node: - fprintf(stdout, "\nfound a glue_spec in a paragraph!"); - break; - default: - fprintf(stdout, "\ntype=%d",type(cur_p)); - tconfusion("paragraph") ; - } - cur_p=vlink(cur_p); - while (cur_p==null && nest_index>0) { - cur_p = nest_stack[--nest_index]; - /* fprintf(stderr,"Node Pop %d [%d]\n",nest_index,(int)cur_p);*/ - } } - if (cur_p==null) { - /* Try the final line break at the end of the paragraph, - and |goto done| if the desired breakpoints have been found */ - - /* The forced line break at the paragraph's end will reduce the list of - breakpoints so that all active nodes represent breaks at |cur_p=null|. - On the first pass, we insist on finding an active node that has the - correct ``looseness.'' On the final pass, there will be at least one active - node, and we will match the desired looseness as well as we can. - - The global variable |best_bet| will be set to the active node for the best - way to break the paragraph, and a few other variables are used to - help determine what is best. - */ - - ext_try_break(eject_penalty,hyphenated_node, pdf_adjust_spacing, - par_shape_ptr, adj_demerits, tracing_paragraphs, - pdf_protrude_chars,line_penalty, last_line_fit, - double_hyphen_demerits, final_hyphen_demerits,first_p,cur_p); - if (vlink(active)!=active) { - /* @;*/ - r=vlink(active); - fewest_demerits=awful_bad; - do { - if (type(r)!=delta_node) { - if (total_demerits(r);*/ - - /* The adjustment for a desired looseness is a slightly more complicated - version of the loop just considered. Note that if a paragraph is broken - into segments by displayed equations, each segment will be subject to the - looseness calculation, independently of the other segments. - */ - r=vlink(active); - actual_looseness=0; - do { - if (type(r)!=delta_node) { - line_diff=line_number(r)-best_line; - if (((line_diffactual_looseness)&&(looseness>=line_diff))) { - best_bet=r; - actual_looseness=line_diff; - fewest_demerits=total_demerits(r); - } else if ((line_diff==actual_looseness)&& - (total_demerits(r); */ + r = vlink(active); + fewest_demerits = awful_bad; + do { + if (type(r) != delta_node) { + if (total_demerits(r) < fewest_demerits) { + fewest_demerits = total_demerits(r); + best_bet = r; + } + } + r = vlink(r); + } while (r != active); + best_line = line_number(best_bet); + + /* /Find an active node with fewest demerits; */ + if (looseness == 0) + goto DONE; + /*@; */ + + /* The adjustment for a desired looseness is a slightly more complicated + version of the loop just considered. Note that if a paragraph is broken + into segments by displayed equations, each segment will be subject to the + looseness calculation, independently of the other segments. + */ + r = vlink(active); + actual_looseness = 0; + do { + if (type(r) != delta_node) { + line_diff = line_number(r) - best_line; + if (((line_diff < actual_looseness) + && (looseness <= line_diff)) + || ((line_diff > actual_looseness) + && (looseness >= line_diff))) { + best_bet = r; + actual_looseness = line_diff; + fewest_demerits = total_demerits(r); + } else if ((line_diff == actual_looseness) && + (total_demerits(r) < fewest_demerits)) { + best_bet = r; + fewest_demerits = total_demerits(r); + } + } + r = vlink(r); + } while (r != active); + best_line = line_number(best_bet); + + /* /Find the best active node for the desired looseness; */ + if ((actual_looseness == looseness) || final_pass) + goto DONE; + } } - + /* Clean up the memory by removing the break nodes; */ clean_up_the_memory(); /* /Clean up the memory by removing the break nodes; */ - if (!second_pass) { - if (tracing_paragraphs>0) - tprint_nl("@secondpass"); - threshold=tolerance; - second_pass=true; - final_pass=(emergency_stretch<=0); - } else { /* if at first you do not succeed, \dots */ - if (tracing_paragraphs>0) - tprint_nl("@emergencypass"); - background[2] += emergency_stretch; - final_pass=true; + if (!second_pass) { + if (tracing_paragraphs > 0) + tprint_nl("@secondpass"); + threshold = tolerance; + second_pass = true; + final_pass = (emergency_stretch <= 0); + } else { /* if at first you do not succeed, \dots */ + if (tracing_paragraphs > 0) + tprint_nl("@emergencypass"); + background[2] += emergency_stretch; + final_pass = true; } - } - DONE: - if (tracing_paragraphs>0) { - end_diagnostic(true); - normalize_selector(); - } - if (do_last_line_fit) { - /* Adjust \(t)the final line of the paragraph;*/ +} + +DONE: +if (tracing_paragraphs > 0) { + end_diagnostic(true); + normalize_selector(); +} +if (do_last_line_fit) { + /* Adjust \(t)the final line of the paragraph; */ /* Here we either reset |do_last_line_fit| or adjust the |par_fill_skip| glue. */ - if (active_short(best_bet)==0) { - do_last_line_fit=false; - } else { - q=new_spec(glue_ptr(last_line_fill)); - delete_glue_ref(glue_ptr(last_line_fill)); - width(q) += (active_short(best_bet)-active_glue(best_bet)); - stretch(q)=0; - glue_ptr(last_line_fill)=q; + if (active_short(best_bet) == 0) { + do_last_line_fit = false; + } else { + q = new_spec(glue_ptr(last_line_fill)); + delete_glue_ref(glue_ptr(last_line_fill)); + width(q) += (active_short(best_bet) - active_glue(best_bet)); + stretch(q) = 0; + glue_ptr(last_line_fill) = q; } - /* /Adjust \(t)the final line of the paragraph;*/ - } + /* /Adjust \(t)the final line of the paragraph; */ +} /* @; */ /* Once the best sequence of breakpoints has been found (hurray), we call on the procedure |post_line_break| to finish the remainder of the work. (By introducing this subprocedure, we are able to keep |line_break| from getting extremely long.) - */ - ext_post_line_break(d, - right_skip, - left_skip, - pdf_protrude_chars, - par_shape_ptr, - pdf_adjust_spacing, - pdf_each_line_height, - pdf_each_line_depth, - pdf_first_line_height, - pdf_last_line_depth, - inter_line_penalties_ptr, - inter_line_penalty, - club_penalty, - club_penalties_ptr, - display_widow_penalties_ptr, - widow_penalties_ptr, - display_widow_penalty, - widow_penalty, - broken_penalty, - final_par_glue, - best_bet, - last_special_line, - second_width, - second_indent, - first_width, - first_indent, - best_line - ); + */ +ext_post_line_break(d, + right_skip, + left_skip, + pdf_protrude_chars, + par_shape_ptr, + pdf_adjust_spacing, + pdf_each_line_height, + pdf_each_line_depth, + pdf_first_line_height, + pdf_last_line_depth, + inter_line_penalties_ptr, + inter_line_penalty, + club_penalty, + club_penalties_ptr, + display_widow_penalties_ptr, + widow_penalties_ptr, + display_widow_penalty, + widow_penalty, + broken_penalty, + final_par_glue, + best_bet, + last_special_line, + second_width, + second_indent, first_width, first_indent, best_line); /* /Break the paragraph at the chosen... */ /* Clean up the memory by removing the break nodes; */ - clean_up_the_memory(); +clean_up_the_memory(); /* - flush_node_list(dir_ptr); - dir_ptr=null; - */ + flush_node_list(dir_ptr); + dir_ptr=null; + */ } - - diff --git a/Build/source/texk/web2c/luatexdir/tex/postlinebreak.c b/Build/source/texk/web2c/luatexdir/tex/postlinebreak.c index 86b9562c262..21451602f8b 100644 --- a/Build/source/texk/web2c/luatexdir/tex/postlinebreak.c +++ b/Build/source/texk/web2c/luatexdir/tex/postlinebreak.c @@ -1,4 +1,4 @@ -/* $Id: postlinebreak.c 1078 2008-03-05 15:33:46Z taco $ */ +/* $Id: postlinebreak.c 1155 2008-04-14 07:53:21Z oneiros $ */ #include "luatex-api.h" #include @@ -22,19 +22,19 @@ point to a glue node, penalty node, explicit kern node, or math node. */ -static halfword -do_push_dir_node (halfword p, halfword a ) { - halfword n; - n = copy_node(a); - vlink(n) = p; - return n; +static halfword do_push_dir_node(halfword p, halfword a) +{ + halfword n; + n = copy_node(a); + vlink(n) = p; + return n; } -static halfword -do_pop_dir_node ( halfword p ) { - halfword n = vlink(p); - flush_node(p); - return n; +static halfword do_pop_dir_node(halfword p) +{ + halfword n = vlink(p); + flush_node(p); + return n; } @@ -53,460 +53,468 @@ and begin direction instructions at the beginnings of lines. */ -#define next_break prev_break /*new name for |prev_break| after links are reversed*/ +#define next_break prev_break /*new name for |prev_break| after links are reversed */ #define append_list(a,b) \ { vlink(cur_list.tail_field)=vlink((a)); cur_list.tail_field = b; } -#define left_skip_code 7 /*glue at left of justified lines*/ -#define right_skip_code 8 /*glue at right of justified lines*/ +#define left_skip_code 7 /*glue at left of justified lines */ +#define right_skip_code 8 /*glue at right of justified lines */ /* the ints are actually halfwords */ -void ext_post_line_break(boolean d, - int right_skip, - int left_skip, - int pdf_protrude_chars, - halfword par_shape_ptr, - int pdf_adjust_spacing, - int pdf_each_line_height, - int pdf_each_line_depth, - int pdf_first_line_height, - int pdf_last_line_depth, - halfword inter_line_penalties_ptr, - int inter_line_penalty, - int club_penalty, - halfword club_penalties_ptr, - halfword display_widow_penalties_ptr, - halfword widow_penalties_ptr, - int display_widow_penalty, - int widow_penalty, - int broken_penalty, - halfword final_par_glue, - halfword best_bet, - halfword last_special_line, - scaled second_width, - scaled second_indent, - scaled first_width, - scaled first_indent, - halfword best_line ) { - - boolean have_directional = true; - halfword q,r,s; /* temporary registers for list manipulation */ - halfword p, k; - scaled w; - boolean glue_break; /* was a break at glue? */ - boolean disc_break; /*was the current break at a discretionary node?*/ - 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 */ - halfword cur_p; /* cur_p, but localized */ - halfword cur_line; /*the current line number being justified*/ - - dir_ptr = cur_list.dirs_field; - /* @; */ - /* The job of reversing links in a list is conveniently regarded as the job - of taking items off one stack and putting them on another. In this case we - take them off a stack pointed to by |q| and having |prev_break| fields; - we put them on a stack pointed to by |cur_p| and having |next_break| fields. - Node |r| is the passive node being moved from stack to stack. - */ - q=break_node(best_bet); - /*used_discs = used_disc(best_bet);*/ - /*has_direction*/ - cur_p=null; - do { - r=q; - q=prev_break(q); - next_break(r)=cur_p; - cur_p=r; - } while (q!=null); - /* |cur_p| is now the first breakpoint; */ - - cur_line=cur_list.pg_field+1; /* prevgraf+1 */ - - do { - /* @; */ - /* The current line to be justified appears in a horizontal list starting - at |vlink(temp_head)| and ending at |cur_break(cur_p)|. If |cur_break(cur_p)| is - a glue node, we reset the glue to equal the |right_skip| glue; otherwise - we append the |right_skip| glue at the right. If |cur_break(cur_p)| is a - discretionary node, we modify the list so that the discretionary break - is compulsory, and we set |disc_break| to |true|. We also append - the |left_skip| glue at the left of the line, unless it is zero. */ +void ext_post_line_break(boolean d, + int right_skip, + int left_skip, + int pdf_protrude_chars, + halfword par_shape_ptr, + int pdf_adjust_spacing, + int pdf_each_line_height, + int pdf_each_line_depth, + int pdf_first_line_height, + int pdf_last_line_depth, + halfword inter_line_penalties_ptr, + int inter_line_penalty, + int club_penalty, + halfword club_penalties_ptr, + halfword display_widow_penalties_ptr, + halfword widow_penalties_ptr, + int display_widow_penalty, + int widow_penalty, + int broken_penalty, + halfword final_par_glue, + halfword best_bet, + halfword last_special_line, + scaled second_width, + scaled second_indent, + scaled first_width, + scaled first_indent, halfword best_line) +{ + + boolean have_directional = true; + halfword q, r, s; /* temporary registers for list manipulation */ + halfword p, k; + scaled w; + boolean glue_break; /* was a break at glue? */ + boolean disc_break; /*was the current break at a discretionary node? */ + 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 */ + halfword cur_p; /* cur_p, but localized */ + halfword cur_line; /*the current line number being justified */ + + dir_ptr = cur_list.dirs_field; + /* @; */ + /* The job of reversing links in a list is conveniently regarded as the job + of taking items off one stack and putting them on another. In this case we + take them off a stack pointed to by |q| and having |prev_break| fields; + we put them on a stack pointed to by |cur_p| and having |next_break| fields. + Node |r| is the passive node being moved from stack to stack. + */ + q = break_node(best_bet); + /*used_discs = used_disc(best_bet); */ + /*has_direction */ + cur_p = null; + do { + r = q; + q = prev_break(q); + next_break(r) = cur_p; + cur_p = r; + } while (q != null); + /* |cur_p| is now the first breakpoint; */ + + cur_line = cur_list.pg_field + 1; /* prevgraf+1 */ + + do { + /* @; */ + /* The current line to be justified appears in a horizontal list starting + at |vlink(temp_head)| and ending at |cur_break(cur_p)|. If |cur_break(cur_p)| is + a glue node, we reset the glue to equal the |right_skip| glue; otherwise + we append the |right_skip| glue at the right. If |cur_break(cur_p)| is a + discretionary node, we modify the list so that the discretionary break + is compulsory, and we set |disc_break| to |true|. We also append + the |left_skip| glue at the left of the line, unless it is zero. */ #if 0 - tprint("BEGIN OF LINE "); - print_int(cur_break(cur_p)); - breadth_max=100000; - depth_threshold=100000; - show_node_list(temp_head); + tprint("BEGIN OF LINE "); + print_int(cur_break(cur_p)); + breadth_max = 100000; + depth_threshold = 100000; + show_node_list(temp_head); #endif - - /* DIR: Insert dir nodes at the beginning of the current line;*/ - for (q=dir_ptr;q!=null;q=vlink(q)) { - halfword tmp = new_dir(dir_dir(q)); - halfword nxt = vlink(temp_head); - couple_nodes(temp_head,tmp); - couple_nodes(tmp,nxt); - } - if (dir_ptr!=null) { - flush_node_list(dir_ptr); dir_ptr=null; - } - - /* Modify the end of the line to reflect the nature of the break and to - include \.{\\rightskip}; also set the proper value of |disc_break|; */ - /* At the end of the following code, |q| will point to the final node on the - list about to be justified. In the meanwhile |r| will point to the - node we will use to insert end-of-line stuff after. |q==null| means - we use the final position of |r| */ - r = cur_break(cur_p); - q = null; - disc_break=false; - post_disc_break=false; - glue_break = false; - - if (r==null) { - for (r=temp_head; vlink(r)!=null; r=vlink(r)); - if (r==final_par_glue) { - /* This should almost always be true... */ - /* TODO assert ? */ - q = r; - /* |q| refers to the last node of the line (and paragraph) */ - r = alink(r); - } - /* |r| refers to the node after which the dir nodes should be closed */ - } else if (type(r)==glue_node) { - delete_glue_ref(glue_ptr(r)); - glue_ptr(r)=right_skip; - subtype(r)=right_skip_code+1; - incr(glue_ref_count(right_skip)); - glue_break = true; - /* |q| refers to the last node of the line */ - q = r; - r=alink(r); - assert(vlink(r)==q); - /* |r| refers to the node after which the dir nodes should be closed */ - } else if (type(r)==disc_node) { - halfword a = alink(r); - assert(a!=null); - halfword v = vlink(r); - if (v==null) { /* nested disc, let's unfold */ - fprintf(stderr,"Nested disc [%d]<-[%d]->null\n",(int)a,(int)r); - do { - halfword d; - while (alink(a)!=null) a = alink(a); - assert(type(a)==nesting_node); - assert(subtype(a)=no_break_head(0)); /* No_break */ - d = a - subtype(a); /* MAGIC subtype is offset of nesting with disc */ - assert(type(d)==disc_node); - v = vlink(d); - a = alink(d); - fprintf(stderr,"Up to disc [%d]<-[%d]->[%d] & link [%d]\n",(int)a,(int)d,(int)v,(int)vlink_no_break(d)); - assert(a!=null); - couple_nodes(a,vlink_no_break(d)); - vlink_no_break(d)=null; - tlink_no_break(d)=null; - flush_node(d); - } while (v==null); - couple_nodes(r,v); - fprintf(stderr,"Close list [%d]<->[%d] a=[%d]\n",(int)r,(int)v,(int)alink(r)); - a = alink(r); - } - if (vlink_no_break(r)!=null) { - flush_node_list(vlink_no_break(r)); - vlink_no_break(r)=null; - tlink_no_break(r)=null; - } - if (vlink_pre_break(r)!=null) { - couple_nodes(a,vlink_pre_break(r)); - couple_nodes(tlink_pre_break(r),r); - vlink_pre_break(r)=null; - tlink_pre_break(r)=null; - } - if (vlink_post_break(r)!=null) { - couple_nodes(r,vlink_post_break(r)); - couple_nodes(tlink_post_break(r),v); - vlink_post_break(r)=null; - tlink_post_break(r)=null; - post_disc_break = true; - } - disc_break=true; - } else if (type(r)==kern_node) { - width(r)=0; - } else if (type(r)==math_node) { - surround(r)=0; - } - - /* DIR: Adjust the dir stack based on dir nodes in this line; */ - /* TODO what about the previousparagraph ??? */ - if (have_directional) { - halfword e; - halfword p; - for(e=vlink(temp_head); e!=null && e!=cur_break(cur_p); e=vlink(e)) { - if (type(e)!=whatsit_node || subtype(e)!=dir_node) - continue; - if (dir_dir(e)>=0) { - dir_ptr = do_push_dir_node(dir_ptr,e); - } else if (dir_ptr!=null && dir_dir(dir_ptr)==(dir_dir(e)+64)) { - dir_ptr = do_pop_dir_node(dir_ptr); + + /* DIR: Insert dir nodes at the beginning of the current line; */ + for (q = dir_ptr; q != null; q = vlink(q)) { + halfword tmp = new_dir(dir_dir(q)); + halfword nxt = vlink(temp_head); + couple_nodes(temp_head, tmp); + couple_nodes(tmp, nxt); + } + if (dir_ptr != null) { + flush_node_list(dir_ptr); + dir_ptr = null; + } + + /* Modify the end of the line to reflect the nature of the break and to + include \.{\\rightskip}; also set the proper value of |disc_break|; */ + /* At the end of the following code, |q| will point to the final node on the + list about to be justified. In the meanwhile |r| will point to the + node we will use to insert end-of-line stuff after. |q==null| means + we use the final position of |r| */ + r = cur_break(cur_p); + q = null; + disc_break = false; + post_disc_break = false; + glue_break = false; + + if (r == null) { + for (r = temp_head; vlink(r) != null; r = vlink(r)); + if (r == final_par_glue) { + /* This should almost always be true... */ + /* TODO assert ? */ + q = r; + /* |q| refers to the last node of the line (and paragraph) */ + r = alink(r); + } + /* |r| refers to the node after which the dir nodes should be closed */ + } else if (type(r) == glue_node) { + delete_glue_ref(glue_ptr(r)); + glue_ptr(r) = right_skip; + subtype(r) = right_skip_code + 1; + incr(glue_ref_count(right_skip)); + glue_break = true; + /* |q| refers to the last node of the line */ + q = r; + r = alink(r); + assert(vlink(r) == q); + /* |r| refers to the node after which the dir nodes should be closed */ + } else if (type(r) == disc_node) { + halfword a = alink(r); + assert(a != null); + halfword v = vlink(r); + if (v == null) { /* nested disc, let's unfold */ + fprintf(stderr, "Nested disc [%d]<-[%d]->null\n", (int) a, + (int) r); + do { + halfword d; + while (alink(a) != null) + a = alink(a); + assert(type(a) == nesting_node); + assert(subtype(a) = no_break_head(0)); /* No_break */ + d = a - subtype(a); /* MAGIC subtype is offset of nesting with disc */ + assert(type(d) == disc_node); + v = vlink(d); + a = alink(d); + fprintf(stderr, "Up to disc [%d]<-[%d]->[%d] & link [%d]\n", + (int) a, (int) d, (int) v, (int) vlink_no_break(d)); + assert(a != null); + couple_nodes(a, vlink_no_break(d)); + vlink_no_break(d) = null; + tlink_no_break(d) = null; + flush_node(d); + } while (v == null); + couple_nodes(r, v); + fprintf(stderr, "Close list [%d]<->[%d] a=[%d]\n", (int) r, + (int) v, (int) alink(r)); + a = alink(r); + } + if (vlink_no_break(r) != null) { + flush_node_list(vlink_no_break(r)); + vlink_no_break(r) = null; + tlink_no_break(r) = null; + } + if (vlink_pre_break(r) != null) { + couple_nodes(a, vlink_pre_break(r)); + couple_nodes(tlink_pre_break(r), r); + vlink_pre_break(r) = null; + tlink_pre_break(r) = null; + } + if (vlink_post_break(r) != null) { + couple_nodes(r, vlink_post_break(r)); + couple_nodes(tlink_post_break(r), v); + vlink_post_break(r) = null; + tlink_post_break(r) = null; + post_disc_break = true; + } + disc_break = true; + } else if (type(r) == kern_node) { + width(r) = 0; + } else if (type(r) == math_node) { + surround(r) = 0; + } + + /* DIR: Adjust the dir stack based on dir nodes in this line; */ + /* TODO what about the previousparagraph ??? */ + if (have_directional) { + halfword e; + halfword p; + for (e = vlink(temp_head); e != null && e != cur_break(cur_p); + e = vlink(e)) { + if (type(e) != whatsit_node || subtype(e) != dir_node) + continue; + if (dir_dir(e) >= 0) { + dir_ptr = do_push_dir_node(dir_ptr, e); + } else if (dir_ptr != null + && dir_dir(dir_ptr) == (dir_dir(e) + 64)) { + dir_ptr = do_pop_dir_node(dir_ptr); + } + } + assert(e == cur_break(cur_p)); + + /* @; */ + e = vlink(r); + for (p = dir_ptr; p != null; p = vlink(p)) { + halfword s = new_dir(dir_dir(p) - 64); + couple_nodes(r, s); + try_couple_nodes(s, e); + r = s; + } + } + if (passive_right_box(cur_p) != null) { + /* TODO: CHECK has |s| below a |alink| ? */ + halfword s = copy_node_list(passive_right_box(cur_p)); + halfword e = vlink(r); + couple_nodes(r, s); + try_couple_nodes(s, e); + r = s; + } + if (q == null) { + q = r; + } + /* Now [q] refers to the last node on the line */ + + /* FIXME from this point on we no longer keep alink() valid */ + + /* at this point |q| is the rightmost breakpoint; the only exception is + the case of a discretionary break with non-empty |pre_break|, then |q| + has been changed to the last node of the |pre_break| list */ + /* If the par ends with a \break command, the last line is utterly empty. + That is the case of |q==temp_head| */ + if (q != temp_head && pdf_protrude_chars > 0) { + halfword ptmp; + if (disc_break && (is_char_node(q) || (type(q) != disc_node))) { + p = q; /* |q| has been reset to the last node of |pre_break| */ + ptmp = p; + } else { + p = alink(q); /* get |vlink(p) = q| */ + assert(vlink(p) == q); + ptmp = p; + p = find_protchar_right(vlink(temp_head), p); + } + w = char_pw(p, right_side); + if (w != 0) { /* we have found a marginal kern, append it after |ptmp| */ + k = new_margin_kern(-w, last_rightmost_char, right_side); + vlink(k) = vlink(ptmp); + vlink(ptmp) = k; + if (ptmp == q) + q = vlink(q); + } + } + /* if |q| was not a breakpoint at glue and has been reset to |rightskip| + then we append |rightskip| after |q| now */ + if (!glue_break) { + /* @; */ + halfword r = new_param_glue(right_skip_code); + vlink(r) = vlink(q); + vlink(q) = r; + q = r; } - } - assert(e==cur_break(cur_p)); - - /* @;*/ - e = vlink(r); - for (p=dir_ptr; p!=null; p=vlink(p)) { - halfword s=new_dir(dir_dir(p)-64); - couple_nodes(r,s); - try_couple_nodes(s,e); - r=s; - } - } - if (passive_right_box(cur_p)!=null) { - /* TODO: CHECK has |s| below a |alink| ? */ - halfword s = copy_node_list(passive_right_box(cur_p)); - halfword e = vlink(r); - couple_nodes(r,s); - try_couple_nodes(s,e); - r=s; - } - if (q==null) { - q = r; - } - /* Now [q] refers to the last node on the line */ - - /* FIXME from this point on we no longer keep alink() valid */ - - /* at this point |q| is the rightmost breakpoint; the only exception is - the case of a discretionary break with non-empty |pre_break|, then |q| - has been changed to the last node of the |pre_break| list */ - /* If the par ends with a \break command, the last line is utterly empty. - That is the case of |q==temp_head| */ - if (q!=temp_head && pdf_protrude_chars > 0) { - halfword ptmp; - if (disc_break && (is_char_node(q) || (type(q) != disc_node))) { - p = q; /* |q| has been reset to the last node of |pre_break| */ - ptmp = p; - } else { - p = alink(q); /* get |vlink(p) = q| */ - assert(vlink(p)==q); - ptmp = p; - p = find_protchar_right(vlink(temp_head), p); - } - w = char_pw(p, right_side); - if (w!=0) { /* we have found a marginal kern, append it after |ptmp| */ - k = new_margin_kern(-w, last_rightmost_char, right_side); - vlink(k) = vlink(ptmp); - vlink(ptmp) = k; - if (ptmp == q) - q = vlink(q); - } - } - /* if |q| was not a breakpoint at glue and has been reset to |rightskip| - then we append |rightskip| after |q| now */ - if (!glue_break) { - /* @;*/ - halfword r=new_param_glue(right_skip_code); - vlink(r)=vlink(q); - vlink(q)=r; - q=r; - } - - /* /Modify the end of the line to reflect the nature of the break and to - include \.{\\rightskip}; also set the proper value of |disc_break|; */ - - /* Put the \(l)\.{\\leftskip} glue at the left and detach this line;*/ - /* The following code begins with |q| at the end of the list to be - justified. It ends with |q| at the beginning of that list, and with - |vlink(temp_head)| pointing to the remainder of the paragraph, if any. */ - r=vlink(q); - vlink(q)=null; - - q=vlink(temp_head); - try_couple_nodes(temp_head,r); - if (passive_left_box(cur_p)!=null && passive_left_box(cur_p)!=0) { - /* omega bits: */ - r=copy_node_list(passive_left_box(cur_p)); - s=vlink(q); - vlink(r)=q; - q=r; - if ((cur_line==cur_list.pg_field+1) && (s!=null)) { - if (type(s)==hlist_node) { - if (list_ptr(s)==null) { - q=vlink(q); - vlink(r)=vlink(s); - vlink(s)=r; - } - } - } - } - /*at this point |q| is the leftmost node; all discardable nodes have been discarded */ - if (pdf_protrude_chars > 0) { - p = q; - p = find_protchar_left(p, false); /* no more discardables */ - w = char_pw(p, left_side); - if (w != 0) { - k = new_margin_kern(-w, last_leftmost_char, left_side); - vlink(k) = q; - q = k; - } - }; - if (left_skip!=zero_glue) { - r=new_param_glue(left_skip_code); - vlink(r)=q; - q=r; - } - /* /Put the \(l)\.{\\leftskip} glue at the left and detach this line;*/ - - /* Call the packaging subroutine, setting |just_box| to the justified box;*/ - /* Now |q| points to the hlist that represents the current line of the - paragraph. We need to compute the appropriate line width, pack the - line into a box of this size, and shift the box by the appropriate - amount of indentation. */ - if (cur_line>last_special_line) { - cur_width=second_width; - cur_indent=second_indent; - } else if (par_shape_ptr==null) { - cur_width=first_width; - cur_indent=first_indent; - } else { - cur_indent=varmem[(par_shape_ptr+2*cur_line)].cint; - cur_width=varmem[(par_shape_ptr+2*cur_line+1)].cint; - } - adjust_tail=adjust_head; - pack_direction=paragraph_dir; - pre_adjust_tail = pre_adjust_head; - if (pdf_adjust_spacing > 0 ) { - just_box = hpack(q, cur_width, cal_expand_ratio); - } else { - just_box = hpack(q, cur_width, exactly); - } - shift_amount(just_box)=cur_indent; - /* /Call the packaging subroutine, setting |just_box| to the justified box;*/ - - /* Append the new box to the current vertical list, followed by the list of - special nodes taken out of the box by the packager;*/ - if (pdf_each_line_height!=0) - height(just_box) = pdf_each_line_height; - if (pdf_each_line_depth != 0) - depth(just_box) = pdf_each_line_depth; - if ((pdf_first_line_height != 0) && (cur_line == cur_list.pg_field + 1)) - height(just_box) = pdf_first_line_height; - if ((pdf_last_line_depth != 0) && (cur_line + 1 == best_line)) - depth(just_box) = pdf_last_line_depth; - - if (pre_adjust_head != pre_adjust_tail) - append_list(pre_adjust_head,pre_adjust_tail); - pre_adjust_tail = null; - append_to_vlist(just_box); - if (adjust_head != adjust_tail) - append_list(adjust_head,adjust_tail); - adjust_tail = null; - - /* /Append the new box to the current vertical list, followed by the list of - special nodes taken out of the box by the packager;*/ - - /* Append a penalty node, if a nonzero penalty is appropriate */ - /* Penalties between the lines of a paragraph come from club and widow lines, - from the |inter_line_penalty| parameter, and from lines that end at - discretionary breaks. Breaking between lines of a two-line paragraph gets - both club-line and widow-line penalties. The local variable |pen| will - be set to the sum of all relevant penalties for the current line, except - that the final line is never penalized. */ - if (cur_line+1!=best_line) { - q=inter_line_penalties_ptr; - if (q!=null) { - r=cur_line; - if (r>penalty(q)) - r=penalty(q); - pen=penalty(q+r); - } else { - if (passive_pen_inter(cur_p)!=0) { - pen=passive_pen_inter(cur_p); - } else { - pen=inter_line_penalty; - } - } - q=club_penalties_ptr; - if (q!=null) { - r=cur_line-cur_list.pg_field; /* prevgraf */ - if (r>penalty(q)) - r=penalty(q); - pen += penalty(q+r); - } else if (cur_line==cur_list.pg_field+1) { /* prevgraf */ - pen += club_penalty; - } - if (d) - q = display_widow_penalties_ptr; - else - q = widow_penalties_ptr; - if (q!=null) { - r=best_line-cur_line-1; - if (r>penalty(q)) - r=penalty(q); - pen += penalty(q+r); - } else if (cur_line+2==best_line) { - if (d) - pen += display_widow_penalty; - else - pen += widow_penalty; - } - if (disc_break) { - if (passive_pen_broken(cur_p)!=0) { - pen += passive_pen_broken(cur_p); - } else { - pen += broken_penalty; - } - } - if (pen!=0) { - r=new_penalty(pen); - couple_nodes(cur_list.tail_field,r); - cur_list.tail_field=r; - } - } - /* /Append a penalty node, if a nonzero penalty is appropriate */ - - /* /Justify the line ending at breakpoint |cur_p|, and append it to the - current vertical list, together with associated penalties and other - insertions@>; */ - incr(cur_line); - cur_p=next_break(cur_p); - if (cur_p!=null && !post_disc_break) { - /* @; */ - /* Glue and penalty and kern and math nodes are deleted at the - beginning of a line, except in the anomalous case that the - node to be deleted is actually one of the chosen - breakpoints. Otherwise the pruning done here is designed to - match the lookahead computation in |try_break|, where the - |break_width| values are computed for non-discretionary - breakpoints. */ - r=temp_head; - while(1) { - q=vlink(r); - if (q==cur_break(cur_p) || is_char_node(q)) - break; - if (!((type(q)==whatsit_node)&&(subtype(q)==local_par_node))) { - if (non_discardable(q) - || (type(q)==kern_node && subtype(q)!=explicit )) - break; - } - r=q; - }; - if (r!=temp_head) { - vlink(r)=null; - flush_node_list(vlink(temp_head)); - try_couple_nodes(temp_head,q); - } - } - } while (cur_p!=null); - if ((cur_line!=best_line)||(vlink(temp_head)!=null)) - tconfusion("line breaking"); - cur_list.pg_field=best_line-1; /* prevgraf */ - cur_list.dirs_field=dir_ptr; /* dir_save */ - dir_ptr = null; -} + /* /Modify the end of the line to reflect the nature of the break and to + include \.{\\rightskip}; also set the proper value of |disc_break|; */ + + /* Put the \(l)\.{\\leftskip} glue at the left and detach this line; */ + /* The following code begins with |q| at the end of the list to be + justified. It ends with |q| at the beginning of that list, and with + |vlink(temp_head)| pointing to the remainder of the paragraph, if any. */ + r = vlink(q); + vlink(q) = null; + + q = vlink(temp_head); + try_couple_nodes(temp_head, r); + if (passive_left_box(cur_p) != null && passive_left_box(cur_p) != 0) { + /* omega bits: */ + r = copy_node_list(passive_left_box(cur_p)); + s = vlink(q); + vlink(r) = q; + q = r; + if ((cur_line == cur_list.pg_field + 1) && (s != null)) { + if (type(s) == hlist_node) { + if (list_ptr(s) == null) { + q = vlink(q); + vlink(r) = vlink(s); + vlink(s) = r; + } + } + } + } + /*at this point |q| is the leftmost node; all discardable nodes have been discarded */ + if (pdf_protrude_chars > 0) { + p = q; + p = find_protchar_left(p, false); /* no more discardables */ + w = char_pw(p, left_side); + if (w != 0) { + k = new_margin_kern(-w, last_leftmost_char, left_side); + vlink(k) = q; + q = k; + } + }; + if (left_skip != zero_glue) { + r = new_param_glue(left_skip_code); + vlink(r) = q; + q = r; + } + /* /Put the \(l)\.{\\leftskip} glue at the left and detach this line; */ + + /* Call the packaging subroutine, setting |just_box| to the justified box; */ + /* Now |q| points to the hlist that represents the current line of the + paragraph. We need to compute the appropriate line width, pack the + line into a box of this size, and shift the box by the appropriate + amount of indentation. */ + if (cur_line > last_special_line) { + cur_width = second_width; + cur_indent = second_indent; + } else if (par_shape_ptr == null) { + cur_width = first_width; + cur_indent = first_indent; + } else { + cur_indent = varmem[(par_shape_ptr + 2 * cur_line)].cint; + cur_width = varmem[(par_shape_ptr + 2 * cur_line + 1)].cint; + } + adjust_tail = adjust_head; + pack_direction = paragraph_dir; + pre_adjust_tail = pre_adjust_head; + if (pdf_adjust_spacing > 0) { + just_box = hpack(q, cur_width, cal_expand_ratio); + } else { + just_box = hpack(q, cur_width, exactly); + } + shift_amount(just_box) = cur_indent; + /* /Call the packaging subroutine, setting |just_box| to the justified box; */ + + /* Append the new box to the current vertical list, followed by the list of + special nodes taken out of the box by the packager; */ + if (pdf_each_line_height != 0) + height(just_box) = pdf_each_line_height; + if (pdf_each_line_depth != 0) + depth(just_box) = pdf_each_line_depth; + if ((pdf_first_line_height != 0) && (cur_line == cur_list.pg_field + 1)) + height(just_box) = pdf_first_line_height; + if ((pdf_last_line_depth != 0) && (cur_line + 1 == best_line)) + depth(just_box) = pdf_last_line_depth; + + if (pre_adjust_head != pre_adjust_tail) + append_list(pre_adjust_head, pre_adjust_tail); + pre_adjust_tail = null; + append_to_vlist(just_box); + if (adjust_head != adjust_tail) + append_list(adjust_head, adjust_tail); + adjust_tail = null; + + /* /Append the new box to the current vertical list, followed by the list of + special nodes taken out of the box by the packager; */ + + /* Append a penalty node, if a nonzero penalty is appropriate */ + /* Penalties between the lines of a paragraph come from club and widow lines, + from the |inter_line_penalty| parameter, and from lines that end at + discretionary breaks. Breaking between lines of a two-line paragraph gets + both club-line and widow-line penalties. The local variable |pen| will + be set to the sum of all relevant penalties for the current line, except + that the final line is never penalized. */ + if (cur_line + 1 != best_line) { + q = inter_line_penalties_ptr; + if (q != null) { + r = cur_line; + if (r > penalty(q)) + r = penalty(q); + pen = penalty(q + r); + } else { + if (passive_pen_inter(cur_p) != 0) { + pen = passive_pen_inter(cur_p); + } else { + pen = inter_line_penalty; + } + } + q = club_penalties_ptr; + if (q != null) { + r = cur_line - cur_list.pg_field; /* prevgraf */ + if (r > penalty(q)) + r = penalty(q); + pen += penalty(q + r); + } else if (cur_line == cur_list.pg_field + 1) { /* prevgraf */ + pen += club_penalty; + } + if (d) + q = display_widow_penalties_ptr; + else + q = widow_penalties_ptr; + if (q != null) { + r = best_line - cur_line - 1; + if (r > penalty(q)) + r = penalty(q); + pen += penalty(q + r); + } else if (cur_line + 2 == best_line) { + if (d) + pen += display_widow_penalty; + else + pen += widow_penalty; + } + if (disc_break) { + if (passive_pen_broken(cur_p) != 0) { + pen += passive_pen_broken(cur_p); + } else { + pen += broken_penalty; + } + } + if (pen != 0) { + r = new_penalty(pen); + couple_nodes(cur_list.tail_field, r); + cur_list.tail_field = r; + } + } + /* /Append a penalty node, if a nonzero penalty is appropriate */ + + /* /Justify the line ending at breakpoint |cur_p|, and append it to the + current vertical list, together with associated penalties and other + insertions@>; */ + incr(cur_line); + cur_p = next_break(cur_p); + if (cur_p != null && !post_disc_break) { + /* @; */ + /* Glue and penalty and kern and math nodes are deleted at the + beginning of a line, except in the anomalous case that the + node to be deleted is actually one of the chosen + breakpoints. Otherwise the pruning done here is designed to + match the lookahead computation in |try_break|, where the + |break_width| values are computed for non-discretionary + breakpoints. */ + r = temp_head; + while (1) { + q = vlink(r); + if (q == cur_break(cur_p) || is_char_node(q)) + break; + if (! + ((type(q) == whatsit_node) + && (subtype(q) == local_par_node))) { + if (non_discardable(q) + || (type(q) == kern_node && subtype(q) != explicit)) + break; + } + r = q; + }; + if (r != temp_head) { + vlink(r) = null; + flush_node_list(vlink(temp_head)); + try_couple_nodes(temp_head, q); + } + } + } while (cur_p != null); + if ((cur_line != best_line) || (vlink(temp_head) != null)) + tconfusion("line breaking"); + cur_list.pg_field = best_line - 1; /* prevgraf */ + cur_list.dirs_field = dir_ptr; /* dir_save */ + dir_ptr = null; +} diff --git a/Build/source/texk/web2c/luatexdir/tex/texnodes.c b/Build/source/texk/web2c/luatexdir/tex/texnodes.c index 06004160503..bb477e54ffb 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texnodes.c +++ b/Build/source/texk/web2c/luatexdir/tex/texnodes.c @@ -1,4 +1,4 @@ -/* $Id: texnodes.c 1103 2008-03-11 14:32:50Z taco $ */ +/* $Id: texnodes.c 1168 2008-04-15 13:43:34Z taco $ */ #include "luatex-api.h" #include @@ -15,19 +15,19 @@ char *varmem_sizes = NULL; halfword var_mem_max = 0; halfword rover = 0; -halfword free_chain[MAX_CHAIN_SIZE] = {null}; +halfword free_chain[MAX_CHAIN_SIZE] = { null }; -static int prealloc=0; +static int prealloc = 0; -int fix_node_lists=1; +int fix_node_lists = 1; int free_error_seen = 0; int copy_error_seen = 0; -halfword slow_get_node (integer s) ; /* defined below */ -int copy_error (halfword p) ; /* define below */ +halfword slow_get_node(integer s); /* defined below */ +int copy_error(halfword p); /* define below */ -#undef link /* defined by cpascal.h */ +#undef link /* defined by cpascal.h */ #define info(a) fixmem[(a)].hhlh #define link(a) fixmem[(a)].hhrh @@ -38,799 +38,892 @@ int copy_error (halfword p) ; /* define below */ #define variable_node_size 2 -char * node_fields_list [] = { "attr", "width", "depth", "height", "dir", "shift", - "glue_order", "glue_sign", "glue_set" , "list", NULL }; -char * node_fields_rule [] = { "attr", "width", "depth", "height", "dir", NULL }; -char * node_fields_insert [] = { "attr", "cost", "depth", "height", "spec", "list", NULL }; -char * node_fields_mark [] = { "attr", "class", "mark", NULL }; -char * node_fields_adjust [] = { "attr", "list", NULL }; -char * node_fields_disc [] = { "attr", "pre", "post", "replace", NULL }; -char * node_fields_math [] = { "attr", "surround", NULL }; -char * node_fields_glue [] = { "attr", "spec", "leader", NULL }; -char * node_fields_kern [] = { "attr", "kern", NULL }; -char * node_fields_penalty [] = { "attr", "penalty", NULL }; -char * node_fields_unset [] = { "attr", "width", "depth", "height", "dir", "shrink", - "glue_order", "glue_sign", "stretch" , "span", "list", NULL }; -char * node_fields_margin_kern [] = { "attr", "width", "glyph", NULL }; -char * node_fields_glyph [] = { "attr", "char", "font", "lang", "left", "right", "uchyph", - "components", "xoffset", "yoffset", NULL }; -char * node_fields_style [] = { NULL }; -char * node_fields_choice [] = { NULL }; -char * node_fields_ord [] = { NULL }; -char * node_fields_op [] = { NULL }; -char * node_fields_bin [] = { NULL }; -char * node_fields_rel [] = { NULL }; -char * node_fields_open [] = { NULL }; -char * node_fields_close [] = { NULL }; -char * node_fields_punct [] = { NULL }; -char * node_fields_inner [] = { NULL }; -char * node_fields_radical [] = { NULL }; -char * node_fields_fraction [] = { NULL }; -char * node_fields_under [] = { NULL }; -char * node_fields_over [] = { NULL }; -char * node_fields_accent [] = { NULL }; -char * node_fields_vcenter [] = { NULL }; -char * node_fields_left [] = { NULL }; -char * node_fields_right [] = { NULL }; - -char * node_fields_inserting [] = { "height", "last_ins_ptr", "best_ins_ptr", NULL}; - -char * node_fields_splitup [] = { "height", "last_ins_ptr", "best_ins_ptr", - "broken_ptr", "broken_ins", NULL}; - -char * node_fields_action [] = { "action_type", "named_id", "action_id", - "file", "new_window", "data", "ref_count", NULL }; -char * node_fields_attribute [] = { "number", "value", NULL }; -char * node_fields_glue_spec [] = { "width", "stretch", "shrink", - "stretch_order", "shrink_order", "ref_count", NULL }; -char * node_fields_attribute_list [] = { NULL }; - -char * node_fields_whatsit_open [] = { "attr", "stream", "name", "area", "ext", NULL }; -char * node_fields_whatsit_write [] = { "attr", "stream", "data", NULL }; -char * node_fields_whatsit_close [] = { "attr", "stream", NULL }; -char * node_fields_whatsit_special [] = { "attr", "data", NULL }; - -char * node_fields_whatsit_local_par [] = { "attr", "pen_inter", "pen_broken", "dir", - "box_left", "box_left_width", "box_right", "box_right_width", NULL }; -char * node_fields_whatsit_dir [] = { "attr", "dir", "level", "dvi_ptr", "dvi_h", NULL }; - -char * node_fields_whatsit_pdf_literal [] = { "attr", "mode", "data", NULL }; -char * node_fields_whatsit_pdf_refobj [] = { "attr", "objnum", NULL }; -char * node_fields_whatsit_pdf_refxform [] = { "attr", "width", "height", "depth", "objnum", NULL }; -char * node_fields_whatsit_pdf_refximage [] = { "attr", "width", "height", "depth", "objnum", NULL }; -char * node_fields_whatsit_pdf_annot [] = { "attr", "width", "height", "depth", "objnum", "data", NULL }; -char * node_fields_whatsit_pdf_start_link [] = { "attr", "width", "height", "depth", - "objnum", "link_attr", "action", NULL }; -char * node_fields_whatsit_pdf_end_link [] = { "attr", NULL }; -char * node_fields_whatsit_pdf_dest [] = { "attr", "width", "height", "depth", - "named_id", "dest_id", "dest_type", "xyz_zoom", "objnum", NULL }; -char * node_fields_whatsit_pdf_thread [] = { "attr", "width", "height", "depth", - "named_id", "thread_id", "thread_attr", NULL }; -char * node_fields_whatsit_pdf_start_thread [] = { "attr", "width", "height", "depth", - "named_id", "thread_id", "thread_attr", NULL }; -char * node_fields_whatsit_pdf_end_thread [] = { "attr", NULL }; -char * node_fields_whatsit_pdf_save_pos [] = { "attr", NULL }; -char * node_fields_whatsit_late_lua [] = { "attr", "reg", "data", NULL }; -char * node_fields_whatsit_close_lua [] = { "attr", "reg", NULL }; -char * node_fields_whatsit_pdf_colorstack [] = { "attr", "stack", "cmd", "data", NULL }; -char * node_fields_whatsit_pdf_setmatrix [] = { "attr", "data", NULL }; -char * node_fields_whatsit_pdf_save [] = { "attr", NULL }; -char * node_fields_whatsit_pdf_restore [] = { "attr", NULL }; -char * node_fields_whatsit_cancel_boundary [] = { "attr", NULL }; -char * node_fields_whatsit_user_defined [] = { "attr", "user_id", "type", "value", NULL }; +char *node_fields_list[] = { "attr", "width", "depth", "height", "dir", "shift", + "glue_order", "glue_sign", "glue_set", "list", NULL +}; +char *node_fields_rule[] = { "attr", "width", "depth", "height", "dir", NULL }; +char *node_fields_insert[] = + { "attr", "cost", "depth", "height", "spec", "list", NULL }; +char *node_fields_mark[] = { "attr", "class", "mark", NULL }; +char *node_fields_adjust[] = { "attr", "list", NULL }; +char *node_fields_disc[] = { "attr", "pre", "post", "replace", NULL }; +char *node_fields_math[] = { "attr", "surround", NULL }; +char *node_fields_glue[] = { "attr", "spec", "leader", NULL }; +char *node_fields_kern[] = { "attr", "kern", NULL }; +char *node_fields_penalty[] = { "attr", "penalty", NULL }; +char *node_fields_unset[] = + { "attr", "width", "depth", "height", "dir", "shrink", + "glue_order", "glue_sign", "stretch", "span", "list", NULL +}; +char *node_fields_margin_kern[] = { "attr", "width", "glyph", NULL }; +char *node_fields_glyph[] = + { "attr", "char", "font", "lang", "left", "right", "uchyph", + "components", "xoffset", "yoffset", NULL +}; +char *node_fields_style[] = { NULL }; +char *node_fields_choice[] = { NULL }; +char *node_fields_ord[] = { NULL }; +char *node_fields_op[] = { NULL }; +char *node_fields_bin[] = { NULL }; +char *node_fields_rel[] = { NULL }; +char *node_fields_open[] = { NULL }; +char *node_fields_close[] = { NULL }; +char *node_fields_punct[] = { NULL }; +char *node_fields_inner[] = { NULL }; +char *node_fields_radical[] = { NULL }; +char *node_fields_fraction[] = { NULL }; +char *node_fields_under[] = { NULL }; +char *node_fields_over[] = { NULL }; +char *node_fields_accent[] = { NULL }; +char *node_fields_vcenter[] = { NULL }; +char *node_fields_left[] = { NULL }; +char *node_fields_right[] = { NULL }; + +char *node_fields_inserting[] = + { "height", "last_ins_ptr", "best_ins_ptr", NULL }; + +char *node_fields_splitup[] = { "height", "last_ins_ptr", "best_ins_ptr", + "broken_ptr", "broken_ins", NULL +}; + +char *node_fields_action[] = { "action_type", "named_id", "action_id", + "file", "new_window", "data", "ref_count", NULL +}; +char *node_fields_attribute[] = { "number", "value", NULL }; +char *node_fields_glue_spec[] = { "width", "stretch", "shrink", + "stretch_order", "shrink_order", "ref_count", NULL +}; +char *node_fields_attribute_list[] = { NULL }; + +char *node_fields_whatsit_open[] = + { "attr", "stream", "name", "area", "ext", NULL }; +char *node_fields_whatsit_write[] = { "attr", "stream", "data", NULL }; +char *node_fields_whatsit_close[] = { "attr", "stream", NULL }; +char *node_fields_whatsit_special[] = { "attr", "data", NULL }; + +char *node_fields_whatsit_local_par[] = + { "attr", "pen_inter", "pen_broken", "dir", + "box_left", "box_left_width", "box_right", "box_right_width", NULL +}; +char *node_fields_whatsit_dir[] = + { "attr", "dir", "level", "dvi_ptr", "dvi_h", NULL }; + +char *node_fields_whatsit_pdf_literal[] = { "attr", "mode", "data", NULL }; +char *node_fields_whatsit_pdf_refobj[] = { "attr", "objnum", NULL }; +char *node_fields_whatsit_pdf_refxform[] = + { "attr", "width", "height", "depth", "objnum", NULL }; +char *node_fields_whatsit_pdf_refximage[] = + { "attr", "width", "height", "depth", "objnum", NULL }; +char *node_fields_whatsit_pdf_annot[] = + { "attr", "width", "height", "depth", "objnum", "data", NULL }; +char *node_fields_whatsit_pdf_start_link[] = + { "attr", "width", "height", "depth", + "objnum", "link_attr", "action", NULL +}; +char *node_fields_whatsit_pdf_end_link[] = { "attr", NULL }; +char *node_fields_whatsit_pdf_dest[] = { "attr", "width", "height", "depth", + "named_id", "dest_id", "dest_type", "xyz_zoom", "objnum", NULL +}; +char *node_fields_whatsit_pdf_thread[] = { "attr", "width", "height", "depth", + "named_id", "thread_id", "thread_attr", NULL +}; +char *node_fields_whatsit_pdf_start_thread[] = + { "attr", "width", "height", "depth", + "named_id", "thread_id", "thread_attr", NULL +}; +char *node_fields_whatsit_pdf_end_thread[] = { "attr", NULL }; +char *node_fields_whatsit_pdf_save_pos[] = { "attr", NULL }; +char *node_fields_whatsit_late_lua[] = { "attr", "reg", "data", NULL }; +char *node_fields_whatsit_close_lua[] = { "attr", "reg", NULL }; +char *node_fields_whatsit_pdf_colorstack[] = + { "attr", "stack", "cmd", "data", NULL }; +char *node_fields_whatsit_pdf_setmatrix[] = { "attr", "data", NULL }; +char *node_fields_whatsit_pdf_save[] = { "attr", NULL }; +char *node_fields_whatsit_pdf_restore[] = { "attr", NULL }; +char *node_fields_whatsit_cancel_boundary[] = { "attr", NULL }; +char *node_fields_whatsit_user_defined[] = + { "attr", "user_id", "type", "value", NULL }; node_info node_data[] = { - { hlist_node, box_node_size, node_fields_list, "hlist" }, - { vlist_node, box_node_size, node_fields_list, "vlist" }, - { rule_node, rule_node_size, node_fields_rule, "rule" }, - { ins_node, ins_node_size, node_fields_insert, "ins" }, - { mark_node, mark_node_size, node_fields_mark, "mark" }, - { adjust_node, adjust_node_size, node_fields_adjust, "adjust" }, - { fake_node, fake_node_size, NULL, fake_node_name }, /* don't touch this! */ - { disc_node, disc_node_size, node_fields_disc, "disc" }, - { whatsit_node, -1, NULL, "whatsit" }, - { math_node, math_node_size, node_fields_math, "math" }, - { glue_node, glue_node_size, node_fields_glue, "glue" }, - { kern_node, kern_node_size, node_fields_kern, "kern" }, - { penalty_node, penalty_node_size, node_fields_penalty, "penalty" }, - { unset_node, box_node_size, node_fields_unset, "unset" }, - { style_node, style_node_size, node_fields_style, "style" }, - { choice_node, style_node_size, node_fields_choice, "choice" }, - { ord_noad, noad_size, node_fields_ord, "ord" }, - { op_noad, noad_size, node_fields_op, "op" }, - { bin_noad, noad_size, node_fields_bin, "bin" }, - { rel_noad, noad_size, node_fields_rel, "rel" }, - { open_noad, noad_size, node_fields_open, "open" }, - { close_noad, noad_size, node_fields_close, "close" }, - { punct_noad, noad_size, node_fields_punct, "punct" }, - { inner_noad, noad_size, node_fields_inner, "inner" }, - { radical_noad, radical_noad_size, node_fields_radical, "radical" }, - { fraction_noad, fraction_noad_size, node_fields_fraction, "fraction" }, - { under_noad, noad_size, node_fields_under, "under" }, - { over_noad, noad_size, node_fields_over, "over" }, - { accent_noad, accent_noad_size, node_fields_accent, "accent" }, - { vcenter_noad, noad_size, node_fields_vcenter, "vcenter" }, - { left_noad, noad_size, node_fields_left, "left" }, - { right_noad, noad_size, node_fields_right, "right" }, - { margin_kern_node, margin_kern_node_size, node_fields_margin_kern, "margin_kern" }, - { glyph_node, glyph_node_size, node_fields_glyph, "glyph" }, /* 33 */ - { align_record_node, box_node_size, NULL, "align_record" }, - { pseudo_file_node, pseudo_file_node_size, NULL, "pseudo_file" }, - { pseudo_line_node, variable_node_size, NULL, "pseudo_line" }, - { inserting_node, page_ins_node_size, node_fields_inserting, "page_insert" }, - { split_up_node, page_ins_node_size, node_fields_splitup, "split_insert" }, - { expr_node, expr_node_size, NULL, "expr_stack" }, - { nesting_node, nesting_node_size, NULL, "nested_list" }, /* 40 */ - { span_node, span_node_size, NULL, "span" }, - { attribute_node, attribute_node_size, node_fields_attribute, "attribute" }, - { glue_spec_node, glue_spec_size, node_fields_glue_spec, "glue_spec" }, - { attribute_list_node, attribute_node_size, node_fields_attribute_list,"attribute_list" }, - { action_node, pdf_action_size, node_fields_action, "action" }, - { temp_node, temp_node_size, NULL, "temp" }, - { align_stack_node, align_stack_node_size, NULL, "align_stack" }, - { movement_node, movement_node_size, NULL, "movement_stack" }, - { if_node, if_node_size, NULL, "if_stack" }, - { unhyphenated_node, active_node_size, NULL, "unhyphenated" }, /* 50 */ - { hyphenated_node, active_node_size, NULL, "hyphenated" }, - { delta_node, delta_node_size, NULL, "delta" }, - { passive_node, passive_node_size, NULL, "passive" }, - { shape_node, variable_node_size, NULL, "shape" }, - { -1, -1, NULL, NULL }}; + {hlist_node, box_node_size, node_fields_list, "hlist"}, + {vlist_node, box_node_size, node_fields_list, "vlist"}, + {rule_node, rule_node_size, node_fields_rule, "rule"}, + {ins_node, ins_node_size, node_fields_insert, "ins"}, + {mark_node, mark_node_size, node_fields_mark, "mark"}, + {adjust_node, adjust_node_size, node_fields_adjust, "adjust"}, + {fake_node, fake_node_size, NULL, fake_node_name}, /* don't touch this! */ + {disc_node, disc_node_size, node_fields_disc, "disc"}, + {whatsit_node, -1, NULL, "whatsit"}, + {math_node, math_node_size, node_fields_math, "math"}, + {glue_node, glue_node_size, node_fields_glue, "glue"}, + {kern_node, kern_node_size, node_fields_kern, "kern"}, + {penalty_node, penalty_node_size, node_fields_penalty, "penalty"}, + {unset_node, box_node_size, node_fields_unset, "unset"}, + {style_node, style_node_size, node_fields_style, "style"}, + {choice_node, style_node_size, node_fields_choice, "choice"}, + {ord_noad, noad_size, node_fields_ord, "ord"}, + {op_noad, noad_size, node_fields_op, "op"}, + {bin_noad, noad_size, node_fields_bin, "bin"}, + {rel_noad, noad_size, node_fields_rel, "rel"}, + {open_noad, noad_size, node_fields_open, "open"}, + {close_noad, noad_size, node_fields_close, "close"}, + {punct_noad, noad_size, node_fields_punct, "punct"}, + {inner_noad, noad_size, node_fields_inner, "inner"}, + {radical_noad, radical_noad_size, node_fields_radical, "radical"}, + {fraction_noad, fraction_noad_size, node_fields_fraction, "fraction"}, + {under_noad, noad_size, node_fields_under, "under"}, + {over_noad, noad_size, node_fields_over, "over"}, + {accent_noad, accent_noad_size, node_fields_accent, "accent"}, + {vcenter_noad, noad_size, node_fields_vcenter, "vcenter"}, + {left_noad, noad_size, node_fields_left, "left"}, + {right_noad, noad_size, node_fields_right, "right"}, + {margin_kern_node, margin_kern_node_size, node_fields_margin_kern, + "margin_kern"}, + {glyph_node, glyph_node_size, node_fields_glyph, "glyph"}, /* 33 */ + {align_record_node, box_node_size, NULL, "align_record"}, + {pseudo_file_node, pseudo_file_node_size, NULL, "pseudo_file"}, + {pseudo_line_node, variable_node_size, NULL, "pseudo_line"}, + {inserting_node, page_ins_node_size, node_fields_inserting, "page_insert"}, + {split_up_node, page_ins_node_size, node_fields_splitup, "split_insert"}, + {expr_node, expr_node_size, NULL, "expr_stack"}, + {nesting_node, nesting_node_size, NULL, "nested_list"}, /* 40 */ + {span_node, span_node_size, NULL, "span"}, + {attribute_node, attribute_node_size, node_fields_attribute, "attribute"}, + {glue_spec_node, glue_spec_size, node_fields_glue_spec, "glue_spec"}, + {attribute_list_node, attribute_node_size, node_fields_attribute_list, + "attribute_list"}, + {action_node, pdf_action_size, node_fields_action, "action"}, + {temp_node, temp_node_size, NULL, "temp"}, + {align_stack_node, align_stack_node_size, NULL, "align_stack"}, + {movement_node, movement_node_size, NULL, "movement_stack"}, + {if_node, if_node_size, NULL, "if_stack"}, + {unhyphenated_node, active_node_size, NULL, "unhyphenated"}, /* 50 */ + {hyphenated_node, active_node_size, NULL, "hyphenated"}, + {delta_node, delta_node_size, NULL, "delta"}, + {passive_node, passive_node_size, NULL, "passive"}, + {shape_node, variable_node_size, NULL, "shape"}, + {-1, -1, NULL, NULL} +}; #define last_normal_node shape_node node_info whatsit_node_data[] = { - { open_node, open_node_size, node_fields_whatsit_open, "open" }, - { write_node, write_node_size, node_fields_whatsit_write, "write" }, - { close_node, close_node_size, node_fields_whatsit_close, "close" }, - { special_node, special_node_size, node_fields_whatsit_special, "special" }, - { fake_node, fake_node_size, NULL, fake_node_name }, - { fake_node, fake_node_size, NULL, fake_node_name }, - { local_par_node, local_par_size, node_fields_whatsit_local_par, "local_par" }, - { dir_node, dir_node_size, node_fields_whatsit_dir, "dir" }, - { pdf_literal_node, write_node_size, node_fields_whatsit_pdf_literal, "pdf_literal" }, - { fake_node, fake_node_size, NULL, fake_node_name }, - { pdf_refobj_node, pdf_refobj_node_size, node_fields_whatsit_pdf_refobj, "pdf_refobj" }, - { fake_node, fake_node_size, NULL, fake_node_name }, - { pdf_refxform_node, pdf_refxform_node_size, node_fields_whatsit_pdf_refxform, "pdf_refxform" }, - { fake_node, fake_node_size, NULL, fake_node_name }, - { pdf_refximage_node, pdf_refximage_node_size, node_fields_whatsit_pdf_refximage, "pdf_refximage" }, - { pdf_annot_node, pdf_annot_node_size, node_fields_whatsit_pdf_annot, "pdf_annot" }, - { pdf_start_link_node, pdf_annot_node_size, node_fields_whatsit_pdf_start_link, "pdf_start_link" }, - { pdf_end_link_node, pdf_end_link_node_size, node_fields_whatsit_pdf_end_link, "pdf_end_link" }, - { fake_node, fake_node_size, NULL, fake_node_name }, - { pdf_dest_node, pdf_dest_node_size, node_fields_whatsit_pdf_dest, "pdf_dest" }, - { pdf_thread_node, pdf_thread_node_size, node_fields_whatsit_pdf_thread, "pdf_thread" }, - { pdf_start_thread_node, pdf_thread_node_size, node_fields_whatsit_pdf_start_thread,"pdf_start_thread"}, - { pdf_end_thread_node, pdf_end_thread_node_size, node_fields_whatsit_pdf_end_thread, "pdf_end_thread" }, - { pdf_save_pos_node, pdf_save_pos_node_size, node_fields_whatsit_pdf_save_pos, "pdf_save_pos" }, - { pdf_thread_data_node, pdf_thread_node_size, NULL, "pdf_thread_data" }, - { pdf_link_data_node, pdf_annot_node_size, NULL, "pdf_link_data" }, - { fake_node, fake_node_size, NULL, fake_node_name }, - { fake_node, fake_node_size, NULL, fake_node_name }, - { fake_node, fake_node_size, NULL, fake_node_name }, - { fake_node, fake_node_size, NULL, fake_node_name }, - { fake_node, fake_node_size, NULL, fake_node_name }, - { fake_node, fake_node_size, NULL, fake_node_name }, - { fake_node, fake_node_size, NULL, fake_node_name }, - { fake_node, fake_node_size, NULL, fake_node_name }, - { fake_node, fake_node_size, NULL, fake_node_name }, - { late_lua_node, write_node_size, node_fields_whatsit_late_lua, "late_lua" }, - { close_lua_node, write_node_size, node_fields_whatsit_close_lua, "close_lua" }, - { fake_node, fake_node_size, NULL, fake_node_name }, - { fake_node, fake_node_size, NULL, fake_node_name }, - { pdf_colorstack_node, pdf_colorstack_node_size, node_fields_whatsit_pdf_colorstack, "pdf_colorstack" }, - { pdf_setmatrix_node, pdf_setmatrix_node_size, node_fields_whatsit_pdf_setmatrix, "pdf_setmatrix" }, - { pdf_save_node, pdf_save_node_size, node_fields_whatsit_pdf_save, "pdf_save" }, - { pdf_restore_node, pdf_restore_node_size, node_fields_whatsit_pdf_restore, "pdf_restore" }, - { cancel_boundary_node, cancel_boundary_size, node_fields_whatsit_cancel_boundary, "cancel_boundary" }, - { user_defined_node, user_defined_node_size, node_fields_whatsit_user_defined, "user_defined" }, - { -1, -1, NULL, NULL }}; + {open_node, open_node_size, node_fields_whatsit_open, "open"}, + {write_node, write_node_size, node_fields_whatsit_write, "write"}, + {close_node, close_node_size, node_fields_whatsit_close, "close"}, + {special_node, special_node_size, node_fields_whatsit_special, "special"}, + {fake_node, fake_node_size, NULL, fake_node_name}, + {fake_node, fake_node_size, NULL, fake_node_name}, + {local_par_node, local_par_size, node_fields_whatsit_local_par, + "local_par"}, + {dir_node, dir_node_size, node_fields_whatsit_dir, "dir"}, + {pdf_literal_node, write_node_size, node_fields_whatsit_pdf_literal, + "pdf_literal"}, + {fake_node, fake_node_size, NULL, fake_node_name}, + {pdf_refobj_node, pdf_refobj_node_size, node_fields_whatsit_pdf_refobj, + "pdf_refobj"}, + {fake_node, fake_node_size, NULL, fake_node_name}, + {pdf_refxform_node, pdf_refxform_node_size, + node_fields_whatsit_pdf_refxform, "pdf_refxform"}, + {fake_node, fake_node_size, NULL, fake_node_name}, + {pdf_refximage_node, pdf_refximage_node_size, + node_fields_whatsit_pdf_refximage, "pdf_refximage"}, + {pdf_annot_node, pdf_annot_node_size, node_fields_whatsit_pdf_annot, + "pdf_annot"}, + {pdf_start_link_node, pdf_annot_node_size, + node_fields_whatsit_pdf_start_link, "pdf_start_link"}, + {pdf_end_link_node, pdf_end_link_node_size, + node_fields_whatsit_pdf_end_link, "pdf_end_link"}, + {fake_node, fake_node_size, NULL, fake_node_name}, + {pdf_dest_node, pdf_dest_node_size, node_fields_whatsit_pdf_dest, + "pdf_dest"}, + {pdf_thread_node, pdf_thread_node_size, node_fields_whatsit_pdf_thread, + "pdf_thread"}, + {pdf_start_thread_node, pdf_thread_node_size, + node_fields_whatsit_pdf_start_thread, "pdf_start_thread"}, + {pdf_end_thread_node, pdf_end_thread_node_size, + node_fields_whatsit_pdf_end_thread, "pdf_end_thread"}, + {pdf_save_pos_node, pdf_save_pos_node_size, + node_fields_whatsit_pdf_save_pos, "pdf_save_pos"}, + {pdf_thread_data_node, pdf_thread_node_size, NULL, "pdf_thread_data"}, + {pdf_link_data_node, pdf_annot_node_size, NULL, "pdf_link_data"}, + {fake_node, fake_node_size, NULL, fake_node_name}, + {fake_node, fake_node_size, NULL, fake_node_name}, + {fake_node, fake_node_size, NULL, fake_node_name}, + {fake_node, fake_node_size, NULL, fake_node_name}, + {fake_node, fake_node_size, NULL, fake_node_name}, + {fake_node, fake_node_size, NULL, fake_node_name}, + {fake_node, fake_node_size, NULL, fake_node_name}, + {fake_node, fake_node_size, NULL, fake_node_name}, + {fake_node, fake_node_size, NULL, fake_node_name}, + {late_lua_node, write_node_size, node_fields_whatsit_late_lua, "late_lua"}, + {close_lua_node, write_node_size, node_fields_whatsit_close_lua, + "close_lua"}, + {fake_node, fake_node_size, NULL, fake_node_name}, + {fake_node, fake_node_size, NULL, fake_node_name}, + {pdf_colorstack_node, pdf_colorstack_node_size, + node_fields_whatsit_pdf_colorstack, "pdf_colorstack"}, + {pdf_setmatrix_node, pdf_setmatrix_node_size, + node_fields_whatsit_pdf_setmatrix, "pdf_setmatrix"}, + {pdf_save_node, pdf_save_node_size, node_fields_whatsit_pdf_save, + "pdf_save"}, + {pdf_restore_node, pdf_restore_node_size, node_fields_whatsit_pdf_restore, + "pdf_restore"}, + {cancel_boundary_node, cancel_boundary_size, + node_fields_whatsit_cancel_boundary, "cancel_boundary"}, + {user_defined_node, user_defined_node_size, + node_fields_whatsit_user_defined, "user_defined"}, + {-1, -1, NULL, NULL} +}; #define last_whatsit_node user_defined_node #define get_node_size(i,j) (i!=whatsit_node ? node_data[i].size : whatsit_node_data[j].size) #define get_node_name(i,j) (i!=whatsit_node ? node_data[i].name : whatsit_node_data[j].name) -halfword -new_node(int i, int j) { - register int s; - register halfword n; - s = get_node_size(i,j); - n = get_node(s); - /* it should be possible to do this memset at free_node() */ - /* type() and subtype() will be set below, and vlink() is - set to null by get_node(), so we can do we clearing one - word less than |s| */ - (void)memset((void *)(varmem+n+1),0, (sizeof(memory_word)*(s-1))); - switch (i) { - case glyph_node: - init_lang_data(n); - break; - case glue_node: - case kern_node: - case glue_spec_node: - break; - case hlist_node: - case vlist_node: - box_dir(n)=-1; - break; - case whatsit_node: - if (j==open_node) { - open_name(n) = get_nullstr(); - open_area(n) = open_name(n); - open_ext(n) = open_name(n); +halfword new_node(int i, int j) +{ + register int s; + register halfword n; + s = get_node_size(i, j); + n = get_node(s); + /* it should be possible to do this memset at free_node() */ + /* type() and subtype() will be set below, and vlink() is + set to null by get_node(), so we can do we clearing one + word less than |s| */ + (void) memset((void *) (varmem + n + 1), 0, + (sizeof(memory_word) * (s - 1))); + switch (i) { + case glyph_node: + init_lang_data(n); + break; + case glue_node: + case kern_node: + case glue_spec_node: + break; + case hlist_node: + case vlist_node: + box_dir(n) = -1; + break; + case whatsit_node: + if (j == open_node) { + open_name(n) = get_nullstr(); + open_area(n) = open_name(n); + open_ext(n) = open_name(n); + } + break; + case disc_node: + pre_break(n) = pre_break_head(n); + type(pre_break(n)) = nesting_node; + subtype(pre_break(n)) = pre_break_head(0); + post_break(n) = post_break_head(n); + type(post_break(n)) = nesting_node; + subtype(post_break(n)) = post_break_head(0); + no_break(n) = no_break_head(n); + type(no_break(n)) = nesting_node; + subtype(no_break(n)) = no_break_head(0); + break; + case rule_node: + depth(n) = null_flag; + height(n) = null_flag; + rule_dir(n) = -1; + /* fall through */ + case unset_node: + width(n) = null_flag; + break; + case pseudo_line_node: + case shape_node: + /* this is a trick that makes pseudo_files slightly slower, + * but the overall allocation faster then an explicit test + * at the top of new_node(). + */ + free_node(n, variable_node_size); + n = slow_get_node(j); + (void) memset((void *) (varmem + n + 1), 0, + (sizeof(memory_word) * (j - 1))); + break; + default: + break; + } + if (nodetype_has_attributes(i)) { + build_attribute_list(n); } - break; - case disc_node: - pre_break(n)=pre_break_head(n); - type(pre_break(n))= nesting_node; - subtype(pre_break(n))=pre_break_head(0); - post_break(n)=post_break_head(n); - type(post_break(n))= nesting_node; - subtype(post_break(n))=post_break_head(0); - no_break(n)=no_break_head(n); - type(no_break(n))= nesting_node; - subtype(no_break(n))=no_break_head(0); - break; - case rule_node: - depth(n)=null_flag; - height(n)=null_flag; - rule_dir(n)=-1; - /* fall through */ - case unset_node: - width(n) = null_flag; - break; - case pseudo_line_node: - case shape_node: - /* this is a trick that makes pseudo_files slightly slower, - * but the overall allocation faster then an explicit test - * at the top of new_node(). - */ - free_node(n,variable_node_size); - n = slow_get_node(j); - (void)memset((void *)(varmem+n+1),0, (sizeof(memory_word)*(j-1))); - break; - default: - break; - } - if (nodetype_has_attributes(i)) { - build_attribute_list(n); - } - type(n)=i; - subtype(n)=j; - return n; + type(n) = i; + subtype(n) = j; + return n; } -halfword -raw_glyph_node(void) { - register halfword n; - n = get_node(glyph_node_size); - (void)memset((void *)(varmem+n+1),0, (sizeof(memory_word)*(glyph_node_size-1))); - type(n)=glyph_node; - subtype(n)=0; - return n; +halfword raw_glyph_node(void) +{ + register halfword n; + n = get_node(glyph_node_size); + (void) memset((void *) (varmem + n + 1), 0, + (sizeof(memory_word) * (glyph_node_size - 1))); + type(n) = glyph_node; + subtype(n) = 0; + return n; } -halfword -new_glyph_node(void) { - register halfword n; - n = get_node(glyph_node_size); - (void)memset((void *)(varmem+n+1),0, (sizeof(memory_word)*(glyph_node_size-1))); - type(n)=glyph_node; - subtype(n)=0; - build_attribute_list(n); - return n; +halfword new_glyph_node(void) +{ + register halfword n; + n = get_node(glyph_node_size); + (void) memset((void *) (varmem + n + 1), 0, + (sizeof(memory_word) * (glyph_node_size - 1))); + type(n) = glyph_node; + subtype(n) = 0; + build_attribute_list(n); + return n; } /* makes a duplicate of the node list that starts at |p| and returns a pointer to the new list */ -halfword -copy_node_list(halfword p) { - halfword q; /* previous position in new list */ - halfword h = null; /* head of the list */ - copy_error_seen = 0; - while (p!=null) { - register halfword s = copy_node(p); - if (h==null) { - h = s; - } else { - couple_nodes(q,s); +halfword copy_node_list(halfword p) +{ + halfword q; /* previous position in new list */ + halfword h = null; /* head of the list */ + copy_error_seen = 0; + while (p != null) { + register halfword s = copy_node(p); + if (h == null) { + h = s; + } else { + couple_nodes(q, s); + } + q = s; + p = vlink(p); } - q=s; - p=vlink(p); - } - return h; + return h; } /* make a dupe of a single node */ -halfword -copy_node(const halfword p) { - halfword r; /* current node being fabricated for new list */ - register halfword s; /* a helper variable for copying into variable mem */ - register int i; - if (copy_error(p)) { - r = new_node(temp_node,0); - return r; - } - i = get_node_size(type(p), subtype(p)); - r = get_node(i); - (void)memcpy((void *)(varmem+r),(void *)(varmem+p),(sizeof(memory_word)*i)); - - if (nodetype_has_attributes(type(p))) { - add_node_attr_ref(node_attr(p)); - alink(r)=null; /* needs checking */ - } - vlink(r)=null; - switch (type(p)) { - case glyph_node: - s=copy_node_list(lig_ptr(p)); - lig_ptr(r)=s; - break; - case glue_node: - add_glue_ref(glue_ptr(p)); - s=copy_node_list(leader_ptr(p)); - leader_ptr(r)=s; - break; - case hlist_node: - case vlist_node: - case unset_node: - s=copy_node_list(list_ptr(p)); - list_ptr(r)=s; - break; - case ins_node: - add_glue_ref(split_top_ptr(p)); - s=copy_node_list(ins_ptr(p)); - ins_ptr(r)=s; - break; - case margin_kern_node: - s=copy_node(margin_char(p)); - margin_char(r)=s; - break; - case disc_node: - pre_break(r)=pre_break_head(r); - if (vlink_pre_break(p)!=null) { - s=copy_node_list(vlink_pre_break(p)); - alink(s)=pre_break(r); - tlink_pre_break(r)=tail_of_list(s); - vlink_pre_break(r)=s; - } else { - assert(tlink(pre_break(r))==null); - } - post_break(r)=post_break_head(r); - if (vlink_post_break(p)!=null) { - s=copy_node_list(vlink_post_break(p)); - alink(s)=post_break(r); - tlink_post_break(r)=tail_of_list(s); - vlink_post_break(r)=s; - } else { - assert(tlink_post_break(r)==null); +halfword copy_node(const halfword p) +{ + halfword r; /* current node being fabricated for new list */ + register halfword s; /* a helper variable for copying into variable mem */ + register int i; + if (copy_error(p)) { + r = new_node(temp_node, 0); + return r; } - no_break(r)=no_break_head(r); - if (vlink(no_break(p))!=null) { - s=copy_node_list(vlink_no_break(p)); - alink(s)=no_break(r); - tlink_no_break(r)=tail_of_list(s); - vlink_no_break(r)=s; - } else { - assert(tlink_no_break(r)==null); + i = get_node_size(type(p), subtype(p)); + r = get_node(i); + (void) memcpy((void *) (varmem + r), (void *) (varmem + p), + (sizeof(memory_word) * i)); + + if (nodetype_has_attributes(type(p))) { + add_node_attr_ref(node_attr(p)); + alink(r) = null; /* needs checking */ } - break; - case mark_node: - add_token_ref(mark_ptr(p)); - break; - case adjust_node: - s=copy_node_list(adjust_ptr(p)); - adjust_ptr(r)=s; - break; - case glue_spec_node: - glue_ref_count(r)=null; - break; - case whatsit_node: - switch (subtype(p)) { - case dir_node: - case local_par_node: - break; - case write_node: - case special_node: - add_token_ref(write_tokens(p)); - break; - case pdf_literal_node: - add_token_ref(pdf_literal_data(p)); - break; - case pdf_colorstack_node: - if (pdf_colorstack_cmd(p) <= colorstack_data) - add_token_ref(pdf_colorstack_data(p)); - break; - case pdf_setmatrix_node: - add_token_ref(pdf_setmatrix_data(p)); - break; - case late_lua_node: - add_token_ref(late_lua_data(p)); - break; - case pdf_annot_node: - add_token_ref(pdf_annot_data(p)); - break; - case pdf_start_link_node: - if (pdf_link_attr(r) != null) - add_token_ref(pdf_link_attr(r)); - add_action_ref(pdf_link_action(r)); - break; - case pdf_dest_node: - if (pdf_dest_named_id(p) > 0) - add_token_ref(pdf_dest_id(p)); - break; - case pdf_thread_node: - case pdf_start_thread_node: - if (pdf_thread_named_id(p) > 0) - add_token_ref(pdf_thread_id(p)); - if (pdf_thread_attr(p) != null) - add_token_ref(pdf_thread_attr(p)); - break; - case user_defined_node: - switch (user_node_type(p)) { - case 'a': add_node_attr_ref(user_node_value(p)); + vlink(r) = null; + switch (type(p)) { + case glyph_node: + s = copy_node_list(lig_ptr(p)); + lig_ptr(r) = s; + break; + case glue_node: + add_glue_ref(glue_ptr(p)); + s = copy_node_list(leader_ptr(p)); + leader_ptr(r) = s; break; - case 't': add_token_ref(user_node_value(p)); + case hlist_node: + case vlist_node: + case unset_node: + s = copy_node_list(list_ptr(p)); + list_ptr(r) = s; + break; + case ins_node: + add_glue_ref(split_top_ptr(p)); + s = copy_node_list(ins_ptr(p)); + ins_ptr(r) = s; + break; + case margin_kern_node: + s = copy_node(margin_char(p)); + margin_char(r) = s; + break; + case disc_node: + pre_break(r) = pre_break_head(r); + if (vlink_pre_break(p) != null) { + s = copy_node_list(vlink_pre_break(p)); + alink(s) = pre_break(r); + tlink_pre_break(r) = tail_of_list(s); + vlink_pre_break(r) = s; + } else { + assert(tlink(pre_break(r)) == null); + } + post_break(r) = post_break_head(r); + if (vlink_post_break(p) != null) { + s = copy_node_list(vlink_post_break(p)); + alink(s) = post_break(r); + tlink_post_break(r) = tail_of_list(s); + vlink_post_break(r) = s; + } else { + assert(tlink_post_break(r) == null); + } + no_break(r) = no_break_head(r); + if (vlink(no_break(p)) != null) { + s = copy_node_list(vlink_no_break(p)); + alink(s) = no_break(r); + tlink_no_break(r) = tail_of_list(s); + vlink_no_break(r) = s; + } else { + assert(tlink_no_break(r) == null); + } break; - case 'n': - s=copy_node_list(user_node_value(p)); - user_node_value(r)=s; + case mark_node: + add_token_ref(mark_ptr(p)); + break; + case adjust_node: + s = copy_node_list(adjust_ptr(p)); + adjust_ptr(r) = s; + break; + case glue_spec_node: + glue_ref_count(r) = null; + break; + case whatsit_node: + switch (subtype(p)) { + case dir_node: + case local_par_node: + break; + case write_node: + case special_node: + add_token_ref(write_tokens(p)); + break; + case pdf_literal_node: + add_token_ref(pdf_literal_data(p)); + break; + case pdf_colorstack_node: + if (pdf_colorstack_cmd(p) <= colorstack_data) + add_token_ref(pdf_colorstack_data(p)); + break; + case pdf_setmatrix_node: + add_token_ref(pdf_setmatrix_data(p)); + break; + case late_lua_node: + add_token_ref(late_lua_data(p)); + break; + case pdf_annot_node: + add_token_ref(pdf_annot_data(p)); + break; + case pdf_start_link_node: + if (pdf_link_attr(r) != null) + add_token_ref(pdf_link_attr(r)); + add_action_ref(pdf_link_action(r)); + break; + case pdf_dest_node: + if (pdf_dest_named_id(p) > 0) + add_token_ref(pdf_dest_id(p)); + break; + case pdf_thread_node: + case pdf_start_thread_node: + if (pdf_thread_named_id(p) > 0) + add_token_ref(pdf_thread_id(p)); + if (pdf_thread_attr(p) != null) + add_token_ref(pdf_thread_attr(p)); + break; + case user_defined_node: + switch (user_node_type(p)) { + case 'a': + add_node_attr_ref(user_node_value(p)); + break; + case 't': + add_token_ref(user_node_value(p)); + break; + case 'n': + s = copy_node_list(user_node_value(p)); + user_node_value(r) = s; + break; + } + break; + default: + break; + } break; - } - break; - default: - break; } - break; - } - return r; + return r; } -int valid_node (halfword p) { - if (p>prealloc) { - if (p0) - return 1; +int valid_node(halfword p) +{ + if (p > prealloc) { + if (p < var_mem_max) { + if (varmem_sizes[p] > 0) + return 1; + } + } else { + return 1; } - } else { - return 1; - } - return 0; + return 0; } -static void -do_free_error (halfword p) { - char errstr[255]= {0}; - char *errhlp[] = {"When I tried to free the node mentioned in the error message, it turned", - "out it was not (or no longer) actually in use.", - "Errors such as these are often caused by Lua node list alteration,", - "but could also point to a bug in the executable. It should be safe to continue.", - NULL}; - - check_node_mem(); - if (free_error_seen) - return; - - halfword r = null; - free_error_seen = 1; - if (type(p)==glyph_node) { - snprintf(errstr,255,"Attempt to double-free glyph (%c) node %d, ignored", (int)character (p), (int)p); - } else { - snprintf(errstr,255,"Attempt to double-free %s node %d, ignored", get_node_name(type(p),subtype(p)), (int)p); - } - tex_error(errstr,errhlp); - for (r=prealloc+1;rprealloc && varmem_sizes[s]==0) - s--; - if (s!=null - && s!=prealloc - && s!=var_mem_max - && (r-s) prealloc && varmem_sizes[s] == 0) + s--; + if (s != null + && s != prealloc + && s != var_mem_max + && (r - s) < get_node_size(type(s), subtype(s)) + && alink(s) != p) { + + if (type(s) == disc_node) { + fprintf(stdout, + " pointed to from %s node %d (vlink %d, alink %d): ", + get_node_name(type(s), subtype(s)), (int) s, + (int) vlink(s), (int) alink(s)); + fprintf(stdout, "pre_break(%d,%d,%d), ", + (int) vlink_pre_break(s), (int) tlink(pre_break(s)), + (int) alink(pre_break(s))); + fprintf(stdout, "post_break(%d,%d,%d), ", + (int) vlink_post_break(s), + (int) tlink(post_break(s)), + (int) alink(post_break(s))); + fprintf(stdout, "no_break(%d,%d,%d)", + (int) vlink_no_break(s), (int) tlink(no_break(s)), + (int) alink(no_break(s))); + fprintf(stdout, "\n"); + } else { + if (vlink(s) == p + || (type(s) == glyph_node && lig_ptr(s) == p) + || (type(s) == vlist_node && list_ptr(s) == p) + || (type(s) == hlist_node && list_ptr(s) == p) + || (type(s) == unset_node && list_ptr(s) == p) + || (type(s) == ins_node && ins_ptr(s) == p) + ) { + fprintf(stdout, + " pointed to from %s node %d (vlink %d, alink %d): ", + get_node_name(type(s), subtype(s)), (int) s, + (int) vlink(s), (int) alink(s)); + if (type(s) == glyph_node) { + fprintf(stdout, "lig_ptr(%d)", (int) lig_ptr(s)); + } else if (type(s) == vlist_node + || type(s) == hlist_node) { + fprintf(stdout, "list_ptr(%d)", (int) list_ptr(s)); + } + fprintf(stdout, "\n"); + } else { + if ((type(s) != penalty_node) + && (type(s) != math_node) + && (type(s) != kern_node) + ) { + fprintf(stdout, " pointed to from %s node %d\n", + get_node_name(type(s), subtype(s)), + (int) s); + } + } + } } - } } - } } - } } -int -free_error (halfword p) { - assert(p>prealloc); - assert(p prealloc); + assert(p < var_mem_max); + if (varmem_sizes[p] == 0) { + do_free_error(p); + return 1; /* double free */ + } + return 0; } -static void -do_copy_error (halfword p) { - char errstr[255]= {0}; - char *errhlp[] = {"When I tried to copy the node mentioned in the error message, it turned", - "out it was not (or no longer) actually in use.", - "Errors such as these are often caused by Lua node list alteration,", - "but could also point to a bug in the executable. It should be safe to continue.", - NULL}; +static void do_copy_error(halfword p) +{ + char errstr[255] = { 0 }; + char *errhlp[] = + { +"When I tried to copy the node mentioned in the error message, it turned", + "out it was not (or no longer) actually in use.", + "Errors such as these are often caused by Lua node list alteration,", + "but could also point to a bug in the executable. It should be safe to continue.", + NULL + }; + + if (copy_error_seen) + return; + + copy_error_seen = 1; + if (type(p) == glyph_node) { + snprintf(errstr, 255, + "Attempt to copy free glyph (%c) node %d, ignored", + (int) character(p), (int) p); + } else { + snprintf(errstr, 255, "Attempt to copy free %s node %d, ignored", + get_node_name(type(p), subtype(p)), (int) p); + } + tex_error(errstr, errhlp); +} - if (copy_error_seen) - return; - copy_error_seen = 1; - if (type(p)==glyph_node) { - snprintf(errstr,255,"Attempt to copy free glyph (%c) node %d, ignored", (int)character (p), (int)p); - } else { - snprintf(errstr,255,"Attempt to copy free %s node %d, ignored", get_node_name(type(p),subtype(p)), (int)p); - } - tex_error(errstr,errhlp); +int copy_error(halfword p) +{ + assert(p >= 0); + assert(p < var_mem_max); + if (p > prealloc && varmem_sizes[p] == 0) { + do_copy_error(p); + return 1; /* copy free node */ + } + return 0; } -int -copy_error (halfword p) { - assert(p>=0); - assert(pprealloc && varmem_sizes[p]==0) { - do_copy_error(p); - return 1; /* copy free node */ - } - return 0; -} +void flush_node(halfword p) +{ + if (p == null) /* legal, but no-op */ + return; -void -flush_node (halfword p) { - - if (p==null) /* legal, but no-op */ - return; + if (free_error(p)) + return; - if (free_error(p)) - return; - - switch(type(p)) { - case glyph_node: - flush_node_list(lig_ptr(p)); - break; - case glue_node: - delete_glue_ref(glue_ptr(p)); - flush_node_list(leader_ptr(p)); - break; - - case attribute_node: - case attribute_list_node: - case temp_node: - case glue_spec_node: - case rule_node: - case kern_node: - case math_node: - case penalty_node: - break; - - case hlist_node: - case vlist_node: - case unset_node: - flush_node_list(list_ptr(p)); - break; - case whatsit_node: - switch (subtype(p)) { - - case dir_node: - break; - case open_node: - case write_node: - case close_node: - case pdf_save_node: - case pdf_restore_node: - case cancel_boundary_node: - case close_lua_node: - case pdf_refobj_node: - case pdf_refxform_node: - case pdf_refximage_node: - case pdf_end_link_node: - case pdf_end_thread_node: - case pdf_save_pos_node: - case local_par_node: - break; - - case special_node: - delete_token_ref(write_tokens(p)); - break; - case pdf_literal_node: - delete_token_ref(pdf_literal_data(p)); - break; - case pdf_colorstack_node: - if (pdf_colorstack_cmd(p) <= colorstack_data) - delete_token_ref(pdf_colorstack_data(p)); - break; - case pdf_setmatrix_node: - delete_token_ref(pdf_setmatrix_data(p)); - break; - case late_lua_node: - delete_token_ref(late_lua_data(p)); - break; - case pdf_annot_node: - delete_token_ref(pdf_annot_data(p)); - break; - - case pdf_link_data_node: - break; - - case pdf_start_link_node: - if (pdf_link_attr(p) != null) - delete_token_ref(pdf_link_attr(p)); - delete_action_ref(pdf_link_action(p)); - break; - case pdf_dest_node: - if (pdf_dest_named_id(p) > 0) - delete_token_ref(pdf_dest_id(p)); - break; - - case pdf_thread_data_node: - break; - - case pdf_thread_node: - case pdf_start_thread_node: - if (pdf_thread_named_id(p) > 0 ) delete_token_ref(pdf_thread_id(p)); - if (pdf_thread_attr(p) != null) delete_token_ref(pdf_thread_attr(p)); - break; - case user_defined_node: - switch( user_node_type(p)) { - case 'a': delete_attribute_ref(user_node_value(p)); break; - case 't': delete_token_ref(user_node_value(p)); break; - case 'n': flush_node_list(user_node_value(p)); break; - default: tconfusion("extuser"); break; - } - break; + switch (type(p)) { + case glyph_node: + flush_node_list(lig_ptr(p)); + break; + case glue_node: + delete_glue_ref(glue_ptr(p)); + flush_node_list(leader_ptr(p)); + break; + + case attribute_node: + case attribute_list_node: + case temp_node: + case glue_spec_node: + case rule_node: + case kern_node: + case math_node: + case penalty_node: + break; + + case hlist_node: + case vlist_node: + case unset_node: + flush_node_list(list_ptr(p)); + break; + case whatsit_node: + switch (subtype(p)) { + + case dir_node: + break; + case open_node: + case write_node: + case close_node: + case pdf_save_node: + case pdf_restore_node: + case cancel_boundary_node: + case close_lua_node: + case pdf_refobj_node: + case pdf_refxform_node: + case pdf_refximage_node: + case pdf_end_link_node: + case pdf_end_thread_node: + case pdf_save_pos_node: + case local_par_node: + break; + + case special_node: + delete_token_ref(write_tokens(p)); + break; + case pdf_literal_node: + delete_token_ref(pdf_literal_data(p)); + break; + case pdf_colorstack_node: + if (pdf_colorstack_cmd(p) <= colorstack_data) + delete_token_ref(pdf_colorstack_data(p)); + break; + case pdf_setmatrix_node: + delete_token_ref(pdf_setmatrix_data(p)); + break; + case late_lua_node: + delete_token_ref(late_lua_data(p)); + break; + case pdf_annot_node: + delete_token_ref(pdf_annot_data(p)); + break; + + case pdf_link_data_node: + break; + + case pdf_start_link_node: + if (pdf_link_attr(p) != null) + delete_token_ref(pdf_link_attr(p)); + delete_action_ref(pdf_link_action(p)); + break; + case pdf_dest_node: + if (pdf_dest_named_id(p) > 0) + delete_token_ref(pdf_dest_id(p)); + break; + + case pdf_thread_data_node: + break; + + case pdf_thread_node: + case pdf_start_thread_node: + if (pdf_thread_named_id(p) > 0) + delete_token_ref(pdf_thread_id(p)); + if (pdf_thread_attr(p) != null) + delete_token_ref(pdf_thread_attr(p)); + break; + case user_defined_node: + switch (user_node_type(p)) { + case 'a': + delete_attribute_ref(user_node_value(p)); + break; + case 't': + delete_token_ref(user_node_value(p)); + break; + case 'n': + flush_node_list(user_node_value(p)); + break; + default: + tconfusion("extuser"); + break; + } + break; + + default: + tconfusion("ext3"); + return; + + } + break; + case ins_node: + flush_node_list(ins_ptr(p)); + delete_glue_ref(split_top_ptr(p)); + break; + case margin_kern_node: + flush_node(margin_char(p)); + break; + case mark_node: + delete_token_ref(mark_ptr(p)); + break; + case disc_node: + flush_node_list(vlink(pre_break(p))); + flush_node_list(vlink(post_break(p))); + flush_node_list(vlink(no_break(p))); + break; + case adjust_node: + flush_node_list(adjust_ptr(p)); + break; + case style_node: + break; + case choice_node: + flush_node_list(display_mlist(p)); + flush_node_list(text_mlist(p)); + flush_node_list(script_mlist(p)); + flush_node_list(script_script_mlist(p)); + break; + case ord_noad: + case op_noad: + case bin_noad: + case rel_noad: + case open_noad: + case close_noad: + case punct_noad: + case inner_noad: + case radical_noad: + case over_noad: + case under_noad: + case vcenter_noad: + case accent_noad: + + /* + * if (math_type(nucleus(p))>=sub_box) + * flush_node_list(vinfo(nucleus(p))); + * if (math_type(supscr(p))>=sub_box) + * flush_node_list(vinfo(supscr(p))); + * if (math_type(subscr(p))>=sub_box) + * flush_node_list(vinfo(subscr(p))); + */ + break; + case left_noad: + case right_noad: + break; + case fraction_noad: + flush_node_list(vinfo(numerator(p))); + flush_node_list(vinfo(denominator(p))); + break; + case pseudo_file_node: + flush_node_list(pseudo_lines(p)); + break; + case pseudo_line_node: + case shape_node: + free_node(p, subtype(p)); + return; + break; + case align_stack_node: + case span_node: + case movement_node: + case if_node: + case nesting_node: + case unhyphenated_node: + case hyphenated_node: + case delta_node: + case passive_node: + case action_node: + case inserting_node: + case split_up_node: + case expr_node: + break; default: - tconfusion("ext3"); - return; + fprintf(stdout, "flush_node: type is %d\n", type(p)); + return; } - break; - case ins_node: - flush_node_list(ins_ptr(p)); - delete_glue_ref(split_top_ptr(p)); - break; - case margin_kern_node: - flush_node(margin_char(p)); - break; - case mark_node: - delete_token_ref(mark_ptr(p)); - break; - case disc_node: - flush_node_list(vlink(pre_break(p))); - flush_node_list(vlink(post_break(p))); - flush_node_list(vlink(no_break(p))); - break; - case adjust_node: - flush_node_list(adjust_ptr(p)); - break; - case style_node: - break; - case choice_node: - flush_node_list(display_mlist(p)); - flush_node_list(text_mlist(p)); - flush_node_list(script_mlist(p)); - flush_node_list(script_script_mlist(p)); - break; - case ord_noad: - case op_noad: - case bin_noad: - case rel_noad: - case open_noad: - case close_noad: - case punct_noad: - case inner_noad: - case radical_noad: - case over_noad: - case under_noad: - case vcenter_noad: - case accent_noad: - - /* - * if (math_type(nucleus(p))>=sub_box) - * flush_node_list(vinfo(nucleus(p))); - * if (math_type(supscr(p))>=sub_box) - * flush_node_list(vinfo(supscr(p))); - * if (math_type(subscr(p))>=sub_box) - * flush_node_list(vinfo(subscr(p))); - */ - - break; - case left_noad: - case right_noad: - break; - case fraction_noad: - flush_node_list(vinfo(numerator(p))); - flush_node_list(vinfo(denominator(p))); - break; - case pseudo_file_node: - flush_node_list(pseudo_lines(p)); - break; - case pseudo_line_node: - case shape_node: - free_node(p,subtype(p)); - return; - break; - case align_stack_node: - case span_node: - case movement_node: - case if_node: - case nesting_node: - case unhyphenated_node: - case hyphenated_node: - case delta_node: - case passive_node: - case action_node: - case inserting_node: - case split_up_node: - case expr_node: - break; - default: - fprintf(stdout,"flush_node: type is %d\n", type(p)); + if (nodetype_has_attributes(type(p))) + delete_attribute_ref(node_attr(p)); + free_node(p, get_node_size(type(p), subtype(p))); return; - - } - if (nodetype_has_attributes(type(p))) - delete_attribute_ref(node_attr(p)); - free_node(p,get_node_size(type(p),subtype(p))); - return; } -void -flush_node_list(halfword pp) { /* erase list of nodes starting at |p| */ - register halfword p=pp; - free_error_seen = 0; - if (p==null) /* legal, but no-op */ - return; - if (free_error(p)) - return; - - while (p!=null) { - register halfword q = vlink(p); - flush_node(p); - p=q; - } +void flush_node_list(halfword pp) +{ /* erase list of nodes starting at |p| */ + register halfword p = pp; + free_error_seen = 0; + if (p == null) /* legal, but no-op */ + return; + if (free_error(p)) + return; + + while (p != null) { + register halfword q = vlink(p); + flush_node(p); + p = q; + } } static int test_count = 1; @@ -854,841 +947,880 @@ static int test_count = 1; #define check_attribute_ref(a) { dorangetest(p,a,var_mem_max); } #define check_token_ref(a) assert(1) -void -check_node (halfword p) { - - switch(type(p)) { - case glyph_node: - dorangetest(p,lig_ptr(p),var_mem_max); - break; - case glue_node: - check_glue_ref(glue_ptr(p)); - dorangetest(p,leader_ptr(p),var_mem_max); - break; - case hlist_node: - case vlist_node: - case unset_node: - case align_record_node: - dorangetest(p,list_ptr(p),var_mem_max); - break; - case ins_node: - dorangetest(p,ins_ptr(p),var_mem_max); - check_glue_ref(split_top_ptr(p)); - break; - case whatsit_node: - switch (subtype(p)) { - case special_node: - check_token_ref(write_tokens(p)); - break; - case pdf_literal_node: - check_token_ref(pdf_literal_data(p)); - break; - case pdf_colorstack_node: - if (pdf_colorstack_cmd(p) <= colorstack_data) - check_token_ref(pdf_colorstack_data(p)); - break; - case pdf_setmatrix_node: - check_token_ref(pdf_setmatrix_data(p)); - break; - case late_lua_node: - check_token_ref(late_lua_data(p)); - break; - case pdf_annot_node: - check_token_ref(pdf_annot_data(p)); - break; - case pdf_start_link_node: - if (pdf_link_attr(p) != null) - check_token_ref(pdf_link_attr(p)); - check_action_ref(pdf_link_action(p)); - break; - case pdf_dest_node: - if (pdf_dest_named_id(p) > 0) - check_token_ref(pdf_dest_id(p)); - break; - case pdf_thread_node: - case pdf_start_thread_node: - if (pdf_thread_named_id(p) > 0 ) check_token_ref(pdf_thread_id(p)); - if (pdf_thread_attr(p) != null) check_token_ref(pdf_thread_attr(p)); - break; - case user_defined_node: - switch( user_node_type(p)) { - case 'a': check_attribute_ref(user_node_value(p)); break; - case 't': check_token_ref(user_node_value(p)); break; - case 'n': dorangetest(p,user_node_value(p),var_mem_max); break; - default: tconfusion("extuser"); break; - } - break; - case dir_node: - case open_node: - case write_node: - case close_node: - case pdf_save_node: - case pdf_restore_node: - case cancel_boundary_node: - case close_lua_node: - case pdf_refobj_node: - case pdf_refxform_node: - case pdf_refximage_node: - case pdf_end_link_node: - case pdf_end_thread_node: - case pdf_save_pos_node: - case local_par_node: - break; +void check_node(halfword p) +{ + + switch (type(p)) { + case glyph_node: + dorangetest(p, lig_ptr(p), var_mem_max); + break; + case glue_node: + check_glue_ref(glue_ptr(p)); + dorangetest(p, leader_ptr(p), var_mem_max); + break; + case hlist_node: + case vlist_node: + case unset_node: + case align_record_node: + dorangetest(p, list_ptr(p), var_mem_max); + break; + case ins_node: + dorangetest(p, ins_ptr(p), var_mem_max); + check_glue_ref(split_top_ptr(p)); + break; + case whatsit_node: + switch (subtype(p)) { + case special_node: + check_token_ref(write_tokens(p)); + break; + case pdf_literal_node: + check_token_ref(pdf_literal_data(p)); + break; + case pdf_colorstack_node: + if (pdf_colorstack_cmd(p) <= colorstack_data) + check_token_ref(pdf_colorstack_data(p)); + break; + case pdf_setmatrix_node: + check_token_ref(pdf_setmatrix_data(p)); + break; + case late_lua_node: + check_token_ref(late_lua_data(p)); + break; + case pdf_annot_node: + check_token_ref(pdf_annot_data(p)); + break; + case pdf_start_link_node: + if (pdf_link_attr(p) != null) + check_token_ref(pdf_link_attr(p)); + check_action_ref(pdf_link_action(p)); + break; + case pdf_dest_node: + if (pdf_dest_named_id(p) > 0) + check_token_ref(pdf_dest_id(p)); + break; + case pdf_thread_node: + case pdf_start_thread_node: + if (pdf_thread_named_id(p) > 0) + check_token_ref(pdf_thread_id(p)); + if (pdf_thread_attr(p) != null) + check_token_ref(pdf_thread_attr(p)); + break; + case user_defined_node: + switch (user_node_type(p)) { + case 'a': + check_attribute_ref(user_node_value(p)); + break; + case 't': + check_token_ref(user_node_value(p)); + break; + case 'n': + dorangetest(p, user_node_value(p), var_mem_max); + break; + default: + tconfusion("extuser"); + break; + } + break; + case dir_node: + case open_node: + case write_node: + case close_node: + case pdf_save_node: + case pdf_restore_node: + case cancel_boundary_node: + case close_lua_node: + case pdf_refobj_node: + case pdf_refxform_node: + case pdf_refximage_node: + case pdf_end_link_node: + case pdf_end_thread_node: + case pdf_save_pos_node: + case local_par_node: + break; + default: + tconfusion("ext3"); + } + break; + case margin_kern_node: + check_node(margin_char(p)); + break; + case disc_node: + dorangetest(p, vlink(pre_break(p)), var_mem_max); + dorangetest(p, vlink(post_break(p)), var_mem_max); + dorangetest(p, vlink(no_break(p)), var_mem_max); + break; + case adjust_node: + dorangetest(p, adjust_ptr(p), var_mem_max); + break; + case pseudo_file_node: + dorangetest(p, pseudo_lines(p), var_mem_max); + break; + case pseudo_line_node: + case shape_node: + break; + case choice_node: + dorangetest(p, display_mlist(p), var_mem_max); + dorangetest(p, text_mlist(p), var_mem_max); + dorangetest(p, script_mlist(p), var_mem_max); + dorangetest(p, script_script_mlist(p), var_mem_max); + break; + case fraction_noad: + dorangetest(p, vinfo(numerator(p)), var_mem_max); + dorangetest(p, vinfo(denominator(p)), var_mem_max); + break; + case rule_node: + case kern_node: + case math_node: + case penalty_node: + case mark_node: + case style_node: + case ord_noad: + case op_noad: + case bin_noad: + case rel_noad: + case open_noad: + case close_noad: + case punct_noad: + case inner_noad: + case radical_noad: + case over_noad: + case under_noad: + case vcenter_noad: + case accent_noad: + case left_noad: + case right_noad: + case attribute_list_node: + case attribute_node: + case glue_spec_node: + case temp_node: + case align_stack_node: + case movement_node: + case if_node: + case nesting_node: + case span_node: + case unhyphenated_node: + case hyphenated_node: + case delta_node: + case passive_node: + case expr_node: + break; default: - tconfusion("ext3"); + fprintf(stdout, "check_node: type is %d\n", type(p)); } - break; - case margin_kern_node: - check_node(margin_char(p)); - break; - case disc_node: - dorangetest(p,vlink(pre_break(p)),var_mem_max); - dorangetest(p,vlink(post_break(p)),var_mem_max); - dorangetest(p,vlink(no_break(p)),var_mem_max); - break; - case adjust_node: - dorangetest(p,adjust_ptr(p),var_mem_max); - break; - case pseudo_file_node: - dorangetest(p,pseudo_lines(p),var_mem_max); - break; - case pseudo_line_node: - case shape_node: - break; - case choice_node: - dorangetest(p,display_mlist(p),var_mem_max); - dorangetest(p,text_mlist(p),var_mem_max); - dorangetest(p,script_mlist(p),var_mem_max); - dorangetest(p,script_script_mlist(p),var_mem_max); - break; - case fraction_noad: - dorangetest(p,vinfo(numerator(p)),var_mem_max); - dorangetest(p,vinfo(denominator(p)),var_mem_max); - break; - case rule_node: - case kern_node: - case math_node: - case penalty_node: - case mark_node: - case style_node: - case ord_noad: - case op_noad: - case bin_noad: - case rel_noad: - case open_noad: - case close_noad: - case punct_noad: - case inner_noad: - case radical_noad: - case over_noad: - case under_noad: - case vcenter_noad: - case accent_noad: - case left_noad: - case right_noad: - case attribute_list_node: - case attribute_node: - case glue_spec_node: - case temp_node: - case align_stack_node: - case movement_node: - case if_node: - case nesting_node: - case span_node: - case unhyphenated_node: - case hyphenated_node: - case delta_node: - case passive_node: - case expr_node: - break; - default: - fprintf(stdout,"check_node: type is %d\n", type(p)); - } } -void -check_static_node_mem (void) { - dotest(zero_glue,width(zero_glue),0); - dotest(zero_glue,type(zero_glue),glue_spec_node); - dotest(zero_glue,vlink(zero_glue),null); - dotest(zero_glue,stretch(zero_glue),0); - dotest(zero_glue,stretch_order(zero_glue),normal); - dotest(zero_glue,shrink(zero_glue),0); - dotest(zero_glue,shrink_order(zero_glue),normal); - - dotest(sfi_glue,width(sfi_glue),0); - dotest(sfi_glue,type(sfi_glue),glue_spec_node); - dotest(sfi_glue,vlink(sfi_glue),null); - dotest(sfi_glue,stretch(sfi_glue),0); - dotest(sfi_glue,stretch_order(sfi_glue),sfi); - dotest(sfi_glue,shrink(sfi_glue),0); - dotest(sfi_glue,shrink_order(sfi_glue),normal); - - dotest(fil_glue,width(fil_glue),0); - dotest(fil_glue,type(fil_glue),glue_spec_node); - dotest(fil_glue,vlink(fil_glue),null); - dotest(fil_glue,stretch(fil_glue),unity); - dotest(fil_glue,stretch_order(fil_glue),fil); - dotest(fil_glue,shrink(fil_glue),0); - dotest(fil_glue,shrink_order(fil_glue),normal); - - dotest(fill_glue,width(fill_glue),0); - dotest(fill_glue,type(fill_glue),glue_spec_node); - dotest(fill_glue,vlink(fill_glue),null); - dotest(fill_glue,stretch(fill_glue),unity); - dotest(fill_glue,stretch_order(fill_glue),fill); - dotest(fill_glue,shrink(fill_glue),0); - dotest(fill_glue,shrink_order(fill_glue),normal); - - dotest(ss_glue,width(ss_glue),0); - dotest(ss_glue,type(ss_glue),glue_spec_node); - dotest(ss_glue,vlink(ss_glue),null); - dotest(ss_glue,stretch(ss_glue),unity); - dotest(ss_glue,stretch_order(ss_glue),fil); - dotest(ss_glue,shrink(ss_glue),unity); - dotest(ss_glue,shrink_order(ss_glue),fil); - - dotest(fil_neg_glue,width(fil_neg_glue),0); - dotest(fil_neg_glue,type(fil_neg_glue),glue_spec_node); - dotest(fil_neg_glue,vlink(fil_neg_glue),null); - dotest(fil_neg_glue,stretch(fil_neg_glue),-unity); - dotest(fil_neg_glue,stretch_order(fil_neg_glue),fil); - dotest(fil_neg_glue,shrink(fil_neg_glue),0); - dotest(fil_neg_glue,shrink_order(fil_neg_glue),normal); +void check_static_node_mem(void) +{ + dotest(zero_glue, width(zero_glue), 0); + dotest(zero_glue, type(zero_glue), glue_spec_node); + dotest(zero_glue, vlink(zero_glue), null); + dotest(zero_glue, stretch(zero_glue), 0); + dotest(zero_glue, stretch_order(zero_glue), normal); + dotest(zero_glue, shrink(zero_glue), 0); + dotest(zero_glue, shrink_order(zero_glue), normal); + + dotest(sfi_glue, width(sfi_glue), 0); + dotest(sfi_glue, type(sfi_glue), glue_spec_node); + dotest(sfi_glue, vlink(sfi_glue), null); + dotest(sfi_glue, stretch(sfi_glue), 0); + dotest(sfi_glue, stretch_order(sfi_glue), sfi); + dotest(sfi_glue, shrink(sfi_glue), 0); + dotest(sfi_glue, shrink_order(sfi_glue), normal); + + dotest(fil_glue, width(fil_glue), 0); + dotest(fil_glue, type(fil_glue), glue_spec_node); + dotest(fil_glue, vlink(fil_glue), null); + dotest(fil_glue, stretch(fil_glue), unity); + dotest(fil_glue, stretch_order(fil_glue), fil); + dotest(fil_glue, shrink(fil_glue), 0); + dotest(fil_glue, shrink_order(fil_glue), normal); + + dotest(fill_glue, width(fill_glue), 0); + dotest(fill_glue, type(fill_glue), glue_spec_node); + dotest(fill_glue, vlink(fill_glue), null); + dotest(fill_glue, stretch(fill_glue), unity); + dotest(fill_glue, stretch_order(fill_glue), fill); + dotest(fill_glue, shrink(fill_glue), 0); + dotest(fill_glue, shrink_order(fill_glue), normal); + + dotest(ss_glue, width(ss_glue), 0); + dotest(ss_glue, type(ss_glue), glue_spec_node); + dotest(ss_glue, vlink(ss_glue), null); + dotest(ss_glue, stretch(ss_glue), unity); + dotest(ss_glue, stretch_order(ss_glue), fil); + dotest(ss_glue, shrink(ss_glue), unity); + dotest(ss_glue, shrink_order(ss_glue), fil); + + dotest(fil_neg_glue, width(fil_neg_glue), 0); + dotest(fil_neg_glue, type(fil_neg_glue), glue_spec_node); + dotest(fil_neg_glue, vlink(fil_neg_glue), null); + dotest(fil_neg_glue, stretch(fil_neg_glue), -unity); + dotest(fil_neg_glue, stretch_order(fil_neg_glue), fil); + dotest(fil_neg_glue, shrink(fil_neg_glue), 0); + dotest(fil_neg_glue, shrink_order(fil_neg_glue), normal); } -void -check_node_mem(void ) { - int i; - check_static_node_mem(); - - for (i=(prealloc+1);i0) { - check_node(i); +void check_node_mem(void) +{ + int i; + check_static_node_mem(); + + for (i = (prealloc + 1); i < var_mem_max; i++) { + if (varmem_sizes[i] > 0) { + check_node(i); + } } - } - test_count++; + test_count++; } -void -fix_node_list (halfword head) { - halfword p,q; - if (head==null) - return; - p = head; - q = vlink(p); - while (q!=null) { - alink(q) = p; - p = q; +void fix_node_list(halfword head) +{ + halfword p, q; + if (head == null) + return; + p = head; q = vlink(p); - } + while (q != null) { + alink(q) = p; + p = q; + q = vlink(p); + } } -halfword -get_node (integer s) { - register halfword r; +halfword get_node(integer s) +{ + register halfword r; - /*check_static_node_mem();*/ - assert(sx) { - /* todo ? it is perhaps possible to merge the new node with an existing rover */ - vlink (x) = rover; - node_size(x) = (var_mem_max-x); - while(vlink(rover)!=vlink(x)) {rover=vlink(rover);} - vlink (rover) = x; - } + undump_things(free_chain[0], MAX_CHAIN_SIZE); + undump_int(var_used); + undump_int(prealloc); + if (var_mem_max > x) { + /* todo ? it is perhaps possible to merge the new node with an existing rover */ + vlink(x) = rover; + node_size(x) = (var_mem_max - x); + while (vlink(rover) != vlink(x)) { + rover = vlink(rover); + } + vlink(rover) = x; + } } #if 0 -void test_rovers (char *s) { - int q = rover; - int r = q; - fprintf(stdout,"%s: {rover=%d,size=%d,link=%d}",s,r,node_size(r),vlink(r)); - while (vlink(r)!=q) { - r = vlink(r); - fprintf(stdout,",{rover=%d,size=%d,link=%d}",r,node_size(r),vlink(r)); - } - fprintf(stdout,"\n"); +void test_rovers(char *s) +{ + int q = rover; + int r = q; + fprintf(stdout, "%s: {rover=%d,size=%d,link=%d}", s, r, node_size(r), + vlink(r)); + while (vlink(r) != q) { + r = vlink(r); + fprintf(stdout, ",{rover=%d,size=%d,link=%d}", r, node_size(r), + vlink(r)); + } + fprintf(stdout, "\n"); } #else -#define test_rovers(a) +# define test_rovers(a) #endif -halfword -slow_get_node (integer s) { - register int t; - - RETRY: - t = node_size(rover); - assert(vlink(rover)s) { - register halfword r; - /* allocating from the bottom helps decrease page faults */ - r = rover; - rover += s; - vlink(rover)=vlink(r); - node_size(rover) = node_size(r) - s; - if (vlink(rover)!=r) { /* list is longer than one */ - halfword q = r; - while (vlink(q)!=r) { q=vlink(q);} - vlink(q) += s; - } else { - vlink(rover) += s; - } - test_rovers("taken"); - assert(vlink(rover) s) { + register halfword r; + /* allocating from the bottom helps decrease page faults */ + r = rover; + rover += s; + vlink(rover) = vlink(r); + node_size(rover) = node_size(r) - s; + if (vlink(rover) != r) { /* list is longer than one */ + halfword q = r; + while (vlink(q) != r) { + q = vlink(q); + } + vlink(q) += s; + } else { + vlink(rover) += s; + } + test_rovers("taken"); + assert(vlink(rover) < var_mem_max); #ifndef NDEBUG - varmem_sizes[r]=(s>127 ? 127 : s); + varmem_sizes[r] = (s > 127 ? 127 : s); #endif - vlink(r)=null; - var_used += s; /* maintain usage statistics */ - return r; /* this is the only exit */ - } else { - int x; - /* attempt to keep the free list small */ - if (vlink(rover)!=rover) { - if (ts) { - goto RETRY; - } - rover=vlink(rover); - } - } - } - /* if we are still here, it was apparently impossible to get a match */ - x = (var_mem_max>>2)+s; - varmem = (memory_word *)realloc((void *)varmem,sizeof(memory_word)*(var_mem_max+x)); - if (varmem==NULL) { - overflow_string("node memory size",var_mem_max); - } - memset ((void *)(varmem+var_mem_max),0,x*sizeof(memory_word)); - + vlink(r) = null; + var_used += s; /* maintain usage statistics */ + return r; /* this is the only exit */ + } else { + int x; + /* attempt to keep the free list small */ + if (vlink(rover) != rover) { + if (t < MAX_CHAIN_SIZE) { + halfword l = vlink(rover); + vlink(rover) = free_chain[t]; + free_chain[t] = rover; + rover = l; + while (vlink(l) != free_chain[t]) { + l = vlink(l); + } + vlink(l) = rover; + test_rovers("outtake"); + goto RETRY; + } else { + halfword l = rover; + while (vlink(rover) != l) { + if (node_size(rover) > s) { + goto RETRY; + } + rover = vlink(rover); + } + } + } + /* if we are still here, it was apparently impossible to get a match */ + x = (var_mem_max >> 2) + s; + varmem = + (memory_word *) realloc((void *) varmem, + sizeof(memory_word) * (var_mem_max + x)); + if (varmem == NULL) { + overflow_string("node memory size", var_mem_max); + } + memset((void *) (varmem + var_mem_max), 0, x * sizeof(memory_word)); + #ifndef NDEBUG - varmem_sizes = (char *)realloc(varmem_sizes,sizeof(char)*(var_mem_max+x)); - if (varmem_sizes==NULL) { - overflow_string("node memory size",var_mem_max); - } - memset ((void *)(varmem_sizes+var_mem_max),0,x*sizeof(char)); + varmem_sizes = + (char *) realloc(varmem_sizes, sizeof(char) * (var_mem_max + x)); + if (varmem_sizes == NULL) { + overflow_string("node memory size", var_mem_max); + } + memset((void *) (varmem_sizes + var_mem_max), 0, x * sizeof(char)); #endif - /* todo ? it is perhaps possible to merge the new memory with an existing rover */ - vlink(var_mem_max) = rover; - node_size(var_mem_max) = x; - while(vlink(rover)!=vlink(var_mem_max)) {rover=vlink(rover);} - vlink (rover) = var_mem_max; - rover = var_mem_max; - test_rovers("realloc"); - var_mem_max += x; - goto RETRY; - } + /* todo ? it is perhaps possible to merge the new memory with an existing rover */ + vlink(var_mem_max) = rover; + node_size(var_mem_max) = x; + while (vlink(rover) != vlink(var_mem_max)) { + rover = vlink(rover); + } + vlink(rover) = var_mem_max; + rover = var_mem_max; + test_rovers("realloc"); + var_mem_max += x; + goto RETRY; + } } -char * -sprint_node_mem_usage (void) { - int i,b; - - char *s, *ss; - char msg[256]; - int node_counts[last_normal_node+last_whatsit_node+2] = {0}; - - for (i=(var_mem_max-1);i>prealloc;i--) { - if (varmem_sizes[i]>0) { - if (type(i)>last_normal_node+last_whatsit_node) { - node_counts[last_normal_node+last_whatsit_node+1] ++; - } else if (type(i)==whatsit_node){ - node_counts[(subtype(i)+last_normal_node+1)] ++; - } else { - node_counts[type(i)] ++; - } +char *sprint_node_mem_usage(void) +{ + int i, b; + + char *s, *ss; + char msg[256]; + int node_counts[last_normal_node + last_whatsit_node + 2] = { 0 }; + + for (i = (var_mem_max - 1); i > prealloc; i--) { + if (varmem_sizes[i] > 0) { + if (type(i) > last_normal_node + last_whatsit_node) { + node_counts[last_normal_node + last_whatsit_node + 1]++; + } else if (type(i) == whatsit_node) { + node_counts[(subtype(i) + last_normal_node + 1)]++; + } else { + node_counts[type(i)]++; + } + } } - } - s = strdup(""); - b=0; - for (i=0;i0) { - int j = (i>(last_normal_node+1) ? (i-last_normal_node-1) : 0); - snprintf(msg,255,"%s%d %s",(b ? ", " : ""), - (int)node_counts[i], - get_node_name((i>last_normal_node ? whatsit_node : i),j)); - ss = concat(s,msg); - free (s); - s = ss; - b=1; + s = strdup(""); + b = 0; + for (i = 0; i < last_normal_node + last_whatsit_node + 2; i++) { + if (node_counts[i] > 0) { + int j = + (i > (last_normal_node + 1) ? (i - last_normal_node - 1) : 0); + snprintf(msg, 255, "%s%d %s", (b ? ", " : ""), (int) node_counts[i], + get_node_name((i > last_normal_node ? whatsit_node : i), + j)); + ss = concat(s, msg); + free(s); + s = ss; + b = 1; + } } - } - return s; + return s; } -halfword -list_node_mem_usage (void) { - halfword i, j; - halfword p = null,q = null; - char *saved_varmem_sizes = xmallocarray (char, var_mem_max); - memcpy (saved_varmem_sizes,varmem_sizes,var_mem_max); - for (i=prealloc+1;i<(var_mem_max-1);i++) { - if (saved_varmem_sizes[i]>0) { - j = copy_node(i); - if (p==null) { - q = j; - } else { - vlink(p)=j; - } - p = j; +halfword list_node_mem_usage(void) +{ + halfword i, j; + halfword p = null, q = null; + char *saved_varmem_sizes = xmallocarray(char, var_mem_max); + memcpy(saved_varmem_sizes, varmem_sizes, var_mem_max); + for (i = prealloc + 1; i < (var_mem_max - 1); i++) { + if (saved_varmem_sizes[i] > 0) { + j = copy_node(i); + if (p == null) { + q = j; + } else { + vlink(p) = j; + } + p = j; + } } - } - free(saved_varmem_sizes); - return q; + free(saved_varmem_sizes); + return q; } -void -print_node_mem_stats (int num, int online) { - int i,b; - halfword j; - char msg[256]; - char *s; - integer free_chain_counts[MAX_CHAIN_SIZE] = {0}; - - snprintf(msg,255,"node memory in use: %d words out of %d", (int)(var_used+prealloc), (int)var_mem_max); - tprint_nl(msg); - tprint_nl("rapidly available: "); - b=0; - for (i=1;i0) { - snprintf(msg,255,"%s%d:%d",(b ? ", " : ""),i, (int)free_chain_counts[i]); - tprint(msg); - b=1; +void print_node_mem_stats(int num, int online) +{ + int i, b; + halfword j; + char msg[256]; + char *s; + integer free_chain_counts[MAX_CHAIN_SIZE] = { 0 }; + + snprintf(msg, 255, "node memory in use: %d words out of %d", + (int) (var_used + prealloc), (int) var_mem_max); + tprint_nl(msg); + tprint_nl("rapidly available: "); + b = 0; + for (i = 1; i < MAX_CHAIN_SIZE; i++) { + for (j = free_chain[i]; j != null; j = vlink(j)) + free_chain_counts[i]++; + if (free_chain_counts[i] > 0) { + snprintf(msg, 255, "%s%d:%d", (b ? ", " : ""), i, + (int) free_chain_counts[i]); + tprint(msg); + b = 1; + } } - } - tprint(" nodes"); - s = sprint_node_mem_usage(); - tprint_nl("current usage: "); - tprint(s); free(s); - tprint(" nodes"); - print_nlp(); /* newline, if needed */ + tprint(" nodes"); + s = sprint_node_mem_usage(); + tprint_nl("current usage: "); + tprint(s); + free(s); + tprint(" nodes"); + print_nlp(); /* newline, if needed */ } /* this belongs in the web but i couldn't find the correct syntactic place */ -halfword -new_span_node(halfword n, int s, scaled w) { - halfword p=new_node(span_node,0); - span_link(p)=n; - span_span(p)=s; - width(p)=w; - return p; +halfword new_span_node(halfword n, int s, scaled w) +{ + halfword p = new_node(span_node, 0); + span_link(p) = n; + span_span(p) = s; + width(p) = w; + return p; } -halfword -string_to_pseudo(integer l,integer pool_ptr, integer nl) { - halfword i, r, q = null; - four_quarters w; - int sz; - halfword h = new_node(pseudo_file_node,0); - while (l1) { - w.b0=str_pool[m++]; - w.b1=str_pool[m++]; - w.b2=str_pool[m++]; - w.b3=str_pool[m++]; - varmem[++i].qqqq=w; - } - w.b0 = (l>m ? str_pool[m++] : ' '); - w.b1 = (l>m ? str_pool[m++] : ' '); - w.b2 = (l>m ? str_pool[m++] : ' '); - w.b3 = (l>m ? str_pool[m] : ' '); - varmem[++i].qqqq=w; - if (pseudo_lines(h)==null) { - pseudo_lines(h) = r; - q = r; - } else { - couple_nodes(q,r); +halfword string_to_pseudo(integer l, integer pool_ptr, integer nl) +{ + halfword i, r, q = null; + four_quarters w; + int sz; + halfword h = new_node(pseudo_file_node, 0); + while (l < pool_ptr) { + int m = l; + while ((l < pool_ptr) && (str_pool[l] != nl)) + l++; + sz = (l - m + 7) / 4; + if (sz == 1) + sz = 2; + r = new_node(pseudo_line_node, sz); + i = r; + while (--sz > 1) { + w.b0 = str_pool[m++]; + w.b1 = str_pool[m++]; + w.b2 = str_pool[m++]; + w.b3 = str_pool[m++]; + varmem[++i].qqqq = w; + } + w.b0 = (l > m ? str_pool[m++] : ' '); + w.b1 = (l > m ? str_pool[m++] : ' '); + w.b2 = (l > m ? str_pool[m++] : ' '); + w.b3 = (l > m ? str_pool[m] : ' '); + varmem[++i].qqqq = w; + if (pseudo_lines(h) == null) { + pseudo_lines(h) = r; + q = r; + } else { + couple_nodes(q, r); + } + q = vlink(q); + if (str_pool[l] == nl) + l++; } - q = vlink(q); - if (str_pool[l]==nl) l++; - } - return h; + return h; } /* attribute stuff */ -static halfword -new_attribute_node (unsigned int i, int v) { - register halfword r = get_node(attribute_node_size); - type(r) = attribute_node; - attribute_id(r)= i; - attribute_value(r)= v; - return r; +static halfword new_attribute_node(unsigned int i, int v) +{ + register halfword r = get_node(attribute_node_size); + type(r) = attribute_node; + attribute_id(r) = i; + attribute_value(r) = v; + return r; } -halfword -copy_attribute_list(halfword n) { - halfword q = get_node(attribute_node_size); - register halfword p = q; - type(p) = attribute_list_node; - attr_list_ref(p)=0; - n = vlink(n); - while (n!=null) { - register halfword r = get_node(attribute_node_size); - /* the link will be fixed automatically in the next loop */ - (void)memcpy((void *)(varmem+r),(void *)(varmem+n),(sizeof(memory_word)*attribute_node_size)); - vlink(p) = r; - p = r; +halfword copy_attribute_list(halfword n) +{ + halfword q = get_node(attribute_node_size); + register halfword p = q; + type(p) = attribute_list_node; + attr_list_ref(p) = 0; n = vlink(n); - } - return q; + while (n != null) { + register halfword r = get_node(attribute_node_size); + /* the link will be fixed automatically in the next loop */ + (void) memcpy((void *) (varmem + r), (void *) (varmem + n), + (sizeof(memory_word) * attribute_node_size)); + vlink(p) = r; + p = r; + n = vlink(n); + } + return q; } -void -update_attribute_cache(void) { - halfword p; - register int i; - attr_list_cache=get_node(attribute_node_size); - type(attr_list_cache) = attribute_list_node; - attr_list_ref(attr_list_cache)=0; - p=attr_list_cache; - for (i=0;i<=max_used_attr;i++) { - register int v = get_attribute(i); - if (v>=0) { - register halfword r = new_attribute_node(i,v); - vlink(p)=r; - p=r; - } - } - if (vlink(attr_list_cache)==null) { - free_node(attr_list_cache,attribute_node_size); - attr_list_cache = null; - } - return; +void update_attribute_cache(void) +{ + halfword p; + register int i; + attr_list_cache = get_node(attribute_node_size); + type(attr_list_cache) = attribute_list_node; + attr_list_ref(attr_list_cache) = 0; + p = attr_list_cache; + for (i = 0; i <= max_used_attr; i++) { + register int v = get_attribute(i); + if (v >= 0) { + register halfword r = new_attribute_node(i, v); + vlink(p) = r; + p = r; + } + } + if (vlink(attr_list_cache) == null) { + free_node(attr_list_cache, attribute_node_size); + attr_list_cache = null; + } + return; } -void -build_attribute_list(halfword b) { - if (max_used_attr>=0) { - if (attr_list_cache==cache_disabled) { - update_attribute_cache(); - if (attr_list_cache == null) - return; +void build_attribute_list(halfword b) +{ + if (max_used_attr >= 0) { + if (attr_list_cache == cache_disabled) { + update_attribute_cache(); + if (attr_list_cache == null) + return; + } + attr_list_ref(attr_list_cache)++; + node_attr(b) = attr_list_cache; } - attr_list_ref(attr_list_cache)++; - node_attr(b)=attr_list_cache; - } } -void -delete_attribute_ref(halfword b) { - if (b!=null){ - assert(type(b)==attribute_list_node); - attr_list_ref(b)--; - if (attr_list_ref(b)==0) { - if (b==attr_list_cache) - attr_list_cache=cache_disabled; - free_node_chain(b,attribute_node_size); +void delete_attribute_ref(halfword b) +{ + if (b != null) { + assert(type(b) == attribute_list_node); + attr_list_ref(b)--; + if (attr_list_ref(b) == 0) { + if (b == attr_list_cache) + attr_list_cache = cache_disabled; + free_node_chain(b, attribute_node_size); + } + /* maintain sanity */ + if (attr_list_ref(b) < 0) + attr_list_ref(b) = 0; } - /* maintain sanity */ - if (attr_list_ref(b)<0) - attr_list_ref(b)=0; - } } /* |p| is an attr list head, or zero */ -halfword -do_set_attribute (halfword p, int i, int val) { - register halfword q; - register int j = 0; - if (p==null) { /* add a new head & node */ - q = get_node(attribute_node_size); - type(q) = attribute_list_node; - attr_list_ref(q)=1; - p = new_attribute_node(i,val); - vlink(q)=p; +halfword do_set_attribute(halfword p, int i, int val) +{ + register halfword q; + register int j = 0; + if (p == null) { /* add a new head & node */ + q = get_node(attribute_node_size); + type(q) = attribute_list_node; + attr_list_ref(q) = 1; + p = new_attribute_node(i, val); + vlink(q) = p; + return q; + } + + assert(vlink(p) != null); + while (vlink(p) != null) { + int t = attribute_id(vlink(p)); + if (t == i && attribute_value(vlink(p)) == val) + return q; /* no need to do anything */ + if (t >= i) + break; + j++; + p = vlink(p); + } + + p = q; + while (j-- > 0) + p = vlink(p); + if (attribute_id(vlink(p)) == i) { + attribute_value(vlink(p)) = val; + } else { /* add a new node */ + halfword r = new_attribute_node(i, val); + vlink(r) = vlink(p); + vlink(p) = r; + } return q; - } - - assert(vlink(p)!=null); - while (vlink(p)!=null) { - int t = attribute_id(vlink(p)); - if (t==i && attribute_value(vlink(p))==val) - return q; /* no need to do anything */ - if (t>=i) - break; - j++; - p = vlink(p); - } - - p = q; - while (j-->0) p = vlink(p); - if (attribute_id(vlink(p))==i) { - attribute_value(vlink(p))=val; - } else { /* add a new node */ - halfword r = new_attribute_node(i,val); - vlink(r)=vlink(p); - vlink(p)=r; - } - return q; } -void -set_attribute (halfword n, int i, int val) { - register halfword p; - register int j = 0; - if (!nodetype_has_attributes(type(n))) - return; - p = node_attr(n); - if (p==null) { /* add a new head & node */ - p = get_node(attribute_node_size); - type(p) = attribute_list_node; - attr_list_ref(p)=1; - node_attr(n) = p ; - p = new_attribute_node(i,val); - vlink(node_attr(n))=p; - return; - } - assert(vlink(p)!=null); - while (vlink(p)!=null) { - int t = attribute_id(vlink(p)); - if (t==i && attribute_value(vlink(p))==val) - return; - if (t>=i) - break; - j++; - p = vlink(p); - } - p = node_attr(n); - if (attr_list_ref(p)!=1) { - if (attr_list_ref(p)>1) { - p = copy_attribute_list (p); - delete_attribute_ref(node_attr(n)); - node_attr(n) = p; - } else { - fprintf(stdout,"Node %d has an attribute list that is free already\n",(int)n); +void set_attribute(halfword n, int i, int val) +{ + register halfword p; + register int j = 0; + if (!nodetype_has_attributes(type(n))) + return; + p = node_attr(n); + if (p == null) { /* add a new head & node */ + p = get_node(attribute_node_size); + type(p) = attribute_list_node; + attr_list_ref(p) = 1; + node_attr(n) = p; + p = new_attribute_node(i, val); + vlink(node_attr(n)) = p; + return; + } + assert(vlink(p) != null); + while (vlink(p) != null) { + int t = attribute_id(vlink(p)); + if (t == i && attribute_value(vlink(p)) == val) + return; + if (t >= i) + break; + j++; + p = vlink(p); + } + p = node_attr(n); + if (attr_list_ref(p) != 1) { + if (attr_list_ref(p) > 1) { + p = copy_attribute_list(p); + delete_attribute_ref(node_attr(n)); + node_attr(n) = p; + } else { + fprintf(stdout, + "Node %d has an attribute list that is free already\n", + (int) n); + } + attr_list_ref(p) = 1; + } + while (j-- > 0) + p = vlink(p); + + if (attribute_id(vlink(p)) == i) { + attribute_value(vlink(p)) = val; + } else { /* add a new node */ + halfword r = new_attribute_node(i, val); + vlink(r) = vlink(p); + vlink(p) = r; } - attr_list_ref(p)=1; - } - while (j-->0) p = vlink(p); - - if (attribute_id(vlink(p))==i) { - attribute_value(vlink(p))=val; - } else { /* add a new node */ - halfword r = new_attribute_node(i,val); - vlink(r)=vlink(p); - vlink(p)=r; - } - return; + return; } -int -unset_attribute (halfword n, int i, int val) { - register halfword p; - register int t; - register int j = 0; - - if (!nodetype_has_attributes(type(n))) - return null; - p = node_attr(n); - if (p==null) - return -1; - assert (vlink(p)!=null); - while (vlink(p)!=null) { - t = attribute_id(vlink(p)); - if (t>i) - return -1; - if (t==i) - break; - j++; +int unset_attribute(halfword n, int i, int val) +{ + register halfword p; + register int t; + register int j = 0; + + if (!nodetype_has_attributes(type(n))) + return null; + p = node_attr(n); + if (p == null) + return -1; + assert(vlink(p) != null); + while (vlink(p) != null) { + t = attribute_id(vlink(p)); + if (t > i) + return -1; + if (t == i) + break; + j++; + p = vlink(p); + } + /* if we are still here, the attribute exists */ + p = node_attr(n); + if (attr_list_ref(p) != 1) { + if (attr_list_ref(p) > 1) { + p = copy_attribute_list(p); + delete_attribute_ref(node_attr(n)); + node_attr(n) = p; + } else { + fprintf(stdout, + "Node %d has an attribute list that is free already\n", + (int) n); + } + attr_list_ref(p) = 1; + } p = vlink(p); - } - /* if we are still here, the attribute exists */ - p = node_attr(n); - if (attr_list_ref(p)!=1) { - if (attr_list_ref(p)>1) { - p = copy_attribute_list (p); - delete_attribute_ref(node_attr(n)); - node_attr(n) = p; - } else { - fprintf(stdout,"Node %d has an attribute list that is free already\n",(int)n); + while (j-- > 0) + p = vlink(p); + t = attribute_value(p); + if (val == -1 || t == val) { + attribute_value(p) = -1; } - attr_list_ref(p)=1; - } - p = vlink(p); - while (j-->0) p = vlink(p); - t = attribute_value(p); - if (val==-1 || t==val) { - attribute_value(p)=-1; - } - return t; + return t; } -int -has_attribute (halfword n,int i, int val) { - register halfword p; - if (!nodetype_has_attributes(type(n))) - return -1; - p = node_attr(n); - if (p==null || vlink(p)==null) - return -1; - p = vlink(p); - while (p!=null) { - if (attribute_id(p)==i) { - int ret = attribute_value(p); - if (val==-1 || val==ret) - return ret; - return -1; - } else if (attribute_id(p)>i) { - return -1; +int has_attribute(halfword n, int i, int val) +{ + register halfword p; + if (!nodetype_has_attributes(type(n))) + return -1; + p = node_attr(n); + if (p == null || vlink(p) == null) + return -1; + p = vlink(p); + while (p != null) { + if (attribute_id(p) == i) { + int ret = attribute_value(p); + if (val == -1 || val == ret) + return ret; + return -1; + } else if (attribute_id(p) > i) { + return -1; + } + p = vlink(p); } - p=vlink(p); - } - return -1; + return -1; } - diff --git a/Build/source/texk/web2c/luatexdir/tex/texpdf.c b/Build/source/texk/web2c/luatexdir/tex/texpdf.c index fbb4c2b7e21..000742dd001 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texpdf.c +++ b/Build/source/texk/web2c/luatexdir/tex/texpdf.c @@ -1,4 +1,4 @@ -/* $Id: texpdf.c 1013 2008-02-14 00:09:02Z oneiros $ */ +/* $Id: texpdf.c 1158 2008-04-14 08:13:06Z oneiros $ */ #include "luatex-api.h" #include @@ -7,7 +7,7 @@ #define number_chars 1114112 #define string_offset 2097152 #define str_start_macro(a) str_start[(a) - string_offset] -#define str_length(a) (str_start_macro((a)+1)-str_start_macro(a)) /* the number of characters in string number (a) */ +#define str_length(a) (str_start_macro((a)+1)-str_start_macro(a)) /* the number of characters in string number (a) */ #define is_hex_char isxdigit @@ -17,20 +17,20 @@ /* make sure that there are at least |n| bytes free in PDF buffer */ -#define pdf_room(a) do { \ - if ((pdf_os_mode) && ((a) + pdf_ptr > pdf_buf_size)) \ - pdf_os_get_os_buf(a); \ - else if ((!pdf_os_mode) && ((a) > pdf_buf_size) ) \ - overflow("PDF output buffer", pdf_op_buf_size); \ - else if ((!pdf_os_mode) && ((a) + pdf_ptr > pdf_buf_size)) \ - pdf_flush(); \ +#define pdf_room(a) do { \ + if ((pdf_os_mode) && ((a) + pdf_ptr > pdf_buf_size)) \ + pdf_os_get_os_buf(a); \ + else if ((!pdf_os_mode) && ((a) > pdf_buf_size) ) \ + overflow(maketexstring("PDF output buffer"), pdf_op_buf_size); \ + else if ((!pdf_os_mode) && ((a) + pdf_ptr > pdf_buf_size)) \ + pdf_flush(); \ } while (0) /* do the same as |pdf_quick_out| and flush the PDF buffer if necessary */ #define pdf_out(a) do { \ - pdf_room(1); \ - pdf_quick_out(a); \ + pdf_room(1); \ + pdf_quick_out(a); \ } while (0) @@ -39,131 +39,139 @@ * (40) and right parenthesis (41) */ -#define pdf_print_escaped(c) \ - if ((c)<=32||(c)=='\\'||(c)=='('||(c)==')'||(c)>127) { \ - pdf_room(4); \ - pdf_quick_out('\\'); \ - pdf_quick_out('0' + (((c)>>6) & 0x3)); \ - pdf_quick_out('0' + (((c)>>3) & 0x7)); \ - pdf_quick_out('0' + ( (c) & 0x7)); \ - } else { \ - pdf_out((c)); \ - } - -void -pdf_print_char(internal_font_number f, integer cc) { - register int c; - pdf_mark_char(f, cc); - if (font_encodingbytes(f)==2) { - register int chari; - chari = char_index(f, cc); - c = chari >> 8; - pdf_print_escaped(c); - c = chari & 0xFF; - } else { - if (cc>255) return; - c = cc; +#define pdf_print_escaped(c) \ + if ((c)<=32||(c)=='\\'||(c)=='('||(c)==')'||(c)>127) { \ + pdf_room(4); \ + pdf_quick_out('\\'); \ + pdf_quick_out('0' + (((c)>>6) & 0x3)); \ + pdf_quick_out('0' + (((c)>>3) & 0x7)); \ + pdf_quick_out('0' + ( (c) & 0x7)); \ + } else { \ + pdf_out((c)); \ } - pdf_print_escaped(c); + +void pdf_print_char(internal_font_number f, integer cc) +{ + register int c; + pdf_mark_char(f, cc); + if (font_encodingbytes(f) == 2) { + register int chari; + chari = char_index(f, cc); + c = chari >> 8; + pdf_print_escaped(c); + c = chari & 0xFF; + } else { + if (cc > 255) + return; + c = cc; + } + pdf_print_escaped(c); } /* print out a string to PDF buffer */ -void -pdf_print(str_number s) { - if (s < number_chars) { - assert(s<256); - pdf_out(s); - } else { - register pool_pointer j = str_start_macro(s); - while (j < str_start_macro(s + 1)) { - pdf_out(str_pool[j++]); - } - } +void pdf_print(str_number s) +{ + if (s < number_chars) { + assert(s < 256); + pdf_out(s); + } else { + register pool_pointer j = str_start_macro(s); + while (j < str_start_macro(s + 1)) { + pdf_out(str_pool[j++]); + } + } } /* print out a integer to PDF buffer */ -void -pdf_print_int(integer n) { - register integer k = 0; /* current digit; we assume that $|n|<10^{23}$ */ - if (n<0) { - pdf_out('-'); - if (n<-0x7FFFFFFF) { /* need to negate |n| more carefully */ - register integer m; - k++; - m =-1-n; n=m / 10; m= (m % 10)+1; - if (m<10) { - dig[0]=m ; - } else { - dig[0]=0; incr(n); - } - } else { - n = -n; - } - } - do { - dig[k++] = n % 10; - n = n / 10; - } while (n!=0); - pdf_room(k); - while (k-->0) { - pdf_quick_out('0'+dig[k]); - } +void pdf_print_int(integer n) +{ + register integer k = 0; /* current digit; we assume that $|n|<10^{23}$ */ + if (n < 0) { + pdf_out('-'); + if (n < -0x7FFFFFFF) { /* need to negate |n| more carefully */ + register integer m; + k++; + m = -1 - n; + n = m / 10; + m = (m % 10) + 1; + if (m < 10) { + dig[0] = m; + } else { + dig[0] = 0; + incr(n); + } + } else { + n = -n; + } + } + do { + dig[k++] = n % 10; + n = n / 10; + } while (n != 0); + pdf_room(k); + while (k-- > 0) { + pdf_quick_out('0' + dig[k]); + } } /* print $m/10^d$ as real */ -void -pdf_print_real(integer m, integer d) { - if (m < 0) { - pdf_out('-'); - m = -m; - }; - pdf_print_int(m / ten_pow[d]); - m = m % ten_pow[d]; - if (m > 0) { - pdf_out('.'); - d--; - while (m < ten_pow[d]) { - pdf_out('0'); - d--; +void pdf_print_real(integer m, integer d) +{ + if (m < 0) { + pdf_out('-'); + m = -m; + }; + pdf_print_int(m / ten_pow[d]); + m = m % ten_pow[d]; + if (m > 0) { + pdf_out('.'); + d--; + while (m < ten_pow[d]) { + pdf_out('0'); + d--; + } + while (m % 10 == 0) + m = m / 10; + pdf_print_int(m); } - while (m % 10 == 0) - m = m / 10; - pdf_print_int(m); - } } /* print out |s| as string in PDF output */ -void -pdf_print_str(str_number s) { - pool_pointer i, j; - i = str_start_macro(s); - j = str_start_macro(s+1) - 1; - if (i > j) { - pdf_room(2); - pdf_quick_out('('); - pdf_quick_out(')'); - return; - } - /* the next is not really safe, the string could be "(a)xx(b)" */ - if ((str_pool[i] == '(') && (str_pool[j] == ')')) { - pdf_print(s); - return; - } - if ((str_pool[i] != '<') || (str_pool[j] != '>') || odd(str_length(s))) { - pdf_out('('); pdf_print(s); pdf_out(')'); - return; - } - i++; - j--; - while (i < j) { - if (!is_hex_char(str_pool[i++])) { - pdf_out('('); pdf_print(s); pdf_out(')'); - return; +void pdf_print_str(str_number s) +{ + pool_pointer i, j; + i = str_start_macro(s); + j = str_start_macro(s + 1) - 1; + if (i > j) { + pdf_room(2); + pdf_quick_out('('); + pdf_quick_out(')'); + return; + } + /* the next is not really safe, the string could be "(a)xx(b)" */ + if ((str_pool[i] == '(') && (str_pool[j] == ')')) { + pdf_print(s); + return; + } + if ((str_pool[i] != '<') || (str_pool[j] != '>') || odd(str_length(s))) { + pdf_out('('); + pdf_print(s); + pdf_out(')'); + return; + } + i++; + j--; + while (i < j) { + if (!is_hex_char(str_pool[i++])) { + pdf_out('('); + pdf_print(s); + pdf_out(')'); + return; + } } - } - pdf_print(s); /* it was a hex string after all */ + pdf_print(s); /* it was a hex string after all */ } diff --git a/Build/source/texk/web2c/luatexdir/tex/textoken.c b/Build/source/texk/web2c/luatexdir/tex/textoken.c index 20c57b9479b..366fa798791 100644 --- a/Build/source/texk/web2c/luatexdir/tex/textoken.c +++ b/Build/source/texk/web2c/luatexdir/tex/textoken.c @@ -1,4 +1,4 @@ -/* $Id: textoken.c 1013 2008-02-14 00:09:02Z oneiros $ */ +/* $Id: textoken.c 1155 2008-04-14 07:53:21Z oneiros $ */ #include "luatex-api.h" #include @@ -7,18 +7,18 @@ /* Integer parameters and other command-related defines. This needs it's own header file! */ -#define end_line_char_code 48 /* character placed at the right end of the buffer */ +#define end_line_char_code 48 /* character placed at the right end of the buffer */ #define cat_code_table_code 63 -#define tex_int_pars 66 /* total number of \.{\\TeX} + Aleph integer parameters */ +#define tex_int_pars 66 /* total number of \.{\\TeX} + Aleph integer parameters */ /* this is not what happens in the pascal code! there the values shift from bare numbers to offsets ! */ #define dir_base tex_int_pars #define dir_pars 5 -#define pdftex_first_integer_code dir_base+dir_pars /* base for \pdfTeX's integer parameters */ -#define pdf_int_pars pdftex_first_integer_code+27 /*total number of \pdfTeX's integer parameters*/ -#define etex_int_base pdf_int_pars /*base for \eTeX's integer parameters*/ -#define tracing_nesting_code etex_int_base+4 /*show incomplete groups and ifs within files*/ +#define pdftex_first_integer_code dir_base+dir_pars /* base for \pdfTeX's integer parameters */ +#define pdf_int_pars pdftex_first_integer_code+27 /*total number of \pdfTeX's integer parameters */ +#define etex_int_base pdf_int_pars /*base for \eTeX's integer parameters */ +#define tracing_nesting_code etex_int_base+4 /*show incomplete groups and ifs within files */ -#define int_par(a) zeqtb[static_int_base+a].cint /* an integer parameter */ +#define int_par(a) zeqtb[static_int_base+a].cint /* an integer parameter */ #define cat_code_table int_par(cat_code_table_code) #define tracing_nesting int_par(tracing_nesting_code) #define end_line_char int_par(end_line_char_code) @@ -26,7 +26,7 @@ #define every_eof get_every_eof() #define number_active_chars 65536+65536 -#define active_base 1 /* beginning of region 1, for active character equivalents */ +#define active_base 1 /* beginning of region 1, for active character equivalents */ #define null_cs active_base+number_active_chars /* equivalent of \.{\\csname\\endcsname} */ @@ -40,18 +40,18 @@ #define nonstop_mode 1 /* command codes */ -#define relax 0 +#define relax 0 #define out_param 5 -#define max_command 117 /* fetched from C output */ -#define dont_expand 133 /* fetched from C output */ +#define max_command 117 /* fetched from C output */ +#define dont_expand 133 /* fetched from C output */ -#define terminal_input (name==0) /* are we reading from the terminal? */ -#define special_char 1114113 /* |biggest_char+2| */ -#define cur_file input_file[index] /* the current |alpha_file| variable */ +#define terminal_input (name==0) /* are we reading from the terminal? */ +#define special_char 1114113 /* |biggest_char+2| */ +#define cur_file input_file[index] /* the current |alpha_file| variable */ -#define no_expand_flag special_char /*this characterizes a special variant of |relax|*/ +#define no_expand_flag special_char /*this characterizes a special variant of |relax| */ -extern void insert_vj_template (void); +extern void insert_vj_template(void); #define do_get_cat_code(a) do { \ if (local_catcode_table) \ @@ -61,219 +61,223 @@ extern void insert_vj_template (void); } while (0) -static void -invalid_character_error (void) { - char *hlp[] = {"A funny symbol that I can't read has just been input.", - "Continue, and I'll forget that it ever happened.", - NULL}; - deletions_allowed=false; - tex_error("Text line contains an invalid character", hlp); - deletions_allowed=true; +static void invalid_character_error(void) +{ + char *hlp[] = { "A funny symbol that I can't read has just been input.", + "Continue, and I'll forget that it ever happened.", + NULL + }; + deletions_allowed = false; + tex_error("Text line contains an invalid character", hlp); + deletions_allowed = true; } /* no longer done */ -static boolean process_sup_mark(void); /* below */ +static boolean process_sup_mark(void); /* below */ static int scan_control_sequence(void); /* below */ -typedef enum {next_line_ok, next_line_return, next_line_restart } next_line_retval ; +typedef enum { next_line_ok, next_line_return, + next_line_restart } next_line_retval; -static next_line_retval next_line(void); /* below */ +static next_line_retval next_line(void); /* below */ /* @^inner loop@>*/ -static void -utf_error (void) { - char *hlp[] = {"A funny symbol that I can't read has just been input.", - "Just continue, I'll change it to 0xFFFD.", - NULL }; - deletions_allowed=false; - tex_error("Text line contains an invalid utf-8 sequence", hlp); - deletions_allowed=true; +static void utf_error(void) +{ + char *hlp[] = { "A funny symbol that I can't read has just been input.", + "Just continue, I'll change it to 0xFFFD.", + NULL + }; + deletions_allowed = false; + tex_error("Text line contains an invalid utf-8 sequence", hlp); + deletions_allowed = true; } -static integer -qbuffer_to_unichar (integer *k) { - register int ch; - int val = 0xFFFD; - unsigned char *text = buffer+*k; - if ( (ch = *text++)<0x80 ) { - val = ch; - *k+=1; - } else if ( ch<=0xbf ) { /* error */ - *k+=1; - } else if ( ch<=0xdf ) { - if ( *text>=0x80 && *text<0xc0 ) - val = ((ch&0x1f)<<6) | (*text++&0x3f); - *k+=2; - } else if ( ch<=0xef ) { - if ( *text>=0x80 && *text<0xc0 && text[1]>=0x80 && text[1]<0xc0 ) { - val = ((ch&0xf)<<12) | ((text[0]&0x3f)<<6) | (text[1]&0x3f); - *k+=3; +static integer qbuffer_to_unichar(integer * k) +{ + register int ch; + int val = 0xFFFD; + unsigned char *text = buffer + *k; + if ((ch = *text++) < 0x80) { + val = ch; + *k += 1; + } else if (ch <= 0xbf) { /* error */ + *k += 1; + } else if (ch <= 0xdf) { + if (*text >= 0x80 && *text < 0xc0) + val = ((ch & 0x1f) << 6) | (*text++ & 0x3f); + *k += 2; + } else if (ch <= 0xef) { + if (*text >= 0x80 && *text < 0xc0 && text[1] >= 0x80 && text[1] < 0xc0) { + val = + ((ch & 0xf) << 12) | ((text[0] & 0x3f) << 6) | (text[1] & 0x3f); + *k += 3; + } + } else { + int w = (((ch & 0x7) << 2) | ((text[0] & 0x30) >> 4)) - 1, w2; + w = (w << 6) | ((text[0] & 0xf) << 2) | ((text[1] & 0x30) >> 4); + w2 = ((text[1] & 0xf) << 6) | (text[2] & 0x3f); + val = w * 0x400 + w2 + 0x10000; + if (*text < 0x80 || text[1] < 0x80 || text[2] < 0x80 || + *text >= 0xc0 || text[1] >= 0xc0 || text[2] >= 0xc0) + val = 0xFFFD; + *k += 4; } - } else { - int w = ( ((ch&0x7)<<2) | ((text[0]&0x30)>>4) )-1, w2; - w = (w<<6) | ((text[0]&0xf)<<2) | ((text[1]&0x30)>>4); - w2 = ((text[1]&0xf)<<6) | (text[2]&0x3f); - val = w*0x400 + w2 + 0x10000; - if ( *text<0x80 || text[1]<0x80 || text[2]<0x80 || - *text>=0xc0 || text[1]>=0xc0 || text[2]>=0xc0 ) - val = 0xFFFD; - *k+=4; - } - if (val==0xFFFD) - utf_error(); - return( val ); + if (val == 0xFFFD) + utf_error(); + return (val); } -static boolean -get_next_file (void) { - SWITCH: - if (loc<=limit) { /* current line not yet finished */ - cur_chr = qbuffer_to_unichar(&loc); - RESWITCH: - if (detokenized_line) { - cur_cmd = (cur_chr==' ' ? 10 : 12) ; +static boolean get_next_file(void) +{ + SWITCH: + if (loc <= limit) { /* current line not yet finished */ + cur_chr = qbuffer_to_unichar(&loc); + RESWITCH: + if (detokenized_line) { + cur_cmd = (cur_chr == ' ' ? 10 : 12); + } else { + do_get_cat_code(cur_cmd); + } + /* + @; + */ + /* The following 48-way switch accomplishes the scanning quickly, assuming + that a decent \PASCAL\ compiler has translated the code. Note that the numeric + values for |mid_line|, |skip_blanks|, and |new_line| are spaced + apart from each other by |max_char_code+1|, so we can add a character's + command code to the state to get a single number that characterizes both. + */ + switch (state + cur_cmd) { + case mid_line + ignore: + case skip_blanks + ignore: + case new_line + ignore: + case skip_blanks + spacer: + case new_line + spacer: /* @ */ + goto SWITCH; + break; + case mid_line + escape: + case new_line + escape: + case skip_blanks + escape: /* @; */ + state = scan_control_sequence(); + break; + case mid_line + active_char: + case new_line + active_char: + case skip_blanks + active_char: /* @; */ + invalid_character_error(); + return false; /* because state may be token_list now */ + break; + case mid_line + spacer: /* @; */ + state = skip_blanks; + cur_chr = ' '; + break; + case mid_line + car_ret: /* @; */ + /* When a character of type |spacer| gets through, its character code is + changed to $\.{"\ "}=@'40$. This means that the ASCII codes for tab and space, + and for the space inserted at the end of a line, will + be treated alike when macro parameters are being matched. We do this + since such characters are indistinguishable on most computer terminal displays. + */ + loc = limit + 1; + cur_cmd = spacer; + cur_chr = ' '; + break; + case skip_blanks + car_ret: + case mid_line + comment: + case new_line + comment: + case skip_blanks + comment: /* @; */ + loc = limit + 1; + goto SWITCH; + break; + case new_line + car_ret: /* @; */ + loc = limit + 1; + cur_cs = par_loc; + cur_cmd = eq_type(cur_cs); + cur_chr = equiv(cur_cs); + break; + case skip_blanks + left_brace: + case new_line + left_brace: + state = mid_line; /* fall through */ + case mid_line + left_brace: + align_state++; + break; + case skip_blanks + right_brace: + case new_line + right_brace: + state = mid_line; /* fall through */ + case mid_line + right_brace: + align_state--; + break; + case mid_line + math_shift: + case mid_line + tab_mark: + case mid_line + mac_param: + case mid_line + sub_mark: + case mid_line + letter: + case mid_line + other_char: + break; + default: + /* + case skip_blanks + math_shift: + case skip_blanks + tab_mark: + case skip_blanks + mac_param: + case skip_blanks + sub_mark: + case skip_blanks + letter: + case skip_blanks + other_char: + case new_line + math_shift: + case new_line + tab_mark: + case new_line + mac_param: + case new_line + sub_mark: + case new_line + letter: + case new_line + other_char: + */ + state = mid_line; + break; + } } else { - do_get_cat_code(cur_cmd); + if (current_ocp_lstack > 0) { + pop_input(); + return false; + } + if (name != 21) + state = new_line; + + /* + @; + */ + do { + next_line_retval r = next_line(); + if (r == next_line_return) { + return true; + } else if (r == next_line_restart) { + return false; + } + } while (0); + check_interrupt(); + goto SWITCH; } - /* - @; - */ - /* The following 48-way switch accomplishes the scanning quickly, assuming - that a decent \PASCAL\ compiler has translated the code. Note that the numeric - values for |mid_line|, |skip_blanks|, and |new_line| are spaced - apart from each other by |max_char_code+1|, so we can add a character's - command code to the state to get a single number that characterizes both. - */ - switch(state+cur_cmd) { - case mid_line + ignore: - case skip_blanks + ignore: - case new_line + ignore: - case skip_blanks + spacer: - case new_line + spacer: /* @ */ - goto SWITCH; - break; - case mid_line + escape: - case new_line + escape: - case skip_blanks + escape: /* @;*/ - state = scan_control_sequence(); - break; - case mid_line + active_char: - case new_line + active_char: - case skip_blanks + active_char: /* @;*/ - invalid_character_error(); - return false; /* because state may be token_list now */ - break; - case mid_line + spacer: /* @;*/ - state=skip_blanks; - cur_chr=' '; - break; - case mid_line + car_ret: /* @;*/ - /* When a character of type |spacer| gets through, its character code is - changed to $\.{"\ "}=@'40$. This means that the ASCII codes for tab and space, - and for the space inserted at the end of a line, will - be treated alike when macro parameters are being matched. We do this - since such characters are indistinguishable on most computer terminal displays. - */ - loc=limit+1; - cur_cmd=spacer; - cur_chr=' '; - break; - case skip_blanks + car_ret: - case mid_line + comment: - case new_line + comment: - case skip_blanks + comment: /* @;*/ - loc=limit+1; - goto SWITCH; - break; - case new_line + car_ret: /* @;*/ - loc=limit+1; - cur_cs=par_loc; - cur_cmd=eq_type(cur_cs); - cur_chr=equiv(cur_cs); - break; - case skip_blanks + left_brace: - case new_line + left_brace: - state=mid_line; /* fall through */ - case mid_line + left_brace: - align_state++; - break; - case skip_blanks + right_brace: - case new_line + right_brace: - state=mid_line; /* fall through */ - case mid_line + right_brace: - align_state--; - break; - case mid_line + math_shift: - case mid_line + tab_mark: - case mid_line + mac_param: - case mid_line + sub_mark: - case mid_line + letter: - case mid_line + other_char: - break; - default: - /* - case skip_blanks + math_shift: - case skip_blanks + tab_mark: - case skip_blanks + mac_param: - case skip_blanks + sub_mark: - case skip_blanks + letter: - case skip_blanks + other_char: - case new_line + math_shift: - case new_line + tab_mark: - case new_line + mac_param: - case new_line + sub_mark: - case new_line + letter: - case new_line + other_char: - */ - state=mid_line; - break; - } - } else { - if (current_ocp_lstack>0) { - pop_input(); - return false; - } - if (name!=21) - state=new_line; - - /* - @; - */ - do { - next_line_retval r = next_line(); - if (r==next_line_return) { - return true; - } else if (r==next_line_restart) { - return false; - } - } while (0); - check_interrupt(); - goto SWITCH; - } - return true; + return true; } #define is_hex(a) ((a>='0'&&a<='9')||(a>='a'&&a<='f')) @@ -307,71 +311,75 @@ get_next_file (void) { /* Notice that a code like \.{\^\^8} becomes \.x if not followed by a hex digit.*/ -static boolean -process_sup_mark(void) { - if (cur_chr==buffer[loc]) { - int c,cc; - if (loclimit) { - cur_cs=null_cs; /* |state| is irrelevant in this case */ - } else { - register int cat; /* |cat_code(cur_chr)|, usually */ - while (1) { - integer k=loc; - cur_chr = qbuffer_to_unichar(&k); - do_get_cat_code(cat); - if (cat!=letter||k>limit) { - retval = (cat==spacer ? skip_blanks : mid_line); - if (cat==sup_mark && check_expanded_code(&k)) /* @; */ - continue; - } else { - retval=skip_blanks; - do { - cur_chr = qbuffer_to_unichar(&k); - do_get_cat_code(cat); - } while (cat==letter&&k<=limit); - - if (cat==sup_mark && check_expanded_code(&k)) /* @; */ - continue; - if (cat!=letter) { - decr(k); - if (cur_chr>0xFFFF) decr(k); - if (cur_chr>0x7FF) decr(k); - if (cur_chr>0x7F) decr(k); - } /* now |k| points to first nonletter */ - } - cur_cs=id_lookup(loc,k-loc); - loc=k; - break; +static boolean check_expanded_code(integer * kk); /* below */ + +static int scan_control_sequence(void) +{ + int retval = mid_line; + if (loc > limit) { + cur_cs = null_cs; /* |state| is irrelevant in this case */ + } else { + register int cat; /* |cat_code(cur_chr)|, usually */ + while (1) { + integer k = loc; + cur_chr = qbuffer_to_unichar(&k); + do_get_cat_code(cat); + if (cat != letter || k > limit) { + retval = (cat == spacer ? skip_blanks : mid_line); + if (cat == sup_mark && check_expanded_code(&k)) /* @; */ + continue; + } else { + retval = skip_blanks; + do { + cur_chr = qbuffer_to_unichar(&k); + do_get_cat_code(cat); + } while (cat == letter && k <= limit); + + if (cat == sup_mark && check_expanded_code(&k)) /* @; */ + continue; + if (cat != letter) { + decr(k); + if (cur_chr > 0xFFFF) + decr(k); + if (cur_chr > 0x7FF) + decr(k); + if (cur_chr > 0x7F) + decr(k); + } /* now |k| points to first nonletter */ + } + cur_cs = id_lookup(loc, k - loc); + loc = k; + break; + } } - } - cur_cmd=eq_type(cur_cs); - cur_chr=equiv(cur_cs); - return retval; + cur_cmd = eq_type(cur_cs); + cur_chr = equiv(cur_cs); + return retval; } /* Whenever we reach the following piece of code, we will have @@ -440,89 +452,97 @@ static int scan_control_sequence (void ) { the buffer left two or three places. */ -static boolean -check_expanded_code (integer *kk) { - int l; - int k = *kk; - int d =1; /* number of excess characters in an expanded code */ - int c,cc,ccc,cccc,ccccc,cccccc; /* constituents of a possible expanded code */ - if (buffer[k]==cur_chr && k2) - d=2*d-1; - else - d++; - if (cur_chr <= 0x7F) { - buffer[k-1]= cur_chr; - } else if (cur_chr<=0x7FF) { - buffer[k-1]=0xC0 + cur_chr / 0x40; - k++; d--; - buffer[k-1]=0x80 + cur_chr % 0x40; - } else if (cur_chr<=0xFFFF){ - buffer[k-1]=0xE0 + cur_chr / 0x1000; - k++; d--; - buffer[k-1]=0x80 + (cur_chr % 0x1000) / 0x40; - k++; d--; - buffer[k-1]=0x80 + (cur_chr % 0x1000) % 0x40; - } else { - buffer[k-1]=0xF0 + cur_chr / 0x40000; - k++; d--; - buffer[k-1]=0x80 + (cur_chr % 0x40000) / 0x1000; - k++; d--; - buffer[k-1]=0x80 + ((cur_chr % 0x40000) % 0x1000) / 0x40; - k++; d--; - buffer[k-1]=0x80 + ((cur_chr % 0x40000) % 0x1000) % 0x40; - } - l = k; - limit = limit - d; - while (l<=limit) { - buffer[l]=buffer[l+d]; - l++; +static boolean check_expanded_code(integer * kk) +{ + int l; + int k = *kk; + int d = 1; /* number of excess characters in an expanded code */ + int c, cc, ccc, cccc, ccccc, cccccc; /* constituents of a possible expanded code */ + if (buffer[k] == cur_chr && k < limit) { + if ((cur_chr == buffer[k + 1]) && (cur_chr == buffer[k + 2]) + && ((k + 6) <= limit)) { + d = 4; + if ((cur_chr == buffer[k + 3]) && ((k + 8) <= limit)) + d = 5; + if ((cur_chr == buffer[k + 4]) && ((k + 10) <= limit)) + d = 6; + c = buffer[k + d - 1]; + cc = buffer[k + d]; + ccc = buffer[k + d + 1]; + cccc = buffer[k + d + 2]; + if (d == 6) { + ccccc = buffer[k + d + 3]; + cccccc = buffer[k + d + 4]; + if (is_hex(c) && is_hex(cc) && is_hex(ccc) && is_hex(cccc) + && is_hex(ccccc) && is_hex(cccccc)) + six_hex_to_cur_chr; + } else if (d == 5) { + ccccc = buffer[k + d + 3]; + if (is_hex(c) && is_hex(cc) && is_hex(ccc) && is_hex(cccc) + && is_hex(ccccc)) + five_hex_to_cur_chr; + } else { + if (is_hex(c) && is_hex(cc) && is_hex(ccc) && is_hex(cccc)) + four_hex_to_cur_chr; + } + } else { + c = buffer[k + 1]; + if (c < 0200) { + d = 1; + if (is_hex(c) && (k + 2) <= limit) { + cc = buffer[k + 2]; + if (is_hex(c) && is_hex(cc)) { + d = 2; + hex_to_cur_chr; + } + } else if (c < 0100) { + cur_chr = c + 0100; + } else { + cur_chr = c - 0100; + } + } + } + if (d > 2) + d = 2 * d - 1; + else + d++; + if (cur_chr <= 0x7F) { + buffer[k - 1] = cur_chr; + } else if (cur_chr <= 0x7FF) { + buffer[k - 1] = 0xC0 + cur_chr / 0x40; + k++; + d--; + buffer[k - 1] = 0x80 + cur_chr % 0x40; + } else if (cur_chr <= 0xFFFF) { + buffer[k - 1] = 0xE0 + cur_chr / 0x1000; + k++; + d--; + buffer[k - 1] = 0x80 + (cur_chr % 0x1000) / 0x40; + k++; + d--; + buffer[k - 1] = 0x80 + (cur_chr % 0x1000) % 0x40; + } else { + buffer[k - 1] = 0xF0 + cur_chr / 0x40000; + k++; + d--; + buffer[k - 1] = 0x80 + (cur_chr % 0x40000) / 0x1000; + k++; + d--; + buffer[k - 1] = 0x80 + ((cur_chr % 0x40000) % 0x1000) / 0x40; + k++; + d--; + buffer[k - 1] = 0x80 + ((cur_chr % 0x40000) % 0x1000) % 0x40; + } + l = k; + limit = limit - d; + while (l <= limit) { + buffer[l] = buffer[l + d]; + l++; + } + *kk = k; + return true; } - *kk =k; - return true; - } - return false; + return false; } #define end_line_char_inactive ((end_line_char<0)||(end_line_char>127)) @@ -540,122 +560,126 @@ check_expanded_code (integer *kk) { There is one more branch. */ -static next_line_retval -next_line (void) { - integer tab; /* a category table */ - boolean inhibit_eol = false; /* a way to end a pseudo file without trailing space */ - detokenized_line=false; - local_catcode_table=false; - if (name>17) { - /* @ */ - incr(line); - first=start; - if (!force_eof) { - if (name<=20) { - if (pseudo_input()) { /* not end of file */ - firm_up_the_line(); /* this sets |limit| */ - if ((name==19)&&(pseudo_lines(pseudo_files)==null)) - inhibit_eol=true; - } else if ((every_eof!=null)&&!eof_seen[index]) { - limit=first-1; eof_seen[index]=true; /* fake one empty line */ - if (name!=19) - begin_token_list(every_eof,every_eof_text); - return next_line_restart; - } else { - force_eof=true; - } - } else { - if (name==21) { - if (luacstring_input()) { /* not end of strings */ - firm_up_the_line(); - if ((luacstring_penultimate())||(luacstring_simple())) - inhibit_eol=true; - if (!luacstring_simple()) - state=new_line; - if (luacstring_detokenized()) { - inhibit_eol=true; - detokenized_line=true; - } else { - if (! luacstring_defaultcattable()) { - tab=luacstring_cattable(); - if (valid_catcode_table(tab)) { - local_catcode_table=true; - line_catcode_table=tab; - } - } - } - } else { - force_eof=true; - } - } else { - if (lua_input_ln(cur_file,0,true)) { /* not end of file */ - firm_up_the_line(); /* this sets |limit| */ - } else if ((every_eof!=null)&& (!eof_seen[index])) { - limit=first-1; eof_seen[index]=true; /* fake one empty line */ - begin_token_list(every_eof,every_eof_text); - return next_line_restart; - } else { - force_eof=true; - } - } - } - } - if (force_eof) { - if (tracing_nesting>0) - if ((grp_stack[in_open]!=cur_boundary)||(if_stack[in_open]!=cond_ptr)) - if (!((name==19)||(name=21))) - file_warning(); /* give warning for some unfinished groups and/or conditionals */ - if ((name>21)||(name==20)) { - if (tracefilenames) - print_char(')'); - open_parens--; - /* update_terminal();*/ /* show user that file has been read */ - } - force_eof=false; - end_file_reading(); - return next_line_restart; - } - if (inhibit_eol||end_line_char_inactive) - limit--; - else - buffer[limit]=end_line_char; - first=limit+1; - loc=start; /* ready to read */ - } else { - if (!terminal_input) { /* \.{\\read} line has ended */ - cur_cmd=0; - cur_chr=0; - return next_line_return; /* OUTER */ - } - if (input_ptr>0) { /* text was inserted during error recovery */ - end_file_reading(); - return next_line_restart; /* resume previous level */ - } - if (selectornonstop_mode) { - if (end_line_char_inactive) - limit++; - if (limit==start) { /* previous line was empty */ - tprint_nl("(Please type a command or say `\\end')"); - } - print_ln(); - first=start; - prompt_input((str_number)'*'); /* input on-line into |buffer| */ - limit=last; - if (end_line_char_inactive) - limit--; - else - buffer[limit]=end_line_char; - first=limit+1; - loc=start; +static next_line_retval next_line(void) +{ + integer tab; /* a category table */ + boolean inhibit_eol = false; /* a way to end a pseudo file without trailing space */ + detokenized_line = false; + local_catcode_table = false; + if (name > 17) { + /* @ */ + incr(line); + first = start; + if (!force_eof) { + if (name <= 20) { + if (pseudo_input()) { /* not end of file */ + firm_up_the_line(); /* this sets |limit| */ + if ((name == 19) && (pseudo_lines(pseudo_files) == null)) + inhibit_eol = true; + } else if ((every_eof != null) && !eof_seen[index]) { + limit = first - 1; + eof_seen[index] = true; /* fake one empty line */ + if (name != 19) + begin_token_list(every_eof, every_eof_text); + return next_line_restart; + } else { + force_eof = true; + } + } else { + if (name == 21) { + if (luacstring_input()) { /* not end of strings */ + firm_up_the_line(); + if ((luacstring_penultimate()) || (luacstring_simple())) + inhibit_eol = true; + if (!luacstring_simple()) + state = new_line; + if (luacstring_detokenized()) { + inhibit_eol = true; + detokenized_line = true; + } else { + if (!luacstring_defaultcattable()) { + tab = luacstring_cattable(); + if (valid_catcode_table(tab)) { + local_catcode_table = true; + line_catcode_table = tab; + } + } + } + } else { + force_eof = true; + } + } else { + if (lua_input_ln(cur_file, 0, true)) { /* not end of file */ + firm_up_the_line(); /* this sets |limit| */ + } else if ((every_eof != null) && (!eof_seen[index])) { + limit = first - 1; + eof_seen[index] = true; /* fake one empty line */ + begin_token_list(every_eof, every_eof_text); + return next_line_restart; + } else { + force_eof = true; + } + } + } + } + if (force_eof) { + if (tracing_nesting > 0) + if ((grp_stack[in_open] != cur_boundary) + || (if_stack[in_open] != cond_ptr)) + if (!((name == 19) || (name = 21))) + file_warning(); /* give warning for some unfinished groups and/or conditionals */ + if ((name > 21) || (name == 20)) { + if (tracefilenames) + print_char(')'); + open_parens--; + /* update_terminal(); *//* show user that file has been read */ + } + force_eof = false; + end_file_reading(); + return next_line_restart; + } + if (inhibit_eol || end_line_char_inactive) + limit--; + else + buffer[limit] = end_line_char; + first = limit + 1; + loc = start; /* ready to read */ } else { - fatal_error(maketexstring("*** (job aborted, no legal \\end found)")); - /* nonstop mode, which is intended for overnight batch processing, - never waits for on-line input */ + if (!terminal_input) { /* \.{\\read} line has ended */ + cur_cmd = 0; + cur_chr = 0; + return next_line_return; /* OUTER */ + } + if (input_ptr > 0) { /* text was inserted during error recovery */ + end_file_reading(); + return next_line_restart; /* resume previous level */ + } + if (selector < log_only) + open_log_file(); + if (interaction > nonstop_mode) { + if (end_line_char_inactive) + limit++; + if (limit == start) { /* previous line was empty */ + tprint_nl("(Please type a command or say `\\end')"); + } + print_ln(); + first = start; + prompt_input((str_number) '*'); /* input on-line into |buffer| */ + limit = last; + if (end_line_char_inactive) + limit--; + else + buffer[limit] = end_line_char; + first = limit + 1; + loc = start; + } else { + fatal_error(maketexstring + ("*** (job aborted, no legal \\end found)")); + /* nonstop mode, which is intended for overnight batch processing, + never waits for on-line input */ + } } - } - return next_line_ok; + return next_line_ok; } @@ -663,46 +687,46 @@ next_line (void) { /* Let's consider now what happens when |get_next| is looking at a token list. */ -static boolean -get_next_tokenlist (void) { - register halfword t; /* a token*/ - t=info(loc); - loc=link(loc); /* move to next */ - if (t>=cs_token_flag) { /* a control sequence token */ - cur_cs=t-cs_token_flag; - cur_cmd=eq_type(cur_cs); - if (cur_cmd==dont_expand) { /* @*/ - /* The present point in the program is reached only when the |expand| - routine has inserted a special marker into the input. In this special - case, |info(loc)| is known to be a control sequence token, and |link(loc)=null|. - */ - cur_cs=info(loc)-cs_token_flag; - loc=null; - cur_cmd=eq_type(cur_cs); - if (cur_cmd>max_command) { - cur_cmd=relax; - cur_chr=no_expand_flag; - return true; - } - } - cur_chr=equiv(cur_cs); - } else { - cur_cmd=t >> string_offset_bits; /* cur_cmd=t / string_offset; */ - cur_chr=t & (string_offset-1); /* cur_chr=t % string_offset; */ - switch (cur_cmd) { - case left_brace: - align_state++; - break; - case right_brace: - align_state--; - break; - case out_param: /* @; */ - begin_token_list(param_stack[param_start+cur_chr-1],parameter); - return false; - break; +static boolean get_next_tokenlist(void) +{ + register halfword t; /* a token */ + t = info(loc); + loc = link(loc); /* move to next */ + if (t >= cs_token_flag) { /* a control sequence token */ + cur_cs = t - cs_token_flag; + cur_cmd = eq_type(cur_cs); + if (cur_cmd == dont_expand) { /* @ */ + /* The present point in the program is reached only when the |expand| + routine has inserted a special marker into the input. In this special + case, |info(loc)| is known to be a control sequence token, and |link(loc)=null|. + */ + cur_cs = info(loc) - cs_token_flag; + loc = null; + cur_cmd = eq_type(cur_cs); + if (cur_cmd > max_command) { + cur_cmd = relax; + cur_chr = no_expand_flag; + return true; + } + } + cur_chr = equiv(cur_cs); + } else { + cur_cmd = t >> string_offset_bits; /* cur_cmd=t / string_offset; */ + cur_chr = t & (string_offset - 1); /* cur_chr=t % string_offset; */ + switch (cur_cmd) { + case left_brace: + align_state++; + break; + case right_brace: + align_state--; + break; + case out_param: /* @; */ + begin_token_list(param_stack[param_start + cur_chr - 1], parameter); + return false; + break; + } } - } - return true; + return true; } /* Now we're ready to take the plunge into |get_next| itself. Parts of @@ -712,42 +736,42 @@ get_next_tokenlist (void) { /* sets |cur_cmd|, |cur_chr|, |cur_cs| to next token */ -void -get_next (void) { - RESTART: - cur_cs=0; - if (state!=token_list) { - /* Input from external file, |goto restart| if no input found */ - if (!get_next_file()) - goto RESTART; - } else { - if (loc==null) { - end_token_list(); - goto RESTART; /* list exhausted, resume previous level */ - } else if (!get_next_tokenlist()) { - goto RESTART; /* parameter needs to be expanded */ +void get_next(void) +{ + RESTART: + cur_cs = 0; + if (state != token_list) { + /* Input from external file, |goto restart| if no input found */ + if (!get_next_file()) + goto RESTART; + } else { + if (loc == null) { + end_token_list(); + goto RESTART; /* list exhausted, resume previous level */ + } else if (!get_next_tokenlist()) { + goto RESTART; /* parameter needs to be expanded */ + } + } + /* @ */ + if ((cur_cmd == tab_mark || cur_cmd == car_ret) && align_state == 0) { + insert_vj_template(); + goto RESTART; } - } - /* @ */ - if ((cur_cmd==tab_mark || cur_cmd==car_ret) && align_state==0) { - insert_vj_template(); - goto RESTART; - } } -void -get_token_lua (void) { - register int callback_id ; - callback_id = callback_defined(token_filter_callback); - if (callback_id!=0) { - while (state==token_list && loc==null && index!=v_template) - end_token_list(); - /* there is some stuff we don't want to see inside the callback */ - if (!(state==token_list && - ((nofilter==true) || (index==backed_up && loc!=null)))) { - do_get_token_lua(callback_id); - return; +void get_token_lua(void) +{ + register int callback_id; + callback_id = callback_defined(token_filter_callback); + if (callback_id != 0) { + while (state == token_list && loc == null && index != v_template) + end_token_list(); + /* there is some stuff we don't want to see inside the callback */ + if (!(state == token_list && + ((nofilter == true) || (index == backed_up && loc != null)))) { + do_get_token_lua(callback_id); + return; + } } - } - get_next(); + get_next(); } -- cgit v1.2.3