diff -Naur --exclude CVS ../abi-current/wv/exporter/TODO.txt wv/exporter/TODO.txt --- ../abi-current/wv/exporter/TODO.txt Fri Jul 28 00:30:46 2000 +++ wv/exporter/TODO.txt Sun Jul 30 20:12:26 2000 @@ -1,31 +1,60 @@ -File Issues/Concerns +File Status/Issues/Concerns --------------------------------------------------------------------------- -anld.c Does it need a toBucket() method? -anlv.c Does is need a toBucket() method? +anld.c Done +anlv.c Done asumy.c Done asumyi.c Done -atrd.c Does it need a PCLF method? -bkd.c Does it need a PCLF method? -bkf.c Does it need a PCLF method? -bkl.c Does it need a PCLF method? +atrd.c Done +bkd.c Done +bkf.c Done +bkl.c Done blip.c **TODO** -brc.c **TODO** -bte.c Does it need a PCLF method? -chp.c **Does it need a toBucket() method?** +brc.c Done +bte.c Done +bx.c **TODO** +chp.c **TODO** clx.c **TODO** -dcs.c Does it need a PCLF method? +dcs.c Done dogrid.c Done -dop.c **putCOPTS() is done, putDOP() is not** +dop.c **TODO: putCOPTS() is done, putDOP() is not** doptypography.c Done dttm.c Done escher.c **TODO** -fbse.c **TODO** -fdoa.c Does it need a PCLF method? -ffn.c **TODO** -fib.c **putFib():HUGE CHECK ME!!, code putFib6() ** +fbse.c **TODO: needs more work** +fdoa.c Done +ffn.c Done +fib.c **TODO: code wvPutFib6()** filetime.c Done -fld.c Does it need a PCLF method? +fkp.c **TODO** +fld.c Done font.c Done -fopt.c In progress... - -lvl.c Does it need a wvGetLVL method? +fopt.c **TODO: CHECK ME** +frd.c Done +fspa.c Done +ftxbxs.c Done +generic.c Done +lfo.c Done +lspd.c Done +lst.c **TODO: Done??** +lvl.c Done +numrm.c Done +olst.c Done +pcd.c Done +pgd.c Done +phe.c **TODO: Done??** +picf.c **TODO: need for embedded graphics** +prm.c Done +rr.c Done +rs.c Done +sed.c Done +sep.c Done +shd.c Done +sprm.c **TODO: do we need to code this?** +sttbf.c **TODO** +stylesheet.c **TODO** +table.c **TODO: BIG!!** +tbd.c Done +tc.c Done +tlp.c Done +wkb.c Done +xst.c **TODO** \ No newline at end of file diff -Naur --exclude CVS ../abi-current/wv/exporter/anld.c wv/exporter/anld.c --- ../abi-current/wv/exporter/anld.c Fri Jul 28 00:30:46 2000 +++ wv/exporter/anld.c Sun Jul 30 17:27:15 2000 @@ -1,5 +1,3 @@ -/* TODO: do I need to code wvPutANLD_ToBucket()?? */ - void wvPutANLD(version ver,ANLD *item,wvStream *fd) { U8 temp8 = (U8)0; @@ -51,4 +49,4 @@ write_8ubit(fd, item->rgxch[i]); } -} \ No newline at end of file +} diff -Naur --exclude CVS ../abi-current/wv/exporter/anlv.c wv/exporter/anlv.c --- ../abi-current/wv/exporter/anlv.c Fri Jul 28 00:30:46 2000 +++ wv/exporter/anlv.c Sun Jul 30 17:28:14 2000 @@ -1,5 +1,3 @@ -/* TODO: do we need write to bucket routines? */ - void wvPutANLV(ANLV *item,wvStream *fd) { U8 temp8 = (U8)0; @@ -38,4 +36,4 @@ write_16ubit(item->iStartAt); write_16ubit(item->dxaIndent); write_16ubit((U16)item->dxaSpace); -} \ No newline at end of file +} diff -Naur --exclude CVS ../abi-current/wv/exporter/brc.c wv/exporter/brc.c --- ../abi-current/wv/exporter/brc.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/brc.c Sun Jul 30 19:47:35 2000 @@ -0,0 +1,40 @@ +#include +#include +#include "wvexporter.h" + +void wvPutBRC10(BRC *item, wvStream *fd) +{ + /* todo someday?? what's it good for? */ +} + +void wvPutBRC6(BRC *item, wvStream *fd) +{ + /* non-word8 support */ + U16 temp16 = 0; + + temp16 |= item->dptLineWidth; + temp16 |= item->brcType<<3; + temp16 |= item->fShadow<<5; + temp16 |= item->ico<<6; + temp16 |= item->dptSpace<<11; + + write_16ubit(fd, temp16); +} + +void wvPutBRC(BRC *item, wvStream *fd) +{ + U8 temp8 = 0; + + /* word 8 support */ + + write_8ubit(fd, item->dptLineWidth); + write_8ubit(fd, item->brcType); + write_8ubit(fd, item->ico); + + temp8 |= item->dptSpace; + temp8 |= item->fShadow << 5; + temp8 |= item->fFrame << 6; + temp8 |= item->reserved << 7; + + write_8ubit(fd, temp8); +} diff -Naur --exclude CVS ../abi-current/wv/exporter/bx.c wv/exporter/bx.c --- ../abi-current/wv/exporter/bx.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/bx.c Sun Jul 30 19:49:11 2000 @@ -0,0 +1,9 @@ +#include "wvexporter.h" + +void wvPutBX(BX *item, U8 *page, U16 *pos) +{ +} + +void wvPutBX6(BX *item, U8 *page, U16 *pos) +{ +} diff -Naur --exclude CVS ../abi-current/wv/exporter/chp.c wv/exporter/chp.c --- ../abi-current/wv/exporter/chp.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/chp.c Sun Jul 30 18:29:33 2000 @@ -0,0 +1,6 @@ +#include "wvexporter.h" + +void wvPutCHPX() +{ + +} diff -Naur --exclude CVS ../abi-current/wv/exporter/fbse.c wv/exporter/fbse.c --- ../abi-current/wv/exporter/fbse.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/fbse.c Sun Jul 30 19:58:27 2000 @@ -0,0 +1,25 @@ +#include +#include +#include "wvexporter.h" + +/* TODO: code wvPutBlip(), wvPutMetafile() */ + +void wvPutFBSE(FBSE *item, wvStream *fd) +{ + int i; + + write_8ubit(fd, item->btWin32); + write_8ubit(fd, item->btMacOS); + + for(i=0;i<16;i++) + write_8ubit(fd, item->rgbUid[i]); + + write_16ubit(fd, item->tag); + write_32ubit(fd, item->size); + write_32ubit(fd, item->cRef); + write_32ubit(fd, item->foDelay); + write_8ubit(fd, item->usage); + write_8ubit(fd, item->cbName); + write_8ubit(fd, item->unused2); + write_8ubit(fd, item->unused3); +} diff -Naur --exclude CVS ../abi-current/wv/exporter/ffn.c wv/exporter/ffn.c --- ../abi-current/wv/exporter/ffn.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/ffn.c Sun Jul 30 18:50:29 2000 @@ -0,0 +1,53 @@ +#include +#include +#include "wvexporter.h" + +void wvGetFFN6(FFN *item, wvStream *fd) +{ + int len, i; + U8 temp8 = 0; + + write_8ubit(fd, item->cbFfnM1); + + temp8 |= item->prq; + temp8 |= item->fTrueType << 2; + temp8 |= item->reserved1 << 3; + temp8 |= item->ff << 4; + temp8 |= item->reserved2 << 7; + write_8ubit(fd, temp8); + + write_16ubit(fd, (U16)item->wWeight); + write_8ubit(fd, item->chs); + write_8ubit(fd, item->ixchSzAlt); + + len = item->cbFfnM1 - 5; + if(len > 65) len = 65; + for(i = 0; i < len; i++) + write_8ubit(fd, item->xszFfn[i]); +} + +void wvGetFFN(FFN *item, wvStream *fd) +{ + int len, i; + U8 temp8 = 0; + + write_8ubit(fd, item->cvFfnM1); + + temp8 |= item->prq; + temp8 |= item->fTrueType << 2; + temp8 |= item->reserved1 << 3; + temp8 |= item->ff << 4; + temp8 |= item->reserved2 << 7; + write_8ubit(fd, temp8); + + write_16ubit(fd, (U16)item->wWeight); + write_8ubit(fd, item->chs); + write_8ubit(fd, item->ixchSzAlt); + + len = item->cbFfnM1 - 39; + len = len /2; + if(len > 65) len = 65; + + for(i = 0; i < len; i++) + write_16ubit(fd, item->xszFfn[i]); +} diff -Naur --exclude CVS ../abi-current/wv/exporter/fspa.c wv/exporter/fspa.c --- ../abi-current/wv/exporter/fspa.c Fri Jul 28 00:30:46 2000 +++ wv/exporter/fspa.c Sun Jul 30 18:57:40 2000 @@ -1,6 +1,6 @@ /* no PCLF version */ -void wvGetFSPA(FSPA *item,wvStream *fd) +void wvPutFSPA(FSPA *item,wvStream *fd) { U16 temp16 = (U16)0; @@ -21,4 +21,4 @@ write_16ubit(fd, temp16); write_32ubit(fd, item->cTxbx); - } \ No newline at end of file + } diff -Naur --exclude CVS ../abi-current/wv/exporter/lspd.c wv/exporter/lspd.c --- ../abi-current/wv/exporter/lspd.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/lspd.c Sun Jul 30 19:01:08 2000 @@ -0,0 +1,9 @@ +#include +#include +#include "wvexporter.h" + +void wvPutLSPD(LSPD *item, wvStream *fd) +{ + write_16ubit(fd, item->dyaLine); + write_16ubit(fd, item->fMultLinespace); +} diff -Naur --exclude CVS ../abi-current/wv/exporter/numrm.c wv/exporter/numrm.c --- ../abi-current/wv/exporter/numrm.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/numrm.c Sun Jul 30 19:16:18 2000 @@ -0,0 +1,28 @@ +#include +#include +#include "wvexporter.h" + +void wvPutNUMRM(NUMRM *item, wvStream *fd) +{ + int i; + + write_8ubit(fd, item->fNumRM); + write_8ubit(fd, item->Spare1); + write_16ubit(fd, (U16)item->ibstNumRM); + + wvPutDTTM(item->dttmNumRM, fd); + + for(i=0;i<9;i++) + write_8ubit(fd, item->rgbxchNums[i]); + + for(i=0;i<9;i++) + write_8ubit(fd, item->rgnfc[i]); + + write_16ubit(fd, (U16)item->Spare2); + + for(i=0;i<9;i++) + write_32ubit(fd, (U32)item->PNBR[i]); + + for(i=0;i<32;i++) + write_16ubit(fd, item->xst[i]); +} diff -Naur --exclude CVS ../abi-current/wv/exporter/olst.c wv/exporter/olst.c --- ../abi-current/wv/exporter/olst.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/olst.c Sun Jul 30 19:14:08 2000 @@ -0,0 +1,25 @@ +#include +#include +#include "wvexport.h" + +void wvPutOLST(OLST *item, wvStream *fd) +{ + U8 i; + for(i=0;i<9;i++) + wvPutANLV(fd, item->rganlv[i]); + + write_8ubit(fd, item->fRestartHdr); + write_8ubit(fd, item->fSpareOlst2); + write_8ubit(fd, item->fSpareOlst3); + write_8ubit(fd, item->fSpareOlst4); + + /* assuming WORD8 */ + for(i=0;i<32;i++) + write_16ubit(fd, item->rgxch[i]); + + /* non-word8 */ + /* + for(i=0;i<64;i++) + write_8ubit(fd, item->rgxch[i]); + */ +} diff -Naur --exclude CVS ../abi-current/wv/exporter/pcd.c wv/exporter/pcd.c --- ../abi-current/wv/exporter/pcd.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/pcd.c Sun Jul 30 19:18:28 2000 @@ -0,0 +1,19 @@ +#include +#include +#include "wvexporter.h" + +void wvPutPCD(PCD *item, wvStream *fd) +{ + U8 temp8 = 0; + + temp8 |= item->fNoParaLast; + temp8 |= item->fPaphNil << 1; + temp8 |= item->fCopied << 2; + temp8 |= item->reserved << 3; + + write_8ubit(fd, temp8); + + write_8ubit(fd, item->fn); + write_32ubit(fd, item->fc); + wvPutPRM(item->prm, fd); +} diff -Naur --exclude CVS ../abi-current/wv/exporter/pgd.c wv/exporter/pgd.c --- ../abi-current/wv/exporter/pgd.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/pgd.c Sun Jul 30 19:22:29 2000 @@ -0,0 +1,30 @@ +#include +#include +#include "wvexporter.h" + +void wvPutPGD(PGD *item, wvStream *fd) +{ + U16 temp16 = 0; + + temp16 |= item->fContinue; + temp16 |= item->fUnk << 1; + temp16 |= item->fRight MM 2; + temp16 |= item->fPgnRestart << 3; + temp16 |= item->fEmptyPage << 4; + temp16 |= item->fAllFtn << 5; + temp16 |= item->fColOnly << 6; + temp16 |= item->fTableBreaks << 7; + temp16 |= item->fMarked << 8; + temp16 |= item->fColumnBreaks << 9; + temp16 |= item->fTableHeader << 10; + temp16 |= item->fNewPage << 11; + temp16 |= item->bkc << 12; + + write_16ubit(temp16); + + write_16ubit(fd, item->lnn); + write_16ubit(fd, item->pgn); + + /* only for WORD8 */ + write_32ubit(fd, (U32)item->dym); +} diff -Naur --exclude CVS ../abi-current/wv/exporter/phe.c wv/exporter/phe.c --- ../abi-current/wv/exporter/phe.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/phe.c Sun Jul 30 19:32:51 2000 @@ -0,0 +1,36 @@ +#include +#include +#include "wvexporter.h" + +void wvPutPHE6(PHE *item, wvStream *fd) +{ + U8 temp8 = 0; + + temp8 |= item->var1.fSpare; + temp8 |= item->var1.fUnk << 1; + temp8 |= item->var1.fDiffLines << 2; + temp8 |= item->var1.reserved1 << 3; + + write_8ubit(fd, temp8); + + write_8ubit(fd, item->var1.clMac); + write_16ubit(fd, item->var1.dxaCol); + write_16ubit(fd, (U16)item->var1.dymHeight); +} + +void wvPutPHE(PHE *item, wvStream *fd) +{ + U8 temp8 = 0; + + temp8 |= item->var1.fSpare; + temp8 |= item->var1.fUnk << 1; + temp8 |= item->var1.fDiffLines << 2; + temp8 |= item->var1.reserved1 << 3; + + write_8ubit(fd, temp8); + + write_8ubit(fd, item->var1.clMac); + write_16ubit(fd, item->var1.reserved2); + write_32ubit(fd, (U32)item->var1.dxaCol); + write_32ubit(fd, (U32)item->var1.dymHeight); +} diff -Naur --exclude CVS ../abi-current/wv/exporter/prm.c wv/exporter/prm.c --- ../abi-current/wv/exporter/prm.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/prm.c Sun Jul 30 19:36:57 2000 @@ -0,0 +1,18 @@ +#include +#include +#include "wvexporter.h" + +void wvPutPRM(PRM *item, wvStream *fd) +{ + U16 temp16 = 0; + + temp16 |= item->fComplex; + if(item->fComplex) + temp16 |= item->para.var2.igrpprl << 1; + else { + temp16 |= item->para.var1.isprm << 1; + temp16 |= item->para.var1.val << 8; + } + + write_16ubit(fd, temp16); +} diff -Naur --exclude CVS ../abi-current/wv/exporter/rr.c wv/exporter/rr.c --- ../abi-current/wv/exporter/rr.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/rr.c Sun Jul 30 18:13:11 2000 @@ -0,0 +1,7 @@ +#include "wvexporter.h" + +void wvPutRR(RR *item, wvStream *fd) +{ + write_16ubit(fd, (U16)item->cv); + write_16ubit(fd, (U16)item->cvSzRecip); +} diff -Naur --exclude CVS ../abi-current/wv/exporter/rs.c wv/exporter/rs.c --- ../abi-current/wv/exporter/rs.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/rs.c Sun Jul 30 18:16:26 2000 @@ -0,0 +1,13 @@ +#include "wvexporter.h" + +void wvPutRS(RS *item, wvStream *fd) +{ + write_16ubit(fd, (U16)item->fRouted); + write_16ubit(fd, (U16)item->fReturnOrig); + write_16ubit(fd, (U16)item->fTrackStatus); + write_16ubit(fd, (U16)item->fDirty); + write_16ubit(fd, (U16)item->nProtect); + write_16ubit(fd, (U16)item->iStage); + write_16ubit(fd, (U16)item->delOption); + write_16ubit(fd, (U16)item->cRecip); +} diff -Naur --exclude CVS ../abi-current/wv/exporter/sed.c wv/exporter/sed.c --- ../abi-current/wv/exporter/sed.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/sed.c Sun Jul 30 19:38:41 2000 @@ -0,0 +1,11 @@ +#include +#include +#include "wvexporter.h" + +void wvPutSED(SED *item, wvStream *fd) +{ + write_16ubit(fd, (U16)item->fn); + write_32ubit(fd, item->fcSepx); + write_16ubit(fd, (U16)item->fnMpr); + write_32ubit(fd, item->fcMpr); +} diff -Naur --exclude CVS ../abi-current/wv/exporter/sep.c wv/exporter/sep.c --- ../abi-current/wv/exporter/sep.c Fri Jul 28 00:30:46 2000 +++ wv/exporter/sep.c Sun Jul 30 18:12:24 2000 @@ -2,7 +2,7 @@ { U16 i = (U16)0; - write_16ubit(fd. item->cb); + write_16ubit(fd, item->cb); if (!item->cb) return; @@ -11,4 +11,4 @@ { write_8ubit(fd, item->grpprl[i]); } - } \ No newline at end of file + } diff -Naur --exclude CVS ../abi-current/wv/exporter/shd.c wv/exporter/shd.c --- ../abi-current/wv/exporter/shd.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/shd.c Sun Jul 30 19:40:29 2000 @@ -0,0 +1,14 @@ +#include +#include +#include "wvexporter.h" + +void wvPutSHD(SHD *item, wvStream *fd) +{ + U16 temp16 = 0; + + temp16 |= item->icoFore; + temp16 |= item->icoBack << 5; + temp16 |= item->ipat << 10; + + write_16ubit(fd, temp16); +} diff -Naur --exclude CVS ../abi-current/wv/exporter/support.c wv/exporter/support.c --- ../abi-current/wv/exporter/support.c Fri Jul 28 00:30:46 2000 +++ wv/exporter/support.c Sun Jul 30 18:26:40 2000 @@ -13,19 +13,19 @@ #if defined(WORDS_BIGENDIAN) || !defined(MATCHED_TYPE) - /* TODO: convert from little to big endian */ + /* TODO: convert from big to little endian */ - #define LE_TO_BE_32(i) (i) - #define LE_TO_BE_16(i) (i) - #define LE_TO_BE_8(i) (i) + #define TO_LE_32(i) (i) + #define TO_LE_16(i) (i) + #define TO_LE_8(i) (i) #else /* noop macros for little-endian machines */ - #define LE_TO_BE_32(i) (i) - #define LE_TO_BE_16(i) (i) - #define LE_TO_BE_8(i) (i) + #define TO_LE_32(i) (i) + #define TO_LE_16(i) (i) + #define TO_LE_8(i) (i) #endif @@ -59,7 +59,7 @@ int write_32ubit(wvStream *in, U32 out) { - guint32 cpy = (guint32)LE_TO_BE_32(out); + guint32 cpy = (guint32)TO_LE_32(out); int nwr = 0; if (in->kind == LIBOLE_STREAM) @@ -78,7 +78,7 @@ int write_16ubit(wvStream *in, U16 out) { - guint16 cpy = (guint16)LE_TO_BE_16(out); + guint16 cpy = (guint16)TO_LE_16(out); int nwr = 0; if (in->kind == LIBOLE_STREAM) @@ -96,7 +96,7 @@ int write_8ubit(wvStream *in, U8 out) { - guint8 cpy = (guint8)LE_TO_BE_8(out); + guint8 cpy = (guint8)TO_LE_8(out); int nwr = 0; wvTrace(("About to write 16-bit value")); diff -Naur --exclude CVS ../abi-current/wv/exporter/tbd.c wv/exporter/tbd.c --- ../abi-current/wv/exporter/tbd.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/tbd.c Sun Jul 30 20:03:37 2000 @@ -0,0 +1,14 @@ +#include +#include +#include "wvexporter.h" + +void wvPutTBD(TBD *item, wvStream *fd) +{ + U8 temp8 = 0; + + temp8 |= item->jc; + temp8 |= item->tlc << 3; + temp8 |= item->reserved << 6; + + write_8ubit(fd, temp8); +} diff -Naur --exclude CVS ../abi-current/wv/exporter/tc.c wv/exporter/tc.c --- ../abi-current/wv/exporter/tc.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/tc.c Sun Jul 30 20:09:26 2000 @@ -0,0 +1,28 @@ +#include +#include +#include "wvexporter.h" + +void wvPutTC(TC *tc, wvStream *fd) +{ + U16 temp16; + BRC10 brc10; + + /* assumes word8 */ + temp16 |= item->fFirstMerged; + temp16 |= item->fMerged<<1; + temp16 |= item->fVertical<<2; + temp16 |= item->fBackward<<3; + temp16 |= item->fRotateFont<<4; + temp16 |= item->fVertMerge<<5; + temp16 |= item->fVertRestart<<6; + temp16 |= item->vertAlign<<7; + temp16 |= item->fUnused<<9; + write_16ubit(fd, temp16); + + write_16ubit(fd, item->wUnused); + + wvPutBRC(item->brcTop, fd); + wvPutBRC(item->brcLeft, fd); + wvPutBRC(item->brcBottom, fd); + wvPutBRC(item->brcRight, fd); +} diff -Naur --exclude CVS ../abi-current/wv/exporter/tlp.c wv/exporter/tlp.c --- ../abi-current/wv/exporter/tlp.c Wed Dec 31 19:00:00 1969 +++ wv/exporter/tlp.c Sun Jul 30 20:12:14 2000 @@ -0,0 +1,22 @@ +#include +#include +#include "wvexporter.h" + +void wvPutTLP(TLP *item, wvStream *fd) +{ + U16 temp16 = 0; + + write_16ubit(fd, item->itl); + + temp16 |= item->fBorders; + temp16 |= item->fShading <<1; + temp16 |= item->fFont <<2; + temp16 |= item->fColor <<3; + temp16 |= item->fBestFit <<4; + temp16 |= item->fHdrRows <<5; + temp16 |= item->fLastRow <<6; + temp16 |= item->fHdrCols <<7; + temp16 |= item->fLastCol <<8; + + write_16ubit(fd, temp16); +}