diff -r b7447adddc9a -r 5522d1da7e37 xml.h --- a/xml.h Wed Jan 10 13:26:12 2007 +0000 +++ b/xml.h Tue Jan 23 11:50:53 2007 +0000 @@ -29,6 +29,7 @@ void setInputFile (QString); void setLoadMode (const LoadMode &); bool readBranchAttr (const QXmlAttributes&); + bool readFrameAttr (const QXmlAttributes&); bool readOOAttr (const QXmlAttributes&); bool readNoteAttr (const QXmlAttributes&); bool readFloatImageAttr (const QXmlAttributes&); @@ -40,17 +41,20 @@ QString errorProt; enum State { - StateInit, StateMap, StateMapSelect, + StateInit, + StateMap, + StateMapSelect, StateMapSetting, + StateMapCenter, + StateBranch, + StateBranchXLink, // + StateHtmlNote, + StateHtml, + StateFrame, + StateStandardFlag, + StateNote, StateFloatImage, - StateMapCenter, StateMapCenterStandardFlag, - StateMapCenterHeading, StateMapCenterNote, - StateMapCenterFloatImage, - - StateBranch, StateBranchStandardFlag, - StateBranchHeading, StateBranchNote, - StateBranchFloatImage, StateBranchXLink, - StateHtmlNote, StateHtml + StateHeading }; @@ -58,6 +62,7 @@ bool isVymPart; State state; State laststate; + QList stateStack; QString htmldata; int branchDepth; NoteObj no;