Przeglądaj źródła

Merge branch source:main into main

Curtis Hamilton 3 tygodni temu
rodzic
commit
26a7cb69be
100 zmienionych plików z 2359 dodań i 1651 usunięć
  1. 4 0
      compiler/pdecl.pas
  2. 8 0
      compiler/symdef.pas
  3. 1 1
      packages/fcl-base/src/csvdocument.pp
  4. 1 1
      packages/fcl-base/texts/fptemplate.txt
  5. 1 1
      packages/fcl-db/src/base/db.pas
  6. 1 1
      packages/fcl-json/src/jsonconf.pp
  7. 2 2
      packages/fcl-passrc/examples/test_parser.pp
  8. 1 1
      packages/fcl-passrc/examples/testunit1.pp
  9. 9 9
      packages/fcl-process/src/process.txt
  10. 4 4
      packages/fcl-sdo/src/base/sdo.pas
  11. 1 1
      packages/fcl-web/examples/fcm/README.md
  12. 194 0
      packages/fcl-web/examples/websocket/postmanecho/postmanecho.pp
  13. 1 1
      packages/fcl-web/src/base/FCGI-README.txt
  14. 1 1
      packages/fcl-web/src/base/iniwebsession.pp
  15. 1 1
      packages/fcl-web/src/jsonrpc/fpjsonrpc.pp
  16. 1 1
      packages/fcl-xml/tests/README_DOM.txt
  17. 1 1
      packages/fpindexer/examples/readme.txt
  18. 1 1
      packages/gtk2/src/gtkext/gtk2ext.pp
  19. 1 1
      packages/httpd13/src/ap.inc
  20. 2 2
      packages/httpd13/src/httpd.inc
  21. 1 1
      packages/httpd20/src/ap_release.inc
  22. 2 2
      packages/httpd20/src/apr/apr_errno.inc
  23. 2 2
      packages/httpd20/src/apr/apr_file_info.inc
  24. 2 2
      packages/httpd20/src/apr/apr_file_io.inc
  25. 1 1
      packages/httpd20/src/apr/apr_network_io.inc
  26. 1 1
      packages/httpd20/src/apr/apr_poll.inc
  27. 1 1
      packages/httpd20/src/apr/apr_portable.inc
  28. 1 1
      packages/httpd20/src/apr/apr_time.inc
  29. 1 1
      packages/httpd20/src/http_config.inc
  30. 1 1
      packages/httpd20/src/util_filter.inc
  31. 1 1
      packages/httpd22/src/ap_release.inc
  32. 2 2
      packages/httpd22/src/apr/apr_errno.inc
  33. 2 2
      packages/httpd22/src/apr/apr_file_info.inc
  34. 2 2
      packages/httpd22/src/apr/apr_file_io.inc
  35. 1 1
      packages/httpd22/src/apr/apr_network_io.inc
  36. 1 1
      packages/httpd22/src/apr/apr_portable.inc
  37. 1 1
      packages/httpd22/src/apr/apr_time.inc
  38. 1 1
      packages/httpd22/src/http_config.inc
  39. 1 1
      packages/httpd22/src/httpd.inc
  40. 1 1
      packages/httpd22/src/util_filter.inc
  41. 2 2
      packages/httpd24/src/apr/apr_file_info.inc
  42. 1 1
      packages/httpd24/src/apr/apr_time.inc
  43. 3 3
      packages/httpd24/src/httpd.inc
  44. 1 1
      packages/libjack/src/net.inc
  45. 1 1
      packages/libndsfpc/examples/dswifi/ap_search/apSearch.pp
  46. 3 3
      packages/libndsfpc/examples/gl2d/scrolling/scrolling.pp
  47. 2 2
      packages/libndsfpc/examples/gl2d/sprites/sprites.pp
  48. 1 1
      packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/3DBothScreens.pp
  49. 1 1
      packages/libndsfpc/examples/graphics/3D/Picking/Picking.pp
  50. 1 1
      packages/libndsfpc/examples/graphics/3D/Toon_Shading/ToonShading.pp
  51. 1 1
      packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/DoubleBuffer.pp
  52. 1 1
      packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Advanced.pp
  53. 1 1
      packages/libndsfpc/examples/time/RealTimeClock/realtimeclock.pp
  54. 1 1
      packages/libndsfpc/src/nds/arm9/videoGL.inc
  55. 1 1
      packages/libndsfpc/src/nds/card.inc
  56. 1 1
      packages/libndsfpc/src/nds/registers_alt.inc
  57. 1 1
      packages/libusb/src/libusb.pp
  58. 1 1
      packages/oracle/README.txt
  59. 6 6
      packages/oracle/src/nzt.inc
  60. 10 10
      packages/oracle/src/oci.inc
  61. 19 19
      packages/oracle/src/ociap.inc
  62. 4 4
      packages/oracle/src/orl.inc
  63. 2 2
      packages/oracle/src/oro_interface.inc
  64. 8 8
      packages/oracle/src/ort.inc
  65. 2 2
      packages/paszlib/readme.txt
  66. 153 0
      packages/rtl-console/demo/demoansi.pp
  67. 2 0
      packages/rtl-console/fpmake.pp
  68. 3 0
      packages/rtl-console/namespaced/System.Console.Ansi.pp
  69. 1 0
      packages/rtl-console/namespaces.lst
  70. 343 0
      packages/rtl-console/src/inc/fpansi.pp
  71. 1 1
      packages/rtl-extra/src/beos/unxsockh.inc
  72. 1 1
      packages/rtl-extra/src/dragonfly/unxsockh.inc
  73. 1 1
      packages/rtl-extra/src/freebsd/unxsockh.inc
  74. 1 1
      packages/rtl-extra/src/haiku/unxsockh.inc
  75. 1 1
      packages/rtl-extra/src/openbsd/unxsockh.inc
  76. 1 1
      packages/rtl-extra/src/solaris/unxsockh.inc
  77. 1 1
      packages/rtl-objpas/fpmake.pp
  78. 1 1
      packages/sdl/src/sdl_mixer.pas
  79. 2 2
      packages/univint/src/ABGlobals.pas
  80. 179 179
      packages/univint/src/AEDataModel.pas
  81. 58 58
      packages/univint/src/AEHelpers.pas
  82. 46 46
      packages/univint/src/AEInteraction.pas
  83. 33 33
      packages/univint/src/AEMach.pas
  84. 47 47
      packages/univint/src/AEObjects.pas
  85. 17 17
      packages/univint/src/AEPackObject.pas
  86. 7 7
      packages/univint/src/AERegistry.pas
  87. 7 7
      packages/univint/src/AEUserTermTypes.pas
  88. 4 4
      packages/univint/src/AIFF.pas
  89. 34 34
      packages/univint/src/ASDebugging.pas
  90. 6 6
      packages/univint/src/ASRegistry.pas
  91. 182 182
      packages/univint/src/ATSFont.pas
  92. 26 26
      packages/univint/src/ATSLayoutTypes.pas
  93. 31 31
      packages/univint/src/ATSTypes.pas
  94. 50 50
      packages/univint/src/ATSUnicodeDirectAccess.pas
  95. 164 164
      packages/univint/src/ATSUnicodeDrawing.pas
  96. 61 61
      packages/univint/src/ATSUnicodeFlattening.pas
  97. 171 171
      packages/univint/src/ATSUnicodeFonts.pas
  98. 151 151
      packages/univint/src/ATSUnicodeGlyphs.pas
  99. 179 179
      packages/univint/src/ATSUnicodeObjects.pas
  100. 57 57
      packages/univint/src/ATSUnicodeTypes.pas

+ 4 - 0
compiler/pdecl.pas

@@ -961,6 +961,10 @@ implementation
                         end;
 
                       include(hdef.defoptions,df_unique);
+
+                      { update object's real name for better error messages }
+                      if hdef is tabstractrecorddef then
+                        tabstractrecorddef(hdef).setobjrealname(newtype.RealName);
                     end;
                   if not assigned(hdef.typesym) then
                     begin

+ 8 - 0
compiler/symdef.pas

@@ -372,6 +372,8 @@ interface
           function is_visible_for_rtti(option: trtti_option; vis: tvisibility): boolean; inline;
           function rtti_visibilities_for_option(option: trtti_option): tvisibilities; inline;
           function has_extended_rtti: boolean; inline;
+          { update the name of the object, typically needed after getcopy }
+          procedure setobjrealname(const n: string);
        end;
 
        pvariantrecdesc = ^tvariantrecdesc;
@@ -5350,6 +5352,12 @@ implementation
       end;
 {$endif DEBUG_NODE_XML}
 
+    procedure tabstractrecorddef.setobjrealname(const n:string);
+      begin
+        Freemem(objrealname);
+        objrealname:=stringdup(n);
+      end;
+
 {***************************************************************************
                                   trecorddef
 ***************************************************************************}

+ 1 - 1
packages/fcl-base/src/csvdocument.pp

@@ -124,7 +124,7 @@ type
 
     // Return column for cell data AString at row ARow
     function  IndexOfCol(const AString: String; ARow: Integer): Integer;
-    // Return row for cell data AString at coloumn ACol
+    // Return row for cell data AString at column ACol
     function  IndexOfRow(const AString: String; ACol: Integer): Integer;
 
     // Utils

+ 1 - 1
packages/fcl-base/texts/fptemplate.txt

@@ -162,7 +162,7 @@ following Tag in a template:
 .
 
 
-I know, I know its ugly html progamming and who uses tables and font html tags
+I know, I know its ugly html programming and who uses tables and font html tags
 nowadays, etc. ... but you get the idea.
 The OnReplaceTag event handler just need to replace the whole REPORTRESULT
 template tag with the ~Column1, ~Column2 for the HEADER parameter, and the

+ 1 - 1
packages/fcl-db/src/base/db.pas

@@ -1573,7 +1573,7 @@ type
   be changed later (2.8?), to allow a grace period for descendents to catch up.
 
   Testing with TRecordBuffer=PByte will turn up typing problems. TRecordBuffer=pansichar is backwards
-  compatible, even if overriden with "PAnsiChar" variants.
+  compatible, even if overridden with "PAnsiChar" variants.
 }
   TRecordBufferBaseType = AnsiChar; // must match TRecordBuffer.
   TRecordBuffer = PAnsiChar;

+ 1 - 1
packages/fcl-json/src/jsonconf.pp

@@ -45,7 +45,7 @@ type
 
 (* ********************************************************************
    "APath" is the path and name of a value: A JSON configuration file
-   is hierachical. "/" is the path delimiter, the part after the last
+   is hierarchical. "/" is the path delimiter, the part after the last
    "/" is the name of the value. The path components will be mapped
    to nested JSON objects, with the name equal to the part. In practice
    this means that "/my/path/value" will be written as:

+ 2 - 2
packages/fcl-passrc/examples/test_parser.pp

@@ -15,7 +15,7 @@
     Also the output is not always in the same order as in input as this
     information is not available easily.
 
-    !!!Do not expect this program to produce executeable output!!!
+    !!!Do not expect this program to produce executable output!!!
 
     Status: -workes with one Unit or Program
             -Some type declarations missing
@@ -182,7 +182,7 @@ var
   E: TPasTreeContainer;
   I: Integer;
   cmdl, TargetOS, TargetCPU : string;
-  isim, //is Impleamentation, only for GetTPasProcedureBody
+  isim, //is Implementation, only for GetTPasProcedureBody
   Unformated:boolean; // no Formating in output
 
 

+ 1 - 1
packages/fcl-passrc/examples/testunit1.pp

@@ -1,5 +1,5 @@
 //This is only for testing the parser, it is not intended to be runable in a real
-//program but for checking the contructs to be parsed well.
+//program but for checking the constructs to be parsed well.
 //All statements are written like testparser would print them out to diff the
 //result with this file again to show differences.
 //Based on /utils/fpdoc/testunit.pp

+ 9 - 9
packages/fcl-process/src/process.txt

@@ -35,7 +35,7 @@ Options control the behaviour of the object. It can be a set of the
 following constants:
 
 poExecuteOnCreate
-  If you include this option, the constructor will immediatly
+  If you include this option, the constructor will immediately
   call the Execute method, using default settings for all parameters.
   This has the effect that the program is run at once.
 
@@ -54,13 +54,13 @@ poUsePipes
 
 poNoConsole
   If you include this option, the application will not display a
-  console, untill it explicitly needs one or requests one using the
+  console, until it explicitly needs one or requests one using the
   AllocConsole method. This is very convenient in combination with the
   poUsePipes option, allowing you to run an application without getting
   the Console window, and being able to read it's output at once.
 
 poStderrToOutPut
-  If This option is included, then the error desciptor is redirected to
+  If This option is included, then the error descriptor is redirected to
   the standard output director, i.e. all output goes to the standard
   output.
 
@@ -89,7 +89,7 @@ Destructor Destroy; virtual;
   you may kill it.
 
 Procedure Execute; virtual;
-  This actually runs the application. It will return immediatly, unless
+  This actually runs the application. It will return immediately, unless
   you specified the poWaitOnExit option when creating the object.
 
 Function Resume : Integer; virtual;
@@ -109,8 +109,8 @@ Function Terminate (AExitCode : Integer): Boolean; virtual;
   It returns True on succes, False on failure.
 
 Function WaitOnExit : Boolean;
-  This function returns true if the wait for the process exit was succesful,
-  false if some error occurded. It returns immediatly if the application is
+  This function returns true if the wait for the process exit was successful,
+  false if some error occurred. It returns immediately if the application is
   not running, and waits for the application to finish if it was still running.
 
 Property ApplicationName : String;
@@ -143,7 +143,7 @@ Property CreationFlags : Cardinal;
   settings tat you may have made.
 
 Property CurrentDirectory : String;
-  When set, the process wil start in the directory that you have set
+  When set, the process will start in the directory that you have set
   for it.
 
 Property DeskTop : String;
@@ -164,7 +164,7 @@ Property ExitStatus : Integer;
 
 Property ExitCode : Integer;
   Read-Only
-  This returns the exit code as returned by the application, if it exited correcly.
+  This returns the exit code as returned by the application, if it exited correctly.
   It returns 0 if the process didn't exit correctly (e.g. a signal).
 
 Property FillAttribute : Integer;
@@ -210,7 +210,7 @@ Property ProcessInformation : TProcessInformation;
 
 Property Running : Boolean;
   Read-Only
-  Retruns True if the application is still running, False otherwise.
+  Returns True if the application is still running, False otherwise.
   If the application is suspended or not doesn't affect the result.
 
 Property ShowWindow : Word;

+ 4 - 4
packages/fcl-sdo/src/base/sdo.pas

@@ -494,7 +494,7 @@ type
 	 *
 	 * Although many types may have a property of the same name, any given
 	 * instance of a property belongs to only one type.
-	 * This method returns the type which holds this proeprty.
+	 * This method returns the type which holds this property.
 	 }
    function getContainingType() : ISDOType;
 
@@ -906,7 +906,7 @@ type
      * copied.
      * The byte array is not necessarily null terminated. If a null terminated
      * C style string is required, then getCString is an alternative.
-     * The third paarameter is the length of the allocated buffer, which may be more
+     * The third parameter is the length of the allocated buffer, which may be more
      * than the length of the byte array. If the length specified is less than the
      * length of the byte array, then only a portion of the
      * byte array is returned.
@@ -927,7 +927,7 @@ type
      * by the users program. The return value is the number of wchar_t actually
      * copied.
      * The array is not necessarily null terminated.
-     * The third paarameter is the length of the allocated buffer, which may be more
+     * The third parameter is the length of the allocated buffer, which may be more
      * than the length of the array. If the length specified is less than the
      * length of the array, then only a portion of the array is returned.
        }
@@ -1123,7 +1123,7 @@ type
     {  clear unsets all the properties
      *
      * This method unsets all the properties, and deletes all the data object
-     * propertiy values from this data object.
+     * property values from this data object.
      }
 
     procedure clear();

+ 1 - 1
packages/fcl-web/examples/fcm/README.md

@@ -37,7 +37,7 @@ The JSON should be saved in a file called
 ```
 messagingserver-serviceaccount.json
 ```
-It will be loaded by the server when communicaton with FCM servers is
+It will be loaded by the server when communication with FCM servers is
 needed.
 
 ### HTTPS 

+ 194 - 0
packages/fcl-web/examples/websocket/postmanecho/postmanecho.pp

@@ -0,0 +1,194 @@
+program PostManEcho;
+
+{$mode objfpc}{$H+}
+
+uses
+  {$IFDEF UNIX}
+  cthreads,
+  {$ENDIF}
+  SysUtils,
+  Classes,
+  opensslsockets,
+  fpwebsocketclient,
+  fpwebsocket;
+
+type
+  TWebSocketDemo = class
+  private
+    FClient: TWebsocketClient;
+    FConnected: Boolean;
+
+    procedure HandleConnect(Sender: TObject);
+    procedure HandleDisconnect(Sender: TObject);
+    procedure HandleMessageReceived(Sender: TObject; const AMessage: TWSMessage);
+  public
+    constructor Create;
+    destructor Destroy; override;
+
+    procedure Connect(const AHost: string; APort: Integer; const AResource: string);
+    procedure Disconnect;
+    procedure Send(const AMessage: string);
+    procedure WaitForMessages(ASeconds: Integer);
+  end;
+
+{ TWebSocketDemo }
+
+constructor TWebSocketDemo.Create;
+var
+  LMessagePump: TWSThreadMessagePump;
+begin
+  inherited Create;
+  FConnected := False;
+
+  // Create message pump for async message handling
+  LMessagePump := TWSThreadMessagePump.Create(nil);
+  LMessagePump.Interval := 50; // Check every 50ms
+
+  // Create client
+  FClient := TWebsocketClient.Create(nil);
+  FClient.MessagePump := LMessagePump;
+  FClient.ConnectTimeout := 10000;
+  FClient.CheckTimeOut := 100;
+
+  // Wire events
+  FClient.OnConnect := @HandleConnect;
+  FClient.OnDisconnect := @HandleDisconnect;
+  FClient.OnMessageReceived := @HandleMessageReceived;
+end;
+
+destructor TWebSocketDemo.Destroy;
+begin
+  WriteLn('Destroying WebSocketDemo...');
+
+  // Disconnect if still connected
+  if FConnected then
+    Disconnect;
+
+  // Free message pump first
+  if Assigned(FClient.MessagePump) then
+  begin
+    WriteLn('  Freeing message pump...');
+    FClient.MessagePump.Free;
+  end;
+
+  // Free client
+  WriteLn('  Freeing client...');
+  FClient.Free;
+
+  WriteLn('  Done.');
+  inherited;
+end;
+
+procedure TWebSocketDemo.HandleConnect(Sender: TObject);
+begin
+  FConnected := True;
+  WriteLn('Connected!');
+end;
+
+procedure TWebSocketDemo.HandleDisconnect(Sender: TObject);
+begin
+  FConnected := False;
+  WriteLn('Disconnected!');
+end;
+
+procedure TWebSocketDemo.HandleMessageReceived(Sender: TObject; const AMessage: TWSMessage);
+begin
+  if AMessage.IsText then
+    WriteLn('Received: ', AMessage.AsString)
+  else
+    WriteLn('Received binary data: ', Length(AMessage.PayLoad), ' bytes');
+end;
+
+procedure TWebSocketDemo.Connect(const AHost: string; APort: Integer; const AResource: string);
+begin
+  WriteLn('Connecting to ', AHost, ':', APort, AResource);
+
+  FClient.HostName := AHost;
+  FClient.Port := APort;
+  FClient.Resource := AResource;
+  FClient.UseSSL := (APort = 443);
+
+  // Start message pump
+  if Assigned(FClient.MessagePump) then
+  begin
+    WriteLn('Starting message pump...');
+    FClient.MessagePump.Execute;
+  end;
+
+  // Connect
+  FClient.Connect;
+end;
+
+procedure TWebSocketDemo.Disconnect;
+begin
+  if not FClient.Active then
+    Exit;
+
+  WriteLn('Disconnecting...');
+
+  // Stop message pump first
+  if Assigned(FClient.MessagePump) then
+  begin
+    try
+      FClient.MessagePump.Terminate;
+    except
+      // Ignore
+    end;
+  end;
+
+  FClient.Disconnect;
+end;
+
+procedure TWebSocketDemo.WaitForMessages(ASeconds: Integer);
+var
+  I: Integer;
+begin
+  WriteLn('Waiting ', ASeconds, ' seconds for messages...');
+  for I := 1 to ASeconds do
+  begin
+    Sleep(1000);
+    Write('.');
+  end;
+  WriteLn;
+end;
+
+procedure TWebSocketDemo.Send(const AMessage: string);
+begin
+  WriteLn('Sending: ', AMessage);
+  FClient.SendMessage(AMessage);
+end;
+
+var
+  Demo: TWebSocketDemo;
+
+begin
+  WriteLn('=== Postman echo Demo ===');
+  WriteLn;
+
+  Demo := TWebSocketDemo.Create;
+  try
+    // Connect to a public WebSocket echo server
+    // For testing, we'll just connect briefly
+    try
+      // Use a working echo server (wss://ws.postman-echo.com/raw)
+      Demo.Connect('ws.postman-echo.com', 443, '/raw');
+
+      // Wait for connection
+      Sleep(2000);
+
+      // Send a test message
+      Demo.Send('Hello from FPC WebSocket Leak Demo!');
+
+      // Wait for echo response
+      Demo.WaitForMessages(3);
+    except
+      on E: Exception do
+        WriteLn('Connection error (expected if server unavailable): ', E.Message);
+    end;
+  finally
+    Demo.Free;
+  end;
+
+  WriteLn;
+  WriteLn('Demo complete.');
+end.

+ 1 - 1
packages/fcl-web/src/base/FCGI-README.txt

@@ -427,7 +427,7 @@ Example:
 
 And the FastCGI process must be started somehow separately.
 On windows, a windows service application is most suitable.
-On Unices, a simple process can be put in the system startup scripts.
+On Unixes, a simple process can be put in the system startup scripts.
 
 Then, NGINX must be told to forward all requests to this address.
 

+ 1 - 1
packages/fcl-web/src/base/iniwebsession.pp

@@ -76,7 +76,7 @@ Type
     Function SessionExpired(Ini : TMemIniFile) : boolean;
     procedure CheckSessionDir; virtual;
     Function DoCreateSession(ARequest : TRequest) : TCustomSession; override;
-    // Sweep session direcory and delete expired files.
+    // Sweep session directory and delete expired files.
     procedure DoCleanupSessions; override;
     Procedure DoDoneSession(Var ASession : TCustomSession); override;
     Function SessionFilePrefix : String; virtual;

+ 1 - 1
packages/fcl-web/src/jsonrpc/fpjsonrpc.pp

@@ -862,7 +862,7 @@ begin
     else
       begin
       Param:=ParamArray[i];
-      // jtUnkown accepts all data types
+      // jtUnknown accepts all data types
       if (def.DataType<>jtUnknown) and not (Param.JSONType=def.DataType) then
         JSONRPCParamError(SErrParamsDataTypeMismatch,[def.Name,JSONTypeName(def.DataType),JSONTypeName(Param.JSONType)]);
       end;

+ 1 - 1
packages/fcl-xml/tests/README_DOM.txt

@@ -78,7 +78,7 @@ by using -f commandline switch, but in this case the resulting Pascal unit will
 fail to compile.
 
 4) Now, pick up your preferred fpcunit test runner, add the generated units to its
-uses clause, and compile. You may as well add the suppied 'extras.pp' and 'extras2.pp'
+uses clause, and compile. You may as well add the supplied 'extras.pp' and 'extras2.pp'
 units. During compilation, path to 'domunit.pp' should be added to the unit search
 paths.
 

+ 1 - 1
packages/fpindexer/examples/readme.txt

@@ -25,7 +25,7 @@ Which ones are compiled-in depend on some defines in the httpsearcher.pp file
 
 The HTTP server supports 2 kinds of queries:
 [baseURL]/search  : search pages matching the search term.
-[baseURL]/list    : search words matching the search term. Can be used for typeahead funcionnality
+[baseURL]/list    : search words matching the search term. Can be used for typeahead functionality
 [baseURL] is the base URL where the HTTP service is listening...
 
 Responses are in JSON dataset format (see extjsdataset unit)

+ 1 - 1
packages/gtk2/src/gtkext/gtk2ext.pp

@@ -15,7 +15,7 @@ uses
 {$ENDIF FPC_DOTTEDUNITS}
 
 const
-  { This is equired when people don't have -dev/-devel packages on linux.
+  { This is required when people don't have -dev/-devel packages on linux.
     I'm not sure how Darwin is handled tho }
   {$ifdef windows}
   GtkLibNames: array[1..1] of ansistring = (gtklib);

+ 1 - 1
packages/httpd13/src/ap.inc

@@ -144,7 +144,7 @@ function ap_vsnprintf(buf: PAnsiChar; len: size_t; const format: PAnsiChar; ap:
  * or anything non A-Z,0-9 etc as terminal.
  *
  * plain strings/binary sequences are not assumed '\0' terminated. Encoded
- * strings are neither. But propably should.
+ * strings are neither. But probably should.
  *
  }
 function ap_base64encode_len(len: cint): cint;

+ 2 - 2
packages/httpd13/src/httpd.inc

@@ -340,7 +340,7 @@ const
  * application.
  *
  * "Product tokens should be short and to the point -- use of them for
- * advertizing or other non-essential information is explicitly forbidden."
+ * advertising or other non-essential information is explicitly forbidden."
  *
  * Example: "Apache/1.1.0 MrWidget/0.1-alpha"
  }
@@ -749,7 +749,7 @@ type
 
     { On systems with case insensitive file systems (Windows, OS/2, etc.),
      * r->filename is case canonicalized (folded to either lower or upper
-     * case, depending on the specific system) to accomodate file access
+     * case, depending on the specific system) to accommodate file access
      * checking. case_preserved_filename is the same as r->filename
      * except case is preserved. There is at least one instance where Apache
      * needs access to the case preserved filename: Java class files published

+ 1 - 1
packages/httpd20/src/ap_release.inc

@@ -28,7 +28,7 @@ const
  * application.
  *
  * "Product tokens should be short and to the point -- use of them for
- * advertizing or other non-essential information is explicitly forbidden."
+ * advertising or other non-essential information is explicitly forbidden."
  *
  * Example: "Apache/1.1.0 MrWidget/0.1-alpha"
  }

+ 2 - 2
packages/httpd20/src/apr/apr_errno.inc

@@ -197,7 +197,7 @@ const
  * APR_ANONYMOUS      APR is using anonymous shared memory
  * APR_FILEBASED      APR is using a file name as the key to the shared memory
  * APR_KEYBASED       APR is using a shared key as the key to the shared memory
- * APR_EINIT          Ininitalizer value.  If no option has been found, but
+ * APR_EINIT          Initializer value.  If no option has been found, but
  *                    the status variable requires a value, this should be used
  * APR_ENOTIMPL       The APR function has not been implemented on this
  *                    platform, either because nobody has gotten to it yet,
@@ -513,7 +513,7 @@ const
  }
 //#define APR_STATUS_IS_KEYBASED(s)       ((s) == APR_KEYBASED)
 {
- * Ininitalizer value.  If no option has been found, but
+ * Initializer value.  If no option has been found, but
  * the status variable requires a value, this should be used
  * @warning
  * always use this test, as platform-specific variances may meet this

+ 2 - 2
packages/httpd20/src/apr/apr_file_info.inc

@@ -330,11 +330,11 @@ const
  * given filepath.  In the simplest example, given a filepath of "/foo",
  * returns the rootpath of "/" and filepath points at "foo".  This is far
  * more complex on other platforms, which will canonicalize the root form
- * to a consistant format, given the APR_FILEPATH_TRUENAME flag, and also
+ * to a consistent format, given the APR_FILEPATH_TRUENAME flag, and also
  * test for the validity of that root (e.g., that a drive d:/ or network
  * share //machine/foovol/).
  * The function returns APR_ERELATIVE if filepath isn't rooted (an
- * error), APR_EINCOMPLETE if the root path is ambigious (but potentially
+ * error), APR_EINCOMPLETE if the root path is ambiguous (but potentially
  * legitimate, e.g. "/" on Windows is incomplete because it doesn't specify
  * the drive letter), or APR_EBADPATH if the root is simply invalid.
  * APR_SUCCESS is returned if filepath is an absolute path.

+ 2 - 2
packages/httpd20/src/apr/apr_file_io.inc

@@ -600,7 +600,7 @@ function apr_file_name_get(const newpath: PPAnsiChar; thefile: Papr_file_t): apr
 {
  * Return the data associated with the current file.
  * @param data The user data associated with the file.
- * @param key The key to use for retreiving data associated with this file.
+ * @param key The key to use for retrieving data associated with this file.
  * @param file The currently open file.
  }
 function apr_file_data_get(data: PPointer; const key: PAnsiChar;
@@ -612,7 +612,7 @@ function apr_file_data_get(data: PPointer; const key: PAnsiChar;
  * Set the data associated with the current file.
  * @param file The currently open file.
  * @param data The user data to associate with the file.
- * @param key The key to use for assocaiteing data with the file.
+ * @param key The key to use for associating data with the file.
  * @param cleanup The cleanup routine to use when the file is destroyed.
  }
 //function apr_file_data_set(ch: AnsiChar; thefile: PPapr_file_t): apr_status_t;

+ 1 - 1
packages/httpd20/src/apr/apr_network_io.inc

@@ -440,7 +440,7 @@ function apr_getnameinfo(hostname: PPAnsiChar; sa: Papr_socket_t; flags: apr_int
  *   abc:65536             (invalid port number)
  *
  * @param addr The new buffer containing just the hostname.  On output, *addr
- *             will be NULL if no hostname/IP address was specfied.
+ *             will be NULL if no hostname/IP address was specified.
  * @param scope_id The new buffer containing just the scope id.  On output,
  *                 *scope_id will be NULL if no scope id was specified.
  * @param port The port number.  On output, *port will be 0 if no port was

+ 1 - 1
packages/httpd20/src/apr/apr_poll.inc

@@ -175,7 +175,7 @@ function apr_poll_socket_clear(aprset: Papr_pollfd_t;
  * @param event The returned events for the socket.  One of:
  * <PRE>
  *            APR_POLLIN       Data is available to be read
- *            APR_POLLPRI      Priority data is availble to be read
+ *            APR_POLLPRI      Priority data is available to be read
  *            APR_POLLOUT      Write will succeed
  *            APR_POLLERR      An error occurred on the socket
  *            APR_POLLHUP      The connection has been terminated

+ 1 - 1
packages/httpd20/src/apr/apr_portable.inc

@@ -47,7 +47,7 @@
 #endif}
 
 {
- * @defgroup apr_portabile Portability Routines
+ * @defgroup apr_portable Portability Routines
  * @ingroup APR
  }
 

+ 1 - 1
packages/httpd20/src/apr/apr_time.inc

@@ -252,7 +252,7 @@ function apr_strftime(s: PAnsiChar; retsize: apr_size_t;
 
 {
  * Improve the clock resolution for the lifetime of the given pool.
- * Generally this is only desireable on benchmarking and other very
+ * Generally this is only desirable on benchmarking and other very
  * time-sensitive applications, and has no impact on most platforms.
  * @param p The pool to associate the finer clock resolution
  }

+ 1 - 1
packages/httpd20/src/http_config.inc

@@ -309,7 +309,7 @@ type
     { Server_rec being configured for }
     server: Pserver_rec;
     { If configuring for a directory, pathname of that directory.
-     *  NOPE!  That's what it meant previous to the existance of <Files>,
+     *  NOPE!  That's what it meant previous to the existence of <Files>,
      * <Location> and regex matching.  Now the only usefulness that can be
      * derived from this field is whether a command is being called in a
      * server context (path == NULL) or being called in a dir context

+ 1 - 1
packages/httpd20/src/util_filter.inc

@@ -209,7 +209,7 @@ type
     { The function to call before the handlers are invoked. Notice
      * that this function is called only for filters participating in
      * the http protocol. Filters for other protocols are to be
-     * initiliazed by the protocols themselves. }
+     * initialized by the protocols themselves. }
     filter_init_func: ap_init_filter_func;
     { The type of filter, either AP_FTYPE_CONTENT or AP_FTYPE_CONNECTION.
      * An AP_FTYPE_CONTENT filter modifies the data based on information

+ 1 - 1
packages/httpd22/src/ap_release.inc

@@ -28,7 +28,7 @@ const
  * application.
  *
  * "Product tokens should be short and to the point -- use of them for
- * advertizing or other non-essential information is explicitly forbidden."
+ * advertising or other non-essential information is explicitly forbidden."
  *
  * Example: "Apache/1.1.0 MrWidget/0.1-alpha"
  }

+ 2 - 2
packages/httpd22/src/apr/apr_errno.inc

@@ -197,7 +197,7 @@ const
  * APR_ANONYMOUS      APR is using anonymous shared memory
  * APR_FILEBASED      APR is using a file name as the key to the shared memory
  * APR_KEYBASED       APR is using a shared key as the key to the shared memory
- * APR_EINIT          Ininitalizer value.  If no option has been found, but
+ * APR_EINIT          Initializer value.  If no option has been found, but
  *                    the status variable requires a value, this should be used
  * APR_ENOTIMPL       The APR function has not been implemented on this
  *                    platform, either because nobody has gotten to it yet,
@@ -518,7 +518,7 @@ const
  }
 //#define APR_STATUS_IS_KEYBASED(s)       ((s) == APR_KEYBASED)
 {
- * Ininitalizer value.  If no option has been found, but
+ * Initializer value.  If no option has been found, but
  * the status variable requires a value, this should be used
  * @warning
  * always use this test, as platform-specific variances may meet this

+ 2 - 2
packages/httpd22/src/apr/apr_file_info.inc

@@ -329,11 +329,11 @@ const
  * given filepath.  In the simplest example, given a filepath of "/foo",
  * returns the rootpath of "/" and filepath points at "foo".  This is far
  * more complex on other platforms, which will canonicalize the root form
- * to a consistant format, given the APR_FILEPATH_TRUENAME flag, and also
+ * to a consistent format, given the APR_FILEPATH_TRUENAME flag, and also
  * test for the validity of that root (e.g., that a drive d:/ or network
  * share //machine/foovol/).
  * The function returns APR_ERELATIVE if filepath isn't rooted (an
- * error), APR_EINCOMPLETE if the root path is ambigious (but potentially
+ * error), APR_EINCOMPLETE if the root path is ambiguous (but potentially
  * legitimate, e.g. "/" on Windows is incomplete because it doesn't specify
  * the drive letter), or APR_EBADPATH if the root is simply invalid.
  * APR_SUCCESS is returned if filepath is an absolute path.

+ 2 - 2
packages/httpd22/src/apr/apr_file_io.inc

@@ -639,7 +639,7 @@ function apr_file_name_get(const newpath: PPAnsiChar; thefile: Papr_file_t): apr
 {
  * Return the data associated with the current file.
  * @param data The user data associated with the file.
- * @param key The key to use for retreiving data associated with this file.
+ * @param key The key to use for retrieving data associated with this file.
  * @param file The currently open file.
  }
 function apr_file_data_get(data: PPointer; const key: PAnsiChar;
@@ -651,7 +651,7 @@ function apr_file_data_get(data: PPointer; const key: PAnsiChar;
  * Set the data associated with the current file.
  * @param file The currently open file.
  * @param data The user data to associate with the file.
- * @param key The key to use for assocaiteing data with the file.
+ * @param key The key to use for associating data with the file.
  * @param cleanup The cleanup routine to use when the file is destroyed.
  }
 //function apr_file_data_set(ch: AnsiChar; thefile: PPapr_file_t): apr_status_t;

+ 1 - 1
packages/httpd22/src/apr/apr_network_io.inc

@@ -417,7 +417,7 @@ function apr_getnameinfo(hostname: PPAnsiChar; sa: Papr_socket_t; flags: apr_int
  *   abc:65536             (invalid port number)
  *
  * @param addr The new buffer containing just the hostname.  On output, *addr
- *             will be NULL if no hostname/IP address was specfied.
+ *             will be NULL if no hostname/IP address was specified.
  * @param scope_id The new buffer containing just the scope id.  On output,
  *                 *scope_id will be NULL if no scope id was specified.
  * @param port The port number.  On output, *port will be 0 if no port was

+ 1 - 1
packages/httpd22/src/apr/apr_portable.inc

@@ -47,7 +47,7 @@
 #endif}
 
 {
- * @defgroup apr_portabile Portability Routines
+ * @defgroup apr_portable Portability Routines
  * @ingroup APR
  }
 

+ 1 - 1
packages/httpd22/src/apr/apr_time.inc

@@ -234,7 +234,7 @@ function apr_strftime(s: PAnsiChar; retsize: apr_size_t;
 
 {
  * Improve the clock resolution for the lifetime of the given pool.
- * Generally this is only desireable on benchmarking and other very
+ * Generally this is only desirable on benchmarking and other very
  * time-sensitive applications, and has no impact on most platforms.
  * @param p The pool to associate the finer clock resolution
  }

+ 1 - 1
packages/httpd22/src/http_config.inc

@@ -324,7 +324,7 @@ type
     { Server_rec being configured for }
     server: Pserver_rec;
     { If configuring for a directory, pathname of that directory.
-     *  NOPE!  That's what it meant previous to the existance of <Files>,
+     *  NOPE!  That's what it meant previous to the existence of <Files>,
      * <Location> and regex matching.  Now the only usefulness that can be
      * derived from this field is whether a command is being called in a
      * server context (path == NULL) or being called in a dir context

+ 1 - 1
packages/httpd22/src/httpd.inc

@@ -1696,7 +1696,7 @@ function ap_escape_quotes(p: Papr_pool_t; const instring: PAnsiChar): PAnsiChar;
  * a macro, to avoid unistd.h dependency
  * @param p The pool to allocate memory from
  * @param string The string to append the PID to
- * @param delim The string to use to deliminate the string from the PID
+ * @param delim The string to use to delimitate the string from the PID
  * @return A copy of the string with the PID appended
  }
 function ap_append_pid(p: Papr_pool_t; const string_, delim: PAnsiChar): PAnsiChar;

+ 1 - 1
packages/httpd22/src/util_filter.inc

@@ -221,7 +221,7 @@ type
     { The function to call before the handlers are invoked. Notice
      * that this function is called only for filters participating in
      * the http protocol. Filters for other protocols are to be
-     * initiliazed by the protocols themselves.
+     * initialized by the protocols themselves.
      }
     filter_init_func: ap_init_filter_func;
 

+ 2 - 2
packages/httpd24/src/apr/apr_file_info.inc

@@ -355,11 +355,11 @@ const
  * given filepath.  In the simplest example, given a filepath of "/foo",
  * returns the rootpath of "/" and filepath points at "foo".  This is far
  * more complex on other platforms, which will canonicalize the root form
- * to a consistant format, given the APR_FILEPATH_TRUENAME flag, and also
+ * to a consistent format, given the APR_FILEPATH_TRUENAME flag, and also
  * test for the validity of that root (e.g., that a drive d:/ or network
  * share //machine/foovol/).
  * The function returns APR_ERELATIVE if filepath isn't rooted (an
- * error), APR_EINCOMPLETE if the root path is ambigious (but potentially
+ * error), APR_EINCOMPLETE if the root path is ambiguous (but potentially
  * legitimate, e.g. "/" on Windows is incomplete because it doesn't specify
  * the drive letter), or APR_EBADPATH if the root is simply invalid.
  * APR_SUCCESS is returned if filepath is an absolute path.

+ 1 - 1
packages/httpd24/src/apr/apr_time.inc

@@ -269,7 +269,7 @@ function apr_strftime(s: PAnsiChar;
 
 {**
  * Improve the clock resolution for the lifetime of the given pool.
- * Generally this is only desireable on benchmarking and other very
+ * Generally this is only desirable on benchmarking and other very
  * time-sensitive applications, and has no impact on most platforms.
  * @param p The pool to associate the finer clock resolution
  *}

+ 3 - 3
packages/httpd24/src/httpd.inc

@@ -237,7 +237,7 @@ const
     AP_MAX_REG_MATCH = 10;
 
   {*
-   * APR_HAS_LARGE_FILES introduces the problem of spliting sendfile into
+   * APR_HAS_LARGE_FILES introduces the problem of splitting sendfile into
    * multiple buckets, no greater than MAX(apr_size_t), and more granular
    * than that in case the brigade code/filters attempt to read it directly.
    * ### 16mb is an invention, no idea if it is reasonable.
@@ -626,9 +626,9 @@ const
   const
   {* linefeed  }
     LF = 10;
-  {* carrige return  }
+  {* carriage return  }
     CR = 13;
-  {* carrige return /Line Feed Combo  }
+  {* carriage return /Line Feed Combo  }
     CRLF = #015#012;
 
   {*

+ 1 - 1
packages/libjack/src/net.inc

@@ -246,7 +246,7 @@ function jack_set_net_slave_shutdown_callback(net: Pjack_net_slave_t; shutdown_c
 (**
  * Prototype for server Restart callback : this is the new preferable way to be notified when the master has disappeared.
  * The client may want to retry connecting a certain number of time (which will be done using the time_out value given in jack_net_slave_open)
- * by returning 0. Otherwise returning a non-zero error code will definively close the connection
+ * by returning 0. Otherwise returning a non-zero error code will definitely close the connection
  * (and jack_net_slave_is_active will later on return false).
  * If both Shutdown and Restart are supplied, Restart callback will be used.
  *

+ 1 - 1
packages/libndsfpc/examples/dswifi/ap_search/apSearch.pp

@@ -61,7 +61,7 @@ begin
 
     end;
 
-		//move the selection asterick
+		//move the selection asterisk
 		if ((pressed and KEY_UP) <> 0) and (selected > 0) then
       dec(selected);
 

+ 3 - 3
packages/libndsfpc/examples/gl2d/scrolling/scrolling.pp

@@ -40,10 +40,10 @@ const
 
 (*
 	I'm using the struct of player from the
-	Animate simple man/woman exmple in the
+	Animate simple man/woman example in the
 	"nds/examples" folder
 	You might want to read up on that too to
-	see the differnce in handling sprites via OAM
+	see the difference in handling sprites via OAM
 	and Easy GL2D.
 *)
 
@@ -68,7 +68,7 @@ type
     width: integer;			// dimensions of the map
     height: integer;
 
-    camera_x: integer;		// top-left cooordinates of our virtual camera
+    camera_x: integer;		// top-left coordinates of our virtual camera
     camera_y: integer;		// Works almost the same the 2d BG scroller
 
     tile_x: integer;			// current tile the top-left coordinate of our

+ 2 - 2
packages/libndsfpc/examples/gl2d/sprites/sprites.pp

@@ -143,7 +143,7 @@ begin
   //put bg 0 at a lower priority than the text background
   bgSetPriority(0, 1);
 
-  // Bottom screeen
+  // Bottom screen
   vramSetBankI(VRAM_I_SUB_BG_0x06208000);
   consoleInit(@bottomScreen, 0, BgType_Text4bpp, BgSize_T_256x256, 20, 0, false, false);
 
@@ -377,7 +377,7 @@ begin
 
       // Make the Anya's rotoscaled sprite translucent just for kicks
       // Use glSpriteRotateScaleXY() for some effect
-      // Give it a polygon ID so that transluceny would work
+      // Give it a polygon ID so that translucency would work
       glPolyFmt(POLY_ALPHA(20) or POLY_CULL_NONE or POLY_ID(1));
       glSpriteRotateScaleXY(SCREEN_WIDTH div 2, SCREEN_HEIGHT div 2,
           Frame * 140, sinLerp(Frame * 120) * 3, sinLerp(Frame * 210) * 2,

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/3DBothScreens.pp

@@ -97,7 +97,7 @@ end;
 
 
 //-------------------------------------------------------
-// set up a 2D layer construced of bitmap sprites
+// set up a 2D layer constructed of bitmap sprites
 // this holds the image when rendering to the top screen
 //-------------------------------------------------------
 procedure initSubSprites();

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/Picking/Picking.pp

@@ -74,7 +74,7 @@ begin
   glClearDepth($7FFF);
 
   // setup the camera
-  gluLookAt( 0.0, 0.0, 1.0,   //camera possition
+  gluLookAt( 0.0, 0.0, 1.0,   //camera position
              0.0, 0.0, 0.0,   //look at
              0.0, 1.0, 0.0);  //up
 

+ 1 - 1
packages/libndsfpc/examples/graphics/3D/Toon_Shading/ToonShading.pp

@@ -81,7 +81,7 @@ begin
   glLight(0, RGB15(16,16,16) , 0,   floattov10(-1.0),   0);
   glLight(1, RGB15(16,16,16),   floattov10(-1.0), 0,    0);
 
-  gluLookAt(  0.0, 0.0, -3.0,   //camera possition
+  gluLookAt(  0.0, 0.0, -3.0,   //camera position
         0.0, 0.0, 0.0,    //look at
         0.0, 1.0, 0.0);   //up
 

+ 1 - 1
packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/DoubleBuffer.pp

@@ -18,7 +18,7 @@ begin
 
 	//set the first two banks as background memory and the third as sub background memory
 	//D is not used..if you need a bigger background then you will need to map
-	//more vram banks consecutivly (VRAM A-D are all 0x20000 bytes in size)
+	//more vram banks consecutively (VRAM A-D are all 0x20000 bytes in size)
 	vramSetPrimaryBanks(VRAM_A_MAIN_BG_0x06000000, VRAM_B_MAIN_BG_0x06020000,
 		VRAM_C_SUB_BG, VRAM_D_LCD);
 

+ 1 - 1
packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Advanced.pp

@@ -179,7 +179,7 @@ begin
   Each background uses 8K of palette memory starting at the base of the vram bank
   you allocate (which bank is up to you within limits, see the vram usage table
   to determine which banks can be mapped for textures).  These 8K blocks are often
-  refered to as "slots" with each background getting its own slot.
+  referred to as "slots" with each background getting its own slot.
 
    By default, Background 0 uses slot 0 ... Background 3 uses slot 3.  It is possible
    to assign Background 0 to slot 2 and Background 1 to slot 3 (only these two are configurable)

+ 1 - 1
packages/libndsfpc/examples/time/RealTimeClock/realtimeclock.pp

@@ -63,7 +63,7 @@ begin
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
   gluPerspective(70, 256.0 / 192.0, 0.1, 100);
-  gluLookAt(  0.0, 0.0, 3.0,    //camera possition
+  gluLookAt(  0.0, 0.0, 3.0,    //camera position
               0.0, 0.0, 0.0,    //look at
               0.0, 1.0, 0.0);   //up
 

+ 1 - 1
packages/libndsfpc/src/nds/arm9/videoGL.inc

@@ -290,7 +290,7 @@ type
   gl_hidden_globals = record
     matrixMode: GL_MATRIX_MODE_ENUM; // holds the current Matrix Mode
 
-    vramBlocks: array [0..1] of ps_vramBlock;		// Two classe instances, one for textures, and one for palettes
+    vramBlocks: array [0..1] of ps_vramBlock;		// Two class instances, one for textures, and one for palettes
     vramLock: array [0..1] of cint;				// Holds the current lock state of the VRAM banks
 
     // texture globals

+ 1 - 1
packages/libndsfpc/src/nds/card.inc

@@ -53,7 +53,7 @@ function CARD_DELAY1(n: cint): cint; inline;
 const
   // 3 bits in b10..b8 indicate something
   // read bits
-  CARD_BUSY       = (1 shl 31);  // when reading, still expecting incomming data?
+  CARD_BUSY       = (1 shl 31);  // when reading, still expecting incoming data?
   CARD_DATA_READY = (1 shl 23);  // when reading, CARD_DATA_RD or CARD_DATA has another word of data and is good to go
 
   // Card commands

+ 1 - 1
packages/libndsfpc/src/nds/registers_alt.inc

@@ -198,7 +198,7 @@ const
 //  REG_RCNT		: pcuint16 = pointer($4000134);
   REG_HS_CTRL		: pcuint16 = pointer($4000140);
 
-  (* Interupt	enable registers *)
+  (* Interrupt enable registers *)
 {$define IE  := REG_IE}
 {$define _IF :=	REG_IF}
 {$define IME	:= REG_IME}

+ 1 - 1
packages/libusb/src/libusb.pp

@@ -145,7 +145,7 @@ const libusb1='libusb-1.0.so';
       LIBUSB_API_VERSION = $01000104;
     { The following is kept for compatibility, but will be deprecated in the future  }
       LIBUSBX_API_VERSION = LIBUSB_API_VERSION;
-{ C++ extern C conditionnal removed }
+{ C++ extern C conditional removed }
 {*
  * \ingroup misc
  * Convert a 16-bit value from host-endian to little-endian format. On

+ 1 - 1
packages/oracle/README.txt

@@ -6,7 +6,7 @@ on Oracle 8.0.1.5 Standard server. One developer license
 of Oracle server is free of charge...
 
 Unit oraclew contains some procedures and functions,
-which makes usage of oraoci not so painfull... But -
+which makes usage of oraoci not so painful... But -
 if you wanna to program in RAW OCI, you really can ;)
 
 The oci and ocidyn units are a complete conversion from

+ 6 - 6
packages/oracle/src/nzt.inc

@@ -870,7 +870,7 @@ var nztwOpenWallet : function (_para1:Pnzctx; _para2:ub4; _para3:Ptext; _para4:u
    *    persona  IN/OUT    Persona.
    *
    * NOTES
-   *    The persona is destroyd in the open state, but it will
+   *    The persona is destroyed in the open state, but it will
    *    not be associated with a wallet.
    *
    *    The persona parameter is doubly indirect so that at the
@@ -931,7 +931,7 @@ var nztwOpenWallet : function (_para1:Pnzctx; _para2:ub4; _para3:Ptext; _para4:u
    *    vkey_len OUT    Private Key Length
    *
    * NOTES
-   *    This funiction will only work for X.509 based persona which contain
+   *    This function will only work for X.509 based persona which contain
    *    a private key.
    *    A copy of the private key is returned to the caller so that they do not
    *    have to worry about the key changeing "underneath them".
@@ -962,7 +962,7 @@ var nztwOpenWallet : function (_para1:Pnzctx; _para2:ub4; _para3:Ptext; _para4:u
    *    cert_len OUT    Certificate length
    *
    * NOTES
-   *    This funiction will only work for X.509 based persona which contain
+   *    This function will only work for X.509 based persona which contain
    *    a certificate for the self identity.
    *    A copy of the certificate is returned to the caller so that they do not
    *    have to worry about the certificate changeing "underneath them".
@@ -1216,7 +1216,7 @@ var nztwOpenWallet : function (_para1:Pnzctx; _para2:ub4; _para3:Ptext; _para4:u
    *
    * RETURNS
    *    NZERROR_OK           Success.
-   *    NZERROR_TK_CANTGROW  Needed to grow outptu buffer but could not.
+   *    NZERROR_TK_CANTGROW  Needed to grow output buffer but could not.
    *    NZERROR_TK_NOTOPEN   Persona is not open.
    *    NZERROR_TK_NOTSUPP   Function not supported with persona.
     }
@@ -1762,7 +1762,7 @@ var nztwOpenWallet : function (_para1:Pnzctx; _para2:ub4; _para3:Ptext; _para4:u
   {-------------------- nztdbuf_DestroyBuf -------------------- }
   {
    * NAME
-   *    nztdbuf_DestroyBuf - Deallocation funtions for ub1 and text buffer
+   *    nztdbuf_DestroyBuf - Deallocation functions for ub1 and text buffer
    *
    * PARAMETERS
    *    Name   IN/OUT   Description
@@ -2029,7 +2029,7 @@ var nztwOpenWallet : function (_para1:Pnzctx; _para2:ub4; _para3:Ptext; _para4:u
    *    parameter.
    *
    * RETURNS
-   *    NZERROR_OK                 Sucess.
+   *    NZERROR_OK                 Success.
    *    NZERROR_TK_WALLET_EXISTS   Wallet already exists.
    *    NZERROR_RIO_OPEN           RIO could not create wallet (see trace file).
     }

+ 10 - 10
packages/oracle/src/oci.inc

@@ -1239,9 +1239,9 @@ uses ctypes,
      OCI_ATTR_DEQCOND = 146;
   { reserved  }
      OCI_ATTR_RESERVED_2 = 147;
-  { recepient of subscription  }
+  { recipient of subscription  }
      OCI_ATTR_SUBSCR_RECPT = 148;
-  { protocol for recepient  }
+  { protocol for recipient  }
      OCI_ATTR_SUBSCR_RECPTPROTO = 149;
   { For values 150 - 151, see DirPathAPI attribute section in this file  }
   { LDAP host to connect to  }
@@ -1256,7 +1256,7 @@ uses ctypes,
      OCI_ATTR_WALL_LOC = 157;
   { LDAP authentication method  }
      OCI_ATTR_LDAP_AUTH = 158;
-  { LDAP adminstration context DN  }
+  { LDAP administration context DN  }
      OCI_ATTR_LDAP_CTX = 159;
   { list of registration server DNs  }
      OCI_ATTR_SERVER_DNS = 160;
@@ -1307,7 +1307,7 @@ uses ctypes,
      OCI_ATTR_NUM_OPEN_STMTS = 188;
   { get native info via desc  }
      OCI_ATTR_DESCRIBE_NATIVE = 189;
-  { number of bind postions  }
+  { number of bind positions  }
      OCI_ATTR_BIND_COUNT = 190;
   { pos of bind/define handle  }
      OCI_ATTR_HANDLE_POSITION = 191;
@@ -1327,7 +1327,7 @@ uses ctypes,
      OCI_ATTR_SCN_BASE = 198;
   { snapshot wrap  }
      OCI_ATTR_SCN_WRAP = 199;
-  { --------------------------- Miscellanous attributes ---------------------  }
+  { -------------------------- Miscellaneous attributes ---------------------  }
   { reserved  }
      OCI_ATTR_RESERVED_6 = 200;
   { txn is readonly  }
@@ -1479,7 +1479,7 @@ uses ctypes,
   { ----------------- port no attribute in subscription handle  -------------  }
   { port no to listen         }
      OCI_ATTR_SUBSCR_PORTNO = 390;
-  {------------- Supported Values for protocol for recepient ----------------- }
+  {------------- Supported Values for protocol for recipient ----------------- }
   { oci  }
      OCI_SUBSCR_PROTO_OCI = 0;
   { mail  }
@@ -1490,7 +1490,7 @@ uses ctypes,
      OCI_SUBSCR_PROTO_HTTP = 3;
   { max current protocols  }
      OCI_SUBSCR_PROTO_MAX = 4;
-  {------------- Supported Values for presentation for recepient ------------- }
+  {------------- Supported Values for presentation for recipient ------------- }
   { default  }
      OCI_SUBSCR_PRES_DEFAULT = 0;
   { xml  }
@@ -1753,7 +1753,7 @@ uses ctypes,
      OCI_LOGON2_CPOOL = OCI_CPOOL;
   { Use Stmt Caching  }
      OCI_LOGON2_STMTCACHE = $0004;
-  { Proxy authentiaction  }
+  { Proxy authentication  }
      OCI_LOGON2_PROXY = $0008;
   {--------------------------------------------------------------------------- }
   {------------------------- OCISessionPoolCreate Modes ---------------------- }
@@ -2060,7 +2060,7 @@ uses ctypes,
   {=======================Describe Handle Parameter Attributes =============== }
   {
      These attributes are orthogonal to the other set of attributes defined
-     above.  These attrubutes are to be used only for the describe handle.
+     above.  These attributes are to be used only for the describe handle.
    }
   {=========================================================================== }
   { Attributes common to Columns and Stored Procs  }
@@ -3242,7 +3242,7 @@ uses ctypes,
      OCI_NLS_GROUP = 46;
   { Native symbol of debit  }
      OCI_NLS_DEBIT = 47;
-  { Native sumbol of credit  }
+  { Native symbol of credit  }
      OCI_NLS_CREDIT = 48;
   { Oracle date format  }
      OCI_NLS_DATEFORMAT = 49;

+ 19 - 19
packages/oracle/src/ociap.inc

@@ -819,7 +819,7 @@
   OCIBindDynamic() or by setting the pointer to the buffer in the buffer passed
   in by OCIStmtSetPieceInfo() called when OCIStmtExecute() returned
   OCI_NEED_DATA. The memory of these client library- allocated buffers must be
-  freed when not in use anymore by using the OCIObjectFreee() call.
+  freed when not in use anymore by using the OCIObjectFree() call.
   Parameters
   bindp ( IN/OUT) - the bind handle returned by the call to OCIBindByName()
   or OCIBindByPos().
@@ -906,10 +906,10 @@
   to the database are started on calling OCIConnectionPoolCreate.
 
   Parameters:
-  envhp (IN/OUT)  - A pointer to the environment where the Conencton Pool
+  envhp (IN/OUT)  - A pointer to the environment where the Connector Pool
                     is to be created
   errhp (IN/OUT)  - An error handle which can be passed to OCIErrorGet().
-  poolhp (IN/OUT) - An uninitialiazed pool handle.
+  poolhp (IN/OUT) - An uninitialized pool handle.
   poolName (OUT) - The connection pool name.
   poolNameLen (OUT) - The length of the connection pool name
   dblink (IN/OUT) - Specifies the database(server) to connect. This will also
@@ -956,7 +956,7 @@
   are closed and the pool is destroyed.
 
   Parameters:
-  poolhp (IN/OUT) - An initialiazed pool handle.
+  poolhp (IN/OUT) - An initialized pool handle.
   errhp (IN/OUT)  - An error handle which can be passed to OCIErrorGet().
   mode (IN)       - Currently, OCIConnectionPoolDestroy() will support only
                     the OCI_DEFAULT mode.
@@ -1587,7 +1587,7 @@
   OCIRowidToChar
 
   Purpose
-  Converts physical/logical (universal) ROWID to chracter extended (Base 64)
+  Converts physical/logical (universal) ROWID to character extended (Base 64)
   representation into user provided buffer outbfp of length outbflp. After
   execution outbflp contains amount of bytes converted.In case of truncation
   error, outbflp contains required size to make this conversion successful
@@ -1605,7 +1605,7 @@
   desired ROWID.
 
   Parameters
-  rowidDesc (IN)   - rowid DESCriptor which is allocated from OCIDescritorAlloc
+  rowidDesc (IN)   - rowid DESCriptor which is allocated from OCIDescriptorAlloc
                      and populated by a prior SQL statement execution
   outbfp (OUT)     - pointer to the buffer where converted rowid in character
                      representation is stored after successful execution.
@@ -1673,7 +1673,7 @@
                 ub2         *rcodep,
                 ub4         mode );
   Comments
-  This call defines an output buffer which will receive data retreived from
+  This call defines an output buffer which will receive data retrieved from
   Oracle. The define is a local step which is necessary when a SELECT statement
   returns data to your OCI application.
   This call also implicitly allocates the define handle for the select-list item.
@@ -1738,7 +1738,7 @@
   number of bytes specified is insufficient to handle the number of characters
   desired.
   dty (IN) - the data type. Named data type (SQLT_NTY) and REF (SQLT_REF)
-  are valid only if the environment has been intialized with in object mode.
+  are valid only if the environment has been initialized with in object mode.
   indp - pointer to an indicator variable or array. For scalar data types,
   pointer to sb2 or an array of sb2s. Ignored for named data types. For named
   data types, a pointer to a named data type indicator structure or an array of
@@ -1803,7 +1803,7 @@
   octxp (IN) - points to a context for the callback function.
   ocbfp (IN) - points to a callback function. This is invoked at runtime to get
   a pointer to the buffer into which the fetched data or a piece of it will be
-  retreived. The callback also specifies the indicator, the return code and the
+  retrieved. The callback also specifies the indicator, the return code and the
   lengths of the data piece and indicator. The callback has the following
   parameters:
   octxp (IN) - a context pointer passed as an argument to all the callback
@@ -2047,7 +2047,7 @@
   then all libraries that are used by OCI are also initialized in the
   threaded mode.
 
-  This call should be invoked before anny other OCI call and should be used
+  This call should be invoked before any other OCI call and should be used
   instead of the OCIInitialize and OCIEnvInit calls. This is the recommended
   call, although OCIInitialize and OCIEnvInit calls will still be supported
   for backward compatibility.
@@ -2645,7 +2645,7 @@
    OCIFileOpen returns a handle to the open file in filep if the file is
    successfully opened.
    If one wants to use the standard file objects (stdin, stdout & stderr)
-   then OCIFileOpen whould be called with the type filed containing the
+   then OCIFileOpen would be called with the type filed containing the
    appropriate type (see the parameter type). If any of the standard files
    are specified then filename, path, mode and create are ignored.
    The function will return OCI_ERROR if any error is encountered, else
@@ -3418,7 +3418,7 @@
                           size_t str_len, OCIInterval *result);
 
     DESCRIPTION
-      Retuns an OCI_DTYPE_INTERVAL_DS OCIInterval with the region id (if
+      Returns an OCI_DTYPE_INTERVAL_DS OCIInterval with the region id (if
       the region is specified in the input string) set and the current
       absolute offset or an absolute offset with the region id set to 0.
     PARAMETERS
@@ -4096,7 +4096,7 @@
 
   Comments
   Opens a FILE. The FILE can be opened for read-only access only. FILEs may not
-  be written to throough ORACLE.
+  be written to through ORACLE.
 
   Parameters
   svchp (IN) - the service context handle.
@@ -4805,7 +4805,7 @@
   Comments
   With unlimited size LOB support the limit for a LOB is no longer restricted to 4GB.
   This interface should be used to get the actual limit for storing data for a specific
-  LOB locator. Note that if the compatibality is set to 9.2 or older the limit would still
+  LOB locator. Note that if the compatibility is set to 9.2 or older the limit would still
   be 4GB.
 
   Parameters
@@ -5714,7 +5714,7 @@
 
   OCIStmtRelease()
   Name
-  OCI Statement Release. This call is used to relesae the stmt that
+  OCI Statement Release. This call is used to release the stmt that
   was retrieved using OCIStmtPrepare2(). If the stmt is release
   using this call, OCIHandleFree() must not be called on the stmt
   handle.
@@ -6381,7 +6381,7 @@
   OCI_TRANS_NEW is specified, this value is stored and may be used later by
   OCITransDetach().
   flags (IN) - specifies whether a new transaction is being started or an
-  existing transaction is being resumed. Also specifies serializiability or
+  existing transaction is being resumed. Also specifies serializability or
   read-only status. More than a single value can be specified. By default,
   a read/write transaction is started. The flag values are:
   OCI_TRANS_NEW - starts a new transaction branch. By default starts a
@@ -9090,7 +9090,7 @@ var OCIInitialize : function (mode:ub4; ctxp:Pdvoid; malocfp:tmalocfp; ralocfp:t
   {
      NAME
        OCIMultiByteStrnDisplayLength - calculate the display length for a
-                                       multibyt string
+                                       multibyte string
      REMARKS
        This function returns the number of display positions occupied by the
        complete characters within the range of n bytes.
@@ -9589,7 +9589,7 @@ var OCIInitialize : function (mode:ub4; ctxp:Pdvoid; malocfp:tmalocfp; ralocfp:t
         'OCIThreadProcessInit()',  there is no need to have a first call
         that occurs before all the others.
 
-        The first time 'OCIThreadInit()' is called, it initilaizes the OCI
+        The first time 'OCIThreadInit()' is called, it initializes the OCI
         Thread context.  It also saves a pointer to the context in some system
         dependent manner.  Subsequent calls to 'OCIThreadInit()' will return
         the same context.
@@ -10973,7 +10973,7 @@ var OCISubscriptionRegister : function (svchp:POCISvcCtx; var subscrhpp:POCISubs
   {---------------------------------------------------------------------------
                             PRIVATE FUNCTIONS
     --------------------------------------------------------------------------- }
-  { the following functions are depracated and should not be used  }
+  { the following functions are deprecated and should not be used  }
 {$ifdef NEVER}
 
   function OCIStmtBindByPos(stmtp:POCIStmt; bindp:POCIBind; errhp:POCIError; position:ub4; valuep:Pdvoid;

+ 4 - 4
packages/oracle/src/orl.inc

@@ -321,7 +321,7 @@
       cxcheng    10/20/95 -  add more comments on number versions
       cxcheng    10/13/95 -  add more number functions
       cxcheng    08/29/95 -  Support for segmented varrays
-      cxcheng    08/18/95 -  modifiy orlmls structure
+      cxcheng    08/18/95 -  modify orlmls structure
       skrishna   06/06/95 -  rename orln, orld, orlvs and orlva to orlnum,
                              orldat, orlvstr and orlvary respectively
       skrishna   11/15/94 -  remove orlnget() function
@@ -1371,8 +1371,8 @@ var OCINumberToInt : function (err:POCIError; number:POCINumber; rsl_length:uwor
 {$ENDIF}
 
   {
-     NAME: OCINumberPower - OCINumber takes an arbitary Base to an
-                            arbitary Power
+     NAME: OCINumberPower - OCINumber takes an arbitrary Base to an
+                            arbitrary Power
      PARAMETERS:
           err (IN/OUT) - error handle. If there is an error, it is
                   recorded in 'err' and this function returns OCI_ERROR.
@@ -3891,7 +3891,7 @@ var OCICollSize : function (env:POCIEnv; err:POCIError; coll:POCIColl; size:Psb4
                This is not to be used in Public interfaces , but
                has been provided due to special requirements from
                SQLPLUS development group as they require to call
-               Core funtions directly .
+               Core functions directly.
      }
     type
     { OCI representation of XMLType  }

+ 2 - 2
packages/oracle/src/oro_interface.inc

@@ -585,9 +585,9 @@
      OCI_OBJECTPROP_SCHEMA = 2;
   { table name of table containing object  }
      OCI_OBJECTPROP_TABLE = 3;
-  { pin duartion of object  }
+  { pin duration of object  }
      OCI_OBJECTPROP_PIN_DURATION = 4;
-  { alloc duartion of object  }
+  { alloc duration of object  }
      OCI_OBJECTPROP_ALLOC_DURATION = 5;
   { lock status of object  }
      OCI_OBJECTPROP_LOCK = 6;

+ 8 - 8
packages/oracle/src/ort.inc

@@ -76,7 +76,7 @@
 
         OCIType - type descriptor in the object cache
         OCITypeElem - type element descriptor in the object cache
-              (used for attributes and paramters)
+              (used for attributes and parameters)
         OCITypeCode  - Open Type System type code.
         OCITypeMethod - method descriptor in the object cache
         OCITypeParamMode - parameter modes (ie. IN, IN-OUT etc)
@@ -85,7 +85,7 @@
 
       ITERATOR (for OCITypeAttrNext and OCITypeMethodNext)
 
-        OCITypeIterNew  - ** OBSOLETE ** Create new instance of an iteraton.
+        OCITypeIterNew  - ** OBSOLETE ** Create new instance of an iterator.
         OCITypeIterSet  - ** OBSOLETE ** Initialize iterator.
         OCITypeIterFree - ** OBSOLETE ** Free instance of iterator.
 
@@ -720,7 +720,7 @@
    *
    * The contents of an 'orti' is private/opaque to clients.  Clients just
    * need to declare and pass 'orti' pointers in to the type manager functions.
-   * The iterator is used to retreive MDO's and ADO's that belong to the TDO
+   * The iterator is used to retrieve MDO's and ADO's that belong to the TDO
    * one at a time. It needs to be allocated by the 'OCITypeIterNew()' function
    * call and deallocated with the 'OCITypeIterFree()' function call.
     }
@@ -933,7 +933,7 @@ var OCITypeIterNew : function (env:POCIEnv; err:POCIError; tdo:POCIType; var ite
     DESCRIPTION:
          Get pointers to the existing types associated with the schema/type name
          array. This is similar to OCITypeByName() except that all the TDO's are
-         retreived via a single network roundtrip.
+         retrieved via a single network roundtrip.
     RETURNS:
           OCI_SUCCESS if the function completes successfully.
           OCI_INVALID_HANDLE if 'env' or 'err' is null.
@@ -973,7 +973,7 @@ var OCITypeIterNew : function (env:POCIEnv; err:POCIError; tdo:POCIType; var ite
     DESCRIPTION:
          Get pointers to the
          with the schema/type name array. This is similar to OCITypeByName()
-         except that all the TDO's are retreived via a single network roundtrip.
+         except that all the TDO's are retrieved via a single network roundtrip.
     RETURNS:
           OCI_SUCCESS if the function completes successfully.
           OCI_INVALID_HANDLE if 'env' or 'err' is null.
@@ -1018,7 +1018,7 @@ var OCITypeIterNew : function (env:POCIEnv; err:POCIError; tdo:POCIType; var ite
     DESCRIPTION:
          Get pointers to the
          with the schema/type name array. This is similar to OCITypeByName()
-         except that all the TDO's are retreived via a single network roundtrip.
+         except that all the TDO's are retrieved via a single network roundtrip.
     RETURNS:
           OCI_SUCCESS if the function completes successfully.
           OCI_INVALID_HANDLE if 'env' or 'err' is null.
@@ -2021,10 +2021,10 @@ var OCITypeIterNew : function (env:POCIEnv; err:POCIError; tdo:POCIType; var ite
              any accessor.
           2) All input parameters must not be NULL and must be valid.
      DESCRIPTION:
-          Get the flags (inline, constant, virutal, constructor, destructor) of
+          Get the flags (inline, constant, virtual, constructor, destructor) of
           a method.
      RETURNS:
-          the flags (inline, constant, virutal, constructor, destructor) of
+          the flags (inline, constant, virtual, constructor, destructor) of
           the method
      NOTES:
           The type must be unpinned when the accessed information is no

+ 2 - 2
packages/paszlib/readme.txt

@@ -38,7 +38,7 @@ Please see the fpdoc help and the zipper.pp for details on using the class.
 
 Zip file format
 ===============
-The standard mentioned above documents the zip file format authoratively
+The standard mentioned above documents the zip file format authoritatively
 and in detail. However, a brief summary can be useful:
 A zip file consists of
 
@@ -87,7 +87,7 @@ central directory file header version is used.
 
 If zip64 support is needed due to zip64 local/central file headers and/or the
 number of files in the zip file, the zip64 alternatives to the end of central
-diretory variables are always written. Although the zip standard doesn't seem to
+directory variables are always written. Although the zip standard doesn't seem to
 require this explicitly, it doesn't forbid it either and other utilities such as
 rar and Windows 7 built in zip support seem to require it.
 

+ 153 - 0
packages/rtl-console/demo/demoansi.pp

@@ -0,0 +1,153 @@
+program demoansi;
+
+{$mode objfpc}
+{$h+}
+
+uses sysutils, fpansi;
+
+var
+  ANI : Array[0..3] of string = ('|','/','-','\');
+
+var
+  i : Integer;
+  aText : TAnsi;
+  aLine : AnsiString;
+  
+procedure Pause;
+begin
+  Writeln;
+  Write('Press Enter to continue...');
+  Readln;
+  Writeln(TAnsi.EraseDisplay(edScreen));
+  Writeln(TAnsi.CursorAt(1,1));
+end;
+
+begin
+  Writeln(TAnsi.EraseDisplay(edScreen));  
+  Writeln('--- Basic & Existing Demo ---');
+  aText:='Hello world!';
+  aLine:=aText.Bold.Fg(TAnsi.Red);
+  Writeln(TAnsi.CursorAt(1,1),aLine);
+  aText:='Hello world, again!';
+  aText.Bold.Fg(TAnsi.BrightGreen).At(2,1).EmitLn;
+  
+  Write('Running animation... ');
+  for I:=1 to 100 do
+    begin
+    aText:=Ani[i mod 4]+' '+Format('%.2d',[(100-I)]);
+    AText.Backward(4).FG(TAnsi.BrightRed).Emit;
+    Sleep(20);
+    end;
+  
+  Pause;
+
+  // --- Attributes Demo ---
+  Writeln('--- Attributes Demo ---');
+  aText := 'This text is BLINKING (may not work in all terminals)';
+  aText.Blinking.EmitLn;
+  
+  aText := 'This text is FAINT';
+  aText.Faint.EmitLn;
+  
+  aText := 'This text is STRIKETHROUGH';
+  aText.Strikethrough.EmitLn;
+  
+  aText := 'This text is BOLD and FAINT combined';
+  aText.Bold.Faint.EmitLn;
+
+  Pause;
+
+  // --- Colors Demo ---
+  Writeln('--- Colors Demo ---');
+  aText := 'Standard Blue Background with White Text';
+  aText.Bg(TAnsi.Blue).Fg(TAnsi.White).EmitLn;
+
+  aText := 'Custom RGB Foreground (Orange: 255, 165, 0)';
+  aText.FgRGB(255, 165, 0).EmitLn;
+
+  aText := 'Custom RGB Background (Purple: 128, 0, 128)';
+  aText.BgRGB(128, 0, 128).Fg(TAnsi.White).EmitLn;
+
+  Writeln('Grayscale Ramp (Bg):');
+  for i := 0 to 23 do
+  begin
+    aText := ' ';
+    aText.Bg(aText.GrayScale(i)).Emit;
+  end;
+  Writeln;
+  
+  Writeln('RGB Helper Demo (Red Gradient Bg):');
+  for i := 0 to 5 do
+  begin
+    aText := '  ';
+    aText.Bg(aText.RGB(i, 0, 0)).Emit;
+  end;
+  Writeln;
+
+  Pause;
+
+  // --- Cursor Movement Demo ---
+  Writeln('--- Cursor Movement Demo ---');
+  Writeln('Line 1: Origin');
+  Writeln('Line 2: Target for Up/Down');
+  Writeln('Line 3: Target for PreviousLine');
+  Writeln;
+  
+  // Go back up to Line 1
+  aText := ' <--- Appended on Line 1 via PreviousLine';
+  aText.PreviousLine(4).Forward(15).Emit; 
+  
+  // Go down to Line 2
+  aText := ' <--- Appended on Line 2 via NextLine';
+  aText.NextLine.Forward(15).Emit;
+
+  // Move absolute
+  aText := 'Absolute Position (Row 10, Col 20)';
+  aText.At(20, 10).Emit;
+
+  // Column movement
+  Writeln;
+  Writeln; // Ensure we are below
+  Write('Column 1');
+  aText := 'Column 30 via AtCol';
+  aText.AtCol(30).EmitLn;
+  
+  // Directional
+  Writeln;
+  Write('Start');
+  aText := 'Up and Right';
+  // Move Up 1 and Right 5 from current position
+  aText.Up(1).Forward(5).EmitLn;
+  Writeln;
+
+  Pause;
+
+  // --- Erase Demo ---
+  Writeln('--- Erase Demo ---');
+  Writeln('1. This line will be partially erased from the END (Watch this part -> XXXXX)');
+  Writeln('2. This line will be partially erased from the BEGINNING');
+  Writeln('3. This line will be FULLY erased');
+  Writeln('4. This line stays.');
+  
+  // 1. Erase End
+  // Move up 4 lines (to line 1), move to column 55 approx
+  Write(TAnsi.CursorPreviousLine(4)); 
+  Write(TAnsi.CursorAtCol(55)); 
+  Write(TAnsi.EraseLine(elEndOfLine));
+  
+  // 2. Erase Start
+  Write(TAnsi.CursorNextLine(1));
+  Write(TAnsi.CursorAtCol(10)); // Move in a bit
+  Write(TAnsi.EraseLine(edBeginOfLine));
+
+  // 3. Erase Full
+  Write(TAnsi.CursorNextLine(1));
+  Write(TAnsi.EraseLine(edLine));
+
+  // Return to bottom
+  Write(TAnsi.CursorNextLine(2));
+  
+  Pause;
+
+  Writeln('Demo Complete.');
+end.

+ 2 - 0
packages/rtl-console/fpmake.pp

@@ -69,6 +69,8 @@ begin
 
     T:=P.Targets.AddUnit('winevent.pp',WinEventOSes);
 
+    T:=P.Targets.AddUnit('fpansi.pp');
+    
     T:=P.Targets.AddUnit('keyboard.pp',KbdOSes);
     with T.Dependencies do
       begin

+ 3 - 0
packages/rtl-console/namespaced/System.Console.Ansi.pp

@@ -0,0 +1,3 @@
+unit System.Console.Ansi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpansi.pp}

+ 1 - 0
packages/rtl-console/namespaces.lst

@@ -1,3 +1,4 @@
+src/inc/fpansi.pp=namespaced/System.Console.Ansi.pp
 src/emx/crt.pp=namespaced/System.Console.Crt.pp
 {s*:src/emx/}=namespaced/
 {i+:src/emx/}

+ 343 - 0
packages/rtl-console/src/inc/fpansi.pp

@@ -0,0 +1,343 @@
+{
+    This file is part of the Free Pascal run time library.
+    Copyright (c) 2026 by Michael Van Canneyt
+    member of the Free Pascal development team
+
+    Emit ANSI escape sequences
+    (Based on an idea by Vianney Gagnière)
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
+unit FPAnsi;
+{$ENDIF}
+
+{$mode objfpc}
+{$h+}
+{$modeswitch advancedrecords}
+
+interface
+
+uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.SysUtils, System.StrUtils
+{$ELSE}
+  SysUtils,StrUtils  
+{$ENDIF}
+  ;
+
+type
+  TRGBComponent = 0..5;
+  TGrayScale = 0..23;
+  TEraseDisplay = (edEndOfScreen,edBeginOfScreen,edScreen,edScreenAndBuffer);
+  TEraseLine = (elEndOfLine,edBeginOfLine,edLine);
+    
+  TAnsi = record
+  private
+    FCmds : string;
+    FSGR : string;
+    FText: string;
+    procedure SGR(const aEscape: string);
+    procedure AddCommand(const aCommand : string);
+  public
+  const
+    // https://en.wikipedia.org/wiki/ANSI_escape_code#8-bit
+    Black     = 0;
+    Red       = 1;
+    Green     = 2;
+    Yellow    = 3;
+    Blue      = 4;
+    Magenta   = 5;
+    Cyan      = 6;
+    White     = 7;
+   
+    BrightBlack   = 8;  
+    BrightRed     = 9;
+    BrightGreen   = 10;
+    BrightYellow  = 11;
+    BrightBlue    = 12;
+    BrightMagenta = 13;
+    BrightCyan    = 14;
+    BrightWhite   = 15;
+   
+    function RGB(R,G,B : TRGBComponent) : Byte;
+    Function GrayScale(aScale : TGrayScale) : Byte;
+    function FgRGB(R,G,B : Byte) : TAnsi;
+    function BgRGB(R,G,B : Byte) : TAnsi;
+    function Fg(const aColorCode: Byte): TAnsi;
+    function Bg(const aColorCode: Byte): TAnsi;
+    function Blinking: TAnsi;
+    function Bold: TAnsi;
+    function Faint: TAnsi;
+    function Strikethrough: TAnsi;
+    function ToString : String;
+    // Return ANSI escape control string
+    class function CursorAt(aCol,aRow : Word; asFormat : boolean = True) : string; static;
+    class function CursorAtCol(aCol : Word) : string; static;
+    class function CursorUp(aLines : Word = 1) : string; static;
+    class function CursorDown(aLines : Word = 1) : string; static;
+    class function CursorForward(aCols : Word = 1) : string; static;
+    class function CursorBackward(aCols : Word = 1) : string; static;
+    class function CursorNextLine(aLines : Word = 1) : string; static;
+    class function CursorPreviousLine(aLines : Word = 1) : string; static;
+    class function EraseDisplay(aWhich : TEraseDisplay) : string; static;
+    class function EraseLine(aWhich : TEraseLine) : string; static;
+    // Apply ANSI escape control string.
+    function At(aCol,aRow : Word; asFormat : Boolean = True): TAnsi;
+    function AtCol(aCol : Word): TAnsi;
+    function Up(aLines : Word = 1): TAnsi;
+    function Down(aLines : Word = 1): TAnsi;
+    function Forward(aCols : Word = 1): TAnsi;
+    function Backward(aCols : Word = 1): TAnsi;
+    function NextLine(aLines : Word = 1): TAnsi;
+    function PreviousLine(aLines : Word = 1): TAnsi;
+    function Emit(aClear : Boolean = True) : TAnsi;
+    function EmitLn(aClear : Boolean = True) : TAnsi;
+    Function Clear(aClearText : Boolean = False) : TAnsi;
+    class operator :=(const aText: AnsiString): TAnsi;
+    class operator :=(const aAnsi: TAnsi): AnsiString;
+    class operator :=(const aText: ShortString): TAnsi;
+    class operator :=(const aAnsi: TAnsi): ShortString;
+  end;
+
+implementation
+
+class operator TAnsi.:=(const aText: AnsiString): TAnsi;
+begin
+  Result:=Default(TAnsi);
+  Result.FText := aText;
+end;
+
+class operator TAnsi.:=(const aText: ShortString): TAnsi;
+begin
+  Result:=Default(TAnsi);
+  Result.FText := aText;
+end;
+
+class operator TAnsi.:=(const aAnsi: TAnsi): AnsiString;
+begin
+  Result:=aAnsi.ToString;
+end;
+
+class operator TAnsi.:=(const aAnsi: TAnsi): Shortstring;
+begin
+  Result:=aAnsi.ToString;
+end;
+
+procedure TAnsi.SGR(const aEscape: string);
+begin
+  if FSGR<>'' then
+    FSGR:=FSGR+';';
+  FSGR := FSGR+aEscape;
+end;
+
+function TAnsi.GrayScale(aScale : TGrayScale) : Byte;
+
+begin
+  Result:=232+aScale;
+end; 
+
+function TAnsi.RGB(R,G,B : TRGBComponent) : Byte;
+
+begin
+  Result:=16+(36*r)+(6*g)+b;
+end;
+
+function TAnsi.ToString : string;
+begin
+  Result:=FCmds+#27'['+FSGR+'m'+FText+#27'[0m';
+end;
+
+function TAnsi.Fg(const aColorCode: Byte): TAnsi;
+begin
+  SGR(Format('38;5;%d',[aColorCode]));
+  Result := Self;
+end;
+
+function TAnsi.Bg(const aColorCode: Byte): TAnsi;
+begin
+  SGR(Format('48;5;%d',[aColorCode]));
+  Result := Self;
+end;
+
+function Tansi.FgRGB(R,G,B : Byte) : TAnsi;
+begin
+  SGR(Format('38,2;%d;%d;%d',[R,G,B]));
+end;
+
+function TAnsi.BgRGB(R,G,B : Byte) : TAnsi;
+begin
+  SGR(Format('48,2;%d;%d;%d',[R,G,B]));
+end;
+
+class function TAnsi.CursorUp(aLines : Word = 1) : string;
+begin
+  Result:=Format(#27'[%dA',[aLines]);
+end;
+
+class function TAnsi.CursorDown(aLines : Word = 1) : string;
+begin
+  Result:=Format(#27'[%dB',[aLines]);
+end;
+
+class function TAnsi.CursorForward(aCols : Word = 1) : string;
+begin
+  Result:=Format(#27'[%dC',[aCols]);
+end;
+
+class function TAnsi.CursorBackward(aCols : Word = 1) : string;
+begin
+  Result:=Format(#27'[%dD',[aCols]);
+end;
+
+class function TAnsi.CursorNextLine(aLines : Word = 1) : string;
+begin
+  Result:=Format(#27'[%dE',[aLines]);
+end;
+
+class function TAnsi.CursorPreviousLine(aLines : Word = 1) : string;
+begin
+  Result:=Format(#27'[%dF',[aLines]);
+end;
+
+class function TAnsi.CursorAt(aCol,aRow : Word; asFormat : boolean = True) : string;
+
+Const
+  Chars : Array[Boolean] of String = ('H','f');
+  
+begin
+  Result:=Format(#27'[%d;%d%s',[aCol,aRow,Chars[asFormat]]);
+end;
+
+class function TAnsi.CursorAtCol(aCol : Word) : string;
+
+begin
+  Result:=Format(#27'[%dG',[aCol]);
+end;
+
+class function TAnsi.EraseDisplay(aWhich : TEraseDisplay) : string; 
+
+begin
+  Result:=Format(#27'[%dJ',[Ord(aWhich)]);
+end;
+
+class function TAnsi.EraseLine(aWhich : TEraseLine) : string; 
+
+begin
+  Result:=Format(#27'[%dK',[Ord(aWhich)]);
+end;
+
+procedure TAnsi.AddCommand(const aCommand : string);
+begin
+  FCmds:=FCmds+aCommand;
+end;
+
+function TAnsi.At(aCol,aRow : Word; asFormat : boolean = True) : TAnsi;
+
+begin
+  AddCommand(CursorAt(aCol,aRow,asFormat));
+  Result:=Self;
+end;
+
+function TAnsi.AtCol(aCol : Word) : TAnsi;
+
+begin
+  AddCommand(CursorAtCol(aCol));
+  Result:=Self;
+end;
+
+function TAnsi.Up(aLines : Word = 1): TAnsi;
+begin
+  AddCommand(CursorUp(aLines));
+  Result:=Self;
+end;
+
+function TAnsi.Down(aLines : Word = 1): TAnsi;
+begin
+  AddCommand(CursorDown(aLines));
+  Result:=Self;
+end;
+
+function TAnsi.Forward(aCols : Word = 1): TAnsi;
+begin
+  AddCommand(CursorForward(aCols));
+  Result:=Self;
+end;
+
+function TAnsi.Backward(aCols : Word = 1): TAnsi;
+begin
+  AddCommand(CursorBackWard(aCols));
+  Result:=Self;
+end;
+
+function TAnsi.NextLine(aLines : Word = 1): TAnsi;
+begin
+  AddCommand(CursorNextLine(aLines));
+  Result:=Self;
+end;
+
+function TAnsi.PreviousLine(aLines : Word = 1): TAnsi;
+begin
+  AddCommand(CursorPreviousLine(aLines));
+  Result:=Self;
+end;
+
+function TAnsi.Blinking: TAnsi;
+begin
+  SGR('5');
+  Result := Self;
+end;
+
+function TAnsi.Bold: TAnsi;
+begin
+  SGR('1');
+  Result := Self;
+end;
+
+function TAnsi.Faint: TAnsi;
+begin
+  SGR('2');
+  Result := Self;
+end;
+
+function TAnsi.StrikeThrough: TAnsi;
+begin
+  SGR('9');
+  Result := Self;
+end;
+
+function TAnsi.Emit(aClear : Boolean = True) : TAnsi;
+begin
+  Write(ToString); 
+  flush(output);
+  if aClear then
+    Clear(False);
+  Result:=Self;  
+end;
+
+function TAnsi.EmitLn(aClear : Boolean = True) : TAnsi;
+begin
+  WriteLn(ToString); 
+  flush(output);
+  if aClear then
+    Clear(False);
+  Result:=Self;
+end;
+
+Function TAnsi.Clear(aClearText : Boolean = False) : TAnsi;
+
+begin
+  FCmds:='';
+  FSGR:='';
+  if aClearText then
+    FText:='';
+  result:=Self;  
+end;
+
+end.

+ 1 - 1
packages/rtl-extra/src/beos/unxsockh.inc

@@ -328,7 +328,7 @@ Const
  	IPV6_HOPLIMIT           = 47; { int; send hop limit }
  	IPV6_NEXTHOP            = 48; { sockaddr; next hop addr }
  	IPV6_HOPOPTS            = 49; { ip6_hbh; send hop-by-hop option }
- 	IPV6_DSTOPTS            = 50; { ip6_dest; send dst option befor rthdr }
+ 	IPV6_DSTOPTS            = 50; { ip6_dest; send dst option before rthdr }
  	IPV6_RTHDR              = 51; { ip6_rthdr; send routing header }
  	IPV6_PKTOPTIONS         = 52; { buf/cmsghdr; set/get IPv6 options }
 

+ 1 - 1
packages/rtl-extra/src/dragonfly/unxsockh.inc

@@ -328,7 +328,7 @@ Const
  	IPV6_HOPLIMIT           = 47; { int; send hop limit }
  	IPV6_NEXTHOP            = 48; { sockaddr; next hop addr }
  	IPV6_HOPOPTS            = 49; { ip6_hbh; send hop-by-hop option }
- 	IPV6_DSTOPTS            = 50; { ip6_dest; send dst option befor rthdr }
+ 	IPV6_DSTOPTS            = 50; { ip6_dest; send dst option before rthdr }
  	IPV6_RTHDR              = 51; { ip6_rthdr; send routing header }
  	IPV6_PKTOPTIONS         = 52; { buf/cmsghdr; set/get IPv6 options }
 

+ 1 - 1
packages/rtl-extra/src/freebsd/unxsockh.inc

@@ -328,7 +328,7 @@ Const
  	IPV6_HOPLIMIT           = 47; { int; send hop limit }
  	IPV6_NEXTHOP            = 48; { sockaddr; next hop addr }
  	IPV6_HOPOPTS            = 49; { ip6_hbh; send hop-by-hop option }
- 	IPV6_DSTOPTS            = 50; { ip6_dest; send dst option befor rthdr }
+ 	IPV6_DSTOPTS            = 50; { ip6_dest; send dst option before rthdr }
  	IPV6_RTHDR              = 51; { ip6_rthdr; send routing header }
  	IPV6_PKTOPTIONS         = 52; { buf/cmsghdr; set/get IPv6 options }
 

+ 1 - 1
packages/rtl-extra/src/haiku/unxsockh.inc

@@ -359,7 +359,7 @@ Const
  	IPV6_HOPLIMIT           = 47; { int; send hop limit }
  	IPV6_NEXTHOP            = 48; { sockaddr; next hop addr }
  	IPV6_HOPOPTS            = 49; { ip6_hbh; send hop-by-hop option }
- 	IPV6_DSTOPTS            = 50; { ip6_dest; send dst option befor rthdr }
+ 	IPV6_DSTOPTS            = 50; { ip6_dest; send dst option before rthdr }
  	IPV6_RTHDR              = 51; { ip6_rthdr; send routing header }
  	IPV6_PKTOPTIONS         = 52; { buf/cmsghdr; set/get IPv6 options }
 *)

+ 1 - 1
packages/rtl-extra/src/openbsd/unxsockh.inc

@@ -328,7 +328,7 @@ Const
  	IPV6_HOPLIMIT           = 47; { int; send hop limit }
  	IPV6_NEXTHOP            = 48; { sockaddr; next hop addr }
  	IPV6_HOPOPTS            = 49; { ip6_hbh; send hop-by-hop option }
- 	IPV6_DSTOPTS            = 50; { ip6_dest; send dst option befor rthdr }
+ 	IPV6_DSTOPTS            = 50; { ip6_dest; send dst option before rthdr }
  	IPV6_RTHDR              = 51; { ip6_rthdr; send routing header }
  	IPV6_PKTOPTIONS         = 52; { buf/cmsghdr; set/get IPv6 options }
 

+ 1 - 1
packages/rtl-extra/src/solaris/unxsockh.inc

@@ -355,7 +355,7 @@ const
     { enable/disable IPV6_HOPOPTS  }
       IPV6_RECVHOPOPTS = $14;
     {
-     * This options exists for backwards compatability and should no longer be
+     * This options exists for backwards compatibility and should no longer be
      * used.  Use IPV6_RECVDSTOPTS instead.
       }
       _OLD_IPV6_RECVDSTOPTS = $15;

+ 1 - 1
packages/rtl-objpas/fpmake.pp

@@ -8,7 +8,7 @@ uses {$ifdef unix}cthreads,{$endif} fpmkunit;
 procedure add_rtl_objpas(const ADirectory: string);
 
 Const
-  // All Unices have full set of KVM+Crt in unix/ except QNX which is not
+  // All Unixes have full set of KVM+Crt in unix/ except QNX which is not
   // in workable state atm.
   UnixLikes = AllUnixOSes -[QNX]; // qnx never was active in 2.x afaik
 

+ 1 - 1
packages/sdl/src/sdl_mixer.pas

@@ -779,7 +779,7 @@ const
 
   { * set the position ofa channel.( angle ) is an integer from 0 to 360, that
     * specifies the location of the sound in relation to the listener.( angle )
-    * will be reduced as neccesary( 540 becomes 180 degrees, -100 becomes 260 ).
+    * will be reduced as necessary( 540 becomes 180 degrees, -100 becomes 260 ).
     * Angle 0 is due north, and rotates clockwise as the value increases.
     * for efficiency, the precision of this effect may be limited( angles 1
     * through 7 might all produce the same effect, 8 through 15 are equal, etc ).

+ 2 - 2
packages/univint/src/ABGlobals.pas

@@ -380,11 +380,11 @@ var kABDepartmentProperty: CFStringRef; external name '_kABDepartmentProperty';
 var kABPersonFlags: CFStringRef; external name '_kABPersonFlags'; (* attribute const *)
 (* AVAILABLE_MAC_OS_X_VERSION_10_3_AND_LATER *)     // Various flags - kABIntegerProperty - (Person)
 
-const	
+const
 	kABShowAsMask = 7;
 	kABShowAsPerson = 0;
 	kABShowAsCompany = 1;
-	
+
 	kABNameOrderingMask = 7 shl 3;
 	kABDefaultNameOrdering = 0 shl 3;
 	kABFirstNameFirst = 4 shl 3;

Plik diff jest za duży
+ 179 - 179
packages/univint/src/AEDataModel.pas


+ 58 - 58
packages/univint/src/AEHelpers.pas

@@ -1,17 +1,17 @@
 {
      File:       AE/AEHelpers.h
- 
+
      Contains:   AEPrint, AEBuild and AEStream for Carbon
- 
-    
- 
+
+
+
      Copyright:  © 1999-2008 by Apple Computer, Inc., all rights reserved.
- 
+
      Bugs?:      For bug reports, consult the following page on
                  the World Wide Web:
- 
+
                      http://bugs.freepascal.org
- 
+
 }
 {
     Modified for use with Free Pascal
@@ -240,7 +240,7 @@ uses MacTypes,AppleEvents,AEDataModel;
  * format is similar to the stdio printf call, where meta data is
  * extracted from a format string and used to build the final
  * representation.
- * 
+ *
  * For more information on AEBuild and other APIs in AEHelpers, see:
  *     <http://developer.apple.com/technotes/tn/tn2045.html>
  }
@@ -283,10 +283,10 @@ type
 }
 {
  *  AEBuildDesc()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -299,10 +299,10 @@ function AEBuildDesc( var dst: AEDesc; error: AEBuildErrorPtr { can be NULL }; s
 { varargs version of AEBuildDesc}
 {
  *  vAEBuildDesc()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -315,10 +315,10 @@ function AEBuildDesc( var dst: AEDesc; error: AEBuildErrorPtr { can be NULL }; s
 { Append parameters to an existing AppleEvent}
 {
  *  AEBuildParameters()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -331,10 +331,10 @@ function AEBuildParameters( var event: AppleEvent; error: AEBuildErrorPtr { can
 { varargs version of AEBuildParameters}
 {
  *  vAEBuildParameters()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -347,10 +347,10 @@ function AEBuildParameters( var event: AppleEvent; error: AEBuildErrorPtr { can
 { Building an entire Apple event:}
 {
  *  AEBuildAppleEvent()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -363,10 +363,10 @@ function AEBuildAppleEvent( theClass: AEEventClass; theID: AEEventID; addressTyp
 { varargs version of AEBuildAppleEvent}
 {
  *  vAEBuildAppleEvent()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -387,10 +387,10 @@ function AEBuildAppleEvent( theClass: AEEventClass; theID: AEEventID; addressTyp
  }
 {
  *  AEPrintDescToHandle()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -419,10 +419,10 @@ type
 }
 {
  *  AEStreamOpen()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -439,10 +439,10 @@ function AEStreamOpen: AEStreamRef; external name '_AEStreamOpen';
 }
 {
  *  AEStreamClose()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -458,10 +458,10 @@ function AEStreamClose( ref: AEStreamRef; var desc: AEDesc ): OSStatus; external
 }
 {
  *  AEStreamOpenDesc()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -474,10 +474,10 @@ function AEStreamOpenDesc( ref: AEStreamRef; newType: DescType ): OSStatus; exte
 { Append data to the previously opened desc.}
 {
  *  AEStreamWriteData()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -493,10 +493,10 @@ function AEStreamWriteData( ref: AEStreamRef; data: {const} UnivPtr; length: Siz
 }
 {
  *  AEStreamCloseDesc()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -509,10 +509,10 @@ function AEStreamCloseDesc( ref: AEStreamRef ): OSStatus; external name '_AEStre
 { Write data as a desc to the stream}
 {
  *  AEStreamWriteDesc()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -525,10 +525,10 @@ function AEStreamWriteDesc( ref: AEStreamRef; newType: DescType; data: {const} U
 { Write an entire desc to the stream}
 {
  *  AEStreamWriteAEDesc()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -544,10 +544,10 @@ function AEStreamWriteAEDesc( ref: AEStreamRef; const (*var*) desc: AEDesc ): OS
 }
 {
  *  AEStreamOpenList()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -560,10 +560,10 @@ function AEStreamOpenList( ref: AEStreamRef ): OSStatus; external name '_AEStrea
 { Finish a list.}
 {
  *  AEStreamCloseList()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -579,10 +579,10 @@ function AEStreamCloseList( ref: AEStreamRef ): OSStatus; external name '_AEStre
 }
 {
  *  AEStreamOpenRecord()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -595,10 +595,10 @@ function AEStreamOpenRecord( ref: AEStreamRef; newType: DescType ): OSStatus; ex
 { Change the type of a record.}
 {
  *  AEStreamSetRecordType()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -611,10 +611,10 @@ function AEStreamSetRecordType( ref: AEStreamRef; newType: DescType ): OSStatus;
 { Finish a record}
 {
  *  AEStreamCloseRecord()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -630,10 +630,10 @@ function AEStreamCloseRecord( ref: AEStreamRef ): OSStatus; external name '_AESt
 }
 {
  *  AEStreamWriteKeyDesc()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -649,10 +649,10 @@ function AEStreamWriteKeyDesc( ref: AEStreamRef; key: AEKeyword; newType: DescTy
 }
 {
  *  AEStreamOpenKeyDesc()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -665,10 +665,10 @@ function AEStreamOpenKeyDesc( ref: AEStreamRef; key: AEKeyword; newType: DescTyp
 { Write a key to the stream - you can follow this with an AEWriteDesc.}
 {
  *  AEStreamWriteKey()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -685,10 +685,10 @@ function AEStreamWriteKey( ref: AEStreamRef; key: AEKeyword ): OSStatus; externa
 }
 {
  *  AEStreamCreateEvent()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -708,10 +708,10 @@ function AEStreamCreateEvent( clazz: AEEventClass; id: AEEventID; targetType: De
 }
 {
  *  AEStreamOpenEvent()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -724,10 +724,10 @@ function AEStreamOpenEvent( var event: AppleEvent ): AEStreamRef; external name
 { Mark a keyword as being an optional parameter.}
 {
  *  AEStreamOptionalParam()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later

+ 46 - 46
packages/univint/src/AEInteraction.pas

@@ -1,17 +1,17 @@
 {
      File:       HIToolbox/AEInteraction.h
- 
+
      Contains:   AppleEvent functions that deal with Events and interacting with user
- 
+
      Version:    HIToolbox-624~3
- 
+
      Copyright:  © 2000-2008 by Apple Computer, Inc., all rights reserved.
- 
+
      Bugs?:      For bug reports, consult the following page on
                  the World Wide Web:
- 
+
                      http://bugs.freepascal.org
- 
+
 }
 {       Pascal Translation Updated:  Peter N Lewis, <[email protected]>, August 2005 }
 {       Pascal Translation Updated:  Jonas Maebe, <[email protected]>, October 2009 }
@@ -231,7 +231,7 @@ uses MacTypes,QuickdrawTypes,AEDataModel,Notification,Events,CarbonEventsCore;
 
 
 {*************************************************************************
-  AppleEvent callbacks. 
+  AppleEvent callbacks.
 *************************************************************************}
 type
 	AEIdleProcPtr = function( var theEvent: EventRecord; var sleepTime: SInt32; var mouseRgn: RgnHandle ): Boolean;
@@ -241,14 +241,14 @@ type
 
 {*************************************************************************
   The next couple of calls are basic routines used to create, send,
-  and process AppleEvents. 
+  and process AppleEvents.
 *************************************************************************}
 {
  *  AESend()
- *  
+ *
  *  Mac OS X threading:
  *    Not thread safe
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -260,10 +260,10 @@ function AESend( const (*var*) theAppleEvent: AppleEvent; var reply: AppleEvent;
 
 {
  *  AEProcessAppleEvent()
- *  
+ *
  *  Mac OS X threading:
  *    Not thread safe
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -275,11 +275,11 @@ function AEProcessAppleEvent( const (*var*) theEventRecord: EventRecord ): OSErr
 
 {
  *  AEProcessEvent()
- *  
+ *
  *  Summary:
  *    Dispatches a Carbon event of type kEventAppleEvent to the
  *    appropriate AppleEvent handlers.
- *  
+ *
  *  Discussion:
  *    This API is similar to AEProcessAppleEvent, but does not require
  *    the Carbon event to be converted to an EventRecord. Also, unlike
@@ -290,21 +290,21 @@ function AEProcessAppleEvent( const (*var*) theEventRecord: EventRecord ): OSErr
  *    event from its event queue later once you're done handling it,
  *    and it is also acceptable to remove it from the event queue
  *    before calling this API.
- *  
+ *
  *  Mac OS X threading:
  *    Not thread safe
- *  
+ *
  *  Parameters:
- *    
+ *
  *    inEvent:
  *      A Carbon event of class kEventClassAppleEvent and kind
  *      kEventAppleEvent.
- *  
+ *
  *  Result:
  *    The operating system result code returned by the AppleEvent
  *    handler, or paramErr if the event passed to this API is not of
  *    the correct class and kind.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.5 and later in Carbon.framework
  *    CarbonLib:        not available
@@ -314,18 +314,18 @@ function AEProcessEvent( inEvent: EventRef ): OSStatus; external name '_AEProces
 (* AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER *)
 
 
-{ 
+{
  Note: during event processing, an event handler may realize that it is likely
  to exceed the client's timeout limit. Passing the reply to this
  routine causes a wait event to be generated that asks the client
- for more time. 
+ for more time.
 }
 {
  *  AEResetTimer()
- *  
+ *
  *  Mac OS X threading:
  *    Not thread safe
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -337,7 +337,7 @@ function AEResetTimer( const (*var*) reply: AppleEvent ): OSErr; external name '
 
 {*************************************************************************
   The following three calls are used to allow applications to behave
-  courteously when a user interaction such as a dialog box is needed. 
+  courteously when a user interaction such as a dialog box is needed.
 *************************************************************************}
 
 type
@@ -349,10 +349,10 @@ const
 
 {
  *  AEGetInteractionAllowed()
- *  
+ *
  *  Mac OS X threading:
  *    Not thread safe
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -364,10 +364,10 @@ function AEGetInteractionAllowed( var level: AEInteractAllowed ): OSErr; externa
 
 {
  *  AESetInteractionAllowed()
- *  
+ *
  *  Mac OS X threading:
  *    Not thread safe
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -379,10 +379,10 @@ function AESetInteractionAllowed( level: AEInteractAllowed ): OSErr; external na
 
 {
  *  AEInteractWithUser()
- *  
+ *
  *  Mac OS X threading:
  *    Not thread safe
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -403,10 +403,10 @@ function AEInteractWithUser( timeOutInTicks: SInt32; nmReqPtr: NMRecPtr; idlePro
 *************************************************************************}
 {
  *  AESuspendTheCurrentEvent()
- *  
+ *
  *  Mac OS X threading:
  *    Not thread safe
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -416,7 +416,7 @@ function AESuspendTheCurrentEvent( const (*var*) theAppleEvent: AppleEvent ): OS
 (* AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER *)
 
 
-{ 
+{
  Note: The following routine tells the AppleEvent manager that processing
  is either about to resume or has been completed on a previously suspended
  event. The procPtr passed in as the dispatcher parameter will be called to
@@ -446,10 +446,10 @@ const
 
 {
  *  AEResumeTheCurrentEvent()
- *  
+ *
  *  Mac OS X threading:
  *    Not thread safe
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -461,10 +461,10 @@ function AEResumeTheCurrentEvent( const (*var*) theAppleEvent: AppleEvent; const
 
 {
  *  AEGetTheCurrentEvent()
- *  
+ *
  *  Mac OS X threading:
  *    Not thread safe
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -476,10 +476,10 @@ function AEGetTheCurrentEvent( var theAppleEvent: AppleEvent ): OSErr; external
 
 {
  *  AESetTheCurrentEvent()
- *  
+ *
  *  Mac OS X threading:
  *    Not thread safe
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -490,11 +490,11 @@ function AESetTheCurrentEvent( const (*var*) theAppleEvent: AppleEvent ): OSErr;
 
 
 {*************************************************************************
-  AppleEvent callbacks. 
+  AppleEvent callbacks.
 *************************************************************************}
 {
  *  NewAEIdleUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -505,7 +505,7 @@ function NewAEIdleUPP( userRoutine: AEIdleProcPtr ): AEIdleUPP; external name '_
 
 {
  *  NewAEFilterUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -516,7 +516,7 @@ function NewAEFilterUPP( userRoutine: AEFilterProcPtr ): AEFilterUPP; external n
 
 {
  *  DisposeAEIdleUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -527,7 +527,7 @@ procedure DisposeAEIdleUPP( userUPP: AEIdleUPP ); external name '_DisposeAEIdleU
 
 {
  *  DisposeAEFilterUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -538,7 +538,7 @@ procedure DisposeAEFilterUPP( userUPP: AEFilterUPP ); external name '_DisposeAEF
 
 {
  *  InvokeAEIdleUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -549,7 +549,7 @@ function InvokeAEIdleUPP( var theEvent: EventRecord; var sleepTime: SInt32; var
 
 {
  *  InvokeAEFilterUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later

+ 33 - 33
packages/univint/src/AEMach.pas

@@ -1,17 +1,17 @@
 {
      File:       AE/AEMach.h
- 
+
      Contains:   AppleEvent over mach_msg interfaces
- 
-    
- 
+
+
+
      Copyright:  © 2000-2008 by Apple Computer, Inc., all rights reserved.
- 
+
      Bugs?:      For bug reports, consult the following page on
                  the World Wide Web:
- 
+
                      http://bugs.freepascal.org
- 
+
 }
 {
     Modified for use with Free Pascal
@@ -240,12 +240,12 @@ uses MacTypes,MacOSXPosix,AEDataModel;
  * Of note is a new attribute for an AppleEvent, keyReplyPortAttr.
  * This specifies the mach_port_t to which an AppleEvent reply
  * should be directed.  By default, replies are sent to the
- * processes' registered port where they are culled from the normal  
+ * processes' registered port where they are culled from the normal
  * event stream if there is an outstanding AESend + kAEWaitReply.
  * But it may be desirable for a client to specify their own port to
- * receive queud replies.
+ * receive queued replies.
  *
- * In the case of AESendMessage with kAEWaitReply specified, an 
+ * In the case of AESendMessage with kAEWaitReply specified, an
  * anonymous port will be used to block until the reply is received.
  *
  * Not supplied is a convenience routine to block a server and
@@ -268,7 +268,7 @@ const
 
 {
  *  AEGetRegisteredMachPort()
- *  
+ *
  *  Discussion:
  *    Return the mach_port_t that was registered by the AppleEvent
  *    framework for this process.  This port is considered public, and
@@ -277,10 +277,10 @@ const
  *    only if, you are not also using routines from HIToolbox.  In that
  *    case, HIToolbox retains control of this port and AppleEvents are
  *    dispatched through the main event loop.
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.3
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        not available in CarbonLib 1.x, is available on Mac OS X version 10.0 and later
@@ -292,7 +292,7 @@ function AEGetRegisteredMachPort: mach_port_t; external name '_AEGetRegisteredMa
 
 {
  *  AEDecodeMessage()
- *  
+ *
  *  Discussion:
  *    Decode a mach_msg into an AppleEvent and its related reply.  (The
  *    reply is set up from fields of the event.)  You can call this
@@ -305,21 +305,21 @@ function AEGetRegisteredMachPort: mach_port_t; external name '_AEGetRegisteredMa
  *    the AppleEvent reply with a event class attribute of
  *    typeAppleEvent, class typeAppleEventReply:
  *    The contents of the header are invalid after this call.
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.3
- *  
+ *
  *  Parameters:
- *    
+ *
  *    header:
  *      The incoming mach message to be dispatched
- *    
+ *
  *    event:
  *      The AppleEvent to decode the message in header into
- *    
+ *
  *    reply:
  *      The AppleEvent reply is decoded into reply
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        not available in CarbonLib 1.x, is available on Mac OS X version 10.0 and later
@@ -331,20 +331,20 @@ function AEDecodeMessage( var header: mach_msg_header_t; var event: AppleEvent;
 
 {
  *  AEProcessMessage()
- *  
+ *
  *  Discussion:
  *    Decodes and dispatches an event to an event handler.  Handles
  *    packaging and returning the reply to the sender.
  *    The contents of the header are invalid after this call.
- *  
+ *
  *  Mac OS X threading:
  *    Not thread safe since version 10.3
- *  
+ *
  *  Parameters:
- *    
+ *
  *    header:
  *      The incoming mach message to be dispatched.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        not available in CarbonLib 1.x, is available on Mac OS X version 10.0 and later
@@ -356,31 +356,31 @@ function AEProcessMessage( var header: mach_msg_header_t ): OSStatus; external n
 
 {
  *  AESendMessage()
- *  
+ *
  *  Discussion:
  *    Send an AppleEvent to a target process.  If the target is the
  *    current process (as specified by using typeProcessSerialNumber of
  *    ( 0, kCurrentProcess ) it is dispatched directly to the
  *    appropriate event handler in your process and not serialized.
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Parameters:
- *    
+ *
  *    event:
  *      The event to be sent
- *    
+ *
  *    reply:
  *      The reply for the event, if non-NULL
- *    
+ *
  *    sendMode:
  *      The mode to send the event
- *    
+ *
  *    timeOutInTicks:
  *      The timeout for sending the event, in ticks.  If 0, there is no
  *      timeout.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        not available in CarbonLib 1.x, is available on Mac OS X version 10.0 and later

+ 47 - 47
packages/univint/src/AEObjects.pas

@@ -1,17 +1,17 @@
 {
      File:       AE/AEObjects.h
- 
+
      Contains:   Object Support Library Interfaces.
- 
-    
- 
+
+
+
      Copyright:  © 1991-2008 by Apple Computer, Inc., all rights reserved
- 
+
      Bugs?:      For bug reports, consult the following page on
                  the World Wide Web:
- 
+
                      http://bugs.freepascal.org
- 
+
 }
 {
     Modified for use with Free Pascal
@@ -349,7 +349,7 @@ type
 	OSLAdjustMarksUPP = OSLAdjustMarksProcPtr;
 {
  *  NewOSLAccessorUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -360,7 +360,7 @@ function NewOSLAccessorUPP( userRoutine: OSLAccessorProcPtr ): OSLAccessorUPP; e
 
 {
  *  NewOSLCompareUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -371,7 +371,7 @@ function NewOSLCompareUPP( userRoutine: OSLCompareProcPtr ): OSLCompareUPP; exte
 
 {
  *  NewOSLCountUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -382,7 +382,7 @@ function NewOSLCountUPP( userRoutine: OSLCountProcPtr ): OSLCountUPP; external n
 
 {
  *  NewOSLDisposeTokenUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -393,7 +393,7 @@ function NewOSLDisposeTokenUPP( userRoutine: OSLDisposeTokenProcPtr ): OSLDispos
 
 {
  *  NewOSLGetMarkTokenUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -404,7 +404,7 @@ function NewOSLGetMarkTokenUPP( userRoutine: OSLGetMarkTokenProcPtr ): OSLGetMar
 
 {
  *  NewOSLGetErrDescUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -415,7 +415,7 @@ function NewOSLGetErrDescUPP( userRoutine: OSLGetErrDescProcPtr ): OSLGetErrDesc
 
 {
  *  NewOSLMarkUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -426,7 +426,7 @@ function NewOSLMarkUPP( userRoutine: OSLMarkProcPtr ): OSLMarkUPP; external name
 
 {
  *  NewOSLAdjustMarksUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -437,7 +437,7 @@ function NewOSLAdjustMarksUPP( userRoutine: OSLAdjustMarksProcPtr ): OSLAdjustMa
 
 {
  *  DisposeOSLAccessorUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -448,7 +448,7 @@ procedure DisposeOSLAccessorUPP( userUPP: OSLAccessorUPP ); external name '_Disp
 
 {
  *  DisposeOSLCompareUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -459,7 +459,7 @@ procedure DisposeOSLCompareUPP( userUPP: OSLCompareUPP ); external name '_Dispos
 
 {
  *  DisposeOSLCountUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -470,7 +470,7 @@ procedure DisposeOSLCountUPP( userUPP: OSLCountUPP ); external name '_DisposeOSL
 
 {
  *  DisposeOSLDisposeTokenUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -481,7 +481,7 @@ procedure DisposeOSLDisposeTokenUPP( userUPP: OSLDisposeTokenUPP ); external nam
 
 {
  *  DisposeOSLGetMarkTokenUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -492,7 +492,7 @@ procedure DisposeOSLGetMarkTokenUPP( userUPP: OSLGetMarkTokenUPP ); external nam
 
 {
  *  DisposeOSLGetErrDescUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -503,7 +503,7 @@ procedure DisposeOSLGetErrDescUPP( userUPP: OSLGetErrDescUPP ); external name '_
 
 {
  *  DisposeOSLMarkUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -514,7 +514,7 @@ procedure DisposeOSLMarkUPP( userUPP: OSLMarkUPP ); external name '_DisposeOSLMa
 
 {
  *  DisposeOSLAdjustMarksUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -525,7 +525,7 @@ procedure DisposeOSLAdjustMarksUPP( userUPP: OSLAdjustMarksUPP ); external name
 
 {
  *  InvokeOSLAccessorUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -536,7 +536,7 @@ function InvokeOSLAccessorUPP( desiredClass: DescType; const (*var*) container:
 
 {
  *  InvokeOSLCompareUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -547,7 +547,7 @@ function InvokeOSLCompareUPP( oper: DescType; const (*var*) obj1: AEDesc; const
 
 {
  *  InvokeOSLCountUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -558,7 +558,7 @@ function InvokeOSLCountUPP( desiredType: DescType; containerClass: DescType; con
 
 {
  *  InvokeOSLDisposeTokenUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -569,7 +569,7 @@ function InvokeOSLDisposeTokenUPP( var unneededToken: AEDesc; userUPP: OSLDispos
 
 {
  *  InvokeOSLGetMarkTokenUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -580,7 +580,7 @@ function InvokeOSLGetMarkTokenUPP( const (*var*) dContainerToken: AEDesc; contai
 
 {
  *  InvokeOSLGetErrDescUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -591,7 +591,7 @@ function InvokeOSLGetErrDescUPP( var appDescPtr: AEDescPtr; userUPP: OSLGetErrDe
 
 {
  *  InvokeOSLMarkUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -602,7 +602,7 @@ function InvokeOSLMarkUPP( const (*var*) dToken: AEDesc; const (*var*) markToken
 
 {
  *  InvokeOSLAdjustMarksUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -613,10 +613,10 @@ function InvokeOSLAdjustMarksUPP( newStart: SIGNEDLONG; newStop: SIGNEDLONG; con
 
 {
  *  AEObjectInit()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -630,10 +630,10 @@ function AEObjectInit: OSErr; external name '_AEObjectInit';
   such that further calls can be via inline }
 {
  *  AESetObjectCallbacks()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -645,10 +645,10 @@ function AESetObjectCallbacks( myCompareProc: OSLCompareUPP; myCountProc: OSLCou
 
 {
  *  AEResolve()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -660,10 +660,10 @@ function AEResolve( const (*var*) objectSpecifier: AEDesc; callbackFlags: SInt16
 
 {
  *  AEInstallObjectAccessor()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -675,10 +675,10 @@ function AEInstallObjectAccessor( desiredClass: DescType; containerType: DescTyp
 
 {
  *  AERemoveObjectAccessor()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -690,10 +690,10 @@ function AERemoveObjectAccessor( desiredClass: DescType; containerType: DescType
 
 {
  *  AEGetObjectAccessor()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -705,10 +705,10 @@ function AEGetObjectAccessor( desiredClass: DescType; containerType: DescType; v
 
 {
  *  AEDisposeToken()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -720,10 +720,10 @@ function AEDisposeToken( var theToken: AEDesc ): OSErr; external name '_AEDispos
 
 {
  *  AECallObjectAccessor()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later

+ 17 - 17
packages/univint/src/AEPackObject.pas

@@ -1,17 +1,17 @@
 {
      File:       AE/AEPackObject.h
- 
+
      Contains:   AppleEvents object packing Interfaces.
- 
-    
- 
+
+
+
      Copyright:  © 1991-2008 by Apple Computer, Inc., all rights reserved
- 
+
      Bugs?:      For bug reports, consult the following page on
                  the World Wide Web:
- 
+
                      http://bugs.freepascal.org
- 
+
 }
 {
     Modified for use with Free Pascal
@@ -230,10 +230,10 @@ uses MacTypes,AEDataModel,AppleEvents;
 { These are the object packing routines.  }
 {
  *  CreateOffsetDescriptor()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -245,10 +245,10 @@ function CreateOffsetDescriptor( theOffset: SIGNEDLONG; var theDescriptor: AEDes
 
 {
  *  CreateCompDescriptor()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -260,10 +260,10 @@ function CreateCompDescriptor( comparisonOperator: DescType; var operand1: AEDes
 
 {
  *  CreateLogicalDescriptor()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -275,10 +275,10 @@ function CreateLogicalDescriptor( var theLogicalTerms: AEDescList; theLogicOpera
 
 {
  *  CreateObjSpecifier()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -290,10 +290,10 @@ function CreateObjSpecifier( desiredClass: DescType; var theContainer: AEDesc; k
 
 {
  *  CreateRangeDescriptor()
- *  
+ *
  *  Mac OS X threading:
  *    Thread safe since version 10.2
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later

+ 7 - 7
packages/univint/src/AERegistry.pas

@@ -1,17 +1,17 @@
 {
      File:       AE/AERegistry.h
- 
+
      Contains:   AppleEvents Registry Interface.
- 
-    
- 
+
+
+
      Copyright:  © 1993-2008 by Apple Computer, Inc., all rights reserved
- 
+
      Bugs?:      For bug reports, consult the following page on
                  the World Wide Web:
- 
+
                      http://bugs.freepascal.org
- 
+
 }
 {
     Modified for use with Free Pascal

+ 7 - 7
packages/univint/src/AEUserTermTypes.pas

@@ -1,17 +1,17 @@
 {
      File:       AE/AEUserTermTypes.h
- 
+
      Contains:   AppleEvents AEUT resource format Interfaces.
- 
-    
- 
+
+
+
      Copyright:  © 1991-2008 by Apple Computer, Inc., all rights reserved
- 
+
      Bugs?:      For bug reports, consult the following page on
                  the World Wide Web:
- 
+
                      http://bugs.freepascal.org
- 
+
 }
 {
     Modified for use with Free Pascal

+ 4 - 4
packages/univint/src/AIFF.pas

@@ -1,9 +1,9 @@
 {
      File:       CarbonCore/AIFF.h
- 
+
      Contains:   Definition of AIFF file format components.
                  The contents of this header file are deprecated.
- 
+
      Copyright:  © 1989-2011 by Apple Inc. All rights reserved.
 }
 {
@@ -267,9 +267,9 @@ const
 
 {
     AIFF.h use to define a type, ID, which causes conflicts with other headers and application which want to use
-    this pretty common name as their own type.  If you were previously relying on this being defined here, you 
+    this pretty common name as their own type.  If you were previously relying on this being defined here, you
     should either define it yourself or change your references to it into a UInt32.
-    
+
     typedef UInt32 ID;
 }
 type

+ 34 - 34
packages/univint/src/ASDebugging.pas

@@ -1,17 +1,17 @@
 {
      File:       OpenScripting/ASDebugging.h
- 
+
      Contains:   AppleScript Debugging Interfaces.
- 
+
      Version:    OSA-148~28
- 
+
      Copyright:  © 1992-2008 by Apple Computer, Inc., all rights reserved
- 
+
      Bugs?:      For bug reports, consult the following page on
                  the World Wide Web:
- 
+
                      http://bugs.freepascal.org
- 
+
 }
 
 {  Pascal Translation Updated: Gorazd Krosl <[email protected]>, October 2009 }
@@ -236,7 +236,7 @@ uses MacTypes,AEDataModel,OSA,Files,Components,AppleEvents,AppleScript,CFBase,CF
 {    This mode flag can be passed to OSASetProperty or OSASetHandler
     and will prevent properties or handlers from being defined in a context
     that doesn't already have bindings for them. An error is returned if
-    a current binding doesn't already exist. 
+    a current binding doesn't already exist.
 }
 const
 	kOSAModeDontDefine = $0001;
@@ -264,7 +264,7 @@ const
 *************************************************************************}
 {
  *  OSASetProperty()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -276,7 +276,7 @@ function OSASetProperty( scriptingComponent: ComponentInstance; modeFlags: SInt3
 
 {
  *  OSAGetProperty()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -288,7 +288,7 @@ function OSAGetProperty( scriptingComponent: ComponentInstance; modeFlags: SInt3
 
 {
  *  OSAGetPropertyNames()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -300,7 +300,7 @@ function OSAGetPropertyNames( scriptingComponent: ComponentInstance; modeFlags:
 
 {
  *  OSASetHandler()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -312,7 +312,7 @@ function OSASetHandler( scriptingComponent: ComponentInstance; modeFlags: SInt32
 
 {
  *  OSAGetHandler()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -324,7 +324,7 @@ function OSAGetHandler( scriptingComponent: ComponentInstance; modeFlags: SInt32
 
 {
  *  OSAGetHandlerNames()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -338,10 +338,10 @@ function OSAGetHandlerNames( scriptingComponent: ComponentInstance; modeFlags: S
 {$ifc not TARGET_CPU_64}
 {
  *  OSAGetAppTerminology()   *** DEPRECATED ***
- *  
+ *
  *  Deprecated:
  *    use OSACopyScriptingDefinition instead.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework [32-bit only] but deprecated in 10.5
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -355,12 +355,12 @@ function OSAGetAppTerminology( scriptingComponent: ComponentInstance; modeFlags:
 
 {
  *  OSAGetSysTerminology()
- *  
+ *
  *  Discussion:
  *    A terminology ID is derived from script code and language code as
  *    follows: terminologyID = ((scriptCode & 0x7F) << 8) | (langCode &
  *    0xFF)
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -372,22 +372,22 @@ function OSAGetSysTerminology( scriptingComponent: ComponentInstance; modeFlags:
 
 {
  *  OSACopyScriptingDefinition()
- *  
+ *
  *  Discussion:
  *    Gets the scripting definition of the specified bundle.  See
  *    sdef(5) for details of the sdef format.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    ref:
  *      The file (or bundle) to look in.
- *    
+ *
  *    modeFlags:
  *      There are no flags defined at this time; pass 0.
- *    
+ *
  *    sdef:
  *      The resulting sdef as XML data.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.4 and later in Carbon.framework
  *    CarbonLib:        not available
@@ -399,23 +399,23 @@ function OSACopyScriptingDefinition( const (*var*) ref: FSRef; modeFlags: SInt32
 
 {
  *  OSACopyScriptingDefinitionFromURL()
- *  
+ *
  *  Discussion:
  *    Gets the scripting definition of the specified URL.  See sdef(5)
  *    for details of the sdef format.  If used with a file: URL, this
  *    call is equivalent to OSACopyScriptingDefinition.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    url:
  *      The URL to look in; this should be a file: or eppc: URL.
- *    
+ *
  *    modeFlags:
  *      There are no flags defined at this time; pass 0.
- *    
+ *
  *    sdef:
  *      The resulting sdef as XML data.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.5 and later in Carbon.framework
  *    CarbonLib:        not available
@@ -432,7 +432,7 @@ function OSACopyScriptingDefinitionFromURL( url: CFURLRef; modeFlags: SInt32; va
 {$ifc not TARGET_CPU_64}
 {
  *  ASSetProperty()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework [32-bit only]
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -444,7 +444,7 @@ function ASSetProperty( scriptingComponent: ComponentInstance; contextID: OSAID;
 
 {
  *  ASGetProperty()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework [32-bit only]
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -456,7 +456,7 @@ function ASGetProperty( scriptingComponent: ComponentInstance; contextID: OSAID;
 
 {
  *  ASSetHandler()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework [32-bit only]
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -468,7 +468,7 @@ function ASSetHandler( scriptingComponent: ComponentInstance; contextID: OSAID;
 
 {
  *  ASGetHandler()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework [32-bit only]
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -480,7 +480,7 @@ function ASGetHandler( scriptingComponent: ComponentInstance; contextID: OSAID;
 
 {
  *  ASGetAppTerminology()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in Carbon.framework [32-bit only]
  *    CarbonLib:        in CarbonLib 1.0 and later

+ 6 - 6
packages/univint/src/ASRegistry.pas

@@ -1,17 +1,17 @@
 {
      File:       OpenScripting/ASRegistry.h
- 
+
      Contains:   AppleScript Registry constants.
- 
+
      Version:    OSA-148~28
- 
+
      Copyright:  © 1991-2008 by Apple Computer, Inc., all rights reserved
- 
+
      Bugs?:      For bug reports, consult the following page on
                  the World Wide Web:
- 
+
                      http://bugs.freepascal.org
- 
+
 }
 
 {  Pascal Translation Updated: Gorazd Krosl <[email protected]>, October 2009 }

Plik diff jest za duży
+ 182 - 182
packages/univint/src/ATSFont.pas


+ 26 - 26
packages/univint/src/ATSLayoutTypes.pas

@@ -1,17 +1,17 @@
 {
      File:       ATS/ATSLayoutTypes.h
- 
+
      Contains:   Apple Type Services layout public structures and constants.
- 
+
      Version:    ATS
- 
+
      Copyright:  © 1994-2012 by Apple Inc., all rights reserved.
- 
+
      Bugs?:      For bug reports, consult the following page on
                  the World Wide Web:
- 
+
                      http://bugs.freepascal.org
- 
+
 }
 
 { Pascal Translation Updated: Gorazd Krosl <[email protected]>, October 2009 }
@@ -281,7 +281,7 @@ const
 
 {
  *  ATSULayoutOperationSelector
- *  
+ *
  *  Summary:
  *    This is used to select which operations to override, or which
  *    operation is currently being run.
@@ -330,7 +330,7 @@ const
 
 {
  *  ATSULayoutOperationCallbackStatus
- *  
+ *
  *  Summary:
  *    One of these must be returned by a
  *    ATSUDLayoutOperationOverrideUPP callback function in order to
@@ -357,7 +357,7 @@ const
 
 {
  *  ATSLineLayoutOptions
- *  
+ *
  *  Summary:
  *    ATSLineLayoutOptions are normally set in an ATSUTextLayout object
  *    via the kATSULineLayoutOptionsTag layout control attribute. They
@@ -518,7 +518,7 @@ const
 
 {
  *  ATSStyleRenderingOptions
- *  
+ *
  *  Summary:
  *    ATSStyleRenderingOptions are set in the ATSUStyle object via the
  *    attribute tag kATSUStyleRenderingOptions. They provide finer
@@ -570,7 +570,7 @@ const
 
 {
  *  ATSGlyphInfoFlags
- *  
+ *
  *  Summary:
  *    ATSGlyphInfoFlags are set in the individual ATSLayoutRecord
  *    structures and apply only to the ATSGlyphRef in that structure.
@@ -631,7 +631,7 @@ const
 
 {
  *  ATSLayoutRecord
- *  
+ *
  *  Summary:
  *    The ATSLayoutRecord structure defines all the needed info for a
  *    single glyph during the layout process.  This struct must be
@@ -661,12 +661,12 @@ type
 		realPos: Fixed;
 	end;
 	ATSLayoutRecordPtr = ^ATSLayoutRecord;
-	
+
 { --------------------------------------------------------------------------- }
 
 {
  *  ATSTrapezoid
- *  
+ *
  *  Summary:
  *    The ATSTrapezoid structure supplies a convenient container for
  *    glyph bounds in trapezoidal form.
@@ -679,12 +679,12 @@ type
 		lowerLeft: FixedPoint;
 	end;
 	ATSTrapezoidPtr = ^ATSTrapezoid;
-	
+
 { --------------------------------------------------------------------------- }
 
 {
  *  ATSJustWidthDeltaEntryOverride
- *  
+ *
  *  Summary:
  *    The JustWidthDeltaEntryOverride structure specifies values for
  *    the grow and shrink case during justification, both on the left
@@ -726,15 +726,15 @@ type
 		shrinkFlags: JustificationFlags;
 	end;
 	ATSJustWidthDeltaEntryOverridePtr = ^ATSJustWidthDeltaEntryOverride;
-	
+
 { The JustPriorityOverrides type is an array of 4 width delta records, one per priority level override. }
 	ATSJustPriorityWidthDeltaOverrides = array[0..3] of ATSJustWidthDeltaEntryOverride;
-	
+
 { ---------------------------------------------------------------------------- }
 
 {
  *  ATSULineRef
- *  
+ *
  *  Summary:
  *    A reference to a line that is being laid out. This is passed into
  *    the ATSUDirectLayoutOperationOverrideUPP callback function to be
@@ -751,10 +751,10 @@ type
 
 {
  *  ATSUDirectLayoutOperationOverrideProcPtr
- *  
+ *
  *  Summary:
  *    Callback definition for a low-level adjustment routine hook.
- *  
+ *
  *  Discussion:
  *    This callback can be set in an ATSUTextLayout object by setting
  *    the attribute tag kATSULayoutOperationOverrideTag and passing in
@@ -789,7 +789,7 @@ type
 
 {
  *  NewATSUDirectLayoutOperationOverrideUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.2 and later in ApplicationServices.framework
  *    CarbonLib:        not available in CarbonLib 1.x, is available on Mac OS X version 10.2 and later
@@ -800,7 +800,7 @@ function NewATSUDirectLayoutOperationOverrideUPP( userRoutine: ATSUDirectLayoutO
 
 {
  *  DisposeATSUDirectLayoutOperationOverrideUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.2 and later in ApplicationServices.framework
  *    CarbonLib:        not available in CarbonLib 1.x, is available on Mac OS X version 10.2 and later
@@ -811,7 +811,7 @@ procedure DisposeATSUDirectLayoutOperationOverrideUPP( userUPP: ATSUDirectLayout
 
 {
  *  InvokeATSUDirectLayoutOperationOverrideUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.2 and later in ApplicationServices.framework
  *    CarbonLib:        not available in CarbonLib 1.x, is available on Mac OS X version 10.2 and later
@@ -832,7 +832,7 @@ function InvokeATSUDirectLayoutOperationOverrideUPP( iCurrentOperation: ATSULayo
 
 {
  *  ATSULayoutOperationOverrideSpecifier
- *  
+ *
  *  Summary:
  *    This structure is used to install a callback for one or more
  *    ATSUI operations. To do this, simply passed one of these
@@ -849,7 +849,7 @@ type
 		overrideUPP: ATSUDirectLayoutOperationOverrideUPP;
 	end;
 	ATSULayoutOperationOverrideSpecifierPtr = ^ATSULayoutOperationOverrideSpecifier;
-	
+
 //#pragma pack(pop)
 
 {$endc} {TARGET_OS_MAC}

+ 31 - 31
packages/univint/src/ATSTypes.pas

@@ -1,17 +1,17 @@
 {
      File:       ATS/ATSTypes.h
- 
+
      Contains:   Public interfaces for Apple Type Services components.
- 
+
      Version:    ATS
- 
+
      Copyright:  Copyright 1997-2012 by Apple Inc., all rights reserved.
- 
+
      Bugs?:      For bug reports, consult the following page on
                  the World Wide Web:
- 
+
                      http://bugs.freepascal.org
- 
+
 }
 
 {  Pascal Translation Updated: Gorazd Krosl <[email protected]>, October 2009 }
@@ -244,8 +244,8 @@ type
 
 {$ifc TARGET_CPU_64}
 {
-   ATSFSSpec serves as a temporary place holder for the FSSpec data type which is deprecated for 64-bit. 
-   A 64-bit replacement for FSSpec based APIs will be introduced.  
+   ATSFSSpec serves as a temporary place holder for the FSSpec data type which is deprecated for 64-bit.
+   A 64-bit replacement for FSSpec based APIs will be introduced.
 }
 type
 	ATSFSSpec = record
@@ -257,9 +257,9 @@ type
 type
 	ATSFSSpec = FSSpec;
 {$endc}  { TARGET_CPU_64 }
-	
+
 	ATSFSSpecPtr = ^ATSFSSpec;
-	
+
 { FMGeneration }
 
 	FMGeneration = UInt32;
@@ -273,14 +273,14 @@ type
 
 	FMFontFamily = SInt16;
 	FMFontFamilyPtr = ^FMFontFamily;
-	
+
 	FMFontStyle = SInt16;
 	FMFontStylePtr = ^FMFontStyle;
-	
+
 	FMFontSize = SInt16;
 	FMFontSizePtr = ^FMFontSize;
-	
-{ 
+
+{
    The font family is a collection of fonts, each of which is identified
    by an FMFont reference that maps to a single object registered with
    the font database. The font references associated with the font
@@ -290,7 +290,7 @@ type
 
 	FMFont = UInt32;
 	FMFontPtr = ^FMFont;
-	
+
 	FMFontFamilyInstancePtr = ^FMFontFamilyInstance;
 	FMFontFamilyInstance = record
 		fontFamily: FMFontFamily;
@@ -307,13 +307,13 @@ type
 		reserved: array[0..15] of UInt32;
 	end;
 	FMFontIteratorPtr = ^FMFontIterator;
-	
+
 
 	FMFontFamilyInstanceIterator = record
 		reserved: array[0..15] of UInt32;
 	end;
 	FMFontFamilyInstanceIteratorPtr = ^FMFontFamilyInstanceIterator;
-	
+
 const
 	kInvalidGeneration = 0;
 	kInvalidFontFamily = -1;
@@ -345,7 +345,7 @@ type
 
 {
  *  NewFMFontFamilyCallbackFilterUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -356,7 +356,7 @@ function NewFMFontFamilyCallbackFilterUPP( userRoutine: FMFontFamilyCallbackFilt
 
 {
  *  NewFMFontCallbackFilterUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -367,7 +367,7 @@ function NewFMFontCallbackFilterUPP( userRoutine: FMFontCallbackFilterProcPtr ):
 
 {
  *  DisposeFMFontFamilyCallbackFilterUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -378,7 +378,7 @@ procedure DisposeFMFontFamilyCallbackFilterUPP( userUPP: FMFontFamilyCallbackFil
 
 {
  *  DisposeFMFontCallbackFilterUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -389,7 +389,7 @@ procedure DisposeFMFontCallbackFilterUPP( userUPP: FMFontCallbackFilterUPP ); ex
 
 {
  *  InvokeFMFontFamilyCallbackFilterUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -400,7 +400,7 @@ function InvokeFMFontFamilyCallbackFilterUPP( iFontFamily: FMFontFamily; iRefCon
 
 {
  *  InvokeFMFontCallbackFilterUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -424,7 +424,7 @@ type
 		reserved: array[0..1] of UInt32;
 	end;
 	FMFontDirectoryFilterPtr = ^FMFontDirectoryFilter;
-	
+
 {
    Note: The fontContainerFilter member is not available in 64-bit. Use fontFileRefFilter
    and the kFMFontFileRefFilterSelector enum instead.
@@ -440,27 +440,27 @@ type
 			5:	(fontDirectoryFilter: FMFontDirectoryFilter);
 			6:	(fontFileRefFilter: { const } FSRefPtr);
 	end;
-	
+
 	FMFilter = record
 		format: UInt32;
 		selector: FMFilterSelector;
 		filter : FMFilterfilter;
 	end;
 	FMFilterPtr = ^FMFilter;
-	
+
 	ATSOptionFlags = OptionBits;
 	ATSGeneration = UInt32;
 	ATSFontContainerRef = UInt32;
-	
+
 	ATSFontFamilyRef = UInt32;
 	ATSFontFamilyRefPtr = ^ATSFontFamilyRef;
-	
+
 	ATSFontRef = UInt32;
 	ATSFontRefPtr = ^ATSFontRef;
 
 	ATSGlyphRef = UInt16;
 	ATSGlyphRefPtr = ^ATSGlyphRef;
-	
+
 	ATSFontSize = CGFloat;
 	ATSFontFormat = UInt32;
 const
@@ -497,7 +497,7 @@ type
 		underlineThickness: CGFloat;     { Stroke width for underlining }
 	end;
 	ATSFontMetricsPtr = ^ATSFontMetrics;
-	
+
 const
 	kATSItalicQDSkew = (1 shl 16) / 4; { fixed value of 0.25 }
 	kATSBoldQDStretch = (1 shl 16) * 3 / 2; { fixed value of 1.50 }
@@ -511,7 +511,7 @@ const
 	kATSQuadCurveType = $0002;
 	kATSOtherCurveType = $0003;
 
-{ 
+{
     This is what the ATSGlyphRef is set to when the glyph is deleted -
     that is, when the glyph is set to no longer appear when the layout
     is actually drawn

+ 50 - 50
packages/univint/src/ATSUnicodeDirectAccess.pas

@@ -1,17 +1,17 @@
 {
      File:       QD/ATSUnicodeDirectAccess.h
- 
+
      Contains:   Public Interfaces/Types for Low Level ATSUI
- 
+
      Version:    Quickdraw-285~150
- 
+
      Copyright:  © 2002-2008 by Apple Inc. all rights reserved.
- 
+
      Bugs?:      For bug reports, consult the following page on
                  the World Wide Web:
- 
+
                      http://bugs.freepascal.org
- 
+
 }
 {  Pascal Translation:  Peter N Lewis, <[email protected]>, 2004 }
 {  Pascal Translation Updated:  Jonas Maebe, <[email protected]>, October 2009 }
@@ -237,7 +237,7 @@ uses MacTypes,ATSLayoutTypes,ATSUnicodeTypes,TextCommon;
 
 {
  *  ATSUDirectDataSelector
- *  
+ *
  *  Summary:
  *    These are the data selectors used in the
  *    ATSUDirectGetLayoutDataArrayPtr function to get the needed layout
@@ -342,7 +342,7 @@ const
 
 {
  *  ATSUStyleSettingRef
- *  
+ *
  *  Summary:
  *    A reference to a style setting object that represents an
  *    ATSUStyle plus any cached/set information about that style.
@@ -355,14 +355,14 @@ type
 { ---------------------------------------------------------------------------- }
 {
  *  ATSUDirectGetLayoutDataArrayPtrFromLineRef()   *** DEPRECATED ***
- *  
+ *
  *  Deprecated:
  *    Use CTRunGetGlyphsPtr or CTRunGetPositionsPtr instead.
- *  
+ *
  *  Summary:
  *    Returns the data pointer specified by iDataSelector and
  *    referenced by iLineRef.
- *  
+ *
  *  Discussion:
  *    This function simply returns the data pointer specified by
  *    iDataSelector and referenced by iLineRef. This data pointer
@@ -389,17 +389,17 @@ type
  *    pointer returned by this function is only valid within the
  *    context of the callback. Do not attempt to retain it for later
  *    use.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    iLineRef:
  *      The ATSULineRef which was passed into a
  *      ATSUDirectLayoutOperationOverrideUPP callback function as a
  *      parameter.
- *    
+ *
  *    iDataSelector:
  *      The selector for the data that is being requested.
- *    
+ *
  *    iCreate:
  *      If the ATSULineRef passed in iLineRef does not reference the
  *      requested array, then a zero-filled one will be created and
@@ -407,19 +407,19 @@ type
  *      ATSUDirectDataSelectors, these cannot be simply created. Thus,
  *      this flag will have no affect on these few
  *      ATSUDirectDataSelectors.
- *    
+ *
  *    oLayoutDataArrayPtr:
- *      Upon sucessful return, this parameter will contain a pointer to
+ *      Upon successful return, this parameter will contain a pointer to
  *      an array of the requested values if the ATSULineRef passed in
  *      iLineRef references those values. If this is not the case, then
  *      NULL will be returned, unless iCreate is set to true and the
  *      array can be created. This parameter itself may be set to NULL
  *      if only a count of the entries is needed.
- *    
+ *
  *    oLayoutDataCount:
- *      Upon sucessful return, this parameter will contain a count of
+ *      Upon successful return, this parameter will contain a count of
  *      the entries in the array returned in oLayoutDataArray.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.2 and later in ApplicationServices.framework but deprecated in 10.6
  *    CarbonLib:        not available in CarbonLib 1.x, is available on Mac OS X version 10.2 and later
@@ -433,14 +433,14 @@ function ATSUDirectGetLayoutDataArrayPtrFromLineRef( iLineRef: ATSULineRef; iDat
 {$ifc not TARGET_CPU_64}
 {
  *  ATSUDirectGetLayoutDataArrayPtrFromTextLayout()   *** DEPRECATED ***
- *  
+ *
  *  Deprecated:
  *    Use CTRunGetGlyphs or CTRunGetPositions instead.
- *  
+ *
  *  Summary:
  *    Returns the data pointer specified by iDataSelector and
  *    referenced by iTextLayout for the line starting at iLineOffset.
- *  
+ *
  *  Discussion:
  *    This function simply returns the data pointer specified by
  *    iDataSelector and referenced by iTextLayout for the line starting
@@ -461,7 +461,7 @@ function ATSUDirectGetLayoutDataArrayPtrFromLineRef( iLineRef: ATSULineRef; iDat
  *    return in order-n time. Second of all, this means that the
  *    developer cannot change any of the data. Any changes the
  *    developer makes to the arrays returned by this API will have no
- *    effect on the layout. Using the 
+ *    effect on the layout. Using the
  *    kATSULayoutOperationPostLayoutAdjustment operation selector
  *    override and the ATSUDirectGetLayoutDataArrayPtrFromLineRef is a
  *    great alternative to using this API. Many of the requested arrays
@@ -470,35 +470,35 @@ function ATSUDirectGetLayoutDataArrayPtrFromLineRef( iLineRef: ATSULineRef; iDat
  *    In this case, if there's no error returned, the array simply
  *    doesn't exist and the caller should treat all of the entries in
  *    the array that they would have recieved as being 0.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    iTextLayout:
  *      The ATSUTextLayout object from which the requested data will
  *      come from.
- *    
+ *
  *    iLineOffset:
  *      The edge offset that corresponds to the beginning of the range
  *      of text of the line of the requested data. If the text has
  *      multiple lines, then ATSUDirectGetLayoutDataArrayPtrFromLineRef
  *      will need to be called for each of the lines in which the
  *      requested data is needed.
- *    
+ *
  *    iDataSelector:
  *      The selector for the data that is being requested.
- *    
+ *
  *    oLayoutDataArrayPtr:
- *      Upon sucessful return, this parameter will contain a pointer to
+ *      Upon successful return, this parameter will contain a pointer to
  *      an array of the requested values if the ATSUTextLayout passed
  *      in iTextLayout references those values for the line offset
  *      iLineOffset. If this is not the case, then NULL will be
  *      returned. This parameter itself may be set to NULL if only a
  *      count of the entries is needed.
- *    
+ *
  *    oLayoutDataCount:
- *      Upon sucessful return, this parameter will contain a count of
+ *      Upon successful return, this parameter will contain a count of
  *      the entries in the array returned in oLayoutDataArray.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.2 and later in ApplicationServices.framework [32-bit only] but deprecated in 10.6
  *    CarbonLib:        not available in CarbonLib 1.x, is available on Mac OS X version 10.2 and later
@@ -513,15 +513,15 @@ function ATSUDirectGetLayoutDataArrayPtrFromTextLayout( iTextLayout: ATSUTextLay
 
 {
  *  ATSUDirectReleaseLayoutDataArrayPtr()   *** DEPRECATED ***
- *  
+ *
  *  Deprecated:
  *    Use CoreText API instead.
- *  
+ *
  *  Summary:
  *    Properly releases of an array pointer returned by
  *    ATSUDirectGetLayoutDataArrayPtrFromLineRef() or
  *    ATSUDirectGetLayoutDataArrayPtrFromTextLayout.
- *  
+ *
  *  Discussion:
  *    This function is needed to let ATSUI know that the caller is
  *    finished with the pointer that was previously requested by
@@ -529,20 +529,20 @@ function ATSUDirectGetLayoutDataArrayPtrFromTextLayout( iTextLayout: ATSUTextLay
  *    ATSUDirectGetLayoutDataArrayPtrFromTextLayout(). This is needed
  *    in case ATSUI needs to make any internal adjustments to it's
  *    internal structures.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    iLineRef:
  *      The lineRef from which the layout data array pointer came from.
  *      If the layout data array pointer did not come from a lineRef,
  *      then set this to NULL.
- *    
+ *
  *    iDataSelector:
  *      The selector for which iLayoutDataArrayPtr was obtained.
- *    
+ *
  *    iLayoutDataArrayPtr:
  *      A pointer to the layout data array which is to be disposed of.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.2 and later in ApplicationServices.framework but deprecated in 10.6
  *    CarbonLib:        not available in CarbonLib 1.x, is available on Mac OS X version 10.2 and later
@@ -556,14 +556,14 @@ function ATSUDirectReleaseLayoutDataArrayPtr( iLineRef: ATSULineRef { can be NUL
 {$ifc not TARGET_CPU_64}
 {
  *  ATSUDirectAddStyleSettingRef()   *** DEPRECATED ***
- *  
+ *
  *  Deprecated:
  *    Use CTRunGetGlyphsPtr or CTRunGetGlyphs instead.
- *  
+ *
  *  Summary:
  *    This function will fetch a style index for the
  *    ATSUStyleSettingRef passed in.
- *  
+ *
  *  Discussion:
  *    This function allows for glyph replacement or substitution from
  *    one layout or line to another layout or line. Not only will it
@@ -575,26 +575,26 @@ function ATSUDirectReleaseLayoutDataArrayPtr( iLineRef: ATSULineRef { can be NUL
  *    pointer obtained for this may no longer be valid after this
  *    function has been called. These pointers should be freed before
  *    calling this function and re-obtained afterwards.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    iLineRef:
  *      An ATSULineRef which was passed into a
  *      ATSUDirectLayoutOperationOverrideUPP callback function as a
  *      parameter.
- *    
+ *
  *    iStyleSettingRef:
  *      The ATSUStyleSettingRef to be looked up or added to the
  *      ATSUTextLayout referenced by iTextLayout for the line starting
  *      at the offset iLineOffset.
- *    
+ *
  *    oStyleIndex:
- *      Upon sucessful return, this will parameter will be set to the
+ *      Upon successful return, this will parameter will be set to the
  *      index of the ATSUStyleSettingRef passed in iStyleSettingRef for
  *      the line referenced by iLineRef. If the ATSUStyleSettingRef
  *      does not exist, in that context, then it will be added and the
  *      new index will be returned here.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.2 and later in ApplicationServices.framework [32-bit only] but deprecated in 10.6
  *    CarbonLib:        not available in CarbonLib 1.x, is available on Mac OS X version 10.2 and later

Plik diff jest za duży
+ 164 - 164
packages/univint/src/ATSUnicodeDrawing.pas


+ 61 - 61
packages/univint/src/ATSUnicodeFlattening.pas

@@ -1,17 +1,17 @@
 {
      File:       QD/ATSUnicodeFlattening.h
- 
+
      Contains:   Public interfaces for Apple Type Services for Unicode Imaging
- 
+
      Version:    Quickdraw-285~150
- 
+
      Copyright:  © 2002-2008 by Apple Inc. all rights reserved.
- 
+
      Bugs?:      For bug reports, consult the following page on
                  the World Wide Web:
- 
+
                      http://bugs.freepascal.org
- 
+
 }
 {  Pascal Translation:  Peter N Lewis, <[email protected]>, 2004 }
 {  Pascal Translation Updated:  Jonas Maebe, <[email protected]>, October 2009 }
@@ -247,7 +247,7 @@ const
 
 {
    ATSUFlattenStyleRunOptions is a bitfield list of options that can be passed
-   into the ATSUFlattenStyleRunsToStream API. Currently, there are no options. 
+   into the ATSUFlattenStyleRunsToStream API. Currently, there are no options.
    This is here for future expansion.
 }
 type
@@ -257,7 +257,7 @@ const
 
 {
    ATSUUnFlattenStyleRunOptions is a bitfield list of options that can be passed
-   into the ATSUUnFlattenStyleRunsToStream API. Currently, there are no options. 
+   into the ATSUUnFlattenStyleRunsToStream API. Currently, there are no options.
    This is here for future expansion.
 }
 type
@@ -271,10 +271,10 @@ const
 { ---------------------------------------------------------------------------- }
 
 {
-   ATSUStyleRunInfo is a structure that contains an index into an array of 
-   unique ATSUStyle objects as well as the length of the run that the style run 
-   object covers. This structure is utilized by ATSUUnflattenStyleRunsFromStream() 
-   to return the style run info to the caller. 
+   ATSUStyleRunInfo is a structure that contains an index into an array of
+   unique ATSUStyle objects as well as the length of the run that the style run
+   object covers. This structure is utilized by ATSUUnflattenStyleRunsFromStream()
+   to return the style run info to the caller.
 }
 type
 	ATSUStyleRunInfo = record
@@ -291,7 +291,7 @@ type
    2. Flattened Text Layout Data
    3. Flattened Style Run Data
    4. Flattened Style Data
-   Per the 'ustl' spec, these structures should maintain four-byte alignment. 
+   Per the 'ustl' spec, these structures should maintain four-byte alignment.
    For things that are variable width (such as font names), padding bytes must
    be added to ensure that this alignment is always kept.
 }
@@ -435,7 +435,7 @@ type
 	ATSFlatDataLineInfoDataPtr = ^ATSFlatDataLineInfoData;
 {
    This structure is the main data header for the flattened line info data. This
-   is what a non-zero offsetToLineInfo points to in the 
+   is what a non-zero offsetToLineInfo points to in the
    ATSFlatDataTextLayoutDataHeader structure above.
 }
 type
@@ -484,12 +484,12 @@ type
 {
    The block 4 structures store flattened ATSUStyle objects. This too, is
    currently used by the ATSUI style run flattening and parsing functions,
-   ATSUFlattenStyleRunsToStream and ATSUUnflattenStyleRunsFromStream. 
+   ATSUFlattenStyleRunsToStream and ATSUUnflattenStyleRunsFromStream.
 }
 
 {
    this structure forms the beginning of an individually flattened ATSUStyle
-   object. 
+   object.
 }
 type
 	ATSFlatDataStyleListStyleDataHeader = record
@@ -567,8 +567,8 @@ type
 	end;
 	ATSFlatDataStyleListFeatureDataPtr = ^ATSFlatDataStyleListFeatureData;
 {
-   this structure stores the flattened font variation data. An array of these 
-   comes after the array of ATSFlatDataStyleListFeatureData structures (if any) 
+   this structure stores the flattened font variation data. An array of these
+   comes after the array of ATSFlatDataStyleListFeatureData structures (if any)
    if the numberOfSetVariations is non-zero. There must be one of these
    structures for each numberOfSetFeatures.
 }
@@ -585,10 +585,10 @@ type
 { Flattened Font Data Info }
 { ------------------------ }
 {
-   This is somewhat of an addendum to the 'ustl' structure above. These flattened 
-   data structures are stored in block 4 as a font attribute with the attribute 
+   This is somewhat of an addendum to the 'ustl' structure above. These flattened
+   data structures are stored in block 4 as a font attribute with the attribute
    tag of kATSUFontTag. They can store font data in a few different ways, such as
-   by a FontSync reference or by simple raw font name data. Just as with the 
+   by a FontSync reference or by simple raw font name data. Just as with the
    'ustl' above, this structure must maintain four byte alignment.
 }
 
@@ -604,7 +604,7 @@ const
 {
    this is the main header for the font data. It dictates what type of data
    is stored. The actual data stored must match the type specified by the
-   nameSpecType. 
+   nameSpecType.
 }
 type
 	ATSFlatDataFontNameDataHeader = record
@@ -664,13 +664,13 @@ type
 {
    this is a header structure that defines some things constant throughout
    the entire search for the font name, as well as the array of
-   ATSFlatDataFontNameData structures. In order to gaurantee that the same font 
+   ATSFlatDataFontNameData structures. In order to gaurantee that the same font
    will be used, more than one name specifer should be stored. The standard ATSUI
    style run flattening and parsing functions, ATSUFlattenStyleRunsToStream and
    ATSUUnflattenStyleRunsFromStream. These will store both the font's full name
    (kFontFullName) as well as the font's manufacturer name (kFontManufacturerName)
    and match fonts based on both of
-   these. 
+   these.
 }
 type
 	ATSFlatDataFontSpecRawNameDataHeader = record
@@ -691,14 +691,14 @@ type
 {$ifc not TARGET_CPU_64}
 {
  *  ATSUFlattenStyleRunsToStream()   *** DEPRECATED ***
- *  
+ *
  *  Deprecated:
  *    Use CoreFoundation flattening API instead.
- *  
+ *
  *  Summary:
  *    Converts a series of ATSUStyle objects and associated run info to
  *    a flat binary representation.
- *  
+ *
  *  Discussion:
  *    This function takes an array of ATSUStyle objects and style run
  *    information and flattens the data to the specified format. The
@@ -717,26 +717,26 @@ type
  *    buffer. (2) Allocate an appropriately-sized buffer for the
  *    oStreamBuffer parameter and then call the function
  *    ATSUFlattenStyleRunsToStream a second time.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    iStreamFormat:
  *      The format of the flattened data. There is only one format
  *      supported at this time ('ustl'), so you must pass the constant
  *      kATSUDataStreamUnicodeStyledText.
- *    
+ *
  *    iFlattenOptions:
  *      The options you want to use to flatten the data. There are no
  *      options supported at this time, so you must pass the constant
  *      kATSUFlattenOptionNoOptionsMask.
- *    
+ *
  *    iNumberOfRunInfo:
  *      The number of style run information structures passed in the
  *      iRunInfoArray parameter. If you pass 0, ATSUI assumes there is
  *      only one style for the entire text block passed in the
  *      oStreamBuffer parameter. The flattened data format passed to
  *      the iStreamFormat parameter must support the use of one style.
- *    
+ *
  *    iRunInfoArray:
  *      An array of ATSUStyleRunInfo structures that describes the
  *      style runs to be flattened. This array must contain
@@ -746,22 +746,22 @@ type
  *      index in the ATSUStyleRunInfo structure must reference a valid
  *      ATSUStyle object passed in the iStyleArray parameter. You can
  *      pass NULL, only if iNumberOfRunInfo is set to zero.
- *    
+ *
  *    iNumberOfStyleObjects:
  *      The number of ATSUStyle objects in the array passed to the
  *      iStyleArray parameter. You must pass a value that is greater
  *      than 0.
- *    
+ *
  *    iStyleArray:
  *      An array of ATSUStyle objects to be flattened. You cannot pass
  *      NULL.
- *    
+ *
  *    iStreamBufferSize:
  *      The size of the stream buffer, pointed to by the oStreamBuffer
  *      parameter. You can pass 0only if the iStreamBufferSize
  *      parameter is set to NULL. If you are uncertain of the size of
  *      the array, see the Discussion.
- *    
+ *
  *    oStreamBuffer:
  *      On input, a pointer to the data you want to flatten. On return,
  *      points to the flattened data. If you pass NULL for this
@@ -770,16 +770,16 @@ type
  *      parameter. See the Discussion for more details. You are
  *      responsible for allocating the text buffer passed in the
  *      oStreamBuffer parameter.
- *    
+ *
  *    oActualStreamBufferSize:
  *      On return, the size of the data written to the oStreamBuffer
  *      parameter. You can pass NULL only if the oStreamBuffer
  *      parameter is not NULL.
- *  
+ *
  *  Result:
  *    On success, noErr is returned. See MacErrors.h for possible error
  *    codes.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.2 and later in ApplicationServices.framework [32-bit only] but deprecated in 10.6
  *    CarbonLib:        not available in CarbonLib 1.x, is available on Mac OS X version 10.2 and later
@@ -791,14 +791,14 @@ function ATSUFlattenStyleRunsToStream( iStreamFormat: ATSUFlattenedDataStreamFor
 
 {
  *  ATSUUnflattenStyleRunsFromStream()   *** DEPRECATED ***
- *  
+ *
  *  Deprecated:
  *    Use CoreFoundation flattening API instead.
- *  
+ *
  *  Summary:
  *    Creates a series of ATSUStyle objects and associated run
  *    information from a flat binary representation.
- *  
+ *
  *  Discussion:
  *    This function extracts the ATSUI style run information from
  *    previously-flattened data. The style objects and style run
@@ -824,39 +824,39 @@ function ATSUFlattenStyleRunsToStream( iStreamFormat: ATSUFlattenedDataStreamFor
  *    the newly allocated arrays in the oRunInfoArray and oStyleArray
  *    parameters, with the iNumberOfRunInfo and iNumberOfStyleObjects
  *    parameters set to the values you obtained from the first call.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    iStreamFormat:
  *      The format of the flattened data. There is only one format
  *      supported at this time ('ustl'), so you must pass the constant
  *      kATSUDataStreamUnicodeStyledText.
- *    
+ *
  *    iUnflattenOptions:
  *      The options you want to use to unflatten the data. There are no
  *      options supported at this time, so you must pass the constant
  *      kATSUUnflattenOptionNoOptionsMask.
- *    
+ *
  *    iStreamBufferSize:
  *      The size of the buffer pointed to by the iStreamBuffer
  *      parameter. You must pass a value greater than 0.
- *    
+ *
  *    iStreamBuffer:
  *      A pointer to the buffer that contains the flattened data. The
  *      data must be of the format specified by the iStreamFormat
  *      parameter and must be of size specified by the
  *      iStreamBufferSize parameter. You cannot pass NULL .
- *    
+ *
  *    iNumberOfRunInfo:
  *      The number of style run information structures passed in the
  *      oRunInfoArray parameter. If you are uncertain of the number of
  *      style run information structures, see the Discussion.
- *    
+ *
  *    iNumberOfStyleObjects:
  *      The number of ATSUStyle objects in the array passed into the
  *      iStyleArray parameter. If you are uncertain of the number of
  *      ATSUStyle objects, see the Discussion.
- *    
+ *
  *    oRunInfoArray:
  *      On return, points to an array of style run information
  *      structures. Each structure contains a style run length and
@@ -864,7 +864,7 @@ function ATSUFlattenStyleRunsToStream( iStreamFormat: ATSUFlattenedDataStreamFor
  *      much memory to allocate for this array, see the Discussion. You
  *      are responsible for disposing of the array when you no longer
  *      need it.
- *    
+ *
  *    oStyleArray:
  *      On return, a pointer to an array of the unique ATSUStyle
  *      objects obtained from the flattened data. The indices returned
@@ -873,24 +873,24 @@ function ATSUFlattenStyleRunsToStream( iStreamFormat: ATSUFlattenedDataStreamFor
  *      see the Discussion. You are responsible for disposing of the
  *      array and the ATSUI style objects in the array when you no
  *      longer need the array.
- *    
+ *
  *    oActualNumberOfRunInfo:
  *      On return, points to the actual number of ATSUStyleRunInfo
  *      structures obtained from the flattened data. The actual number
  *      of structures is the number of entries added to the array
  *      oRunInfoArray. You can pass NULL if you to not want to obtain
  *      this value.
- *    
+ *
  *    oActualNumberOfStyleObjects:
  *      On return, points to the actual number of unique ATSUStyle
  *      objects obtained from the flattened data. The actual number is
  *      the number of entries added to the oStyleArray array. You can
  *      pass NULL if you do no want to obtain this value.
- *  
+ *
  *  Result:
  *    On success, noErr is returned. See MacErrors.h for possible error
  *    codes.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.2 and later in ApplicationServices.framework [32-bit only] but deprecated in 10.6
  *    CarbonLib:        not available in CarbonLib 1.x, is available on Mac OS X version 10.2 and later
@@ -904,14 +904,14 @@ function ATSUUnflattenStyleRunsFromStream( iStreamFormat: ATSUFlattenedDataStrea
 
 {
  *  ATSUCopyToHandle()   *** DEPRECATED ***
- *  
+ *
  *  Deprecated:
  *    Use CoreFoundation flattening API instead.
- *  
+ *
  *  Discussion:
  *    This function is no longer recommended. Please use
  *    ATSUFlattenStyleRunsToStream instead.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework [32-bit only] but deprecated in 10.1
  *    CarbonLib:        in CarbonLib 1.0 and later
@@ -923,14 +923,14 @@ function ATSUCopyToHandle( iStyle: ATSUStyle; oStyleHandle: Handle ): OSStatus;
 
 {
  *  ATSUPasteFromHandle()   *** DEPRECATED ***
- *  
+ *
  *  Deprecated:
  *    Use CoreFoundation flattening API instead.
- *  
+ *
  *  Discussion:
  *    This function is no longer recommended. Please use
  *    ATSUUnflattenStyleRunsFromStream instead.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework [32-bit only] but deprecated in 10.1
  *    CarbonLib:        in CarbonLib 1.0 and later

Plik diff jest za duży
+ 171 - 171
packages/univint/src/ATSUnicodeFonts.pas


+ 151 - 151
packages/univint/src/ATSUnicodeGlyphs.pas

@@ -1,17 +1,17 @@
 {
      File:       QD/ATSUnicodeGlyphs.h
- 
+
      Contains:   ATSUI glyph handling functions.
- 
+
      Version:    Quickdraw-285~150
- 
+
      Copyright:  © 2003-2008 by Apple Inc. all rights reserved.
- 
+
      Bugs?:      For bug reports, consult the following page on
                  the World Wide Web:
- 
+
                      http://bugs.freepascal.org
- 
+
 }
 {  Pascal Translation:  Peter N Lewis, <[email protected]>, 2004 }
 {  Pascal Translation Updated:  Jonas Maebe, <[email protected]>, October 2009 }
@@ -238,17 +238,17 @@ uses MacTypes,ATSUnicodeTypes,TextCommon,ATSTypes;
 {$ifc not TARGET_CPU_64}
 {
  *  ATSUGlyphGetIdealMetrics()   *** DEPRECATED ***
- *  
+ *
  *  Deprecated:
  *    Use CTFontGetGlyphWithName,
  *    CTFontGetVerticalTranslationsForGlyphs,
  *    CTFontGetBoundingRectsForGlyphs, or CTFontGetAdvancesForGlyphs
  *    instead.
- *  
+ *
  *  Summary:
  *    Obtains resolution-independent font metric information for glyphs
  *    associated with a given style object.
- *  
+ *
  *  Discussion:
  *    The advance width is the full horizontal width of the glyph as
  *    measured from its origin to the origin of the next glyph on the
@@ -265,37 +265,37 @@ uses MacTypes,ATSUnicodeTypes,TextCommon,ATSTypes;
  *    glyph metrics. To obtain device-adjusted (that is,
  *    resolution-dependent) glyph metrics, call the function
  *    ATSUGlyphGetScreenMetrics.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    iATSUStyle:
  *      A style referring to a font you wish to obtain glyph metrics
  *      from.
- *    
+ *
  *    iNumOfGlyphs:
  *      The number of glyph IDs you are passing in to be examined. This
  *      value should be equal to the size of the array you are passing
  *      in for the iGlyphIDs parameter.
- *    
+ *
  *    iGlyphIDs:
  *      An array of glyph IDs referring to glyphs for which you wish to
  *      obtain metrics.
- *    
+ *
  *    iInputOffset:
  *      A ByteOffset value specifying the offset in bytes between glyph
  *      IDs in the iGlyphIDs array.
- *    
+ *
  *    oIdealMetrics:
  *      A pointer to memory you have allocated for an array of
  *      ATSGlyphIdealMetrics structures. On return, each structure
  *      contains advance and side-bearing values for a glyph. See
  *      ATSTypes.h for more information regarding the
  *      ATSGlyphIdealMetrics structure.
- *  
+ *
  *  Result:
  *    On success, noErr is returned. See MacErrors.h for possible error
  *    codes.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework [32-bit only] but deprecated in 10.6
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -307,16 +307,16 @@ function ATSUGlyphGetIdealMetrics( iATSUStyle: ATSUStyle; iNumOfGlyphs: ItemCoun
 
 {
  *  ATSUGlyphGetScreenMetrics()   *** DEPRECATED ***
- *  
+ *
  *  Deprecated:
  *    Use CTFontGetBoundingBox, CTFontGetUnderlinePosition,
  *    CTFontGetUnderlineThickness, CTFontGetSlantAngle,
- *    CTFontGetCapHeight, or CTFontGetXHeight iinstead.
- *  
+ *    CTFontGetCapHeight, or CTFontGetXHeight instead.
+ *
  *  Summary:
  *    Obtains device-adjusted font metric information for glyphs
  *    associated with a given style object.
- *  
+ *
  *  Discussion:
  *    You can call the ATSUGlyphGetScreenMetrics function to obtain an
  *    array of ATSGlyphScreenMetrics structures containing values for
@@ -325,45 +325,45 @@ function ATSUGlyphGetIdealMetrics( iATSUStyle: ATSUStyle; iNumOfGlyphs: ItemCoun
  *    obtain device-adjusted (that is, resolution-dependent) glyph
  *    metrics. To obtain resolution-independent glyph metrics, call the
  *    function ATSUGlyphGetIdealMetrics.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    iATSUStyle:
  *      A style referring to a font you wish to obtain glyph metrics
  *      from.
- *    
+ *
  *    iNumOfGlyphs:
  *      The number of glyph IDs you are passing in to be examined. This
  *      value should be equal to the size of the array you are passing
  *      in for the iGlyphIDs parameter.
- *    
+ *
  *    iGlyphIDs:
  *      An array of glyph IDs referring to glyphs for which you wish to
  *      obtain metrics.
- *    
+ *
  *    iInputOffset:
  *      A ByteOffset value specifying the offset in bytes between glyph
  *      IDs in the iGlyphIDs array.
- *    
+ *
  *    iForcingAntiAlias:
  *      A Boolean value indicating whether anti-aliasing is forced for
  *      the style object.
- *    
+ *
  *    iAntiAliasSwitch:
  *      A Boolean value indicating whether anti-aliasing is currently
  *      on or off.
- *    
+ *
  *    oScreenMetrics:
  *      A pointer to memory you have allocated for an array of
  *      ATSGlyphScreenMetrics structures. On return, each structure
  *      contains advance and side-bearing values for a glyph. See
  *      ATSTypes.h for more information regarding the
  *      ATSGlyphScreenMetrics structure.
- *  
+ *
  *  Result:
  *    On success, noErr is returned. See MacErrors.h for possible error
  *    codes.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework [32-bit only] but deprecated in 10.6
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -378,13 +378,13 @@ function ATSUGlyphGetScreenMetrics( iATSUStyle: ATSUStyle; iNumOfGlyphs: ItemCou
 { ---------------------------------------------------------------------------- }
 {
  *  ATSUGetNativeCurveType()   *** DEPRECATED ***
- *  
+ *
  *  Deprecated:
  *    Use CTFontCreatePathForGlyph instead.
- *  
+ *
  *  Summary:
  *    Returns the native curve format for a specific font.
- *  
+ *
  *  Discussion:
  *    Use this function to decide whether to call
  *    ATSUGlyphGetQuadraticPaths or ATSUGlyphGetCubicPaths. Both
@@ -393,23 +393,23 @@ function ATSUGlyphGetScreenMetrics( iATSUStyle: ATSUStyle; iNumOfGlyphs: ItemCou
  *    font, the curves you get back will be mathematically converted,
  *    rather than native font data. See the definition of ATSCurveType
  *    in ATSTypes.h for possible return values from this function.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    iATSUStyle:
  *      A style referencing a font for which you wish to obtain the
  *      native curve type.
- *    
+ *
  *    oCurveType:
  *      On return, a value indicating the native curve type of the font
  *      referenced by iATSUStyle. See the definition of ATSCurveType in
  *      ATSTypes.h for a list of possible return values for this
  *      parameter.
- *  
+ *
  *  Result:
  *    On success, noErr is returned. See MacErrors.h for possible error
  *    codes.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework [32-bit only] but deprecated in 10.6
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -424,19 +424,19 @@ function ATSUGetNativeCurveType( iATSUStyle: ATSUStyle; var oCurveType: ATSCurve
 
 {
  *  ATSQuadraticNewPathProcPtr
- *  
+ *
  *  Discussion:
  *    A pointer to a client supplied callback function for handling
  *    glyph curve drawing operations. This callback handles operations
  *    to start a new drawing path.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    callBackDataPtr:
  *      A pointer to any application specific data that may have been
  *      passed to the callbacks through the iCallbackDataPtr parameter
  *      of the ATSUGlyphGetQuadraticPaths function.
- *  
+ *
  *  Result:
  *    Return status. Pass any errors you wish to propagate back to the
  *    original caller of ATSUGlyphGetQuadraticPaths through this return
@@ -448,7 +448,7 @@ type
 	ATSQuadraticNewPathUPP = ATSQuadraticNewPathProcPtr;
 {
  *  NewATSQuadraticNewPathUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -459,7 +459,7 @@ function NewATSQuadraticNewPathUPP( userRoutine: ATSQuadraticNewPathProcPtr ): A
 
 {
  *  DisposeATSQuadraticNewPathUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -470,7 +470,7 @@ procedure DisposeATSQuadraticNewPathUPP( userUPP: ATSQuadraticNewPathUPP ); exte
 
 {
  *  InvokeATSQuadraticNewPathUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -481,25 +481,25 @@ function InvokeATSQuadraticNewPathUPP( callBackDataPtr: UnivPtr; userUPP: ATSQua
 
 {
  *  ATSQuadraticLineProcPtr
- *  
+ *
  *  Discussion:
  *    A pointer to a client supplied callback function for handling
  *    glyph curve drawing operations. This callback handles operations
  *    to draw straight lines.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    pt1:
  *      The starting point of the line.
- *    
+ *
  *    pt2:
  *      The end point of the line.
- *    
+ *
  *    callBackDataPtr:
  *      A pointer to any application specific data that may have been
  *      passed to the callbacks through the iCallbackDataPtr parameter
  *      of the ATSUGlyphGetQuadraticPaths function.
- *  
+ *
  *  Result:
  *    Return status. Pass any errors you wish to propagate back to the
  *    original caller of ATSUGlyphGetQuadraticPaths through this return
@@ -511,7 +511,7 @@ type
 	ATSQuadraticLineUPP = ATSQuadraticLineProcPtr;
 {
  *  NewATSQuadraticLineUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -522,7 +522,7 @@ function NewATSQuadraticLineUPP( userRoutine: ATSQuadraticLineProcPtr ): ATSQuad
 
 {
  *  DisposeATSQuadraticLineUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -533,7 +533,7 @@ procedure DisposeATSQuadraticLineUPP( userUPP: ATSQuadraticLineUPP ); external n
 
 {
  *  InvokeATSQuadraticLineUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -544,30 +544,30 @@ function InvokeATSQuadraticLineUPP( const (*var*) pt1: Float32Point; const (*var
 
 {
  *  ATSQuadraticCurveProcPtr
- *  
+ *
  *  Discussion:
  *    A pointer to a client supplied callback function for handling
  *    glyph curve drawing operations. This callback handles operations
  *    to draw curves. The curve is a quadratic patch specified by a
  *    start point (pt1), and end point (pt2), and a single control
  *    point (controlPt).
- *  
+ *
  *  Parameters:
- *    
+ *
  *    pt1:
  *      The starting point of the curve.
- *    
+ *
  *    controlPt:
  *      The off-curve control point.
- *    
+ *
  *    pt2:
  *      The end point of the curve.
- *    
+ *
  *    callBackDataPtr:
  *      A pointer to any application specific data that may have been
  *      passed to the callbacks through the iCallbackDataPtr parameter
  *      of the ATSUGlyphGetQuadraticPaths function.
- *  
+ *
  *  Result:
  *    Return status. Pass any errors you wish to propagate back to the
  *    original caller of ATSUGlyphGetQuadraticPaths through this return
@@ -579,7 +579,7 @@ type
 	ATSQuadraticCurveUPP = ATSQuadraticCurveProcPtr;
 {
  *  NewATSQuadraticCurveUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -590,7 +590,7 @@ function NewATSQuadraticCurveUPP( userRoutine: ATSQuadraticCurveProcPtr ): ATSQu
 
 {
  *  DisposeATSQuadraticCurveUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -601,7 +601,7 @@ procedure DisposeATSQuadraticCurveUPP( userUPP: ATSQuadraticCurveUPP ); external
 
 {
  *  InvokeATSQuadraticCurveUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -612,19 +612,19 @@ function InvokeATSQuadraticCurveUPP( const (*var*) pt1: Float32Point; const (*va
 
 {
  *  ATSQuadraticClosePathProcPtr
- *  
+ *
  *  Discussion:
  *    A pointer to a client supplied callback function for handling
  *    glyph curve drawing operations. This callback handles operations
  *    to close the current drawing path.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    callBackDataPtr:
  *      A pointer to any application specific data that may have been
  *      passed to the callbacks through the iCallbackDataPtr parameter
  *      of the ATSUGlyphGetQuadraticPaths function.
- *  
+ *
  *  Result:
  *    Return status. Pass any errors you wish to propagate back to the
  *    original caller of ATSUGlyphGetQuadraticPaths through this return
@@ -636,7 +636,7 @@ type
 	ATSQuadraticClosePathUPP = ATSQuadraticClosePathProcPtr;
 {
  *  NewATSQuadraticClosePathUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -647,7 +647,7 @@ function NewATSQuadraticClosePathUPP( userRoutine: ATSQuadraticClosePathProcPtr
 
 {
  *  DisposeATSQuadraticClosePathUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -658,7 +658,7 @@ procedure DisposeATSQuadraticClosePathUPP( userUPP: ATSQuadraticClosePathUPP );
 
 {
  *  InvokeATSQuadraticClosePathUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -670,14 +670,14 @@ function InvokeATSQuadraticClosePathUPP( callBackDataPtr: UnivPtr; userUPP: ATSQ
 {$ifc not TARGET_CPU_64}
 {
  *  ATSUGlyphGetQuadraticPaths()   *** DEPRECATED ***
- *  
+ *
  *  Deprecated:
  *    Use CTFontCreatePathForGlyph instead.
- *  
+ *
  *  Summary:
  *    Uses a callback mechanism to obtain a set of Quadratic outlines
  *    for a specified glyph in a specified font.
- *  
+ *
  *  Discussion:
  *    This function will allow you to use callbacks to obtain the exact
  *    outline of a specified glyph, in quadratic form. Although this
@@ -691,55 +691,55 @@ function InvokeATSQuadraticClosePathUPP( callBackDataPtr: UnivPtr; userUPP: ATSQ
  *    of ATSQuadraticNewPathProcPtr, ATSQuadraticLineProcPtr,
  *    ATSQuadraticCurveProcPtr, and ATSQuadraticClosePathProcPtr for
  *    more information about setting up the callbacks.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    iATSUStyle:
  *      A style referring to a font you wish to obtain a set of glyph
  *      outlines from.
- *    
+ *
  *    iGlyphID:
  *      A ID number referring to the glyph for which you wish to obtain
  *      outline data. Use the ATSUI direct access functions in
  *      ATSUnicodeDirectAccess.h to obtain values to pass for this
  *      parameter.
- *    
+ *
  *    iNewPathProc:
  *      A pointer to a callback function for quadratic new path
  *      operations. See the definition of ATSQuadraticNewPathProcPtr
  *      for more information about creating, disposing, and invoking
  *      this type of Universal Procedure Pointer.
- *    
+ *
  *    iLineProc:
  *      A pointer to a callback function for quadratic LineTo
  *      operations. See the definition of ATSQuadraticLineProcPtr for
  *      more information about creating, disposing, and invoking this
  *      type of Universal Procedure Pointer.
- *    
+ *
  *    iCurveProc:
  *      A pointer to a callback function for quadratic curve
  *      operations. See the definition of ATSQuadraticCurveProcPtr for
  *      more information about creating, disposing, and invoking this
  *      type of Universal Procedure Pointer.
- *    
+ *
  *    iClosePathProc:
  *      A pointer to a callback function for quadratic close path
  *      operations. See the definition of ATSQuadraticClosePathProcPtr
  *      for more information about creating, disposing, and invoking
  *      this type of Universal Procedure Pointer.
- *    
+ *
  *    iCallbackDataPtr:
  *      Any valid pointer. Any application specific data you wish to
  *      pass to your callbacks may be sent through this parameter.
- *    
+ *
  *    oCallbackResult:
  *      On return, status returned by callback functions. If an error
  *      occurs, callbacks may communicate it through this parameter.
- *  
+ *
  *  Result:
  *    On success, noErr is returned. See MacErrors.h for possible error
  *    codes.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework [32-bit only] but deprecated in 10.6
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -754,22 +754,22 @@ function ATSUGlyphGetQuadraticPaths( iATSUStyle: ATSUStyle; iGlyphID: GlyphID; i
 
 {
  *  ATSCubicMoveToProcPtr
- *  
+ *
  *  Discussion:
  *    A pointer to a client supplied callback function for handling
  *    glyph curve drawing operations. This callback handles operations
  *    to move the current pen location.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    pt:
  *      The point to which to move the current pen location.
- *    
+ *
  *    callBackDataPtr:
  *      A pointer to any application specific data that may have been
  *      passed to the callbacks through the iCallbackDataPtr parameter
  *      of the ATSUGlyphGetCubicPaths function.
- *  
+ *
  *  Result:
  *    Return status. Pass any errors you wish to propagate back to the
  *    original caller of ATSUGlyphGetCubicPaths through this return
@@ -781,7 +781,7 @@ type
 	ATSCubicMoveToUPP = ATSCubicMoveToProcPtr;
 {
  *  NewATSCubicMoveToUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -792,7 +792,7 @@ function NewATSCubicMoveToUPP( userRoutine: ATSCubicMoveToProcPtr ): ATSCubicMov
 
 {
  *  DisposeATSCubicMoveToUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -803,7 +803,7 @@ procedure DisposeATSCubicMoveToUPP( userUPP: ATSCubicMoveToUPP ); external name
 
 {
  *  InvokeATSCubicMoveToUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -814,23 +814,23 @@ function InvokeATSCubicMoveToUPP( const (*var*) pt: Float32Point; callBackDataPt
 
 {
  *  ATSCubicLineToProcPtr
- *  
+ *
  *  Discussion:
  *    A pointer to a client supplied callback function for handling
  *    glyph curve drawing operations. This callback handles operations
  *    to draw straight lines.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    pt:
  *      The end point of the line to be drawn. The starting point is
  *      whatever the current pen position is.
- *    
+ *
  *    callBackDataPtr:
  *      A pointer to any application specific data that may have been
  *      passed to the callbacks through the iCallbackDataPtr parameter
  *      of the ATSUGlyphGetCubicPaths function.
- *  
+ *
  *  Result:
  *    Return status. Pass any errors you wish to propagate back to the
  *    original caller of ATSUGlyphGetCubicPaths through this return
@@ -842,7 +842,7 @@ type
 	ATSCubicLineToUPP = ATSCubicLineToProcPtr;
 {
  *  NewATSCubicLineToUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -853,7 +853,7 @@ function NewATSCubicLineToUPP( userRoutine: ATSCubicLineToProcPtr ): ATSCubicLin
 
 {
  *  DisposeATSCubicLineToUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -864,7 +864,7 @@ procedure DisposeATSCubicLineToUPP( userUPP: ATSCubicLineToUPP ); external name
 
 {
  *  InvokeATSCubicLineToUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -875,30 +875,30 @@ function InvokeATSCubicLineToUPP( const (*var*) pt: Float32Point; callBackDataPt
 
 {
  *  ATSCubicCurveToProcPtr
- *  
+ *
  *  Discussion:
  *    A pointer to a client supplied callback function for handling
  *    glyph curve drawing operations. This callback handles operations
  *    to draw a curve. The curve is a Bezier patch defined by two
  *    off-curve control points (pt1 and pt2), and an endpoint (pt3).
  *    The starting point is whatever the current pen position is.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    pt1:
  *      The first off-curve control point.
- *    
+ *
  *    pt2:
  *      The second off-curve control point.
- *    
+ *
  *    pt3:
  *      The end point of the curve.
- *    
+ *
  *    callBackDataPtr:
  *      A pointer to any application specific data that may have been
  *      passed to the callbacks through the iCallbackDataPtr parameter
  *      of the ATSUGlyphGetCubicPaths function.
- *  
+ *
  *  Result:
  *    Return status. Pass any errors you wish to propagate back to the
  *    original caller of ATSUGlyphGetCubicPaths through this return
@@ -910,7 +910,7 @@ type
 	ATSCubicCurveToUPP = ATSCubicCurveToProcPtr;
 {
  *  NewATSCubicCurveToUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -921,7 +921,7 @@ function NewATSCubicCurveToUPP( userRoutine: ATSCubicCurveToProcPtr ): ATSCubicC
 
 {
  *  DisposeATSCubicCurveToUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -932,7 +932,7 @@ procedure DisposeATSCubicCurveToUPP( userUPP: ATSCubicCurveToUPP ); external nam
 
 {
  *  InvokeATSCubicCurveToUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -943,19 +943,19 @@ function InvokeATSCubicCurveToUPP( const (*var*) pt1: Float32Point; const (*var*
 
 {
  *  ATSCubicClosePathProcPtr
- *  
+ *
  *  Discussion:
  *    A pointer to a client supplied callback function for handling
  *    glyph curve drawing operations. This callback handles operations
  *    to close the current drawing path.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    callBackDataPtr:
  *      A pointer to any application specific data that may have been
  *      passed to the callbacks through the iCallbackDataPtr parameter
  *      of the ATSUGlyphGetCubicPaths function.
- *  
+ *
  *  Result:
  *    Return status. Pass any errors you wish to propagate back to the
  *    original caller of ATSUGlyphGetCubicPaths through this return
@@ -967,7 +967,7 @@ type
 	ATSCubicClosePathUPP = ATSCubicClosePathProcPtr;
 {
  *  NewATSCubicClosePathUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -978,7 +978,7 @@ function NewATSCubicClosePathUPP( userRoutine: ATSCubicClosePathProcPtr ): ATSCu
 
 {
  *  DisposeATSCubicClosePathUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -989,7 +989,7 @@ procedure DisposeATSCubicClosePathUPP( userUPP: ATSCubicClosePathUPP ); external
 
 {
  *  InvokeATSCubicClosePathUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -1001,14 +1001,14 @@ function InvokeATSCubicClosePathUPP( callBackDataPtr: UnivPtr; userUPP: ATSCubic
 {$ifc not TARGET_CPU_64}
 {
  *  ATSUGlyphGetCubicPaths()   *** DEPRECATED ***
- *  
+ *
  *  Deprecated:
  *    Use CTFontCreatePathForGlyph instead.
- *  
+ *
  *  Summary:
  *    Uses a callback mechanism to obtain a set of Cubic outlines for a
  *    specified glyph in a specified font.
- *  
+ *
  *  Discussion:
  *    This function will allow you to use callbacks to obtain the exact
  *    outline of a specified glyph, in cubic form. Although this
@@ -1022,55 +1022,55 @@ function InvokeATSCubicClosePathUPP( callBackDataPtr: UnivPtr; userUPP: ATSCubic
  *    of ATSCubicMoveToProcPtr, ATSCubicLineToProcPtr,
  *    ATSCubicCurveToProcPtr, and ATSCubicClosePathProcPtr for more
  *    information about setting up the callbacks.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    iATSUStyle:
  *      A style referring to a font you wish to obtain a set of glyph
  *      outlines from.
- *    
+ *
  *    iGlyphID:
  *      A ID number referring to the glyph for which you wish to obtain
  *      outline data. Use the ATSUI direct access functions in
  *      ATSUnicodeDirectAccess.h to obtain values to pass for this
  *      parameter.
- *    
+ *
  *    iMoveToProc:
  *      A pointer to a callback function for cubic MoveTo operations.
  *      See the definition of ATSCubicMoveToProcPtr for more
  *      information about creating, disposing, and invoking this type
  *      of Universal Procedure Pointer.
- *    
+ *
  *    iLineToProc:
  *      A pointer to a callback function for cubic LineTo operations.
  *      See the definition of ATSCubicLineToProcPtr for more
  *      information about creating, disposing, and invoking this type
  *      of Universal Procedure Pointer.
- *    
+ *
  *    iCurveToProc:
  *      A pointer to a callback function for cubic CurveTo operations.
  *      See the definition of ATSCubicCurveToProcPtr for more
  *      information about creating, disposing, and invoking this type
  *      of Universal Procedure Pointer.
- *    
+ *
  *    iClosePathProc:
  *      A pointer to a callback function for cubic MoveTo operations.
  *      See the definition of ATSCubicClosePathProcPtr for more
  *      information about creating, disposing, and invoking this type
  *      of Universal Procedure Pointer.
- *    
+ *
  *    iCallbackDataPtr:
  *      Any valid pointer. Any application specific data you wish to
  *      pass to your callbacks may be sent through this parameter.
- *    
+ *
  *    oCallbackResult:
  *      On return, status returned by callback functions. If an error
  *      occurs, callbacks may communicate it through this parameter.
- *  
+ *
  *  Result:
  *    On success, noErr is returned. See MacErrors.h for possible error
  *    codes.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework [32-bit only] but deprecated in 10.6
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -1082,13 +1082,13 @@ function ATSUGlyphGetCubicPaths( iATSUStyle: ATSUStyle; iGlyphID: GlyphID; iMove
 
 {
  *  ATSUGlyphGetCurvePaths()   *** DEPRECATED ***
- *  
+ *
  *  Deprecated:
  *    Use CTFontCreatePathForGlyph instead.
- *  
+ *
  *  Summary:
  *    Obtains glyph curve data without the use of callbacks.
- *  
+ *
  *  Discussion:
  *    This function will return glyph curve data in a single data
  *    structure rather than through the use of callbacks, but you must
@@ -1105,33 +1105,33 @@ function ATSUGlyphGetCubicPaths( iATSUStyle: ATSUStyle; iGlyphID: GlyphID; iMove
  *    call the ATSUGlyphGetCurvePaths again, passing a pointer to the
  *    array in the oPaths parameter. On return, the array contains the
  *    glyph outline data.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    iATSUStyle:
  *      A style referring to a font you wish to obtain a set of glyph
  *      outlines from.
- *    
+ *
  *    iGlyphID:
  *      A ID number referring to the glyph for which you wish to obtain
  *      outline data. Use the ATSUI direct access functions in
  *      ATSUnicodeDirectAccess.h to obtain values to pass for this
  *      parameter.
- *    
+ *
  *    ioBufferSize:
  *      On input, the size of the buffer you have allocated for the
  *      oPaths parameter. On return, the actual size of the data
  *      structure that has been copied into the oPaths parameter.
- *    
+ *
  *    oPaths:
  *      On return, a data structure containing glyph outline
  *      information. See ATSTypes.h for a definition of this data
  *      structure.
- *  
+ *
  *  Result:
  *    On success, noErr is returned. See MacErrors.h for possible error
  *    codes.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework [32-bit only] but deprecated in 10.6
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -1148,19 +1148,19 @@ function ATSUGlyphGetCurvePaths( iATSUStyle: ATSUStyle; iGlyphID: GlyphID; ioBuf
 { ---------------------------------------------------------------------------- }
 {
  *  ATSUGetGlyphInfo()   *** DEPRECATED ***
- *  
+ *
  *  Deprecated:
  *    Use CTRunGetGlyphsPtr,CTRunGetGlyphs, CTRunGetPositionsPtr,
  *    CTRunGetPositions, CTRunGetStringIndicesPtr,
  *    CTRunGetStringIndices, CTRunGetStringRange instead.
- *  
+ *
  *  Summary:
  *    Obtains a copy of the style and layout information for each glyph
  *    in a line.
- *  
+ *
  *  Discussion:
  *    Please see ATSUnicodeDirectAccess.h for replacement functions.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework [32-bit only] but deprecated in 10.3
  *    CarbonLib:        in CarbonLib 1.1 and later
@@ -1172,19 +1172,19 @@ function ATSUGetGlyphInfo( iTextLayout: ATSUTextLayout; iLineStart: UniCharArray
 
 {
  *  ATSUDrawGlyphInfo()   *** DEPRECATED ***
- *  
+ *
  *  Deprecated:
  *    Use CTRunGetGlyphsPtr,CTRunGetGlyphs, CTRunGetPositionsPtr,
  *    CTRunGetPositions, CTRunGetStringIndicesPtr,
  *    CTRunGetStringIndices, CTRunGetStringRange instead.
- *  
+ *
  *  Summary:
  *    Draws glyphs at the specified location, based on style and layout
  *    information specified for each glyph.
- *  
+ *
  *  Discussion:
  *    Please see ATSUnicodeDirectAccess.h for replacement functions.
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework [32-bit only] but deprecated in 10.3
  *    CarbonLib:        in CarbonLib 1.1 and later

Plik diff jest za duży
+ 179 - 179
packages/univint/src/ATSUnicodeObjects.pas


+ 57 - 57
packages/univint/src/ATSUnicodeTypes.pas

@@ -1,17 +1,17 @@
 {
      File:       QD/ATSUnicodeTypes.h
- 
+
      Contains:   ATSUI types and constants.
- 
+
      Version:    Quickdraw-285~150
- 
+
      Copyright:  © 2003-2008 by Apple Inc. all rights reserved.
- 
+
      Bugs?:      For bug reports, consult the following page on
                  the World Wide Web:
- 
+
                      http://bugs.freepascal.org
- 
+
 }
 {  Pascal Translation:  Peter N Lewis, <[email protected]>, 2004 }
 {   Pascal Translation Updated:  Jonas Maebe, <[email protected]>, October 2009 }
@@ -238,7 +238,7 @@ uses MacTypes,MacMemory,ATSLayoutTypes,Fonts,QuickdrawTypes,SFNTTypes,SFNTLayout
 
 {
  *  ATSUTextLayout
- *  
+ *
  *  Discussion:
  *    Text layout objects are the heart of ATSUI. These opaque objects
  *    associate Unicode text with style runs, store information about
@@ -256,7 +256,7 @@ type
 
 {
  *  ATSUStyle
- *  
+ *
  *  Discussion:
  *    Style objects retain information about text such as font, point
  *    size, color and other attributes. Styles are associated with text
@@ -274,7 +274,7 @@ type
 
 {
  *  ATSUFontFallbacks
- *  
+ *
  *  Discussion:
  *    ATSUFontFallbacks objects are used to store the desired font
  *    fallback mode, list, and associated cache information. See the
@@ -287,7 +287,7 @@ type
 
 {
  *  ATSUTextMeasurement
- *  
+ *
  *  Discussion:
  *    ATSUTextMeasurement is specific to ATSUI in that measurement
  *    quantities are in fractional Fixed format instead of shorts used
@@ -301,7 +301,7 @@ type
 
 {
  *  ATSUFontID
- *  
+ *
  *  Discussion:
  *    ATSUFontID indicates a particular font family and face.
  *    ATSUFontID's are not guaranteed to remain constant across
@@ -315,7 +315,7 @@ type
 
 {
  *  ATSUFontFeatureType
- *  
+ *
  *  Discussion:
  *    Used to identify a font feature type for a particular font. See
  *    the definitions of the functions ATSUGetAllFontFeatures and
@@ -327,7 +327,7 @@ type
 
 {
  *  ATSUFontFeatureSelector
- *  
+ *
  *  Discussion:
  *    Used to identify a font feature selector for a particular font.
  *    See the definitions of the functions ATSUGetAllFontFeatures and
@@ -339,7 +339,7 @@ type
 
 {
  *  ATSUFontVariationAxis
- *  
+ *
  *  Discussion:
  *    Used to identify a font variation axis for a particular font. See
  *    the definitions of the functions ATSUGetAllFontVariations and
@@ -351,7 +351,7 @@ type
 
 {
  *  ATSUFontVariationValue
- *  
+ *
  *  Discussion:
  *    Used to identify a font variation value for a particular font.
  *    See the definitions of the functions ATSUGetAllFontVariations and
@@ -363,11 +363,11 @@ type
 
 {
  *  ATSUAttributeTag
- *  
+ *
  *  Summary:
  *    Constants used for style attributes, line controls, and layout
  *    controls.
- *  
+ *
  *  Discussion:
  *    The following constants are used to change settings in text
  *    layout and style objects. Use the functions ATSUSetLineControls,
@@ -829,7 +829,7 @@ const
 
 {
  *  ATSUAttributeValuePtr
- *  
+ *
  *  Summary:
  *    Used to provide generic access for storage of attribute values,
  *    which vary in size.
@@ -841,7 +841,7 @@ type
 
 {
  *  ATSUAttributeInfo
- *  
+ *
  *  Discussion:
  *    ATSUAttributeInfo is used to provide a tag/size pairing. This
  *    makes it possible to provide the client information about all the
@@ -864,7 +864,7 @@ type
 
 {
  *  ATSUCaret
- *  
+ *
  *  Discussion:
  *    Contains the complete information needed to render a caret.  fX
  *    and fY is the position of one of the caret's ends relative to the
@@ -886,10 +886,10 @@ type
 
 {
  *  ATSUCursorMovementType
- *  
+ *
  *  Discussion:
  *    Used to indicate how much to move the cursor when using the ATSUI
- *    cusor movement routines. Note that kATSUByCharacterCluster is
+ *    cursor movement routines. Note that kATSUByCharacterCluster is
  *    only available in Mac OS X and in CarbonLib versions 1.3 and
  *    later.
  }
@@ -926,11 +926,11 @@ const
 
 {
  *  ATSULineTruncation
- *  
+ *
  *  Summary:
  *    Constants used with the kATSULineTruncationTag layout and line
  *    control.
- *  
+ *
  *  Discussion:
  *    The constants kATSUTruncateNone, kATSUTruncateStart,
  *    kATSUTruncateEnd, and kATSUTruncateMiddle represent different
@@ -956,7 +956,7 @@ const
 
 {
  *  ATSUStyleLineCountType
- *  
+ *
  *  Discussion:
  *    ATSUStyleLineCountType is used to designate how many lines will
  *    be drawn for a given style type.  Currently only the underline
@@ -971,7 +971,7 @@ const
 
 {
  *  ATSUVerticalCharacterType
- *  
+ *
  *  Discussion:
  *    Use these constants along with the kATSUVerticalCharacterTag
  *    layout control to determine whether the vertical or horizontal
@@ -987,7 +987,7 @@ const
 
 {
  *  ATSUStyleComparison
- *  
+ *
  *  Discussion:
  *    ATSUStyleComparison is an enumeration with four values, and is
  *    used by ATSUCompareStyles() to indicate if the first style
@@ -1005,7 +1005,7 @@ const
 
 {
  *  ATSUFontFallbackMethod
- *  
+ *
  *  Discussion:
  *    ATSUFontFallbackMethod type defines the method by which ATSUI
  *    will try to find an appropriate font for a character if the
@@ -1050,7 +1050,7 @@ const
 
 {
  *  ATSUTabType
- *  
+ *
  *  Discussion:
  *    ATSUTabType type defines the characteristic of ATSUI tabs. A Left
  *    tab type specifies that the left side of affected text is to be
@@ -1077,7 +1077,7 @@ const
 
 {
  *  ATSUTab
- *  
+ *
  *  Discussion:
  *    ATSUTab specifies the position and type of tab stop to be applied
  *    to a ATSUTextLayout set through the ATSUI routine ATSUSetTabArray
@@ -1092,7 +1092,7 @@ type
 
 {
  *  ATSURGBAlphaColor
- *  
+ *
  *  Discussion:
  *    Use this structure with the kATSURGBAlphaColorTag attribute to
  *    specify color for your text in an ATSUStyle. All values range
@@ -1109,7 +1109,7 @@ type
 
 {
  *  GlyphCollection
- *  
+ *
  *  Discussion:
  *    GlyphCollection types represent the specific character
  *    collection.  If the value is zero, kGlyphCollectionGID, then this
@@ -1132,7 +1132,7 @@ const
 
 {
  *  ATSUGlyphSelector
- *  
+ *
  *  Discussion:
  *    ATSUGlyphSelector can direct ATSUI to use a specific glyph
  *    instead of the one that ATSUI normally derives.  The glyph can be
@@ -1158,10 +1158,10 @@ type
 
 {
  *  ATSUGlyphInfo
- *  
+ *
  *  Summary:
  *    Structure returned by ATSUGetGlyphInfo
- *  
+ *
  *  Discussion:
  *    ATSUGetGlyphInfo will return an array of these structs, one for
  *    each glyph in the specified range. You can then make changes to
@@ -1185,10 +1185,10 @@ type
 
 {
  *  ATSUGlyphInfoArray
- *  
+ *
  *  Summary:
  *    Structure returned by ATSUGetGlyphInfo
- *  
+ *
  *  Discussion:
  *    This data structure is returned by ATSUGetGlyphInfo. layout is
  *    the same layout you pass in to ATSUGetGlyphInfo, numGlyphs is the
@@ -1211,7 +1211,7 @@ type
 
 {
  *  ATSUHighlightMethod
- *  
+ *
  *  Discussion:
  *    Use the constants with the function ATSUSetHighlightingMethod to
  *    determine the method of highlighting to use. kInvertHighlighting
@@ -1235,7 +1235,7 @@ const
 
 {
  *  ATSUBackgroundDataType
- *  
+ *
  *  Discussion:
  *    Use these constants for the dataType field in the
  *    ATSUUnhighlightData structure. kATSUBackgroundColor refers to a
@@ -1252,7 +1252,7 @@ const
 
 {
  *  ATSUBackgroundColor
- *  
+ *
  *  Discussion:
  *    A background color used by ATSUI to redraw the background after a
  *    call to ATSUUnhighlight text when the highlighting method is set
@@ -1265,7 +1265,7 @@ type
 
 {
  *  RedrawBackgroundProcPtr
- *  
+ *
  *  Discussion:
  *    RedrawBackgroundProcPtr is a pointer to a client-supplied
  *    callback function (e.g. MyRedrawBackgroundProc) for redrawing
@@ -1280,28 +1280,28 @@ type
  *    parameter for the ATSUSetHighlightingMethod call. When finished,
  *    the client should call DisposeRedrawBackgroundUPP with the
  *    RedrawBackgroundUPP.
- *  
+ *
  *  Parameters:
- *    
+ *
  *    iLayout:
  *      The layout to which the highlighting is being applied. The
  *      client function can use this to redraw the text.
- *    
+ *
  *    iTextOffset:
  *      The offset of the text that is being highlighted; can be used
  *      by the client function to redraaw the text.
- *    
+ *
  *    iTextLength:
  *      The length of the text that is being highlighted; can be used
  *      by the client function to redraaw the text.
- *    
+ *
  *    iUnhighlightArea:
  *      An array of ATSTrapezoids that describes the highlight area.
  *      The ATSTrapezoid array is ALWAYS in QD coordinates.
- *    
+ *
  *    iTrapezoidCount:
  *      The count of ATSTrapezoids in iUnhighlightArea.
- *  
+ *
  *  Result:
  *    A Boolean result indicating whether ATSUI should redraw the text.
  *    If the client function redraws the text, it should return false,
@@ -1313,7 +1313,7 @@ type
 	RedrawBackgroundUPP = RedrawBackgroundProcPtr;
 {
  *  NewRedrawBackgroundUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        not available in CarbonLib 1.x, is available on Mac OS X version 10.0 and later
@@ -1324,7 +1324,7 @@ function NewRedrawBackgroundUPP( userRoutine: RedrawBackgroundProcPtr ): RedrawB
 
 {
  *  DisposeRedrawBackgroundUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        not available in CarbonLib 1.x, is available on Mac OS X version 10.0 and later
@@ -1335,7 +1335,7 @@ procedure DisposeRedrawBackgroundUPP( userUPP: RedrawBackgroundUPP ); external n
 
 {
  *  InvokeRedrawBackgroundUPP()
- *  
+ *
  *  Availability:
  *    Mac OS X:         in version 10.0 and later in ApplicationServices.framework
  *    CarbonLib:        not available in CarbonLib 1.x, is available on Mac OS X version 10.0 and later
@@ -1347,10 +1347,10 @@ function InvokeRedrawBackgroundUPP( iLayout: ATSUTextLayout; iTextOffset: UniCha
 
 {
  *  ATSUBackgroundData
- *  
+ *
  *  Summary:
  *    Data describing one of two methods for ATSUI to unhighlight text.
- *  
+ *
  *  Discussion:
  *    When you call ATSUUnhighlightText and the highlighting method
  *    used is kRedrawHighlighting, ATSUI must redraw the text,
@@ -1382,10 +1382,10 @@ type
 
 {
  *  ATSUUnhighlightData
- *  
+ *
  *  Summary:
  *    Struct for defining a method for ATSUI to unhighlight text.
- *  
+ *
  *  Discussion:
  *    There are two methods of highlighting available on Mac OS X:
  *    invert and redraw. For the invert method, no unhighlight method
@@ -1427,7 +1427,7 @@ type
 {
  *  Summary:
  *    Line direction types
- *  
+ *
  *  Discussion:
  *    These constants are used with the kATSULineDirectionTag control
  *    to determine overall line direction.
@@ -1484,7 +1484,7 @@ const
 {
  *  Summary:
  *    Text buffer convenience constants.
- *  
+ *
  *  Discussion:
  *    These constants refer to the beginning and end of a text buffer.
  *    Functions which accept these constants are marked below. Do not

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików