Changeset 140

Timestamp:

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

Author:

RBRi

Message:

more refactoring

Location:

trunk/NewView

Files:

• HelpFile.pas (modified) (7 diffs)
• HelpTopic.pas (modified) (14 diffs)
• NewViewConstantsUnit.pas (modified) (1 diff)
• ViewStub.pas (modified) (2 diffs)

trunk/NewView/HelpFile.pas

@@ -157 +157 @@
   BseErr,
   StringUtilsUnit,
+  CharUtilsUnit,
   DebugUnit,
-  ACLStringUtility,
   ACLFileIOUtility,
   ACLLanguageUnit;
@@ -964 +964 @@
   i: longint;
   pFontSpec: pTHelpFontSpec;
+  tmpSubstitutionItems : TStringList;
+  tmpCounter : integer;
+  tmpDimensionParts : TStringList;
 begin
   ParseFontTable; // (re)load table from raw data
 
-  while Substitutions <> '' do
-  begin
-    Item := ExtractNextValue( Substitutions, ';' );
+  tmpSubstitutionItems := TStringList.Create;
+  StrExtractStrings(tmpSubstitutionItems, Substitutions, [';'], #0);
+
+  for tmpCounter := 0 to tmpSubstitutionItems.Count - 1 do
+  begin
+    Item := tmpSubstitutionItems[tmpCounter];
     try
       if Item <> '' then
@@ -975 +981 @@
         // Look for space in xxxx WxH
 
-        SpacePos := FindCharFromEnd( Item, ' ' );
+        SpacePos := LastPosOfChar(' ', Item);
         if SpacePos > 0 then
         begin
@@ -981 +987 @@
           FontName := StrLeft( Item, SpacePos - 1 );
           Delete( Item, 1, SpacePos );
+
           // width and height after, with an X between
-          W := StrToInt( ExtractNextValue( Item, 'x' ) );
-          H := StrToInt( Item );
+          tmpDimensionParts := TStringList.Create;
+          StrExtractStrings(tmpDimensionParts, Item, ['x'], #0);
+          W := StrToInt(tmpDimensionParts[0]);
+          H := StrToInt(tmpDimensionParts[1]);
+          tmpDimensionParts.Destroy;
           if ( W > 0 ) and ( H > 0 ) then
           begin
@@ -990 +1000 @@
             begin
               pFontSpec := _FontTable[ i ];
-              if StrNPas( pFontSpec ^. FaceName,
-                          sizeof( pFontSpec ^. FaceName ) ) = FontName then
+              if StrPasWithLength( pFontSpec^.FaceName, sizeof( pFontSpec^.FaceName ) ) = FontName then
               begin
                 // same face name...
@@ -1007 +1016 @@
     end;
   end;
+
+  tmpSubstitutionItems.Destroy;
 end;
 
@@ -1026 +1037 @@
   Result := '';
 
-  if    StringsSame( Ext, '.inf' )
-     or StringsSame( Ext, '.hlp' ) then
+  if    StrEqualIgnoringCase( Ext, '.inf' )
+     or StrEqualIgnoringCase( Ext, '.hlp' ) then
   begin
     szName := Filename;

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 )

trunk/NewView/NewViewConstantsUnit.pas

@@ -16 +16 @@
   PARAM_LINK_EXTERNAL = 'external';
 
+  PRGM_EXPLORER = 'explore'; // web explorer
+  PRGM_NETSCAPE = 'netscape';
+  PRGM_MOZILLA = 'mozilla';
+  PRGM_FIREFOX = 'firefox';
+
+
 Implementation
 

trunk/NewView/ViewStub.pas

@@ -68 +68 @@
     result := NULLHANDLE;
 
-    if aCmdLineParameters.getFileNames = '' then
+    if aCmdLineParameters.getFileNames(false) = '' then
       // not loading files; nothing to check
       exit;
@@ -75 +75 @@
     tmpFilenames := TStringList.Create;
 
-    StrExtractStrings(tmpFileItems, aCmdLineParameters.getFileNames, ['+'], #0);
+    StrExtractStrings(tmpFileItems, aCmdLineParameters.getFileNames(false), ['+'], #0);
     TranslateIPFEnvironmentVars(tmpFileItems, tmpFileNames );