Indentation tidyups

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@11205 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2001-10-18 15:33:23 +00:00
parent b0663eeb9a
commit 424c51335e

View file

@ -3068,16 +3068,16 @@ scanRange (NSScanner *scanner, NSCharacterSet* aSet)
{ {
NSLog(@"we are at end before finishing a line: %d.\n", [lineScanner scanLocation]); NSLog(@"we are at end before finishing a line: %d.\n", [lineScanner scanLocation]);
NSLog(@"scanLocation = %d, previousParagraphLocation = %d, beginLineIndex = %d", NSLog(@"scanLocation = %d, previousParagraphLocation = %d, beginLineIndex = %d",
[lineScanner scanLocation], [lineScanner scanLocation],
previousParagraphLocation, previousParagraphLocation,
beginLineIndex); beginLineIndex);
[lineStarts addObject: [NSNumber [lineStarts addObject: [NSNumber
numberWithInt: beginLineIndex]]; numberWithInt: beginLineIndex]];
[lineEnds addObject: [NSNumber [lineEnds addObject: [NSNumber
numberWithInt: (int)[lineScanner scanLocation] + previousParagraphLocation - (beginLineIndex)]]; numberWithInt: (int)[lineScanner scanLocation] + previousParagraphLocation - (beginLineIndex)]];
lineWidth = 0.0; lineWidth = 0.0;
} }
lineWidth += lSize.width; lineWidth += lSize.width;
//NSLog(@"lineWidth: %f", lineWidth); //NSLog(@"lineWidth: %f", lineWidth);
} }
@ -3088,22 +3088,22 @@ numberWithInt: (int)[lineScanner scanLocation] + previousParagraphLocation - (be
lastLineForContainerReached = YES; lastLineForContainerReached = YES;
break; break;
} }
[lineScanner setScanLocation: previousScanLocation]; [lineScanner setScanLocation: previousScanLocation];
indexToAdd = previousScanLocation + previousParagraphLocation indexToAdd = previousScanLocation + previousParagraphLocation
- (beginLineIndex); - (beginLineIndex);
NSLog(@"previousScanLocation = %d, previousParagraphLocation = %d, beginLineIndex = %d indexToAdd = %d", NSLog(@"previousScanLocation = %d, previousParagraphLocation = %d, beginLineIndex = %d indexToAdd = %d",
previousScanLocation, previousScanLocation,
previousParagraphLocation, previousParagraphLocation,
beginLineIndex, beginLineIndex,
indexToAdd); indexToAdd);
ourLines += 20.0; // 14 ourLines += 20.0; // 14
lineWidth = 0.0; lineWidth = 0.0;
[lineStarts addObject: [NSNumber [lineStarts addObject: [NSNumber
numberWithInt: beginLineIndex]]; numberWithInt: beginLineIndex]];
[lineEnds addObject: [NSNumber numberWithInt: indexToAdd]]; [lineEnds addObject: [NSNumber numberWithInt: indexToAdd]];
beginLineIndex = previousScanLocation + previousParagraphLocation; beginLineIndex = previousScanLocation + previousParagraphLocation;
} }