diff -r 5db8dfd30ea2 -r 7fc6541f0490 xml.h
--- a/xml.h	Thu Nov 23 16:18:26 2006 +0000
+++ b/xml.h	Mon Jul 23 12:42:01 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 <State> stateStack;
 	QString htmldata;
 	int branchDepth; 
 	NoteObj no;