aab4f66a2aca5293f3536cc1d1438b17d2b09dfd tdreszer Thu May 5 16:14:15 2011 -0700 A large set of tiny changes. These fix a lot of discrepencies with bgcolor and font color declarations which were tripping up docttype 4.01. diff --git src/ameme/ameme.c src/ameme/ameme.c index 251c8e5..df1c18f 100644 --- src/ameme/ameme.c +++ src/ameme/ameme.c @@ -2263,32 +2263,32 @@ } void setFontColor(struct rgbColor color) /* Set the font color for html. */ { static struct rgbColor lastColor = {0,0,0}; static boolean firstTextColorSwitch = TRUE; if (color.r != lastColor.r || color.b != lastColor.b || color.g != lastColor.g) { if (firstTextColorSwitch) firstTextColorSwitch = FALSE; else - fprintf(htmlOut, "</FONT>"); - fprintf(htmlOut, "<FONT COLOR=#%02X%02X%02X>",color.r, color.g, color.b); + fprintf(htmlOut, "</span>"); + fprintf(htmlOut, "<span style='color:#%02X%02X%02X;'>",color.r, color.g, color.b); lastColor = color; } } void blackText() /* Set the font color for html to black. */ { static struct rgbColor black = {0,0,0}; setFontColor(black); } void colorTextOut(char c, struct rgbColor color) /* Print out one character in color to html file. */ { setFontColor(color); @@ -3227,29 +3227,29 @@ initRandom(); /* This one needs to be after htmlOut set up. */ /* Figure out if we're going to find a pattern in sequences, or just display * where a pre-computed pattern occurs in sequences. */ isMotifMatcher = cgiVarExists("motifMatcher"); if (isMotifMatcher) programName = "Motif Matcher"; else programName = "Improbizer"; /* Print out html header. Make background color brilliant white. */ if (isFromWeb) puts("Content-Type:text/html\n"); fprintf(htmlOut, "<HEAD>\n<TITLE>%s Results</TITLE>\n</HEAD>\n\n", programName); -fprintf(htmlOut, "<BODY BGCOLOR=#FFFFFF>\n\n"); +fprintf(htmlOut, "<BODY BGCOLOR='#FFFFFF'>\n\n"); /* Wrap error handling et. around doMiddle. */ if (isFromWeb) htmEmptyShell(doMiddle, NULL); else doMiddle(); //carefulCheckHeap(); /* Write end of html. */ htmEnd(htmlOut); return 0; }