***************
*** 161,170 ****
  		return;
  	}
  
- 	//	if(m_iBlockType == BT_NORMAL)
- 	//	m_pie->write("</p>\n");
  
-         if(m_iBlockType == BT_HEADING1)
  		m_pie->write("</h1>\n");
  
          else if(m_iBlockType == BT_HEADING2)
--- 161,170 ----
  		return;
  	}
  
+        	if(m_iBlockType == BT_NORMAL)
+        	m_pie->write("</p>\n");
  
+ 	else if(m_iBlockType == BT_HEADING1)
  		m_pie->write("</h1>\n");
  
          else if(m_iBlockType == BT_HEADING2)
***************
*** 182,188 ****
          // Add "catchall" for now
  
  	else
- 	  m_pie->write("<br />\n");
  
  	m_bInBlock = UT_FALSE;
  	return;
--- 182,188 ----
          // Add "catchall" for now
  
  	else
+ 	  m_pie->write("</p>\n");
  
  	m_bInBlock = UT_FALSE;
  	return;
***************
*** 259,266 ****
  
  				// <p style="<anything else!>"> ...
  
- 			  //	        m_iBlockType = BT_NORMAL;
- 			  //    	m_pie->write("<p");
  			}	
  		}
  		else 
--- 259,267 ----
  
  				// <p style="<anything else!>"> ...
  
+ 			        m_iBlockType = BT_NORMAL;
+ 			      	m_pie->write("<p class=\"norm\"");
+ 				wasWritten = UT_TRUE;
  			}	
  		}
  		else 
***************
*** 268,275 ****
  
  			// <p> with no style attribute ...
  
- 		  //m_iBlockType = BT_NORMAL;
- 		  //m_pie->write("<p");
  		}
  
  		/* Assumption: never get property set with h1-h3, block text, plain text. Probably true. */
--- 269,277 ----
  
  			// <p> with no style attribute ...
  
+ 		  m_iBlockType = BT_NORMAL;
+ 		  m_pie->write("<p class=\"norm\"");
+ 		  wasWritten = UT_TRUE;
  		}
  
  		/* Assumption: never get property set with h1-h3, block text, plain text. Probably true. */
***************
*** 278,284 ****
  			m_iBlockType == BT_NORMAL && (pAP->getProperty("text-align", szValue))
  			)
  		{
- 			m_pie->write(" ALIGN=\"");
  			m_pie->write(szValue);
  			m_pie->write("\"");
  		}
--- 280,286 ----
  			m_iBlockType == BT_NORMAL && (pAP->getProperty("text-align", szValue))
  			)
  		{
+ 			m_pie->write(" align=\"");
  			m_pie->write(szValue);
  			m_pie->write("\"");
  		}
***************
*** 288,295 ****
  
  		// <p> with no style attribute, and no properties either
  
- 	  //m_iBlockType = BT_NORMAL;
- 	  //m_pie->write("<p");
  	}
  	if (wasWritten)
  	  m_pie->write(">");
--- 290,298 ----
  
  		// <p> with no style attribute, and no properties either
  
+ 	  m_iBlockType = BT_NORMAL;
+ 	  m_pie->write("<p class=\"norm\"");
+ 	  wasWritten = UT_TRUE;
  	}
  	if (wasWritten)
  	  m_pie->write(">");
***************
*** 374,379 ****
  	
  	const PP_AttrProp * pAP = NULL;
  	UT_Bool bHaveProp = m_pDocument->getAttrProp(api,&pAP);
  	
  	if (bHaveProp && pAP)
  	{
--- 377,385 ----
  	
  	const PP_AttrProp * pAP = NULL;
  	UT_Bool bHaveProp = m_pDocument->getAttrProp(api,&pAP);
+ 
+ 	bool span = UT_FALSE;
+ 	bool textD = UT_FALSE;
  	
  	if (bHaveProp && pAP)
  	{
***************
*** 384,390 ****
  			&& !UT_stricmp(szValue, "bold")
  			)
  		{
- 			m_pie->write("<b>");
  		}
  		
  		if (
--- 390,404 ----
  			&& !UT_stricmp(szValue, "bold")
  			)
  		{
+ 		        if (!span)
+ 			  {
+ 			    m_pie->write("<span style=\"font-weight: bold");	
+ 			    span = UT_TRUE;
+ 			  }
+ 			else
+ 			  {
+ 			    m_pie->write("; font-weight: bold");
+ 			  }
  		}
  		
  		if (
***************
*** 392,399 ****
  			&& !UT_stricmp(szValue, "italic")
  			)
  		{
- 			m_pie->write("<i>");
  		}
  		
  		if (
  			(pAP->getProperty("text-decoration", szValue))
--- 406,422 ----
  			&& !UT_stricmp(szValue, "italic")
  			)
  		{
+ 		  if (!span)
+ 			  {
+ 			    m_pie->write("<span style=\"font-style: italic\"");	
+ 			    span = UT_TRUE;
+ 			  }
+ 			else
+ 			  {
+ 			    m_pie->write("; font-style: italic");
+ 			  }
  		}
+ 
  		
  		if (
  			(pAP->getProperty("text-decoration", szValue))
***************
*** 414,420 ****
  			{
  				if (0 == UT_stricmp(q, "underline"))
  				{
- 					m_pie->write("<u>");
  				}
  
  				q = strtok(NULL, " ");
--- 437,456 ----
  			{
  				if (0 == UT_stricmp(q, "underline"))
  				{
+ 				  if (!span)
+ 				    {
+ 					m_pie->write("<span style=\"text-decoration: underline");	
+ 					span = UT_TRUE;
+ 				    }
+ 				  else if (!textD)
+ 				    {
+ 				        m_pie->write("; text-decoration: underline");
+ 					textD = UT_TRUE;
+ 				    }
+ 				  else
+ 				    {
+ 				      m_pie->write(" underline");
+ 				    }
  				}
  
  				q = strtok(NULL, " ");
***************
*** 442,448 ****
  			{
  				if (0 == UT_stricmp(q, "line-through"))
  				{
- 					m_pie->write("<s>");	// is it <s> or <strike> ? TODO
  				}
  
  				q = strtok(NULL, " ");
--- 478,538 ----
  			{
  				if (0 == UT_stricmp(q, "line-through"))
  				{
+ 				  if (!span)
+ 				    {
+ 					m_pie->write("<span style=\"text-decoration: line-through");	
+ 					span = UT_TRUE;
+ 				    }
+ 				  else if (!textD)
+ 				    {
+ 				        m_pie->write("; text-decoration: line-through");
+ 					textD = UT_TRUE;
+ 				    }
+ 				  else
+ 				    {
+ 				        m_pie->write(" line-through");
+ 				    }
+ 				}
+ 
+ 				q = strtok(NULL, " ");
+ 			}
+ 
+ 			free(p);
+ 		}
+ 
+ 		if (
+ 			(pAP->getProperty("text-decoration", szValue))
+ 			)
+ 		{
+ 			const XML_Char* pszDecor = szValue;
+ 			
+ 			XML_Char* p;
+ 			if (!UT_cloneString((char *&)p, pszDecor))
+ 			{
+ 				// TODO outofmem
+ 			}
+ 			
+ 			UT_ASSERT(p || !pszDecor);
+ 			XML_Char*	q = strtok(p, " ");
+ 
+ 			while (q)
+ 			{
+ 				if (0 == UT_stricmp(q, "overline"))
+ 				{
+ 				  if (!span)
+ 				    {
+ 					m_pie->write("<span style=\"text-decoration: overline");	
+ 					span = UT_TRUE;
+ 				    }
+ 				  else if (!textD)
+ 				    {
+ 				        m_pie->write("; text-decoration: overline");
+ 					textD = UT_TRUE;
+ 				    }
+ 				  else
+ 				    {
+ 				        m_pie->write(" overline");
+ 				    }
  				}
  
  				q = strtok(NULL, " ");
***************
*** 451,456 ****
  			free(p);
  		}
  
  		if (pAP->getProperty("text-position", szValue))
  		{
  			if (!UT_stricmp("superscript", szValue))
--- 541,549 ----
  			free(p);
  		}
  
+ 		if (span)
+ 		  m_pie->write("\">");
+ 
  		if (pAP->getProperty("text-position", szValue))
  		{
  			if (!UT_stricmp("superscript", szValue))
***************
*** 480,486 ****
  			m_pie->write("<font");
  			if (pszColor)
  			{
- 				m_pie->write(" COLOR=\"");
  				char szColor[16];
  				_convertColor(szColor, pszColor);
  				m_pie->write(szColor);
--- 573,579 ----
  			m_pie->write("<font");
  			if (pszColor)
  			{
+ 				m_pie->write(" color=\"");
  				char szColor[16];
  				_convertColor(szColor, pszColor);
  				m_pie->write(szColor);
***************
*** 489,502 ****
  			
  			if (pszFontFamily)
  			{
- 				m_pie->write(" FACE=\"");
  				m_pie->write(pszFontFamily);
  				m_pie->write("\"");
  			}
  			
  			if (pszFontSize)
  			{
- 				m_pie->write(" SIZE=\"");
  				char szSize[16];
  				_convertFontSize(szSize, pszFontSize);
  				m_pie->write(szSize);
--- 582,595 ----
  			
  			if (pszFontFamily)
  			{
+ 				m_pie->write(" face=\"");
  				m_pie->write(pszFontFamily);
  				m_pie->write("\"");
  			}
  			
  			if (pszFontSize)
  			{
+ 				m_pie->write(" size=\"");
  				char szSize[16];
  				_convertFontSize(szSize, pszFontSize);
  				m_pie->write(szSize);
***************
*** 543,602 ****
  			}
  		}
  
- 		if (
- 			(pAP->getProperty("text-decoration", szValue))
- 			)
- 		{
- 			const XML_Char* pszDecor = szValue;
- 			
- 			XML_Char* p;
- 			if (!UT_cloneString((char *&)p, pszDecor))
- 			{
- 				// TODO outofmem
- 			}
- 			
- 			UT_ASSERT(p || !pszDecor);
- 			XML_Char*	q = strtok(p, " ");
- 
- 			while (q)
- 			{
- 				if (0 == UT_stricmp(q, "line-through"))
- 				{
- 					m_pie->write("</s>");	// is it <s> or <strike> ? TODO
- 				}
- 
- 				q = strtok(NULL, " ");
- 			}
- 
- 			free(p);
- 		}
  
  		if (
  			(pAP->getProperty("text-decoration", szValue))
  			)
  		{
- 			const XML_Char* pszDecor = szValue;
- 			
- 			XML_Char* p;
- 			if (!UT_cloneString((char *&)p, pszDecor))
- 			{
- 				// TODO outofmem
- 			}
- 			
- 			UT_ASSERT(p || !pszDecor);
- 			XML_Char*	q = strtok(p, " ");
- 
- 			while (q)
- 			{
- 				if (0 == UT_stricmp(q, "underline"))
- 				{
- 					m_pie->write("</u>");
- 				}
- 
- 				q = strtok(NULL, " ");
- 			}
- 
- 			free(p);
  		}
  
  		if (
--- 636,649 ----
  			}
  		}
  
+ 		UT_Bool closeSpan = UT_FALSE;
  
  		if (
  			(pAP->getProperty("text-decoration", szValue))
+ 			&& UT_stricmp(szValue, "none")
  			)
  		{
+ 		  closeSpan = UT_TRUE;
  		}
  
  		if (
***************
*** 604,610 ****
  			&& !UT_stricmp(szValue, "italic")
  			)
  		{
- 			m_pie->write("</i>");
  		}
  		
  		if (
--- 651,657 ----
  			&& !UT_stricmp(szValue, "italic")
  			)
  		{
+ 		  closeSpan = UT_TRUE;
  		}
  		
  		if (
***************
*** 612,620 ****
  			&& !UT_stricmp(szValue, "bold")
  			)
  		{
- 			m_pie->write("</b>");
  		}
  
  		m_pAP_Span = NULL;
  	}
  
--- 659,672 ----
  			&& !UT_stricmp(szValue, "bold")
  			)
  		{
+ 		  closeSpan = UT_TRUE;
  		}
  
+ 		if (closeSpan)
+ 		  {
+ 		    m_pie->write("</span>");
+ 		  }
+ 
  		m_pAP_Span = NULL;
  	}
  
***************
*** 763,771 ****
  	
  	m_pie->write("\n");
  	
  	m_pie->write("<html>\n");
  	m_pie->write("<head>\n");
  	m_pie->write("<title>AbiWord Document</title>\n");
  	m_pie->write("</head>\n");
  	m_pie->write("<body>\n");
  
--- 815,827 ----
  	
  	m_pie->write("\n");
  	
+ 	m_pie->write("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"DTD/xhtml1-strict.dtd\">\n");
  	m_pie->write("<html>\n");
  	m_pie->write("<head>\n");
  	m_pie->write("<title>AbiWord Document</title>\n");
+ 	m_pie->write("<style type=\"text/css\">\n");
+ 	m_pie->write("<!-- \n P.norm { margin-top: 0pt; margin-bottom: 0pt } \n -->\n");
+ 	m_pie->write("</style>\n");
  	m_pie->write("</head>\n");
  	m_pie->write("<body>\n");