[Babeldoc-devel] babeldoc/modules/conversion/src/com/babeldoc/conversion/flatfile FlatFileConverter.java,1.2,1.3 LineSegmentData.java,1.1,1.2

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/flatfile
In directory sc8-pr-cvs1:/tmp/cvs-serv31614

Modified Files:
	FlatFileConverter.java LineSegmentData.java 
Log Message:
Added fixes for bugs: 865405,  865397
and RFE: 865418

Index: FlatFileConverter.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/flatfile/FlatFileConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FlatFileConverter.java	30 Oct 2003 00:15:56 -0000	1.2
--- FlatFileConverter.java	24 Dec 2003 20:14:14 -0000	1.3
***************
*** 390,398 ****
        int width = lineSegment.width;
        String value = lineSegment.value;
  
!       if ((line.length() > (column + width)) &&
!             line.substring(column, width).equals(value)) {
!         Element segmentElement = handleLineSegmentElement(element, lineSegment);
  
          try {
            handlineLineSegmentElementData(segmentElement, lineSegment, para);
--- 390,400 ----
        int width = lineSegment.width;
        String value = lineSegment.value;
+       String pattern = lineSegment.pattern;
  
!       if ((pattern != null && line.matches(pattern)) || ((width > 0)
!           && (line.length() > (column + width)) &&
!           line.substring(column, column + width).equals(value))) {
  
+         Element segmentElement = handleLineSegmentElement(element, lineSegment);
          try {
            handlineLineSegmentElementData(segmentElement, lineSegment, para);

Index: LineSegmentData.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/conversion/src/com/babeldoc/conversion/flatfile/LineSegmentData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LineSegmentData.java	19 Jul 2003 13:16:47 -0000	1.1
--- LineSegmentData.java	24 Dec 2003 20:14:14 -0000	1.2
***************
*** 85,88 ****
--- 85,89 ----
    public int conversionType;
    public int width;
+   public String pattern;
  
    /**
***************
*** 97,100 ****
--- 98,102 ----
                                      .append("conversionType", conversionType)
                                      .append("value", value)
+                                     .append("pattern", pattern)
                                      .append("startGroup", startGroup)
                                      .append("endGroup", endGroup)