Index: text.c =================================================================== RCS file: /cvsroot/wv/text.c,v retrieving revision 1.46 diff -u -r1.46 text.c --- text.c 2000/08/23 02:19:38 1.46 +++ text.c 2000/08/25 07:55:53 @@ -135,7 +135,7 @@ return("CP1252"); case 0x041b: /*Slovak*/ return("CP1250"); case 0x041c: /*Albanian*/ return("CP1251"); - case 0x041d: /*Swedish*/ return("CP1250"); + case 0x041d: /*Swedish*/ return("CP1252"); case 0x041e: /*Thai*/ return("CP874"); case 0x041f: /*Turkish*/ return("CP1254"); case 0x0420: /*Urdu*/ return("CP1256"); @@ -555,6 +555,9 @@ switch(char16) { /* Fix up these as math characters: */ + case 0xb1: + printf("$\\pm$"); + return(1); case 0xb2: printf("$\\mathtwosuperior$"); return(1); Index: wvHtml.c =================================================================== RCS file: /cvsroot/wv/wvHtml.c,v retrieving revision 1.43 diff -u -r1.43 wvHtml.c --- wvHtml.c 2000/06/06 00:55:16 1.43 +++ wvHtml.c 2000/08/25 07:55:54 @@ -26,6 +26,8 @@ 0 on success */ +char *config=NULL; + int myelehandler(wvParseStruct *ps,wvTag tag, void *props, int dirty); int mydochandler(wvParseStruct *ps,wvTag tag); int myCharProc(wvParseStruct *ps,U16 eachchar,U8 chartype,U16 lid); @@ -174,7 +176,6 @@ { FILE *input; char *password=NULL; - char *config=NULL; char *dir=NULL; int ret; state_data myhandle; @@ -484,7 +485,34 @@ return(0); } +void wvStrangeNoGraphicData(char *config, int graphicstype) + { + wvError(("Strange No Graphic Data in the 0x01 graphic\n")); + if (strcmp(config, "wvLaTeX.xml") == 0) + printf("\n\\resizebox*{\\baselineskip}{!}{\\includegraphics{placeholder.eps}}\ + \n-- %#.2x graphic: StrangeNoGraphicData --", + graphicstype); + else + printf("\"%#.2x
", graphicstype, + "StrangeNoGraphicData"); + return; + } + +void wvPrintGraphics(char *config, int graphicstype, int width, int height, + char* source) + { + if (strcmp(config, "wvLaTeX.xml") == 0) + printf("\n\\resizebox{%dpt}{%dpt}\ + {\\includegraphics{placeholder.eps}}\ + \n-- %#.2x graphic %s -- \n", + width, height, graphicstype, source); + else + printf("\"%#.2x
", + width, height, graphicstype, source); + return; + } + int mySpecCharProc(wvParseStruct *ps,U16 eachchar,CHP *achp) { static int message,state; @@ -552,14 +580,14 @@ { wvTrace(("Here\n")); name = wvHtmlGraphic(ps,&blip); - printf("\"0x01
",(int)wvTwipsToHPixels(picf.dxaGoal),(int)wvTwipsToVPixels(picf.dyaGoal),name); + wvPrintGraphics(config, 0x01, + (int)wvTwipsToHPixels(picf.dxaGoal), + (int)wvTwipsToVPixels(picf.dyaGoal), + name); wvFree(name); } else - { - wvError(("Strange No Graphic Data in the 0x01 graphic\n")); - printf("\"0x08
","StrangeNoGraphicData"); - } + wvStrangeNoGraphicData(config, 0x01); wvStream_goto(ps->data,p); return(0); } @@ -577,16 +605,14 @@ { wvTrace(("Here\n")); name = wvHtmlGraphic(ps,&blip); - printf("\"0x08
", - (int)wvTwipsToHPixels(fspa->xaRight-fspa->xaLeft),(int)wvTwipsToVPixels(fspa->yaBottom-fspa->yaTop), + wvPrintGraphics(config, 0x08, + (int)wvTwipsToHPixels(fspa->xaRight-fspa->xaLeft), + (int)wvTwipsToVPixels(fspa->yaBottom-fspa->yaTop), name); wvFree(name); } else - { - wvError(("Strange No Graphic Data in the 0x01 graphic\n")); - printf("\"0x08
","StrangeNoGraphicData"); - } + wvStrangeNoGraphicData(config, 0x08); } else { Index: wvLaTeX.xml =================================================================== RCS file: /cvsroot/wv/wvLaTeX.xml,v retrieving revision 1.7 diff -u -r1.7 wvLaTeX.xml --- wvLaTeX.xml 2000/08/15 02:09:24 1.7 +++ wvLaTeX.xml 2000/08/25 07:55:55 @@ -345,8 +345,14 @@ - - +\vspace{} +\setlength{\parindent}{} +\setlength{\leftskip}{} +\setlength{\rightskip}{} + + +\vspace{} +