Changeset 140 for trunk/NewView/HelpTopic.pas

Timestamp:

Apr 30, 2007, 9:01:02 PM (18 years ago)

Author:

RBRi

Message:

more refactoring

File:

• trunk/NewView/HelpTopic.pas (modified) (14 diffs)

trunk/NewView/HelpTopic.pas

@@ -253 +253 @@
   NewViewConstantsUnit,
   ACLUtility,
-  ACLStringUtility,
   ACLFileIOUtility,
   AStringUtilityUnit,
   ACLLanguageUnit,
   StringUtilsUnit,
+  CharUtilsUnit,
   SettingsUnit;
 
@@ -565 +565 @@
 
   Write( F, ':artwork name=' );
-  Write( F, StrQuote( 'img' + IntToStr( ImageIndex ) + '.bmp' ) );
+  Write( F, StrInSingleQuotes('img' + IntToStr(ImageIndex) + '.bmp') );
 
   case BitmapFlags and 7 of
@@ -826 +826 @@
 end;
 
+// TODO
 function FullDoubleQuote( const s: string ): string;
 begin
-  Result := DoubleQuote
-            + InsertDuplicateChars( s,
-                                    DoubleQuote )
-            + DoubleQuote;
+  Result := StrDoubleQuote
+            + StrEscapeAllCharsBy(s, [], CharDoubleQuote)
+            + StrDoubleQuote;
 end;
 
@@ -906 +906 @@
   ProgramFilename: string;
   ProgramInfo : TSerializableStringList;
+  tmpProgramLinkParts : TStringList;
 
   OutputString: string;
@@ -1031 +1032 @@
       // :link reftype=hd refid=... database=<filename>
       ExternalLinkFileIndex := ( pData + 2 )^;
-      ExternalLinkTopicID := StrNPas( pchar( pData + 4 ), ( pData + 3 )^ );
+      ExternalLinkTopicID := StrPasWithLength( pchar( pData + 4 ), ( pData + 3 )^ );
       OutputString := '<blue><link ' + PARAM_LINK_EXTERNAL + ' '
                       + IntToStr( ExternalLinkFileIndex )
@@ -1043 +1044 @@
     begin
       CheckForAutoURL( Text, State );
-      ProgramLink := StrNPas( pchar( pData + 3 ), EscapeLen - 3 );
-      ProgramPath := ExtractNextValue( ProgramLink, ' ' );
+      ProgramLink := StrPasWithLength( pchar( pData + 3 ), EscapeLen - 3 );
+
+      tmpProgramLinkParts := TStringList.Create;
+      StrExtractStrings(tmpProgramLinkParts, ProgramLink, [' '], #0);
+      ProgramPath := tmpProgramLinkParts[0];
+      tmpProgramLinkParts.Destroy;
+
       ProgramFilename := ExtractFilename( ProgramPath );
-      if    StrStarts( 'netscape', ProgramFilename )
-         or StrStarts( 'explore', ProgramFilename ) // web explorer?
-         or StrStarts( 'mozilla', ProgramFilename )
+
+      if    StrStartsWithIgnoringCase(PRGM_EXPLORER, ProgramFilename ) // web explorer?
+         or StrStartsWithIgnoringCase(PRGM_NETSCAPE, ProgramFilename )
+         or StrStartsWithIgnoringCase(PRGM_MOZILLA, ProgramFilename )
+         or StrStartsWithIgnoringCase(PRGM_FIREFOX, ProgramFilename )
          then
       begin
@@ -1201 +1209 @@
         begin
           pFontSpec := _FontTable[ FontIndex ];
-          FaceName := StrNPas( pFontSpec ^. FaceName,
+          FaceName := StrPasWithLength( pFontSpec ^. FaceName,
                                sizeof( pFontSpec ^. FaceName ) );
           // arbitrarily and capriciously use specified height * 2/3
@@ -1511 +1519 @@
 
         // s := pstring( _GlobalDictionary[ DictIndex ] )^; // for debug only
-        if not IsSpaces( pstring( _GlobalDictionary[ DictIndex ] )^ ) then
+        if not StrIsEmptyOrSpaces( pstring( _GlobalDictionary[ DictIndex ] )^ ) then
         begin
           if pSequenceStepWords^[ DictIndex ] = 0 then
@@ -1638 +1646 @@
           StringToAdd := '';
 
-        if IsSpaces( StringToAdd ) then
+        if StrIsEmptyOrSpaces( StringToAdd ) then
         begin
           // spaces only...
@@ -2022 +2030 @@
 
       if GlobalDictIndex < _GlobalDictionary.Count then
-        if not IsSpaces( pstring( _GlobalDictionary[ GlobalDictIndex ] )^ ) then;
+        if not StrIsEmptyOrSpaces( pstring( _GlobalDictionary[ GlobalDictIndex ] )^ ) then;
           WordRelevance := pStepWordRelevances[ GlobalDictIndex ];
 
@@ -2265 +2273 @@
   ProgramLink: string;
   ProgramPath: string;
+  tmpProgramLinkParts : TStringList;
 
   OutputString: string;
@@ -2372 +2381 @@
     begin
       ExternalLinkFileIndex := ( pData + 2 )^;
-      ExternalLinkTopicID := StrNPas( pchar( pData + 4 ), ( pData + 3 )^ );
+      ExternalLinkTopicID := StrPasWithLength( pchar( pData + 4 ), ( pData + 3 )^ );
       Write( F, ':link reftype=hd '
-             + ' refid=' + StrQuote( ExternalLinkTopicID )
-             + ' database=' + StrQuote( _ReferencedFiles[ ExternalLinkFileIndex ] )
+             + ' refid=' + StrInSingleQuotes( ExternalLinkTopicID )
+             + ' database=' + StrInSingleQuotes( _ReferencedFiles[ ExternalLinkFileIndex ] )
              + '.' );
 
@@ -2382 +2391 @@
     ecProgramLink:
     begin
-      ProgramLink := StrNPas( pchar( pData + 3 ), EscapeLen - 3 );
-      ProgramPath := ExtractNextValue( ProgramLink, ' ' );
+      ProgramLink := StrPasWithLength( pchar( pData + 3 ), EscapeLen - 3 );
+
+      tmpProgramLinkParts := TStringList.Create;
+      StrExtractStrings(tmpProgramLinkParts, ProgramLink, [' '], #0);
+      ProgramPath := tmpProgramLinkParts[0];
+      tmpProgramLinkParts.Destroy;
+
       Write( F, ':link reftype=launch'
-             + ' object=' + StrQuote( ProgramPath )
-             + ' data=' + StrQuote( ProgramLink )
+             + ' object=' + StrInSingleQuotes( ProgramPath )
+             + ' data=' + StrInSingleQuotes( ProgramLink )
              + '.' );
     end;
@@ -2506 +2520 @@
         begin
           pFontSpec := _FontTable[ FontIndex ];
-          FaceName := StrNPas( pFontSpec ^. FaceName,
+          FaceName := StrPasWithLength( pFontSpec ^. FaceName,
                                sizeof( pFontSpec ^. FaceName ) );
           Write( F,
-                 ':font facename=' + StrQuote( FaceName )
+                 ':font facename=' + StrInSingleQuotes( FaceName )
                  + ' size=' + IntToStr( pFontSpec ^. Height )
                    + 'x' + IntToStr( pFontSpec ^. Width )