diff -c -r xmulti200beta/fonts/fonts.c xmulti-current/fonts/fonts.c *** xmulti200beta/fonts/fonts.c Mon Dec 22 13:20:07 1997 --- xmulti-current/fonts/fonts.c Wed Jan 7 18:24:10 1998 *************** *** 300,306 **** int a, min = 99999; /* scalable */ ! if (scale_ok && face->scale_ok || face->scalable) r = fontface_addpoint(face, point); else { /* 一番近いサイズのものを探す */ --- 300,306 ---- int a, min = 99999; /* scalable */ ! if ((scale_ok && face->scale_ok) || face->scalable) r = fontface_addpoint(face, point); else { /* 一番近いサイズのものを探す */ diff -c -r xmulti200beta/fonts/text.c xmulti-current/fonts/text.c *** xmulti200beta/fonts/text.c Sat Dec 27 21:04:35 1997 --- xmulti-current/fonts/text.c Wed Jan 7 18:24:10 1998 *************** *** 38,44 **** while (p != NULL) { q = p; p = p->next; ! fontname_delete(p); } } --- 38,44 ---- while (p != NULL) { q = p; p = p->next; ! fontname_delete(q); } } diff -c -r xmulti200beta/html/dtd_y.y xmulti-current/html/dtd_y.y *** xmulti200beta/html/dtd_y.y Mon Dec 22 13:20:03 1997 --- xmulti-current/html/dtd_y.y Wed Jan 7 18:24:05 1998 *************** *** 1,5 **** --- 1,6 ---- %{ #include + #include #include #include "tag.h" diff -c -r xmulti200beta/html/obj.c xmulti-current/html/obj.c *** xmulti200beta/html/obj.c Tue Dec 23 20:46:19 1997 --- xmulti-current/html/obj.c Wed Jan 7 18:24:06 1998 *************** *** 22,28 **** p->width = 0; p->lbearing = p->rbearing = 0; p->ascent = p->descent = 0; ! p->pixel = 0; return p; } --- 22,28 ---- p->width = 0; p->lbearing = p->rbearing = 0; p->ascent = p->descent = 0; ! p->pixel = 0; return p; } *************** *** 96,102 **** perror("htmlimageobj_new"); exit(1); } - p->next = NULL; p->anim = NULL; return p; } --- 96,101 ---- diff -c -r xmulti200beta/html/obj.h xmulti-current/html/obj.h *** xmulti200beta/html/obj.h Tue Dec 23 13:00:29 1997 --- xmulti-current/html/obj.h Wed Jan 7 18:24:06 1998 *************** *** 18,23 **** --- 18,24 ---- typedef struct HTMLObj { struct HTMLObj *prev; struct HTMLObj *next; + HTMLObjType type; int x, y; *************** *** 36,49 **** } HTMLObj, *HTMLObjList; typedef struct HTMLTextObj { - struct HTMLTextObj *next; wchar_t *str; int len; OC *oc; } HTMLTextObj, *HTMLTextObjList; typedef struct HTMLImageObj { - struct HTMLOtherObj *next; Animate *anim; } HTMLImageObj, *HTMLImageObjList; --- 37,48 ---- diff -c -r xmulti200beta/html/style_l.l xmulti-current/html/style_l.l *** xmulti200beta/html/style_l.l Thu Dec 25 11:37:18 1997 --- xmulti-current/html/style_l.l Wed Jan 7 18:24:08 1998 *************** *** 4,9 **** --- 4,10 ---- from http://www.w3.org/TR/REC-CSS1#appendix-b */ #include + #include #include #include "stylesheet.h" diff -c -r xmulti200beta/html/style_term.c xmulti-current/html/style_term.c *** xmulti200beta/html/style_term.c Fri Dec 26 05:54:23 1997 --- xmulti-current/html/style_term.c Wed Jan 7 18:24:09 1998 *************** *** 103,107 **** --- 103,108 ---- case SSTERM_URL: case SSTERM_RGB: } + return 0; } diff -c -r xmulti200beta/html/stylesheet.c xmulti-current/html/stylesheet.c *** xmulti200beta/html/stylesheet.c Thu Dec 25 16:11:10 1997 --- xmulti-current/html/stylesheet.c Wed Jan 7 18:24:08 1998 *************** *** 140,146 **** while (p != NULL) { q = p; p = p->next; ! declarationset_delete(p); } } --- 140,146 ---- while (p != NULL) { q = p; p = p->next; ! declarationset_delete(q); } } *************** *** 185,191 **** while (p != NULL) { q = p; p = p->next; ! simpleselector_delete(p); } } --- 185,191 ---- while (p != NULL) { q = p; p = p->next; ! simpleselector_delete(q); } } *************** *** 279,285 **** while (p != NULL) { q = p; p = p->next; ! selectorset_delete(p); } } --- 279,285 ---- while (p != NULL) { q = p; p = p->next; ! selectorset_delete(q); } } *************** *** 333,339 **** while (p != NULL) { q = p; p = p->next; ! stylesheet_delete(p); } } --- 333,339 ---- while (p != NULL) { q = p; p = p->next; ! stylesheet_delete(q); } } Only in xmulti-current: http diff -c -r xmulti200beta/imagelib/anim_l.l xmulti-current/imagelib/anim_l.l *** xmulti200beta/imagelib/anim_l.l Mon Dec 22 13:20:05 1997 --- xmulti-current/imagelib/anim_l.l Wed Jan 7 18:23:53 1998 *************** *** 1,4 **** --- 1,6 ---- %{ + #include + #include #include #include "anim_y.h" diff -c -r xmulti200beta/imagelib/anim_y.y xmulti-current/imagelib/anim_y.y *** xmulti200beta/imagelib/anim_y.y Mon Dec 22 13:20:05 1997 --- xmulti-current/imagelib/anim_y.y Wed Jan 7 18:23:52 1998 *************** *** 1,5 **** --- 1,6 ---- %{ #include + #include #include #include "namelist.h" #include "animate.h"