Fixed bugs in STXSaxDriver.

[sope] / sope-xml / STXSaxDriver / Model / StructuredTextParagraph.m

diff --git a/sope-xml/STXSaxDriver/Model/StructuredTextParagraph.m b/sope-xml/STXSaxDriver/Model/StructuredTextParagraph.m
index 9f3ad8c5e4d943b56e721d1cb97e113c345312e3..5d4d7d964c69c875faf19b974d5dea89607f4d12 100644 (file)
--- a/sope-xml/STXSaxDriver/Model/StructuredTextParagraph.m
+++ b/sope-xml/STXSaxDriver/Model/StructuredTextParagraph.m
@@ -24,22 +24,22 @@
 
 @implementation StructuredTextParagraph
 
-- (id)initWithString:(NSString *)aString {
+- (id)initWithString:(NSString *)_s {
   if ((self = [super init])) {
-    _text = [aString retain];
+    self->_text = [_s retain];
   }
   return self;
 }
 
 - (void)dealloc {
-  [_text release];
+  [self->_text release];
   [super dealloc];
 }
 
 /* accessors */
 
 - (NSString *)text {
-  return _text;
+  return self->_text;
 }
 
 /* processing */
@@ -47,14 +47,11 @@
 - (NSString *)textParsedWithDelegate:(id<StructuredTextRenderingDelegate>)_del
   inContext:(NSDictionary *)_ctx 
 {
-  NSString *text;
-
   self->_delegate = _del;
-  text = [self parseText:[self text] inContext:_ctx];
-  
-  return (_del)
-    ? [_del insertText:text inContext:_ctx]
-    : text;
+  [self beginParagraphInContext:_ctx];
+  [self parseText:[self text] inContext:_ctx];
+  [self endParagraphInContext:_ctx];
+  return nil;
 }
 
 @end /* StructuredTextParagraph */