# HG changeset patch
# User insilmaril
# Date 1184671191 0
# Node ID 2913f96fd2337a2511640b97c745f502311065d6
# Parent  55236fe5a6301891c7d4f22e5dff79f6cb37024c
1.9.2 Bugfixes for exports

diff -r 55236fe5a630 -r 2913f96fd233 demos/vym-projectplan.vym
Binary file demos/vym-projectplan.vym has changed
diff -r 55236fe5a630 -r 2913f96fd233 noteobj.cpp
--- a/noteobj.cpp	Tue Jul 17 11:19:50 2007 +0000
+++ b/noteobj.cpp	Tue Jul 17 11:19:51 2007 +0000
@@ -48,32 +48,36 @@
 {
 	QString r=note;
 
+	// Remove all <style...> ...</style>
+	QRegExp rx ("<style.*>.*</style>");
+	rx.setMinimal(true);
+	r.replace (rx,"");
+
 	// convert all "<br*>" to "\n"
-	QRegExp re("<br.*>");
-	re.setMinimal(true);
-	r.replace (re,"\n");
+	rx.setPattern ("<br.*>");
+	r.replace (rx,"\n");
 
 	// convert all "</p>" to "\n"
-	re.setPattern ("</p>");
-	r.replace (re,"\n");
+	rx.setPattern ("</p>");
+	r.replace (rx,"\n");
 	
 	// remove all remaining tags 
-	re.setPattern ("<.*>");
-	r.replace (re,"");
+	rx.setPattern ("<.*>");
+	r.replace (rx,"");
 
 	// If string starts with \n now, remove it.
 	// It would be wrong in an OOo export for example
 	while (r.at(0)=='\n') r.remove (0,1);
 	
 	// convert "&", "<" and ">"
-	re.setPattern ("&gt;");
-	r.replace (re,">");
-	re.setPattern ("&lt;");
-	r.replace (re,"<");
-	re.setPattern ("&amp;");
-	r.replace (re,"&");
-	re.setPattern ("&quot;");
-	r.replace (re,"\"");
+	rx.setPattern ("&gt;");
+	r.replace (rx,">");
+	rx.setPattern ("&lt;");
+	r.replace (rx,"<");
+	rx.setPattern ("&amp;");
+	r.replace (rx,"&");
+	rx.setPattern ("&quot;");
+	r.replace (rx,"\"");
 
 	return r;
 }
@@ -148,14 +152,38 @@
 	// QTextEdit may generate fontnames with unquoted &, like
 	// in "Lucida B&H". This is invalid in XML and thus would crash
 	// the XML parser
-	uint pos=0;
+
+	// More invalid XML is generated with bullet lists:
+	// There are 2 <style> tags in one <li>, so we merge them here
+	int pos=0;
 	bool inbracket=false;
+	int begin_bracket;
 	bool inquot=false;
 	QString n=note;
 	while (pos<n.length())
 	{
-		if (n.mid(pos,1)=="<") inbracket=true;
-		if (n.mid(pos,1)==">") inbracket=false;
+		if (n.mid(pos,1)=="<") 
+		{
+			inbracket=true;
+			begin_bracket=pos;
+		}
+		if (n.mid(pos,1)==">") 
+		{
+			inbracket=false;
+			QString s=n.mid(begin_bracket,pos-begin_bracket+1);
+			int sl=s.length();
+			if (s.count("style=\"")>1)
+			{
+				cout << "note: s="<<s.ascii()<<endl;
+				QRegExp rx("style=\\s*\"(.*)\"\\s*style=\\s*\"(.*)\"");
+				rx.setMinimal (true);
+				s.replace(rx,"style=\"\\1 \\2\"");
+				cout << " new:   "<<s.ascii()<<endl;
+				n.replace (begin_bracket,sl,s);
+				cout << "pos="<<pos<<"  bb="<<begin_bracket<<"  s1l="<<sl<<"  s2l="<<s.length()<<endl<<endl;
+				pos=pos-(sl-s.length());
+			}	
+		}	
 		if (n.mid(pos,1)=="\"" && inbracket)
 		{
 			if (!inquot)
diff -r 55236fe5a630 -r 2913f96fd233 version.h
--- a/version.h	Tue Jul 17 11:19:50 2007 +0000
+++ b/version.h	Tue Jul 17 11:19:51 2007 +0000
@@ -4,10 +4,10 @@
 #include <QString>
 
 #define __VYM_NAME "VYM"
-#define __VYM_VERSION "1.9.1"
+#define __VYM_VERSION "1.9.2"
 //#define __VYM_CODENAME "Codename: 1.10.0-beta-1"
 #define __VYM_CODENAME "Codename: development version"
-#define __VYM_BUILD_DATE "July 11, 2007"
+#define __VYM_BUILD_DATE "July 16, 2007"
 
 
 bool checkVersion(const QString &);