1.1 --- a/xml.h	Thu Nov 23 16:18:26 2006 +0000
     1.2 +++ b/xml.h	Sat Mar 31 09:28:27 2007 +0000
     1.3 @@ -29,6 +29,7 @@
     1.4  	void setInputFile (QString);
     1.5  	void setLoadMode (const LoadMode &);
     1.6  	bool readBranchAttr (const QXmlAttributes&);
     1.7 +	bool readFrameAttr (const QXmlAttributes&);
     1.8  	bool readOOAttr (const QXmlAttributes&);
     1.9  	bool readNoteAttr (const QXmlAttributes&);
    1.10  	bool readFloatImageAttr (const QXmlAttributes&);
    1.11 @@ -40,17 +41,20 @@
    1.12  	QString     errorProt;
    1.13  	enum State 
    1.14  	{ 
    1.15 -		StateInit, StateMap, StateMapSelect, 
    1.16 +		StateInit, 
    1.17 +		StateMap, 
    1.18 +		StateMapSelect, 
    1.19  		StateMapSetting,
    1.20 +		StateMapCenter, 
    1.21 +		StateBranch, 
    1.22 +		StateBranchXLink,			//
    1.23 +		StateHtmlNote, 
    1.24 +		StateHtml, 
    1.25 +		StateFrame,
    1.26 +		StateStandardFlag,
    1.27 +		StateNote,
    1.28  		StateFloatImage,
    1.29 -		StateMapCenter, StateMapCenterStandardFlag,
    1.30 -		StateMapCenterHeading, StateMapCenterNote, 
    1.31 -		StateMapCenterFloatImage,
    1.32 -		
    1.33 -		StateBranch, StateBranchStandardFlag,
    1.34 -		StateBranchHeading, StateBranchNote, 
    1.35 -		StateBranchFloatImage, StateBranchXLink,
    1.36 -		StateHtmlNote, StateHtml 
    1.37 +		StateHeading
    1.38  	 };
    1.39  				 
    1.40  
    1.41 @@ -58,6 +62,7 @@
    1.42  	bool isVymPart;
    1.43  	State state;			 
    1.44  	State laststate;
    1.45 +	QList <State> stateStack;
    1.46  	QString htmldata;
    1.47  	int branchDepth; 
    1.48  	NoteObj no;