Changeset 214 for trunk/Components/RichTextStyleUnit.pas

Timestamp:

Jun 13, 2007, 8:33:51 PM (18 years ago)

Author:

RBRi

Message:

using StringUtilsUnit

File:

• trunk/Components/RichTextStyleUnit.pas (modified) (7 diffs)

trunk/Components/RichTextStyleUnit.pas

@@ -4 +4 @@
 
 uses
-  Forms, Classes, Graphics, CanvasFontManager, RichTextDocumentUnit;
+  Forms,
+  Classes,
+  Graphics,
+  CanvasFontManager,
+  RichTextDocumentUnit;
 
 type
@@ -144 +148 @@
 uses
   SysUtils,
-  ACLStringUtility;
-//  ACLProfile;
+  StringUtilsUnit;
 
 Procedure ApplyStyle( const Style: TTextDrawStyle;
@@ -169 +172 @@
   XSizeStr: string;
   YSizeStr: string;
+  tmpFontParts : TStringList;
 
   MarginSize: longint;
@@ -203 +207 @@
     ttFont:
     begin
-      ParseIndex := 1;
-      GetNextQuotedValue( Tag.Arguments, ParseIndex, FontFaceName, DoubleQuote );
-      GetNextQuotedValue( Tag.Arguments, ParseIndex, FontSizeString, DoubleQuote );
+      tmpFontParts := TStringList.Create;
+      StrExtractStringsQuoted(tmpFontParts, Tag.Arguments);
+      FontFaceName := tmpFontParts[0];
+      FontSizeString := tmpFontParts[1];
+      tmpFontParts.Destroy;
+
       NewStyle := Style;
       try
@@ -212 +219 @@
         if Pos( 'x', FontSizeString ) > 0 then
         begin
-          XSizeStr := ExtractNextValue( FontSizeString, 'x' );
-          YSizeStr := FontSizeString;
+          tmpFontParts := TStringList.Create;
+          StrExtractStrings(tmpFontParts, FontSizeString, ['x'], #0);
+          XSizeStr := tmpFontParts[0];
+          YSizeStr := tmpFontParts[1];
+          tmpFontParts.Destroy;
+
           NewStyle.Font.XSize := StrToInt( XSizeStr );
           NewStyle.Font.YSize := StrToInt( YSizeStr );
@@ -265 +276 @@
     ttSetRightMargin:
     begin
+      tmpFontParts := TStringList.Create;
+      StrExtractStrings(tmpFontParts, Tag.Arguments, [' '], #0);
+      MarginParam1 := tmpFontParts[0];
+      tmpFontParts.Destroy;
+
       ParsePoint := 1;
-      GetNextValue( Tag.Arguments, ParsePoint, MarginParam1, ' ' );
       if     ( Tag.TagType = ttSetLeftMargin )
          and ( MarginParam1 = 'here' ) then
@@ -276 +291 @@
         try
           MarginSize := StrToInt( MarginParam1 );
-          GetNextValue( Tag.Arguments, ParsePoint, MarginParam2, ' ' );
+          MarginParam2 := tmpFontParts[1];
           if MarginParam2 = 'pixels' then
             NewMargin := MarginSize