CVS: jfor/src/org/jfor/jfor/rtflib/rtfdoc RtfText.java,1.10,1.11 RtfParagraph.java,1.16,1.17 ITableAttributes.java,1.9,1.10 RtfTableRow.java,1.15,1.16
Peter Herweg <[email protected]> Sun, 12 Oct 2003 06:45:54 -0700
| Newsgroups | gmane.text.xml.jfor.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/rtfdoc
In directory sc8-pr-cvs1:/tmp/cvs-serv11588/rtflib/rtfdoc
Modified Files:
RtfText.java RtfParagraph.java ITableAttributes.java
RtfTableRow.java
Log Message:
support for margin-left attribute added to fo:block and fo:table
Index: RtfText.java
===================================================================
RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/rtfdoc/RtfText.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** RtfText.java 30 Jul 2002 14:48:05 -0000 1.10
--- RtfText.java 12 Oct 2003 13:45:51 -0000 1.11
***************
*** 61,64 ****
--- 61,67 ----
// $Id$
// $Log$
+ // Revision 1.11 2003/10/12 13:45:51 pherweg
+ // support for margin-left attribute added to fo:block and fo:table
+ //
// Revision 1.10 2002/07/30 14:48:05 bdelacretaz
// V0.7.1dev-d, page-number-citation attributes bug corrected
***************
*** 162,167 ****
/**RtfText attributes: indentation attributes */
//added by Chris Scott
! public static String LEFT_INDENT_BODY = "li";
! public static String LEFT_INDENT_FIRST = "fi-";
public static String TAB_CENTER = "tqc\\tx";
--- 165,171 ----
/**RtfText attributes: indentation attributes */
//added by Chris Scott
! public static final String LEFT_INDENT_BODY = "li";
! public static final String LEFT_INDENT_FIRST = "fi-";
! public static final String RIGHT_INDENT_BODY = "ri";
public static String TAB_CENTER = "tqc\\tx";
***************
*** 193,197 ****
public static String[] INDENT = new String []
{
! LEFT_INDENT_BODY, LEFT_INDENT_FIRST
};
--- 197,202 ----
public static String[] INDENT = new String []
{
! LEFT_INDENT_BODY, LEFT_INDENT_FIRST,
! RIGHT_INDENT_BODY
};
Index: RtfParagraph.java
===================================================================
RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/rtfdoc/RtfParagraph.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** RtfParagraph.java 18 Feb 2003 16:10:58 -0000 1.16
--- RtfParagraph.java 12 Oct 2003 13:45:52 -0000 1.17
***************
*** 64,67 ****
--- 64,70 ----
// $Id$
// $Log$
+ // Revision 1.17 2003/10/12 13:45:52 pherweg
+ // support for margin-left attribute added to fo:block and fo:table
+ //
// Revision 1.16 2003/02/18 16:10:58 rmarra
// Contributions Normand Massé
***************
*** 218,221 ****
--- 221,225 ----
if ( m_attrib.isSet( "intbl" ) && mustWriteAttributes() ) {
writeAttributes(m_attrib, RtfText.ALIGNMENT);
+ writeAttributes(m_attrib, RtfText.INDENT);
}
***************
*** 233,240 ****
if ( !m_attrib.isSet( "intbl" ) ) {
writeAttributes(m_attrib, RtfText.ALIGNMENT);
}
//this line added by Chris Scott, Westinghouse
writeAttributes(m_attrib, RtfText.BORDER);
- writeAttributes(m_attrib, RtfText.INDENT);
writeAttributes(m_attrib, RtfText.TABS);
if(writeForBreak){
--- 237,244 ----
if ( !m_attrib.isSet( "intbl" ) ) {
writeAttributes(m_attrib, RtfText.ALIGNMENT);
+ writeAttributes(m_attrib, RtfText.INDENT);
}
//this line added by Chris Scott, Westinghouse
writeAttributes(m_attrib, RtfText.BORDER);
writeAttributes(m_attrib, RtfText.TABS);
if(writeForBreak){
Index: ITableAttributes.java
===================================================================
RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/rtfdoc/ITableAttributes.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ITableAttributes.java 30 Aug 2003 16:06:19 -0000 1.9
--- ITableAttributes.java 12 Oct 2003 13:45:52 -0000 1.10
***************
*** 65,69 ****
// RTF 1.5 attributes (word 97)
// half the space between the cells of a table row in twips
! String ATTR_RTF_15_TRGAPH = "trgaph";
// RTF 1.6 Row and table attributes
--- 65,70 ----
// RTF 1.5 attributes (word 97)
// half the space between the cells of a table row in twips
! final String ATTR_RTF_15_TRGAPH = "trgaph";
! final String ATTR_ROW_LEFT_INDENT = "trleft";
// RTF 1.6 Row and table attributes
***************
*** 87,91 ****
ATTR_ROW_PADDING_LEFT, ATTR_ROW_U_PADDING_LEFT,
ATTR_ROW_PADDING_RIGHT, ATTR_ROW_U_PADDING_RIGHT,
! ATTR_RTF_15_TRGAPH
};
--- 88,92 ----
ATTR_ROW_PADDING_LEFT, ATTR_ROW_U_PADDING_LEFT,
ATTR_ROW_PADDING_RIGHT, ATTR_ROW_U_PADDING_RIGHT,
! ATTR_RTF_15_TRGAPH, ATTR_ROW_LEFT_INDENT
};
Index: RtfTableRow.java
===================================================================
RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/rtfdoc/RtfTableRow.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** RtfTableRow.java 31 Aug 2003 11:43:12 -0000 1.15
--- RtfTableRow.java 12 Oct 2003 13:45:52 -0000 1.16
***************
*** 62,65 ****
--- 62,68 ----
// $Id$
// $Log$
+ // Revision 1.16 2003/10/12 13:45:52 pherweg
+ // support for margin-left attribute added to fo:block and fo:table
+ //
// Revision 1.15 2003/08/31 11:43:12 pherweg
// Imporoved support for fo:table-header simplified
***************
*** 281,284 ****
--- 284,293 ----
// write X positions of our cells
int xPos = 0;
+
+ final Object leftIndent = m_attrib.getValue(ITableAttributes.ATTR_ROW_LEFT_INDENT);
+ if (leftIndent != null) {
+ xPos = ((Integer)leftIndent).intValue();
+ }
+
index = 0; // Line added by Boris POUDEROUS on 07/02/2002
for(Iterator it = getChildren().iterator(); it.hasNext(); ) {
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php