Index: ie_imp_RTF.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_imp_RTF.cpp,v
retrieving revision 1.92
diff -c -r1.92 ie_imp_RTF.cpp
*** ie_imp_RTF.cpp	2001/09/06 14:13:40	1.92
--- ie_imp_RTF.cpp	2001/09/09 21:55:42
***************
*** 2768,2776 ****
  	case 's':
  		if (strcmp((char*)pKeyword, "stylesheet") == 0)
  		{
! 			// TODO Ignore stylesheet as ABIWord doesn't do styles (at the moment)
! 			// In the text all applied styles also have their equivlent effects on too
! 			m_currentRTFState.m_destinationState = RTFStateStore::rdsSkip;
  		}
  		else if (strcmp((char*)pKeyword, "strike") == 0  ||  strcmp((char*)pKeyword, "striked") == 0)
  		{
--- 2768,2774 ----
  	case 's':
  		if (strcmp((char*)pKeyword, "stylesheet") == 0)
  		{
! 			return HandleStyleDefinition();
  		}
  		else if (strcmp((char*)pKeyword, "strike") == 0  ||  strcmp((char*)pKeyword, "striked") == 0)
  		{
***************
*** 5735,5742 ****
--- 5733,5902 ----
  	return;
  }
  
+ // This should probably be defined in pt_Types.h
+ #define PT_MAX_ATTRIBUTES 8
+ 
+ /*!
+ Define a new style, here is the formal syntax:
+ <style>	'{' <styledef>?<keycode>? <formatting> <additive>? <based>? <next>? 
+             <stylename>? ';' '}'
+ <styledef>	\s  |\*\cs  | \ds
+ <keycode>	'{' \keycode <keys> '}'
+ <additive>	\additive
+ <based>	\sbasedon
+ <next>	\snext
+ <autoupd>	\sautoupd
+ <hidden>	\shidden
+ <formatting>	(<brdrdef> | <parfmt> | <apoctl> | <tabdef> | <shading> | <chrfmt>)+
+ <stylename>	#PCDATA
+ <keys>	( \shift? & \ctrl? & \alt?) <key>
+ <key>	\fn | #PCDATA
+ 
+ The style definition is located within a {\stylesheet } sequence.
+ 
+ The minimum (useless) example would be {}
+ A more typical set of styles would be 
+ {\stylesheet
+     {\fs20 \sbasedon222\snext0{\*\keycode \shift\ctrl n} Normal;}
+ 	{\s1\qr \fs20 \sbasedon0\snext1 FLUSHRIGHT;}
+ 	{\s2\fi-720\li720\fs20\ri2880\sbasedon0\snext2 IND;}
+ }
+ 
+ */
+ bool IE_Imp_RTF::HandleStyleDefinition(void)
+ {
+ 	bool status = true;
+ 	int nesting = 1;
+ 	unsigned char ch;
+ 	unsigned int i;
+ 
+ 	UT_Vector attribs;
+ 	UT_Vector styleNames;
+ 	UT_String styleName = "";
+ 	unsigned int styleNumber = 0;
+ 	while (nesting>0 && status == true)
+ 	{
+         unsigned char keyword[MAX_KEYWORD_LEN];
+         long parameter = 0;
+ 	    bool parameterUsed = false;
+         
+ 		if (!ReadCharFromFile(&ch))
+ 		    return false;
+ 		
+ 		switch(ch)
+ 		{
+ 		case '\\':
+             status = ReadKeyword(keyword, &parameter, &parameterUsed, MAX_KEYWORD_LEN);
+ 			if (!status)
+ 				return status;
+ 			else if (0 == UT_strcmp((char *)keyword, "sbasedon"))
+ 			{
+ 				if (parameter >= styleNumber)
+ 				{
+ 					UT_DEBUGMSG(("Cannot base this style on style %d when I am style %d",parameter,styleNumber));
+ 					return false;
+ 				}
+ 				char * val = (char *)styleNames.getNthItem(parameter);
+ 				if (val != NULL)
+ 				{
+ 					attribs.addItem((void *)PT_BASEDON_ATTRIBUTE_NAME);
+ 					attribs.addItem(val);
+ 				}
+ 			}
+ 			else if (0 == UT_strcmp((char *)keyword, "snext"))
+ 			{
+ 				if (parameter != styleNumber)
+ 				{
+ 					char * val = (char *)styleNames.getNthItem(parameter);
+ 					if (val != NULL)
+ 					{
+ 						attribs.addItem((void *)PT_FOLLOWEDBY_ATTRIBUTE_NAME);
+ 						attribs.addItem(val);
+ 					}
+ 				}
+ 			}
+ 			else if ((0 == UT_strcmp((char *)keyword,  "s")) ||
+ 				     (0 == UT_strcmp((char *)keyword, "ds")) ||
+ 				     (0 == UT_strcmp((char *)keyword, "cs")))
+ 			{
+ 				styleNumber = parameter;
+ 			}
+ 			else if (0 == UT_strcmp((char *)keyword, "*"))
+ 			{
+ 				break;
+ 			}
+ 			else 
+ 			{
+ 			    status = TranslateKeyword(keyword, parameter, parameterUsed);
+ 			}
+ 			break;
+ 		case '{':
+ 			nesting++;
+ 			break;
+ 		case '}':
+ 			nesting--;
+ 			break;
+ 		default:
+ 			// The only thing that should be left is the style name
  
+ 			if (styleName.size() >0)
+ 			{
+ 				UT_DEBUGMSG(("RTF: stylename already parsed once, something is wrong"));
+ 				return false;
+ 			}
+ 			while (ch != '}' && ch != ';')
+ 			{
+ 				styleName += ch;
+                 if (!ReadCharFromFile(&ch))
+ 		            return false;
+ 				if (ch =='}')
+ 				{
+ 					UT_DEBUGMSG(("RTF: Badly formatted style name, no ';'"));
+ 					nesting--;
+ 				}
+ 			}
+ 			char * buffer  = strdup(styleName.c_str());
+ 			char * oldbuffer;
+ 			styleNames.setNthItem(styleNumber,(void *)buffer,(void **)&oldbuffer);
+ 			break;
+ 		}
+ 		if (nesting == 1)
+ 		{
+ 			// Reached the end of a single style definition.
+ 			// Use it.
+ 			const char * attributes[16];
+ 			for (i=0;i<attribs.size(); i++)
+ 			{
+ 				attributes[i] = (char *)attribs.getNthItem(i);
+ 			}
+ 			// TODO: Turn the properties structure into a string
+ 			attributes[i++] = PT_PROPS_ATTRIBUTE_NAME;
+ 			attributes[i++] = "text-align: left";
+ 			// ApplyParagraphAttributes()
  
+ 			attributes[i++] = PT_NAME_ATTRIBUTE_NAME;
+ 			attributes[i++] = (const char *)styleNames[styleNumber];
  
+ 			attributes[i++] = PT_TYPE_ATTRIBUTE_NAME;
+ 			attributes[i++] = "P";
+ 			attributes[i++] = NULL;
+ 			getDoc()->appendStyle(attributes);
  
+ 			// Reset
+ 			attribs.clear();
+ 			styleNumber = 0;
+ 			styleName = "";
+             status = ResetCharacterAttributes();
+             status = ResetParagraphAttributes();
+ 		}
+ 	}
+ 	// Since the final '}' has been read off the stream, return things to the way they were
+ 	for (i=0;i<styleNames.size(); i++)
+ 	{
+ 		delete (char *)styleNames[i];
+ 	}
+ 	
+ 	status = PopRTFState();
+ 	return status;
  
+ }
Index: ie_imp_RTF.h
===================================================================
RCS file: /cvsroot/abi/src/wp/impexp/xp/ie_imp_RTF.h,v
retrieving revision 1.40
diff -c -r1.40 ie_imp_RTF.h
*** ie_imp_RTF.h	2001/08/21 02:09:06	1.40
--- ie_imp_RTF.h	2001/09/09 21:55:45
***************
*** 457,462 ****
--- 457,463 ----
  	bool HandlePicture();
  	bool HandleObject();
  	bool HandleField();
+ 	bool HandleStyleDefinition(void);
  	bool HandleHeaderFooter(RTFHdrFtr::HdrFtrType hftype, UT_uint32 & headerID);
  	bool SkipCurrentGroup(bool bConsumeLastBrace = false);
  	bool StuffCurrentGroup(UT_ByteBuf & buf);