CVS: jfor/src/org/jfor/jfor/rtflib/rtfdoc RtfText.java,1.8,1.9 RtfTableCell.java,1.7,1.8

Update of /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/rtfdoc
In directory usw-pr-cvs1:/tmp/cvs-serv20963

Modified Files:
	RtfText.java RtfTableCell.java 
Log Message:
Contributions for background-color processing and
space-before/space-after <[email protected]>


Index: RtfText.java
===================================================================
RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/rtfdoc/RtfText.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RtfText.java	12 Jul 2002 08:08:31 -0000	1.8
--- RtfText.java	17 Jul 2002 18:13:07 -0000	1.9
***************
*** 51,54 ****
--- 51,55 ----
   * ====================================================================
   * Contributor(s):
+  * Boris Poudérous [email protected]
  -----------------------------------------------------------------------------*/
  
***************
*** 60,63 ****
--- 61,68 ----
  // $Id$
  // $Log$
+ // Revision 1.9  2002/07/17 18:13:07  rmarra
+ // Contributions for background-color processing and
+ // space-before/space-after <[email protected]>
+ //
  // Revision 1.8  2002/07/12 08:08:31  bdelacretaz
  // License changed to jfor Apache-style license
***************
*** 127,130 ****
--- 132,136 ----
  	public static final String ATTR_FONT_FAMILY = "f";
  	public static final String ATTR_FONT_COLOR = "cf";
+ 	public static final String ATTR_BACKGROUND_COLOR = "chcbpat"; // Added by Boris on 06/25//02
  
  	/** RtfText attributes: alignment attributes */
***************
*** 163,167 ****
  	public static String TAB_LEADER_THICK = "tlth";
  	public static String TAB_LEADER_EQUALS = "tleq";
! 
  
  	/** RtfText attributes: this must contain all allignment attributes names */
--- 169,177 ----
  	public static String TAB_LEADER_THICK = "tlth";
  	public static String TAB_LEADER_EQUALS = "tleq";
! 	
! 	/** Space before/after a paragraph */
! 	//these lines were added by Boris Pouderous
! 	public static final String SPACE_BEFORE = "sb";
!   	public static final String SPACE_AFTER = "sa";
  
  	/** RtfText attributes: this must contain all allignment attributes names */
***************
*** 197,201 ****
  		ATTR_FONT_SIZE,
  		ATTR_FONT_FAMILY,
! 		ATTR_FONT_COLOR
  	};
  
--- 207,212 ----
  		ATTR_FONT_SIZE,
  		ATTR_FONT_FAMILY,
! 		ATTR_FONT_COLOR,
! 		ATTR_BACKGROUND_COLOR	
  	};
  
***************
*** 214,217 ****
--- 225,235 ----
  	{
              writeChars: {
+             	
+             	//these lines were added by Boris Pouderous
+           		if (m_attr != null) {
+                   writeAttributes(m_attr,new String[] {RtfText.SPACE_BEFORE});
+                   writeAttributes(m_attr,new String[] {RtfText.SPACE_AFTER});
+                 }  	
+             	
  	            if(isTab()){
  	            	writeControlWord("tab");

Index: RtfTableCell.java
===================================================================
RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/rtfdoc/RtfTableCell.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RtfTableCell.java	12 Jul 2002 08:08:31 -0000	1.7
--- RtfTableCell.java	17 Jul 2002 18:13:07 -0000	1.8
***************
*** 52,55 ****
--- 52,56 ----
   * Contributor(s):
   *  @author Andreas Putz [email protected]
+  * Boris Poudérous [email protected]
  -----------------------------------------------------------------------------*/
  
***************
*** 61,64 ****
--- 62,69 ----
  // $Id$
  // $Log$
+ // Revision 1.8  2002/07/17 18:13:07  rmarra
+ // Contributions for background-color processing and
+ // space-before/space-after <[email protected]>
+ //
  // Revision 1.7  2002/07/12 08:08:31  bdelacretaz
  // License changed to jfor Apache-style license
***************
*** 233,236 ****
--- 238,248 ----
  		}
  		
+ 	    /**
+ 	     * Added by Boris POUDEROUS on 2002/06/26
+ 	     */
+ 	    // Cell background color processing :
+ 	    writeAttributes (m_attrib, ITableAttributes.CELL_COLOR);
+ 	    /** - end - */
+ 
  		writeAttributes (m_attrib, ITableAttributes.ATTRIB_CELL_PADDING);
  		writeAttributes (m_attrib, ITableAttributes.CELL_BORDER);



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf