diff -rcN --exclude=Makefile --exclude=*.bak --exclude=*.Bak --exclude=*.uu --exclude=*~ --exclude=*.patch --exclude=*.o --exclude=xcalendar ../xcalendar/Imakefile ./Imakefile *** ../xcalendar/Imakefile Sun Oct 1 12:19:17 1995 --- ./Imakefile Mon Jan 18 20:11:15 1999 *************** *** 1,28 **** XCALENDAR_LIBDIR = $(LIBDIR)/xcalendar LIBFILES = larrow.xbm qmark.xbm quit.xbm rarrow.xbm xcalendar.hlp - # Comment out the following two lines for the Motif version - LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) - EXTRA_DEFINES = -DATHENA - # Uncomment the following two lines for the Motif version - # LOCAL_LIBRARIES = -L/usr/local/Motif/lib -lXm $(XMULIB) $(XTOOLLIB) $(XLIB) - # EXTRA_DEFINES = -I/usr/local/Motif/include - SRCS = xcalendar.c dayeditor.c lists.c - OBJS = xcalendar.o dayeditor.o lists.o # # for Internationalization # ! EXTRA_DEFINES = -DXI18N -DATHENA ! ##if !SharedLibXwchar ! # _UseCat($(USRLIBDIR),$(CONTRIBSRC)/lib/Xwchar,/libXwchar.a) ! # XWCHARLIB = LoaderLibPrefix _Use(-lXwchar,$(DEPXWCHARLIB)) ! ##endif ! ##if !SharedLibXaw ! # DEPXAWLIB = _UseCat($(USRLIBDIR),$(CONTRIBSRC)/lib/Xaw,/libXaw.a) ! # XAWLIB = LoaderLibPrefix _Use(-lXaw,$(DEPXAWLIB)) ! ##endif ! #DEPLIBS = $(DEPXAWLIB) $(DEPXCHARLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) ! #LOCAL_LIBRARIES = $(XAWLIB) $(XWCHARLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) ComplexProgramTarget(xcalendar) --- 1,29 ---- XCALENDAR_LIBDIR = $(LIBDIR)/xcalendar LIBFILES = larrow.xbm qmark.xbm quit.xbm rarrow.xbm xcalendar.hlp # # for Internationalization # ! XCOMM #if !SharedLibXwchar ! XCOMM _UseCat($(USRLIBDIR),$(CONTRIBSRC)/lib/Xwchar,/libXwchar.a) ! XCOMM XWCHARLIB = LoaderLibPrefix _Use(-lXwchar,$(DEPXWCHARLIB)) ! XCOMM #endif ! XCOMM #if !SharedLibXaw ! XCOMM DEPXAWLIB = _UseCat($(USRLIBDIR),$(CONTRIBSRC)/lib/Xaw,/libXaw.a) ! XCOMM XAWLIB = LoaderLibPrefix _Use(-lXaw,$(DEPXAWLIB)) ! XCOMM #endif ! XCOMM DEPLIBS = $(DEPXAWLIB) $(DEPXCHARLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) ! ! # Comment out the following two lines for the Motif version ! LOCAL_LIBRARIES = $(XAWLIB) $(XWCHARLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) ! EXTRA_DEFINES = -DXI18N -DATHENA -D_REENTRANT ! ! # Uncomment the following two lines for the Motif version ! XCOMM LOCAL_LIBRARIES = -lXm $(XMULIB) $(XTOOLLIB) $(XLIB) ! XCOMM EXTRA_DEFINES = -DXI18N -D_REENTRANT ! ! SRCS = xcalendar.c dayeditor.c lists.c ! OBJS = xcalendar.o dayeditor.o lists.o ComplexProgramTarget(xcalendar) *************** *** 44,57 **** < $? \ > $@ install:: XCal-uj.ad ! MakeDir($(LIBDIR)/ja_JP.EUC/app-defaults) ! $(INSTALL) -c $(INSTAPPFLAGS) XCal-uj.ad $(LIBDIR)/ja_JP.EUC/app-defaults/XCalendar ! # MakeDir($(LIBDIR)/ja_JP.ujis/app-defaults) ! # $(INSTALL) -c $(INSTAPPFLAGS) XCal-uj.ad $(LIBDIR)/ja_JP.ujis/app-defaults/XCalendar clean:: $(RM) XCal-uj.ad MakeDirectories(install, $(XCALENDAR_LIBDIR)) InstallMultipleFlags($(LIBFILES), $(XCALENDAR_LIBDIR), $(INSTDATFLAGS)) --- 45,67 ---- < $? \ > $@ install:: XCal-uj.ad ! XCOMM MakeDir($(LIBDIR)/ja_JP.EUC/app-defaults) ! XCOMM $(INSTALL) -c $(INSTAPPFLAGS) XCal-uj.ad $(LIBDIR)/ja_JP.EUC/app-defaults/XCalendar ! ! XCOMM MakeDir($(LIBDIR)/ja_JP.ujis/app-defaults) ! XCOMM $(INSTALL) -c $(INSTAPPFLAGS) XCal-uj.ad $(LIBDIR)/ja_JP.ujis/app-defaults/XCalendar ! MakeDir($(LIBDIR)/ja/app-defaults) ! $(INSTALL) -c $(INSTAPPFLAGS) XCal-uj.ad $(LIBDIR)/ja/app-defaults/XCalendar clean:: $(RM) XCal-uj.ad MakeDirectories(install, $(XCALENDAR_LIBDIR)) InstallMultipleFlags($(LIBFILES), $(XCALENDAR_LIBDIR), $(INSTDATFLAGS)) + + + EXCLUDE=--exclude=Makefile --exclude=\*.bak --exclude=\*.Bak --exclude=\*.uu --exclude=\*~ --exclude=\*.patch --exclude=\*.o --exclude=xcalendar + patch: + -diff -rcN $(EXCLUDE) ../xcalendar . > ../xcalendar-4.0+i18n-amateras.patch + diff -rcN --exclude=Makefile --exclude=*.bak --exclude=*.Bak --exclude=*.uu --exclude=*~ --exclude=*.patch --exclude=*.o --exclude=xcalendar ../xcalendar/XCal-uj.sed ./XCal-uj.sed *** ../xcalendar/XCal-uj.sed Sun Oct 1 14:31:06 1995 --- ./XCal-uj.sed Mon Jan 18 20:05:08 1999 *************** *** 12,18 **** *FontList: 8x13 *helpFile: %%XCALENDAR_LIBDIR%%/xcalendar.hlp ! *holidayFile: %%XCALENDAR_LIBDIR%%/xcalendar.hol *firstDay: 7 --- 12,20 ---- *FontList: 8x13 *helpFile: %%XCALENDAR_LIBDIR%%/xcalendar.hlp ! *holidayFile: %%XCALENDAR_LIBDIR%%/xcalendar.hol ! *holiday2File: %%XCALENDAR_LIBDIR%%/xcalendar.hol2 ! *simpleHolidayFile: /usr/local/share/holidays.txt *firstDay: 7 *************** *** 50,56 **** #ifdef COLOR ! colors *Background: lightgray ! *markBackground: Steel Blue *daynames*Background: lightgray *daynames.SUN*Foreground: Red *daynames.SAT*Foreground: Black --- 52,58 ---- #ifdef COLOR ! colors *Background: lightgray ! *markBackground: steelblue *daynames*Background: lightgray *daynames.SUN*Foreground: Red *daynames.SAT*Foreground: Black *************** *** 74,84 **** *setMarkBackground: True *markOnStartup: True - ! *markCurrent: True ! *currentForeground: Blue *markHoliday: True *holidayForeground: Red *BorderWidth: 2 *calendar.borderWidth: 1 --- 76,87 ---- *setMarkBackground: True *markOnStartup: True *markCurrent: True ! *currentForeground: Purple *markHoliday: True *holidayForeground: Red + *markHoliday2: True + *holiday2Foreground: Blue *BorderWidth: 2 *calendar.borderWidth: 1 *************** *** 159,165 **** --- 162,170 ---- *helpWindow*cursorPositionVisible: False *helpWindow*displayCaret: False + ! Keyboard accelerators + *editorControls*doneButton*accelerators: #override \n\ Metaq: set() notify() reset() \n *editorControls*saveButton*accelerators: #override \n\ *************** *** 179,184 **** --- 184,192 ---- *quitButton*accelerators: #override \n\ q: set() notify() \n + + ! Motif text translations to make it work like emacs + *XmText.translations: #override\n\ Ctrl b: backward-character()\n\ Alt b: backward-word()\n\ *************** *** 199,205 **** Alt >: end-of-file()\n\ Meta >: end-of-file()\n\ Ctrl e: end-of-line()\n\ - Shift Ctrl e: end-of-line(extend)\n\ Ctrl f: forward-character()\n\ Alt ]: forward-paragraph()\n\ --- 207,212 ---- *************** *** 230,233 **** Ctrl osfDown: next-page()\n\ Ctrl osfUp: previous-page()\n\ Ctrl space: set-anchor()\n - --- 237,239 ---- diff -rcN --exclude=Makefile --exclude=*.bak --exclude=*.Bak --exclude=*.uu --exclude=*~ --exclude=*.patch --exclude=*.o --exclude=xcalendar ../xcalendar/XCalendar.sed ./XCalendar.sed *** ../xcalendar/XCalendar.sed Tue Jul 4 06:59:01 1995 --- ./XCalendar.sed Mon Jan 18 18:52:22 1999 *************** *** 12,17 **** --- 12,19 ---- *helpFile: %%XCALENDAR_LIBDIR%%/xcalendar.hlp *holidayFile: %%XCALENDAR_LIBDIR%%/xcalendar.hol + *holiday2File: %%XCALENDAR_LIBDIR%%/xcalendar.hol2 + *simpleHolidayFile: /usr/local/share/holidays.txt *firstDay: 7 *************** *** 24,47 **** *helpButton*bitmap: %%XCALENDAR_LIBDIR%%/qmark.xbm *quitButton*bitmap: %%XCALENDAR_LIBDIR%%/quit.xbm *prev*labelType: XmPIXMAP ! *prev*labelPixmap: /usr/local/X11R5/lib/X11/xcalendar/larrow.xbm *succ*labelType: XmPIXMAP ! *succ*labelPixmap: /usr/local/X11R5/lib/X11/xcalendar/rarrow.xbm *prevday*labelType: XmPIXMAP ! *prevday*labelPixmap: /usr/local/X11R5/lib/X11/xcalendar/larrow.xbm *succday*labelType: XmPIXMAP ! *succday*labelPixmap: /usr/local/X11R5/lib/X11/xcalendar/rarrow.xbm *quitButton*labelType: XmPIXMAP ! *quitButton*labelPixmap: /usr/local/X11R5/lib/X11/xcalendar/quit.xbm *helpButton*labelType: XmPIXMAP ! *helpButton*labelPixmap: /usr/local/X11R5/lib/X11/xcalendar/qmark.xbm ! colors ! Note: These may cause problems using the -rv option on monochrome displays *Background: lightgray ! *markBackground: gray *daynames*Background: lightgray *daynames.SUN*Foreground: Red *daynames.SAT*Foreground: Black --- 26,49 ---- *helpButton*bitmap: %%XCALENDAR_LIBDIR%%/qmark.xbm *quitButton*bitmap: %%XCALENDAR_LIBDIR%%/quit.xbm *prev*labelType: XmPIXMAP ! *prev*labelPixmap: /usr/lib/X11/xcalendar/larrow.xbm *succ*labelType: XmPIXMAP ! *succ*labelPixmap: /usr/lib/X11/xcalendar/rarrow.xbm *prevday*labelType: XmPIXMAP ! *prevday*labelPixmap: /usr/lib/X11/xcalendar/larrow.xbm *succday*labelType: XmPIXMAP ! *succday*labelPixmap: /usr/lib/X11/xcalendar/rarrow.xbm *quitButton*labelType: XmPIXMAP ! *quitButton*labelPixmap: /usr/lib/X11/xcalendar/quit.xbm *helpButton*labelType: XmPIXMAP ! *helpButton*labelPixmap: /usr/lib/X11/xcalendar/qmark.xbm ! colors ! Note: These may cause problems using the -rv option on monochrome displays *Background: lightgray ! *markBackground: steelblue *daynames*Background: lightgray *daynames.SUN*Foreground: Red *daynames.SAT*Foreground: Black *************** *** 67,75 **** *setMarkBackground: True *markOnStartup: True *markCurrent: True ! *currentForeground: Blue *markHoliday: True *holidayForeground: Red *holiday*fontList: 6x13 *BorderWidth: 2 --- 69,79 ---- *setMarkBackground: True *markOnStartup: True *markCurrent: True ! *currentForeground: Purple *markHoliday: True *holidayForeground: Red + *markHoliday2: True + *holiday2Foreground: Blue *holiday*fontList: 6x13 *BorderWidth: 2 *************** *** 127,133 **** *helpWindow*cursorPositionVisible: False *helpWindow*displayCaret: False ! !! Keyboard accelerators for Athena version *Box*doneButton*accelerators: #override \n\ Metaq: set() notify() reset() \n --- 131,138 ---- *helpWindow*cursorPositionVisible: False *helpWindow*displayCaret: False ! ! ! Keyboard accelerators for Athena version *Box*doneButton*accelerators: #override \n\ Metaq: set() notify() reset() \n *************** *** 180,186 **** Ctrl Alt f: forward-word()\n\ Ctrl Meta f: forward-word()\n\ Ctrl d: kill-next-character()\n\ ! Ctrl h: kill-previous-character()\n\ Alt BackSpace: kill-previous-word()\n\ Meta BackSpace: kill-previous-word()\n\ Ctrl w: key-select() kill-selection()\n\ --- 185,191 ---- Ctrl Alt f: forward-word()\n\ Ctrl Meta f: forward-word()\n\ Ctrl d: kill-next-character()\n\ ! Ctrl h: kill-previous-character()\n\ Alt BackSpace: kill-previous-word()\n\ Meta BackSpace: kill-previous-word()\n\ Ctrl w: key-select() kill-selection()\n\ *************** *** 196,205 **** Ctrl p: previous-line()\n\ Ctrl g: process-cancel()\n\ Ctrl l: redraw-display()\n\ ! Ctrl v: next-page()\n\ ! Meta v: previous-page()\n\ Ctrl osfDown: next-page()\n\ Ctrl osfUp: previous-page()\n\ Ctrl space: set-anchor()\n - - --- 201,208 ---- Ctrl p: previous-line()\n\ Ctrl g: process-cancel()\n\ Ctrl l: redraw-display()\n\ ! Ctrl v: next-page()\n\ ! Meta v: previous-page()\n\ Ctrl osfDown: next-page()\n\ Ctrl osfUp: previous-page()\n\ Ctrl space: set-anchor()\n diff -rcN --exclude=Makefile --exclude=*.bak --exclude=*.Bak --exclude=*.uu --exclude=*~ --exclude=*.patch --exclude=*.o --exclude=xcalendar ../xcalendar/xcalendar.c ./xcalendar.c *** ../xcalendar/xcalendar.c Tue Jul 4 06:59:01 1995 --- ./xcalendar.c Mon Jan 18 19:11:56 1999 *************** *** 45,50 **** --- 45,51 ---- int debug = 0; List daylist; List holilist; + List holilist2; void FormGeometryHandler(); LList *dayEntryList; Cardinal day, month, year; *************** *** 132,137 **** --- 133,142 ---- offset(calendarDir), XtRImmediate, NULL}, {"holidayFile", "HolidayFile", XtRString, sizeof(String), offset(holidayFile), XtRImmediate, "/usr/lib/X11/xcalendar/xcalendar.hol"}, + {"holiday2File", "Holiday2File", XtRString, sizeof(String), + offset(holiday2File), XtRImmediate, "/usr/lib/X11/xcalendar/xcalendar.hol2"}, + {"simpleHolidayFile", "SimpleHolidayFile", XtRString, sizeof(String), + offset(simpleHolidayFile), XtRImmediate, "/usr/local/share/holidays.txt"}, {"oldStyle", "OldStyle", XtRBoolean, sizeof(Boolean), offset(oldStyle), XtRString, "True"}, {"markCurrent", "MarkCurrent", XtRBoolean, sizeof(Boolean), *************** *** 141,149 **** {"currentForeground", "CurrentForeground", XtRPixel, sizeof(Pixel), offset(currentForeground), XtRString, XtDefaultForeground}, {"markHoliday", "MarkHoliday", XtRBoolean, sizeof(Boolean), ! offset(markHoliday), XtRString, "False"}, {"holidayForeground", "HolidayForeground", XtRPixel, sizeof(Pixel), ! offset(holidayForeground), XtRString, XtDefaultForeground}, }; static int marked_day; --- 146,158 ---- {"currentForeground", "CurrentForeground", XtRPixel, sizeof(Pixel), offset(currentForeground), XtRString, XtDefaultForeground}, {"markHoliday", "MarkHoliday", XtRBoolean, sizeof(Boolean), ! offset(markHoliday), XtRString, "True"}, {"holidayForeground", "HolidayForeground", XtRPixel, sizeof(Pixel), ! offset(holidayForeground), XtRString, "Red"}, ! {"markHoliday2", "MarkHoliday2", XtRBoolean, sizeof(Boolean), ! offset(markHoliday2), XtRString, "True"}, ! {"holiday2Foreground", "Holiday2Foreground", XtRPixel, sizeof(Pixel), ! offset(holiday2Foreground), XtRString, "Blue"}, }; static int marked_day; *************** *** 402,407 **** --- 411,418 ---- #endif LoadHolidays(); + LoadHolidays2(); + LoadSimpleHolidays(); day = current_day(); month = current_month(); *************** *** 509,514 **** --- 520,530 ---- XtSetArg(colors[0], XtNforeground, appResources.holidayForeground); } + if (is_holiday2((Widget) listp->element) && + appResources.markHoliday2) { + XtSetArg(colors[0], XtNforeground, + appResources.holiday2Foreground); + } if (is_today((Widget) listp->element) && appResources.markCurrent) { XtSetArg(colors[0], XtNforeground, appResources.currentForeground); *************** *** 544,549 **** --- 560,571 ---- appResources.holidayForeground); XtSetValues((Widget) listp->element, colors, 1); } + if (is_holiday2((Widget) listp->element) && + appResources.markHoliday2) { + XtSetArg(colors[0], XtNforeground, + appResources.holiday2Foreground); + XtSetValues((Widget) listp->element, colors, 1); + } if (is_today((Widget) listp->element) && appResources.markCurrent) { XtSetArg(colors[0], XtNforeground, *************** *** 599,604 **** --- 621,632 ---- n++; XtSetValues(w, colors, n); } + if (is_holiday2(w) && appResources.markHoliday2) { + n = 0; + XtSetArg(colors[n], XtNforeground, appResources.holiday2Foreground); + n++; + XtSetValues(w, colors, n); + } if (is_today(w) && appResources.markCurrent) { n = 0; XtSetArg(colors[n], XtNforeground, appResources.currentForeground); *************** *** 619,624 **** --- 647,655 ---- if (is_holiday(w) && appResources.markHoliday) XtSetArg(colors[n], XtNforeground, appResources.holidayForeground); + if (is_holiday2(w) && appResources.markHoliday2) + XtSetArg(colors[n], XtNforeground, + appResources.holiday2Foreground); if (is_today(w) && appResources.markCurrent) XtSetArg(colors[n], XtNforeground, appResources.currentForeground); *************** *** 1341,1346 **** --- 1372,1400 ---- } /* + * is_holiday2() - Returns true if the widget is for a holiday level II. + */ + + Boolean + is_holiday2(w) + Widget w; + { + int i; + struct holiday *holi; + + for (i = 0; i < holilist2->pos; i++) { + holi = *((Holiday *) holilist2->list + i); + if (((GetWidgetFromList(daylist, + FirstDay(displayedMonth, displayedYear) - + 1 + holi->day)) == w) && + (holi->month == displayedMonth) && + (holi->year == displayedYear)) + return (True); + } + return (False); + } + + /* * MakeDayList() - Keeps a list of all days. */ *************** *** 1357,1363 **** w = GetWidgetFromList(daylist, i); allDaysList = (LList *) pput(w, allDaysKey, allDaysList); allDaysList->data = XtMalloc(sizeof(MarkColors)); ! XtSetArg(args[n], XtNbackground, &DayBackground(allDaysList)); n++; XtSetArg(args[n], XtNforeground, &(DayForeground(allDaysList))); n++; --- 1411,1417 ---- w = GetWidgetFromList(daylist, i); allDaysList = (LList *) pput(w, allDaysKey, allDaysList); allDaysList->data = XtMalloc(sizeof(MarkColors)); ! XtSetArg(args[n], XtNbackground, &(DayBackground(allDaysList))); n++; XtSetArg(args[n], XtNforeground, &(DayForeground(allDaysList))); n++; *************** *** 1896,1898 **** --- 1950,2085 ---- XtFree(start); } + /* + * LoadHolidays2() - Loads the holiday file level II. + */ + + void + LoadHolidays2() + { + char *buf; + int n; + int len; + char *next; + char *tab; + char *start; + struct holiday *holi; + + n = 2048; + buf = XtMalloc(sizeof(char) * n); + + holilist2 = CreateList(1, sizeof(Holiday)); + + len = read_file(appResources.holiday2File, buf, n); + if (len == -1) + return; + else if (len > n) { + buf = XtRealloc(buf, len + 1); + n = len + 1; + len = read_file(appResources.holiday2File, buf, n); + if (len == -1) + return; + } + start = buf; + + while (len > 0) { + next = strchr(buf, '\n'); + tab = strchr(buf, '\t'); + if (tab == NULL) { + XtFree(start); + return; + } + if (next != NULL) { + next[0] = '\0'; + } + holi = (struct holiday *) XtMalloc(sizeof(struct holiday)); + holi->text = XtMalloc(sizeof(char) * strlen(tab)); + sscanf(buf, "%d/%d/%d", &holi->month, &holi->day, &holi->year); + strcpy(holi->text, tab + 1); + (void) PushOnList(holilist2, &holi); + if (next == NULL) { + XtFree(start); + return; + } + buf = next + 1; + len = strlen(buf); + } + XtFree(start); + } + + /* + * LoadSimpleHolidays() - Loads the simple-style holiday file. + */ + + void + LoadSimpleHolidays() + { + char *buf; + char *ptr; + char *lasts; + char *p; + char *l; + int r; + int n; + int len; + char *start; + char *next; + struct holiday *holi; + int year, month, day; + + n = 2048; + buf = XtMalloc(sizeof(char) * n); + + len = read_file(appResources.simpleHolidayFile, buf, n); + if (len == -1) + return; + else if (len > n) { + buf = XtRealloc(buf, len + 1); + n = len + 1; + len = read_file(appResources.simpleHolidayFile, buf, n); + if (len == -1) + return; + } + start = buf; + + while (len > 0) { + next = strchr(buf, '\n'); + if (next != NULL) + next[0] = '\0'; + month = -1; + day = -1; + r = 0; + ptr = strtok_r(buf, "\t", &lasts); + while (ptr) { + if (buf == ptr) { + year = atoi(ptr); + } else if (month == -1) { + month = atoi(ptr); + } else { + p = strtok_r(ptr, ",", &l); + while (p) { + day = atoi(p); + holi = (struct holiday *) XtMalloc(sizeof(struct holiday)); + holi->month = month; + holi->day = day; + holi->year = year; + holi->text = ""; + if (r == 2) + (void) PushOnList(holilist, &holi); + else + (void) PushOnList(holilist2, &holi); + p = strtok_r(NULL, ",", &l); + } + } + r++; + ptr = strtok_r(NULL, "\t", &lasts); + } + if (next == NULL) { + len = 0; + } else { + buf = next + 1; + len = strlen(buf); + } + } + XtFree(start); + } diff -rcN --exclude=Makefile --exclude=*.bak --exclude=*.Bak --exclude=*.uu --exclude=*~ --exclude=*.patch --exclude=*.o --exclude=xcalendar ../xcalendar/xcalendar.h ./xcalendar.h *** ../xcalendar/xcalendar.h Sun Oct 1 12:21:42 1995 --- ./xcalendar.h Mon Jan 18 18:01:45 1999 *************** *** 37,43 **** #include ! #include #include #include #include --- 37,44 ---- #include ! #include ! #include #include #include #include *************** *** 103,114 **** --- 104,119 ---- int textBufferSize; char *calendarDir; char *holidayFile; + char *holiday2File; + char *simpleHolidayFile; Boolean oldStyle; Boolean markCurrent; int updateCurrent; Pixel currentForeground; Boolean markHoliday; Pixel holidayForeground; + Boolean markHoliday2; + Pixel holiday2Foreground; } AppResourcesRec, *AppResources; typedef struct holiday{ *************** *** 192,198 **** --- 197,206 ---- extern void CloseEditors(); extern Boolean is_today(); extern Boolean is_holiday(); + extern Boolean is_holiday2(); extern void LoadHolidays(); + extern void LoadHolidays2(); + extern void LoadSimpleHolidays(); extern void Fill_In_Date(); extern void MakeDayList(); extern int current_month(); *************** *** 215,220 **** --- 223,229 ---- extern LList *dayEntryList; extern List daylist; extern List holilist; + extern List holilist2; extern Cardinal day,month,year; extern AppResourcesRec appResources; /* application specific resources */ extern LList *allDaysList;